wednesdayai 0.4.12-dev.706 → 0.4.12-dev.707

package/dist/plugin-sdk/{tools-C7fDpDC6.js → tools-C53gbWae.js}

@@ -10,7 +10,7 @@ import { i as logWarn, n as logError, r as logInfo, t as logDebug } from "./logg
 import { a as validateSlackBlocksArray, c as resolveSlackWebClientOptions, i as parseSlackBlocksInput, l as parseSlackTarget, o as buildSlackBlocksFallbackText, r as normalizeSlackOutboundText, s as createSlackWebClient, t as sendMessageSlack, u as resolveSlackChannelId } from "./send-BepXbnVG.js";
 import { $ as fetchChannelPermissionsDiscord, A as addRoleDiscord, B as removeRoleDiscord, C as fetchMessageDiscord, Ct as resolveDiscordSystemLocation, D as readMessagesDiscord, Dt as buildChannelKeyCandidates, E as pinMessageDiscord, Et as applyChannelMatchMeta, F as fetchRoleInfoDiscord, G as createChannelDiscord, H as listGuildEmojisDiscord, I as fetchVoiceStatusDiscord, J as moveChannelDiscord, K as deleteChannelDiscord, L as kickMemberDiscord, M as createScheduledEventDiscord, N as fetchChannelInfoDiscord, O as searchMessagesDiscord, Ot as normalizeChannelSlug, P as fetchMemberInfoDiscord, R as listGuildChannelsDiscord, S as editMessageDiscord, St as formatDiscordUserTag, T as listThreadsDiscord, Tt as fetchDiscord, U as uploadEmojiDiscord, V as timeoutMemberDiscord, W as uploadStickerDiscord, X as setChannelPermissionDiscord, Y as removeChannelPermissionDiscord, Z as stripUndefinedFields, _ as sendStickerDiscord, _t as resolveDiscordOwnerAllowFrom, a as sendDiscordComponentMessage, at as parseDiscordTarget, b as createThreadDiscord, bt as shouldEmitDiscordReactionNotification, c as parseDiscordComponentCustomId, ct as listDiscordDirectoryPeersLive, d as parseDiscordModalCustomIdForCarbon, dt as normalizeDiscordSlug, f as readDiscordComponentSpec, ft as resolveDiscordAllowListMatch, g as sendPollDiscord, gt as resolveDiscordOwnerAccess, h as sendMessageDiscord, ht as resolveDiscordMemberAccessState, i as removeReactionDiscord, it as createDiscordRestClient, j as banMemberDiscord, k as unpinMessageDiscord, kt as resolveChannelEntryMatchWithFallback, l as parseDiscordComponentCustomIdForCarbon, lt as isDiscordGroupAllowedByPolicy, m as resolveDiscordModalEntry, mt as resolveDiscordGuildEntry, n as reactMessageDiscord, nt as chunkDiscordTextWithMode, o as createDiscordFormModal, ot as resolveDiscordChannelId, p as resolveDiscordComponentEntry, pt as resolveDiscordChannelConfigWithFallback, q as editChannelDiscord, r as removeOwnReactionsDiscord, rt as createDiscordClient, s as formatDiscordComponentEventText, st as listDiscordDirectoryGroupsLive, t as fetchReactionsDiscord, tt as hasAnyGuildPermissionDiscord, u as parseDiscordModalCustomId, ut as normalizeDiscordAllowList, v as sendVoiceMessageDiscord, vt as resolveDiscordShouldRequireMention, w as listPinsDiscord, wt as resolveTimestampMs, x as deleteMessageDiscord, xt as formatDiscordReactionEmoji, y as sendWebhookMessageDiscord, yt as resolveGroupDmAllow, z as listScheduledEventsDiscord } from "./send-BQC0ol0I.js";
 import { a as saveJsonFile, i as loadJsonFile, r as resolveCopilotApiToken } from "./github-copilot-token-pUhYl0t8.js";
-import { a as clearDelayedReleaseHold, c as mergeDelayedAgentTurn, d as KeyedAsyncQueue, i as agentTurnIdempotencyKey, l as peekDelayedAgentTurn, n as getAgentTurnRuntime, o as enqueueAgentTurn, r as tryGetAgentTurnRuntime, s as isClaimableAgentTurnWorkId, u as setDelayedReleaseHold } from "./agent-turn-runner-BN0V4J__.js";
+import { a as clearDelayedReleaseHold, c as mergeDelayedAgentTurn, d as KeyedAsyncQueue, i as agentTurnIdempotencyKey, l as peekDelayedAgentTurn, n as getAgentTurnRuntime, o as enqueueAgentTurn, r as tryGetAgentTurnRuntime, s as isClaimableAgentTurnWorkId, u as setDelayedReleaseHold } from "./agent-turn-runner-CKrIkJOo.js";
 import { $ as resolveSandboxConfigForAgent, A as isFailoverAssistantError, B as isTimeoutErrorMessage, C as formatRawAssistantErrorForUi, D as isCloudCodeAssistFormatError, E as isBillingAssistantError, F as isTransientHttpError, G as registerBrowserRoutes, H as resolveSandboxContext, I as parseImageDimensionError, J as getBridgeAuthForPort, K as resolveBrowserConfig, L as parseImageSizeError, M as isLikelyContextOverflowError, N as isRateLimitAssistantError, O as isCompactionFailureError, P as isRawApiErrorPayload, Q as trimToUndefined$1, R as sanitizeUserFacingText, S as formatBillingErrorMessage, T as isAuthAssistantError, U as resolveSandboxRuntimeStatus, V as ensureSandboxWorkspaceForSession, W as createBrowserRouteContext, X as resolveBrowserControlAuth, Y as ensureBrowserControlAuth, Z as resolveGatewayCredentialsFromConfig, _ as downgradeOpenAIReasoningBlocks, a as isMessagingToolDuplicateNormalized, at as resolveBootstrapTotalMaxChars, b as classifyFailoverReason, c as sanitizeImageBlocks, ct as buildPluginToolGroups, d as canonicalizeBase64, dt as mergeAlsoAllowPolicy, et as compileGlobPatterns, f as estimateBase64DecodedBytes, ft as stripPluginOnlyAllowlist, g as downgradeOpenAIFunctionCallReasoningPairs, h as sanitizeToolCallIdsForCloudCodeAssist, ht as resolveToolProfilePolicy, it as resolveBootstrapMaxChars, j as isFailoverErrorMessage, k as isContextOverflowError, l as sanitizeToolResultImages, lt as collectExplicitAllowlist, m as extractToolResultId, mt as normalizeToolName, n as validateGeminiTurns, nt as buildBootstrapContextFiles, o as normalizeTextForComparison, ot as sanitizeGoogleTurnOrdering, p as extractToolCallsFromAssistant, pt as expandToolGroups, q as resolveProfile, r as pickFallbackThinkingLevel, rt as ensureSessionHeader, s as sanitizeSessionMessagesImages, st as applyOwnerOnlyToolPolicy, t as validateAnthropicTurns, tt as matchesAnyGlobPattern, u as resolveImageSanitizationLimits, ut as expandPolicyWithPluginGroups, v as isGoogleModelApi, w as getApiErrorPayloadFingerprint, x as formatAssistantErrorText, y as BILLING_ERROR_USER_MESSAGE, z as isAuthPermanentErrorMessage } from "./pi-embedded-helpers-CpchdPKn.js";
 import { a as toInternalMessageReceivedContext, c as toPluginMessageReceivedEvent, d as initializeGlobalHookRunner, f as promptBuildResultToContribution, g as resolveProviderRuntimeIdentity, h as resolveProviderPromptCacheKey, i as toInternalMessagePreprocessedContext, l as fireAndForgetHook, m as buildPluginTurnIdentity, n as createMessageSentEmitter, o as toInternalMessageTranscribedContext, p as buildPluginRuntimeIdentity, r as deriveInboundMessageHookContext, s as toPluginMessageContext, t as applyMessageSendingHook, u as getGlobalHookRunner } from "./outbound-message-hooks-Bym4ElEd.js";
 import { t as resolveNetworkSsrFPolicy } from "./ssrf-config-DTYnjeA4.js";
