@markjaquith/agency 2.65.2 → 2.66.0

package/README.md

@@ -347,8 +347,10 @@ external effects the failed invocation may have completed.
 
 ### Agent Runners
 
-OpenCode and Claude Code are built-in runner presets. Select either preset or a
-configured runner with `agency work --runner <name>`. A launch is fresh unless
+OpenCode (`opencode2` and `opencode`) and Claude Code are built-in runner presets.
+Without an explicit runner, Agency uses the first available executable in this
+order: `opencode2`, `opencode`, then `claude`. Select a preset or configured
+runner with `agency work --runner <name>`. A launch is fresh unless
 `AGENCY_SESSION_ID` is already set; resumed launches use the runner's
 `resumeCommand` when configured. The built-in presets use `--continue` only for
 resumed launches. By default Agency opens the runner without a prompt. `--auto`
@@ -399,8 +401,9 @@ to the receiving OpenCode session, injects an explicit active-worker system
 instruction, and restores Agency identity for that session's shell environment.
 This session bridge is necessary because an OpenCode client can attach to a
 long-lived server process that did not inherit the client's launch environment.
-The `opencode` runner remains rooted in its task or epic working directory so
-the workbase `AGENTS.md` and managed OpenCode config are discovered normally.
+The `opencode2` and `opencode` runners remain rooted in their task or epic
+working directory so the workbase `AGENTS.md` and managed OpenCode config are
+discovered normally.
 Agency's managed OpenCode plugin grants the active workbase external-directory
 access and adds existing checkout-local `.claude/skills`, `.agents/skills`, and
 `.opencode/{skill,skills}` directories to `skills.paths`.
@@ -1063,10 +1066,10 @@ configured external chooser. Pass a directory, including `.` for the current
 directory, to infer its epic, task, or phase. Outside a workbase, Agency first
 presents the registered workbases, then the selected workbase's hierarchy.
 
-OpenCode is the default runner, with automatic Claude fallback when neither is
-explicitly selected. `--opencode` and `--claude` remain aliases for requiring
-their built-in presets. Launches are interactive and promptless by default; use
-`--auto` to send Agency's generated context prompt.
+Agency automatically uses the first available runner in this order: `opencode2`,
+`opencode`, then `claude`. `--opencode` and `--claude` remain aliases for
+requiring their corresponding built-in presets. Launches are interactive and
+promptless by default; use `--auto` to send Agency's generated context prompt.
 
 `agency work prepare` resolves an execution unit and creates or reuses its
 writable and reference worktrees, or its single pinned review checkout, without

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.65.2",
+  "version": "2.66.0",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/commands/work.test.ts

@@ -1050,18 +1050,45 @@ describe("work command", () => {
 		).toBeUndefined()
 	})
 
