forked from anomalyco/opencode
-
Notifications
You must be signed in to change notification settings - Fork 0
[codex] Fix team worker model routing #186
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ const need = new Map<string, Need>() | |
| const live = new Map<string, Run>() | ||
| const seen = new WeakMap<object, Seen>() | ||
| const sweeping = new Map<string, Promise<void>>() | ||
| const models = new Map<string, Lane>() | ||
|
|
||
| type Need = { | ||
| done: boolean | ||
|
|
@@ -35,6 +36,7 @@ type Note = { | |
| type Msg = { | ||
| info: { | ||
| role: string | ||
| finish?: string | ||
| time?: { | ||
| completed?: number | ||
| } | ||
|
|
@@ -57,6 +59,12 @@ type Rule = { | |
| action: "allow" | "deny" | "ask" | ||
| } | ||
|
|
||
| type Lane = { | ||
| provider: string | ||
| model: string | ||
| variant: string | ||
| } | ||
|
|
||
| type Client = { | ||
| permission?: { | ||
| list(input?: { directory?: string; workspace?: string }): Promise<{ | ||
|
|
@@ -152,7 +160,15 @@ type Step = { | |
| no_patch: boolean | ||
| allow_no_patch: boolean | ||
| updated_at?: string | ||
| failure_stage?: "worktree_setup" | "session_create" | "execution" | "merge_back" | "aborted" | "timeout" | "blocked" | ||
| failure_stage?: | ||
| | "worktree_setup" | ||
| | "session_create" | ||
| | "llm_unavailable" | ||
| | "execution" | ||
| | "merge_back" | ||
| | "aborted" | ||
| | "timeout" | ||
| | "blocked" | ||
| } | ||
|
|
||
| type Run = { | ||
|
|
@@ -224,7 +240,8 @@ function summary(parts: Note[]) { | |
| function pick(list: Msg[], completedOnly = false) { | ||
| const items = [...list].reverse().filter((item) => item.info.role === "assistant") | ||
| if (!items.length) return | ||
| return items.find((item) => typeof item.info.time?.completed === "number") ?? (completedOnly ? undefined : items[0]) | ||
| const done = items.find((item) => typeof item.info.time?.completed === "number" && item.info.finish !== "tool-calls") | ||
| return done ?? (completedOnly ? undefined : items[0]) | ||
| } | ||
|
|
||
| function scrub(cmd: string) { | ||
|
|
@@ -396,6 +413,7 @@ function workerTools(push: boolean) { | |
| function permit(base: Rule[]) { | ||
| return [ | ||
| ...base, | ||
| { permission: "bash", pattern: "*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "pwd", action: "allow" as const }, | ||
| { permission: "bash", pattern: "ls", action: "allow" as const }, | ||
| { permission: "bash", pattern: "ls *", action: "allow" as const }, | ||
|
|
@@ -407,46 +425,61 @@ function permit(base: Rule[]) { | |
| { permission: "bash", pattern: "tail *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git status*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git diff*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git branch*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git log*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rev-parse*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git ls-tree*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git show*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git ls-files*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git grep *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git restore *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git worktree list*", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git checkout *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git checkout -- *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git switch *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase origin/develop", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase develop", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase origin/main", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase main", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase --continue", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git rebase --skip", action: "allow" as const }, | ||
| { permission: "bash", pattern: "git cherry-pick *", action: "allow" as const }, | ||
| { permission: "bash", pattern: "rm -rf *", action: "deny" as const }, | ||
| { permission: "bash", pattern: "sudo *", action: "deny" as const }, | ||
| { permission: "bash", pattern: "git reset --hard*", action: "deny" as const }, | ||
| { permission: "bash", pattern: "git merge *", action: "deny" as const }, | ||
| { permission: "bash", pattern: "curl * | sh*", action: "deny" as const }, | ||
| { permission: "bash", pattern: "curl * | bash*", action: "deny" as const }, | ||
| { permission: "bash", pattern: "opencode *", action: "deny" as const }, | ||
| { permission: "bash", pattern: "claude *", action: "deny" as const }, | ||
| { permission: "bash", pattern: "codex *", action: "deny" as const }, | ||
| ] | ||
| } | ||
|
|
||
| function lane(item: Pick<Step, "id" | "description" | "agent" | "prompt" | "depends">) { | ||
| const text = [item.id, item.description, item.agent, item.prompt, ...item.depends].join("\n") | ||
| const large = | ||
| big(text) || | ||
| item.depends.length > 1 || | ||
| /(leader|integrat|review|coord|arch|design|migration|cross|wide|large|broad|major|critical|fan-?in|全体|統合|横断|設計|移行|大規模)/i.test( | ||
| text, | ||
| ) | ||
| if (large) { | ||
| return { | ||
| provider: "openai", | ||
| model: "gpt-5.4", | ||
| variant: "high", | ||
| } | ||
| } | ||
| function recordModel( | ||
| sessionID: string, | ||
| model?: { providerID?: unknown; modelID?: unknown; id?: unknown }, | ||
| variant?: unknown, | ||
| ) { | ||
| const provider = typeof model?.providerID === "string" ? model.providerID : "" | ||
| const id = typeof model?.modelID === "string" ? model.modelID : typeof model?.id === "string" ? model.id : "" | ||
| if (!sessionID || !provider || !id) return | ||
| models.set(sessionID, { | ||
| provider, | ||
| model: id, | ||
| variant: typeof variant === "string" ? variant : "", | ||
| }) | ||
| } | ||
|
|
||
| function currentLane(sessionID: string) { | ||
| return models.get(sessionID) ?? { provider: "zai-coding-plan", model: "glm-5.1", variant: "" } | ||
| } | ||
|
|
||
| function lane(_item: Pick<Step, "id" | "description" | "agent" | "prompt" | "depends">, current: Lane) { | ||
| return { | ||
| provider: "zai-coding-plan", | ||
| model: "glm-5.1", | ||
| variant: "", | ||
| provider: current.provider, | ||
| model: current.model, | ||
| variant: current.variant, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -494,6 +527,7 @@ function worktreeHint(text: string) { | |
| /(?:git\s+)?worktree[\s\S]{0,120}?(?:at|path|directory|dir|:|：)[\s\S]{0,40}?`([^`\n]+)`/i, | ||
| /(?:ワークツリー|作業ツリー)[\s\S]{0,120}?`([^`\n]+)`/i, | ||
| /`(\/[^`\n]*\/\.worktrees\/[^`\n]+)`/i, | ||
| /`(\/[^`\n]*\/\.opencode\/worktrees\/[^`\n]+)`/i, | ||
| ] | ||
| for (const rule of direct) { | ||
| const match = text.match(rule) | ||
|
|
@@ -945,13 +979,17 @@ async function snap(client: Client, id: string, dir: string, completedOnly = fal | |
| } | ||
|
|
||
| function stage(err: string): Step["failure_stage"] { | ||
| return /blocked on (permission|question)/i.test(err) | ||
| ? "blocked" | ||
| : /abort/i.test(err) | ||
| ? "aborted" | ||
| : /timeout/i.test(err) | ||
| ? "timeout" | ||
| : "execution" | ||
| return /(model not found|api key|apikey|auth|unauthorized|forbidden|provider|llm|language model|no such model|invalid model|quota|rate limit)/i.test( | ||
| err, | ||
| ) | ||
| ? "llm_unavailable" | ||
| : /blocked on (permission|question)/i.test(err) | ||
| ? "blocked" | ||
| : /abort/i.test(err) | ||
| ? "aborted" | ||
| : /timeout/i.test(err) | ||
| ? "timeout" | ||
|
Comment on lines
981
to
+991
|
||
| : "execution" | ||
| } | ||
|
|
||
| function why(item: Step | undefined, err: string): Step["failure_stage"] { | ||
|
|
@@ -1222,14 +1260,15 @@ export default async function team(input: { client: Client; worktree: string; di | |
| const target = repoRoot && push ? await externalWorktree(repoRoot, item.prompt) : undefined | ||
| const useExistingWorktree = push && item.worktree && !!target | ||
| useWorktree = push && item.worktree && !!repoRoot && !useExistingWorktree | ||
| const mergeWorktree = push && item.worktree && !!repoRoot | ||
|
|
||
| if (useExistingWorktree && target) { | ||
| box = target | ||
| } else if (useWorktree && repoRoot) { | ||
| box = await yardadd(repoRoot, `${run.id}-${item.id}`) | ||
| kept = await carry(repoRoot, ctx.directory, box) | ||
| } | ||
| const prompt = direct(useWorktree && repoRoot ? rebaseForWorktree(item.prompt, repoRoot, box) : item.prompt, push) | ||
| const prompt = direct(mergeWorktree && repoRoot ? rebaseForWorktree(item.prompt, repoRoot, box) : item.prompt, push) | ||
|
|
||
| if (process.env.DEBUG_TEAM) console.log("job.start", run.id, item.id) | ||
| todo(run, item.id, { | ||
|
|
@@ -1291,7 +1330,7 @@ export default async function team(input: { client: Client; worktree: string; di | |
| let err = out.error | ||
| // [Phase6] Classify failure stage for abort reason tracking | ||
| let failure_stage: Step["failure_stage"] = undefined | ||
| if (!err && useWorktree && repoRoot && box !== ctx.directory) { | ||
| if (!err && mergeWorktree && repoRoot && box !== ctx.directory) { | ||
| const merged = await merge(repoRoot, box, run.id, item.id, kept) | ||
| patchfile = merged.patch | ||
| if (!merged.merged) { | ||
|
|
@@ -1307,7 +1346,7 @@ export default async function team(input: { client: Client; worktree: string; di | |
| todo(run, item.id, { | ||
| state: err ? "error" : "done", | ||
| patch: patchfile, | ||
| no_patch: !err && item.write && useWorktree && patchfile === "", | ||
| no_patch: !err && item.write && mergeWorktree && patchfile === "", | ||
| output: out.text, | ||
| error: err, | ||
| failure_stage: err ? failure_stage : undefined, | ||
|
|
@@ -1383,13 +1422,16 @@ export default async function team(input: { client: Client; worktree: string; di | |
| created_at: now(), | ||
| updated_at: now(), | ||
| tasks: args.tasks.map((item) => { | ||
| const pick = lane({ | ||
| id: item.id, | ||
| description: item.description || item.id, | ||
| prompt: item.prompt, | ||
| depends: item.depends ?? [], | ||
| agent: item.agent || "", | ||
| }) | ||
| const pick = lane( | ||
| { | ||
| id: item.id, | ||
| description: item.description || item.id, | ||
| prompt: item.prompt, | ||
| depends: item.depends ?? [], | ||
| agent: item.agent || "", | ||
| }, | ||
| currentLane(ctx.sessionID), | ||
| ) | ||
| return { | ||
| id: item.id, | ||
| description: item.description || item.id, | ||
|
|
@@ -1507,13 +1549,6 @@ export default async function team(input: { client: Client; worktree: string; di | |
| agent: args.agent || "", | ||
| write: write(args.prompt, args.write), | ||
| worktree: canIsolate && args.worktree !== false, | ||
| ...lane({ | ||
| id: slug(args.description || args.agent || "worker") || "worker", | ||
| description: args.description || "background worker", | ||
| prompt: args.prompt, | ||
| depends: [], | ||
| agent: args.agent || "", | ||
| }), | ||
| state: "pending", | ||
| dir: "", | ||
| session: "", | ||
|
|
@@ -1522,6 +1557,16 @@ export default async function team(input: { client: Client; worktree: string; di | |
| allow_no_patch: operationOnly(args.prompt), | ||
| output: "", | ||
| error: "", | ||
| ...lane( | ||
| { | ||
| id: slug(args.description || args.agent || "worker") || "worker", | ||
| description: args.description || "background worker", | ||
| prompt: args.prompt, | ||
| depends: [], | ||
| agent: args.agent || "", | ||
| }, | ||
| currentLane(ctx.sessionID), | ||
| ), | ||
| } | ||
| const run: Run = { | ||
| id: crypto.randomUUID(), | ||
|
|
@@ -1620,6 +1665,11 @@ export default async function team(input: { client: Client; worktree: string; di | |
| item: { | ||
| sessionID: string | ||
| agent?: string | ||
| model?: { | ||
| providerID: string | ||
| modelID: string | ||
| } | ||
| variant?: string | ||
| }, | ||
| out: { | ||
| message: { | ||
|
|
@@ -1631,6 +1681,7 @@ export default async function team(input: { client: Client; worktree: string; di | |
| }, | ||
| ) => { | ||
| void sweep(input.client, inputRoot) | ||
| recordModel(item.sessionID, item.model, item.variant) | ||
| if (out.message.role !== "user") return | ||
| if (kids.has(item.sessionID)) return | ||
| if (item.agent && /(review|technical-writer|doc-updater)/i.test(item.agent)) return | ||
|
|
@@ -1665,6 +1716,13 @@ export default async function team(input: { client: Client; worktree: string; di | |
| text: "Parallel implementation policy is active for this request. Before any edit, write, apply_patch, or mutating bash call, you MUST call the `team` tool and fan out at least one worker task. Mark tasks that should edit code with `write: true`; those tasks will be isolated in git worktrees and merged back when possible. Use `background` only for side work that should keep running after this turn.", | ||
| }) | ||
| }, | ||
| "chat.params": async (item: { | ||
| sessionID: string | ||
| model: { providerID?: unknown; modelID?: unknown; id?: unknown } | ||
| message: { model?: { variant?: unknown } } | ||
| }) => { | ||
| recordModel(item.sessionID, item.model, item.message.model?.variant) | ||
| }, | ||
| "tool.execute.before": async ( | ||
| item: { | ||
| tool: string | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modelsis a process-globalMap<string, Lane>keyed bysessionID, but nothing ever deletes/prunes entries. In a long-lived server this can grow without bound across many sessions. Consider bounding it (LRU/max size), or deleting entries when a session is no longer relevant (e.g. after a run completes/fails) while still preserving intra-session inheritance.