@cydm/pie 2.7.11 → 2.7.12

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-XIRBNP2S.js";
-import "../../../chunks/chunk-XVF6V6Q5.js";
-import "../../../chunks/chunk-3VEIP2VY.js";
+} from "../../../chunks/chunk-AFPRX5XI.js";
+import "../../../chunks/chunk-2NBUFVUQ.js";
+import "../../../chunks/chunk-EN47TIBG.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

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

@@ -6,9 +6,9 @@ import {
   extractPlanTodoItems,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-XIRBNP2S.js";
-import "../../../chunks/chunk-XVF6V6Q5.js";
-import "../../../chunks/chunk-3VEIP2VY.js";
+} from "../../../chunks/chunk-AFPRX5XI.js";
+import "../../../chunks/chunk-2NBUFVUQ.js";
+import "../../../chunks/chunk-EN47TIBG.js";
 import {
   Type
 } from "../../../chunks/chunk-XXGYUYXI.js";
@@ -121,6 +121,30 @@ function planModeExtension(ctx) {
     return items.map((item, index) => `${index + 1}. ${item.text}${item.detail ? `
    ${item.detail}` : ""}`).join("\n");
   }
+  async function planSelect(prompt, options, leftShortcut) {
+    const response = await ctx.interactions.request({
+      type: "select_one",
+      id: `plan-mode:${Date.now()}`,
+      prompt,
+      options,
+      // No timeoutMs: plan approval must wait for the user indefinitely,
+      // matching the pre-protocol ctx.ui.select behavior.
+      ...leftShortcut ? { leftShortcut } : {}
+    });
+    return response.type === "select_one" ? response.selection : void 0;
+  }
+  function planNotify(message, level = "info") {
+    void ctx.interactions.request({ type: "notify", message, level, markdown: true }).catch(() => void 0);
+  }
+  async function planRefine(items) {
+    const response = await ctx.interactions.request({
+      type: "multiline_input",
+      id: `plan-mode:refine:${Date.now()}`,
+      prompt: "Refine the plan (edit the plan or add feedback):",
+      prefill: formatPlanText(items)
+    });
+    return response.type === "multiline_input" ? response.value : void 0;
+  }
   function renderPlanMarkdown(goal, items) {
     const heading = goal ? `## \u{1F4CB} ${goal} \u2014 ${items.length} steps` : `## \u{1F4CB} Plan \u2014 ${items.length} steps`;
     const steps = items.map((item, index) => {
@@ -208,15 +232,15 @@ Execute the steps in order, starting with step 1. After completing a step, inclu
       lastOfferedPlanKey = JSON.stringify(items);
       const rendered = items.map((item) => `${item.step}. \u2610 ${item.text}${item.detail ? `
    ${item.detail}` : ""}`).join("\n");
-      if (!ctx.hasUI) {
+      if (!ctx.interactions.isAvailable()) {
         return reply(`Plan submitted (${items.length} steps) in headless mode; interactive approval is unavailable, so nothing will be executed:
 
 ${rendered}`);
       }
       const goal = typeof args.goal === "string" && args.goal.trim() ? args.goal.trim() : void 0;
-      ctx.ui.notify(renderPlanMarkdown(goal, items), "info", { markdown: true });
+      planNotify(renderPlanMarkdown(goal, items));
       const yoloOption = typeof ctx.setYoloMode === "function" && !ctx.yoloMode ? ["Execute in YOLO mode (auto-approve everything)"] : [];
-      const choice = await ctx.ui.select(`\u{1F4CB} Plan (${items.length} steps) \u2014 what next?`, [
+      const choice = await planSelect(`\u{1F4CB} Plan (${items.length} steps) \u2014 what next?`, [
         "Execute the plan (track progress)",
         ...yoloOption,
         "Stay in plan mode",
@@ -230,7 +254,7 @@ ${rendered}`);
         return reply(startPlanExecution(items));
       }
       if (choice === "Refine the plan") {
-        const refinement = await ctx.ui.editor("Refine the plan (edit the plan or add feedback):", formatPlanText(items));
+        const refinement = await planRefine(items);
         if (refinement?.trim()) {
           return reply(`The user refined the plan:
 
@@ -298,7 +322,8 @@ ${completedList}`, "info", { markdown: true });
       }
       return;
     }
-    if (!planModeEnabled || !ctx.hasUI) return;
+    if (!planModeEnabled) return;
+    if (!ctx.interactions.isAvailable()) return;
     if (approvalOfferedThisTurn) return;
     const messages = event.messages || [];
     const lastAssistant = [...messages].reverse().find(
@@ -316,10 +341,10 @@ ${completedList}`, "info", { markdown: true });
     approvalOfferedThisTurn = true;
     const todoListText = extracted.map((item, index) => `${index + 1}. \u2610 ${item.text}${item.detail ? `
    - \u21B3 ${item.detail}` : ""}`).join("\n");
-    ctx.ui.notify(`## \u{1F4CB} Plan \u2014 ${extracted.length} steps
+    planNotify(`## \u{1F4CB} Plan \u2014 ${extracted.length} steps
 
-${todoListText}`, "info", { markdown: true });
-    const choice = await ctx.ui.select(`\u{1F4CB} Plan (${extracted.length} steps) \u2014 what next?`, [
+${todoListText}`);
+    const choice = await planSelect(`\u{1F4CB} Plan (${extracted.length} steps) \u2014 what next?`, [
       "Execute the plan (track progress)",
       "Stay in plan mode",
       "Refine the plan"
@@ -329,7 +354,7 @@ ${todoListText}`, "info", { markdown: true });
       return;
     }
     if (choice === "Refine the plan") {
-      const refinement = await ctx.ui.editor("Refine the plan (edit the plan or add feedback):", formatPlanText(extracted));
+      const refinement = await planRefine(extracted);
       if (refinement?.trim()) {
         ctx.sendUserMessage(refinement.trim());
       }

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

@@ -1,18 +1,20 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
+  classifyCliFailure,
   createCliHostCapabilities,
+  createCliRetryPolicy,
   formatTransportLifecycle,
   getConfigDir,
   logTransportLifecycle
-} from "../../../chunks/chunk-3NFKVBGY.js";
+} from "../../../chunks/chunk-YI3CSQGD.js";
 import {
   SUBAGENT_SESSION_RECORD_VERSION,
   createPolicyEnforcedTools,
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-XIRBNP2S.js";
-import "../../../chunks/chunk-XVF6V6Q5.js";
-import "../../../chunks/chunk-3VEIP2VY.js";
+} from "../../../chunks/chunk-AFPRX5XI.js";
+import "../../../chunks/chunk-2NBUFVUQ.js";
+import "../../../chunks/chunk-EN47TIBG.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 
@@ -398,6 +400,10 @@ function subagentExtension(ctx) {
     },
     skills,
     yoloMode: ctx.yoloMode,
+    recovery: {
+      policy: createCliRetryPolicy(),
+      classifyFailure: (context) => classifyCliFailure(context)
+    },
     getParentTools: () => ctx.getAllTools(),
     log: (message) => ctx.log(message),
     notify: ctx.hasUI ? (message, type) => ctx.ui.notify(message, type === "success" ? "info" : type) : void 0,

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

@@ -8,9 +8,9 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-XIRBNP2S.js";
-import "../../../chunks/chunk-XVF6V6Q5.js";
-import "../../../chunks/chunk-3VEIP2VY.js";
+} from "../../../chunks/chunk-AFPRX5XI.js";
+import "../../../chunks/chunk-2NBUFVUQ.js";
+import "../../../chunks/chunk-EN47TIBG.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/chunks/{chunk-XVF6V6Q5.js → chunk-2NBUFVUQ.js}

@@ -4,7 +4,7 @@ import {
   disposeModelTransports,
   streamSimple,
   validateToolArguments
-} from "./chunk-3VEIP2VY.js";
+} from "./chunk-EN47TIBG.js";
 
 // ../../packages/agent-core/src/agent-loop.ts
 function createLoopErrorMessage(error, config, signal) {
@@ -182,6 +182,11 @@ async function runLoop(currentContext, newMessages, config, signal, stream, stre
         }
       }
       stream.push({ type: "turn_end", message, toolResults });
+      if (hasMoreToolCalls && config.beforeToolContinuation) {
+        const replacement = await config.beforeToolContinuation(signal);
+        if (signal?.aborted) throw new Error("Request was aborted");
+        if (replacement) currentContext.messages = replacement.slice();
+      }
       if (steeringAfterTools && steeringAfterTools.length > 0) {
         pendingMessages = steeringAfterTools;
         steeringAfterTools = null;
@@ -444,7 +449,22 @@ function isUserContentBlock(value) {
     return false;
   }
   const type = value.type;
-  return type === "text" || type === "image" || type === "audio" || type === "video" || type === "fileRef";
+  return type === "text" || type === "image" || type === "audio" || type === "video" || type === "fileRef" || type === "hostContext";
+}
+async function awaitToolContinuation(handler, signal) {
+  let onAbort;
+  const cancelled = new Promise((_resolve, reject) => {
+    onAbort = () => reject(new Error("Request was aborted"));
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+  try {
+    await Promise.race([Promise.resolve().then(() => {
+      if (signal.aborted) throw new Error("Request was aborted");
+      return handler(signal);
+    }), cancelled]);
+  } finally {
+    signal.removeEventListener("abort", onAbort);
+  }
 }
 var Agent = class {
   _state;
@@ -467,6 +487,7 @@ var Agent = class {
   _thinkingBudgets;
   _maxRetryDelayMs;
   hooks;
+  beforeToolContinuation;
   /** Stable identity for this agent instance, bound onto every run signal
    *  handed to tools (signals themselves are per-run; see tool-caller-identity.ts). */
   toolCallerIdentity = createToolCallerIdentity();
@@ -559,6 +580,15 @@ var Agent = class {
   setHooks(hooks) {
     this.hooks = hooks;
   }
+  /** Single session-policy owner. Runs after the complete tool turn has been
+   * published to observers; replaceMessages here also updates the active loop.
+   * Removal does not detach a callback already captured by an active run. */
+  setBeforeToolContinuation(handler) {
+    this.beforeToolContinuation = handler;
+    return () => {
+      if (this.beforeToolContinuation === handler) this.beforeToolContinuation = void 0;
+    };
+  }
   replaceMessages(ms) {
     this.releaseTransport();
     this._state.messages = ms.slice();
@@ -648,6 +678,7 @@ var Agent = class {
     this._state.error = void 0;
     this.steeringQueue = [];
     this.followUpQueue = [];
+    this.resolveRunningPrompt?.();
     this.runningPrompt = void 0;
     this.resolveRunningPrompt = void 0;
     this.updateStatusSnapshot({
@@ -670,6 +701,7 @@ var Agent = class {
     this._state.error = void 0;
     this.steeringQueue = [];
     this.followUpQueue = [];
+    this.resolveRunningPrompt?.();
     this.runningPrompt = void 0;
     this.resolveRunningPrompt = void 0;
     this.abortController = void 0;
@@ -784,6 +816,8 @@ var Agent = class {
       tools: this._state.tools
     };
     let skipInitialSteeringPoll = options?.skipInitialSteeringPoll === true;
+    const beforeToolContinuation = this.beforeToolContinuation;
+    let acknowledgeToolTurn;
     const config = {
       model,
       reasoning,
@@ -794,6 +828,16 @@ var Agent = class {
       maxRetryDelayMs: this._maxRetryDelayMs,
       convertToLlm: this.convertToLlm,
       transformContext: this.transformContext,
+      beforeToolContinuation: beforeToolContinuation ? async () => {
+        await new Promise((resolve) => {
+          acknowledgeToolTurn = resolve;
+        });
+        acknowledgeToolTurn = void 0;
+        if (!ownsRun() || runController.signal.aborted) throw new Error("Request was aborted");
+        await awaitToolContinuation(beforeToolContinuation, runController.signal);
+        if (!ownsRun() || runController.signal.aborted) throw new Error("Request was aborted");
+        return this._state.messages.slice();
+      } : void 0,
       getApiKey: this.getApiKey,
       hooks: this.hooks,
       getSteeringMessages: async () => {
@@ -855,6 +899,7 @@ var Agent = class {
             break;
         }
         this.emit(event, ownsRun);
+        if (event.type === "turn_end") acknowledgeToolTurn?.();
       }
       if (ownsRun() && partial && partial.role === "assistant" && partial.content?.length > 0) {
         const onlyEmpty = !partial.content.some(
@@ -889,6 +934,7 @@ var Agent = class {
       this._state.error = err?.message || String(err);
       this.emit({ type: "agent_end", messages: [errorMsg] }, ownsRun);
     } finally {
+      acknowledgeToolTurn?.();
       if (ownsRun()) {
         this._state.isStreaming = false;
         this._state.streamMessage = null;