@poncho-ai/cli 0.30.7 → 0.31.0

package/dist/{chunk-NPD5GM5C.js → chunk-73C227HM.js}

@@ -3174,10 +3174,11 @@ var getWebUiClientScript = (markedSource2) => `
         } else if (willStream) {
           setStreaming(true);
         } else if (payload.needsContinuation && !payload.conversation.parentConversationId) {
-          console.log("[poncho] Detected orphaned continuation for", conversationId, "\u2014 auto-resuming");
+          console.log("[poncho] Detected orphaned continuation for", conversationId, "\u2014 auto-resuming via /continue");
           (async () => {
             try {
               setStreaming(true);
+              state.activeStreamConversationId = conversationId;
               var localMsgs = state.activeMessages || [];
               var contAssistant = {
                 role: "assistant",
@@ -3194,30 +3195,36 @@ var getWebUiClientScript = (markedSource2) => `
               state.activeMessages = localMsgs;
               state._activeStreamMessages = localMsgs;
               renderMessages(localMsgs, true);
+
               var contResp = await fetch(
-                "/api/conversations/" + encodeURIComponent(conversationId) + "/messages",
+                "/api/conversations/" + encodeURIComponent(conversationId) + "/continue",
                 {
                   method: "POST",
                   credentials: "include",
                   headers: { "Content-Type": "application/json", "x-csrf-token": state.csrfToken },
-                  body: JSON.stringify({ continuation: true }),
                 },
               );
               if (!contResp.ok || !contResp.body) {
-                contAssistant._error = "Failed to resume \u2014 reload to retry";
+                // Server already claimed the continuation (safety net). Poll for completion.
+                await pollUntilRunIdle(conversationId);
                 setStreaming(false);
                 renderMessages(localMsgs, false);
                 return;
               }
-              state.activeStreamConversationId = conversationId;
+
               var contReader = contResp.body.getReader();
               var contDecoder = new TextDecoder();
               var contBuffer = "";
