@markjaquith/agency 3.4.1 → 3.4.2

package/README.md

@@ -318,11 +318,16 @@ set `agent` in `$XDG_CONFIG_HOME/agency/agency.json` (or
 The selection precedence is `--agent` (including the legacy `--opencode` and
 `--claude` aliases), then `AGENCY_AGENT`, then `agent`, then automatic
 detection. Supported global values are `opencode2`, `opencode`, `pi`, and
-`claude`; an unavailable configured agent fails rather than falling back. A launch
-is fresh unless `AGENCY_SESSION_ID` is already set; resumed launches use the agent's
-`resumeCommand` when configured. The built-in presets use `--continue` only for
-resumed launches. By default Agency opens the agent without a prompt. `--auto`
-uses its autonomous command and sends the generated task, phase, or epic prompt.
+`claude`; an unavailable configured agent fails rather than falling back. A
+launch is fresh unless `AGENCY_SESSION_ID` is already set; resumed launches use
+the agent's `resumeCommand` when configured. The built-in presets use
+`--continue` only for resumed launches, except autonomous OpenCode V2 launches,
+which open a fresh TUI session so the generated continuation prompt cannot be
+routed to an unrelated prior session. By default Agency opens the agent without
+a prompt. `--auto` uses its autonomous command and sends the generated task,
+phase, or epic prompt. OpenCode V2 receives a launch-only environment marker;
+Agency's managed TUI companion waits for the populated composer and dispatches
+its native submit command once.
 
 Custom agents are direct argv commands, never shell snippets:
 
@@ -352,6 +357,9 @@ Every agent receives the same `AGENCY_AGENT`, `AGENCY_SESSION_ID`,
 `AGENCY_WORKBASE`, `AGENCY_TARGET`,
 `AGENCY_TASK_ID`, `AGENCY_PHASE_ID`, and `AGENCY_PROMPT` environment. Configured
 environment is added without overriding these normalized values.
+Autonomous OpenCode V2 launches additionally receive
+`AGENCY_TUI_AUTOSUBMIT=1`; the client-side managed TUI companion consumes it,
+and manual and non-V2 launches do not receive it.
 Execution-unit agents also receive `AGENCY_WRITABLE_CHECKOUT` with the
 authoritative writable checkout path.
 `AGENCY_PROMPT` is empty unless `--auto` is set.

package/package.json

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

package/src/commands/integration.ts

@@ -18,6 +18,7 @@ interface IntegrationResult {
 			| "opencode-plugin"
 			| "opencode-tui"
 			| "opencode-tui-plugin"
+			| "opencode-v2-tui-plugin"
 		readonly path: string
 		readonly state: string
 		readonly diagnostic: string
@@ -32,6 +33,7 @@ const integrationNames = {
 	"opencode-plugin": "OpenCode workbase plugin",
 	"opencode-tui": "OpenCode TUI config",
 	"opencode-tui-plugin": "OpenCode /agency-debug",
+	"opencode-v2-tui-plugin": "OpenCode V2 TUI companion",
 } as const
 
 const logHumanResult = (

package/src/services/IntegrationService.ts

@@ -23,6 +23,12 @@ import {
 	canUpdateManagedWorkbaseOpencodeTuiPlugin,
 	managedWorkbaseOpencodeTuiPlugin,
 } from "../workbase/opencode-tui-plugin-file"
+import {
+	canUpdateManagedWorkbaseOpencodeV2TuiFile,
+	managedWorkbaseOpencodeV2TuiIndex,
+	managedWorkbaseOpencodeV2TuiPackage,
+	managedWorkbaseOpencodeV2TuiPlugin,
+} from "../workbase/opencode-v2-tui-plugin-file"
 
 const managedHeaderPattern =
 	/^\/\/ agency-managed: sha256=([a-f0-9]{64})\r?\n\r?\n/
@@ -46,6 +52,7 @@ interface IntegrationFileStatus {
 		| "opencode-plugin"
 		| "opencode-tui"
 		| "opencode-tui-plugin"
+		| "opencode-v2-tui-plugin"
 	readonly path: string
 	readonly state: IntegrationFileState
 	readonly diagnostic: string
@@ -144,6 +151,25 @@ const describe = (
 							"Run 'agency integration sync' to install /agency-debug.",
 					}
 	}
+	if (name === "opencode-v2-tui-plugin") {
+		return state === "managed"
+			? {
+					diagnostic: "Agency's managed OpenCode V2 TUI companion is current.",
+					remediation: null,
+				}
+			: state === "customized"
+				? {
+						diagnostic:
+							"A user-owned OpenCode V2 TUI companion is present and was preserved.",
+						remediation: null,
+					}
+				: {
+						diagnostic:
+							"The managed OpenCode V2 TUI companion needs synchronization.",
+						remediation:
+							"Run 'agency integration sync' to install V2 autonomous prompt submission.",
+					}
+	}
 	return state === "missing" || state === "drifted"
 		? {
 				diagnostic: "Managed workbase instructions need synchronization.",
@@ -202,6 +228,10 @@ const inspect = (root: string) =>
 			"agency-repository-skills.ts",
 		)
 		const tuiPluginPath = join(opencodeDirectory, "tui", "agency-debug.ts")
+		const v2TuiDirectory = join(opencodeDirectory, "plugins", "agency-tui")
+		const v2TuiPackagePath = join(v2TuiDirectory, "package.json")
+		const v2TuiIndexPath = join(v2TuiDirectory, "index.ts")
+		const v2TuiPluginPath = join(v2TuiDirectory, "tui.ts")
 		const [
 			agents,
 			opencode,
@@ -211,6 +241,9 @@ const inspect = (root: string) =>
 			tui,
 			tuiJson,
 			tuiPlugin,
+			v2TuiPackage,
+			v2TuiIndex,
+			v2TuiPlugin,
 		] = yield* Effect.all(
 			[
 				fs.inspectFile(agentsPath),
@@ -221,6 +254,9 @@ const inspect = (root: string) =>
 				fs.inspectFile(tuiPath),
 				fs.inspectFile(tuiJsonPath),
 				fs.inspectFile(tuiPluginPath),
+				fs.inspectFile(v2TuiPackagePath),
+				fs.inspectFile(v2TuiIndexPath),
+				fs.inspectFile(v2TuiPluginPath),
 			] as const,
 			{ concurrency: 8 },
 		)
@@ -317,6 +353,30 @@ const inspect = (root: string) =>
 			files.push(fileStatus("opencode-tui-plugin", tuiPluginPath, "missing"))
 		}
 
+		const v2TuiFiles = [
+			[v2TuiPackage, managedWorkbaseOpencodeV2TuiPackage],
+			[v2TuiIndex, managedWorkbaseOpencodeV2TuiIndex],
+			[v2TuiPlugin, managedWorkbaseOpencodeV2TuiPlugin],
+		] as const
+		const v2TuiStates = v2TuiFiles.map(([file, managed]) => {
+			if (file.kind === "missing") return "missing" as const
+			if (file.kind !== "file") return "customized" as const
+			if (file.content === managed) return "managed" as const
+			return canUpdateManagedWorkbaseOpencodeV2TuiFile(file.content)
+				? ("drifted" as const)
+				: ("customized" as const)
+		})
+		const v2TuiState = v2TuiStates.every((state) => state === "missing")
+			? "missing"
+			: v2TuiStates.every((state) => state === "managed")
+				? "managed"
+				: v2TuiStates.some((state) => state === "customized")
+					? "customized"
+					: "drifted"
+		files.push(
+			fileStatus("opencode-v2-tui-plugin", v2TuiPluginPath, v2TuiState),
+		)
+
 		return { files, legacyPlugin }
 	})
 
