@poncho-ai/cli 0.27.0 → 0.28.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @poncho-ai/cli@0.27.0 build /home/runner/work/poncho-ai/poncho-ai/packages/cli
+> @poncho-ai/cli@0.28.0 build /home/runner/work/poncho-ai/poncho-ai/packages/cli
 > tsup src/index.ts src/cli.ts --format esm --dts
 
 CLI Building entry: src/cli.ts, src/index.ts
@@ -9,10 +9,10 @@
 ESM Build start
 ESM dist/cli.js                          94.00 B
 ESM dist/index.js                        857.00 B
-ESM dist/run-interactive-ink-OUX42GU4.js 56.74 KB
-ESM dist/chunk-LPT2RFZ5.js               422.53 KB
-ESM ⚡️ Build success in 63ms
+ESM dist/run-interactive-ink-5SPYMVJR.js 56.74 KB
+ESM dist/chunk-5AKBY5GK.js               434.40 KB
+ESM ⚡️ Build success in 56ms
 DTS Build start
-DTS ⚡️ Build success in 4319ms
+DTS ⚡️ Build success in 3589ms
 DTS dist/cli.d.ts   20.00 B
 DTS dist/index.d.ts 3.70 KB

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @poncho-ai/cli
 
+## 0.28.0
+
+### Minor Changes
+
+- [#40](https://github.com/cesr/poncho-ai/pull/40) [`95ae86b`](https://github.com/cesr/poncho-ai/commit/95ae86b4ea0d913357ccca9a43a227c83e46b9c4) Thanks [@cesr](https://github.com/cesr)! - Add built-in todo tools (todo_list, todo_add, todo_update, todo_remove) with per-conversation storage and a live todo panel in the web UI
+
+### Patch Changes
+
+- Updated dependencies [[`95ae86b`](https://github.com/cesr/poncho-ai/commit/95ae86b4ea0d913357ccca9a43a227c83e46b9c4)]:
+  - @poncho-ai/harness@0.26.0
+
+## 0.27.1
+
+### Patch Changes
+
+- [`5a103ca`](https://github.com/cesr/poncho-ai/commit/5a103ca62238cceaa4f4b31769a96637330d6b84) Thanks [@cesr](https://github.com/cesr)! - Split `memory_main_update` into `memory_main_write` (full overwrite) and `memory_main_edit` (targeted string replacement). Hot-reload AGENT.md and skills in dev mode without restarting the server. Merge agent + skill MCP tool patterns additively. Fix MissingToolResultsError when resuming from nested approval checkpoints.
+
+- Updated dependencies [[`5a103ca`](https://github.com/cesr/poncho-ai/commit/5a103ca62238cceaa4f4b31769a96637330d6b84)]:
+  - @poncho-ai/harness@0.25.0
+
 ## 0.27.0
 
 ### Minor Changes

package/dist/{chunk-LPT2RFZ5.js → chunk-5AKBY5GK.js}

@@ -1024,6 +1024,8 @@ var WEB_UI_STYLES = `
     }
     .composer-inner { max-width: 680px; margin: 0 auto; }
     .composer-shell {
+      position: relative;
+      z-index: 1;
       background: var(--bg-alt);
       border: 1px solid var(--border-3);
       border-radius: 24px;
@@ -1591,6 +1593,114 @@ var WEB_UI_STYLES = `
       text-decoration: underline;
     }
 
+    /* Todo panel \u2014 inside composer-inner, above the input shell */
+    #todo-panel {
+      max-height: 240px;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      font-size: 13px;
+      background: var(--surface-2);
+      border-radius: 14px 14px 0 0;
+      padding-bottom: 24px;
+      margin-bottom: -24px;
+    }
+    #todo-panel.hidden { display: none; }
+
+    .todo-panel-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 6px 14px;
+      flex-shrink: 0;
+      cursor: pointer;
+      user-select: none;
+    }
+    .todo-panel-header:hover {
+      background: var(--surface-1);
+    }
+    #todo-panel.collapsed {
+      padding-bottom: 0;
+    }
+    #todo-panel.collapsed .todo-panel-header {
+      padding-bottom: 30px;
+    }
+    .todo-panel-title {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+    .todo-panel-label {
+      font-weight: 600;
+      color: var(--fg);
+      font-size: 11px;
+    }
+    .todo-panel-progress {
+      font-size: 11px;
+      color: var(--fg-3);
+    }
+    .todo-panel-toggle {
+      color: var(--fg-5);
+      display: flex;
+      align-items: center;
+      transition: transform 0.15s ease;
+    }
+    .todo-panel-toggle.open {
+      transform: rotate(90deg);
+    }
+
+    .todo-panel-list {
+      list-style: none;
+      margin: 0;
+      padding: 0 0 4px;
+      overflow-y: auto;
+      flex: 1;
+    }
+    .todo-item {
+      display: flex;
+      align-items: flex-start;
+      gap: 8px;
+      padding: 4px 14px;
+      color: var(--fg-2);
+      line-height: 1.4;
+    }
+    .todo-item-done {
+      opacity: 0.5;
+    }
+    .todo-item-done .todo-item-content {
+      text-decoration: line-through;
+    }
+    .todo-item-content {
+      flex: 1;
+      word-break: break-word;
+    }
+
+    .todo-status {
+      flex-shrink: 0;
+      width: 16px;
+      text-align: center;
+      line-height: 1.4;
+    }
+    .todo-status-completed { color: #4ade80; }
+    .todo-status-in-progress { color: #facc15; }
+    .todo-status-pending { color: var(--fg-5); }
+
+    .todo-priority {
+      flex-shrink: 0;
+      font-size: 10px;
+      padding: 1px 5px;
+      border-radius: 4px;
+      line-height: 1.4;
+    }
+    .todo-priority-high {
+      color: #f87171;
+      background: rgba(248,113,113,0.12);
+    }
+    .todo-priority-low {
+      color: var(--fg-5);
+      background: var(--surface-1);
+    }
+
     /* Reduced motion */
     @media (prefers-reduced-motion: reduce) {
       *, *::before, *::after {
@@ -1630,6 +1740,8 @@ var getWebUiClientScript = (markedSource2) => `
         subagentsParentId: null,
         viewingSubagentId: null,
         parentConversationId: null,
+        todos: [],
+        todoPanelCollapsed: false,
       };
 
       const agentInitial = document.body.dataset.agentInitial || "A";
@@ -2181,7 +2293,9 @@ var getWebUiClientScript = (markedSource2) => `
             state.activeMessages = [];
             state.contextTokens = 0;
             state.contextWindow = 0;
+            state.todos = [];
             updateContextRing();
+            renderTodoPanel();
             pushConversationUrl(null);
             elements.chatTitle.textContent = "";
             renderMessages([]);
@@ -2213,6 +2327,136 @@ var getWebUiClientScript = (markedSource2) => `
         return item;
       };
 
+      const _todoPriorityOrder = { high: 0, medium: 1, low: 2 };
+      const _todoStatusOrder = { in_progress: 0, pending: 1, completed: 2 };
+      const _todoCompletedTimers = new Map();
+
+      const _scheduleCompletedHide = () => {
+        state.todos.forEach(function(todo) {
+          if (todo.status === "completed" && !_todoCompletedTimers.has(todo.id)) {
+            _todoCompletedTimers.set(todo.id, todo.updatedAt || Date.now());
+          }
+        });
+        const activeIds = new Set(state.todos.map(function(t) { return t.id; }));
+        for (const id of _todoCompletedTimers.keys()) {
+          if (!activeIds.has(id)) _todoCompletedTimers.delete(id);
+        }
+      };
+
+      const _getVisibleTodos = () => {
+        const now = Date.now();
+        const sorted = state.todos.slice().sort(function(a, b) {
+          const sp = (_todoStatusOrder[a.status] || 1) - (_todoStatusOrder[b.status] || 1);
+          if (sp !== 0) return sp;
+          const pp = (_todoPriorityOrder[a.priority] || 1) - (_todoPriorityOrder[b.priority] || 1);
+          if (pp !== 0) return pp;
+          return (a.createdAt || 0) - (b.createdAt || 0);
+        });
+        if (!state.todoPanelCollapsed) return sorted;
+        return sorted.filter(function(todo) {
+          if (todo.status !== "completed") return true;
+          const completedAt = _todoCompletedTimers.get(todo.id);
+          return !completedAt || (now - completedAt) < 30000;
+        });
+      };
+
+      let _todoHideTimer = null;
+      const _ensureHideTimer = () => {
+        if (_todoHideTimer) return;
+        _todoHideTimer = setInterval(function() {
+          const hasExpiring = state.todos.some(function(t) {
+            if (t.status !== "completed") return false;
+            const at = _todoCompletedTimers.get(t.id);
+            return at && (Date.now() - at) >= 30000;
+          });
+          if (hasExpiring && state.todoPanelCollapsed) renderTodoPanel();
+          if (!state.todos.length) {
+            clearInterval(_todoHideTimer);
+            _todoHideTimer = null;
+          }
+        }, 5000);
+      };
+
+      const _autoCollapseTodos = (live) => {
+        if (!live) {
+          state.todoPanelCollapsed = true;
+          return;
+        }
+        const hasActive = state.todos.some(function(t) {
+          return t.status === "pending" || t.status === "in_progress";
+        });
+        state.todoPanelCollapsed = !hasActive;
+      };
+
+      const renderTodoPanel = () => {
+        let panel = document.getElementById("todo-panel");
+        if (!panel) return;
+
+        _scheduleCompletedHide();
+        const visible = _getVisibleTodos();
+
+        if (!visible.length) {
+          panel.classList.add("hidden");
+          panel.innerHTML = "";
+          return;
+        }
+
+        panel.classList.remove("hidden");
+        if (state.todoPanelCollapsed) {
+          panel.classList.add("collapsed");
+        } else {
+          panel.classList.remove("collapsed");
+        }
+        _ensureHideTimer();
+
+        const completed = state.todos.filter(t => t.status === "completed").length;
+        const total = state.todos.length;
+
+        const statusIcon = (status) => {
+          if (status === "completed") return '<span class="todo-status todo-status-completed">\\u2713</span>';
+          if (status === "in_progress") return '<span class="todo-status todo-status-in-progress">\\u25CF</span>';
+          return '<span class="todo-status todo-status-pending">\\u25CB</span>';
+        };
+
+        const priorityBadge = (priority) => {
+          if (!priority || priority === "medium") return "";
+          return '<span class="todo-priority todo-priority-' + priority + '">' + priority + '</span>';
+        };
+
+        const isCollapsed = state.todoPanelCollapsed;
+
+        let html = '<div class="todo-panel-header" id="todo-panel-header">';
+        html += '<div class="todo-panel-title">';
+        html += '<span class="todo-panel-label">Todos</span>';
+        html += '<span class="todo-panel-progress">' + completed + '/' + total + ' done</span>';
+        html += '</div>';
+        html += '<span class="todo-panel-toggle' + (isCollapsed ? '' : ' open') + '"><svg viewBox="0 0 12 12" fill="none" width="12" height="12"><path d="M4.5 2.75L8 6L4.5 9.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg></span>';
+        html += '</div>';
+
+        if (!isCollapsed) {
+          html += '<ul class="todo-panel-list">';
+          visible.forEach(function(todo) {
+            const isDone = todo.status === "completed";
+            html += '<li class="todo-item' + (isDone ? ' todo-item-done' : '') + '">';
+            html += statusIcon(todo.status);
+            html += '<span class="todo-item-content">' + escapeHtml(todo.content) + '</span>';
+            html += priorityBadge(todo.priority);
+            html += '</li>';
+          });
+          html += '</ul>';
+        }
+
+        panel.innerHTML = html;
+
+        const header = document.getElementById("todo-panel-header");
+        if (header) {
+          header.onclick = function() {
+            state.todoPanelCollapsed = !state.todoPanelCollapsed;
+            renderTodoPanel();
+          };
+        }
+      };
+
       const renderConversationList = () => {
         elements.list.innerHTML = "";
         const pending = state.conversations.filter(c => c.hasPendingApprovals);
@@ -2227,21 +2471,48 @@ var getWebUiClientScript = (markedSource2) => `
             elements.list.appendChild(buildConversationItem(c));
             appendSubagentsIfActive(c.conversationId);
           }
-          if (rest.length > 0) {
+        }
+
+        const now = new Date();
+        const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+        const sevenDaysAgo = startOfToday - 7 * 86400000;
+
+        const latest = [];
+        const previous7 = [];
+        const older = [];
+        for (const c of rest) {
+          const ts = c.updatedAt || c.createdAt || 0;
+          if (ts >= startOfToday) {
+            latest.push(c);
+          } else if (ts >= sevenDaysAgo) {
+            previous7.push(c);
+          } else {
+            older.push(c);
+          }
+        }
+
+        let sectionRendered = pending.length > 0;
+        const appendSection = (items, labelText) => {
+          if (items.length === 0) return;
+          if (sectionRendered) {
             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);
           }
-        }
+          const sectionLabel = document.createElement("div");
+          sectionLabel.className = "sidebar-section-label";
+          sectionLabel.textContent = labelText;
+          elements.list.appendChild(sectionLabel);
+          for (const c of items) {
+            elements.list.appendChild(buildConversationItem(c));
+            appendSubagentsIfActive(c.conversationId);
+          }
+          sectionRendered = true;
+        };
 
-        for (const c of rest) {
-          elements.list.appendChild(buildConversationItem(c));
-          appendSubagentsIfActive(c.conversationId);
-        }
+        appendSection(latest, "Latest");
+        appendSection(previous7, "Previous 7 days");
+        appendSection(older, "Older");
       };
 
       const appendSubagentsIfActive = (conversationId) => {
@@ -2621,6 +2892,15 @@ var getWebUiClientScript = (markedSource2) => `
           loadSubagents(subagentParentId);
         }
 
+        try {
+          const todosPayload = await api("/api/conversations/" + encodeURIComponent(conversationId) + "/todos");
+          state.todos = todosPayload.todos || [];
+        } catch (_e) {
+          state.todos = [];
+        }
+        _autoCollapseTodos();
+        renderTodoPanel();
+
         updateContextRing();
         renderMessages(state.activeMessages, false, { forceScrollBottom: true });
         if (!state.viewingSubagentId) {
@@ -2723,6 +3003,13 @@ var getWebUiClientScript = (markedSource2) => `
                 payload.conversation.messages || [],
                 allPending,
               );
+              if (typeof payload.conversation.contextTokens === "number") {
+                state.contextTokens = payload.conversation.contextTokens;
+              }
+              if (typeof payload.conversation.contextWindow === "number" && payload.conversation.contextWindow > 0) {
+                state.contextWindow = payload.conversation.contextWindow;
+              }
+              updateContextRing();
               renderMessages(state.activeMessages, payload.hasActiveRun);
             }
             if (payload.hasActiveRun) {
@@ -2938,6 +3225,11 @@ var getWebUiClientScript = (markedSource2) => `
                         state.contextTokens += payload.outputTokenEstimate;
                         updateContextRing();
                       }
+                      if (toolName !== "todo_list" && toolName.startsWith("todo_") && payload.output && typeof payload.output === "object" && Array.isArray(payload.output.todos)) {
+                        state.todos = payload.output.todos;
+                        _autoCollapseTodos(true);
+                        renderTodoPanel();
+                      }
                       renderIfActiveConversation(true);
                     }
                     if (eventName === "tool:error") {
@@ -2973,6 +3265,10 @@ var getWebUiClientScript = (markedSource2) => `
                     if (eventName === "compaction:completed") {
                       didCompact = true;
                       removeActiveActivityForTool(assistantMessage, "__compaction__");
+                      if (typeof payload.tokensAfter === "number") {
+                        state.contextTokens = payload.tokensAfter;
+                        updateContextRing();
+                      }
                       renderIfActiveConversation(true);
                     }
                     if (eventName === "browser:status" && payload.active) {
@@ -3760,6 +4056,11 @@ var getWebUiClientScript = (markedSource2) => `
                     state.contextTokens += payload.outputTokenEstimate;
                     updateContextRing();
                   }
+                  if (toolName !== "todo_list" && toolName.startsWith("todo_") && payload.output && typeof payload.output === "object" && Array.isArray(payload.output.todos)) {
+                    state.todos = payload.output.todos;
+                    _autoCollapseTodos(true);
+                    renderTodoPanel();
+                  }
                   renderIfActiveConversation(true);
                 }
                 if (eventName === "tool:error") {
@@ -3797,6 +4098,10 @@ var getWebUiClientScript = (markedSource2) => `
                 if (eventName === "compaction:completed") {
                   didCompact = true;
                   removeActiveActivityForTool(assistantMessage, "__compaction__");
+                  if (typeof payload.tokensAfter === "number") {
+                    state.contextTokens = payload.tokensAfter;
+                    updateContextRing();
+                  }
                   renderIfActiveConversation(true);
                 }
                 if (eventName === "browser:status" && payload.active) {
@@ -4043,8 +4348,10 @@ var getWebUiClientScript = (markedSource2) => `
         state.parentConversationId = null;
         state.subagents = [];
         state.subagentsParentId = null;
+        state.todos = [];
         updateSubagentUi();
         updateContextRing();
+        renderTodoPanel();
         pushConversationUrl(null);
         elements.chatTitle.textContent = "";
         renderMessages([]);
@@ -5193,6 +5500,7 @@ ${WEB_UI_STYLES}
           </div>
           <form id="composer" class="composer">
             <div class="composer-inner">
+              <div id="todo-panel" class="hidden"></div>
               <div id="attachment-preview" class="attachment-preview" style="display:none"></div>
               <div class="composer-shell">
                 <button id="attach-btn" class="attach-btn" type="button" title="Attach files">
@@ -7778,7 +8086,7 @@ data: ${JSON.stringify(statusPayload)}
       runId: null
     });
     childHarness.setSubagentManager(subagentManager);
-    childHarness.unregisterTools(["memory_main_update"]);
+    childHarness.unregisterTools(["memory_main_write", "memory_main_edit"]);
     let assistantResponse = "";
     let latestRunId = "";
     const toolTimeline = [];
@@ -8137,6 +8445,32 @@ data: ${JSON.stringify(statusPayload)}
     let runContextWindow = conversation.contextWindow ?? 0;
     const baseMessages = checkpoint.baseMessageCount != null ? conversation.messages.slice(0, checkpoint.baseMessageCount) : [];
     const fullCheckpointMessages = [...baseMessages, ...checkpoint.checkpointMessages];
+    let resumeToolResultMsg;
+    const lastCpMsg = fullCheckpointMessages[fullCheckpointMessages.length - 1];
+    if (lastCpMsg?.role === "assistant") {
+      try {
+        const parsed = JSON.parse(typeof lastCpMsg.content === "string" ? lastCpMsg.content : "");
+        const cpToolCalls = parsed.tool_calls ?? [];
+        if (cpToolCalls.length > 0) {
+          const providedMap = new Map(toolResults.map((r) => [r.callId, r]));
+          resumeToolResultMsg = {
+            role: "tool",
+            content: JSON.stringify(cpToolCalls.map((tc) => {
+              const provided = providedMap.get(tc.id);
+              return {
+                type: "tool_result",
+                tool_use_id: tc.id,
+                tool_name: provided?.toolName ?? tc.name,
+                content: provided ? provided.error ? `Tool error: ${provided.error}` : JSON.stringify(provided.result ?? null) : "Tool error: Tool execution deferred (pending approval checkpoint)"
+              };
+            })),
+            metadata: { timestamp: Date.now() }
+          };
+        }
+      } catch {
+      }
+    }
+    const fullCheckpointWithResults = resumeToolResultMsg ? [...fullCheckpointMessages, resumeToolResultMsg] : fullCheckpointMessages;
     try {
       for await (const event of harness.continueFromToolResult({
         messages: fullCheckpointMessages,
@@ -8202,7 +8536,7 @@ data: ${JSON.stringify(statusPayload)}
               tool: a.tool,
               toolCallId: a.toolCallId,
               input: a.input,
-              checkpointMessages: [...fullCheckpointMessages, ...event.checkpointMessages],
+              checkpointMessages: [...fullCheckpointWithResults, ...event.checkpointMessages],
               baseMessageCount: 0,
               pendingToolCalls: event.pendingToolCalls
             }));
@@ -9407,6 +9741,13 @@ data: ${JSON.stringify(frame)}
       writeJson(response, 200, { subagents });
       return;
     }
+    const todosMatch = pathname.match(/^\/api\/conversations\/([^/]+)\/todos$/);
+    if (todosMatch && request.method === "GET") {
+      const conversationId = decodeURIComponent(todosMatch[1] ?? "");
+      const todos = await harness.getTodos(conversationId);
+      writeJson(response, 200, { todos });
+      return;
+    }
     const conversationPathMatch = pathname.match(/^\/api\/conversations\/([^/]+)$/);
     if (conversationPathMatch) {
       const conversationId = decodeURIComponent(conversationPathMatch[1] ?? "");
@@ -10613,7 +10954,7 @@ var runInteractive = async (workingDir, params) => {
   await harness.initialize();
   const identity = await ensureAgentIdentity2(workingDir);
   try {
-    const { runInteractiveInk } = await import("./run-interactive-ink-OUX42GU4.js");
+    const { runInteractiveInk } = await import("./run-interactive-ink-5SPYMVJR.js");
     await runInteractiveInk({
       harness,
       params,

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   main
-} from "./chunk-LPT2RFZ5.js";
+} from "./chunk-5AKBY5GK.js";
 
 // src/cli.ts
 void main();

package/dist/index.js

@@ -23,7 +23,7 @@ import {
   runTests,
   startDevServer,
   updateAgentGuidance
-} from "./chunk-LPT2RFZ5.js";
+} from "./chunk-5AKBY5GK.js";
 export {
   addSkill,
   buildCli,

package/dist/{run-interactive-ink-OUX42GU4.js → run-interactive-ink-5SPYMVJR.js}

@@ -2,7 +2,7 @@ import {
   consumeFirstRunIntro,
   inferConversationTitle,
   resolveHarnessEnvironment
-} from "./chunk-LPT2RFZ5.js";
+} from "./chunk-5AKBY5GK.js";
 
 // src/run-interactive-ink.ts
 import * as readline from "readline";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poncho-ai/cli",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "CLI for building and deploying AI agents",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "react": "^19.2.4",
     "react-devtools-core": "^6.1.5",
     "yaml": "^2.8.1",
-    "@poncho-ai/harness": "0.24.0",
+    "@poncho-ai/harness": "0.26.0",
     "@poncho-ai/messaging": "0.7.0",
     "@poncho-ai/sdk": "1.5.0"
   },

package/src/index.ts

@@ -1681,8 +1681,8 @@ export const createRequestHandler = async (options?: {
 
     // Wire up subagent manager on the child so it can spawn sub-subagents
     childHarness.setSubagentManager(subagentManager);
-    // Subagents get read-only memory -- strip the write tool
-    childHarness.unregisterTools(["memory_main_update"]);
+    // Subagents get read-only memory -- strip the write tools
+    childHarness.unregisterTools(["memory_main_write", "memory_main_edit"]);
 
     let assistantResponse = "";
     let latestRunId = "";
@@ -2098,6 +2098,41 @@ export const createRequestHandler = async (options?: {
       : [];
     const fullCheckpointMessages = [...baseMessages, ...checkpoint.checkpointMessages!];
 
+    // Build the tool result message that continueFromToolResult will also
+    // construct internally.  We need it here so that if the resumed run hits
+    // another approval checkpoint, the nested checkpoint includes complete
+    // tool-call/result pairs — otherwise the Vercel AI SDK throws
+    // MissingToolResultsError when converting the history on the next resume.
+    let resumeToolResultMsg: Message | undefined;
+    const lastCpMsg = fullCheckpointMessages[fullCheckpointMessages.length - 1];
+    if (lastCpMsg?.role === "assistant") {
+      try {
+        const parsed = JSON.parse(typeof lastCpMsg.content === "string" ? lastCpMsg.content : "");
+        const cpToolCalls: Array<{ id: string; name: string }> = parsed.tool_calls ?? [];
+        if (cpToolCalls.length > 0) {
+          const providedMap = new Map(toolResults.map(r => [r.callId, r]));
+          resumeToolResultMsg = {
+            role: "tool",
+            content: JSON.stringify(cpToolCalls.map(tc => {
+              const provided = providedMap.get(tc.id);
+              return {
+                type: "tool_result",
+                tool_use_id: tc.id,
+                tool_name: provided?.toolName ?? tc.name,
+                content: provided
+                  ? (provided.error ? `Tool error: ${provided.error}` : JSON.stringify(provided.result ?? null))
+                  : "Tool error: Tool execution deferred (pending approval checkpoint)",
+              };
+            })),
+            metadata: { timestamp: Date.now() },
+          };
+        }
+      } catch { /* last message is not a parseable assistant-with-tools — skip */ }
+    }
+    const fullCheckpointWithResults = resumeToolResultMsg
+      ? [...fullCheckpointMessages, resumeToolResultMsg]
+      : fullCheckpointMessages;
+
     try {
       for await (const event of harness.continueFromToolResult({
         messages: fullCheckpointMessages,
@@ -2163,7 +2198,7 @@ export const createRequestHandler = async (options?: {
               tool: a.tool,
               toolCallId: a.toolCallId,
               input: a.input,
-              checkpointMessages: [...fullCheckpointMessages, ...event.checkpointMessages],
+              checkpointMessages: [...fullCheckpointWithResults, ...event.checkpointMessages],
               baseMessageCount: 0,
               pendingToolCalls: event.pendingToolCalls,
             }));
@@ -3559,6 +3594,14 @@ export const createRequestHandler = async (options?: {
       return;
     }
 
+    const todosMatch = pathname.match(/^\/api\/conversations\/([^/]+)\/todos$/);
+    if (todosMatch && request.method === "GET") {
+      const conversationId = decodeURIComponent(todosMatch[1] ?? "");
+      const todos = await harness.getTodos(conversationId);
+      writeJson(response, 200, { todos });
+      return;
+    }
+
     const conversationPathMatch = pathname.match(/^\/api\/conversations\/([^/]+)$/);
     if (conversationPathMatch) {
       const conversationId = decodeURIComponent(conversationPathMatch[1] ?? "");

package/src/web-ui-client.ts

@@ -27,6 +27,8 @@ export const getWebUiClientScript = (markedSource: string): string => `
         subagentsParentId: null,
         viewingSubagentId: null,
         parentConversationId: null,
+        todos: [],
+        todoPanelCollapsed: false,
       };
 
       const agentInitial = document.body.dataset.agentInitial || "A";
@@ -578,7 +580,9 @@ export const getWebUiClientScript = (markedSource: string): string => `
             state.activeMessages = [];
             state.contextTokens = 0;
             state.contextWindow = 0;
+            state.todos = [];
             updateContextRing();
+            renderTodoPanel();
             pushConversationUrl(null);
             elements.chatTitle.textContent = "";
             renderMessages([]);
@@ -610,6 +614,136 @@ export const getWebUiClientScript = (markedSource: string): string => `
         return item;
       };
 
+      const _todoPriorityOrder = { high: 0, medium: 1, low: 2 };
+      const _todoStatusOrder = { in_progress: 0, pending: 1, completed: 2 };
+      const _todoCompletedTimers = new Map();
+
+      const _scheduleCompletedHide = () => {
+        state.todos.forEach(function(todo) {
+          if (todo.status === "completed" && !_todoCompletedTimers.has(todo.id)) {
+            _todoCompletedTimers.set(todo.id, todo.updatedAt || Date.now());
+          }
+        });
+        const activeIds = new Set(state.todos.map(function(t) { return t.id; }));
+        for (const id of _todoCompletedTimers.keys()) {
+          if (!activeIds.has(id)) _todoCompletedTimers.delete(id);
+        }
+      };
+
+      const _getVisibleTodos = () => {
+        const now = Date.now();
+        const sorted = state.todos.slice().sort(function(a, b) {
+          const sp = (_todoStatusOrder[a.status] || 1) - (_todoStatusOrder[b.status] || 1);
+          if (sp !== 0) return sp;
+          const pp = (_todoPriorityOrder[a.priority] || 1) - (_todoPriorityOrder[b.priority] || 1);
+          if (pp !== 0) return pp;
+          return (a.createdAt || 0) - (b.createdAt || 0);
+        });
+        if (!state.todoPanelCollapsed) return sorted;
+        return sorted.filter(function(todo) {
+          if (todo.status !== "completed") return true;
+          const completedAt = _todoCompletedTimers.get(todo.id);
+          return !completedAt || (now - completedAt) < 30000;
+        });
+      };
+
+      let _todoHideTimer = null;
+      const _ensureHideTimer = () => {
+        if (_todoHideTimer) return;
+        _todoHideTimer = setInterval(function() {
+          const hasExpiring = state.todos.some(function(t) {
+            if (t.status !== "completed") return false;
+            const at = _todoCompletedTimers.get(t.id);
+            return at && (Date.now() - at) >= 30000;
+          });
+          if (hasExpiring && state.todoPanelCollapsed) renderTodoPanel();
+          if (!state.todos.length) {
+            clearInterval(_todoHideTimer);
+            _todoHideTimer = null;
+          }
+        }, 5000);
+      };
+
+      const _autoCollapseTodos = (live) => {
+        if (!live) {
+          state.todoPanelCollapsed = true;
+          return;
+        }
+        const hasActive = state.todos.some(function(t) {
+          return t.status === "pending" || t.status === "in_progress";
+        });
+        state.todoPanelCollapsed = !hasActive;
+      };
+
+      const renderTodoPanel = () => {
+        let panel = document.getElementById("todo-panel");
+        if (!panel) return;
+
+        _scheduleCompletedHide();
+        const visible = _getVisibleTodos();
+
+        if (!visible.length) {
+          panel.classList.add("hidden");
+          panel.innerHTML = "";
+          return;
+        }
+
+        panel.classList.remove("hidden");
+        if (state.todoPanelCollapsed) {
+          panel.classList.add("collapsed");
+        } else {
+          panel.classList.remove("collapsed");
+        }
+        _ensureHideTimer();
+
+        const completed = state.todos.filter(t => t.status === "completed").length;
+        const total = state.todos.length;
+
+        const statusIcon = (status) => {
+          if (status === "completed") return '<span class="todo-status todo-status-completed">\\u2713</span>';
+          if (status === "in_progress") return '<span class="todo-status todo-status-in-progress">\\u25CF</span>';
+          return '<span class="todo-status todo-status-pending">\\u25CB</span>';
+        };
+
+        const priorityBadge = (priority) => {
+          if (!priority || priority === "medium") return "";
+          return '<span class="todo-priority todo-priority-' + priority + '">' + priority + '</span>';
+        };
+
+        const isCollapsed = state.todoPanelCollapsed;
+
+        let html = '<div class="todo-panel-header" id="todo-panel-header">';
+        html += '<div class="todo-panel-title">';
+        html += '<span class="todo-panel-label">Todos</span>';
+        html += '<span class="todo-panel-progress">' + completed + '/' + total + ' done</span>';
+        html += '</div>';
+        html += '<span class="todo-panel-toggle' + (isCollapsed ? '' : ' open') + '"><svg viewBox="0 0 12 12" fill="none" width="12" height="12"><path d="M4.5 2.75L8 6L4.5 9.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg></span>';
+        html += '</div>';
+
+        if (!isCollapsed) {
+          html += '<ul class="todo-panel-list">';
+          visible.forEach(function(todo) {
+            const isDone = todo.status === "completed";
+            html += '<li class="todo-item' + (isDone ? ' todo-item-done' : '') + '">';
+            html += statusIcon(todo.status);
+            html += '<span class="todo-item-content">' + escapeHtml(todo.content) + '</span>';
+            html += priorityBadge(todo.priority);
+            html += '</li>';
+          });
+          html += '</ul>';
+        }
+
+        panel.innerHTML = html;
+
+        const header = document.getElementById("todo-panel-header");
+        if (header) {
+          header.onclick = function() {
+            state.todoPanelCollapsed = !state.todoPanelCollapsed;
+            renderTodoPanel();
+          };
+        }
+      };
+
       const renderConversationList = () => {
         elements.list.innerHTML = "";
         const pending = state.conversations.filter(c => c.hasPendingApprovals);
@@ -624,21 +758,48 @@ export const getWebUiClientScript = (markedSource: string): string => `
             elements.list.appendChild(buildConversationItem(c));
             appendSubagentsIfActive(c.conversationId);
           }
-          if (rest.length > 0) {
+        }
+
+        const now = new Date();
+        const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+        const sevenDaysAgo = startOfToday - 7 * 86400000;
+
+        const latest = [];
+        const previous7 = [];
+        const older = [];
+        for (const c of rest) {
+          const ts = c.updatedAt || c.createdAt || 0;
+          if (ts >= startOfToday) {
+            latest.push(c);
+          } else if (ts >= sevenDaysAgo) {
+            previous7.push(c);
+          } else {
+            older.push(c);
+          }
+        }
+
+        let sectionRendered = pending.length > 0;
+        const appendSection = (items, labelText) => {
+          if (items.length === 0) return;
+          if (sectionRendered) {
             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);
           }
-        }
+          const sectionLabel = document.createElement("div");
+          sectionLabel.className = "sidebar-section-label";
+          sectionLabel.textContent = labelText;
+          elements.list.appendChild(sectionLabel);
+          for (const c of items) {
+            elements.list.appendChild(buildConversationItem(c));
+            appendSubagentsIfActive(c.conversationId);
+          }
+          sectionRendered = true;
+        };
 
-        for (const c of rest) {
-          elements.list.appendChild(buildConversationItem(c));
-          appendSubagentsIfActive(c.conversationId);
-        }
+        appendSection(latest, "Latest");
+        appendSection(previous7, "Previous 7 days");
+        appendSection(older, "Older");
       };
 
       const appendSubagentsIfActive = (conversationId) => {
@@ -1018,6 +1179,15 @@ export const getWebUiClientScript = (markedSource: string): string => `
           loadSubagents(subagentParentId);
         }
 
+        try {
+          const todosPayload = await api("/api/conversations/" + encodeURIComponent(conversationId) + "/todos");
+          state.todos = todosPayload.todos || [];
+        } catch (_e) {
+          state.todos = [];
+        }
+        _autoCollapseTodos();
+        renderTodoPanel();
+
         updateContextRing();
         renderMessages(state.activeMessages, false, { forceScrollBottom: true });
         if (!state.viewingSubagentId) {
@@ -1120,6 +1290,13 @@ export const getWebUiClientScript = (markedSource: string): string => `
                 payload.conversation.messages || [],
                 allPending,
               );
+              if (typeof payload.conversation.contextTokens === "number") {
+                state.contextTokens = payload.conversation.contextTokens;
+              }
+              if (typeof payload.conversation.contextWindow === "number" && payload.conversation.contextWindow > 0) {
+                state.contextWindow = payload.conversation.contextWindow;
+              }
+              updateContextRing();
               renderMessages(state.activeMessages, payload.hasActiveRun);
             }
             if (payload.hasActiveRun) {
@@ -1335,6 +1512,11 @@ export const getWebUiClientScript = (markedSource: string): string => `
                         state.contextTokens += payload.outputTokenEstimate;
                         updateContextRing();
                       }
+                      if (toolName !== "todo_list" && toolName.startsWith("todo_") && payload.output && typeof payload.output === "object" && Array.isArray(payload.output.todos)) {
+                        state.todos = payload.output.todos;
+                        _autoCollapseTodos(true);
+                        renderTodoPanel();
+                      }
                       renderIfActiveConversation(true);
                     }
                     if (eventName === "tool:error") {
@@ -1370,6 +1552,10 @@ export const getWebUiClientScript = (markedSource: string): string => `
                     if (eventName === "compaction:completed") {
                       didCompact = true;
                       removeActiveActivityForTool(assistantMessage, "__compaction__");
+                      if (typeof payload.tokensAfter === "number") {
+                        state.contextTokens = payload.tokensAfter;
+                        updateContextRing();
+                      }
                       renderIfActiveConversation(true);
                     }
                     if (eventName === "browser:status" && payload.active) {
@@ -2157,6 +2343,11 @@ export const getWebUiClientScript = (markedSource: string): string => `
                     state.contextTokens += payload.outputTokenEstimate;
                     updateContextRing();
                   }
+                  if (toolName !== "todo_list" && toolName.startsWith("todo_") && payload.output && typeof payload.output === "object" && Array.isArray(payload.output.todos)) {
+                    state.todos = payload.output.todos;
+                    _autoCollapseTodos(true);
+                    renderTodoPanel();
+                  }
                   renderIfActiveConversation(true);
                 }
                 if (eventName === "tool:error") {
@@ -2194,6 +2385,10 @@ export const getWebUiClientScript = (markedSource: string): string => `
                 if (eventName === "compaction:completed") {
                   didCompact = true;
                   removeActiveActivityForTool(assistantMessage, "__compaction__");
+                  if (typeof payload.tokensAfter === "number") {
+                    state.contextTokens = payload.tokensAfter;
+                    updateContextRing();
+                  }
                   renderIfActiveConversation(true);
                 }
                 if (eventName === "browser:status" && payload.active) {
@@ -2440,8 +2635,10 @@ export const getWebUiClientScript = (markedSource: string): string => `
         state.parentConversationId = null;
         state.subagents = [];
         state.subagentsParentId = null;
+        state.todos = [];
         updateSubagentUi();
         updateContextRing();
+        renderTodoPanel();
         pushConversationUrl(null);
         elements.chatTitle.textContent = "";
         renderMessages([]);

package/src/web-ui-styles.ts

@@ -983,6 +983,8 @@ export const WEB_UI_STYLES = `
     }
     .composer-inner { max-width: 680px; margin: 0 auto; }
     .composer-shell {
+      position: relative;
+      z-index: 1;
       background: var(--bg-alt);
       border: 1px solid var(--border-3);
       border-radius: 24px;
@@ -1550,6 +1552,114 @@ export const WEB_UI_STYLES = `
       text-decoration: underline;
     }
 