+              var gotStreamEnd = false;
               while (true) {
                 var chunk = await contReader.read();
                 if (chunk.done) break;
                 contBuffer += contDecoder.decode(chunk.value, { stream: true });
                 contBuffer = parseSseChunk(contBuffer, function(evtName, evtPayload) {
+                  if (evtName === "stream:end") {
+                    gotStreamEnd = true;
+                    return;
+                  }
                   if (evtName === "model:chunk" && evtPayload.content) {
                     contAssistant.content = (contAssistant.content || "") + evtPayload.content;
                     contAssistant._currentText += evtPayload.content;
@@ -3248,14 +3255,14 @@ var getWebUiClientScript = (markedSource2) => `
                     if (evtName === "run:error") {
                       contAssistant._error = evtPayload.error?.message || "Something went wrong";
                     }
-                    if (evtName === "run:completed" && evtPayload.result?.continuation === true) {
-                      // Another continuation needed \u2014 reload to pick it up
-                      loadConversation(conversationId).catch(function() {});
-                    }
                   }
                   renderMessages(localMsgs, true);
                 });
               }
+              if (gotStreamEnd) {
+                // Safety net already claimed it. Poll for completion.
+                await pollUntilRunIdle(conversationId);
+              }
               setStreaming(false);
               renderMessages(localMsgs, false);
               await loadConversations();
@@ -4350,59 +4357,30 @@ var getWebUiClientScript = (markedSource2) => `
           };
           let _totalSteps = 0;
           let _maxSteps = 0;
-          let _isContinuation = false;
           let _receivedTerminalEvent = false;
-          while (true) {
           let _shouldContinue = false;
-          let fetchOpts;
-          if (_isContinuation) {
-            fetchOpts = {
-              method: "POST",
-              credentials: "include",
-              headers: { "Content-Type": "application/json", "x-csrf-token": state.csrfToken },
-              body: JSON.stringify({ continuation: true }),
-              signal: streamAbortController.signal,
-            };
-          } else if (filesToSend.length > 0) {
-            const formData = new FormData();
-            formData.append("message", messageText);
-            for (const f of filesToSend) {
-              formData.append("files", f, f.name);
-            }
-            fetchOpts = {
-              method: "POST",
-              credentials: "include",
-              headers: { "x-csrf-token": state.csrfToken },
-              body: formData,
-              signal: streamAbortController.signal,
-            };
-          } else {
-            fetchOpts = {
-              method: "POST",
-              credentials: "include",
-              headers: { "Content-Type": "application/json", "x-csrf-token": state.csrfToken },
-              body: JSON.stringify({ message: messageText }),
-              signal: streamAbortController.signal,
-            };
-          }
-          const response = await fetch(
-            "/api/conversations/" + encodeURIComponent(conversationId) + "/messages",
-            fetchOpts,
-          );
-          if (!response.ok || !response.body) {
-            throw new Error("Failed to stream response");
-          }
-          const reader = response.body.getReader();
-          const decoder = new TextDecoder();
-          let buffer = "";
-          while (true) {
-            const { value, done } = await reader.read();
-            if (done) {
-              break;
+
+          // Helper to read an SSE stream from a fetch response
+          const readSseStream = async (response) => {
+            _shouldContinue = false;
+            const reader = response.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            while (true) {
+              const { value, done } = await reader.read();
+              if (done) break;
+              buffer += decoder.decode(value, { stream: true });
+              buffer = parseSseChunk(buffer, (eventName, payload) => {
+                try {
+                  handleSseEvent(eventName, payload);
+                } catch (error) {
+                  console.error("SSE event handling error:", eventName, error);
+                }
+              });
             }
-            buffer += decoder.decode(value, { stream: true });
-            buffer = parseSseChunk(buffer, (eventName, payload) => {
-              try {
+          };
+
+          const handleSseEvent = (eventName, payload) => {
                 if (eventName === "model:chunk") {
                   const chunk = String(payload.content || "");
                   if (chunk.length > 0) clearResolvedApprovals(assistantMessage);
@@ -4686,6 +4664,12 @@ var getWebUiClientScript = (markedSource2) => `
                   if (typeof payload.result?.maxSteps === "number") _maxSteps = payload.result.maxSteps;
                   if (payload.result?.continuation === true && (_maxSteps <= 0 || _totalSteps < _maxSteps)) {
                     _shouldContinue = true;
+                    if (assistantMessage._currentTools.length > 0) {
+                      assistantMessage._sections.push({ type: "tools", content: assistantMessage._currentTools });
+                      assistantMessage._currentTools = [];
+                    }
+                    assistantMessage._activeActivities = [];
+                    renderIfActiveConversation(true);
                   } else {
                     finalizeAssistantMessage();
                     if (!assistantMessage.content || assistantMessage.content.length === 0) {
@@ -4709,26 +4693,77 @@ var getWebUiClientScript = (markedSource2) => `
                   assistantMessage._error = errMsg;
                   renderIfActiveConversation(false);
                 }
-              } catch (error) {
-                console.error("SSE event handling error:", eventName, error);
-              }
-            });
+                if (eventName === "stream:end") {
+                  // no-op: server signals empty continuation
+                }
+          };
+
+          // Initial message POST
+          let fetchOpts;
+          if (filesToSend.length > 0) {
+            const formData = new FormData();
+            formData.append("message", messageText);
+            for (const f of filesToSend) {
+              formData.append("files", f, f.name);
+            }
+            fetchOpts = {
+              method: "POST",
+              credentials: "include",
+              headers: { "x-csrf-token": state.csrfToken },
+              body: formData,
+              signal: streamAbortController.signal,
+            };
+          } else {
+            fetchOpts = {
+              method: "POST",
+              credentials: "include",
+              headers: { "Content-Type": "application/json", "x-csrf-token": state.csrfToken },
+              body: JSON.stringify({ message: messageText }),
+              signal: streamAbortController.signal,
+            };
           }
-          if (!_shouldContinue && !_receivedTerminalEvent) {
+          const response = await fetch(
+            "/api/conversations/" + encodeURIComponent(conversationId) + "/messages",
+            fetchOpts,
+          );
+          if (!response.ok || !response.body) {
+            throw new Error("Failed to stream response");
+          }
+          await readSseStream(response);
+
+          // Continuation loop: POST to /continue while the server signals more work
+          while (_shouldContinue) {
+            _shouldContinue = false;
+            _receivedTerminalEvent = false;
+            const contResponse = await fetch(
+              "/api/conversations/" + encodeURIComponent(conversationId) + "/continue",
+              {
+                method: "POST",
+                credentials: "include",
+                headers: { "Content-Type": "application/json", "x-csrf-token": state.csrfToken },
+                signal: streamAbortController.signal,
+              },
+            );
+            if (!contResponse.ok || !contResponse.body) {
+              // Server may have already handled continuation (safety net claimed it).
+              // Fall back to polling for idle state.
+              await pollUntilRunIdle(conversationId);
+              break;
+            }
+            await readSseStream(contResponse);
+          }
+
+          // If stream ended without terminal event and no continuation, check server
+          if (!_receivedTerminalEvent && !_shouldContinue) {
             try {
               const recoveryPayload = await api("/api/conversations/" + encodeURIComponent(conversationId));
-              if (recoveryPayload.needsContinuation) {
-                _shouldContinue = true;
-                console.log("[poncho] Stream ended without terminal event, server has continuation \u2014 resuming");
+              if (recoveryPayload.hasActiveRun || recoveryPayload.needsContinuation) {
+                await pollUntilRunIdle(conversationId);
               }
             } catch (_recoverErr) {
               console.warn("[poncho] Recovery check failed after abrupt stream end");
             }
           }
-          if (!_shouldContinue) break;
-          _receivedTerminalEvent = false;
-          _isContinuation = true;
-          }
           // Update active state only if user is still on this conversation.
           if (state.activeConversationId === streamConversationId) {
             state.activeMessages = localMessages;
@@ -8604,7 +8639,7 @@ data: ${JSON.stringify(statusPayload)}
     await resumeRunFromCheckpoint(subagentId, conv, checkpointRef, toolResults);
     await handleSubagentCompletion(subagentId);
   };
-  const runSubagent = async (childConversationId, parentConversationId, task, ownerId, isContinuation = false) => {
+  const runSubagent = async (childConversationId, parentConversationId, task, ownerId, _isContinuation = false) => {
     const childHarness = new AgentHarness({
       workingDir,
       environment: resolveHarnessEnvironment(),
@@ -8632,9 +8667,9 @@ data: ${JSON.stringify(statusPayload)}
       if (conversation.subagentMeta?.status === "stopped") return;
       conversation.lastActivityAt = Date.now();
       await conversationStore.update(conversation);
-      const harnessMessages = isContinuation && conversation._continuationMessages?.length ? [...conversation._continuationMessages] : [...conversation.messages];
+      const harnessMessages = conversation._harnessMessages?.length ? [...conversation._harnessMessages] : [...conversation.messages];
       for await (const event of childHarness.runWithTelemetry({
-        task: isContinuation ? void 0 : task,
+        task,
         conversationId: childConversationId,
         parameters: {
           __activeConversationId: childConversationId,
@@ -8824,17 +8859,22 @@ data: ${JSON.stringify(statusPayload)}
       if (currentText.length > 0) sections.push({ type: "text", content: currentText });
       const conv = await conversationStore.get(childConversationId);
       if (conv) {
+        const hasContent = assistantResponse.length > 0 || toolTimeline.length > 0;
+        if (hasContent) {
+          conv.messages.push({
+            role: "assistant",
+            content: assistantResponse,
+            metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
+          });
+        }
         if (runResult?.continuation && runResult.continuationMessages) {
           conv._continuationMessages = runResult.continuationMessages;
         } else {
           conv._continuationMessages = void 0;
-          if (assistantResponse.length > 0 || toolTimeline.length > 0) {
-            conv.messages.push({
-              role: "assistant",
-              content: assistantResponse,
-              metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
-            });
-          }
+          conv._continuationCount = void 0;
+        }
+        if (runResult?.continuationMessages) {
+          conv._harnessMessages = runResult.continuationMessages;
         }
         conv.lastActivityAt = Date.now();
         conv.updatedAt = Date.now();
@@ -8847,16 +8887,11 @@ data: ${JSON.stringify(statusPayload)}
             await childHarness.shutdown();
           } catch {
           }
-          if (isServerless) {
-            const work = selfFetchWithRetry(`/api/internal/subagent/${encodeURIComponent(childConversationId)}/run`, { continuation: true }).catch(
-              (err) => console.error(`[poncho][subagent] Continuation self-fetch failed:`, err instanceof Error ? err.message : err)
-            );
-            doWaitUntil(work);
-          } else {
-            runSubagent(childConversationId, parentConversationId, task, ownerId, true).catch(
-              (err) => console.error(`[poncho][subagent] Continuation failed:`, err instanceof Error ? err.message : err)
-            );
-          }
+          const work = selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(childConversationId)}`).catch(
+            (err) => console.error(`[poncho][subagent] Continuation self-fetch failed:`, err instanceof Error ? err.message : err)
+          );
+          doWaitUntil(work);
+          if (!waitUntilHook) await work;
           return;
         }
         conv.subagentMeta = { ...conv.subagentMeta, status: "completed" };
@@ -9009,11 +9044,12 @@ ${resultBody}`,
         finished: false
       });
     }
-    const historyMessages = isContinuationResume && conversation._continuationMessages?.length ? [...conversation._continuationMessages] : [...conversation.messages];
+    const historyMessages = isContinuationResume && conversation._continuationMessages?.length ? [...conversation._continuationMessages] : conversation._harnessMessages?.length ? [...conversation._harnessMessages] : [...conversation.messages];
     let assistantResponse = "";
     let latestRunId = "";
-    let runContinuation = false;
+    let runContinuation2 = false;
     let runContinuationMessages;
+    let runHarnessMessages;
     let runContextTokens = conversation.contextTokens ?? 0;
     let runContextWindow = conversation.contextWindow ?? 0;
     const toolTimeline = [];
@@ -9072,8 +9108,11 @@ ${resultBody}`,
           }
           runContextTokens = event.result.contextTokens ?? runContextTokens;
           runContextWindow = event.result.contextWindow ?? runContextWindow;
+          if (event.result.continuationMessages) {
+            runHarnessMessages = event.result.continuationMessages;
+          }
           if (event.result.continuation) {
-            runContinuation = true;
+            runContinuation2 = true;
             if (event.result.continuationMessages) {
               runContinuationMessages = event.result.continuationMessages;
             }
@@ -9096,6 +9135,9 @@ ${resultBody}`,
               metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
             });
           }
+          if (runHarnessMessages) {
+            freshConv._harnessMessages = runHarnessMessages;
+          }
           freshConv.runtimeRunId = latestRunId || freshConv.runtimeRunId;
           freshConv.runningCallbackSince = void 0;
           freshConv.runStatus = "idle";
@@ -9121,7 +9163,7 @@ ${resultBody}`,
           }
         }
       }
-      if (runContinuation) {
+      if (runContinuation2) {
         if (isServerless) {
           const work = selfFetchWithRetry(`/api/internal/conversations/${encodeURIComponent(conversationId)}/subagent-callback`).catch(
             (err) => console.error(`[poncho][subagent-callback] Continuation self-fetch failed:`, err instanceof Error ? err.message : err)
@@ -9293,6 +9335,7 @@ ${resultBody}`,
     let checkpointedRun = false;
     let runContextTokens = conversation.contextTokens ?? 0;
     let runContextWindow = conversation.contextWindow ?? 0;
+    let resumeHarnessMessages;
     const baseMessages = checkpoint.baseMessageCount != null ? conversation.messages.slice(0, checkpoint.baseMessageCount) : [];
     const fullCheckpointMessages = [...baseMessages, ...checkpoint.checkpointMessages];
     let resumeToolResultMsg;
@@ -9406,6 +9449,9 @@ ${resultBody}`,
           }
           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}]`;
@@ -9465,6 +9511,9 @@ ${resultBody}`,
             ];
           }
         }
+        if (resumeHarnessMessages) {
+          conv._harnessMessages = resumeHarnessMessages;
+        }
         conv.runtimeRunId = latestRunId || conv.runtimeRunId;
         conv.pendingApprovals = [];
         conv.runStatus = "idle";
@@ -9517,7 +9566,7 @@ ${resultBody}`,
           };
           await conversationStore.update(existing);
         }
-        return { messages: existing.messages };
+        return { messages: existing._harnessMessages?.length ? existing._harnessMessages : existing.messages };
       }
       const now = Date.now();
       const channelMeta = meta.channelId ? {
@@ -9566,7 +9615,7 @@ ${resultBody}`,
       let checkpointedRun = false;
       let runContextTokens = 0;
       let runContextWindow = 0;
-      let runContinuation = false;
+      let runContinuation2 = false;
       let runContinuationMessages;
       let runSteps = 0;
       let runMaxSteps;
@@ -9717,7 +9766,7 @@ ${resultBody}`,
             if (assistantResponse.length === 0 && event.result.response) {
               assistantResponse = event.result.response;
             }
-            runContinuation = event.result.continuation === true;
+            runContinuation2 = event.result.continuation === true;
             if (event.result.continuationMessages) {
               runContinuationMessages = event.result.continuationMessages;
             }
@@ -9745,12 +9794,15 @@ ${resultBody}`,
       }
       if (!checkpointedRun) {
         await updateConversation((c) => {
-          if (runContinuationMessages) {
+          if (runContinuation2 && runContinuationMessages) {
             c._continuationMessages = runContinuationMessages;
           } else {
             c._continuationMessages = void 0;
             c.messages = buildMessages();
           }
+          if (runContinuationMessages) {
+            c._harnessMessages = runContinuationMessages;
+          }
           c.runtimeRunId = latestRunId || c.runtimeRunId;
           c.pendingApprovals = [];
           c.runStatus = "idle";
@@ -9767,11 +9819,11 @@ ${resultBody}`,
         runOwners.delete(latestRunId);
         runConversations.delete(latestRunId);
       }
-      console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation ? "(continuation)" : "");
+      console.log("[messaging-runner] run complete, response length:", assistantResponse.length, runContinuation2 ? "(continuation)" : "");
       const response = assistantResponse;
       return {
         response,
-        continuation: runContinuation,
+        continuation: runContinuation2,
         steps: runSteps,
         maxSteps: runMaxSteps
       };
@@ -9897,6 +9949,375 @@ ${resultBody}`,
     const headerValue = getInternalRequestHeader(headers);
     return typeof headerValue === "string" && headerValue === internalSecret;
   };
+  const MAX_CONTINUATION_COUNT = 20;
+  async function* runContinuation(conversationId) {
+    const conversation = await conversationStore.get(conversationId);
+    if (!conversation) return;
+    if (!conversation._continuationMessages?.length) return;
+    if (conversation.runStatus === "running") return;
+    const count = (conversation._continuationCount ?? 0) + 1;
+    if (count > MAX_CONTINUATION_COUNT) {
+      console.warn(`[poncho][continuation] Max continuation count (${MAX_CONTINUATION_COUNT}) reached for ${conversationId}`);
+      conversation._continuationMessages = void 0;
+      conversation._continuationCount = void 0;
+      await conversationStore.update(conversation);
+      return;
+    }
+    const continuationMessages = [...conversation._continuationMessages];
+    conversation._continuationMessages = void 0;
+    conversation._continuationCount = count;
+    conversation.runStatus = "running";
+    await conversationStore.update(conversation);
+    const abortController = new AbortController();
+    activeConversationRuns.set(conversationId, {
+      ownerId: conversation.ownerId,
+      abortController,
+      runId: null
+    });
+    const prevStream = conversationEventStreams.get(conversationId);
+    if (prevStream) {
+      prevStream.finished = false;
+      prevStream.buffer = [];
+    } else {
+      conversationEventStreams.set(conversationId, {
+        buffer: [],
+        subscribers: /* @__PURE__ */ new Set(),
+        finished: false
+      });
+    }
+    try {
+      if (conversation.parentConversationId) {
+        yield* runSubagentContinuation(conversationId, conversation, continuationMessages);
+      } else {
+        yield* runChatContinuation(conversationId, conversation, continuationMessages);
+      }
+    } 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: {
+        __activeConversationId: conversationId,
+        __ownerId: conversation.ownerId
+      },
+      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;
+        }
+      }
+      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 });
+    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;
+      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;
+    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) {
+    const parentConversationId = conversation.parentConversationId;
+    const task = conversation.subagentMeta?.task ?? "";
+    const ownerId = conversation.ownerId;
+    const childHarness = new AgentHarness({
+      workingDir,
+      environment: resolveHarnessEnvironment(),
+      uploadStore
+    });
+    await childHarness.initialize();
+    childHarness.unregisterTools(["memory_main_write", "memory_main_edit"]);
+    const childAbortController = activeConversationRuns.get(conversationId)?.abortController ?? new AbortController();
+    activeSubagentRuns.set(conversationId, { abortController: childAbortController, harness: childHarness, parentConversationId });
+    let assistantResponse = "";
+    let latestRunId = "";
+    let runResult;
+    const toolTimeline = [];
+    const sections = [];
+    let currentTools = [];
+    let currentText = "";
+    try {
+      for await (const event of childHarness.runWithTelemetry({
+        conversationId,
+        parameters: {
+          __activeConversationId: conversationId,
+          __ownerId: ownerId
+        },
+        messages: continuationMessages,
+        abortSignal: childAbortController.signal
+      })) {
+        if (event.type === "run:started") {
+          latestRunId = event.runId;
+          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") {
+          runResult = {
+            status: event.result.status,
+            response: event.result.response,
+            steps: event.result.steps,
+            duration: event.result.duration,
+            continuation: event.result.continuation,
+            continuationMessages: event.result.continuationMessages
+          };
+          if (!assistantResponse && event.result.response) {
+            assistantResponse = event.result.response;
+          }
+        }
+        if (event.type === "run:error") {
+          assistantResponse = assistantResponse || `[Error: ${event.error.message}]`;
+        }
+        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 });
+      const conv = await conversationStore.get(conversationId);
+      if (conv) {
+        const hasContent = assistantResponse.length > 0 || toolTimeline.length > 0;
+        if (runResult?.continuation && runResult.continuationMessages) {
+          if (hasContent) {
+            conv.messages.push({
+              role: "assistant",
+              content: assistantResponse,
+              metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
+            });
+          }
+          conv._continuationMessages = runResult.continuationMessages;
+          conv._continuationCount = conversation._continuationCount;
+        } else {
+          conv._continuationMessages = void 0;
+          conv._continuationCount = void 0;
+          if (hasContent) {
+            conv.messages.push({
+              role: "assistant",
+              content: assistantResponse,
+              metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
+            });
+          }
+        }
+        if (runResult?.continuationMessages) {
+          conv._harnessMessages = runResult.continuationMessages;
+        }
+        conv.lastActivityAt = Date.now();
+        conv.runStatus = "idle";
+        conv.updatedAt = Date.now();
+        if (runResult?.continuation) {
+          await conversationStore.update(conv);
+          activeSubagentRuns.delete(conversationId);
+          try {
+            await childHarness.shutdown();
+          } catch {
+          }
+          return;
+        }
+        conv.subagentMeta = { ...conv.subagentMeta, status: "completed" };
+        await conversationStore.update(conv);
+      }
+      activeSubagentRuns.delete(conversationId);
+      broadcastEvent(parentConversationId, {
+        type: "subagent:completed",
+        subagentId: conversationId,
+        conversationId
+      });
+      let subagentResponse = runResult?.response ?? assistantResponse;
+      if (!subagentResponse) {
+        const freshSubConv = await conversationStore.get(conversationId);
+        if (freshSubConv) {
+          const lastAssistant = [...freshSubConv.messages].reverse().find((m) => m.role === "assistant");
+          if (lastAssistant) {
+            subagentResponse = typeof lastAssistant.content === "string" ? lastAssistant.content : "";
+          }
+        }
+      }
+      const parentConv = await conversationStore.get(parentConversationId);
+      if (parentConv) {
+        const result = {
+          subagentId: conversationId,
+          task,
+          status: "completed",
+          result: { status: "completed", response: subagentResponse, steps: runResult?.steps ?? 0, tokens: { input: 0, output: 0, cached: 0 }, duration: runResult?.duration ?? 0 },
+          timestamp: Date.now()
+        };
+        await conversationStore.appendSubagentResult(parentConversationId, result);
+        if (isServerless) {
+          selfFetchWithRetry(`/api/internal/conversations/${encodeURIComponent(parentConversationId)}/subagent-callback`).catch(
+            (err) => console.error(`[poncho][subagent] Callback self-fetch failed:`, err instanceof Error ? err.message : err)
+          );
+        } else {
+          processSubagentCallback(parentConversationId).catch(
+            (err) => console.error(`[poncho][subagent] Callback failed:`, err instanceof Error ? err.message : err)
+          );
+        }
+      }
+      try {
+        await childHarness.shutdown();
+      } catch {
+      }
+    } catch (err) {
+      activeSubagentRuns.delete(conversationId);
+      try {
+        await childHarness.shutdown();
+      } catch {
+      }
+      const conv = await conversationStore.get(conversationId);
+      if (conv) {
+        conv.subagentMeta = { ...conv.subagentMeta, status: "error", error: { code: "CONTINUATION_ERROR", message: err instanceof Error ? err.message : String(err) } };
+        conv.runStatus = "idle";
+        conv._continuationMessages = void 0;
+        conv._continuationCount = void 0;
+        conv.updatedAt = Date.now();
+        await conversationStore.update(conv);
+      }
+      broadcastEvent(conversation.parentConversationId, {
+        type: "subagent:completed",
+        subagentId: conversationId,
+        conversationId
+      });
+      const parentConv = await conversationStore.get(conversation.parentConversationId);
+      if (parentConv) {
+        const result = {
+          subagentId: conversationId,
+          task,
+          status: "error",
+          error: { code: "CONTINUATION_ERROR", message: err instanceof Error ? err.message : String(err) },
+          timestamp: Date.now()
+        };
+        await conversationStore.appendSubagentResult(conversation.parentConversationId, result);
+        if (isServerless) {
+          selfFetchWithRetry(`/api/internal/conversations/${encodeURIComponent(conversation.parentConversationId)}/subagent-callback`).catch(() => {
+          });
+        } else {
+          processSubagentCallback(conversation.parentConversationId).catch(() => {
+          });
+        }
+      }
+    }
+  }
   const messagingAdapters = /* @__PURE__ */ new Map();
   const messagingBridges = [];
   if (config?.messaging && config.messaging.length > 0) {
@@ -10230,9 +10651,8 @@ ${resultBody}`,
               await resumeSubagentFromCheckpoint(subagentId);
               return;
             }
-            const isContinuation = body?.continuation === true;
-            const task = isContinuation ? conv.subagentMeta?.task ?? "" : conv.messages.find((m) => m.role === "user")?.content ?? conv.subagentMeta?.task ?? "";
-            await runSubagent(subagentId, conv.parentConversationId, task, conv.ownerId, isContinuation);
+            const task = conv.messages.find((m) => m.role === "user")?.content ?? conv.subagentMeta?.task ?? "";
+            await runSubagent(subagentId, conv.parentConversationId, task, conv.ownerId, false);
           } catch (err) {
             console.error(`[poncho][internal] subagent run error for ${subagentId}:`, err instanceof Error ? err.message : err);
           }
@@ -10250,6 +10670,26 @@ ${resultBody}`,
         if (!waitUntilHook) await work;
         return;
       }
+      const continueMatch = pathname.match(/^\/api\/internal\/continue\/([^/]+)$/);
+      if (continueMatch) {
+        const conversationId = decodeURIComponent(continueMatch[1]);
+        writeJson(response, 202, { ok: true });
+        const work = (async () => {
+          try {
+            for await (const _event of runContinuation(conversationId)) {
+            }
+            const conv = await conversationStore.get(conversationId);
+            if (conv?._continuationMessages?.length) {
+              await selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`);
+            }
+          } catch (err) {
+            console.error(`[poncho][internal-continue] Error for ${conversationId}:`, err instanceof Error ? err.message : err);
+          }
+        })();
+        doWaitUntil(work);
+        if (!waitUntilHook) await work;
+        return;
+      }
       writeJson(response, 404, { error: "Not found" });
       return;
     }
