wave-code 0.2.0 → 0.4.0

package/dist/managers/InputManager.js

@@ -1,4 +1,4 @@
-import { searchFiles as searchFilesUtil, deleteBashCommandFromHistory, } from "wave-agent-sdk";
+import { searchFiles as searchFilesUtil, PromptHistoryManager, } from "wave-agent-sdk";
 import { readClipboardImage } from "../utils/clipboard.js";
 export class InputManager {
     constructor(callbacks = {}) {
@@ -15,10 +15,9 @@ export class InputManager {
         this.showCommandSelector = false;
         this.slashPosition = -1;
         this.commandSearchQuery = "";
-        // Bash history selector state
-        this.showBashHistorySelector = false;
-        this.exclamationPosition = -1;
-        this.bashHistorySearchQuery = "";
+        // History search state
+        this.showHistorySearch = false;
+        this.historySearchQuery = "";
         // Memory type selector state
         this.showMemoryTypeSelector = false;
         this.memoryMessage = "";
@@ -40,6 +39,7 @@ export class InputManager {
         // Additional UI state
         this.showBashManager = false;
         this.showMcpManager = false;
+        this.showRewindManager = false;
         // Permission mode state
         this.permissionMode = "default";
         // Flag to prevent handleInput conflicts when selector selection occurs
@@ -228,6 +228,11 @@ export class InputManager {
                         this.callbacks.onShowMcpManager();
                         commandExecuted = true;
                     }
+                    else if (command === "rewind" &&
+                        this.callbacks.onShowRewindManager) {
+                        this.callbacks.onShowRewindManager();
+                        commandExecuted = true;
+                    }
                 }
             })();
             this.handleCancelCommandSelect();
@@ -275,72 +280,6 @@ export class InputManager {
         }
         return false;
     }
