@markjaquith/agency 3.4.1 → 3.5.0

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.5.0",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/cli-parser.ts

@@ -665,14 +665,14 @@ const commands = {
 		},
 	},
 	sync: {
-		usage: "agency sync [<task-id> [phase-id]] [--dry-run] [--json]",
+		usage: "agency sync [<task-id|path> [phase-id]] [--dry-run] [--json]",
 		options: {
 			...outputOptions,
 			...entitySelectorOptions,
 			"dry-run": { type: "boolean" },
 		},
 		command: {
-			usage: "agency sync [<task-id> [phase-id]] [--dry-run] [--json]",
+			usage: "agency sync [<task-id|path> [phase-id]] [--dry-run] [--json]",
 			minArgs: 0,
 			maxArgs: 2,
 			options: ["dry-run", "json", "task", "phase"],

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/commands/sync.ts

@@ -122,13 +122,14 @@ export const sync = (
 	})
 
 export const help = `
-Usage: agency sync [<task-id> [phase-id]] [--dry-run] [--json]
+Usage: agency sync [<task-id|path> [phase-id]] [--dry-run] [--json]
 
 Compare portable repository declarations and execution state with local Git
 repositories, worktrees, branches, references, and pull requests.
 Safe reconciliation transitions are applied by default.
-When a task or phase is provided, only that target and its repositories are
-queried or reconciled. Task scope includes all phases of a multi-phase task.
+When a task, phase, or item path is provided, only that target and its
+repositories are queried or reconciled. Task and epic scopes include their
+child execution units.
 
 Options:
   --dry-run                 Report planned safe transitions without changing state

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/services/SyncService.ts

@@ -1,5 +1,5 @@
 import { Data, Effect, Either } from "effect"
-import { dirname, join, resolve } from "node:path"
+import { dirname, join, relative, resolve, sep } from "node:path"
 import type {
 	PhaseFrontmatter,
 	RepositoryReference,
@@ -228,7 +228,17 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 				const worktrees = yield* WorktreeService
 				const repositories = yield* RepositoryService
 				const versionControl = yield* VersionControlService
-				const { root, config } = yield* workbase.loadConfig(options.cwd)
+				const cwd = resolve(options.cwd ?? process.cwd())
+				const candidate = options.taskId
+					? resolve(cwd, options.taskId)
+					: undefined
+				const candidateExists =
+					candidate !== undefined && !options.phaseId
+						? yield* fs.exists(candidate)
+						: false
+				const { root, config } = yield* workbase.loadConfig(
+					candidateExists ? candidate : cwd,
+				)
 				const backend = yield* versionControl.forWorkbase(root)
 				const validation = yield* workbase.validate(root, {
 					includeDocuments: true,
@@ -246,20 +256,49 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 					})
 				}
 				const documents = validation.documents!
+				let taskId = options.taskId
+				let phaseId = options.phaseId
+				let epicId: string | undefined
+				const existingTaskSelector =
+					options.taskId !== undefined &&
+					documents.tasks.some((task) => task.id === options.taskId)
+				if (candidateExists && candidate && !existingTaskSelector) {
+					const canonicalPath = yield* fs.realPath(candidate)
+					const canonicalRoot = yield* fs.realPath(root)
+					const parts = relative(canonicalRoot, canonicalPath).split(sep)
+					if (parts[0] === "epics" && parts[1]) {
+						epicId = parts[1]
+						taskId = undefined
+					} else if (parts[0] === "tasks" && parts[1]) {
+						taskId = parts[1]
+						phaseId = parts[2] === "phases" && parts[3] ? parts[3] : undefined
+					} else {
+						return yield* new SyncError({
+							message: `Sync path does not identify an active task, phase, or epic: ${canonicalPath}`,
+						})
+					}
+				}
+				if (epicId && !documents.epics.some((epic) => epic.id === epicId)) {
+					return yield* new SyncError({
+						message: `Epic '${epicId}' does not exist`,
+					})
+				}
 				const allTaskRecords = documents.tasks
-				const taskRecords = options.taskId
-					? allTaskRecords.filter((task) => task.id === options.taskId)
-					: allTaskRecords
-				if (options.taskId && taskRecords.length === 0) {
+				const taskRecords = taskId
+					? allTaskRecords.filter((task) => task.id === taskId)
+					: epicId
+						? allTaskRecords.filter((task) => task.data.epic === epicId)
+						: allTaskRecords
+				if (taskId && taskRecords.length === 0) {
 					return yield* new SyncError({
-						message: `Task '${options.taskId}' does not exist`,
+						message: `Task '${taskId}' does not exist`,
 					})
 				}
 				const records: ExecutionRecord[] = []
 				for (const task of taskRecords) {
 					if ("phases" in task.data) {
 						for (const phase of documents.phasesByTask.get(task.id) ?? []) {
-							if (options.phaseId && phase.id !== options.phaseId) continue
+							if (phaseId && phase.id !== phaseId) continue
 							records.push({
 								key: `phase:${task.id}/${phase.id}`,
 								taskId: task.id,
@@ -270,7 +309,7 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 								data: phase.data,
 							})
 						}
-					} else if (!options.phaseId && !("review" in task.data)) {
+					} else if (!phaseId && !("review" in task.data)) {
 						records.push({
 							key: `task:${task.id}`,
 							taskId: task.id,
@@ -281,12 +320,12 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 						})
 					}
 				}
-				const reviewRecords = options.phaseId
+				const reviewRecords = phaseId
 					? []
 					: taskRecords.filter((task) => "review" in task.data)
-				if (options.phaseId && records.length === 0) {
+				if (phaseId && records.length === 0) {
 					return yield* new SyncError({
-						message: `Phase '${options.taskId}/${options.phaseId}' does not exist`,
+						message: `Phase '${taskId}/${phaseId}' does not exist`,
 					})
 				}
 				const repositoryAliases = new Set<string>()
@@ -299,10 +338,15 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 					if ("review" in task.data)
 						repositoryAliases.add(task.data.review.repo)
 				}
+				if (epicId) {
+					const epic = documents.epics.find((record) => record.id === epicId)!
+					for (const reference of epic.data.repos)
+						repositoryAliases.add(reference.repo)
+				}
 				const repositorySetup = yield* repositories.setup({
 					cwd: root,
 					apply: options.apply === true,
-					...(options.taskId ? { aliases: [...repositoryAliases] } : {}),
+					...(taskId || epicId ? { aliases: [...repositoryAliases] } : {}),
 				})
 				options.onProgress?.({
 					stage: "repositories",

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]
+}