@cydm/pie 2.4.0 → 2.5.1

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-FKUEIYFQ.js";
+} from "../../../chunks/chunk-REP6QANY.js";
 import "../../../chunks/chunk-ZKHMNEXL.js";
 import "../../../chunks/chunk-YRXXRLMQ.js";
 import "../../../chunks/chunk-XXGYUYXI.js";

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

@@ -136,7 +136,42 @@ function spawnHerdrReport(binPath, args, timeoutMs = REPORT_TIMEOUT_MS) {
   } catch {
   }
 }
-function attachHerdrReporter(host, herdr, transport = (args) => spawnHerdrReport(herdr.binPath, args), sequencer = createReportSequencer()) {
+var KILL_GRACE_MS = 1e3;
+async function runHerdrReportBounded(binPath, args, timeoutMs = REPORT_TIMEOUT_MS) {
+  let child;
+  try {
+    child = spawn(binPath, args, { detached: true, stdio: "ignore" });
+  } catch {
+    return { outcome: "spawn-error", exitCode: null };
+  }
+  return await new Promise((resolve) => {
+    let killTimer;
+    let settled = false;
+    const finish = (outcome, exitCode) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (killTimer) clearTimeout(killTimer);
+      resolve({ outcome, exitCode });
+    };
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGTERM");
+      } catch {
+      }
+      killTimer = setTimeout(() => {
+        try {
+          if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+        } catch {
+        }
+        killTimer = setTimeout(() => finish("escalated", child.exitCode), 250);
+      }, KILL_GRACE_MS);
+    }, timeoutMs);
+    child.on("error", () => finish("spawn-error", null));
+    child.on("exit", (code) => finish("exited", code));
+  });
+}
+function attachHerdrReporter(host, herdr, transport = (args) => spawnHerdrReport(herdr.binPath, args), sequencer = createReportSequencer(), shutdownTransport = (args) => runHerdrReportBounded(herdr.binPath, args)) {
   const nextSeq = sequencer;
   let agentActive = false;
   const blockingToolCalls = /* @__PURE__ */ new Map();
@@ -238,10 +273,10 @@ function attachHerdrReporter(host, herdr, transport = (args) => spawnHerdrReport
     }
     publishState();
   });
