swagmanager-mcp 5.0.0 → 6.3.0

package/bin/swag-agent.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+// SwagManager Local Agent — CLI entry point
+// Usage: swag-agent start --key YOUR_API_KEY
+
+import("../dist/local-agent/index.js").catch((err) => {
+  console.error("Failed to start swag-agent:", err.message);
+  console.error("Run 'npm run build' first if you see module not found errors.");
+  process.exit(1);
+});

package/bin/swagmanager-mcp.js

@@ -112,6 +112,7 @@ function showHelp() {
   console.log(`    whale init${d}             Generate .whale/CLAUDE.md for project${r}`);
   console.log(`    whale config${d}           View/set configuration${r}`);
   console.log(`    whale serve${d}            Local agent WebSocket server${r}`);
+  console.log(`    whale agent${d}            Start local security agent${r}`);
   console.log();
   console.log(`  ${B}Print Mode (non-interactive):${r}`);
   console.log(`    whale -p "prompt"${d}      Run single prompt, output to stdout${r}`);
@@ -304,6 +305,15 @@ switch (command) {
     break;
   }
 
+  case "agent": {
+    // Forward remaining args to local-agent CLI
+    // Rebuild process.argv so the agent sees: [node, script, subcommand, ...flags]
+    const agentArgs = process.argv.slice(2).filter(a => a !== "agent");
+    process.argv = [process.argv[0], process.argv[1], ...agentArgs];
+    await import(join(distDir, "local-agent", "index.js"));
+    break;
+  }
+
   default:
     console.error(`Unknown command: ${command}`);
     console.error(`Run 'whale help' for usage.`);

package/dist/cli/chat/ChatApp.js

@@ -7,7 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * is managed by Ink's render loop. This prevents scroll bounce when
  * content exceeds the terminal height.
  */
-import { useState, useEffect, useRef, useMemo } from "react";
+import { useState, useEffect, useRef, useMemo, useCallback } from "react";
 import { Box, Text, Static, useApp, useInput } from "ink";
 import Spinner from "ink-spinner";
 import { canUseAgent, getServerToolCount, getModelShortName, setModel, getPermissionMode, mcpClientManager, } from "../services/agent-loop.js";
@@ -19,6 +19,8 @@ import { StreamingText } from "./StreamingText.js";
 import { ChatInput } from "./ChatInput.js";
 import { StoreSelector } from "./StoreSelector.js";
 import { ModelSelector } from "./ModelSelector.js";
+import { RewindViewer, RewindOutcome } from "./RewindViewer.js";
+import { RewindManager } from "../services/rewind.js";
 import { colors, symbols } from "../shared/Theme.js";
 import { loadKeybindings, matchesBinding } from "../services/keybinding-manager.js";
 import { loadConfig, updateConfig } from "../services/config-store.js";
@@ -78,6 +80,10 @@ export function ChatApp() {
             return true;
         }
     });
+    // Rewind state
+    const [showRewind, setShowRewind] = useState(false);
+    const rewindManagerRef = useRef(new RewindManager());
+    const turnIndexRef = useRef(0);
     // Refs
     const conversationRef = useRef([]);
     const abortRef = useRef(null);
@@ -150,14 +156,78 @@ export function ChatApp() {
         setMessages, setStreamingText, setActiveTools, setTeamState,
         setStoreList, setStoreSelectMode, setModelSelectMode, setCurrentModel,
         setSessionId, setThinkingEnabled, setUserLabel, setServerToolsAvailable,
+        setShowRewind,
+        rewindCheckpointCount: rewindManagerRef.current.getCheckpointCount(),
         PKG_NAME, PKG_VERSION,
     });
     const { handleSend } = useAgentLoop({
         isStreaming, thinkingEnabled, conversationRef, abortRef,
         accTextRef, textTimerRef, teamTimerRef, toolOutputTimerRef, thinkingVerbRef,
+        rewindManagerRef, turnIndexRef,
         setMessages, setStreamingText, setIsStreaming, setActiveTools,
         setSubagentActivity, setCompletedSubagents, setTeamState,
     });