-    // Bash history selector methods
-    activateBashHistorySelector(position) {
-        this.showBashHistorySelector = true;
-        this.exclamationPosition = position;
-        this.bashHistorySearchQuery = "";
-        this.callbacks.onBashHistorySelectorStateChange?.(true, "", position);
-    }
-    updateBashHistorySearchQuery(query) {
-        this.bashHistorySearchQuery = query;
-        this.callbacks.onBashHistorySelectorStateChange?.(this.showBashHistorySelector, query, this.exclamationPosition);
-    }
-    handleBashHistorySelect(command) {
-        if (this.exclamationPosition >= 0) {
-            const beforeExclamation = this.inputText.substring(0, this.exclamationPosition);
-            const afterQuery = this.inputText.substring(this.cursorPosition);
-            const newInput = beforeExclamation + `!${command}` + afterQuery;
-            const newCursorPosition = beforeExclamation.length + command.length + 1;
-            this.inputText = newInput;
-            this.cursorPosition = newCursorPosition;
-            this.handleCancelBashHistorySelect();
-            // Set flag to prevent handleInput from processing the same Enter key
-            this.selectorJustUsed = true;
-            setTimeout(() => {
-                this.selectorJustUsed = false;
-            }, 0);
-            this.callbacks.onInputTextChange?.(newInput);
-            this.callbacks.onCursorPositionChange?.(newCursorPosition);
-            return { newInput, newCursorPosition };
-        }
-        return { newInput: this.inputText, newCursorPosition: this.cursorPosition };
-    }
-    handleCancelBashHistorySelect() {
-        this.showBashHistorySelector = false;
-        this.exclamationPosition = -1;
-        this.bashHistorySearchQuery = "";
-        this.callbacks.onBashHistorySelectorStateChange?.(false, "", -1);
-    }
-    handleBashHistoryExecute(command) {
-        this.showBashHistorySelector = false;
-        this.exclamationPosition = -1;
-        this.bashHistorySearchQuery = "";
-        this.callbacks.onBashHistorySelectorStateChange?.(false, "", -1);
-        return command; // Return command to execute
-    }
-    handleBashHistoryExecuteAndSend(command) {
-        const commandToExecute = this.handleBashHistoryExecute(command);
-        // Clear input box and execute command, ensure command starts with !
-        const bashCommand = commandToExecute.startsWith("!")
-            ? commandToExecute
-            : `!${commandToExecute}`;
-        this.clearInput();
-        this.callbacks.onSendMessage?.(bashCommand);
-    }
-    handleBashHistoryDelete(command, workdir) {
-        deleteBashCommandFromHistory(command, workdir);
-        // Trigger a refresh of the selector state to force re-render of BashHistorySelector
-        this.callbacks.onBashHistorySelectorStateChange?.(this.showBashHistorySelector, this.bashHistorySearchQuery, this.exclamationPosition);
-    }
-    checkForExclamationDeletion(cursorPosition) {
-        if (this.showBashHistorySelector &&
-            cursorPosition <= this.exclamationPosition) {
-            this.handleCancelBashHistorySelect();
-            return true;
-        }
-        return false;
-    }
     // Memory type selector methods
     activateMemoryTypeSelector(message) {
         this.showMemoryTypeSelector = true;
@@ -421,9 +360,6 @@ export class InputManager {
     isCommandSelectorActive() {
         return this.showCommandSelector;
     }
-    isBashHistorySelectorActive() {
-        return this.showBashHistorySelector;
-    }
     isMemoryTypeSelectorActive() {
         return this.showMemoryTypeSelector;
     }
@@ -442,13 +378,6 @@ export class InputManager {
             position: this.slashPosition,
         };
     }
-    getBashHistorySelectorState() {
-        return {
-            show: this.showBashHistorySelector,
-            query: this.bashHistorySearchQuery,
-            position: this.exclamationPosition,
-        };
-    }
     getMemoryTypeSelectorState() {
         return {
             show: this.showMemoryTypeSelector,
@@ -469,25 +398,19 @@ export class InputManager {
             const newQuery = inputText.substring(queryStart, queryEnd);
             this.updateCommandSearchQuery(newQuery);
         }
-        else if (this.showBashHistorySelector && this.exclamationPosition >= 0) {
-            const queryStart = this.exclamationPosition + 1;
-            const queryEnd = cursorPosition;
-            const newQuery = inputText.substring(queryStart, queryEnd);
-            this.updateBashHistorySearchQuery(newQuery);
-        }
     }
     // Handle special character input that might trigger selectors
     handleSpecialCharInput(char) {
         if (char === "@") {
             this.activateFileSelector(this.cursorPosition - 1);
         }
-        else if (char === "/" && !this.showFileSelector) {
+        else if (char === "/" &&
+            !this.showFileSelector &&
+            this.cursorPosition === 1) {
             // Don't activate command selector when file selector is active
+            // Only activate command selector if '/' is at the start of input
             this.activateCommandSelector(this.cursorPosition - 1);
         }
-        else if (char === "!" && this.cursorPosition === 1) {
-            this.activateBashHistorySelector(0);
-        }
         else if (char === "#" && this.cursorPosition === 1) {
             // Memory message detection will be handled in submit
         }
@@ -630,6 +553,13 @@ export class InputManager {
         this.showMcpManager = show;
         this.callbacks.onMcpManagerStateChange?.(show);
     }
+    getShowRewindManager() {
+        return this.showRewindManager;
+    }
+    setShowRewindManager(show) {
+        this.showRewindManager = show;
+        this.callbacks.onRewindManagerStateChange?.(show);
+    }
     // Permission mode methods
     getPermissionMode() {
         return this.permissionMode;
@@ -676,6 +606,10 @@ export class InputManager {
             // Remove image placeholders, expand long text placeholders, send message
             let cleanContent = this.inputText.replace(imageRegex, "").trim();
             cleanContent = this.expandLongTextPlaceholders(cleanContent);
+            // Save to prompt history
+            PromptHistoryManager.addEntry(cleanContent).catch((err) => {
+                this.logger?.error("Failed to save prompt history", err);
+            });
             this.callbacks.onSendMessage?.(cleanContent, referencedImages.length > 0 ? referencedImages : undefined);
             this.clearInput();
             this.callbacks.onResetHistoryNavigation?.();
@@ -691,7 +625,6 @@ export class InputManager {
                     // Check for special character deletion
                     this.checkForAtDeletion(newCursorPosition);
                     this.checkForSlashDeletion(newCursorPosition);
-                    this.checkForExclamationDeletion(newCursorPosition);
                     // Update search queries using the same logic as character input
                     this.updateSearchQueriesForActiveSelectors(newInput, newCursorPosition);
                 });
@@ -724,6 +657,28 @@ export class InputManager {
         }
         return false;
     }
+    // History search methods
+    activateHistorySearch() {
+        this.showHistorySearch = true;
+        this.historySearchQuery = "";
+        this.callbacks.onHistorySearchStateChange?.(true, "");
+    }
+    updateHistorySearchQuery(query) {
+        this.historySearchQuery = query;
+        this.callbacks.onHistorySearchStateChange?.(true, query);
+    }
+    handleHistorySearchSelect(prompt) {
+        this.inputText = prompt;
+        this.cursorPosition = prompt.length;
+        this.callbacks.onInputTextChange?.(prompt);
+        this.callbacks.onCursorPositionChange?.(prompt.length);
+        this.handleCancelHistorySearch();
+    }
+    handleCancelHistorySearch() {
+        this.showHistorySearch = false;
+        this.historySearchQuery = "";
+        this.callbacks.onHistorySearchStateChange?.(false, "");
+    }
     // Handle normal input (when no selector is active)
     async handleNormalInput(input, key, attachedImages, isLoading = false, isCommandRunning = false, clearImages) {
         if (key.return) {
@@ -738,9 +693,6 @@ export class InputManager {
             else if (this.showCommandSelector) {
                 this.handleCancelCommandSelect();
             }
-            else if (this.showBashHistorySelector) {
-                this.handleCancelBashHistorySelect();
-            }
             return true;
         }
         if (key.backspace || key.delete) {
@@ -751,7 +703,6 @@ export class InputManager {
                 const newCursorPosition = this.cursorPosition - 1;
                 this.checkForAtDeletion(newCursorPosition);
                 this.checkForSlashDeletion(newCursorPosition);
-                this.checkForExclamationDeletion(newCursorPosition);
             }
             return true;
         }
@@ -778,18 +729,17 @@ export class InputManager {
             });
             return true;
         }
+        // Handle Ctrl+R for history search
+        if (key.ctrl && input === "r") {
+            this.activateHistorySearch();
+            return true;
+        }
         // Handle up/down keys for history navigation (only when no selector is active)
-        if (key.upArrow &&
-            !this.showFileSelector &&
-            !this.showCommandSelector &&
-            !this.showBashHistorySelector) {
+        if (key.upArrow && !this.showFileSelector && !this.showCommandSelector) {
             this.navigateHistory("up", this.inputText);
             return true;
         }
-        if (key.downArrow &&
-            !this.showFileSelector &&
-            !this.showCommandSelector &&
-            !this.showBashHistorySelector) {
+        if (key.downArrow && !this.showFileSelector && !this.showCommandSelector) {
             this.navigateHistory("down", this.inputText);
             return true;
         }
@@ -832,16 +782,35 @@ export class InputManager {
         // Check if any selector is active
         if (this.showFileSelector ||
             this.showCommandSelector ||
-            this.showBashHistorySelector ||
+            this.showHistorySearch ||
             this.showMemoryTypeSelector ||
             this.showBashManager ||
-            this.showMcpManager) {
+            this.showMcpManager ||
+            this.showRewindManager) {
             if (this.showMemoryTypeSelector ||
                 this.showBashManager ||
-                this.showMcpManager) {
-                // Memory type selector, bash manager and MCP manager don't need to handle input, handled by component itself
+                this.showMcpManager ||
+                this.showRewindManager) {
+                // Memory type selector, bash manager, MCP manager and Rewind don't need to handle input, handled by component itself
                 return false;
             }
+            if (this.showHistorySearch) {
+                if (key.escape) {
+                    this.handleCancelHistorySearch();
+                    return true;
+                }
+                if (key.backspace || key.delete) {
+                    if (this.historySearchQuery.length > 0) {
+                        this.updateHistorySearchQuery(this.historySearchQuery.slice(0, -1));
+                    }
+                    return true;
+                }
+                if (input && !key.ctrl && !key.meta && !key.return && !key.tab) {
+                    this.updateHistorySearchQuery(this.historySearchQuery + input);
+                    return true;
+                }
+                return true; // Let HistorySearch component handle arrows and Enter
+            }
             return this.handleSelectorInput(input, key);
         }
         else {

package/dist/plugin-manager-cli.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Entry point for the Plugin Manager CLI.
+ * Renders the Ink component and handles the lifecycle.
+ */
+export declare function startPluginManagerCli(): Promise<boolean>;
+//# sourceMappingURL=plugin-manager-cli.d.ts.map

package/dist/plugin-manager-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-manager-cli.d.ts","sourceRoot":"","sources":["../src/plugin-manager-cli.tsx"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAI9D"}

package/dist/plugin-manager-cli.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from "ink";
+import { PluginManagerShell } from "./components/PluginManagerShell.js";
+/**
+ * Entry point for the Plugin Manager CLI.
+ * Renders the Ink component and handles the lifecycle.
+ */
+export async function startPluginManagerCli() {
+    const { waitUntilExit } = render(_jsx(PluginManagerShell, {}));
+    await waitUntilExit();
+    return true;
+}

package/dist/session-selector-cli.d.ts

@@ -0,0 +1,2 @@
+export declare function startSessionSelectorCli(): Promise<string | null>;
+//# sourceMappingURL=session-selector-cli.d.ts.map

package/dist/session-selector-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-selector-cli.d.ts","sourceRoot":"","sources":["../src/session-selector-cli.tsx"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BtE"}

package/dist/session-selector-cli.js

@@ -0,0 +1,25 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render, Box } from "ink";
+import { listSessions, truncateContent } from "wave-agent-sdk";
+import { SessionSelector } from "./components/SessionSelector.js";
+export async function startSessionSelectorCli() {
+    const currentWorkdir = process.cwd();
+    const sessions = await listSessions(currentWorkdir);
+    if (sessions.length === 0) {
+        console.log(`No sessions found for workdir: ${currentWorkdir}`);
+        return null;
+    }
+    const sessionsWithContent = sessions.map((s) => ({
+        ...s,
+        firstMessage: truncateContent(s.firstMessage || "No content", 80),
+    }));
+    return new Promise((resolve) => {
+        const { unmount } = render(_jsx(Box, { padding: 1, children: _jsx(SessionSelector, { sessions: sessionsWithContent, onSelect: (sessionId) => {
+                    unmount();
+                    resolve(sessionId);
+                }, onCancel: () => {
+                    unmount();
+                    resolve(null);
+                } }) }));
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -30,17 +30,20 @@
   ],
   "dependencies": {
     "chalk": "^5.6.2",
+    "cli-highlight": "^2.1.11",
     "diff": "^8.0.2",
     "glob": "^13.0.0",
     "ink": "^6.5.1",
     "marked": "^11.2.0",
-    "react": "^19.1.0",
+    "react": "^19.2.4",
+    "react-dom": "19.2.4",
     "yargs": "^17.7.2",
-    "wave-agent-sdk": "0.2.0"
+    "wave-agent-sdk": "0.4.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",
     "@types/yargs": "^17.0.0",
+    "@vitest/coverage-v8": "^3.2.4",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "ink-testing-library": "^4.0.0",
@@ -62,6 +65,7 @@
     "type-check": "tsc --noEmit --incremental",
     "watch": "tsc -p tsconfig.build.json --watch & tsc-alias -p tsconfig.build.json --watch",
     "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "lint": "eslint --cache",
     "format": "prettier --write .",
     "version:patch": "node ../../scripts/version.js patch",

package/src/commands/plugin/disable.ts

@@ -2,11 +2,12 @@ import {
   ConfigurationService,
   PluginManager,
   PluginScopeManager,
+  Scope,
 } from "wave-agent-sdk";
 
 export async function disablePluginCommand(argv: {
   plugin: string;
-  scope: "user" | "project" | "local";
+  scope?: Scope;
 }) {
   const workdir = process.cwd();
   const configurationService = new ConfigurationService();
@@ -17,10 +18,13 @@ export async function disablePluginCommand(argv: {
     pluginManager,
   });
 
+  const scope =
+    argv.scope || scopeManager.findPluginScope(argv.plugin) || "user";
+
   try {
-    await scopeManager.disablePlugin(argv.scope, argv.plugin);
+    await scopeManager.disablePlugin(scope, argv.plugin);
     console.log(
-      `Successfully disabled plugin: ${argv.plugin} in ${argv.scope} scope`,
+      `Successfully disabled plugin: ${argv.plugin} in ${scope} scope`,
     );
     process.exit(0);
   } catch (error) {

package/src/commands/plugin/enable.ts

@@ -2,11 +2,12 @@ import {
   ConfigurationService,
   PluginManager,
   PluginScopeManager,
+  Scope,
 } from "wave-agent-sdk";
 
 export async function enablePluginCommand(argv: {
   plugin: string;
-  scope: "user" | "project" | "local";
+  scope?: Scope;
 }) {
   const workdir = process.cwd();
   const configurationService = new ConfigurationService();
@@ -17,10 +18,13 @@ export async function enablePluginCommand(argv: {
     pluginManager,
   });
 
+  const scope =
+    argv.scope || scopeManager.findPluginScope(argv.plugin) || "user";
+
   try {
-    await scopeManager.enablePlugin(argv.scope, argv.plugin);
+    await scopeManager.enablePlugin(scope, argv.plugin);
     console.log(
-      `Successfully enabled plugin: ${argv.plugin} in ${argv.scope} scope`,
+      `Successfully enabled plugin: ${argv.plugin} in ${scope} scope`,
     );
     process.exit(0);
   } catch (error) {

package/src/commands/plugin/install.ts

@@ -3,11 +3,12 @@ import {
   ConfigurationService,
   PluginManager,
   PluginScopeManager,
+  Scope,
 } from "wave-agent-sdk";
 
 export async function installPluginCommand(argv: {
   plugin: string;
-  scope?: "user" | "project" | "local";
+  scope?: Scope;
 }) {
   const marketplaceService = new MarketplaceService();
   const workdir = process.cwd();

package/src/commands/plugin/list.ts

@@ -1,9 +1,23 @@
-import { MarketplaceService, ConfigurationService } from "wave-agent-sdk";
+import {
+  MarketplaceService,
+  ConfigurationService,
+  PluginScopeManager,
+  PluginManager,
+} from "wave-agent-sdk";
 
 export async function listPluginsCommand() {
-  const marketplaceService = new MarketplaceService();
   const configurationService = new ConfigurationService();
+  const marketplaceService = new MarketplaceService();
   const workdir = process.cwd();
+  const pluginManager = new PluginManager({
+    workdir,
+    configurationService,
+  });
+  const pluginScopeManager = new PluginScopeManager({
+    workdir,
+    configurationService,
+    pluginManager,
+  });
 
   try {
     const installedPlugins = await marketplaceService.getInstalledPlugins();
@@ -16,6 +30,7 @@ export async function listPluginsCommand() {
       marketplace: string;
       installed: boolean;
       version?: string;
+      scope?: string;
     }[] = [];
 
     for (const m of marketplaces) {
@@ -24,6 +39,7 @@ export async function listPluginsCommand() {
           marketplaceService.getMarketplacePath(m),
         );
         manifest.plugins.forEach((p) => {
+          const pluginId = `${p.name}@${m.name}`;
           const installed = installedPlugins.plugins.find(
             (ip) => ip.name === p.name && ip.marketplace === m.name,
           );
@@ -32,6 +48,7 @@ export async function listPluginsCommand() {
             marketplace: m.name,
             installed: !!installed,
             version: installed?.version,
+            scope: pluginScopeManager.findPluginScope(pluginId) || undefined,
           });
         });
       } catch {
@@ -52,7 +69,8 @@ export async function listPluginsCommand() {
             : "disabled"
           : "not installed";
         const versionStr = p.version ? ` v${p.version}` : "";
-        console.log(`- ${pluginId}${versionStr} [${status}]`);
+        const scopeStr = p.scope ? ` (${p.scope})` : "";
+        console.log(`- ${pluginId}${versionStr}${scopeStr} [${status}]`);
       });
     }
     process.exit(0);

package/src/commands/plugin/marketplace.ts

@@ -42,7 +42,10 @@ export async function listMarketplacesCommand() {
         } else {
           sourceInfo = source.url + (source.ref ? `#${source.ref}` : "");
         }
-        console.log(`- ${m.name}: ${sourceInfo} (${m.source.source})`);
+        const builtinLabel = m.isBuiltin ? " [builtin]" : "";
+        console.log(
+          `- ${m.name}${builtinLabel}: ${sourceInfo} (${m.source.source})`,
+        );
       });
     }
     process.exit(0);
@@ -53,6 +56,19 @@ export async function listMarketplacesCommand() {
   }
 }
 
+export async function removeMarketplaceCommand(argv: { name: string }) {
+  const service = new MarketplaceService();
+  try {
+    await service.removeMarketplace(argv.name);
+    console.log(`Successfully removed marketplace: ${argv.name}`);
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`Failed to remove marketplace: ${message}`);
+    process.exit(1);
+  }
+}
+
 export async function updateMarketplaceCommand(argv: { name?: string }) {
   const service = new MarketplaceService();
   try {

package/src/commands/plugin/uninstall.ts

@@ -0,0 +1,39 @@
+import {
+  MarketplaceService,
+  ConfigurationService,
+  PluginManager,
+  PluginScopeManager,
+} from "wave-agent-sdk";
+
+export async function uninstallPluginCommand(argv: { plugin: string }) {
+  const marketplaceService = new MarketplaceService();
+  const workdir = process.cwd();
+
+  try {
+    await marketplaceService.uninstallPlugin(argv.plugin);
+    console.log(`Successfully uninstalled plugin: ${argv.plugin}`);
+
+    const configurationService = new ConfigurationService();
+    const pluginManager = new PluginManager({ workdir });
+    const scopeManager = new PluginScopeManager({
+      workdir,
+      configurationService,
+      pluginManager,
+    });
+
+    try {
+      await scopeManager.removePluginFromAllScopes(argv.plugin);
+      console.log(`Cleaned up plugin configuration from all scopes`);
+    } catch (error) {
+      console.warn(
+        `Warning: Could not clean up all plugin configurations: ${error instanceof Error ? error.message : String(error)}`,
+      );
+    }
+
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`Failed to uninstall plugin: ${message}`);
+    process.exit(1);
+  }
+}

package/src/commands/plugin/update.ts

@@ -0,0 +1,19 @@
+import { MarketplaceService } from "wave-agent-sdk";
+
+export async function updatePluginCommand(argv: { plugin: string }) {
+  const marketplaceService = new MarketplaceService();
+
+  try {
+    const updated = await marketplaceService.updatePlugin(argv.plugin);
+    console.log(
+      `Successfully updated plugin: ${updated.name} v${updated.version} from ${updated.marketplace}`,
+    );
+    console.log(`Cache path: ${updated.cachePath}`);
+
+    process.exit(0);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`Failed to update plugin: ${message}`);
+    process.exit(1);
+  }
+}

package/src/components/ChatInterface.tsx

@@ -27,6 +27,7 @@ export const ChatInterface: React.FC = () => {
     confirmingTool,
     handleConfirmationDecision,
     handleConfirmationCancel,
+    rewindId,
   } = useChat();
 
   if (!sessionId) return null;
@@ -40,7 +41,7 @@ export const ChatInterface: React.FC = () => {
         isCompressing={isCompressing}
         latestTotalTokens={latestTotalTokens}
         isExpanded={isExpanded}
-        key={String(isExpanded) + sessionId}
+        key={String(isExpanded) + sessionId + rewindId}
       />
 
       {isConfirmationVisible && (

package/src/components/CommandSelector.tsx

@@ -15,6 +15,13 @@ const AVAILABLE_COMMANDS: SlashCommand[] = [
     description: "View and manage MCP servers",
     handler: () => {}, // Handler here won't be used, actual processing is in the hook
   },
+  {
+    id: "rewind",
+    name: "rewind",
+    description:
+      "Revert conversation and file changes to a previous checkpoint",
+    handler: () => {}, // Handler here won't be used, actual processing is in the hook
+  },
 ];
 
 export interface CommandSelectorProps {

package/src/components/Confirmation.tsx

@@ -229,7 +229,7 @@ export const Confirmation: React.FC<ConfirmationProps> = ({
       } else if (state.selectedOption === "auto") {
         if (toolName === BASH_TOOL_NAME) {
           const rule = suggestedPrefix
-            ? `Bash(${suggestedPrefix}:*)`
+            ? `Bash(${suggestedPrefix}*)`
             : `Bash(${toolInput?.command})`;
           onDecision({
             behavior: "allow",