@p4code/cli 0.3.22 → 0.3.24

package/dist/bin.mjs

@@ -239,7 +239,7 @@ const make$91 = () => {
 const layer$82 = Layer.sync(NetService, make$91);
 //#endregion
 //#region package.json
-var version = "0.3.22";
+var version = "0.3.24";
 //#endregion
 //#region src/config.ts
 /**
@@ -1619,6 +1619,10 @@ const MODEL_SLUG_ALIASES_BY_PROVIDER = {
 		"gpt-5.3-spark": "gpt-5.3-codex-spark"
 	},
 	[CLAUDE_DRIVER_KIND]: {
+		fable: "claude-fable-5-1",
+		"fable-5.1": "claude-fable-5-1",
+		"fable-5-1": "claude-fable-5-1",
+		"claude-fable-5.1": "claude-fable-5-1",
 		opus: "claude-opus-5",
 		"opus-5": "claude-opus-5",
 		"claude-opus-5.0": "claude-opus-5",
@@ -10569,6 +10573,8 @@ const agentAssetTotalBytes = (files) => files.reduce((total, file) => total + en
 * has. Two definitions of the same rule is how one of them ends up laxer.
 */
 const McpServerName = AgentAssetName;
+/** Provider-neutral session alias for a Claude user-scope server forwarded by p4code. */
+const mcpUserScopeSessionName = (name) => `p4-user-${name}`;
 /**
 * Where a secret goes when it is resolved.
 *
@@ -11683,7 +11689,7 @@ const WsSkillsPublishRpc = Rpc.make(WS_METHODS.skillsPublish, {
 	error: Schema$1.Union([EnvironmentAuthorizationError])
 });
 const WsSkillsPublishAllRpc = Rpc.make(WS_METHODS.skillsPublishAll, {
-	payload: Schema$1.Struct({}),
+	payload: Schema$1.Struct({ kind: Schema$1.optional(AgentAssetKind) }),
 	success: Schema$1.Struct({
 		report: AgentSyncReport,
 		status: AgentSyncStatus
@@ -12922,15 +12928,21 @@ const make$87 = Effect.gen(function* () {
 	};
 	const create = (name, value) => {
 		const secretPath = resolveSecretPath(name);
-		return Effect.scoped(Effect.gen(function* () {
-			const file = yield* fileSystem.open(secretPath, {
-				flag: "wx",
-				mode: 384
-			});
-			yield* file.writeAll(value);
-			yield* file.sync;
-			yield* fileSystem.chmod(secretPath, 384);
-		})).pipe(Effect.mapError((cause) => new SecretStorePersistError({
+		return crypto.randomUUIDv4.pipe(Effect.mapError((cause) => new SecretStoreTemporaryPathError({
+			resource: `secret ${name}`,
+			cause
+		})), Effect.flatMap((uuid) => {
+			const tempPath = `${secretPath}.${uuid}.tmp`;
+			return Effect.scoped(Effect.gen(function* () {
+				const file = yield* fileSystem.open(tempPath, {
+					flag: "wx",
+					mode: 384
+				});
+				yield* file.writeAll(value);
+				yield* file.sync;
+				yield* fileSystem.link(tempPath, secretPath);
+			})).pipe(Effect.ensuring(fileSystem.remove(tempPath).pipe(Effect.ignore)));
+		}), Effect.mapError((cause) => new SecretStorePersistError({
 			resource: `secret ${name}`,
 			cause
 		})));
@@ -21615,6 +21627,8 @@ const make$80 = Effect.gen(function* () {
 	const userPath = claudeUserConfigPath();
 	return {
 		readUser: readAt(userPath),
+		readUserAt: (configDir) => readAt(Effect.succeed(path.join(path.resolve(expandHomePath$3(configDir)), ".claude.json"))),
+		readUserFile: (filePath) => readAt(Effect.succeed(path.resolve(filePath))),
 		upsertUser: (registration) => upsertAt(userPath)(registration),
 		removeUser: (name) => removeAt(userPath)(name),
 		readProject: (projectDir) => readAt(Effect.succeed(projectFile(projectDir))),
@@ -21625,6 +21639,8 @@ const make$80 = Effect.gen(function* () {
 const layer$70 = Layer.effect(ClaudeMcpFiles, make$80);
 Layer.succeed(ClaudeMcpFiles, {
 	readUser: Effect.succeed([]),
+	readUserAt: () => Effect.succeed([]),
+	readUserFile: () => Effect.succeed([]),
 	upsertUser: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
 	removeUser: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
 	readProject: () => Effect.succeed([]),
@@ -22190,61 +22206,84 @@ const make$78 = Effect.gen(function* () {
 		target: slot.target,
 		key: slot.key
 	}), new TextEncoder().encode(value)).pipe(Effect.catchCause((cause) => Effect.logWarning("mcp secret write failed", { cause }).pipe(Effect.asVoid)));
-	return {
-		list,
-		save,
-		remove,
-		setSecret,
-		resolveForSession: Effect.gen(function* () {
-			const registrations = yield* readAll();
-			const resolved = {};
-			for (const registration of registrations) {
-				if (!registration.enabled) continue;
-				const headers = { ...registration.transport === "stdio" ? {} : registration.headers ?? {} };
-				const env = { ...registration.transport === "stdio" ? registration.env ?? {} : {} };
-				let complete = true;
-				for (const slot of slotsOf(registration)) {
-					const value = yield* readSecret(registration.name, slot);
-					if (Option.isNone(value)) {
-						complete = false;
-						break;
-					}
-					if (slot.target === "header") headers[slot.key] = value.value;
-					else env[slot.key] = value.value;
-				}
-				if (!complete) continue;
-				const hasExplicitAuthorization = Object.keys(headers).some((key) => key.toLowerCase() === "authorization");
-				if (registration.transport !== "stdio" && !hasExplicitAuthorization) {
-					const token = yield* oauth.accessTokenFor(registration);
-					if (Option.isSome(token)) headers["Authorization"] = `Bearer ${token.value}`;
+	const resolveForSessionWithUserScope = (readUserScope) => Effect.gen(function* () {
+		const registrations = yield* readAll();
+		const resolved = {};
+		for (const registration of registrations) {
+			if (!registration.enabled) continue;
+			const headers = { ...registration.transport === "stdio" ? {} : registration.headers ?? {} };
+			const env = { ...registration.transport === "stdio" ? registration.env ?? {} : {} };
+			let complete = true;
+			for (const slot of slotsOf(registration)) {
+				const value = yield* readSecret(registration.name, slot);
+				if (Option.isNone(value)) {
+					complete = false;
+					break;
 				}
-				resolved[registration.name] = registration.transport === "stdio" ? {
+				if (slot.target === "header") headers[slot.key] = value.value;
+				else env[slot.key] = value.value;
+			}
+			if (!complete) continue;
+			const hasExplicitAuthorization = Object.keys(headers).some((key) => key.toLowerCase() === "authorization");
+			if (registration.transport !== "stdio" && !hasExplicitAuthorization) {
+				const token = yield* oauth.accessTokenFor(registration);
+				if (Option.isSome(token)) headers["Authorization"] = `Bearer ${token.value}`;
+			}
+			resolved[registration.name] = registration.transport === "stdio" ? {
+				type: "stdio",
+				command: registration.command,
+				args: registration.args ?? [],
+				env
+			} : {
+				type: registration.transport,
+				url: registration.url,
+				headers
+			};
+		}
+		for (const userScope of yield* readUserScope) {
+			if (userScope.name in resolved) continue;
+			const sessionName = mcpUserScopeSessionName(userScope.name);
+			if (sessionName in resolved) {
+				yield* Effect.logWarning("skipped user-scope MCP session alias collision", {
+					server: userScope.name,
+					sessionName
+				});
+				continue;
+			}
+			if (userScope.transport === "stdio") {
+				resolved[sessionName] = {
 					type: "stdio",
-					command: registration.command,
-					args: registration.args ?? [],
-					env
-				} : {
-					type: registration.transport,
-					url: registration.url,
-					headers
+					command: userScope.command,
+					args: userScope.args ?? [],
+					env: userScope.env ?? {}
 				};
+				continue;
 			}
-			for (const userScope of yield* claudeFiles.readUser) {
-				if (userScope.transport === "stdio") continue;
-				if (userScope.name in resolved) continue;
+			const headers = { ...userScope.headers };
+			if (!Object.keys(headers).some((key) => key.toLowerCase() === "authorization")) {
 				const token = yield* oauth.accessTokenFor(userScope);
-				if (Option.isNone(token)) continue;
-				resolved[userScope.name] = {
-					type: userScope.transport,
-					url: userScope.url,
-					headers: {
-						...userScope.headers,
-						Authorization: `Bearer ${token.value}`
-					}
-				};
+				if (Option.isSome(token)) headers["Authorization"] = `Bearer ${token.value}`;
+				else if (Option.isSome(yield* oauth.statusFor(userScope))) continue;
 			}
-			return resolved;
-		}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("mcp registry resolve failed", { cause }).pipe(Effect.as({}))))
+			resolved[sessionName] = {
+				type: userScope.transport,
+				url: userScope.url,
+				headers
+			};
+		}
+		return resolved;
+	}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("mcp registry resolve failed", { cause }).pipe(Effect.as({}))));
+	const resolveForSession = resolveForSessionWithUserScope(claudeFiles.readUser);
+	const resolveForSessionAtClaudeConfigDir = (configDir) => resolveForSessionWithUserScope(claudeFiles.readUserAt(configDir));
+	const resolveForSessionAtClaudeUserConfigPath = (filePath) => resolveForSessionWithUserScope(claudeFiles.readUserFile(filePath));
+	return {
+		list,
+		save,
+		remove,
+		setSecret,
+		resolveForSession,
+		resolveForSessionAtClaudeConfigDir,
+		resolveForSessionAtClaudeUserConfigPath
 	};
 });
 const layer$68 = Layer.effect(McpRegistry, make$78);
@@ -23893,10 +23932,10 @@ const make$75 = Effect.gen(function* () {
 			}]
 		};
 	}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("asset publish failed", { cause }).pipe(Effect.as(EMPTY_REPORT))));
-	const publishAll = Effect.gen(function* () {
+	const publishAll = (kind) => Effect.gen(function* () {
 		if (!(yield* isConfigured)) return EMPTY_REPORT;
 		const status = yield* assetStatus;
-		const candidates = status.entries.filter((entry) => entry.state === "unmanaged");
+		const candidates = status.entries.filter((entry) => entry.state === "unmanaged" && (kind === void 0 || entry.kind === kind));
 		const published = [];
 		const conflicts = [];
 		for (const candidate of candidates) {
@@ -23910,10 +23949,10 @@ const make$75 = Effect.gen(function* () {
 		return {
 			...EMPTY_REPORT,
 			ran: true,
-			roots: status.roots,
+			roots: status.roots.filter((root) => kind === void 0 || root.kind === kind),
 			published,
 			conflicts,
-			refused: status.refused
+			refused: status.refused.filter((refusal) => kind === void 0 || refusal.kind === kind)
 		};
 	}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("asset publish-all failed", { cause }).pipe(Effect.as(EMPTY_REPORT))));
 	const unpublish = ({ kind, name }) => Effect.gen(function* () {
@@ -24673,7 +24712,7 @@ const makeAssetCommands = (words) => {
 			name: nameArgument.pipe(Argument.optional),
 			all: Flag.boolean("all").pipe(Flag.withDescription("Share everything local this machine does not already share."))
 		}).pipe(Command.withDescription(`Share local ${words.plural} through the hub, so every machine gets them.`), Command.withHandler((flags) => runWithSync(flags, ({ sync }) => Effect.gen(function* () {
-			if (flags.all) return yield* sync.publishAll.pipe(Effect.flatMap((report) => Console.log(formatReport(report))));
+			if (flags.all) return yield* sync.publishAll().pipe(Effect.flatMap((report) => Console.log(formatReport(report))));
 			const name = Option.getOrUndefined(flags.name);
 			if (name === void 0) return yield* Console.error(`Name a ${words.singular}, or pass --all to share every unshared one.`);
 			return yield* sync.publish({
@@ -32446,7 +32485,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		const [thread, rows] = yield* Effect.all([getBtwThreadRow({ threadId }), listBtwContextRows({ threadId })]).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getBtwContext:query", "ProjectionSnapshotQuery.getBtwContext:decodeRows")));
 		if (Option.isNone(thread)) return Option.none();
 		let remaining = BTW_CONTEXT_CHARACTER_LIMIT;
-		const newestFirst = [...rows].reverse();
+		const newestFirst = [...rows].toReversed();
 		const retained = [];
 		for (const row of newestFirst) {
 			if (remaining <= 0) break;
@@ -32460,7 +32499,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 		return Option.some({
 			projectId: thread.value.projectId,
 			cwd: thread.value.cwd,
-			messages: retained.reverse()
+			messages: retained.toReversed()
 		});
 	});
 	const getCommandReadModel = () => sql.withTransaction(Effect.all([
@@ -51692,8 +51731,8 @@ function filterQualifiers(filters, viewer) {
 */
 function matchesFilters(item, filters, viewer) {
 	if (filters === void 0) return true;
-	const labels = item.labels.map((label) => label.name.trim().toLowerCase());
-	const holds = (label) => labels.includes(label.trim().toLowerCase());
+	const labels = new Set(item.labels.map((label) => label.name.trim().toLowerCase()));
+	const holds = (label) => labels.has(label.trim().toLowerCase());
 	return (filters.draft === void 0 || item.isDraft === (filters.draft === "only")) && (filters.review === void 0 || (filters.review === "none" ? item.reviewDecision === null : item.reviewDecision === filters.review)) && (filters.checks === void 0 || item.checksState === filters.checks) && (filters.labels === void 0 || filters.labels.every((group) => group.some(holds))) && (filters.excludedLabels === void 0 || !filters.excludedLabels.some(holds)) && (filters.author === void 0 || item.author?.login.toLowerCase() === resolvePullRequestAuthorFilter(filters.author, viewer).toLowerCase());
 }
 function involvementArgs(input) {
@@ -54782,8 +54821,8 @@ const make$29 = Effect.gen(function* () {
 	*/
 	const matchesRowFilters = (item, filters, viewer) => {
 		if (filters === void 0) return true;
-		const labels = item.labels.map((label) => label.name.trim().toLowerCase());
-		const holds = (label) => labels.includes(label.trim().toLowerCase());
+		const labels = new Set(item.labels.map((label) => label.name.trim().toLowerCase()));
+		const holds = (label) => labels.has(label.trim().toLowerCase());
 		return (filters.draft === void 0 || item.isDraft === (filters.draft === "only")) && (filters.review === void 0 || item.reviewDecision === void 0 || (filters.review === "none" ? item.reviewDecision === null : item.reviewDecision === filters.review)) && (filters.labels === void 0 || filters.labels.every((group) => group.some(holds))) && (filters.excludedLabels === void 0 || !filters.excludedLabels.some(holds)) && (filters.author === void 0 || item.author?.login.toLowerCase() === resolvePullRequestAuthorFilter(filters.author, viewer).toLowerCase());
 	};
 	const toEntry = (input) => {
@@ -64243,9 +64282,9 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 				status: yield* assetSync.status
 			};
 		}), { "rpc.aggregate": "skills" }),
-		[WS_METHODS.skillsPublishAll]: (_input) => observeRpcEffect$1(WS_METHODS.skillsPublishAll, Effect.gen(function* () {
+		[WS_METHODS.skillsPublishAll]: (input) => observeRpcEffect$1(WS_METHODS.skillsPublishAll, Effect.gen(function* () {
 			return {
-				report: yield* assetSync.publishAll,
+				report: yield* assetSync.publishAll(input.kind),
 				status: yield* assetSync.status
 			};
 		}), { "rpc.aggregate": "skills" }),
@@ -67185,62 +67224,70 @@ const CLAUDE_PRESENTATION = {
 	displayName: "Claude",
 	showInteractionModeToggle: true
 };
+const MINIMUM_CLAUDE_FABLE_5_1_VERSION = "2.1.257";
 const MINIMUM_CLAUDE_OPUS_5_VERSION = "2.1.219";
 const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
 const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
 const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
+const CLAUDE_FABLE_CAPABILITIES = createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
+	id: "effort",
+	label: "Reasoning",
+	options: [
+		{
+			value: "low",
+			label: "Low"
+		},
+		{
+			value: "medium",
+			label: "Medium"
+		},
+		{
+			value: "high",
+			label: "High",
+			isDefault: true
+		},
+		{
+			value: "xhigh",
+			label: "Extra High"
+		},
+		{
+			value: "max",
+			label: "Max"
+		},
+		{
+			value: "ultracode",
+			label: "Ultracode"
+		},
+		{
+			value: "ultrathink",
+			label: "Ultrathink"
+		}
+	],
+	promptInjectedValues: ["ultrathink"]
+}), buildSelectOptionDescriptor({
+	id: "contextWindow",
+	label: "Context Window",
+	options: [{
+		value: "200k",
+		label: "200k"
+	}, {
+		value: "1m",
+		label: "1M",
+		isDefault: true
+	}]
+})] });
 const BUILT_IN_MODELS = [
+	{
+		slug: "claude-fable-5-1",
+		name: "Claude Fable 5.1",
+		isCustom: false,
+		capabilities: CLAUDE_FABLE_CAPABILITIES
+	},
 	{
 		slug: "claude-fable-5",
 		name: "Claude Fable 5",
 		isCustom: false,
-		capabilities: createModelCapabilities({ optionDescriptors: [buildSelectOptionDescriptor({
-			id: "effort",
-			label: "Reasoning",
-			options: [
-				{
-					value: "low",
-					label: "Low"
-				},
-				{
-					value: "medium",
-					label: "Medium"
-				},
-				{
-					value: "high",
-					label: "High",
-					isDefault: true
-				},
-				{
-					value: "xhigh",
-					label: "Extra High"
-				},
-				{
-					value: "max",
-					label: "Max"
-				},
-				{
-					value: "ultracode",
-					label: "Ultracode"
-				},
-				{
-					value: "ultrathink",
-					label: "Ultrathink"
-				}
-			],
-			promptInjectedValues: ["ultrathink"]
-		}), buildSelectOptionDescriptor({
-			id: "contextWindow",
-			label: "Context Window",
-			options: [{
-				value: "200k",
-				label: "200k"
-			}, {
-				value: "1m",
-				label: "1M",
-				isDefault: true
-			}]
-		})] })
+		capabilities: CLAUDE_FABLE_CAPABILITIES
 	},
 	{
 		slug: "claude-opus-5",
@@ -67572,6 +67619,9 @@ const BUILT_IN_MODELS = [
 function supportsClaudeOpus5(version) {
 	return version ? compareSemverVersions(version, MINIMUM_CLAUDE_OPUS_5_VERSION) >= 0 : false;
 }
+function supportsClaudeFable51(version) {
+	return version ? compareSemverVersions(version, MINIMUM_CLAUDE_FABLE_5_1_VERSION) >= 0 : false;
+}
 function supportsClaudeFable5(version) {
 	return version ? compareSemverVersions(version, MINIMUM_CLAUDE_FABLE_5_VERSION) >= 0 : false;
 }
@@ -67583,6 +67633,7 @@ function supportsClaudeOpus47(version) {
 }
 function getBuiltInClaudeModelsForVersion(version) {
 	return BUILT_IN_MODELS.filter((model) => {
+		if (model.slug === "claude-fable-5-1") return supportsClaudeFable51(version);
 		if (model.slug === "claude-opus-5") return supportsClaudeOpus5(version);
 		if (model.slug === "claude-fable-5") return supportsClaudeFable5(version);
 		if (model.slug === "claude-opus-4-8") return supportsClaudeOpus48(version);
@@ -67590,6 +67641,9 @@ function getBuiltInClaudeModelsForVersion(version) {
 		return true;
 	});
 }
+function formatClaudeFable51UpgradeMessage(version) {
+	return `Claude Code ${version ? `v${version}` : "the installed version"} is too old for Claude Fable 5.1. Upgrade to v${MINIMUM_CLAUDE_FABLE_5_1_VERSION} or newer to access it.`;
+}
 function formatClaudeOpus5UpgradeMessage(version) {
 	return `Claude Code ${version ? `v${version}` : "the installed version"} is too old for Claude Opus 5. Upgrade to v${MINIMUM_CLAUDE_OPUS_5_VERSION} or newer to access it.`;
 }
@@ -67629,7 +67683,7 @@ function resolveClaudeEffort(caps, raw) {
 function normalizeClaudeCliEffort(effort, model) {
 	if (!effort || effort === "ultrathink") return;
 	if (effort === "ultracode") return "xhigh";
-	if (effort === "xhigh" && model !== "claude-fable-5" && model !== "claude-opus-5" && model !== "claude-opus-4-8" && model !== "claude-sonnet-5") return "max";
+	if (effort === "xhigh" && model !== "claude-fable-5-1" && model !== "claude-fable-5" && model !== "claude-opus-5" && model !== "claude-opus-4-8" && model !== "claude-sonnet-5") return "max";
 	if (effort === "max" && model === "claude-sonnet-4-6") return "high";
 	return effort;
 }
@@ -67910,7 +67964,7 @@ const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(functio
 		});
 	}
 	const models = providerModelsFromSettings(getBuiltInClaudeModelsForVersion(parsedVersion), claudeSettings.customModels, DEFAULT_CLAUDE_MODEL_CAPABILITIES);
-	const versionUpgradeMessage = supportsClaudeOpus5(parsedVersion) ? void 0 : supportsClaudeFable5(parsedVersion) ? formatClaudeOpus5UpgradeMessage(parsedVersion) : supportsClaudeOpus48(parsedVersion) ? formatClaudeFable5UpgradeMessage(parsedVersion) : supportsClaudeOpus47(parsedVersion) ? formatClaudeOpus48UpgradeMessage(parsedVersion) : formatClaudeOpus47UpgradeMessage(parsedVersion);
+	const versionUpgradeMessage = supportsClaudeFable51(parsedVersion) ? void 0 : supportsClaudeOpus5(parsedVersion) ? formatClaudeFable51UpgradeMessage(parsedVersion) : supportsClaudeFable5(parsedVersion) ? formatClaudeOpus5UpgradeMessage(parsedVersion) : supportsClaudeOpus48(parsedVersion) ? formatClaudeFable5UpgradeMessage(parsedVersion) : supportsClaudeOpus47(parsedVersion) ? formatClaudeOpus48UpgradeMessage(parsedVersion) : formatClaudeOpus47UpgradeMessage(parsedVersion);
 	const capabilities = resolveCapabilities ? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => void 0)) : void 0;
 	const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment, disabledSkills);
 	const dedupedSlashCommands = dedupeSlashCommands(capabilities?.slashCommands ?? []);
