@poncho-ai/cli 0.33.1 → 0.33.2

package/dist/{chunk-IDGGF5WH.js → chunk-QAUWCAWU.js}

@@ -7175,12 +7175,8 @@ var collectEnvFileLines = (answers) => {
   }
   const telemetryEnabled = Boolean(answers["telemetry.enabled"] ?? true);
   if (telemetryEnabled) {
-    lines.push("# Telemetry (optional)");
-    lines.push("# Latitude telemetry setup: https://docs.latitude.so/");
-    lines.push("# If not using Latitude yet, you can leave these empty.");
-    lines.push("LATITUDE_API_KEY=");
-    lines.push("LATITUDE_PROJECT_ID=");
-    lines.push("LATITUDE_PATH=");
+    lines.push("# Telemetry (optional) \u2014 set an OTLP endpoint to export traces");
+    lines.push("# OTEL_EXPORTER_OTLP_ENDPOINT=");
     lines.push("");
   }
   while (lines.length > 0 && lines[lines.length - 1] === "") {
@@ -7599,14 +7595,17 @@ var parseParams = (values) => {
   return params;
 };
 var normalizeMessageForClient = (message) => {
+  if (message.role === "tool" || message.role === "system") {
+    return null;
+  }
   if (message.role !== "assistant" || typeof message.content !== "string") {
     return message;
   }
   try {
     const parsed = JSON.parse(message.content);
-    const text = typeof parsed.text === "string" ? parsed.text : void 0;
     const toolCalls = Array.isArray(parsed.tool_calls) ? parsed.tool_calls : void 0;
-    if (typeof text === "string" && toolCalls) {
+    if (toolCalls) {
+      const text = typeof parsed.text === "string" ? parsed.text : "";
       const meta = { ...message.metadata ?? {} };
       if (!meta.sections && toolCalls.length > 0) {
         const toolLabels = toolCalls.map((tc) => {
@@ -7724,6 +7723,7 @@ var buildAssistantMetadata = (draft, sectionsOverride) => {
 var executeConversationTurn = async ({
   harness,
   runInput,
+  events,
   initialContextTokens = 0,
   initialContextWindow = 0,
   onEvent
@@ -7738,7 +7738,8 @@ var executeConversationTurn = async ({
   let runContextWindow = initialContextWindow;
   let runSteps = 0;
   let runMaxSteps;
-  for await (const event of harness.runWithTelemetry(runInput)) {
+  const source = events ?? harness.runWithTelemetry(runInput);
+  for await (const event of source) {
     recordStandardTurnEvent(draft, event);
     if (event.type === "run:started") {
       latestRunId = event.runId;
@@ -7831,6 +7832,76 @@ var __internalRunOrchestration = {
   recordStandardTurnEvent,
   executeConversationTurn
 };
+var applyTurnMetadata = (conv, meta, opts = {}) => {
+  const {
+    clearContinuation = true,
+    clearApprovals = true,
+    setIdle = true,
+    shouldRebuildCanonical = false
+  } = opts;
+  if (meta.continuation && meta.continuationMessages) {
+    conv._continuationMessages = meta.continuationMessages;
+  } else if (clearContinuation) {
+    conv._continuationMessages = void 0;
+    conv._continuationCount = void 0;
+  }
+  if (meta.harnessMessages) {
+    conv._harnessMessages = meta.harnessMessages;
+  } else if (shouldRebuildCanonical) {
+    conv._harnessMessages = conv.messages;
+  }
+  if (meta.toolResultArchive !== void 0) {
+    conv._toolResultArchive = meta.toolResultArchive;
+  }
+  conv.runtimeRunId = meta.latestRunId || conv.runtimeRunId;
+  if (clearApprovals) conv.pendingApprovals = [];
+  if (setIdle) conv.runStatus = "idle";
+  if (meta.contextTokens > 0) conv.contextTokens = meta.contextTokens;
+  if (meta.contextWindow > 0) conv.contextWindow = meta.contextWindow;
+  conv.updatedAt = Date.now();
+};
+var runCronAgent = async (harnessRef, task, conversationId, historyMessages, toolResultArchive, onEvent) => {
+  const execution = await executeConversationTurn({
+    harness: harnessRef,
+    runInput: {
+      task,
+      conversationId,
+      parameters: {
+        __activeConversationId: conversationId,
+        [TOOL_RESULT_ARCHIVE_PARAM]: toolResultArchive ?? {}
+      },
+      messages: historyMessages
+    },
+    onEvent
+  });
+  flushTurnDraft(execution.draft);
+  const hasContent = execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0;
+  const assistantMetadata = buildAssistantMetadata(execution.draft);
+  return {
+    response: execution.draft.assistantResponse,
+    steps: execution.runSteps,
+    assistantMetadata,
+    hasContent,
+    contextTokens: execution.runContextTokens,
+    contextWindow: execution.runContextWindow,
+    harnessMessages: execution.runHarnessMessages,
+    toolResultArchive: harnessRef.getToolResultArchive(conversationId),
+    latestRunId: execution.latestRunId,
+    continuation: execution.runContinuation,
+    continuationMessages: execution.runContinuationMessages
+  };
+};
+var buildCronMessages = (task, historyMessages, result) => [
+  ...historyMessages,
+  { role: "user", content: task },
+  ...result.hasContent ? [{ role: "assistant", content: result.response, metadata: result.assistantMetadata }] : []
+];
+var appendCronTurn = (conv, task, result) => {
+  conv.messages.push(
+    { role: "user", content: task },
+    ...result.hasContent ? [{ role: "assistant", content: result.response, metadata: result.assistantMetadata }] : []
+  );
+};
 var AGENT_TEMPLATE = (name, id, options) => `---
 name: ${name}
 id: ${id}
@@ -9651,30 +9722,23 @@ ${resultBody}`,
       if (callbackNeedsContinuation || execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0) {
         const freshConv = await conversationStore.get(conversationId);
         if (freshConv) {
-          if (callbackNeedsContinuation) {
-            freshConv._continuationMessages = execution.runContinuationMessages;
-          } else {
-            freshConv._continuationMessages = void 0;
+          if (!callbackNeedsContinuation) {
             freshConv.messages.push({
               role: "assistant",
               content: execution.draft.assistantResponse,
               metadata: buildAssistantMetadata(execution.draft)
             });
           }
-          if (callbackNeedsContinuation && execution.runHarnessMessages) {
-            freshConv._harnessMessages = execution.runHarnessMessages;
-          } else if (historySelection.shouldRebuildCanonical) {
-            freshConv._harnessMessages = freshConv.messages;
-          } else {
-            freshConv._harnessMessages = freshConv.messages;
-          }
-          freshConv._toolResultArchive = harness.getToolResultArchive(conversationId);
-          freshConv.runtimeRunId = execution.latestRunId || freshConv.runtimeRunId;
+          applyTurnMetadata(freshConv, {
+            latestRunId: execution.latestRunId,
+            contextTokens: execution.runContextTokens,
+            contextWindow: execution.runContextWindow,
+            continuation: !!callbackNeedsContinuation,
+            continuationMessages: execution.runContinuationMessages,
+            harnessMessages: callbackNeedsContinuation ? execution.runHarnessMessages : void 0,
+            toolResultArchive: harness.getToolResultArchive(conversationId)
+          }, { shouldRebuildCanonical: true, clearApprovals: false });
           freshConv.runningCallbackSince = void 0;
-          freshConv.runStatus = "idle";
-          if (execution.runContextTokens > 0) freshConv.contextTokens = execution.runContextTokens;
-          if (execution.runContextWindow > 0) freshConv.contextWindow = execution.runContextWindow;
-          freshConv.updatedAt = Date.now();
           await conversationStore.update(freshConv);
           if (freshConv.channelMeta && execution.draft.assistantResponse.length > 0) {
             const adapter = messagingAdapters.get(freshConv.channelMeta.platform);
@@ -9863,15 +9927,7 @@ ${resultBody}`,
       runId: null
     });
     let latestRunId = conversation.runtimeRunId ?? "";
-    let assistantResponse = "";
-    const toolTimeline = [];
-    const sections = [];
-    let currentText = "";
-    let currentTools = [];
     let checkpointedRun = false;
-    let runContextTokens = conversation.contextTokens ?? 0;
-    let runContextWindow = conversation.contextWindow ?? 0;
-    let resumeHarnessMessages;
     const normalizedCheckpoint = normalizeApprovalCheckpoint(checkpoint, conversation.messages);
     const baseMessages = normalizedCheckpoint.baseMessageCount != null ? conversation.messages.slice(0, normalizedCheckpoint.baseMessageCount) : [];
     const fullCheckpointMessages = [...baseMessages, ...normalizedCheckpoint.checkpointMessages];
@@ -9901,133 +9957,99 @@ ${resultBody}`,
       }
     }
     const fullCheckpointWithResults = resumeToolResultMsg ? [...fullCheckpointMessages, resumeToolResultMsg] : fullCheckpointMessages;
+    let draftRef;
+    let execution;
     try {
-      for await (const event of harness.continueFromToolResult({
-        messages: fullCheckpointMessages,
-        toolResults,
-        conversationId,
-        abortSignal: abortController.signal
-      })) {
-        if (event.type === "run:started") {
-          latestRunId = event.runId;
-          runOwners.set(event.runId, conversation.ownerId);
-          runConversations.set(event.runId, conversationId);
-          const active = activeConversationRuns.get(conversationId);
-          if (active && active.abortController === abortController) {
-            active.runId = event.runId;
-          }
-        }
-        if (event.type === "model:chunk") {
-          if (currentTools.length > 0) {
-            sections.push({ type: "tools", content: currentTools });
-            currentTools = [];
-            if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
-              assistantResponse += " ";
+      execution = await executeConversationTurn({
+        harness,
+        events: harness.continueFromToolResult({
+          messages: fullCheckpointMessages,
+          toolResults,
+          conversationId,
+          abortSignal: abortController.signal
+        }),
+        initialContextTokens: conversation.contextTokens ?? 0,
+        initialContextWindow: conversation.contextWindow ?? 0,
+        onEvent: async (event, draft2) => {
+          draftRef = draft2;
+          if (event.type === "run:started") {
+            latestRunId = event.runId;
+            runOwners.set(event.runId, conversation.ownerId);
+            runConversations.set(event.runId, conversationId);
+            const active = activeConversationRuns.get(conversationId);
+            if (active && active.abortController === abortController) {
+              active.runId = event.runId;
             }
           }
-          assistantResponse += event.content;
-          currentText += event.content;
-        }
-        if (event.type === "tool:started") {
-          if (currentText.length > 0) {
-            sections.push({ type: "text", content: currentText });
-            currentText = "";
+          if (event.type === "tool:approval:required") {
+            const toolText = `- approval required \`${event.tool}\``;
+            draft2.toolTimeline.push(toolText);
+            draft2.currentTools.push(toolText);
           }
-          const toolText = `- start \`${event.tool}\``;
-          toolTimeline.push(toolText);
-          currentTools.push(toolText);
-        }
-        if (event.type === "tool:completed") {
-          const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
-          toolTimeline.push(toolText);
-          currentTools.push(toolText);
-        }
-        if (event.type === "tool:error") {
-          const toolText = `- error \`${event.tool}\`: ${event.error}`;
-          toolTimeline.push(toolText);
-          currentTools.push(toolText);
-        }
-        if (event.type === "tool:approval:required") {
-          const toolText = `- approval required \`${event.tool}\``;
-          toolTimeline.push(toolText);
-          currentTools.push(toolText);
-        }
-        if (event.type === "tool:approval:checkpoint") {
-          const conv = await conversationStore.get(conversationId);
-          if (conv) {
-            conv.pendingApprovals = buildApprovalCheckpoints({
-              approvals: event.approvals,
-              runId: latestRunId,
-              checkpointMessages: [...fullCheckpointWithResults, ...event.checkpointMessages],
-              baseMessageCount: 0,
-              pendingToolCalls: event.pendingToolCalls
-            });
-            conv.updatedAt = Date.now();
-            await conversationStore.update(conv);
-            if (conv.channelMeta?.platform === "telegram") {
-              const tgAdapter = messagingAdapters.get("telegram");
-              if (tgAdapter) {
-                const messageThreadId = parseTelegramMessageThreadIdFromPlatformThreadId(
-                  conv.channelMeta.platformThreadId,
-                  conv.channelMeta.channelId
-                );
-                void tgAdapter.sendApprovalRequest(
-                  conv.channelMeta.channelId,
-                  event.approvals.map((a) => ({ approvalId: a.approvalId, tool: a.tool, input: a.input })),
-                  { message_thread_id: messageThreadId }
-                ).catch(() => {
-                });
+          if (event.type === "tool:approval:checkpoint") {
+            const conv = await conversationStore.get(conversationId);
+            if (conv) {
+              conv.pendingApprovals = buildApprovalCheckpoints({
+                approvals: event.approvals,
+                runId: latestRunId,
+                checkpointMessages: [...fullCheckpointWithResults, ...event.checkpointMessages],
+                baseMessageCount: 0,
+                pendingToolCalls: event.pendingToolCalls
+              });
+              conv.updatedAt = Date.now();
+              await conversationStore.update(conv);
+              if (conv.channelMeta?.platform === "telegram") {
+                const tgAdapter = messagingAdapters.get("telegram");
+                if (tgAdapter) {
+                  const messageThreadId = parseTelegramMessageThreadIdFromPlatformThreadId(
+                    conv.channelMeta.platformThreadId,
+                    conv.channelMeta.channelId
+                  );
+                  void tgAdapter.sendApprovalRequest(
+                    conv.channelMeta.channelId,
+                    event.approvals.map((a) => ({ approvalId: a.approvalId, tool: a.tool, input: a.input })),
+                    { message_thread_id: messageThreadId }
+                  ).catch(() => {
+                  });
+                }
               }
             }
+            checkpointedRun = true;
           }
-          checkpointedRun = true;
-        }
-        if (event.type === "run:completed") {
-          if (assistantResponse.length === 0 && event.result.response) {
-            assistantResponse = event.result.response;
-          }
-          runContextTokens = event.result.contextTokens ?? runContextTokens;
-          runContextWindow = event.result.contextWindow ?? runContextWindow;
-          if (event.result.continuationMessages) {
-            resumeHarnessMessages = event.result.continuationMessages;
-          }
-        }
-        if (event.type === "run:error") {
-          assistantResponse = assistantResponse || `[Error: ${event.error.message}]`;
+          await telemetry.emit(event);
+          broadcastEvent(conversationId, event);
+          emitBrowserStatusIfActive(conversationId, event);
         }
-        await telemetry.emit(event);
-        broadcastEvent(conversationId, event);
-        emitBrowserStatusIfActive(conversationId, event);
-      }
+      });
+      flushTurnDraft(execution.draft);
+      latestRunId = execution.latestRunId || latestRunId;
     } catch (err) {
       console.error("[resume-run] error:", err instanceof Error ? err.message : err);
-      assistantResponse = assistantResponse || `[Error: ${err instanceof Error ? err.message : "Unknown error"}]`;
-    }
-    if (currentTools.length > 0) {
-      sections.push({ type: "tools", content: currentTools });
-    }
-    if (currentText.length > 0) {
-      sections.push({ type: "text", content: currentText });
+      if (draftRef) {
+        draftRef.assistantResponse = draftRef.assistantResponse || `[Error: ${err instanceof Error ? err.message : "Unknown error"}]`;
+        flushTurnDraft(draftRef);
+      }
     }
+    const draft = execution?.draft ?? draftRef ?? createTurnDraftState();
     if (!checkpointedRun) {
       const conv = await conversationStore.get(conversationId);
       if (conv) {
-        const prevMessages = conv.messages;
-        const hasAssistantContent = assistantResponse.length > 0 || toolTimeline.length > 0 || sections.length > 0;
+        const hasAssistantContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draft.sections.length > 0;
         if (hasAssistantContent) {
+          const prevMessages = conv.messages;
           const lastMsg = prevMessages[prevMessages.length - 1];
           if (lastMsg && lastMsg.role === "assistant" && lastMsg.metadata) {
             const existingToolActivity = lastMsg.metadata.toolActivity;
             const existingSections = lastMsg.metadata.sections;
             const mergedTimeline = [
               ...Array.isArray(existingToolActivity) ? existingToolActivity : [],
-              ...toolTimeline
+              ...draft.toolTimeline
             ];
             const mergedSections = [
               ...Array.isArray(existingSections) ? existingSections : [],
-              ...sections
+              ...draft.sections
             ];
-            const mergedText = (typeof lastMsg.content === "string" ? lastMsg.content : "") + assistantResponse;
+            const mergedText = (typeof lastMsg.content === "string" ? lastMsg.content : "") + draft.assistantResponse;
             conv.messages = [
               ...prevMessages.slice(0, -1),
               {
@@ -10044,23 +10066,18 @@ ${resultBody}`,
               ...prevMessages,
               {
                 role: "assistant",
-                content: assistantResponse,
-                metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
+                content: draft.assistantResponse,
+                metadata: buildAssistantMetadata(draft)
               }
             ];
           }
         }
-        if (resumeHarnessMessages) {
-          conv._harnessMessages = resumeHarnessMessages;
-        } else {
-          conv._harnessMessages = conv.messages;
-        }
-        conv.runtimeRunId = latestRunId || conv.runtimeRunId;
-        conv.pendingApprovals = [];
-        conv.runStatus = "idle";
-        if (runContextTokens > 0) conv.contextTokens = runContextTokens;
-        if (runContextWindow > 0) conv.contextWindow = runContextWindow;
-        conv.updatedAt = Date.now();
+        applyTurnMetadata(conv, {
+          latestRunId,
+          contextTokens: execution?.runContextTokens ?? 0,
+          contextWindow: execution?.runContextWindow ?? 0,
+          harnessMessages: execution?.runHarnessMessages
+        }, { shouldRebuildCanonical: true });
         await conversationStore.update(conv);
       }
     } else {
@@ -10201,7 +10218,7 @@ ${resultBody}`,
         conversationId,
         messages: historyMessages,
         files: input2.files,
-        parameters: {
+        parameters: withToolResultArchiveParam({
           ...input2.metadata ? {
             __messaging_platform: input2.metadata.platform,
             __messaging_sender_id: input2.metadata.sender.id,
@@ -10209,7 +10226,7 @@ ${resultBody}`,
             __messaging_thread_id: input2.metadata.threadId
           } : {},
           __activeConversationId: conversationId
-        }
+        }, latestConversation ?? { _toolResultArchive: {} })
       };
       try {
         const execution = await executeConversationTurn({
@@ -10302,31 +10319,31 @@ ${resultBody}`,
       flushTurnDraft(draft);
       if (!checkpointedRun) {
         await updateConversation((c) => {
-          if (runContinuation2 && runContinuationMessages) {
-            c._continuationMessages = runContinuationMessages;
-          } else {
-            c._continuationMessages = void 0;
+          if (!(runContinuation2 && runContinuationMessages)) {
             c.messages = buildMessages();
           }
-          if (runContinuationMessages) {
-            c._harnessMessages = runContinuationMessages;
-          } else if (shouldRebuildCanonical) {
-            c._harnessMessages = c.messages;
-          } else {
-            c._harnessMessages = c.messages;
-          }
-          c.runtimeRunId = latestRunId || c.runtimeRunId;
-          c.pendingApprovals = [];
-          c.runStatus = "idle";
-          if (runContextTokens > 0) c.contextTokens = runContextTokens;
-          if (runContextWindow > 0) c.contextWindow = runContextWindow;
+          applyTurnMetadata(c, {
+            latestRunId,
+            contextTokens: runContextTokens,
+            contextWindow: runContextWindow,
+            continuation: runContinuation2,
+            continuationMessages: runContinuationMessages,
+            harnessMessages: runContinuationMessages,
+            toolResultArchive: harness.getToolResultArchive(conversationId)
+          }, { shouldRebuildCanonical: true });
         });
       } else {
         await updateConversation((c) => {
-          if (shouldRebuildCanonical && !c._harnessMessages?.length) {
-            c._harnessMessages = c.messages;
-          }
-          c.runStatus = "idle";
+          applyTurnMetadata(c, {
+            latestRunId: "",
+            contextTokens: 0,
+            contextWindow: 0,
+            toolResultArchive: harness.getToolResultArchive(conversationId)
+          }, {
+            clearContinuation: false,
+            clearApprovals: false,
+            shouldRebuildCanonical: shouldRebuildCanonical && !c._harnessMessages?.length
+          });
         });
       }
       finishConversationStream(conversationId);
@@ -10477,7 +10494,7 @@ ${resultBody}`,
     return typeof headerValue === "string" && headerValue === internalSecret;
   };
   const MAX_CONTINUATION_COUNT = 20;
-  async function* runContinuation(conversationId) {
+  async function runContinuation(conversationId, onYield) {
     const conversation = await conversationStore.get(conversationId);
     if (!conversation) return;
     if (Array.isArray(conversation.pendingApprovals) && conversation.pendingApprovals.length > 0) return;
@@ -10515,132 +10532,69 @@ ${resultBody}`,
     }
     try {
       if (conversation.parentConversationId) {
-        yield* runSubagentContinuation(conversationId, conversation, continuationMessages);
+        for await (const event of runSubagentContinuation(conversationId, conversation, continuationMessages)) {
+          if (onYield) await onYield(event);
+        }
       } else {
-        yield* runChatContinuation(conversationId, conversation, continuationMessages);
+        await runChatContinuation(conversationId, conversation, continuationMessages, onYield);
       }
     } finally {
       activeConversationRuns.delete(conversationId);
       finishConversationStream(conversationId);
     }
   }
-  async function* runChatContinuation(conversationId, conversation, continuationMessages) {
-    let assistantResponse = "";
-    let latestRunId = conversation.runtimeRunId ?? "";
-    const toolTimeline = [];
-    const sections = [];
-    let currentTools = [];
-    let currentText = "";
-    let runContextTokens = conversation.contextTokens ?? 0;
-    let runContextWindow = conversation.contextWindow ?? 0;
-    let nextContinuationMessages;
-    let nextHarnessMessages;
-    for await (const event of harness.runWithTelemetry({
-      conversationId,
-      parameters: withToolResultArchiveParam({
-        __activeConversationId: conversationId,
-        __ownerId: conversation.ownerId
-      }, conversation),
-      messages: continuationMessages,
-      abortSignal: activeConversationRuns.get(conversationId)?.abortController.signal
-    })) {
-      if (event.type === "run:started") {
-        latestRunId = event.runId;
-        runOwners.set(event.runId, conversation.ownerId);
-        runConversations.set(event.runId, conversationId);
-        const active = activeConversationRuns.get(conversationId);
-        if (active) active.runId = event.runId;
-      }
-      if (event.type === "model:chunk") {
-        if (currentTools.length > 0) {
-          sections.push({ type: "tools", content: currentTools });
-          currentTools = [];
-          if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
-            assistantResponse += " ";
-          }
-        }
-        assistantResponse += event.content;
-        currentText += event.content;
-      }
-      if (event.type === "tool:started") {
-        if (currentText.length > 0) {
-          sections.push({ type: "text", content: currentText });
-          currentText = "";
-        }
-        const toolText = `- start \`${event.tool}\``;
-        toolTimeline.push(toolText);
-        currentTools.push(toolText);
-      }
-      if (event.type === "tool:completed") {
-        const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
-        toolTimeline.push(toolText);
-        currentTools.push(toolText);
-      }
-      if (event.type === "tool:error") {
-        const toolText = `- error \`${event.tool}\`: ${event.error}`;
-        toolTimeline.push(toolText);
-        currentTools.push(toolText);
-      }
-      if (event.type === "run:completed") {
-        runContextTokens = event.result.contextTokens ?? runContextTokens;
-        runContextWindow = event.result.contextWindow ?? runContextWindow;
-        if (event.result.continuation && event.result.continuationMessages) {
-          nextContinuationMessages = event.result.continuationMessages;
-        }
-        if (event.result.continuationMessages) {
-          nextHarnessMessages = event.result.continuationMessages;
-        }
-        if (!assistantResponse && event.result.response) {
-          assistantResponse = event.result.response;
+  async function runChatContinuation(conversationId, conversation, continuationMessages, onYield) {
+    const execution = await executeConversationTurn({
+      harness,
+      runInput: {
+        conversationId,
+        parameters: withToolResultArchiveParam({
+          __activeConversationId: conversationId,
+          __ownerId: conversation.ownerId
+        }, conversation),
+        messages: continuationMessages,
+        abortSignal: activeConversationRuns.get(conversationId)?.abortController.signal
+      },
+      initialContextTokens: conversation.contextTokens ?? 0,
+      initialContextWindow: conversation.contextWindow ?? 0,
+      onEvent: async (event) => {
+        if (event.type === "run:started") {
+          runOwners.set(event.runId, conversation.ownerId);
+          runConversations.set(event.runId, conversationId);
+          const active = activeConversationRuns.get(conversationId);
+          if (active) active.runId = event.runId;
         }
+        await telemetry.emit(event);
+        broadcastEvent(conversationId, event);
+        if (onYield) await onYield(event);
       }
-      if (event.type === "run:error") {
-        assistantResponse = assistantResponse || `[Error: ${event.error.message}]`;
-      }
-      await telemetry.emit(event);
-      broadcastEvent(conversationId, event);
-      yield event;
-    }
-    if (currentTools.length > 0) sections.push({ type: "tools", content: currentTools });
-    if (currentText.length > 0) sections.push({ type: "text", content: currentText });
+    });
+    flushTurnDraft(execution.draft);
     const freshConv = await conversationStore.get(conversationId);
     if (!freshConv) return;
-    const hasContent = assistantResponse.length > 0 || toolTimeline.length > 0;
-    const assistantMetadata = toolTimeline.length > 0 || sections.length > 0 ? {
-      toolActivity: [...toolTimeline],
-      sections: sections.length > 0 ? sections : void 0
-    } : void 0;
-    if (nextContinuationMessages) {
-      if (hasContent) {
-        freshConv.messages = [
-          ...freshConv.messages,
-          { role: "assistant", content: assistantResponse, metadata: assistantMetadata }
-        ];
-      }
-      freshConv._continuationMessages = nextContinuationMessages;
+    const hasContent = execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0;
+    if (hasContent) {
+      freshConv.messages = [
+        ...freshConv.messages,
+        {
+          role: "assistant",
+          content: execution.draft.assistantResponse,
+          metadata: buildAssistantMetadata(execution.draft)
+        }
+      ];
+    }
+    applyTurnMetadata(freshConv, {
+      latestRunId: execution.latestRunId,
+      contextTokens: execution.runContextTokens,
+      contextWindow: execution.runContextWindow,
+      continuation: execution.runContinuation,
+      continuationMessages: execution.runContinuationMessages,
+      harnessMessages: execution.runHarnessMessages,
+      toolResultArchive: harness.getToolResultArchive(conversationId)
+    }, { shouldRebuildCanonical: true });
+    if (execution.runContinuation) {
       freshConv._continuationCount = conversation._continuationCount;
-    } else {
-      if (hasContent) {
-        freshConv.messages = [
-          ...freshConv.messages,
-          { role: "assistant", content: assistantResponse, metadata: assistantMetadata }
-        ];
-      }
-      freshConv._continuationMessages = void 0;
-      freshConv._continuationCount = void 0;
     }
-    if (nextHarnessMessages) {
-      freshConv._harnessMessages = nextHarnessMessages;
-    } else {
-      freshConv._harnessMessages = freshConv.messages;
-    }
-    freshConv._toolResultArchive = harness.getToolResultArchive(conversationId);
-    freshConv.runtimeRunId = latestRunId || freshConv.runtimeRunId;
-    freshConv.pendingApprovals = [];
-    if (runContextTokens > 0) freshConv.contextTokens = runContextTokens;
-    if (runContextWindow > 0) freshConv.contextWindow = runContextWindow;
-    freshConv.runStatus = "idle";
-    freshConv.updatedAt = Date.now();
     await conversationStore.update(freshConv);
   }
   async function* runSubagentContinuation(conversationId, conversation, continuationMessages) {
@@ -11206,8 +11160,7 @@ ${resultBody}`,
         writeJson(response, 202, { ok: true });
         const work = (async () => {
           try {
-            for await (const _event of runContinuation(conversationId)) {
-            }
+            await runContinuation(conversationId);
             const conv = await conversationStore.get(conversationId);
             if (conv?._continuationMessages?.length) {
               await selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`);
@@ -11818,7 +11771,7 @@ data: ${JSON.stringify(frame)}
         writeJson(response, 200, {
           conversation: {
             ...conversation,
-            messages: conversation.messages.map(normalizeMessageForClient),
+            messages: conversation.messages.map(normalizeMessageForClient).filter((m) => m !== null),
             pendingApprovals: storedPending,
             _continuationMessages: void 0,
             _harnessMessages: void 0
@@ -12024,7 +11977,7 @@ data: ${JSON.stringify(frame)}
       });
       let eventCount = 0;
       try {
-        for await (const event of runContinuation(conversationId)) {
+        await runContinuation(conversationId, async (event) => {
           eventCount++;
           let sseEvent = event;
           if (sseEvent.type === "run:completed") {
@@ -12037,7 +11990,7 @@ data: ${JSON.stringify(frame)}
           } catch {
           }
           emitBrowserStatusIfActive(conversationId, event, response);
-        }
+        });
       } catch (err) {
         const errorEvent = {
           type: "run:error",
@@ -12152,18 +12105,6 @@ data: ${JSON.stringify(frame)}
         `[poncho] conversation="${conversationId}" history_source=${canonicalHistory.source}`
       );
       let latestRunId = conversation.runtimeRunId ?? "";
-      let assistantResponse = "";
-      const toolTimeline = [];
-      const sections = [];
-      let currentText = "";
-      let currentTools = [];
-      let runCancelled = false;
-      let checkpointedRun = false;
-      let didCompact = false;
-      let runContextTokens = conversation.contextTokens ?? 0;
-      let runContextWindow = conversation.contextWindow ?? 0;
-      let runContinuationMessages;
-      let runHarnessMessages;
       let userContent = messageText;
       if (files.length > 0) {
         try {
@@ -12207,6 +12148,39 @@ data: ${JSON.stringify(frame)}
           }
         }
       });
+      const draft = createTurnDraftState();
+      let checkpointedRun = false;
+      let runCancelled = false;
+      let runContinuationMessages;
+      const buildMessages = () => {
+        const draftSections = cloneSections(draft.sections);
+        if (draft.currentTools.length > 0) {
+          draftSections.push({ type: "tools", content: [...draft.currentTools] });
+        }
+        if (draft.currentText.length > 0) {
+          draftSections.push({ type: "text", content: draft.currentText });
+        }
+        const userTurn = userContent != null ? [{ role: "user", content: userContent }] : [];
+        const hasDraftContent = draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draftSections.length > 0;
+        if (!hasDraftContent) {
+          return [...historyMessages, ...userTurn];
+        }
+        return [
+          ...historyMessages,
+          ...userTurn,
+          {
+            role: "assistant",
+            content: draft.assistantResponse,
+            metadata: buildAssistantMetadata(draft, draftSections)
+          }
+        ];
+      };
+      const persistDraftAssistantTurn = async () => {
+        if (draft.assistantResponse.length === 0 && draft.toolTimeline.length === 0) return;
+        conversation.messages = buildMessages();
+        conversation.updatedAt = Date.now();
+        await conversationStore.update(conversation);
+      };
       try {
         {
           conversation.messages = [...historyMessages, { role: "user", content: userContent }];
@@ -12217,38 +12191,6 @@ data: ${JSON.stringify(frame)}
             console.error("[poncho] Failed to persist user turn:", err);
           });
         }
-        const persistDraftAssistantTurn = async () => {
-          const draftSections = [
-            ...sections.map((section) => ({
-              type: section.type,
-              content: Array.isArray(section.content) ? [...section.content] : section.content
-            }))
-          ];
-          if (currentTools.length > 0) {
-            draftSections.push({ type: "tools", content: [...currentTools] });
-          }
-          if (currentText.length > 0) {
-            draftSections.push({ type: "text", content: currentText });
-          }
-          const hasDraftContent = assistantResponse.length > 0 || toolTimeline.length > 0 || draftSections.length > 0;
-          if (!hasDraftContent) {
-            return;
-          }
-          conversation.messages = [
-            ...historyMessages,
-            ...userContent != null ? [{ role: "user", content: userContent }] : [],
-            {
-              role: "assistant",
-              content: assistantResponse,
-              metadata: toolTimeline.length > 0 || draftSections.length > 0 ? {
-                toolActivity: [...toolTimeline],
-                sections: draftSections.length > 0 ? draftSections : void 0
-              } : void 0
-            }
-          ];
-          conversation.updatedAt = Date.now();
-          await conversationStore.update(conversation);
-        };
         let cachedRecallCorpus;
         const lazyRecallCorpus = async () => {
           if (cachedRecallCorpus) return cachedRecallCorpus;
@@ -12269,249 +12211,156 @@ data: ${JSON.stringify(frame)}
           console.info(`[poncho] recall corpus fetched lazily (${cachedRecallCorpus.length} items, ${(performance.now() - _rc0).toFixed(1)}ms)`);
           return cachedRecallCorpus;
         };
-        for await (const event of harness.runWithTelemetry({
-          task: messageText,
-          conversationId,
-          parameters: withToolResultArchiveParam({
-            ...bodyParameters ?? {},
-            __conversationRecallCorpus: lazyRecallCorpus,
-            __activeConversationId: conversationId,
-            __ownerId: ownerId
-          }, conversation),
-          messages: harnessMessages,
-          files: files.length > 0 ? files : void 0,
-          abortSignal: abortController.signal
-        })) {
-          if (event.type === "run:started") {
-            latestRunId = event.runId;
-            runOwners.set(event.runId, ownerId);
-            runConversations.set(event.runId, conversationId);
-            const active = activeConversationRuns.get(conversationId);
-            if (active && active.abortController === abortController) {
-              active.runId = event.runId;
-            }
-          }
-          if (event.type === "run:cancelled") {
-            runCancelled = true;
-          }
-          if (event.type === "model:chunk") {
-            if (currentTools.length > 0) {
-              sections.push({ type: "tools", content: currentTools });
-              currentTools = [];
-              if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
-                assistantResponse += " ";
+        const execution = await executeConversationTurn({
+          harness,
+          runInput: {
+            task: messageText,
+            conversationId,
+            parameters: withToolResultArchiveParam({
+              ...bodyParameters ?? {},
+              __conversationRecallCorpus: lazyRecallCorpus,
+              __activeConversationId: conversationId,
+              __ownerId: ownerId
+            }, conversation),
+            messages: harnessMessages,
+            files: files.length > 0 ? files : void 0,
+            abortSignal: abortController.signal
+          },
+          initialContextTokens: conversation.contextTokens ?? 0,
+          initialContextWindow: conversation.contextWindow ?? 0,
+          onEvent: async (event, eventDraft) => {
+            draft.assistantResponse = eventDraft.assistantResponse;
+            draft.toolTimeline = eventDraft.toolTimeline;
+            draft.sections = eventDraft.sections;
+            draft.currentTools = eventDraft.currentTools;
+            draft.currentText = eventDraft.currentText;
+            if (event.type === "run:started") {
+              latestRunId = event.runId;
+              runOwners.set(event.runId, ownerId);
+              runConversations.set(event.runId, conversationId);
+              const active = activeConversationRuns.get(conversationId);
+              if (active && active.abortController === abortController) {
+                active.runId = event.runId;
               }
             }
-            assistantResponse += event.content;
-            currentText += event.content;
-          }
-          if (event.type === "tool:started") {
-            if (currentText.length > 0) {
-              sections.push({ type: "text", content: currentText });
-              currentText = "";
-            }
-            const toolText = `- start \`${event.tool}\``;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-          }
-          if (event.type === "tool:completed") {
-            const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-          }
-          if (event.type === "tool:error") {
-            const toolText = `- error \`${event.tool}\`: ${event.error}`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-          }
-          if (event.type === "compaction:completed") {
-            didCompact = true;
-            if (event.compactedMessages) {
-              historyMessages.length = 0;
-              historyMessages.push(...event.compactedMessages);
-              const preservedFromHistory = historyMessages.length - 1;
-              const removedCount = preRunMessages.length - Math.max(0, preservedFromHistory);
-              const existingHistory = conversation.compactedHistory ?? [];
-              conversation.compactedHistory = [
-                ...existingHistory,
-                ...preRunMessages.slice(0, removedCount)
-              ];
-            }
-          }
-          if (event.type === "step:completed") {
-            await persistDraftAssistantTurn();
-          }
-          if (event.type === "tool:approval:required") {
-            const toolText = `- approval required \`${event.tool}\``;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            const existingApprovals = Array.isArray(conversation.pendingApprovals) ? conversation.pendingApprovals : [];
-            if (!existingApprovals.some((approval) => approval.approvalId === event.approvalId)) {
-              conversation.pendingApprovals = [
-                ...existingApprovals,
-                {
-                  approvalId: event.approvalId,
-                  runId: latestRunId || conversation.runtimeRunId || "",
-                  tool: event.tool,
-                  toolCallId: void 0,
-                  input: event.input ?? {},
-                  checkpointMessages: void 0,
-                  baseMessageCount: historyMessages.length,
-                  pendingToolCalls: []
-                }
-              ];
-              conversation.updatedAt = Date.now();
-              await conversationStore.update(conversation);
-            }
-            await persistDraftAssistantTurn();
-          }
-          if (event.type === "tool:approval:checkpoint") {
-            const checkpointSections = [...sections];
-            if (currentTools.length > 0) {
-              checkpointSections.push({ type: "tools", content: [...currentTools] });
+            if (event.type === "run:cancelled") {
+              runCancelled = true;
             }
-            if (currentText.length > 0) {
-              checkpointSections.push({ type: "text", content: currentText });
+            if (event.type === "compaction:completed") {
+              if (event.compactedMessages) {
+                historyMessages.length = 0;
+                historyMessages.push(...event.compactedMessages);
+                const preservedFromHistory = historyMessages.length - 1;
+                const removedCount = preRunMessages.length - Math.max(0, preservedFromHistory);
+                const existingHistory = conversation.compactedHistory ?? [];
+                conversation.compactedHistory = [
+                  ...existingHistory,
+                  ...preRunMessages.slice(0, removedCount)
+                ];
+              }
             }
-            conversation.messages = [
-              ...historyMessages,
-              ...userContent != null ? [{ role: "user", content: userContent }] : [],
-              ...assistantResponse.length > 0 || toolTimeline.length > 0 || checkpointSections.length > 0 ? [{
-                role: "assistant",
-                content: assistantResponse,
-                metadata: toolTimeline.length > 0 || checkpointSections.length > 0 ? { toolActivity: [...toolTimeline], sections: checkpointSections.length > 0 ? checkpointSections : void 0 } : void 0
-              }] : []
-            ];
-            conversation.pendingApprovals = buildApprovalCheckpoints({
-              approvals: event.approvals,
-              runId: latestRunId,
-              checkpointMessages: event.checkpointMessages,
-              baseMessageCount: historyMessages.length,
-              pendingToolCalls: event.pendingToolCalls
-            });
-            conversation._toolResultArchive = harness.getToolResultArchive(conversationId);
-            conversation.updatedAt = Date.now();
-            await conversationStore.update(conversation);
-            checkpointedRun = true;
-          }
-          if (event.type === "run:completed") {
-            if (assistantResponse.length === 0 && event.result.response) {
-              assistantResponse = event.result.response;
+            if (event.type === "step:completed") {
+              await persistDraftAssistantTurn();
             }
-            runContextTokens = event.result.contextTokens ?? runContextTokens;
-            runContextWindow = event.result.contextWindow ?? runContextWindow;
-            if (event.result.continuationMessages) {
-              runHarnessMessages = event.result.continuationMessages;
+            if (event.type === "tool:approval:required") {
+              const toolText = `- approval required \`${event.tool}\``;
+              draft.toolTimeline.push(toolText);
+              draft.currentTools.push(toolText);
+              const existingApprovals = Array.isArray(conversation.pendingApprovals) ? conversation.pendingApprovals : [];
+              if (!existingApprovals.some((approval) => approval.approvalId === event.approvalId)) {
+                conversation.pendingApprovals = [
+                  ...existingApprovals,
+                  {
+                    approvalId: event.approvalId,
+                    runId: latestRunId || conversation.runtimeRunId || "",
+                    tool: event.tool,
+                    toolCallId: void 0,
+                    input: event.input ?? {},
+                    checkpointMessages: void 0,
+                    baseMessageCount: historyMessages.length,
+                    pendingToolCalls: []
+                  }
+                ];
+                conversation.updatedAt = Date.now();
+                await conversationStore.update(conversation);
+              }
+              await persistDraftAssistantTurn();
             }
-            if (event.result.continuation && event.result.continuationMessages) {
-              runContinuationMessages = event.result.continuationMessages;
-              const intSections = [...sections];
-              if (currentTools.length > 0) intSections.push({ type: "tools", content: [...currentTools] });
-              if (currentText.length > 0) intSections.push({ type: "text", content: currentText });
-              const hasContent = assistantResponse.length > 0 || toolTimeline.length > 0 || intSections.length > 0;
-              const intMetadata = toolTimeline.length > 0 || intSections.length > 0 ? { toolActivity: [...toolTimeline], sections: intSections.length > 0 ? intSections : void 0 } : void 0;
-              conversation.messages = [
-                ...historyMessages,
-                ...userContent != null ? [{ role: "user", content: userContent }] : [],
-                ...hasContent ? [{ role: "assistant", content: assistantResponse, metadata: intMetadata }] : []
-              ];
-              conversation._continuationMessages = runContinuationMessages;
-              conversation._harnessMessages = runContinuationMessages;
+            if (event.type === "tool:approval:checkpoint") {
+              conversation.messages = buildMessages();
+              conversation.pendingApprovals = buildApprovalCheckpoints({
+                approvals: event.approvals,
+                runId: latestRunId,
+                checkpointMessages: event.checkpointMessages,
+                baseMessageCount: historyMessages.length,
+                pendingToolCalls: event.pendingToolCalls
+              });
               conversation._toolResultArchive = harness.getToolResultArchive(conversationId);
-              conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
-              if (!checkpointedRun) {
-                conversation.pendingApprovals = [];
-              }
-              if (runContextTokens > 0) conversation.contextTokens = runContextTokens;
-              if (runContextWindow > 0) conversation.contextWindow = runContextWindow;
               conversation.updatedAt = Date.now();
               await conversationStore.update(conversation);
-              if (!checkpointedRun) {
-                doWaitUntil(
-                  new Promise((r) => setTimeout(r, 3e3)).then(
-                    () => selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`)
-                  )
-                );
+              checkpointedRun = true;
+            }
+            if (event.type === "run:completed") {
+              if (event.result.continuation && event.result.continuationMessages) {
+                runContinuationMessages = event.result.continuationMessages;
+                conversation.messages = buildMessages();
+                conversation._continuationMessages = runContinuationMessages;
+                conversation._harnessMessages = runContinuationMessages;
+                conversation._toolResultArchive = harness.getToolResultArchive(conversationId);
+                conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
+                if (!checkpointedRun) {
+                  conversation.pendingApprovals = [];
+                }
+                if ((event.result.contextTokens ?? 0) > 0) conversation.contextTokens = event.result.contextTokens;
+                if ((event.result.contextWindow ?? 0) > 0) conversation.contextWindow = event.result.contextWindow;
+                conversation.updatedAt = Date.now();
+                await conversationStore.update(conversation);
+                if (!checkpointedRun) {
+                  doWaitUntil(
+                    new Promise((r) => setTimeout(r, 3e3)).then(
+                      () => selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`)
+                    )
+                  );
+                }
               }
             }
-          }
-          await telemetry.emit(event);
-          let sseEvent = event.type === "compaction:completed" && event.compactedMessages ? { ...event, compactedMessages: void 0 } : event;
-          if (sseEvent.type === "run:completed") {
-            const hasPendingSubagents = await hasPendingSubagentWorkForParent(conversationId, ownerId);
-            const stripped = { ...sseEvent, result: { ...sseEvent.result, continuationMessages: void 0 } };
-            if (hasPendingSubagents) {
-              sseEvent = { ...stripped, pendingSubagents: true };
-            } else {
-              sseEvent = stripped;
+            await telemetry.emit(event);
+            let sseEvent = event.type === "compaction:completed" && event.compactedMessages ? { ...event, compactedMessages: void 0 } : event;
+            if (sseEvent.type === "run:completed") {
+              const hasPendingSubagents = await hasPendingSubagentWorkForParent(conversationId, ownerId);
+              const stripped = { ...sseEvent, result: { ...sseEvent.result, continuationMessages: void 0 } };
+              if (hasPendingSubagents) {
+                sseEvent = { ...stripped, pendingSubagents: true };
+              } else {
+                sseEvent = stripped;
+              }
             }
-          }
-          broadcastEvent(conversationId, sseEvent);
-          try {
-            response.write(formatSseEvent(sseEvent));
-          } catch {
-          }
-          emitBrowserStatusIfActive(conversationId, event, response);
-        }
-        if (currentTools.length > 0) {
-          sections.push({ type: "tools", content: currentTools });
-        }
-        if (currentText.length > 0) {
-          sections.push({ type: "text", content: currentText });
-        }
-        if (!checkpointedRun && !runContinuationMessages) {
-          const hasAssistantContent = assistantResponse.length > 0 || toolTimeline.length > 0 || sections.length > 0;
-          const userTurn = userContent != null ? [{ role: "user", content: userContent }] : [];
-          conversation.messages = hasAssistantContent ? [
-            ...historyMessages,
-            ...userTurn,
-            {
-              role: "assistant",
-              content: assistantResponse,
-              metadata: toolTimeline.length > 0 || sections.length > 0 ? {
-                toolActivity: toolTimeline,
-                sections: sections.length > 0 ? sections : void 0
-              } : void 0
+            broadcastEvent(conversationId, sseEvent);
+            try {
+              response.write(formatSseEvent(sseEvent));
+            } catch {
             }
-          ] : [...historyMessages, ...userTurn];
-          conversation._continuationMessages = void 0;
-          if (runHarnessMessages) {
-            conversation._harnessMessages = runHarnessMessages;
-          } else if (shouldRebuildCanonical) {
-            conversation._harnessMessages = conversation.messages;
-          } else {
-            conversation._harnessMessages = conversation.messages;
+            emitBrowserStatusIfActive(conversationId, event, response);
           }
-          conversation._toolResultArchive = harness.getToolResultArchive(conversationId);
-          conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
-          conversation.pendingApprovals = [];
-          if (runContextTokens > 0) conversation.contextTokens = runContextTokens;
-          if (runContextWindow > 0) conversation.contextWindow = runContextWindow;
-          conversation.updatedAt = Date.now();
+        });
+        flushTurnDraft(draft);
+        latestRunId = execution.latestRunId || latestRunId;
+        if (!checkpointedRun && !runContinuationMessages) {
+          conversation.messages = buildMessages();
+          applyTurnMetadata(conversation, {
+            latestRunId,
+            contextTokens: execution.runContextTokens,
+            contextWindow: execution.runContextWindow,
+            harnessMessages: execution.runHarnessMessages,
+            toolResultArchive: harness.getToolResultArchive(conversationId)
+          }, { shouldRebuildCanonical });
           await conversationStore.update(conversation);
         }
       } catch (error) {
+        flushTurnDraft(draft);
         if (abortController.signal.aborted || runCancelled) {
-          const fallbackSections = [...sections];
-          if (currentTools.length > 0) {
-            fallbackSections.push({ type: "tools", content: [...currentTools] });
-          }
-          if (currentText.length > 0) {
-            fallbackSections.push({ type: "text", content: currentText });
-          }
-          if (assistantResponse.length > 0 || toolTimeline.length > 0 || fallbackSections.length > 0) {
-            conversation.messages = [
-              ...historyMessages,
-              ...userContent != null ? [{ role: "user", content: userContent }] : [],
-              {
-                role: "assistant",
-                content: assistantResponse,
-                metadata: toolTimeline.length > 0 || fallbackSections.length > 0 ? {
-                  toolActivity: [...toolTimeline],
-                  sections: fallbackSections.length > 0 ? fallbackSections : void 0
-                } : void 0
-              }
-            ];
+          if (draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draft.sections.length > 0) {
+            conversation.messages = buildMessages();
             conversation.updatedAt = Date.now();
             await conversationStore.update(conversation);
           }
@@ -12532,26 +12381,8 @@ data: ${JSON.stringify(frame)}
             })
           );
         } catch {
-          const fallbackSections = [...sections];
-          if (currentTools.length > 0) {
-            fallbackSections.push({ type: "tools", content: [...currentTools] });
-          }
-          if (currentText.length > 0) {
-            fallbackSections.push({ type: "text", content: currentText });
-          }
-          if (assistantResponse.length > 0 || toolTimeline.length > 0 || fallbackSections.length > 0) {
-            conversation.messages = [
-              ...historyMessages,
-              ...userContent != null ? [{ role: "user", content: userContent }] : [],
-              {
-                role: "assistant",
-                content: assistantResponse,
-                metadata: toolTimeline.length > 0 || fallbackSections.length > 0 ? {
-                  toolActivity: [...toolTimeline],
-                  sections: fallbackSections.length > 0 ? fallbackSections : void 0
-                } : void 0
-              }
-            ];
+          if (draft.assistantResponse.length > 0 || draft.toolTimeline.length > 0 || draft.sections.length > 0) {
+            conversation.messages = buildMessages();
             conversation.updatedAt = Date.now();
             await conversationStore.update(conversation);
           }
@@ -12642,51 +12473,41 @@ ${cronJob.task}`;
             });
             const historyMessages = [...historySelection.messages];
             try {
-              const execution = await executeConversationTurn({
+              const result = await runCronAgent(
                 harness,
-                runInput: {
-                  task,
-                  conversationId: conv.conversationId,
-                  parameters: withToolResultArchiveParam(
-                    { __activeConversationId: conv.conversationId },
-                    conv
-                  ),
-                  messages: historyMessages
-                },
-                onEvent: async (event) => {
+                task,
+                conv.conversationId,
+                historyMessages,
+                conv._toolResultArchive,
+                async (event) => {
                   await telemetry.emit(event);
                 }
-              });
-              const assistantResponse = execution.draft.assistantResponse;
-              conv.messages = [
-                ...historyMessages,
-                { role: "user", content: task },
-                ...assistantResponse ? [{ role: "assistant", content: assistantResponse }] : []
-              ];
-              if (execution.runHarnessMessages) {
-                conv._harnessMessages = execution.runHarnessMessages;
-              } else if (historySelection.shouldRebuildCanonical) {
-                conv._harnessMessages = conv.messages;
+              );
+              const freshConv = await conversationStore.get(conv.conversationId);
+              if (freshConv) {
+                appendCronTurn(freshConv, task, result);
+                applyTurnMetadata(freshConv, result, {
+                  clearContinuation: false,
+                  clearApprovals: false,
+                  setIdle: false,
+                  shouldRebuildCanonical: historySelection.shouldRebuildCanonical
+                });
+                await conversationStore.update(freshConv);
               }
-              conv._toolResultArchive = harness.getToolResultArchive(conv.conversationId);
-              if (execution.runContextTokens > 0) conv.contextTokens = execution.runContextTokens;
-              if (execution.runContextWindow > 0) conv.contextWindow = execution.runContextWindow;
-              conv.updatedAt = Date.now();
-              await conversationStore.update(conv);
-              if (assistantResponse) {
+              if (result.response) {
                 try {
                   await adapter.sendReply(
                     {
                       channelId: chatId,
-                      platformThreadId: conv.channelMeta?.platformThreadId ?? chatId
+                      platformThreadId: (freshConv ?? conv).channelMeta?.platformThreadId ?? chatId
                     },
-                    assistantResponse
+                    result.response
                   );
                 } catch (sendError) {
                   console.error(`[cron] ${jobName}: send to ${chatId} failed:`, sendError instanceof Error ? sendError.message : sendError);
                 }
               }
-              chatResults.push({ chatId, status: "completed", steps: execution.runSteps });
+              chatResults.push({ chatId, status: "completed", steps: result.steps });
             } catch (runError) {
               chatResults.push({ chatId, status: "error" });
               console.error(`[cron] ${jobName}: run for chat ${chatId} failed:`, runError instanceof Error ? runError.message : runError);
@@ -12712,7 +12533,6 @@ ${cronJob.task}`;
           cronOwnerId,
           `[cron] ${jobName} ${timestamp}`
         );
-        const historyMessages = [];
         const convId = conversation.conversationId;
         activeConversationRuns.set(convId, {
           ownerId: conversation.ownerId,
@@ -12720,117 +12540,28 @@ ${cronJob.task}`;
           runId: null
         });
         try {
-          const abortController = new AbortController();
-          let assistantResponse = "";
-          let latestRunId = "";
-          let runContinuationMessages;
-          const toolTimeline = [];
-          const sections = [];
-          let currentTools = [];
-          let currentText = "";
-          let runResult = {
-            status: "completed",
-            steps: 0
-          };
-          const platformMaxDurationSec = Number(process.env.PONCHO_MAX_DURATION) || 0;
-          const softDeadlineMs = platformMaxDurationSec > 0 ? platformMaxDurationSec * 800 : 0;
-          for await (const event of harness.runWithTelemetry({
-            task: cronJob.task,
-            conversationId: convId,
-            parameters: withToolResultArchiveParam({ __activeConversationId: convId }, conversation),
-            messages: historyMessages,
-            abortSignal: abortController.signal
-          })) {
-            if (event.type === "run:started") {
-              latestRunId = event.runId;
-            }
-            if (event.type === "model:chunk") {
-              if (currentTools.length > 0) {
-                sections.push({ type: "tools", content: currentTools });
-                currentTools = [];
-                if (assistantResponse.length > 0 && !/\s$/.test(assistantResponse)) {
-                  assistantResponse += " ";
-                }
-              }
-              assistantResponse += event.content;
-              currentText += event.content;
-            }
-            if (event.type === "tool:started") {
-              if (currentText.length > 0) {
-                sections.push({ type: "text", content: currentText });
-                currentText = "";
-              }
-              const toolText = `- start \`${event.tool}\``;
-              toolTimeline.push(toolText);
-              currentTools.push(toolText);
-            }
-            if (event.type === "tool:completed") {
-              const toolText = `- done \`${event.tool}\` (${event.duration}ms)`;
-              toolTimeline.push(toolText);
-              currentTools.push(toolText);
+          const result = await runCronAgent(
+            harness,
+            cronJob.task,
+            convId,
+            [],
+            conversation._toolResultArchive,
+            async (event) => {
+              broadcastEvent(convId, event);
+              await telemetry.emit(event);
             }
-            if (event.type === "tool:error") {
-              const toolText = `- error \`${event.tool}\`: ${event.error}`;
-              toolTimeline.push(toolText);
-              currentTools.push(toolText);
-            }
-            if (event.type === "run:completed") {
-              runResult = {
-                status: event.result.status,
-                steps: event.result.steps,
-                continuation: event.result.continuation,
-                contextTokens: event.result.contextTokens,
-                contextWindow: event.result.contextWindow,
-                harnessMessages: event.result.continuationMessages
-              };
-              if (event.result.continuation && event.result.continuationMessages) {
-                runContinuationMessages = event.result.continuationMessages;
-              }
-              if (!assistantResponse && event.result.response) {
-                assistantResponse = event.result.response;
-              }
-            }
-            broadcastEvent(convId, event);
-            await telemetry.emit(event);
-          }
+          );
           finishConversationStream(convId);
-          if (currentTools.length > 0) {
-            sections.push({ type: "tools", content: currentTools });
-          }
-          if (currentText.length > 0) {
-            sections.push({ type: "text", content: currentText });
-            currentText = "";
-          }
-          const hasContent = assistantResponse.length > 0 || toolTimeline.length > 0;
-          const assistantMetadata = toolTimeline.length > 0 || sections.length > 0 ? {
-            toolActivity: [...toolTimeline],
-            sections: sections.length > 0 ? sections : void 0
-          } : void 0;
-          const messages = [
-            ...historyMessages,
-            { role: "user", content: cronJob.task },
-            ...hasContent ? [{ role: "assistant", content: assistantResponse, metadata: assistantMetadata }] : []
-          ];
           const freshConv = await conversationStore.get(convId);
           if (freshConv) {
-            freshConv.messages = messages;
-            if (runContinuationMessages) {
-              freshConv._continuationMessages = runContinuationMessages;
-            } else {
-              freshConv._continuationMessages = void 0;
-              freshConv._continuationCount = void 0;
-            }
-            if (runResult.harnessMessages) {
-              freshConv._harnessMessages = runResult.harnessMessages;
-            }
-            freshConv._toolResultArchive = harness.getToolResultArchive(convId);
-            freshConv.runtimeRunId = latestRunId || freshConv.runtimeRunId;
-            if (runResult.contextTokens) freshConv.contextTokens = runResult.contextTokens;
-            if (runResult.contextWindow) freshConv.contextWindow = runResult.contextWindow;
-            freshConv.updatedAt = Date.now();
+            freshConv.messages = buildCronMessages(cronJob.task, [], result);
+            applyTurnMetadata(freshConv, result, {
+              clearApprovals: false,
+              setIdle: false
+            });
             await conversationStore.update(freshConv);
           }
-          if (runResult.continuation) {
+          if (result.continuation) {
             const work = selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(convId)}`).catch(
               (err) => console.error(`[poncho][cron] Continuation self-fetch failed:`, err instanceof Error ? err.message : err)
             );
@@ -12844,10 +12575,10 @@ ${cronJob.task}`;
           }
           writeJson(response, 200, {
             conversationId: convId,
-            status: runResult.status,
-            response: assistantResponse.slice(0, 500),
+            status: "completed",
+            response: result.response.slice(0, 500),
             duration: Date.now() - start,
-            steps: runResult.steps
+            steps: result.steps
           });
         } finally {
           activeConversationRuns.delete(convId);
@@ -12909,26 +12640,21 @@ Scheduled for: ${new Date(reminder.scheduledAt).toISOString()}`;
           if (channelMeta) {
             const adapter = messagingAdapters.get(channelMeta.platform);
             if (adapter && originConv) {
-              const historyMessages = originConv.messages ?? [];
-              let assistantResponse = "";
-              for await (const event of harness.runWithTelemetry({
-                task: framedMessage,
-                conversationId: originConv.conversationId,
-                parameters: { __activeConversationId: originConv.conversationId },
-                messages: historyMessages
-              })) {
-                if (event.type === "model:chunk") {
-                  assistantResponse += event.content;
-                }
-              }
-              if (assistantResponse) {
+              const result = await runCronAgent(
+                harness,
+                framedMessage,
+                originConv.conversationId,
+                originConv.messages ?? [],
+                originConv._toolResultArchive
+              );
+              if (result.response) {
                 try {
                   await adapter.sendReply(
                     {
                       channelId: channelMeta.channelId,
                       platformThreadId: channelMeta.platformThreadId ?? channelMeta.channelId
                     },
-                    assistantResponse
+                    result.response
                   );
                 } catch (sendError) {
                   console.error(`[reminder] Send to ${channelMeta.platform} failed:`, sendError instanceof Error ? sendError.message : sendError);
@@ -12936,12 +12662,12 @@ Scheduled for: ${new Date(reminder.scheduledAt).toISOString()}`;
               }
               const freshConv = await conversationStore.get(originConv.conversationId);
               if (freshConv) {
-                freshConv.messages = [
-                  ...historyMessages,
-                  { role: "user", content: framedMessage },
-                  ...assistantResponse ? [{ role: "assistant", content: assistantResponse }] : []
-                ];
-                freshConv.updatedAt = Date.now();
+                appendCronTurn(freshConv, framedMessage, result);
+                applyTurnMetadata(freshConv, result, {
+                  clearContinuation: false,
+                  clearApprovals: false,
+                  setIdle: false
+                });
                 await conversationStore.update(freshConv);
               }
             }
@@ -12952,24 +12678,15 @@ Scheduled for: ${new Date(reminder.scheduledAt).toISOString()}`;
               `[reminder] ${reminder.task.slice(0, 80)} ${timestamp}`
             );
             const convId = conversation.conversationId;
-            let assistantResponse = "";
-            for await (const event of harness.runWithTelemetry({
-              task: framedMessage,
-              conversationId: convId,
-              parameters: { __activeConversationId: convId },
-              messages: []
-            })) {
-              if (event.type === "model:chunk") {
-                assistantResponse += event.content;
-              }
-            }
+            const result = await runCronAgent(harness, framedMessage, convId, []);
             const freshConv = await conversationStore.get(convId);
             if (freshConv) {
-              freshConv.messages = [
-                { role: "user", content: framedMessage },
-                ...assistantResponse ? [{ role: "assistant", content: assistantResponse }] : []
-              ];
-              freshConv.updatedAt = Date.now();
+              freshConv.messages = buildCronMessages(framedMessage, [], result);
+              applyTurnMetadata(freshConv, result, {
+                clearContinuation: false,
+                clearApprovals: false,
+                setIdle: false
+              });
               await conversationStore.update(freshConv);
             }
           }
@@ -13044,39 +12761,6 @@ var startDevServer = async (port, options) => {
   await checkVercelCronDrift(workingDir);
   const { Cron } = await import("croner");
   let activeJobs = [];
-  const runCronAgent = async (harnessRef, task, conversationId, historyMessages, toolResultArchive, onEvent) => {
-    const execution = await executeConversationTurn({
-      harness: harnessRef,
-      runInput: {
-        task,
-        conversationId,
-        parameters: {
-          __activeConversationId: conversationId,
-          [TOOL_RESULT_ARCHIVE_PARAM]: toolResultArchive ?? {}
-        },
-        messages: historyMessages
-      },
-      onEvent
-    });
-    flushTurnDraft(execution.draft);
-    const hasContent = execution.draft.assistantResponse.length > 0 || execution.draft.toolTimeline.length > 0;
-    const assistantMetadata = buildAssistantMetadata(execution.draft);
-    return {
-      response: execution.draft.assistantResponse,
-      steps: execution.runSteps,
-      assistantMetadata,
-      hasContent,
-      contextTokens: execution.runContextTokens,
-      contextWindow: execution.runContextWindow,
-      harnessMessages: execution.runHarnessMessages,
-      toolResultArchive: harnessRef.getToolResultArchive(conversationId)
-    };
-  };
-  const buildCronMessages = (task, historyMessages, result) => [
-    ...historyMessages,
-    { role: "user", content: task },
-    ...result.hasContent ? [{ role: "assistant", content: result.response, metadata: result.assistantMetadata }] : []
-  ];
   const scheduleCronJobs = (jobs) => {
     for (const job of activeJobs) {
       job.stop();
@@ -13153,18 +12837,13 @@ ${config.task}`;
                   handler._finishConversationStream?.(convId);
                   const freshConv = await store.get(convId);
                   if (freshConv) {
-                    freshConv.messages = buildCronMessages(task, historyMessages, result);
-                    if (result.harnessMessages) {
-                      freshConv._harnessMessages = result.harnessMessages;
-                    } else if (historySelection.shouldRebuildCanonical) {
-                      freshConv._harnessMessages = freshConv.messages;
-                    }
-                    if (result.toolResultArchive) {
-                      freshConv._toolResultArchive = result.toolResultArchive;
-                    }
-                    if (result.contextTokens > 0) freshConv.contextTokens = result.contextTokens;
-                    if (result.contextWindow > 0) freshConv.contextWindow = result.contextWindow;
-                    freshConv.updatedAt = Date.now();
+                    appendCronTurn(freshConv, task, result);
+                    applyTurnMetadata(freshConv, result, {
+                      clearContinuation: false,
+                      clearApprovals: false,
+                      setIdle: false,
+                      shouldRebuildCanonical: historySelection.shouldRebuildCanonical
+                    });
                     await store.update(freshConv);
                     if (result.response) {
                       try {
@@ -13234,15 +12913,11 @@ ${config.task}`;
             const freshConv = await store.get(cronConvId);
             if (freshConv) {
               freshConv.messages = buildCronMessages(config.task, [], result);
-              if (result.harnessMessages) {
-                freshConv._harnessMessages = result.harnessMessages;
-              }
-              if (result.toolResultArchive) {
-                freshConv._toolResultArchive = result.toolResultArchive;
-              }
-              if (result.contextTokens > 0) freshConv.contextTokens = result.contextTokens;
-              if (result.contextWindow > 0) freshConv.contextWindow = result.contextWindow;
-              freshConv.updatedAt = Date.now();
+              applyTurnMetadata(freshConv, result, {
+                clearContinuation: false,
+                clearApprovals: false,
+                setIdle: false
+              });
               await store.update(freshConv);
             }
             const elapsed = ((Date.now() - start) / 1e3).toFixed(1);
@@ -13396,7 +13071,7 @@ var runInteractive = async (workingDir, params) => {
   await harness.initialize();
   const identity = await ensureAgentIdentity2(workingDir);
   try {
-    const { runInteractiveInk } = await import("./run-interactive-ink-R4PHKIQR.js");
+    const { runInteractiveInk } = await import("./run-interactive-ink-VS35YSBB.js");
     await runInteractiveInk({
       harness,
       params,