cogpit-memory 0.4.1 → 0.4.2

package/dist/cli.js

@@ -1871,6 +1871,62 @@ function appendAssistantText(turn, text, timestamp) {
   turn.contentBlocks.push({ kind: "text", text: [text], timestamp });
 }
 
+// src/lib/automatedPrompts.ts
+var CREW_CHAT_DELIVERY_RE = /^Crew chat · ([^\n]+) · message (\d+)(?:\n|$)/;
+var TASK_WAKEUP_START_RE = /^Delegated task \S+ (?:running|completed|error|cancelled|needs attention)\. Child session: /;
+function isReaderPrompt(text) {
+  const trimmed = text.trim();
+  if (!trimmed) return false;
+  if (CREW_CHAT_DELIVERY_RE.test(trimmed) || TASK_WAKEUP_START_RE.test(trimmed)) return false;
+  return parseAgentEnvelope(trimmed).sender === null;
+}
+
+// src/lib/asyncAnswers.ts
+function promptText(content) {
+  if (content === null) return "";
+  if (typeof content === "string") return content;
+  return content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n");
+}
+function linkAsyncAnswers(turns) {
+  const answers = /* @__PURE__ */ new Map();
+  let open4 = [];
+  const answer = (text) => {
+    if (open4.length === 0 || !isReaderPrompt(text)) return;
+    for (const id of open4) answers.set(id, text.trim());
+    open4 = [];
+  };
+  for (const turn of turns) {
+    answer(promptText(turn.userMessage));
+    for (const block of turn.contentBlocks) {
+      if (block.kind === "queued_prompt") answer(block.content);
+      else if (block.kind === "tool_calls") {
+        for (const call of block.toolCalls) if (call.asyncQuestion) open4.push(call.id);
+      }
+    }
+  }
+  const stale = (call) => call.asyncQuestion === true && call.asyncAnswer !== answers.get(call.id);
+  const relinked = /* @__PURE__ */ new Map();
+  const relink = (call) => {
+    if (!stale(call)) return call;
+    let next = relinked.get(call);
+    if (!next) {
+      const { asyncAnswer: _previous, ...rest } = call;
+      const reply = answers.get(call.id);
+      next = reply === void 0 ? rest : { ...rest, asyncAnswer: reply };
+      relinked.set(call, next);
+    }
+    return next;
+  };
+  return turns.map((turn) => {
+    if (!turn.toolCalls.some(stale)) return turn;
+    return {
+      ...turn,
+      toolCalls: turn.toolCalls.map(relink),
+      contentBlocks: turn.contentBlocks.map((block) => block.kind === "tool_calls" ? { ...block, toolCalls: block.toolCalls.map(relink) } : block)
+    };
+  });
+}
+
 // src/lib/codex-patches.ts
 function isApplyPatchText(value) {
   return value.includes("*** Begin Patch") && value.includes("*** End Patch");
@@ -2652,6 +2708,7 @@ function walkCodexRecords(records, options) {
   }
   let current = null;
   let currentTurnId = null;
+  let queuedPromptEcho = false;
   let currentModel = metadata.model || null;
   let lastTurnTimestamp = "";
   let pendingCompaction = null;
@@ -2706,6 +2763,7 @@ function walkCodexRecords(records, options) {
     recordIndex = index;
     const payload = isObject3(record2.payload) ? record2.payload : void 0;
     const timestamp = record2.timestamp ?? "";
+    if (record2.type !== "event_msg") queuedPromptEcho = false;
     if (record2.type === "compacted") {
       current = commitTurn(current);
       pendingCompaction = "Conversation compacted";
@@ -2723,11 +2781,17 @@ function walkCodexRecords(records, options) {
       continue;
     }
     if (record2.type === "event_msg" && payload?.type === "user_message" && typeof payload.message === "string") {
+      if (queuedPromptEcho) {
+        queuedPromptEcho = false;
+        continue;
+      }
       if (current && (current.assistantText.length > 0 || current.toolCalls.length > 0 || current.thinking.length > 0)) {
         current = commitTurn(current);
       }
+      const opensWindow = !sawTurnStart;
       sawTurnStart = true;
       current ??= createActiveTurn(currentTurnId, timestamp, currentModel);
+      if (opensWindow) current.opensOnPrompt = true;
       const localImages = (Array.isArray(payload.local_images) ? payload.local_images : []).filter(
         (p) => typeof p === "string" && p.length > 0
       );
@@ -2842,8 +2906,15 @@ function walkCodexRecords(records, options) {
       appendAssistantText(current, extractMessageText(payload, "output_text"), timestamp);
       continue;
     }
-    if (payload.type === "message" && payload.role === "user" && current.userMessage === null) {
+    if (payload.type === "message" && payload.role === "user") {
       const text = normalizePromptText(extractMessageText(payload, "input_text"));
+      if (current.userMessage !== null || current.contentBlocks.length > 0) {
+        if (text) {
+          current.contentBlocks.push({ kind: "queued_prompt", content: text, timestamp });
+          queuedPromptEcho = true;
+        }
+        continue;
+      }
       const images = extractResponseMessageImages(payload);
       const audio = extractResponseMessageAudio(payload);
       if (text || images.length > 0 || audio.length > 0) {
@@ -3085,6 +3156,7 @@ function walkCodexRecords(records, options) {
     }
   }
   commitTurn(current);
+  const linkedTurns = linkAsyncAnswers(turns);
   return {
     turnStartIndices,
     sessionId: metadata.sessionId,
@@ -3094,8 +3166,8 @@ function walkCodexRecords(records, options) {
     slug: metadata.slug,
     name: "",
     model: metadata.model,
-    turns,
-    stats: options?.skipStats ? createEmptySessionStats(turns.length) : computeStats(turns),
+    turns: linkedTurns,
+    stats: options?.skipStats ? createEmptySessionStats(linkedTurns.length) : computeStats(linkedTurns),
     rawMessages: options?.skipStats ? [] : records,
     branchedFrom: metadata.branchedFrom,
     agentKind: "codex"

package/dist/index.js

@@ -1880,6 +1880,62 @@ function appendAssistantText(turn, text, timestamp) {
   turn.contentBlocks.push({ kind: "text", text: [text], timestamp });
 }
 
+// src/lib/automatedPrompts.ts
+var CREW_CHAT_DELIVERY_RE = /^Crew chat · ([^\n]+) · message (\d+)(?:\n|$)/;
+var TASK_WAKEUP_START_RE = /^Delegated task \S+ (?:running|completed|error|cancelled|needs attention)\. Child session: /;
+function isReaderPrompt(text) {
+  const trimmed = text.trim();
+  if (!trimmed) return false;
+  if (CREW_CHAT_DELIVERY_RE.test(trimmed) || TASK_WAKEUP_START_RE.test(trimmed)) return false;
+  return parseAgentEnvelope(trimmed).sender === null;
+}
+
+// src/lib/asyncAnswers.ts
+function promptText(content) {
+  if (content === null) return "";
+  if (typeof content === "string") return content;
+  return content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n");
+}
+function linkAsyncAnswers(turns) {
+  const answers = /* @__PURE__ */ new Map();
+  let open4 = [];
+  const answer = (text) => {
+    if (open4.length === 0 || !isReaderPrompt(text)) return;
+    for (const id of open4) answers.set(id, text.trim());
+    open4 = [];
+  };
+  for (const turn of turns) {
+    answer(promptText(turn.userMessage));
+    for (const block of turn.contentBlocks) {
+      if (block.kind === "queued_prompt") answer(block.content);
+      else if (block.kind === "tool_calls") {
+        for (const call of block.toolCalls) if (call.asyncQuestion) open4.push(call.id);
+      }
+    }
+  }
+  const stale = (call) => call.asyncQuestion === true && call.asyncAnswer !== answers.get(call.id);
+  const relinked = /* @__PURE__ */ new Map();
+  const relink = (call) => {
+    if (!stale(call)) return call;
+    let next = relinked.get(call);
+    if (!next) {
+      const { asyncAnswer: _previous, ...rest } = call;
+      const reply = answers.get(call.id);
+      next = reply === void 0 ? rest : { ...rest, asyncAnswer: reply };
+      relinked.set(call, next);
+    }
+    return next;
+  };
+  return turns.map((turn) => {
+    if (!turn.toolCalls.some(stale)) return turn;
+    return {
+      ...turn,
+      toolCalls: turn.toolCalls.map(relink),
+      contentBlocks: turn.contentBlocks.map((block) => block.kind === "tool_calls" ? { ...block, toolCalls: block.toolCalls.map(relink) } : block)
+    };
+  });
+}
+
 // src/lib/codex-patches.ts
 function isApplyPatchText(value) {
   return value.includes("*** Begin Patch") && value.includes("*** End Patch");
@@ -2661,6 +2717,7 @@ function walkCodexRecords(records, options) {
   }
   let current = null;
   let currentTurnId = null;
+  let queuedPromptEcho = false;
   let currentModel = metadata.model || null;
   let lastTurnTimestamp = "";
   let pendingCompaction = null;
@@ -2715,6 +2772,7 @@ function walkCodexRecords(records, options) {
     recordIndex = index;
     const payload = isObject3(record2.payload) ? record2.payload : void 0;
     const timestamp = record2.timestamp ?? "";
+    if (record2.type !== "event_msg") queuedPromptEcho = false;
     if (record2.type === "compacted") {
       current = commitTurn(current);
       pendingCompaction = "Conversation compacted";
@@ -2732,11 +2790,17 @@ function walkCodexRecords(records, options) {
       continue;
     }
     if (record2.type === "event_msg" && payload?.type === "user_message" && typeof payload.message === "string") {
+      if (queuedPromptEcho) {
+        queuedPromptEcho = false;
+        continue;
+      }
       if (current && (current.assistantText.length > 0 || current.toolCalls.length > 0 || current.thinking.length > 0)) {
         current = commitTurn(current);
       }
+      const opensWindow = !sawTurnStart;
       sawTurnStart = true;
       current ??= createActiveTurn(currentTurnId, timestamp, currentModel);
+      if (opensWindow) current.opensOnPrompt = true;
       const localImages = (Array.isArray(payload.local_images) ? payload.local_images : []).filter(
         (p) => typeof p === "string" && p.length > 0
       );
@@ -2851,8 +2915,15 @@ function walkCodexRecords(records, options) {
       appendAssistantText(current, extractMessageText(payload, "output_text"), timestamp);
       continue;
     }
-    if (payload.type === "message" && payload.role === "user" && current.userMessage === null) {
+    if (payload.type === "message" && payload.role === "user") {
       const text = normalizePromptText(extractMessageText(payload, "input_text"));
+      if (current.userMessage !== null || current.contentBlocks.length > 0) {
+        if (text) {
+          current.contentBlocks.push({ kind: "queued_prompt", content: text, timestamp });
+          queuedPromptEcho = true;
+        }
+        continue;
+      }
       const images = extractResponseMessageImages(payload);
       const audio = extractResponseMessageAudio(payload);
       if (text || images.length > 0 || audio.length > 0) {
@@ -3094,6 +3165,7 @@ function walkCodexRecords(records, options) {
     }
   }
   commitTurn(current);
+  const linkedTurns = linkAsyncAnswers(turns);
   return {
     turnStartIndices,
     sessionId: metadata.sessionId,
@@ -3103,8 +3175,8 @@ function walkCodexRecords(records, options) {
     slug: metadata.slug,
     name: "",
     model: metadata.model,
-    turns,
-    stats: options?.skipStats ? createEmptySessionStats(turns.length) : computeStats(turns),
+    turns: linkedTurns,
+    stats: options?.skipStats ? createEmptySessionStats(linkedTurns.length) : computeStats(linkedTurns),
     rawMessages: options?.skipStats ? [] : records,
     branchedFrom: metadata.branchedFrom,
     agentKind: "codex"

package/dist/lib/asyncAnswers.d.ts

@@ -0,0 +1,10 @@
+import type { Turn } from "./types";
+/**
+ * Records on each async question the reader's first prompt after it.
+ *
+ * Nothing links a reply to its question, so that prompt answers every question
+ * still open when it arrives. A pure recompute over the list handed in, so the
+ * page stitcher re-runs it across a join and gets what a single parse would
+ * have produced. Turns whose answers did not change come back by reference.
+ */
+export declare function linkAsyncAnswers(turns: readonly Turn[]): Turn[];

package/dist/lib/automatedPrompts.d.ts

@@ -0,0 +1,4 @@
+export declare const CREW_CHAT_DELIVERY_RE: RegExp;
+export declare const TASK_WAKEUP_START_RE: RegExp;
+/** Whether a prompt came from the reader rather than a crew, a child task or another agent. */
+export declare function isReaderPrompt(text: string): boolean;

package/dist/lib/types.d.ts

@@ -411,6 +411,8 @@ export interface ToolCall {
      * answered here.
      */
     asyncQuestion?: boolean;
+    /** The reader's reply to an async question, once the transcript holds one. */
+    asyncAnswer?: string;
     /** Set by parser when a PostToolUse hook replaced this tool's output */
     outputReplacedByHook?: boolean;
     /** Total duration of PostToolUse hooks attached to this call, summed in ms */
@@ -656,6 +658,13 @@ export interface Turn {
      * must be stitched onto the previous turn once the older page arrives.
      */
     isFragment?: boolean;
+    /**
+     * Set when the parse window opened on this turn's prompt record, with no turn
+     * context before it. An older CLI's echo of a prompt steered into the previous
+     * page's last turn looks exactly like this, so the page stitcher may fold it
+     * back into that steer.
+     */
+    opensOnPrompt?: boolean;
 }
 export interface SessionStats {
     totalInputTokens: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogpit-memory",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "CLI tool for Claude Code, Codex, and GitHub Copilot CLI session introspection",
   "license": "MIT",
   "repository": {