@@ -10856,7 +11296,8 @@ data: ${JSON.stringify(frame)}
           conversation: {
             ...conversation,
             pendingApprovals: storedPending,
-            _continuationMessages: void 0
+            _continuationMessages: void 0,
+            _harnessMessages: void 0
           },
           subagentPendingApprovals: subagentPending,
           hasActiveRun: hasActiveRun || hasPendingCallbackResults,
@@ -11025,6 +11466,87 @@ data: ${JSON.stringify(frame)}
       });
       return;
     }
+    const conversationContinueMatch = pathname.match(/^\/api\/conversations\/([^/]+)\/continue$/);
+    if (conversationContinueMatch && request.method === "POST") {
+      const conversationId = decodeURIComponent(conversationContinueMatch[1] ?? "");
+      const conversation = await conversationStore.get(conversationId);
+      if (!conversation || conversation.ownerId !== ownerId) {
+        writeJson(response, 404, {
+          code: "CONVERSATION_NOT_FOUND",
+          message: "Conversation not found"
+        });
+        return;
+      }
+      if (conversation.parentConversationId) {
+        writeJson(response, 403, {
+          code: "SUBAGENT_READ_ONLY",
+          message: "Subagent conversations are read-only."
+        });
+        return;
+      }
+      response.writeHead(200, {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        Connection: "keep-alive",
+        "X-Accel-Buffering": "no"
+      });
+      const unsubSubagentEvents = onConversationEvent(conversationId, (evt) => {
+        if (evt.type.startsWith("subagent:")) {
+          try {
+            response.write(formatSseEvent(evt));
+          } catch {
+          }
+        }
+      });
+      let eventCount = 0;
+      try {
+        for await (const event of runContinuation(conversationId)) {
+          eventCount++;
+          let sseEvent = event;
+          if (sseEvent.type === "run:completed") {
+            const hasRunningSubagents = Array.from(activeSubagentRuns.values()).some(
+              (r) => r.parentConversationId === conversationId
+            );
+            const stripped = { ...sseEvent, result: { ...sseEvent.result, continuationMessages: void 0 } };
+            sseEvent = hasRunningSubagents ? { ...stripped, pendingSubagents: true } : stripped;
+          }
+          try {
+            response.write(formatSseEvent(sseEvent));
+          } catch {
+          }
+          emitBrowserStatusIfActive(conversationId, event, response);
+        }
+      } catch (err) {
+        const errorEvent = {
+          type: "run:error",
+          runId: "",
+          error: { code: "CONTINUATION_ERROR", message: err instanceof Error ? err.message : String(err) }
+        };
+        try {
+          response.write(formatSseEvent(errorEvent));
+        } catch {
+        }
+      } finally {
+        unsubSubagentEvents();
+      }
+      if (eventCount === 0) {
+        try {
+          response.write("event: stream:end\ndata: {}\n\n");
+        } catch {
+        }
+      } else {
+        const freshConv = await conversationStore.get(conversationId);
+        if (freshConv?._continuationMessages?.length) {
+          doWaitUntil(
+            new Promise((r) => setTimeout(r, 3e3)).then(
+              () => selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`)
+            )
+          );
+        }
+      }
+      response.end();
+      return;
+    }
     const conversationMessageMatch = pathname.match(/^\/api\/conversations\/([^/]+)\/messages$/);
     if (conversationMessageMatch && request.method === "POST") {
       const conversationId = decodeURIComponent(conversationMessageMatch[1] ?? "");
@@ -11046,7 +11568,6 @@ data: ${JSON.stringify(frame)}
       let messageText = "";
       let bodyParameters;
       let files = [];
-      let isContinuation = false;
       const contentType = request.headers["content-type"] ?? "";
       if (contentType.includes("multipart/form-data")) {
         const parsed = await parseMultipartRequest(request);
@@ -11055,11 +11576,7 @@ data: ${JSON.stringify(frame)}
         files = parsed.files;
       } else {
         const body = await readRequestBody(request);
-        if (body.continuation === true) {
-          isContinuation = true;
-        } else {
-          messageText = body.message?.trim() ?? "";
-        }
+        messageText = body.message?.trim() ?? "";
         bodyParameters = body.parameters;
         if (Array.isArray(body.files)) {
           files = body.files.filter(
@@ -11067,7 +11584,7 @@ data: ${JSON.stringify(frame)}
           );
         }
       }
-      if (!isContinuation && !messageText) {
+      if (!messageText) {
         writeJson(response, 400, {
           code: "VALIDATION_ERROR",
           message: "message is required"
@@ -11092,7 +11609,7 @@ data: ${JSON.stringify(frame)}
         abortController,
         runId: null
       });
-      if (!isContinuation && conversation.messages.length === 0 && (conversation.title === "New conversation" || conversation.title.trim().length === 0)) {
+      if (conversation.messages.length === 0 && (conversation.title === "New conversation" || conversation.title.trim().length === 0)) {
         conversation.title = inferConversationTitle(messageText);
       }
       response.writeHead(200, {
@@ -11101,7 +11618,7 @@ data: ${JSON.stringify(frame)}
         Connection: "keep-alive",
         "X-Accel-Buffering": "no"
       });
-      const harnessMessages = isContinuation && conversation._continuationMessages?.length ? [...conversation._continuationMessages] : [...conversation.messages];
+      const harnessMessages = conversation._harnessMessages?.length ? [...conversation._harnessMessages] : [...conversation.messages];
       const historyMessages = [...conversation.messages];
       const preRunMessages = [...conversation.messages];
       let latestRunId = conversation.runtimeRunId ?? "";
@@ -11116,8 +11633,9 @@ data: ${JSON.stringify(frame)}
       let runContextTokens = conversation.contextTokens ?? 0;
       let runContextWindow = conversation.contextWindow ?? 0;
       let runContinuationMessages;
-      let userContent = isContinuation ? void 0 : messageText;
-      if (!isContinuation && files.length > 0) {
+      let runHarnessMessages;
+      let userContent = messageText;
+      if (files.length > 0) {
         try {
           const uploadedParts = await Promise.all(
             files.map(async (f) => {
@@ -11160,9 +11678,10 @@ data: ${JSON.stringify(frame)}
         }
       });
       try {
-        if (!isContinuation) {
+        {
           conversation.messages = [...historyMessages, { role: "user", content: userContent }];
           conversation.subagentCallbackCount = 0;
+          conversation._continuationCount = void 0;
           conversation.updatedAt = Date.now();
           conversationStore.update(conversation).catch((err) => {
             console.error("[poncho] Failed to persist user turn:", err);
@@ -11221,7 +11740,7 @@ data: ${JSON.stringify(frame)}
           return cachedRecallCorpus;
         };
         for await (const event of harness.runWithTelemetry({
-          task: isContinuation ? void 0 : messageText,
+          task: messageText,
           conversationId,
           parameters: {
             ...bodyParameters ?? {},
@@ -11230,7 +11749,7 @@ data: ${JSON.stringify(frame)}
             __ownerId: ownerId
           },
           messages: harnessMessages,
-          files: !isContinuation && files.length > 0 ? files : void 0,
+          files: files.length > 0 ? files : void 0,
           abortSignal: abortController.signal
         })) {
           if (event.type === "run:started") {
@@ -11335,15 +11854,34 @@ data: ${JSON.stringify(frame)}
             }
             runContextTokens = event.result.contextTokens ?? runContextTokens;
             runContextWindow = event.result.contextWindow ?? runContextWindow;
+            if (event.result.continuationMessages) {
+              runHarnessMessages = event.result.continuationMessages;
+            }
             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;
               conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
               conversation.pendingApprovals = [];
               if (runContextTokens > 0) conversation.contextTokens = runContextTokens;
               if (runContextWindow > 0) conversation.contextWindow = runContextWindow;
               conversation.updatedAt = Date.now();
               await conversationStore.update(conversation);
+              doWaitUntil(
+                new Promise((r) => setTimeout(r, 3e3)).then(
+                  () => selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(conversationId)}`)
+                )
+              );
             }
           }
           await telemetry.emit(event);
