@poncho-ai/harness 0.59.2 → 0.59.3

package/dist/index.js

@@ -2780,55 +2780,6 @@ import { randomUUID as randomUUID3 } from "crypto";
 // src/storage/entries.ts
 import { createLogger as createLogger2 } from "@poncho-ai/sdk";
 var entriesReadLog = createLogger2("entries-read");
-function buildLlmContext(entries) {
-  let latestCompaction;
-  for (const e of entries) {
-    if (e.type === "compaction" && (!latestCompaction || e.seq > latestCompaction.seq)) {
-      latestCompaction = e;
-    }
-  }
-  const harnessMsgs = entries.filter(
-    (e) => e.type === "harness_message"
-  );
-  if (latestCompaction) {
-    const kept = harnessMsgs.filter((e) => e.seq >= latestCompaction.firstKeptSeq).map((e) => e.message);
-    return [latestCompaction.summaryMessage, ...kept];
-  }
-  return harnessMsgs.map((e) => e.message);
-}
-function buildDisplaySnapshot(entries, tailN) {
-  const amendmentsByTarget = /* @__PURE__ */ new Map();
-  for (const e of entries) {
-    if (e.type === "assistant_amendment") {
-      const list = amendmentsByTarget.get(e.targetEntryId) ?? [];
-      list.push(e);
-      amendmentsByTarget.set(e.targetEntryId, list);
-    }
-  }
-  const built = [];
-  for (const e of entries) {
-    if (e.type === "user_message") {
-      if (e.hidden) continue;
-      built.push({ seq: e.seq, message: e.message });
-    } else if (e.type === "assistant_message") {
-      let content = typeof e.message.content === "string" ? e.message.content : "";
-      const amendments = amendmentsByTarget.get(e.id);
-      if (amendments) {
-        for (const a of amendments.sort((x, y) => x.seq - y.seq)) {
-          if (a.appendText) content += a.appendText;
-        }
-      }
-      built.push({ seq: e.seq, message: { ...e.message, content } });
-    }
-  }
-  const total = built.length;
-  const tail = tailN >= total ? built : built.slice(total - tailN);
-  return {
-    messages: tail.map((b) => b.message),
-    totalMessages: total,
-    headSeq: tail.length > 0 ? tail[0].seq : null
-  };
-}
 function getPendingSubagentResults(entries) {
   const consumed = /* @__PURE__ */ new Set();
   for (const e of entries) {
@@ -2908,7 +2859,7 @@ var InMemoryEngine = class {
       if (!c) return void 0;
       return rebuildConversationFromEntries(
         { ...c },
-        (id) => this.conversations.readEntries(id)
+        (id) => this.conversations.readEntries(id, { types: ["subagent_result", "callback_started"] })
       );
     },
     // In-memory storage has no separate archive blob, so both variants
@@ -2918,7 +2869,7 @@ var InMemoryEngine = class {
       if (!c) return void 0;
       return rebuildConversationFromEntries(
         { ...c },
-        (id) => this.conversations.readEntries(id)
+        (id) => this.conversations.readEntries(id, { types: ["subagent_result", "callback_started"] })
       );
     },
     getStatusSnapshot: async (conversationId) => {
@@ -3797,7 +3748,7 @@ var SqlStorageEngine = class {
       }
       return rebuildConversationFromEntries(
         conv,
-        (id) => this.conversations.readEntries(id)
+        (id) => this.conversations.readEntries(id, { types: ["subagent_result", "callback_started"] })
       );
     },
     getStatusSnapshot: async (conversationId) => {
@@ -3850,7 +3801,7 @@ var SqlStorageEngine = class {
       }
       return rebuildConversationFromEntries(
         conv,
-        (id) => this.conversations.readEntries(id)
+        (id) => this.conversations.readEntries(id, { types: ["subagent_result", "callback_started"] })
       );
     },
     create: async (ownerId, title, tenantId, init) => {
@@ -3967,12 +3918,13 @@ var SqlStorageEngine = class {
     },
     rename: async (conversationId, title) => {
       const normalized = normalizeTitle2(title);
+      const dataExpr = this.dialect.tag === "sqlite" ? `json_set(data, '$.title', $2)` : `jsonb_set(data, '{title}', to_jsonb($2::text))`;
       await this.executor.run(
         rewrite(
-          `UPDATE conversations SET title = $1, updated_at = $2 WHERE id = $3`,
+          `UPDATE conversations SET title = $1, data = ${dataExpr}, updated_at = $3 WHERE id = $4`,
           this.dialect
         ),
-        [normalized, (/* @__PURE__ */ new Date()).toISOString(), conversationId]
+        [normalized, normalized, (/* @__PURE__ */ new Date()).toISOString(), conversationId]
       );
       return this.conversations.get(conversationId);
     },
@@ -12249,7 +12201,10 @@ var InMemoryConversationStore = class {
     this.purgeExpired();
     const c = this.conversations.get(conversationId);
     if (!c) return void 0;
-    return rebuildConversationFromEntries({ ...c }, (id) => this.readEntries(id));
+    return rebuildConversationFromEntries(
+      { ...c },
+      (id) => this.readEntries(id, { types: ["subagent_result", "callback_started"] })
+    );
   }
   // In-memory stores already hold the full conversation object, so there's
   // no separate archive blob to load. Both variants return the same data.
@@ -12708,12 +12663,10 @@ var CALLBACK_LOCK_STALE_MS = 5 * 60 * 1e3;
 var STALE_SUBAGENT_THRESHOLD_MS = 5 * 60 * 1e3;
 
 // src/orchestrator/orchestrator.ts
-import { createLogger as createLogger8, getTextContent as getTextContent4 } from "@poncho-ai/sdk";
+import { createLogger as createLogger8, getTextContent as getTextContent3 } from "@poncho-ai/sdk";
 
 // src/orchestrator/entries-dual-write.ts
 import { randomUUID as randomUUID6 } from "crypto";
-import { getTextContent as getTextContent3 } from "@poncho-ai/sdk";
-var entriesParityEnabled = () => process.env.PONCHO_VERIFY_ENTRIES === "1";
 var appendEntriesSafe = async (store, conversation, entries, log2) => {
   if (entries.length === 0) return [];
   try {
@@ -12728,123 +12681,21 @@ var appendEntriesSafe = async (store, conversation, entries, log2) => {
     );
   } catch (err) {
     log2.error(
-      `[entries-dual-write] append failed for ${conversation.conversationId}: ${err instanceof Error ? err.message : String(err)}`
+      `[entries-queue] append failed for ${conversation.conversationId}: ${err instanceof Error ? err.message : String(err)}`
     );
     return [];
   }
 };
-var userMessageEntry = (message, turnId, opts) => ({
-  type: "user_message",
-  message,
-  turnId,
-  ...opts?.hidden ? { hidden: true } : {}
-});
-var assistantMessageEntry = (message, turnId, runId) => ({
-  type: "assistant_message",
-  message,
-  turnId,
-  runId
-});
-var harnessMessageEntries = (messages, turnId) => messages.map((message) => ({ type: "harness_message", message, turnId }));
-var compactionEntry = (summaryMessage, firstKeptSeq, opts) => ({
-  type: "compaction",
-  summaryMessage,
-  firstKeptSeq,
-  ...opts?.tokensBefore !== void 0 ? { tokensBefore: opts.tokensBefore } : {},
-  ...opts?.tokensAfter !== void 0 ? { tokensAfter: opts.tokensAfter } : {}
-});
 var subagentResultEntry = (result) => ({ type: "subagent_result", result });
 var callbackStartedEntry = (consumedSeqs) => ({
   type: "callback_started",
   consumedSeqs
 });
-var assistantAmendmentEntry = (targetEntryId, appendText) => ({
-  type: "assistant_amendment",
-  targetEntryId,
-  ...appendText ? { appendText } : {}
-});
-var newHarnessMessagesThisTurn = (prev, next) => {
-  const prevArr = prev ?? [];
-  const nextArr = next ?? [];
-  if (nextArr.length === 0) return { messages: [], approximate: false };
-  if (prevArr.length === 0) return { messages: nextArr, approximate: false };
-  if (nextArr.length >= prevArr.length) {
-    return { messages: nextArr.slice(prevArr.length), approximate: false };
-  }
-  return { messages: nextArr, approximate: true };
-};
-var projectText = (m) => {
-  const role = m.role;
-  const text = getTextContent3(m).replace(/\s+/g, " ").trim();
-  return `${role}:${text}`;
-};
-var projectAll = (msgs) => msgs.map(projectText);
-var countMismatch = (label, a, b) => a === b ? null : `${label} length ${a} (entries) vs ${b} (blob)`;
-var verifyEntriesParity = async (store, conversationId, blob, log2) => {
-  if (!entriesParityEnabled()) return;
-  try {
-    const entries = await store.readEntries(conversationId);
-    const mismatches = [];
-    if (blob.harnessMessages) {
-      const llm = buildLlmContext(entries);
-      const lenMismatch = countMismatch(
-        "llmContext",
-        llm.length,
-        blob.harnessMessages.length
-      );
-      if (lenMismatch) mismatches.push(lenMismatch);
-      const entriesProj = projectAll(llm);
-      const blobProj = projectAll(blob.harnessMessages);
-      const tail = Math.min(entriesProj.length, blobProj.length, 5);
-      for (let i = 1; i <= tail; i++) {
-        const ep = entriesProj[entriesProj.length - i];
-        const bp = blobProj[blobProj.length - i];
-        if (ep !== bp) {
-          mismatches.push(
-            `llmContext tail[-${i}] differs: entries=${JSON.stringify(ep).slice(0, 120)} blob=${JSON.stringify(bp).slice(0, 120)}`
-          );
-        }
-      }
-    }
-    if (blob.displayMessages) {
-      const snap = buildDisplaySnapshot(entries, Number.MAX_SAFE_INTEGER);
-      const lenMismatch = countMismatch(
-        "display",
-        snap.totalMessages,
-        blob.displayMessages.length
-      );
-      if (lenMismatch) mismatches.push(lenMismatch);
-      const entriesProj = projectAll(snap.messages);
-      const blobProj = projectAll(blob.displayMessages);
-      const tail = Math.min(entriesProj.length, blobProj.length, 5);
-      for (let i = 1; i <= tail; i++) {
-        const ep = entriesProj[entriesProj.length - i];
-        const bp = blobProj[blobProj.length - i];
-        if (ep !== bp) {
-          mismatches.push(
-            `display tail[-${i}] differs: entries=${JSON.stringify(ep).slice(0, 120)} blob=${JSON.stringify(bp).slice(0, 120)}`
-          );
-        }
-      }
-    }
-    if (mismatches.length > 0) {
-      log2.warn(
-        `[entries-parity] ${conversationId} MISMATCH (${mismatches.length}): ${mismatches.join(" | ")}`
-      );
-    } else {
-      log2.info(`[entries-parity] ${conversationId} OK`);
-    }
-  } catch (err) {
-    log2.error(
-      `[entries-parity] ${conversationId} checker threw (ignored): ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-};
 
 // src/orchestrator/orchestrator.ts
-var dualWriteLog = createLogger8("orchestrator:entries");
+var entriesQueueLog = createLogger8("orchestrator:entries");
 var assistantMessageText = (message) => {
-  const raw = getTextContent4(message).trim();
+  const raw = getTextContent3(message).trim();
   if (raw.startsWith("{") && raw.includes('"tool_calls"')) {
     try {
       const parsed = JSON.parse(raw);
@@ -13153,8 +13004,6 @@ var AgentOrchestrator = class {
     if (!checkpointedRun) {
       const conv = await this.conversationStore.get(conversationId);
       if (conv) {
-        let amendmentText;
-        let pushedAssistant;
         const hasAssistantContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draft.sections.length > 0;
         if (hasAssistantContent) {
           const prevMessages = conv.messages;
@@ -13182,14 +13031,15 @@ var AgentOrchestrator = class {
                 }
               }
             ];
-            amendmentText = draft.assistantResponse;
           } else {
-            pushedAssistant = {
-              role: "assistant",
-              content: draft.assistantResponse,
-              metadata: buildAssistantMetadata(draft)
-            };
-            conv.messages = [...prevMessages, pushedAssistant];
+            conv.messages = [
+              ...prevMessages,
+              {
+                role: "assistant",
+                content: draft.assistantResponse,
+                metadata: buildAssistantMetadata(draft)
+              }
+            ];
           }
         }
         applyTurnMetadata(conv, {
@@ -13199,54 +13049,6 @@ var AgentOrchestrator = class {
           harnessMessages: execution?.runHarnessMessages
         }, { shouldRebuildCanonical: true });
         await this.conversationStore.update(conv);
-        if (amendmentText !== void 0 || pushedAssistant) {
-          const finalConv = conv;
-          const amendText = amendmentText;
-          const pushed = pushedAssistant;
-          void (async () => {
-            try {
-              if (pushed) {
-                await appendEntriesSafe(
-                  this.conversationStore,
-                  finalConv,
-                  [assistantMessageEntry(pushed, `resume-${conversationId}`, latestRunId)],
-                  dualWriteLog
-                );
-              } else if (amendText !== void 0) {
-                const existing = await this.conversationStore.readEntries(
-                  conversationId,
-                  { types: ["assistant_message"] }
-                );
-                const target = existing[existing.length - 1];
-                if (target) {
-                  await appendEntriesSafe(
-                    this.conversationStore,
-                    finalConv,
-                    [assistantAmendmentEntry(target.id, amendText)],
-                    dualWriteLog
-                  );
-                } else {
-                  dualWriteLog.warn(
-                    `[entries-dual-write] resume amendment for ${conversationId}: no assistant_message entry to target; skipped`
-                  );
-                }
-              }
-              await verifyEntriesParity(
-                this.conversationStore,
-                conversationId,
-                {
-                  harnessMessages: finalConv._harnessMessages,
-                  displayMessages: finalConv.messages
-                },
-                dualWriteLog
-              );
-            } catch (err) {
-              dualWriteLog.error(
-                `[entries-dual-write] resume finalize append failed for ${conversationId}: ${err instanceof Error ? err.message : String(err)}`
-              );
-            }
-          })();
-        }
       }
     } else {
       const conv = await this.conversationStore.get(conversationId);
@@ -13782,7 +13584,6 @@ ${resultBody}`,
     conversation.updatedAt = Date.now();
     await this.conversationStore.update(conversation);
     if (pendingResults.length > 0) {
-      const turnId = `callback-${callbackCount}-${conversation.conversationId}`;
       void (async () => {
         try {
           const resultEntries = await this.conversationStore.readEntries(
@@ -13796,17 +13597,12 @@ ${resultBody}`,
           await appendEntriesSafe(
             this.conversationStore,
             conversation,
-            [
-              callbackStartedEntry(consumedSeqs),
-              ...injectedCallbackMessages.map(
-                (m) => userMessageEntry(m, turnId, { hidden: true })
-              )
-            ],
-            dualWriteLog
+            [callbackStartedEntry(consumedSeqs)],
+            entriesQueueLog
           );
         } catch (err) {
-          dualWriteLog.error(
-            `[entries-dual-write] callback_started append failed for ${conversation.conversationId}: ${err instanceof Error ? err.message : String(err)}`
+          entriesQueueLog.error(
+            `[entries-queue] callback_started append failed for ${conversation.conversationId}: ${err instanceof Error ? err.message : String(err)}`
           );
         }
       })();
@@ -13892,25 +13688,6 @@ ${resultBody}`,
           }, { shouldRebuildCanonical: true, clearApprovals: false });
           freshConv.runningCallbackSince = void 0;
           await this.conversationStore.update(freshConv);
-          if (callbackAssistantMsg) {
-            const finalMsg = callbackAssistantMsg;
-            void appendEntriesSafe(
-              this.conversationStore,
-              freshConv,
-              [assistantMessageEntry(finalMsg, `callback-${conversationId}`, execution.latestRunId)],
-              dualWriteLog
-            ).then(
-              () => verifyEntriesParity(
-                this.conversationStore,
-                conversationId,
-                {
-                  harnessMessages: freshConv._harnessMessages,
-                  displayMessages: freshConv.messages
-                },
-                dualWriteLog
-              )
-            );
-          }
           if (freshConv.channelMeta && execution.draft.assistantResponse.length > 0) {
             this.hooks?.onMessagingNotify?.(conversationId, execution.draft.assistantResponse);
           }
@@ -14323,11 +14100,11 @@ ${resultBody}`,
           this.conversationStore,
           parent,
           [subagentResultEntry(result)],
-          dualWriteLog
+          entriesQueueLog
         );
       } catch (err) {
-        dualWriteLog.error(
-          `[entries-dual-write] subagent_result append failed for ${parentConversationId}: ${err instanceof Error ? err.message : String(err)}`
+        entriesQueueLog.error(
+          `[entries-queue] subagent_result append failed for ${parentConversationId}: ${err instanceof Error ? err.message : String(err)}`
         );
       }
     })();
@@ -14518,8 +14295,6 @@ var runConversationTurn = async (opts) => {
     conversation.updatedAt = Date.now();
     await opts.conversationStore.update(conversation);
   };
-  const preTurnHarnessMessages = conversation._harnessMessages ? [...conversation._harnessMessages] : void 0;
-  const turnId = assistantId;
   conversation.messages = [...historyMessages, userMessage];
   conversation.subagentCallbackCount = 0;
   conversation._continuationCount = void 0;
@@ -14529,12 +14304,6 @@ var runConversationTurn = async (opts) => {
       `failed to persist user turn: ${err instanceof Error ? err.message : String(err)}`
     );
   });
-  void appendEntriesSafe(
-    opts.conversationStore,
-    conversation,
-    [userMessageEntry(userMessage, turnId)],
-    log
-  );
   try {
     const execution = await executeConversationTurn({
       harness: opts.harness,
@@ -14582,34 +14351,6 @@ var runConversationTurn = async (opts) => {
               ...existingHistory,
               ...preRunMessages.slice(0, removedCount)
             ];
-            const summaryMessage = event.compactedMessages[0];
-            const keptCount = Math.max(0, event.compactedMessages.length - 1);
-            if (summaryMessage) {
-              void (async () => {
-                try {
-                  const existing = await opts.conversationStore.readEntries(
-                    opts.conversationId,
-                    { types: ["harness_message"] }
-                  );
-                  const harnessSeqs = existing.map((e) => e.seq);
-                  const firstKeptSeq = harnessSeqs.length >= keptCount && keptCount > 0 ? harnessSeqs[harnessSeqs.length - keptCount] : (harnessSeqs[harnessSeqs.length - 1] ?? 0) + 1;
-                  await appendEntriesSafe(
-                    opts.conversationStore,
-                    conversation,
-                    [
-                      compactionEntry(summaryMessage, firstKeptSeq, {
-                        tokensBefore: conversation.contextTokens
-                      })
-                    ],
-                    log
-                  );
-                } catch (err) {
-                  log.error(
-                    `[entries-dual-write] compaction append failed: ${err instanceof Error ? err.message : String(err)}`
-                  );
-                }
-              })();
-            }
           }
         }
         if (event.type === "step:completed") {
@@ -14743,36 +14484,6 @@ var runConversationTurn = async (opts) => {
         { shouldRebuildCanonical }
       );
       await opts.conversationStore.update(conversation);
-      const finalAssistant = conversation.messages[conversation.messages.length - 1];
-      const { messages: newHarness, approximate } = newHarnessMessagesThisTurn(
-        preTurnHarnessMessages,
-        conversation._harnessMessages
-      );
-      if (approximate) {
-        log.warn(
-          `[entries-dual-write] ${opts.conversationId} harness-message diff approximate (blob array shrank this turn \u2014 likely compaction); appended full context`
-        );
-      }
-      const finalizeEntries = [
-        ...harnessMessageEntries(newHarness, turnId),
-        ...finalAssistant && finalAssistant.role === "assistant" ? [assistantMessageEntry(finalAssistant, turnId, latestRunId)] : []
-      ];
-      void appendEntriesSafe(
-        opts.conversationStore,
-        conversation,
-        finalizeEntries,
-        log
-      ).then(
-        () => verifyEntriesParity(
-          opts.conversationStore,
-          opts.conversationId,
-          {
-            harnessMessages: conversation._harnessMessages,
-            displayMessages: conversation.messages
-          },
-          log
-        )
-      );
     }
     return {
       latestRunId,
@@ -14895,8 +14606,6 @@ export {
   buildAgentDirectoryName,
   buildApprovalCheckpoints,
   buildAssistantMetadata,
-  buildDisplaySnapshot,
-  buildLlmContext,
   buildSkillContextWindow,
   buildToolCompletedText,
   cloneSections,
@@ -14933,7 +14642,6 @@ export {
   deleteOpenAICodexSession,
   deriveUploadKey,
   ensureAgentIdentity,
-  entriesParityEnabled,
   estimateTokens,
   estimateTotalTokens,
   executeConversationTurn,
@@ -14959,7 +14667,6 @@ export {
   loadSkillMetadataFromDirs,
   loadVfsSkillMetadata,
   mergeSkills,
-  newHarnessMessagesThisTurn,
   normalizeApprovalCheckpoint,
   normalizeOtlp,
   normalizeScriptPolicyPath,
@@ -14983,7 +14690,6 @@ export {
   runConversationTurn,
   slugifyStorageComponent,
   startOpenAICodexDeviceAuth,
-  verifyEntriesParity,
   verifyTenantToken,
   withToolResultArchiveParam,
   writeOpenAICodexSession

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poncho-ai/harness",
-  "version": "0.59.2",
+  "version": "0.59.3",
   "description": "Agent execution runtime - conversation loop, tool dispatch, streaming",
   "repository": {
     "type": "git",

package/src/index.ts

@@ -21,23 +21,15 @@ export * from "./telemetry.js";
 export * from "./secrets-store.js";
 export * from "./storage/index.js";
 export * from "./storage/store-adapters.js";
-// Append-only conversation entries (Phase 3 substrate): types + rebuild fns.
-// appendEntries/readEntries are reachable on the ConversationStore /
-// StorageEngine.conversations surfaces already exported above.
+// Subagent delivery queue (append-only conversation_entries): types + the
+// pending-results rebuild. appendEntries/readEntries are reachable on the
+// ConversationStore / StorageEngine.conversations surfaces exported above.
 export {
-  buildLlmContext,
-  buildDisplaySnapshot,
   getPendingSubagentResults,
   type ConversationEntry,
   type NewConversationEntry,
-  type UserMessageEntry,
-  type AssistantMessageEntry,
-  type AssistantAmendmentEntry,
-  type HarnessMessageEntry,
-  type CompactionEntry,
   type SubagentResultEntry,
   type CallbackStartedEntry,
-  type DisplaySnapshot,
 } from "./storage/entries.js";
 export {
   PonchoFsAdapter,