+    // ── Rewind handler ──
+    const handleRewind = useCallback((checkpointIndex, outcome) => {
+        const rm = rewindManagerRef.current;
+        if (outcome === RewindOutcome.Cancel) {
+            setShowRewind(false);
+            return;
+        }
+        if (outcome === RewindOutcome.RevertOnly) {
+            // Revert files only, keep conversation
+            const result = rm.revertFilesFrom(checkpointIndex);
+            setShowRewind(false);
+            const total = result.filesReverted.length + result.filesDeleted.length;
+            const parts = [];
+            if (result.filesReverted.length > 0)
+                parts.push(`${result.filesReverted.length} reverted`);
+            if (result.filesDeleted.length > 0)
+                parts.push(`${result.filesDeleted.length} deleted`);
+            if (result.errors.length > 0)
+                parts.push(`${result.errors.length} errors`);
+            setMessages(prev => [...prev, {
+                    role: "assistant",
+                    text: total > 0
+                        ? `  ${symbols.check} File changes reverted (${parts.join(", ")})`
+                        : `  ${symbols.check} No file changes to revert.`,
+                }]);
+            return;
+        }
+        // RewindOnly or RewindAndRevert
+        const shouldRevertFiles = outcome === RewindOutcome.RewindAndRevert;
+        const result = rm.rewindTo(checkpointIndex);
+        // Truncate messages
+        setMessages(prev => prev.slice(0, result.messageCount));
+        // Truncate conversation history to match
+        // We need to figure out how many Anthropic messages correspond to the checkpoint.
+        // The checkpoint stores messageCount which is the UI messages count at that point.
+        // Rebuild conversation from remaining messages by keeping only the conversation
+        // entries up to the corresponding turn.
+        const targetTurnIndex = rm.getCheckpoints()[checkpointIndex]?.turnIndex ?? 0;
+        // Each user/assistant exchange is roughly 2 conversation entries (user + assistant).
+        // But the actual conversation is maintained independently.
+        // We slice it to 2*(turnIndex+1) entries (user+assistant pairs)
+        const conversationSlicePoint = Math.min((targetTurnIndex + 1) * 2, conversationRef.current.length);
+        conversationRef.current = conversationRef.current.slice(0, conversationSlicePoint);
+        // Reset turn index to match
+        turnIndexRef.current = targetTurnIndex + 1;
+        setShowRewind(false);
+        const parts = [];
+        if (shouldRevertFiles) {
+            if (result.filesReverted.length > 0)
+                parts.push(`${result.filesReverted.length} files reverted`);
+            if (result.filesDeleted.length > 0)
+                parts.push(`${result.filesDeleted.length} files deleted`);
+        }
+        if (result.errors.length > 0)
+            parts.push(`${result.errors.length} revert errors`);
+        const detail = parts.length > 0 ? ` (${parts.join(", ")})` : "";
+        setMessages(prev => [...prev, {
+                role: "assistant",
+                text: `  ${symbols.check} Rewound to turn ${targetTurnIndex + 1}${detail}`,
+            }]);
+    }, []);
     // ── Render ──
     const termWidth = process.stdout.columns || 80;
     const contentWidth = Math.max(20, termWidth - 2);
@@ -181,7 +251,7 @@ export function ChatApp() {
                         return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: colors.brand, bold: true, children: "\u25C6 whale code" }), userLabel ? _jsxs(Text, { color: colors.dim, children: ["  ", userLabel] }) : null, _jsxs(Text, { color: colors.dim, children: ["  ", currentModel] }), thinkingEnabled ? _jsx(Text, { color: colors.warning, children: "  thinking" }) : null, getPermissionMode() !== "default" && (_jsxs(Text, { color: getPermissionMode() === "yolo" ? colors.error : colors.info, children: ["  ", getPermissionMode()] })), serverToolsAvailable > 0 ? (_jsxs(Text, { color: colors.tertiary, children: ["  ", symbols.dot, " ", serverToolsAvailable, " server tools"] })) : null] }), _jsx(Text, { color: colors.separator, children: "─".repeat(contentWidth) })] }, item.id));
                     }
                     return _jsx(CompletedMessage, { msg: item.msg, index: item.index, toolsExpanded: toolsExpanded }, item.id);
