@markjaquith/agency 2.68.0 → 2.69.1

package/src/workbase/{runner-command.ts → agent-command.ts}

@@ -1,6 +1,6 @@
 import type { WorkbaseConfig } from "./schemas"
 
-export interface RunnerCommandVariables {
+export interface AgentCommandVariables {
 	readonly prompt: string
 	readonly workbase: string
 	readonly target: string
@@ -11,7 +11,7 @@ export interface RunnerCommandVariables {
 	readonly claimRevision: string
 }
 
-interface RunnerDefinition {
+interface AgentDefinition {
 	readonly command: readonly string[]
 	readonly autoCommand?: readonly string[]
 	readonly resumeCommand?: readonly string[]
@@ -19,7 +19,7 @@ interface RunnerDefinition {
 	readonly environment?: Readonly<Record<string, string>>
 }
 
-const PLACEHOLDERS = new Set<keyof RunnerCommandVariables>([
+const PLACEHOLDERS = new Set<keyof AgentCommandVariables>([
 	"prompt",
 	"workbase",
 	"target",
@@ -30,7 +30,7 @@ const PLACEHOLDERS = new Set<keyof RunnerCommandVariables>([
 	"claimRevision",
 ])
 
-const BUILTIN_RUNNERS: Readonly<Record<string, RunnerDefinition>> = {
+const BUILTIN_AGENTS: Readonly<Record<string, AgentDefinition>> = {
 	opencode2: {
 		command: ["opencode2"],
 		autoCommand: ["opencode2", "--prompt", "{prompt}"],
@@ -43,6 +43,12 @@ const BUILTIN_RUNNERS: Readonly<Record<string, RunnerDefinition>> = {
 		resumeCommand: ["opencode", "--continue"],
 		autoResumeCommand: ["opencode", "--continue", "--prompt", "{prompt}"],
 	},
+	pi: {
+		command: ["pi"],
+		autoCommand: ["pi", "{prompt}"],
+		resumeCommand: ["pi", "--continue"],
+		autoResumeCommand: ["pi", "--continue", "{prompt}"],
+	},
 	claude: {
 		command: ["claude"],
 		autoCommand: ["claude", "{prompt}"],
@@ -51,48 +57,46 @@ const BUILTIN_RUNNERS: Readonly<Record<string, RunnerDefinition>> = {
 	},
 }
 
-const validateTemplate = (runner: string, value: string) => {
+const validateTemplate = (agent: string, value: string) => {
 	for (const match of value.matchAll(/\{([^{}]+)\}/g)) {
 		const placeholder = match[1]!
-		if (!PLACEHOLDERS.has(placeholder as keyof RunnerCommandVariables)) {
-			throw new Error(
-				`Unknown runner '${runner}' placeholder: {${placeholder}}`,
-			)
+		if (!PLACEHOLDERS.has(placeholder as keyof AgentCommandVariables)) {
+			throw new Error(`Unknown agent '${agent}' placeholder: {${placeholder}}`)
 		}
 	}
 }
 
-export const validateRunners = (runners: WorkbaseConfig["runners"]): void => {
-	for (const [name, runner] of Object.entries(runners ?? {})) {
+export const validateAgents = (agents: WorkbaseConfig["agents"]): void => {
+	for (const [name, agent] of Object.entries(agents ?? {})) {
 		for (const value of [
-			...runner.command,
-			...(runner.autoCommand ?? []),
-			...(runner.resumeCommand ?? []),
-			...(runner.autoResumeCommand ?? []),
-			...Object.values(runner.environment ?? {}),
+			...agent.command,
+			...(agent.autoCommand ?? []),
+			...(agent.resumeCommand ?? []),
+			...(agent.autoResumeCommand ?? []),
+			...Object.values(agent.environment ?? {}),
 		]) {
 			validateTemplate(name, value)
 		}
 	}
 }
 
-const expand = (value: string, variables: RunnerCommandVariables) =>
+const expand = (value: string, variables: AgentCommandVariables) =>
 	value.replaceAll(
 		/\{([^{}]+)\}/g,
 		(match, placeholder: string) =>
-			variables[placeholder as keyof RunnerCommandVariables] ?? match,
+			variables[placeholder as keyof AgentCommandVariables] ?? match,
 	)
 
-export const resolveRunnerCommand = (
+export const resolveAgentCommand = (
 	name: string,
-	configured: WorkbaseConfig["runners"],
-	variables: RunnerCommandVariables,
+	configured: WorkbaseConfig["agents"],
+	variables: AgentCommandVariables,
 	resume: boolean,
 	auto = false,
 ) => {
-	validateRunners(configured)
-	const definition = configured?.[name] ?? BUILTIN_RUNNERS[name]
-	if (!definition) throw new Error(`Unknown runner: ${name}`)
+	validateAgents(configured)
+	const definition = configured?.[name] ?? BUILTIN_AGENTS[name]
+	if (!definition) throw new Error(`Unknown agent: ${name}`)
 	const template = auto
 		? resume
 			? (definition.autoResumeCommand ?? definition.autoCommand)
@@ -101,7 +105,7 @@ export const resolveRunnerCommand = (
 			? definition.resumeCommand
 			: definition.command
 	if (!template) {
-		throw new Error(`Runner '${name}' does not support --auto`)
+		throw new Error(`Agent '${name}' does not support --auto`)
 	}
 	const argv = template.map((argument) => expand(argument, variables))
 	const environment = Object.fromEntries(
@@ -113,11 +117,11 @@ export const resolveRunnerCommand = (
 	return { argv, environment }
 }
 
-export const runnerEnvironment = (
-	runner: string,
-	variables: RunnerCommandVariables,
+export const agentEnvironment = (
+	agent: string,
+	variables: AgentCommandVariables,
 ): Record<string, string> => ({
-	AGENCY_RUNNER: runner,
+	AGENCY_AGENT: agent,
 	AGENCY_CLAIMANT: variables.claimant,
 	AGENCY_SESSION_ID: variables.sessionId,
 	AGENCY_CLAIM_REVISION: variables.claimRevision,

package/src/workbase/kickoff-contract.ts

@@ -325,11 +325,11 @@ export const buildKickoffPlan = (input: {
 				recovery: "Reuse the existing split when present.",
 			},
 			{
-				id: "runner-start",
+				id: "agent-start",
 				cwd: taskDirectory,
 				argv: ["agency", "work", ".", "--auto"],
 				recovery:
-					"Inspect the recorded tab before retrying; a working runner must not be duplicated.",
+					"Inspect the recorded tab before retrying; a working agent must not be duplicated.",
 			},
 			{
 				id: "final-context-verification",
@@ -341,7 +341,7 @@ export const buildKickoffPlan = (input: {
 				],
 				exactlyOnce: true,
 				recovery:
-					"If verification fails, inspect the existing tab; do not launch another runner.",
+					"If verification fails, inspect the existing tab; do not launch another agent.",
 			},
 		],
 		successFields: [
@@ -351,7 +351,7 @@ export const buildKickoffPlan = (input: {
 			"preparedCheckout",
 			"herdrWorkspace",
 			"herdrTab",
-			"runnerStart",
+			"agentStart",
 			"contextVerification",
 		],
 	}

package/src/workbase/opencode-file.ts

@@ -31,7 +31,7 @@ const body = () =>
 						"Handles Agency workbase orchestration and workflow operations with the Agency CLI",
 					mode: "subagent",
 					prompt:
-						"You are the Agency workflow specialist. Use the Agency CLI to handle delegated workbase orchestration and workflow operations. Always start with `agency context . --json`, follow the managed Agency instructions and reported authority, use Agency commands for durable mutations, and report the resulting state concisely. When delegated to start or kick off work in another agent, launch it, verify that the runner started successfully, and return without waiting for the task to finish.",
+						"You are the Agency workflow specialist. Use the Agency CLI to handle delegated workbase orchestration and workflow operations. Always start with `agency context . --json`, follow the managed Agency instructions and reported authority, use Agency commands for durable mutations, and report the resulting state concisely. When delegated to start or kick off work in another agent, launch it, verify that the agent started successfully, and return without waiting for the task to finish.",
 				},
 				plan: {
 					disable: true,

package/src/workbase/schemas.test.ts

@@ -276,11 +276,11 @@ describe("workspace creation configuration", () => {
 	})
 })
 
-describe("runner configuration", () => {
+describe("agent configuration", () => {
 	test("accepts named argv commands with resume commands and environment", () => {
 		const config = Schema.decodeUnknownSync(WorkbaseConfig)({
 			version: 2,
-			runners: {
+			agents: {
 				custom: {
 					command: ["agent"],
 					autoCommand: ["agent", "{prompt}"],
@@ -291,14 +291,14 @@ describe("runner configuration", () => {
 			},
 		})
 
-		expect(config.runners?.custom?.autoCommand).toEqual(["agent", "{prompt}"])
+		expect(config.agents?.custom?.autoCommand).toEqual(["agent", "{prompt}"])
 	})
 
 	test("rejects shell strings in place of argv arrays", () => {
 		expect(() =>
 			Schema.decodeUnknownSync(WorkbaseConfig)({
 				version: 2,
-				runners: { custom: { command: "agent {prompt}" } },
+				agents: { custom: { command: "agent {prompt}" } },
 			}),
 		).toThrow()
 	})
@@ -423,7 +423,7 @@ describe("work status", () => {
 describe("claim records", () => {
 	const record = {
 		claimant: "orchestrator",
-		runner: "agent",
+		agent: "agent",
 		sessionId: "job-1",
 		startedAt: "2026-07-17T12:00:00.000Z",
 		targetRevision: "0".repeat(64),

package/src/workbase/schemas.ts

@@ -52,7 +52,7 @@ export const DocumentRevision = Schema.String.pipe(
 
 export const ClaimRecord = Schema.Struct({
 	claimant: NonEmptyString,
-	runner: NonEmptyString,
+	agent: NonEmptyString,
 	sessionId: NonEmptyString,
 	startedAt: IsoTimestamp,
 	targetRevision: DocumentRevision,
@@ -110,7 +110,7 @@ export const WorkbaseConfig = Schema.Struct({
 	chooserCommand: Schema.optional(Schema.NonEmptyArray(NonEmptyString)),
 	worktreeCreateCommand: Schema.optional(Schema.NonEmptyArray(NonEmptyString)),
 	workspaceCreateCommand: Schema.optional(Schema.NonEmptyArray(NonEmptyString)),
-	runners: Schema.optional(
+	agents: Schema.optional(
 		Schema.Record({
 			key: EntityId,
 			value: Schema.Struct({
@@ -146,6 +146,12 @@ export const WorkbaseRegistry = Schema.Struct({
 	defaultId: Schema.optional(EntityId),
 })
 
+export const GlobalConfig = Schema.Struct({
+	agent: Schema.optional(
+		Schema.Literal("opencode2", "opencode", "pi", "claude"),
+	),
+})
+
 export const Dependency = Schema.Struct({
 	id: EntityId,
 	dependsOn: Schema.optional(Schema.Array(EntityId)),