+    /* Todo panel — inside composer-inner, above the input shell */
+    #todo-panel {
+      max-height: 240px;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      font-size: 13px;
+      background: var(--surface-2);
+      border-radius: 14px 14px 0 0;
+      padding-bottom: 24px;
+      margin-bottom: -24px;
+    }
+    #todo-panel.hidden { display: none; }
+
+    .todo-panel-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 6px 14px;
+      flex-shrink: 0;
+      cursor: pointer;
+      user-select: none;
+    }
+    .todo-panel-header:hover {
+      background: var(--surface-1);
+    }
+    #todo-panel.collapsed {
+      padding-bottom: 0;
+    }
+    #todo-panel.collapsed .todo-panel-header {
+      padding-bottom: 30px;
+    }
+    .todo-panel-title {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+    .todo-panel-label {
+      font-weight: 600;
+      color: var(--fg);
+      font-size: 11px;
+    }
+    .todo-panel-progress {
+      font-size: 11px;
+      color: var(--fg-3);
+    }
+    .todo-panel-toggle {
+      color: var(--fg-5);
+      display: flex;
+      align-items: center;
+      transition: transform 0.15s ease;
+    }
+    .todo-panel-toggle.open {
+      transform: rotate(90deg);
+    }
+
+    .todo-panel-list {
+      list-style: none;
+      margin: 0;
+      padding: 0 0 4px;
+      overflow-y: auto;
+      flex: 1;
+    }
+    .todo-item {
+      display: flex;
+      align-items: flex-start;
+      gap: 8px;
+      padding: 4px 14px;
+      color: var(--fg-2);
+      line-height: 1.4;
+    }
+    .todo-item-done {
+      opacity: 0.5;
+    }
+    .todo-item-done .todo-item-content {
+      text-decoration: line-through;
+    }
+    .todo-item-content {
+      flex: 1;
+      word-break: break-word;
+    }
+
+    .todo-status {
+      flex-shrink: 0;
+      width: 16px;
+      text-align: center;
+      line-height: 1.4;
+    }
+    .todo-status-completed { color: #4ade80; }
+    .todo-status-in-progress { color: #facc15; }
+    .todo-status-pending { color: var(--fg-5); }
+
+    .todo-priority {
+      flex-shrink: 0;
+      font-size: 10px;
+      padding: 1px 5px;
+      border-radius: 4px;
+      line-height: 1.4;
+    }
+    .todo-priority-high {
+      color: #f87171;
+      background: rgba(248,113,113,0.12);
+    }
+    .todo-priority-low {
+      color: var(--fg-5);
+      background: var(--surface-1);
+    }
+
     /* Reduced motion */
     @media (prefers-reduced-motion: reduce) {
       *, *::before, *::after {

package/src/web-ui.ts

@@ -162,6 +162,7 @@ ${WEB_UI_STYLES}
           </div>
           <form id="composer" class="composer">
             <div class="composer-inner">
+              <div id="todo-panel" class="hidden"></div>
               <div id="attachment-preview" class="attachment-preview" style="display:none"></div>
               <div class="composer-shell">
                 <button id="attach-btn" class="attach-btn" type="button" title="Attach files">