-                } }), dynamicMessages.map((msg) => (_jsx(CompletedMessage, { msg: msg, index: messages.length - 1, toolsExpanded: toolsExpanded }, `dynamic-${messages.length - 1}`))), teamState ? (_jsx(TeamPanel, { team: teamState })) : (_jsxs(_Fragment, { children: [isStreaming && !streamingText && activeTools.length === 0 && (_jsxs(Box, { marginLeft: 2, marginY: 1, children: [_jsx(Text, { color: colors.brand, children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: colors.dim, children: ["  ", thinkingVerbRef.current] })] })), activeTools.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: activeTools.map((tc, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(ToolIndicator, { id: `live-${tc.name}-${i}`, name: tc.name, status: tc.status, input: tc.input, expanded: toolsExpanded }), tc.name === "task" && tc.status === "running" && (subagentActivity.size > 0 || completedSubagents.length > 0) && (_jsx(SubagentPanel, { running: subagentActivity, completed: completedSubagents }))] }, `live-${tc.name}-${i}`))) })), streamingText && (_jsx(Box, { marginLeft: 2, children: _jsx(StreamingText, { text: streamingText }) }))] })), storeSelectMode ? (_jsx(StoreSelector, { stores: storeList, currentStoreId: loadConfig().store_id || "", onSelect: handleStoreSelect, onCancel: handleStoreCancel })) : modelSelectMode ? (_jsx(ModelSelector, { currentModel: currentModel, onSelect: (model) => {
+                } }), dynamicMessages.map((msg) => (_jsx(CompletedMessage, { msg: msg, index: messages.length - 1, toolsExpanded: toolsExpanded }, `dynamic-${messages.length - 1}`))), teamState ? (_jsx(TeamPanel, { team: teamState })) : (_jsxs(_Fragment, { children: [isStreaming && !streamingText && activeTools.length === 0 && (_jsxs(Box, { marginLeft: 2, marginY: 1, children: [_jsx(Text, { color: colors.brand, children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: colors.dim, children: ["  ", thinkingVerbRef.current] })] })), activeTools.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: activeTools.map((tc, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(ToolIndicator, { id: `live-${tc.name}-${i}`, name: tc.name, status: tc.status, input: tc.input, expanded: toolsExpanded }), tc.name === "task" && tc.status === "running" && (subagentActivity.size > 0 || completedSubagents.length > 0) && (_jsx(SubagentPanel, { running: subagentActivity, completed: completedSubagents }))] }, `live-${tc.name}-${i}`))) })), streamingText && (_jsx(Box, { marginLeft: 2, children: _jsx(StreamingText, { text: streamingText }) }))] })), showRewind ? (_jsx(RewindViewer, { checkpoints: rewindManagerRef.current.getCheckpoints(), onRewind: handleRewind, onCancel: () => setShowRewind(false) })) : storeSelectMode ? (_jsx(StoreSelector, { stores: storeList, currentStoreId: loadConfig().store_id || "", onSelect: handleStoreSelect, onCancel: handleStoreCancel })) : modelSelectMode ? (_jsx(ModelSelector, { currentModel: currentModel, onSelect: (model) => {
                     setModelSelectMode(false);
                     setModel(model.value);
                     setCurrentModel(model.value);

package/dist/cli/chat/ChatInput.js

@@ -39,6 +39,7 @@ export const SLASH_COMMANDS = [
     { name: "/memory", description: "List all remembered facts" },
     { name: "/mode", description: "Permission mode (default/plan/yolo)" },
     { name: "/thinking", description: "Toggle extended thinking" },
+    { name: "/rewind", description: "Rewind conversation to earlier point" },
     { name: "/init", description: "Generate project config (.whale/CLAUDE.md)" },
     { name: "/update", description: "Check for updates & install" },
     { name: "/clear", description: "Clear conversation" },

package/dist/cli/chat/MessageList.d.ts

@@ -24,6 +24,10 @@ export interface ChatMessage {
         input_tokens: number;
         output_tokens: number;
         thinking_tokens?: number;
+        model?: string;
+        costUsd?: number;
+        cache_read_tokens?: number;
+        cache_creation_tokens?: number;
     };
 }
 export declare const CompletedMessage: React.NamedExoticComponent<{

package/dist/cli/chat/MessageList.js

@@ -17,10 +17,16 @@ import { MODEL_PRICING } from "../../shared/agent-core.js";
 // ============================================================================
 // HELPERS
 // ============================================================================
-function estimateCost(input, output) {
-    // Use Opus pricing as default since that's the primary model
-    const opusPricing = MODEL_PRICING["claude-opus-4-6"] || { inputPer1M: 15, outputPer1M: 75 };
-    const cost = (input * opusPricing.inputPer1M + output * opusPricing.outputPer1M) / 1_000_000;
+function estimateCost(input, output, model, precomputedCost) {
+    // Use precomputed cost if available (accurate for all providers)
+    let cost = precomputedCost;
+    if (cost == null) {
+        // Fall back to model-specific pricing, then Sonnet as default
+        const pricing = (model && MODEL_PRICING[model])
+            || MODEL_PRICING[Object.keys(MODEL_PRICING).find(k => model?.startsWith(k)) ?? ""]
+            || MODEL_PRICING["claude-sonnet-4-6"];
+        cost = (input * pricing.inputPer1M + output * pricing.outputPer1M) / 1_000_000;
+    }
     if (cost < 0.001)
         return "<$0.001";
     if (cost < 0.01)
@@ -70,5 +76,5 @@ function groupConsecutiveTools(toolCalls) {
 export const CompletedMessage = React.memo(function CompletedMessage({ msg, index, toolsExpanded }) {
     const cw = Math.max(20, contentWidth());
     const toolGroups = useMemo(() => msg.toolCalls ? groupConsecutiveTools(msg.toolCalls) : [], [msg.toolCalls]);
-    return (_jsxs(Box, { flexDirection: "column", children: [msg.role === "user" && index > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: colors.separator, children: "─".repeat(cw) })] })), msg.role === "user" ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), msg.images && msg.images.length > 0 && (_jsx(Box, { marginLeft: 2, children: msg.images.map((name, i) => (_jsxs(Text, { children: [_jsx(Text, { color: colors.indigo, children: "[" }), _jsx(Text, { color: colors.secondary, children: name }), _jsx(Text, { color: colors.indigo, children: "]" }), _jsx(Text, { children: " " })] }, i))) })), _jsxs(Text, { children: [_jsx(Text, { color: colors.brand, bold: true, children: "❯ " }), _jsx(Text, { color: colors.user, children: msg.text })] })] })) : (_jsxs(Box, { flexDirection: "column", children: [toolGroups.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: toolGroups.map((group, j) => (_jsx(ToolIndicator, { id: `done-${index}-${j}`, name: group.tool.name, status: group.tool.status, result: group.tool.result, input: group.tool.input, durationMs: group.tool.durationMs, expanded: toolsExpanded, count: group.count }, j))) })), msg.completedSubagents && msg.completedSubagents.length > 0 && (_jsx(CompletedSubagentTree, { agents: msg.completedSubagents })), msg.text && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsx(Text, { children: " " }), _jsx(MarkdownText, { text: msg.text })] })), msg.usage && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { children: ["  ", _jsxs(Text, { color: colors.quaternary, children: [formatTokens(msg.usage.input_tokens), _jsx(Text, { color: colors.indigo, children: "\u2191" }), " ", formatTokens(msg.usage.output_tokens), _jsx(Text, { color: colors.purple, children: "\u2193" }), msg.usage.thinking_tokens ? (_jsxs(_Fragment, { children: [" ", formatTokens(msg.usage.thinking_tokens), _jsx(Text, { color: colors.warning, children: "T" })] })) : null] }), _jsxs(Text, { color: colors.quaternary, children: ["  ", estimateCost(msg.usage.input_tokens, msg.usage.output_tokens)] }), msg.toolCalls && msg.toolCalls.length > 0 ? (_jsxs(Text, { color: colors.quaternary, children: ["  ", msg.toolCalls.length, " tool", msg.toolCalls.length !== 1 ? "s" : "", "  ", formatMs(totalToolDuration(msg.toolCalls))] })) : null] })] }))] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [msg.role === "user" && index > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: colors.separator, children: "─".repeat(cw) })] })), msg.role === "user" ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), msg.images && msg.images.length > 0 && (_jsx(Box, { marginLeft: 2, children: msg.images.map((name, i) => (_jsxs(Text, { children: [_jsx(Text, { color: colors.indigo, children: "[" }), _jsx(Text, { color: colors.secondary, children: name }), _jsx(Text, { color: colors.indigo, children: "]" }), _jsx(Text, { children: " " })] }, i))) })), _jsxs(Text, { children: [_jsx(Text, { color: colors.brand, bold: true, children: "❯ " }), _jsx(Text, { color: colors.user, children: msg.text })] })] })) : (_jsxs(Box, { flexDirection: "column", children: [toolGroups.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: toolGroups.map((group, j) => (_jsx(ToolIndicator, { id: `done-${index}-${j}`, name: group.tool.name, status: group.tool.status, result: group.tool.result, input: group.tool.input, durationMs: group.tool.durationMs, expanded: toolsExpanded, count: group.count }, j))) })), msg.completedSubagents && msg.completedSubagents.length > 0 && (_jsx(CompletedSubagentTree, { agents: msg.completedSubagents })), msg.text && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsx(Text, { children: " " }), _jsx(MarkdownText, { text: msg.text })] })), msg.usage && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsxs(Text, { children: ["  ", _jsxs(Text, { color: colors.quaternary, children: [formatTokens(msg.usage.input_tokens), _jsx(Text, { color: colors.indigo, children: "\u2191" }), " ", formatTokens(msg.usage.output_tokens), _jsx(Text, { color: colors.purple, children: "\u2193" }), msg.usage.thinking_tokens ? (_jsxs(_Fragment, { children: [" ", formatTokens(msg.usage.thinking_tokens), _jsx(Text, { color: colors.warning, children: "T" })] })) : null, msg.usage.cache_read_tokens ? (_jsxs(_Fragment, { children: [" ", formatTokens(msg.usage.cache_read_tokens), _jsx(Text, { color: colors.success, children: "C" })] })) : null] }), _jsxs(Text, { color: colors.quaternary, children: ["  ", estimateCost(msg.usage.input_tokens, msg.usage.output_tokens, msg.usage.model, msg.usage.costUsd)] }), msg.toolCalls && msg.toolCalls.length > 0 ? (_jsxs(Text, { color: colors.quaternary, children: ["  ", msg.toolCalls.length, " tool", msg.toolCalls.length !== 1 ? "s" : "", "  ", formatMs(totalToolDuration(msg.toolCalls))] })) : null] })] }))] }))] }));
 });

