@markjaquith/agency 2.7.0 → 2.7.1

package/cli.ts

@@ -240,7 +240,9 @@ const commands: Record<string, Command> = {
 				return
 			}
 			if (args.length > 1) {
-				throw new Error("Usage: agency work [<directory> | --epic <epic-id>]")
+				throw new Error(
+					"Usage: agency work [<directory-or-task-id> | --epic <epic-id>]",
+				)
 			}
 
 			await runCommand(
@@ -301,7 +303,7 @@ Commands:
   phase <subcommand>     Manage task phases
   archive <type>         Archive a work item
   task <subcommand>      Manage tasks
-  work [directory]       Work on an epic, task, or phase
+  work [directory|task]  Work on an epic, task, or phase
   pr create              Create a pull request for an execution unit
   repo <subcommand>      Manage workbase repositories
   status                 Show status for the current workbase

package/package.json

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

package/src/commands/work.test.ts

@@ -46,12 +46,14 @@ interface HarnessOptions {
 	readonly phaseRecords?: readonly any[]
 	readonly outsideWorkbase?: boolean
 	readonly registeredWorkbases?: readonly string[]
+	readonly existingDirectories?: readonly string[]
 }
 
 const createHarness = (options: HarnessOptions = {}) => {
 	const events: string[] = []
 	const probes: string[] = []
 	const statusUpdates: string[] = []
+	const shownTasks: string[] = []
 	const progressUpdates: string[] = []
 	const launches: Array<{
 		cli: string
@@ -95,14 +97,16 @@ const createHarness = (options: HarnessOptions = {}) => {
 		list: () => Effect.succeed(options.epicRecords ?? []),
 	}
 	const tasks = {
-		show: (id: string) =>
-			Effect.succeed({
+		show: (id: string) => {
+			shownTasks.push(id)
+			return Effect.succeed({
 				id,
 				path: `/workbase/tasks/${id}/TASK.md`,
 				data: options.multiPhaseTasks?.includes(id)
 					? { phases: [] }
 					: { repo: "agency", branch: `task/${id}`, base: "main" },
-			}),
+			})
+		},
 		list: () => Effect.succeed(options.taskRecords ?? []),
 		setStatus: (id: string, status: string) => {
 			statusUpdates.push(`task:${id}:${status}`)
@@ -124,7 +128,8 @@ const createHarness = (options: HarnessOptions = {}) => {
 		},
 	}
 	const fs = {
-		isDirectory: () => Effect.succeed(true),
+		isDirectory: (path: string) =>
+			Effect.succeed(options.existingDirectories?.includes(path) ?? true),
 		runCommand: (args: readonly string[]) => {
 			const cli = args[1] as "opencode" | "claude"
 			events.push(`probe:${cli}`)
@@ -169,6 +174,7 @@ const createHarness = (options: HarnessOptions = {}) => {
 		launches,
 		materializeOptions,
 		statusUpdates,
+		shownTasks,
 		progressUpdates,
 		run,
 	}
@@ -192,6 +198,34 @@ describe("work command", () => {
 		})
 	})
 
+	test("resolves an existing positional path before treating it as a task ID", async () => {
+		const harness = createHarness({
+			existingDirectories: ["/workbase/tasks/delivery"],
+		})
+
+		await harness.run({
+			cwd: "/workbase/tasks/delivery",
+			directory: ".",
+			opencode: true,
+		})
+
+		expect(harness.shownTasks).toEqual(["delivery"])
+		expect(harness.launches[0]?.cwd).toBe("/workbase/tasks/delivery")
+	})
+
+	test("treats a positional value as a task ID when it is not a directory", async () => {
+		const harness = createHarness({ existingDirectories: [] })
+
+		await harness.run({
+			cwd: "/workbase",
+			directory: "delivery",
+			opencode: true,
+		})
+
+		expect(harness.shownTasks).toEqual(["delivery"])
+		expect(harness.launches[0]?.cwd).toBe("/workbase/tasks/delivery")
+	})
+
 	test("launches a multi-phase task agent without materializing", async () => {
 		const harness = createHarness({ multiPhaseTasks: ["delivery"] })
 

package/src/commands/work.ts

@@ -77,12 +77,13 @@ export const work = (
 		const phases = yield* PhaseService
 		const { log, verboseLog } = createLoggers(options)
 		const cwd = options.cwd ?? process.cwd()
-		const startPath = options.directory ? resolve(cwd, options.directory) : cwd
-		if (options.directory && !(yield* fs.isDirectory(startPath))) {
-			return yield* Effect.fail(
-				new Error(`Work directory does not exist: ${startPath}`),
-			)
-		}
+		const directoryPath = options.directory
+			? resolve(cwd, options.directory)
+			: undefined
+		const isDirectory = directoryPath
+			? yield* fs.isDirectory(directoryPath)
+			: false
+		const startPath = isDirectory && directoryPath ? directoryPath : cwd
 		const root = yield* resolveWorkbase(startPath, log, pickBase)
 		if (!root) return
 
@@ -108,7 +109,15 @@ export const work = (
 					multiPhase: "phases" in task.data,
 				}
 			}
-		} else if (options.directory) {
+		} else if (options.directory && !isDirectory) {
+			const task = yield* tasks.show(options.directory, root)
+			target = {
+				kind: "task",
+				taskId: task.id,
+				path: task.path,
+				multiPhase: "phases" in task.data,
+			}
+		} else if (directoryPath) {
 			const path = relative(root, startPath)
 			const parts =
 				!path || isAbsolute(path) || path.startsWith(`..${sep}`)
@@ -226,11 +235,12 @@ export const work = (
 	})
 
 export const help = `
-Usage: agency work [<directory> | --epic <epic-id>]
+Usage: agency work [<directory-or-task-id> | --epic <epic-id>]
 
 Launch an agent for an epic, task, or phase. With no directory, select one
-with fzf. Use '.' for the current directory. Outside a workbase, select a
-registered workbase first.
+with fzf. A positional argument resolves as a directory first, then as a task
+ID. Use '.' for the current directory. Outside a workbase, select a registered
+workbase first.
 
 Options:
   --epic <id>         Work on an epic