@@ -134,7 +134,7 @@ function resolveAllowListSet(allowList) {
 
 //#endregion
 //#region src/plugins/activation-migration.ts
-const log$38 = createSubsystemLogger("plugins/activation-migration");
+const log$40 = createSubsystemLogger("plugins/activation-migration");
 /**
 * One-time migration from the presence-implies-load model to explicit-enable (ADR 0016).
 * Runs synchronously inside loadOpenClawPlugins, before resolveEnableState is applied.
@@ -176,7 +176,7 @@ function runActivationMigrationIfNeeded(config, pluginRecords) {
 			activationMigrationVersion: 1
 		}
 	};
-	if (toEnable.size > 0) log$38.info(`activation migration v1: auto-enabled ${toEnable.size} previously-active plugin(s)`, { ids: [...toEnable] });
+	if (toEnable.size > 0) log$40.info(`activation migration v1: auto-enabled ${toEnable.size} previously-active plugin(s)`, { ids: [...toEnable] });
 	return next;
 }
 
@@ -3081,7 +3081,7 @@ async function applyBootstrapHookOverrides(params) {
 
 //#endregion
 //#region src/agents/system-prompt-config.ts
-const log$37 = createSubsystemLogger("agents/system-prompt-config");
+const log$39 = createSubsystemLogger("agents/system-prompt-config");
 const DEFAULT_PROMPT_SOURCE_MAX_CHARS = 2e4;
 const MAX_PROMPT_SOURCE_FILE_BYTES = 512 * 1024;
 const MAX_PROMPT_SOURCE_FILE_BYTES_HARD = 8 * 1024 * 1024;
@@ -3267,7 +3267,7 @@ async function readPromptSourceFile(params) {
 	if (!opened.ok) {
 		promptSourceCache.delete(absolutePath);
 		if (params.optional) {
-			if (opened.reason !== "path") log$37.warn("skipping optional systemPrompt source: present but unusable", {
+			if (opened.reason !== "path") log$39.warn("skipping optional systemPrompt source: present but unusable", {
 				file: params.file,
 				reason: opened.reason
 			});
@@ -3291,7 +3291,7 @@ async function readPromptSourceFile(params) {
 	} catch (error) {
 		promptSourceCache.delete(opened.path);
 		if (params.optional) {
-			log$37.warn("skipping optional systemPrompt source after read error", {
+			log$39.warn("skipping optional systemPrompt source after read error", {
 				file: params.file,
 				error
 			});
@@ -3398,7 +3398,7 @@ async function resolveSystemPromptConfigForRun(params) {
 
 //#endregion
 //#region src/agents/workspace-lanes.ts
-const log$36 = createSubsystemLogger("agents/workspace-lanes");
+const log$38 = createSubsystemLogger("agents/workspace-lanes");
 const DEFAULT_ROOT_TEMPLATE = "~/.openclaw/agents/{agentId}/lanes/{laneId}/workspace";
 const SUPPORTED_STRATEGY = "hybrid";
 const DEFAULT_COPIED_ON_CREATE_FILES = ["USER.md", "BOOTSTRAP.md"];
@@ -3551,7 +3551,7 @@ function resolveWorkspaceLane(params) {
 		actor: params.actor
 	});
 	if (!keyResult.ok) {
-		log$36.warn("workspace lane key denied", {
+		log$38.warn("workspace lane key denied", {
 			agentId,
 			laneKeySource: keyResult.laneKeySource,
 			reason: keyResult.reason
@@ -3572,7 +3572,7 @@ function resolveWorkspaceLane(params) {
 		laneId: key.laneId
 	});
 	if (!rootTemplate.ok) {
-		log$36.warn("workspace lane root template denied", {
+		log$38.warn("workspace lane root template denied", {
 			agentId,
 			laneId: key.laneId,
 			laneKeySource: key.laneKeySource,
@@ -3590,7 +3590,7 @@ function resolveWorkspaceLane(params) {
 	}
 	const effectiveWorkspaceDir = rootTemplate.effectiveWorkspaceDir;
 	if (strategy !== SUPPORTED_STRATEGY) {
-		log$36.warn("workspace lane strategy denied", {
+		log$38.warn("workspace lane strategy denied", {
 			agentId,
 			strategy
 		});
@@ -3685,7 +3685,7 @@ async function resolveWorkspaceLaneForTurn(params) {
 	if ((config?.create ?? "on-first-message") !== "on-first-message") {
 		const pathState = await getExistingPathState(resolution.effectiveWorkspaceDir);
 		if (pathState !== "directory") {
-			log$36.warn("workspace lane manual creation denied", {
+			log$38.warn("workspace lane manual creation denied", {
 				agentId: resolution.agentId,
 				laneId: resolution.laneId,
 				laneKeySource: resolution.laneKeySource,
@@ -3711,7 +3711,7 @@ async function resolveWorkspaceLaneForTurn(params) {
 			targetRoot: resolution.effectiveWorkspaceDir,
 			relativePath: file
 		});
-		if (decision === "copied" || !existed) log$36.info("workspace lane seed file decision", {
+		if (decision === "copied" || !existed) log$38.info("workspace lane seed file decision", {
 			agentId: resolution.agentId,
 			laneId: resolution.laneId,
 			laneKeySource: resolution.laneKeySource,
@@ -3720,7 +3720,7 @@ async function resolveWorkspaceLaneForTurn(params) {
 		});
 	}
 	const created = !existed;
-	if (created) log$36.info("workspace lane created", {
+	if (created) log$38.info("workspace lane created", {
 		agentId: resolution.agentId,
 		laneId: resolution.laneId,
 		laneKeySource: resolution.laneKeySource
@@ -5176,7 +5176,7 @@ function parseUpdateFileChunk(lines, lineNumber, allowMissingContext) {
 
 //#endregion
 //#region src/infra/exec-approvals.ts
-const log$35 = createSubsystemLogger("infra/exec-approvals");
+const log$37 = createSubsystemLogger("infra/exec-approvals");
 const APPROVALS_FILE = join(process.env.HOME ?? "/tmp", ".openclaw", "exec-approvals.json");
 const DEFAULT_SECURITY = "deny";
 const DEFAULT_ASK = "on-miss";
@@ -6729,7 +6729,7 @@ function createRunRegistry(options) {
 
 //#endregion
 //#region src/process/supervisor/supervisor.ts
-const log$34 = createSubsystemLogger("process/supervisor");
+const log$36 = createSubsystemLogger("process/supervisor");
 function clampTimeout(value) {
 	if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return;
 	return Math.max(1, Math.floor(value));
@@ -6915,7 +6915,7 @@ function createProcessSupervisor() {
 				exitCode: null,
 				exitSignal: null
 			});
-			log$34.warn(`spawn failed: runId=${runId} reason=${String(err)}`);
+			log$36.warn(`spawn failed: runId=${runId} reason=${String(err)}`);
 			throw err;
 		}
 	};
@@ -11420,7 +11420,7 @@ function normalizeSystemRunApprovalPlan(value) {
 
 //#endregion
 //#region src/infra/system-run-command.ts
-const log$33 = createSubsystemLogger("infra/system-run-command");
+const log$35 = createSubsystemLogger("infra/system-run-command");
 function formatExecCommand(argv) {
 	return argv.map((arg) => {
 		if (arg.length === 0) return "\"\"";
@@ -15401,6 +15401,60 @@ async function withAcpRuntimeErrorBoundary(params) {
 	}
 }
 
+//#endregion
+//#region src/acp/runtime/registry.ts
+const ACP_RUNTIME_REGISTRY_STATE_KEY = Symbol.for("openclaw.acpRuntimeRegistryState");
+function createAcpRuntimeRegistryGlobalState() {
+	return { backendsById: /* @__PURE__ */ new Map() };
+}
+function resolveAcpRuntimeRegistryGlobalState() {
+	const runtimeGlobal = globalThis;
+	if (!runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY]) runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY] = createAcpRuntimeRegistryGlobalState();
+	return runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY];
+}
+const ACP_BACKENDS_BY_ID = resolveAcpRuntimeRegistryGlobalState().backendsById;
+function normalizeBackendId(id) {
+	return id?.trim().toLowerCase() || "";
+}
+function isBackendHealthy(backend) {
+	if (!backend.healthy) return true;
+	try {
+		return backend.healthy();
+	} catch {
+		return false;
+	}
+}
+function getAcpRuntimeBackend(id) {
+	const normalized = normalizeBackendId(id);
+	if (normalized) return ACP_BACKENDS_BY_ID.get(normalized) ?? null;
+	if (ACP_BACKENDS_BY_ID.size === 0) return null;
+	for (const backend of ACP_BACKENDS_BY_ID.values()) if (isBackendHealthy(backend)) return backend;
+	return ACP_BACKENDS_BY_ID.values().next().value ?? null;
+}
+function requireAcpRuntimeBackend(id) {
+	const normalized = normalizeBackendId(id);
+	const backend = getAcpRuntimeBackend(normalized || void 0);
+	if (!backend) throw new AcpRuntimeError("ACP_BACKEND_MISSING", "ACP runtime backend is not configured. Install and enable the acpx runtime plugin.");
+	if (!isBackendHealthy(backend)) throw new AcpRuntimeError("ACP_BACKEND_UNAVAILABLE", "ACP runtime backend is currently unavailable. Try again in a moment.");
+	if (normalized && backend.id !== normalized) throw new AcpRuntimeError("ACP_BACKEND_MISSING", `ACP runtime backend "${normalized}" is not registered.`);
+	return backend;
+}
+async function waitForAcpRuntimeBackendHealthy(params) {
+	const normalized = normalizeBackendId(params.id);
+	const pollMs = params.pollMs ?? 250;
+	const deadline = Date.now() + params.timeoutMs;
+	for (;;) {
+		const backend = getAcpRuntimeBackend(normalized || void 0);
+		if (!backend) return false;
+		if (isBackendHealthy(backend)) return true;
+		const remainingMs = deadline - Date.now();
+		if (remainingMs <= 0) return false;
+		await new Promise((resolve) => {
+			setTimeout(resolve, Math.min(pollMs, remainingMs)).unref();
+		});
+	}
+}
+
 //#endregion
 //#region src/acp/runtime/session-identity.ts
 function normalizeText$2(value) {
@@ -15913,45 +15967,6 @@ async function applyManagerRuntimeControls(params) {
 	if (cached) cached.appliedControlSignature = signature;
 }
 
-//#endregion
-//#region src/acp/runtime/registry.ts
-const ACP_RUNTIME_REGISTRY_STATE_KEY = Symbol.for("openclaw.acpRuntimeRegistryState");
-function createAcpRuntimeRegistryGlobalState() {
-	return { backendsById: /* @__PURE__ */ new Map() };
-}
-function resolveAcpRuntimeRegistryGlobalState() {
-	const runtimeGlobal = globalThis;
-	if (!runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY]) runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY] = createAcpRuntimeRegistryGlobalState();
-	return runtimeGlobal[ACP_RUNTIME_REGISTRY_STATE_KEY];
-}
-const ACP_BACKENDS_BY_ID = resolveAcpRuntimeRegistryGlobalState().backendsById;
-function normalizeBackendId(id) {
-	return id?.trim().toLowerCase() || "";
-}
-function isBackendHealthy(backend) {
-	if (!backend.healthy) return true;
-	try {
-		return backend.healthy();
-	} catch {
-		return false;
-	}
-}
-function getAcpRuntimeBackend(id) {
-	const normalized = normalizeBackendId(id);
-	if (normalized) return ACP_BACKENDS_BY_ID.get(normalized) ?? null;
-	if (ACP_BACKENDS_BY_ID.size === 0) return null;
-	for (const backend of ACP_BACKENDS_BY_ID.values()) if (isBackendHealthy(backend)) return backend;
-	return ACP_BACKENDS_BY_ID.values().next().value ?? null;
-}
-function requireAcpRuntimeBackend(id) {
-	const normalized = normalizeBackendId(id);
-	const backend = getAcpRuntimeBackend(normalized || void 0);
-	if (!backend) throw new AcpRuntimeError("ACP_BACKEND_MISSING", "ACP runtime backend is not configured. Install and enable the acpx runtime plugin.");
-	if (!isBackendHealthy(backend)) throw new AcpRuntimeError("ACP_BACKEND_UNAVAILABLE", "ACP runtime backend is currently unavailable. Try again in a moment.");
-	if (normalized && backend.id !== normalized) throw new AcpRuntimeError("ACP_BACKEND_MISSING", `ACP runtime backend "${normalized}" is not registered.`);
-	return backend;
-}
-
 //#endregion
 //#region src/agents/session-dirs.ts
 async function resolveAgentSessionDirs(stateDir) {
@@ -16152,6 +16167,9 @@ var SessionActorQueue = class {
 
 //#endregion
 //#region src/acp/control-plane/manager.core.ts
+const log$34 = createSubsystemLogger("acp/manager");
+const STARTUP_RECONCILE_BACKEND_WAIT_MS = 3e4;
+const STARTUP_RECONCILE_BACKEND_POLL_MS = 250;
 var AcpSessionManager = class {
 	constructor(deps = DEFAULT_DEPS) {
 		this.deps = deps;
@@ -16229,34 +16247,54 @@ var AcpSessionManager = class {
 				failed: failed + 1
 			};
 		}
+		const logFailure = (sessionKey, acpError) => {
+			const redactedKey = redactIdentifier(sessionKey);
+			log$34.warn(`startup identity reconcile failed for ${redactedKey}: code=${acpError.code} ${acpError.message.replaceAll(sessionKey, redactedKey)}`);
+		};
+		const toReconcileError = (error) => toAcpRuntimeError({
+			error,
+			fallbackCode: "ACP_SESSION_INIT_FAILED",
+			fallbackMessage: "ACP startup identity reconcile failed."
+		});
+		const deferred = [];
 		for (const session of acpSessions) {
 			if (!session.acp || !session.sessionKey) continue;
 			if (!isSessionIdentityPending(resolveSessionIdentityFromMeta(session.acp))) continue;
 			checked += 1;
 			try {
-				if (await this.withSessionActor(session.sessionKey, async () => {
-					const resolution = this.resolveSession({
-						cfg: params.cfg,
-						sessionKey: session.sessionKey
-					});
-					if (resolution.kind !== "ready") return false;
-					const { runtime, handle, meta } = await this.ensureRuntimeHandle({
-						cfg: params.cfg,
+				if (await this.reconcileOneSessionIdentity(params.cfg, session.sessionKey)) resolved += 1;
+			} catch (error) {
+				const acpError = toReconcileError(error);
+				if (acpError.code === "ACP_BACKEND_UNAVAILABLE") {
+					deferred.push({
 						sessionKey: session.sessionKey,
-						meta: resolution.meta
+						backend: (session.acp.backend || params.cfg.acp?.backend || "").trim()
 					});
-					return !isSessionIdentityPending(resolveSessionIdentityFromMeta((await this.reconcileRuntimeSessionIdentifiers({
-						cfg: params.cfg,
-						sessionKey: session.sessionKey,
-						runtime,
-						handle,
-						meta,
-						failOnStatusError: false
-					})).meta));
-				})) resolved += 1;
-			} catch (error) {
+					continue;
+				}
 				failed += 1;
-				logVerbose(`acp-manager: startup identity reconcile failed for ${redactIdentifier(session.sessionKey)}: ${String(error)}`);
+				logFailure(session.sessionKey, acpError);
+			}
+		}
+		if (deferred.length > 0) {
+			const backendIds = [...new Set(deferred.map(({ backend }) => backend))];
+			const healthyByBackend = new Map(await Promise.all(backendIds.map(async (backend) => [backend, await waitForAcpRuntimeBackendHealthy({
+				id: backend || void 0,
+				timeoutMs: params.backendWaitMs ?? STARTUP_RECONCILE_BACKEND_WAIT_MS,
+				pollMs: params.backendPollMs ?? STARTUP_RECONCILE_BACKEND_POLL_MS
+			})])));
+			for (const { sessionKey, backend } of deferred) {
+				if (!healthyByBackend.get(backend)) {
+					failed += 1;
+					logFailure(sessionKey, new AcpRuntimeError("ACP_BACKEND_UNAVAILABLE", `ACP runtime backend${backend ? ` "${backend}"` : ""} did not become healthy before the startup wait expired.`));
+					continue;
+				}
+				try {
+					if (await this.reconcileOneSessionIdentity(params.cfg, sessionKey)) resolved += 1;
+				} catch (error) {
+					failed += 1;
+					logFailure(sessionKey, toReconcileError(error));
+				}
 			}
 		}
 		return {
@@ -16265,6 +16303,37 @@ var AcpSessionManager = class {
 			failed
 		};
 	}
+	async reconcileOneSessionIdentity(cfg, sessionKey) {
+		return await this.withSessionActor(sessionKey, async () => {
+			const resolution = this.resolveSession({
+				cfg,
+				sessionKey
+			});
+			if (resolution.kind !== "ready") return false;
+			const { runtime, handle, meta } = await this.ensureRuntimeHandle({
+				cfg,
+				sessionKey,
+				meta: resolution.meta
+			});
+			try {
+				return !isSessionIdentityPending(resolveSessionIdentityFromMeta((await this.reconcileRuntimeSessionIdentifiers({
+					cfg,
+					sessionKey,
+					runtime,
+					handle,
+					meta,
+					failOnStatusError: true
+				})).meta));
+			} catch (error) {
+				const stored = this.deps.readSessionEntry({
+					cfg,
+					sessionKey
+				})?.acp;
+				if (stored && !isSessionIdentityPending(resolveSessionIdentityFromMeta(stored))) return true;
+				throw error;
+			}
+		});
+	}
 	async initializeSession(input) {
 		const sessionKey = normalizeSessionKey$1(input.sessionKey);
 		if (!sessionKey) throw new AcpRuntimeError("ACP_SESSION_INIT_FAILED", "ACP session key is required.");
@@ -23905,7 +23974,7 @@ const FIELD_LABELS = {
 
 //#endregion
 //#region src/config/schema.hints.ts
-const log$32 = createSubsystemLogger("config/schema");
+const log$33 = createSubsystemLogger("config/schema");
 const NORMALIZED_SENSITIVE_KEY_WHITELIST_SUFFIXES = [
 	"maxtokens",
 	"maxoutputtokens",
@@ -23946,7 +24015,7 @@ function isSensitiveConfigPath(path) {
 
 //#endregion
 //#region src/config/redact-snapshot.ts
-const log$31 = createSubsystemLogger("config/redaction");
+const log$32 = createSubsystemLogger("config/redaction");
 const ENV_VAR_PLACEHOLDER_PATTERN = /^\$\{[^}]*\}$/;
 function isSensitivePath(path) {
 	if (path.endsWith("[]")) return isSensitiveConfigPath(path.slice(0, -2));
@@ -30645,7 +30714,7 @@ async function handleSubagentsLogAction(ctx) {
 
 //#endregion
 //#region src/agents/pi-embedded-runner/logger.ts
-const log$30 = createSubsystemLogger("agent/embedded");
+const log$31 = createSubsystemLogger("agent/embedded");
 
 //#endregion
 //#region src/agents/pi-embedded-runner/run-sender-identity.ts
@@ -30690,7 +30759,7 @@ function resolveRunSenderIdentity(params) {
 		candidate: params.inheritedCanonicalIdentity
 	});
 	if (inherited) {
-		log$30.info("runtime identity injected", {
+		log$31.info("runtime identity injected", {
 			identitySource: "parent-session",
 			canonicalIdentity: inherited,
 			trigger: params.trigger,
@@ -30709,7 +30778,7 @@ function resolveRunSenderIdentity(params) {
 			candidate: params.configuredIdentity
 		});
 		if (configured) {
-			log$30.info("runtime identity injected", {
+			log$31.info("runtime identity injected", {
 				identitySource: "job-config",
 				canonicalIdentity: configured,
 				trigger: params.trigger,
@@ -36778,7 +36847,7 @@ const REMINDER_CONTEXT_MESSAGES_MAX = 10;
 const REMINDER_CONTEXT_PER_MESSAGE_MAX = 220;
 const REMINDER_CONTEXT_TOTAL_MAX = 700;
 const REMINDER_CONTEXT_MARKER = "\n\nRecent context:\n";
-const log$29 = createSubsystemLogger("cron-tool");
+const log$30 = createSubsystemLogger("cron-tool");
 const AGENT_FORBIDDEN_JOB_FIELDS = new Set(["identity", "state"]);
 const JOB_KEYS = new Set([
 	"name",
@@ -36914,7 +36983,7 @@ async function buildReminderContextLines(params) {
 		}
 		return lines;
 	} catch (err) {
-		log$29.warn("reminder context fetch failed", { error: err });
+		log$30.warn("reminder context fetch failed", { error: err });
 		return ["- (context unavailable: gateway unreachable)"];
 	}
 }
@@ -37470,7 +37539,7 @@ function assertGatewayToolActionAllowed(params) {
 
 //#endregion
 //#region src/agents/tools/gateway-tool.ts
-const log$28 = createSubsystemLogger("gateway-tool");
+const log$29 = createSubsystemLogger("gateway-tool");
 const DEFAULT_UPDATE_TIMEOUT_MS = 20 * 6e4;
 const GatewayToolSchema = Type.Object({
 	action: stringEnum([
@@ -37538,7 +37607,7 @@ function createGatewayTool(opts) {
 				try {
 					await writeRestartSentinel(payload);
 				} catch {}
-				log$28.info(`gateway tool: restart requested (delayMs=${delayMs ?? "default"}, reason=${reason ?? "none"})`);
+				log$29.info(`gateway tool: restart requested (delayMs=${delayMs ?? "default"}, reason=${reason ?? "none"})`);
 				return jsonResult(scheduleGatewaySigusr1Restart({
 					delayMs,
 					reason
@@ -44450,7 +44519,7 @@ async function resolveAnnounceTarget(params) {
 
 //#endregion
 //#region src/agents/tools/sessions-send-tool.a2a.ts
-const log$27 = createSubsystemLogger("agents/sessions-send");
+const log$28 = createSubsystemLogger("agents/sessions-send");
 async function runSessionsSendA2AFlow(params) {
 	const runContextId = params.waitRunId ?? "unknown";
 	try {
@@ -44545,7 +44614,7 @@ async function runSessionsSendA2AFlow(params) {
 				timeoutMs: 1e4
 			});
 		} catch (err) {
-			log$27.warn("sessions_send announce delivery failed", {
+			log$28.warn("sessions_send announce delivery failed", {
 				runId: runContextId,
 				channel: announceTarget.channel,
 				to: announceTarget.to,
@@ -44553,7 +44622,7 @@ async function runSessionsSendA2AFlow(params) {
 			});
 		}
 	} catch (err) {
-		log$27.warn("sessions_send announce flow failed", {
+		log$28.warn("sessions_send announce flow failed", {
 			runId: runContextId,
 			error: formatErrorMessage(err)
 		});
@@ -45333,7 +45402,7 @@ const BACKGROUND_IDLE_RECHECK_MS = 1e3;
 const BACKGROUND_IDLE_MAX_ATTEMPTS = 30;
 const backgroundIdleAttempts = /* @__PURE__ */ new Map();
 const SIGNAL_DEADLINE_GRACE_MS = 0;
-const log$26 = createSubsystemLogger("agent-signals");
+const log$27 = createSubsystemLogger("agent-signals");
 function normalizeTrimmed(value) {
 	return value?.trim() || void 0;
 }
@@ -45619,7 +45688,7 @@ function dispatchHeartbeatSignal(signal, now = Date.now()) {
 	if (!signal.sessionKey) return false;
 	if (signal.requiresIdle === true) {
 		if (signal.notBeforeMs !== void 0 && now > signal.notBeforeMs + SIGNAL_DEADLINE_GRACE_MS) {
-			log$26.warn("agent-signals: evicting requiresIdle heartbeat signal past its deadline", {
+			log$27.warn("agent-signals: evicting requiresIdle heartbeat signal past its deadline", {
 				signalId: signal.id,
 				type: signal.type,
 				source: signal.source,
@@ -48563,7 +48632,7 @@ function resolveRunWorkspaceDir(params) {
 
 //#endregion
 //#region src/agents/cli-runner.ts
-const log$25 = createSubsystemLogger("agent/claude-cli");
+const log$26 = createSubsystemLogger("agent/claude-cli");
 async function runCliAgent(params) {
 	const started = Date.now();
 	const workspaceResolution = resolveRunWorkspaceDir({
@@ -48576,7 +48645,7 @@ async function runCliAgent(params) {
 	const redactedSessionId = redactRunIdentifier(params.sessionId);
 	const redactedSessionKey = redactRunIdentifier(params.sessionKey);
 	const redactedWorkspace = redactRunIdentifier(resolvedWorkspace);
-	if (workspaceResolution.usedFallback) log$25.warn(`[workspace-fallback] caller=runCliAgent reason=${workspaceResolution.fallbackReason} run=${params.runId} session=${redactedSessionId} sessionKey=${redactedSessionKey} agent=${workspaceResolution.agentId} workspace=${redactedWorkspace}`);
+	if (workspaceResolution.usedFallback) log$26.warn(`[workspace-fallback] caller=runCliAgent reason=${workspaceResolution.fallbackReason} run=${params.runId} session=${redactedSessionId} sessionKey=${redactedSessionKey} agent=${workspaceResolution.agentId} workspace=${redactedWorkspace}`);
 	const workspaceDir = resolvedWorkspace;
 	const backendResolved = resolveCliBackendConfig(params.provider, params.config);
 	if (!backendResolved) throw new Error(`Unknown CLI backend: ${params.provider}`);
@@ -48606,7 +48675,7 @@ async function runCliAgent(params) {
 		resolvedSystemPrompt,
 		warn: makeBootstrapWarn({
 			sessionLabel,
-			warn: (message) => log$25.warn(message)
+			warn: (message) => log$26.warn(message)
 		})
 	});
 	const heartbeatPrompt = sessionAgentId === defaultAgentId ? resolveHeartbeatPrompt$1(params.config?.agents?.defaults?.heartbeat?.prompt) : void 0;
@@ -48669,7 +48738,7 @@ async function runCliAgent(params) {
 		const queueKey = backend.serialize ?? true ? backendResolved.id : `${backendResolved.id}:${params.runId}`;
 		try {
 			return await enqueueCliRun(queueKey, async () => {
-				log$25.info(`cli exec: provider=${params.provider} model=${normalizedModel} promptChars=${params.prompt.length}`);
+				log$26.info(`cli exec: provider=${params.provider} model=${normalizedModel} promptChars=${params.prompt.length}`);
 				const logOutputText = isTruthyEnvValue(process.env.OPENCLAW_CLAUDE_CLI_LOG_OUTPUT);
 				if (logOutputText) {
 					const logArgs = [];
@@ -48702,7 +48771,7 @@ async function runCliAgent(params) {
 						const promptIndex = logArgs.indexOf(argsPrompt);
 						if (promptIndex >= 0) logArgs[promptIndex] = `<prompt:${argsPrompt.length} chars>`;
 					}
-					log$25.info(`cli argv: ${backend.command} ${logArgs.join(" ")}`);
+					log$26.info(`cli argv: ${backend.command} ${logArgs.join(" ")}`);
 				}
 				const env = (() => {
 					const next = {
@@ -48740,17 +48809,17 @@ async function runCliAgent(params) {
 				const stdout = result.stdout.trim();
 				const stderr = result.stderr.trim();
 				if (logOutputText) {
-					if (stdout) log$25.info(`cli stdout:\n${stdout}`);
-					if (stderr) log$25.info(`cli stderr:\n${stderr}`);
+					if (stdout) log$26.info(`cli stdout:\n${stdout}`);
+					if (stderr) log$26.info(`cli stderr:\n${stderr}`);
 				}
 				if (shouldLogVerbose()) {
-					if (stdout) log$25.debug(`cli stdout:\n${stdout}`);
-					if (stderr) log$25.debug(`cli stderr:\n${stderr}`);
+					if (stdout) log$26.debug(`cli stdout:\n${stdout}`);
+					if (stderr) log$26.debug(`cli stderr:\n${stderr}`);
 				}
 				if (result.exitCode !== 0 || result.reason !== "exit") {
 					if (result.reason === "no-output-timeout" || result.noOutputTimedOut) {
 						const timeoutReason = `CLI produced no output for ${Math.round(noOutputTimeoutMs / 1e3)}s and was terminated.`;
-						log$25.warn(`cli watchdog timeout: provider=${params.provider} model=${modelId} session=${resolvedSessionId ?? params.sessionId} noOutputTimeoutMs=${noOutputTimeoutMs} pid=${managedRun.pid ?? "unknown"}`);
+						log$26.warn(`cli watchdog timeout: provider=${params.provider} model=${modelId} session=${resolvedSessionId ?? params.sessionId} noOutputTimeoutMs=${noOutputTimeoutMs} pid=${managedRun.pid ?? "unknown"}`);
 						throw new FailoverError(timeoutReason, {
 							reason: "timeout",
 							provider: params.provider,
@@ -48804,7 +48873,7 @@ async function runCliAgent(params) {
 	} catch (err) {
 		if (err instanceof FailoverError) {
 			if (err.reason === "session_expired" && params.cliSessionId && params.sessionKey) {
-				log$25.warn(`CLI session expired, clearing session ID and retrying: provider=${params.provider} session=${redactRunIdentifier(params.cliSessionId)}`);
+				log$26.warn(`CLI session expired, clearing session ID and retrying: provider=${params.provider} session=${redactRunIdentifier(params.cliSessionId)}`);
 				const output = await executeCliWithSession(void 0);
 				const text = output.text?.trim();
 				return {
@@ -49384,7 +49453,7 @@ function createBlockReplyDeliveryHandler(params) {
 * every turn the queue-drain path starts later (a `sessions.steer` mode "queue" follow-up and
 * every channel follow-up ride the same drain).
 */
-const log$24 = createSubsystemLogger("auto-reply/session-run-recording");
+const log$25 = createSubsystemLogger("auto-reply/session-run-recording");
 const NO_RECORDING = {
 	complete: async () => {},
 	fail: async () => {},
@@ -49415,7 +49484,7 @@ async function beginTurnSessionRun(params) {
 			sessionKey
 		});
 	} catch (error) {
-		log$24.warn("session-run recording unavailable for this turn", {
+		log$25.warn("session-run recording unavailable for this turn", {
 			runId: params.runId,
 			error: error instanceof Error ? error.message : String(error)
 		});
@@ -50248,7 +50317,7 @@ function repairToolUseResultPairing(messages) {
 
 //#endregion
 //#region src/agents/compaction.ts
-const log$23 = createSubsystemLogger("compaction");
+const log$24 = createSubsystemLogger("compaction");
 const BASE_CHUNK_RATIO = .4;
 const MIN_CHUNK_RATIO = .15;
 const SAFETY_MARGIN = 1.2;
@@ -50374,7 +50443,7 @@ async function summarizeWithFallback(params) {
 	try {
 		return await summarizeChunks(params);
 	} catch (fullError) {
-		log$23.warn(`Full summarization failed, trying partial: ${fullError instanceof Error ? fullError.message : String(fullError)}`);
+		log$24.warn(`Full summarization failed, trying partial: ${fullError instanceof Error ? fullError.message : String(fullError)}`);
 	}
 	const smallMessages = [];
 	const oversizedNotes = [];
@@ -50389,7 +50458,7 @@ async function summarizeWithFallback(params) {
 			messages: smallMessages
 		}) + (oversizedNotes.length > 0 ? `\n\n${oversizedNotes.join("\n")}` : "");
 	} catch (partialError) {
-		log$23.warn(`Partial summarization also failed: ${partialError instanceof Error ? partialError.message : String(partialError)}`);
+		log$24.warn(`Partial summarization also failed: ${partialError instanceof Error ? partialError.message : String(partialError)}`);
 	}
 	return `Context contained ${messages.length} messages (${oversizedNotes.length} oversized). Summary unavailable due to size limits.`;
 }
@@ -52595,7 +52664,7 @@ async function applyResetModelOverride(params) {
 //#endregion
 //#region src/infra/session-maintenance-warning.ts
 const warnedContexts = /* @__PURE__ */ new Map();
-const log$22 = createSubsystemLogger("session-maintenance-warning");
+const log$23 = createSubsystemLogger("session-maintenance-warning");
 function shouldSendWarning() {
 	return !process.env.VITEST && true;
 }
@@ -52666,7 +52735,7 @@ async function deliverSessionMaintenanceWarning(params) {
 			session: outboundSession
 		});
 	} catch (err) {
-		log$22.warn(`Failed to deliver session maintenance warning: ${String(err)}`);
+		log$23.warn(`Failed to deliver session maintenance warning: ${String(err)}`);
 		enqueueSystemEvent(text, { sessionKey: params.sessionKey });
 	}
 }
@@ -52836,7 +52905,7 @@ function buildSessionEndHookPayload(params) {
 
 //#endregion
 //#region src/auto-reply/reply/session.ts
-const log$21 = createSubsystemLogger("session-init");
+const log$22 = createSubsystemLogger("session-init");
 async function initSessionState(params) {
 	const { ctx, cfg, commandAuthorized } = params;
 	const targetSessionKey = ctx.CommandSource === "native" ? ctx.CommandTargetSessionKey?.trim() : void 0;
@@ -53043,10 +53112,10 @@ async function initSessionState(params) {
 	if (parentSessionKey && parentSessionKey !== sessionKey && sessionStore[parentSessionKey] && !alreadyForked) {
 		const parentTokens = sessionStore[parentSessionKey].totalTokens ?? 0;
 		if (parentForkMaxTokens > 0 && parentTokens > parentForkMaxTokens) {
-			log$21.warn(`skipping parent fork (parent too large): parentKey=${parentSessionKey} → sessionKey=${sessionKey} parentTokens=${parentTokens} maxTokens=${parentForkMaxTokens}`);
+			log$22.warn(`skipping parent fork (parent too large): parentKey=${parentSessionKey} → sessionKey=${sessionKey} parentTokens=${parentTokens} maxTokens=${parentForkMaxTokens}`);
 			sessionEntry.forkedFromParent = true;
 		} else {
-			log$21.warn(`forking from parent session: parentKey=${parentSessionKey} → sessionKey=${sessionKey} parentTokens=${parentTokens}`);
+			log$22.warn(`forking from parent session: parentKey=${parentSessionKey} → sessionKey=${sessionKey} parentTokens=${parentTokens}`);
 			const forked = await forkSessionFromParent({
 				parentEntry: sessionStore[parentSessionKey],
 				agentId,
@@ -53057,7 +53126,7 @@ async function initSessionState(params) {
 				sessionEntry.sessionId = forked.sessionId;
 				sessionEntry.sessionFile = forked.sessionFile;
 				sessionEntry.forkedFromParent = true;
-				log$21.warn(`forked session created: file=${forked.sessionFile}`);
+				log$22.warn(`forked session created: file=${forked.sessionFile}`);
 			}
 		}
 	}
@@ -53932,11 +54001,11 @@ async function getReplyFromConfig(ctx, opts, configOverride) {
 
 //#endregion
 //#region src/infra/background-run.ts
-const log$20 = createSubsystemLogger("infra/background-run");
+const log$21 = createSubsystemLogger("infra/background-run");
 
 //#endregion
 //#region src/infra/heartbeat-active-hours.ts
-const log$19 = createSubsystemLogger("heartbeat-active-hours");
+const log$20 = createSubsystemLogger("heartbeat-active-hours");
 
 //#endregion
 //#region src/infra/heartbeat-events-filter.ts
@@ -53989,7 +54058,7 @@ function isCronSystemEvent(evt) {
 
 //#endregion
 //#region src/infra/heartbeat-events.ts
-const log$18 = createSubsystemLogger("infra/heartbeat-events");
+const log$19 = createSubsystemLogger("infra/heartbeat-events");
 function resolveIndicatorType(status) {
 	switch (status) {
 		case "ok-empty":
@@ -54011,7 +54080,7 @@ function emitHeartbeatEvent(evt) {
 	for (const listener of listeners) try {
 		listener(enriched);
 	} catch (err) {
-		log$18.warn("heartbeat event listener threw", { error: err });
+		log$19.warn("heartbeat event listener threw", { error: err });
 	}
 }
 
@@ -54050,7 +54119,7 @@ function resolveHeartbeatVisibility(params) {
 
 //#endregion
 //#region src/infra/nudge.ts
-const log$17 = createSubsystemLogger("infra/nudge");
+const log$18 = createSubsystemLogger("infra/nudge");
 function renderSummary(text, data) {
 	if (data && Object.keys(data).length > 0) try {
 		return `${text}\n\nData:\n${JSON.stringify(data, null, 2)}`;
@@ -54084,14 +54153,14 @@ function requestNudge(input, cfg = loadConfig(), deps) {
 		const enqueue = deps.enqueueAgentTurn;
 		try {
 			enqueue(payload).catch((error) => {
-				log$17.warn("nudge enqueue failed", {
+				log$18.warn("nudge enqueue failed", {
 					error,
 					sessionKey: redactIdentifier(sessionKey),
 					signalId
 				});
 			});
 		} catch (error) {
-			log$17.warn("nudge enqueue failed", {
+			log$18.warn("nudge enqueue failed", {
 				error,
 				sessionKey: redactIdentifier(sessionKey),
 				signalId
@@ -54108,20 +54177,20 @@ function requestNudge(input, cfg = loadConfig(), deps) {
 			const { backbone, runner } = getAgentTurnRuntime();
 			const id = await enqueueAgentTurn(backbone, payload);
 			if (!isClaimableAgentTurnWorkId(id)) return;
-			const { runMainAgentTurn } = await import("./agent-turn-execute-CoUpaQcG.js");
+			const { runMainAgentTurn } = await import("./agent-turn-execute-B_zIGst3.js");
 			await runner.claimAndExecute({
 				workId: id,
 				execute: (claim) => runMainAgentTurn(claim.message.payload)
 			});
 		})().catch((error) => {
-			log$17.warn("nudge claim chain failed", {
+			log$18.warn("nudge claim chain failed", {
 				error,
 				sessionKey: redactIdentifier(sessionKey),
 				signalId
 			});
 		});
 	} catch (error) {
-		log$17.warn("nudge enqueue failed", {
+		log$18.warn("nudge enqueue failed", {
 			error,
 			sessionKey: redactIdentifier(sessionKey),
 			signalId
@@ -54136,7 +54205,7 @@ function requestNudge(input, cfg = loadConfig(), deps) {
 
 //#endregion
 //#region src/infra/wake-gate.ts
-const log$16 = createSubsystemLogger("wake-gate");
+const log$17 = createSubsystemLogger("wake-gate");
 const DEFAULT_COMMAND_TIMEOUT_MS = 3e4;
 const DEFAULT_MODEL_TIMEOUT_MS = 3e4;
 const MAX_COMMAND_OUTPUT_BYTES = 64 * 1024;
@@ -54258,7 +54327,7 @@ async function runWakeGate(spec, ctx) {
 		if (spec.kind === "command") return await runCommandGate(spec, ctx);
 		else return await runModelGate(spec, ctx);
 	} catch (err) {
-		log$16.error("wake-gate error (no crash)", {
+		log$17.error("wake-gate error (no crash)", {
 			kind: spec.kind,
 			error: err instanceof Error ? err.message : String(err)
 		});
@@ -54269,7 +54338,7 @@ async function runCommandGate(spec, _ctx) {
 	try {
 		const result = await runCommand(spec.command, spec.cwd, spec.timeoutMs, _ctx.abortSignal);
 		if (result.exit !== 0) {
-			log$16.warn("wake gate command non-zero exit", {
+			log$17.warn("wake gate command non-zero exit", {
 				kind: "command",
 				exit: result.exit,
 				...stdoutShapeForLog(result.stdout)
@@ -54278,7 +54347,7 @@ async function runCommandGate(spec, _ctx) {
 		}
 		const lines = result.stdout.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
 		if (lines.length === 0) {
-			log$16.warn("wake gate command produced no output", {
+			log$17.warn("wake gate command produced no output", {
 				kind: "command",
 				exit: result.exit,
 				...stdoutShapeForLog(result.stdout)
@@ -54288,7 +54357,7 @@ async function runCommandGate(spec, _ctx) {
 		const lastLine = lines[lines.length - 1];
 		const decision = await parseWakeDecision(lastLine);
 		if (!decision) {
-			log$16.warn("wake gate command output did not parse as a wake decision", {
+			log$17.warn("wake gate command output did not parse as a wake decision", {
 				kind: "command",
 				exit: result.exit,
 				...stdoutShapeForLog(result.stdout)
@@ -54296,14 +54365,14 @@ async function runCommandGate(spec, _ctx) {
 			return { wake: false };
 		}
 		if (!decision.wakeAgent) {
-			log$16.debug("wake gate command decided not to wake", {
+			log$17.debug("wake gate command decided not to wake", {
 				kind: "command",
 				exit: result.exit,
 				...stdoutShapeForLog(result.stdout)
 			});
 			return { wake: false };
 		}
-		log$16.info("wake gate command decided to wake", {
+		log$17.info("wake gate command decided to wake", {
 			kind: "command",
 			exit: result.exit,
 			hasText: decision.text !== void 0,
@@ -54314,7 +54383,7 @@ async function runCommandGate(spec, _ctx) {
 		if (decision.data !== void 0) res.data = decision.data;
 		return res;
 	} catch (err) {
-		log$16.warn("command gate error", { error: err instanceof Error ? err.message : String(err) });
+		log$17.warn("command gate error", { error: err instanceof Error ? err.message : String(err) });
 		return { wake: false };
 	}
 }
@@ -54352,27 +54421,27 @@ async function runModelGate(spec, ctx) {
 			...ctx.abortSignal ? { abortSignal: ctx.abortSignal } : {}
 		})).payloads ?? []).filter((payload) => !payload.isError && typeof payload.text === "string").map((payload) => payload.text ?? "").join("\n").trim();
 		if (!modelOutput) {
-			log$16.warn("wake gate model produced no output", { kind: "model" });
+			log$17.warn("wake gate model produced no output", { kind: "model" });
 			return { wake: false };
 		}
 		const outputLines = modelOutput.split("\n").map((l) => l.trim()).filter(Boolean);
 		const lastLine = outputLines[outputLines.length - 1] ?? modelOutput;
 		const decision = await parseWakeDecision(modelOutput) ?? await parseWakeDecision(lastLine);
 		if (!decision) {
-			log$16.warn("wake gate model output did not parse as a wake decision", {
+			log$17.warn("wake gate model output did not parse as a wake decision", {
 				kind: "model",
 				tail: tailForLog(modelOutput)
 			});
 			return { wake: false };
 		}
 		if (!decision.wakeAgent) {
-			log$16.debug("wake gate model decided not to wake", {
+			log$17.debug("wake gate model decided not to wake", {
 				kind: "model",
 				tail: tailForLog(modelOutput)
 			});
 			return { wake: false };
 		}
-		log$16.info("wake gate model decided to wake", {
+		log$17.info("wake gate model decided to wake", {
 			kind: "model",
 			hasText: decision.text !== void 0,
 			hasData: decision.data !== void 0
@@ -54382,7 +54451,7 @@ async function runModelGate(spec, ctx) {
 		if (decision.data !== void 0) res.data = decision.data;
 		return res;
 	} catch (err) {
-		log$16.warn("model gate error", { error: err instanceof Error ? err.message : String(err) });
+		log$17.warn("model gate error", { error: err instanceof Error ? err.message : String(err) });
 		return { wake: false };
 	} finally {
 		if (tmpDir) await fs$1.rm(tmpDir, {
@@ -54394,7 +54463,7 @@ async function runModelGate(spec, ctx) {
 
 //#endregion
 //#region src/infra/heartbeat-runner.ts
-const log$15 = createSubsystemLogger("gateway/heartbeat");
+const log$16 = createSubsystemLogger("gateway/heartbeat");
 const DEFAULT_HEARTBEAT_TARGET = "none";
 const redactHeartbeatLogIdentifier = (value) => value?.trim() ? redactIdentifier(value) : null;
 function isHeartbeatSessionResolutionError(resolution) {
@@ -54571,7 +54640,7 @@ async function pruneHeartbeatTranscript(params) {
 			throw err;
 		}
 	} catch (err) {
-		log$15.warn(`pruneHeartbeatTranscript error: ${err instanceof Error ? err.message : String(err)}`, { transcriptPath });
+		log$16.warn(`pruneHeartbeatTranscript error: ${err instanceof Error ? err.message : String(err)}`, { transcriptPath });
 	}
 }
 /**
@@ -54811,7 +54880,7 @@ async function prepareHeartbeatDeliveryAndPrompt(params) {
 				reason: HEARTBEAT_SKIP_WAKE_GATE_EMPTY,
 				durationMs: Date.now() - startedAt
 			});
-			log$15.info("heartbeat: wake gate suppressed run", {
+			log$16.info("heartbeat: wake gate suppressed run", {
 				agentId: redactHeartbeatLogIdentifier(agentId),
 				reason: HEARTBEAT_SKIP_WAKE_GATE_EMPTY
 			});
@@ -54822,16 +54891,16 @@ async function prepareHeartbeatDeliveryAndPrompt(params) {
 		}
 		wakeGateText = wakeResult.data !== void 0 ? `${wakeResult.text ?? ""}\n\nData:\n${JSON.stringify(wakeResult.data, null, 2)}`.trim() : wakeResult.text?.trim() || void 0;
 	}
-	if (delivery.reason === "unknown-account") log$15.warn("heartbeat: unknown accountId", {
+	if (delivery.reason === "unknown-account") log$16.warn("heartbeat: unknown accountId", {
 		accountId: redactHeartbeatLogIdentifier(delivery.accountId ?? heartbeatAccountId),
 		target: heartbeat?.target ?? "none"
 	});
-	else if (heartbeatAccountId) log$15.info("heartbeat: using explicit accountId", {
+	else if (heartbeatAccountId) log$16.info("heartbeat: using explicit accountId", {
 		accountId: redactHeartbeatLogIdentifier(delivery.accountId ?? heartbeatAccountId),
 		target: heartbeat?.target ?? "none",
 		channel: delivery.channel
 	});
-	log$15.info("heartbeat: resolved plan", {
+	log$16.info("heartbeat: resolved plan", {
 		agentId: redactHeartbeatLogIdentifier(agentId),
 		sessionKey: redactHeartbeatLogIdentifier(sessionKey),
 		sessionSource: preflight.session.source,
@@ -54906,7 +54975,7 @@ async function resolveHeartbeatPreflightOrSkip(params) {
 			durationMs: Date.now() - startedAt,
 			indicatorType: resolveIndicatorType("failed")
 		});
-		log$15.error(`heartbeat failed: ${publicReason}`, {
+		log$16.error(`heartbeat failed: ${publicReason}`, {
 			error: publicReason,
 			agentId: redactHeartbeatLogIdentifier(agentId),
 			sessionSource: preflight.sessionError.source,
@@ -54925,7 +54994,7 @@ async function resolveHeartbeatPreflightOrSkip(params) {
 			durationMs: Date.now() - startedAt,
 			indicatorType: resolveIndicatorType("failed")
 		});
-		log$15.error(`heartbeat failed: ${reason}`, {
+		log$16.error(`heartbeat failed: ${reason}`, {
 			error: reason,
 			agentId: redactHeartbeatLogIdentifier(agentId)
 		});
@@ -54962,7 +55031,7 @@ async function loadSharedSessionHeartbeatContext(params) {
 		if (present.length === 0) return;
 		return present.map((file) => `## ${file.path}\n\n${file.content}`).join("\n\n");
 	} catch (err) {
-		log$15.warn("failed to load heartbeat context files for trigger message", { error: err });
+		log$16.warn("failed to load heartbeat context files for trigger message", { error: err });
 		return;
 	}
 }
@@ -55267,7 +55336,7 @@ async function finalizeTurnOutcome(params) {
 				channel: delivery.channel,
 				accountId: delivery.accountId
 			});
-			log$15.warn("heartbeat: channel not ready", {
+			log$16.warn("heartbeat: channel not ready", {
 				channel: delivery.channel,
 				reason: readiness.reason
 			});
@@ -55355,11 +55424,11 @@ async function cleanupIsolatedHeartbeatSession(params) {
 				restrictToStoreDir: true
 			});
 		} catch (archiveErr) {
-			log$15.warn(`cron: error-path isolated session archive failed: ${formatErrorMessage(archiveErr)}`, { sessionId: isolatedEntry.sessionId });
+			log$16.warn(`cron: error-path isolated session archive failed: ${formatErrorMessage(archiveErr)}`, { sessionId: isolatedEntry.sessionId });
 		}
 		delete store[createdIsolatedSessionKey];
 	}).catch((cleanupErr) => {
-		log$15.warn(`failed to clean up isolated heartbeat session on error: ${String(cleanupErr)}`);
+		log$16.warn(`failed to clean up isolated heartbeat session on error: ${String(cleanupErr)}`);
 	});
 }
 async function handleHeartbeatError(params) {
@@ -55379,7 +55448,7 @@ async function handleHeartbeatError(params) {
 		accountId: delivery.accountId,
 		indicatorType: visibility.useIndicator ? resolveIndicatorType("failed") : void 0
 	});
-	log$15.error(`heartbeat failed: ${reason}`, { error: reason });
+	log$16.error(`heartbeat failed: ${reason}`, { error: reason });
 	return {
 		status: "failed",
 		reason
@@ -55391,7 +55460,7 @@ async function handleHeartbeatError(params) {
 const AGENT_TURN_PROMPT = "Process the pending system events for this session.";
 async function ackAnnounceExecuted(payload) {
 	if (payload.kind !== "announce") return;
-	const { markSubagentAnnounceExecuted } = await import("./subagent-registry-BWIHOyvI.js");
+	const { markSubagentAnnounceExecuted } = await import("./subagent-registry-CoP2z-4v.js");
 	for (const runId of [payload.runId, ...payload.mergedRunIds ?? []]) try {
 		await markSubagentAnnounceExecuted(runId);
 	} catch {}
@@ -55532,7 +55601,7 @@ async function runMainAgentTurn(payload, opts) {
 
 //#endregion
 //#region src/agents/subagent-announce-turn.ts
-const log$14 = createSubsystemLogger("agents/subagent-announce-turn");
+const log$15 = createSubsystemLogger("agents/subagent-announce-turn");
 function clearDelayedReleaseHoldIfNoAnnounceIsParked(sessionKey) {
 	if (!peekDelayedAgentTurn(sessionKey, (payload) => payload.kind === "announce")) clearDelayedReleaseHold(sessionKey);
 }
@@ -55592,7 +55661,7 @@ async function publishSubagentAnnounceTurn(params) {
 		};
 	} catch (error) {
 		clearDelayedReleaseHoldIfNoAnnounceIsParked(params.requesterSessionKey);
-		log$14.warn("subagent announce turn failed", { error: String(error) });
+		log$15.warn("subagent announce turn failed", { error: String(error) });
 		return {
 			status: "failed",
 			error: String(error)
@@ -55639,7 +55708,7 @@ const DIRECT_ANNOUNCE_TRANSIENT_RETRY_DELAYS_MS = FAST_TEST_MODE ? [
 let subagentRegistryAccessPromise;
 const STALLED_SIBLING_ANNOUNCE_HOLD_MS = 5 * 6e4;
 function loadSubagentRegistryAccess() {
-	if (!subagentRegistryAccessPromise) subagentRegistryAccessPromise = import("./subagent-registry-BWIHOyvI.js").catch((err) => {
+	if (!subagentRegistryAccessPromise) subagentRegistryAccessPromise = import("./subagent-registry-CoP2z-4v.js").catch((err) => {
 		const message = err instanceof Error && err.message ? err.message : String(err);
 		defaultRuntime.log(`[warn] subagent registry access import failed: ${message}`);
 		subagentRegistryAccessPromise = void 0;
@@ -58188,7 +58257,7 @@ function wrapToolWithAbortSignal(tool, abortSignal) {
 
 //#endregion
 //#region src/agents/pi-tools.before-tool-call.ts
-const log$13 = createSubsystemLogger("agents/tools");
+const log$14 = createSubsystemLogger("agents/tools");
 const BEFORE_TOOL_CALL_WRAPPED = Symbol("beforeToolCallWrapped");
 const adjustedParamsByToolCallId = /* @__PURE__ */ new Map();
 const MAX_TRACKED_ADJUSTED_PARAMS = 1024;
@@ -58226,7 +58295,7 @@ async function recordLoopOutcome(args) {
 			config: args.ctx.loopDetection
 		});
 	} catch (err) {
-		log$13.warn(`tool loop outcome tracking failed: tool=${args.toolName} error=${String(err)}`);
+		log$14.warn(`tool loop outcome tracking failed: tool=${args.toolName} error=${String(err)}`);
 	}
 }
 var UserCancelledError = class extends Error {
@@ -58253,7 +58322,7 @@ async function runBeforeToolCallHook(args) {
 		const loopResult = detectToolCallLoop(sessionState, toolName, params, args.ctx.loopDetection);
 		if (loopResult.stuck) {
 			if (loopResult.level === "critical") {
-				log$13.error(`Blocking ${toolName} due to critical loop: ${loopResult.message}`);
+				log$14.error(`Blocking ${toolName} due to critical loop: ${loopResult.message}`);
 				logToolLoopAction({
 					sessionKey: args.ctx.sessionKey,
 					sessionId: args.ctx?.agentId,
@@ -58271,7 +58340,7 @@ async function runBeforeToolCallHook(args) {
 					reason: loopResult.message
 				};
 			} else if (shouldEmitLoopWarning(sessionState, loopResult.warningKey ?? `${loopResult.detector}:${toolName}`, loopResult.count)) {
-				log$13.warn(`Loop warning for ${toolName}: ${loopResult.message}`);
+				log$14.warn(`Loop warning for ${toolName}: ${loopResult.message}`);
 				logToolLoopAction({
 					sessionKey: args.ctx.sessionKey,
 					sessionId: args.ctx?.agentId,
@@ -58330,7 +58399,7 @@ async function runBeforeToolCallHook(args) {
 		}
 	} catch (err) {
 		const toolCallId = args.toolCallId ? ` toolCallId=${args.toolCallId}` : "";
-		log$13.warn(`before_tool_call hook failed: tool=${toolName}${toolCallId} error=${String(err)}`);
+		log$14.warn(`before_tool_call hook failed: tool=${toolName}${toolCallId} error=${String(err)}`);
 	}
 	return {
 		blocked: false,
@@ -60146,7 +60215,7 @@ async function truncateOversizedToolResultsInSession(params) {
 					const textLength = getToolResultTextLength(msg);
 					if (textLength > maxChars) {
 						oversizedIndices.push(i);
-						log$30.info(`[tool-result-truncation] Found oversized tool result: entry=${entry.id} chars=${textLength} maxChars=${maxChars} sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
+						log$31.info(`[tool-result-truncation] Found oversized tool result: entry=${entry.id} chars=${textLength} maxChars=${maxChars} sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
 					}
 				}
 				if (oversizedIndices.length === 0) return {
@@ -60168,7 +60237,7 @@ async function truncateOversizedToolResultsInSession(params) {
 							message = truncateToolResultMessage(message, maxChars);
 							truncatedCount++;
 							const newLength = getToolResultTextLength(message);
-							log$30.info(`[tool-result-truncation] Truncated tool result: originalEntry=${entry.id} newChars=${newLength} sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
+							log$31.info(`[tool-result-truncation] Truncated tool result: originalEntry=${entry.id} newChars=${newLength} sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
 						}
 						sessionManager.appendMessage(message);
 					} else if (entry.type === "compaction") sessionManager.appendCompaction(entry.summary, entry.firstKeptEntryId, entry.tokensBefore, entry.details, entry.fromHook);
@@ -60182,14 +60251,14 @@ async function truncateOversizedToolResultsInSession(params) {
 						if (entry.name) sessionManager.appendSessionInfo(entry.name);
 					}
 				}
-				log$30.info(`[tool-result-truncation] Truncated ${truncatedCount} tool result(s) in session (contextWindow=${contextWindowTokens} maxChars=${maxChars}) sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
+				log$31.info(`[tool-result-truncation] Truncated ${truncatedCount} tool result(s) in session (contextWindow=${contextWindowTokens} maxChars=${maxChars}) sessionKey=${params.sessionKey ?? params.sessionId ?? "unknown"}`);
 				return {
 					truncated: true,
 					truncatedCount
 				};
 			} catch (err) {
 				const errMsg = err instanceof Error ? err.message : String(err);
-				log$30.warn(`[tool-result-truncation] Failed to truncate: ${errMsg}`);
+				log$31.warn(`[tool-result-truncation] Failed to truncate: ${errMsg}`);
 				return {
 					truncated: false,
 					truncatedCount: 0,
@@ -60563,7 +60632,7 @@ const getCompactionSafeguardRuntime = registry$1.get;
 
 //#endregion
 //#region src/agents/pi-extensions/compaction-safeguard.ts
-const log$12 = createSubsystemLogger("compaction-safeguard");
+const log$13 = createSubsystemLogger("compaction-safeguard");
 const missedModelWarningSessions = /* @__PURE__ */ new WeakSet();
 const TURN_PREFIX_INSTRUCTIONS = "This summary covers the prefix of a split turn. Focus on the original request, early progress, and any details needed to understand the retained suffix.";
 const MAX_TOOL_FAILURES = 8;
@@ -60672,7 +60741,7 @@ function compactionSafeguardExtension(api) {
 	api.on("session_before_compact", async (event, ctx) => {
 		const { preparation, customInstructions, signal } = event;
 		if (!preparation.messagesToSummarize.some(isRealConversationMessage)) {
-			log$12.warn("Compaction safeguard: cancelling compaction with no real conversation messages to summarize.");
+			log$13.warn("Compaction safeguard: cancelling compaction with no real conversation messages to summarize.");
 			return { cancel: true };
 		}
 		const { readFiles, modifiedFiles } = computeFileLists(preparation.fileOps);
@@ -60680,7 +60749,7 @@ function compactionSafeguardExtension(api) {
 		const toolFailureSection = formatToolFailuresSection(collectToolFailures([...preparation.messagesToSummarize, ...preparation.turnPrefixMessages]));
 		const runtime = getCompactionSafeguardRuntime(ctx.sessionManager);
 		if (runtime?.enabled === false) {
-			log$12.info("Compaction safeguard: compaction disabled by config; cancelling.");
+			log$13.info("Compaction safeguard: compaction disabled by config; cancelling.");
 			return { cancel: true };
 		}
 		const summarizationInstructions = {
@@ -60721,7 +60790,7 @@ function compactionSafeguardExtension(api) {
 					});
 					if (pruned.droppedChunks > 0) {
 						const newContentRatio = newContentTokens / contextWindowTokens * 100;
-						log$12.warn(`Compaction safeguard: new content uses ${newContentRatio.toFixed(1)}% of context; dropped ${pruned.droppedChunks} older chunk(s) (${pruned.droppedMessages} messages) to fit history budget.`);
+						log$13.warn(`Compaction safeguard: new content uses ${newContentRatio.toFixed(1)}% of context; dropped ${pruned.droppedChunks} older chunk(s) (${pruned.droppedMessages} messages) to fit history budget.`);
 						messagesToSummarize = pruned.messages;
 						if (pruned.droppedMessagesList.length > 0) try {
 							const droppedChunkRatio = computeAdaptiveChunkRatio(pruned.droppedMessagesList, contextWindowTokens);
@@ -60739,7 +60808,7 @@ function compactionSafeguardExtension(api) {
 								previousSummary: preparation.previousSummary
 							});
 						} catch (droppedError) {
-							log$12.warn(`Compaction safeguard: failed to summarize dropped messages, continuing without: ${droppedError instanceof Error ? droppedError.message : String(droppedError)}`);
+							log$13.warn(`Compaction safeguard: failed to summarize dropped messages, continuing without: ${droppedError instanceof Error ? droppedError.message : String(droppedError)}`);
 						}
 					}
 				}
@@ -60787,7 +60856,7 @@ function compactionSafeguardExtension(api) {
 				}
 			} };
 		} catch (error) {
-			log$12.warn(`Compaction summarization failed; cancelling compaction to preserve history: ${error instanceof Error ? error.message : String(error)}`);
+			log$13.warn(`Compaction summarization failed; cancelling compaction to preserve history: ${error instanceof Error ? error.message : String(error)}`);
 			return { cancel: true };
 		}
 	});
@@ -61518,14 +61587,14 @@ function logToolSchemasForGoogle(params) {
 	if (params.provider !== "google-gemini-cli") return;
 	const toolNames = params.tools.map((tool, index) => `${index}:${tool.name}`);
 	const tools = sanitizeToolsForGoogle(params);
-	log$30.info("google tool schema snapshot", {
+	log$31.info("google tool schema snapshot", {
 		provider: params.provider,
 		toolCount: tools.length,
 		tools: toolNames
 	});
 	for (const [index, tool] of tools.entries()) {
 		const violations = findUnsupportedSchemaKeywords(tool.parameters, `${tool.name}.parameters`);
-		if (violations.length > 0) log$30.warn("google tool schema has unsupported keywords", {
+		if (violations.length > 0) log$31.warn("google tool schema has unsupported keywords", {
 			index,
 			tool: tool.name,
 			violations: violations.slice(0, 12),
@@ -61537,7 +61606,7 @@ const compactionFailureEmitter = new EventEmitter();
 registerUnhandledRejectionHandler((reason) => {
 	const message = describeUnknownError(reason);
 	if (!isCompactionFailureError(message)) return false;
-	log$30.error(`Auto-compaction failed (unhandled): ${message}`);
+	log$31.error(`Auto-compaction failed (unhandled): ${message}`);
 	compactionFailureEmitter.emit("failure", message);
 	return true;
 });
@@ -61589,7 +61658,7 @@ function applyGoogleTurnOrderingFix(params) {
 	const sanitized = sanitizeGoogleTurnOrdering(params.messages);
 	const didPrepend = sanitized !== params.messages;
 	if (didPrepend && !hasGoogleTurnOrderingMarker(params.sessionManager)) {
-		(params.warn ?? ((message) => log$30.warn(message)))(`google turn ordering fixup: prepended user bootstrap (sessionId=${params.sessionId})`);
+		(params.warn ?? ((message) => log$31.warn(message)))(`google turn ordering fixup: prepended user bootstrap (sessionId=${params.sessionId})`);
 		markGoogleTurnOrderingMarker(params.sessionManager);
 	}
 	return {
@@ -62020,6 +62089,57 @@ async function flushPendingToolResultsAfterIdle(opts) {
 	opts.sessionManager?.flushPendingToolResults?.();
 }
 
+//#endregion
+//#region src/agents/pi-embedded-runner/workspace-cwd.ts
+const log$12 = createSubsystemLogger("agents/workspace-cwd");
+const holders = [];
+let baselineCwd;
+function readCwd() {
+	try {
+		return process.cwd();
+	} catch (err) {
+		log$12.warn("process.cwd() failed; the working directory was removed under the process", { error: String(err) });
+		return;
+	}
+}
+function tryChdir(target) {
+	if (readCwd() === target) return true;
+	try {
+		process.chdir(target);
+		return true;
+	} catch (err) {
+		log$12.error("cwd restore target is gone", {
+			target,
+			error: String(err)
+		});
+		return false;
+	}
+}
+/**
+* The cwd is process-global while embedded runs overlap (`agents.defaults.maxConcurrent`
+* defaults to 4). Each holder gets the cwd on acquire; on release the cwd goes to the most
+* recent surviving holder's workspace, and to the baseline the first holder found once none
+* remain. The returned release never throws: a throw from a caller's finally would skip the
+* rest of it (e.g. clearActiveEmbeddedRun) and leak the run registry entry.
+*/
+function acquireWorkspaceCwd(workspaceDir) {
+	if (holders.length === 0) baselineCwd = readCwd() ?? os.tmpdir();
+	if (readCwd() !== workspaceDir) process.chdir(workspaceDir);
+	const holder = { workspaceDir };
+	holders.push(holder);
+	let released = false;
+	return () => {
+		if (released) return;
+		released = true;
+		const index = holders.indexOf(holder);
+		if (index !== -1) holders.splice(index, 1);
+		for (let i = holders.length - 1; i >= 0; i -= 1) if (tryChdir(holders[i].workspaceDir)) return;
+		const target = baselineCwd ?? os.tmpdir();
+		if (holders.length === 0) baselineCwd = void 0;
+		if (!tryChdir(target) && !tryChdir(os.tmpdir())) log$12.error("tmpdir chdir failed; leaving the process cwd unchanged");
+	};
+}
+
 //#endregion
 //#region src/agents/pi-embedded-runner/compact.ts
 function createCompactionDiagId$1() {
@@ -62430,11 +62550,10 @@ async function compactEmbeddedPiSessionDirect(params) {
 		compacted: false,
 		reason: "compaction deferred by context.prune handler"
 	};
-	const prevCwd = process.cwd();
 	const provider = (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
 	const modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
 	const fail = (reason) => {
-		log$30.warn(`[compaction-diag] end runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} outcome=failed reason=${classifyCompactionReason(reason)} durationMs=${Date.now() - startedAt}`);
+		log$31.warn(`[compaction-diag] end runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} outcome=failed reason=${classifyCompactionReason(reason)} durationMs=${Date.now() - startedAt}`);
 		return {
 			ok: false,
 			compacted: false,
@@ -62478,7 +62597,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 		cwd: effectiveWorkspace
 	});
 	let restoreSkillEnv;
-	process.chdir(effectiveWorkspace);
+	const releaseWorkspaceCwd = acquireWorkspaceCwd(effectiveWorkspace);
 	try {
 		const shouldLoadSkillEntries = !params.skillsSnapshot || !params.skillsSnapshot.resolvedSkills;
 		const skillEntries = shouldLoadSkillEntries ? loadWorkspaceSkillEntries(effectiveWorkspace) : [];
@@ -62514,7 +62633,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 			resolvedSystemPrompt,
 			warn: makeBootstrapWarn({
 				sessionLabel,
-				warn: (message) => log$30.warn(message)
+				warn: (message) => log$31.warn(message)
 			})
 		});
 		const runAbortController = new AbortController();
@@ -62656,7 +62775,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 		});
 		try {
 			if (isPreservationArmed() || !isJsonlSessionBackend()) {
-				log$30.warn(`[compaction-diag] refused transcript repair/open runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} preservationArmed=${isPreservationArmed()} jsonlBackend=${isJsonlSessionBackend()}`);
+				log$31.warn(`[compaction-diag] refused transcript repair/open runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} preservationArmed=${isPreservationArmed()} jsonlBackend=${isJsonlSessionBackend()}`);
 				return {
 					ok: true,
 					compacted: false,
@@ -62665,7 +62784,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 			}
 			await repairSessionFileIfNeeded({
 				sessionFile: params.sessionFile,
-				warn: (message) => log$30.warn(message)
+				warn: (message) => log$31.warn(message)
 			});
 			await prewarmSessionFile(params.sessionFile);
 			const transcriptPolicy = resolveTranscriptPolicy({
@@ -62761,7 +62880,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 				const inputStorageCursor = await loadCompactionStorageCursor({
 					sessionId: params.sessionId,
 					sessionKey: params.sessionKey,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const truncated = limitHistoryTurns(validated, getDmHistoryLimitFromSessionKey(params.sessionKey, params.config));
 				const limited = transcriptPolicy.repairToolUseResultPairing ? sanitizeToolUseResultPairing(truncated) : truncated;
@@ -62773,7 +62892,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 					tokenWindow,
 					usage,
 					storageCursor: inputStorageCursor,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const sanitizedHookMessages = await sanitizeHookCompactionMessages({
 					messages: cloneCompactionMessages(compactionPlan.messages),
@@ -62796,7 +62915,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 					messages: transcriptPolicy.validateAnthropicTurns ? validateAnthropicTurns(validatedPlannedGemini) : validatedPlannedGemini,
 					fallbackMessages: limited,
 					replacedMessages: compactionPlan.replacedMessages,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const compactionInputMessages = compactionInput.messages;
 				if (compactionInputMessages.length === 0) return fail(compactionInput.abortReason ?? "compaction input is empty");
@@ -62807,13 +62926,13 @@ async function compactEmbeddedPiSessionDirect(params) {
 					messages: preCompactionMessages,
 					sessionFile: params.sessionFile
 				}, hookCtx).catch((hookErr) => {
-					log$30.warn(`before_compaction hook failed: ${String(hookErr)}`);
+					log$31.warn(`before_compaction hook failed: ${String(hookErr)}`);
 				});
-				const diagEnabled = log$30.isEnabled("debug");
+				const diagEnabled = log$31.isEnabled("debug");
 				const preMetrics = diagEnabled ? summarizeCompactionMessages(session.messages) : void 0;
 				if (diagEnabled && preMetrics) {
-					log$30.debug(`[compaction-diag] start runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} pre.messages=${preMetrics.messages} pre.historyTextChars=${preMetrics.historyTextChars} pre.toolResultChars=${preMetrics.toolResultChars} pre.estTokens=${preMetrics.estTokens ?? "unknown"}`);
-					log$30.debug(`[compaction-diag] contributors diagId=${diagId} top=${JSON.stringify(preMetrics.contributors)}`);
+					log$31.debug(`[compaction-diag] start runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} pre.messages=${preMetrics.messages} pre.historyTextChars=${preMetrics.historyTextChars} pre.toolResultChars=${preMetrics.toolResultChars} pre.estTokens=${preMetrics.estTokens ?? "unknown"}`);
+					log$31.debug(`[compaction-diag] contributors diagId=${diagId} top=${JSON.stringify(preMetrics.contributors)}`);
 				}
 				const compactStartedAt = Date.now();
 				setContextHooksLastCompactionPreparation(sessionManager, void 0);
@@ -62823,7 +62942,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 					result = await compactWithAbortOnTimeout({
 						compact: () => session.compact(params.customInstructions),
 						abort: () => session.abortCompaction(),
-						onAbortSettleTimeout: (err) => log$30.warn(`compaction did not settle after abort: ${String(err)}`)
+						onAbortSettleTimeout: (err) => log$31.warn(`compaction did not settle after abort: ${String(err)}`)
 					});
 				} finally {
 					setContextHooksPlannedCompaction(sessionManager, void 0);
@@ -62851,12 +62970,12 @@ async function compactEmbeddedPiSessionDirect(params) {
 					compactedCount: compactionInputMessages.length - session.messages.length,
 					sessionFile: params.sessionFile
 				}, hookCtx).catch((hookErr) => {
-					log$30.warn(`after_compaction hook failed: ${hookErr}`);
+					log$31.warn(`after_compaction hook failed: ${hookErr}`);
 				});
 				const outputStorageCursor = await loadCompactionStorageCursor({
 					sessionId: params.sessionId,
 					sessionKey: params.sessionKey,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const compactionResult = {
 					summary: result.summary,
@@ -62886,10 +63005,10 @@ async function compactEmbeddedPiSessionDirect(params) {
 					outputMessageCount: session.messages.length,
 					replacedMessages: compactionReplacementApplied,
 					result: compactionResult,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const postMetrics = diagEnabled ? summarizeCompactionMessages(session.messages) : void 0;
-				if (diagEnabled && preMetrics && postMetrics) log$30.debug(`[compaction-diag] end runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} outcome=compacted reason=none durationMs=${Date.now() - compactStartedAt} retrying=false post.messages=${postMetrics.messages} post.historyTextChars=${postMetrics.historyTextChars} post.toolResultChars=${postMetrics.toolResultChars} post.estTokens=${postMetrics.estTokens ?? "unknown"} delta.messages=${postMetrics.messages - preMetrics.messages} delta.historyTextChars=${postMetrics.historyTextChars - preMetrics.historyTextChars} delta.toolResultChars=${postMetrics.toolResultChars - preMetrics.toolResultChars} delta.estTokens=${typeof preMetrics.estTokens === "number" && typeof postMetrics.estTokens === "number" ? postMetrics.estTokens - preMetrics.estTokens : "unknown"}`);
+				if (diagEnabled && preMetrics && postMetrics) log$31.debug(`[compaction-diag] end runId=${runId} sessionKey=${params.sessionKey ?? params.sessionId} diagId=${diagId} trigger=${trigger} provider=${provider}/${modelId} attempt=${attempt} maxAttempts=${maxAttempts} outcome=compacted reason=none durationMs=${Date.now() - compactStartedAt} retrying=false post.messages=${postMetrics.messages} post.historyTextChars=${postMetrics.historyTextChars} post.toolResultChars=${postMetrics.toolResultChars} post.estTokens=${postMetrics.estTokens ?? "unknown"} delta.messages=${postMetrics.messages - preMetrics.messages} delta.historyTextChars=${postMetrics.historyTextChars - preMetrics.historyTextChars} delta.toolResultChars=${postMetrics.toolResultChars - preMetrics.toolResultChars} delta.estTokens=${typeof preMetrics.estTokens === "number" && typeof postMetrics.estTokens === "number" ? postMetrics.estTokens - preMetrics.estTokens : "unknown"}`);
 				return {
 					ok: true,
 					compacted: true,
@@ -62918,7 +63037,7 @@ async function compactEmbeddedPiSessionDirect(params) {
 		return fail(describeUnknownError(err));
 	} finally {
 		restoreSkillEnv?.();
-		process.chdir(prevCwd);
+		releaseWorkspaceCwd();
 	}
 }
 /**
@@ -63053,15 +63172,15 @@ function createStreamFnWithExtraParams(baseStreamFn, extraParams, provider) {
 	if (transport === "sse" || transport === "websocket" || transport === "auto") streamParams.transport = transport;
 	else if (transport != null) {
 		const transportSummary = typeof transport === "string" ? transport : typeof transport;
-		log$30.warn(`ignoring invalid transport param: ${transportSummary}`);
+		log$31.warn(`ignoring invalid transport param: ${transportSummary}`);
 	}
 	if (typeof extraParams.openaiWsWarmup === "boolean") streamParams.openaiWsWarmup = extraParams.openaiWsWarmup;
 	const cacheRetention = resolveCacheRetention(extraParams, provider);
 	if (cacheRetention) streamParams.cacheRetention = cacheRetention;
 	const providerRouting = provider === "openrouter" && extraParams.provider != null && typeof extraParams.provider === "object" ? extraParams.provider : void 0;
 	if (Object.keys(streamParams).length === 0 && !providerRouting) return;
-	log$30.debug(`creating streamFn wrapper with params: ${JSON.stringify(streamParams)}`);
-	if (providerRouting) log$30.debug(`OpenRouter provider routing: ${JSON.stringify(providerRouting)}`);
+	log$31.debug(`creating streamFn wrapper with params: ${JSON.stringify(streamParams)}`);
+	if (providerRouting) log$31.debug(`OpenRouter provider routing: ${JSON.stringify(providerRouting)}`);
 	const underlying = baseStreamFn ?? streamSimple;
 	const wrappedStreamFn = (model, context, options) => {
 		return underlying(providerRouting ? {
@@ -63183,7 +63302,7 @@ function resolveAnthropicBetas(extraParams, provider, modelId) {
 		for (const beta of configured) if (typeof beta === "string" && beta.trim()) betas.add(beta.trim());
 	}
 	if (extraParams?.context1m === true) if (isAnthropic1MModel(modelId)) betas.add(ANTHROPIC_CONTEXT_1M_BETA);
-	else log$30.warn(`ignoring context1m for non-opus/sonnet model: ${provider}/${modelId}`);
+	else log$31.warn(`ignoring context1m for non-opus/sonnet model: ${provider}/${modelId}`);
 	return betas.size > 0 ? [...betas] : void 0;
 }
 function mergeAnthropicBetaHeader(headers, betas) {
@@ -63210,7 +63329,7 @@ function createAnthropicBetaHeadersWrapper(baseStreamFn, betas) {
 		const isOauth = isAnthropicOAuthApiKey(options?.apiKey);
 		const requestedContext1m = betas.includes(ANTHROPIC_CONTEXT_1M_BETA);
 		const effectiveBetas = isOauth && requestedContext1m ? betas.filter((beta) => beta !== ANTHROPIC_CONTEXT_1M_BETA) : betas;
-		if (isOauth && requestedContext1m) log$30.warn(`ignoring context1m for OAuth token auth on ${model.provider}/${model.id}; Anthropic rejects context-1m beta with OAuth auth`);
+		if (isOauth && requestedContext1m) log$31.warn(`ignoring context1m for OAuth token auth on ${model.provider}/${model.id}; Anthropic rejects context-1m beta with OAuth auth`);
 		const piAiBetas = isOauth ? PI_AI_OAUTH_ANTHROPIC_BETAS : PI_AI_DEFAULT_ANTHROPIC_BETAS;
 		const allBetas = [...new Set([...piAiBetas, ...effectiveBetas])];
 		return underlying(model, context, {
@@ -63571,12 +63690,12 @@ function applyExtraParamsToAgent(agent, cfg, provider, modelId, extraParamsOverr
 	};
 	const wrappedStreamFn = createStreamFnWithExtraParams(agent.streamFn, merged, provider);
 	if (wrappedStreamFn) {
-		log$30.debug(`applying extraParams to agent streamFn for ${provider}/${modelId}`);
+		log$31.debug(`applying extraParams to agent streamFn for ${provider}/${modelId}`);
 		agent.streamFn = wrappedStreamFn;
 	}
 	const anthropicBetas = resolveAnthropicBetas(merged, provider, modelId);
 	if (anthropicBetas?.length) {
-		log$30.debug(`applying Anthropic beta header for ${provider}/${modelId}: ${anthropicBetas.join(",")}`);
+		log$31.debug(`applying Anthropic beta header for ${provider}/${modelId}: ${anthropicBetas.join(",")}`);
 		agent.streamFn = createAnthropicBetaHeadersWrapper(agent.streamFn, anthropicBetas);
 	}
 	if (shouldApplySiliconFlowThinkingOffCompat({
@@ -63584,7 +63703,7 @@ function applyExtraParamsToAgent(agent, cfg, provider, modelId, extraParamsOverr
 		modelId,
 		thinkingLevel
 	})) {
-		log$30.debug(`normalizing thinking=off to thinking=null for SiliconFlow compatibility (${provider}/${modelId})`);
+		log$31.debug(`normalizing thinking=off to thinking=null for SiliconFlow compatibility (${provider}/${modelId})`);
 		agent.streamFn = createSiliconFlowThinkingWrapper(agent.streamFn);
 	}
 	if (provider === "moonshot") {
@@ -63592,22 +63711,22 @@ function applyExtraParamsToAgent(agent, cfg, provider, modelId, extraParamsOverr
 			configuredThinking: merged?.thinking,
 			thinkingLevel
 		});
-		if (moonshotThinkingType) log$30.debug(`applying Moonshot thinking=${moonshotThinkingType} payload wrapper for ${provider}/${modelId}`);
+		if (moonshotThinkingType) log$31.debug(`applying Moonshot thinking=${moonshotThinkingType} payload wrapper for ${provider}/${modelId}`);
 		agent.streamFn = createMoonshotThinkingWrapper(agent.streamFn, moonshotThinkingType);
 	}
 	if (provider === "openrouter") {
-		log$30.debug(`applying OpenRouter app attribution headers for ${provider}/${modelId}`);
+		log$31.debug(`applying OpenRouter app attribution headers for ${provider}/${modelId}`);
 		const openRouterThinkingLevel = modelId === "auto" || isOpenRouterReasoningUnsupported(modelId) ? void 0 : thinkingLevel;
 		agent.streamFn = createOpenRouterWrapper(agent.streamFn, openRouterThinkingLevel);
 		agent.streamFn = createOpenRouterSystemCacheWrapper(agent.streamFn);
 	}
 	if (provider === "amazon-bedrock" && !isAnthropicBedrockModel(modelId)) {
-		log$30.debug(`disabling prompt caching for non-Anthropic Bedrock model ${provider}/${modelId}`);
+		log$31.debug(`disabling prompt caching for non-Anthropic Bedrock model ${provider}/${modelId}`);
 		agent.streamFn = createBedrockNoCacheWrapper(agent.streamFn);
 	}
 	if (provider === "zai" || provider === "z-ai") {
 		if (merged?.tool_stream !== false) {
-			log$30.debug(`enabling Z.AI tool_stream for ${provider}/${modelId}`);
+			log$31.debug(`enabling Z.AI tool_stream for ${provider}/${modelId}`);
 			agent.streamFn = createZaiToolStreamWrapper(agent.streamFn, true);
 		}
 	}
@@ -64299,7 +64418,7 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 			if (!session.manager.isConnected() && !session.broken) try {
 				await session.manager.connect(apiKey);
 				session.everConnected = true;
-				log$30.debug(`[ws-stream] connected for session=${sessionId}`);
+				log$31.debug(`[ws-stream] connected for session=${sessionId}`);
 			} catch (connErr) {
 				try {
 					session.manager.close();
@@ -64307,12 +64426,12 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 				session.broken = true;
 				wsRegistry.delete(sessionId);
 				if (transport === "websocket") throw connErr instanceof Error ? connErr : new Error(String(connErr));
-				log$30.warn(`[ws-stream] WebSocket connect failed for session=${sessionId}; falling back to HTTP. error=${String(connErr)}`);
+				log$31.warn(`[ws-stream] WebSocket connect failed for session=${sessionId}; falling back to HTTP. error=${String(connErr)}`);
 				return fallbackToHttp(model, context, options, eventStream, apiKey, opts.signal);
 			}
 			if (session.broken || !session.manager.isConnected()) {
 				if (transport === "websocket") throw new Error("WebSocket session disconnected");
-				log$30.warn(`[ws-stream] session=${sessionId} broken/disconnected; falling back to HTTP`);
+				log$31.warn(`[ws-stream] session=${sessionId} broken/disconnected; falling back to HTTP`);
 				try {
 					session.manager.close();
 				} catch {}
@@ -64330,10 +64449,10 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 						instructions: context.systemPrompt ?? void 0,
 						signal
 					});
-					log$30.debug(`[ws-stream] warm-up completed for session=${sessionId}`);
+					log$31.debug(`[ws-stream] warm-up completed for session=${sessionId}`);
 				} catch (warmErr) {
 					if (signal?.aborted) throw warmErr instanceof Error ? warmErr : new Error(String(warmErr));
-					log$30.warn(`[ws-stream] warm-up failed for session=${sessionId}; continuing without warm-up. error=${String(warmErr)}`);
+					log$31.warn(`[ws-stream] warm-up failed for session=${sessionId}; continuing without warm-up. error=${String(warmErr)}`);
 				}
 			}
 			const prevResponseId = session.manager.previousResponseId;
@@ -64341,13 +64460,13 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 			if (prevResponseId && session.lastContextLength > 0) {
 				const toolResults = context.messages.slice(session.lastContextLength).filter((m) => m.role === "toolResult");
 				if (toolResults.length === 0) {
-					log$30.debug(`[ws-stream] session=${sessionId}: no new tool results found; sending full context`);
+					log$31.debug(`[ws-stream] session=${sessionId}: no new tool results found; sending full context`);
 					inputItems = buildFullInput(context);
 				} else inputItems = convertMessagesToInputItems(toolResults);
-				log$30.debug(`[ws-stream] session=${sessionId}: incremental send (${inputItems.length} tool results) previous_response_id=${prevResponseId}`);
+				log$31.debug(`[ws-stream] session=${sessionId}: incremental send (${inputItems.length} tool results) previous_response_id=${prevResponseId}`);
 			} else {
 				inputItems = buildFullInput(context);
-				log$30.debug(`[ws-stream] session=${sessionId}: full context send (${inputItems.length} items)`);
+				log$31.debug(`[ws-stream] session=${sessionId}: full context send (${inputItems.length} items)`);
 			}
 			const tools = convertTools(context.tools);
 			const streamOpts = options;
@@ -64377,7 +64496,7 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 				session.manager.send(payload);
 			} catch (sendErr) {
 				if (transport === "websocket") throw sendErr instanceof Error ? sendErr : new Error(String(sendErr));
-				log$30.warn(`[ws-stream] send failed for session=${sessionId}; falling back to HTTP. error=${String(sendErr)}`);
+				log$31.warn(`[ws-stream] send failed for session=${sessionId}; falling back to HTTP. error=${String(sendErr)}`);
 				try {
 					session.manager.close();
 				} catch {}
@@ -64457,7 +64576,7 @@ function createOpenAIWebSocketStreamFn(apiKey, sessionId, opts = {}) {
 		};
 		queueMicrotask(() => run().catch((err) => {
 			const errorMessage = err instanceof Error ? err.message : String(err);
-			log$30.warn(`[ws-stream] session=${sessionId} run error: ${errorMessage}`);
+			log$31.warn(`[ws-stream] session=${sessionId} run error: ${errorMessage}`);
 			eventStream.push({
 				type: "error",
 				reason: "error",
@@ -66730,7 +66849,7 @@ function normalizeRefForDedupe(raw) {
 }
 async function sanitizeImagesWithLog(images, label, imageSanitization) {
 	const { images: sanitized, dropped } = await sanitizeImageBlocks(images, label, imageSanitization);
-	if (dropped > 0) log$30.warn(`Native image: dropped ${dropped} image(s) after sanitization (${label}).`);
+	if (dropped > 0) log$31.warn(`Native image: dropped ${dropped} image(s) after sanitization (${label}).`);
 	return sanitized;
 }
 /**
@@ -66817,7 +66936,7 @@ async function loadImageFromRef(ref, workspaceDir, options) {
 				mediaPath: targetPath
 			})).resolved;
 		} catch (err) {
-			log$30.debug(`Native image: sandbox validation failed for ${ref.resolved}: ${err instanceof Error ? err.message : String(err)}`);
+			log$31.debug(`Native image: sandbox validation failed for ${ref.resolved}: ${err instanceof Error ? err.message : String(err)}`);
 			return null;
 		}
 		else if (!path.isAbsolute(targetPath)) targetPath = path.resolve(workspaceDir, targetPath);
@@ -66835,7 +66954,7 @@ async function loadImageFromRef(ref, workspaceDir, options) {
 			readFile: createSandboxBridgeReadFile({ sandbox: options.sandbox })
 		}) : await loadWebMedia(targetPath, options?.maxBytes);
 		if (media.kind !== "image") {
-			log$30.debug(`Native image: not an image file: ${targetPath} (got ${media.kind})`);
+			log$31.debug(`Native image: not an image file: ${targetPath} (got ${media.kind})`);
 			return null;
 		}
 		const mimeType = media.contentType ?? "image/jpeg";
@@ -66845,7 +66964,7 @@ async function loadImageFromRef(ref, workspaceDir, options) {
 			mimeType
 		};
 	} catch (err) {
-		log$30.debug(`Native image: failed to load ${ref.resolved}: ${err instanceof Error ? err.message : String(err)}`);
+		log$31.debug(`Native image: failed to load ${ref.resolved}: ${err instanceof Error ? err.message : String(err)}`);
 		return null;
 	}
 }
@@ -66882,7 +67001,7 @@ async function detectAndLoadPromptImages(params) {
 		loadedCount: 0,
 		skippedCount: 0
 	};
-	log$30.debug(`Native image: detected ${allRefs.length} image refs in prompt`);
+	log$31.debug(`Native image: detected ${allRefs.length} image refs in prompt`);
 	const promptImages = [...params.existingImages ?? []];
 	let loadedCount = 0;
 	let skippedCount = 0;
@@ -66895,7 +67014,7 @@ async function detectAndLoadPromptImages(params) {
 		if (image) {
 			promptImages.push(image);
 			loadedCount++;
-			log$30.debug(`Native image: loaded ${ref.type} ${ref.resolved}`);
+			log$31.debug(`Native image: loaded ${ref.type} ${ref.resolved}`);
 		} else skippedCount++;
 	}
 	return {
@@ -67510,7 +67629,7 @@ async function buildStreamFn(params) {
 		const wsApiKey = await params.authStorage.getApiKey(params.provider);
 		if (wsApiKey) streamFn = createOpenAIWebSocketStreamFn(wsApiKey, params.sessionId, { signal: params.abortSignal });
 		else {
-			log$30.warn(`[ws-stream] no API key for provider=${params.provider}; using HTTP transport`);
+			log$31.warn(`[ws-stream] no API key for provider=${params.provider}; using HTTP transport`);
 			streamFn = streamSimple;
 		}
 	} else {
@@ -67613,13 +67732,13 @@ async function resolvePromptBuildHookResult(params) {
 		messages: params.messages,
 		systemPrompt: params.systemPrompt
 	}, params.hookCtx).catch((hookErr) => {
-		log$30.warn(`before_prompt_build hook failed: ${String(hookErr)}`);
+		log$31.warn(`before_prompt_build hook failed: ${String(hookErr)}`);
 	}) : void 0;
 	const legacyResult = params.legacyBeforeAgentStartResult ?? (params.hookRunner?.hasHooks("before_agent_start") ? await params.hookRunner.runBeforeAgentStart({
 		prompt: params.prompt,
 		messages: params.messages
 	}, params.hookCtx).catch((hookErr) => {
-		log$30.warn(`before_agent_start hook (legacy prompt build path) failed: ${String(hookErr)}`);
+		log$31.warn(`before_agent_start hook (legacy prompt build path) failed: ${String(hookErr)}`);
 	}) : void 0);
 	return {
 		systemPrompt: promptBuildResult?.systemPrompt ?? legacyResult?.systemPrompt,
@@ -67757,7 +67876,7 @@ async function collectAttemptPromptContribution(params) {
 		messages: params.messages,
 		envelope: params.envelope
 	}, params.lifecycleCtx).catch((hookErr) => {
-		log$30.warn(`context.collect hook failed: ${String(hookErr)}`);
+		log$31.warn(`context.collect hook failed: ${String(hookErr)}`);
 	}) : void 0;
 	return mergePromptContributions([promptBuildResultToContribution(legacyResult), contextCollectResult]);
 }
@@ -67772,7 +67891,7 @@ async function runContextProjectionAndPruningHooks(params) {
 			contributions: params.contributions,
 			envelope: params.envelope
 		}, params.lifecycleCtx).catch((hookErr) => {
-			log$30.warn(`context.project hook failed: ${String(hookErr)}`);
+			log$31.warn(`context.project hook failed: ${String(hookErr)}`);
 		});
 		if (result?.messages) currentMessages = result.messages;
 		if (result?.projection) projection = {
@@ -67788,7 +67907,7 @@ async function runContextProjectionAndPruningHooks(params) {
 			tokenWindow: params.lifecycleCtx.tokenWindow,
 			usage: params.lifecycleCtx.usage
 		}, params.lifecycleCtx).catch((hookErr) => {
-			log$30.warn(`context.prune hook failed: ${String(hookErr)}`);
+			log$31.warn(`context.prune hook failed: ${String(hookErr)}`);
 		});
 		if (result?.messages) currentMessages = result.messages;
 		if (result?.dropped) dropped.push(...result.dropped);
@@ -67890,7 +68009,7 @@ function installAttemptInputTransform(params) {
 			runtime: params.projectionRuntime,
 			timeoutMs: params.projectionArtifactTimeoutMs
 		}).catch((err) => {
-			log$30.warn(`context projection artifact persist failed: ${String(err)}`);
+			log$31.warn(`context projection artifact persist failed: ${String(err)}`);
 		});
 		const finalMessages = await runTransformLlmInputHooks({
 			messages: currentMessages,
@@ -67899,7 +68018,7 @@ function installAttemptInputTransform(params) {
 			provider: params.provider,
 			modelId: params.modelId
 		}).catch((err) => {
-			log$30.warn(`transform_llm_input hook failed: ${String(err)}`);
+			log$31.warn(`transform_llm_input hook failed: ${String(err)}`);
 		}) ?? currentMessages;
 		params.onFinalInputMessages?.(finalMessages);
 		return finalMessages;
@@ -68017,11 +68136,10 @@ function summarizeSessionContext(messages) {
 }
 async function runEmbeddedAttempt(params) {
 	const resolvedWorkspace = resolveUserPath(params.workspaceDir);
-	const prevCwd = process.cwd();
 	let pendingClearActiveEmbeddedRun;
 	const runAbortController = new AbortController();
 	const currentUserTurnForStorage = resolveCurrentUserTurnForStorage(params);
-	log$30.debug(`embedded run start: runId=${params.runId} sessionId=${params.sessionId} provider=${params.provider} model=${params.modelId} thinking=${params.thinkLevel} messageChannel=${params.messageChannel ?? params.messageProvider ?? "unknown"}`);
+	log$31.debug(`embedded run start: runId=${params.runId} sessionId=${params.sessionId} provider=${params.provider} model=${params.modelId} thinking=${params.thinkLevel} messageChannel=${params.messageChannel ?? params.messageProvider ?? "unknown"}`);
 	await fs$1.mkdir(resolvedWorkspace, { recursive: true });
 	const sandboxSessionKey = params.sessionKey?.trim() || params.sessionId;
 	const toolSessionKey = params.toolSessionKey?.trim() || sandboxSessionKey;
@@ -68034,7 +68152,7 @@ async function runEmbeddedAttempt(params) {
 	const effectiveWorkspace = sandbox?.enabled ? sandbox.workspaceAccess === "rw" ? resolvedWorkspace : sandbox.workspaceDir : resolvedWorkspace;
 	await fs$1.mkdir(effectiveWorkspace, { recursive: true });
 	let restoreSkillEnv;
-	if (!params.skipCwdChange) process.chdir(effectiveWorkspace);
+	const releaseWorkspaceCwd = params.skipCwdChange ? void 0 : acquireWorkspaceCwd(effectiveWorkspace);
 	try {
 		const skillWorkspace = params.skillWorkspaceDir ?? effectiveWorkspace;
 		const shouldLoadSkillEntries = !params.skipSkillEnv && (!params.skillsSnapshot || !params.skillsSnapshot.resolvedSkills);
@@ -68076,7 +68194,7 @@ async function runEmbeddedAttempt(params) {
 			resolvedSystemPrompt,
 			warn: makeBootstrapWarn({
 				sessionLabel,
-				warn: (message) => log$30.warn(message)
+				warn: (message) => log$31.warn(message)
 			}),
 			contextMode: params.bootstrapContextMode,
 			runKind: params.bootstrapContextRunKind,
@@ -68318,7 +68436,7 @@ async function runEmbeddedAttempt(params) {
 			if (queue != null) {
 				await drainPendingPrimaryWrites(queue, 3e4, storage?.config.fallbackToJsonlOnError ?? false);
 				if (storage?.runtime?.conversation?.upsertTurn) await storage.runtime.conversation.upsertTurn(params.sessionId).catch((err) => {
-					log$30.warn("turn upsert failed (non-fatal)", {
+					log$31.warn("turn upsert failed (non-fatal)", {
 						sessionId: params.sessionId,
 						err
 					});
@@ -68386,14 +68504,14 @@ async function runEmbeddedAttempt(params) {
 						sessionManager = _wrapped.sm;
 						_primaryWriteQueue = _wrapped.queue;
 					}
-				} else log$30.error("DB backend detected but conversation store is unavailable — turn will run without history and DB write-through; check that the DB runtime initialised correctly", {
+				} else log$31.error("DB backend detected but conversation store is unavailable — turn will run without history and DB write-through; check that the DB runtime initialised correctly", {
 					sessionId: params.sessionId,
 					backend: _configuredStorage?.runtime?.backend
 				});
 			} else {
 				await repairSessionFileIfNeeded({
 					sessionFile: params.sessionFile,
-					warn: (message) => log$30.warn(message)
+					warn: (message) => log$31.warn(message)
 				});
 				const hadSessionFile = await fs$1.stat(params.sessionFile).then(() => true).catch(() => false);
 				if (!params.skipSessionManagerCache) await prewarmSessionFile(params.sessionFile);
@@ -68534,7 +68652,7 @@ async function runEmbeddedAttempt(params) {
 				const wsApiKey = await params.authStorage.getApiKey(params.provider);
 				if (wsApiKey) activeSession.agent.streamFn = createOpenAIWebSocketStreamFn(wsApiKey, params.sessionId, { signal: runAbortController.signal });
 				else {
-					log$30.warn(`[ws-stream] no API key for provider=${params.provider}; using HTTP transport`);
+					log$31.warn(`[ws-stream] no API key for provider=${params.provider}; using HTTP transport`);
 					activeSession.agent.streamFn = streamSimple;
 				}
 			} else {
@@ -68734,7 +68852,7 @@ async function runEmbeddedAttempt(params) {
 			let abortWarnTimer;
 			const isProbeSession = params.sessionId?.startsWith("probe-") ?? false;
 			const abortTimer = setTimeout(() => {
-				if (!isProbeSession) log$30.warn(`embedded run timeout: runId=${params.runId} sessionId=${params.sessionId} timeoutMs=${params.timeoutMs}`);
+				if (!isProbeSession) log$31.warn(`embedded run timeout: runId=${params.runId} sessionId=${params.sessionId} timeoutMs=${params.timeoutMs}`);
 				if (shouldFlagCompactionTimeout({
 					isTimeout: true,
 					isCompactionPendingOrRetrying: subscription.isCompacting(),
@@ -68743,7 +68861,7 @@ async function runEmbeddedAttempt(params) {
 				abortRun(true);
 				if (!abortWarnTimer) abortWarnTimer = setTimeout(() => {
 					if (!activeSession.isStreaming) return;
-					if (!isProbeSession) log$30.warn(`embedded run abort still streaming: runId=${params.runId} sessionId=${params.sessionId}`);
+					if (!isProbeSession) log$31.warn(`embedded run abort still streaming: runId=${params.runId} sessionId=${params.sessionId}`);
 				}, 1e4);
 			}, Math.max(1, params.timeoutMs));
 			let messagesSnapshot = [];
@@ -68777,7 +68895,7 @@ async function runEmbeddedAttempt(params) {
 					let timeoutHandle;
 					const timeout = new Promise((resolve) => {
 						timeoutHandle = setTimeout(() => {
-							log$30.warn(`${label} timed out after ${metaTimeoutMs}ms`);
+							log$31.warn(`${label} timed out after ${metaTimeoutMs}ms`);
 							resolve(void 0);
 						}, metaTimeoutMs);
 						timeoutHandle.unref?.();
@@ -68785,7 +68903,7 @@ async function runEmbeddedAttempt(params) {
 					try {
 						return await Promise.race([p, timeout]);
 					} catch (err) {
-						log$30.warn(`${label} failed: ${String(err)}`);
+						log$31.warn(`${label} failed: ${String(err)}`);
 						return;
 					} finally {
 						if (timeoutHandle !== void 0) clearTimeout(timeoutHandle);
@@ -68810,14 +68928,14 @@ async function runEmbeddedAttempt(params) {
 					senderIdentity,
 					workspaceLane: params.workspaceLane
 				});
-				log$30.debug(`embedded run prompt start: runId=${params.runId} sessionId=${params.sessionId}`);
+				log$31.debug(`embedded run prompt start: runId=${params.runId} sessionId=${params.sessionId}`);
 				const leafEntry = sessionManager.getLeafEntry();
 				if (leafEntry?.type === "message" && leafEntry.message.role === "user") {
 					if (leafEntry.parentId) sessionManager.branch(leafEntry.parentId);
 					else sessionManager.resetLeaf();
 					const sessionContext = sessionManager.buildSessionContext();
 					activeSession.agent.state.messages = sessionContext.messages;
-					log$30.warn(`Removed orphaned user message to prevent consecutive user turns. runId=${params.runId} sessionId=${params.sessionId}`);
+					log$31.warn(`Removed orphaned user message to prevent consecutive user turns. runId=${params.runId} sessionId=${params.sessionId}`);
 				}
 				const cleanUserMessage = createCleanUserMessageFromPrompt(params.prompt);
 				const baseEnvelope = createCurrentUserPromptEnvelope({ cleanUserMessage });
@@ -68846,7 +68964,7 @@ async function runEmbeddedAttempt(params) {
 				const contributedSystemPrompt = applySystemPromptContribution(systemPromptText, promptContribution);
 				if (contributedSystemPrompt !== systemPromptText) {
 					applySystemPromptOverrideToSession(activeSession, contributedSystemPrompt);
-					log$30.debug(`hooks: augmented system prompt (+${contributedSystemPrompt.length - systemPromptText.length} chars)`);
+					log$31.debug(`hooks: augmented system prompt (+${contributedSystemPrompt.length - systemPromptText.length} chars)`);
 					systemPromptText = contributedSystemPrompt;
 				}
 				cacheTrace?.recordStage("prompt:before", {
@@ -68878,12 +68996,12 @@ async function runEmbeddedAttempt(params) {
 						messages: activeSession.messages,
 						note: `images: prompt=${imageResult.images.length}`
 					});
-					if (log$30.isEnabled("debug")) {
+					if (log$31.isEnabled("debug")) {
 						const msgCount = activeSession.messages.length;
 						const systemLen = systemPromptText?.length ?? 0;
 						const promptLen = effectivePrompt.length;
 						const sessionSummary = summarizeSessionContext(activeSession.messages);
-						log$30.debug(`[context-diag] pre-prompt: sessionKey=${params.sessionKey ?? params.sessionId} messages=${msgCount} roleCounts=${sessionSummary.roleCounts} historyTextChars=${sessionSummary.totalTextChars} maxMessageTextChars=${sessionSummary.maxMessageTextChars} historyImageBlocks=${sessionSummary.totalImageBlocks} systemPromptChars=${systemLen} promptChars=${promptLen} promptImages=${imageResult.images.length} provider=${params.provider}/${params.modelId} sessionFile=${params.sessionFile}`);
+						log$31.debug(`[context-diag] pre-prompt: sessionKey=${params.sessionKey ?? params.sessionId} messages=${msgCount} roleCounts=${sessionSummary.roleCounts} historyTextChars=${sessionSummary.totalTextChars} maxMessageTextChars=${sessionSummary.maxMessageTextChars} historyImageBlocks=${sessionSummary.totalImageBlocks} systemPromptChars=${systemLen} promptChars=${promptLen} promptImages=${imageResult.images.length} provider=${params.provider}/${params.modelId} sessionFile=${params.sessionFile}`);
 					}
 					if (hookRunner?.hasHooks("llm_input")) hookRunner.runLlmInput({
 						runId: params.runId,
@@ -68895,7 +69013,7 @@ async function runEmbeddedAttempt(params) {
 						historyMessages: activeSession.messages,
 						imagesCount: imageResult.images.length
 					}, hookCtx).catch((err) => {
-						log$30.warn(`llm_input hook failed: ${String(err)}`);
+						log$31.warn(`llm_input hook failed: ${String(err)}`);
 					});
 					const modelUserMessage = appendPromptImagesToUserMessage(renderedCurrentUserPrompt.modelUserMessage, imageResult.images);
 					const currentPromptIndex = activeSession.messages.length;
@@ -68938,7 +69056,7 @@ async function runEmbeddedAttempt(params) {
 						errorType: String(err instanceof Error ? err.name : "UnknownError")
 					});
 				} finally {
-					log$30.debug(`embedded run prompt end: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - promptStartedAt}`);
+					log$31.debug(`embedded run prompt end: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - promptStartedAt}`);
 				}
 				const wasCompactingBefore = activeSession.isCompacting;
 				const snapshot = activeSession.messages.slice();
@@ -68953,7 +69071,7 @@ async function runEmbeddedAttempt(params) {
 							promptError = err;
 							promptErrorSource = "compaction";
 						}
-						if (!isProbeSession) log$30.debug(`compaction wait aborted: runId=${params.runId} sessionId=${params.sessionId}`);
+						if (!isProbeSession) log$31.debug(`compaction wait aborted: runId=${params.runId} sessionId=${params.sessionId}`);
 					} else throw err;
 				}
 				const compactionOccurredThisAttempt = getCompactionCount() > 0;
@@ -68972,7 +69090,7 @@ async function runEmbeddedAttempt(params) {
 					currentSessionId: activeSession.sessionId
 				});
 				if (timedOutDuringCompaction) {
-					if (!isProbeSession) log$30.warn(`using ${snapshotSelection.source} snapshot: timed out during compaction runId=${params.runId} sessionId=${params.sessionId}`);
+					if (!isProbeSession) log$31.warn(`using ${snapshotSelection.source} snapshot: timed out during compaction runId=${params.runId} sessionId=${params.sessionId}`);
 				}
 				messagesSnapshot = snapshotSelection.messagesSnapshot;
 				sessionIdUsed = snapshotSelection.sessionIdUsed;
@@ -68987,7 +69105,7 @@ async function runEmbeddedAttempt(params) {
 						error: describeUnknownError(promptError)
 					});
 				} catch (entryErr) {
-					log$30.warn(`failed to persist prompt error entry: ${String(entryErr)}`);
+					log$31.warn(`failed to persist prompt error entry: ${String(entryErr)}`);
 				}
 				if (!params.skipTranscriptSync) await drainOrSyncTranscript(_primaryWriteQueue, _isDbBackend, _configuredStorage, {
 					agentId: hookAgentIdForTranscript,
@@ -69007,16 +69125,16 @@ async function runEmbeddedAttempt(params) {
 					error: promptError ? describeUnknownError(promptError) : void 0,
 					durationMs: Date.now() - promptStartedAt
 				}, hookCtx).catch((err) => {
-					log$30.warn(`agent_end hook failed: ${err}`);
+					log$31.warn(`agent_end hook failed: ${err}`);
 				});
 			} finally {
 				clearTimeout(abortTimer);
 				if (abortWarnTimer) clearTimeout(abortWarnTimer);
-				if (!isProbeSession && (aborted || timedOut) && !timedOutDuringCompaction) log$30.debug(`run cleanup: runId=${params.runId} sessionId=${params.sessionId} aborted=${aborted} timedOut=${timedOut}`);
+				if (!isProbeSession && (aborted || timedOut) && !timedOutDuringCompaction) log$31.debug(`run cleanup: runId=${params.runId} sessionId=${params.sessionId} aborted=${aborted} timedOut=${timedOut}`);
 				try {
 					unsubscribe();
 				} catch (err) {
-					log$30.error(`CRITICAL: unsubscribe failed, possible resource leak: runId=${params.runId} ${String(err)}`);
+					log$31.error(`CRITICAL: unsubscribe failed, possible resource leak: runId=${params.runId} ${String(err)}`);
 				}
 				pendingClearActiveEmbeddedRun = () => clearActiveEmbeddedRun(params.sessionId, queueHandle, params.sessionKey, !aborted && !timedOut && !promptError);
 				params.abortSignal?.removeEventListener?.("abort", onAbort);
@@ -69054,7 +69172,7 @@ async function runEmbeddedAttempt(params) {
 					workspaceLane: params.workspaceLane,
 					runId: params.runId
 				})).catch((err) => {
-					log$30.warn(`model_call_ended hook failed: ${String(err)}`);
+					log$31.warn(`model_call_ended hook failed: ${String(err)}`);
 				});
 				proxyMetadataFromHook = modelCallEndedEvent.proxyMetadata;
 			}
@@ -69078,7 +69196,7 @@ async function runEmbeddedAttempt(params) {
 				workspaceLane: params.workspaceLane,
 				runId: params.runId
 			})).catch((err) => {
-				log$30.warn(`llm_output hook failed: ${String(err)}`);
+				log$31.warn(`llm_output hook failed: ${String(err)}`);
 			});
 			return {
 				aborted,
@@ -69121,7 +69239,7 @@ async function runEmbeddedAttempt(params) {
 				if (_primaryWriteQueue != null && _primaryWriteQueue.length > 0) try {
 					await drainPendingPrimaryWrites(_primaryWriteQueue, 5e3, _configuredStorage?.config.fallbackToJsonlOnError ?? false);
 				} catch (cleanupDrainErr) {
-					log$30.error("cleanup drain failed in finally; session entries may be lost", {
+					log$31.error("cleanup drain failed in finally; session entries may be lost", {
 						sessionId: params.sessionId,
 						error: cleanupDrainErr
 					});
@@ -69133,7 +69251,7 @@ async function runEmbeddedAttempt(params) {
 		}
 	} finally {
 		restoreSkillEnv?.();
-		if (!params.skipCwdChange) process.chdir(prevCwd);
+		releaseWorkspaceCwd?.();
 		pendingClearActiveEmbeddedRun?.();
 	}
 }
@@ -69409,8 +69527,7 @@ async function runEmbeddedPiAgent(params) {
 		const redactedSessionId = redactRunIdentifier(params.sessionId);
 		const redactedSessionKey = redactRunIdentifier(params.sessionKey);
 		const redactedWorkspace = redactRunIdentifier(resolvedWorkspace);
-		if (workspaceResolution.usedFallback) log$30.warn(`[workspace-fallback] caller=runEmbeddedPiAgent reason=${workspaceResolution.fallbackReason} run=${params.runId} session=${redactedSessionId} sessionKey=${redactedSessionKey} agent=${workspaceResolution.agentId} workspace=${redactedWorkspace}`);
-		const prevCwd = process.cwd();
+		if (workspaceResolution.usedFallback) log$31.warn(`[workspace-fallback] caller=runEmbeddedPiAgent reason=${workspaceResolution.fallbackReason} run=${params.runId} session=${redactedSessionId} sessionKey=${redactedSessionKey} agent=${workspaceResolution.agentId} workspace=${redactedWorkspace}`);
 		let provider = (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
 		let modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
 		const agentDir = params.agentDir ?? resolveOpenClawAgentDir();
@@ -69450,7 +69567,7 @@ async function runEmbeddedPiAgent(params) {
 		if (hookRunner?.hasHooks("before_model_resolve")) try {
 			modelResolveOverride = await hookRunner.runBeforeModelResolve({ prompt: params.prompt }, hookCtx);
 		} catch (hookErr) {
-			log$30.warn(`before_model_resolve hook failed: ${String(hookErr)}`);
+			log$31.warn(`before_model_resolve hook failed: ${String(hookErr)}`);
 		}
 		if (hookRunner?.hasHooks("before_agent_start")) try {
 			legacyBeforeAgentStartResult = await hookRunner.runBeforeAgentStart({ prompt: params.prompt }, hookCtx);
@@ -69459,15 +69576,15 @@ async function runEmbeddedPiAgent(params) {
 				modelOverride: modelResolveOverride?.modelOverride ?? legacyBeforeAgentStartResult?.modelOverride
 			};
 		} catch (hookErr) {
-			log$30.warn(`before_agent_start hook (legacy model resolve path) failed: ${String(hookErr)}`);
+			log$31.warn(`before_agent_start hook (legacy model resolve path) failed: ${String(hookErr)}`);
 		}
 		if (modelResolveOverride?.providerOverride) {
 			provider = modelResolveOverride.providerOverride;
-			log$30.info(`[hooks] provider overridden to ${provider}`);
+			log$31.info(`[hooks] provider overridden to ${provider}`);
 		}
 		if (modelResolveOverride?.modelOverride) {
 			modelId = modelResolveOverride.modelOverride;
-			log$30.info(`[hooks] model overridden to ${modelId}`);
+			log$31.info(`[hooks] model overridden to ${modelId}`);
 		}
 		const { model, error, authStorage, modelRegistry } = resolveModel(provider, modelId, agentDir, params.config);
 		if (!model) throw new FailoverError(error ?? `Unknown model: ${provider}/${modelId}`, {
@@ -69487,9 +69604,9 @@ async function runEmbeddedPiAgent(params) {
 			warnBelowTokens: CONTEXT_WINDOW_WARN_BELOW_TOKENS,
 			hardMinTokens: CONTEXT_WINDOW_HARD_MIN_TOKENS
 		});
-		if (ctxGuard.shouldWarn) log$30.warn(`low context window: ${provider}/${modelId} ctx=${ctxGuard.tokens} (warn<${CONTEXT_WINDOW_WARN_BELOW_TOKENS}) source=${ctxGuard.source}`);
+		if (ctxGuard.shouldWarn) log$31.warn(`low context window: ${provider}/${modelId} ctx=${ctxGuard.tokens} (warn<${CONTEXT_WINDOW_WARN_BELOW_TOKENS}) source=${ctxGuard.source}`);
 		if (ctxGuard.shouldBlock) {
-			log$30.error(`blocked model (context window too small): ${provider}/${modelId} ctx=${ctxGuard.tokens} (min=${CONTEXT_WINDOW_HARD_MIN_TOKENS}) source=${ctxGuard.source}`);
+			log$31.error(`blocked model (context window too small): ${provider}/${modelId} ctx=${ctxGuard.tokens} (min=${CONTEXT_WINDOW_HARD_MIN_TOKENS}) source=${ctxGuard.source}`);
 			throw new FailoverError(`Model context window too small (${ctxGuard.tokens} tokens). Minimum is ${CONTEXT_WINDOW_HARD_MIN_TOKENS}.`, {
 				reason: "unknown",
 				provider,
@@ -69543,14 +69660,14 @@ async function runEmbeddedPiAgent(params) {
 			copilotTokenState.refreshInFlight = (async () => {
 				const githubToken = copilotTokenState.githubToken.trim();
 				if (!githubToken) throw new Error("Copilot refresh requires a GitHub token.");
-				log$30.debug(`Refreshing GitHub Copilot token (${reason})...`);
+				log$31.debug(`Refreshing GitHub Copilot token (${reason})...`);
 				const copilotToken = await resolveCopilotApiToken({ githubToken });
 				authStorage.setRuntimeApiKey(model.provider, copilotToken.token);
 				copilotTokenState.expiresAt = copilotToken.expiresAt;
 				const remaining = copilotToken.expiresAt - Date.now();
-				log$30.debug(`Copilot token refreshed; expires in ${Math.max(0, Math.floor(remaining / 1e3))}s.`);
+				log$31.debug(`Copilot token refreshed; expires in ${Math.max(0, Math.floor(remaining / 1e3))}s.`);
 			})().catch((err) => {
-				log$30.warn(`Copilot token refresh failed: ${describeUnknownError(err)}`);
+				log$31.warn(`Copilot token refresh failed: ${describeUnknownError(err)}`);
 				throw err;
 			}).finally(() => {
 				copilotTokenState.refreshInFlight = void 0;
@@ -69560,7 +69677,7 @@ async function runEmbeddedPiAgent(params) {
 		const scheduleCopilotRefresh = () => {
 			if (!copilotTokenState || copilotRefreshCancelled) return;
 			if (!hasCopilotGithubToken()) {
-				log$30.warn("Skipping Copilot refresh scheduling; GitHub token missing.");
+				log$31.warn("Skipping Copilot refresh scheduling; GitHub token missing.");
 				return;
 			}
 			clearCopilotRefreshTimer();
@@ -69722,7 +69839,7 @@ async function runEmbeddedPiAgent(params) {
 			while (true) {
 				if (runLoopIterations >= MAX_RUN_LOOP_ITERATIONS) {
 					const message = `Exceeded retry limit after ${runLoopIterations} attempts (max=${MAX_RUN_LOOP_ITERATIONS}).`;
-					log$30.error(`[run-retry-limit] sessionKey=${params.sessionKey ?? params.sessionId} provider=${provider}/${modelId} attempts=${runLoopIterations} maxAttempts=${MAX_RUN_LOOP_ITERATIONS}`);
+					log$31.error(`[run-retry-limit] sessionKey=${params.sessionKey ?? params.sessionId} provider=${provider}/${modelId} attempts=${runLoopIterations} maxAttempts=${MAX_RUN_LOOP_ITERATIONS}`);
 					logRunCompleted({
 						runId: params.runId,
 						sessionKey: params.sessionKey,
@@ -69886,21 +70003,21 @@ async function runEmbeddedPiAgent(params) {
 					const errorText = contextOverflowError.text;
 					const overflowStorage = getConfiguredSessionStorageRuntime();
 					const msgCount = attempt.messagesSnapshot?.length ?? 0;
-					log$30.warn(`[context-overflow-diag] sessionKey=${params.sessionKey ?? params.sessionId} provider=${provider}/${modelId} source=${contextOverflowError.source} messages=${msgCount} sessionFile=${params.sessionFile} diagId=${overflowDiagId} compactionAttempts=${overflowCompactionAttempts} error=${errorText.slice(0, 200)}`);
+					log$31.warn(`[context-overflow-diag] sessionKey=${params.sessionKey ?? params.sessionId} provider=${provider}/${modelId} source=${contextOverflowError.source} messages=${msgCount} sessionFile=${params.sessionFile} diagId=${overflowDiagId} compactionAttempts=${overflowCompactionAttempts} error=${errorText.slice(0, 200)}`);
 					const isCompactionFailure = isCompactionFailureError(errorText);
 					const hadAttemptLevelCompaction = attemptCompactionCount > 0;
 					const explicitOverflowCompactionAllowed = params.trigger !== "analysis" && !params.disablePluginHooks && !params.skipTranscriptSync;
 					if (explicitOverflowCompactionAllowed && !isCompactionFailure && hadAttemptLevelCompaction && overflowCompactionAttempts < MAX_OVERFLOW_COMPACTION_ATTEMPTS) {
 						overflowCompactionAttempts++;
-						log$30.warn(`context overflow persisted after in-attempt compaction (attempt ${overflowCompactionAttempts}/${MAX_OVERFLOW_COMPACTION_ATTEMPTS}); retrying prompt without additional compaction for ${provider}/${modelId}`);
+						log$31.warn(`context overflow persisted after in-attempt compaction (attempt ${overflowCompactionAttempts}/${MAX_OVERFLOW_COMPACTION_ATTEMPTS}); retrying prompt without additional compaction for ${provider}/${modelId}`);
 						continue;
 					}
 					if (explicitOverflowCompactionAllowed && !isCompactionFailure && !hadAttemptLevelCompaction && overflowCompactionAttempts < MAX_OVERFLOW_COMPACTION_ATTEMPTS) {
-						if (log$30.isEnabled("debug")) log$30.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=compact isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=unknown attempt=${overflowCompactionAttempts + 1} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
+						if (log$31.isEnabled("debug")) log$31.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=compact isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=unknown attempt=${overflowCompactionAttempts + 1} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
 						overflowCompactionAttempts++;
-						log$30.warn(`context overflow detected (attempt ${overflowCompactionAttempts}/${MAX_OVERFLOW_COMPACTION_ATTEMPTS}); attempting auto-compaction for ${provider}/${modelId}`);
+						log$31.warn(`context overflow detected (attempt ${overflowCompactionAttempts}/${MAX_OVERFLOW_COMPACTION_ATTEMPTS}); attempting auto-compaction for ${provider}/${modelId}`);
 						const _overflowIsDb = (overflowStorage?.runtime?.backend ?? "fs-jsonl") !== "fs-jsonl";
-						if (_overflowIsDb) log$30.warn(`context overflow compaction skipped for DB backend session ${params.sessionId}; compact.ts does not yet support DB-backend sessions`);
+						if (_overflowIsDb) log$31.warn(`context overflow compaction skipped for DB backend session ${params.sessionId}; compact.ts does not yet support DB-backend sessions`);
 						const compactResult = _overflowIsDb ? {
 							compacted: false,
 							reason: "db-backend-not-supported"
@@ -69933,10 +70050,10 @@ async function runEmbeddedPiAgent(params) {
 						});
 						if (compactResult.compacted) {
 							autoCompactionCount += 1;
-							log$30.info(`auto-compaction succeeded for ${provider}/${modelId}; retrying prompt`);
+							log$31.info(`auto-compaction succeeded for ${provider}/${modelId}; retrying prompt`);
 							continue;
 						}
-						log$30.warn(`auto-compaction failed for ${provider}/${modelId}: ${compactResult.reason ?? "nothing to compact"}`);
+						log$31.warn(`auto-compaction failed for ${provider}/${modelId}: ${compactResult.reason ?? "nothing to compact"}`);
 					}
 					if (!toolResultTruncationAttempted) {
 						const contextWindowTokens = ctxInfo.tokens;
@@ -69945,11 +70062,11 @@ async function runEmbeddedPiAgent(params) {
 							contextWindowTokens
 						}) : false;
 						if (hasOversized) {
-							if (log$30.isEnabled("debug")) log$30.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=truncate_tool_results isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=${hasOversized} attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
+							if (log$31.isEnabled("debug")) log$31.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=truncate_tool_results isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=${hasOversized} attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
 							toolResultTruncationAttempted = true;
-							if ((overflowStorage?.runtime?.backend ?? "fs-jsonl") !== "fs-jsonl") log$30.warn(`[context-overflow-recovery] Tool result truncation skipped for DB backend session ${params.sessionId}; tool-result-truncation.ts does not yet support DB-backend sessions`);
+							if ((overflowStorage?.runtime?.backend ?? "fs-jsonl") !== "fs-jsonl") log$31.warn(`[context-overflow-recovery] Tool result truncation skipped for DB backend session ${params.sessionId}; tool-result-truncation.ts does not yet support DB-backend sessions`);
 							else {
-								log$30.warn(`[context-overflow-recovery] Attempting tool result truncation for ${provider}/${modelId} (contextWindow=${contextWindowTokens} tokens)`);
+								log$31.warn(`[context-overflow-recovery] Attempting tool result truncation for ${provider}/${modelId} (contextWindow=${contextWindowTokens} tokens)`);
 								const truncResult = await truncateOversizedToolResultsInSession({
 									sessionFile: params.sessionFile,
 									contextWindowTokens,
@@ -69957,14 +70074,14 @@ async function runEmbeddedPiAgent(params) {
 									sessionKey: params.sessionKey
 								});
 								if (truncResult.truncated) {
-									log$30.info(`[context-overflow-recovery] Truncated ${truncResult.truncatedCount} tool result(s); retrying prompt`);
+									log$31.info(`[context-overflow-recovery] Truncated ${truncResult.truncatedCount} tool result(s); retrying prompt`);
 									continue;
 								}
-								log$30.warn(`[context-overflow-recovery] Tool result truncation did not help: ${truncResult.reason ?? "unknown"}`);
+								log$31.warn(`[context-overflow-recovery] Tool result truncation did not help: ${truncResult.reason ?? "unknown"}`);
 							}
-						} else if (log$30.isEnabled("debug")) log$30.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=give_up isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=${hasOversized} attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
+						} else if (log$31.isEnabled("debug")) log$31.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=give_up isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=${hasOversized} attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
 					}
-					if ((isCompactionFailure || overflowCompactionAttempts >= MAX_OVERFLOW_COMPACTION_ATTEMPTS || toolResultTruncationAttempted) && log$30.isEnabled("debug")) log$30.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=give_up isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=unknown attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
+					if ((isCompactionFailure || overflowCompactionAttempts >= MAX_OVERFLOW_COMPACTION_ATTEMPTS || toolResultTruncationAttempted) && log$31.isEnabled("debug")) log$31.debug(`[compaction-diag] decision diagId=${overflowDiagId} branch=give_up isCompactionFailure=${isCompactionFailure} hasOversizedToolResults=unknown attempt=${overflowCompactionAttempts} maxAttempts=${MAX_OVERFLOW_COMPACTION_ATTEMPTS}`);
 					const kind = isCompactionFailure ? "compaction_failure" : "context_overflow";
 					logRunCompleted({
 						runId: params.runId,
@@ -70070,7 +70187,7 @@ async function runEmbeddedPiAgent(params) {
 						attempted: attemptedThinking
 					});
 					if (fallbackThinking) {
-						log$30.warn(`unsupported thinking level for ${provider}/${modelId}; retrying with ${fallbackThinking}`);
+						log$31.warn(`unsupported thinking level for ${provider}/${modelId}; retrying with ${fallbackThinking}`);
 						thinkLevel = fallbackThinking;
 						continue;
 					}
@@ -70088,7 +70205,7 @@ async function runEmbeddedPiAgent(params) {
 					attempted: attemptedThinking
 				});
 				if (fallbackThinking && !aborted) {
-					log$30.warn(`unsupported thinking level for ${provider}/${modelId}; retrying with ${fallbackThinking}`);
+					log$31.warn(`unsupported thinking level for ${provider}/${modelId}; retrying with ${fallbackThinking}`);
 					thinkLevel = fallbackThinking;
 					continue;
 				}
@@ -70109,7 +70226,7 @@ async function runEmbeddedPiAgent(params) {
 						imageDimensionError.contentIndex !== void 0 ? `content=${imageDimensionError.contentIndex}` : null,
 						imageDimensionError.maxDimensionPx !== void 0 ? `limit=${imageDimensionError.maxDimensionPx}px` : null
 					].filter(Boolean).join(" ");
-					log$30.warn(`Profile ${lastProfileId} rejected image payload${details ? ` (${details})` : ""}.`);
+					log$31.warn(`Profile ${lastProfileId} rejected image payload${details ? ` (${details})` : ""}.`);
 				}
 				if (!aborted && failoverFailure || timedOut && !timedOutDuringCompaction) {
 					if (lastProfileId) {
@@ -70117,8 +70234,8 @@ async function runEmbeddedPiAgent(params) {
 							profileId: lastProfileId,
 							reason: timedOut || assistantFailoverReason === "timeout" ? "timeout" : assistantFailoverReason ?? "unknown"
 						});
-						if (timedOut && !isProbeSession) log$30.warn(`Profile ${lastProfileId} timed out. Trying next account...`);
-						if (cloudCodeAssistFormatError) log$30.warn(`Profile ${lastProfileId} hit Cloud Code Assist format error. Tool calls will be sanitized on retry.`);
+						if (timedOut && !isProbeSession) log$31.warn(`Profile ${lastProfileId} timed out. Trying next account...`);
+						if (cloudCodeAssistFormatError) log$31.warn(`Profile ${lastProfileId} hit Cloud Code Assist format error. Tool calls will be sanitized on retry.`);
 					}
 					if (await advanceAuthProfile()) continue;
 					if (fallbackConfigured) {
@@ -70163,7 +70280,7 @@ async function runEmbeddedPiAgent(params) {
 					}, hookCtx);
 					if (transformResult?.assistantTexts) finalAssistantTexts = transformResult.assistantTexts;
 				} catch (err) {
-					log$30.warn(`transform_llm_output hook failed: ${String(err)}`);
+					log$31.warn(`transform_llm_output hook failed: ${String(err)}`);
 				}
 				const payloads = buildEmbeddedRunPayloads({
 					assistantTexts: finalAssistantTexts,
@@ -70214,7 +70331,7 @@ async function runEmbeddedPiAgent(params) {
 					durationMs: Date.now() - started,
 					exitStatus: aborted || timedOut ? "error" : void 0
 				});
-				log$30.debug(`embedded run done: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - started} aborted=${aborted}`);
+				log$31.debug(`embedded run done: runId=${params.runId} sessionId=${params.sessionId} durationMs=${Date.now() - started} aborted=${aborted}`);
 				if (lastProfileId) {
 					await markAuthProfileGood({
 						store: authStore,
@@ -70251,7 +70368,6 @@ async function runEmbeddedPiAgent(params) {
 			}
 		} finally {
 			stopCopilotRefreshTimer();
-			if (!params.skipCwdChange) process.chdir(prevCwd);
 		}
 	}));
 }
@@ -97096,7 +97212,7 @@ async function registerSlackMonitorSlashCommands(params) {
 			const [{ resolveAgentRoute }, { finalizeInboundContext }, { dispatchReplyWithDispatcher }] = await Promise.all([
 				import("./resolve-route-DgcwkR0G.js").then((n) => n.r),
 				import("./inbound-context-BG7BNrcT.js").then((n) => n.n),
-				import("./provider-dispatcher-D0-S69GS.js")
+				import("./provider-dispatcher-CkSHbuj1.js")
 			]);
 			const [{ resolveConversationLabel }, { createReplyPrefixOptions }, { recordInboundSessionMetaSafe }] = await Promise.all([
 				import("./conversation-label-BXGlixeO.js"),