@prestyj/cli 4.2.62 → 4.2.76

package/dist/system-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.d.ts","sourceRoot":"","sources":["../src/system-prompt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIrE;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,KAAK,EAAE,EAChB,QAAQ,CAAC,EAAE,OAAO,EAClB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,CAAC,CA8KjB"}
+{"version":3,"file":"system-prompt.d.ts","sourceRoot":"","sources":["../src/system-prompt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIrE;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,KAAK,EAAE,EAChB,QAAQ,CAAC,EAAE,OAAO,EAClB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,CAAC,CAgMjB"}

package/dist/system-prompt.js

@@ -46,8 +46,21 @@ export async function buildSystemPrompt(cwd, skills, planMode, approvedPlanPath)
             `### Rules\n` +
             `- DO NOT use bash, edit, write (except to .ezcoder/plans/), or subagent — they are restricted\n` +
             `- Be specific: list exact file paths, function names, line numbers\n` +
-            `- Include step-by-step implementation order with dependencies\n` +
-            `- Note risks and verification criteria`);
+            `- Note risks and verification criteria\n\n` +
+            `### Plan Format\n` +
+            `Your plan can have any structure (phases, analysis, notes, etc.) but it MUST end ` +
+            `with a section titled exactly \`## Steps\` containing a single flat numbered list of ` +
+            `implementation steps. This section is parsed by the progress widget — it is the ONLY ` +
+            `source of truth for step tracking. Do NOT put numbered lists elsewhere in the plan. ` +
+            `Use bullets or sub-headings for other sections.\n\n` +
+            `Example:\n` +
+            "```\n" +
+            `## Steps\n` +
+            `1. Create protocol types package with shared interfaces\n` +
+            `2. Set up monorepo with pnpm workspaces\n` +
+            `3. Migrate Expo Router to file-based routing\n` +
+            `...\n` +
+            "```");
     }
     // 2c. Approved plan — injected when a plan has been approved for implementation
     if (approvedPlanPath && !planMode) {
@@ -66,7 +79,12 @@ export async function buildSystemPrompt(cwd, skills, planMode, approvedPlanPath)
                 `### Rules\n` +
                 `- Follow the plan's step-by-step implementation order\n` +
                 `- Do not deviate from the plan without user confirmation\n` +
-                `- If you encounter issues not covered by the plan, ask the user`);
+                `- If you encounter issues not covered by the plan, ask the user\n\n` +
+                `### Progress Tracking\n` +
+                `After completing each step from the plan's \`## Steps\` section, output \`[DONE:n]\` ` +
+                `(e.g. \`[DONE:1]\`, \`[DONE:2]\`) in your response to mark it as complete. ` +
+                `The step numbers correspond to the numbered list in the \`## Steps\` section. ` +
+                `This updates the progress widget shown to the user.`);
         }
     }
     // 3. Code Quality

package/dist/system-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../src/system-prompt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../src/system-prompt.ts"],"names":[],"mappings":"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"}

package/dist/ui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"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"}

package/dist/ui/App.js

@@ -29,6 +29,7 @@ import { BackgroundTasksBar } from "./components/BackgroundTasksBar.js";
 import { useTheme } from "./theme/theme.js";
 import { useAnimationTick, useAnimationActive, deriveFrame, } from "./components/AnimationContext.js";
 import { useTerminalTitle } from "./hooks/useTerminalTitle.js";
+import { useTerminalProgress } from "./hooks/useTerminalProgress.js";
 import { getGitBranch } from "../utils/git.js";
 import { getModel, getContextWindow } from "../core/model-registry.js";
 import { SessionManager } from "../core/session-manager.js";
@@ -39,8 +40,10 @@ import { estimateConversationTokens } from "../core/compaction/token-estimator.j
 import { PROMPT_COMMANDS, getPromptCommand } from "../core/prompt-commands.js";
 import { loadCustomCommands } from "../core/custom-commands.js";
 import { buildSystemPrompt } from "../system-prompt.js";
+import { extractPlanSteps, findCompletedMarkers, markStepsCompleted, stripDoneMarkers, } from "../utils/plan-steps.js";
 import { getMCPServers } from "../core/mcp/index.js";
 import { trimFlushedItems, flushOnTurnText, flushOnTurnEnd } from "./live-item-flush.js";
