From ff2d7c22e78f970455f13703ed91c40c39b8d428 Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Wed, 24 Jun 2026 22:24:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(agent):=20=E6=A8=A1=E5=9E=8B=E6=A1=A3?= =?UTF-8?q?=E4=BD=8D=E5=8D=87=20fable-5=EF=BC=88=E5=A4=8D=E5=AE=A1/hard?= =?UTF-8?q?=E6=8B=86=E8=A7=A3/=E8=A7=A3=E5=86=B2=E7=AA=81=EF=BC=89+=20?= =?UTF-8?q?=E5=9B=9E=E9=80=80=E9=93=BE=20fable=20=E7=BD=AE=E9=A6=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按 plan ①②③④ 定稿（用户确认）： - reviewer 三档统一 fable-5（不被 project.model 降档，保复审严格度） - planner hard 拆解 opus→fable-5（最烧脑用最强档）；medium=opus/easy=sonnet 不变 - conflict 固定 fable-5（解冲突恒用最强档） - MODEL_FALLBACK_CHAIN: [fable-5, opus-4-8, sonnet-4-6]（fable 置链首） - executor 档不变（per plan ②）；CLAUDE.md 档位表同步更正 Co-Authored-By: Claude Opus 4.8 --- CLAUDE.md | 8 +++++--- src/executor/models.ts | 25 +++++++++++++------------ test/models.test.ts | 31 ++++++++++++++++++------------- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 57c981f..eb957a8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -79,10 +79,12 @@ score = P(self) + Σ P(completed deps) + Σ P(tasks blocked by self) | Role | Easy | Medium | Hard | |---|---|---|---| -| executor | claude-sonnet-4-6 | claude-opus-4-8 | claude-fable-5 | -| reviewer | claude-sonnet-4-6 | claude-opus-4-8 | claude-opus-4-8 | +| executor | claude-sonnet-4-6 | claude-opus-4-8 | claude-opus-4-8 | +| planner | claude-sonnet-4-6 | claude-opus-4-8 | claude-fable-5 | +| reviewer | claude-fable-5 | claude-fable-5 | claude-fable-5 | +| conflict | claude-fable-5 | claude-fable-5 | claude-fable-5 | -Project-level `model` setting overrides env vars; env vars override built-in defaults. +Reviewer/conflict use the strongest tier (fable-5) and are NOT downgraded by project-level `model` (preserves self-review/conflict-resolution rigor). Project-level `model` overrides executor/planner env vars; env vars override built-in defaults. Model fallback chain on unavailability: `fable-5 → opus-4-8 → sonnet-4-6`. ### Data Directory diff --git a/src/executor/models.ts b/src/executor/models.ts index 8671a71..ffbfaef 100644 --- a/src/executor/models.ts +++ b/src/executor/models.ts @@ -4,8 +4,8 @@ import type { Complexity } from '../model/complexity.js'; /** 角色：executor（执行改动）/ reviewer（执行后复审）/ planner（拆解 Hard / 写方案 Medium）/ conflict（冲突裁决） */ export type ModelRole = 'executor' | 'reviewer' | 'planner' | 'conflict'; -/** 模型不可用时的回退链（按序取下一档，同一 run 内只重试一次） */ -export const MODEL_FALLBACK_CHAIN = ['claude-opus-4-8', 'claude-sonnet-4-6'] as const; +/** 模型不可用时的回退链（按序取下一档，同一 run 内只重试一次；fable 置链首=优先用最强档） */ +export const MODEL_FALLBACK_CHAIN = ['claude-fable-5', 'claude-opus-4-8', 'claude-sonnet-4-6'] as const; /** 复杂度 → [env 覆盖变量名, 默认模型] */ const MODEL_TABLE: Record> = { @@ -14,22 +14,23 @@ const MODEL_TABLE: Record { assert.equal(pickModel(fakeTask('easy'), p, 'executor'), 'claude-sonnet-4-6'); assert.equal(pickModel(fakeTask('medium'), p, 'executor'), 'claude-opus-4-8'); assert.equal(pickModel(fakeTask('hard'), p, 'executor'), 'claude-opus-4-8'); - // reviewer 三档统一 opus-4-8（保复审独立性） - assert.equal(pickModel(fakeTask('easy'), p, 'reviewer'), 'claude-opus-4-8'); - assert.equal(pickModel(fakeTask('medium'), p, 'reviewer'), 'claude-opus-4-8'); - assert.equal(pickModel(fakeTask('hard'), p, 'reviewer'), 'claude-opus-4-8'); + // reviewer 三档统一 fable-5（复审是质量关口，用最强档保严格度） + assert.equal(pickModel(fakeTask('easy'), p, 'reviewer'), 'claude-fable-5'); + assert.equal(pickModel(fakeTask('medium'), p, 'reviewer'), 'claude-fable-5'); + assert.equal(pickModel(fakeTask('hard'), p, 'reviewer'), 'claude-fable-5'); + // planner hard 拆解最烧脑 → fable-5；medium=opus；easy=sonnet + assert.equal(pickModel(fakeTask('hard'), p, 'planner'), 'claude-fable-5'); + assert.equal(pickModel(fakeTask('medium'), p, 'planner'), 'claude-opus-4-8'); + assert.equal(pickModel(fakeTask('easy'), p, 'planner'), 'claude-sonnet-4-6'); }); }); @@ -53,10 +57,10 @@ test('pickModel：project.model executor 最优先，但 reviewer/conflict 不 for (const c of ['easy', 'medium', 'hard'] as const) { // executor 受 project.model 覆盖 assert.equal(pickModel(fakeTask(c), p, 'executor'), 'claude-opus-4-6'); - // reviewer 不受 project.model 覆盖，始终用 opus-4-8（保自审独立性） - assert.equal(pickModel(fakeTask(c), p, 'reviewer'), 'claude-opus-4-8'); - // conflict 固定 opus-4-8 - assert.equal(pickModel(fakeTask(c), p, 'conflict'), 'claude-opus-4-8'); + // reviewer 不受 project.model 覆盖，始终用 fable-5（保自审独立性） + assert.equal(pickModel(fakeTask(c), p, 'reviewer'), 'claude-fable-5'); + // conflict 固定 fable-5（解冲突恒用最强档） + assert.equal(pickModel(fakeTask(c), p, 'conflict'), 'claude-fable-5'); } }); }); @@ -70,8 +74,8 @@ test('pickModel：env 覆盖默认值，executor/reviewer 各用各的 env', () assert.equal(pickModel(fakeTask('easy'), p, 'executor'), 'claude-haiku-4-5'); // reviewer easy 被 MAESTRO_MODEL_REVIEW_EASY 覆盖 assert.equal(pickModel(fakeTask('easy'), p, 'reviewer'), 'claude-sonnet-4-6'); - // reviewer hard 无 env → 默认 opus-4-8 - assert.equal(pickModel(fakeTask('hard'), p, 'reviewer'), 'claude-opus-4-8'); + // reviewer hard 无 env → 默认 fable-5 + assert.equal(pickModel(fakeTask('hard'), p, 'reviewer'), 'claude-fable-5'); assert.equal(pickModel(fakeTask('hard'), p, 'executor'), 'claude-opus-4-8'); }); }); @@ -98,8 +102,9 @@ test('isModelError：模型不可用类错误才触发回退', () => { }); test('pickFallbackModel：回退链取下一档（循环）', () => { - // 链：opus → sonnet → opus（循环） - assert.deepEqual([...MODEL_FALLBACK_CHAIN], ['claude-opus-4-8', 'claude-sonnet-4-6']); + // 链：fable → opus → sonnet → fable（循环，fable 置链首=优先最强档） + assert.deepEqual([...MODEL_FALLBACK_CHAIN], ['claude-fable-5', 'claude-opus-4-8', 'claude-sonnet-4-6']); + assert.equal(pickFallbackModel('claude-fable-5'), 'claude-opus-4-8'); assert.equal(pickFallbackModel('claude-opus-4-8'), 'claude-sonnet-4-6'); - assert.equal(pickFallbackModel('claude-sonnet-4-6'), 'claude-opus-4-8'); + assert.equal(pickFallbackModel('claude-sonnet-4-6'), 'claude-fable-5'); });