shortcutxl 0.2.13 → 0.2.15

package/README.md

@@ -1,13 +1,33 @@
 # ShortcutXL
 
-An AI agent that lives on your computer and has Excel superpowers. Made by the Shortcut team [Shortcut](https://shortcut.ai).
+An AI agent that lives on your computer and has Excel superpowers. Made by the [Shortcut](https://shortcut.ai) team.
+
+## Install
+
+### 1. Open Command Prompt or PowerShell and install Node.js
+
+```bash
+winget install OpenJS.NodeJS.LTS
+```
+
+### 2. Install ShortcutXL
 
 ```bash
 npm install -g shortcutxl
+```
+
+### 3. Launch ShortcutXL
+
+Type `shortcut` in your terminal:
+
+```bash
 shortcut
 ```
 
-> **Important:** Install globally with `-g`. Do not use `npm install shortcutxl` without it.
+## Requirements
+
+- **Windows 10/11** with **Excel 2016+** (64-bit)
+- **Node.js >= 20**
 
 ## Capabilities
 
@@ -19,8 +39,3 @@ shortcut
 - **Extensible** — Integrate any API or data source by adding a skill file or a custom tool extension.
 - **User-defined functions (UDFs)** — Custom Excel formulas powered by Python for live data, calculations, or database queries.
 - **External data connections** — ODBC, OLE DB, QueryTables, Power Query.
-
-## Prerequisites
-
-- **Windows 10/11** with **Excel 2016+** (64-bit)
-- **Node.js >= 20** — If missing: `winget install OpenJS.NodeJS.LTS`

package/dist/core/keybindings.js

@@ -10,7 +10,8 @@ export const DEFAULT_APP_KEYBINDINGS = {
     clear: 'ctrl+c',
     exit: 'ctrl+d',
     suspend: 'ctrl+z',
-    cycleThinkingLevel: 'shift+tab',
+    cycleThinkingLevel: 'shift+ctrl+tab',
+    toggleAutoApprove: 'shift+tab',
     cycleModelForward: 'ctrl+p',
     cycleModelBackward: 'shift+ctrl+p',
     selectModel: 'ctrl+l',
@@ -40,6 +41,7 @@ const APP_ACTIONS = [
     'exit',
     'suspend',
     'cycleThinkingLevel',
+    'toggleAutoApprove',
     'cycleModelForward',
     'cycleModelBackward',
     'selectModel',

package/dist/core/settings-manager.js

@@ -2,6 +2,11 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
 import lockfile from 'proper-lockfile';
 import { CONFIG_DIR_NAME, getAgentDir } from '../config.js';
+/** Display labels for the approval mode (footer + /settings). */
+export const APPROVAL_MODE = {
+    ASK: 'Ask before edits',
+    AUTO: 'Approve all edits',
+};
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
 function deepMergeSettings(base, overrides) {
     const result = { ...base };
@@ -568,5 +573,29 @@ export class SettingsManager {
     getCodeBlockIndent() {
         return this.settings.markdown?.codeBlockIndent ?? '  ';
     }
+    // Session-scoped auto-approve. Initialized from the persistent
+    // settings.autoApprove default, then toggled freely via Shift+Tab.
+    _autoApprove;
+    getAutoApprove() {
+        if (this._autoApprove === undefined) {
+            this._autoApprove = this.settings.autoApprove ?? false;
+        }
+        return this._autoApprove;
+    }
+    /** Toggle session-scoped auto-approve (Shift+Tab / Accept All). */
+    setAutoApprove(autoApprove) {
+        this._autoApprove = autoApprove;
+    }
+    /** Get the persistent default (what new sessions start with). */
+    getAutoApproveDefault() {
+        return this.settings.autoApprove ?? false;
+    }
+    /** Persist the default and update the current session to match. */
+    setAutoApproveDefault(autoApprove) {
+        this.globalSettings.autoApprove = autoApprove;
+        this._autoApprove = autoApprove;
+        this.markModified('autoApprove');
+        this.save();
+    }
 }
 //# sourceMappingURL=settings-manager.js.map

package/dist/custom/install-utils.js

@@ -7,9 +7,6 @@
 import chalk from 'chalk';
 import { spawnSync } from 'child_process';
 // ── Logging ──────────────────────────────────────────────────────────────
-export function log(msg) {
-    console.log(chalk.cyan('  → ') + msg);
-}
 export function ok(msg) {
     console.log(chalk.green('  ✓ ') + msg);
 }

package/dist/custom/prompts/api.js

@@ -68,7 +68,7 @@ function readApiReference() {
 // ---------------------------------------------------------------------------
 // Exported prompt string
 // ---------------------------------------------------------------------------
-export function getExcelComApiGuidelines() {
+function getExcelComApiGuidelines() {
     const apiRef = readApiReference();
     return `${COM_GUIDELINES}
 

package/dist/custom/providers/provider-ids.js

@@ -5,5 +5,6 @@
  * and used in auth checks, model scoping, and provider-specific logic.
  */
 export const SHORTCUT_PROVIDER_ID = 'shortcut';
+/** @public — parked until multi-provider support */
 export const OPENAI_CODEX_PROVIDER_ID = 'openai';
 //# sourceMappingURL=provider-ids.js.map

package/dist/custom/tools/excel-approval.js

@@ -0,0 +1,180 @@
+/**
+ * Compact approval component for Excel cell changes.
+ *
+ * Renders a table (Cell | Before | After | Formula) with horizontal
+ * buttons: [Accept] [Accept All] [Reject].
+ */
+import { Container, getEditorKeybindings, Spacer, Text, truncateToWidth, visibleWidth } from '../../tui/index.js';
+/** User's response to the approval prompt. */
+export const APPROVAL = {
+    ACCEPT: 'Accept',
+    ACCEPT_ALL: 'Accept All',
+    REJECT: 'Reject',
+};
+/** Control actions sent from TS → Python over HTTP. */
+export const CONTROL = {
+    REVERT: 'revert',
+    CLEANUP: 'cleanup',
+};
+/** Outcome of the approval flow (internal to excel-exec). */
+export const OUTCOME = {
+    ACCEPTED: 'accepted',
+    REVERTED: 'reverted',
+    REVERT_FAILED: 'revert-failed',
+};
+const MAX_VISIBLE_ROWS = 8;
+const BUTTONS = [APPROVAL.ACCEPT, APPROVAL.ACCEPT_ALL, APPROVAL.REJECT];
+/** Inline border — avoids importing from modes/ (boundary rule). */
+class Border {
+    color;
+    constructor(color) {
+        this.color = color;
+    }
+    invalidate() { }
+    render(width) {
+        return [this.color('\u2500'.repeat(Math.max(1, width)))];
+    }
+}
+function padVisible(text, targetWidth) {
+    const w = visibleWidth(text);
+    return w >= targetWidth ? text : text + ' '.repeat(targetWidth - w);
+}
+export class ExcelApprovalComponent extends Container {
+    selectedButton = 0;
+    scrollOffset = 0;
+    diff;
+    theme;
+    onDone;
+    tableContainer;
+    buttonContainer;
+    borderColor;
+    constructor(diff, theme, onDone) {
+        super();
+        this.diff = diff;
+        this.theme = theme;
+        this.onDone = onDone;
+        this.borderColor = (s) => theme.fg('border', s);
+        this.addChild(new Border(this.borderColor));
+        const count = diff.total;
+        const title = theme.bold(theme.fg('accent', ' Review Changes')) +
+            theme.fg('dim', `  ${count} cell${count !== 1 ? 's' : ''} modified`);
+        this.addChild(new Text(title, 0, 0));
+        this.addChild(new Spacer(1));
+        this.tableContainer = new Container();
+        this.addChild(this.tableContainer);
+        if (diff.total > diff.cells.length) {
+            this.addChild(new Text(theme.fg('dim', `  ... and ${diff.total - diff.cells.length} more cells`), 0, 0));
+        }
+        this.addChild(new Spacer(1));
+        this.buttonContainer = new Container();
+        this.addChild(this.buttonContainer);
+        this.addChild(new Border(this.borderColor));
+        this.updateTable();
+        this.updateButtons();
+    }
+    updateTable() {
+        this.tableContainer.clear();
+        const cells = this.diff.cells;
+        const visible = cells.slice(this.scrollOffset, this.scrollOffset + MAX_VISIBLE_ROWS);
+        // Compute column widths from visible data
+        const colWidths = { cell: 4, before: 6, after: 5, formula: 7 };
+        for (const c of visible) {
+            colWidths.cell = Math.max(colWidths.cell, String(c.cell).length);
+            colWidths.before = Math.max(colWidths.before, String(c.before).length);
+            colWidths.after = Math.max(colWidths.after, String(c.after).length);
+            const formulaText = c.formula || c.oldFormula || '';
+            colWidths.formula = Math.max(colWidths.formula, formulaText.length);
+        }
+        colWidths.cell = Math.min(colWidths.cell, 20);
+        colWidths.before = Math.min(colWidths.before, 16);
+        colWidths.after = Math.min(colWidths.after, 16);
+        colWidths.formula = Math.min(colWidths.formula, 30);
+        // Header
+        const header = '  ' +
+            this.theme.fg('dim', padVisible('Cell', colWidths.cell) +
+                '  ' +
+                padVisible('Before', colWidths.before) +
+                '  ' +
+                padVisible('After', colWidths.after) +
+                '  ' +
+                padVisible('Formula', colWidths.formula));
+        this.tableContainer.addChild(new Text(header, 0, 0));
+        // Rows
+        for (const c of visible) {
+            const cellStr = truncateToWidth(String(c.cell), colWidths.cell, '..', true);
+            const beforeStr = truncateToWidth(String(c.before), colWidths.before, '..', true);
+            const afterStr = truncateToWidth(String(c.after), colWidths.after, '..', true);
+            const formulaStr = c.formula
+                ? truncateToWidth(c.formula, colWidths.formula, '..', true)
+                : c.oldFormula
+                    ? truncateToWidth(this.theme.fg('dim', c.oldFormula), colWidths.formula, '..', true)
+                    : padVisible(this.theme.fg('dim', 'hardcoded'), colWidths.formula);
+            const row = '  ' +
+                this.theme.fg('text', padVisible(cellStr, colWidths.cell)) +
+                '  ' +
+                this.theme.fg(c.before !== 'empty' ? 'error' : 'dim', padVisible(beforeStr, colWidths.before)) +
+                '  ' +
+                this.theme.fg('accent', padVisible(afterStr, colWidths.after)) +
+                '  ' +
+                formulaStr;
+            this.tableContainer.addChild(new Text(row, 0, 0));
+        }
+        if (cells.length > MAX_VISIBLE_ROWS) {
+            const scrollInfo = `  ${this.scrollOffset + 1}-${Math.min(this.scrollOffset + MAX_VISIBLE_ROWS, cells.length)} of ${cells.length}`;
+            this.tableContainer.addChild(new Text(this.theme.fg('dim', scrollInfo + '  (\u2191\u2193 scroll)'), 0, 0));
+        }
+    }
+    updateButtons() {
+        this.buttonContainer.clear();
+        const parts = [];
+        for (let i = 0; i < BUTTONS.length; i++) {
+            const label = BUTTONS[i];
+            if (i === this.selectedButton) {
+                if (label === APPROVAL.ACCEPT) {
+                    parts.push(this.theme.fg('success', this.theme.bold(`[ ${label} ]`)));
+                }
+                else if (label === APPROVAL.REJECT) {
+                    parts.push(this.theme.fg('error', this.theme.bold(`[ ${label} ]`)));
+                }
+                else {
+                    parts.push(this.theme.bold(`[ ${label} ]`));
+                }
+            }
+            else {
+                parts.push(this.theme.fg('dim', `  ${label}  `));
+            }
+        }
+        this.buttonContainer.addChild(new Text('  ' + parts.join('  '), 0, 0));
+        this.buttonContainer.addChild(new Text(this.theme.fg('dim', '  \u2190\u2192 navigate  enter select  esc cancel'), 0, 0));
+    }
+    handleInput(keyData) {
+        const kb = getEditorKeybindings();
+        if (keyData === '\x1b[D' || keyData === 'h') {
+            this.selectedButton = Math.max(0, this.selectedButton - 1);
+            this.updateButtons();
+        }
+        else if (keyData === '\x1b[C' || keyData === 'l') {
+            this.selectedButton = Math.min(BUTTONS.length - 1, this.selectedButton + 1);
+            this.updateButtons();
+        }
+        else if (keyData === '\x1b[A' || keyData === 'k') {
+            if (this.scrollOffset > 0) {
+                this.scrollOffset--;
+                this.updateTable();
+            }
+        }
+        else if (keyData === '\x1b[B' || keyData === 'j') {
+            if (this.scrollOffset + MAX_VISIBLE_ROWS < this.diff.cells.length) {
+                this.scrollOffset++;
+                this.updateTable();
+            }
+        }
+        else if (kb.matches(keyData, 'selectConfirm') || keyData === '\n' || keyData === '\r') {
+            this.onDone(BUTTONS[this.selectedButton]);
+        }
+        else if (kb.matches(keyData, 'selectCancel')) {
+            this.onDone('Reject');
+        }
+    }
+}
+//# sourceMappingURL=excel-approval.js.map

package/dist/custom/tools/excel-exec.js

@@ -2,13 +2,16 @@
  * Excel exec tool — POST /exec with Python code to ShortcutXL's HTTP server.
  *
  * Request:  POST /exec  { "code": "..." }
- * Response: { "ok": true, "output": "..." } or { "ok": false, "error": "..." }
+ *           POST /exec  { "control": "revert"|"cleanup", "cfTxId": "..." }
+ * Response: { "ok": true, "output": "...", "diff"?: {...}, "cfTxId"?: "..." }
+ *        or { "ok": false, "error": "..." }
  */
 import { Type } from '@sinclair/typebox';
 import { truncateOutput } from '../../core/tools/truncate.js';
 import { EXCEL_EXEC } from '../../tool-names.js';
 import { Text } from '../../tui/index.js';
 import { formatNotation, parseExcelLocation } from './excel-range.js';
+import { APPROVAL, CONTROL, OUTCOME } from './excel-approval.js';
 import { highlightCode } from './render-helpers.js';
 const TOOL_NAME = EXCEL_EXEC;
 const NO_OUTPUT_FALLBACK = '(no output)';
@@ -32,7 +35,48 @@ const schema = Type.Object({
         description: 'Python code to execute in Excel. `app` (Excel.Application) is already available — do NOT import xl_app. Use print() to return values.'
     })
 });
-export function createExcelExecTool(httpUrl) {
+/**
+ * Resolve approval for cell changes: show UI if needed, then revert or cleanup.
+ * Extracted from execute() so the approval flow is independently testable.
+ */
+async function resolveApproval(result, approval, postControl, ctx) {
+    const { diff, cfTxId } = result;
+    const needsUI = diff && approval && !approval.isAutoApproved();
+    if (needsUI) {
+        const choice = await approval.requestApproval(diff, ctx);
+        if (choice === APPROVAL.REJECT || choice === undefined) {
+            try {
+                await postControl({ control: CONTROL.REVERT, cfTxId });
+                return OUTCOME.REVERTED;
+            }
+            catch {
+                // Revert failed — try to at least clean up CF highlights.
+                if (cfTxId != null) {
+                    await postControl({ control: CONTROL.CLEANUP, cfTxId }).catch(() => { });
+                }
+                return OUTCOME.REVERT_FAILED;
+            }
+        }
+        if (choice === APPROVAL.ACCEPT_ALL) {
+            approval.onAcceptAll();
+        }
+    }
+    // Accepted (explicitly or auto) — clean up CF highlights.
+    if (cfTxId != null) {
+        await postControl({ control: CONTROL.CLEANUP, cfTxId }).catch((e) => {
+            const msg = e instanceof Error ? e.message : String(e);
+            console.error(`excel-exec: CF cleanup failed for tx ${cfTxId}: ${msg}`);
+        });
+    }
+    return OUTCOME.ACCEPTED;
+}
+export function createExcelExecTool(httpUrl, approval) {
+    const postControl = (body, signal) => fetch(`${httpUrl}/exec`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+        signal
+    });
     return {
         name: TOOL_NAME,
         label: 'Excel exec',
@@ -76,15 +120,11 @@ export function createExcelExecTool(httpUrl) {
                 return undefined;
             return new Text(theme.fg('toolOutput', output), 0, 0);
         },
-        async execute(_toolCallId, { code, description: _description }, signal, _onUpdate, _ctx) {
+        async execute(_toolCallId, { code, description: _description }, signal, _onUpdate, ctx) {
+            const autoApprove = !approval || approval.isAutoApproved();
             let response;
             try {
-                response = await fetch(`${httpUrl}/exec`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ code }),
-                    signal
-                });
+                response = await postControl({ code, autoApprove }, signal);
             }
             catch (e) {
                 const msg = e instanceof Error ? e.message : String(e);
@@ -101,9 +141,24 @@ export function createExcelExecTool(httpUrl) {
             if (!result.ok) {
                 throw new Error(result.error ?? 'Unknown error from Excel');
             }
-            const output = result.output ?? NO_OUTPUT_FALLBACK;
+            const outcome = await resolveApproval(result, approval, (b) => postControl(b), ctx);
+            if (outcome === OUTCOME.REVERT_FAILED) {
+                return {
+                    content: [{
+                            type: 'text',
+                            text: 'Revert failed — changes are still applied in Excel. You may need to undo manually (Ctrl+Z).'
+                        }],
+                    details: result
+                };
+            }
+            if (outcome === OUTCOME.REVERTED) {
+                return {
+                    content: [{ type: 'text', text: 'Changes reverted by user.' }],
+                    details: result
+                };
+            }
             return {
-                content: [{ type: 'text', text: truncateOutput(output) }],
+                content: [{ type: 'text', text: truncateOutput(result.output ?? NO_OUTPUT_FALLBACK) }],
                 details: result
             };
         }

package/dist/custom/tools/task/render.js

@@ -347,7 +347,7 @@ function groupQueryPreview(query, theme) {
 export function formatAgentTypeLabel(agentType) {
     return agentType.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase()) + ' Subagent';
 }
-export function formatAgentGroupLabel(agentType, count) {
+function formatAgentGroupLabel(agentType, count) {
     const name = agentType.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
     return `${count} ${name} Agent${count > 1 ? 's' : ''}`;
 }

package/dist/main.js

@@ -46,6 +46,7 @@ import { registerShortcutProvider } from './custom/providers/register-shortcut-p
 import { syncXll } from './custom/sync-xll.js';
 import { createCronTool } from './custom/tools/cron.js';
 import { createExcelExecTool } from './custom/tools/excel-exec.js';
+import { ExcelApprovalComponent } from './custom/tools/excel-approval.js';
 import { createLlmAnalysisTool } from './custom/tools/llm-analysis.js';
 import { createSwitchModeTool, setCurrentMode } from './custom/tools/switch-mode.js';
 import { createTaskTool } from './custom/tools/task/index.js';
@@ -236,7 +237,16 @@ function buildSessionOptions(parsed, sessionManager, modelRegistry, _settingsMan
     if (!parsed.noCustomTools) {
         const customToolSet = parsed.customTools ? new Set(parsed.customTools) : null;
         if (!customToolSet || customToolSet.has(EXCEL_EXEC)) {
-            availableCustomTools.push(createExcelExecTool(EXCEL_HTTP_URL));
+            const approvalCallbacks = {
+                isAutoApproved: () => _settingsManager.getAutoApprove(),
+                requestApproval: async (diff, ctx) => {
+                    if (!ctx.hasUI)
+                        return undefined;
+                    return ctx.ui.custom((_tui, uiTheme, _kb, done) => new ExcelApprovalComponent(diff, uiTheme, done));
+                },
+                onAcceptAll: () => _settingsManager.setAutoApprove(true),
+            };
+            availableCustomTools.push(createExcelExecTool(EXCEL_HTTP_URL, approvalCallbacks));
         }
         if (!customToolSet || customToolSet.has(TASK)) {
             availableCustomTools.push(createTaskTool());
@@ -509,6 +519,7 @@ export async function main(args) {
         sessionManager = SessionManager.open(selectedPath);
     }
     const { options: sessionOptions, cliThinkingFromModel } = buildSessionOptions(parsed, sessionManager, modelRegistry, settingsManager);
+    sessionOptions.settingsManager = settingsManager;
     sessionOptions.authStorage = authStorage;
     sessionOptions.modelRegistry = modelRegistry;
     sessionOptions.resourceLoader = resourceLoader;

package/dist/modes/interactive/components/footer.js

@@ -1,4 +1,5 @@
 import { truncateToWidth, visibleWidth } from '../../../tui/index.js';
+import { APPROVAL_MODE } from '../../../core/settings-manager.js';
 import { theme } from '../../../core/theme.js';
 /**
  * Sanitize text for display in a single-line status.
@@ -293,6 +294,15 @@ export class FooterComponent {
             lines.push(theme.fg('dim', infoLine));
         }
         lines.push(styledStatsLeft + styledRemainder);
+        // SHORTCUT PATCH: show approval mode indicator
+        // Read from settings directly so "Accept All" in excel_exec is reflected immediately.
+        const autoApprove = this.session.settingsManager.getAutoApprove();
+        if (autoApprove) {
+            lines.push(theme.fg('success', `\u23F5\u23F5 ${APPROVAL_MODE.AUTO}`) + theme.fg('dim', '  (shift+tab to toggle)'));
+        }
+        else {
+            lines.push(theme.fg('dim', `\u23F8 ${APPROVAL_MODE.ASK}  (shift+tab to toggle)`));
+        }
         // SHORTCUT PATCH: render each extension status on its own line (for dev trace paths)
         const extensionStatuses = this.footerData.getExtensionStatuses();
         if (extensionStatuses.size > 0) {

package/dist/modes/interactive/components/settings-selector.js

@@ -1,4 +1,5 @@
 import { Container, getCapabilities, SelectList, SettingsList, Spacer, Text } from '../../../tui/index.js';
+import { APPROVAL_MODE } from '../../../core/settings-manager.js';
 import { theme } from '../../../core/theme.js';
 import { getSelectListTheme, getSettingsListTheme } from '../theme/theme.js';
 import { DynamicBorder } from './dynamic-border.js';
@@ -52,6 +53,13 @@ export class SettingsSelectorComponent extends Container {
         super();
         const supportsImages = getCapabilities().images;
         const items = [
+            {
+                id: 'auto-approve',
+                label: 'Auto-approve edits',
+                description: 'Whether the agent can edit Excel without asking',
+                currentValue: config.autoApprove ? APPROVAL_MODE.AUTO : APPROVAL_MODE.ASK,
+                values: [APPROVAL_MODE.ASK, APPROVAL_MODE.AUTO]
+            },
             {
                 id: 'collapse-changelog',
                 label: 'Collapse changelog',
@@ -102,6 +110,9 @@ export class SettingsSelectorComponent extends Container {
         this.addChild(new DynamicBorder());
         this.settingsList = new SettingsList(items, 10, getSettingsListTheme(), (id, newValue) => {
             switch (id) {
+                case 'auto-approve':
+                    callbacks.onAutoApproveChange(newValue === APPROVAL_MODE.AUTO);
+                    break;
                 case 'show-images':
                     callbacks.onShowImagesChange(newValue === 'true');
                     break;

package/dist/modes/interactive/interactive-mode.js

@@ -1551,6 +1551,7 @@ export class InteractiveMode {
         this.defaultEditor.onCtrlD = () => this.handleCtrlD();
         this.defaultEditor.onAction('suspend', () => this.handleCtrlZ());
         this.defaultEditor.onAction('cycleThinkingLevel', () => this.cycleThinkingLevel());
+        this.defaultEditor.onAction('toggleAutoApprove', () => this.toggleAutoApprove());
         this.defaultEditor.onAction('cycleModelForward', () => this.cycleModel('forward'));
         this.defaultEditor.onAction('cycleModelBackward', () => this.cycleModel('backward'));
         // Global debug handler on TUI (works regardless of focus)
@@ -2063,10 +2064,23 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortRetry();
                 };
-                // Show retry indicator
+                // SHORTCUT PATCH: Remove the error assistant message from the chat.
+                // The retry will remove it from conversation history and produce a new
+                // response — no point leaving the stale "[Request failed: ...]" visible.
+                // Safe: on auto_retry_start the last assistant message is always the
+                // failed one — successful responses don't trigger retries.
+                const retryChildren = this.chatContainer.children;
+                for (let i = retryChildren.length - 1; i >= 0; i--) {
+                    if (retryChildren[i] instanceof AssistantMessageComponent) {
+                        this.chatContainer.removeChild(retryChildren[i]);
+                        break;
+                    }
+                }
+                // Show retry indicator with the error reason
                 this.statusContainer.clear();
                 const delaySeconds = Math.round(event.delayMs / 1000);
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg('warning', spinner), (text) => theme.fg('muted', text), `Retrying (${event.attempt}/${event.maxAttempts}) in ${delaySeconds}s... (${appKey(this.keybindings, 'interrupt')} to cancel)`);
+                const prefix = event.errorMessage ? `${event.errorMessage} — ` : '';
+                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg('warning', spinner), (text) => theme.fg('muted', text), `${prefix}Retrying (${event.attempt}/${event.maxAttempts}) in ${delaySeconds}s... (${appKey(this.keybindings, 'interrupt')} to cancel)`);
                 this.statusContainer.addChild(this.retryLoader);
                 this.ui.requestRender();
                 break;
@@ -2445,6 +2459,12 @@ export class InteractiveMode {
             this.showStatus(`Thinking level: ${newLevel}`);
         }
     }
+    toggleAutoApprove() {
+        const current = this.settingsManager.getAutoApprove();
+        const next = !current;
+        this.settingsManager.setAutoApprove(next);
+        this.ui.requestRender();
+    }
     async cycleModel(direction) {
         try {
             const result = await this.session.cycleModel(direction);
@@ -2763,7 +2783,8 @@ export class InteractiveMode {
                 currentTheme: this.settingsManager.getTheme() || 'dark',
                 availableThemes: getAvailableThemes(),
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
-                quietStartup: this.settingsManager.getQuietStartup()
+                quietStartup: this.settingsManager.getQuietStartup(),
+                autoApprove: this.settingsManager.getAutoApproveDefault()
             }, {
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
@@ -2794,6 +2815,9 @@ export class InteractiveMode {
                 onQuietStartupChange: (enabled) => {
                     this.settingsManager.setQuietStartup(enabled);
                 },
+                onAutoApproveChange: (enabled) => {
+                    this.settingsManager.setAutoApproveDefault(enabled);
+                },
                 onCancel: () => {
                     done();
                     this.ui.requestRender();
@@ -3445,7 +3469,7 @@ export class InteractiveMode {
         const clear = this.getAppKeyDisplay('clear');
         const exit = this.getAppKeyDisplay('exit');
         const suspend = this.getAppKeyDisplay('suspend');
-        const cycleThinkingLevel = this.getAppKeyDisplay('cycleThinkingLevel');
+        const toggleAutoApprove = this.getAppKeyDisplay('toggleAutoApprove');
         const cycleModelForward = this.getAppKeyDisplay('cycleModelForward');
         const selectModel = this.getAppKeyDisplay('selectModel');
         const expandTools = this.getAppKeyDisplay('expandTools');
@@ -3486,7 +3510,7 @@ export class InteractiveMode {
 | \`${clear}\` | Clear editor (first) / exit (second) |
 | \`${exit}\` | Exit (when editor is empty) |
 | \`${suspend}\` | Suspend to background |
-| \`${cycleThinkingLevel}\` | Cycle thinking level |
+| \`${toggleAutoApprove}\` | Toggle auto-approve for Excel edits |
 | \`${cycleModelForward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
 | \`${expandTools}\` | Toggle tool output expansion |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shortcutxl",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "type": "module",
   "files": [
     "dist/",
@@ -25,7 +25,7 @@
     "copy-assets": "npm run sync-modules && cp -r src/tui dist/tui && cp src/modes/interactive/theme/*.json dist/modes/interactive/theme/ && cp src/core/export-html/*.{html,css,js} dist/core/export-html/ && cp src/core/export-html/vendor/*.js dist/core/export-html/vendor/",
     "test-install": "npm uninstall -g shortcutxl & npm run build && npm pack && node -e \"const g=require('glob').globSync('shortcutxl-*.tgz')[0];require('child_process').execSync('npm install -g '+g,{stdio:'inherit'});require('fs').unlinkSync(g)\"",
     "test-uninstall": "npm uninstall -g shortcutxl",
-    "dev": "npm run sync-modules && tsx src/cli.ts",
+    "dev": "npm run sync-modules && node -e \"try{require('fs').unlinkSync(require('path').join(require('os').homedir(),'.shortcut','agent','xll','.sync-version'))}catch{}\" && tsx src/cli.ts",
     "start": "node dist/cli.js",
     "lint": "eslint src/",
     "check-types": "tsc --noEmit",
@@ -34,7 +34,9 @@
     "test": "vitest --run",
     "test:e2e": "vitest --run --config vitest.e2e.config.ts",
     "test:watch": "vitest",
-    "knip": "knip"
+    "knip": "knip",
+    "lint:python": "cd .. && uvx ruff check modules/ tests/",
+    "check-types:python": "cd .. && uvx pyright modules/ tests/"
   },
   "dependencies": {
     "@mariozechner/jiti": "^2.6.5",