package/dist/cli/chat/ModelSelector.js

@@ -3,12 +3,16 @@ import { Box, Text, useInput } from "ink";
 import SelectInput from "ink-select-input";
 import { colors, symbols } from "../shared/Theme.js";
 export const MODEL_OPTIONS = [
+    // Auto
+    { label: "Auto (smart routing)", value: "auto", modelId: "auto", provider: "Auto" },
     // Anthropic
     { label: "Opus 4.6", value: "opus", modelId: "claude-opus-4-6", provider: "Anthropic" },
-    { label: "Sonnet 4", value: "sonnet", modelId: "claude-sonnet-4-20250514", provider: "Anthropic" },
+    { label: "Sonnet 4.6", value: "sonnet", modelId: "claude-sonnet-4-6", provider: "Anthropic" },
+    { label: "Sonnet 4", value: "sonnet-4", modelId: "claude-sonnet-4-20250514", provider: "Anthropic" },
     { label: "Haiku 4.5", value: "haiku", modelId: "claude-haiku-4-5-20251001", provider: "Anthropic" },
     // Bedrock
-    { label: "Sonnet 4", value: "bedrock-sonnet", modelId: "us.anthropic.claude-sonnet-4-20250514-v1:0", provider: "Bedrock" },
+    { label: "Sonnet 4.6", value: "bedrock-sonnet", modelId: "anthropic.claude-sonnet-4-6", provider: "Bedrock" },
+    { label: "Sonnet 4", value: "bedrock-sonnet-4", modelId: "us.anthropic.claude-sonnet-4-20250514-v1:0", provider: "Bedrock" },
     { label: "Sonnet 4.5", value: "bedrock-sonnet-4.5", modelId: "us.anthropic.claude-sonnet-4-5-20250929-v1:0", provider: "Bedrock" },
     { label: "Haiku 4.5", value: "bedrock-haiku", modelId: "us.anthropic.claude-haiku-4-5-20251001-v1:0", provider: "Bedrock" },
     // Gemini
@@ -26,7 +30,7 @@ export const MODEL_OPTIONS = [
     { label: "GPT-4o", value: "gpt-4o", modelId: "gpt-4o", provider: "OpenAI" },
 ];
 // Group labels to render section headers
-const PROVIDER_ORDER = ["Anthropic", "Bedrock", "Gemini", "OpenAI"];
+const PROVIDER_ORDER = ["Auto", "Anthropic", "Bedrock", "Gemini", "OpenAI"];
 export function ModelSelector({ currentModel, onSelect, onCancel }) {
     useInput((_input, key) => {
         if (key.escape)

package/dist/cli/chat/RewindViewer.d.ts

@@ -0,0 +1,26 @@
+/**
+ * RewindViewer — conversation timeline for rewind selection
+ *
+ * Displays checkpoints as a navigable list. Users select a point to
+ * rewind to with arrow keys and Enter. Esc cancels.
+ *
+ * UX modeled after Gemini CLI's rewind viewer:
+ * - Shows each turn with a summary of what happened
+ * - Lists file changes for each turn
+ * - Highlight selected checkpoint
+ * - Confirmation step with rewind options
+ */
+import type { RewindCheckpoint } from "../services/rewind.js";
+export declare enum RewindOutcome {
+    RewindAndRevert = "rewind_and_revert",
+    RewindOnly = "rewind_only",
+    RevertOnly = "revert_only",
+    Cancel = "cancel"
+}
+interface RewindViewerProps {
+    checkpoints: RewindCheckpoint[];
+    onRewind: (checkpointIndex: number, outcome: RewindOutcome) => void;
+    onCancel: () => void;
+}
+export declare function RewindViewer({ checkpoints, onRewind, onCancel }: RewindViewerProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/cli/chat/RewindViewer.js

@@ -0,0 +1,185 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * RewindViewer — conversation timeline for rewind selection
+ *
+ * Displays checkpoints as a navigable list. Users select a point to
+ * rewind to with arrow keys and Enter. Esc cancels.
+ *
+ * UX modeled after Gemini CLI's rewind viewer:
+ * - Shows each turn with a summary of what happened
+ * - Lists file changes for each turn
+ * - Highlight selected checkpoint
+ * - Confirmation step with rewind options
+ */
+import { useState, useMemo } from "react";
+import { Box, Text, useInput } from "ink";
+import { colors, symbols } from "../shared/Theme.js";
+// ============================================================================
+// TYPES
+// ============================================================================
+export var RewindOutcome;
+(function (RewindOutcome) {
+    RewindOutcome["RewindAndRevert"] = "rewind_and_revert";
+    RewindOutcome["RewindOnly"] = "rewind_only";
+    RewindOutcome["RevertOnly"] = "revert_only";
+    RewindOutcome["Cancel"] = "cancel";
+})(RewindOutcome || (RewindOutcome = {}));
+// ============================================================================
+// HELPERS
+// ============================================================================
+function truncateSummary(text, maxLen) {
+    if (!text)
+        return "(no text)";
+    const cleaned = text.replace(/\n/g, " ").trim();
+    if (cleaned.length <= maxLen)
+        return cleaned;
+    return cleaned.slice(0, maxLen - 1) + "\u2026";
+}
+function formatFileOp(op, isNew) {
+    if (isNew)
+        return "created";
+    switch (op) {
+        case "write": return "written";
+        case "edit": return "edited";
+        case "multi_edit": return "edited";
+        default: return "modified";
+    }
+}
+function formatTimeAgo(timestamp) {
+    const diff = Date.now() - timestamp;
+    const seconds = Math.floor(diff / 1000);
+    if (seconds < 60)
+        return "just now";
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m ago`;
+    const hours = Math.floor(minutes / 60);
+    return `${hours}h ago`;
+}
+function basename(filePath) {
+    const parts = filePath.split("/");
+    return parts[parts.length - 1] || filePath;
+}
+// ============================================================================
+// CONFIRMATION COMPONENT
+// ============================================================================
+function RewindConfirmation({ checkpoint, fileChangeCount, onConfirm, onCancel, }) {
+    const hasFileChanges = fileChangeCount > 0;
+    const options = useMemo(() => {
+        const opts = [];
+        if (hasFileChanges) {
+            opts.push({
+                label: "Rewind conversation and revert file changes",
+                value: RewindOutcome.RewindAndRevert,
+            });
+        }
+        opts.push({
+            label: "Rewind conversation only",
+            value: RewindOutcome.RewindOnly,
+        });
+        if (hasFileChanges) {
+            opts.push({
+                label: "Revert file changes only",
+                value: RewindOutcome.RevertOnly,
+            });
+        }
+        opts.push({
+            label: "Cancel (Esc)",
+            value: RewindOutcome.Cancel,
+        });
+        return opts;
+    }, [hasFileChanges]);
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    useInput((input, key) => {
+        if (key.escape) {
+            onCancel();
+            return;
+        }
+        if (key.upArrow) {
+            setSelectedIndex(prev => Math.max(0, prev - 1));
+            return;
+        }
+        if (key.downArrow) {
+            setSelectedIndex(prev => Math.min(options.length - 1, prev + 1));
+            return;
+        }
+        if (key.return) {
+            onConfirm(options[selectedIndex].value);
+            return;
+        }
+    });
+    const termWidth = process.stdout.columns || 80;
+    const boxWidth = Math.min(termWidth - 2, 60);
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: colors.border, paddingX: 1, paddingY: 1, width: boxWidth, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: colors.brand, children: "Confirm Rewind" }) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Rewind to turn ", checkpoint.turnIndex + 1, ": ", truncateSummary(checkpoint.summary, 40)] }), hasFileChanges && (_jsxs(Text, { dimColor: true, children: [fileChangeCount, " file change", fileChangeCount !== 1 ? "s" : "", " will be affected"] })), !hasFileChanges && (_jsx(Text, { dimColor: true, children: "No file changes to revert." }))] }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Select an action:" }) }), _jsx(Box, { flexDirection: "column", children: options.map((opt, i) => (_jsxs(Box, { children: [_jsxs(Text, { color: i === selectedIndex ? colors.brand : colors.quaternary, children: [i === selectedIndex ? symbols.arrowRight : " ", " "] }), _jsx(Text, { color: i === selectedIndex ? colors.text : colors.secondary, bold: i === selectedIndex, children: opt.label })] }, opt.value))) })] }));
+}
+// ============================================================================
+// MAIN VIEWER COMPONENT
+// ============================================================================
+export function RewindViewer({ checkpoints, onRewind, onCancel }) {
+    // Start selection at the last checkpoint (current position)
+    const [selectedIndex, setSelectedIndex] = useState(checkpoints.length - 1);
+    const [confirmIndex, setConfirmIndex] = useState(null);
+    // Calculate visible window (scrolling for long lists)
+    const termHeight = process.stdout.rows || 24;
+    const maxVisible = Math.max(3, Math.min(checkpoints.length, termHeight - 8));
+    const scrollOffset = useMemo(() => {
+        if (checkpoints.length <= maxVisible)
+            return 0;
+        // Keep selected item roughly centered
+        const half = Math.floor(maxVisible / 2);
+        const start = Math.max(0, Math.min(selectedIndex - half, checkpoints.length - maxVisible));
+        return start;
+    }, [selectedIndex, maxVisible, checkpoints.length]);
+    const visibleCheckpoints = checkpoints.slice(scrollOffset, scrollOffset + maxVisible);
+    useInput((input, key) => {
+        if (confirmIndex !== null)
+            return; // Confirmation handles its own input
+        if (key.escape) {
+            onCancel();
+            return;
+        }
+        if (key.upArrow) {
+            setSelectedIndex(prev => Math.max(0, prev - 1));
+            return;
+        }
+        if (key.downArrow) {
+            setSelectedIndex(prev => Math.min(checkpoints.length - 1, prev + 1));
+            return;
+        }
+        if (key.return) {
+            // Selecting the last checkpoint (current) = cancel
+            if (selectedIndex === checkpoints.length - 1) {
+                onCancel();
+                return;
+            }
+            setConfirmIndex(selectedIndex);
+            return;
+        }
+    });
+    const termWidth = process.stdout.columns || 80;
+    const boxWidth = Math.min(termWidth - 2, 70);
+    // Show confirmation dialog
+    if (confirmIndex !== null) {
+        const checkpoint = checkpoints[confirmIndex];
+        const fileChangeCount = checkpoints
+            .slice(confirmIndex + 1)
+            .reduce((sum, cp) => sum + cp.fileChanges.length, 0);
+        return (_jsx(RewindConfirmation, { checkpoint: checkpoint, fileChangeCount: fileChangeCount, onConfirm: (outcome) => {
+                if (outcome === RewindOutcome.Cancel) {
+                    setConfirmIndex(null);
+                }
+                else {
+                    onRewind(confirmIndex, outcome);
+                }
+            }, onCancel: () => setConfirmIndex(null) }));
+    }
+    if (checkpoints.length === 0) {
+        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: colors.border, paddingX: 1, paddingY: 1, width: boxWidth, children: [_jsx(Text, { bold: true, color: colors.brand, children: "Rewind" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Nothing to rewind to." }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "Press Esc to close." })] }));
+    }
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: colors.border, paddingX: 1, paddingY: 1, width: boxWidth, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: colors.brand, children: [symbols.arrowRight, " Rewind"] }) }), scrollOffset > 0 && (_jsxs(Text, { dimColor: true, children: ["  ", symbols.dot, symbols.dot, symbols.dot, " ", scrollOffset, " more above"] })), _jsx(Box, { flexDirection: "column", children: visibleCheckpoints.map((cp, visIdx) => {
+                    const realIdx = scrollOffset + visIdx;
+                    const isSelected = realIdx === selectedIndex;
+                    const isCurrent = realIdx === checkpoints.length - 1;
+                    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { color: isSelected ? colors.brand : colors.quaternary, children: [isSelected ? symbols.arrowRight : " ", " "] }), _jsx(Text, { color: isSelected ? colors.text : (isCurrent ? colors.secondary : colors.text), children: isCurrent ? symbols.dot : symbols.bullet }), _jsxs(Text, { color: isSelected ? colors.brand : colors.secondary, bold: isSelected, children: [" ", "Turn ", cp.turnIndex + 1] }), _jsxs(Text, { dimColor: true, children: [" ", symbols.divider, " "] }), _jsx(Text, { color: isSelected ? colors.text : colors.secondary, bold: isSelected, children: truncateSummary(cp.summary, 45) }), isCurrent && (_jsx(Text, { dimColor: true, children: " (current)" }))] }), cp.fileChanges.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 4, children: cp.fileChanges.map((fc, fi) => (_jsxs(Text, { dimColor: true, children: [basename(fc.filePath), " (", formatFileOp(fc.operation, fc.isNewFile), ")"] }, fi))) })), isSelected && (_jsx(Box, { marginLeft: 4, children: _jsx(Text, { dimColor: true, children: formatTimeAgo(cp.timestamp) }) }))] }, realIdx));
+                }) }), scrollOffset + maxVisible < checkpoints.length && (_jsxs(Text, { dimColor: true, children: ["  ", symbols.dot, symbols.dot, symbols.dot, " ", checkpoints.length - scrollOffset - maxVisible, " more below"] })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: [symbols.arrowRight, " Use arrow keys to select, Enter to rewind, Esc to cancel"] }) })] }));
+}

package/dist/cli/chat/ToolIndicator.js

@@ -7,7 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * Params: purple keys, typed values (blue dates, green money, red negatives).
  * Duration badge, tool type glyph.
  */
-import React, { useMemo } from "react";
+import React, { useMemo, useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import Spinner from "ink-spinner";
 import { MarkdownText } from "./MarkdownText.js";
@@ -102,11 +102,21 @@ function formatContext(name, input) {
         const ln = input.line ? `:${input.line}` : "";
         return `${op} ${fp}${ln}`;
     }
+    // Kali — show the command being executed (most useful context)
+    if (name === "kali" && input.command) {
+        let cmd = String(input.command);
+        const maxCtx = Math.min(60, Math.max(20, contentWidth() - 40));
+        cmd = cmd.length > maxCtx ? cmd.slice(0, maxCtx - 1) + "…" : cmd;
+        const action = input.action ? String(input.action) + " " : "";
+        return action + cmd;
+    }
     // Server tools → action + key param
     if (input.action) {
         const parts = [String(input.action)];
         if (input.query)
             parts.push(String(input.query).slice(0, 25));
+        else if (input.command)
+            parts.push(String(input.command).slice(0, 40));
         else if (input.name)
             parts.push(String(input.name));
         else if (input.period)
@@ -274,6 +284,15 @@ function wrapInFence(content, lang, subtitle) {
 export const ToolIndicator = React.memo(function ToolIndicator({ id: _id, name, status, result, input, durationMs, expanded = false, count }) {
     const context = useMemo(() => formatContext(name, input), [name, input]);
     const lineCount = useMemo(() => result ? result.split("\n").length : 0, [result]);
+    // Elapsed time counter for running tools
+    const [elapsed, setElapsed] = useState(0);
+    useEffect(() => {
+        if (status !== "running")
+            return;
+        setElapsed(0);
+        const t = setInterval(() => setElapsed(e => e + 1), 1000);
+        return () => clearInterval(t);
+    }, [status]);
     // Detect lang — writes with diffs get "diff" treatment
     const lang = useMemo(() => {
         const base = detectLang(name, input);
@@ -370,11 +389,11 @@ export const ToolIndicator = React.memo(function ToolIndicator({ id: _id, name,
     }, [status, result]);
     // ── RUNNING ──
     if (status === "running") {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: catStyle.color, children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: catStyle.color, children: [" ", catStyle.icon] }), _jsxs(Text, { color: catStyle.color, bold: true, children: [" ", getDisplayName(name)] }), context ? _jsxs(Text, { color: colors.dim, children: ["  ", context] }) : null] }), liveLines.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 4, children: liveLines.map((line, i) => (_jsx(Text, { color: colors.tertiary, wrap: "truncate", children: line }, i))) }))] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: catStyle.color, children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: catStyle.color, children: [" ", catStyle.icon] }), _jsxs(Text, { color: catStyle.color, bold: true, children: [" ", getDisplayName(name)] }), context ? _jsxs(Text, { color: colors.dim, children: ["  ", context] }) : null, elapsed >= 2 && _jsxs(Text, { color: elapsed >= 30 ? colors.warning : colors.dim, children: ["  ", formatDuration(elapsed * 1000)] })] }), liveLines.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 4, children: liveLines.map((line, i) => (_jsx(Text, { color: colors.tertiary, wrap: "truncate", children: line }, i))) }))] }));
     }
     // ── ERROR ──
     if (status === "error") {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: colors.error, bold: true, children: "\u2715" }), _jsxs(Text, { color: catStyle.color, children: [" ", catStyle.icon] }), _jsxs(Text, { color: catStyle.color, bold: true, children: [" ", getDisplayName(name)] }), context ? _jsxs(Text, { color: colors.dim, children: ["  ", context] }) : null, durationMs !== undefined && _jsxs(Text, { color: colors.dim, children: ["  ", formatDuration(durationMs)] })] }), result && (_jsx(Box, { marginLeft: 2, children: _jsx(MarkdownText, { text: "```\n" + result.split("\n").slice(0, 3).join("\n") + "\n```" }) }))] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: colors.error, bold: true, children: "\u2715" }), _jsxs(Text, { color: catStyle.color, children: [" ", catStyle.icon] }), _jsxs(Text, { color: catStyle.color, bold: true, children: [" ", getDisplayName(name)] }), context ? _jsxs(Text, { color: colors.dim, children: ["  ", context] }) : null, durationMs !== undefined && _jsxs(Text, { color: colors.dim, children: ["  ", formatDuration(durationMs)] })] }), result && (_jsx(Box, { marginLeft: 2, children: _jsx(MarkdownText, { text: "```\n" + result.split("\n").slice(0, PREVIEW_LINES).join("\n") + "\n```" }) }))] }));
     }
     // ── SUCCESS ──
     const hasResult = !!(result && result.trim());
@@ -388,9 +407,19 @@ export const ToolIndicator = React.memo(function ToolIndicator({ id: _id, name,
     const alwaysExpand = category === "interactive";
     const isGrouped = (count ?? 0) > 1;
     const showFull = hasResult && !isGrouped && (expanded || alwaysExpand || (isShort && !collapseByDefault));
+    // For grouped tools, extract a one-line summary so they aren't completely invisible
+    const groupSummaryLine = useMemo(() => {
+        if (!isGrouped || !result)
+            return null;
+        const firstLine = result.split("\n").find(l => l.trim() && !l.startsWith("**Success**") && !l.startsWith("**Killed**"));
+        if (!firstLine)
+            return null;
+        const trimmed = firstLine.replace(/^\*\*\w+\*\*:\s*/, "").trim();
+        return trimmed.length > 80 ? trimmed.slice(0, 77) + "…" : trimmed;
+    }, [isGrouped, result]);
     return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: colors.success, children: "\u2713" }), _jsxs(Text, { color: catStyle.color, children: [" ", catStyle.icon] }), _jsxs(Text, { color: catStyle.color, bold: true, children: [" ", getDisplayName(name)] }), context ? _jsxs(Text, { color: colors.dim, children: ["  ", context] }) : null, durationMs !== undefined && (durationMs > 3000
                         ? _jsxs(Text, { color: colors.warning, children: ["  ", formatDuration(durationMs)] })
-                        : _jsxs(Text, { color: colors.dim, children: ["  ", formatDuration(durationMs)] })), summary?.type === "edit" && category === "edit" && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: colors.success, children: ["  +", summary.added] }), _jsxs(Text, { color: colors.error, children: [" -", summary.removed] })] })), summary?.type === "search" && (_jsxs(Text, { color: colors.dim, children: ["  ", summary.matches, " match", summary.matches !== 1 ? "es" : "", summary.files > 0 ? ` in ${summary.files} file${summary.files !== 1 ? "s" : ""}` : ""] })), summary && "label" in summary && summary.type !== "server" && (_jsxs(Text, { color: colors.dim, children: ["  ", summary.label] })), summary?.type === "server" && (_jsxs(Text, { color: colors.info, children: ["  ", summary.label] })), !summary && hasResult && !showFull && _jsxs(Text, { color: colors.dim, children: ["  ", lineCount, " lines"] }), (count ?? 0) > 1 && _jsxs(Text, { color: colors.dim, dimColor: true, children: ["  \u00D7 ", count] })] }), category === "write" && hasDiff && summary?.type === "edit" && (_jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { color: colors.tertiary, children: "\u2514 Added " }), _jsx(Text, { color: colors.success, children: summary.added }), _jsx(Text, { color: colors.tertiary, children: " lines, removed " }), _jsx(Text, { color: colors.error, children: summary.removed }), _jsx(Text, { color: colors.tertiary, children: " lines" })] })), showFull && (_jsx(Box, { marginLeft: 2, flexDirection: "column", children: _jsx(MarkdownText, { text: category === "agent"
+                        : _jsxs(Text, { color: colors.dim, children: ["  ", formatDuration(durationMs)] })), summary?.type === "edit" && category === "edit" && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: colors.success, children: ["  +", summary.added] }), _jsxs(Text, { color: colors.error, children: [" -", summary.removed] })] })), summary?.type === "search" && (_jsxs(Text, { color: colors.dim, children: ["  ", summary.matches, " match", summary.matches !== 1 ? "es" : "", summary.files > 0 ? ` in ${summary.files} file${summary.files !== 1 ? "s" : ""}` : ""] })), summary && "label" in summary && summary.type !== "server" && (_jsxs(Text, { color: colors.dim, children: ["  ", summary.label] })), summary?.type === "server" && (_jsxs(Text, { color: colors.info, children: ["  ", summary.label] })), !summary && hasResult && !showFull && _jsxs(Text, { color: colors.dim, children: ["  ", lineCount, " lines"] }), (count ?? 0) > 1 && _jsxs(Text, { color: colors.dim, dimColor: true, children: ["  \u00D7 ", count] })] }), isGrouped && groupSummaryLine && (_jsx(Box, { marginLeft: 4, children: _jsx(Text, { color: colors.tertiary, wrap: "truncate", children: groupSummaryLine }) })), category === "write" && hasDiff && summary?.type === "edit" && (_jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { color: colors.tertiary, children: "\u2514 Added " }), _jsx(Text, { color: colors.success, children: summary.added }), _jsx(Text, { color: colors.tertiary, children: " lines, removed " }), _jsx(Text, { color: colors.error, children: summary.removed }), _jsx(Text, { color: colors.tertiary, children: " lines" })] })), showFull && (_jsx(Box, { marginLeft: 2, flexDirection: "column", children: _jsx(MarkdownText, { text: category === "agent"
                         ? result
                         : wrapInFence(category === "search" ? formatSearchResult(result) : result, lang, filePath) }) })), hasResult && !showFull && !collapseByDefault && !isGrouped && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsx(MarkdownText, { text: category === "agent"
                             ? result.split("\n").slice(0, PREVIEW_LINES).join("\n")

package/dist/cli/chat/hooks/useAgentLoop.d.ts

@@ -4,6 +4,7 @@
  * All consumers should import from ChatApp (re-export facade).
  */
 import type Anthropic from "@anthropic-ai/sdk";
+import { RewindManager } from "../../services/rewind.js";
 import type { ChatMessage, ToolCall } from "../MessageList.js";
 import type { SubagentActivityState, CompletedSubagentInfo } from "../SubagentPanel.js";
 import type { ImageAttachment } from "../ChatInput.js";
@@ -17,6 +18,8 @@ export interface AgentLoopDeps {
     teamTimerRef: React.MutableRefObject<NodeJS.Timeout | null>;
     toolOutputTimerRef: React.MutableRefObject<NodeJS.Timeout | null>;
     thinkingVerbRef: React.MutableRefObject<string>;
+    rewindManagerRef: React.MutableRefObject<RewindManager>;
+    turnIndexRef: React.MutableRefObject<number>;
     setMessages: React.Dispatch<React.SetStateAction<ChatMessage[]>>;
     setStreamingText: React.Dispatch<React.SetStateAction<string>>;
     setIsStreaming: React.Dispatch<React.SetStateAction<boolean>>;