@markjaquith/agency 2.54.2 → 2.54.3

package/README.md

@@ -857,7 +857,8 @@ including readiness checks and durable PR recording. Other `agency pr`
 invocations forward every argument to `gh pr`. From an execution task or phase
 directory, including descendants, passthrough runs in that execution unit's
 authoritative writable checkout. Otherwise it runs in the caller's current
-directory.
+directory. In jj workbases, Agency also supplies the repository and the work
+item's declared branch to subcommands that would otherwise infer Git context.
 
 ### Status and Validation
 

package/package.json

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

package/src/commands/pr.test.ts

@@ -50,9 +50,19 @@ exit "\${GH_EXIT:-0}"
 	const captured = async () =>
 		(await Bun.file(capturePath).text()).trim().split("\n")
 
-	const createExecutionWorkbase = async () => {
+	const createExecutionWorkbase = async (vcs: "git" | "jj" = "git") => {
 		const root = join(tempRoot, "workbase")
-		await write(root, "agency.json", '{"version":2}\n')
+		await write(
+			root,
+			"agency.json",
+			`${JSON.stringify({
+				version: 2,
+				vcs,
+				repositories: {
+					agency: { remote: "https://github.com/example/agency.git" },
+				},
+			})}\n`,
+		)
 		await mkdir(join(root, "repos/agency"), { recursive: true })
 		await mkdir(join(root, "tasks/single/code/agency"), { recursive: true })
 		await write(
@@ -163,6 +173,51 @@ status: open
 		])
 	})
 
