@qduc/term2 0.11.1 → 0.12.0

package/dist/hooks/settings-completion-config.js

@@ -5,6 +5,7 @@ export const SETTINGS_CATEGORIES = [
     { id: 'tools', label: 'Tools' },
     { id: 'ui', label: 'UI' },
     { id: 'memory', label: 'Memory' },
+    { id: 'hooks', label: 'Hooks' },
     { id: 'misc', label: 'Misc' },
 ];
 export const SETTING_DESCRIPTIONS = {
@@ -22,11 +23,16 @@ export const SETTING_DESCRIPTIONS = {
     [SETTING_KEYS.AGENT_REASONING_EFFORT]: 'Reasoning effort (none|minimal|low|medium|high|xhigh|default)',
     [SETTING_KEYS.AGENT_TEMPERATURE]: 'Model temperature (0-2, controls randomness)',
     [SETTING_KEYS.AGENT_USE_FLEX_SERVICE_TIER]: 'Use OpenAI Flex Service Tier to reduce costs (true|false, OpenAI only)',
+    [SETTING_KEYS.AGENT_CONTEXT_COMPACTION_ENABLED]: 'Enable OpenAI server-side context compaction (true|false, OpenAI only)',
+    [SETTING_KEYS.AGENT_CONTEXT_COMPACTION_COMPACT_THRESHOLD]: 'Context-window ratio for OpenAI server-side context compaction (0-1, 0%-100%)',
     [SETTING_KEYS.AGENT_MENTOR_MODEL]: 'Mentor model to use (optional, enables ask_mentor tool)',
     [SETTING_KEYS.AGENT_MENTOR_PROVIDER]: 'Provider to use for mentor model (openai, openrouter, etc.)',
     [SETTING_KEYS.AGENT_MENTOR_REASONING_EFFORT]: 'Reasoning effort for the mentor model (none|minimal|low|medium|high|xhigh|default)',
     // agent.provider is hidden from UI - it can only be changed via model menu
     [SETTING_KEYS.AGENT_MAX_TURNS]: 'Maximum conversation turns',
+    [SETTING_KEYS.AGENT_MAX_OUTPUT_TOKENS]: 'Maximum tokens generated by one model request',
+    [SETTING_KEYS.AGENT_MAX_STREAM_OUTPUT_CHARS]: 'Maximum streamed text, reasoning, or tool-argument characters per model request',
+    [SETTING_KEYS.AGENT_MAX_MODEL_REQUEST_DURATION_MS]: 'Maximum duration of one model request, in milliseconds',
     [SETTING_KEYS.AGENT_RETRY_ATTEMPTS]: 'Number of retry attempts for failed requests',
     [SETTING_KEYS.AGENT_MAX_PARALLEL_TOOL_CALLS]: 'Maximum number of tool calls allowed to run at the same time',
     [SETTING_KEYS.AGENT_CODEX_WEBSOCKET_FIRST_FRAME_TIMEOUT_MS]: 'Codex WebSocket timeout before the first response frame, in milliseconds',
@@ -44,6 +50,7 @@ export const SETTING_DESCRIPTIONS = {
     [SETTING_KEYS.SHELL_AUTO_APPROVE_MODE]: 'Shell command auto-approval mode (off|advisory|auto)',
     [SETTING_KEYS.AGENT_AUTO_APPROVE_MODEL]: 'Model to use for auto-approval evaluation (fast/cheap)',
     [SETTING_KEYS.AGENT_AUTO_APPROVE_PROVIDER]: 'Provider for the auto-approval model (optional)',
+    [SETTING_KEYS.AGENT_AUTO_APPROVE_REASONING_EFFORT]: 'Reasoning effort for risky shell auto-approval reviews (none|minimal|low|medium|high|xhigh)',
     [SETTING_KEYS.APP_PLAN_MODE]: 'Plan mode: read-only research and implementation planning (true|false)',
     [SETTING_KEYS.APP_ORCHESTRATOR_MODE]: 'Delegate tool-backed work through subagents (true|false)',
     [SETTING_KEYS.APP_NOTIFICATIONS]: 'Enable desktop notifications when the terminal is unfocused (true|false)',
@@ -62,6 +69,13 @@ export const SETTING_DESCRIPTIONS = {
     [SETTING_KEYS.MEMORY_CONTEXT_BUDGET_CHARS]: 'Character budget for memory summaries in initial context (number)',
     [SETTING_KEYS.MEMORY_SEARCH_DEFAULT_LIMIT]: 'Default number of search results to return (number)',
     [SETTING_KEYS.MEMORY_SEARCH_MAX_LIMIT]: 'Maximum number of search results to return (number)',
+    [SETTING_KEYS.HOOKS_USER_ENABLED]: 'Load trusted user hooks from ~/.term2/hooks (true|false)',
+    [SETTING_KEYS.HOOKS_PROJECT_ENABLED]: 'Discover project hooks when the project root is trusted (true|false)',
+    [SETTING_KEYS.HOOKS_TRUSTED_PROJECT_ROOTS]: 'Canonical project roots trusted to load hooks (JSON array)',
+    [SETTING_KEYS.HOOKS_INCLUDE_USER_TEXT]: 'Include user turn text in hook payloads (true|false)',
+    [SETTING_KEYS.HOOKS_INCLUDE_TOOL_ARGUMENTS]: 'Include full tool arguments in hook payloads (true|false)',
+    [SETTING_KEYS.HOOKS_INCLUDE_TOOL_RESULTS]: 'Include full tool results in hook payloads (true|false)',
+    [SETTING_KEYS.HOOKS_TIMEOUT_MS]: 'Maximum time to await one hook callback in milliseconds',
     [SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_MODEL]: 'Model override for the librarian subagent (falls back to agent.model)',
     [SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_PROVIDER]: 'Provider override for the librarian subagent (falls back to agent.provider)',
     [SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_REASONING_EFFORT]: 'Reasoning effort for the librarian subagent (none|minimal|low|medium|high|xhigh|default)',
@@ -110,9 +124,6 @@ export const HIDDEN_SETTINGS = new Set([
     SETTING_KEYS.AGENT_SUBAGENT_WORKER_PROVIDER,
     SETTING_KEYS.AGENT_SUBAGENT_WORKER_MODEL,
     SETTING_KEYS.AGENT_SUBAGENT_WORKER_REASONING_EFFORT,
-    SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_PROVIDER,
-    SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_MODEL,
-    SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_REASONING_EFFORT,
     SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_PROVIDER,
     SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_MODEL,
     SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_REASONING_EFFORT,
@@ -138,18 +149,22 @@ export const CATEGORY_KEYS = {
         SETTING_KEYS.AGENT_MENTOR_MODEL,
         SETTING_KEYS.AGENT_MENTOR_REASONING_EFFORT,
         SETTING_KEYS.AGENT_USE_FLEX_SERVICE_TIER,
+        SETTING_KEYS.AGENT_CONTEXT_COMPACTION_ENABLED,
+        SETTING_KEYS.AGENT_CONTEXT_COMPACTION_COMPACT_THRESHOLD,
         SETTING_KEYS.AGENT_SUBAGENT_EXPLORER_MODEL,
         SETTING_KEYS.AGENT_SUBAGENT_EXPLORER_REASONING_EFFORT,
         SETTING_KEYS.AGENT_SUBAGENT_WORKER_MODEL,
         SETTING_KEYS.AGENT_SUBAGENT_WORKER_REASONING_EFFORT,
-        SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_MODEL,
-        SETTING_KEYS.AGENT_SUBAGENT_RESEARCHER_REASONING_EFFORT,
         SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_MODEL,
         SETTING_KEYS.AGENT_SUBAGENT_LIBRARIAN_REASONING_EFFORT,
     ]),
     safety: new Set([
+        SETTING_KEYS.AGENT_MAX_OUTPUT_TOKENS,
+        SETTING_KEYS.AGENT_MAX_STREAM_OUTPUT_CHARS,
+        SETTING_KEYS.AGENT_MAX_MODEL_REQUEST_DURATION_MS,
         SETTING_KEYS.SHELL_AUTO_APPROVE_MODE,
         SETTING_KEYS.AGENT_AUTO_APPROVE_MODEL,
+        SETTING_KEYS.AGENT_AUTO_APPROVE_REASONING_EFFORT,
         SETTING_KEYS.SANDBOX_ENABLED,
         SETTING_KEYS.SANDBOX_READ_POLICY,
         SETTING_KEYS.SANDBOX_ALLOW_READ_EXTRA,
@@ -188,6 +203,15 @@ export const CATEGORY_KEYS = {
         SETTING_KEYS.MEMORY_SEARCH_DEFAULT_LIMIT,
         SETTING_KEYS.MEMORY_SEARCH_MAX_LIMIT,
     ]),
+    hooks: new Set([
+        SETTING_KEYS.HOOKS_USER_ENABLED,
+        SETTING_KEYS.HOOKS_PROJECT_ENABLED,
+        SETTING_KEYS.HOOKS_TRUSTED_PROJECT_ROOTS,
+        SETTING_KEYS.HOOKS_INCLUDE_USER_TEXT,
+        SETTING_KEYS.HOOKS_INCLUDE_TOOL_ARGUMENTS,
+        SETTING_KEYS.HOOKS_INCLUDE_TOOL_RESULTS,
+        SETTING_KEYS.HOOKS_TIMEOUT_MS,
+    ]),
 };
-export const CATEGORY_ORDER = ['models', 'safety', 'tools', 'ui', 'memory'];
+export const CATEGORY_ORDER = ['models', 'safety', 'tools', 'ui', 'memory', 'hooks'];
 //# sourceMappingURL=settings-completion-config.js.map

package/dist/hooks/settings-completion-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-completion-config.js","sourceRoot":"","sources":["../../source/hooks/settings-completion-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-completion-config.js","sourceRoot":"","sources":["../../source/hooks/settings-completion-config.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-app-commands.d.ts

@@ -1,8 +1,10 @@
 import type { SlashCommand } from '../slash-commands.js';
 import type { SettingsService } from '../services/settings/settings-service.js';
 import type { UserTurn } from '../types/user-turn.js';
+import { type RewindDisposition } from '../commands/rewind-command.js';
 import type { SkillsService, SkillInfo } from '../services/skills/skills-service.js';
 import type { Message } from '../types/message.js';
+import type { RewindItem } from '../utils/conversation/rewind-items.js';
 interface UseAppCommandsProps {
     settingsService: SettingsService;
     addSystemMessage: (text: string) => void;
@@ -13,30 +15,30 @@ interface UseAppCommandsProps {
     exit: () => void;
     messages: Message[];
     setModel: (model: string) => void;
-    undoLastUserMessage: () => {
+    getRewindItems: () => readonly RewindItem[];
+    rewindToTarget: (item: RewindItem) => {
         text: string;
         images?: UserTurn['images'];
     } | null;
-    openUndoMenu: () => void;
+    restoreTurnToInput: (turn: {
+        text: string;
+        images?: UserTurn['images'];
+    }) => void;
+    openRewindMenu: (disposition: RewindDisposition) => void;
     openProvidersMenu: () => void;
-    onUndo?: () => void;
+    onRewind?: () => void;
     onHandoff?: (capturedText: string) => void;
     sendUserMessage: (input: string | UserTurn) => Promise<void>;
     retryLastToolOutput: () => Promise<boolean>;
-    listUserTurns: () => {
-        index: number;
-        text: string;
-        imageCount: number;
-    }[];
     skillsService: SkillsService;
     onSkillSelected: (skill: SkillInfo) => void;
 }
 export { getLastFinalAssistantText } from '../utils/conversation/message-utils.js';
 export { createCopySlashCommand } from '../commands/copy-command.js';
 export { createUsageSlashCommand } from '../commands/usage-command.js';
-export { createUndoSlashCommand } from '../commands/undo-command.js';
-export { createRetrySlashCommand } from '../commands/retry-command.js';
-export declare const useAppCommands: ({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, clearConversation, getSessionUsage, exit, messages, undoLastUserMessage, openUndoMenu, openProvidersMenu, onUndo, onHandoff, sendUserMessage, retryLastToolOutput, listUserTurns, skillsService, onSkillSelected, }: UseAppCommandsProps) => {
+export { createRewindSlashCommand } from '../commands/rewind-command.js';
+export { createRetryToolSlashCommand } from '../commands/retry-tool-command.js';
+export declare const useAppCommands: ({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, clearConversation, getSessionUsage, exit, messages, getRewindItems, rewindToTarget, restoreTurnToInput, openRewindMenu, openProvidersMenu, onRewind, onHandoff, sendUserMessage, retryLastToolOutput, skillsService, onSkillSelected, }: UseAppCommandsProps) => {
     slashCommands: SlashCommand[];
     togglePlanMode: () => void;
     cycleAppModes: () => void;

package/dist/hooks/use-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-app-commands.d.ts","sourceRoot":"","sources":["../../source/hooks/use-app-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAetD,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,UAAU,mBAAmB;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,mBAAmB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,iBAAiB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,mBAAmB,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;IAChF,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,aAAa,EAAE,MAAM;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC3E,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;CAC7C;AAGD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,eAAO,MAAM,cAAc,gSAmBxB,mBAAmB;;;;CAiHrB,CAAC"}
+{"version":3,"file":"use-app-commands.d.ts","sourceRoot":"","sources":["../../source/hooks/use-app-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAUjG,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAExE,UAAU,mBAAmB;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,mBAAmB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACvD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,iBAAiB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,MAAM,SAAS,UAAU,EAAE,CAAC;IAC5C,cAAc,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3F,kBAAkB,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IAClF,cAAc,EAAE,CAAC,WAAW,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;CAC7C;AAGD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAEhF,eAAO,MAAM,cAAc,oTAoBxB,mBAAmB;;;;CA0IrB,CAAC"}

package/dist/hooks/use-app-commands.js

@@ -3,8 +3,8 @@ import { useModeHelpers, createModeToggleCommand } from '../commands/mode-comman
 import { createCopySlashCommand } from '../commands/copy-command.js';
 import { createUsageSlashCommand } from '../commands/usage-command.js';
 import { createClearSlashCommand } from '../commands/clear-command.js';
-import { createUndoSlashCommand } from '../commands/undo-command.js';
-import { createRetrySlashCommand } from '../commands/retry-command.js';
+import { createRewindSlashCommand } from '../commands/rewind-command.js';
+import { createRetryToolSlashCommand } from '../commands/retry-tool-command.js';
 import { createQuitSlashCommand } from '../commands/quit-command.js';
 import { createModelSlashCommand } from '../commands/model-command.js';
 import { createAutoApproveSlashCommand } from '../commands/auto-approve-command.js';
@@ -17,72 +17,98 @@ import { createSkillsSlashCommand } from '../commands/skills-command.js';
 export { getLastFinalAssistantText } from '../utils/conversation/message-utils.js';
 export { createCopySlashCommand } from '../commands/copy-command.js';
 export { createUsageSlashCommand } from '../commands/usage-command.js';
-export { createUndoSlashCommand } from '../commands/undo-command.js';
-export { createRetrySlashCommand } from '../commands/retry-command.js';
-export const useAppCommands = ({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, clearConversation, getSessionUsage, exit, messages, undoLastUserMessage, openUndoMenu, openProvidersMenu, onUndo, onHandoff, sendUserMessage, retryLastToolOutput, listUserTurns, skillsService, onSkillSelected, }) => {
+export { createRewindSlashCommand } from '../commands/rewind-command.js';
+export { createRetryToolSlashCommand } from '../commands/retry-tool-command.js';
+export const useAppCommands = ({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, clearConversation, getSessionUsage, exit, messages, getRewindItems, rewindToTarget, restoreTurnToInput, openRewindMenu, openProvidersMenu, onRewind, onHandoff, sendUserMessage, retryLastToolOutput, skillsService, onSkillSelected, }) => {
     const { disableOtherModes, togglePlanMode, cycleAppModes } = useModeHelpers({
         settingsService,
         applyRuntimeSetting,
         addSystemMessage,
     });
-    const slashCommands = useMemo(() => [
-        createModelSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage, replaceInput }),
-        createEffortSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage, replaceInput }),
-        createClearSlashCommand(clearConversation, addSystemMessage),
-        createCopySlashCommand({ messages, addSystemMessage }),
-        createUsageSlashCommand(addSystemMessage, getSessionUsage),
-        createUndoSlashCommand({ undoLastUserMessage, replaceInput, addSystemMessage, openUndoMenu, onUndo }),
-        createRetrySlashCommand({
-            undoLastUserMessage,
+    const slashCommands = useMemo(() => {
+        // Shared by /rewind and its two aliases so they cannot drift apart.
+        const rewindDeps = {
+            getRewindItems,
+            rewindToTarget,
+            restoreTurnToInput,
             sendUserMessage,
-            retryLastToolOutput,
             addSystemMessage,
-            listUserTurns,
-            onUndo,
-        }),
-        createModeToggleCommand('app.liteMode', 'lite', 'Toggle lite mode (minimal context, session-only)', ' - using minimal prompt, no codebase context', {
-            settingsService,
-            applyRuntimeSetting,
-            addSystemMessage,
-            disableOtherModes,
-            messages,
-        }),
-        createModeToggleCommand('app.mentorMode', 'mentor', 'Toggle mentor mode (collaborative mode with mentor model)', ' - using simplified mentor prompt and ask_mentor tool', {
-            settingsService,
-            applyRuntimeSetting,
-            addSystemMessage,
-            disableOtherModes,
-        }),
-        createModeToggleCommand('app.orchestratorMode', 'orchestrator', 'Toggle orchestrator mode (delegate all tool-backed work)', ' - tool-backed work must use subagents', {
-            settingsService,
-            applyRuntimeSetting,
-            addSystemMessage,
-            disableOtherModes,
-            messages,
-        }),
-        createAutoApproveSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage }),
-        {
-            name: 'plan',
-            description: 'Toggle plan mode (read-only research/planning mode)',
-            action: () => {
-                togglePlanMode();
-                return true;
+            openRewindMenu,
+            onRewind,
+        };
+        return [
+            createModelSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage, replaceInput }),
+            createEffortSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage, replaceInput }),
+            createClearSlashCommand(clearConversation, addSystemMessage),
+            createCopySlashCommand({ messages, addSystemMessage }),
+            createUsageSlashCommand(addSystemMessage, getSessionUsage),
+            createRewindSlashCommand({
+                name: 'rewind',
+                defaultDisposition: 'edit',
+                bareTarget: 'picker',
+                ...rewindDeps,
+            }),
+            // Aliases keep existing muscle memory working: bare /undo opened a picker
+            // and bare /retry acted on the last turn immediately, so each keeps that.
+            createRewindSlashCommand({
+                name: 'undo',
+                aliasOf: 'rewind',
+                defaultDisposition: 'edit',
+                bareTarget: 'picker',
+                ...rewindDeps,
+            }),
+            createRewindSlashCommand({
+                name: 'retry',
+                aliasOf: 'rewind',
+                defaultDisposition: 'resend',
+                bareTarget: 'last',
+                ...rewindDeps,
+            }),
+            createRetryToolSlashCommand({ retryLastToolOutput, addSystemMessage }),
+            createModeToggleCommand('app.liteMode', 'lite', 'Toggle lite mode (minimal context, session-only)', ' - using minimal prompt, no codebase context', {
+                settingsService,
+                applyRuntimeSetting,
+                addSystemMessage,
+                disableOtherModes,
+                messages,
+            }),
+            createModeToggleCommand('app.mentorMode', 'mentor', 'Toggle mentor mode (collaborative mode with mentor model)', ' - using simplified mentor prompt and ask_mentor tool', {
+                settingsService,
+                applyRuntimeSetting,
+                addSystemMessage,
+                disableOtherModes,
+            }),
+            createModeToggleCommand('app.orchestratorMode', 'orchestrator', 'Toggle orchestrator mode (delegate all tool-backed work)', ' - tool-backed work must use subagents', {
+                settingsService,
+                applyRuntimeSetting,
+                addSystemMessage,
+                disableOtherModes,
+                messages,
+            }),
+            createAutoApproveSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage }),
+            {
+                name: 'plan',
+                description: 'Toggle plan mode (read-only research/planning mode)',
+                action: () => {
+                    togglePlanMode();
+                    return true;
+                },
             },
-        },
-        createHandoffSlashCommand({ messages, addSystemMessage, onHandoff }),
-        createGuardedSettingsCommand({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, messages }),
-        createSandboxSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage }),
-        {
-            name: 'providers',
-            description: 'Manage API providers (list, add, edit, delete)',
-            action: () => {
-                openProvidersMenu();
-                return true;
+            createHandoffSlashCommand({ messages, addSystemMessage, onHandoff }),
+            createGuardedSettingsCommand({ settingsService, addSystemMessage, applyRuntimeSetting, replaceInput, messages }),
+            createSandboxSlashCommand({ settingsService, applyRuntimeSetting, addSystemMessage }),
+            {
+                name: 'providers',
+                description: 'Manage API providers (list, add, edit, delete)',
+                action: () => {
+                    openProvidersMenu();
+                    return true;
+                },
             },
-        },
-        createSkillsSlashCommand({ skillsService, onSkillSelected, addSystemMessage, replaceInput }),
-        createQuitSlashCommand(exit),
-    ], [
+            createSkillsSlashCommand({ skillsService, onSkillSelected, addSystemMessage, replaceInput }),
+            createQuitSlashCommand(exit),
+        ];
+    }, [
         addSystemMessage,
         applyRuntimeSetting,
         clearConversation,
@@ -92,14 +118,15 @@ export const useAppCommands = ({ settingsService, addSystemMessage, applyRuntime
         messages,
         replaceInput,
         settingsService,
-        undoLastUserMessage,
-        openUndoMenu,
+        getRewindItems,
+        rewindToTarget,
+        restoreTurnToInput,
+        openRewindMenu,
         openProvidersMenu,
-        onUndo,
+        onRewind,
         onHandoff,
         sendUserMessage,
         retryLastToolOutput,
-        listUserTurns,
         togglePlanMode,
         skillsService,
         onSkillSelected,

package/dist/hooks/use-app-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-app-commands.js","sourceRoot":"","sources":["../../source/hooks/use-app-commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-app-commands.js","sourceRoot":"","sources":["../../source/hooks/use-app-commands.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-app-keyboard-shortcuts.d.ts

@@ -2,9 +2,14 @@ import type { MutableRefObject } from 'react';
 import type { InputMode } from '../context/InputContext.js';
 import type { SkillInfo } from '../services/skills/skills-service.js';
 import type { UserTurn } from '../types/user-turn.js';
+import type { InputOwner } from '../lib/input-owner.js';
 type HandoffState = {
     stage: string;
 } | null;
+export type UseAppKeyboardShortcutsResult = {
+    /** True while a second Escape would interrupt the in-flight turn. */
+    interruptConfirmVisible: boolean;
+};
 export type UseAppKeyboardShortcutsOptions = {
     exitWithUsage: () => void;
     pendingSkillRef: MutableRefObject<SkillInfo | null>;
@@ -13,6 +18,12 @@ export type UseAppKeyboardShortcutsOptions = {
     waitingForRejectionReason: boolean;
     setWaitingForRejectionReason: (value: boolean) => void;
     inputMode: InputMode;
+    /**
+     * Current composer text. Escape clears a non-empty buffer (handled by
+     * `use-escape-key.ts`), so the interrupt confirmation only claims Escape when
+     * this is empty. The emptiness predicate must match that hook's exactly.
+     */
+    inputValue: string;
     isProcessing: boolean;
     waitingForApproval: boolean;
     stopProcessing: () => void;
@@ -24,7 +35,13 @@ export type UseAppKeyboardShortcutsOptions = {
     cycleAppModes: () => void;
     replaceInput: (value: string) => void;
     onSkillActivationCancelled: () => void;
+    /**
+     * Resolved owner of keyboard input. When a non-`'input'` owner is active,
+     * a modal confirmation prompt owns input and the shortcut handler stays
+     * suppressed — except Ctrl+C, which is handled separately below.
+     */
+    inputOwner: InputOwner;
 };
-export declare const useAppKeyboardShortcuts: ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, }: UseAppKeyboardShortcutsOptions) => void;
+export declare const useAppKeyboardShortcuts: ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, inputValue, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, inputOwner, }: UseAppKeyboardShortcutsOptions) => UseAppKeyboardShortcutsResult;
 export {};
 //# sourceMappingURL=use-app-keyboard-shortcuts.d.ts.map

package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-app-keyboard-shortcuts.d.ts","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,IAAI,CAAC;AAET,MAAM,MAAM,8BAA8B,GAAG;IAC3C,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,eAAe,EAAE,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACpD,uBAAuB,EAAE,OAAO,CAAC;IACjC,0BAA0B,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACrD,yBAAyB,EAAE,OAAO,CAAC;IACnC,4BAA4B,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,wBAAwB,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,0BAA0B,EAAE,MAAM,IAAI,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,8VAmBjC,8BAA8B,KAAG,IAgGnC,CAAC"}
+{"version":3,"file":"use-app-keyboard-shortcuts.d.ts","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,IAAI,CAAC;AAST,MAAM,MAAM,6BAA6B,GAAG;IAC1C,qEAAqE;IACrE,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,eAAe,EAAE,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACpD,uBAAuB,EAAE,OAAO,CAAC;IACjC,0BAA0B,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACrD,yBAAyB,EAAE,OAAO,CAAC;IACnC,4BAA4B,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,SAAS,CAAC;IACrB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,wBAAwB,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,0BAA0B,EAAE,MAAM,IAAI,CAAC;IACvC;;;;OAIG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,uBAAuB,sXAqBjC,8BAA8B,KAAG,6BA+KnC,CAAC"}

package/dist/hooks/use-app-keyboard-shortcuts.js

@@ -1,6 +1,27 @@
-import { useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useInput } from 'ink';
-export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, }) => {
+/**
+ * How long the "press Escape again to interrupt" confirmation stays armed.
+ * Matches the double-Escape window used to clear the input buffer
+ * (`use-escape-key.ts`) so both gestures feel the same.
+ */
+const INTERRUPT_CONFIRM_TIMEOUT_MS = 2000;
+export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, inputValue, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, inputOwner, }) => {
+    // `armedRef` — not the state below — is what the key handler reads. A user can
+    // press Escape twice faster than React commits a render, so the confirmation
+    // must not depend on the re-render landing between the two presses. The state
+    // exists only to show the hint.
+    const armedRef = useRef(false);
+    const [interruptConfirmVisible, setInterruptConfirmVisible] = useState(false);
+    const interruptTimeoutRef = useRef(null);
+    const disarmInterrupt = () => {
+        armedRef.current = false;
+        if (interruptTimeoutRef.current) {
+            clearTimeout(interruptTimeoutRef.current);
+            interruptTimeoutRef.current = null;
+        }
+        setInterruptConfirmVisible(false);
+    };
     const stateRef = useRef({
         pendingSkillRef,
         waitingForAskUserAnswer,
@@ -8,6 +29,7 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         waitingForRejectionReason,
         setWaitingForRejectionReason,
         inputMode,
+        inputValue,
         isProcessing,
         waitingForApproval,
         stopProcessing,
@@ -28,6 +50,7 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         waitingForRejectionReason,
         setWaitingForRejectionReason,
         inputMode,
+        inputValue,
         isProcessing,
         waitingForApproval,
         stopProcessing,
@@ -41,12 +64,25 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         onSkillActivationCancelled,
         exitWithUsage,
     };
+    // `inputOwner` is read here via a ref-like pattern: Ink's `isActive` option
+    // captures the value at render time, and this hook re-runs on every render,
+    // so a fresh `isActive` boolean is passed to `useInput` whenever the owner
+    // changes. The `inputOwner` value held by the closure below is therefore also
+    // current as of this render.
+    // Ctrl+C (emergency exit) remains global: it must work even while a prompt
+    // owns input. All other shortcuts are suppressed via `isActive` when a modal
+    // prompt is up, so they cannot double-fire against the prompt's own handler.
     useInput((input, key) => {
-        const current = stateRef.current;
         if (key.ctrl && input === 'c') {
-            current.exitWithUsage();
-            return;
+            stateRef.current.exitWithUsage();
         }
+    }, { isActive: true });
+    // Non-emergency shortcuts. Suppressed entirely while a modal confirmation
+    // prompt owns input (Esc, Shift-Tab, skill/ask-user/rejection-cancel paths).
+    // This closes the Ink fan-out coupling: the prompt's own `useInput` is the
+    // sole handler for its keys while it is mounted.
+    useInput((input, key) => {
+        const current = stateRef.current;
         if (key.escape) {
             if (current.pendingSkillRef.current) {
                 current.pendingSkillRef.current = null;
@@ -63,8 +99,28 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
                 current.replaceInput('');
                 return;
             }
-            if (current.inputMode === 'text' && (current.isProcessing || current.waitingForApproval)) {
-                current.stopProcessing();
+            if (current.inputMode === 'text' &&
+                (current.isProcessing || current.waitingForApproval) &&
+                // A non-empty composer means Escape belongs to the clear-buffer
+                // gesture in `use-escape-key.ts`; interrupting only claims Escape once
+                // there is nothing left to clear.
+                current.inputValue.length === 0) {
+                // Interrupting a turn throws away real work, and Escape is easy to hit
+                // by accident (stray key, leftover terminal escape sequence). Require a
+                // second Escape inside a short window to confirm.
+                if (armedRef.current) {
+                    disarmInterrupt();
+                    current.stopProcessing();
+                    return;
+                }
+                armedRef.current = true;
+                setInterruptConfirmVisible(true);
+                if (interruptTimeoutRef.current)
+                    clearTimeout(interruptTimeoutRef.current);
+                interruptTimeoutRef.current = setTimeout(() => {
+                    interruptTimeoutRef.current = null;
+                    disarmInterrupt();
+                }, INTERRUPT_CONFIRM_TIMEOUT_MS);
                 return;
             }
             if (current.handoffState?.stage === 'entering_message') {
@@ -83,6 +139,19 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
             return;
         }
         current.cycleAppModes();
-    });
+    }, { isActive: inputOwner.kind === 'input' });
+    // Disarm as soon as the turn ends — or as soon as the user types, since
+    // Escape then means "clear the buffer" — so an armed confirmation can never
+    // be completed by a later, unrelated Escape.
+    useEffect(() => {
+        if ((!isProcessing && !waitingForApproval) || inputValue.length > 0) {
+            disarmInterrupt();
+        }
+    }, [isProcessing, waitingForApproval, inputValue]);
+    useEffect(() => () => {
+        if (interruptTimeoutRef.current)
+            clearTimeout(interruptTimeoutRef.current);
+    }, []);
+    return { interruptConfirmVisible };
 };
 //# sourceMappingURL=use-app-keyboard-shortcuts.js.map

package/dist/hooks/use-app-keyboard-shortcuts.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-app-keyboard-shortcuts.js","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-app-keyboard-shortcuts.js","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"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"}