@cydm/pie 1.0.33 → 1.0.35

package/dist/cli.js

@@ -43962,7 +43962,7 @@ import * as path29 from "path";
 
 // src/cli-args.ts
 var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set(["--session-id", "--extension-path"]);
-var BOOLEAN_FLAGS = /* @__PURE__ */ new Set(["--raw-output", "--json-output", "--json-events"]);
+var BOOLEAN_FLAGS = /* @__PURE__ */ new Set(["--raw-output", "--json-output", "--json-events", "--resume-required"]);
 var HELP_FLAGS = /* @__PURE__ */ new Set(["help", "--help", "-h"]);
 var COMMANDS = /* @__PURE__ */ new Set(["chat", "help"]);
 function parseCliInvocation(args) {
@@ -44014,6 +44014,16 @@ function parseCliInvocation(args) {
     initialPrompt: positionals.join(" ").trim() || void 0
   };
 }
+function parseRepeatedFlag(args, flag) {
+  const values = [];
+  for (let i = 0; i < args.length; i += 1) {
+    if (args[i] === flag && args[i + 1]) {
+      values.push(args[i + 1]);
+      i += 1;
+    }
+  }
+  return values;
+}
 
 // src/debug/file-logger.ts
 import * as fs from "fs";
@@ -54844,7 +54854,8 @@ var DEFAULT_APP_KEYBINDINGS = {
   toggleThinking: "ctrl+t",
   toggleSessionNamedFilter: "ctrl+n",
   externalEditor: "ctrl+g",
-  followUp: ["alt+enter", "ctrl+shift+enter"],
+  steer: "alt+enter",
+  followUp: [],
   dequeue: ["alt+up", "ctrl+shift+up"],
   pasteImage: "ctrl+v",
   newSession: [],
@@ -54869,6 +54880,7 @@ var APP_ACTIONS = [
   "toggleThinking",
   "toggleSessionNamedFilter",
   "externalEditor",
+  "steer",
   "followUp",
   "dequeue",
   "pasteImage",
@@ -63849,7 +63861,7 @@ function handleHotkeysCommand(host) {
     theme.fg("muted", "Editor shortcuts:"),
     "  Enter              Submit message",
     "  Shift+Enter        New line",
-    `  ${theme.fg("dim", kb.getKeys("followUp").join(" / "))} ${theme.fg("muted", "Queue follow-up message")}`,
+    `  ${theme.fg("dim", kb.getKeys("steer").join(" / "))} ${theme.fg("muted", "Queue steering message for the active turn")}`,
     `  ${theme.fg("dim", kb.getKeys("dequeue").join(" / "))} ${theme.fg("muted", "Restore queued messages")}`,
     "  /                  Show slash commands",
     "  Esc                Cancel autocomplete",
@@ -66772,6 +66784,10 @@ function setupInteractiveKeybindings(host) {
       host.dequeueMessages();
       return { consume: true };
     }
+    if (host.keybindings.matches(data, "steer")) {
+      host.handleSteer();
+      return { consume: true };
+    }
     if (host.keybindings.matches(data, "followUp")) {
       host.handleFollowUp();
       return { consume: true };
@@ -66872,6 +66888,19 @@ function handleFollowUp(host) {
     void host.editor.onSubmit(text);
   }
 }
+function handleSteer(host) {
+  const text = host.editor.getText().trim();
+  if (!text) return;
+  if (isCommandLikeInput(text)) {
+    host.editor.onSubmit?.(text);
+    return;
+  }
+  if (host.submitLock || (host.agentSessionController?.hasQueuedMessages ?? false)) {
+    queueMessage(host, text, "steer");
+  } else if (host.editor.onSubmit) {
+    void host.editor.onSubmit(text);
+  }
+}
 function truncate(text, maxLength) {
   if (text.length <= maxLength) return text;
   return text.slice(0, maxLength) + "...";
@@ -69558,6 +69587,9 @@ var InteractiveMode = class {
   handleFollowUp() {
     handleFollowUp(this);
   }
+  handleSteer() {
+    handleSteer(this);
+  }
   restoreEditor() {
     return restoreEditor(this.uiHelperHost);
   }
@@ -69572,6 +69604,17 @@ var CliMissingApiKeyError = class extends Error {
     this.name = "CliMissingApiKeyError";
   }
 };
+var CliSessionResumeError = class extends Error {
+  constructor(sessionId, code, message = code === "session_not_found" ? `Session not found: ${sessionId}` : `Session could not be recovered: ${sessionId}`) {
+    super(message);
+    this.sessionId = sessionId;
+    this.code = code;
+    this.name = "CliSessionResumeError";
+  }
+  sessionId;
+  code;
+  recoverable = true;
+};
 function getCliRuntimePaths() {
   const configDir = getConfigDir();
   const sessionsDir = getSessionsDir();
@@ -69644,10 +69687,17 @@ async function composeCliRuntime(params) {
   const cwd = params.cwd ?? process.cwd();
   const sessionManager = createSessionManager({ sessionsDir: paths.sessionsDir });
   if (params.explicitSessionId) {
+    const sessionFileExists = params.requireExistingSession ? await sessionManager.hasSession(params.explicitSessionId) : false;
     const loaded = await sessionManager.loadSession(params.explicitSessionId, {
       warnIfMissing: params.warnIfExplicitSessionMissing
     });
     if (!loaded) {
+      if (params.requireExistingSession) {
+        throw new CliSessionResumeError(
+          params.explicitSessionId,
+          sessionFileExists ? "session_unrecoverable" : "session_not_found"
+        );
+      }
       await sessionManager.createSession(void 0, void 0, params.explicitSessionId);
     } else {
       const restored = restoreSessionModelState({
@@ -70174,12 +70224,17 @@ function parseInput(line) {
       reason: typeof parsed.reason === "string" ? parsed.reason : void 0
     };
   }
-  if (parsed.type === "turn.request" && typeof parsed.turnId === "string" && typeof parsed.prompt === "string") {
+  if ((parsed.type === "turn.request" || parsed.type === "turn.input") && typeof parsed.turnId === "string" && typeof parsed.prompt === "string") {
+    const streamingBehavior = parsed.streamingBehavior;
+    if (streamingBehavior !== void 0 && streamingBehavior !== "steer" && streamingBehavior !== "followUp") {
+      return null;
+    }
     return {
       type: "turn.request",
       sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : void 0,
       turnId: parsed.turnId,
       prompt: parsed.prompt,
+      streamingBehavior,
       cwd: typeof parsed.cwd === "string" ? parsed.cwd : void 0,
       metadata: isRecord4(parsed.metadata) ? parsed.metadata : void 0
     };
@@ -70343,6 +70398,13 @@ async function runJsonEventsMode(params) {
   function delay(ms) {
     return new Promise((resolve5) => setTimeout(resolve5, Math.max(0, ms)));
   }
+  async function waitForActiveController(timeoutMs = 1e3) {
+    const deadline = Date.now() + timeoutMs;
+    while (!controller && activeTurn && !activeTurn.finalized && Date.now() < deadline) {
+      await delay(5);
+    }
+    return controller;
+  }
   function touch() {
     if (activeTurn) {
       activeTurn.lastActivityAt = Date.now();
@@ -70453,6 +70515,25 @@ async function runJsonEventsMode(params) {
       display(chunk);
     }
   }
+  function failureDetail(detail) {
+    if (!detail) return { error: "turn failed" };
+    if (typeof detail === "string") return { error: detail };
+    return {
+      error: detail.message,
+      code: detail.code,
+      recoverable: detail.recoverable
+    };
+  }
+  function errorToFailureDetail(error) {
+    if (error instanceof CliSessionResumeError) {
+      return {
+        message: error.message,
+        code: error.code,
+        recoverable: error.recoverable
+      };
+    }
+    return error instanceof Error ? error.message : String(error);
+  }
   function finalize(kind, detail) {
     const turn = activeTurn;
     if (!turn || turn.finalized) return;
@@ -70466,10 +70547,10 @@ async function runJsonEventsMode(params) {
     };
     switch (kind) {
       case "completed":
-        writeEvent({ type: "turn.completed", ...base, summary: (detail ?? turn.summary).trim() });
+        writeEvent({ type: "turn.completed", ...base, summary: (typeof detail === "string" ? detail : turn.summary).trim() });
         break;
       case "failed":
-        writeEvent({ type: "turn.failed", ...base, error: detail || "turn failed" });
+        writeEvent({ type: "turn.failed", ...base, ...failureDetail(detail) });
         break;
       case "cancelled":
         writeEvent({ type: "turn.cancelled", ...base, reason: detail || "interrupted" });
@@ -70844,12 +70925,7 @@ async function runJsonEventsMode(params) {
       return;
     }
     if (activeTurn && !activeTurn.finalized) {
-      writeEvent({
-        type: "turn.failed",
-        sessionId,
-        turnId: message.turnId,
-        error: "another turn is already running"
-      });
+      await queueActiveTurnInput(message);
       return;
     }
     activeTurn = {
@@ -70897,7 +70973,7 @@ async function runJsonEventsMode(params) {
     try {
       await ensureRuntime(message.cwd);
     } catch (error) {
-      finalize("failed", error instanceof Error ? error.message : String(error));
+      finalize("failed", errorToFailureDetail(error));
       if (activeTurn === turn) emitSettled(turn);
       if (activeTurn === turn) activeTurn = null;
       return;
@@ -70974,6 +71050,55 @@ async function runJsonEventsMode(params) {
       if (activeTurn === turn) activeTurn = null;
     }
   }
+  async function queueActiveTurnInput(message) {
+    if (!message.streamingBehavior) {
+      writeEvent({
+        type: "turn.failed",
+        sessionId,
+        turnId: message.turnId,
+        error: "another turn is already running; specify streamingBehavior ('steer' or 'followUp') to queue the message"
+      });
+      return;
+    }
+    const activeController = await waitForActiveController();
+    if (!activeController) {
+      writeEvent({
+        type: "turn.failed",
+        sessionId,
+        turnId: message.turnId,
+        error: "JSON events runtime is not ready to queue a streaming turn"
+      });
+      return;
+    }
+    try {
+      applyRuntimeSelection(message);
+      trace?.notePendingUserText(message.prompt);
+      trace?.noteRuntimeEvent("json_events_turn_queued", {
+        mode: message.streamingBehavior,
+        turnId: message.turnId
+      });
+      await activeController.prompt(message.prompt, {
+        source: "json-events",
+        streamingBehavior: message.streamingBehavior,
+        displayText: message.prompt,
+        deliverWhileStreaming: message.streamingBehavior === "steer"
+      });
+      writeEvent({
+        type: "turn.queued",
+        sessionId,
+        turnId: message.turnId,
+        mode: message.streamingBehavior,
+        activeTurnId: activeTurn?.turnId
+      });
+    } catch (error) {
+      writeEvent({
+        type: "turn.failed",
+        sessionId,
+        turnId: message.turnId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
   async function interrupt(message) {
     if (isSessionMismatch(message)) {
       writeEvent({
@@ -71098,6 +71223,7 @@ Commands:
 Interactive Mode Key Bindings:
   Enter            Submit message
   \\ + Enter       New line (fallback)
+  Alt+Enter        Queue steering message for the active turn
   Ctrl+C           Exit
   Ctrl+D           Exit
   Ctrl+O           Expand/collapse tool output
@@ -71115,6 +71241,7 @@ Print Mode Options:
   --json-output    Print structured JSON in non-interactive mode
   --json-events    Run JSONL protocol mode over stdin/stdout
   --session-id     Reuse or create a specific session in non-interactive mode
+  --resume-required  In JSON-events mode, fail if --session-id cannot be resumed
   --extension-path Add an extra extension search directory (repeatable)
   --no-builtin-extensions  Skip built-in extensions (keep user/project ones)
   --no-extensions    Skip all discovered extensions (keeps --extension-path)
@@ -71194,16 +71321,6 @@ async function runModelsCommand(args) {
   pie models init [--path <path>] [--force] [--stdout]
   pie models validate [--path <path>] [--probe web_search] [--json]`);
 }
-function parseRepeatedFlag(args, flag) {
-  const values = [];
-  for (let i = 0; i < args.length; i += 1) {
-    if (args[i] === flag && args[i + 1]) {
-      values.push(args[i + 1]);
-      i += 1;
-    }
-  }
-  return values;
-}
 async function runWithJsonEventsConsoleIsolation(fn) {
   const originalLog = console.log;
   const originalInfo = console.info;
@@ -71228,6 +71345,7 @@ async function startChat(initialPrompt, testCommand) {
   const rawOutput = process.argv.includes("--raw-output");
   const jsonOutput = process.argv.includes("--json-output");
   const jsonEvents = process.argv.includes("--json-events");
+  const resumeRequired = process.argv.includes("--resume-required");
   const sessionIdFlagIndex = process.argv.indexOf("--session-id");
   const explicitSessionId = sessionIdFlagIndex >= 0 ? process.argv[sessionIdFlagIndex + 1] : void 0;
   const extensionPaths = parseRepeatedFlag(process.argv, "--extension-path");
@@ -71237,19 +71355,22 @@ async function startChat(initialPrompt, testCommand) {
       if (process.env.PIE_TEST_MOCK_RESPONSE !== void 0) {
         await runJsonEventsMode({
           explicitSessionId,
+          resumeRequired,
           mockResponse: process.env.PIE_TEST_MOCK_RESPONSE
         });
         return;
       }
       await runJsonEventsMode({
         explicitSessionId,
+        resumeRequired,
         streamFn: await createCliTestStreamFnFromEnv(),
         createRuntime: async ({ cwd, sessionId }) => composeCliRuntime({
           explicitSessionId: explicitSessionId ?? sessionId,
           extensionPaths,
           extensionFlags,
           cwd,
-          warnIfExplicitSessionMissing: false
+          warnIfExplicitSessionMissing: false,
+          requireExistingSession: resumeRequired && !!explicitSessionId
         })
       });
     });

package/package.json

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