-  host.registerCleanup?.((reason) => {
+  host.registerCleanup?.(async (reason) => {
     if (reason !== "shutdown") return;
     if (!heldPane) return;
-    report(
+    await shutdownTransport(
       buildReleaseReportArgs({
         paneId: herdr.paneId,
         source: SOURCE_ID,
@@ -267,6 +302,7 @@ export {
   createReportSequencer,
   herdrAgentStateExtension as default,
   readHerdrEnvironment,
+  runHerdrReportBounded,
   spawnHerdrReport,
   summarizeAskUserQuestion
 };

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

@@ -24724,11 +24724,13 @@ var McpServerManager = class {
     };
     for (const tools of Object.values(this.readCacheFile())) {
       for (const tool of tools) {
-        if (!this.definitions.has(tool.server)) continue;
+        const definition = this.definitions.get(tool.server);
+        if (!definition || definition.disabled) continue;
         claim2(tool, false);
       }
     }
     for (const runtime of this.runtimes.values()) {
+      if (runtime.definition.disabled) continue;
       for (const tool of runtime.tools ?? []) claim2(tool, true);
     }
     for (const name of conflicts) {
@@ -24849,6 +24851,20 @@ ${tail}` : "")
         error: `MCP call "${prefixedName}" was cancelled before the request was sent; nothing was executed.`
       };
     }
+    const postConnectCatalog = this.loadCatalog();
+    if (this.conflictedNames.has(prefixedName)) {
+      return {
+        delivery: "not_sent",
+        error: `MCP tool name "${prefixedName}" became claimed by more than one server during connection. Rename one of the servers so every tool name is unambiguous; the call was NOT sent.`
+      };
+    }
+    const postDescriptor = postConnectCatalog.find((tool) => tool.prefixedName === prefixedName);
+    if (postDescriptor && (postDescriptor.server !== server || postDescriptor.tool !== toolName)) {
+      return {
+        delivery: "not_sent",
+        error: `MCP tool "${prefixedName}" resolved to ${postDescriptor.server}/${postDescriptor.tool} after connecting; refusing to send the stale target ${server}/${toolName}. Retry the call.`
+      };
+    }
     try {
       const result = await withTimeout(
         client.callTool({ name: toolName, arguments: args }, void 0, signal !== void 0 ? { signal } : void 0),
@@ -25266,19 +25282,26 @@ function mcpAdapter(ctx) {
     ctx.log
   );
   async function reloadManager() {
-    await manager.dispose().catch(() => void 0);
+    let replacement;
     try {
-      manager = new McpServerManager(
-        resolveMcpAdapterConfig(ctx.cwd, configDir).servers,
-        metadataCacheDir,
-        ctx.log
-      );
+      const resolved = resolveMcpAdapterConfig(ctx.cwd, configDir);
+      if (resolved.problems.length > 0) {
+        const message = `config layers failed to parse: ${resolved.problems.join("; ")}`;
+        ctx.log(`mcp: config reload failed, keeping the previous manager: ${message}`);
+        if (ctx.hasUI) ctx.ui.notify(`MCP adapter config error (previous servers kept): ${message}`, "error");
+        return { ok: false, error: message };
+      }
+      replacement = new McpServerManager(resolved.servers, 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([], metadataCacheDir, ctx.log);
+      ctx.log(`mcp: config reload failed, keeping the previous manager: ${message}`);
+      if (ctx.hasUI) ctx.ui.notify(`MCP adapter config error (previous servers kept): ${message}`, "error");
+      return { ok: false, error: message };
     }
+    const previous = manager;
+    manager = replacement;
+    await previous.dispose().catch(() => void 0);
+    return { ok: true };
   }
   ctx.registerCleanup?.(() => manager.dispose().catch(() => void 0));
   function readProjectOverride() {
@@ -25359,6 +25382,7 @@ function mcpAdapter(ctx) {
         }
         const overrides = readProjectOverride().mcpServers;
         const forceEnabled = overrides?.[definition.name]?.disabled === false;
+        const previousOverride = overrides?.[definition.name]?.disabled;
         const filePath = writeProjectOverride(
           definition.name,
           // enable must lift a source-level disabled:true with an explicit
@@ -25367,8 +25391,24 @@ function mcpAdapter(ctx) {
           // 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 reload = await reloadManager();
+        if (!reload.ok) {
+          writeProjectOverride(definition.name, previousOverride === void 0 ? null : previousOverride);
+          commandCtx.ui.notify(
+            `MCP server "${definition.name}" NOT ${sub === "disable" ? "disabled" : "enabled"}: config reload failed (${reload.error}); previous servers kept and the override was rolled back.`,
+            "error"
+          );
+          return;
+        }
+        const reloaded = manager.getDefinition(definition.name);
+        if (!reloaded) {
+          commandCtx.ui.notify(
+            `MCP server "${definition.name}" disappeared from the reloaded config (wrote ${filePath}); check project/global config merges.`,
+            "error"
+          );
+          return;
+        }
+        const effectiveDisabled = reloaded.disabled;
         const stateLabel = effectiveDisabled ? "disabled" : sub === "disable" ? "still enabled" : "enabled";
         commandCtx.ui.notify(
           `MCP server "${definition.name}" ${stateLabel} (wrote ${filePath}). ` + (eagerRegistered.length > 0 ? "Restart or /reload to resync direct tools." : "Effective immediately."),

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

@@ -7,7 +7,7 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-FKUEIYFQ.js";
+} from "../../../chunks/chunk-REP6QANY.js";
 import "../../../chunks/chunk-ZKHMNEXL.js";
 import "../../../chunks/chunk-YRXXRLMQ.js";
 import {

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

@@ -1,11 +1,11 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-XVUV3IM2.js";
+} from "../../../chunks/chunk-N2MK46AE.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-FKUEIYFQ.js";
+} from "../../../chunks/chunk-REP6QANY.js";
 import "../../../chunks/chunk-ZKHMNEXL.js";
 import "../../../chunks/chunk-YRXXRLMQ.js";
 import "../../../chunks/chunk-5353DEEC.js";
@@ -38,6 +38,7 @@ function subagentExtension(ctx) {
     notify: ctx.hasUI ? (message, type) => ctx.ui.notify(message, type === "success" ? "info" : type) : void 0,
     debugLog: (module, message, data) => ctx.log(`[subagent:${module}] ${message}${data !== void 0 ? ` ${JSON.stringify(data)}` : ""}`),
     resolveModelClass: (modelClass) => ctx.resolveModelClass?.(modelClass),
+    resolveModelRef: (modelRef) => ctx.resolveModelRef?.(modelRef),
     createRuntimeTools: () => {
       const parentRuntimeTools = ctx.getRuntimeTools();
       if (Array.isArray(parentRuntimeTools) && parentRuntimeTools.length > 0) {

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

@@ -8,7 +8,7 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-FKUEIYFQ.js";
+} from "../../../chunks/chunk-REP6QANY.js";
 import "../../../chunks/chunk-ZKHMNEXL.js";
 import "../../../chunks/chunk-YRXXRLMQ.js";
 import "../../../chunks/chunk-XXGYUYXI.js";

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

@@ -8,7 +8,7 @@ import {
   createSharedWebSearchTool,
   interpretShellExit,
   requestInteraction
-} from "./chunk-FKUEIYFQ.js";
+} from "./chunk-REP6QANY.js";
 import {
   getBuiltinDir,
   getConfigDir
@@ -543,9 +543,24 @@ function createBashTool(defaultCwd, options) {
           totalNewlines += data.reduce((count, byte) => count + (byte === 10 ? 1 : 0), 0);
           if (headBytes >= maxHeadBytes) return;
           const prefix = data.subarray(0, maxHeadBytes - headBytes);
-          headChunks.push(prefix);
+          headChunks.push(Buffer.from(prefix));
           headBytes += prefix.length;
         };
+        const appendRollingChunk = (data) => {
+          const owned = Buffer.from(data);
+          chunks.push(owned);
+          chunksBytes += owned.length;
+          while (chunksBytes > maxChunksBytes && chunks.length > 1) {
+            const removed = chunks.shift();
+            chunksBytes -= removed.length;
+          }
+          if (chunks.length === 1 && chunksBytes > maxChunksBytes) {
+            const only = chunks[0];
+            const tail = only.subarray(only.length - maxChunksBytes);
+            chunks[0] = Buffer.from(tail);
+            chunksBytes = tail.length;
+          }
+        };
         let timedOut = false;
         let processExited = false;
         let exitCode = null;
@@ -641,12 +656,7 @@ function createBashTool(defaultCwd, options) {
               return;
             }
           }
-          chunks.push(data);
-          chunksBytes += data.length;
-          while (chunksBytes > maxChunksBytes && chunks.length > 1) {
-            const removed = chunks.shift();
-            chunksBytes -= removed.length;
-          }
+          appendRollingChunk(data);
           if (onUpdate) {
             const fullBuffer = Buffer.concat(chunks);
             const fullText = fullBuffer.toString("utf-8");
@@ -700,12 +710,7 @@ function createBashTool(defaultCwd, options) {
               return;
             }
           }
-          chunks.push(data);
-          chunksBytes += data.length;
-          while (chunksBytes > maxChunksBytes && chunks.length > 1) {
-            const removed = chunks.shift();
-            chunksBytes -= removed.length;
-          }
+          appendRollingChunk(data);
         });
         const finishExecution = async (code, sig, stdioIncomplete = false) => {
           if (settled) return;

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

@@ -1322,6 +1322,8 @@ function formatSkillSummariesForPrompt(skills) {
 
 // ../../packages/shared-headless-capabilities/src/subagent.ts
 var DEFAULT_SUBAGENT_TIMEOUT_SECONDS = 1200;
+var DEFAULT_SUBAGENT_THINKING_LEVEL = "medium";
+var SUBAGENT_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
 function formatSkillsForPrompt(skills) {
   return formatSkillSummariesForPrompt(skills);
 }
@@ -1411,21 +1413,28 @@ function filterToolsForSubagent(runtimeTools, parentTools, plan) {
   }
   return filtered;
 }
-function buildSubagentPlan(deps, task, name, priority, timeoutSeconds) {
+function buildSubagentPlan(deps, task, name, priority, timeoutSeconds, modelOverride, thinkingLevel = DEFAULT_SUBAGENT_THINKING_LEVEL) {
   const complexity = inferComplexity(task, priority);
   const modelClass = selectModelClass(complexity, priority);
-  const modelResolution = deps.resolveModelClass?.(modelClass);
+  const overrideResolution = modelOverride ? deps.resolveModelRef?.(modelOverride) ?? { model: void 0, fallbackReason: `model override "${modelOverride}" is not supported by this host` } : void 0;
+  const overridePair = overrideResolution?.model && overrideResolution?.apiKey ? { model: overrideResolution.model, apiKey: overrideResolution.apiKey } : void 0;
+  const modelResolution = overridePair ? void 0 : deps.resolveModelClass?.(modelClass);
   const resolvedPair = modelResolution?.model && modelResolution?.apiKey ? { model: modelResolution.model, apiKey: modelResolution.apiKey } : void 0;
-  const model = resolvedPair?.model ?? deps.model;
-  const apiKey = resolvedPair?.apiKey ?? deps.apiKey;
+  const model = overridePair?.model ?? resolvedPair?.model ?? deps.model;
+  const apiKey = overridePair?.apiKey ?? resolvedPair?.apiKey ?? deps.apiKey;
+  const overrideMissReason = overrideResolution?.fallbackReason ?? `model override "${modelOverride}" could not be resolved`;
+  const modelFallbackReason = modelOverride ? overridePair ? void 0 : modelResolution?.fallbackReason ? `${overrideMissReason}; ${modelResolution.fallbackReason}` : overrideMissReason : modelResolution?.fallbackReason;
   const partialPlan = {
     task,
     name,
     priority,
     complexity,
     modelClass,
+    modelOverride,
+    modelOverrideApplied: Boolean(overridePair),
+    thinkingLevel,
     modelId: `${model?.provider ? `${model.provider}/` : ""}${model?.id ?? "unknown"}`,
-    modelFallbackReason: modelResolution?.fallbackReason,
+    modelFallbackReason,
     toolsExcluded: [],
     timeoutSeconds,
     outputContract: "Return a concise answer with evidence, uncertainty, and any parent follow-up needed."
@@ -1438,13 +1447,14 @@ function buildSubagentPlan(deps, task, name, priority, timeoutSeconds) {
   };
   return { plan, tools: filteredTools, apiKey, model };
 }
-function createAgentInstance(deps, systemPrompt, tools, model, apiKey) {
+function createAgentInstance(deps, systemPrompt, tools, model, apiKey, thinkingLevel) {
   if (deps.createAgent) {
     return deps.createAgent({
       systemPrompt,
       model,
       tools,
-      apiKey
+      apiKey,
+      thinkingLevel
     });
   }
   return new Agent({
@@ -1452,7 +1462,7 @@ function createAgentInstance(deps, systemPrompt, tools, model, apiKey) {
       systemPrompt,
       model,
       tools,
-      thinkingLevel: "off"
+      thinkingLevel
     },
     apiKey
   });
@@ -1501,7 +1511,7 @@ async function runSubagentWithProgress(deps, task, reportProgress, signal) {
   deps.debugLog?.("run", "runSubagentWithProgress START", { taskName: task.name, yoloMode: deps.yoloMode });
   try {
     reportProgress({ message: `[${task.name}] Starting...`, increment: 5 });
-    const { plan, tools, apiKey, model } = buildSubagentPlan(deps, task.task, task.name, task.priority, task.timeoutSeconds);
+    const { plan, tools, apiKey, model } = buildSubagentPlan(deps, task.task, task.name, task.priority, task.timeoutSeconds, task.modelOverride, task.thinkingLevel);
     task.plan = plan;
     task.needsParentWrite = needsParentWrite(task.task);
     for (const excluded of plan.toolsExcluded) {
@@ -1521,7 +1531,7 @@ async function runSubagentWithProgress(deps, task, reportProgress, signal) {
     if (signal?.aborted) {
       throw new Error("Subagent aborted by parent");
     }
-    deps.log(`[Subagent ${task.name}] Plan: ${plan.complexity}/${plan.modelClass}, ${tools.length} tools`);
+    deps.log(`[Subagent ${task.name}] Plan: ${plan.complexity}/${plan.modelClass}${plan.modelOverride ? `, model=${plan.modelOverrideApplied ? plan.modelOverride : "override failed"}` : ""}, ${tools.length} tools`);
     deps.debugLog?.("plan", "SubagentPlan", plan);
     const systemPrompt = `You are a specialized subagent focused on one bounded task.
 
@@ -1538,7 +1548,7 @@ Output:
 - Parent follow-up needed, if any
 
 ${formatSkillsForPrompt(deps.skills ?? [])}`;
-    const subagent = createAgentInstance(deps, systemPrompt, tools, model, apiKey);
+    const subagent = createAgentInstance(deps, systemPrompt, tools, model, apiKey, plan.thinkingLevel);
     let assistantTurns = 0;
     let toolCalls = 0;
     let rejectTimeout = () => void 0;
@@ -1660,6 +1670,12 @@ function buildParallelResult(tasks, totalDuration) {
     resultText += `**${task.name}** (${statusLabel}`;
     if (task.plan) {
       resultText += `, ${task.plan.complexity}/${task.plan.modelClass}`;
+      if (task.plan.thinkingLevel !== DEFAULT_SUBAGENT_THINKING_LEVEL) {
+        resultText += `, thinking=${task.plan.thinkingLevel}`;
+      }
+      if (task.plan.modelOverride) {
+        resultText += task.plan.modelOverrideApplied ? `, model=${task.plan.modelOverride}` : `, model=${task.plan.modelOverride} (unresolved, fell back)`;
+      }
     }
     if (task.details) {
       resultText += `, ${task.details.durationMs}ms, ${task.details.toolCalls} tools`;
@@ -1699,7 +1715,7 @@ function normalizeTaskDefs(args) {
     return { error: "Invalid spawn_subagents_parallel arguments: tasks must be a non-empty array." };
   }
   const normalized = [];
-  const allowedFields = [...TASK_FIELD_ALIASES, "name", "priority", "timeout"];
+  const allowedFields = [...TASK_FIELD_ALIASES, "name", "priority", "timeout", "model", "thinkingLevel"];
   for (const [index, def] of taskDefs.entries()) {
     if (!def || typeof def !== "object") {
       return { error: `Invalid task #${index + 1}: expected an object with the objective in "task" (aliases "description"/"prompt"/"objective" accepted).` };
@@ -1722,11 +1738,20 @@ function normalizeTaskDefs(args) {
       return { error: `Invalid task #${index + 1}: timeout must be a positive number of seconds.` };
     }
     const priority = def.priority === "thorough" ? "thorough" : "fast";
+    const modelOverride = typeof def.model === "string" ? def.model.trim() : void 0;
+    if (def.model !== void 0 && !modelOverride) {
+      return { error: `Invalid task #${index + 1}: "model" must be a non-empty model reference such as "provider/model-id".` };
+    }
+    if (def.thinkingLevel !== void 0 && (typeof def.thinkingLevel !== "string" || !SUBAGENT_THINKING_LEVELS.includes(def.thinkingLevel))) {
+      return { error: `Invalid task #${index + 1}: "thinkingLevel" must be one of ${SUBAGENT_THINKING_LEVELS.map((level) => `"${level}"`).join(", ")}.` };
+    }
     normalized.push({
       name: typeof def.name === "string" && def.name.trim() ? def.name.trim() : void 0,
       task,
       priority,
-      timeoutSeconds
+      timeoutSeconds,
+      modelOverride,
+      thinkingLevel: def.thinkingLevel
     });
   }
   return normalized;
@@ -1770,7 +1795,11 @@ function createSubagentCapability(deps) {
 Use this for independent investigation, search, review, or triage work. Provide each task as a plain objective. Pie chooses the model class automatically. Use timeout only for unusually long tasks.
 
 Arguments shape (each tasks[] item puts the objective in "task" \u2014 "description"/"prompt"/"objective" are accepted as aliases):
-{ "tasks": [{ "task": "<objective text>", "name": "<optional short label>", "priority": "fast" | "thorough", "timeout": 600 }] }`,
+{ "tasks": [{ "task": "<objective text>", "name": "<optional short label>", "priority": "fast" | "thorough", "model": "<optional explicit model override>", "thinkingLevel": "<optional off|minimal|low|medium|high|xhigh, default medium>", "timeout": 600 }] }
+
+"model" overrides the automatic model-class selection for that task when the user explicitly asks for a specific model (e.g. "anthropic/claude-..."). Prefer "provider/model-id"; a bare model id works only when it is unambiguous across providers. When the override cannot be resolved, the task falls back to automatic selection and reports why.
+
+"thinkingLevel" defaults to "medium"; set it only when the user asks (e.g. "xhigh" for deep review) or for cheap lookup tasks ("off"). Non-reasoning models ignore it.`,
     parameters: Type.Object({
       tasks: Type.Array(
         Type.Object(
@@ -1781,9 +1810,11 @@ Arguments shape (each tasks[] item puts the objective in "task" \u2014 "descript
             objective: Type.Optional(Type.String({ description: "Alias for task." })),
             name: Type.Optional(Type.String({ description: "Short name for this subagent, shown in progress updates." })),
             priority: Type.Optional(Type.Union([Type.Literal("fast"), Type.Literal("thorough")], { description: "fast uses lower-cost defaults; thorough raises model class when needed." })),
+            model: Type.Optional(Type.String({ description: 'Explicit model override for this task, e.g. "provider/model-id". Only set when the user explicitly requests a specific model; otherwise Pie picks the model class automatically.' })),
+            thinkingLevel: Type.Optional(Type.Union([Type.Literal("off"), Type.Literal("minimal"), Type.Literal("low"), Type.Literal("medium"), Type.Literal("high"), Type.Literal("xhigh")], { description: `Reasoning level for this task. Default: "medium". Only override when the user asks (e.g. "xhigh" for deep review tasks, "off" for cheap lookups). Ignored by non-reasoning models.` })),
             timeout: Type.Optional(Type.Number({ description: "Timeout in seconds. Default: 1200s (20 minutes). For longer tasks, explicitly set a higher value, e.g. 3600." }))
           },
-          { additionalProperties: false, description: "Objective goes in 'task' (or an accepted alias); plus optional name/priority/timeout." }
+          { additionalProperties: false, description: "Objective goes in 'task' (or an accepted alias); plus optional name/priority/model/thinkingLevel/timeout." }
         ),
         { description: "Array of tasks to run in parallel; at least one of task/description/prompt/objective must be a non-empty string per item.", minItems: 1, maxItems: 10 }
       )
@@ -1816,6 +1847,8 @@ Arguments shape (each tasks[] item puts the objective in "task" \u2014 "descript
         task: def.task,
         priority: def.priority,
         timeoutSeconds: def.timeoutSeconds,
+        modelOverride: def.modelOverride,
+        thinkingLevel: def.thinkingLevel,
         evidence: [],
         confidenceSignals: [],
         uncertainty: "medium",
@@ -1866,6 +1899,8 @@ Arguments shape (each tasks[] item puts the objective in "task" \u2014 "descript
             task: task.task,
             timeoutSeconds: task.timeoutSeconds,
             plan: task.plan,
+            modelOverride: task.modelOverride,
+            thinkingLevel: task.plan?.thinkingLevel,
             evidence: task.evidence,
             confidenceSignals: task.confidenceSignals,
             runtimeEvidence: task.runtimeEvidence,
@@ -2932,6 +2967,9 @@ var FileSessionStore = class {
     throw new Error(`Session directory is a symbolic link; ${operation} refused: ${dir}`);
   }
   headStatus(sessionId) {
+    if (sessionDirIsSymlink(this.pathsFor(sessionId).dir)) {
+      return "missing";
+    }
     const head = this.tryReadHeadFile(sessionId);
     if (head === "corrupt") {
       return "corrupt";
@@ -2987,6 +3025,9 @@ var FileSessionStore = class {
    * never reinitialize a damaged session to sequence 0.
    */
   tryReadHeadFile(sessionId) {
+    if (sessionDirIsSymlink(this.pathsFor(sessionId).dir)) {
+      return null;
+    }
     const headPath = this.pathsFor(sessionId).headPath;
     const durable = readDurableFileSync(this.gateway, headPath, (content) => this.parseHeadContent(content));
     if (durable !== null) {
@@ -8579,6 +8620,7 @@ function createFileObservationState(options = {}) {
   const files = /* @__PURE__ */ new Map();
   const maxFiles = Math.max(1, Math.floor(options.maxFiles ?? 100));
   const maxRangesPerFile = Math.max(0, Math.floor(options.maxRangesPerFile ?? 8));
+  let generation = 0;
   function touchFile(absolutePath, observed) {
     files.delete(absolutePath);
     files.set(absolutePath, observed);
@@ -8695,8 +8737,12 @@ function createFileObservationState(options = {}) {
     invalidate(absolutePath) {
       files.delete(absolutePath);
     },
+    getGeneration() {
+      return generation;
+    },
     clear() {
       files.clear();
+      generation++;
     }
   };
 }
@@ -8716,6 +8762,7 @@ function createReadErrorResult(message, details) {
 function createReadTool(cwd, options) {
   const fs2 = getFileSystem();
   const fileObservationState = options?.fileObservationState ?? createFileObservationState();
+  const callerObservations = /* @__PURE__ */ new WeakMap();
   const rootSchema = buildRootParameterSchema(cwd, options);
   const readSchema = Type.Object({
     path: Type.String({ description: "Path to the file to read. Example: 'Scripts/PlayerController.cs' or 'Assets/Gen/config.json'." }),
@@ -8950,7 +8997,18 @@ function createReadTool(cwd, options) {
               const readStartsAtBeginning = offset === void 0 || offset === 1;
               const readReachedEndOfFile = startLine + range2.selectedLines >= range2.totalLines;
               const isCompleteTextKnown = readStartsAtBeginning && readReachedEndOfFile && !truncation.truncated && !truncation.firstLineExceedsLimit;
-              if (fileObservationState.isUnchangedReadRange(absolutePath, rangeKey, snapshot, range2.selectedContentHash)) {
+              let callerObservation = fileObservationState;
+              if (signal) {
+                const generation = fileObservationState.getGeneration();
+                const existing = callerObservations.get(signal);
+                if (existing?.generation === generation) {
+                  callerObservation = existing.state;
+                } else {
+                  callerObservation = createFileObservationState();
+                  callerObservations.set(signal, { generation, state: callerObservation });
+                }
+              }
+              if (fileObservationState.isUnchangedReadRange(absolutePath, rangeKey, snapshot, range2.selectedContentHash) && callerObservation.isUnchangedReadRange(absolutePath, rangeKey, snapshot, range2.selectedContentHash)) {
                 if (signal) {
                   signal.removeEventListener("abort", onAbort);
                 }
@@ -9017,6 +9075,9 @@ Base directory: ${nodePath.dirname(absolutePath)}
                   totalLines: range2.totalLines
                 }
               );
+              if (callerObservation !== fileObservationState) {
+                callerObservation.recordTextRead(absolutePath, rangeKey, snapshot, range2.selectedContentHash, isCompleteTextKnown);
+              }
               outputText = sourceHeader + outputText;
               const textContent = [{ type: "text", text: outputText }];
               if (aborted) return;

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   createCliWebResearchHealthStore,
   formatSize,
   truncateHeadTail
-} from "./chunks/chunk-XVUV3IM2.js";
+} from "./chunks/chunk-N2MK46AE.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -60,7 +60,7 @@ import {
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-FKUEIYFQ.js";
+} from "./chunks/chunk-REP6QANY.js";
 import "./chunks/chunk-ZKHMNEXL.js";
 import {
   Deref,
@@ -53356,6 +53356,46 @@ var ModelRegistry = class {
     }
     return { model, apiKey };
   }
+  /** Resolve an explicit model reference for user-requested overrides.
+   *  Accepts "provider/model-id" (exact lookup) or a bare model id (only
+   *  when it matches exactly one configured model). Never guesses across
+   *  providers; ambiguity and missing keys are reported as fallback reasons. */
+  resolveModelRef(ref) {
+    const trimmed = ref.trim();
+    if (!trimmed) {
+      return { fallbackReason: "empty model reference" };
+    }
+    const separator = trimmed.indexOf("/");
+    if (separator >= 0) {
+      if (separator === 0 || separator === trimmed.length - 1) {
+        return { fallbackReason: `invalid model reference "${trimmed}"; expected provider/model-id` };
+      }
+      const provider = trimmed.slice(0, separator);
+      const modelId = trimmed.slice(separator + 1);
+      const model2 = this.find(provider, modelId);
+      if (!model2) {
+        return { fallbackReason: `model "${trimmed}" is not configured` };
+      }
+      const apiKey2 = this.getApiKey(model2);
+      if (!apiKey2) {
+        return { model: model2, fallbackReason: `no API key available for model "${trimmed}"` };
+      }
+      return { model: model2, apiKey: apiKey2 };
+    }
+    const matches = this.getAll().filter((model2) => model2.id === trimmed);
+    if (matches.length === 0) {
+      return { fallbackReason: `model "${trimmed}" is not configured; use provider/model-id` };
+    }
+    if (matches.length > 1) {
+      return { fallbackReason: `model "${trimmed}" is ambiguous across providers (${matches.map((model2) => `${model2.provider}/${model2.id}`).join(", ")}); use provider/model-id` };
+    }
+    const model = matches[0];
+    const apiKey = this.getApiKey(model);
+    if (!apiKey) {
+      return { model, fallbackReason: `no API key available for model "${model.provider}/${model.id}"` };
+    }
+    return { model, apiKey };
+  }
   hasExternalProviderConfig() {
     return this.usingExternalProviders;
   }
@@ -55169,11 +55209,44 @@ function canonicalSessionDir(sessionsDir, sessionId) {
 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"]);
+function fsyncDirectory(dirPath) {
+  try {
+    const fd = fs7.openSync(dirPath, "r");
+    try {
+      fs7.fsyncSync(fd);
+    } finally {
+      fs7.closeSync(fd);
+    }
+  } catch (error) {
+    const code = error?.code;
+    if (code !== void 0 && FSYNC_UNSUPPORTED_CODES.has(code)) return;
+    throw error;
+  }
+}
 function writePublishJournal(journalPath, record) {
-  fs7.mkdirSync(path7.dirname(journalPath), { recursive: true });
+  const journalDir = path7.dirname(journalPath);
+  fs7.mkdirSync(journalDir, { recursive: true });
   const tempPath = `${journalPath}.tmp`;
   fs7.writeFileSync(tempPath, JSON.stringify(record, void 0, "	"));
+  const tempFd = fs7.openSync(tempPath, "r+");
+  try {
+    fs7.fsyncSync(tempFd);
+  } finally {
+    fs7.closeSync(tempFd);
+  }
   fs7.renameSync(tempPath, journalPath);
+  fsyncDirectory(journalDir);
+  fsyncDirectory(path7.dirname(journalDir));
+}
+function markPublishJournalFailed(journalPath) {
+  if (!journalPath) return;
+  try {
+    const record = JSON.parse(fs7.readFileSync(journalPath, "utf8"));
+    if (record?.v !== 1 || typeof record.failedAt === "number") return;
+    writePublishJournal(journalPath, { ...record, failedAt: Date.now() });
+  } catch {
+  }
 }
 function clearPublishJournal(journalPath) {
   if (!journalPath) return;
@@ -55226,6 +55299,7 @@ async function rewindStoredSession(params) {
 }
 async function forkStoredSession(params) {
   let stagingId;
+  let preserveStagingForRecovery = false;
   try {
     const sanitizedTargetId = params.targetSessionId.replace(/[^a-zA-Z0-9_-]/g, "_");
     if (sanitizedTargetId.startsWith(STAGING_SESSION_ID_PREFIX)) {
@@ -55356,6 +55430,7 @@ 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;
@@ -55363,6 +55438,7 @@ async function forkStoredSession(params) {
     }
     try {
       params.store.moveSession(stagingId, params.targetSessionId);
+      if (params.sessionsDir) fsyncDirectory(params.sessionsDir);
     } catch (error) {
       if (hadPreviousTarget) {
         try {
@@ -55370,8 +55446,11 @@ async function forkStoredSession(params) {
             throw new Error("target path is occupied");
           }
           params.store.moveSession(backupId, params.targetSessionId);
+          if (params.sessionsDir) fsyncDirectory(params.sessionsDir);
           clearPublishJournal(journalPath);
         } catch (restoreError) {
+          markPublishJournalFailed(journalPath);
+          preserveStagingForRecovery = true;
           throw new SessionControlError(
             "session_io_error",
             `Fork publication failed; previous session is preserved as ${backupId}. Restore failed: ${String(restoreError)}`,
@@ -55406,7 +55485,7 @@ async function forkStoredSession(params) {
   } catch (error) {
     throw toIoError(error);
   } finally {
-    if (stagingId) {
+    if (stagingId && !preserveStagingForRecovery) {
       try {
         params.store.delete(stagingId);
       } catch {
@@ -55479,7 +55558,7 @@ function recoverOnePublishJournal(params) {
   try {
     const parsed = JSON.parse(fs7.readFileSync(params.journalPath, "utf8"));
     const safeId = /^[a-zA-Z0-9_-]+$/;
-    if (parsed?.v !== 1 || !safeId.test(parsed.targetId ?? "") || !safeId.test(parsed.stagingId ?? "") || !((parsed.backupDir ?? null) === null || safeId.test(parsed.backupDir))) {
+    if (parsed?.v !== 1 || !safeId.test(parsed.targetId ?? "") || !safeId.test(parsed.stagingId ?? "") || !((parsed.backupDir ?? null) === null || safeId.test(parsed.backupDir)) || !((parsed.failedAt ?? void 0) === void 0 || typeof parsed.failedAt === "number")) {
       throw new Error("journal record has unexpected shape");
     }
     record = parsed;
@@ -55505,7 +55584,7 @@ function recoverOnePublishJournal(params) {
   const backupExists = record.backupDir ? dirExists(record.backupDir) : false;
   const stagingExists = dirExists(record.stagingId);
   try {
-    if (targetExists && !stagingExists) {
+    if (targetExists && !stagingExists && record.failedAt === void 0) {
       if (backupExists && record.backupDir) removeSessionDir(record.backupDir);
       removeJournal();
       return { action: "publish-completed", targetId: record.targetId };
@@ -55515,22 +55594,32 @@ function recoverOnePublishJournal(params) {
         path7.join(params.sessionsDir, record.backupDir),
         path7.join(params.sessionsDir, record.targetId)
       );
-      removeJournal();
+      fsyncDirectory(params.sessionsDir);
       if (stagingExists) {
         try {
           removeSessionDir(record.stagingId);
         } catch (error) {
           warn(`[session-control] Restored ${record.targetId} but could not remove its abandoned staging copy ${record.stagingId}: ${String(error)}`);
+          return { action: "ambiguous-preserved", targetId: record.targetId, message: `Staging cleanup failed after restore; journal preserved: ${String(error)}` };
         }
       }
+      removeJournal();
       return { action: "restored-previous-target", targetId: record.targetId };
     }
     if (!targetExists && !backupExists) {
-      if (stagingExists) removeSessionDir(record.stagingId);
+      if (stagingExists) {
+        try {
+          removeSessionDir(record.stagingId);
+        } catch (error) {
+          warn(`[session-control] Could not remove abandoned staging copy ${record.stagingId}: ${String(error)}`);
+          return { action: "ambiguous-preserved", targetId: record.targetId, message: `Staging cleanup failed; journal preserved: ${String(error)}` };
+        }
+      }
       removeJournal();
       return stagingExists ? { action: "discarded-incomplete-fork", targetId: record.targetId } : { action: "nothing-to-recover", targetId: record.targetId };
     }
-    const message = `[session-control] Ambiguous interrupted publish for target ${record.targetId} (target=${targetExists}, backup=${backupExists}, staging=${stagingExists}); nothing was deleted \u2014 inspect ${params.sessionsDir} and ${journalName} manually`;
+    const reason = record.failedAt !== void 0 ? "the publish failed in-process (restore failed) and the backup was preserved" : `target=${targetExists}, backup=${backupExists}, staging=${stagingExists}`;
+    const message = `[session-control] Ambiguous interrupted publish for target ${record.targetId} (${reason}); nothing was deleted \u2014 inspect ${params.sessionsDir} and ${journalName} manually`;
     warn(message);
     return { action: "ambiguous-preserved", targetId: record.targetId, message };
   } catch (error) {
@@ -56206,6 +56295,9 @@ function createExtensionContext(extension, cwd, uiContext, abortFn, isIdleFn, ha
     resolveModelClass(modelClass) {
       return actions?.resolveModelClass?.(modelClass) ?? {};
     },
+    resolveModelRef(modelRef) {
+      return actions?.resolveModelRef?.(modelRef) ?? {};
+    },
     getMessages() {
       return actions?.getMessages?.() ?? [];
     },
@@ -63885,6 +63977,7 @@ var ExtensionRunner = class {
       getAllTools: () => runner.actions.getAllTools(),
       getRuntimeTools: () => runner.actions.getRuntimeTools(),
       resolveModelClass: (modelClass) => runner.actions.resolveModelClass?.(modelClass) ?? {},
+      resolveModelRef: (modelRef) => runner.actions.resolveModelRef?.(modelRef) ?? {},
       getMessages: () => runner.actions.getMessages(),
       getSessionMetadata: () => runner.actions.getSessionMetadata(),
       setSessionMetadata: (key, value) => runner.actions.setSessionMetadata(key, value),
@@ -74159,6 +74252,7 @@ function createExtensionContextForCommands(host) {
     },
     getRuntimeTools: () => host.agent.state.tools,
     resolveModelClass: (modelClass) => host.options.modelRegistry.resolveModelClass(modelClass),
+    resolveModelRef: (modelRef) => host.options.modelRegistry.resolveModelRef(modelRef),
     getMessages: () => host.agent.state.messages,
     getSessionMetadata: () => ({ ...host.sessionManager.getActiveSession()?.metadata ?? {} }),
     setSessionMetadata: (key, value) => {
@@ -79434,6 +79528,7 @@ async function loadInteractiveExtensions(host) {
         fallbackReason: resolved.fallbackReason
       };
     },
+    resolveModelRef: (modelRef) => host.options.modelRegistry.resolveModelRef(modelRef),
     getMessages: () => host.agent.state.messages,
     getSessionMetadata: () => ({ ...host.sessionManager.getActiveSession()?.metadata ?? {} }),
     setSessionMetadata: (key, value) => {
@@ -80657,6 +80752,7 @@ async function loadPrintModeExtensions(params) {
     })),
     getRuntimeTools: () => params.getAgent()?.state.tools ?? [],
     resolveModelClass: (modelClass) => params.modelRegistry.resolveModelClass(modelClass),
+    resolveModelRef: (modelRef) => params.modelRegistry.resolveModelRef(modelRef),
     getMessages: () => params.getAgent()?.state.messages ?? [],
     getSessionMetadata: () => ({ ...params.sessionManager.getActiveSession()?.metadata ?? {} }),
     setSessionMetadata: (key, value) => {
@@ -81145,6 +81241,7 @@ async function loadJsonModeExtensions(params) {
     })),
     getRuntimeTools: () => params.getAgent()?.state.tools ?? [],
     resolveModelClass: (modelClass) => params.runtime.modelRegistry.resolveModelClass(modelClass),
+    resolveModelRef: (modelRef) => params.runtime.modelRegistry.resolveModelRef(modelRef),
     getMessages: () => params.getAgent()?.state.messages ?? [],
     getSessionMetadata: () => ({ ...params.runtime.sessionManager.getActiveSession()?.metadata ?? {} }),
     setSessionMetadata: (key, value) => {

package/package.json

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