@@ -429,6 +489,21 @@ export class IntegrationService extends Effect.Service<IntegrationService>()(
 									status.path,
 									managedWorkbaseOpencodeTuiPlugin,
 								)
+							} else if (status.name === "opencode-v2-tui-plugin") {
+								const directory = dirname(status.path)
+								yield* fs.createDirectory(directory)
+								yield* fs.writeFile(
+									join(directory, "package.json"),
+									managedWorkbaseOpencodeV2TuiPackage,
+								)
+								yield* fs.writeFile(
+									join(directory, "index.ts"),
+									managedWorkbaseOpencodeV2TuiIndex,
+								)
+								yield* fs.writeFile(
+									status.path,
+									managedWorkbaseOpencodeV2TuiPlugin,
+								)
 							}
 						}
 						files.push({

package/src/workbase/agent-command.ts

@@ -31,7 +31,7 @@ const BUILTIN_AGENTS: Readonly<Record<string, AgentDefinition>> = {
 		command: ["opencode2"],
 		autoCommand: ["opencode2", "--prompt", "{prompt}"],
 		resumeCommand: ["opencode2", "--continue"],
-		autoResumeCommand: ["opencode2", "--continue", "--prompt", "{prompt}"],
+		autoResumeCommand: ["opencode2", "--prompt", "{prompt}"],
 	},
 	opencode: {
 		command: ["opencode"],
@@ -125,6 +125,9 @@ export const agentEnvironment = (
 	AGENCY_TASK_ID: variables.task,
 	AGENCY_PHASE_ID: variables.phase,
 	AGENCY_PROMPT: variables.prompt,
+	...(agent === "opencode2" && variables.prompt
+		? { AGENCY_TUI_AUTOSUBMIT: "1" }
+		: {}),
 })
 
 const SECRET_NAME =

package/src/workbase/opencode-v2-tui-plugin-file.ts

@@ -0,0 +1,134 @@
+import { createHash } from "node:crypto"
+
+const managedHeaderPattern =
+	/^\/\/ agency-managed: sha256=([a-f0-9]{64})\r?\n\r?\n/
+
+const checksum = (content: string) =>
+	createHash("sha256").update(content).digest("hex")
+
+const managed = (content: string) =>
+	`// agency-managed: sha256=${checksum(content)}\n\n${content}`
+
+const packageBody = `${JSON.stringify(
+	{
+		name: "agency-tui",
+		private: true,
+		type: "module",
+		exports: {
+			".": "./index.ts",
+			"./tui": "./tui.ts",
+		},
+	},
+	null,
+	2,
+)}\n`
+
+const indexBody = `const plugin = {
+  id: "agency.tui.loader",
+  setup() {},
+  async server() {
+    return {}
+  },
+}
+
+export default plugin
+`
+
+const tuiBody = `const autosubmitTimeoutMs = 10_000
+const autosubmitRetryMs = 25
+
+type AutosubmitContext = {
+  keymap: {
+    commands(): readonly { id?: string }[]
+    dispatch(id: string): unknown
+  }
+  renderer: { currentFocusedEditor?: unknown }
+  ui: {
+    router: { current(): { type: string } }
+    toast: {
+      show(input: {
+        variant: "error"
+        title: string
+        message: string
+        duration: number
+      }): void
+    }
+  }
+}
+
+export const createAgencyAutosubmit = (
+  options: { timeoutMs?: number; retryMs?: number } = {},
+) => {
+  let started = false
+
+  return (context: AutosubmitContext) => {
+    if (started) return () => {}
+    if (process.env.AGENCY_TUI_AUTOSUBMIT !== "1") return () => {}
+    if (!process.env.AGENCY_PROMPT) return () => {}
+    started = true
+    delete process.env.AGENCY_TUI_AUTOSUBMIT
+
+    const timeoutMs = options.timeoutMs ?? autosubmitTimeoutMs
+    const retryMs = options.retryMs ?? autosubmitRetryMs
+    const deadline = Date.now() + timeoutMs
+    let timer: ReturnType<typeof setTimeout> | undefined
+    let stopped = false
+
+    const stop = () => {
+      stopped = true
+      if (timer) clearTimeout(timer)
+    }
+
+    const attempt = () => {
+      if (stopped) return
+      if (context.ui.router.current().type !== "home") {
+        stop()
+        return
+      }
+
+      const submitReady = context.keymap
+        .commands()
+        .some((command) => command.id === "prompt.submit")
+      if (context.renderer.currentFocusedEditor && submitReady) {
+        stop()
+        context.keymap.dispatch("prompt.submit")
+        return
+      }
+
+      if (Date.now() >= deadline) {
+        stop()
+        context.ui.toast.show({
+          variant: "error",
+          title: "Agency launch",
+          message: "The task prompt is ready but could not be submitted automatically.",
+          duration: 8_000,
+        })
+        return
+      }
+      timer = setTimeout(attempt, retryMs)
+    }
+
+    attempt()
+    return stop
+  }
+}
+
+const autosubmit = createAgencyAutosubmit()
+
+export default {
+  id: "agency.tui",
+  setup(context: AutosubmitContext) {
+    return autosubmit(context)
+  },
+}
+`
+
+export const managedWorkbaseOpencodeV2TuiPackage = packageBody
+export const managedWorkbaseOpencodeV2TuiIndex = managed(indexBody)
+export const managedWorkbaseOpencodeV2TuiPlugin = managed(tuiBody)
+
+export const canUpdateManagedWorkbaseOpencodeV2TuiFile = (content: string) => {
+	const match = content.match(managedHeaderPattern)
+	if (!match?.[1]) return false
+	return checksum(content.slice(match[0].length)) === match[1]
+}