@cydm/pie 2.5.1 → 2.5.2

package/dist/builtin/extensions/ask-user/index.js

@@ -1,9 +1,9 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createAskUserCapability
-} from "../../../chunks/chunk-REP6QANY.js";
-import "../../../chunks/chunk-ZKHMNEXL.js";
-import "../../../chunks/chunk-YRXXRLMQ.js";
+} from "../../../chunks/chunk-LO2V5DZZ.js";
+import "../../../chunks/chunk-RTTGO2A6.js";
+import "../../../chunks/chunk-UD7KYQ6J.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/extensions/computer-use/index.js

@@ -3787,8 +3787,23 @@ function wireableInputDescendants(node) {
   visit(node);
   return matches;
 }
+var FOCUS_CHANGING_KEYS = /* @__PURE__ */ new Set(["TAB", "SHIFT+TAB", "ENTER", "RETURN", "SPACE", "UP", "DOWN", "LEFT", "RIGHT", "UP_ARROW", "DOWN_ARROW", "LEFT_ARROW", "RIGHT_ARROW", "ESC", "ESCAPE", "HOME", "END", "PAGE_UP", "PAGE_DOWN", "PAGEDOWN", "PAGEUP"]);
+function isFocusChangingKey(keys2) {
+  const list = typeof keys2 === "string" ? [keys2] : Array.isArray(keys2) ? keys2 : [];
+  for (const raw of list) {
+    if (typeof raw !== "string") continue;
+    const token = raw.trim().toUpperCase().split("+").pop() ?? "";
+    if (FOCUS_CHANGING_KEYS.has(token) || FOCUS_CHANGING_KEYS.has(raw.trim().toUpperCase())) return true;
+  }
+  return false;
+}
 function recordActionFocus(action, state, node, coordinateFocus = false) {
-  if (!["click", "press", "keypress", "typeText"].includes(action.action) || !action.ref && action.action !== "click") return;
+  if (action.action === "keypress" && !action.ref && isFocusChangingKey(action.keys)) {
+    state.currentFocus = true;
+    state.focusRef = void 0;
+    return;
+  }
+  if (!["click", "press", "keypress", "typeText"].includes(action.action) || !action.ref && action.action !== "click" && action.action !== "press" && !coordinateFocus) return;
   state.currentFocus = Boolean(node?.isTextInput && !node.pictureOnly) || coordinateFocus;
   state.focusRef = node?.isTextInput && node.wireRef && !node.pictureOnly ? node.ref : void 0;
   if (!state.currentFocus && node && !node.pictureOnly && action.ref && (action.action === "click" || action.action === "press") && containsEditable(node)) {
@@ -8546,7 +8561,7 @@ async function dispatchUiAction(action, target, look, headless, state, signal) {
   }
   const trace = await helperAct(target, prepared, headless, signal);
   if (!headless) {
-    const coordinateFocus = prepared.action === "click" && "x" in prepared.target;
+    const coordinateFocus = (prepared.action === "click" || prepared.action === "press") && "x" in prepared.target;
     const node = action.ref ? outlineNodeByRef(action.ref.trim()) : coordinateFocus ? editorAtPoint(currentOutlineOrThrow().nodes, action.x, action.y) : void 0;
     recordActionFocus(action, state, node, coordinateFocus);
   }

package/dist/builtin/extensions/computer-use/scripts/setup-helper.mjs

@@ -313,19 +313,100 @@ async function installPrebuiltHelperApp(sourceAppPath) {
 	const existingInfo = await fs.readFile(path.join(helperAppPath, "Contents", "Info.plist"), "utf8").catch(() => undefined);
 	const sourceInfo = await fs.readFile(sourceInfoPath, "utf8");
 	if (existingExecutable?.equals(sourceExecutable) && existingInfo === sourceInfo) {
-		await registerHelperApp();
-		return false;
+		// Byte equality alone is NOT sufficient for the no-change shortcut: a
+		// damaged/missing _CodeSignature (CodeResources tampered or deleted
+		// around an otherwise-identical executable) would otherwise survive
+		// every repair invocation. The existing bundle must still verify.
+		let existingVerifies = false;
+		try {
+			await run("codesign", ["--verify", "--strict", helperAppPath]);
+			existingVerifies = true;
+		} catch {
+			// Fall through to the replacement path below, which re-installs (and
+			// re-verifies) a complete bundle.
+		}
+		if (existingVerifies) {
+			await registerHelperApp();
+			return false;
+		}
 	}
 	// The sealed bundle must arrive intact — a broken signature would burn
 	// the user's TCC grants on an identity that can never validate.
 	await run("codesign", ["--verify", "--strict", sourceAppPath]);
-	await fs.rm(helperAppPath, { force: true, recursive: true });
-	// ditto preserves the bundle byte-for-byte (signature + stapled
-	// notarization ticket). The sealed app is NEVER re-signed here: its
-	// Developer ID designated requirement (identifier + team) is exactly
-	// what gives release builds their best chance of retaining TCC grants.
-	await run("/usr/bin/ditto", [sourceAppPath, helperAppPath]);
-	await registerHelperApp();
+	// Sweep staging directories abandoned by crashed installers (the finally
+	// below only runs on ordinary unwinding). Reclaim is ownership-aware:
+	// the staging name embeds its creator's PID, and ONLY a demonstrably dead
+	// owner (ESRCH on signal-0) plus age beyond a generous slow-install window
+	// makes a stage garbage — mtime alone is not ownership evidence, so a
+	// live/slow installer's stage is never touched.
+	try {
+		const parent = path.dirname(helperAppPath);
+		const base = path.basename(helperAppPath);
+		const entries = await fs.readdir(parent);
+		const cutoff = Date.now() - 60 * 60 * 1000;
+		for (const entry of entries) {
+			// Exact staging format <app>.staged-<pid>-<ts36>: anything else that
+			// merely contains ".staged-" is not ours to touch.
+			const match = new RegExp(`^${base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.staged-(\\d+)-[0-9a-z]+$`).exec(entry);
+			if (!match) continue;
+			const staged = path.join(parent, entry);
+			try {
+				const stat = await fs.stat(staged);
+				if (stat.mtimeMs >= cutoff) continue;
+				const ownerPid = Number(match[1]);
+				let ownerAlive = false;
+				try {
+					process.kill(ownerPid, 0);
+					ownerAlive = true;
+				} catch (error) {
+					// ESRCH: dead. EPERM (exists, other user): treat as alive —
+					// conservative, never delete on unknown liveness.
+					ownerAlive = error && error.code === "EPERM";
+				}
+				if (!ownerAlive) await fs.rm(staged, { force: true, recursive: true });
+			} catch { /* raced away */ }
+		}
+	} catch { /* no parent dir yet */ }
+	// Stage-then-swap: the staged copy is verified before publication and the
+	// previous installation survives every failure up to the final swap.
+	// NOTE: the swap itself (rm + rename) is NOT atomic — directory bundles
+	// have no atomic exchange on stock Node — but the failure window no longer
+	// starts before verification, and a crash mid-swap self-heals on the next
+	// run (which re-stages from the verified source).
+	const stagingPath = `${helperAppPath}.staged-${process.pid}-${Date.now().toString(36)}`;
+	await fs.rm(stagingPath, { force: true, recursive: true });
+	try {
+		// ditto preserves the bundle byte-for-byte (signature + stapled
+		// notarization ticket). The sealed app is NEVER re-signed here: its
+		// Developer ID designated requirement (identifier + team) is exactly
+		// what gives release builds their best chance of retaining TCC grants.
+		await run("/usr/bin/ditto", [sourceAppPath, stagingPath]);
+		// Verify the STAGED bundle (not just the source): source mutation
+		// between the verify above and the copy, or a torn copy, stops here.
+		await run("codesign", ["--verify", "--strict", stagingPath]);
+		let published = false;
+		try {
+			await fs.rm(helperAppPath, { force: true, recursive: true });
+			await fs.rename(stagingPath, helperAppPath);
+			published = true;
+		} catch (renameError) {
+			// Cross-device or otherwise unrenamable staging: fall back to a
+			// second ditto onto the final path, then verify the destination. A
+			// VERIFIED fallback is a successful installation — continue to
+			// registration instead of failing after doing the work.
+			try {
+				await run("/usr/bin/ditto", [stagingPath, helperAppPath]);
+				await run("codesign", ["--verify", "--strict", helperAppPath]);
+				published = true;
+			} catch (fallbackError) {
+				fallbackError.cause = renameError;
+				throw fallbackError;
+			}
+		}
+		if (published) await registerHelperApp();
+	} finally {
+		await fs.rm(stagingPath, { force: true, recursive: true }).catch(() => {});
+	}
 	return true;
 }
 

package/dist/builtin/extensions/mcp-adapter/index.js

@@ -24434,6 +24434,7 @@ var StdioClientTransport = class {
 };
 
 // builtin/extensions/mcp-adapter/src/server-manager.ts
+import { createHash } from "node:crypto";
 import * as fs2 from "node:fs";
 import * as path2 from "node:path";
 var CONNECT_TIMEOUT_MS = 3e4;
@@ -24442,6 +24443,41 @@ var PACKAGE_MANAGER_COMMANDS = /* @__PURE__ */ new Set(["npx", "npm", "bunx", "u
 var METADATA_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 var CALL_TIMEOUT_MS = 12e4;
 var STDERR_TAIL_LIMIT = 4e3;
+var DIAGNOSTIC_TEXT_LIMIT = 1500;
+function definitionSecrets(definition) {
+  const secrets = [];
+  for (const value of Object.values(definition.env ?? {})) {
+    if (typeof value === "string" && value.length > 0) secrets.push(value);
+  }
+  for (const value of Object.values(definition.headers ?? {})) {
+    if (typeof value === "string" && value.length > 0) secrets.push(value);
+  }
+  return secrets.sort((a, b) => b.length - a.length);
+}
+function redactSecrets(text, secrets) {
+  let sanitized = text;
+  for (const secret of secrets) {
+    sanitized = sanitized.split(secret).join("[redacted]");
+  }
+  return sanitized;
+}
+function sanitizeDiagnostic(text, secrets) {
+  let sanitized = redactSecrets(text, secrets);
+  if (secrets.length > 0 && sanitized.length > 0) {
+    for (const secret of secrets) {
+      for (let keep = Math.min(secret.length - 1, sanitized.length); keep >= 4; keep--) {
+        if (sanitized.startsWith(secret.slice(secret.length - keep))) {
+          sanitized = `[redacted]${sanitized.slice(keep)}`;
+          break;
+        }
+      }
+    }
+  }
+  if (sanitized.length > DIAGNOSTIC_TEXT_LIMIT) {
+    sanitized = `${sanitized.slice(0, DIAGNOSTIC_TEXT_LIMIT)}\u2026[truncated ${sanitized.length - DIAGNOSTIC_TEXT_LIMIT} chars]`;
+  }
+  return sanitized;
+}
 function connectTimeoutFor(definition) {
   if (definition.connectTimeoutMs !== void 0) return definition.connectTimeoutMs;
   const base = path2.basename(definition.command ?? "");
@@ -24499,6 +24535,22 @@ function withTimeout(promise, timeoutMs, label, signal) {
     );
   });
 }
+function cacheFingerprint(definition) {
+  return createHash("sha256").update(JSON.stringify({
+    sourceScope: definition.sourceScope,
+    sourcePath: definition.sourcePath,
+    name: definition.name,
+    command: definition.command,
+    args: definition.args,
+    // Canonicalized (key-sorted) so reordering equivalent env/header keys
+    // does not invalidate cached metadata.
+    env: Object.fromEntries(Object.entries(definition.env ?? {}).sort(([a], [b]) => a.localeCompare(b))),
+    serverCwd: definition.cwd,
+    url: definition.url,
+    headers: Object.fromEntries(Object.entries(definition.headers ?? {}).sort(([a], [b]) => a.localeCompare(b))),
+    inheritEnv: definition.inheritEnv
+  })).digest("hex").slice(0, 24);
+}
 var McpServerManager = class {
   constructor(definitions, cacheDir, log, now = Date.now) {
     this.now = now;
@@ -24577,8 +24629,9 @@ var McpServerManager = class {
         stderr: "pipe"
       });
       if (transport2.stderr) {
+        const captureSecrets = definitionSecrets(definition);
         transport2.stderr.on("data", (chunk) => {
-          runtime.stderrTail = appendTail(runtime.stderrTail, chunk);
+          runtime.stderrTail = appendTail(runtime.stderrTail, redactSecrets(String(chunk), captureSecrets));
         });
       }
       return { client, transport: transport2 };
@@ -24669,7 +24722,7 @@ var McpServerManager = class {
         if (!runtime.tools) continue;
         const shardPath = path2.join(this.cacheDir, `${key}.json`);
         const tempPath = `${shardPath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
-        fs2.writeFileSync(tempPath, JSON.stringify({ updatedAt: this.now(), tools: runtime.tools }, null, 2), "utf8");
+        fs2.writeFileSync(tempPath, JSON.stringify({ updatedAt: this.now(), fingerprint: cacheFingerprint(runtime.definition), tools: runtime.tools }, null, 2), "utf8");
         try {
           fs2.renameSync(tempPath, shardPath);
         } catch (error2) {
@@ -24704,6 +24757,7 @@ var McpServerManager = class {
     }
   }
   /** Cached descriptors for one server (from the metadata cache file). */
+  /** Cached descriptors for one server (from the metadata cache file). */
   cachedToolsFor(server) {
     return this.loadCatalog().filter((tool) => tool.server === sanitizeName(server));
   }
@@ -24722,10 +24776,11 @@ var McpServerManager = class {
       catalog.set(tool.prefixedName, tool);
       ownerOf.set(tool.prefixedName, tool.server);
     };
-    for (const tools of Object.values(this.readCacheFile())) {
-      for (const tool of tools) {
-        const definition = this.definitions.get(tool.server);
-        if (!definition || definition.disabled) continue;
+    for (const [key, shard] of Object.entries(this.readCacheFile())) {
+      const definition = this.definitions.get(key);
+      if (!definition || definition.disabled) continue;
+      if (shard.fingerprint !== cacheFingerprint(definition)) continue;
+      for (const tool of shard.tools) {
         claim2(tool, false);
       }
     }
@@ -24786,7 +24841,10 @@ var McpServerManager = class {
         if (typeof parsed.updatedAt !== "number" || this.now() - parsed.updatedAt > METADATA_TTL_MS) continue;
         if (!Array.isArray(parsed.tools)) continue;
         const key = name.slice(0, -".json".length);
-        snapshot[key] = parsed.tools;
+        snapshot[key] = {
+          tools: parsed.tools,
+          ...typeof parsed.fingerprint === "string" ? { fingerprint: parsed.fingerprint } : {}
+        };
         updatedAt[key] = parsed.updatedAt;
       } catch {
       }
@@ -24830,12 +24888,16 @@ var McpServerManager = class {
     } catch (error2) {
       const runtimeState = this.runtimes.get(server);
       const tail = runtimeState?.stderrTail.trim();
+      const secrets = definitionSecrets(definition);
       return {
         delivery: "not_sent",
-        error: `MCP server "${server}" failed to start: ${error2 instanceof Error ? error2.message : String(error2)}` + (tail ? `
+        error: sanitizeDiagnostic(
+          `MCP server "${server}" failed to start: ${error2 instanceof Error ? error2.message : String(error2)}` + (tail ? `
 
 Server stderr tail:
-${tail}` : "")
+${tail}` : ""),
+          secrets
+        )
       };
     }
     const client = runtime.client;
@@ -24879,7 +24941,7 @@ ${tail}` : "")
         isError: result.isError === true
       };
     } catch (error2) {
-      const message = error2 instanceof Error ? error2.message : String(error2);
+      const message = sanitizeDiagnostic(error2 instanceof Error ? error2.message : String(error2), definitionSecrets(definition));
       if (error2 instanceof ProtocolError && (error2.code === ProtocolErrorCode.InvalidRequest || error2.code === ProtocolErrorCode.InvalidParams) && /output schema|structured content/i.test(message)) {
         return {
           delivery: "invalid_result",
@@ -24914,7 +24976,7 @@ ${tail}` : "")
 };
 
 // builtin/extensions/mcp-adapter/src/trust.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 import * as fs3 from "node:fs";
 import * as path3 from "node:path";
 function serverFingerprint(cwd, definition) {
@@ -24933,7 +24995,7 @@ function serverFingerprint(cwd, definition) {
     inheritEnv: definition.inheritEnv,
     headers: definition.headers
   });
-  return createHash("sha256").update(spec).digest("hex").slice(0, 24);
+  return createHash2("sha256").update(spec).digest("hex").slice(0, 24);
 }
 var McpTrustStore = class {
   filePath;
@@ -25034,8 +25096,9 @@ function structuredContentIsMirroredInText(textBlocks, structured) {
 function mapMcpOutcome(outcome, maxBytes) {
   if (outcome.delivery !== "ok") {
     const prefix = outcome.delivery === "may_have_run" || outcome.delivery === "invalid_result" ? "[outcome unknown]" : "[not executed]";
+    const errorText = truncate(`${outcome.error ?? "MCP call failed"}`, maxBytes);
     return {
-      content: [{ type: "text", text: `${prefix} ${outcome.error ?? "MCP call failed"}` }],
+      content: [{ type: "text", text: `${prefix} ${errorText}` }],
       details: { mode: "mcp", delivery: outcome.delivery, ...outcome.protocolCode !== void 0 ? { protocolCode: outcome.protocolCode } : {} },
       isError: true
     };
@@ -25070,8 +25133,9 @@ ${JSON.stringify(outcome.structuredContent, null, 2)}` });
     isError: outcome.isError === true
   };
 }
-function createMcpProxyTool(getManager, ensureTrusted, options = {}) {
-  const maxBytes = options.outputMaxBytes ?? DEFAULT_OUTPUT_MAX_BYTES;
+function createMcpProxyTool(getManager, ensureTrusted, optionsOrVerify = {}, options = {}) {
+  const verifyTrusted = typeof optionsOrVerify === "function" ? optionsOrVerify : void 0;
+  const maxBytes = typeof optionsOrVerify === "object" && optionsOrVerify.outputMaxBytes || options.outputMaxBytes || DEFAULT_OUTPUT_MAX_BYTES;
   return {
     name: "mcp",
     label: "MCP",
@@ -25123,7 +25187,8 @@ ${truncate(JSON.stringify(schema ?? {}, null, 2), maxBytes)}` : `unknown MCP too
       const resolved = getManager().resolvePrefixedName(params.tool);
       const server = descriptor?.server ?? resolved?.server ?? "";
       if (server) {
-        const trust = await ensureTrusted(server);
+        const managerAtGate = getManager();
+        const trust = await ensureTrusted(server, managerAtGate);
         if (!trust.trusted) {
           return {
             content: [{ type: "text", text: `[not executed] ${trust.reason ?? "MCP server not trusted"}` }],
@@ -25131,6 +25196,14 @@ ${truncate(JSON.stringify(schema ?? {}, null, 2), maxBytes)}` : `unknown MCP too
             isError: true
           };
         }
+        const managerNow = getManager();
+        if (managerNow !== managerAtGate || verifyTrusted !== void 0 && !verifyTrusted(server, managerNow)) {
+          return {
+            content: [{ type: "text", text: `[not executed] MCP config changed during approval for server "${server}" \u2014 the approved definition and the current one differ. Retry the call to approve the new definition.` }],
+            details: { mode: "mcp", delivery: "not_sent" },
+            isError: true
+          };
+        }
       }
       let args = {};
       if (typeof params.args === "string") {
@@ -25204,7 +25277,7 @@ function jsonSchemaToTypebox(schema) {
 // builtin/extensions/mcp-adapter/src/direct-tools.ts
 var FALLBACK_PARAMS = Type.Object({}, { description: "MCP tool arguments (schema unknown until first connect)" });
 var DEFAULT_DIRECT_OUTPUT_MAX_BYTES = 8192;
-function registerDirectTools(ctx, getManager, ensureTrusted, outputMaxBytes) {
+function registerDirectTools(ctx, getManager, ensureTrusted, verifyTrusted, outputMaxBytes) {
   const registered = [];
   const seenNames = /* @__PURE__ */ new Set();
   for (const definition of getManager().listDefinitions()) {
@@ -25218,13 +25291,13 @@ function registerDirectTools(ctx, getManager, ensureTrusted, outputMaxBytes) {
         continue;
       }
       seenNames.add(descriptor.prefixedName);
-      registerDirectTool(ctx, getManager, ensureTrusted, definition, descriptor.prefixedName, descriptor.description, descriptor.inputSchema, outputMaxBytes);
+      registerDirectTool(ctx, getManager, ensureTrusted, verifyTrusted, definition, descriptor.prefixedName, descriptor.description, descriptor.inputSchema, outputMaxBytes);
       registered.push(descriptor.prefixedName);
     }
   }
   return registered;
 }
-function registerDirectTool(ctx, getManager, ensureTrusted, definition, prefixedName, description, inputSchema, outputMaxBytes) {
+function registerDirectTool(ctx, getManager, ensureTrusted, verifyTrusted, definition, prefixedName, description, inputSchema, outputMaxBytes) {
   const parameters = inputSchema ? jsonSchemaToTypebox(inputSchema) : FALLBACK_PARAMS;
   ctx.registerTool({
     name: prefixedName,
@@ -25232,7 +25305,8 @@ function registerDirectTool(ctx, getManager, ensureTrusted, definition, prefixed
     description: `${(description ?? prefixedName).trim()} (MCP server: ${definition.name})`,
     parameters,
     async execute(args, toolContext) {
-      const trust = await ensureTrusted(definition.name);
+      const managerAtGate = getManager();
+      const trust = await ensureTrusted(definition.name, managerAtGate);
       if (!trust.trusted) {
         return {
           content: [{ type: "text", text: `[not executed] ${trust.reason ?? "MCP server not trusted"}` }],
@@ -25240,7 +25314,15 @@ function registerDirectTool(ctx, getManager, ensureTrusted, definition, prefixed
           isError: true
         };
       }
-      const outcome = await getManager().callTool(
+      const managerNow = getManager();
+      if (managerNow !== managerAtGate || verifyTrusted !== void 0 && !verifyTrusted(definition.name, managerNow)) {
+        return {
+          content: [{ type: "text", text: `[not executed] MCP config changed during approval for server "${definition.name}" \u2014 retry the call to approve the new definition.` }],
+          details: { delivery: "not_sent" },
+          isError: true
+        };
+      }
+      const outcome = await managerNow.callTool(
         prefixedName,
         args && typeof args === "object" && !Array.isArray(args) ? args : {},
         toolContext.signal
@@ -25335,8 +25417,8 @@ function mcpAdapter(ctx) {
     fs4.writeFileSync(filePath, JSON.stringify(parsed, null, 2) + "\n", "utf8");
     return filePath;
   }
-  async function ensureTrusted(serverName) {
-    const definition = manager.getDefinition(serverName);
+  async function ensureTrusted(serverName, managerAtGate = manager) {
+    const definition = managerAtGate.getDefinition(serverName);
     if (!definition) return { trusted: false, reason: `unknown MCP server "${serverName}"` };
     if (trustStore.isTrusted(ctx.cwd, definition)) return { trusted: true };
     if (!ctx.interactions.isAvailable()) {
@@ -25360,8 +25442,12 @@ function mcpAdapter(ctx) {
       reason: `MCP server "${definition.name}" was not approved. It was NOT started. Ask the user to approve it, or remove it from ${definition.sourcePath}.`
     };
   }
-  ctx.registerTool(createMcpProxyTool(() => manager, ensureTrusted));
-  const eagerRegistered = registerDirectTools(ctx, () => manager, ensureTrusted);
+  function verifyTrusted(serverName, currentManager) {
+    const definition = currentManager.getDefinition(serverName);
+    return !!definition && trustStore.isTrusted(ctx.cwd, definition);
+  }
+  ctx.registerTool(createMcpProxyTool(() => manager, ensureTrusted, verifyTrusted));
+  const eagerRegistered = registerDirectTools(ctx, () => manager, ensureTrusted, verifyTrusted);
   if (eagerRegistered.length > 0) {
     ctx.log(`mcp: registered ${eagerRegistered.length} direct tool(s) from metadata cache: ${eagerRegistered.join(", ")}`);
   }

package/dist/builtin/extensions/plan-mode/index.js

@@ -7,9 +7,9 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-REP6QANY.js";
-import "../../../chunks/chunk-ZKHMNEXL.js";
-import "../../../chunks/chunk-YRXXRLMQ.js";
+} from "../../../chunks/chunk-LO2V5DZZ.js";
+import "../../../chunks/chunk-RTTGO2A6.js";
+import "../../../chunks/chunk-UD7KYQ6J.js";
 import {
   Type
 } from "../../../chunks/chunk-XXGYUYXI.js";

package/dist/builtin/extensions/subagent/index.js

@@ -1,13 +1,13 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-N2MK46AE.js";
+} from "../../../chunks/chunk-M4OJARWJ.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-REP6QANY.js";
-import "../../../chunks/chunk-ZKHMNEXL.js";
-import "../../../chunks/chunk-YRXXRLMQ.js";
+} from "../../../chunks/chunk-LO2V5DZZ.js";
+import "../../../chunks/chunk-RTTGO2A6.js";
+import "../../../chunks/chunk-UD7KYQ6J.js";
 import "../../../chunks/chunk-5353DEEC.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

package/dist/builtin/extensions/todo/index.js

@@ -8,9 +8,9 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-REP6QANY.js";
-import "../../../chunks/chunk-ZKHMNEXL.js";
-import "../../../chunks/chunk-YRXXRLMQ.js";
+} from "../../../chunks/chunk-LO2V5DZZ.js";
+import "../../../chunks/chunk-RTTGO2A6.js";
+import "../../../chunks/chunk-UD7KYQ6J.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-bridge.js

@@ -19640,6 +19640,11 @@ async function handleBridgeRequest(client, req, res, sessionName, logForbidden,
       writeJson(res, 200, {
         status: "ok",
         session: sessionName,
+        // The bridge's own PID so `stop` can verify that the process named
+        // in a (possibly stale) pid file is really THIS bridge before any
+        // signal is sent — a healthy session on the recorded port alone
+        // must not authorize killing an unrelated reused PID.
+        pid: process.pid,
         busy: client.isBusy?.() ?? false,
         ...droppedSelection ? { pageIdentityChanged: true } : {}
       });

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-cli.js

@@ -46,8 +46,11 @@ export function runChromeDevtoolsAxiCli(args = process.argv.slice(2), options =
 			...process.env,
 			CHROME_DEVTOOLS_AXI_MCP_PATH: process.env.CHROME_DEVTOOLS_AXI_MCP_PATH?.trim() || resolveChromeDevtoolsMcpScript(),
 			// Pie pins chrome-devtools-mcp; its daily background update check
-			// (network + ~/.cache write + "install @latest" nag) stays off unless
-			// the environment or caller explicitly provides a value.
+			// (network + ~/.cache write + "install @latest" nag) is UNCONDITIONALLY
+			// disabled for the packaged CLI: the upstream treats any nonempty
+			// value — including "0" or "false" — as "disable", so this env var
+			// cannot re-enable the check. To run the check, invoke the vendored
+			// cli outside Pie with the variable unset.
 			CHROME_DEVTOOLS_MCP_NO_UPDATE_CHECKS: process.env.CHROME_DEVTOOLS_MCP_NO_UPDATE_CHECKS || "1",
 			...options.env,
 		},

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-runtime.js

@@ -21,6 +21,6 @@ function tryFastPath(argv, options) {
 
 // vendor/chrome-devtools-axi/bin/chrome-devtools-axi.ts
 if (!tryFastPath(process.argv.slice(2), { version: VERSION })) {
-  const { main } = await import("./cli-P4VG6ZZG.js");
+  const { main } = await import("./cli-EJ5MQZNA.js");
   await main(process.argv.slice(2));
 }

package/dist/builtin/skills/chrome-devtools-axi/{cli-P4VG6ZZG.js → cli-EJ5MQZNA.js}

@@ -1935,6 +1935,23 @@ async function waitForProcessExit(pid, timeoutMs) {
   return !isProcessAlive(pid);
 }
 function isBridgeProcess(pid) {
+  if (process.platform === "win32") {
+    try {
+      const command = execFileSync(
+        "powershell",
+        [
+          "-NoProfile",
+          "-NonInteractive",
+          "-Command",
+          `(Get-CimInstance Win32_Process -Filter "ProcessId=${pid}").CommandLine`
+        ],
+        { encoding: "utf-8", timeout: 4e3 }
+      );
+      return command.includes("chrome-devtools-axi-bridge");
+    } catch {
+      return false;
+    }
+  }
   try {
     const command = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
       encoding: "utf-8",
@@ -1949,28 +1966,43 @@ async function probeBridgeIdentity(port, sessionName) {
   try {
     const resp = await httpGet(port, "/health", HEALTH_TIMEOUT_MS);
     const data = JSON.parse(resp);
-    if (data.status !== "ok") return "unknown";
+    if (data.status !== "ok") return { identity: "unknown" };
     if (typeof data.session === "string" && data.session !== sessionName) {
-      return "other";
+      return { identity: "other" };
     }
-    return "own";
+    return {
+      identity: "own",
+      reportedPid: typeof data.pid === "number" && data.pid > 0 ? data.pid : void 0
+    };
   } catch {
-    return "unknown";
+    return { identity: "unknown" };
   }
 }
 async function judgeRecordedBridge(pidInfo, sessionName) {
-  const identity = await probeBridgeIdentity(pidInfo.port, sessionName);
-  if (identity === "own") {
-    return {
-      terminate: true,
-      killProcessGroup: isBridgeProcess(pidInfo.pid)
-    };
+  const probe = await probeBridgeIdentity(pidInfo.port, sessionName);
+  if (probe.identity === "own") {
+    if (probe.reportedPid !== void 0) {
+      if (probe.reportedPid === pidInfo.pid) {
+        return {
+          terminate: true,
+          killProcessGroup: isBridgeProcess(pidInfo.pid),
+          targetPid: pidInfo.pid
+        };
+      }
+      return {
+        terminate: true,
+        killProcessGroup: isBridgeProcess(probe.reportedPid),
+        targetPid: probe.reportedPid
+      };
+    }
+    const bridge2 = isBridgeProcess(pidInfo.pid);
+    return { terminate: bridge2, killProcessGroup: bridge2, targetPid: pidInfo.pid };
   }
-  if (identity === "other") {
+  if (probe.identity === "other") {
     return { terminate: false, killProcessGroup: false };
   }
   const bridge = isBridgeProcess(pidInfo.pid);
-  return { terminate: bridge, killProcessGroup: bridge };
+  return { terminate: bridge, killProcessGroup: bridge, targetPid: pidInfo.pid };
 }
 function removePidFile(pidFile) {
   try {
@@ -1978,13 +2010,27 @@ function removePidFile(pidFile) {
   } catch {
   }
 }
+function taskkillTree(pid) {
+  try {
+    execFileSync("taskkill", ["/PID", String(pid), "/T", "/F"], {
+      stdio: "ignore",
+      timeout: 1e4
+    });
+    return true;
+  } catch {
+    return !isProcessAlive(pid);
+  }
+}
 async function terminateBridgeProcess(pid, opts = {}) {
-  if (!isProcessAlive(pid)) return;
+  if (!isProcessAlive(pid)) return true;
   const killProcessGroup = opts.killProcessGroup === true;
+  if (process.platform === "win32") {
+    return taskkillTree(pid) && !await isProcessAlive(pid);
+  }
   try {
     process.kill(pid, "SIGTERM");
-  } catch {
-    return;
+  } catch (error) {
+    if (error.code === "ESRCH") return true;
   }
   if (await waitForProcessExit(pid, 2e3)) {
     if (killProcessGroup) {
@@ -1993,7 +2039,7 @@ async function terminateBridgeProcess(pid, opts = {}) {
       } catch {
       }
     }
-    return;
+    return true;
   }
   if (killProcessGroup) {
     try {
@@ -2010,7 +2056,7 @@ async function terminateBridgeProcess(pid, opts = {}) {
     } catch {
     }
   }
-  await waitForProcessExit(pid, 1e3);
+  return waitForProcessExit(pid, 1e3);
 }
 function spawnBridgeProcess(port, sessionName) {
   const bridgeScript = resolveBridgeScript(import.meta.dirname);
@@ -2100,7 +2146,7 @@ async function ensureBridge(spawnBridge = spawnBridgeProcess, notice) {
     }
     const verdict = await judgeRecordedBridge(pidInfo, sessionName);
     if (verdict.terminate) {
-      await terminateBridgeProcess(pidInfo.pid, {
+      await terminateBridgeProcess(verdict.targetPid ?? pidInfo.pid, {
         killProcessGroup: verdict.killProcessGroup
       });
     } else {
@@ -2374,15 +2420,15 @@ async function getSessionSnapshotIfRunning() {
 }
 async function stopBridge() {
   const pidInfo = readPidFile();
-  if (!pidInfo) return false;
-  if (!isProcessAlive(pidInfo.pid)) return false;
+  if (!pidInfo) return "noop";
+  if (!isProcessAlive(pidInfo.pid)) return "noop";
   const verdict = await judgeRecordedBridge(pidInfo, resolveSessionName());
-  if (!verdict.terminate) return false;
-  await terminateBridgeProcess(pidInfo.pid, {
+  if (!verdict.terminate) return "noop";
+  const terminated = await terminateBridgeProcess(verdict.targetPid ?? pidInfo.pid, {
     killProcessGroup: verdict.killProcessGroup
   });
   clearSelectedPageId();
-  return true;
+  return terminated ? "stopped" : "failed";
 }
 
 // vendor/chrome-devtools-axi/src/generation.ts
@@ -3931,12 +3977,15 @@ async function handleStart() {
   const port = await ensureBridge();
   return encode({ status: "ready", port });
 }
-function formatStopOutput(wasStopped) {
-  return encode({ status: wasStopped ? "stopped" : "stopped (no-op)" });
+function formatStopOutput(outcome) {
+  if (outcome === "failed") {
+    throw new Error("bridge stop failed: the target survived SIGTERM and SIGKILL escalation");
+  }
+  return encode({ status: outcome === "stopped" ? "stopped" : "stopped (no-op)" });
 }
 async function handleStop() {
-  const wasStopped = await stopBridge();
-  return formatStopOutput(wasStopped);
+  const outcome = await stopBridge();
+  return formatStopOutput(outcome);
 }
 async function handlePages() {
   const result = await callTool("list_pages");

package/dist/builtin/skills/tui-use/tui-use-cli.cjs

@@ -9950,7 +9950,13 @@ var import_node_child_process = require("node:child_process");
 var import_node_crypto = require("node:crypto");
 var import_node_os = __toESM(require("node:os"));
 var import_node_path = __toESM(require("node:path"));
-var expandHome = (value) => value.replace(/^~(?=$|\/)/, () => import_node_os.default.homedir());
+var expandHome = (value) => {
+  if (value === "~") return import_node_os.default.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return import_node_path.default.join(import_node_os.default.homedir(), value.slice(2).replace(/\\/g, "/"));
+  }
+  return value;
+};
 var STATE_DIR = import_node_path.default.resolve(process.env.PIE_TUI_USE_STATE_DIR ? expandHome(process.env.PIE_TUI_USE_STATE_DIR) : import_node_path.default.join(expandHome(process.env.PIE_CODING_AGENT_DIR || import_node_path.default.join(import_node_os.default.homedir(), ".pie")), "tui-use"));
 var LOG_PATH = import_node_path.default.join(STATE_DIR, "daemon.log");
 var PID_PATH = import_node_path.default.join(STATE_DIR, "daemon.pid");
@@ -10139,17 +10145,27 @@ async function startDaemon() {
       if (error.code !== "EEXIST") throw error;
       try {
         const contents = import_node_fs.default.readFileSync(LOCK_PATH, "utf8");
-        const lock = JSON.parse(contents);
-        let alive = true;
-        if (!Number.isInteger(lock.pid) || lock.pid <= 0) alive = false;
-        else {
+        let reclaim = false;
+        try {
+          const lock = JSON.parse(contents);
+          let alive = true;
+          if (!Number.isInteger(lock.pid) || lock.pid <= 0) alive = false;
+          else {
+            try {
+              process.kill(lock.pid, 0);
+            } catch (e) {
+              if (e.code === "ESRCH") alive = false;
+            }
+          }
+          if (!alive) reclaim = true;
+        } catch {
           try {
-            process.kill(lock.pid, 0);
-          } catch (e) {
-            if (e.code === "ESRCH") alive = false;
+            const mtimeMs = import_node_fs.default.statSync(LOCK_PATH).mtimeMs;
+            if (Date.now() - mtimeMs > 5e3) reclaim = true;
+          } catch {
           }
         }
-        if (!alive && import_node_fs.default.readFileSync(LOCK_PATH, "utf8") === contents) import_node_fs.default.unlinkSync(LOCK_PATH);
+        if (reclaim && import_node_fs.default.readFileSync(LOCK_PATH, "utf8") === contents) import_node_fs.default.unlinkSync(LOCK_PATH);
       } catch {
       }
       await sleep(100);

package/dist/builtin/skills/tui-use/tui-use-daemon.cjs

@@ -7661,7 +7661,13 @@ function validateRequest(value) {
 var import_node_crypto = require("node:crypto");
 var import_node_os = __toESM(require("node:os"));
 var import_node_path3 = __toESM(require("node:path"));
-var expandHome = (value) => value.replace(/^~(?=$|\/)/, () => import_node_os.default.homedir());
+var expandHome = (value) => {
+  if (value === "~") return import_node_os.default.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return import_node_path3.default.join(import_node_os.default.homedir(), value.slice(2).replace(/\\/g, "/"));
+  }
+  return value;
+};
 var STATE_DIR = import_node_path3.default.resolve(process.env.PIE_TUI_USE_STATE_DIR ? expandHome(process.env.PIE_TUI_USE_STATE_DIR) : import_node_path3.default.join(expandHome(process.env.PIE_CODING_AGENT_DIR || import_node_path3.default.join(import_node_os.default.homedir(), ".pie")), "tui-use"));
 var LOG_PATH = import_node_path3.default.join(STATE_DIR, "daemon.log");
 var PID_PATH = import_node_path3.default.join(STATE_DIR, "daemon.pid");

package/dist/chunks/{chunk-REP6QANY.js → chunk-LO2V5DZZ.js}

@@ -1,7 +1,7 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   Agent
-} from "./chunk-ZKHMNEXL.js";
+} from "./chunk-RTTGO2A6.js";
 import {
   FileSystemGateway,
   completeSimple,
@@ -10,7 +10,7 @@ import {
   getPlatformConfig,
   hashText,
   streamSimple
-} from "./chunk-YRXXRLMQ.js";
+} from "./chunk-UD7KYQ6J.js";
 import {
   Type
 } from "./chunk-XXGYUYXI.js";
@@ -5244,6 +5244,16 @@ var AgentSessionQueue = class {
     }
     this.emitQueueChanged();
   }
+  /** Promote only an input still owned by this queue, never re-send agent-owned inputs. */
+  promoteLatestFollowUp() {
+    const input = this.queuedInputs.slice().reverse().find((queued) => queued.visibility === "user" && queued.mode === "followUp");
+    if (!input || input.deliveredToAgent) return void 0;
+    input.mode = "steer";
+    input.deliverWhileStreaming = true;
+    if (this.getIsStreaming()) this.deliverToAgent(input);
+    this.emitQueueChanged();
+    return cloneQueuedInput(input);
+  }
   deliverToAgent(queuedInput) {
     if (queuedInput.deliveredToAgent) {
       return;
@@ -6404,6 +6414,12 @@ var AgentSessionController = class {
   drainQueuedInputsForEditor() {
     return this.queue.drainForEditor();
   }
+  /** Upgrade the latest visible follow-up that has not been delivered to the agent. */
+  promoteLatestFollowUpToSteer() {
+    const promoted = this.disposed ? void 0 : this.queue.promoteLatestFollowUp();
+    if (promoted && !this.isStreaming) this.requestQueueDispatch();
+    return promoted;
+  }
   replaceQueuedInputText(search, replacement) {
     this.queue.replaceText(search, replacement);
   }
@@ -8775,7 +8791,7 @@ function createReadTool(cwd, options) {
   return {
     name: "read",
     label: "read",
-    description: `Read a file's contents. Use this before editing, and use offset/limit for large files. It can also directly understand image, video, audio, and document files when a file-understanding model is configured; pass question for a focused media/document question instead of preprocessing the file with shell tools. Example: read_file path='Scripts/PlayerController.cs' or read_file path='Data/config.json'. ${pathResolutionDescription} For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). When you need the full file, continue with a larger offset until complete.`,
+    description: `Read a file's contents. Use this before editing, and use offset/limit for large files. Images are attached for the current model when it supports vision; otherwise a configured file-understanding service analyzes them. Video, audio, and documents require a configured understanding service. Pass question to specify what to focus on; it does not force a separate model request. Example: read_file path='Scripts/PlayerController.cs' or read_file path='Data/config.json'. ${pathResolutionDescription} For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). When you need the full file, continue with a larger offset until complete.`,
     parameters: readSchema,
     execute: async (_toolCallId, params, signal) => {
       const { path: path4, root, offset, limit, question } = params;
@@ -8848,7 +8864,7 @@ function createReadTool(cwd, options) {
                 });
                 return;
               }
-              if (magicInfo?.kind === "image" && question && options?.understandFile && (!INLINE_IMAGE_MIME_TYPES.has(magicInfo.mimeType) || stat.size > MAX_INLINE_IMAGE_BYTES)) {
+              if (magicInfo?.kind === "image" && options?.understandFile && (!INLINE_IMAGE_MIME_TYPES.has(magicInfo.mimeType) || stat.size > MAX_INLINE_IMAGE_BYTES)) {
                 resolve3(await options.understandFile({
                   absolutePath,
                   displayPath: path4,
@@ -8864,7 +8880,7 @@ function createReadTool(cwd, options) {
               }
               const imageInfo = options?.allowBinary === false || magicInfo?.kind !== "image" || !INLINE_IMAGE_MIME_TYPES.has(magicInfo.mimeType) ? void 0 : await readImageInfo(absolutePath, fs2);
               if (imageInfo) {
-                if (question && options?.understandFile) {
+                if (options?.understandFile) {
                   resolve3(await options.understandFile({
                     absolutePath,
                     displayPath: path4,
@@ -8879,7 +8895,8 @@ function createReadTool(cwd, options) {
                 const dimensionText = imageInfo.width && imageInfo.height ? `, ${imageInfo.width}x${imageInfo.height}` : "";
                 resolve3({
                   content: [
-                    { type: "text", text: `Read image file [${imageInfo.mimeType}${dimensionText}]. Original image attached as an image block; for very large images, prefer a smaller crop or resized copy before rereading.` },
+                    { type: "text", text: `Read image file [${imageInfo.mimeType}${dimensionText}]. Original image attached as an image block; for very large images, prefer a smaller crop or resized copy before rereading.${question?.trim() ? `
+Focus: ${question.trim()}` : ""}` },
                     { type: "image", data: imageInfo.base64, mimeType: imageInfo.mimeType }
                   ],
                   details: {
@@ -13451,6 +13468,21 @@ function createReadFileUnderstandingHandler(deps) {
 async function understandFileWithModel(deps, request) {
   const purpose = `read_file.${request.kind}`;
   const agentModel = deps.getAgentModel();
+  if (request.kind === "image" && request.imageInfo && agentModel?.input.includes("image")) {
+    if (request.signal?.aborted) throw new Error("Operation aborted");
+    return {
+      content: [
+        { type: "text", text: `Read image file ${request.displayPath} [${request.mimeType}]. Original image attached for the current model.${request.question?.trim() ? `
+Focus: ${request.question.trim()}` : ""}` },
+        { type: "image", data: request.imageInfo.base64, mimeType: request.imageInfo.mimeType }
+      ],
+      details: {
+        image: { mimeType: request.imageInfo.mimeType, width: request.imageInfo.width, height: request.imageInfo.height },
+        understanding: { purpose, kind: request.kind, mimeType: request.mimeType, agentModel: getModelLabel(agentModel), routeSource: "current_model", inputMode: "nativeAttachment" }
+      },
+      isError: false
+    };
+  }
   const singleDecision = deps.resolveToolModel(purpose);
   const candidateDecisions = deps.resolveToolModelCandidates?.(purpose) ?? [singleDecision];
   const sessionId = deps.getSessionId() || `read-file-${Date.now()}`;

package/dist/chunks/{chunk-N2MK46AE.js → chunk-M4OJARWJ.js}

@@ -8,7 +8,7 @@ import {
   createSharedWebSearchTool,
   interpretShellExit,
   requestInteraction
-} from "./chunk-REP6QANY.js";
+} from "./chunk-LO2V5DZZ.js";
 import {
   getBuiltinDir,
   getConfigDir
@@ -1176,7 +1176,12 @@ function createCliRenderedPageReader() {
         networkRequests: linesOf(stripHelpHints(networkOutput))
       };
     } finally {
-      runAxi(["stop"], { env, timeoutMs: 1e4 }).catch(() => void 0);
+      try {
+        await runAxi(["stop"], { env, timeoutMs: 15e3 });
+      } catch (error) {
+        process.stderr.write(`[rendered-page-reader] axi stop after read failed: ${error instanceof Error ? error.message : String(error)}
+`);
+      }
     }
   };
 }

package/dist/chunks/{chunk-ZKHMNEXL.js → chunk-RTTGO2A6.js}

@@ -3,7 +3,7 @@ import {
   EventStream,
   streamSimple,
   validateToolArguments
-} from "./chunk-YRXXRLMQ.js";
+} from "./chunk-UD7KYQ6J.js";
 
 // ../../packages/agent-core/src/agent-loop.ts
 function createLoopErrorMessage(error, config, signal) {

package/dist/chunks/{chunk-YRXXRLMQ.js → chunk-UD7KYQ6J.js}

@@ -2960,6 +2960,7 @@ function convertMessages(model, context, compat) {
       const hasContent = content !== null && content !== void 0 && (typeof content === "string" ? content.length > 0 : Array.isArray(content) && content.length > 0);
       if (hasContent || assistantMsg.tool_calls) params.push(assistantMsg);
     } else if (msg.role === "toolResult") {
+      const attachments = [];
       for (; i < transformedMessages.length && transformedMessages[i].role === "toolResult"; i++) {
         const toolMsg = transformedMessages[i];
         const textResult = toolMsg.content.filter((c) => c.type === "text").map((c) => c.text).join("\n");
@@ -2970,7 +2971,15 @@ function convertMessages(model, context, compat) {
         };
         if (compat.requiresToolResultName && toolMsg.toolName) toolResultMsg.name = toolMsg.toolName;
         params.push(toolResultMsg);
+        if (model.input.includes("image")) {
+          const images = toolMsg.content.filter((c) => c.type === "image");
+          if (images.length > 0) {
+            attachments.push({ type: "text", text: `Images from tool ${toolMsg.toolName ?? "unknown"} (call ${toolMsg.toolCallId}):` });
+            for (const image of images) attachments.push(...convertUserContentItem(image));
+          }
+        }
       }
+      if (attachments.length > 0) params.push({ role: "user", content: attachments });
       i -= 1;
     }
   }

package/dist/chunks/{src-SXUQ7OY6.js → src-33WRCQWX.js}

@@ -3,8 +3,8 @@ import {
   Agent,
   agentLoop,
   agentLoopContinue
-} from "./chunk-ZKHMNEXL.js";
-import "./chunk-YRXXRLMQ.js";
+} from "./chunk-RTTGO2A6.js";
+import "./chunk-UD7KYQ6J.js";
 import "./chunk-XXGYUYXI.js";
 import "./chunk-LZQXQOPJ.js";
 export {

package/dist/chunks/{test-stream-OD3B57AS.js → test-stream-LFR6GSKQ.js}

@@ -1,7 +1,7 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   EventStream
-} from "./chunk-YRXXRLMQ.js";
+} from "./chunk-UD7KYQ6J.js";
 import "./chunk-XXGYUYXI.js";
 import "./chunk-LZQXQOPJ.js";
 

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   createCliWebResearchHealthStore,
   formatSize,
   truncateHeadTail
-} from "./chunks/chunk-N2MK46AE.js";
+} from "./chunks/chunk-M4OJARWJ.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -60,8 +60,8 @@ import {
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-REP6QANY.js";
-import "./chunks/chunk-ZKHMNEXL.js";
+} from "./chunks/chunk-LO2V5DZZ.js";
+import "./chunks/chunk-RTTGO2A6.js";
 import {
   Deref,
   EMPTY_ASSISTANT_CONTENT_ERROR,
@@ -85,7 +85,7 @@ import {
   setLogger,
   sortToolModelCandidatesByCapability,
   type_exports
-} from "./chunks/chunk-YRXXRLMQ.js";
+} from "./chunks/chunk-UD7KYQ6J.js";
 import {
   VERSION,
   getAgentDir,
@@ -55210,8 +55210,11 @@ function publishJournalPath(sessionsDir, safeTargetId) {
   return path7.join(sessionsDir, PUBLISH_JOURNAL_DIR, `${safeTargetId}.json`);
 }
 var FSYNC_UNSUPPORTED_CODES = /* @__PURE__ */ new Set(["EPERM", "EINVAL", "ENOTSUP", "EOPNOTSUPP", "EACCES", "EBADF"]);
+var fsyncDirectoryFaultForTests = {};
 function fsyncDirectory(dirPath) {
   try {
+    const injected = fsyncDirectoryFaultForTests.fault?.(dirPath);
+    if (injected) throw injected;
     const fd = fs7.openSync(dirPath, "r");
     try {
       fs7.fsyncSync(fd);
@@ -55430,11 +55433,21 @@ async function forkStoredSession(params) {
     if (hadPreviousTarget) {
       try {
         params.store.moveSession(params.targetSessionId, backupId);
-        if (params.sessionsDir) fsyncDirectory(params.sessionsDir);
       } catch (error) {
         clearPublishJournal(journalPath);
         throw error;
       }
+      try {
+        if (params.sessionsDir) fsyncDirectory(params.sessionsDir);
+      } catch (error) {
+        markPublishJournalFailed(journalPath);
+        preserveStagingForRecovery = true;
+        throw new SessionControlError(
+          "session_io_error",
+          `Fork publish durability failure after moving the previous session aside; it is preserved as ${backupId} and startup recovery will restore it: ${String(error)}`,
+          false
+        );
+      }
     }
     try {
       params.store.moveSession(stagingId, params.targetSessionId);
@@ -70137,22 +70150,40 @@ var SettingsSelectorComponent = class extends Container {
 };
 
 // src/core/session-display.ts
+function looksAutoGeneratedSessionName(name) {
+  return /^Session (\d|[a-z0-9]{6,8}$)/i.test(name.trim());
+}
+function persistedNameIsAuthoritative(metadata) {
+  if (metadata.nameSource === "derived") return true;
+  if (metadata.nameSource === void 0) return !looksAutoGeneratedSessionName(metadata.name);
+  return false;
+}
 function deriveSessionTitle(options) {
   const { activeSession, messages } = options;
   if (!activeSession) {
     return "No session";
   }
+  if (activeSession.metadata.nameSource === "manual") {
+    const manual = normalizeSessionTitle(activeSession.metadata.name);
+    if (manual) return manual;
+  }
+  if (persistedNameIsAuthoritative(activeSession.metadata)) {
+    const persisted = normalizeSessionTitle(activeSession.metadata.name);
+    if (persisted) return persisted;
+  }
   for (const msg of messages) {
     if (msg.role !== "user") continue;
     const text = extractUserText(msg);
     if (isCompactSummaryMessage(text.trimStart())) continue;
     const normalized = normalizeSessionTitle(text);
     if (normalized) {
+      activeSession.metadata.name = normalized;
+      activeSession.metadata.nameSource = "derived";
       return normalized;
     }
   }
   const metadataName = normalizeSessionTitle(activeSession.metadata.name);
-  if (metadataName && !metadataName.startsWith("Session ")) {
+  if (metadataName && persistedNameIsAuthoritative(activeSession.metadata)) {
     return metadataName;
   }
   return `S:${activeSession.id.slice(-6)}`;
@@ -77094,7 +77125,9 @@ function updatePendingMessagesDisplay(host) {
     host.pendingMessagesContainer.addChild(new Text(text, 1, 0));
   }
   const dequeueHint = host.keybindings.getKeys("dequeue")[0] || "alt+up";
-  const hintText = theme.fg("dim", `\u21B3 Press ${dequeueHint} to edit all queued messages`);
+  const steerHint = host.keybindings.getKeys("steer")[0];
+  const promotionHint = followUpMessages.length > 0 && !followUpMessages[followUpMessages.length - 1].deliveredToAgent && steerHint ? `${steerHint} with empty editor: steer latest follow-up \xB7 ` : "";
+  const hintText = theme.fg("dim", `\u21B3 ${promotionHint}${dequeueHint}: edit all queued messages`);
   host.pendingMessagesContainer.addChild(new Text(hintText, 1, 0));
 }
 function dequeueMessages(host) {
@@ -77150,7 +77183,7 @@ function queueMessage(host, text, mode, options = {}) {
   }
   updatePendingMessagesDisplay(host);
   host.showStatus(
-    options.statusMessage || `Queued message for ${mode === "steer" ? "steering" : "follow-up"}`
+    options.statusMessage || (mode === "steer" ? "Queued message for steering" : `Queued for follow-up after the current task.${host.keybindings.getKeys("steer")[0] ? ` With empty editor, press ${host.keybindings.getKeys("steer")[0]} to steer the current task instead.` : ""}`)
   );
   host.ui.requestRender();
 }
@@ -77169,7 +77202,22 @@ function handleFollowUp(host) {
 }
 function handleSteer(host) {
   const text = host.editor.getText().trim();
-  if (!text) return;
+  if (!text) {
+    const promoted = host.agentSessionController?.promoteLatestFollowUpToSteer();
+    if (!promoted) {
+      host.showStatus("No waiting follow-up to steer (it may already be processing)");
+      return;
+    }
+    if (host.executionState.applyUserTextLifecycle(promoted.displayText)) {
+      host.persistExecutionState();
+      void host.refreshTodoWidget();
+    }
+    host.logDebug("queue:promote", { id: promoted.id, mode: promoted.mode });
+    updatePendingMessagesDisplay(host);
+    host.showStatus("Latest follow-up changed to steer; it will guide the current task at the next message boundary");
+    host.ui.requestRender();
+    return;
+  }
   if (isCommandLikeInput(text)) {
     host.editor.onSubmit?.(text);
     return;
@@ -79986,7 +80034,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-SXUQ7OY6.js");
+    const { Agent } = await import("./chunks/src-33WRCQWX.js");
     this.agent = new Agent({
       initialState: {
         systemPrompt: this.buildSystemPrompt(),
@@ -80820,7 +80868,7 @@ async function runPrintMode(params) {
 `);
     console.log("Assistant: ");
   }
-  const { Agent: AgentClass } = await import("./chunks/src-SXUQ7OY6.js");
+  const { Agent: AgentClass } = await import("./chunks/src-33WRCQWX.js");
   let agent;
   const printModeExtensions = await loadPrintModeExtensions({
     cwd: runtime.cwd,
@@ -81681,7 +81729,7 @@ async function runJsonEventsMode(params) {
         return;
       }
       const parent = agent;
-      const { Agent: AgentClass } = await import("./chunks/src-SXUQ7OY6.js");
+      const { Agent: AgentClass } = await import("./chunks/src-33WRCQWX.js");
       const sideAgent = new AgentClass({
         initialState: {
           systemPrompt: parent.state.systemPrompt,
@@ -82025,7 +82073,7 @@ async function runJsonEventsMode(params) {
     if (runtime.initialModel.unconfigured || controller) {
       return;
     }
-    const { Agent: AgentClass } = await import("./chunks/src-SXUQ7OY6.js");
+    const { Agent: AgentClass } = await import("./chunks/src-33WRCQWX.js");
     const jsonModeExtensions = await loadJsonModeExtensions({ runtime, getAgent: () => agent });
     extensionRunner = jsonModeExtensions.runner;
     const tools = [...runtime.tools, ...jsonModeExtensions.extensionTools];
@@ -82614,7 +82662,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-OD3B57AS.js")).createTestStreamFnFromSequenceEnv();
+  return (await import("./chunks/test-stream-LFR6GSKQ.js")).createTestStreamFnFromSequenceEnv();
 }
 function resolveJsonEventsDetailFlag() {
   for (let index = 0; index < process.argv.length; index += 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "2.5.1",
+	"version": "2.5.2",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {