@gajae-code/coding-agent 0.16.4 → 0.16.6

package/src/setup/paseo/announce.ts

@@ -33,8 +33,6 @@ import { AgentDirSessionLifecycleClient } from "../../sdk/lifecycle/broker-clien
 import { sessionListPageFromResponse, traverseSessionList } from "../../sdk/session-list";
 import { PROVIDER_EXTENDS, PROVIDER_KEY, resolvePaseoHome } from "./setup-deps";
 
-export { resolvePaseoHome } from "./setup-deps";
-
 /** Cheap liveness probe of the daemon socket. Only gates the expensive CLI spawn. */
 const DAEMON_PROBE_TIMEOUT_MS = 750;
 /** Bound on the broker `session.list` traversal that proves our own liveness. */
@@ -87,10 +85,17 @@ export interface PaseoAnnounceDependencies {
 		readonly providerKey: string;
 		readonly cwd: string;
 		readonly sessionId: string;
+		readonly daemonTarget: PaseoDaemonTarget;
+		readonly daemonHost: string;
 		readonly signal?: AbortSignal;
 	}): Promise<PaseoAnnounceOutcome>;
 }
 
+interface ResolvedDaemonSelection {
+	readonly target: PaseoDaemonTarget;
+	readonly host: string;
+}
+
 function asRecord(value: unknown): Record<string, unknown> | undefined {
 	return value && typeof value === "object" && !Array.isArray(value) ? (value as Record<string, unknown>) : undefined;
 }