@@ -71026,7 +71080,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 			...skillOverrides ? { skillOverrides } : {}
 		};
 		const mcpSession = readMcpProviderSession(input.threadId);
-		const externalMcpServers = options?.resolveMcpServers === void 0 ? {} : yield* options.resolveMcpServers;
+		const externalMcpServers = options?.resolveMcpServers === void 0 ? {} : yield* options.resolveMcpServers(input.cwd);
 		const narrateBeforeTools = options?.resolveToolCallNarration === void 0 ? DEFAULT_SERVER_SETTINGS.enableToolCallNarration : yield* options.resolveToolCallNarration;
 		const guardrailSettings = options?.resolveGuardrailPrompts === void 0 ? {
 			enableVerificationBeforeCompletion: DEFAULT_SERVER_SETTINGS.enableVerificationBeforeCompletion,
@@ -71519,24 +71573,23 @@ const ClaudeDriver = {
 			continuationGroupKey
 		});
 		const mcpRegistry = yield* McpRegistry;
+		const hasExplicitClaudeConfigDir = effectiveConfig.homePath.trim().length > 0 || (processEnv.CLAUDE_CONFIG_DIR?.trim().length ?? 0) > 0;
+		const resolveMcpServers = (workspace) => (hasExplicitClaudeConfigDir ? resolveClaudeConfigDirPath(effectiveConfig, processEnv, workspace).pipe(Effect.map((configDir) => path.join(configDir, ".claude.json")), Effect.provideService(Path.Path, path)) : Effect.succeed(path.join(NodeOS.homedir(), ".claude.json"))).pipe(Effect.flatMap(mcpRegistry.resolveForSessionAtClaudeUserConfigPath));
 		const resolveDisabledSkills = serverSettings.getSettings.pipe(Effect.map((settings) => settings.disabledSkills), Effect.orElseSucceed(() => []));
