@cydm/pie 2.6.12 → 2.7.1

package/dist/cli.js

@@ -1,18 +1,38 @@
 #!/usr/bin/env node
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
+  VERSION,
   cleanupBashOutputArtifacts,
   createBashTool,
   createCliHostCapabilities,
   createCliWebResearchHealthStore,
+  createTraceTransportSink,
+  createTransportDiagnosticsStreamFn,
   formatSize,
+  getAgentDir,
+  getBuiltinDir,
+  getConfigDir,
+  getCustomThemesDir,
+  getLogsDir,
+  getPackageDir,
+  getProjectSettingsPath,
+  getRuntimeLogPath,
+  getSessionsDir,
+  getSettingsPath,
+  getThemesDir,
+  logTransportLifecycle,
+  migrateConfigFromAgentDir,
   truncateHeadTail
-} from "./chunks/chunk-AAEBH6KX.js";
+} from "./chunks/chunk-W74NRSRV.js";
+import {
+  resolveCliProjectRoot
+} from "./chunks/chunk-WLFOBECN.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
   AttentionCoordinator,
   BUILTIN_TOOL_CAPABILITY_METADATA,
+  DEFAULT_COMPACTION_CONFIG,
   ExtensionResourceScope,
   FileSessionStore,
   SessionTraceSnapshotWriter,
@@ -30,6 +50,7 @@ import {
   createFileObservationState,
   createPolicyEnforcedTools,
   createReadFileUnderstandingHandler,
+  createSearchContextTool,
   createSessionManager,
   createSharedFileSystemTools,
   createSharedWebSearchTool,
@@ -51,20 +72,22 @@ import {
   interactionAttentionResolution,
   isCompactSummaryMessage,
   isExtensionEnabled,
+  isToolAllowedInPlanMode,
   maybeAdvanceTodoExecutionState,
   modalityForReadFileUnderstandingKind,
   pauseExecutionState,
+  prepareSessionCompaction,
   registerInteractionHandler,
   requestInteraction,
   resolveExtensionIdentity,
   restoreExecutionState,
-  selectToolsForRuntimePolicy,
   setEnablementInMap,
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
-  supersedeExecutionState
-} from "./chunks/chunk-PPEWRUMQ.js";
-import "./chunks/chunk-HHNOENEH.js";
+  supersedeExecutionState,
+  verifyPreparedCompactionCommit
+} from "./chunks/chunk-M44CWVDZ.js";
+import "./chunks/chunk-NJFPBU36.js";
 import {
   Deref,
   EMPTY_ASSISTANT_CONTENT_ERROR,
@@ -87,26 +110,9 @@ import {
   requiredCapabilityForToolPurpose,
   setLogger,
   sortToolModelCandidatesByCapability,
+  streamSimple,
   type_exports
-} from "./chunks/chunk-7B4IIBVS.js";
-import {
-  VERSION,
-  getAgentDir,
-  getBuiltinDir,
-  getConfigDir,
-  getCustomThemesDir,
-  getLogsDir,
-  getPackageDir,
-  getProjectSettingsPath,
-  getRuntimeLogPath,
-  getSessionsDir,
-  getSettingsPath,
-  getThemesDir,
-  migrateConfigFromAgentDir
-} from "./chunks/chunk-5353DEEC.js";
-import {
-  resolveCliProjectRoot
-} from "./chunks/chunk-WLFOBECN.js";
+} from "./chunks/chunk-XUROMYTT.js";
 import {
   IsArray,
   IsBigInt,
@@ -51971,6 +51977,7 @@ var MODEL_OVERRIDE_KEYS = [
   "cost",
   "contextWindow",
   "maxTokens",
+  "transport",
   "headers",
   "compat",
   "cacheCapability",
@@ -51988,9 +51995,11 @@ function validateExtensionProviderConfig(provider, config) {
     throw new Error(`registerProvider("${provider}"): baseUrl must be an absolute URL`);
   }
   assertHeadersShape(config.headers, `registerProvider("${provider}")`);
+  validateTransport(config.transport, `registerProvider("${provider}")`);
   for (const model of config.models ?? []) {
     if (!model || typeof model.id !== "string" || !model.id.trim() || /\s/.test(model.id)) throw new Error(`registerProvider("${provider}"): invalid model id`);
     assertHeadersShape(model.headers, `registerProvider("${provider}") model "${model.id}"`);
+    validateTransport(model.transport, `Model "${model.id}"`);
     validateCompat(model.compat, `registerProvider("${provider}") model "${model.id}" compat`);
     validateCacheCapability(model.cacheCapability, `registerProvider("${provider}") model "${model.id}" cacheCapability`);
     validateWebSearchCapability(model.webSearch, `registerProvider("${provider}") model "${model.id}" webSearch`);
@@ -51998,7 +52007,7 @@ function validateExtensionProviderConfig(provider, config) {
   }
 }
 var REMOTE_CATALOG_CACHE_VERSION = 4;
-var SUPPORTED_REMOTE_APIS = /* @__PURE__ */ new Set(["openai-completions", "anthropic-messages"]);
+var SUPPORTED_REMOTE_APIS = /* @__PURE__ */ new Set(["openai-completions", "anthropic-messages", "openai-responses"]);
 var MAX_REMOTE_CATALOG_BYTES = 2 * 1024 * 1024;
 var OAUTH_RESTORE_LEEWAY_MS = 6e4;
 var OAUTH_REFRESH_TIMEOUT_MS = 3e4;
@@ -52495,11 +52504,17 @@ function validateFileCapabilities(value, label) {
     }
   }
 }
