@markjaquith/agency 2.19.0 → 2.21.0

package/src/commands/epic.ts

@@ -5,12 +5,14 @@ import { createLoggers } from "../utils/effect"
 import { formatTable } from "../utils/table"
 import { getWorkViews } from "../work-view"
 import { parseRepositoryReferences } from "../workbase/repository-reference"
+import { GraphMutationService } from "../services/GraphMutationService"
 
 interface EpicOptions extends BaseCommandOptions {
 	readonly subcommand?: string
 	readonly args: readonly string[]
 	readonly ticketUrl?: string
 	readonly description?: string
+	readonly clearDescription?: boolean
 	readonly repos?: readonly string[]
 	readonly json?: boolean
 	readonly statuses?: readonly string[]
@@ -23,6 +25,7 @@ interface EpicOptions extends BaseCommandOptions {
 export const epic = (options: EpicOptions) =>
 	Effect.gen(function* () {
 		const epics = yield* EpicService
+		const mutations = yield* GraphMutationService
 		const { log } = createLoggers(options)
 		const cwd = options.cwd ?? process.cwd()
 
@@ -105,10 +108,49 @@ export const epic = (options: EpicOptions) =>
 				return
 			}
 
+			case "update": {
+				const id = options.args[0]
+				if (!id) return yield* Effect.fail(new Error("Epic ID is required"))
+				const output = yield* mutations.updateEpic(
+					id,
+					{
+						description: options.clearDescription ? null : options.description,
+						ticketUrl: options.ticketUrl,
+						repos:
+							options.repos === undefined
+								? undefined
+								: parseRepositoryReferences(options.repos),
+					},
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Updated epic '${id}'`,
+				)
+				return
+			}
+
+			case "rename": {
+				const [id, newId] = options.args
+				if (!id || !newId) {
+					return yield* Effect.fail(
+						new Error("Epic ID and new ID are required"),
+					)
+				}
+				const output = yield* mutations.renameEpic(id, newId, cwd)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Renamed epic '${id}' to '${newId}'`,
+				)
+				return
+			}
+
 			default:
 				return yield* Effect.fail(
 					new Error(
-						"Subcommand is required. Available subcommands: create, list, show",
+						"Subcommand is required. Available subcommands: create, list, show, update, rename",
 					),
 				)
 		}
@@ -121,12 +163,20 @@ Subcommands:
   create <id>           Create an epic
   list                  List epics
   show <id>             Show an epic
+  update <id>           Update epic metadata
+  rename <id> <new-id>  Rename an epic and update task references
 
 Create options:
   --ticket-url <url>    External ticket URL
   --description <text>  Short description of the epic
   --repo <alias>:<ref>  Read-only repository reference; repeatable
 
+Update options:
+  --ticket-url <url>    Replace the external ticket URL
+  --description <text>  Replace the description
+  --clear-description   Remove the description
+  --repo <alias>:<ref>  Replace repository references; repeatable
+
 Options:
   --json                Output results as JSON
   --status <status>     Filter list by status; repeatable

package/src/commands/phase.ts

@@ -5,15 +5,20 @@ import { createLoggers } from "../utils/effect"
 import { formatTable } from "../utils/table"
 import { getWorkViews } from "../work-view"
 import { parseRepositoryReferences } from "../workbase/repository-reference"
+import { GraphMutationService } from "../services/GraphMutationService"
 
 interface PhaseOptions extends BaseCommandOptions {
 	readonly subcommand?: string
 	readonly args: readonly string[]
 	readonly description?: string
+	readonly clearDescription?: boolean
 	readonly repo?: string
 	readonly references?: readonly string[]
 	readonly branch?: string
 	readonly base?: string
+	readonly clearReferences?: boolean
+	readonly prUrl?: string
+	readonly clearPr?: boolean
 	readonly dependsOn?: readonly string[]
 	readonly firstPhase?: string
 	readonly json?: boolean
@@ -27,6 +32,7 @@ interface PhaseOptions extends BaseCommandOptions {
 export const phase = (options: PhaseOptions) =>
 	Effect.gen(function* () {
 		const phases = yield* PhaseService
+		const mutations = yield* GraphMutationService
 		const { log } = createLoggers(options)
 		const cwd = options.cwd ?? process.cwd()
 		const [taskId, phaseId] = options.args
@@ -153,10 +159,84 @@ export const phase = (options: PhaseOptions) =>
 				)
 				return
 			}
+			case "update": {
+				if (!taskId || !phaseId) {
+					return yield* Effect.fail(
+						new Error("Task ID and phase ID are required"),
+					)
+				}
+				const output = yield* mutations.updatePhase(
+					taskId,
+					phaseId,
+					{
+						description: options.clearDescription ? null : options.description,
+						repo: options.repo,
+						repos: options.clearReferences
+							? null
+							: options.references === undefined
+								? undefined
+								: parseRepositoryReferences(options.references),
+						branch: options.branch,
+						base: options.base,
+						pr: options.clearPr ? null : options.prUrl,
+					},
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Updated phase '${phaseId}'`,
+				)
+				return
+			}
+			case "rename": {
+				const newId = options.args[2]
+				if (!taskId || !phaseId || !newId) {
+					return yield* Effect.fail(
+						new Error("Task ID, phase ID, and new ID are required"),
+					)
+				}
+				const output = yield* mutations.renamePhase(taskId, phaseId, newId, cwd)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Renamed phase '${phaseId}' to '${newId}'`,
+				)
+				return
+			}
+			case "dependency": {
+				const [operation, dependencyTaskId, dependencyPhaseId, dependencyId] =
+					options.args
+				if (
+					(operation !== "add" && operation !== "remove") ||
+					!dependencyTaskId ||
+					!dependencyPhaseId ||
+					!dependencyId
+				) {
+					return yield* Effect.fail(
+						new Error(
+							"Usage: agency phase dependency <add|remove> <task-id> <phase-id> <dependency-id>",
+						),
+					)
+				}
+				const output = yield* mutations.mutatePhaseDependency(
+					operation,
+					dependencyTaskId,
+					dependencyPhaseId,
+					dependencyId,
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `${operation === "add" ? "Added" : "Removed"} dependency '${dependencyId}' ${operation === "add" ? "to" : "from"} phase '${dependencyPhaseId}'`,
+				)
+				return
+			}
 			default:
 				return yield* Effect.fail(
 					new Error(
-						"Subcommand is required. Available: create, list, show, status",
+						"Subcommand is required. Available: create, list, show, status, update, rename, dependency",
 					),
 				)
 		}
@@ -171,6 +251,11 @@ Subcommands:
   show <task> <phase>   Show a phase
   status <task> <phase> <status>
                         Set open, done, or dropped
+  update <task> <phase> Update phase metadata
+  rename <task> <phase> <new-id>
+                        Rename a phase and update dependencies
+  dependency <operation> <task> <phase> <dependency>
+                        Add or remove a phase dependency
 
 Create options:
   --description <text>  Short description of the phase
@@ -182,6 +267,14 @@ Create options:
   --depends-on <id>     Phase dependency; repeatable
   --first-phase <id>    Existing execution phase ID when converting a task
 
+Update options:
+  --description <text> / --clear-description
+  --repo <alias>        Replace the writable repository
+  --reference <alias>:<ref> / --clear-references
+  --branch <name>       Replace the working branch
+  --base <name>         Replace the base branch
+  --pr-url <url> / --clear-pr
+
 Options:
   --json                Output results as JSON
   --status <status>     Filter list by status; repeatable

package/src/commands/task.ts

@@ -10,17 +10,24 @@ import { WorkbaseService } from "../services/WorkbaseService"
 import { choose } from "../utils/chooser"
 import { formatTable } from "../utils/table"
 import { getWorkViews } from "../work-view"
+import { GraphMutationService } from "../services/GraphMutationService"
 
 interface TaskOptions extends BaseCommandOptions {
 	readonly subcommand?: string
 	readonly args: readonly string[]
 	readonly ticketUrl?: string
 	readonly description?: string
+	readonly clearDescription?: boolean
+	readonly clearTicket?: boolean
 	readonly epic?: string
 	readonly repo?: string
 	readonly references?: readonly string[]
 	readonly branch?: string
 	readonly base?: string
+	readonly clearReferences?: boolean
+	readonly prUrl?: string
+	readonly clearPr?: boolean
+	readonly noEpic?: boolean
 	readonly multiPhase?: boolean
 	readonly json?: boolean
 	readonly statuses?: readonly string[]
@@ -74,6 +81,7 @@ export const task = (options: TaskOptions, interaction?: TaskInteraction) =>
 		const epics = yield* EpicService
 		const repositories = yield* RepositoryService
 		const workbase = yield* WorkbaseService
+		const mutations = yield* GraphMutationService
 		const { log } = createLoggers(options)
 		const cwd = options.cwd ?? process.cwd()
 
@@ -291,10 +299,95 @@ export const task = (options: TaskOptions, interaction?: TaskInteraction) =>
 				)
 				return
 			}
+			case "update": {
+				const id = options.args[0]
+				if (!id) return yield* Effect.fail(new Error("Task ID is required"))
+				const output = yield* mutations.updateTask(
+					id,
+					{
+						description: options.clearDescription ? null : options.description,
+						ticketUrl: options.clearTicket ? null : options.ticketUrl,
+						repo: options.repo,
+						repos: options.clearReferences
+							? null
+							: options.references === undefined
+								? undefined
+								: parseRepositoryReferences(options.references),
+						branch: options.branch,
+						base: options.base,
+						pr: options.clearPr ? null : options.prUrl,
+					},
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Updated task '${id}'`,
+				)
+				return
+			}
+			case "rename": {
+				const [id, newId] = options.args
+				if (!id || !newId) {
+					return yield* Effect.fail(
+						new Error("Task ID and new ID are required"),
+					)
+				}
+				const output = yield* mutations.renameTask(id, newId, cwd)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `Renamed task '${id}' to '${newId}'`,
+				)
+				return
+			}
+			case "move": {
+				const id = options.args[0]
+				if (!id) return yield* Effect.fail(new Error("Task ID is required"))
+				const output = yield* mutations.moveTask(
+					id,
+					options.noEpic ? null : (options.epic ?? null),
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: options.noEpic
+							? `Removed task '${id}' from its epic`
+							: `Moved task '${id}' to epic '${options.epic}'`,
+				)
+				return
+			}
+			case "dependency": {
+				const [operation, id, dependencyId] = options.args
+				if (
+					(operation !== "add" && operation !== "remove") ||
+					!id ||
+					!dependencyId
+				) {
+					return yield* Effect.fail(
+						new Error(
+							"Usage: agency task dependency <add|remove> <task-id> <dependency-id>",
+						),
+					)
+				}
+				const output = yield* mutations.mutateTaskDependency(
+					operation,
+					id,
+					dependencyId,
+					cwd,
+				)
+				log(
+					options.json
+						? JSON.stringify(output, null, 2)
+						: `${operation === "add" ? "Added" : "Removed"} dependency '${dependencyId}' ${operation === "add" ? "to" : "from"} task '${id}'`,
+				)
+				return
+			}
 			default:
 				return yield* Effect.fail(
 					new Error(
-						"Subcommand is required. Available: new, create, list, show, status",
+						"Subcommand is required. Available: new, create, list, show, status, update, rename, move, dependency",
 					),
 				)
 		}
@@ -309,6 +402,11 @@ Subcommands:
   list                  List tasks
   show <id>             Show a task
   status <id> <status>  Set open, done, or dropped
+  update <id>           Update task metadata
+  rename <id> <new-id>  Rename a task and update graph references
+  move <id>             Move a task with --epic or --no-epic
+  dependency <operation> <task> <dependency>
+                        Add or remove a task dependency
 
 Create options:
   --ticket-url <url>    External ticket URL (optional)
@@ -321,6 +419,15 @@ Create options:
   --base <name>         Base branch (default: main)
   --multi-phase         Create a task container for phases
 
+Update options:
+  --ticket-url <url> / --clear-ticket
+  --description <text> / --clear-description
+  --repo <alias>        Replace the writable repository
+  --reference <alias>:<ref> / --clear-references
+  --branch <name>       Replace the working branch
+  --base <name>         Replace the base branch
+  --pr-url <url> / --clear-pr
+
 Task creation is noninteractive. Single-phase tasks require --repo; use
 --multi-phase instead for a task container. Guided input is available only
 through task new, which fails when --no-input is set or no TTY is available.

package/src/commands/work.test.ts

@@ -47,8 +47,16 @@ const multiPhaseWorkspace: ExecutionWorkspace = {
 interface HarnessOptions {
 	readonly workspace?: ExecutionWorkspace
 	readonly materializeError?: Error
-	readonly available?: Partial<Record<"opencode" | "claude", boolean>>
+	readonly available?: Readonly<Record<string, boolean>>
 	readonly chooserCommand?: readonly string[]
+	readonly runners?: Record<
+		string,
+		{
+			command: readonly [string, ...string[]]
+			resumeCommand?: readonly [string, ...string[]]
+			environment?: Record<string, string>
+		}
+	>
 	readonly multiPhaseTasks?: readonly string[]
 	readonly epicRecords?: readonly any[]
 	readonly taskRecords?: readonly any[]
@@ -72,6 +80,7 @@ const createHarness = (options: HarnessOptions = {}) => {
 		args: readonly string[]
 		cwd: string
 	}> = []
+	const launchEnvironments: Array<Readonly<Record<string, string>>> = []
 	const materializeOptions: Array<
 		Parameters<WorktreeService["materialize"]>[3]
 	> = []
@@ -105,6 +114,7 @@ const createHarness = (options: HarnessOptions = {}) => {
 				config: {
 					version: 2 as const,
 					chooserCommand: options.chooserCommand,
+					runners: options.runners,
 				},
 			}),
 	}
@@ -204,7 +214,7 @@ const createHarness = (options: HarnessOptions = {}) => {
 		isDirectory: (path: string) =>
 			Effect.succeed(options.existingDirectories?.includes(path) ?? true),
 		runCommand: (args: readonly string[]) => {
-			const cli = args[1] as "opencode" | "claude"
+			const cli = args[1]!
 			events.push(`probe:${cli}`)
 			probes.push(cli)
 			return Effect.succeed({
@@ -214,9 +224,15 @@ const createHarness = (options: HarnessOptions = {}) => {
 			})
 		},
 	}
-	const launch = (cli: string, args: readonly string[], cwd: string) => {
+	const launch = (
+		cli: string,
+		args: readonly string[],
+		cwd: string,
+		environment: Readonly<Record<string, string>>,
+	) => {
 		events.push(`launch:${cli}`)
 		launches.push({ cli, args, cwd })
+		launchEnvironments.push(environment)
 	}
 	const defaultPick: PickWorkTarget = () => Effect.succeed(null)
 	const defaultPickWorkbase: PickWorkbase = () => Effect.succeed(null)
@@ -257,6 +273,7 @@ const createHarness = (options: HarnessOptions = {}) => {
 		events,
 		probes,
 		launches,
+		launchEnvironments,
 		materializeOptions,
 		statusUpdates,
 		shownTasks,
@@ -353,7 +370,6 @@ describe("work command", () => {
 			cli: "opencode",
 			args: [
 				"opencode",
-				"--continue",
 				"--prompt",
 				"Work on the epic. Read /workbase/epics/delivery/EPIC.md.",
 			],
@@ -403,7 +419,6 @@ describe("work command", () => {
 			cli: "opencode",
 			args: [
 				"opencode",
-				"--continue",
 				"--prompt",
 				"Work on the task. Read /workbase/tasks/delivery/TASK.md.",
 			],
@@ -429,7 +444,6 @@ describe("work command", () => {
 			cli: "opencode",
 			args: [
 				"opencode",
-				"--continue",
 				"--prompt",
 				"Start the task. Read /workbase/tasks/example/TASK.md and /workbase/tasks/example/phases/implementation/PHASE.md.",
 			],
@@ -596,7 +610,7 @@ describe("work command", () => {
 
 		await expect(
 			harness.run({ taskId: "example", opencode: true, claude: true }),
-		).rejects.toThrow("Cannot use both --opencode and --claude")
+		).rejects.toThrow("Cannot combine --runner, --opencode, and --claude")
 		expect(harness.events).toEqual([])
 	})
 
@@ -624,7 +638,6 @@ describe("work command", () => {
 				cli: "opencode",
 				args: [
 					"opencode",
-					"--continue",
 					"--prompt",
 					"Start the task. Read /workbase/tasks/example/TASK.md.",
 				],
@@ -638,14 +651,18 @@ describe("work command", () => {
 		])
 	})
 
-	test("continues OpenCode with explicit task and phase context", async () => {
+	test("resumes OpenCode deterministically when a session identity exists", async () => {
 		const harness = createHarness({ workspace: multiPhaseWorkspace })
-
-		await harness.run({
-			taskId: "example",
-			phaseId: "implementation",
-			opencode: true,
-		})
+		process.env.AGENCY_SESSION_ID = "existing-session"
+		try {
+			await harness.run({
+				taskId: "example",
+				phaseId: "implementation",
+				opencode: true,
+			})
+		} finally {
+			delete process.env.AGENCY_SESSION_ID
+		}
 
 		expect(harness.launches[0]).toEqual({
 			cli: "opencode",
@@ -659,6 +676,78 @@ describe("work command", () => {
 		})
 	})
 
+	test("expands a named runner with shared context and claim identity", async () => {
+		const harness = createHarness({
+			available: { codex: true },
+			runners: {
+				custom: {
+					command: ["codex", "--task", "{task}", "{prompt}"],
+					environment: {
+						CUSTOM_TARGET: "{target}",
+						AGENCY_TARGET: "cannot-override",
+					},
+				},
+			},
+		})
+
+		await harness.run({ taskId: "example", runner: "custom" })
+
+		expect(harness.probes).toEqual(["codex"])
+		expect(harness.launches[0]).toEqual({
+			cli: "codex",
+			args: [
+				"codex",
+				"--task",
+				"example",
+				"Start the task. Read /workbase/tasks/example/TASK.md.",
+			],
+			cwd: singlePhaseWorkspace.writablePath,
+		})
+		expect(harness.launchEnvironments[0]).toMatchObject({
+			AGENCY_RUNNER: "custom",
+			AGENCY_CLAIMANT: process.env.USER ?? "agency",
+			AGENCY_WORKBASE: "/workbase",
+			AGENCY_TARGET: "execution-unit:task/example",
+			AGENCY_TASK_ID: "example",
+			AGENCY_PHASE_ID: "",
+			AGENCY_CLAIM_REVISION: "1".repeat(64),
+			CUSTOM_TARGET: "execution-unit:task/example",
+		})
+	})
+
+	test("prints the exact command contract without launching and omits secrets", async () => {
+		const harness = createHarness({
+			available: { agent: true },
+			runners: {
+				custom: {
+					command: ["agent", "{prompt}"],
+					environment: {
+						VISIBLE: "{task}",
+						API_TOKEN: "do-not-print",
+					},
+				},
+			},
+		})
+
+		const output = await captureLogs(() =>
+			harness.run({
+				taskId: "example",
+				runner: "custom",
+				printCommand: true,
+			}),
+		)
+		const printed = JSON.parse(output.join("\n"))
+
+		expect(harness.launches).toEqual([])
+		expect(printed.cwd).toBe(singlePhaseWorkspace.writablePath)
+		expect(printed.argv).toEqual([
+			"agent",
+			"Start the task. Read /workbase/tasks/example/TASK.md.",
+		])
+		expect(printed.environment.VISIBLE).toBe("example")
+		expect(printed.environment.API_TOKEN).toBeUndefined()
+	})
+
 	test("automatically falls back to Claude", async () => {
 		const harness = createHarness({ available: { opencode: false } })
 
@@ -729,7 +818,7 @@ describe("work command", () => {
 			verboseHarness.run({ taskId: "example", verbose: true }),
 		)
 		expect(verboseLogs).toEqual([
-			"Launching command: opencode --continue --prompt 'Start the task. Read /workbase/tasks/example/TASK.md.' (cwd: /workbase/tasks/example/code/agency)",
+			"Launching command: opencode --prompt 'Start the task. Read /workbase/tasks/example/TASK.md.' (cwd: /workbase/tasks/example/code/agency)",
 		])
 		expect(verboseHarness.materializeOptions[0]?.verbose).toBe(true)