@markjaquith/agency 2.32.1 → 2.33.0

package/package.json

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

package/src/commands/work.test.ts

@@ -71,6 +71,8 @@ interface HarnessOptions {
 	readonly guardError?: Error
 	readonly workTargetIds?: readonly string[]
 	readonly opencodeIntegrationState?: "managed" | "customized"
+	readonly taskStatus?: "open" | "working" | "delegated" | "done" | "dropped"
+	readonly phaseStatus?: "open" | "working" | "delegated" | "done" | "dropped"
 }
 
 const createHarness = (options: HarnessOptions = {}) => {
@@ -141,7 +143,12 @@ const createHarness = (options: HarnessOptions = {}) => {
 				path: `/workbase/tasks/${id}/TASK.md`,
 				data: options.multiPhaseTasks?.includes(id)
 					? { phases: [] }
-					: { repo: "agency", branch: `task/${id}`, base: "main" },
+					: {
+							repo: "agency",
+							branch: `task/${id}`,
+							base: "main",
+							status: options.taskStatus ?? "open",
+						},
 			})
 		},
 		list: () => Effect.succeed(options.taskRecords ?? []),
@@ -156,7 +163,12 @@ const createHarness = (options: HarnessOptions = {}) => {
 				taskId,
 				id,
 				path: `/workbase/tasks/${taskId}/phases/${id}/PHASE.md`,
-				data: { repo: "agency", branch: `task/${id}`, base: "main" },
+				data: {
+					repo: "agency",
+					branch: `task/${id}`,
+					base: "main",
+					status: options.phaseStatus ?? "open",
+				},
 			}),
 		list: () => Effect.succeed(options.phaseRecords ?? []),
 		setStatus: (taskId: string, id: string, status: string) => {
@@ -702,6 +714,22 @@ describe("work command", () => {
 		)
 	})
 
+	test("continues existing work with the resume command", async () => {
+		const harness = createHarness({ taskStatus: "working" })
+
+		await harness.run({ taskId: "example", opencode: true, auto: true })
+
+		expect(harness.launches[0]?.args).toEqual([
+			"opencode",
+			"--continue",
+			"--prompt",
+			"Continue the task. Read /workbase/tasks/example/TASK.md.",
+		])
+		expect(harness.launchEnvironments[0]?.AGENCY_PROMPT).toBe(
+			"Continue the task. Read /workbase/tasks/example/TASK.md.",
+		)
+	})
+
 	test("resumes OpenCode deterministically when a session identity exists", async () => {
 		const harness = createHarness({ workspace: multiPhaseWorkspace })
 		process.env.AGENCY_SESSION_ID = "existing-session"
@@ -722,7 +750,7 @@ describe("work command", () => {
 				"opencode",
 				"--continue",
 				"--prompt",
-				"Start the task. Read /workbase/tasks/example/TASK.md and /workbase/tasks/example/phases/implementation/PHASE.md.",
+				"Continue the task. Read /workbase/tasks/example/TASK.md and /workbase/tasks/example/phases/implementation/PHASE.md.",
 			],
 			cwd: taskDirectory,
 		})

package/src/commands/work.ts

@@ -138,6 +138,7 @@ export const work = (
 					taskId: task.id,
 					phaseId: phase.id,
 					path: phase.path,
+					status: phase.data.status,
 				}
 			} else {
 				target = {
@@ -145,6 +146,7 @@ export const work = (
 					taskId: task.id,
 					path: task.path,
 					multiPhase: "phases" in task.data,
+					status: "phases" in task.data ? undefined : task.data.status,
 				}
 			}
 		} else if (options.directory && !isDirectory) {
@@ -154,6 +156,7 @@ export const work = (
 				taskId: task.id,
 				path: task.path,
 				multiPhase: "phases" in task.data,
+				status: "phases" in task.data ? undefined : task.data.status,
 			}
 		} else if (directoryPath) {
 			const path = relative(root, startPath)
@@ -173,6 +176,7 @@ export const work = (
 						taskId: task.id,
 						phaseId: phase.id,
 						path: phase.path,
+						status: phase.data.status,
 					}
 				} else {
 					target = {
@@ -180,6 +184,7 @@ export const work = (
 						taskId: task.id,
 						path: task.path,
 						multiPhase: "phases" in task.data,
+						status: "phases" in task.data ? undefined : task.data.status,
 					}
 				}
 			}