-	test("automatically falls back to Claude", async () => {
-		const harness = createHarness({ available: { opencode: false } })
+	test("automatically prefers opencode2", async () => {
+		const harness = createHarness()
+
+		await harness.run({ taskId: "example" })
+
+		expect(harness.probes).toEqual(["opencode2"])
+		expect(harness.launches[0]).toEqual({
+			cli: "opencode2",
+			args: ["opencode2"],
+			cwd: taskDirectory,
+		})
+	})
+
+	test("automatically falls back from opencode2 to opencode", async () => {
+		const harness = createHarness({ available: { opencode2: false } })
 
 		await harness.run({ taskId: "example" })
 
-		expect(harness.probes).toEqual(["opencode", "claude"])
+		expect(harness.probes).toEqual(["opencode2", "opencode"])
+		expect(harness.launches[0]).toEqual({
+			cli: "opencode",
+			args: ["opencode"],
+			cwd: taskDirectory,
+		})
+	})
+
+	test("automatically falls back from OpenCode to Claude", async () => {
+		const harness = createHarness({
+			available: { opencode2: false, opencode: false },
+		})
+
+		await harness.run({ taskId: "example" })
+
+		expect(harness.probes).toEqual(["opencode2", "opencode", "claude"])
 		expect(harness.launches[0]).toEqual({
 			cli: "claude",
 			args: ["claude"],
 			cwd: taskDirectory,
 		})
-		expect(harness.launchEnvironments[0]?.OPENCODE_CONFIG).toBeUndefined()
 	})
 
 	test("does not fall back when OpenCode is explicitly required", async () => {
@@ -1090,13 +1117,13 @@ describe("work command", () => {
 
 	test("fails when neither agent tool is available", async () => {
 		const harness = createHarness({
-			available: { opencode: false, claude: false },
+			available: { opencode2: false, opencode: false, claude: false },
 		})
 
 		await expect(harness.run({ taskId: "example" })).rejects.toThrow(
 			"claude CLI tool not found",
 		)
-		expect(harness.probes).toEqual(["opencode", "claude"])
+		expect(harness.probes).toEqual(["opencode2", "opencode", "claude"])
 		expect(harness.launches).toEqual([])
 	})
 
@@ -1150,7 +1177,7 @@ describe("work command", () => {
 			verboseHarness.run({ taskId: "example", verbose: true }),
 		)
 		expect(verboseLogs).toEqual([
-			"Launching command: opencode (cwd: /workbase/tasks/example)",
+			"Launching command: opencode2 (cwd: /workbase/tasks/example)",
 		])
 		expect(verboseHarness.materializeOptions[0]?.verbose).toBe(true)
 

package/src/commands/work.ts

@@ -280,10 +280,16 @@ export const work = (
 			options.claude ||
 			process.env.AGENCY_RUNNER,
 		)
-		let runner =
+		const defaultRunners = ["opencode2", "opencode", "claude"] as const
+		let defaultRunnerIndex = 0
+		let runner: string =
 			options.runner ??
 			process.env.AGENCY_RUNNER ??
-			(options.claude ? "claude" : "opencode")
+			(options.claude
+				? "claude"
+				: options.opencode
+					? "opencode"
+					: defaultRunners[defaultRunnerIndex]!)
 		const claimant = process.env.AGENCY_CLAIMANT ?? process.env.USER ?? "agency"
 		const sessionId =
 			process.env.AGENCY_SESSION_ID ?? `${process.pid}-${Date.now()}`
@@ -311,12 +317,12 @@ export const work = (
 		let available = yield* fs.runCommand(["which", cli], {
 			captureOutput: true,
 		})
-		if (
+		while (
 			available.exitCode !== 0 &&
 			!explicitlyRequested &&
-			runner === "opencode"
+			defaultRunnerIndex < defaultRunners.length - 1
 		) {
-			runner = "claude"
+			runner = defaultRunners[++defaultRunnerIndex]!
 			resolved = resolveRunnerCommand(
 				runner,
 				config.runners,
@@ -580,7 +586,8 @@ Launch an agent for an epic, task, or phase. With no directory, select one
 interactively. A positional argument resolves as a directory first, then as a task
 ID. Use '.' for the current directory. Outside a workbase, select a registered
 workbase first. Managed OpenCode launches receive whole-workbase access through
-Agency's project plugin; Agency context remains authoritative for writes.
+Agency's project plugin; Agency context remains authoritative for writes. Automatic
+runner discovery checks opencode2, opencode, then claude.
 
 The prepare subcommand resolves and materializes an execution workspace without
 launching an agent or changing lifecycle status. --dry-run reports planned Git

package/src/workbase/runner-command.test.ts

@@ -19,6 +19,12 @@ const variables = {
 
 describe("runner commands", () => {
 	test("uses promptless interactive commands for built-in presets", () => {
+		expect(
+			resolveRunnerCommand("opencode2", undefined, variables, false).argv,
+		).toEqual(["opencode2"])
+		expect(
+			resolveRunnerCommand("opencode2", undefined, variables, true).argv,
+		).toEqual(["opencode2", "--continue"])
 		expect(
 			resolveRunnerCommand("opencode", undefined, variables, false).argv,
 		).toEqual(["opencode"])
@@ -31,6 +37,12 @@ describe("runner commands", () => {
 	})
 
 	test("uses autonomous commands when a prompt is requested", () => {
+		expect(
+			resolveRunnerCommand("opencode2", undefined, variables, false, true).argv,
+		).toEqual(["opencode2", "--prompt", "Read the task."])
+		expect(
+			resolveRunnerCommand("opencode2", undefined, variables, true, true).argv,
+		).toEqual(["opencode2", "--continue", "--prompt", "Read the task."])
 		expect(
 			resolveRunnerCommand("opencode", undefined, variables, false, true).argv,
 		).toEqual(["opencode", "--prompt", "Read the task."])

package/src/workbase/runner-command.ts

@@ -31,6 +31,12 @@ const PLACEHOLDERS = new Set<keyof RunnerCommandVariables>([
 ])
 
 const BUILTIN_RUNNERS: Readonly<Record<string, RunnerDefinition>> = {
+	opencode2: {
+		command: ["opencode2"],
+		autoCommand: ["opencode2", "--prompt", "{prompt}"],
+		resumeCommand: ["opencode2", "--continue"],
+		autoResumeCommand: ["opencode2", "--continue", "--prompt", "{prompt}"],
+	},
 	opencode: {
 		command: ["opencode"],
 		autoCommand: ["opencode", "--prompt", "{prompt}"],