@@ -161,43 +166,39 @@ export function parseDaemonListen(raw: string): PaseoDaemonTarget | undefined {
 export async function resolveDaemonTarget(
 	config: unknown,
 	deps: Pick<PaseoAnnounceDependencies, "env" | "paseoHome" | "readJson">,
-): Promise<PaseoDaemonTarget> {
-	return (await resolveDaemonTargets(config, deps))[0] ?? DEFAULT_DAEMON_TARGET;
+): Promise<PaseoDaemonTarget | undefined> {
+	return (await resolveDaemonSelection(config, deps))?.target;
 }
 
-async function resolveDaemonTargets(
+async function resolveDaemonSelection(
 	config: unknown,
 	deps: Pick<PaseoAnnounceDependencies, "env" | "paseoHome" | "readJson">,
-): Promise<PaseoDaemonTarget[]> {
+): Promise<ResolvedDaemonSelection | undefined> {
 	const explicitHost = deps.env.PASEO_HOST?.trim();
 	if (explicitHost) {
-		const explicitTarget = parseDaemonListen(explicitHost);
-		return explicitTarget ? [explicitTarget] : [];
+		const target = parseDaemonListen(explicitHost);
+		return target ? { target, host: explicitHost } : undefined;
+	}
+	const explicitListen = deps.env.PASEO_LISTEN?.trim();
+	if (explicitListen) {
+		const target = parseDaemonListen(explicitListen);
+		return target ? { target, host: explicitListen } : undefined;
 	}
 
 	const pidFile = asRecord(await deps.readJson(path.join(deps.paseoHome, "paseo.pid")));
 	const pidListen = typeof pidFile?.listen === "string" ? pidFile.listen : pidFile?.sockPath;
 	const pidTarget = typeof pidListen === "string" ? parseDaemonListen(pidListen) : undefined;
+	if (pidTarget?.kind === "ipc") return { target: pidTarget, host: pidListen as string };
 
 	const parsed = asRecord(config);
 	const configured = asRecord(parsed?.daemon)?.listen ?? parsed?.listen;
-	const configuredRaw = deps.env.PASEO_LISTEN?.trim() || (typeof configured === "string" ? configured : undefined);
-	const configuredTarget = configuredRaw ? parseDaemonListen(configuredRaw) : undefined;
-	const configuredIpc = configuredTarget?.kind === "ipc" ? configuredTarget : undefined;
-	const pidIpc = pidTarget?.kind === "ipc" ? pidTarget : undefined;
-	const configuredTcp =
-		configuredTarget?.kind === "tcp" && !(configuredTarget.host === "127.0.0.1" && configuredTarget.port === 6767)
-			? configuredTarget
-			: undefined;
-	const directIpc = deps.env.PASEO_LISTEN?.trim();
-	const directIpcTarget = directIpc ? parseDaemonListen(directIpc) : undefined;
-	const targets = [
-		directIpcTarget?.kind === "ipc" ? directIpcTarget : undefined,
-		pidIpc,
-		configuredIpc,
-		configuredTcp,
-	].filter((target): target is PaseoDaemonTarget => target !== undefined);
-	return targets.length > 0 ? [targets[0]!] : [DEFAULT_DAEMON_TARGET];
+	if (typeof configured !== "string") return { target: DEFAULT_DAEMON_TARGET, host: "localhost:6767" };
+	const configuredTarget = parseDaemonListen(configured);
+	if (!configuredTarget) return { target: DEFAULT_DAEMON_TARGET, host: "localhost:6767" };
+	if (configured.trim() === "127.0.0.1:6767") {
+		return { target: DEFAULT_DAEMON_TARGET, host: "localhost:6767" };
+	}
+	return { target: configuredTarget, host: configured };
 }
 
 /**
@@ -243,24 +244,26 @@ export async function announceSessionToPaseo(
 	const cli = deps.resolveCli();
 	if (!cli) return { kind: "skipped", reason: "cli-missing" };
 
-	const targets = await resolveDaemonTargets(config, deps);
-	if (deps.env.PASEO_HOST?.trim() && targets.length === 0)
+	const selection = await resolveDaemonSelection(config, deps);
+	if ((deps.env.PASEO_HOST?.trim() || deps.env.PASEO_LISTEN?.trim()) && selection === undefined)
 		return { kind: "skipped", reason: "unsupported-daemon-target" };
-	let reachable = false;
-	for (const target of targets) {
-		if (await deps.probeDaemon(target)) {
-			reachable = true;
-			break;
-		}
-	}
-	if (!reachable) return { kind: "skipped", reason: "daemon-unreachable" };
+	if (!selection || !(await deps.probeDaemon(selection.target)))
+		return { kind: "skipped", reason: "daemon-unreachable" };
 	if (signal?.aborted) return { kind: "failed", detail: "Paseo announcement cancelled" };
 
 	// Importing a session the broker does not yet report as live would make ACP
 	// `session/load` resume a copy instead of attaching to the running host.
 	if (!(await deps.isSessionLive(input.sessionId, input.cwd))) return { kind: "skipped", reason: "session-not-live" };
 
-	return await deps.runImport({ cli, providerKey, cwd: input.cwd, sessionId: input.sessionId, signal });
+	return await deps.runImport({
+		cli,
+		providerKey,
+		cwd: input.cwd,
+		sessionId: input.sessionId,
+		daemonTarget: selection.target,
+		daemonHost: selection.host,
+		signal,
+	});
 }
 
 /** Only a daemon that is not up yet, or a registration that has not landed yet, is worth retrying. */
@@ -369,17 +372,13 @@ function isSessionLive(agentDir: string): (sessionId: string, cwd: string) => Pr
 			response => sessionListPageFromResponse(response),
 		);
 		for (const { sessions } of pages) {
-			if (sessionListContainsLiveSessionForTests(sessions, sessionId, canonicalCwd)) return true;
+			if (sessionListContainsLiveSession(sessions, sessionId, canonicalCwd)) return true;
 		}
 		return false;
 	};
 }
 
