Skip to content

Commit 2dfa012

Browse files
author
Kevin Rajan
committed
fix(cli): fail closed on unknown --agent after remapping
Resolve --agent via exact then case-insensitive registered names. Unknown names and subagents exit with an error listing primary agents instead of silently falling back to default_agent. Leave --model docs to the separate anomalyco#47040 leaf. Fork repair for #50 / anomalyco#47038.
1 parent 696f41b commit 2dfa012

3 files changed

Lines changed: 101 additions & 38 deletions

File tree

‎packages/opencode/src/cli/cmd/run.ts‎

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { Filesystem } from "@/util/filesystem"
2525
import { createOpencodeClient, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
2626
import { FormatError, FormatUnknownError } from "../error"
2727
import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./run/runtime.stdin"
28+
import { formatUnknownRunAgentError, resolveRequestedRunAgent } from "./run/agent-flag"
2829

2930
type ModelInput = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
3031

@@ -169,7 +170,7 @@ export const RunCommand = effectCmd({
169170
})
170171
.option("agent", {
171172
type: "string",
172-
describe: "agent to use",
173+
describe: "agent to use (exact or case-insensitive registered name; unknown names exit instead of falling back)",
173174
})
174175
.option("format", {
175176
type: "string",
@@ -596,26 +597,15 @@ export const RunCommand = effectCmd({
596597
if (!args.agent) return undefined
597598
const name = args.agent
598599

599-
const entry = await Effect.runPromise(
600-
agentSvc.get(name).pipe(Effect.provideService(InstanceRef, localInstance)),
600+
const listed = await Effect.runPromise(
601+
agentSvc.list().pipe(Effect.provideService(InstanceRef, localInstance)),
601602
)
602-
if (!entry) {
603-
UI.println(
604-
UI.Style.TEXT_WARNING_BOLD + "!",
605-
UI.Style.TEXT_NORMAL,
606-
`agent "${name}" not found. Falling back to default agent`,
607-
)
608-
return undefined
609-
}
610-
if (entry.mode === "subagent") {
611-
UI.println(
612-
UI.Style.TEXT_WARNING_BOLD + "!",
613-
UI.Style.TEXT_NORMAL,
614-
`agent "${name}" is a subagent, not a primary agent. Falling back to default agent`,
615-
)
616-
return undefined
603+
const resolved = resolveRequestedRunAgent(name, listed)
604+
if (!resolved.ok) {
605+
UI.error(formatUnknownRunAgentError(name, resolved))
606+
process.exit(1)
617607
}
618-
return name
608+
return resolved.name
619609
}
620610

621611
async function attachAgent(sdk: OpencodeClient) {
@@ -636,26 +626,12 @@ export const RunCommand = effectCmd({
636626
return undefined
637627
}
638628

639-
const agent = modes.find((a) => a.name === name)
640-
if (!agent) {
641-
UI.println(
642-
UI.Style.TEXT_WARNING_BOLD + "!",
643-
UI.Style.TEXT_NORMAL,
644-
`agent "${name}" not found. Falling back to default agent`,
645-
)
646-
return undefined
647-
}
648-
649-
if (agent.mode === "subagent") {
650-
UI.println(
651-
UI.Style.TEXT_WARNING_BOLD + "!",
652-
UI.Style.TEXT_NORMAL,
653-
`agent "${name}" is a subagent, not a primary agent. Falling back to default agent`,
654-
)
655-
return undefined
629+
const resolved = resolveRequestedRunAgent(name, modes)
630+
if (!resolved.ok) {
631+
UI.error(formatUnknownRunAgentError(name, resolved))
632+
process.exit(1)
656633
}
657-
658-
return name
634+
return resolved.name
659635
}
660636

661637
async function pickAgent(sdk: OpencodeClient) {
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
export type RunAgentListEntry = {
2+
readonly name: string
3+
readonly mode?: string
4+
}
5+
6+
export type ResolveRequestedRunAgentResult =
7+
| { readonly ok: true; readonly name: string }
8+
| { readonly ok: false; readonly reason: "not_found" | "subagent"; readonly names: string[] }
9+
10+
export function matchRunAgent(
11+
requested: string,
12+
agents: readonly RunAgentListEntry[],
13+
): RunAgentListEntry | undefined {
14+
const exact = agents.find((agent) => agent.name === requested)
15+
if (exact) return exact
16+
const lower = requested.toLowerCase()
17+
return agents.find((agent) => agent.name.toLowerCase() === lower)
18+
}
19+
20+
export function primaryRunAgentNames(agents: readonly RunAgentListEntry[]): string[] {
21+
return agents.filter((agent) => agent.mode !== "subagent").map((agent) => agent.name)
22+
}
23+
24+
export function resolveRequestedRunAgent(
25+
requested: string,
26+
agents: readonly RunAgentListEntry[],
27+
): ResolveRequestedRunAgentResult {
28+
const names = primaryRunAgentNames(agents)
29+
const matched = matchRunAgent(requested, agents)
30+
if (!matched) {
31+
return { ok: false, reason: "not_found", names }
32+
}
33+
if (matched.mode === "subagent") {
34+
return { ok: false, reason: "subagent", names }
35+
}
36+
return { ok: true, name: matched.name }
37+
}
38+
39+
export function formatUnknownRunAgentError(
40+
requested: string,
41+
result: Extract<ResolveRequestedRunAgentResult, { ok: false }>,
42+
): string {
43+
const list = result.names.length > 0 ? result.names.join(", ") : "(none)"
44+
if (result.reason === "subagent") {
45+
return `agent "${requested}" is a subagent, not a primary agent. Registered primary agents: ${list}`
46+
}
47+
return `agent "${requested}" not found. Registered primary agents: ${list}`
48+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import { describe, expect, test } from "bun:test"
2+
import {
3+
formatUnknownRunAgentError,
4+
resolveRequestedRunAgent,
5+
} from "../../../src/cli/cmd/run/agent-flag"
6+
7+
describe("resolveRequestedRunAgent", () => {
8+
const agents = [
9+
{ name: "Sisyphus - ultraworker", mode: "primary" },
10+
{ name: "sisyphus", mode: "primary" },
11+
{ name: "explore", mode: "subagent" },
12+
]
13+
14+
test("matches exact registered names", () => {
15+
const result = resolveRequestedRunAgent("sisyphus", agents)
16+
expect(result).toEqual({ ok: true, name: "sisyphus" })
17+
})
18+
19+
test("matches registered names case-insensitively", () => {
20+
const result = resolveRequestedRunAgent("sisyphus - ULTRAWORKER", agents)
21+
expect(result).toEqual({ ok: true, name: "Sisyphus - ultraworker" })
22+
})
23+
24+
test("fails closed on unknown names", () => {
25+
const result = resolveRequestedRunAgent("not-an-agent", agents)
26+
expect(result.ok).toBe(false)
27+
if (result.ok) return
28+
expect(result.reason).toBe("not_found")
29+
expect(formatUnknownRunAgentError("not-an-agent", result)).toContain("Registered primary agents")
30+
expect(formatUnknownRunAgentError("not-an-agent", result)).not.toContain("Falling back")
31+
})
32+
33+
test("rejects subagents", () => {
34+
const result = resolveRequestedRunAgent("explore", agents)
35+
expect(result.ok).toBe(false)
36+
if (result.ok) return
37+
expect(result.reason).toBe("subagent")
38+
})
39+
})

0 commit comments

Comments
 (0)