@cydm/pie 2.2.0 → 2.3.0

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

@@ -1,7 +1,7 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createAskUserCapability
-} from "../../../chunks/chunk-HH2Q2SNX.js";
+} from "../../../chunks/chunk-UPPICLVS.js";
 import "../../../chunks/chunk-QJH6YN2W.js";
 import "../../../chunks/chunk-IM43UYVV.js";
 import "../../../chunks/chunk-XXGYUYXI.js";

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

@@ -3776,10 +3776,26 @@ function containsEditable(node) {
   if (node.canSetValue || node.role.toLowerCase().includes("text")) return true;
   return node.children.some(containsEditable);
 }
+function wireableInputDescendants(node) {
+  const matches = [];
+  const visit = (current) => {
+    for (const child of current.children) {
+      if (child.isTextInput && child.wireRef && !child.pictureOnly && !child.offscreen) matches.push(child);
+      visit(child);
+    }
+  };
+  visit(node);
+  return matches;
+}
 function recordActionFocus(action, state, node, coordinateFocus = false) {
   if (!["click", "press", "keypress", "typeText"].includes(action.action) || !action.ref && action.action !== "click") 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)) {
+    const wireable = wireableInputDescendants(node);
+    state.currentFocus = true;
+    state.focusRef = wireable.length === 1 ? wireable[0].ref : void 0;
+  }
 }
 function editorAtPoint(nodes, x, y) {
   const matches = nodes.filter((node) => node.isTextInput && node.wireRef && !node.pictureOnly && !node.offscreen && node.rect && x >= node.rect.x && x < node.rect.x + node.rect.w && y >= node.rect.y && y < node.rect.y + node.rect.h);
@@ -3790,24 +3806,23 @@ function prepareAction(action, state, env) {
   const focusedKeyboard = !env.headless && state.currentFocus && !action.ref && (operation === "typeText" || operation === "keypress");
   const usesCurrentFocus = focusedKeyboard && !state.focusRef;
   const target = usesCurrentFocus ? focusedTarget(env) : nativeTarget(focusedKeyboard && state.focusRef ? { ...action, ref: state.focusRef } : action, operation, env);
-  const establishesFocus = !env.headless && Boolean(action.ref) && (operation === "click" || operation === "press") && containsEditable(env.node(action.ref));
   const needsForeground = !env.headless && (operation === "click" || operation === "press") && "x" in target;
   switch (operation) {
     case "press":
     case "click":
-      return { action: operation, target, params: { button: mouseButton(action.button), clickCount: clickCount(action.clickCount) }, establishesFocus, usesCurrentFocus: false, needsForeground };
+      return { action: operation, target, params: { button: mouseButton(action.button), clickCount: clickCount(action.clickCount) }, usesCurrentFocus: false, needsForeground };
     case "setText":
-      return { action: operation, target, params: { text: action.text ?? "" }, establishesFocus: false, usesCurrentFocus: false, needsForeground: false };
+      return { action: operation, target, params: { text: action.text ?? "" }, usesCurrentFocus: false, needsForeground: false };
     case "typeText":
-      return { action: operation, target, params: { text: action.text ?? "" }, establishesFocus: false, usesCurrentFocus, needsForeground: false };
+      return { action: operation, target, params: { text: action.text ?? "" }, usesCurrentFocus, needsForeground: false };
     case "keypress":
-      return { action: operation, target, params: { keys: keys(action.keys) }, establishesFocus: false, usesCurrentFocus, needsForeground: false };
+      return { action: operation, target, params: { keys: keys(action.keys) }, usesCurrentFocus, needsForeground: false };
     case "scroll":
-      return { action: operation, target, params: { scrollX: scrollDelta(action.scrollX), scrollY: scrollDelta(action.scrollY) }, establishesFocus: false, usesCurrentFocus: false, needsForeground: false };
+      return { action: operation, target, params: { scrollX: scrollDelta(action.scrollX), scrollY: scrollDelta(action.scrollY) }, usesCurrentFocus: false, needsForeground: false };
     case "drag":
-      return { action: operation, target, params: { path: path(action.path, env) }, establishesFocus: false, usesCurrentFocus: false, needsForeground: false };
+      return { action: operation, target, params: { path: path(action.path, env) }, usesCurrentFocus: false, needsForeground: false };
     case "moveMouse":
-      return { action: operation, target, params: {}, establishesFocus: false, usesCurrentFocus: false, needsForeground: false };
+      return { action: operation, target, params: {}, usesCurrentFocus: false, needsForeground: false };
   }
 }
 function canRetryInForeground(action, outcome, headless) {

package/dist/builtin/extensions/herdr-agent-state/index.js

@@ -0,0 +1,272 @@
+import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
+import "../../../chunks/chunk-LZQXQOPJ.js";
+
+// builtin/extensions/herdr-agent-state/index.ts
+import { spawn } from "node:child_process";
+var AGENT_LABEL = "pie";
+var SOURCE_ID = "pie";
+var BLOCKING_TOOL_NAME = "ask_user_multi";
+var REPORT_TIMEOUT_MS = 3e3;
+var MAX_RESUME_ARGS = 64;
+var MAX_RESUME_TOTAL_CHARS = 8192;
+var RESUME_ARG_PATTERN = /^[A-Za-z0-9._:/=@,%+-]+$/;
+var MESSAGE_MAX_CHARS = 120;
+function readHerdrEnvironment(env = process.env) {
+  if (env.HERDR_ENV !== "1") return void 0;
+  const paneId = env.HERDR_PANE_ID;
+  const binPath = env.HERDR_BIN_PATH;
+  if (typeof paneId !== "string" || !paneId) return void 0;
+  if (typeof binPath !== "string" || !binPath) return void 0;
+  return { paneId, binPath };
+}
+function createReportSequencer(now = Date.now) {
+  let seq = now() * 1e3;
+  return () => {
+    seq += 1;
+    return seq;
+  };
+}
+function summarizeAskUserQuestion(args) {
+  if (!args || typeof args !== "object") return void 0;
+  const record = args;
+  let text = record.question;
+  if (typeof text !== "string" || !text.trim()) {
+    const questions = record.questions;
+    if (Array.isArray(questions) && questions.length > 0) {
+      const first = questions[0];
+      if (first && typeof first === "object") {
+        text = first.question;
+      }
+    }
+  }
+  if (typeof text !== "string") return void 0;
+  const cleaned = text.replace(/\s+/g, " ").trim();
+  if (!cleaned) return void 0;
+  return cleaned.length > MESSAGE_MAX_CHARS ? `${cleaned.slice(0, MESSAGE_MAX_CHARS - 3)}...` : cleaned;
+}
+function buildResumeArgv(sessionId) {
+  const argv = ["pie", "chat", "--session-id", sessionId];
+  if (argv.length > MAX_RESUME_ARGS) return void 0;
+  if (argv.join(" ").length > MAX_RESUME_TOTAL_CHARS) return void 0;
+  for (const arg of argv) {
+    if (!RESUME_ARG_PATTERN.test(arg)) return void 0;
+  }
+  return argv;
+}
+function buildStateReportArgs(params) {
+  const args = [
+    "pane",
+    "report-agent",
+    params.paneId,
+    "--source",
+    params.source,
+    "--agent",
+    params.agent,
+    "--state",
+    params.state,
+    "--seq",
+    String(params.seq)
+  ];
+  if (params.message) {
+    args.push("--message", params.message);
+  }
+  if (params.agentSessionId) {
+    args.push("--agent-session-id", params.agentSessionId);
+  }
+  if (params.resumeArgv && params.resumeArgv.length > 0) {
+    args.push("--", ...params.resumeArgv);
+  }
+  return args;
+}
+function buildSessionReportArgs(params) {
+  const args = [
+    "pane",
+    "report-agent-session",
+    params.paneId,
+    "--source",
+    params.source,
+    "--agent",
+    params.agent,
+    "--seq",
+    String(params.seq),
+    "--agent-session-id",
+    params.agentSessionId
+  ];
+  if (params.resumeArgv?.length) args.push("--", ...params.resumeArgv);
+  return args;
+}
+function buildReleaseReportArgs(params) {
+  return [
+    "pane",
+    "release-agent",
+    params.paneId,
+    "--source",
+    params.source,
+    "--agent",
+    params.agent,
+    "--seq",
+    String(params.seq)
+  ];
+}
+function spawnHerdrReport(binPath, args, timeoutMs = REPORT_TIMEOUT_MS) {
+  try {
+    const child = spawn(binPath, args, { detached: true, stdio: "ignore" });
+    let killTimer;
+    const clearTimers = () => {
+      clearTimeout(timer);
+      if (killTimer) clearTimeout(killTimer);
+    };
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGTERM");
+        killTimer = setTimeout(() => {
+          try {
+            if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+          } catch {
+          }
+        }, 1e3);
+        killTimer.unref?.();
+      } catch {
+      }
+    }, timeoutMs);
+    timer.unref?.();
+    child.on("error", clearTimers);
+    child.on("exit", clearTimers);
+    child.unref();
+  } catch {
+  }
+}
+function attachHerdrReporter(host, herdr, transport = (args) => spawnHerdrReport(herdr.binPath, args), sequencer = createReportSequencer()) {
+  const nextSeq = sequencer;
+  let agentActive = false;
+  const blockingToolCalls = /* @__PURE__ */ new Map();
+  let blockedMessage;
+  let heldPane = false;
+  let lastSessionId;
+  let lastState;
+  let lastMessage;
+  function report(args) {
+    transport(args);
+  }
+  function publishState(options) {
+    const next = desiredState();
+    const unchanged = next.state === lastState && next.message === lastMessage && !options?.force && !options?.resumeArgv;
+    if (unchanged) return;
+    lastState = next.state;
+    lastMessage = next.message;
+    heldPane = true;
+    report(
+      buildStateReportArgs({
+        paneId: herdr.paneId,
+        source: SOURCE_ID,
+        agent: AGENT_LABEL,
+        state: next.state,
+        seq: nextSeq(),
+        message: next.message,
+        agentSessionId: lastSessionId,
+        resumeArgv: options?.resumeArgv
+      })
+    );
+  }
+  function publishSession(sessionId) {
+    const resumeArgv = buildResumeArgv(sessionId);
+    if (!heldPane) {
+      return;
+    }
+    report(
+      buildSessionReportArgs({
+        paneId: herdr.paneId,
+        source: SOURCE_ID,
+        agent: AGENT_LABEL,
+        seq: nextSeq(),
+        agentSessionId: sessionId,
+        resumeArgv
+      })
+    );
+  }
+  function desiredState() {
+    if (blockingToolCalls.size > 0) {
+      return { state: "blocked", message: blockedMessage };
+    }
+    if (agentActive) {
+      return { state: "working" };
+    }
+    return { state: "idle" };
+  }
+  host.on("session:changed", (event) => {
+    const sessionId = typeof event.sessionId === "string" && event.sessionId ? event.sessionId : void 0;
+    const sessionIdChanged = sessionId !== lastSessionId;
+    lastSessionId = sessionId;
+    if (!heldPane) {
+      publishState({
+        force: true,
+        resumeArgv: sessionId ? buildResumeArgv(sessionId) : void 0
+      });
+      return;
+    }
+    if (sessionIdChanged && sessionId) {
+      publishSession(sessionId);
+    }
+  });
+  host.on("turn:start", () => {
+    agentActive = true;
+    publishState();
+  });
+  host.on("agent:end", () => {
+    agentActive = false;
+    blockingToolCalls.clear();
+    blockedMessage = void 0;
+    publishState();
+  });
+  host.on("tool:execution:start", (event) => {
+    if (event.toolName !== BLOCKING_TOOL_NAME) return;
+    const message = summarizeAskUserQuestion(event.args);
+    blockingToolCalls.set(event.toolCallId, message);
+    if (message) {
+      blockedMessage = message;
+    } else if (!blockedMessage) {
+      blockedMessage = "waiting for your answer";
+    }
+    publishState();
+  });
+  host.on("tool:execution:end", (event) => {
+    if (event.toolName !== BLOCKING_TOOL_NAME) return;
+    blockingToolCalls.delete(event.toolCallId);
+    blockedMessage = void 0;
+    for (const message of blockingToolCalls.values()) {
+      if (message) blockedMessage = message;
+    }
+    publishState();
+  });
+  host.registerCleanup?.((reason) => {
+    if (reason !== "shutdown") return;
+    if (!heldPane) return;
+    report(
+      buildReleaseReportArgs({
+        paneId: herdr.paneId,
+        source: SOURCE_ID,
+        agent: AGENT_LABEL,
+        seq: nextSeq()
+      })
+    );
+  });
+}
+function herdrAgentStateExtension(ctx) {
+  const herdr = readHerdrEnvironment();
+  if (!herdr) return;
+  if (!ctx.hasUI) return;
+  ctx.log("herdr agent-state reporter enabled");
+  attachHerdrReporter(ctx, herdr);
+}
+export {
+  attachHerdrReporter,
+  buildReleaseReportArgs,
+  buildResumeArgv,
+  buildSessionReportArgs,
+  buildStateReportArgs,
+  createReportSequencer,
+  herdrAgentStateExtension as default,
+  readHerdrEnvironment,
+  spawnHerdrReport,
+  summarizeAskUserQuestion
+};