-		const resolveToolCallNarration = serverSettings.getSettings.pipe(Effect.map((settings) => settings.enableToolCallNarration), Effect.orElseSucceed(() => DEFAULT_SERVER_SETTINGS.enableToolCallNarration));
-		const resolveGuardrailPrompts = serverSettings.getSettings.pipe(Effect.map((settings) => ({
-			enableVerificationBeforeCompletion: settings.enableVerificationBeforeCompletion,
-			enableRootCauseBeforeFix: settings.enableRootCauseBeforeFix
-		})), Effect.orElseSucceed(() => ({
-			enableVerificationBeforeCompletion: DEFAULT_SERVER_SETTINGS.enableVerificationBeforeCompletion,
-			enableRootCauseBeforeFix: DEFAULT_SERVER_SETTINGS.enableRootCauseBeforeFix
-		})));
-		const resolveUnpromptedSubagents = serverSettings.getSettings.pipe(Effect.map((settings) => settings.enableUnpromptedSubagents), Effect.orElseSucceed(() => DEFAULT_SERVER_SETTINGS.enableUnpromptedSubagents));
 		const adapter = yield* makeClaudeAdapter(effectiveConfig, {
 			instanceId,
 			environment: processEnv,
-			resolveMcpServers: mcpRegistry.resolveForSession,
+			resolveMcpServers,
 			resolveDisabledSkills,
-			resolveToolCallNarration,
-			resolveGuardrailPrompts,
-			resolveUnpromptedSubagents,
+			resolveToolCallNarration: serverSettings.getSettings.pipe(Effect.map((settings) => settings.enableToolCallNarration), Effect.orElseSucceed(() => DEFAULT_SERVER_SETTINGS.enableToolCallNarration)),
+			resolveGuardrailPrompts: serverSettings.getSettings.pipe(Effect.map((settings) => ({
+				enableVerificationBeforeCompletion: settings.enableVerificationBeforeCompletion,
+				enableRootCauseBeforeFix: settings.enableRootCauseBeforeFix
+			})), Effect.orElseSucceed(() => ({
+				enableVerificationBeforeCompletion: DEFAULT_SERVER_SETTINGS.enableVerificationBeforeCompletion,
+				enableRootCauseBeforeFix: DEFAULT_SERVER_SETTINGS.enableRootCauseBeforeFix
+			}))),
+			resolveUnpromptedSubagents: serverSettings.getSettings.pipe(Effect.map((settings) => settings.enableUnpromptedSubagents), Effect.orElseSucceed(() => DEFAULT_SERVER_SETTINGS.enableUnpromptedSubagents)),
 			...eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}
 		});
 		const textGeneration = yield* makeClaudeTextGeneration(effectiveConfig, processEnv);
@@ -90707,8 +90760,8 @@ const ANSI_ESCAPE_REGEX = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g
 const CODEX_STDERR_LOG_REGEX = /^\d{4}-\d{2}-\d{2}T\S+\s+(TRACE|DEBUG|INFO|WARN|ERROR)\s+\S+:\s+(.*)$/;
 const BENIGN_ERROR_LOG_SNIPPETS = ["state db missing rollout path for thread", "state db record_discrepancy: find_thread_path_by_id_str_in_subdir, falling_back"];
 const CODEX_APP_SERVER_FORCE_KILL_AFTER = "2 seconds";
-const PATH_DELIMITER = process.platform === "win32" ? ";" : ":";
-const PATH_SEPARATOR = process.platform === "win32" ? "\\" : "/";
+const PATH_DELIMITER = NodePath.delimiter;
+const PATH_SEPARATOR = NodePath.sep;
 const RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS = [
 	"not found",
 	"missing thread",

package/dist/client/assets/{DiffPanel-C8kzGnED.js → DiffPanel-DagtjUZ5.js}

@@ -1,4 +1,4 @@
-import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}from"./compiler-runtime-CLAvuQ-D.js";import{$c as i,Ca as a,Cl as o,Da as s,Et as c,Fa as ee,Fr as te,Ia as l,La as u,Na as d,Oa as f,Pa as ne,Pl as re,Qc as p,_n as ie,ba as m,cu as h,el as g,gt as _,h as v,ht as y,kl as b,kr as ae,ot as x,tl as S,vl as oe,vt as C,wr as w,x as T,xn as E,zl as se}from"./previewAssetResource-07-U9fAE.js";import{a as D,i as ce,n as O,o as k,r as A,s as j,t as M}from"./toggle-group-4rxcmFeq.js";import{F as le,Fr as ue,I as de,J as fe,L as pe,Lr as me,Mr as he,Nr as ge,R as N,Sr as _e,Y as ve,_ as ye,at as be,ci as xe,cr as Se,ct as Ce,dr as we,fr as Te,gr as Ee,h as De,it as Oe,jr as ke,lr as Ae,lt as P,mr as je,oi as Me,or as Ne,ot as Pe,pr as Fe,rt as Ie,si as Le,sr as Re,st as ze,ur as Be,zr as Ve}from"./index-CDiCN7pg.js";import{a as He,n as Ue}from"./fileCommentAnnotations-6Dxr1gdD.js";var We=S(`pilcrow`,[[`path`,{d:`M13 4v16`,key:`8vvj80`}],[`path`,{d:`M17 4v16`,key:`7dpous`}],[`path`,{d:`M19 4H9.5a4.5 4.5 0 0 0 0 9H13`,key:`sh4n9v`}]]),F=e(n(),1);function Ge({threadRef:e,filePath:t,activeCwd:n,openInEditor:r,openFileSurface:i}){if(e){if(i){i(t);return}x.getState().openFile(e,t);return}r(n?v(t,n):t)}var I=r();function Ke(e,t){let n=(0,I.c)(4),r=Ee(e,t),i;return n[0]!==r.data||n[1]!==r.error||n[2]!==r.isPending?(i={data:r.data,error:r.error,isPending:r.isPending},n[0]=r.data,n[1]=r.error,n[2]=r.isPending,n[3]=i):i=n[3],i}var L=t(),qe=[];function Je(e){return(e.endSide??e.side)===`deletions`?`deletions`:`additions`}function R(e,t,n){let r=Je(t),i=e.findIndex(e=>e.side===r&&e.lineNumber===t.end);return i<0?[...e,{side:r,lineNumber:t.end,metadata:{entries:[n]}}]:e.map((e,t)=>t===i?{...e,metadata:{entries:[...e.metadata.entries,n]}}:e)}function Ye(e){let t=(0,I.c)(50),{files:n,sectionId:r,sectionTitle:i,composerDraftTarget:a,options:o,viewerRef:s,className:c,renderHeaderPrefix:ee}=e,l=w(Qe),u=w(B),d;t[0]===a?d=t[1]:(d=e=>e.getComposerDraft(a)?.reviewComments??qe,t[0]=a,t[1]=d);let f=w(d),[ne,re]=(0,F.useState)(null),[p,ie]=(0,F.useState)(null),m;t[2]===n?m=t[3]:(m=new Map(n.map(Ze)),t[2]=n,t[3]=m);let h=m,g;if(t[4]!==p||t[5]!==n||t[6]!==f||t[7]!==r){let e;t[9]!==p||t[10]!==f||t[11]!==r?(e=e=>{let{fileDiff:t,filePath:n,fileKey:i,collapsed:a}=e,o=f.filter(e=>e.sectionId===r&&e.filePath===n&&(e.fenceLanguage??`diff`)===`diff`).reduce((e,n)=>{let r=te(t,n);return r?R(e,r,{id:n.id,kind:`comment`,range:r,rangeLabel:n.rangeLabel,text:n.text}):e},[]),s=p?.fileKey===i?[...o,p.annotation]:o;return{id:i,type:`diff`,fileDiff:t,annotations:s,collapsed:a,version:Oe(`${a?`1`:`0`}:${s.flatMap(z).join(`:`)}`)}},t[9]=p,t[10]=f,t[11]=r,t[12]=e):e=t[12],g=n.map(e),t[4]=p,t[5]=n,t[6]=f,t[7]=r,t[8]=g}else g=t[8];let _=g,v;t[13]!==a||t[14]!==p?.annotation||t[15]!==u?(v=e=>{re(null),p?.annotation.metadata.entries.some(t=>t.id===e)?ie(null):u(a,e)},t[13]=a,t[14]=p?.annotation,t[15]=u,t[16]=v):v=t[16];let y=v,b;t[17]!==l||t[18]!==a||t[19]!==p||t[20]!==h||t[21]!==r||t[22]!==i?(b=(e,t)=>{let n=p?.annotation.metadata.entries.find(t=>t.id===e),o=p?h.get(p.fileKey):void 0;if(!n||!o)return;let s=ae({id:n.id,sectionId:r,sectionTitle:i,filePath:o.filePath,fileDiff:o.fileDiff,range:n.range,text:t});s&&l(a,s),re(null),ie(null)},t[17]=l,t[18]=a,t[19]=p,t[20]=h,t[21]=r,t[22]=i,t[23]=b):b=t[23];let x=b,S;t[24]!==h||t[25]!==r||t[26]!==i?(S=(e,t)=>{if(!e)return;let n=t.item;if(n.type!==`diff`)return;let a=h.get(n.id);if(!a)return;let o=Ue(),s=ae({id:o,sectionId:r,sectionTitle:i,filePath:a.filePath,fileDiff:a.fileDiff,range:e,text:``});s&&ie({fileKey:n.id,annotation:{side:Je(e),lineNumber:e.end,metadata:{entries:[{id:o,kind:`draft`,range:e,rangeLabel:s.rangeLabel,text:``}]}}})},t[24]=h,t[25]=r,t[26]=i,t[27]=S):S=t[27];let oe=S,C=p!==null,T;t[28]===s?T=t[29]:(T=s?{ref:s}:{},t[28]=s,t[29]=T);let E;t[30]===c?E=t[31]:(E=c?{className:c}:{},t[30]=c,t[31]=E);let se=!C,ce=!C,O;t[32]!==oe||t[33]!==o||t[34]!==ce||t[35]!==se?(O={...o,enableGutterUtility:se,enableLineSelection:ce,onLineSelectionEnd:oe},t[32]=oe,t[33]=o,t[34]=ce,t[35]=se,t[36]=O):O=t[36];let k;t[37]===ee?k=t[38]:(k=e=>e.type===`diff`?ee(e.fileDiff,e.id,e.collapsed===!0):null,t[37]=ee,t[38]=k);let A;t[39]!==y||t[40]!==x?(A=e=>(0,L.jsx)(`div`,{className:`py-1`,children:e.metadata.entries.map(e=>(0,L.jsx)(He,{kind:e.kind,rangeLabel:e.rangeLabel,text:e.text,onCancel:()=>y(e.id),onComment:t=>x(e.id,t),onDelete:()=>y(e.id)},e.id))}),t[39]=y,t[40]=x,t[41]=A):A=t[41];let j;return t[42]!==_||t[43]!==ne||t[44]!==O||t[45]!==k||t[46]!==A||t[47]!==T||t[48]!==E?(j=(0,L.jsx)(D,{...T,...E,items:_,selectedLines:ne,onSelectedLinesChange:re,options:O,renderHeaderPrefix:k,renderAnnotation:A}),t[42]=_,t[43]=ne,t[44]=O,t[45]=k,t[46]=A,t[47]=T,t[48]=E,t[49]=j):j=t[49],j}function z(e){return e.metadata.entries.map(Xe)}function Xe(e){return`${e.id}:${e.rangeLabel}:${e.text}`}function Ze(e){return[e.fileKey,e]}function B(e){return e.removeReviewComment}function Qe(e){return e.addReviewComment}function $e(e){return{diffPreview:o(e,{label:`environment-data:review:diff-preview`,tag:h.reviewGetDiffPreview,staleTimeMs:5e3})}}var et=$e(E);function V(e){return e.remoteName&&e.name.startsWith(`${e.remoteName}/`)?e.name.slice(e.remoteName.length+1):e.name}function tt(e,t){let n=new Set(t),r=e.map(e=>{let r=t.filter(t=>n.has(t)&&V(t)===e.name),i=r.find(e=>e.remoteName===`origin`)??r[0]??null;return i&&n.delete(i),{id:`local:${e.name}`,label:e.name,local:e,remote:i}}),i=t.filter(e=>n.has(e)).map(e=>({id:`remote:${e.name}`,label:e.name,local:null,remote:e}));return[...r,...i]}function nt(e,t){let n=t.trim().toLocaleLowerCase();return n.length===0?e:e.filter(e=>e.label.toLocaleLowerCase().includes(n)||e.local?.name.toLocaleLowerCase().includes(n)===!0||e.remote?.name.toLocaleLowerCase().includes(n)===!0)}var H=`__automatic_base_ref__`,rt=new Set,it=`
+import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}from"./compiler-runtime-CLAvuQ-D.js";import{$c as i,Ca as a,Cl as o,Da as s,Et as c,Fa as ee,Fr as te,Ia as l,La as u,Na as d,Oa as f,Pa as ne,Pl as re,Qc as p,_n as ie,ba as m,cu as h,el as g,gt as _,h as v,ht as y,kl as b,kr as ae,ot as x,tl as S,vl as oe,vt as C,wr as w,x as T,xn as E,zl as se}from"./previewAssetResource-DvTqD816.js";import{a as D,i as ce,n as O,o as k,r as A,s as j,t as M}from"./toggle-group-BUlsuw8Z.js";import{F as le,Fr as ue,I as de,J as fe,L as pe,Lr as me,Mr as he,Nr as ge,R as N,Sr as _e,Y as ve,_ as ye,at as be,ci as xe,cr as Se,ct as Ce,dr as we,fr as Te,gr as Ee,h as De,it as Oe,jr as ke,lr as Ae,lt as P,mr as je,oi as Me,or as Ne,ot as Pe,pr as Fe,rt as Ie,si as Le,sr as Re,st as ze,ur as Be,zr as Ve}from"./index-fMAeFrHc.js";import{a as He,n as Ue}from"./fileCommentAnnotations-CHfu1OPg.js";var We=S(`pilcrow`,[[`path`,{d:`M13 4v16`,key:`8vvj80`}],[`path`,{d:`M17 4v16`,key:`7dpous`}],[`path`,{d:`M19 4H9.5a4.5 4.5 0 0 0 0 9H13`,key:`sh4n9v`}]]),F=e(n(),1);function Ge({threadRef:e,filePath:t,activeCwd:n,openInEditor:r,openFileSurface:i}){if(e){if(i){i(t);return}x.getState().openFile(e,t);return}r(n?v(t,n):t)}var I=r();function Ke(e,t){let n=(0,I.c)(4),r=Ee(e,t),i;return n[0]!==r.data||n[1]!==r.error||n[2]!==r.isPending?(i={data:r.data,error:r.error,isPending:r.isPending},n[0]=r.data,n[1]=r.error,n[2]=r.isPending,n[3]=i):i=n[3],i}var L=t(),qe=[];function Je(e){return(e.endSide??e.side)===`deletions`?`deletions`:`additions`}function R(e,t,n){let r=Je(t),i=e.findIndex(e=>e.side===r&&e.lineNumber===t.end);return i<0?[...e,{side:r,lineNumber:t.end,metadata:{entries:[n]}}]:e.map((e,t)=>t===i?{...e,metadata:{entries:[...e.metadata.entries,n]}}:e)}function Ye(e){let t=(0,I.c)(50),{files:n,sectionId:r,sectionTitle:i,composerDraftTarget:a,options:o,viewerRef:s,className:c,renderHeaderPrefix:ee}=e,l=w(Qe),u=w(B),d;t[0]===a?d=t[1]:(d=e=>e.getComposerDraft(a)?.reviewComments??qe,t[0]=a,t[1]=d);let f=w(d),[ne,re]=(0,F.useState)(null),[p,ie]=(0,F.useState)(null),m;t[2]===n?m=t[3]:(m=new Map(n.map(Ze)),t[2]=n,t[3]=m);let h=m,g;if(t[4]!==p||t[5]!==n||t[6]!==f||t[7]!==r){let e;t[9]!==p||t[10]!==f||t[11]!==r?(e=e=>{let{fileDiff:t,filePath:n,fileKey:i,collapsed:a}=e,o=f.filter(e=>e.sectionId===r&&e.filePath===n&&(e.fenceLanguage??`diff`)===`diff`).reduce((e,n)=>{let r=te(t,n);return r?R(e,r,{id:n.id,kind:`comment`,range:r,rangeLabel:n.rangeLabel,text:n.text}):e},[]),s=p?.fileKey===i?[...o,p.annotation]:o;return{id:i,type:`diff`,fileDiff:t,annotations:s,collapsed:a,version:Oe(`${a?`1`:`0`}:${s.flatMap(z).join(`:`)}`)}},t[9]=p,t[10]=f,t[11]=r,t[12]=e):e=t[12],g=n.map(e),t[4]=p,t[5]=n,t[6]=f,t[7]=r,t[8]=g}else g=t[8];let _=g,v;t[13]!==a||t[14]!==p?.annotation||t[15]!==u?(v=e=>{re(null),p?.annotation.metadata.entries.some(t=>t.id===e)?ie(null):u(a,e)},t[13]=a,t[14]=p?.annotation,t[15]=u,t[16]=v):v=t[16];let y=v,b;t[17]!==l||t[18]!==a||t[19]!==p||t[20]!==h||t[21]!==r||t[22]!==i?(b=(e,t)=>{let n=p?.annotation.metadata.entries.find(t=>t.id===e),o=p?h.get(p.fileKey):void 0;if(!n||!o)return;let s=ae({id:n.id,sectionId:r,sectionTitle:i,filePath:o.filePath,fileDiff:o.fileDiff,range:n.range,text:t});s&&l(a,s),re(null),ie(null)},t[17]=l,t[18]=a,t[19]=p,t[20]=h,t[21]=r,t[22]=i,t[23]=b):b=t[23];let x=b,S;t[24]!==h||t[25]!==r||t[26]!==i?(S=(e,t)=>{if(!e)return;let n=t.item;if(n.type!==`diff`)return;let a=h.get(n.id);if(!a)return;let o=Ue(),s=ae({id:o,sectionId:r,sectionTitle:i,filePath:a.filePath,fileDiff:a.fileDiff,range:e,text:``});s&&ie({fileKey:n.id,annotation:{side:Je(e),lineNumber:e.end,metadata:{entries:[{id:o,kind:`draft`,range:e,rangeLabel:s.rangeLabel,text:``}]}}})},t[24]=h,t[25]=r,t[26]=i,t[27]=S):S=t[27];let oe=S,C=p!==null,T;t[28]===s?T=t[29]:(T=s?{ref:s}:{},t[28]=s,t[29]=T);let E;t[30]===c?E=t[31]:(E=c?{className:c}:{},t[30]=c,t[31]=E);let se=!C,ce=!C,O;t[32]!==oe||t[33]!==o||t[34]!==ce||t[35]!==se?(O={...o,enableGutterUtility:se,enableLineSelection:ce,onLineSelectionEnd:oe},t[32]=oe,t[33]=o,t[34]=ce,t[35]=se,t[36]=O):O=t[36];let k;t[37]===ee?k=t[38]:(k=e=>e.type===`diff`?ee(e.fileDiff,e.id,e.collapsed===!0):null,t[37]=ee,t[38]=k);let A;t[39]!==y||t[40]!==x?(A=e=>(0,L.jsx)(`div`,{className:`py-1`,children:e.metadata.entries.map(e=>(0,L.jsx)(He,{kind:e.kind,rangeLabel:e.rangeLabel,text:e.text,onCancel:()=>y(e.id),onComment:t=>x(e.id,t),onDelete:()=>y(e.id)},e.id))}),t[39]=y,t[40]=x,t[41]=A):A=t[41];let j;return t[42]!==_||t[43]!==ne||t[44]!==O||t[45]!==k||t[46]!==A||t[47]!==T||t[48]!==E?(j=(0,L.jsx)(D,{...T,...E,items:_,selectedLines:ne,onSelectedLinesChange:re,options:O,renderHeaderPrefix:k,renderAnnotation:A}),t[42]=_,t[43]=ne,t[44]=O,t[45]=k,t[46]=A,t[47]=T,t[48]=E,t[49]=j):j=t[49],j}function z(e){return e.metadata.entries.map(Xe)}function Xe(e){return`${e.id}:${e.rangeLabel}:${e.text}`}function Ze(e){return[e.fileKey,e]}function B(e){return e.removeReviewComment}function Qe(e){return e.addReviewComment}function $e(e){return{diffPreview:o(e,{label:`environment-data:review:diff-preview`,tag:h.reviewGetDiffPreview,staleTimeMs:5e3})}}var et=$e(E);function V(e){return e.remoteName&&e.name.startsWith(`${e.remoteName}/`)?e.name.slice(e.remoteName.length+1):e.name}function tt(e,t){let n=new Set(t),r=e.map(e=>{let r=t.filter(t=>n.has(t)&&V(t)===e.name),i=r.find(e=>e.remoteName===`origin`)??r[0]??null;return i&&n.delete(i),{id:`local:${e.name}`,label:e.name,local:e,remote:i}}),i=t.filter(e=>n.has(e)).map(e=>({id:`remote:${e.name}`,label:e.name,local:null,remote:e}));return[...r,...i]}function nt(e,t){let n=t.trim().toLocaleLowerCase();return n.length===0?e:e.filter(e=>e.label.toLocaleLowerCase().includes(n)||e.local?.name.toLocaleLowerCase().includes(n)===!0||e.remote?.name.toLocaleLowerCase().includes(n)===!0)}var H=`__automatic_base_ref__`,rt=new Set,it=`
 [data-diffs-header],
 [data-diff],
 [data-file],