+import { Buddy } from "./buddy/Buddy.js";
 // ── Provider Error Hints ──────────────────────────────────
 /** Detect provider-side errors and return a user-facing hint. */
 function getProviderErrorHint(message) {
@@ -102,6 +105,41 @@ function compactHistory(items) {
     return compacted;
 }
 // flushOnTurnText, flushOnTurnEnd are imported from ./live-item-flush.ts
+/** Check whether an item is still active (running spinner, pending result). */
+function isActiveItem(item) {
+    switch (item.kind) {
+        case "tool_start":
+        case "server_tool_start":
+        case "compacting":
+            return true;
+        case "tool_group":
+            return item.tools.some((t) => t.status === "running");
+        case "subagent_group":
+            return item.agents.some((a) => a.status === "running");
+        default:
+            return false;
+    }
+}
+/**
+ * Partition live items into completed (flushable to Static) and still-active.
+ * Completed items precede active ones — we flush the longest contiguous prefix
+ * of completed items to keep ordering stable.
+ */
+function partitionCompleted(items) {
+    // Find the first active item — everything before it is safe to flush
+    const firstActiveIdx = items.findIndex(isActiveItem);
+    if (firstActiveIdx === -1) {
+        // All items are completed
+        return { flushed: items, remaining: [] };
+    }
+    if (firstActiveIdx === 0) {
+        return { flushed: [], remaining: items };
+    }
+    return {
+        flushed: items.slice(0, firstActiveIdx),
+        remaining: items.slice(firstActiveIdx),
+    };
+}
 // ── Duration summary ─────────────────────────────────────
 function formatDuration(ms) {
     const totalSec = Math.round(ms / 1000);
@@ -276,10 +314,16 @@ export function App(props) {
     const messagesRef = useRef(props.messages);
     const [planAutoExpand, setPlanAutoExpand] = useState(false);
     const approvedPlanPathRef = useRef(undefined);
+    const planStepsRef = useRef([]);
+    const [planSteps, setPlanSteps] = useState([]);
     const nextIdRef = useRef(0);
     const sessionManagerRef = useRef(props.sessionsDir ? new SessionManager(props.sessionsDir) : null);
     const sessionPathRef = useRef(props.sessionPath);
     const persistedIndexRef = useRef(messagesRef.current.length);
+    /** Last actual API-reported input token count (from turn_end). */
+    const lastActualTokensRef = useRef(0);
+    /** Timestamp of last compaction — used for time-based cooldown. */
+    const lastCompactionTimeRef = useRef(0);
     const getId = () => String(nextIdRef.current++);
     // Two-phase flush: items waiting to be moved to Static history after the
     // live area has been cleared and Ink has committed the smaller output.
@@ -379,13 +423,15 @@ export function App(props) {
         persistedIndexRef.current = allMsgs.length;
     }, []);
     // ── Compaction ─────────────────────────────────────────
-    // Load settings for auto-compaction
+    // Load settings for auto-compaction + buddy
     const settingsRef = useRef(null);
+    const [buddyEnabled, setBuddyEnabled] = useState(false);
     useEffect(() => {
         if (props.settingsFile) {
             const sm = new SettingsManager(props.settingsFile);
             sm.load().then(() => {
                 settingsRef.current = sm;
+                setBuddyEnabled(sm.get("buddyEnabled") ?? false);
             });
         }
     }, [props.settingsFile]);
@@ -442,6 +488,11 @@ export function App(props) {
      * transformContext callback for the agent loop.
      * Called before each LLM call and on context overflow.
      * Checks if auto-compaction is needed and runs it.
+     *
+     * Uses actual API-reported token counts (from previous turn_end) when
+     * available, falling back to the character-based estimate. A 30-second
+     * cooldown prevents repeated compaction — matching the pattern used by
+     * Mysti, openclaw, and other real-world agent frameworks.
      */
     const transformContext = useCallback(async (messages, options) => {
         const settings = settingsRef.current;
@@ -449,13 +500,26 @@ export function App(props) {
         const threshold = settings?.get("compactThreshold") ?? 0.8;
         // Force-compact on context overflow regardless of settings
         if (options?.force) {
-            return compactConversation(messages);
+            const result = await compactConversation(messages);
+            lastCompactionTimeRef.current = Date.now();
+            lastActualTokensRef.current = 0; // Reset stale pre-compaction count
+            return result;
         }
         if (!autoCompact)
             return messages;
+        // Time-based cooldown: skip if compaction ran within the last 30 seconds
+        if (Date.now() - lastCompactionTimeRef.current < 30_000) {
+            log("INFO", "compaction", `Skipping compaction — cooldown active`);
+            return messages;
+        }
         const contextWindow = getContextWindow(currentModel);
-        if (shouldCompact(messages, contextWindow, threshold)) {
-            return compactConversation(messages);
+        // Prefer actual API-reported tokens over char-based estimate
+        const actualTokens = lastActualTokensRef.current > 0 ? lastActualTokensRef.current : undefined;
+        if (shouldCompact(messages, contextWindow, threshold, actualTokens)) {
+            const result = await compactConversation(messages);
+            lastCompactionTimeRef.current = Date.now();
+            lastActualTokensRef.current = 0; // Reset stale pre-compaction count
+            return result;
         }
         return messages;
     }, [currentModel, compactConversation]);
@@ -535,8 +599,33 @@ export function App(props) {
     }, {
         onComplete: useCallback(() => {
             persistNewMessages();
-        }, [persistNewMessages]),
+            // Auto-clear plan progress and approved plan when all steps are completed
+            const steps = planStepsRef.current;
+            if (steps.length > 0 && steps.every((s) => s.completed)) {
+                planStepsRef.current = [];
+                setPlanSteps([]);
+                approvedPlanPathRef.current = undefined;
+                // Rebuild system prompt to remove the completed plan from context
+                void (async () => {
+                    const newPrompt = await buildSystemPrompt(props.cwd, props.skills, planMode, undefined);
+                    if (messagesRef.current[0]?.role === "system") {
+                        messagesRef.current[0] = { role: "system", content: newPrompt };
+                    }
+                })();
+            }
+        }, [persistNewMessages, planMode, props.cwd, props.skills]),
         onTurnText: useCallback((text, thinking, thinkingMs) => {
+            // Track [DONE:n] markers for plan step progress
+            if (planStepsRef.current.length > 0) {
+                const completed = findCompletedMarkers(text);
+                if (completed.size > 0) {
+                    const updated = markStepsCompleted(planStepsRef.current, completed);
+                    if (updated !== planStepsRef.current) {
+                        planStepsRef.current = updated;
+                        setPlanSteps(updated);
+                    }
+                }
+            }
             // Flush all completed items from the previous turn to Static history.
             // This keeps liveItems bounded per-turn, preventing Ink's live area from
             // growing unbounded, which makes Ink's live-area re-renders expensive.
@@ -545,11 +634,22 @@ export function App(props) {
                 if (flushed.length > 0) {
                     setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
                 }
-                return [{ kind: "assistant", text, thinking, thinkingMs, id: getId() }];
+                const displayText = planStepsRef.current.length > 0 ? stripDoneMarkers(text) : text;
+                return [{ kind: "assistant", text: displayText, thinking, thinkingMs, id: getId() }];
             });
         }, []),
         onToolStart: useCallback((toolCallId, name, args) => {
             log("INFO", "tool", `Tool call started: ${name}`, { id: toolCallId });
+            // Flush completed items (assistant text, finished tools) to Static
+            // before adding tool UI. Keeping both in the live area makes it tall
+            // and causes Ink's cursor math to clip the top.
+            setLiveItems((prev) => {
+                const { flushed, remaining } = partitionCompleted(prev);
+                if (flushed.length > 0) {
+                    setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
+                }
+                return remaining;
+            });
             if (name === "subagent") {
                 // Create or update the sub-agent group item
                 const newAgent = {
@@ -656,7 +756,12 @@ export function App(props) {
                     };
                     const next = [...prev];
                     next[groupIdx] = { ...group, agents: updatedAgents };
-                    return next;
+                    // Flush completed items to Static to keep the live area small
+                    const { flushed, remaining } = partitionCompleted(next);
+                    if (flushed.length > 0) {
+                        setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
+                    }
+                    return remaining;
                 });
             }
             else {
@@ -664,69 +769,87 @@ export function App(props) {
                     // Check if this tool is in a tool_group
                     const groupIdx = prev.findIndex((item) => item.kind === "tool_group" &&
                         item.tools.some((t) => t.toolCallId === toolCallId));
+                    let updated;
                     if (groupIdx !== -1) {
                         const group = prev[groupIdx];
-                        const next = [...prev];
-                        next[groupIdx] = {
+                        updated = [...prev];
+                        updated[groupIdx] = {
                             ...group,
                             tools: group.tools.map((t) => t.toolCallId === toolCallId
                                 ? { ...t, status: "done", result, isError }
                                 : t),
                         };
-                        return next;
                     }
-                    // Find the matching tool_start and replace it with tool_done
-                    const startIdx = prev.findIndex((item) => item.kind === "tool_start" && item.toolCallId === toolCallId);
-                    if (startIdx !== -1) {
-                        const startItem = prev[startIdx];
-                        const doneItem = {
-                            kind: "tool_done",
-                            name,
-                            args: startItem.args,
-                            result,
-                            isError,
-                            durationMs,
-                            details,
-                            id: startItem.id,
-                        };
-                        const next = [...prev];
-                        next[startIdx] = doneItem;
-                        return next;
+                    else {
+                        // Find the matching tool_start and replace it with tool_done
+                        const startIdx = prev.findIndex((item) => item.kind === "tool_start" && item.toolCallId === toolCallId);
+                        if (startIdx !== -1) {
+                            const startItem = prev[startIdx];
+                            const doneItem = {
+                                kind: "tool_done",
+                                name,
+                                args: startItem.args,
+                                result,
+                                isError,
+                                durationMs,
+                                details,
+                                id: startItem.id,
+                            };
+                            updated = [...prev];
+                            updated[startIdx] = doneItem;
+                        }
+                        else {
+                            // Fallback: just append
+                            updated = [
+                                ...prev,
+                                {
+                                    kind: "tool_done",
+                                    name,
+                                    args: {},
+                                    result,
+                                    isError,
+                                    durationMs,
+                                    details,
+                                    id: getId(),
+                                },
+                            ];
+                        }
                     }
-                    // Fallback: just append
-                    return [
-                        ...prev,
-                        {
-                            kind: "tool_done",
-                            name,
-                            args: {},
-                            result,
-                            isError,
-                            durationMs,
-                            details,
-                            id: getId(),
-                        },
-                    ];
+                    // Flush completed items to Static to keep the live area small
+                    const { flushed, remaining } = partitionCompleted(updated);
+                    if (flushed.length > 0) {
+                        setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
+                    }
+                    return remaining;
                 });
             }
         }, []),
         onServerToolCall: useCallback((id, name, input) => {
             log("INFO", "server_tool", `Server tool call: ${name}`, { id });
-            setLiveItems((prev) => [
-                ...prev,
-                {
-                    kind: "server_tool_start",
-                    serverToolCallId: id,
-                    name,
-                    input,
-                    startedAt: Date.now(),
-                    id: getId(),
-                },
-            ]);
+            // Flush completed items (including assistant text) to Static before
+            // adding server tool UI — same rationale as onToolStart.
+            setLiveItems((prev) => {
+                const { flushed, remaining } = partitionCompleted(prev);
+                if (flushed.length > 0) {
+                    setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
+                }
+                return [
+                    ...remaining,
+                    {
+                        kind: "server_tool_start",
+                        serverToolCallId: id,
+                        name,
+                        input,
+                        startedAt: Date.now(),
+                        id: getId(),
+                    },
+                ];
+            });
         }, []),
         onServerToolResult: useCallback((toolUseId, resultType, data) => {
             log("INFO", "server_tool", `Server tool result`, { toolUseId, resultType });
             setLiveItems((prev) => {
+                let updated;
                 const startIdx = prev.findIndex((item) => item.kind === "server_tool_start" && item.serverToolCallId === toolUseId);
                 if (startIdx !== -1) {
                     const startItem = prev[startIdx];
@@ -739,22 +862,29 @@ export function App(props) {
                         durationMs: Date.now() - startItem.startedAt,
                         id: startItem.id,
                     };
-                    const next = [...prev];
-                    next[startIdx] = doneItem;
-                    return next;
+                    updated = [...prev];
+                    updated[startIdx] = doneItem;
                 }
-                return [
-                    ...prev,
-                    {
-                        kind: "server_tool_done",
-                        name: "unknown",
-                        input: {},
-                        resultType,
-                        data,
-                        durationMs: 0,
-                        id: getId(),
-                    },
-                ];
+                else {
+                    updated = [
+                        ...prev,
+                        {
+                            kind: "server_tool_done",
+                            name: "unknown",
+                            input: {},
+                            resultType,
+                            data,
+                            durationMs: 0,
+                            id: getId(),
+                        },
+                    ];
+                }
+                // Flush completed items to Static
+                const { flushed, remaining } = partitionCompleted(updated);
+                if (flushed.length > 0) {
+                    setHistory((h) => compactHistory([...h, ...trimFlushedItems(flushed)]));
+                }
+                return remaining;
             });
         }, []),
         onTurnEnd: useCallback((turn, stopReason, usage) => {
@@ -765,6 +895,9 @@ export function App(props) {
                 ...(usage.cacheRead != null && { cacheRead: String(usage.cacheRead) }),
                 ...(usage.cacheWrite != null && { cacheWrite: String(usage.cacheWrite) }),
             });
+            // Track actual token count for compaction decisions
+            lastActualTokensRef.current =
+                usage.inputTokens + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
             // For tool-only turns (no text), flush completed items to Static so
             // liveItems doesn't grow unbounded across consecutive tool-only turns.
             setLiveItems((prev) => {
@@ -911,6 +1044,8 @@ export function App(props) {
         setTitleRunning(agentLoop.isRunning);
         setTitleToolNames(agentLoop.activeToolCalls.map((tc) => tc.name));
     }, [agentLoop.activityPhase, agentLoop.isRunning, activeToolNamesKey]);
+    // Terminal progress bar (OSC 9;4) — pulsing bar in supported terminals
+    useTerminalProgress(agentLoop.isRunning, agentLoop.activeToolCalls.length > 0);
     // Animated thinking border — derived from global animation tick
     useAnimationActive();
     const animTick = useAnimationTick();
@@ -952,7 +1087,14 @@ export function App(props) {
             setHistory([{ kind: "banner", id: "banner" }]);
             setLiveItems([]);
             setDoneStatus(null);
-            messagesRef.current = messagesRef.current.slice(0, 1); // keep system prompt
+            approvedPlanPathRef.current = undefined;
+            planStepsRef.current = [];
+            setPlanSteps([]);
+            // Rebuild system prompt without the approved plan
+            void (async () => {
+                const newPrompt = await buildSystemPrompt(props.cwd, props.skills, planMode, undefined);
+                messagesRef.current = [{ role: "system", content: newPrompt }];
+            })();
             agentLoop.reset();
             setLiveItems([{ kind: "info", text: "Session cleared.", id: getId() }]);
             return;
@@ -979,6 +1121,40 @@ export function App(props) {
             ]);
             return;
         }
+        // Handle /clearplan — dismiss the approved plan
+        if (trimmed === "/clearplan") {
+            approvedPlanPathRef.current = undefined;
+            planStepsRef.current = [];
+            setPlanSteps([]);
+            // Rebuild system prompt without the plan
+            void (async () => {
+                const newPrompt = await buildSystemPrompt(props.cwd, props.skills, planMode, undefined);
+                if (messagesRef.current[0]?.role === "system") {
+                    messagesRef.current[0] = { role: "system", content: newPrompt };
+                }
+            })();
+            setLiveItems([{ kind: "info", text: "Approved plan dismissed.", id: getId() }]);
+            return;
+        }
+        // Handle /buddy — toggle companion
+        if (trimmed === "/buddy") {
+            const next = !buddyEnabled;
+            setBuddyEnabled(next);
+            if (settingsRef.current) {
+                settingsRef.current.set("buddyEnabled", next);
+            }
+            setLiveItems((items) => [
+                ...items,
+                {
+                    kind: "info",
+                    text: next
+                        ? "Buddy enabled! Your companion will appear near the prompt."
+                        : "Buddy disabled.",
+                    id: getId(),
+                },
+            ]);
+            return;
+        }
         // Handle /plans — open plan pane
         if (trimmed === "/plans") {
             stdout?.write("\x1b[2J\x1b[3J\x1b[H");
@@ -1124,6 +1300,12 @@ export function App(props) {
         };
         setLastUserMessage(input);
         setDoneStatus(null);
+        // Clear stale plan progress if there's no active approved plan
+        // (avoids lingering progress from a completed or abandoned plan run)
+        if (planStepsRef.current.length > 0 && !approvedPlanPathRef.current) {
+            planStepsRef.current = [];
+            setPlanSteps([]);
+        }
         setLiveItems([userItem]);
         // Run agent
         try {
@@ -1372,6 +1554,12 @@ export function App(props) {
                 }, onApprove: (planPath) => {
                     // Store approved plan path — will be injected into the new system prompt
                     approvedPlanPathRef.current = planPath;
+                    // Extract plan steps for progress tracking
+                    void import("node:fs/promises").then(({ readFile }) => readFile(planPath, "utf-8").then((content) => {
+                        const steps = extractPlanSteps(content);
+                        planStepsRef.current = steps;
+                        setPlanSteps(steps);
+                    }));
                     // Clear session for a fresh context focused on the plan
                     stdout?.write("\x1b[2J\x1b[3J\x1b[H");
                     setHistory([{ kind: "banner", id: "banner" }]);
@@ -1418,7 +1606,7 @@ export function App(props) {
                     void agentLoop.run(msg);
                 } })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, paddingRight: 1, children: [liveItems.map((item) => renderItem(item)), _jsx(StreamingArea, { isRunning: agentLoop.isRunning, streamingText: agentLoop.streamingText, streamingThinking: agentLoop.streamingThinking, showThinking: props.showThinking, thinkingMs: agentLoop.thinkingMs, planMode: planMode })] }), agentLoop.isRunning && agentLoop.activityPhase !== "idle" ? (_jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: agentLoop.activityPhase === "thinking"
                             ? THINKING_BORDER_COLORS[thinkingBorderFrame]
-                            : "transparent", paddingLeft: 1, paddingRight: 1, width: columns, children: _jsx(ActivityIndicator, { phase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, thinkingMs: agentLoop.thinkingMs, isThinking: agentLoop.isThinking, tokenEstimate: agentLoop.streamedTokenEstimate, userMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), planMode: planMode, retryInfo: agentLoop.retryInfo }) })) : (doneStatus && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.success, children: ["✻ ", doneStatus.verb, " ", formatDuration(doneStatus.durationMs)] }) }))), agentLoop.queuedCount > 0 && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.accent, children: ["⏳ ", agentLoop.queuedCount, " message", agentLoop.queuedCount > 1 ? "s" : "", " queued"] }) })), _jsx(InputArea, { onSubmit: handleSubmit, onAbort: handleAbort, disabled: agentLoop.isRunning, isActive: !taskBarFocused && !overlay, onDownAtEnd: handleFocusTaskBar, onShiftTab: handleToggleThinking, onToggleTasks: () => {
+                            : "transparent", paddingLeft: 1, paddingRight: 1, width: columns, children: _jsx(ActivityIndicator, { phase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, thinkingMs: agentLoop.thinkingMs, isThinking: agentLoop.isThinking, tokenEstimate: agentLoop.streamedTokenEstimate, charCountRef: agentLoop.charCountRef, realTokensAccumRef: agentLoop.realTokensAccumRef, userMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), planMode: planMode, retryInfo: agentLoop.retryInfo, planDone: planSteps.filter((s) => s.completed).length, planTotal: planSteps.length }) })) : (doneStatus && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.success, children: ["✻ ", doneStatus.verb, " ", formatDuration(doneStatus.durationMs)] }) }))), agentLoop.queuedCount > 0 && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.accent, children: ["⏳ ", agentLoop.queuedCount, " message", agentLoop.queuedCount > 1 ? "s" : "", " queued"] }) })), _jsx(InputArea, { onSubmit: handleSubmit, onAbort: handleAbort, disabled: agentLoop.isRunning, isActive: !taskBarFocused && !overlay, onDownAtEnd: handleFocusTaskBar, onShiftTab: handleToggleThinking, onToggleTasks: () => {
                             stdout?.write("\x1b[2J\x1b[3J\x1b[H");
                             setOverlay("tasks");
                         }, onToggleSkills: () => {
@@ -1437,6 +1625,6 @@ export function App(props) {
                                     id: getId(),
                                 },
                             ]);
-                        }, cwd: props.cwd, commands: allCommands }), overlay === "model" ? (_jsx(ModelSelector, { onSelect: handleModelSelect, onCancel: () => setOverlay(null), loggedInProviders: props.loggedInProviders ?? [currentProvider], currentModel: currentModel, currentProvider: currentProvider })) : (_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, cwd: props.cwd, gitBranch: gitBranch, thinkingEnabled: thinkingEnabled, planMode: planMode })), bgTasks.length > 0 && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate }))] }))] }));
+                        }, cwd: props.cwd, commands: allCommands }), overlay === "model" ? (_jsx(ModelSelector, { onSelect: handleModelSelect, onCancel: () => setOverlay(null), loggedInProviders: props.loggedInProviders ?? [currentProvider], currentModel: currentModel, currentProvider: currentProvider })) : (_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, linesAdded: agentLoop.linesChanged.added, linesRemoved: agentLoop.linesChanged.removed, cwd: props.cwd, gitBranch: gitBranch, thinkingEnabled: thinkingEnabled, planMode: planMode })), buddyEnabled && _jsx(Buddy, { phase: agentLoop.activityPhase }), bgTasks.length > 0 && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate }))] }))] }));
 }
 //# sourceMappingURL=App.js.map