package/dist/builtin/extensions/herdr-agent-state/package.json

@@ -0,0 +1,11 @@
+{
+	"name": "herdr-agent-state-extension",
+	"version": "1.0.0",
+	"description": "Report Pie interactive agent lifecycle state (working/idle/blocked), session identity, and resume command to the Herdr terminal workspace manager.",
+	"main": "index.js",
+	"type": "module",
+	"pie": {
+		"name": "herdr-agent-state",
+		"main": "index.js"
+	}
+}

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

@@ -544,6 +544,7 @@ function normalizeEntry(name, raw, sourcePath, sourceScope, homeDir) {
   const hasStdio = typeof raw.command === "string" && raw.command.length > 0;
   const hasHttp = typeof raw.url === "string" && raw.url.length > 0;
   if (!hasStdio && !hasHttp) return null;
+  const directTools = normalizeDirectTools(raw.directTools);
   return {
     name,
     command: hasStdio ? expandHome(raw.command, homeDir) : void 0,
@@ -554,8 +555,8 @@ function normalizeEntry(name, raw, sourcePath, sourceScope, homeDir) {
     headers: asStringRecord(raw.headers),
     inheritEnv: raw.inheritEnv !== false,
     connectTimeoutMs: typeof raw.connectTimeoutMs === "number" && Number.isFinite(raw.connectTimeoutMs) && raw.connectTimeoutMs > 0 ? raw.connectTimeoutMs : void 0,
-    directTools: normalizeDirectTools(raw.directTools).mode,
-    directToolsWhitelist: normalizeDirectTools(raw.directTools).whitelist,
+    directTools: directTools.mode,
+    directToolsWhitelist: directTools.whitelist,
     disabled: raw.disabled === true,
     sourcePath,
     sourceScope
@@ -615,8 +616,8 @@ function resolveMcpAdapterConfig(cwd, configDir, homeDir = os.homedir()) {
         continue;
       }
       const existing = merged.get(name);
-      if (existing && raw.disabled === true) {
-        merged.set(name, { ...existing, disabled: true });
+      if (existing && (raw.disabled === true || raw.disabled === false)) {
+        merged.set(name, { ...existing, disabled: raw.disabled });
       }
     }
   }
@@ -24438,6 +24439,7 @@ import * as path2 from "node:path";
 var CONNECT_TIMEOUT_MS = 3e4;
 var PACKAGE_MANAGER_CONNECT_TIMEOUT_MS = 12e4;
 var PACKAGE_MANAGER_COMMANDS = /* @__PURE__ */ new Set(["npx", "npm", "bunx", "uvx", "uv", "pnpm", "pnpmx"]);
+var METADATA_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 var CALL_TIMEOUT_MS = 12e4;
 var STDERR_TAIL_LIMIT = 4e3;
 function connectTimeoutFor(definition) {
@@ -24445,6 +24447,17 @@ function connectTimeoutFor(definition) {
   const base = path2.basename(definition.command ?? "");
   return PACKAGE_MANAGER_COMMANDS.has(base) ? PACKAGE_MANAGER_CONNECT_TIMEOUT_MS : CONNECT_TIMEOUT_MS;
 }
+function unpinnedWarnings(definitions) {
+  const commandPattern = new RegExp(`(^|\\s)(?:${[...PACKAGE_MANAGER_COMMANDS].join("|")})\\s`);
+  const warnings = [];
+  for (const definition of definitions) {
+    const spec = [definition.command ?? "", ...definition.args].join(" ");
+    if (commandPattern.test(spec) && /@latest\b/.test(spec)) {
+      warnings.push(`${definition.name}: unpinned "@latest" fetch \u2014 pin an exact version (e.g. pkg@1.2.3).`);
+    }
+  }
+  return warnings;
+}
 function appendTail(tail, chunk) {
   return (tail + String(chunk)).slice(-STDERR_TAIL_LIMIT);
 }
@@ -24487,15 +24500,8 @@ function withTimeout(promise, timeoutMs, label, signal) {
   });
 }
 var McpServerManager = class {
-  runtimes = /* @__PURE__ */ new Map();
-  definitions;
-  cachePath;
-  log;
-  /** Set by dispose(); after it, no new connects and no late attach. */
-  disposed = false;
-  /** Prefixed names claimed by more than one server in the last loadCatalog(); callTool fail-closes on them. */
-  conflictedNames = /* @__PURE__ */ new Set();
-  constructor(definitions, cachePath, log) {
+  constructor(definitions, cacheDir, log, now = Date.now) {
+    this.now = now;
     this.definitions = new Map(definitions.map((definition) => [sanitizeName(definition.name), definition]));
     if (this.definitions.size !== definitions.length) {
       const counts = /* @__PURE__ */ new Map();
@@ -24510,9 +24516,22 @@ var McpServerManager = class {
         );
       }
     }
-    this.cachePath = cachePath;
+    this.cacheDir = cacheDir;
     this.log = log;
   }
+  now;
+  runtimes = /* @__PURE__ */ new Map();
+  definitions;
+  // Cache directory holding one <server>.json shard per connected server. A
+  // legacy pre-sharding single file (<configDir>/mcp-metadata.json) is
+  // deliberately ignored — the cache is disposable and shards rebuild on the
+  // next connect.
+  cacheDir;
+  log;
+  /** Set by dispose(); after it, no new connects and no late attach. */
+  disposed = false;
+  /** Prefixed names claimed by more than one server in the last loadCatalog(); callTool fail-closes on them. */
+  conflictedNames = /* @__PURE__ */ new Set();
   getDefinition(server) {
     return this.definitions.get(sanitizeName(server));
   }
@@ -24614,13 +24633,11 @@ var McpServerManager = class {
       }
       seen.add(tool.prefixedName);
     }
-    for (const [otherKey, otherRuntime] of this.runtimes) {
+    for (const otherRuntime of this.runtimes.values()) {
       if (otherRuntime === runtime || !otherRuntime.tools) continue;
       for (const otherTool of otherRuntime.tools) {
         if (seen.has(otherTool.prefixedName)) {
-          throw new Error(
-            `tool name collision between "${runtime.definition.name}" and "${otherKey}": ${otherTool.prefixedName}`
-          );
+          this.log(`mcp: tool name "${otherTool.prefixedName}" is claimed by more than one server \u2014 disabled until the servers are renamed (fail-closed)`);
         }
       }
     }
@@ -24629,23 +24646,45 @@ var McpServerManager = class {
   }
   persistMetadata() {
     try {
-      const snapshot = { ...this.readCacheFile() };
+      fs2.mkdirSync(this.cacheDir, { recursive: true });
       for (const [key, runtime] of this.runtimes) {
-        if (runtime.tools) snapshot[key] = runtime.tools;
-      }
-      fs2.mkdirSync(path2.dirname(this.cachePath), { recursive: true });
-      const tempPath = `${this.cachePath}.${process.pid}.tmp`;
-      fs2.writeFileSync(tempPath, JSON.stringify({ updatedAt: Date.now(), tools: snapshot }, null, 2), "utf8");
-      try {
-        fs2.renameSync(tempPath, this.cachePath);
-      } catch (error2) {
-        fs2.unlinkSync(tempPath);
-        throw error2;
+        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");
+        try {
+          fs2.renameSync(tempPath, shardPath);
+        } catch (error2) {
+          fs2.unlinkSync(tempPath);
+          throw error2;
+        }
       }
+      this.deleteExpiredShards();
     } catch (error2) {
       this.log(`mcp: metadata cache write failed: ${error2 instanceof Error ? error2.message : String(error2)}`);
     }
   }
+  /** Delete shard files older than METADATA_TTL_MS (stale entries of offline servers age out). */
+  deleteExpiredShards() {
+    let names;
+    try {
+      names = fs2.readdirSync(this.cacheDir);
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      if (!name.endsWith(".json")) continue;
+      const filePath = path2.join(this.cacheDir, name);
+      try {
+        const mtimeMs = fs2.statSync(filePath).mtimeMs;
+        const parsed = JSON.parse(fs2.readFileSync(filePath, "utf8"));
+        if (typeof parsed.updatedAt !== "number" || this.now() - parsed.updatedAt > METADATA_TTL_MS) {
+          if (fs2.statSync(filePath).mtimeMs === mtimeMs) fs2.unlinkSync(filePath);
+        }
+      } catch {
+      }
+    }
+  }
   /** Cached descriptors for one server (from the metadata cache file). */
   cachedToolsFor(server) {
     return this.loadCatalog().filter((tool) => tool.server === sanitizeName(server));
@@ -24681,27 +24720,60 @@ var McpServerManager = class {
     this.conflictedNames = conflicts;
     return [...catalog.values()].sort((a, b) => a.prefixedName.localeCompare(b.prefixedName));
   }
-  cacheMtime;
+  cacheSignature;
   cacheSnapshot = {};
-  /** Read the metadata cache file, re-reading only when the mtime changed. */
+  cacheUpdatedAt = {};
+  pruneExpiredSnapshot() {
+    for (const [key, updatedAt] of Object.entries(this.cacheUpdatedAt)) {
+      if (this.now() - updatedAt > METADATA_TTL_MS) {
+        delete this.cacheSnapshot[key];
+        delete this.cacheUpdatedAt[key];
+      }
+    }
+    return this.cacheSnapshot;
+  }
+  /**
+   * Read the sharded metadata cache (<cacheDir>/<server>.json), merging every
+   * shard's tools by server key (the file name is the sanitized server key).
+   * Re-reads only when the signature changed; the signature must cover each
+   * shard's name + mtime — the directory's own mtime is NOT enough, because a
+   * rename replacing an existing shard leaves it unchanged.
+   */
   readCacheFile() {
-    let mtime;
+    let names;
     try {
-      mtime = fs2.statSync(this.cachePath).mtimeMs;
+      names = fs2.readdirSync(this.cacheDir).sort();
     } catch {
-      this.cacheMtime = void 0;
+      this.cacheSignature = void 0;
       this.cacheSnapshot = {};
+      this.cacheUpdatedAt = {};
       return this.cacheSnapshot;
     }
-    if (mtime === this.cacheMtime) return this.cacheSnapshot;
-    try {
-      const parsed = JSON.parse(fs2.readFileSync(this.cachePath, "utf8"));
-      this.cacheSnapshot = parsed.tools ?? {};
-      this.cacheMtime = mtime;
-    } catch {
-      this.cacheSnapshot = {};
-      this.cacheMtime = mtime;
+    let signature = "";
+    for (const name of names) {
+      try {
+        signature += `${name}:${fs2.statSync(path2.join(this.cacheDir, name)).mtimeMs};`;
+      } catch {
+      }
     }
+    if (signature === this.cacheSignature) return this.pruneExpiredSnapshot();
+    const snapshot = {};
+    const updatedAt = {};
+    for (const name of names) {
+      if (!name.endsWith(".json")) continue;
+      try {
+        const parsed = JSON.parse(fs2.readFileSync(path2.join(this.cacheDir, name), "utf8"));
+        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;
+        updatedAt[key] = parsed.updatedAt;
+      } catch {
+      }
+    }
+    this.cacheSnapshot = snapshot;
+    this.cacheUpdatedAt = updatedAt;
+    this.cacheSignature = signature;
     return this.cacheSnapshot;
   }
   async callTool(prefixedName, args, signal) {
@@ -24960,7 +25032,7 @@ function createMcpProxyTool(getManager, ensureTrusted, options = {}) {
   return {
     name: "mcp",
     label: "MCP",
-    description: 'Call tools on configured MCP servers without loading their definitions. Discover: mcp({ search: "screenshot" }) lists matching <server>_<tool> names with compact parameter hints (cached metadata; servers do not start for search). Inspect: mcp({ tool: "<name>", describe: true }) returns the full input schema. Call: mcp({ tool: "<name>", args: { ... } }) \u2014 the server starts lazily on first use. args may be a JSON object or JSON string. If a result is marked [outcome unknown], the tool may have executed: do not retry automatically \u2014 verify state with a read-only call first.',
+    description: 'Call tools on configured MCP servers without loading their definitions. Discover: mcp({ search: "screenshot" }) lists matching <server>_<tool> names with compact parameter hints (cached metadata; servers do not start for search). Inspect: mcp({ tool: "<name>", describe: true }) returns the full input schema. Call: mcp({ tool: "<name>", args: { ... } }) \u2014 the server starts lazily on first use. args may be a JSON object or JSON string. Tool lists are a snapshot taken when a server connects: tools added or removed by a running server only appear after /reload refreshes the session. If a result is marked [outcome unknown], the tool may have executed: do not retry automatically \u2014 verify state with a read-only call first.',
     parameters: Type.Object({
       search: Type.Optional(Type.String({ description: "Query text to discover MCP tools by name/description" })),
       tool: Type.Optional(Type.String({ description: "Prefixed tool name <server>_<tool> to describe or call" })),
@@ -25160,10 +25232,10 @@ function formatServerForTrustPrompt(definition) {
 function mcpAdapter(ctx) {
   const configDir = resolveConfigDir();
   const trustStore = new McpTrustStore(path4.join(configDir, "mcp-trust.json"));
-  const metadataCachePath = path4.join(configDir, "mcp-metadata.json");
+  const metadataCacheDir = path4.join(configDir, "mcp-metadata");
   let manager = new McpServerManager(
     resolveMcpAdapterConfig(ctx.cwd, configDir).servers,
-    metadataCachePath,
+    metadataCacheDir,
     ctx.log
   );
   async function reloadManager() {
@@ -25171,23 +25243,29 @@ function mcpAdapter(ctx) {
     try {
       manager = new McpServerManager(
         resolveMcpAdapterConfig(ctx.cwd, configDir).servers,
-        metadataCachePath,
+        metadataCacheDir,
         ctx.log
       );
     } catch (error2) {
       const message = error2 instanceof Error ? error2.message : String(error2);
       ctx.log(`mcp: config reload failed: ${message}`);
       if (ctx.hasUI) ctx.ui.notify(`MCP adapter config error: ${message}`, "error");
-      manager = new McpServerManager([], metadataCachePath, ctx.log);
+      manager = new McpServerManager([], metadataCacheDir, ctx.log);
     }
   }
-  function writeProjectOverride(serverName, disabled) {
+  ctx.registerCleanup?.(() => manager.dispose().catch(() => void 0));
+  function readProjectOverride() {
     const filePath = path4.join(ctx.cwd, ".pie", "mcp-adapter.json");
     let parsed = {};
     try {
       parsed = JSON.parse(fs4.readFileSync(filePath, "utf8"));
     } catch {
     }
+    return parsed;
+  }
+  function writeProjectOverride(serverName, disabled) {
+    const filePath = path4.join(ctx.cwd, ".pie", "mcp-adapter.json");
+    const parsed = readProjectOverride();
     const servers = parsed.mcpServers && typeof parsed.mcpServers === "object" && !Array.isArray(parsed.mcpServers) ? { ...parsed.mcpServers } : {};
     if (disabled === null) {
       delete servers[serverName];
@@ -25229,16 +25307,6 @@ function mcpAdapter(ctx) {
   if (eagerRegistered.length > 0) {
     ctx.log(`mcp: registered ${eagerRegistered.length} direct tool(s) from metadata cache: ${eagerRegistered.join(", ")}`);
   }
-  function unpinnedWarnings() {
-    const warnings = [];
-    for (const definition of manager.listDefinitions()) {
-      const spec = [definition.command ?? "", ...definition.args].join(" ");
-      if (/(^|\s)(npx|bunx|uvx)\s/.test(spec) && /@latest\b/.test(spec)) {
-        warnings.push(`${definition.name}: unpinned "@latest" fetch \u2014 pin an exact version (e.g. pkg@1.2.3).`);
-      }
-    }
-    return warnings;
-  }
   ctx.registerCommand({
     name: "mcp",
     description: "MCP adapter: status (default), enable/disable <server>",
@@ -25254,10 +25322,21 @@ function mcpAdapter(ctx) {
           commandCtx.ui.notify(`Unknown MCP server "${target}". Run /mcp for the configured list.`, "warning");
           return;
         }
-        const filePath = writeProjectOverride(definition.name, sub === "disable" ? true : null);
+        const overrides = readProjectOverride().mcpServers;
+        const forceEnabled = overrides?.[definition.name]?.disabled === false;
+        const filePath = writeProjectOverride(
+          definition.name,
+          // enable must lift a source-level disabled:true with an explicit
+          // {disabled:false} force-override: deleting the override alone
+          // would leave the source-level disable in force. Preserve an
+          // existing force-enable on repeated enable commands too.
+          sub === "disable" ? true : definition.disabled || forceEnabled ? false : null
+        );
         await reloadManager();
+        const effectiveDisabled = manager.getDefinition(definition.name)?.disabled ?? false;
+        const stateLabel = effectiveDisabled ? "disabled" : sub === "disable" ? "still enabled" : "enabled";
         commandCtx.ui.notify(
-          `MCP server "${definition.name}" ${sub}d (wrote ${filePath}). ` + (eagerRegistered.length > 0 ? "Restart or /reload to resync direct tools." : "Effective immediately."),
+          `MCP server "${definition.name}" ${stateLabel} (wrote ${filePath}). ` + (eagerRegistered.length > 0 ? "Restart or /reload to resync direct tools." : "Effective immediately."),
           "info"
         );
         return;
@@ -25279,7 +25358,7 @@ function mcpAdapter(ctx) {
           lines.push(`- ${sanitizeName(definition.name)} [${manager.statusOf(definition.name)}, ${scopeLabel}] ${spec}`);
         }
       }
-      const warnings = unpinnedWarnings();
+      const warnings = unpinnedWarnings(manager.listDefinitions());
       if (warnings.length > 0) lines.push("", "Warnings:", ...warnings.map((warning) => `- ${warning}`));
       const config2 = resolveMcpAdapterConfig(commandCtx.cwd, configDir);
       if (config2.problems.length > 0) lines.push("", "Config problems:", ...config2.problems.map((problem) => `- ${problem}`));

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

@@ -7,7 +7,7 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-HH2Q2SNX.js";
+} from "../../../chunks/chunk-UPPICLVS.js";
 import "../../../chunks/chunk-QJH6YN2W.js";
 import "../../../chunks/chunk-IM43UYVV.js";
 import {

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

@@ -1,14 +1,14 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-G3SE3I2L.js";
-import "../../../chunks/chunk-5353DEEC.js";
+} from "../../../chunks/chunk-P3QPJXS7.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-HH2Q2SNX.js";
+} from "../../../chunks/chunk-UPPICLVS.js";
 import "../../../chunks/chunk-QJH6YN2W.js";
 import "../../../chunks/chunk-IM43UYVV.js";
+import "../../../chunks/chunk-5353DEEC.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

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

@@ -8,7 +8,7 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-HH2Q2SNX.js";
+} from "../../../chunks/chunk-UPPICLVS.js";
 import "../../../chunks/chunk-QJH6YN2W.js";
 import "../../../chunks/chunk-IM43UYVV.js";
 import "../../../chunks/chunk-XXGYUYXI.js";

package/dist/chunks/{chunk-G3SE3I2L.js → chunk-P3QPJXS7.js}

@@ -1,8 +1,4 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
-import {
-  getBuiltinDir,
-  getConfigDir
-} from "./chunk-5353DEEC.js";
 import {
   classifyShellCommand,
   createCodeIntelTool,
@@ -12,7 +8,11 @@ import {
   createSharedWebSearchTool,
   interpretShellExit,
   requestInteraction
-} from "./chunk-HH2Q2SNX.js";
+} from "./chunk-UPPICLVS.js";
+import {
+  getBuiltinDir,
+  getConfigDir
+} from "./chunk-5353DEEC.js";
 import {
   Type
 } from "./chunk-XXGYUYXI.js";

package/dist/chunks/{chunk-HH2Q2SNX.js → chunk-UPPICLVS.js}

@@ -4918,7 +4918,7 @@ var AgentSessionRetryController = class {
       userAbort: false,
       terminal: true
     });
-    const maxRetries = this.retry?.maxRetries ?? 3;
+    const maxRetries = (failure !== void 0 ? this.retry?.maxRetriesForFailure?.(failure) : void 0) ?? this.retry?.maxRetries ?? 3;
     this.emit({ type: "retry_exhausted", errorMessage: terminalFailure.message, maxRetries });
     this.emit({ type: "turn_failed_terminal", failure: terminalFailure });
     this.emit({ type: "turn_settled" });

package/dist/cli.js

@@ -7,25 +7,7 @@ import {
   createCliWebResearchHealthStore,
   formatSize,
   truncateHeadTail
-} from "./chunks/chunk-G3SE3I2L.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-P3QPJXS7.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -78,7 +60,7 @@ import {
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-HH2Q2SNX.js";
+} from "./chunks/chunk-UPPICLVS.js";
 import "./chunks/chunk-QJH6YN2W.js";
 import {
   Deref,
@@ -104,6 +86,24 @@ import {
   sortToolModelCandidatesByCapability,
   type_exports
 } from "./chunks/chunk-IM43UYVV.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";
 import {
   IsArray,
   IsBigInt,
@@ -79622,6 +79622,7 @@ var InteractiveMode = class {
     await this.loadExtensions();
     this.applyRuntimeToolMode();
     this.noteRuntimeModeChanged("extension_reload");
+    await this.syncSessionScopedState();
     this.ui.requestRender();
   }
   calculateContextUsage() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "2.2.0",
+	"version": "2.3.0",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {
@@ -19,7 +19,7 @@
 		"pretest:offline": "npm run build --workspace @pie/agent-framework && npm run build --workspace @pie/shared-headless-capabilities && npm run build && npm run test:skill-regressions",
 		"test:skill-regressions": "node --test --import tsx test/bash-lifecycle.test.ts test/skill-creator-runner.test.ts test/tui-use-contract.test.ts test/tui-use-runtime.test.ts test/browser-runtime.test.ts test/computer-evidence.test.ts test/interactive-lifecycle.test.ts",
 		"posttest:offline": "node --test --import tsx test/remote-model-catalog.test.ts",
-		"test:offline": "node --test --test-concurrency=4 --import tsx test/builtin-extensions.test.ts test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-provider.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/mcp-adapter.test.ts test/extensions-enablement.test.ts test/extension-selector-shortcuts.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/rendered-page-reader.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/bash-yolo.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/ctrl-d-exit.test.ts test/session-display-title.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/clear-command-usage.test.ts test/daily-agent-smoke.terminal.test.ts test/slash-menu-toggles.terminal.test.ts test/cli-args.test.ts test/extensions-configured-paths.test.ts test/extensions-loader-path.test.ts test/file-picker.test.ts test/interrupt-recovery.test.ts test/mention-insert-regression.test.ts test/mention-picker-navigation.test.ts test/pie-unity-rpc-skill.test.ts test/skill-creator-scripts.test.ts",
+		"test:offline": "node --test --test-concurrency=4 --import tsx test/builtin-extensions.test.ts test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-provider.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/mcp-adapter.test.ts test/herdr-agent-state.test.ts test/extensions-enablement.test.ts test/extension-selector-shortcuts.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/rendered-page-reader.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/bash-yolo.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/ctrl-d-exit.test.ts test/session-display-title.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/clear-command-usage.test.ts test/daily-agent-smoke.terminal.test.ts test/slash-menu-toggles.terminal.test.ts test/cli-args.test.ts test/extensions-configured-paths.test.ts test/extensions-loader-path.test.ts test/file-picker.test.ts test/interrupt-recovery.test.ts test/mention-insert-regression.test.ts test/mention-picker-navigation.test.ts test/pie-unity-rpc-skill.test.ts test/skill-creator-scripts.test.ts",
 		"test:all": "npm run test:offline && npm run test:terminal:vitest",
 		"test:terminal:vitest": "vitest run test/mention-file-select.terminal.test.ts test/tool-partial-display.terminal.test.ts test/footer-plan-mode.test.ts test/viewport-position-final.test.ts test/resume-header.terminal.test.ts --no-file-parallelism",
 		"test:todo-tui": "node ../../scripts/run-with-env.mjs PIE_REAL_TODO_TUI=1 -- --test --import tsx test/todo-closure.terminal.test.ts",