-export function sessionListContainsLiveSessionForTests(
-	sessions: readonly unknown[],
-	sessionId: string,
-	cwd: string,
-): boolean {
+export function sessionListContainsLiveSession(sessions: readonly unknown[], sessionId: string, cwd: string): boolean {
 	for (const value of sessions) {
 		const session = asRecord(value);
 		if (session?.sessionId !== sessionId || session.live !== true) continue;
@@ -403,6 +402,8 @@ function runImport(env: NodeJS.ProcessEnv) {
 		readonly providerKey: string;
 		readonly cwd: string;
 		readonly sessionId: string;
+		readonly daemonTarget: PaseoDaemonTarget;
+		readonly daemonHost: string;
 		readonly signal?: AbortSignal;
 	}): Promise<PaseoAnnounceOutcome> => {
 		const timeoutController = new AbortController();
@@ -413,7 +414,12 @@ function runImport(env: NodeJS.ProcessEnv) {
 		try {
 			const child = Bun.spawn(
 				[input.cli, "import", "--provider", input.providerKey, "--cwd", input.cwd, input.sessionId],
-				{ stdout: "pipe", stderr: "pipe", signal, env },
+				{
+					stdout: "ignore",
+					stderr: "pipe",
+					signal,
+					env: { ...env, PASEO_HOST: input.daemonHost },
+				},
 			);
 			const [exitCode, stderr] = await Promise.all([child.exited, new Response(child.stderr).text()]);
 			if (input.signal?.aborted) return { kind: "failed", detail: "Paseo announcement cancelled" };

package/src/setup/paseo/setup-deps.ts

@@ -87,7 +87,7 @@ export function resolvePaseoHome(env: NodeJS.ProcessEnv = process.env, home: str
 export function createDefaultPaseoPaths(
 	agentDir: string = getAgentDir(),
 	home: string = os.homedir(),
-	env: NodeJS.ProcessEnv = {},
+	env: NodeJS.ProcessEnv = process.env,
 ): PaseoPaths {
 	const paseoHome = resolvePaseoHome(env, home);
 	return {

package/src/skill-state/canonical-skills.ts

@@ -2,3 +2,15 @@
 export const CANONICAL_GJC_WORKFLOW_SKILLS = ["deep-interview", "ralplan", "ultragoal", "autoresearch"] as const;
 
 export type CanonicalGjcWorkflowSkill = (typeof CANONICAL_GJC_WORKFLOW_SKILLS)[number];
+
+const CANONICAL_GJC_WORKFLOW_SKILL_SET = new Set<string>(CANONICAL_GJC_WORKFLOW_SKILLS);
+
+/** Case-insensitive, Win32-path-equivalent key used for skill collision checks. */
+export function getSkillFilesystemIdentity(name: string): string {
+	return name.replace(/[. ]+$/u, "").toLowerCase();
+}
+
+/** Whether a name resolves to a bundled workflow under portable filesystem semantics. */
+export function isCanonicalGjcWorkflowSkillFilesystemAlias(name: string): boolean {
+	return CANONICAL_GJC_WORKFLOW_SKILL_SET.has(getSkillFilesystemIdentity(name));
+}

package/src/skills/skills.test.ts

@@ -1,12 +1,14 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test, vi } from "bun:test";
+import * as nodeFs from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import type { LoadContext } from "../capability/types";
 import { getEmbeddedDefaultGjcSkills } from "../defaults/gjc-defaults";
 import { buildSkillPromptMessage } from "../extensibility/skills";
 import { SKILL_FRONTMATTER_SCAN_BYTES, SKILL_FRONTMATTER_SCAN_TOTAL_BYTES, scanSkillDescriptorsFromDir } from "./index";
 
-function makeContext(): any {
-	return { cwd: process.cwd(), home: process.env.HOME ?? process.cwd(), repoRoot: null };
+function makeContext(root: string): LoadContext {
+	return { cwd: root, home: root, repoRoot: null };
 }
 
 describe("skill descriptors", () => {
@@ -22,22 +24,31 @@ describe("skill descriptors", () => {
 				`---\nname: bounded\ndescription: bounded scan\n---\n${body}`,
 			);
 
-			const originalFile = Bun.file;
-			const sliceEnds: number[] = [];
-			(Bun as any).file = (filePath: string) => {
-				const file = originalFile(filePath);
-				return new Proxy(file, {
-					get(target, property, receiver) {
-						if (property !== "slice") return Reflect.get(target, property, receiver);
-						return (start?: number, end?: number) => {
-							sliceEnds.push(end ?? -1);
-							return target.slice(start, end);
-						};
-					},
-				});
-			};
+			// Discovery reads the validated descriptor rather than reopening with Bun.file.
+			// Observe only the handles this scan opens: a FileHandle prototype spy is
+			// process-wide, so unrelated reads from concurrently running tests
+			// interleave and make global counts flaky.
+			const reads: Array<unknown[]> = [];
+			const probe = await fs.open(path.join(skillDir, "SKILL.md"), "r");
+			const fileHandlePrototype = Object.getPrototypeOf(probe) as fs.FileHandle;
+			await probe.close();
+			const originalOpen = nodeFs.promises.open;
+			type OpenArgs = Parameters<typeof nodeFs.promises.open>;
+			const openSpy = vi.spyOn(nodeFs.promises, "open").mockImplementation((async (...args: OpenArgs) => {
+				const handle = await originalOpen(...args);
+				const skillPath = args[0];
+				if (typeof skillPath === "string" && skillPath.endsWith("SKILL.md")) {
+					const originalRead = handle.read.bind(handle);
+					handle.read = (async (...readArgs: never[]) => {
+						reads.push(readArgs as unknown[]);
+						return originalRead(...readArgs);
+					}) as typeof handle.read;
+				}
+				return handle;
+			}) as typeof nodeFs.promises.open);
+			const readFileSpy = vi.spyOn(fileHandlePrototype, "readFile");
 			try {
-				const result = await scanSkillDescriptorsFromDir(makeContext(), {
+				const result = await scanSkillDescriptorsFromDir(makeContext(root), {
 					dir: root,
 					providerId: "test",
 					level: "project",
@@ -45,9 +56,18 @@ describe("skill descriptors", () => {
 				expect(result.items).toHaveLength(1);
 				expect(Object.hasOwn(result.items[0]?.metadata ?? {}, "content")).toBe(false);
 				expect(JSON.stringify(result.items[0]?.metadata)).not.toContain(bodyMarker);
-				expect(sliceEnds).toContain(SKILL_FRONTMATTER_SCAN_BYTES);
+				const boundedReads = reads.filter(
+					call => call[1] === 0 && call[2] === SKILL_FRONTMATTER_SCAN_BYTES && call[3] === 0,
+				);
+				expect(boundedReads).toHaveLength(1);
+				const oversizedReads = reads.filter(
+					call => typeof call[2] === "number" && call[2] > SKILL_FRONTMATTER_SCAN_BYTES,
+				);
+				expect(oversizedReads).toHaveLength(0);
+				expect(readFileSpy).not.toHaveBeenCalled();
 			} finally {
-				(Bun as any).file = originalFile;
+				openSpy.mockRestore();
+				readFileSpy.mockRestore();
 			}
 		} finally {
 			await fs.rm(root, { recursive: true, force: true });
@@ -63,7 +83,7 @@ describe("skill descriptors", () => {
 				path.join(skillDir, "SKILL.md"),
 				`---\nname: unterminated\ndescription: no closing delimiter\n${"x".repeat(SKILL_FRONTMATTER_SCAN_TOTAL_BYTES * 32)}`,
 			);
-			const result = await scanSkillDescriptorsFromDir(makeContext(), {
+			const result = await scanSkillDescriptorsFromDir(makeContext(root), {
 				dir: root,
 				providerId: "test",
 				level: "project",

package/src/system-prompt.ts

@@ -235,6 +235,10 @@ export async function resolvePromptInput(input: string | undefined, description:
 export interface LoadContextFilesOptions {
 	/** Working directory to start walking up from. Default: getProjectDir() */
 	cwd?: string;
+	/** Agent directory backing native user-scope context and system prompt files. */
+	agentDir?: string;
+	/** Resolver-owned classification for `agentDir`; preserve it across HOME/config refreshes. */
+	profileAuthority?: "default" | "custom";
 }
 
 function dedupeExactContextFiles(
@@ -265,7 +269,11 @@ export async function loadProjectContextFilesResult(
 	options: LoadContextFilesOptions = {},
 ): Promise<ProjectContextFilesResult> {
 	const resolvedCwd = options.cwd ?? getProjectDir();
-	const result = await loadCapability(contextFileCapability.id, { cwd: resolvedCwd });
+	const result = await loadCapability(contextFileCapability.id, {
+		cwd: resolvedCwd,
+		agentDir: options.agentDir,
+		profileAuthority: options.profileAuthority,
+	});
 	const items = result.items as ContextFile[];
 
 	// Native user-global context applies everywhere and is least specific, so it
@@ -311,7 +319,11 @@ export async function loadProjectContextFiles(
 export async function loadSystemPromptFiles(options: LoadContextFilesOptions = {}): Promise<string | null> {
 	const resolvedCwd = options.cwd ?? getProjectDir();
 
-	const result = await loadCapability<SystemPromptFile>(systemPromptCapability.id, { cwd: resolvedCwd });
+	const result = await loadCapability<SystemPromptFile>(systemPromptCapability.id, {
+		cwd: resolvedCwd,
+		agentDir: options.agentDir,
+		profileAuthority: options.profileAuthority,
+	});
 
 	if (result.items.length === 0) return null;
 
@@ -374,6 +386,10 @@ export interface BuildSystemPromptOptions {
 	skillsSettings?: SkillsSettings;
 	/** Working directory. Default: getProjectDir() */
 	cwd?: string;
+	/** Agent directory backing native user-scope prompt discovery. */
+	agentDir?: string;
+	/** Resolver-owned classification for `agentDir`; preserve it across HOME/config refreshes. */
+	profileAuthority?: "default" | "custom";
 	/** Pre-loaded context files (skips discovery if provided). */
 	contextFiles?: Array<{ path: string; content: string; depth?: number }>;
 	/** Skills provided directly to system prompt construction. */
@@ -603,10 +619,16 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 
 	const systemPromptCustomizationPromise = logger.time("loadSystemPromptFiles", loadSystemPromptFiles, {
 		cwd: resolvedCwd,
+		agentDir: options.agentDir,
+		profileAuthority: options.profileAuthority,
 	});
 	const contextFilesPromise = providedContextFiles
 		? Promise.resolve({ contextFiles: providedContextFiles, warnings: [] })
-		: logger.time("loadProjectContextFiles", loadProjectContextFilesResult, { cwd: resolvedCwd });
+		: logger.time("loadProjectContextFiles", loadProjectContextFilesResult, {
+				cwd: resolvedCwd,
+				agentDir: options.agentDir,
+				profileAuthority: options.profileAuthority,
+			});
 	const workspaceTreePromise =
 		providedWorkspaceTree !== undefined
 			? Promise.resolve(providedWorkspaceTree)

package/src/task/executor.ts

@@ -281,6 +281,9 @@ export interface ExecutorOptions {
 	authStorage?: AuthStorage;
 	modelRegistry?: ModelRegistry;
 	settings?: Settings;
+	/** Parent session's selected agent directory and immutable resolver-owned authority. */
+	agentDir?: string;
+	profileAuthority?: "default" | "custom";
 	/** Parent session's registry; shared by child sessions for IRC routing and roster visibility. */
 	agentRegistry?: AgentRegistry;
 	/**
@@ -1952,6 +1955,8 @@ export async function runSubprocessOnce(options: ExecutorOptions): Promise<Singl
 			const { session } = await awaitAbortable(
 				canonicalSdk.createAgentSession({
 					cwd: worktree ?? cwd,
+					agentDir: options.agentDir,
+					profileAuthority: options.profileAuthority,
 					authStorage,
 					modelRegistry,
 					settings: subagentSettings,

package/src/task/index.ts

@@ -2337,6 +2337,8 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						modelRegistry: this.session.modelRegistry,
 						agentRegistry: this.session.agentRegistry,
 						settings: this.session.settings,
+						agentDir: this.session.getSessionAgentDir?.() ?? this.session.settings.getAgentDir(),
+						profileAuthority: this.session.profileAuthority,
 						inheritedServiceTier: this.session.serviceTier,
 						contextFiles,
 						skills: availableSkills,
@@ -2421,6 +2423,8 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						modelRegistry: this.session.modelRegistry,
 						agentRegistry: this.session.agentRegistry,
 						settings: this.session.settings,
+						agentDir: this.session.getSessionAgentDir?.() ?? this.session.settings.getAgentDir(),
+						profileAuthority: this.session.profileAuthority,
 						inheritedServiceTier: this.session.serviceTier,
 						contextFiles,
 						skills: availableSkills,

package/src/tools/bash.ts

@@ -103,6 +103,7 @@ const BASH_ERROR_MAX_BYTES = 4096;
 const ARTIFACT_SAVE_DIAGNOSTIC_MAX_BYTES = 256;
 const BASH_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const MASTER_CAPABILITY_ENV = "GJC_MASTER_CAPABILITY";
+const MASTER_OWNER_SESSION_ENV = "GJC_MASTER_OWNER_SESSION_ID";
 const DEFAULT_AUTO_BACKGROUND_THRESHOLD_MS = 60_000;
 const ACP_RELEASE_TIMEOUT_MS = 1_000;
 const READ_ONLY_BASH_ENV: Record<string, string> = {
@@ -186,8 +187,9 @@ function artifactReferenceIsReachable(text: string, result: BashResult | BashInt
 	);
 }
 
-function suffixPrefixOverlap(source: string, target: string): number {
+export function suffixPrefixOverlap(source: string, target: string): number {
 	if (source.length === 0 || target.length === 0) return 0;
+	if (target.startsWith(source)) return source.length;
 	const prefix = new Uint32Array(target.length);
 	for (let index = 1; index < target.length; index += 1) {
 		let length = prefix[index - 1] ?? 0;
@@ -244,10 +246,17 @@ function failureStatusCause(
 	if (result.cancelled) return leadingStatus ?? lastStatus ?? "Command cancelled";
 	if (isInteractiveResult(result) && result.timedOut) return lastStatus ?? "Command timed out";
 	if (result.exitCode === undefined) return "Command failed: missing exit status";
-	if (result.exitCode !== 0) return `Command exited with code ${result.exitCode}`;
+	if (result.exitCode !== 0) return nonZeroExitCause(result);
 	return undefined;
 }
 
+function nonZeroExitCause(result: BashResult | BashInteractiveResult): string {
+	if ("signal" in result && result.signal) {
+		return `Command terminated by ${result.signal} (exit code ${result.exitCode})`;
+	}
+	return `Command exited with code ${result.exitCode}`;
+}
+
 function removeTrailingFailureCause(text: string, cause: string | undefined): string {
 	if (!cause) return text;
 	for (const suffix of [`\n\n${cause}`, `\n${cause}`, cause]) {
@@ -717,7 +726,12 @@ export function masterCommandEnvOverrides(
 	directMasterSpawn: boolean,
 ): Record<string, string> {
 	if (directMasterSpawn) return {};
-	return Object.fromEntries(Object.entries(env ?? {}).filter(([key]) => key !== MASTER_CAPABILITY_ENV));
+	// The master capability is single-use spawn authority and the owner id is
+	// spawn-lineage identity: neither is ambient state for ordinary Bash or a
+	// chained/pipelined descendant (issue #5374).
+	return Object.fromEntries(
+		Object.entries(env ?? {}).filter(([key]) => key !== MASTER_CAPABILITY_ENV && key !== MASTER_OWNER_SESSION_ENV),
+	);
 }
 
 function escapeBashEnvValueForDisplay(value: string): string {
@@ -896,9 +910,8 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			throw new ToolError(formatBashFailureMessage(result, `${outputText}\n\nCommand failed: missing exit status`));
 		}
 		if (result.exitCode !== 0) {
-			throw new ToolError(
-				formatBashFailureMessage(result, `${outputText}\n\nCommand exited with code ${result.exitCode}`),
-			);
+			const cause = nonZeroExitCause(result);
+			throw new ToolError(formatBashFailureMessage(result, `${outputText}\n\n${cause}`));
 		}
 		return outputText;
 	}
@@ -1438,7 +1451,10 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		// command that contained shell syntax into a privileged one.
 		const directMasterSpawn = isStrictDirectSdkSpawnCommand(rawCommand) && isStrictDirectSdkSpawnCommand(command);
 		const masterCapability = directMasterSpawn ? this.session.getMasterBashCapability?.() : undefined;
-		const masterOwnerSessionId = directMasterSpawn ? this.session.getMasterOwnerSessionId?.() : undefined;
+		// Master ownership is lineage identity, not session identity: it travels
+		// under its own variable on every bash env so a master-owned child can
+		// still read its OWN id from GJC_SESSION_ID (issue #5374).
+		const masterOwnerSessionId = this.session.getMasterOwnerSessionId?.();
 		const commandEnvOverrides = masterCommandEnvOverrides(expandedEnv, directMasterSpawn);
 		const resolvedEnv = {
 			...buildGjcRuntimeSessionEnv({
@@ -1451,7 +1467,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				: {}),
 			...commandEnvOverrides,
 			...(masterCapability ? { [MASTER_CAPABILITY_ENV]: masterCapability } : {}),
-			...(masterOwnerSessionId ? { GJC_MASTER_OWNER_SESSION_ID: masterOwnerSessionId } : {}),
+			...(masterOwnerSessionId ? { [MASTER_OWNER_SESSION_ENV]: masterOwnerSessionId } : {}),
 			...(this.session.bashRestrictionProfile === "read-only" ? READ_ONLY_BASH_ENV : {}),
 			...(allowedPrefixes && allowedPrefixes.length > 0 ? { [GJC_RESTRICTED_ROLE_AGENT_BASH_ENV]: "1" } : {}),
 		};
@@ -1503,8 +1519,9 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		resolvedEnv: Record<string, string> | undefined,
 	): Promise<BashResult> {
 		const masterCapability = resolvedEnv?.[MASTER_CAPABILITY_ENV];
+		const ownerSessionId = resolvedEnv?.[MASTER_OWNER_SESSION_ENV];
 		const sessionAgentDir = resolvedEnv?.GJC_CODING_AGENT_DIR;
-		if (masterCapability === undefined || sessionAgentDir === undefined)
+		if (masterCapability === undefined || ownerSessionId === undefined || sessionAgentDir === undefined)
 			throw new ToolError("Master spawn authority context is unavailable.");
 		const args = parseDirectSdkSpawnArgs(command);
 		args.agentDir = sessionAgentDir;
@@ -1512,8 +1529,8 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		const request = runSdkSpawn(args, {
 			env: {
 				...process.env,
-				GJC_MASTER_CAPABILITY: masterCapability,
-				GJC_SESSION_ID: resolvedEnv?.GJC_MASTER_OWNER_SESSION_ID ?? this.session.getSessionId?.() ?? undefined,
+				[MASTER_CAPABILITY_ENV]: masterCapability,
+				[MASTER_OWNER_SESSION_ENV]: ownerSessionId,
 				GJC_CODING_AGENT_DIR: sessionAgentDir,
 			},
 		});

package/src/tools/gh.ts

@@ -2738,7 +2738,14 @@ export async function getOrFetchIssue(options: IssueViewLookupOptions): Promise<
 		}
 	}
 
-	const doFetch = () => fetchIssueViewFresh(options.cwd, repo, identifier, includeComments, options.signal);
+	const doFetch = (signal?: AbortSignal) =>
+		fetchIssueViewFresh(
+			options.cwd,
+			repo,
+			identifier,
+			includeComments,
+			signal && options.signal ? AbortSignal.any([signal, options.signal]) : (signal ?? options.signal),
+		);
 
 	if (!repo || cacheNumber === undefined) {
 		const fresh = await doFetch();
@@ -2752,6 +2759,7 @@ export async function getOrFetchIssue(options: IssueViewLookupOptions): Promise<
 		includeComments,
 		settings: options.settings,
 		authKey,
+		signal: options.signal,
 		fetchFresh: doFetch,
 	});
 	return {
@@ -2771,7 +2779,14 @@ export async function getOrFetchIssue(options: IssueViewLookupOptions): Promise<
 export async function getOrFetchPr(options: PrViewLookupOptions): Promise<ViewLookupResult<GhPrViewData>> {
 	const includeComments = options.includeComments ?? true;
 	const authKey = options.cacheAuthKey === undefined ? (resolveGithubCacheAuthKey() ?? null) : options.cacheAuthKey;
-	const doFetch = () => fetchPrViewFresh(options.cwd, options.repo, options.number, includeComments, options.signal);
+	const doFetch = (signal?: AbortSignal) =>
+		fetchPrViewFresh(
+			options.cwd,
+			options.repo,
+			options.number,
+			includeComments,
+			signal && options.signal ? AbortSignal.any([signal, options.signal]) : (signal ?? options.signal),
+		);
 	const lookup = await getOrFetchView<GhPrViewData>({
 		repo: options.repo,
 		kind: "pr",
@@ -2779,6 +2794,7 @@ export async function getOrFetchPr(options: PrViewLookupOptions): Promise<ViewLo
 		includeComments,
 		settings: options.settings,
 		authKey,
+		signal: options.signal,
 		fetchFresh: doFetch,
 	});
 	return {
@@ -3121,7 +3137,13 @@ async function fetchPrDiffFresh(
  */
 export async function getOrFetchPrDiff(options: PrDiffLookupOptions): Promise<ViewLookupResult<PrDiffPayload>> {
 	const authKey = options.cacheAuthKey === undefined ? (resolveGithubCacheAuthKey() ?? null) : options.cacheAuthKey;
-	const doFetch = () => fetchPrDiffFresh(options.cwd, options.repo, options.number, options.signal);
+	const doFetch = (signal?: AbortSignal) =>
+		fetchPrDiffFresh(
+			options.cwd,
+			options.repo,
+			options.number,
+			signal && options.signal ? AbortSignal.any([signal, options.signal]) : (signal ?? options.signal),
+		);
 	const lookup = await getOrFetchView<PrDiffPayload>({
 		repo: options.repo,
 		kind: "pr-diff",
@@ -3129,6 +3151,7 @@ export async function getOrFetchPrDiff(options: PrDiffLookupOptions): Promise<Vi
 		includeComments: false,
 		settings: options.settings,
 		authKey,
+		signal: options.signal,
 		fetchFresh: doFetch,
 	});
 	return {