@@ -95,4 +95,4 @@ import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}f
   text-decoration-color: currentColor;
 }
 `;function U({mode:e=`inline`,composerDraftTarget:t,initialGitScope:n,threadRef:r}){let{resolvedTheme:o}=T(),te=ue(),[h]=(0,F.useState)(n),[v,ae]=(0,F.useState)(`stacked`),[x,S]=(0,F.useState)(te.wordWrap),[w,E]=(0,F.useState)(te.diffIgnoreWhitespace),[D,ye]=(0,F.useState)(``),[Ee,Oe]=(0,F.useState)(()=>({scopeKey:null,fileKeys:rt})),He=(0,F.useRef)(null),Ue=r.threadId,I=ge(r),qe=I?.projectId??null,Je=he(I&&qe?{environmentId:I.environmentId,projectId:qe}:null),R=I?.worktreePath??Je?.workspaceRoot,z=oe(ie.configValueAtom(I?.environmentId??null)),Xe=je(I?.environmentId??null,z?.availableEditors??[]),Ze=c(I!=null&&R!=null?ke.status({environmentId:I.environmentId,input:{cwd:R}}):null),B=N(e=>pe(e.byThreadKey,r,h===`unstaged`)),Qe=Ze.data?.isRepo??!0,{turnDiffSummaries:$e,inferredCheckpointTurnCountByTurnId:V}=de(I),U=(0,F.useMemo)(()=>[...$e].toSorted((e,t)=>{let n=e.checkpointTurnCount??V[e.turnId]??0,r=t.checkpointTurnCount??V[t.turnId]??0;return n===r?t.completedAt.localeCompare(e.completedAt):r-n}),[V,$e]);(0,F.useEffect)(()=>{B.kind===`turn`&&N.getState().reconcileTurnSelection(r,U.map(e=>e.turnId))},[B,U,r]);let W=B.kind===`turn`?B.turnId:null,G=B.kind===`unstaged`?`unstaged`:`branch`,K=B.kind===`branch`?B.baseRef:null,at=B.kind===`turn`?B.filePath:null,ot=B.kind===`turn`?B.revealRequestId:0,q=W===null?void 0:U.find(e=>e.turnId===W)??U[0],J=q&&(q.checkpointTurnCount??V[q.turnId]),st=U[0],ct=W===null?G===`unstaged`?`Working tree`:`Branch changes`:q?.turnId===st?.turnId?`Latest turn`:`Turn ${J??`?`}`,lt=q?`turn:${q.turnId}`:G,Y=`${r.environmentId}:${r.threadId}:${lt}`,ut=Ee.scopeKey===Y?Ee.fileKeys:rt,dt=q?`Turn ${J??`?`}`:G===`unstaged`?`Working tree`:`Branch changes`,ft=(0,F.useMemo)(()=>typeof J==`number`?{fromTurnCount:Math.max(0,J-1),toTurnCount:J}:null,[J]),pt=Ke({environmentId:I?.environmentId??null,threadId:Ue,fromTurnCount:ft?.fromTurnCount??null,toTurnCount:ft?.toTurnCount??null,ignoreWhitespace:w,cacheScope:q?`turn:${q.turnId}`:null},{enabled:Qe&&q!==void 0}),mt=c(W===null&&I&&R?et.diffPreview({environmentId:I.environmentId,input:{cwd:R,...K?{baseRef:K}:{},ignoreWhitespace:w}}):null),ht=W===null&&mt.error?.includes(`configured workspace root`)===!0&&z?.cwd!==void 0&&z.cwd!==R,gt=c(ht&&I&&z?et.diffPreview({environmentId:I.environmentId,input:{cwd:z.cwd,...K?{baseRef:K}:{},ignoreWhitespace:w}}):null),X=ht?gt:mt,Z=X.data?.sources.find(e=>e.kind===(G===`unstaged`?`working-tree`:`branch-range`)),_t=c(W===null&&G===`branch`&&I&&X.data?.cwd?ke.listRefs({environmentId:I.environmentId,input:{cwd:X.data.cwd,includeMatchingRemoteRefs:!0,refKind:`local`,...D.trim().length>0?{query:D.trim()}:{},limit:100}}):null),vt=c(W===null&&G===`branch`&&I&&X.data?.cwd?ke.listRefs({environmentId:I.environmentId,input:{cwd:X.data.cwd,includeMatchingRemoteRefs:!0,refKind:`remote`,...D.trim().length>0?{query:D.trim()}:{},limit:100}}):null),yt=tt(_t.data?.refs.filter(e=>e.name!==Z?.headRef)??[],vt.data?.refs??[]),bt=nt(yt,D),xt=e=>K&&K===e.remote?.name?K:e.local?.name??e.remote?.name??e.id,St=[H,...yt.map(xt)],Ct=[...D.trim().length===0?[H]:[],...bt.map(xt)],wt=Z?.diff,Tt=q?pt.data?.diff:wt,Et=!q&&Z?.truncated===!0,Dt=q?pt.isPending:X.isPending,Ot=q?pt.error:X.error,kt=typeof Tt==`string`&&Tt.trim().length===0,Q=(0,F.useMemo)(()=>ze(Tt,`diff-panel:${o}`,{compactPartialHunkOffsets:W===null}),[o,Tt,W]),At=(0,F.useMemo)(()=>!Q||Q.kind!==`files`?[]:Q.files.toSorted((e,t)=>P(e).localeCompare(P(t),void 0,{numeric:!0,sensitivity:`base`})),[Q]),$=(0,F.useMemo)(()=>At.map(e=>{let t=Ie(e);return{fileDiff:e,filePath:P(e),fileKey:t,collapsed:ut.has(t)}}),[ut,At]),jt=(0,F.useMemo)(()=>$.map(e=>e.fileKey),[$]),Mt=A(jt,ut),Nt=(0,F.useMemo)(()=>Pe(At),[At]);(0,F.useEffect)(()=>{if(!at)return;let e=$.find(e=>e.filePath===at);e&&He.current?.scrollTo({type:`item`,id:e.fileKey,align:`start`})},[$,at,ot]);let Pt=le({threadRef:r,workspaceRoot:R??null}),Ft=(0,F.useCallback)(e=>{Ge({threadRef:r,filePath:e,activeCwd:R,openFileSurface:Pt,openInEditor:e=>{(async()=>{let t=await Xe(e);t._tag===`Failure`&&!b(t)&&console.warn(`Failed to open diff file in editor.`,{operation:`open-diff-file`,environmentId:r.environmentId,threadId:r.threadId,...se(re(t))})})()}})},[R,Pt,Xe,r]),It=(0,F.useCallback)(e=>{Oe(t=>{let n=new Set(t.scopeKey===Y?t.fileKeys:[]);return n.has(e)?n.delete(e):n.add(e),{scopeKey:Y,fileKeys:n}})},[Y]),Lt=(0,F.useCallback)(()=>{Oe(e=>{let t=e.scopeKey===Y?e.fileKeys:rt;return{scopeKey:Y,fileKeys:ce(jt,t)}})},[Y,jt]),Rt=e=>{N.getState().selectTurn(r,e)},zt=e=>{N.getState().selectGitScope(r,e)},Bt=e=>{N.getState().selectBranchBaseRef(r,e)};return(0,L.jsx)(ve,{mode:e,header:(0,L.jsxs)(L.Fragment,{children:[(0,L.jsxs)(`div`,{className:`flex min-w-0 flex-1 items-center gap-3 [-webkit-app-region:no-drag]`,children:[(0,L.jsxs)(a,{children:[(0,L.jsxs)(l,{className:`inline-flex h-6 max-w-full items-center gap-1 rounded-md bg-muted/70 px-2 text-xs font-medium text-foreground outline-none transition-colors hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring`,"aria-label":`Diff scope: ${ct}`,children:[(0,L.jsx)(`span`,{className:`truncate`,children:ct}),(0,L.jsx)(i,{className:`size-3.5 shrink-0 text-muted-foreground`})]}),(0,L.jsxs)(f,{align:`start`,className:`w-60`,children:[(0,L.jsx)(s,{className:W===null&&G===`unstaged`?`bg-foreground/[0.08]`:void 0,onClick:()=>zt(`unstaged`),children:(0,L.jsx)(`span`,{children:`Working tree`})}),(0,L.jsx)(s,{className:W===null&&G===`branch`?`bg-foreground/[0.08]`:void 0,onClick:()=>zt(`branch`),children:(0,L.jsx)(`span`,{children:`Branch changes`})}),(0,L.jsx)(s,{className:W!==null&&q?.turnId===st?.turnId?`bg-foreground/[0.08]`:void 0,onClick:()=>{st&&Rt(st.turnId)},children:(0,L.jsx)(`span`,{children:`Latest turn`})}),(0,L.jsxs)(d,{children:[(0,L.jsx)(ee,{children:`Turn`}),(0,L.jsx)(ne,{className:`w-64`,children:U.map(e=>{let t=e.checkpointTurnCount??V[e.turnId]??`?`;return(0,L.jsxs)(s,{className:e.turnId===q?.turnId?`bg-foreground/[0.08]`:void 0,onClick:()=>Rt(e.turnId),children:[(0,L.jsxs)(`span`,{children:[`Turn `,t]}),(0,L.jsx)(`span`,{className:`ml-auto text-xs tabular-nums text-muted-foreground`,children:_e(e.completedAt,te.timestampFormat)})]},e.turnId)})})]})]})]}),W===null&&G===`branch`&&Z?.baseRef&&(0,L.jsxs)(`div`,{className:`flex min-w-0 max-w-full items-center gap-2 overflow-hidden text-xs text-muted-foreground`,title:`${Z.headRef??`HEAD`} → ${Z.baseRef}`,"aria-label":`Comparing ${Z.headRef??`HEAD`} against ${Z.baseRef}`,children:[(0,L.jsx)(`span`,{className:`min-w-0 max-w-48 truncate`,children:Z.headRef??`HEAD`}),(0,L.jsx)(xe,{className:`size-3.5 shrink-0 opacity-70`}),(0,L.jsxs)(Re,{items:St,filteredItems:Ct,value:K??H,onOpenChange:e=>{e||ye(``)},onValueChange:e=>{e&&Bt(e===H?null:e)},children:[(0,L.jsxs)(Fe,{className:`inline-flex min-w-0 max-w-48 items-center gap-1 overflow-hidden rounded-md px-1.5 py-1 outline-none transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring`,"aria-label":`Change comparison target. Currently ${Z.baseRef}`,children:[(0,L.jsx)(`span`,{className:`min-w-0 truncate`,children:Z.baseRef}),(0,L.jsx)(i,{className:`size-3.5 shrink-0 opacity-70`})]}),(0,L.jsxs)(Te,{align:`start`,className:`w-72 min-w-0 max-w-[calc(100vw-1rem)] overflow-hidden [&>[data-slot=combobox-popup]]:min-w-0 [&>[data-slot=combobox-popup]]:overflow-hidden`,children:[(0,L.jsx)(`div`,{className:`min-w-0 shrink-0 px-3 pt-2.5`,children:(0,L.jsxs)(`div`,{className:`relative -translate-y-px border-b border-border/70 pb-1.5 transition-colors focus-within:border-ring`,children:[(0,L.jsx)(Ve,{"aria-hidden":`true`,className:`pointer-events-none absolute top-1.5 left-0 size-4 shrink-0 text-muted-foreground/55`}),(0,L.jsx)(Ae,{className:`[&_input]:h-6.5 [&_input]:ps-5 [&_input]:font-sans [&_input]:leading-6.5`,inputClassName:`rounded-none bg-transparent text-sm`,placeholder:`Search refs...`,showTrigger:!1,size:`sm`,unstyled:!0,value:D,onChange:e=>ye(e.target.value)})]})}),(0,L.jsxs)(`div`,{className:`grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide`,children:[(0,L.jsx)(`span`,{"aria-hidden":`true`}),(0,L.jsxs)(`div`,{className:`grid min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center`,children:[(0,L.jsx)(`span`,{children:`Branch`}),(0,L.jsx)(`span`,{className:`text-right`,children:`Remote`})]})]}),(0,L.jsx)(Se,{children:`No matching refs.`}),(0,L.jsxs)(we,{className:`max-h-64 min-w-0 overflow-x-hidden`,children:[(0,L.jsx)(Be,{className:`h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0`,contentClassName:`w-full min-w-0 overflow-hidden`,value:H,children:(0,L.jsx)(`span`,{className:`block min-w-0 truncate`,children:`Automatic`})}),yt.map(e=>{let t=xt(e),n=e.local!==null&&e.remote!==null,r=e.remote?.name===t;return(0,L.jsx)(Be,{className:`h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0`,contentClassName:`w-full min-w-0 overflow-hidden`,value:t,children:(0,L.jsxs)(`div`,{className:`grid w-full min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center overflow-hidden`,children:[(0,L.jsx)(`span`,{className:`block min-w-0 truncate pe-2`,children:e.label}),n?(0,L.jsx)(`div`,{className:`flex justify-end`,onClick:e=>e.stopPropagation(),onPointerDown:e=>e.stopPropagation(),children:(0,L.jsx)(Ne,{"aria-label":`Use remote version of ${e.label}`,checked:r,className:`[--thumb-size:--spacing(3)]`,onCheckedChange:t=>{let n=t?e.remote?.name:e.local?.name;n&&Bt(n)}})}):e.remote?(0,L.jsx)(`span`,{className:`flex justify-end text-muted-foreground`,title:`Remote only`,children:(0,L.jsx)(g,{"aria-hidden":`true`,className:`size-3`})}):null]})},e.id)})]})]})]})]})]}),(0,L.jsxs)(`div`,{className:`flex shrink-0 items-center gap-1 [-webkit-app-region:no-drag]`,children:[$.length>0&&(0,L.jsx)(De,{additions:Nt.additions,deletions:Nt.deletions,className:`mr-1 text-[11px]`,layout:`inline`}),$.length>0&&(0,L.jsxs)(y,{children:[(0,L.jsx)(C,{render:(0,L.jsx)(m,{type:`button`,size:`icon-xs`,variant:`outline`,"aria-label":Mt?`Expand all files`:`Collapse all files`,onClick:Lt}),children:Mt?(0,L.jsx)(Me,{className:`size-3`}):(0,L.jsx)(Le,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:Mt?`Expand all files`:`Collapse all files`})]}),(0,L.jsxs)(O,{className:`shrink-0`,variant:`outline`,size:`xs`,value:[v],onValueChange:e=>{let t=e[0];(t===`stacked`||t===`split`)&&ae(t)},children:[(0,L.jsx)(M,{"aria-label":`Stacked diff view`,value:`stacked`,children:(0,L.jsx)(k,{className:`size-3`})}),(0,L.jsx)(M,{"aria-label":`Split diff view`,value:`split`,children:(0,L.jsx)(j,{className:`size-3`})})]}),(0,L.jsxs)(y,{children:[(0,L.jsx)(C,{render:(0,L.jsx)(M,{"aria-label":x?`Disable diff line wrapping`:`Enable diff line wrapping`,variant:`outline`,size:`xs`,pressed:x,onPressedChange:e=>{S(!!e)}}),children:(0,L.jsx)(me,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:x?`Disable line wrapping`:`Enable line wrapping`})]}),(0,L.jsxs)(y,{children:[(0,L.jsx)(C,{render:(0,L.jsx)(M,{"aria-label":w?`Show whitespace changes`:`Hide whitespace changes`,variant:`outline`,size:`xs`,pressed:w,onPressedChange:e=>{E(!!e)}}),children:(0,L.jsx)(We,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:w?`Show whitespace changes`:`Hide whitespace changes`})]})]})]}),children:I?Qe?W!==null&&U.length===0?(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`No completed turns yet.`}):(0,L.jsx)(L.Fragment,{children:(0,L.jsxs)(`div`,{className:`diff-panel-viewport flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden`,children:[Et&&(0,L.jsx)(`p`,{className:`shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground`,children:`This diff was truncated because it exceeded the preview limit. The changes shown are incomplete.`}),Ot&&!Q&&(0,L.jsx)(`div`,{className:`px-3`,children:(0,L.jsx)(`p`,{className:`mb-2 text-[11px] text-red-500/80`,children:Ot})}),Q?Q.kind===`files`?(0,L.jsx)(`div`,{className:`min-h-0 flex-1`,onClickCapture:e=>{let t=(e.nativeEvent.composedPath?.()??[]).find(e=>e instanceof HTMLElement&&e.hasAttribute(`data-title`))?.textContent?.trim();t&&Ft(t)},children:(0,L.jsx)(Ye,{viewerRef:He,className:`diff-render-surface h-full min-h-0 overflow-auto`,files:$,sectionId:lt,sectionTitle:dt,composerDraftTarget:t,renderHeaderPrefix:(e,t,n)=>{let r=P(e);return(0,L.jsxs)(y,{children:[(0,L.jsx)(C,{render:(0,L.jsx)(`button`,{type:`button`,className:u(`inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden`,be(e)),"aria-label":n?`Expand ${r}`:`Collapse ${r}`,"aria-expanded":!n,onClick:e=>{e.stopPropagation(),It(t)}}),children:n?(0,L.jsx)(p,{className:`size-4`}):(0,L.jsx)(i,{className:`size-4`})}),(0,L.jsx)(_,{side:`top`,children:n?`Expand diff`:`Collapse diff`})]})},options:{diffStyle:v===`split`?`split`:`unified`,lineDiffType:`none`,overflow:x?`wrap`:`scroll`,theme:Ce(o),themeType:o,unsafeCSS:it,stickyHeaders:!0,itemMetrics:{diffHeaderHeight:33},layout:{paddingTop:0,paddingBottom:8,gap:8}}},Y??lt)}):(0,L.jsx)(`div`,{className:`min-h-0 flex-1 overflow-auto p-2`,children:(0,L.jsxs)(`div`,{className:`space-y-2`,children:[(0,L.jsx)(`p`,{className:`text-[11px] text-muted-foreground/75`,children:Q.reason}),(0,L.jsx)(`pre`,{className:u(`max-h-[72vh] rounded-md border border-border/70 bg-background/70 p-3 font-mono text-[11px] leading-relaxed text-muted-foreground/90`,x?`overflow-auto whitespace-pre-wrap wrap-break-word`:`overflow-auto`),children:Q.text})]})}):Dt?(0,L.jsx)(fe,{label:q?`Loading checkpoint diff...`:G===`unstaged`?`Loading working tree diff...`:`Loading branch diff...`}):(0,L.jsx)(`div`,{className:`flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70`,children:(0,L.jsx)(`p`,{children:kt?`No net changes in this selection.`:`No patch available for this selection.`})})]})}):(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`Turn diffs are unavailable because this project is not a git repository.`}):(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`Select a thread to inspect turn diffs.`})})}export{ye as DiffWorkerPoolProvider,U as default};
-//# sourceMappingURL=DiffPanel-C8kzGnED.js.map
+//# sourceMappingURL=DiffPanel-DagtjUZ5.js.map