+	test("injects the execution branch and repository for jj targets", async () => {
+		const root = await createExecutionWorkbase("jj")
+		const task = join(root, "tasks/single")
+		const phase = join(root, "tasks/multi/phases/build")
+
+		expect(await runTestEffect(pr(["view", "--web"], task))).toBe(0)
+		expect(await captured()).toEqual([
+			await realpath(join(task, "code/agency")),
+			"pr",
+			"view",
+			"feat/single",
+			"--repo",
+			"example/agency",
+			"--web",
+		])
+
+		expect(
+			await runTestEffect(pr(["create", "--title", "Example"], phase)),
+		).toBe(0)
+		expect(await captured()).toEqual([
+			await realpath(join(phase, "code/agency")),
+			"pr",
+			"create",
+			"--head",
+			"feat/build",
+			"--repo",
+			"example/agency",
+			"--title",
+			"Example",
+		])
+	})
+
+	test("preserves explicit jj PR and repository targets", async () => {
+		const root = await createExecutionWorkbase("jj")
+		const task = join(root, "tasks/single")
+		const args = ["view", "123", "--repo", "other/repository"]
+
+		expect(await runTestEffect(pr(args, task))).toBe(0)
+		expect(await captured()).toEqual([
+			await realpath(join(task, "code/agency")),
+			"pr",
+			...args,
+		])
+	})
+
 	test("falls back to the invocation directory without execution authority", async () => {
 		const root = await createExecutionWorkbase()
 		const orchestration = join(root, "tasks/multi")

package/src/commands/pr.ts

@@ -3,8 +3,10 @@ import { resolve } from "node:path"
 import { ContextService } from "../services/ContextService"
 import { FileSystemService } from "../services/FileSystemService"
 import { PullRequestService } from "../services/PullRequestService"
+import { WorkbaseService } from "../services/WorkbaseService"
 import type { BaseCommandOptions } from "../utils/command"
 import { createLoggers } from "../utils/effect"
+import { repositoryFromRemote } from "../workbase/delivery-command"
 
 interface PrCreateOptions extends BaseCommandOptions {
 	readonly taskId: string
@@ -13,6 +15,56 @@ interface PrCreateOptions extends BaseCommandOptions {
 	readonly force?: boolean
 }
 
+const branchTargetCommands = new Set([
+	"checkout",
+	"checks",
+	"close",
+	"comment",
+	"diff",
+	"edit",
+	"lock",
+	"merge",
+	"ready",
+	"reopen",
+	"revert",
+	"review",
+	"unlock",
+	"update-branch",
+	"view",
+])
+
+const hasOption = (args: readonly string[], short: string, long: string) =>
+	args.some(
+		(argument) =>
+			argument === short ||
+			argument.startsWith(`${short}=`) ||
+			argument === long ||
+			argument.startsWith(`${long}=`),
+	)
+
+const withJjContext = (
+	args: readonly string[],
+	branch: string,
+	repository: string,
+) => {
+	const [command, ...rest] = args
+	if (!command) return args
+
+	const branchArgs =
+		(command === "create" || command === "new") &&
+		!hasOption(rest, "-H", "--head")
+			? ["--head", branch]
+			: branchTargetCommands.has(command) &&
+				  (rest.length === 0 || rest[0]?.startsWith("-"))
+				? [branch]
+				: []
+	const repositoryArgs = hasOption(rest, "-R", "--repo")
+		? []
+		: ["--repo", repository]
+
+	return [command, ...branchArgs, ...repositoryArgs, ...rest]
+}
+
 export const prCreate = (options: PrCreateOptions) =>
 	Effect.gen(function* () {
 		const pullRequests = yield* PullRequestService
@@ -31,6 +83,7 @@ export const pr = (args: readonly string[], cwd: string = process.cwd()) =>
 	Effect.gen(function* () {
 		const contexts = yield* ContextService
 		const fs = yield* FileSystemService
+		const workbase = yield* WorkbaseService
 		const invocationCwd = resolve(cwd)
 		const context = yield* contexts
 			.get({ cwd: invocationCwd, target: ".", compact: true })
@@ -40,7 +93,26 @@ export const pr = (args: readonly string[], cwd: string = process.cwd()) =>
 				? context.authority.writable?.checkoutPath
 				: null
 		const focusedCwd = writableCheckout ?? invocationCwd
-		const result = yield* fs.runCommand(["gh", "pr", ...args], {
+		let forwardedArgs = args
+		if (
+			writableCheckout &&
+			context?.workbase.vcs === "jj" &&
+			context.authority.writable
+		) {
+			const execution =
+				context.documents?.phase?.data ?? context.documents?.task?.data
+			const { config } = yield* workbase.loadConfig(context.workbase.root)
+			const remote =
+				config.repositories?.[context.authority.writable.repo]?.remote
+			if (execution && "branch" in execution && remote) {
+				forwardedArgs = withJjContext(
+					args,
+					execution.branch,
+					repositoryFromRemote(remote),
+				)
+			}
+		}
+		const result = yield* fs.runCommand(["gh", "pr", ...forwardedArgs], {
 			cwd: focusedCwd,
 			passthrough: true,
 		})
@@ -53,5 +125,6 @@ Usage: agency pr create <task-id> [phase-id] [--draft] [--force] [--json]
 
 Create records a pull request for an Agency execution unit. Other invocations
 run gh pr unchanged, focusing the writable repository checkout when invoked from
-an Agency execution task or phase.
+an Agency execution task or phase. In jj workbases, Agency supplies the declared
+branch and repository to gh subcommands that would otherwise infer Git context.
 `

package/src/services/PullRequestService.ts

@@ -16,20 +16,15 @@ import {
 	normalizePullRequestRecord,
 	parsePullRequestRecord,
 	recordFromGitHubUrl,
+	repositoryFromRemote,
 	resolveDeliveryCommand,
+	resolveGitHubCreateCommand,
 } from "../workbase/delivery-command"
 
 class PullRequestError extends Data.TaggedError("PullRequestError")<{
 	readonly message: string
 }> {}
 
-const repositoryFromRemote = (remote: string) =>
-	remote
-		.replace(/^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?[^/]+\//i, "")
-		.replace(/^[^:]+:/, "")
-		.replace(/\.git\/?$/, "")
-		.replace(/\/$/, "")
-
 interface PullRequestOptions extends BaseCommandOptions {
 	readonly force?: boolean
 }
@@ -197,18 +192,13 @@ export class PullRequestService extends Effect.Service<PullRequestService>()(
 								url: "",
 								identifier: "",
 							})
-						: {
-								argv: [
-									"gh",
-									"pr",
-									"create",
-									"--fill",
-									"--base",
-									execution.base,
-									...(draft ? ["--draft"] : []),
-								],
-								environment: {},
-							}
+						: resolveGitHubCreateCommand({
+								base: execution.base,
+								branch: execution.branch,
+								repository,
+								draft,
+								vcs: config.vcs ?? "git",
+							})
 					const created = yield* fs.runCommand(resolved.argv, {
 						cwd: workspace.writablePath,
 						captureOutput: true,

package/src/workbase/delivery-command.test.ts

@@ -3,6 +3,7 @@ import {
 	parsePullRequestRecord,
 	recordFromGitHubJson,
 	resolveDeliveryCommand,
+	resolveGitHubCreateCommand,
 	validateDelivery,
 } from "./delivery-command"
 
@@ -31,6 +32,34 @@ describe("delivery commands", () => {
 		})
 	})
 
+	test("adds explicit jj context to the default GitHub create command", () => {
+		const input = {
+			base: "main",
+			branch: "feat/example",
+			repository: "example/agency",
+			draft: false,
+		} as const
+		expect(resolveGitHubCreateCommand({ ...input, vcs: "jj" })).toEqual({
+			argv: [
+				"gh",
+				"pr",
+				"create",
+				"--fill",
+				"--base",
+				"main",
+				"--head",
+				"feat/example",
+				"--repo",
+				"example/agency",
+			],
+			environment: {},
+		})
+		expect(resolveGitHubCreateCommand({ ...input, vcs: "git" })).toEqual({
+			argv: ["gh", "pr", "create", "--fill", "--base", "main"],
+			environment: {},
+		})
+	})
+
 	test("rejects unknown placeholders", () => {
 		expect(() =>
 			validateDelivery({ ...delivery, queryCommand: ["forge", "{unknown}"] }),

package/src/workbase/delivery-command.ts

@@ -11,6 +11,39 @@ export interface DeliveryCommandVariables {
 	readonly identifier: string
 }
 
+export const repositoryFromRemote = (remote: string) =>
+	remote
+		.replace(/^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?[^/]+\//i, "")
+		.replace(/^[^:]+:/, "")
+		.replace(/\.git\/?$/, "")
+		.replace(/\/$/, "")
+
+export const resolveGitHubCreateCommand = ({
+	base,
+	branch,
+	repository,
+	draft,
+	vcs,
+}: {
+	readonly base: string
+	readonly branch: string
+	readonly repository: string
+	readonly draft: boolean
+	readonly vcs: "git" | "jj"
+}) => ({
+	argv: [
+		"gh",
+		"pr",
+		"create",
+		"--fill",
+		"--base",
+		base,
+		...(vcs === "jj" ? ["--head", branch, "--repo", repository] : []),
+		...(draft ? ["--draft"] : []),
+	],
+	environment: {},
+})
+
 const PLACEHOLDERS = new Set<keyof DeliveryCommandVariables>([
 	"repository",
 	"branch",