+function validateTransport(value, label) {
+  if (value !== void 0 && value !== "sse" && value !== "websocket" && value !== "auto") throw new Error(`${label}.transport is invalid`);
+}
 function validateCompat(value, label) {
   if (value === void 0) return;
   if (!isPlainRecord(value)) throw new Error(`${label} is invalid`);
   assertOnlyKeys(value, [
     "forcedReasoningEffort",
+    "store",
+    "supportsEncryptedReasoning",
+    "responsesContinuation",
     "supportsStore",
     "supportsDeveloperRole",
     "supportsReasoningEffort",
@@ -52517,6 +52532,9 @@ function validateCompat(value, label) {
     throw new Error(`${label}.forcedReasoningEffort must be "none"`);
   }
   for (const field of [
+    "store",
+    "supportsEncryptedReasoning",
+    "responsesContinuation",
     "supportsStore",
     "supportsDeveloperRole",
     "supportsReasoningEffort",
@@ -52537,12 +52555,14 @@ function validateRemoteModel(profileId, model) {
   if (!isPlainRecord(model) || typeof model.id !== "string" || !model.id.trim() || model.id !== model.id.trim() || /\s/.test(model.id)) throw new Error(`Remote profile "${profileId}" contains an invalid model id`);
   assertOnlyKeys(model, [
     "id",
+    "api",
     "name",
     "reasoning",
     "input",
     "cost",
     "contextWindow",
     "maxTokens",
+    "transport",
     "compat",
     "cacheCapability",
     "webSearch",
@@ -52556,19 +52576,21 @@ function validateRemoteModel(profileId, model) {
   for (const field of ["name", "displayName", "filePlatform", "attachmentPlatform", "apiKeyEnv"]) {
     assertOptionalString(model[field], `Remote profile "${profileId}" model "${model.id}" ${field}`);
   }
+  if (model.api !== void 0 && !SUPPORTED_REMOTE_APIS.has(model.api)) throw new Error(`Model "${model.id}" has unsupported api ${model.api}`);
   assertOptionalBoolean(model.reasoning, `Remote profile "${profileId}" model "${model.id}" reasoning`);
   if (!Array.isArray(model.input) || model.input.length === 0 || model.input.some((item) => !["text", "image", "audio", "video"].includes(item))) {
     throw new Error(`Remote profile "${profileId}" model "${model.id}" has invalid input capabilities`);
   }
   if (!isPlainRecord(model.cost)) throw new Error(`Remote profile "${profileId}" model "${model.id}" has invalid cost values`);
-  assertOnlyKeys(model.cost, ["input", "output", "cacheRead", "cacheWrite"], `Remote profile "${profileId}" model "${model.id}" cost`);
-  if ([model.cost.input, model.cost.output, model.cost.cacheRead, model.cost.cacheWrite].some((value) => typeof value !== "number" || !Number.isFinite(value) || value < 0)) {
+  assertOnlyKeys(model.cost, ["input", "output", "cacheRead", "cacheWrite", "cacheWriteLong"], `Remote profile "${profileId}" model "${model.id}" cost`);
+  if ([model.cost.input, model.cost.output, model.cost.cacheRead, model.cost.cacheWrite, model.cost.cacheWriteLong].some((value) => value !== void 0 && (typeof value !== "number" || !Number.isFinite(value) || value < 0))) {
     throw new Error(`Remote profile "${profileId}" model "${model.id}" has invalid cost values`);
   }
   if (!Number.isSafeInteger(model.contextWindow) || Number(model.contextWindow) <= 0 || !Number.isSafeInteger(model.maxTokens) || Number(model.maxTokens) <= 0 || Number(model.maxTokens) > Number(model.contextWindow)) {
     throw new Error(`Remote profile "${profileId}" model "${model.id}" has invalid token limits`);
   }
   if (new Set(model.input).size !== model.input.length) throw new Error(`Remote profile "${profileId}" model "${model.id}" has duplicate input capabilities`);
+  validateTransport(model.transport, `Model "${model.id}"`);
   validateCompat(model.compat, `Remote profile "${profileId}" model "${model.id}" compat`);
   validateCacheCapability(model.cacheCapability, `Remote profile "${profileId}" model "${model.id}" cacheCapability`);
   validateWebSearchCapability(model.webSearch, `Remote profile "${profileId}" model "${model.id}" webSearch`);
@@ -52604,6 +52626,7 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
     if (!provider || provider !== provider.trim() || /\s/.test(provider) || !isPlainRecord(source)) throw new Error("catalog contains an invalid profile");
     assertOnlyKeys(source, [
       "baseUrl",
+      "endpoints",
       "api",
       "apiKey",
       "apiKeyEnv",
@@ -52611,6 +52634,7 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
       "displayName",
       "filePlatform",
       "attachmentPlatform",
+      "transport",
       "compat",
       "cacheCapability",
       "webSearch",
@@ -52626,8 +52650,13 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
       assertOptionalString(source[field], `Remote profile "${provider}" ${field}`);
     }
     validateRemoteEndpoint(source.baseUrl, catalogUrl, `Remote profile "${provider}"`);
+    validateProfileEndpoints(source, `Remote profile "${provider}"`);
+    for (const [api, endpoint] of Object.entries(source.endpoints ?? {})) {
+      validateRemoteEndpoint(endpoint, catalogUrl, `Remote profile "${provider}" endpoints.${api}`);
+    }
     if (!Array.isArray(source.models) || source.models.length === 0) throw new Error(`Remote profile "${provider}" has no models`);
     assertRemoteHeadersSafe(source.headers, `Remote profile "${provider}"`);
+    validateTransport(source.transport, `Remote profile "${provider}"`);
     validateCompat(source.compat, `Remote profile "${provider}" compat`);
     validateCacheCapability(source.cacheCapability, `Remote profile "${provider}" cacheCapability`);
     validateWebSearchCapability(source.webSearch, `Remote profile "${provider}" webSearch`);
@@ -52644,7 +52673,9 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
     }
     const sanitized = {
       baseUrl: source.baseUrl,
+      ...source.endpoints === void 0 ? {} : { endpoints: { ...source.endpoints } },
       api: source.api,
+      transport: source.transport,
       apiKeyEnv: remote.apiKeyEnv,
       ...source.headers === void 0 ? {} : { headers: { ...source.headers } },
       ...source.displayName === void 0 ? {} : { displayName: source.displayName },
@@ -52656,6 +52687,7 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
       ...source.fileCapabilities === void 0 ? {} : { fileCapabilities: { ...source.fileCapabilities } },
       models: source.models.map((model) => ({
         id: model.id,
+        ...model.api === void 0 ? {} : { api: model.api },
         ...model.name === void 0 ? {} : { name: model.name },
         ...model.reasoning === void 0 ? {} : { reasoning: model.reasoning },
         input: [...model.input],
@@ -52663,10 +52695,12 @@ function sanitizeRemotePayload(decoded, remote, catalogUrl, allowLocallyInjected
           input: model.cost.input,
           output: model.cost.output,
           cacheRead: model.cost.cacheRead,
-          cacheWrite: model.cost.cacheWrite
+          cacheWrite: model.cost.cacheWrite,
+          ...model.cost.cacheWriteLong === void 0 ? {} : { cacheWriteLong: model.cost.cacheWriteLong }
         },
         contextWindow: model.contextWindow,
         maxTokens: model.maxTokens,
+        ...model.transport === void 0 ? {} : { transport: model.transport },
         ...model.compat === void 0 ? {} : { compat: { ...model.compat } },
         ...model.cacheCapability === void 0 ? {} : { cacheCapability: { ...model.cacheCapability } },
         ...model.webSearch === void 0 ? {} : { webSearch: { ...model.webSearch } },
@@ -52729,8 +52763,8 @@ function validateModelOverrides(value) {
     if (override.maxTokens !== void 0 && (!Number.isInteger(override.maxTokens) || Number(override.maxTokens) < 1)) throw new Error(`models.json modelOverrides["${key}"].maxTokens is invalid`);
     if (override.cost !== void 0) {
       if (!isPlainRecord(override.cost)) throw new Error(`models.json modelOverrides["${key}"].cost must be an object`);
-      for (const field of ["input", "output", "cacheRead", "cacheWrite"]) {
-        if (override.cost[field] !== void 0 && (typeof override.cost[field] !== "number" || Number.isNaN(override.cost[field]))) throw new Error(`models.json modelOverrides["${key}"].cost.${field} must be a number`);
+      for (const field of ["input", "output", "cacheRead", "cacheWrite", "cacheWriteLong"]) {
+        if (override.cost[field] !== void 0 && (typeof override.cost[field] !== "number" || !Number.isFinite(override.cost[field]) || override.cost[field] < 0)) throw new Error(`models.json modelOverrides["${key}"].cost.${field} must be a non-negative finite number`);
       }
     }
     if (override.headers !== void 0) {
@@ -52739,16 +52773,41 @@ function validateModelOverrides(value) {
         if (typeof headerValue !== "string") throw new Error(`models.json modelOverrides["${key}"].headers.${headerName} must be a string`);
       }
     }
+    validateTransport(override.transport, `Model override "${key}"`);
     validateCompat(override.compat, `models.json modelOverrides["${key}"].compat`);
     validateCacheCapability(override.cacheCapability, `models.json modelOverrides["${key}"].cacheCapability`);
     validateWebSearchCapability(override.webSearch, `models.json modelOverrides["${key}"].webSearch`);
     validateFileCapabilities(override.fileCapabilities, `models.json modelOverrides["${key}"].fileCapabilities`);
   }
 }
+function validateProfileEndpoints(profile, label) {
+  if (profile.endpoints === void 0) return;
+  if (!isPlainRecord(profile.endpoints)) throw new Error(`${label} endpoints must be an object`);
+  for (const [api, value] of Object.entries(profile.endpoints)) {
+    if (!SUPPORTED_REMOTE_APIS.has(api)) throw new Error(`${label} endpoints has unsupported api ${api}`);
+    try {
+      if (typeof value !== "string") throw new Error("invalid URL");
+      const endpoint = new URL(value);
+      if (endpoint.protocol !== "http:" && endpoint.protocol !== "https:") throw new Error("unsupported protocol");
+    } catch {
+      throw new Error(`${label} endpoints.${api} must be an absolute HTTP(S) URL`);
+    }
+  }
+}
+function resolveProfileRoute(profile, model) {
+  const api = model.api ?? profile.api;
+  if (!SUPPORTED_REMOTE_APIS.has(api)) throw new Error(`Model "${model.id}" has unsupported api ${api}`);
+  const endpoint = profile.endpoints?.[api];
+  if (model.api !== void 0 && endpoint === void 0 && api !== profile.api) {
+    throw new Error(`Model "${model.id}" api ${api} requires profile endpoints.${api} (otherwise api must equal profile api)`);
+  }
+  return { api, baseUrl: endpoint ?? profile.baseUrl };
+}
 function validateProfileConfig(profileId, profileConfig) {
   if (!isPlainRecord(profileConfig)) throw new Error(`Profile "${profileId}" must be an object.`);
   assertOnlyKeys(profileConfig, [
     "baseUrl",
+    "endpoints",
     "api",
     "apiKey",
     "apiKeyEnv",
@@ -52756,6 +52815,7 @@ function validateProfileConfig(profileId, profileConfig) {
     "displayName",
     "filePlatform",
     "attachmentPlatform",
+    "transport",
     "compat",
     "cacheCapability",
     "webSearch",
@@ -52787,7 +52847,9 @@ function validateProfileConfig(profileId, profileConfig) {
   } catch {
     throw new Error(`Profile "${profileId}" baseUrl must be an absolute HTTP(S) URL`);
   }
+  validateProfileEndpoints(profileConfig, `Profile "${profileId}"`);
   assertHeadersShape(profileConfig.headers, `Profile "${profileId}"`);
+  validateTransport(profileConfig.transport, `Profile "${profileId}"`);
   validateCompat(profileConfig.compat, `Profile "${profileId}" compat`);
   validateCacheCapability(profileConfig.cacheCapability, `Profile "${profileId}" cacheCapability`);
   validateWebSearchCapability(profileConfig.webSearch, `Profile "${profileId}" webSearch`);
@@ -52797,12 +52859,14 @@ function validateProfileConfig(profileId, profileConfig) {
     if (!isPlainRecord(modelConfig)) throw new Error(`Profile "${profileId}" model #${index} must be an object.`);
     assertOnlyKeys(modelConfig, [
       "id",
+      "api",
       "name",
       "reasoning",
       "input",
       "cost",
       "contextWindow",
       "maxTokens",
+      "transport",
       "compat",
       "cacheCapability",
       "webSearch",
@@ -52826,6 +52890,7 @@ function validateProfileConfig(profileId, profileConfig) {
       );
     }
     validateRemoteModel(profileId, modelConfig);
+    resolveProfileRoute(profileConfig, modelConfig);
     assertHeadersShape(modelConfig.headers, `Profile "${profileId}" model "${modelConfig.id}"`);
     assertOptionalEnvName(modelConfig.apiKeyEnv, `Profile "${profileId}" model "${modelConfig.id}" apiKeyEnv`);
     if (seenModelIds.has(modelConfig.id)) throw new Error(`Profile "${profileId}" contains duplicate model "${modelConfig.id}".`);
@@ -52916,12 +52981,13 @@ var ModelRegistry = class {
           );
         }
         const existing = this.models.get(provider);
-        if (existing && (providerConfig.baseUrl || providerConfig.api || providerConfig.headers)) {
+        if (existing && (providerConfig.baseUrl || providerConfig.api || providerConfig.headers || providerConfig.transport)) {
           for (const model of existing.values()) {
             this.upsert({
               ...model,
               baseUrl: providerConfig.baseUrl || model.baseUrl,
               api: providerConfig.api || model.api,
+              transport: providerConfig.transport ?? model.transport,
               apiKeyEnv: providerConfig.apiKeyEnv || model.apiKeyEnv,
               displayName: providerConfig.displayName || model.displayName || provider,
               filePlatform: providerConfig.filePlatform || model.filePlatform,
@@ -52938,9 +53004,8 @@ var ModelRegistry = class {
           this.upsert({
             id: customModel.id,
             name: customModel.name || baseModel?.name || customModel.id,
-            api: providerConfig.api || baseModel?.api || "openai-completions",
+            ...resolveProfileRoute(providerConfig, customModel),
             provider,
-            baseUrl: providerConfig.baseUrl || baseModel?.baseUrl || "",
             reasoning: customModel.reasoning ?? baseModel?.reasoning ?? false,
             input: customModel.input || baseModel?.input || ["text"],
             cost: customModel.cost || baseModel?.cost || { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -52951,6 +53016,7 @@ var ModelRegistry = class {
             filePlatform: customModel.filePlatform || providerConfig.filePlatform || baseModel?.filePlatform,
             attachmentPlatform: customModel.attachmentPlatform || providerConfig.attachmentPlatform || baseModel?.attachmentPlatform,
             headers: providerConfig.headers ? { ...baseModel?.headers, ...providerConfig.headers, ...customModel.headers } : customModel.headers || baseModel?.headers,
+            transport: customModel.transport ?? providerConfig.transport ?? baseModel?.transport,
             compat: customModel.compat || providerConfig.compat || baseModel?.compat,
             cacheCapability: customModel.cacheCapability || providerConfig.cacheCapability || baseModel?.cacheCapability,
             webSearch: customModel.webSearch || providerConfig.webSearch || baseModel?.webSearch,
@@ -53003,6 +53069,7 @@ var ModelRegistry = class {
       if (override.maxTokens !== void 0) patched.maxTokens = override.maxTokens;
       if (override.cost !== void 0) patched.cost = { ...existing.cost, ...override.cost };
       if (override.headers !== void 0) patched.headers = { ...existing.headers, ...override.headers };
+      if (override.transport !== void 0) patched.transport = override.transport;
       if (override.compat !== void 0) patched.compat = deepMergePlainRecords(existing.compat, override.compat);
       if (override.cacheCapability !== void 0) patched.cacheCapability = { ...existing.cacheCapability, ...override.cacheCapability };
       if (override.webSearch !== void 0) patched.webSearch = { ...existing.webSearch, ...override.webSearch };
@@ -53024,9 +53091,8 @@ var ModelRegistry = class {
       this.upsert({
         id: customModel.id,
         name: customModel.name || customModel.id,
-        api: providerConfig.api || "openai-completions",
+        ...resolveProfileRoute(providerConfig, customModel),
         provider,
-        baseUrl: providerConfig.baseUrl || "",
         reasoning: customModel.reasoning ?? false,
         input: customModel.input || ["text"],
         cost: customModel.cost || { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -53037,6 +53103,7 @@ var ModelRegistry = class {
         filePlatform: customModel.filePlatform || providerConfig.filePlatform,
         attachmentPlatform: customModel.attachmentPlatform || providerConfig.attachmentPlatform,
         headers: { ...providerConfig.headers, ...customModel.headers },
+        transport: customModel.transport ?? providerConfig.transport,
         compat: customModel.compat || providerConfig.compat,
         cacheCapability: customModel.cacheCapability || providerConfig.cacheCapability,
         webSearch: customModel.webSearch || providerConfig.webSearch,
@@ -53476,12 +53543,13 @@ var ModelRegistry = class {
       this.authStorage.setProviderEnvVar(provider, config.apiKeyEnv);
     }
     const existing = this.models.get(provider);
-    if (existing && (config.baseUrl || config.api || config.headers)) {
+    if (existing && (config.baseUrl || config.api || config.headers || config.transport)) {
       for (const model of existing.values()) {
         this.upsert({
           ...model,
           baseUrl: config.baseUrl || model.baseUrl,
           api: config.api || model.api,
+          transport: config.transport ?? model.transport,
           headers: config.headers ? { ...model.headers, ...config.headers } : model.headers
         });
       }
@@ -53502,6 +53570,7 @@ var ModelRegistry = class {
         apiKeyEnv: config.apiKeyEnv || baseModel?.apiKeyEnv,
         displayName: customModel.displayName || baseModel?.displayName || provider,
         headers: config.headers ? { ...baseModel?.headers, ...config.headers, ...customModel.headers } : customModel.headers || baseModel?.headers,
+        transport: customModel.transport ?? config.transport ?? baseModel?.transport,
         compat: customModel.compat || baseModel?.compat,
         cacheCapability: customModel.cacheCapability || baseModel?.cacheCapability,
         webSearch: customModel.webSearch || baseModel?.webSearch,
@@ -53794,6 +53863,16 @@ var SettingsManager = class {
     this.settings.autoCompactReserveTokens = tokens;
     this.writeSettings();
   }
+  /** Undefined means "no CLI override": the provider default applies. */
+  getPromptCacheRetention() {
+    const retention = this.settings.promptCacheRetention;
+    return retention === "none" || retention === "short" || retention === "long" ? retention : void 0;
+  }
+  setPromptCacheRetention(retention) {
+    if (retention === void 0) delete this.settings.promptCacheRetention;
+    else this.settings.promptCacheRetention = retention;
+    this.writeSettings();
+  }
   getWebSearchMode() {
     const mode = this.settings.tools?.webSearch?.mode;
     if (mode === "disabled" || mode === "cached" || mode === "live") {
@@ -54053,7 +54132,7 @@ function checkComputerUse() {
       id: "computer_use_helper",
       label: "computer-use helper",
       status: "warn",
-      message: `computer-use helper app is not installed yet; it installs on first tool use to ${appPath}. Afterwards grant Accessibility and Screen Recording to pie-computer-use.app in System Settings \u2192 Privacy & Security.`,
+      message: `computer-use helper app is not installed yet; it installs on first computer-use-axi use to ${appPath}. Afterwards grant Accessibility and Screen Recording to pie-computer-use.app in System Settings \u2192 Privacy & Security.`,
       details: { appPath }
     };
   }
@@ -54341,7 +54420,7 @@ var MODE_RULES = {
     "~/.pie is allowlisted for Pie configuration and session support.",
     "Shell commands run from the workspace and return structured output, timeout, and truncation details.",
     "web_research is read-only, uses provider-native web/search/fetch capabilities, and does not grant bash/curl web scraping permission.",
-    "computer-use observe tools only read the screen; act_ui synthesizes real desktop input and requires a first-use confirmation each session.",
+    "Desktop control runs through the computer-use-axi skill CLI via bash: observation commands only read the screen, while act synthesizes real desktop input and goes through normal shell permission prompts.",
     "Protected paths from extensions can block reads/writes even when tools are present."
   ],
   plan: [
@@ -54351,7 +54430,7 @@ var MODE_RULES = {
   yolo: [
     "/settings/yolo relaxes filesystem sandbox directory restrictions.",
     "It does not make destructive shell commands safe; use it only in trusted workspaces.",
-    "It also bypasses the computer-use act_ui first-use confirmation."
+    "It also auto-approves shell commands, including computer-use-axi desktop input."
   ],
   subagents: [
     "Subagents inherit the parent tool set, then runtime policy removes write and high-risk tools.",
@@ -55513,10 +55592,11 @@ async function forkStoredSession(params) {
         timestamp: entry.timestamp
       };
       if (copy.compactionData) {
+        const selfAnchored = copy.compactionData.firstKeptEntryId === entry.id;
         const keptId = idMap.get(copy.compactionData.firstKeptEntryId);
         copy.compactionData = {
           ...copy.compactionData,
-          firstKeptEntryId: keptId ?? firstCopiedId ?? copy.id
+          firstKeptEntryId: selfAnchored ? copy.id : keptId ?? firstCopiedId ?? copy.id
         };
       }
       idMap.set(summary.id, copy.id);
@@ -56502,7 +56582,10 @@ function createExtensionContext(extension, cwd, uiContext, abortFn, isIdleFn, ha
     },
     get yoloMode() {
       return actions?.yoloMode ?? false;
-    }
+    },
+    // Only expose setYoloMode when the host can actually toggle it — plan-mode
+    // gates the option on typeof ctx.setYoloMode === "function".
+    ...actions?.setYoloMode ? { setYoloMode: (enabled) => actions.setYoloMode(enabled) } : {}
   };
   return context;
 }
@@ -60395,8 +60478,8 @@ var Editor = class {
     this.historyIndex = -1;
     this.lastAction = null;
     this.pushUndoSnapshot();
-    const cleanText2 = pastedText.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    const tabExpandedText = cleanText2.replace(/\t/g, "    ");
+    const cleanText = pastedText.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    const tabExpandedText = cleanText.replace(/\t/g, "    ");
     let filteredText = tabExpandedText.split("").filter((char) => char === "\n" || char.charCodeAt(0) >= 32).join("");
     if (/^[/~.]/.test(filteredText)) {
       const currentLine = this.state.lines[this.state.cursorLine] || "";
@@ -61480,9 +61563,9 @@ var Input = class {
   handlePaste(pastedText) {
     this.lastAction = null;
     this.pushUndo();
-    const cleanText2 = pastedText.replace(/\r\n/g, "").replace(/\r/g, "").replace(/\n/g, "");
-    this.value = this.value.slice(0, this.cursor) + cleanText2 + this.value.slice(this.cursor);
-    this.cursor += cleanText2.length;
+    const cleanText = pastedText.replace(/\r\n/g, "").replace(/\r/g, "").replace(/\n/g, "");
+    this.value = this.value.slice(0, this.cursor) + cleanText + this.value.slice(this.cursor);
+    this.cursor += cleanText.length;
   }
   invalidate() {
   }
@@ -64255,7 +64338,10 @@ var ExtensionRunner = class {
       },
       get yoloMode() {
         return runner.actions.yoloMode ?? false;
-      }
+      },
+      // Only expose setYoloMode when the host can actually toggle it — plan-mode
+      // gates the option on typeof ctx.setYoloMode === "function".
+      ...runner.actions.setYoloMode ? { setYoloMode: (enabled) => runner.actions.setYoloMode(enabled) } : {}
     };
     return createLoggedProxy(context, `ExtensionContext#${contextId}`);
   }
@@ -65005,6 +65091,23 @@ function buildCliFileAccessOptions(params) {
   };
 }
 
+// src/runtime/computer-use-owner.ts
+var COMPUTER_USE_OWNER_ENV = "PIE_COMPUTER_USE_OWNER_ID";
+var COMPUTER_USE_EXECUTION_ENV = "PIE_COMPUTER_USE_EXECUTION_ID";
+var COMPUTER_USE_STANDALONE_OWNER = "standalone";
+var OWNER_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:@-]{0,255}$/;
+function normalizeComputerUseOwner(value) {
+  if (typeof value !== "string") return COMPUTER_USE_STANDALONE_OWNER;
+  const trimmed = value.trim();
+  if (!trimmed) return COMPUTER_USE_STANDALONE_OWNER;
+  return OWNER_PATTERN.test(trimmed) ? trimmed : COMPUTER_USE_STANDALONE_OWNER;
+}
+function computerUseOwnerEnv(ownerId, executionId) {
+  const env = { [COMPUTER_USE_OWNER_ENV]: normalizeComputerUseOwner(ownerId) };
+  if (executionId) env[COMPUTER_USE_EXECUTION_ENV] = executionId;
+  return env;
+}
+
 // src/theme/theme.ts
 import * as fs13 from "node:fs";
 import * as path12 from "node:path";
@@ -70202,14 +70305,18 @@ function computePromptPrefixHash(systemPrompt, tools) {
 function calculateCumulativeCacheHitRate(messages) {
   let input = 0;
   let cacheRead = 0;
+  let cacheWrite = 0;
+  let cacheWriteLong = 0;
   for (const message of messages) {
     if (message.role !== "assistant") continue;
     const usage = message.usage;
     if (!usage) continue;
     input += usage.input;
     cacheRead += usage.cacheRead;
+    cacheWrite += usage.cacheWrite;
+    cacheWriteLong += usage.cacheWriteLong ?? 0;
   }
-  const base = input + cacheRead;
+  const base = input + cacheRead + cacheWrite + cacheWriteLong;
   return base > 0 ? cacheRead / base : null;
 }
 var signalMemories = /* @__PURE__ */ new WeakMap();
@@ -70219,20 +70326,52 @@ function getLastContextSignals(hostKey) {
 }
 function computeContextSignals(hostKey, systemPrompt, tools, messages) {
   const prefixHash = computePromptPrefixHash(systemPrompt, tools);
+  const systemHash = computePromptPrefixHash(systemPrompt, []);
+  const toolsHash = computePromptPrefixHash("", tools);
   const previous = signalMemories.get(hostKey);
   const prefixHashChanged = previous !== void 0 && previous.hash !== prefixHash;
   if (previous?.hash !== prefixHash) {
-    signalMemories.set(hostKey, { hash: prefixHash });
+    signalMemories.set(hostKey, { hash: prefixHash, systemHash, toolsHash });
   }
   const signals = {
     prefixHash,
     prefixHashChanged,
+    ...prefixHashChanged && previous ? { previousPrefixHash: previous.hash } : {},
+    systemPromptChanged: prefixHashChanged && previous !== void 0 && previous.systemHash !== systemHash,
+    toolsChanged: prefixHashChanged && previous !== void 0 && previous.toolsHash !== toolsHash,
     cacheHitRate: calculateCumulativeCacheHitRate(messages)
   };
   lastSignals.set(hostKey, signals);
   return signals;
 }
 
+// src/runtime/cache-invalidation-trace.ts
+function noteCacheInvalidationInChat(host, signals) {
+  if (!signals || !signals.prefixHashChanged) return;
+  const parts = [];
+  if (signals.systemPromptChanged && signals.toolsChanged) parts.push("system prompt + tools rebuilt");
+  else if (signals.toolsChanged) parts.push("tools rebuilt");
+  else if (signals.systemPromptChanged) parts.push("system prompt rebuilt");
+  else parts.push("prefix rebuilt");
+  const from = signals.previousPrefixHash ?? "?";
+  const line = `\u26A1 Prompt cache invalidated: \u2301${from} \u2192 \u2301${signals.prefixHash} (${parts.join(", ")})`;
+  if (host.chatContainer && host.ui) {
+    host.chatContainer.addChild(new Spacer(1));
+    host.chatContainer.addChild(new Text(theme.fg("warning", line), 1, 0));
+    host.ui.requestRender();
+  }
+  host.sessionTrace?.noteRuntimeEvent("cache_prefix_invalidated", {
+    from,
+    to: signals.prefixHash,
+    systemPromptChanged: signals.systemPromptChanged,
+    toolsChanged: signals.toolsChanged
+  });
+}
+function applyContextSignalsWithTrace(host) {
+  applyContextSignalsToFooter(host);
+  noteCacheInvalidationInChat(host, getLastContextSignals(host));
+}
+
 // src/commands/interactive-session-commands.ts
 import * as os6 from "os";
 
@@ -70434,6 +70573,11 @@ function formatReportTokens(count) {
   if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
   return `${Math.round(count / 1e6)}M`;
 }
+function formatMeasuredTime(timestamp) {
+  const date = new Date(timestamp);
+  const pad = (value) => String(value).padStart(2, "0");
+  return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+}
 function buildSystemPromptBlocks(systemPrompt, skillsSection, knowledgeSection) {
   const totalTokens = estimateStringTokens(systemPrompt);
   const skillsTokens = skillsSection && systemPrompt.includes(skillsSection.trim()) ? estimateStringTokens(skillsSection) : null;
@@ -70689,8 +70833,12 @@ ${file.content}`).join("\n\n");
     messagesTokens,
     dynamicContextTokens: 0,
     estimatedTotalTokens,
-    actualTokens: inputs.actualTokens,
+    estimatedCurrentTokens: inputs.estimatedCurrentTokens,
+    providerMeasuredTokens: inputs.providerMeasuredTokens,
+    providerMeasuredAt: inputs.providerMeasuredAt ?? null,
+    measurementMatchesCurrentContext: inputs.measurementMatchesCurrentContext,
     contextWindow: inputs.contextWindow,
+    autoCompactEnabled: inputs.autoCompactEnabled,
     autoCompactLimitTokens: inputs.autoCompactLimitTokens,
     reserveTokens: inputs.reserveTokens,
     promptPrefixHash: inputs.promptPrefixHash,
@@ -70747,13 +70895,14 @@ function buildContextOverviewText(data, themeInput) {
       }
     }
   });
-  const autoCompact = data.autoCompactLimitTokens ? `triggers > ~${formatReportTokens(data.autoCompactLimitTokens)} (reserve ${formatReportTokens(data.reserveTokens)})` : "disabled";
+  const autoCompact = !data.autoCompactEnabled ? "Off (disabled in settings)" : data.autoCompactLimitTokens ? `On \xB7 triggers > ~${formatReportTokens(data.autoCompactLimitTokens)} (reserve ${formatReportTokens(data.reserveTokens)})` : "On \xB7 threshold unknown (context window unavailable)";
   lines.push(
     `${padEndVisible(` ${branch(sections.length)} auto-compact`, labelWidth)}${theme2.fg("dim", autoCompact)}`
   );
-  const reconciliation = data.actualTokens !== null ? `actual ${formatReportTokens(data.actualTokens)} (last response) \xB7 est\u2212actual \u2248 ${formatReportTokens(
-    Math.abs(data.estimatedTotalTokens - data.actualTokens)
-  )}${data.estimatedTotalTokens >= data.actualTokens ? " overhead" : " undercount"}` : "actual unknown until the next model response";
+  const measuredAt = data.providerMeasuredAt !== null ? ` \xB7 measured ${formatMeasuredTime(data.providerMeasuredAt)}` : "";
+  const reconciliation = data.providerMeasuredTokens !== null ? data.measurementMatchesCurrentContext ? `est current ~${formatReportTokens(data.estimatedCurrentTokens)} \xB7 provider-measured ${formatReportTokens(data.providerMeasuredTokens)} (last response${measuredAt}) \xB7 est\u2212measured \u2248 ${formatReportTokens(
+    Math.abs(data.estimatedCurrentTokens - data.providerMeasuredTokens)
+  )}${data.estimatedCurrentTokens >= data.providerMeasuredTokens ? " overhead" : " undercount"}` : `est current ~${formatReportTokens(data.estimatedCurrentTokens)} \xB7 provider-measured ${formatReportTokens(data.providerMeasuredTokens)} (last response${measuredAt}) \xB7 not comparable \u2014 context changed since measurement` : `est current ~${formatReportTokens(data.estimatedCurrentTokens)} \xB7 provider usage not reported yet`;
   lines.push(`  ${theme2.fg("dim", reconciliation)}`);
   lines.push(theme2.fg("dim", "  /debugs/context \xB7 Enter to drill into a section, Esc to go back"));
   return lines.join("\n");
@@ -70772,23 +70921,37 @@ function buildWindowRows(data) {
       label: "estimated total (prompt + tools + messages)",
       estTokens: data.estimatedTotalTokens,
       note: `prompt ~${formatReportTokens(data.systemPromptTokens)} \xB7 tools ~${formatReportTokens(data.toolsTokens)} \xB7 messages ~${formatReportTokens(data.messagesTokens)}`
+    },
+    {
+      id: "window:estimated-current",
+      label: "estimated current context (local estimate + tail)",
+      estTokens: data.estimatedCurrentTokens,
+      note: "local estimate \u2014 not a provider measurement"
     }
   ];
-  if (data.actualTokens !== null) {
+  if (data.providerMeasuredTokens !== null) {
+    const measuredAt = data.providerMeasuredAt !== null ? formatMeasuredTime(data.providerMeasuredAt) : "unknown time";
     rows.push({
-      id: "window:actual",
-      label: "actual (last model response)",
-      estTokens: data.actualTokens,
-      valueText: formatReportTokens(data.actualTokens),
-      note: `gap \u2248 ${formatReportTokens(Math.abs(data.estimatedTotalTokens - data.actualTokens))}`
+      id: "window:provider-measured",
+      label: "provider-measured (last response)",
+      estTokens: data.providerMeasuredTokens,
+      valueText: formatReportTokens(data.providerMeasuredTokens),
+      note: data.measurementMatchesCurrentContext ? `est\u2212measured \u2248 ${formatReportTokens(Math.abs(data.estimatedCurrentTokens - data.providerMeasuredTokens))} \xB7 ${measuredAt}` : `not comparable \u2014 context changed since measurement \xB7 ${measuredAt}`
     });
   }
   rows.push({
     id: "window:auto-compact",
+    label: "auto-compact",
+    estTokens: 0,
+    valueText: data.autoCompactEnabled ? "On" : "Off",
+    note: data.autoCompactEnabled ? "enabled in settings" : "disabled in settings"
+  });
+  rows.push({
+    id: "window:auto-compact-threshold",
     label: "auto-compact threshold",
-    estTokens: data.autoCompactLimitTokens ?? 0,
-    valueText: data.autoCompactLimitTokens ? `>${formatReportTokens(data.autoCompactLimitTokens)}` : "off",
-    note: data.autoCompactLimitTokens ? `reserve ${formatReportTokens(data.reserveTokens)}` : "disabled"
+    estTokens: data.autoCompactEnabled ? data.autoCompactLimitTokens ?? 0 : 0,
+    valueText: data.autoCompactEnabled ? data.autoCompactLimitTokens ? `>${formatReportTokens(data.autoCompactLimitTokens)}` : "unknown" : "\u2014",
+    note: data.autoCompactEnabled ? data.autoCompactLimitTokens ? `reserve ${formatReportTokens(data.reserveTokens)}` : "context window unavailable" : "not applied while Off"
   });
   if (data.promptPrefixHash) {
     rows.push({
@@ -71171,6 +71334,9 @@ var TreeSelectorComponent = class {
   pageNext() {
     if (this.goToNextPage()) {
       this.statusMessage = null;
+    } else if (this.filteredRows.length > 0) {
+      this.selectedIndex = Math.max(0, this.filteredRows.length - 1);
+      this.statusMessage = "latest page - at newest entry";
     } else {
       this.statusMessage = this.pageSummaries.length === 0 ? "no entries" : "latest page";
     }
@@ -71178,10 +71344,58 @@ var TreeSelectorComponent = class {
   pagePrev() {
     if (this.goToPreviousPage()) {
       this.statusMessage = null;
+    } else if (this.filteredRows.length > 0) {
+      this.selectedIndex = 0;
+      this.statusMessage = "oldest page - at first entry";
     } else {
       this.statusMessage = this.pageSummaries.length === 0 ? "no entries" : "oldest page";
     }
   }
+  /** Jump to the oldest page (seqs start at 1; afterSeq 0 = from the start). */
+  jumpToFirstPage() {
+    if (this.pageSummaries.length > 0 && !this.hasPrev) {
+      this.selectedIndex = 0;
+      this.statusMessage = "oldest page - at first entry";
+      return;
+    }
+    if (this.fetchWindow(0, null)) {
+      this.selectedIndex = 0;
+      this.statusMessage = null;
+    }
+  }
+  /** Jump to the newest page. Seqs are 1..total (append-only journal), so the last window starts at total - pageSize. */
+  jumpToLastPage() {
+    if (this.pageSummaries.length > 0 && !this.hasNext) {
+      this.selectedIndex = Math.max(0, this.filteredRows.length - 1);
+      this.statusMessage = "latest page - at newest entry";
+      return;
+    }
+    let anchor = Math.max(0, this.totalEntries - this.pageSizeValue);
+    for (let attempt = 0; attempt < 4; attempt++) {
+      if (this.fetchWindow(anchor, null)) {
+        if (this.hasNext) {
+          anchor = this.pageSummaries[this.pageSummaries.length - 1].seq;
+          continue;
+        }
+        this.selectedIndex = Math.max(0, this.filteredRows.length - 1);
+        this.statusMessage = null;
+        return;
+      }
+      if (anchor === 0 || !this.hasNext) break;
+      anchor = Math.max(0, anchor - this.pageSizeValue);
+    }
+  }
+  /** Move the cursor one viewport within the resident page; ←/→ change pages. */
+  screenScroll(delta) {
+    if (this.filteredRows.length === 0) return;
+    const next = Math.max(0, Math.min(this.selectedIndex + delta, this.filteredRows.length - 1));
+    if (next === this.selectedIndex) {
+      this.statusMessage = delta > 0 ? "end of page - \u2192 for next page" : "start of page - \u2190 for previous page";
+      return;
+    }
+    this.selectedIndex = next;
+    this.statusMessage = null;
+  }
   /**
    * Bounded "next match": step to the next in-page match, otherwise scan
    * forward at most SEARCH_SCAN_PAGE_LIMIT pages per press. Never scans
@@ -71235,7 +71449,7 @@ var TreeSelectorComponent = class {
     lines.push(createLine("  Conversation Tree", width, false));
     lines.push(
       createLine(
-        "  \u2191\u2193:move  \u2190\u2192:page  e:collapse  tab:next match  F:fork  Enter:navigate  Esc:cancel",
+        "  \u2191\u2193:move  \u2190\u2192:page  PgUp/PgDn:screen  Home/End:jump  e:collapse  tab:match  F:fork  Enter:go  Esc:cancel",
         width,
         false
       )
@@ -71304,10 +71518,18 @@ var TreeSelectorComponent = class {
       this.moveUp();
     } else if (kb.matches(keyData, "selectDown")) {
       this.moveDown();
-    } else if (kb.matches(keyData, "cursorRight") || kb.matches(keyData, "selectPageDown")) {
+    } else if (kb.matches(keyData, "cursorRight")) {
       this.pageNext();
-    } else if (kb.matches(keyData, "cursorLeft") || kb.matches(keyData, "selectPageUp")) {
+    } else if (kb.matches(keyData, "cursorLeft")) {
       this.pagePrev();
+    } else if (kb.matches(keyData, "selectPageDown")) {
+      this.screenScroll(this.maxVisibleLines);
+    } else if (kb.matches(keyData, "selectPageUp")) {
+      this.screenScroll(-this.maxVisibleLines);
+    } else if (kb.matches(keyData, "cursorLineStart")) {
+      this.jumpToFirstPage();
+    } else if (kb.matches(keyData, "cursorLineEnd")) {
+      this.jumpToLastPage();
     } else if (keyData === "e" || keyData === "E") {
       this.toggleCollapse();
     } else if (kb.matches(keyData, "selectConfirm")) {
@@ -72622,7 +72844,9 @@ function calculateSessionUsageTotals(messages) {
   let output = 0;
   let cacheRead = 0;
   let cacheWrite = 0;
+  let cacheWriteLong = 0;
   let cost = 0;
+  let costEstimated = false;
   for (const message of messages) {
     if (message.role !== "assistant") continue;
     const usage = message.usage;
@@ -72631,9 +72855,11 @@ function calculateSessionUsageTotals(messages) {
     output += usage.output;
     cacheRead += usage.cacheRead;
     cacheWrite += usage.cacheWrite;
+    cacheWriteLong += usage.cacheWriteLong ?? 0;
     cost += usage.cost?.total ?? 0;
+    if (usage.cost?.cacheWriteLongEstimated === true) costEstimated = true;
   }
-  return { input, output, cacheRead, cacheWrite, cost };
+  return { input, output, cacheRead, cacheWrite, cacheWriteLong, cacheWriteTotal: cacheWrite + cacheWriteLong, cost, costEstimated };
 }
 function formatTokensCompact(count) {
   if (count < 1e3) return String(count);
@@ -72679,16 +72905,18 @@ ${options.theme.bold("Usage (active context)")}
         info += `${options.theme.fg("dim", "Cache Read:")} ${totals.cacheRead.toLocaleString()}
 `;
       }
-      if (totals.cacheWrite > 0) {
-        info += `${options.theme.fg("dim", "Cache Write:")} ${totals.cacheWrite.toLocaleString()}
+      if (totals.cacheWriteTotal > 0) {
+        const split = totals.cacheWriteLong > 0 ? options.theme.fg("dim", ` (short ${totals.cacheWrite.toLocaleString()} \xB7 long ${totals.cacheWriteLong.toLocaleString()})`) : "";
+        info += `${options.theme.fg("dim", "Cache Write:")} ${totals.cacheWriteTotal.toLocaleString()}${split}
 `;
       }
       if (totals.cost > 0) {
-        info += `${options.theme.fg("dim", "Cost:")} $${totals.cost.toFixed(4)}
+        const estimateNote = totals.costEstimated ? " (long-TTL estimate)" : "";
+        info += `${options.theme.fg("dim", "Cost:")} $${totals.cost.toFixed(4)}${estimateNote}
 `;
       }
-      const hitRateBase = totals.input + totals.cacheRead;
-      if (hitRateBase > 0 && totals.cacheRead > 0) {
+      const hitRateBase = totals.input + totals.cacheRead + totals.cacheWriteTotal;
+      if (hitRateBase > 0) {
         const hitRate = (totals.cacheRead / hitRateBase * 100).toFixed(1);
         info += `${options.theme.fg("dim", "Cache Hit Rate:")} ${hitRate}% (~${formatTokensCompact(hitRateBase)} served)
 `;
@@ -72822,11 +73050,13 @@ async function loadSession(host, sessionId) {
       outputTokens: contextUsage.output,
       cacheRead: contextUsage.cacheRead,
       cacheWrite: contextUsage.cacheWrite,
+      cacheWriteLong: contextUsage.cacheWriteLong,
       cost: contextUsage.cost,
+      costEstimated: contextUsage.costEstimated,
       contextPercent,
       contextWindow
     });
-    applyContextSignalsToFooter(host);
+    applyContextSignalsWithTrace(host);
     host.ui.requestRender();
     setTimeout(() => host.ui.requestRender(), 100);
   } catch (error) {
@@ -73860,11 +74090,13 @@ function bindInteractiveRuntimeEvents(host) {
           outputTokens: contextUsage.output,
           cacheRead: contextUsage.cacheRead,
           cacheWrite: contextUsage.cacheWrite,
+          cacheWriteLong: contextUsage.cacheWriteLong,
           cost: contextUsage.cost,
+          costEstimated: contextUsage.costEstimated,
           contextPercent,
           contextWindow
         });
-        applyContextSignalsToFooter(host);
+        applyContextSignalsWithTrace(host);
         host.safeRequestRender();
         host.sessionManager.save().catch((err) => {
           console.error("[Session] Auto-save failed:", err);
@@ -74612,7 +74844,7 @@ function listDiscoveredSkills(host) {
 function applyReloadedSkills(host, result) {
   host.skills = result.skills.filter((skill) => host.options.settingsManager.isSkillEnabled(skill.name));
   host.skillsSection = formatSkillsForPrompt(host.skills);
-  host.applyRuntimeToolMode(host.allTools.length > 0 ? host.allTools : host.agent.state.tools);
+  host.applyRuntimeToolMode();
   host.updateSystemPromptTools();
   for (const skill of host.skills) {
     const skillPath = ["skills", `skill:${skill.name}`];
@@ -74913,9 +75145,9 @@ function collectKnownToolNames(host) {
 function describeToggleEffect(host, name, enabled) {
   const loaded = collectKnownToolNames(host).active.includes(name);
   if (enabled) {
-    return loaded ? `Tool "${name}" enabled (active now).` : `Tool "${name}" enabled in ~/.pie/settings.json (loads on next start \u2014 it was not loaded this session).`;
+    return loaded ? `Tool "${name}" enabled (saved to ~/.pie/settings.json; active now).` : `Tool "${name}" enabled in ~/.pie/settings.json (loads on next start \u2014 it was not loaded this session).`;
   }
-  return loaded ? `Tool "${name}" disabled (removed from this session).` : `Tool "${name}" disabled in ~/.pie/settings.json.`;
+  return loaded ? `Tool "${name}" disabled (saved to ~/.pie/settings.json; removed from this and future sessions).` : `Tool "${name}" disabled in ~/.pie/settings.json.`;
 }
 function showToolsManager(host) {
   host.showSelector((done) => {
@@ -75020,7 +75252,7 @@ function handleToolsCommand(host, args) {
       host.chatContainer.addChild(new Text(theme.fg("dim", "  No tools available."), 1, 0));
     }
     for (const name of active) {
-      const state = host.options.settingsManager.isToolEnabled(name) ? "enabled" : "disabled (removed from this session)";
+      const state = host.options.settingsManager.isToolEnabled(name) ? "enabled" : "disabled (saved to ~/.pie/settings.json; removed this session)";
       host.chatContainer.addChild(new Text(theme.fg("dim", `  \u2022 ${name}: ${state}`), 1, 0));
     }
     for (const name of disabled) {
@@ -75040,6 +75272,23 @@ function handleToolsCommand(host, args) {
 var RESET2 = "\x1B[0m";
 var INVERSE2 = "\x1B[7m";
 var ROLE_FILTER_CYCLE = ["all", "user", "assistant", "toolResult", "compaction"];
+function buildWrappedLines(rawLines, contentWidth) {
+  const width = Math.max(1, contentWidth);
+  const lines = [];
+  const sourceStart = [];
+  for (const rawLine of rawLines) {
+    sourceStart.push(lines.length);
+    lines.push(...wrapTextWithAnsi(rawLine, width));
+  }
+  return { lines: lines.length > 0 ? lines : [""], sourceStart };
+}
+function anchorFor(scroll, sourceStart, sourceCount) {
+  if (sourceStart.length === 0) return { source: 0, offset: 0 };
+  const target = Math.max(0, Math.min(scroll, sourceCount - 1));
+  let source = sourceStart.length - 1;
+  while (source > 0 && sourceStart[source] > target) source -= 1;
+  return { source, offset: target - sourceStart[source] };
+}
 function createLine2(content, width, isSelected) {
   const normalized = content.replace(/[\r\n]+/g, " ");
   const body = isSelected ? INVERSE2 + normalized : normalized;
@@ -75180,12 +75429,33 @@ var ContextReportSelectorComponent = class {
     this.views.push({
       kind: "text",
       title,
-      lines: text.replace(/\r\n/g, "\n").split("\n"),
+      rawLines: text.replace(/\r\n/g, "\n").split("\n"),
+      lines: [],
+      sourceStart: [],
+      wrapWidth: 0,
       scroll: 0
     });
     this.selectedIndex = 0;
     this.statusMessage = null;
   }
+  /** Re-wrap a text view for the current terminal width, preserving the anchor. */
+  ensureTextWrapped(view, width) {
+    const contentWidth = Math.max(1, width - 2);
+    if (view.wrapWidth === contentWidth) return;
+    const previousCount = view.lines.length;
+    const anchor = view.wrapWidth > 0 && previousCount > 0 ? anchorFor(view.scroll, view.sourceStart, previousCount) : { source: 0, offset: 0 };
+    const rebuilt = buildWrappedLines(view.rawLines, contentWidth);
+    view.lines = rebuilt.lines;
+    view.sourceStart = rebuilt.sourceStart;
+    view.wrapWidth = contentWidth;
+    const source = Math.min(anchor.source, Math.max(0, rebuilt.sourceStart.length - 1));
+    const nextSourceStart = rebuilt.sourceStart[source + 1] ?? rebuilt.lines.length;
+    const sourceLineCount = Math.max(1, nextSourceStart - rebuilt.sourceStart[source]);
+    view.scroll = Math.min(
+      Math.max(0, rebuilt.lines.length - 1),
+      rebuilt.sourceStart[source] + Math.min(anchor.offset, sourceLineCount - 1)
+    );
+  }
   drillIntoSelected() {
     const view = this.currentView;
     if (view.kind !== "list") return;
@@ -75367,6 +75637,8 @@ var ContextReportSelectorComponent = class {
         )
       );
     } else {
+      this.ensureTextWrapped(view, width);
+      view.scroll = Math.max(0, Math.min(view.scroll, view.lines.length - 1));
       const total = view.lines.length;
       const start = Math.min(view.scroll, Math.max(0, total - 1));
       const end = Math.min(start + this.maxVisibleLines, total);
@@ -75531,6 +75803,7 @@ function handleContextReportCommand(host) {
   const usage = host.calculateContextUsage();
   const contextWindow = host.options.model?.contextWindow ?? 0;
   const reserveTokens = host.options.settingsManager.getAutoCompactReserveTokens();
+  const autoCompactEnabled = host.options.settingsManager.getAutoCompactEnabled();
   const autoCompactLimit = contextWindow > 0 ? getAutoCompactTokenLimit(contextWindow, reserveTokens) ?? null : null;
   const prefixHash = computePromptPrefixHash(
     systemPrompt,
@@ -75562,7 +75835,11 @@ function handleContextReportCommand(host) {
     entries,
     compactionTokensBefore: (entryId) => host.sessionManager.getEntry(entryId)?.compactionData?.tokensBefore,
     contextWindow,
-    actualTokens: usage.tokens,
+    estimatedCurrentTokens: usage.estimatedCurrentTokens,
+    providerMeasuredTokens: usage.providerMeasuredTokens,
+    providerMeasuredAt: usage.providerMeasuredAt,
+    measurementMatchesCurrentContext: usage.measurementMatchesCurrentContext,
+    autoCompactEnabled,
     autoCompactLimitTokens: autoCompactLimit,
     reserveTokens,
     promptPrefixHash: prefixHash,
@@ -76394,11 +76671,13 @@ async function handleClearCommand(host) {
     outputTokens: contextUsage.output,
     cacheRead: contextUsage.cacheRead,
     cacheWrite: contextUsage.cacheWrite,
+    cacheWriteLong: contextUsage.cacheWriteLong,
     cost: contextUsage.cost,
+    costEstimated: contextUsage.costEstimated,
     contextPercent: contextWindow > 0 && contextUsage.tokens !== null ? contextUsage.tokens / contextWindow * 100 : 0,
     contextWindow
   });
-  applyContextSignalsToFooter(host);
+  applyContextSignalsWithTrace(host);
   host.updateTerminalTitle();
   host.chatContainer.clear();
   host.streamingComponent = void 0;
@@ -76487,7 +76766,10 @@ function createExtensionContextForCommands(host) {
         console.error(`[Extension] Tools restricted to: ${tools.join(", ")}`);
       }
     },
-    getActiveTools: () => host.agent.state.tools.map((tool) => tool.name),
+    getActiveTools: () => {
+      const tools = host.agent.state.tools;
+      return (host.planModeEnabled ? tools.filter((tool) => isToolAllowedInPlanMode(tool)) : tools).map((tool) => tool.name);
+    },
     sendUserMessage: (content) => {
       if (host.editor.onSubmit) {
         void host.editor.onSubmit(content);
@@ -76754,11 +77036,16 @@ async function handleCompactCommand(host) {
       host.showStatus("Nothing to compact yet");
       return;
     }
-    const firstKeptEntryId = findFirstKeptEntrySummaryId(host.sessionManager.getActiveContextSummaries());
-    if (!firstKeptEntryId) {
+    const preparation = prepareSessionCompaction({
+      sessionManager: host.sessionManager,
+      messages: existingMessages,
+      budgetTokens: host.options.model?.contextWindow
+    });
+    if (preparation.entries.length === 0) {
       host.showStatus("Need at least one real user message before compacting");
       return;
     }
+    const tokensBefore = calculateTotalTokens(preparation.messages);
     const compactOptions = {
       model: host.options.model,
       apiKey: host.options.apiKey,
@@ -76777,13 +77064,31 @@ async function handleCompactCommand(host) {
     if (beforeCompact?.summary) {
       summary = beforeCompact.summary;
     } else {
-      summary = await createCompactionSummary(existingMessages, compactOptions);
+      summary = await createCompactionSummary(preparation.messages, compactOptions);
     }
-    const tokensBefore = calculateTotalTokens(existingMessages);
-    host.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore);
+    const verified = verifyPreparedCompactionCommit({
+      preparation,
+      sessionManager: host.sessionManager,
+      messages: host.agent.state.messages,
+      result: { summary, retainedTail: preparation.retainedTail.retainedTail, tokensBefore }
+    });
+    if (verified.ok === false) {
+      if (verified.kind === "stale") {
+        host.showStatus("Session changed during compaction; nothing was published");
+        return;
+      }
+      throw new Error(`Compaction abandoned: ${verified.reason}`);
+    }
+    host.sessionManager.appendCompactionCheckpoint({
+      summary,
+      retainedTail: verified.retainedTail,
+      tokensBefore,
+      excludeFailure: preparation.excludedFailure
+    });
     const compactedMessages = host.sessionManager.getMessages();
     host.replaceAgentMessagesAndMarkSynced(compactedMessages);
     host.resetFileObservationState();
+    host.resetRuntimeModeBlocks?.();
     host.streamingComponent = void 0;
     host.pendingTools.clear();
     host.chatContainer.clear();
@@ -76804,11 +77109,13 @@ async function handleCompactCommand(host) {
       outputTokens: contextUsage.output,
       cacheRead: contextUsage.cacheRead,
       cacheWrite: contextUsage.cacheWrite,
+      cacheWriteLong: contextUsage.cacheWriteLong,
       cost: contextUsage.cost,
+      costEstimated: contextUsage.costEstimated,
       contextPercent,
       contextWindow
     });
-    applyContextSignalsToFooter(host);
+    applyContextSignalsWithTrace(host);
     await host.sessionManager.save();
     host.safeRequestRender();
   } catch (error) {
@@ -78927,8 +79234,12 @@ function queueMessage(host, text, mode, options = {}) {
   }
   const clearEditor = options.clearEditor ?? true;
   host.sessionTrace.notePendingUserText(text);
+  const runtimeBlock = host.runtimeModeBlockForNextMessage?.();
+  const content = runtimeBlock ? `${runtimeBlock}
+
+${text}` : text;
   void host.agentSessionController.prompt(
-    { role: "user", content: text, timestamp: Date.now() },
+    { role: "user", content, timestamp: Date.now() },
     {
       source: "interactive",
       streamingBehavior: mode,
@@ -79183,8 +79494,12 @@ var FooterComponent = class {
     if (state.inputTokens) statsParts.push(`\u2191${formatTokens(state.inputTokens)}`);
     if (state.outputTokens) statsParts.push(`\u2193${formatTokens(state.outputTokens)}`);
     if (state.cacheRead) statsParts.push(`R${formatTokens(state.cacheRead)}`);
-    if (state.cacheWrite) statsParts.push(`W${formatTokens(state.cacheWrite)}`);
-    if (state.cost) statsParts.push(`$${state.cost.toFixed(3)}`);
+    const cacheWriteShort = state.cacheWrite ?? 0;
+    const cacheWriteLong = state.cacheWriteLong ?? 0;
+    const cacheWriteTotal = cacheWriteShort + cacheWriteLong;
+    if (cacheWriteTotal) statsParts.push(`W${formatTokens(cacheWriteTotal)}`);
+    if (cacheWriteLong) statsParts.push(`W1h${formatTokens(cacheWriteLong)}`);
+    if (state.cost) statsParts.push(`${state.costEstimated ? "~" : ""}$${state.cost.toFixed(3)}`);
     if (state.cacheHitRate != null) {
       statsParts.push(theme.fg("dim", `ca ${(state.cacheHitRate * 100).toFixed(0)}%`));
     }
@@ -79334,13 +79649,23 @@ function calculateCliContextUsage(params) {
   const estimate = estimateContextTokens(messages);
   const usageMessage = estimate.lastUsageIndex !== null ? messages[estimate.lastUsageIndex] : void 0;
   const usage = usageMessage?.role === "assistant" ? usageMessage.usage : void 0;
+  const hasProviderMeasurement = usage !== void 0 && estimate.lastUsageIndex !== null;
   return {
     tokens: estimate.tokens,
+    estimatedCurrentTokens: estimate.tokens,
+    providerMeasuredTokens: hasProviderMeasurement ? estimate.providerTokens : null,
+    providerMeasuredAt: hasProviderMeasurement && usageMessage ? usageMessage.timestamp : null,
+    // A provider total describes the context AT that response. Any trailing
+    // tool/user message (or a compaction reset, which zeroes stale usage)
+    // makes the two figures different snapshots, so no error may be shown.
+    measurementMatchesCurrentContext: hasProviderMeasurement && estimate.lastUsageIndex === messages.length - 1,
     input: usage?.input ?? 0,
     output: usage?.output ?? 0,
     cacheRead: usage?.cacheRead ?? 0,
     cacheWrite: usage?.cacheWrite ?? 0,
-    cost: usage?.cost.total ?? 0
+    cacheWriteLong: usage?.cacheWriteLong ?? 0,
+    cost: usage?.cost.total ?? 0,
+    costEstimated: usage?.cost?.cacheWriteLongEstimated === true
   };
 }
 function createCliAutoCompactDecision(params) {
@@ -79371,6 +79696,11 @@ function shouldCliAutoCompactTokens(params) {
   const tokenLimit = getAutoCompactTokenLimit(params.contextWindow, params.reserveTokens);
   return tokenLimit !== void 0 && params.tokens > tokenLimit;
 }
+function createCliCompactionBudget(params) {
+  const contextWindow = params.contextWindow ?? 0;
+  const reserveTokens = params.reserveTokens ?? DEFAULT_COMPACTION_CONFIG.reserveTokens;
+  return () => getAutoCompactTokenLimit(contextWindow, reserveTokens);
+}
 async function createCliAutoCompactionResult(params) {
   if (params.context.signal?.aborted) {
     return { aborted: true };
@@ -79379,8 +79709,9 @@ async function createCliAutoCompactionResult(params) {
   if (!activeEntryId) {
     return { aborted: true };
   }
-  const firstKeptEntryId = findFirstKeptEntrySummaryId(params.context.sessionManager.getActiveContextSummaries());
-  if (!firstKeptEntryId) {
+  const legacyCutId = params.context.preparation ? null : findFirstKeptEntrySummaryId(params.context.sessionManager.getActiveContextSummaries());
+  const retainedTail = params.context.preparation ? params.context.preparation.retainedTail.retainedTail : legacyCutId ? { kind: "from-entry", entryId: legacyCutId } : void 0;
+  if (!retainedTail) {
     return { aborted: true };
   }
   const compactOptions = {
@@ -79395,7 +79726,8 @@ async function createCliAutoCompactionResult(params) {
   }
   return {
     summary,
-    firstKeptEntryId,
+    retainedTail,
+    ...retainedTail.kind === "from-entry" ? { firstKeptEntryId: retainedTail.entryId } : {},
     tokensBefore: calculateTotalTokens(params.context.messages)
   };
 }
@@ -79556,7 +79888,20 @@ function createCliRetryPolicy(isRetryableErrorOverride) {
 function calculateContextUsage(host) {
   const messages = host.agent?.state.messages ?? [];
   if (messages.length === 0) {
-    return { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+    return {
+      tokens: 0,
+      estimatedCurrentTokens: 0,
+      providerMeasuredTokens: null,
+      providerMeasuredAt: null,
+      measurementMatchesCurrentContext: false,
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+      cacheWriteLong: 0,
+      cost: 0,
+      costEstimated: false
+    };
   }
   return calculateCliContextUsage({
     messages,
@@ -80307,6 +80652,9 @@ function createInteractiveAgentSessionController(host) {
       }
       return void 0;
     },
+    // Same auto-compact limit the threshold decision uses; a checkpoint whose
+    // summary + retained tail would still exceed it is refused.
+    getCompactionBudgetTokens: createCliCompactionBudget({ contextWindow: host.options.model?.contextWindow }),
     getAutoContinueMessage: () => host.getTodoAutoContinueMessage(),
     classifyFailure: (context) => classifyCliFailure(context),
     retry: createCliRetryPolicy(
@@ -80324,9 +80672,16 @@ function createInteractiveAgentSessionController(host) {
           return { aborted: true };
         }
         if (beforeCompact?.summary) {
-          const firstKeptEntryId = findFirstKeptEntrySummaryId(context.sessionManager.getActiveContextSummaries());
-          if (!firstKeptEntryId) return { aborted: true };
-          return { summary: beforeCompact.summary, firstKeptEntryId };
+          const retainedTail = context.preparation?.retainedTail.retainedTail ?? (() => {
+            const legacyCutId = findFirstKeptEntrySummaryId(context.sessionManager.getActiveContextSummaries());
+            return legacyCutId ? { kind: "from-entry", entryId: legacyCutId } : void 0;
+          })();
+          if (!retainedTail) return { aborted: true };
+          return {
+            summary: beforeCompact.summary,
+            retainedTail,
+            ...retainedTail.kind === "from-entry" ? { firstKeptEntryId: retainedTail.entryId } : {}
+          };
         }
         autoCompactBeforeStats = summarizeActiveContext(context.sessionManager.getActiveContextSummaries());
         return createCliAutoCompactionResult({
@@ -80488,6 +80843,13 @@ function createInteractiveAgentSessionController(host) {
         host.isProcessing = true;
         host.footer.setState({ status: "processing", lifecycleEvent: "auto_compact" });
         host.showStatus(event.reason === "overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context...");
+      } else if (event.type === "compaction_committed") {
+        host.resetFileObservationState();
+        host.resetRuntimeModeBlocks?.();
+        host.sessionTrace.noteRuntimeEvent("compaction_committed", {
+          reason: event.reason,
+          willRetry: event.willRetry
+        });
       } else if (event.type === "auto_compaction_end") {
         host.isCompacting = false;
         host.isProcessing = false;
@@ -80500,7 +80862,6 @@ function createInteractiveAgentSessionController(host) {
           autoCompactBeforeStats = null;
           return;
         }
-        host.resetFileObservationState();
         if (!event.result?.aborted) {
           host.streamingComponent = void 0;
           host.pendingTools.clear();
@@ -80519,11 +80880,13 @@ function createInteractiveAgentSessionController(host) {
           outputTokens: contextUsage.output,
           cacheRead: contextUsage.cacheRead,
           cacheWrite: contextUsage.cacheWrite,
+          cacheWriteLong: contextUsage.cacheWriteLong,
           cost: contextUsage.cost,
+          costEstimated: contextUsage.costEstimated,
           contextPercent,
           contextWindow
         });
-        applyContextSignalsToFooter(host);
+        applyContextSignalsWithTrace(host);
         host.safeRequestRender();
         if (!event.result?.aborted) {
           if (autoCompactBeforeStats !== null) {
@@ -80552,94 +80915,80 @@ function createInteractiveAgentSessionController(host) {
 }
 
 // src/runtime/runtime-mode-context.ts
-var RUNTIME_MODE_CONTEXT_MARKER = "<runtime-mode-context>";
-var RUNTIME_MODE_CONTEXT_END_MARKER = "</runtime-mode-context>";
-var STALE_SYSTEM_REMINDER_RE = /<system-reminder>\s*# Plan Mode[\s\S]*?<\/system-reminder>\s*/gi;
-var STALE_RUNTIME_CONTEXT_RE = /<runtime-mode-context>[\s\S]*?<\/runtime-mode-context>\s*/gi;
-function isRecord3(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
+function isAgentMessage(value) {
+  return !!value && typeof value === "object" && "role" in value;
 }
-function cleanText(text) {
-  let stripped = 0;
-  const withoutRuntime = text.replace(STALE_RUNTIME_CONTEXT_RE, () => {
-    stripped++;
-    return "";
-  });
-  const withoutPlanReminder = withoutRuntime.replace(STALE_SYSTEM_REMINDER_RE, () => {
-    stripped++;
-    return "";
-  });
-  return { text: withoutPlanReminder, stripped };
-}
-function stripUserMessage(message) {
-  if (!isRecord3(message) || message.role !== "user") {
-    return { message, stripped: 0 };
+function prependRuntimeModeBlockToPrompt(input, block) {
+  if (!block) return input;
+  if (typeof input === "string") {
+    return input.trim() ? `${block}
+
+${input}` : block;
   }
-  const content = message.content;
-  if (typeof content === "string") {
-    const cleaned = cleanText(content);
-    if (cleaned.stripped === 0) return { message, stripped: 0 };
-    return {
-      message: {
-        ...message,
-        content: cleaned.text
-      },
-      stripped: cleaned.stripped
-    };
+  if (Array.isArray(input)) {
+    if (input.length > 0 && isAgentMessage(input[0])) {
+      return prependBlockToMessages(input, block);
+    }
+    return [{ type: "text", text: block }, ...input];
   }
-  if (!Array.isArray(content)) {
-    return { message, stripped: 0 };
-  }
-  let stripped = 0;
-  const nextContent = content.map((block) => {
-    if (!isRecord3(block) || block.type !== "text" || typeof block.text !== "string") {
-      return block;
-    }
-    const cleaned = cleanText(block.text);
-    stripped += cleaned.stripped;
-    return { ...block, text: cleaned.text };
-  }).filter((block) => !(isRecord3(block) && block.type === "text" && String(block.text ?? "").length === 0));
-  if (stripped === 0) return { message, stripped: 0 };
-  return {
-    message: {
-      ...message,
-      content: nextContent
-    },
-    stripped
-  };
+  if (isAgentMessage(input)) {
+    return prependBlockToMessages([input], block)[0];
+  }
+  return [{ type: "text", text: block }, ...input];
 }
-function stripRuntimeModeContext(messages) {
-  let stripped = 0;
-  const nextMessages = [];
-  for (const message of messages) {
-    const result = stripUserMessage(message);
-    stripped += result.stripped;
-    if (isRecord3(result.message) && result.message.role === "user") {
-      const content = result.message.content;
-      if (typeof content === "string" && content.trim().length === 0) {
-        continue;
-      }
-      if (Array.isArray(content) && content.length === 0) {
-        continue;
-      }
+function prependBlockToMessages(messages, block) {
+  const next = [...messages];
+  let target = -1;
+  for (let index = next.length - 1; index >= 0; index--) {
+    if (next[index]?.role === "user") {
+      target = index;
+      break;
     }
-    nextMessages.push(result.message);
   }
-  return { messages: nextMessages, stripped };
+  if (target < 0) {
+    next.push({ role: "user", content: block, timestamp: Date.now() });
+    return next;
+  }
+  const message = next[target];
+  if (typeof message.content === "string") {
+    next[target] = { ...message, content: `${block}
+
+${message.content}` };
+  } else if (Array.isArray(message.content)) {
+    next[target] = { ...message, content: [{ type: "text", text: block }, ...message.content] };
+  } else {
+    next.splice(target, 0, { role: "user", content: block, timestamp: Date.now() });
+  }
+  return next;
 }
+var RUNTIME_MODE_CONTEXT_MARKER = "<runtime-mode-context>";
+var RUNTIME_MODE_CONTEXT_END_MARKER = "</runtime-mode-context>";
 function buildRuntimeModeContext(state) {
   const lines = [
     RUNTIME_MODE_CONTEXT_MARKER,
-    "Current runtime mode:",
-    `- Plan mode: ${state.planMode === "planning" ? "active (workspace read-only; plan_scratch permits session-local temporary drafts)" : "off"}.`,
+    "Current runtime mode:"
+  ];
+  if (state.planMode === "planning") {
+    lines.push(
+      "- Plan mode: active (workspace read-only; plan_scratch permits session-local temporary drafts; submit the finished plan by calling plan_submit with the ordered steps for user approval)."
+    );
+    if (state.planDisabledToolNames.length > 0) {
+      lines.push(
+        `- Disabled this turn by plan mode (calls are denied): ${state.planDisabledToolNames.join(", ")}. Do not call them while planning.`
+      );
+    }
+  } else {
+    lines.push("- Plan mode: off.");
+  }
+  lines.push(
     `- YOLO mode: ${state.yoloMode ? "on (filesystem sandbox directory restrictions are disabled)" : "off (workspace/protected-path restrictions apply)"}.`,
     `- Filesystem scope: ${state.filesystemScope === "all" ? "all local paths may be passed directly to file tools when permitted" : "workspace paths and configured safe roots only"}.`
-  ];
+  );
   if (state.pendingTransition) {
     const transitionText = {
       entered_yolo: "YOLO mode was just enabled for this turn.",
       exited_yolo: "YOLO mode was just disabled; do not assume previous absolute-path access still applies.",
-      entered_plan: "Plan mode was just enabled; analyze and plan without changing the workspace. Use plan_scratch for temporary drafts.",
+      entered_plan: "Plan mode was just enabled; analyze and plan without changing the workspace. Use plan_scratch for temporary drafts, then submit the finished plan by calling plan_submit with the ordered steps for user approval.",
       exited_plan: "Plan mode was just disabled; execution tools may be used when the task requires them."
     };
     lines.push(`- Transition: ${transitionText[state.pendingTransition]}`);
@@ -80653,44 +81002,195 @@ function buildRuntimeModeContext(state) {
   lines.push(RUNTIME_MODE_CONTEXT_END_MARKER);
   return lines.join("\n");
 }
-function findLatestUserIndex(messages) {
-  for (let index = messages.length - 1; index >= 0; index--) {
+function runtimeModeBlockKey(state) {
+  return JSON.stringify({
+    planMode: state.planMode,
+    yoloMode: state.yoloMode,
+    filesystemScope: state.filesystemScope,
+    currentDate: state.currentDate ?? null,
+    activeToolNames: state.activeToolNames,
+    planDisabledToolNames: state.planDisabledToolNames
+  });
+}
+function shouldInjectRuntimeModeBlock(lastKey, state) {
+  if (lastKey === null) return true;
+  return runtimeModeBlockKey(state) !== lastKey;
+}
+function runtimeModeTraceData(state) {
+  return {
+    yoloMode: state.yoloMode,
+    planMode: state.planMode,
+    filesystemScope: state.filesystemScope,
+    pendingTransition: state.pendingTransition,
+    currentDate: state.currentDate,
+    timeZone: state.timeZone,
+    activeToolCount: state.activeToolNames.length,
+    planDisabledToolCount: state.planDisabledToolNames.length
+  };
+}
+function currentDateInZone(timeZone) {
+  const parts = new Intl.DateTimeFormat("en-US", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    timeZone
+  }).formatToParts(/* @__PURE__ */ new Date());
+  const part = (type) => parts.find((p) => p.type === type)?.value ?? "00";
+  return `${part("year")}-${part("month")}-${part("day")}`;
+}
+var RUNTIME_MODE_BLOCK_START_MARKER = "<runtime-mode-context>";
+function leadingRuntimeBlock(text) {
+  const withoutLeadingWhitespace = text.replace(/^[\t ]+/, "");
+  if (!withoutLeadingWhitespace.startsWith(RUNTIME_MODE_BLOCK_START_MARKER)) return null;
+  const markerStart = text.length - withoutLeadingWhitespace.length;
+  const endIndex = text.indexOf(RUNTIME_MODE_CONTEXT_END_MARKER, markerStart);
+  if (endIndex < 0) return null;
+  const block = text.slice(markerStart, endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length);
+  const rest = text.slice(endIndex + RUNTIME_MODE_CONTEXT_END_MARKER.length).replace(/^[\t ]*(?:\r?\n){0,2}/, "");
+  return { block, rest };
+}
+function stripLeadingRuntimeBlock(text) {
+  const leading = leadingRuntimeBlock(text);
+  return leading ? { rest: leading.rest } : null;
+}
+function leadingRuntimeBlockOfMessage(message) {
+  if (message.role !== "user") return null;
+  const content = message.content;
+  if (typeof content === "string") return leadingRuntimeBlock(content)?.block ?? null;
+  if (!Array.isArray(content)) return null;
+  const first = content[0];
+  if (first?.type !== "text" || typeof first.text !== "string") return null;
+  return leadingRuntimeBlock(first.text)?.block ?? null;
+}
+function lastUserMessageCarriesRuntimeBlock(messages, block) {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
     const message = messages[index];
-    if (isRecord3(message) && message.role === "user") {
-      return index;
-    }
+    if (message?.role !== "user") continue;
+    return leadingRuntimeBlockOfMessage(message) === block;
   }
-  return -1;
+  return false;
 }
-function injectRuntimeModeContext(messages, state) {
-  const contextMessage = {
-    role: "user",
-    content: buildRuntimeModeContext(state),
-    timestamp: Date.now()
-  };
-  const latestUserIndex = findLatestUserIndex(messages);
-  if (latestUserIndex < 0) {
-    return [...messages, contextMessage];
+function applyRuntimeBlockToText(text, block) {
+  const split = stripLeadingRuntimeBlock(text);
+  const rest = split ? split.rest : text;
+  const next = rest.length > 0 ? `${block}
+
+${rest}` : block;
+  return next === text ? text : next;
+}
+function applyRuntimeBlockToContentArray(content, block) {
+  const first = content[0];
+  if (first && typeof first === "object" && first.type === "text" && typeof first.text === "string") {
+    const text = first.text;
+    if (stripLeadingRuntimeBlock(text)) {
+      const nextText = applyRuntimeBlockToText(text, block);
+      if (nextText === text) return content;
+      const copy = [...content];
+      copy[0] = { ...first, text: nextText };
+      return copy;
+    }
   }
-  return [
-    ...messages.slice(0, latestUserIndex),
-    contextMessage,
-    ...messages.slice(latestUserIndex)
-  ];
+  return [{ type: "text", text: block }, ...content];
 }
-function createRuntimeModeTransformContext(options) {
-  return async (messages) => {
-    const stripped = stripRuntimeModeContext(messages);
-    if (stripped.stripped > 0) {
-      options.onStripped?.(stripped.stripped);
+function refreshRuntimeModeBlockOnLastUserMessage(messages, block) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message?.role !== "user") continue;
+    const content = message.content;
+    if (typeof content === "string") {
+      const next = applyRuntimeBlockToText(content, block);
+      if (next === content) return messages;
+      const copy = [...messages];
+      copy[i] = { ...message, content: next };
+      return copy;
+    }
+    if (Array.isArray(content)) {
+      const next = applyRuntimeBlockToContentArray(content, block);
+      if (next === content) return messages;
+      const copy = [...messages];
+      copy[i] = { ...message, content: next };
+      return copy;
     }
-    const state = options.getState();
-    const nextMessages = injectRuntimeModeContext(stripped.messages, state);
-    options.onInjected?.(state);
-    if (state.pendingTransition) {
-      options.consumeTransition?.();
+    return messages;
+  }
+  return messages;
+}
+var RuntimeModeBlockInjector = class {
+  constructor(options) {
+    this.options = options;
+  }
+  options;
+  lastKey = null;
+  /**
+   * Request-view overlay. While active, the CURRENT block is re-derived on
+   * every request from the live message snapshot and applied to the latest
+   * user message. It is not cached into history and it ends only when a real
+   * user message freezes the current block (see `nextBlock` + the transform),
+   * so consecutive tool rounds after a compaction retry keep the fresh state
+   * instead of losing it after one request.
+   */
+  overlayActive = false;
+  reset() {
+    this.lastKey = null;
+    this.overlayActive = true;
+  }
+  /**
+   * Arm the request-view overlay without resetting the frozen-block key. Used
+   * when the runtime shape changed while a turn is still running (compaction
+   * checkpoint committed, plan approval, YOLO toggle inside a tool turn): the
+   * next and subsequent model requests must see the current state even though
+   * no new user message has been accepted yet.
+   */
+  armRefresh() {
+    this.overlayActive = true;
+  }
+  /**
+   * Block to prepend to the next user message, or null when unchanged. Does
+   * NOT end the overlay: the block is only proof once the message carrying it
+   * reaches the request transform.
+   */
+  nextBlock() {
+    return this.freshBlock();
+  }
+  /**
+   * Current block for a request that reuses existing history (overflow retry
+   * after compaction, manual-compact continue, or the tool rounds that follow
+   * a mid-turn mode change). Returns the same block for every request until
+   * the latest user message itself carries that block; then the overlay is
+   * retired and null is returned. Derivation is per request from the given
+   * snapshot; no message array is cached.
+   */
+  consumeRetryRefreshBlock(messages) {
+    if (!this.overlayActive) return null;
+    const state = this.options.getState();
+    const block = buildRuntimeModeContext(state);
+    if (messages && lastUserMessageCarriesRuntimeBlock(messages, block)) {
+      this.overlayActive = false;
+      return null;
     }
-    return nextMessages;
+    return block;
+  }
+  freshBlock() {
+    const state = this.options.getState();
+    if (!shouldInjectRuntimeModeBlock(this.lastKey, state)) return null;
+    this.lastKey = runtimeModeBlockKey(state);
+    if (state.pendingTransition) this.options.consumeTransition();
+    this.options.noteTrace(state);
+    return buildRuntimeModeContext(state);
+  }
+};
+
+// src/runtime/cache-retention.ts
+function createCacheRetentionStreamFn(configured, getConfiguredRetention) {
+  const base = configured ?? ((model, context, options) => streamSimple(model, context, options));
+  return (model, context, options) => {
+    const requested = options?.cacheRetention;
+    const configuredRetention = model.api === "anthropic-messages" ? getConfiguredRetention?.() : void 0;
+    const cacheRetention = requested ?? configuredRetention;
+    return base(model, context, {
+      ...options,
+      ...cacheRetention === void 0 ? {} : { cacheRetention }
+    });
   };
 }
 
@@ -80706,12 +81206,19 @@ function isMarkerOnlyUserMessage(message) {
 function stripGuardAdvisories(messages) {
   return messages.filter((message) => !isMarkerOnlyUserMessage(message));
 }
-function findLatestUserIndex2(messages) {
+function findLatestUserIndex(messages) {
   for (let index = messages.length - 1; index >= 0; index -= 1) {
     if (messages[index].role === "user") return index;
   }
   return -1;
 }
+function applyRuntimeRequestTransform(messages, options) {
+  const advisory = options.takeAdvisory();
+  let next = advisory ? injectGuardAdvisory(messages, advisory) : stripGuardAdvisories(messages);
+  const retryBlock = options.takeRetryBlock(next);
+  if (retryBlock) next = refreshRuntimeModeBlockOnLastUserMessage(next, retryBlock);
+  return next;
+}
 function injectGuardAdvisory(messages, guidance) {
   const advisoryMessage = {
     role: "user",
@@ -80720,7 +81227,7 @@ ${guidance}
 ${GUARD_ADVISORY_END_MARKER}`,
     timestamp: Date.now()
   };
-  const latestUserIndex = findLatestUserIndex2(messages);
+  const latestUserIndex = findLatestUserIndex(messages);
   if (latestUserIndex < 0) {
     return [...messages, advisoryMessage];
   }
@@ -80731,11 +81238,6 @@ ${GUARD_ADVISORY_END_MARKER}`,
   ];
 }
 
-// src/runtime/tool-policy.ts
-function selectToolsForRuntimeMode(tools, mode) {
-  return selectToolsForRuntimePolicy(tools, mode);
-}
-
 // src/runtime/terminal-bell.ts
 var BEL = "\x07";
 var DEFAULT_MIN_INTERVAL_MS = 500;
@@ -80933,7 +81435,7 @@ function createInteractiveExtensionUIContext(host) {
     }
   };
   return {
-    notify: (message, type = "info") => showExtensionNotification(host, message, type),
+    notify: (message, type = "info", opts) => showExtensionNotification(host, message, type, opts),
     select: (title, options, opts) => interact(() => showExtensionSelector2(host, title, options, opts)),
     confirm: async (title, message, opts) => await interact(() => showExtensionConfirm(host, title, message, opts)) === true,
     input: (title, placeholder, opts) => interact(() => showExtensionInput(host, title, placeholder, opts)),
@@ -81081,10 +81583,14 @@ function installInteractiveInteractionHandler(host) {
     }
   });
 }
-function showExtensionNotification(host, message, type = "info") {
+function showExtensionNotification(host, message, type = "info", opts) {
   const prefix = type === "error" ? "Error: " : type === "warning" ? "Warning: " : "";
   host.chatContainer.addChild(new Spacer(1));
-  host.chatContainer.addChild(new Text(theme.fg(type === "error" ? "error" : type === "warning" ? "warning" : "dim", `${prefix}${message}`), 1, 0));
+  if (opts?.markdown) {
+    host.chatContainer.addChild(new Markdown(`${prefix}${message}`, 1, 0, getMarkdownTheme()));
+  } else {
+    host.chatContainer.addChild(new Text(theme.fg(type === "error" ? "error" : type === "warning" ? "warning" : "dim", `${prefix}${message}`), 1, 0));
+  }
   host.ui.requestRender();
 }
 function showExtensionSelector2(host, title, options, opts) {
@@ -81455,7 +81961,10 @@ async function loadInteractiveExtensions(host) {
         console.error(`[Extension] Tools set to: ${toolNames.join(", ")}`);
       }
     },
-    getActiveTools: () => host.agent.state.tools.map((t) => t.name),
+    getActiveTools: () => {
+      const tools = host.agent.state.tools;
+      return (host.planModeEnabled ? tools.filter((tool) => isToolAllowedInPlanMode(tool)) : tools).map((tool) => tool.name);
+    },
     sendUserMessage: (content) => {
       if (host.editor.onSubmit) {
         void host.editor.onSubmit(content);
@@ -81545,7 +82054,8 @@ async function loadInteractiveExtensions(host) {
     reload: () => host.reloadRuntime(),
     get yoloMode() {
       return host.yoloMode;
-    }
+    },
+    setYoloMode: host.setYoloMode ? (enabled) => host.setYoloMode?.(enabled) : void 0
   };
   const contextActions = {
     isIdle: () => !host.isProcessing,
@@ -81576,13 +82086,24 @@ async function loadInteractiveExtensions(host) {
       console.error(`[Extension] Failed to load ${path34}: ${error}`);
     }
   }
-  const extensionTools = filterEnabledTools(convertExtensionTools(extensions), host.options.settingsManager);
+  const policyContext = () => ({
+    mode: host.planModeEnabled ? "plan" : "normal",
+    yoloMode: host.yoloMode,
+    confirmationPolicy: "allow"
+  });
+  const extensionTools = filterEnabledTools(
+    createPolicyEnforcedTools(convertExtensionTools(extensions), { getContext: policyContext }),
+    host.options.settingsManager
+  );
   const activeTools = [...host.agent.state.tools, ...extensionTools];
   host.agent.state.tools = wrapToolsWithExtensions(activeTools, host.extensionRunner);
   const availableTools = [
-    ...host.allTools.length > 0 ? host.allTools : host.originalTools.length > 0 ? host.originalTools : host.agent.state.tools,
+    // Prefer the pristine (extension-unwrapped) assembly; re-deriving from
+    // already extension-wrapped `allTools` would nest interceptors.
+    ...host.pristineTools && host.pristineTools.length > 0 ? host.pristineTools : host.allTools.length > 0 ? host.allTools : host.originalTools.length > 0 ? host.originalTools : host.agent.state.tools,
     ...extensionTools
   ];
+  host.pristineTools = [...availableTools];
   host.allTools = wrapToolsWithExtensions(availableTools, host.extensionRunner);
   host.originalTools = [...host.allTools];
   if (host.options.compositionTrace) {
@@ -81653,12 +82174,20 @@ var InteractiveMode = class {
   pendingYoloModeTransition = null;
   executionReminder = null;
   pendingRuntimeGuardAdvisory = null;
+  /** Freezes runtime mode blocks into user messages (cache-stable history). */
+  runtimeModeBlocks = new RuntimeModeBlockInjector({
+    getState: () => this.getRuntimeModeState(),
+    consumeTransition: () => this.consumeRuntimeModeTransition(),
+    noteTrace: (state) => this.sessionTrace.noteRuntimeEvent("runtime_context_injected", runtimeModeTraceData(state))
+  });
   fileManager;
   mentionHandler;
   mentionPickerComponent;
   mentionPickerOptions = [];
   attachmentResolver;
   yoloMode = false;
+  pristineTools = [];
+  // Pristine (extension-unwrapped) tool assembly: the mode-rebuild source.
   /** Calm mode: render only questions and answers (display-only; persisted). */
   calmMode = false;
   originalTools = [];
@@ -81815,11 +82344,16 @@ var InteractiveMode = class {
   get controllerSetupHost() {
     return this;
   }
+  getPolicyContext = () => ({
+    mode: this.planModeEnabled ? "plan" : "normal",
+    yoloMode: this.yoloMode,
+    confirmationPolicy: "allow"
+  });
   rebuildSkillAwareTools(sourceTools) {
     const preservedTools = sourceTools.filter(
       (tool) => !CLI_FILESYSTEM_TOOL_NAMES.includes(tool.name) && tool.name !== "bash"
     );
-    const bashTool = createBashTool(this.options.cwd, { isYoloMode: () => this.yoloMode });
+    const bashTool = createBashTool(this.options.cwd, { isYoloMode: () => this.yoloMode, getEnv: () => computerUseOwnerEnv(this.sessionManager.getActiveSessionId() || COMPUTER_USE_STANDALONE_OWNER, String(process.pid)) });
     const fileSystemToolOptions = (allowlistedDirs) => ({
       ...buildCliFileAccessOptions({
         cwd: this.options.cwd,
@@ -81840,19 +82374,14 @@ var InteractiveMode = class {
     });
     const normalFsTools = createCliFileSystemTools(this.options.cwd, fileSystemToolOptions([this.options.configDir]));
     const currentFsTools = this.yoloMode ? createCliFileSystemTools(this.options.cwd, fileSystemToolOptions(["/"])) : normalFsTools;
-    const getPolicyContext = () => ({
-      mode: this.planModeEnabled ? "plan" : "normal",
-      yoloMode: this.yoloMode,
-      confirmationPolicy: "allow"
-    });
     return {
       currentTools: createPolicyEnforcedTools(
         [...currentFsTools, bashTool, ...preservedTools],
-        { getContext: getPolicyContext }
+        { getContext: this.getPolicyContext }
       ),
       originalTools: createPolicyEnforcedTools(
         [...normalFsTools, bashTool, ...preservedTools],
-        { getContext: getPolicyContext }
+        { getContext: this.getPolicyContext }
       )
     };
   }
@@ -81860,26 +82389,27 @@ var InteractiveMode = class {
     this.options.fileObservationState.clear();
   }
   getRuntimeModeState() {
-    const pendingTransition = this.getPendingRuntimeModeTransition();
     const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || "local";
-    const dateParts = new Intl.DateTimeFormat("en-US", {
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      timeZone
-    }).formatToParts(/* @__PURE__ */ new Date());
-    const datePart = (type) => dateParts.find((part) => part.type === type)?.value ?? "00";
-    const currentDate = `${datePart("year")}-${datePart("month")}-${datePart("day")}`;
+    const activeTools = this.agent?.state?.tools ?? [];
     return {
       yoloMode: this.yoloMode,
       planMode: this.planModeEnabled ? "planning" : "off",
       filesystemScope: this.yoloMode ? "all" : "workspace",
-      ...pendingTransition ? { pendingTransition } : {},
-      currentDate,
+      ...this.getPendingRuntimeModeTransition() ? { pendingTransition: this.getPendingRuntimeModeTransition() } : {},
+      currentDate: currentDateInZone(timeZone),
       timeZone,
-      activeToolNames: this.agent?.state?.tools?.map((tool) => tool.name) ?? []
+      activeToolNames: activeTools.map((tool) => tool.name),
+      planDisabledToolNames: this.planModeEnabled ? activeTools.filter((tool) => !isToolAllowedInPlanMode(tool)).map((tool) => tool.name) : []
     };
   }
+  /** Public reset for compaction flows (compaction may drop the latest block). */
+  resetRuntimeModeBlocks() {
+    this.runtimeModeBlocks.reset();
+  }
+  /** Runtime mode block for the next user message; frozen into it (append-only history, cache-stable prefixes). */
+  runtimeModeBlockForNextMessage() {
+    return this.runtimeModeBlocks.nextBlock();
+  }
   getPendingRuntimeModeTransition() {
     if (this.pendingYoloModeTransition === "enter") return "entered_yolo";
     if (this.pendingYoloModeTransition === "exit") return "exited_yolo";
@@ -81893,15 +82423,12 @@ var InteractiveMode = class {
   }
   applyRuntimeToolMode(sourceTools) {
     if (!this.agent) return;
-    const completeToolSet = sourceTools ?? (this.allTools.length > 0 ? this.allTools : void 0) ?? (this.originalTools.length > 0 ? this.originalTools : void 0) ?? this.agent.state.tools;
+    const completeToolSet = sourceTools ?? ((this.pristineTools?.length ?? 0) > 0 ? this.pristineTools : this.allTools) ?? this.agent.state.tools;
     const rebuilt = this.rebuildSkillAwareTools(completeToolSet);
     const currentTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.currentTools, this.extensionRunner) : rebuilt.currentTools;
     const originalTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.originalTools, this.extensionRunner) : rebuilt.originalTools;
     const activeTools = filterEnabledTools(
-      selectToolsForRuntimeMode(
-        currentTools,
-        this.planModeEnabled ? "plan" : "normal"
-      ),
+      currentTools,
       this.options.settingsManager
     );
     this.agent.setTools(activeTools);
@@ -81918,6 +82445,7 @@ var InteractiveMode = class {
     });
   }
   noteRuntimeModeChanged(trigger) {
+    this.runtimeModeBlocks?.armRefresh();
     const state = this.getRuntimeModeState();
     this.sessionTrace.noteRuntimeEvent("runtime_mode_changed", {
       trigger,
@@ -81934,7 +82462,8 @@ var InteractiveMode = class {
     this.safeRequestRender();
   }
   promptAgent(input) {
-    return this.agentSessionController.prompt(input, { source: "interactive" });
+    const prompt = prependRuntimeModeBlockToPrompt(input, this.runtimeModeBlockForNextMessage());
+    return this.agentSessionController.prompt(prompt, { source: "interactive" });
   }
   continueAgent() {
     return this.agentSessionController.continue();
@@ -81964,6 +82493,7 @@ var InteractiveMode = class {
       this.persistExecutionState();
     }
     this.executionReminder = this.executionState.getReminder();
+    this.resetRuntimeModeBlocks();
     await this.refreshTodoWidget();
     await this.emitExtensionEvent({
       type: "session:changed",
@@ -81974,7 +82504,7 @@ var InteractiveMode = class {
   async init() {
     const activeSession = this.sessionManager.getActiveSession();
     this.thinkingLevel = resolveInitialThinkingLevel({ session: activeSession, settingsManager: this.options.settingsManager });
-    const { Agent } = await import("./chunks/src-OWQI5M6W.js");
+    const { Agent } = await import("./chunks/src-C4KA4G75.js");
     this.agent = new Agent({
       initialState: {
         systemPrompt: this.buildSystemPrompt(),
@@ -81984,28 +82514,15 @@ var InteractiveMode = class {
       },
       apiKey: this.options.apiKey,
       sessionId: activeSession?.id,
-      streamFn: this.options.streamFn,
-      transformContext: async (messages) => {
-        const runtimeModeTransform = createRuntimeModeTransformContext({
-          getState: () => this.getRuntimeModeState(),
-          consumeTransition: () => this.consumeRuntimeModeTransition(),
-          onInjected: (state) => this.sessionTrace.noteRuntimeEvent("runtime_context_injected", {
-            yoloMode: state.yoloMode,
-            planMode: state.planMode,
-            filesystemScope: state.filesystemScope,
-            pendingTransition: state.pendingTransition,
-            currentDate: state.currentDate,
-            timeZone: state.timeZone,
-            activeToolCount: state.activeToolNames.length
-          }),
-          onStripped: (count) => this.sessionTrace.noteRuntimeEvent("stale_runtime_context_stripped", { count })
-        });
-        let transformed = await runtimeModeTransform(messages);
-        const advisory = this.pendingRuntimeGuardAdvisory;
-        this.pendingRuntimeGuardAdvisory = null;
-        transformed = advisory ? injectGuardAdvisory(transformed, advisory) : stripGuardAdvisories(transformed);
-        return transformed;
-      }
+      streamFn: createTransportDiagnosticsStreamFn(createCacheRetentionStreamFn(this.options.streamFn, () => this.options.settingsManager.getPromptCacheRetention()), createTraceTransportSink((type, meta) => this.sessionTrace.noteRuntimeEvent(type, meta))),
+      transformContext: async (messages) => applyRuntimeRequestTransform(messages, {
+        takeAdvisory: () => {
+          const advisory = this.pendingRuntimeGuardAdvisory;
+          this.pendingRuntimeGuardAdvisory = null;
+          return advisory;
+        },
+        takeRetryBlock: (snapshot) => this.runtimeModeBlocks.consumeRetryRefreshBlock(snapshot)
+      })
     });
     this.agentSessionController = createInteractiveAgentSessionController(this.controllerSetupHost);
     this.updateTerminalTitle();
@@ -82097,6 +82614,7 @@ var InteractiveMode = class {
     }
     this.allTools = [...this.options.allTools];
     this.originalTools = [...this.options.allTools];
+    this.pristineTools = [...this.options.allTools];
     this.agent.state.tools = [...this.options.allTools];
     await this.extensionRunner?.dispose("reload");
     this.extensionWidgets?.clearAll();
@@ -82189,6 +82707,9 @@ var InteractiveMode = class {
   async handleYoloCommand(args) {
     return handleYoloCommand(this, args);
   }
+  setYoloMode(enabled) {
+    void this.handleYoloCommand(enabled ? "on" : "off");
+  }
   /**
    * Toggle calm mode and rebuild the chat so already-rendered rows follow
    * the new mode. Delivery, tool execution, and session storage are
@@ -82390,6 +82911,7 @@ var InteractiveMode = class {
 
 // src/app/runtime-composition.ts
 import { existsSync as existsSync18, mkdirSync as mkdirSync13 } from "fs";
+import { randomUUID } from "crypto";
 import * as path31 from "path";
 var CliMissingApiKeyError = class extends Error {
   constructor(message) {
@@ -82519,6 +83041,7 @@ async function composeCliRuntime(params) {
     await sessionManager.save();
   }
   const sessionId = sessionManager.getActiveSession()?.id;
+  const computerUseExecutionId = randomUUID();
   const fileObservationState = createFileObservationState();
   if (sessionId) {
     if (process.env.PIE_DEBUG && !fileLogger.isEnabled()) {
@@ -82547,7 +83070,8 @@ async function composeCliRuntime(params) {
     getWebSearchMode: () => settingsManager.getWebSearchMode(),
     resolveToolModel: (purpose) => modelRegistry.resolveToolModel(purpose, getCurrentModel()),
     resolveToolModelCandidates: (purpose) => modelRegistry.resolveToolModelCandidates(purpose, getCurrentModel()),
-    configDir: paths.configDir
+    configDir: paths.configDir,
+    getBashEnv: () => computerUseOwnerEnv(sessionManager.getActiveSessionId() || COMPUTER_USE_STANDALONE_OWNER, computerUseExecutionId)
   });
   const fileSystemToolOptions = {
     ...buildCliFileAccessOptions({ cwd, configDir: paths.configDir, skills, allowlistedDirs: [paths.configDir] }),
@@ -82560,6 +83084,7 @@ async function composeCliRuntime(params) {
     getPolicyContext: () => ({ mode: "normal", confirmationPolicy: "allow" })
   };
   const rawTools = [
+    createSearchContextTool(() => sessionManager),
     ...createCliFileSystemTools(cwd, fileSystemToolOptions),
     ...cliHostCapabilities.tools
   ];
@@ -82674,6 +83199,38 @@ function createPrintModeRetryStatusReporter() {
   };
 }
 
+// src/app/print-mode-compaction.ts
+function createPrintModeCompactionHandler(params) {
+  return {
+    compact: async (context) => {
+      const beforeCompact = await params.runner.emitSessionBeforeCompact({
+        type: "session:before_compact",
+        reason: context.reason === "overflow" ? "overflow" : "threshold",
+        messageCount: context.messages.length
+      });
+      if (beforeCompact.cancel) return { aborted: true };
+      if (beforeCompact.summary) {
+        const retainedTail = context.preparation?.retainedTail.retainedTail ?? (() => {
+          const legacyCutId = findFirstKeptEntrySummaryId(context.sessionManager.getActiveContextSummaries());
+          return legacyCutId ? { kind: "from-entry", entryId: legacyCutId } : void 0;
+        })();
+        if (!retainedTail) return { aborted: true };
+        return {
+          summary: beforeCompact.summary,
+          retainedTail,
+          ...retainedTail.kind === "from-entry" ? { firstKeptEntryId: retainedTail.entryId } : {}
+        };
+      }
+      return createCliAutoCompactionResult({
+        context,
+        model: params.model,
+        apiKey: params.apiKey,
+        systemPrompt: params.systemPrompt
+      });
+    }
+  };
+}
+
 // src/app/print-mode.ts
 function createNoOpExtensionUIContext() {
   return {
@@ -82805,7 +83362,7 @@ async function runPrintMode(params) {
 `);
     console.log("Assistant: ");
   }
-  const { Agent: AgentClass } = await import("./chunks/src-OWQI5M6W.js");
+  const { Agent: AgentClass } = await import("./chunks/src-C4KA4G75.js");
   let agent;
   const printModeExtensions = await loadPrintModeExtensions({
     cwd: runtime.cwd,
@@ -82849,7 +83406,8 @@ async function runPrintMode(params) {
       thinkingLevel: printThinkingLevel
     },
     apiKey: runtime.apiKey,
-    streamFn: params.streamFn
+    // Body-free transport timeline for the main (print-mode) agent.
+    streamFn: createTransportDiagnosticsStreamFn(params.streamFn ?? streamSimple, logTransportLifecycle)
   });
   const sessionTrace = new SessionTraceWriter(runtime.paths.sessionsDir, runtime.sessionManager);
   const reportRetryStatus = createPrintModeRetryStatusReporter();
@@ -82883,28 +83441,16 @@ async function runPrintMode(params) {
       latestCompactionTimestamp: runtime.sessionManager.getLatestCompactionTimestamp(),
       isContextOverflowError: isCliContextOverflowError
     }),
-    compaction: {
-      compact: async (context) => {
-        const beforeCompact = await printModeExtensions.runner.emitSessionBeforeCompact({
-          type: "session:before_compact",
-          reason: context.reason === "overflow" ? "overflow" : "threshold",
-          messageCount: context.messages.length
-        });
-        if (beforeCompact.cancel) return { aborted: true };
-        if (beforeCompact.summary) {
-          const activeEntryId = context.sessionManager.getActiveEntryId();
-          const firstKeptEntryId = activeEntryId ? findFirstKeptEntrySummaryId(context.sessionManager.getActiveContextSummaries()) : void 0;
-          if (!firstKeptEntryId) return { aborted: true };
-          return { summary: beforeCompact.summary, firstKeptEntryId };
-        }
-        return createCliAutoCompactionResult({
-          context,
-          model: runtime.model,
-          apiKey: runtime.apiKey,
-          systemPrompt: agent?.state.systemPrompt ?? baseSystemPrompt
-        });
-      }
-    },
+    getCompactionBudgetTokens: createCliCompactionBudget({
+      contextWindow: runtime.model.contextWindow,
+      reserveTokens: runtime.settingsManager.getAutoCompactReserveTokens()
+    }),
+    compaction: createPrintModeCompactionHandler({
+      runner: printModeExtensions.runner,
+      model: runtime.model,
+      apiKey: runtime.apiKey,
+      systemPrompt: agent?.state.systemPrompt ?? baseSystemPrompt
+    }),
     classifyFailure: (context) => classifyCliFailure(context),
     onEvent: (event) => {
       sessionTrace.noteRuntimeEvent(event.type, event);
@@ -82912,7 +83458,7 @@ async function runPrintMode(params) {
         console.error(event.failure.kind === "context_overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context before retry...");
       } else if (event.type === "auto_compaction_start") {
         console.error(event.reason === "overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context...");
-      } else if (event.type === "auto_compaction_end" && !event.errorMessage) {
+      } else if (event.type === "compaction_committed") {
         runtime.fileObservationState.clear();
       } else {
         reportRetryStatus(event);
@@ -83045,7 +83591,7 @@ function toJsonValue(value, depth = 0, cap = MAX_EVENT_STRING_LENGTH) {
   }
   return result;
 }
-function isRecord4(value) {
+function isRecord3(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function truncateForEvent(text, cap) {
@@ -83071,7 +83617,7 @@ function parseInput(line) {
   } catch {
     return null;
   }
-  if (!isRecord4(parsed) || typeof parsed.type !== "string") return null;
+  if (!isRecord3(parsed) || typeof parsed.type !== "string") return null;
   if (parsed.type === "shutdown") {
     return { type: "shutdown", reason: typeof parsed.reason === "string" ? parsed.reason : void 0 };
   }
@@ -83122,7 +83668,7 @@ function parseInput(line) {
       prompt: parsed.prompt,
       streamingBehavior,
       cwd: typeof parsed.cwd === "string" ? parsed.cwd : void 0,
-      metadata: isRecord4(parsed.metadata) ? parsed.metadata : void 0
+      metadata: isRecord3(parsed.metadata) ? parsed.metadata : void 0
     };
   }
   return null;
@@ -83162,15 +83708,15 @@ function readProgressText(value) {
 function extractJsonEventsToolProgressText(partialResult) {
   const plainText = readProgressText(partialResult).trim();
   if (plainText) return plainText;
-  if (!isRecord4(partialResult)) return "";
+  if (!isRecord3(partialResult)) return "";
   const content = partialResult.content;
   if (Array.isArray(content)) {
-    return content.map((block) => isRecord4(block) && block.type === "text" ? readProgressText(block.text) : "").filter(Boolean).join("\n").trim();
+    return content.map((block) => isRecord3(block) && block.type === "text" ? readProgressText(block.text) : "").filter(Boolean).join("\n").trim();
   }
   const directText = readProgressText(partialResult.text) || readProgressText(partialResult.message);
   if (directText) return directText.trim();
   const details = partialResult.details;
-  if (isRecord4(details)) {
+  if (isRecord3(details)) {
     return (readProgressText(details.text) || readProgressText(details.message)).trim();
   }
   return "";
@@ -83266,6 +83812,9 @@ async function loadJsonModeExtensions(params) {
     extensionCount: extensions.length
   };
 }
+function createJsonEventsTransportStreamFn(streamFn) {
+  return createTransportDiagnosticsStreamFn(streamFn ?? streamSimple, logTransportLifecycle);
+}
 async function runJsonEventsMode(params) {
   const eventDetail = params.eventDetail === FULL_DETAIL ? FULL_DETAIL : COMPACT_DETAIL;
   const eventStringCap = eventDetail === FULL_DETAIL ? MAX_EVENT_STRING_LENGTH : COMPACT_EVENT_STRING_LENGTH;
@@ -83666,7 +84215,7 @@ async function runJsonEventsMode(params) {
         return;
       }
       const parent = agent;
-      const { Agent: AgentClass } = await import("./chunks/src-OWQI5M6W.js");
+      const { Agent: AgentClass } = await import("./chunks/src-C4KA4G75.js");
       const sideAgent = new AgentClass({
         initialState: {
           systemPrompt: parent.state.systemPrompt,
@@ -83676,7 +84225,11 @@ async function runJsonEventsMode(params) {
           messages: structuredClone(parent.state.messages)
         },
         apiKey: runtime.apiKey,
-        streamFn: params.streamFn
+        // Same body-free transport timeline as the main agent: a sidechat is
+        // an independent Responses request and previously had no record at all
+        // when it stalled. `streamSimple` matches the host default when the
+        // caller injected no stream function.
+        streamFn: createJsonEventsTransportStreamFn(params.streamFn)
       });
       sidechatController.signal.addEventListener("abort", () => sideAgent.abort(), { once: true });
       const timer = setTimeout(() => {
@@ -83834,7 +84387,7 @@ async function runJsonEventsMode(params) {
   }
   function handleControllerEvent(event) {
     trace?.noteRuntimeEvent(event.type, event);
-    if (event.type === "auto_compaction_end" && !event.errorMessage) {
+    if (event.type === "compaction_committed") {
       runtime?.fileObservationState.clear();
     }
     if (event.type === "turn_settled" && activeTurn) {
@@ -84010,7 +84563,7 @@ async function runJsonEventsMode(params) {
     if (runtime.initialModel.unconfigured || controller) {
       return;
     }
-    const { Agent: AgentClass } = await import("./chunks/src-OWQI5M6W.js");
+    const { Agent: AgentClass } = await import("./chunks/src-C4KA4G75.js");
     const jsonModeExtensions = await loadJsonModeExtensions({ runtime, getAgent: () => agent });
     extensionRunner = jsonModeExtensions.runner;
     const tools = [...runtime.tools, ...jsonModeExtensions.extensionTools];
@@ -84042,7 +84595,8 @@ async function runJsonEventsMode(params) {
         thinkingLevel
       },
       apiKey: runtime.apiKey,
-      streamFn: params.streamFn
+      // Body-free transport timeline for the main (JSON-events) agent.
+      streamFn: createJsonEventsTransportStreamFn(params.streamFn)
     });
     controller = new AgentSessionController({
       agent,
@@ -84071,6 +84625,10 @@ async function runJsonEventsMode(params) {
         latestCompactionTimestamp: runtime.sessionManager.getLatestCompactionTimestamp(),
         isContextOverflowError: isCliContextOverflowError
       }),
+      getCompactionBudgetTokens: createCliCompactionBudget({
+        contextWindow: runtime.model.contextWindow,
+        reserveTokens: runtime.settingsManager.getAutoCompactReserveTokens()
+      }),
       compaction: {
         compact: async (context) => createCliAutoCompactionResult({
           context,
@@ -84604,7 +85162,7 @@ async function runWithJsonEventsConsoleIsolation(fn) {
 }
 async function createCliTestStreamFnFromEnv() {
   if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) return void 0;
-  return (await import("./chunks/test-stream-Y7WXELAJ.js")).createTestStreamFnFromSequenceEnv();
+  return (await import("./chunks/test-stream-A5ZELKNG.js")).createTestStreamFnFromSequenceEnv();
 }
 function resolveJsonEventsDetailFlag() {
   for (let index = 0; index < process.argv.length; index += 1) {