@@ -224,6 +229,11 @@ export const work = (
 		}
 		yield* readiness.guardWorkTarget(targetNodeId(target), root, options.force)
 
+		const continuing =
+			target.kind !== "epic" &&
+			!(target.kind === "task" && target.multiPhase) &&
+			(process.env.AGENCY_SESSION_ID !== undefined ||
+				(target.status !== undefined && target.status !== "open"))
 		let prompt: string
 		let launchPath: string
 		let writablePath: string | undefined
@@ -247,9 +257,10 @@ export const work = (
 						Effect.sync(() => progress.fail("Workspace preparation failed")),
 					),
 				)
+			const action = continuing ? "Continue" : "Start"
 			prompt = workspace.phasePath
-				? `Start the task. Read ${workspace.taskPath} and ${workspace.phasePath}.`
-				: `Start the task. Read ${workspace.taskPath}.`
+				? `${action} the task. Read ${workspace.taskPath} and ${workspace.phasePath}.`
+				: `${action} the task. Read ${workspace.taskPath}.`
 			launchPath = dirname(workspace.taskPath)
 			writablePath = workspace.writablePath
 		}
@@ -267,7 +278,9 @@ export const work = (
 		const claimant = process.env.AGENCY_CLAIMANT ?? process.env.USER ?? "agency"
 		const sessionId =
 			process.env.AGENCY_SESSION_ID ?? `${process.pid}-${Date.now()}`
-		const resume = process.env.AGENCY_SESSION_ID !== undefined
+		const resume =
+			process.env.AGENCY_SESSION_ID !== undefined ||
+			(Boolean(options.auto) && continuing)
 		const variables = {
 			prompt: options.auto ? prompt : "",
 			workbase: root,

package/src/utils/interactive.test.tsx

@@ -44,7 +44,7 @@ describe("OpenTUI interaction", () => {
 	test("uses the split-footer renderer contract", () => {
 		expect(interactiveRendererConfig).toMatchObject({
 			screenMode: "split-footer",
-			footerHeight: 4,
+			footerHeight: 5,
 			externalOutputMode: "capture-stdout",
 			clearOnShutdown: false,
 		})
@@ -212,6 +212,26 @@ describe("OpenTUI interaction", () => {
 		}
 	})
 
+	test("wraps text prompt input onto another line", async () => {
+		const setup = await testRender(
+			() => <InteractiveTextPrompt prompt="Task ID" onDone={() => {}} />,
+			{ width: 16, height: 5 },
+		)
+		try {
+			await setup.renderer.setupTerminal()
+			await setup.renderOnce()
+			await Bun.sleep(0)
+			await setup.mockInput.typeText("alpha beta gamma delta")
+			await setup.flush()
+			const frame = setup.captureCharFrame()
+			expect(frame).toContain("alpha beta")
+			expect(frame).toContain("gamma")
+			expect(frame).toMatch(/alpha beta\s*\ngamma delta/)
+		} finally {
+			setup.renderer.destroy()
+		}
+	})
+
 	test("submits text and cancels with ctrl-c or escape", async () => {
 		let submitted: string | null | undefined
 		const input = await testRender(

package/src/utils/interactive.tsx

@@ -4,7 +4,7 @@ import {
 	createCliRenderer,
 	type CliRenderer,
 	type CliRendererConfig,
-	type InputRenderable,
+	type TextareaRenderable,
 } from "@opentui/core"
 import { render, useKeyboard, type JSX } from "@opentui/solid"
 import { createMemo, createSignal, For } from "solid-js"
@@ -16,7 +16,7 @@ export interface InteractiveChoice {
 
 export const interactiveRendererConfig = {
 	screenMode: "split-footer",
-	footerHeight: 4,
+	footerHeight: 5,
 	externalOutputMode: "capture-stdout",
 	consoleMode: "disabled",
 	clearOnShutdown: false,
@@ -35,7 +35,7 @@ const isCancel = (key: { name: string; ctrl: boolean }) =>
 	key.name === "escape" || (key.ctrl && key.name === "c")
 
 export const InteractiveTextPrompt = (props: PromptProps<string>) => {
-	let input: InputRenderable | undefined
+	let input: TextareaRenderable | undefined
 	let value = ""
 	useKeyboard((key) => {
 		if (isCancel(key)) {
@@ -53,10 +53,13 @@ export const InteractiveTextPrompt = (props: PromptProps<string>) => {
 	return (
 		<box flexDirection="column" width="100%" height="100%">
 			<text fg="#7aa2f7">{props.prompt}</text>
-			<input
+			<textarea
 				focused
-				onInput={(next) => {
-					value = next
+				height={2}
+				wrapMode="word"
+				keyBindings={[{ name: "return", action: "submit" }]}
+				onContentChange={() => {
+					value = input?.plainText ?? ""
 				}}
 				ref={(next) => {
 					input = next
@@ -140,7 +143,7 @@ export const fuzzyChoices = (
 }
 
 export const InteractiveSelectPrompt = (props: SelectPromptProps) => {
-	let input: InputRenderable | undefined
+	let input: TextareaRenderable | undefined
 	const [query, setQuery] = createSignal("")
 	const [selected, setSelected] = createSignal(0)
 	const choices = createMemo(() => fuzzyChoices(props.choices, query()))
@@ -195,13 +198,16 @@ export const InteractiveSelectPrompt = (props: SelectPromptProps) => {
 					{props.prompt}
 				</text>
 				<text fg="#7aa2f7">{" > "}</text>
-				<input
+				<textarea
 					focused
 					flexGrow={1}
 					minWidth={8}
+					height={2}
+					wrapMode="word"
 					placeholder="filter"
-					onInput={(next) => {
-						setQuery(next)
+					keyBindings={[{ name: "return", action: "submit" }]}
+					onContentChange={() => {
+						setQuery(input?.plainText ?? "")
 						setSelected(0)
 					}}
 					ref={(next) => {
@@ -266,7 +272,6 @@ async function runInteractive<T>(
 	} finally {
 		if (renderer) {
 			await shutdown(renderer)
-			process.stdout.write("\n")
 		}
 	}
 }

package/src/utils/process.test.ts

@@ -45,10 +45,13 @@ describe("spawnProcess", () => {
 		const lineCount = 256
 		const script = [
 			`const line = ${JSON.stringify(line)}`,
-			`for (let i = 0; i < ${lineCount}; i++) {`,
-			"console.log(`out:${i}:${line}`)",
-			"console.error(`err:${i}:${line}`)",
-			"}",
+			`const indexes = Array.from({ length: ${lineCount} }, (_, i) => i)`,
+			"const stdout = indexes.map((i) => `out:${i}:${line}`).join(`\n`)",
+			"const stderr = indexes.map((i) => `err:${i}:${line}`).join(`\n`)",
+			"const write = (stream, output) => new Promise((resolve, reject) => {",
+			"stream.write(output, (error) => error ? reject(error) : resolve())",
+			"})",
+			"await Promise.all([write(process.stdout, stdout), write(process.stderr, stderr)])",
 		].join("\n")
 
 		const result = await Effect.runPromise(

package/src/workbase/work-target.ts

@@ -13,12 +13,14 @@ export type WorkTarget =
 			readonly taskId: string
 			readonly path: string
 			readonly multiPhase: boolean
+			readonly status?: WorkStatus
 	  }
 	| {
 			readonly kind: "phase"
 			readonly taskId: string
 			readonly phaseId: string
 			readonly path: string
+			readonly status?: WorkStatus
 	  }
 
 interface EpicRecord {
@@ -116,6 +118,7 @@ const taskChoices = (
 				taskId: task.id,
 				path: task.path,
 				multiPhase,
+				status: multiPhase ? undefined : (task.data.status ?? "open"),
 			},
 		},
 	]
@@ -147,6 +150,7 @@ const taskChoices = (
 				taskId: task.id,
 				phaseId: record.id,
 				path: record.path,
+				status: record.data.status ?? "open",
 			},
 		})
 	}
@@ -172,6 +176,7 @@ const taskChoices = (
 				taskId: task.id,
 				phaseId: record.id,
 				path: record.path,
+				status: record.data.status ?? "open",
 			},
 		})
 	}