@@ -11388,6 +11926,9 @@ data: ${JSON.stringify(frame)}
             }
           ] : [...historyMessages, ...userTurn];
           conversation._continuationMessages = void 0;
+          if (runHarnessMessages) {
+            conversation._harnessMessages = runHarnessMessages;
+          }
           conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
           conversation.pendingApprovals = [];
           if (runContextTokens > 0) conversation.contextTokens = runContextTokens;
@@ -11496,20 +12037,9 @@ data: ${JSON.stringify(frame)}
         return;
       }
       const urlObj = new URL(request.url ?? "/", `http://${request.headers.host ?? "localhost"}`);
-      const continueConversationId = urlObj.searchParams.get("continue");
-      const continuationCount = Number(urlObj.searchParams.get("continuation") ?? "0");
-      const maxContinuations = 5;
-      if (continuationCount >= maxContinuations) {
-        writeJson(response, 200, {
-          conversationId: continueConversationId,
-          status: "max_continuations_reached",
-          continuations: continuationCount
-        });
-        return;
-      }
       const cronOwnerId = ownerId;
       const start = Date.now();
-      if (cronJob.channel && !continueConversationId) {
+      if (cronJob.channel) {
         const adapter = messagingAdapters.get(cronJob.channel);
         if (!adapter) {
           writeJson(response, 200, {
@@ -11544,10 +12074,11 @@ data: ${JSON.stringify(frame)}
             if (!conv) continue;
             const task = `[Scheduled: ${jobName}]
 ${cronJob.task}`;
-            const historyMessages = [...conv.messages];
+            const historyMessages = conv._harnessMessages?.length ? [...conv._harnessMessages] : [...conv.messages];
             try {
               let assistantResponse = "";
               let steps = 0;
+              let cronHarnessMessages;
               for await (const event of harness.runWithTelemetry({
                 task,
                 conversationId: conv.conversationId,
@@ -11562,6 +12093,9 @@ ${cronJob.task}`;
                   if (!assistantResponse && event.result.response) {
                     assistantResponse = event.result.response;
                   }
+                  if (event.result.continuationMessages) {
+                    cronHarnessMessages = event.result.continuationMessages;
+                  }
                 }
                 await telemetry.emit(event);
               }
@@ -11570,6 +12104,9 @@ ${cronJob.task}`;
                 { role: "user", content: task },
                 ...assistantResponse ? [{ role: "assistant", content: assistantResponse }] : []
               ];
+              if (cronHarnessMessages) {
+                conv._harnessMessages = cronHarnessMessages;
+              }
               conv.updatedAt = Date.now();
               await conversationStore.update(conv);
               if (assistantResponse) {
@@ -11606,29 +12143,12 @@ ${cronJob.task}`;
         return;
       }
       try {
-        let conversation;
-        let historyMessages = [];
-        if (continueConversationId) {
-          conversation = await conversationStore.get(continueConversationId);
-          if (!conversation) {
-            writeJson(response, 404, {
-              code: "CONVERSATION_NOT_FOUND",
-              message: "Continuation conversation not found"
-            });
-            return;
-          }
-          historyMessages = conversation._continuationMessages?.length ? [...conversation._continuationMessages] : [...conversation.messages];
-          if (conversation._continuationMessages?.length) {
-            conversation._continuationMessages = void 0;
-            await conversationStore.update(conversation);
-          }
-        } else {
-          const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-          conversation = await conversationStore.create(
-            cronOwnerId,
-            `[cron] ${jobName} ${timestamp}`
-          );
-        }
+        const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+        const conversation = await conversationStore.create(
+          cronOwnerId,
+          `[cron] ${jobName} ${timestamp}`
+        );
+        const historyMessages = [];
         const convId = conversation.conversationId;
         activeConversationRuns.set(convId, {
           ownerId: conversation.ownerId,
@@ -11696,7 +12216,8 @@ ${cronJob.task}`;
                 steps: event.result.steps,
                 continuation: event.result.continuation,
                 contextTokens: event.result.contextTokens,
-                contextWindow: event.result.contextWindow
+                contextWindow: event.result.contextWindow,
+                harnessMessages: event.result.continuationMessages
               };
               if (event.result.continuation && event.result.continuationMessages) {
                 runContinuationMessages = event.result.continuationMessages;
@@ -11723,16 +12244,20 @@ ${cronJob.task}`;
           } : void 0;
           const messages = [
             ...historyMessages,
-            ...continueConversationId ? [] : [{ role: "user", content: cronJob.task }],
+            { 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.messages = messages;
+              freshConv._continuationCount = void 0;
+            }
+            if (runResult.harnessMessages) {
+              freshConv._harnessMessages = runResult.harnessMessages;
             }
             freshConv.runtimeRunId = latestRunId || freshConv.runtimeRunId;
             if (runResult.contextTokens) freshConv.contextTokens = runResult.contextTokens;
@@ -11741,15 +12266,13 @@ ${cronJob.task}`;
             await conversationStore.update(freshConv);
           }
           if (runResult.continuation) {
-            const continuationPath = `/api/cron/${encodeURIComponent(jobName)}?continue=${encodeURIComponent(convId)}&continuation=${continuationCount + 1}`;
-            const work = selfFetchWithRetry(continuationPath).catch(
+            const work = selfFetchWithRetry(`/api/internal/continue/${encodeURIComponent(convId)}`).catch(
               (err) => console.error(`[poncho][cron] Continuation self-fetch failed:`, err instanceof Error ? err.message : err)
             );
             doWaitUntil(work);
             writeJson(response, 200, {
               conversationId: convId,
               status: "continued",
-              continuations: continuationCount + 1,
               duration: Date.now() - start
             });
             return;
@@ -11851,6 +12374,7 @@ var startDevServer = async (port, options) => {
     let steps = 0;
     let contextTokens = 0;
     let contextWindow = 0;
+    let harnessMessages;
     const toolTimeline = [];
     const sections = [];
     let currentTools = [];
@@ -11896,6 +12420,9 @@ var startDevServer = async (port, options) => {
         steps = event.result.steps;
         contextTokens = event.result.contextTokens ?? 0;
         contextWindow = event.result.contextWindow ?? 0;
+        if (event.result.continuationMessages) {
+          harnessMessages = event.result.continuationMessages;
+        }
         if (!assistantResponse && event.result.response) {
           assistantResponse = event.result.response;
         }
@@ -11912,7 +12439,7 @@ var startDevServer = async (port, options) => {
       toolActivity: [...toolTimeline],
       sections: sections.length > 0 ? sections : void 0
     } : void 0;
-    return { response: assistantResponse, steps, assistantMetadata, hasContent, contextTokens, contextWindow };
+    return { response: assistantResponse, steps, assistantMetadata, hasContent, contextTokens, contextWindow, harnessMessages };
   };
   const buildCronMessages = (task, historyMessages, result) => [
     ...historyMessages,
@@ -11971,7 +12498,7 @@ var startDevServer = async (port, options) => {
                 if (!conversation) continue;
                 const task = `[Scheduled: ${jobName}]
 ${config.task}`;
-                const historyMessages = [...conversation.messages];
+                const historyMessages = conversation._harnessMessages?.length ? [...conversation._harnessMessages] : [...conversation.messages];
                 const convId = conversation.conversationId;
                 activeRuns?.set(convId, {
                   ownerId: "local-owner",
@@ -11991,6 +12518,9 @@ ${config.task}`;
                   const freshConv = await store.get(convId);
                   if (freshConv) {
                     freshConv.messages = buildCronMessages(task, historyMessages, result);
+                    if (result.harnessMessages) {
+                      freshConv._harnessMessages = result.harnessMessages;
+                    }
                     if (result.contextTokens > 0) freshConv.contextTokens = result.contextTokens;
                     if (result.contextWindow > 0) freshConv.contextWindow = result.contextWindow;
                     freshConv.updatedAt = Date.now();
@@ -12062,6 +12592,9 @@ ${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.contextTokens > 0) freshConv.contextTokens = result.contextTokens;
               if (result.contextWindow > 0) freshConv.contextWindow = result.contextWindow;
               freshConv.updatedAt = Date.now();
@@ -12197,7 +12730,7 @@ var runInteractive = async (workingDir, params) => {
   await harness.initialize();
   const identity = await ensureAgentIdentity2(workingDir);
   try {
-    const { runInteractiveInk } = await import("./run-interactive-ink-NV6LIQWU.js");
+    const { runInteractiveInk } = await import("./run-interactive-ink-OKE5AV3N.js");
     await runInteractiveInk({
       harness,
       params,