@poncho-ai/cli 0.14.0 → 0.14.1

package/dist/{chunk-A32BXZKP.js → chunk-AIEVSNGF.js}

@@ -339,6 +339,8 @@ var renderWebUiHtml = (options) => {
       --tool-done: #6a9955;
       --tool-error: #f48771;
 
+      --warning: #e8a735;
+
       --approve: #78e7a6;
       --approve-border: rgba(58,208,122,0.45);
       --deny: #f59b9b;
@@ -416,6 +418,8 @@ var renderWebUiHtml = (options) => {
         --tool-done: #16a34a;
         --tool-error: #dc2626;
 
+        --warning: #ca8a04;
+
         --approve: #16a34a;
         --approve-border: rgba(22,163,74,0.35);
         --deny: #dc2626;
@@ -561,6 +565,20 @@ var renderWebUiHtml = (options) => {
       flex-direction: column;
       gap: 2px;
     }
+    .sidebar-section-label {
+      font-size: 11px;
+      font-weight: 600;
+      color: var(--fg-7);
+      text-transform: uppercase;
+      letter-spacing: 0.04em;
+      padding: 10px 10px 4px;
+    }
+    .sidebar-section-label:first-child { padding-top: 4px; }
+    .sidebar-section-divider {
+      height: 1px;
+      background: var(--border);
+      margin: 6px 10px;
+    }
     .conversation-item {
       height: 36px;
       min-height: 36px;
@@ -578,6 +596,16 @@ var renderWebUiHtml = (options) => {
       position: relative;
       transition: color 0.15s;
     }
+    .conversation-item .approval-dot {
+      display: inline-block;
+      width: 6px;
+      height: 6px;
+      border-radius: 50%;
+      background: var(--warning, #e8a735);
+      margin-right: 6px;
+      flex-shrink: 0;
+      vertical-align: middle;
+    }
     .conversation-item:hover { color: var(--fg-3); }
     .conversation-item.active {
       color: var(--fg);
@@ -801,7 +829,7 @@ var renderWebUiHtml = (options) => {
     .tool-error {
       color: var(--tool-error);
     }
-    .assistant-content table {
+    .assistant-content table:not(.approval-request-table) {
       border-collapse: collapse;
       width: 100%;
       margin: 14px 0;
@@ -814,7 +842,7 @@ var renderWebUiHtml = (options) => {
       overflow-x: auto;
       white-space: nowrap;
     }
-    .assistant-content th {
+    .assistant-content table:not(.approval-request-table) th {
       background: var(--surface-4);
       padding: 10px 12px;
       text-align: left;
@@ -823,16 +851,16 @@ var renderWebUiHtml = (options) => {
       color: var(--fg-strong);
       min-width: 100px;
     }
-    .assistant-content td {
+    .assistant-content table:not(.approval-request-table) td {
       padding: 10px 12px;
       border-bottom: 1px solid var(--border-1);
       width: 100%;
       min-width: 100px;
     }
-    .assistant-content tr:last-child td {
+    .assistant-content table:not(.approval-request-table) tr:last-child td {
       border-bottom: none;
     }
-    .assistant-content tbody tr:hover {
+    .assistant-content table:not(.approval-request-table) tbody tr:hover {
       background: var(--surface-1);
     }
     .assistant-content hr {
@@ -850,6 +878,10 @@ var renderWebUiHtml = (options) => {
       line-height: 1.45;
       color: var(--fg-tool-code);
       width: 300px;
+      transition: width 0.2s ease;
+    }
+    .tool-activity.has-approvals {
+      width: 100%;
     }
     .assistant-content > .tool-activity:first-child {
       margin-top: 0;
@@ -909,40 +941,60 @@ var renderWebUiHtml = (options) => {
       border-top: 1px solid var(--border-2);
       padding: 10px 12px 12px;
       display: grid;
-      gap: 8px;
-      background: var(--inset-1);
+      gap: 10px;
     }
     .approval-requests-label {
-      font-size: 11px;
+      font-size: 12px;
       text-transform: uppercase;
       letter-spacing: 0.06em;
       color: var(--fg-approval-label);
       font-weight: 600;
     }
+    .approval-requests-label code {
+      font-family: ui-monospace, "SF Mono", "Fira Code", monospace;
+      text-transform: none;
+      letter-spacing: 0;
+      color: var(--fg-strong);
+    }
     .approval-request-item {
-      border: 1px solid var(--border-3);
-      background: var(--surface-2);
-      border-radius: 8px;
-      padding: 8px;
       display: grid;
-      gap: 6px;
+      gap: 8px;
     }
-    .approval-request-tool {
-      font-size: 12px;
-      color: var(--fg-strong);
+    .approval-request-table {
+      width: 100%;
+      border-collapse: collapse;
+      border: none;
+      font-size: 14px;
+      line-height: 1.5;
+    }
+    .approval-request-table tr,
+    .approval-request-table td {
+      border: none;
+      background: none;
+    }
+    .approval-request-table td {
+      padding: 4px 0;
+      vertical-align: top;
+    }
+    .approval-request-table .ak {
       font-weight: 600;
-      overflow-wrap: anywhere;
+      color: var(--fg-approval-label);
+      white-space: nowrap;
+      width: 1%;
+      padding-right: 20px;
     }
-    .approval-request-input {
-      font-family: ui-monospace, "SF Mono", "Fira Code", monospace;
-      font-size: 11px;
-      color: var(--fg-approval-input);
-      background: var(--inset-2);
-      border-radius: 6px;
-      padding: 6px;
+    .approval-request-table .av,
+    .approval-request-table .av-complex {
+      color: var(--fg);
       overflow-wrap: anywhere;
-      max-height: 80px;
+      white-space: pre-wrap;
+      max-height: 200px;
       overflow-y: auto;
+      display: block;
+    }
+    .approval-request-table .av-complex {
+      font-family: ui-monospace, "SF Mono", "Fira Code", monospace;
+      font-size: 12px;
     }
     .approval-request-actions {
       display: flex;
@@ -983,6 +1035,7 @@ var renderWebUiHtml = (options) => {
       line-height: 1.5;
       overflow-wrap: break-word;
       word-break: break-word;
+      white-space: pre-wrap;
     }
     .empty-state {
       display: flex;
@@ -1656,18 +1709,20 @@ var renderWebUiHtml = (options) => {
           .map((req) => {
             const approvalId = typeof req.approvalId === "string" ? req.approvalId : "";
             const tool = typeof req.tool === "string" ? req.tool : "tool";
-            const inputPreview = typeof req.inputPreview === "string" ? req.inputPreview : "{}";
+            const input = req.input != null ? req.input : {};
             const submitting = req.state === "submitting";
             const approveLabel = submitting && req.pendingDecision === "approve" ? "Approving..." : "Approve";
             const denyLabel = submitting && req.pendingDecision === "deny" ? "Denying..." : "Deny";
+            const errorHtml = req._error
+              ? '<div style="color: var(--deny); font-size: 11px; margin-top: 4px;">Submit failed: ' + escapeHtml(req._error) + "</div>"
+              : "";
             return (
               '<div class="approval-request-item">' +
-              '<div class="approval-request-tool">' +
+              '<div class="approval-requests-label">Approval required: <code>' +
               escapeHtml(tool) +
-              "</div>" +
-              '<div class="approval-request-input">' +
-              escapeHtml(inputPreview) +
-              "</div>" +
+              "</code></div>" +
+              renderInputTable(input) +
+              errorHtml +
               '<div class="approval-request-actions">' +
               '<button class="approval-action-btn approve" data-approval-id="' +
               escapeHtml(approvalId) +
@@ -1690,7 +1745,6 @@ var renderWebUiHtml = (options) => {
           .join("");
         return (
           '<div class="approval-requests">' +
-          '<div class="approval-requests-label">Approval required</div>' +
           rows +
           "</div>"
         );
@@ -1720,22 +1774,46 @@ var renderWebUiHtml = (options) => {
               "</details>"
             )
           : "";
+        const cls = "tool-activity" + (hasApprovals ? " has-approvals" : "");
         return (
-          '<div class="tool-activity">' +
+          '<div class="' + cls + '">' +
           disclosure +
           renderApprovalRequests(approvalRequests) +
           "</div>"
         );
       };
 
-      const safeJsonPreview = (value) => {
-        try {
-          return JSON.stringify(value, (_, nestedValue) =>
-            typeof nestedValue === "bigint" ? String(nestedValue) : nestedValue,
-          );
-        } catch {
-          return "[unserializable input]";
+      const renderInputTable = (input) => {
+        if (!input || typeof input !== "object") {
+          return '<div class="av-complex">' + escapeHtml(String(input ?? "{}")) + "</div>";
         }
+        const keys = Object.keys(input);
+        if (keys.length === 0) {
+          return '<div class="av-complex">{}</div>';
+        }
+        const formatValue = (val) => {
+          if (val === null || val === undefined) return escapeHtml("null");
+          if (typeof val === "boolean" || typeof val === "number") return escapeHtml(String(val));
+          if (typeof val === "string") return escapeHtml(val);
+          try {
+            const replacer = (_, v) => typeof v === "bigint" ? String(v) : v;
+            return escapeHtml(JSON.stringify(val, replacer, 2));
+          } catch {
+            return escapeHtml("[unserializable]");
+          }
+        };
+        const rows = keys.map((key) => {
+          const val = input[key];
+          const isComplex = val !== null && typeof val === "object";
+          const cls = isComplex ? "av-complex" : "av";
+          return (
+            "<tr>" +
+            '<td class="ak">' + escapeHtml(key) + "</td>" +
+            '<td><div class="' + cls + '">' + formatValue(val) + "</div></td>" +
+            "</tr>"
+          );
+        }).join("");
+        return '<table class="approval-request-table">' + rows + "</table>";
       };
 
       const updatePendingApproval = (approvalId, updater) => {
@@ -1774,12 +1852,10 @@ var renderWebUiHtml = (options) => {
               return null;
             }
             const toolName = item && typeof item.tool === "string" ? item.tool : "tool";
-            const preview = safeJsonPreview(item?.input ?? {});
-            const inputPreview = preview.length > 600 ? preview.slice(0, 600) + "..." : preview;
             return {
               approvalId,
               tool: toolName,
-              inputPreview,
+              input: item?.input ?? {},
               state: "pending",
             };
           })
@@ -1857,53 +1933,87 @@ var renderWebUiHtml = (options) => {
         elements.shell.classList.toggle("sidebar-open", open);
       };
 
-      const renderConversationList = () => {
-        elements.list.innerHTML = "";
-        for (const c of state.conversations) {
-          const item = document.createElement("div");
-          item.className = "conversation-item" + (c.conversationId === state.activeConversationId ? " active" : "");
-          item.textContent = c.title;
-
-          const isConfirming = state.confirmDeleteId === c.conversationId;
-          const deleteBtn = document.createElement("button");
-          deleteBtn.className = "delete-btn" + (isConfirming ? " confirming" : "");
-          deleteBtn.textContent = isConfirming ? "sure?" : "\\u00d7";
-          deleteBtn.onclick = async (e) => {
-            e.stopPropagation();
-            if (!isConfirming) {
-              state.confirmDeleteId = c.conversationId;
-              renderConversationList();
-              return;
-            }
-            await api("/api/conversations/" + c.conversationId, { method: "DELETE" });
-            if (state.activeConversationId === c.conversationId) {
-              state.activeConversationId = null;
-              state.activeMessages = [];
-              state.contextTokens = 0;
-              state.contextWindow = 0;
-              updateContextRing();
-              pushConversationUrl(null);
-              elements.chatTitle.textContent = "";
-              renderMessages([]);
-            }
-            state.confirmDeleteId = null;
-            await loadConversations();
-          };
-          item.appendChild(deleteBtn);
+      const buildConversationItem = (c) => {
+        const item = document.createElement("div");
+        item.className = "conversation-item" + (c.conversationId === state.activeConversationId ? " active" : "");
 
-          item.onclick = async () => {
-            // Clear any delete confirmation, but still navigate
-            if (state.confirmDeleteId) {
-              state.confirmDeleteId = null;
-            }
-            state.activeConversationId = c.conversationId;
-            pushConversationUrl(c.conversationId);
+        if (c.hasPendingApprovals) {
+          const dot = document.createElement("span");
+          dot.className = "approval-dot";
+          item.appendChild(dot);
+        }
+
+        const titleSpan = document.createElement("span");
+        titleSpan.textContent = c.title;
+        item.appendChild(titleSpan);
+
+        const isConfirming = state.confirmDeleteId === c.conversationId;
+        const deleteBtn = document.createElement("button");
+        deleteBtn.className = "delete-btn" + (isConfirming ? " confirming" : "");
+        deleteBtn.textContent = isConfirming ? "sure?" : "\\u00d7";
+        deleteBtn.onclick = async (e) => {
+          e.stopPropagation();
+          if (!isConfirming) {
+            state.confirmDeleteId = c.conversationId;
             renderConversationList();
-            await loadConversation(c.conversationId);
-            if (isMobile()) setSidebarOpen(false);
-          };
+            return;
+          }
+          await api("/api/conversations/" + c.conversationId, { method: "DELETE" });
+          if (state.activeConversationId === c.conversationId) {
+            state.activeConversationId = null;
+            state.activeMessages = [];
+            state.contextTokens = 0;
+            state.contextWindow = 0;
+            updateContextRing();
+            pushConversationUrl(null);
+            elements.chatTitle.textContent = "";
+            renderMessages([]);
+          }
+          state.confirmDeleteId = null;
+          await loadConversations();
+        };
+        item.appendChild(deleteBtn);
+
+        item.onclick = async () => {
+          if (state.confirmDeleteId) {
+            state.confirmDeleteId = null;
+          }
+          state.activeConversationId = c.conversationId;
+          pushConversationUrl(c.conversationId);
+          renderConversationList();
+          await loadConversation(c.conversationId);
+          if (isMobile()) setSidebarOpen(false);
+        };
 
-          elements.list.appendChild(item);
+        return item;
+      };
+
+      const renderConversationList = () => {
+        elements.list.innerHTML = "";
+        const pending = state.conversations.filter(c => c.hasPendingApprovals);
+        const rest = state.conversations.filter(c => !c.hasPendingApprovals);
+
+        if (pending.length > 0) {
+          const label = document.createElement("div");
+          label.className = "sidebar-section-label";
+          label.textContent = "Awaiting approval";
+          elements.list.appendChild(label);
+          for (const c of pending) {
+            elements.list.appendChild(buildConversationItem(c));
+          }
+          if (rest.length > 0) {
+            const divider = document.createElement("div");
+            divider.className = "sidebar-section-divider";
+            elements.list.appendChild(divider);
+            const recentLabel = document.createElement("div");
+            recentLabel.className = "sidebar-section-label";
+            recentLabel.textContent = "Recent";
+            elements.list.appendChild(recentLabel);
+          }
+        }
+
+        for (const c of rest) {
+          elements.list.appendChild(buildConversationItem(c));
         }
       };
 
@@ -2332,8 +2442,6 @@ var renderWebUiHtml = (options) => {
                       const approvalId =
                         typeof payload.approvalId === "string" ? payload.approvalId : "";
                       if (approvalId) {
-                        const preview = safeJsonPreview(payload.input ?? {});
-                        const inputPreview = preview.length > 600 ? preview.slice(0, 600) + "..." : preview;
                         if (!Array.isArray(assistantMessage._pendingApprovals)) {
                           assistantMessage._pendingApprovals = [];
                         }
@@ -2344,7 +2452,7 @@ var renderWebUiHtml = (options) => {
                           assistantMessage._pendingApprovals.push({
                             approvalId,
                             tool: toolName,
-                            inputPreview,
+                            input: payload.input ?? {},
                             state: "pending",
                           });
                         }
@@ -2992,8 +3100,6 @@ var renderWebUiHtml = (options) => {
                   const approvalId =
                     typeof payload.approvalId === "string" ? payload.approvalId : "";
                   if (approvalId) {
-                    const preview = safeJsonPreview(payload.input ?? {});
-                    const inputPreview = preview.length > 600 ? preview.slice(0, 600) + "..." : preview;
                     if (!Array.isArray(assistantMessage._pendingApprovals)) {
                       assistantMessage._pendingApprovals = [];
                     }
@@ -3004,7 +3110,7 @@ var renderWebUiHtml = (options) => {
                       assistantMessage._pendingApprovals.push({
                         approvalId,
                         tool: toolName,
-                        inputPreview,
+                        input: payload.input ?? {},
                         state: "pending",
                       });
                     }
@@ -3353,17 +3459,23 @@ var renderWebUiHtml = (options) => {
           });
           updatePendingApproval(approvalId, () => null);
           renderMessages(state.activeMessages, state.isStreaming);
+          loadConversations();
           if (!wasStreaming && state.activeConversationId) {
-            await streamConversationEvents(state.activeConversationId);
+            await streamConversationEvents(state.activeConversationId, { liveOnly: true });
           }
         } catch (error) {
-          const errMsg = error instanceof Error ? error.message : String(error);
-          updatePendingApproval(approvalId, (request) => ({
-            ...request,
-            state: "pending",
-            pendingDecision: null,
-            inputPreview: String(request.inputPreview || "") + " (submit failed: " + errMsg + ")",
-          }));
+          const isStale = error && error.payload && error.payload.code === "APPROVAL_NOT_FOUND";
+          if (isStale) {
+            updatePendingApproval(approvalId, () => null);
+          } else {
+            const errMsg = error instanceof Error ? error.message : String(error);
+            updatePendingApproval(approvalId, (request) => ({
+              ...request,
+              state: "pending",
+              pendingDecision: null,
+              _error: errMsg,
+            }));
+          }
           renderMessages(state.activeMessages, state.isStreaming);
         } finally {
           if (!wasStreaming) {
@@ -5893,7 +6005,6 @@ var createRequestHandler = async (options) => {
   const runOwners = /* @__PURE__ */ new Map();
   const runConversations = /* @__PURE__ */ new Map();
   const activeConversationRuns = /* @__PURE__ */ new Map();
-  const pendingApprovals = /* @__PURE__ */ new Map();
   const conversationEventStreams = /* @__PURE__ */ new Map();
   const broadcastEvent = (conversationId, event) => {
     let stream = conversationEventStreams.get(conversationId);
@@ -5925,51 +6036,19 @@ var createRequestHandler = async (options) => {
       setTimeout(() => conversationEventStreams.delete(conversationId), 3e4);
     }
   };
-  const persistConversationPendingApprovals = async (conversationId) => {
-    const conversation = await conversationStore.get(conversationId);
-    if (!conversation) {
-      return;
-    }
-    conversation.pendingApprovals = Array.from(pendingApprovals.entries()).filter(
-      ([, pending]) => pending.ownerId === conversation.ownerId && pending.conversationId === conversationId
-    ).map(([approvalId, pending]) => ({
-      approvalId,
-      runId: pending.runId,
-      tool: pending.tool,
-      input: pending.input
-    }));
-    await conversationStore.update(conversation);
-  };
   const clearPendingApprovalsForConversation = async (conversationId) => {
-    for (const [approvalId, pending] of pendingApprovals.entries()) {
-      if (pending.conversationId !== conversationId) {
-        continue;
-      }
-      pendingApprovals.delete(approvalId);
-      pending.resolve(false);
+    const conversation = await conversationStore.get(conversationId);
+    if (!conversation) return;
+    if (Array.isArray(conversation.pendingApprovals) && conversation.pendingApprovals.length > 0) {
+      conversation.pendingApprovals = [];
+      await conversationStore.update(conversation);
     }
-    await persistConversationPendingApprovals(conversationId);
   };
   const uploadStore = await createUploadStore(config?.uploads, workingDir);
   const harness = new AgentHarness({
     workingDir,
     environment: resolveHarnessEnvironment(),
-    uploadStore,
-    approvalHandler: async (request) => new Promise((resolveApproval) => {
-      const ownerIdForRun = runOwners.get(request.runId) ?? "local-owner";
-      const conversationIdForRun = runConversations.get(request.runId) ?? null;
-      pendingApprovals.set(request.approvalId, {
-        ownerId: ownerIdForRun,
-        runId: request.runId,
-        conversationId: conversationIdForRun,
-        tool: request.tool,
-        input: request.input,
-        resolve: resolveApproval
-      });
-      if (conversationIdForRun) {
-        void persistConversationPendingApprovals(conversationIdForRun);
-      }
-    })
+    uploadStore
   });
   await harness.initialize();
   const telemetry = new TelemetryEmitter(config?.telemetry);
@@ -5978,6 +6057,162 @@ var createRequestHandler = async (options) => {
     workingDir,
     agentId: identity.id
   });
+  const resumeRunFromCheckpoint = async (conversationId, conversation, checkpoint, toolResults) => {
+    const abortController = new AbortController();
+    activeConversationRuns.set(conversationId, {
+      ownerId: conversation.ownerId,
+      abortController,
+      runId: null
+    });
+    let latestRunId = conversation.runtimeRunId ?? "";
+    let assistantResponse = "";
+    const toolTimeline = [];
+    const sections = [];
+    let currentText = "";
+    let currentTools = [];
+    let checkpointedRun = false;
+    const baseMessages = checkpoint.baseMessageCount != null ? conversation.messages.slice(0, checkpoint.baseMessageCount) : [];
+    const fullCheckpointMessages = [...baseMessages, ...checkpoint.checkpointMessages];
+    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 = [];
+          }
+          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 === "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 = [{
+              approvalId: event.approvalId,
+              runId: latestRunId,
+              tool: event.tool,
+              toolCallId: event.toolCallId,
+              input: event.input,
+              checkpointMessages: [...fullCheckpointMessages, ...event.checkpointMessages],
+              baseMessageCount: 0,
+              pendingToolCalls: event.pendingToolCalls
+            }];
+            conv.updatedAt = Date.now();
+            await conversationStore.update(conv);
+          }
+          checkpointedRun = true;
+        }
+        if (event.type === "run:completed" && assistantResponse.length === 0 && 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);
+      }
+    } 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 (!checkpointedRun) {
+      const conv = await conversationStore.get(conversationId);
+      if (conv) {
+        const prevMessages = conv.messages;
+        const hasAssistantContent = assistantResponse.length > 0 || toolTimeline.length > 0 || sections.length > 0;
+        if (hasAssistantContent) {
+          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
+            ];
+            const mergedSections = [
+              ...Array.isArray(existingSections) ? existingSections : [],
+              ...sections
+            ];
+            const mergedText = (typeof lastMsg.content === "string" ? lastMsg.content : "") + assistantResponse;
+            conv.messages = [
+              ...prevMessages.slice(0, -1),
+              {
+                role: "assistant",
+                content: mergedText,
+                metadata: {
+                  toolActivity: mergedTimeline,
+                  sections: mergedSections.length > 0 ? mergedSections : void 0
+                }
+              }
+            ];
+          } else {
+            conv.messages = [
+              ...prevMessages,
+              {
+                role: "assistant",
+                content: assistantResponse,
+                metadata: toolTimeline.length > 0 || sections.length > 0 ? { toolActivity: toolTimeline, sections: sections.length > 0 ? sections : void 0 } : void 0
+              }
+            ];
+          }
+        }
+        conv.runtimeRunId = latestRunId || conv.runtimeRunId;
+        conv.pendingApprovals = [];
+        conv.updatedAt = Date.now();
+        await conversationStore.update(conv);
+      }
+    }
+    finishConversationStream(conversationId);
+    activeConversationRuns.delete(conversationId);
+    if (latestRunId) {
+      runOwners.delete(latestRunId);
+      runConversations.delete(latestRunId);
+    }
+    console.log("[resume-run] complete for", conversationId);
+  };
   const messagingRoutes = /* @__PURE__ */ new Map();
   const messagingRouteRegistrar = (method, path, routeHandler) => {
     let byMethod = messagingRoutes.get(path);
@@ -6026,6 +6261,7 @@ var createRequestHandler = async (options) => {
       const sections = [];
       let currentTools = [];
       let currentText = "";
+      let checkpointedRun = false;
       const buildMessages = () => {
         const draftSections = [
           ...sections.map((s) => ({
@@ -6116,19 +6352,22 @@ var createRequestHandler = async (options) => {
             toolTimeline.push(toolText);
             currentTools.push(toolText);
             await persistDraftAssistantTurn();
-            await persistConversationPendingApprovals(conversationId);
           }
-          if (event.type === "tool:approval:granted") {
-            const toolText = `- approval granted (${event.approvalId})`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            await persistDraftAssistantTurn();
-          }
-          if (event.type === "tool:approval:denied") {
-            const toolText = `- approval denied (${event.approvalId})`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            await persistDraftAssistantTurn();
+          if (event.type === "tool:approval:checkpoint") {
+            await updateConversation((c) => {
+              c.messages = buildMessages();
+              c.pendingApprovals = [{
+                approvalId: event.approvalId,
+                runId: latestRunId,
+                tool: event.tool,
+                toolCallId: event.toolCallId,
+                input: event.input,
+                checkpointMessages: event.checkpointMessages,
+                baseMessageCount: historyMessages.length,
+                pendingToolCalls: event.pendingToolCalls
+              }];
+            });
+            checkpointedRun = true;
           }
           if (event.type === "run:completed" && assistantResponse.length === 0 && event.result.response) {
             assistantResponse = event.result.response;
@@ -6150,13 +6389,14 @@ var createRequestHandler = async (options) => {
         sections.push({ type: "text", content: currentText });
         currentText = "";
       }
-      await updateConversation((c) => {
-        c.messages = buildMessages();
-        c.runtimeRunId = latestRunId || c.runtimeRunId;
-        c.pendingApprovals = [];
-      });
+      if (!checkpointedRun) {
+        await updateConversation((c) => {
+          c.messages = buildMessages();
+          c.runtimeRunId = latestRunId || c.runtimeRunId;
+          c.pendingApprovals = [];
+        });
+      }
       finishConversationStream(conversationId);
-      await persistConversationPendingApprovals(conversationId);
       if (latestRunId) {
         runOwners.delete(latestRunId);
         runConversations.delete(latestRunId);
@@ -6418,7 +6658,8 @@ var createRequestHandler = async (options) => {
           tenantId: conversation.tenantId,
           createdAt: conversation.createdAt,
           updatedAt: conversation.updatedAt,
-          messageCount: conversation.messages.length
+          messageCount: conversation.messages.length,
+          hasPendingApprovals: Array.isArray(conversation.pendingApprovals) && conversation.pendingApprovals.length > 0
         }))
       });
       return;
@@ -6442,36 +6683,77 @@ var createRequestHandler = async (options) => {
     const approvalMatch = pathname.match(/^\/api\/approvals\/([^/]+)$/);
     if (approvalMatch && request.method === "POST") {
       const approvalId = decodeURIComponent(approvalMatch[1] ?? "");
-      const pending = pendingApprovals.get(approvalId);
-      if (!pending || pending.ownerId !== ownerId) {
-        const conversations = await conversationStore.list(ownerId);
-        let prunedStale = false;
-        for (const conversation of conversations) {
-          if (!Array.isArray(conversation.pendingApprovals)) {
-            continue;
-          }
-          const next = conversation.pendingApprovals.filter(
-            (approval) => approval.approvalId !== approvalId
-          );
-          if (next.length !== conversation.pendingApprovals.length) {
-            conversation.pendingApprovals = next;
-            await conversationStore.update(conversation);
-            prunedStale = true;
-          }
+      const body = await readRequestBody(request);
+      const approved = body.approved === true;
+      const conversations = await conversationStore.list(ownerId);
+      let foundConversation;
+      let foundApproval;
+      for (const conv of conversations) {
+        if (!Array.isArray(conv.pendingApprovals)) continue;
+        const match = conv.pendingApprovals.find((a) => a.approvalId === approvalId);
+        if (match) {
+          foundConversation = conv;
+          foundApproval = match;
+          break;
         }
+      }
+      if (!foundConversation || !foundApproval) {
         writeJson(response, 404, {
           code: "APPROVAL_NOT_FOUND",
-          message: prunedStale ? "Approval request is no longer active" : "Approval request not found"
+          message: "Approval request not found"
         });
         return;
       }
-      const body = await readRequestBody(request);
-      const approved = body.approved === true;
-      pendingApprovals.delete(approvalId);
-      if (pending.conversationId) {
-        await persistConversationPendingApprovals(pending.conversationId);
+      const conversationId = foundConversation.conversationId;
+      if (!foundApproval.checkpointMessages || !foundApproval.toolCallId) {
+        foundConversation.pendingApprovals = (foundConversation.pendingApprovals ?? []).filter((a) => a.approvalId !== approvalId);
+        await conversationStore.update(foundConversation);
+        writeJson(response, 404, {
+          code: "APPROVAL_NOT_FOUND",
+          message: "Approval request is no longer active (no checkpoint data)"
+        });
+        return;
       }
-      pending.resolve(approved);
+      foundConversation.pendingApprovals = (foundConversation.pendingApprovals ?? []).filter((a) => a.approvalId !== approvalId);
+      await conversationStore.update(foundConversation);
+      broadcastEvent(
+        conversationId,
+        approved ? { type: "tool:approval:granted", approvalId } : { type: "tool:approval:denied", approvalId }
+      );
+      void (async () => {
+        let toolResults;
+        if (approved) {
+          const toolContext = {
+            runId: foundApproval.runId,
+            agentId: identity.id,
+            step: 0,
+            workingDir,
+            parameters: {}
+          };
+          const execResults = await harness.executeTools(
+            [{ id: foundApproval.toolCallId, name: foundApproval.tool, input: foundApproval.input }],
+            toolContext
+          );
+          toolResults = execResults.map((r) => ({
+            callId: r.callId,
+            toolName: r.tool,
+            result: r.output,
+            error: r.error
+          }));
+        } else {
+          toolResults = [{
+            callId: foundApproval.toolCallId,
+            toolName: foundApproval.tool,
+            error: "Tool execution denied by user"
+          }];
+        }
+        await resumeRunFromCheckpoint(
+          conversationId,
+          foundConversation,
+          foundApproval,
+          toolResults
+        );
+      })();
       writeJson(response, 200, { ok: true, approvalId, approved });
       return;
     }
@@ -6533,30 +6815,18 @@ var createRequestHandler = async (options) => {
         return;
       }
       if (request.method === "GET") {
-        const storedPending = Array.isArray(conversation.pendingApprovals) ? conversation.pendingApprovals : [];
-        const livePending = Array.from(pendingApprovals.entries()).filter(
-          ([, pending]) => pending.ownerId === ownerId && pending.conversationId === conversationId
-        ).map(([approvalId, pending]) => ({
-          approvalId,
-          runId: pending.runId,
-          tool: pending.tool,
-          input: pending.input
-        }));
-        const mergedPendingById = /* @__PURE__ */ new Map();
-        for (const approval of storedPending) {
-          if (approval && typeof approval.approvalId === "string") {
-            mergedPendingById.set(approval.approvalId, approval);
-          }
-        }
-        for (const approval of livePending) {
-          mergedPendingById.set(approval.approvalId, approval);
-        }
+        const storedPending = Array.isArray(conversation.pendingApprovals) ? conversation.pendingApprovals.map((a) => ({
+          approvalId: a.approvalId,
+          runId: a.runId,
+          tool: a.tool,
+          input: a.input
+        })) : [];
         const activeStream = conversationEventStreams.get(conversationId);
         const hasActiveRun = !!activeStream && !activeStream.finished;
         writeJson(response, 200, {
           conversation: {
             ...conversation,
-            pendingApprovals: Array.from(mergedPendingById.values())
+            pendingApprovals: storedPending
           },
           hasActiveRun
         });
@@ -6740,6 +7010,7 @@ var createRequestHandler = async (options) => {
       let currentText = "";
       let currentTools = [];
       let runCancelled = false;
+      let checkpointedRun = false;
       let userContent = messageText;
       if (files.length > 0) {
         try {
@@ -6877,17 +7148,36 @@ var createRequestHandler = async (options) => {
             currentTools.push(toolText);
             await persistDraftAssistantTurn();
           }
-          if (event.type === "tool:approval:granted") {
-            const toolText = `- approval granted (${event.approvalId})`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            await persistDraftAssistantTurn();
-          }
-          if (event.type === "tool:approval:denied") {
-            const toolText = `- approval denied (${event.approvalId})`;
-            toolTimeline.push(toolText);
-            currentTools.push(toolText);
-            await persistDraftAssistantTurn();
+          if (event.type === "tool:approval:checkpoint") {
+            const checkpointSections = [...sections];
+            if (currentTools.length > 0) {
+              checkpointSections.push({ type: "tools", content: [...currentTools] });
+            }
+            if (currentText.length > 0) {
+              checkpointSections.push({ type: "text", content: currentText });
+            }
+            conversation.messages = [
+              ...historyMessages,
+              { 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 = [{
+              approvalId: event.approvalId,
+              runId: latestRunId,
+              tool: event.tool,
+              toolCallId: event.toolCallId,
+              input: event.input,
+              checkpointMessages: event.checkpointMessages,
+              baseMessageCount: historyMessages.length,
+              pendingToolCalls: event.pendingToolCalls
+            }];
+            conversation.updatedAt = Date.now();
+            await conversationStore.update(conversation);
+            checkpointedRun = true;
           }
           if (event.type === "run:completed" && assistantResponse.length === 0 && event.result.response) {
             assistantResponse = event.result.response;
@@ -6905,23 +7195,25 @@ var createRequestHandler = async (options) => {
         if (currentText.length > 0) {
           sections.push({ type: "text", content: currentText });
         }
-        const hasAssistantContent = assistantResponse.length > 0 || toolTimeline.length > 0 || sections.length > 0;
-        conversation.messages = hasAssistantContent ? [
-          ...historyMessages,
-          { role: "user", content: userContent },
-          {
-            role: "assistant",
-            content: assistantResponse,
-            metadata: toolTimeline.length > 0 || sections.length > 0 ? {
-              toolActivity: toolTimeline,
-              sections: sections.length > 0 ? sections : void 0
-            } : void 0
-          }
-        ] : [...historyMessages, { role: "user", content: userContent }];
-        conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
-        conversation.pendingApprovals = [];
-        conversation.updatedAt = Date.now();
-        await conversationStore.update(conversation);
+        if (!checkpointedRun) {
+          const hasAssistantContent = assistantResponse.length > 0 || toolTimeline.length > 0 || sections.length > 0;
+          conversation.messages = hasAssistantContent ? [
+            ...historyMessages,
+            { role: "user", content: userContent },
+            {
+              role: "assistant",
+              content: assistantResponse,
+              metadata: toolTimeline.length > 0 || sections.length > 0 ? {
+                toolActivity: toolTimeline,
+                sections: sections.length > 0 ? sections : void 0
+              } : void 0
+            }
+          ] : [...historyMessages, { role: "user", content: userContent }];
+          conversation.runtimeRunId = latestRunId || conversation.runtimeRunId;
+          conversation.pendingApprovals = [];
+          conversation.updatedAt = Date.now();
+          await conversationStore.update(conversation);
+        }
       } catch (error) {
         if (abortController.signal.aborted || runCancelled) {
           const fallbackSections = [...sections];
@@ -6992,7 +7284,6 @@ var createRequestHandler = async (options) => {
           activeConversationRuns.delete(conversationId);
         }
         finishConversationStream(conversationId);
-        await persistConversationPendingApprovals(conversationId);
         if (latestRunId) {
           runOwners.delete(latestRunId);
           runConversations.delete(latestRunId);
@@ -7391,33 +7682,16 @@ Error: ${event.error.message}
 var runInteractive = async (workingDir, params) => {
   dotenv.config({ path: resolve3(workingDir, ".env") });
   const config = await loadPonchoConfig(workingDir);
-  let pendingApproval = null;
-  let onApprovalRequest = null;
-  const approvalHandler = async (request) => {
-    return new Promise((resolveApproval) => {
-      const req = {
-        tool: request.tool,
-        input: request.input,
-        approvalId: request.approvalId,
-        resolve: resolveApproval
-      };
-      pendingApproval = req;
-      if (onApprovalRequest) {
-        onApprovalRequest(req);
-      }
-    });
-  };
   const uploadStore = await createUploadStore(config?.uploads, workingDir);
   const harness = new AgentHarness({
     workingDir,
     environment: resolveHarnessEnvironment(),
-    approvalHandler,
     uploadStore
   });
   await harness.initialize();
   const identity = await ensureAgentIdentity2(workingDir);
   try {
-    const { runInteractiveInk } = await import("./run-interactive-ink-SLWDVTDX.js");
+    const { runInteractiveInk } = await import("./run-interactive-ink-7ULE5JJI.js");
     await runInteractiveInk({
       harness,
       params,
@@ -7426,13 +7700,7 @@ var runInteractive = async (workingDir, params) => {
       conversationStore: createConversationStore(resolveStateConfig(config), {
         workingDir,
         agentId: identity.id
-      }),
-      onSetApprovalCallback: (cb) => {
-        onApprovalRequest = cb;
-        if (pendingApproval) {
-          cb(pendingApproval);
-        }
-      }
+      })
     });
   } finally {
     await harness.shutdown();