@markjaquith/agency 3.1.1 → 3.2.0

package/README.md

@@ -1028,7 +1028,7 @@ until restored.
 
 ```text
 agency work [<directory> | --epic <epic-id>] [--agent <name>] [--auto] [--print-command]
-agency work prepare [target] [--evidence <json-or-path>] [--dry-run] [--json]
+agency work prepare [target] [--evidence <json-or-path>] [--force] [--dry-run] [--json]
 agency worktree <list|inspect|prepare|remove|rebuild|repair>
 agency push [--json]
 agency pr create <task-id> [phase-id] [--draft] [--title <title>] [--head <branch>] [--base <branch>] [--label <label>] [--force] [--json]
@@ -1062,9 +1062,11 @@ work and reading context. It does not prescribe how callers present or execute
 prepared work.
 The evidence argument may be an evidence object, task-creation JSON, or a path to
 either. Use `--dry-run` to report planned fetch, branch, and worktree changes
-without applying them. Validation reuse never skips readiness, active-claim,
-repository, ownership, reference-drift, dirty-workspace, or worktree safety
-checks.
+without applying them. Use `--force` to prepare work blocked by readiness, such
+as a follow-on phase whose dependency is still active; preparation still does
+not launch an agent or change lifecycle status. Validation reuse never skips
+readiness, active-claim, repository, ownership, reference-drift, dirty-workspace,
+or worktree safety checks.
 
 The authoritative implementation locations for this contract are
 `src/commands/task.ts` (creation output),

package/package.json

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

package/src/cli-parser.test.ts

@@ -397,9 +397,11 @@ describe("strict CLI parsing", () => {
 			commandName: "work",
 			values: { force: true },
 		})
-		expect(() => parseCli(["work", "prepare", "example", "--force"])).toThrow(
-			"cannot be combined",
-		)
+		expect(parseCli(["work", "prepare", "example", "--force"])).toMatchObject({
+			commandName: "work",
+			args: ["prepare", "example"],
+			values: { force: true },
+		})
 	})
 
 	test("preserves every argument after pr without parsing it", () => {

package/src/cli-parser.ts

@@ -917,7 +917,7 @@ const commands = {
 	},
 	work: {
 		usage:
-			"agency work [<directory-or-task-id> | --epic <epic-id>] [--agent <name>] [--auto] | agency work prepare [target] [--dry-run] [--json]",
+			"agency work [<directory-or-task-id> | --epic <epic-id>] [--agent <name>] [--auto] | agency work prepare [target] [--force] [--dry-run] [--json]",
 		options: {
 			...commonOptions,
 			...entitySelectorOptions,
@@ -933,7 +933,7 @@ const commands = {
 		},
 		command: {
 			usage:
-				"agency work [<directory-or-task-id> | --epic <epic-id>] [--agent <name>] [--auto] | agency work prepare [target] [--dry-run] [--json]",
+				"agency work [<directory-or-task-id> | --epic <epic-id>] [--agent <name>] [--auto] | agency work prepare [target] [--force] [--dry-run] [--json]",
 			minArgs: 0,
 			maxArgs: 2,
 			options: [
@@ -1691,8 +1691,7 @@ export function parseCli(args: readonly string[]): ParsedCli {
 					parsed.values.claude ||
 					parsed.values.agent ||
 					parsed.values.auto ||
-					parsed.values["print-command"] ||
-					parsed.values.force))
+					parsed.values["print-command"]))
 		) {
 			throw usageError(
 				preparing

package/src/cli.test.ts

@@ -1310,7 +1310,12 @@ status: open
 					...process.env,
 					...contract.environment,
 					XDG_CONFIG_HOME: isolatedConfigHome,
+					OPENCODE_DISABLE_AUTOUPDATE: "1",
 					OPENCODE_DISABLE_EXTERNAL_SKILLS: "1",
+					OPENCODE_DISABLE_MODELS_FETCH: "1",
+					OPENCODE_CONFIG_CONTENT: JSON.stringify({
+						model: "opencode/big-pickle",
+					}),
 				}
 				const probe = Bun.spawnSync(["opencode", "debug", "agent", "build"], {
 					cwd: contract.cwd,
@@ -1409,7 +1414,9 @@ status: open
 				...process.env,
 				PATH: `${agencyBin}:${process.env.PATH ?? ""}`,
 				XDG_CONFIG_HOME: isolatedConfigHome,
+				OPENCODE_DISABLE_AUTOUPDATE: "1",
 				OPENCODE_DISABLE_EXTERNAL_SKILLS: "1",
+				OPENCODE_DISABLE_MODELS_FETCH: "1",
 			}
 			delete directEnvironment.OPENCODE_CONFIG
 			delete directEnvironment.OPENCODE_CONFIG_CONTENT
@@ -1480,6 +1487,7 @@ status: open
 				env: {
 					...directEnvironment,
 					OPENCODE_CONFIG_CONTENT: JSON.stringify({
+						model: "opencode/big-pickle",
 						permission: { external_directory: { "*": "deny" } },
 					}),
 				},
@@ -1578,7 +1586,7 @@ status: open
 				graph.nodes.find((node: any) => node.id === "task:pipeline").status,
 			).toBe("working")
 		},
-		180_000,
+		360_000,
 	)
 
 	test("envelopes help and version output in machine mode", async () => {

package/src/commands/work.test.ts

@@ -569,6 +569,49 @@ describe("work command", () => {
 		).rejects.toThrow("Recalled repository conflicts")
 	})
 
+	test("force prepares a phase blocked by an active dependency without launching or changing status", async () => {
+		const blocked = createHarness({
+			workspace: multiPhaseWorkspace,
+			multiPhaseTasks: ["example"],
+			guardError: new Error("Phase dependency is working"),
+		})
+		await expect(
+			blocked.runPrepare({
+				cwd: "/workbase",
+				taskId: "example",
+				phaseId: "implementation",
+			}),
+		).rejects.toThrow("Phase dependency is working")
+		expect(blocked.events).toEqual(["guard"])
+
+		const forced = createHarness({
+			workspace: multiPhaseWorkspace,
+			multiPhaseTasks: ["example"],
+			guardError: new Error("Phase dependency is working"),
+		})
+		await forced.runPrepare({
+			cwd: "/workbase",
+			taskId: "example",
+			phaseId: "implementation",
+			force: true,
+			silent: true,
+		})
+
+		expect(forced.guards).toEqual([
+			{
+				target: "execution-unit:phase/example/implementation",
+				override: true,
+			},
+		])
+		expect(forced.events).toEqual(["guard", "materialize"])
+		expect(forced.materializeOptions[0]).toMatchObject({
+			force: true,
+			validationAlreadyPerformed: true,
+		})
+		expect(forced.launches).toEqual([])
+		expect(forced.statusUpdates).toEqual([])
+	})
+
 	test("launches an epic agent from an epic directory", async () => {
 		const harness = createHarness()
 

package/src/commands/work.ts

@@ -577,7 +577,7 @@ export const workPrepare = (options: WorkOptions = {}) =>
 
 export const help = `
 Usage: agency work [<directory-or-task-id> | --epic <epic-id>] [--agent <name>] [--auto]
-       agency work prepare [target] [--evidence <json-or-path>] [--dry-run] [--json]
+       agency work prepare [target] [--evidence <json-or-path>] [--force] [--dry-run] [--json]
 
 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
@@ -592,7 +592,8 @@ changes without fetching, creating branches, or creating worktrees.
 It emits revision-bound validation evidence and an idempotent external-orchestrator
 contract. Evidence is reused only while the target, workbase, configuration, and
 repository mapping remain unchanged. Dynamic readiness and workspace safety checks
-always run.
+always run. With prepare, --force overrides readiness without launching or changing
+lifecycle status.
 
 Options:
   --epic <id>          Work on an epic
@@ -605,8 +606,8 @@ Options:
   --print-command      Print cwd, argv, and non-secret environment without launch
   --opencode           Require the OpenCode preset
   --claude             Require the Claude Code preset
-  --force              Override readiness; reopen terminal execution units
-	--evidence <value>   Validation evidence JSON or a path to JSON (prepare only)
+  --force              Override readiness; launched terminal work is reopened
+  --evidence <value>   Validation evidence JSON or a path to JSON (prepare only)
   --no-input           Never open an interactive selector
 
 Without interactive input, provide an explicit workbase or cwd and an entity