@cydm/pie 2.5.0 → 2.5.2

package/dist/cli.js

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

package/package.json

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