shortcutxl 0.3.89 → 0.3.91

package/BINARY-INVENTORY.json

@@ -1,17 +1,17 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-09-02T01:14:28.575Z",
+  "generatedAt": "2026-09-10T05:20:31.240Z",
   "package": "shortcutxl",
   "build": {
     "builder": "github-actions",
     "repository": "lyfegame/shortcut",
-    "sourceRef": "refs/heads/codex/cli-daily-credit-usage",
-    "sourceCommit": "79a4adfc21dce36c575744cbbf07df842928b610",
-    "workflowRef": "lyfegame/shortcut/.github/workflows/release-shortcut-cli-npm-package.yml@refs/heads/codex/cli-daily-credit-usage",
-    "runId": "33578448535",
+    "sourceRef": "refs/heads/mcp-startup-budget",
+    "sourceCommit": "0905764a93d06c695b77bf413eaa2003d6bbd83f",
+    "workflowRef": "lyfegame/shortcut/.github/workflows/release-shortcut-cli-npm-package.yml@refs/heads/mcp-startup-budget",
+    "runId": "34440542822",
     "runnerOs": "Windows",
     "runnerImage": "win25-vs2026",
-    "runnerImageVersion": "20260824.214.3"
+    "runnerImageVersion": "20260907.229.1"
   },
   "binaryExtensions": [
     ".dll",
@@ -550,7 +550,7 @@
     },
     {
       "path": "xll/python/Scripts/httpx.exe",
-      "sha256": "56ecd26f514b1582761c3403f4938d112adc5f033a63d4bc945181079ca82ead",
+      "sha256": "a022dc159b79a3312afeed6f1733da09a8e85523163566f0df9da427319a0040",
       "source": "httpx console launcher installed into embedded Python",
       "version": "see packaged httpx distribution",
       "builtBy": "third-party",
@@ -558,7 +558,7 @@
     },
     {
       "path": "xll/python/Scripts/idna.exe",
-      "sha256": "ffda0108e10dc93a09f57419aac0a52d85871bb787308bf946ac851cb11f703a",
+      "sha256": "8cd6a6078a64ae8e4c826fde0c179ee719401389df7d73832baf0dd3c582ab38",
       "source": "Python package console launcher installed into embedded Python",
       "version": "see owning Python package metadata in site-packages",
       "builtBy": "third-party",
@@ -566,7 +566,7 @@
     },
     {
       "path": "xll/python/Scripts/pip.exe",
-      "sha256": "ce0f86f7cf5cc2882a4821943d3af21f7c41218ff43e7a1f62b18f185aefde97",
+      "sha256": "4a130513690433dd5e1e502566a7fd2084fc629eb85d08f66b0aad591a012c23",
       "source": "pip console launcher installed into embedded Python",
       "version": "see packaged pip distribution",
       "builtBy": "third-party",
@@ -574,7 +574,7 @@
     },
     {
       "path": "xll/python/Scripts/pip3.13.exe",
-      "sha256": "ce0f86f7cf5cc2882a4821943d3af21f7c41218ff43e7a1f62b18f185aefde97",
+      "sha256": "4a130513690433dd5e1e502566a7fd2084fc629eb85d08f66b0aad591a012c23",
       "source": "pip console launcher installed into embedded Python",
       "version": "see packaged pip distribution",
       "builtBy": "third-party",
@@ -582,7 +582,7 @@
     },
     {
       "path": "xll/python/Scripts/pip3.exe",
-      "sha256": "ce0f86f7cf5cc2882a4821943d3af21f7c41218ff43e7a1f62b18f185aefde97",
+      "sha256": "4a130513690433dd5e1e502566a7fd2084fc629eb85d08f66b0aad591a012c23",
       "source": "pip console launcher installed into embedded Python",
       "version": "see packaged pip distribution",
       "builtBy": "third-party",
@@ -590,7 +590,7 @@
     },
     {
       "path": "xll/python/Scripts/pywin32_postinstall.exe",
-      "sha256": "ff04c09d3e15a07d9a4006748c92e511f7e5c5abb2c78b68d7233e8f3ff19630",
+      "sha256": "1e121893a273808b93c23160b171d2055aa4ec72ddb72c92a3d7ebb274115f1d",
       "source": "Python package console launcher installed into embedded Python",
       "version": "see owning Python package metadata in site-packages",
       "builtBy": "third-party",
@@ -598,7 +598,7 @@
     },
     {
       "path": "xll/python/Scripts/pywin32_testall.exe",
-      "sha256": "c0641e3d6816baddcabb155f66ffb5de7c378b8257b95ad16f0a45e26184b879",
+      "sha256": "d92feb62593764e35c01fa841192e2cbab59bd51b4d33f88f14197527c48ffa2",
       "source": "Python package console launcher installed into embedded Python",
       "version": "see owning Python package metadata in site-packages",
       "builtBy": "third-party",

package/CHANGELOG.md

@@ -1,8 +1,14 @@
 # Changelog
 
-## [0.3.89]
+## [0.3.91]
+
+- **GPT-6 Astra** - GPT-6 Astra is now available in the model selector.
+- **Faster, more reliable MCP startup** - Shortcut now starts MCP integrations faster, retries temporary connection failures, and clearly reports servers that take too long to start.
+
+## [0.3.90]
 
 - **Skill Forge** - A recursive self-improvement loop for skills. Create or improve personal skills by giving Skill Forge tasks and a grading bar to train, evaluate, and refine against.
+- **Safer, more reliable Excel changes** - Shortcut now asks for approval before making workbook changes and allows longer operations to finish without timing out.
 - **Credit usage at a glance** - See today's personal credit usage for non-teams users.
 
 ## [0.3.88]

package/dist/ai/types.d.ts

@@ -296,6 +296,8 @@ export interface Model<TApi extends Api> {
         cacheWrite: number;
     };
     contextWindow: number;
+    /** Optional auto-compaction threshold. Defaults to the runtime-wide threshold policy. */
+    compactionThresholdTokens?: number;
     maxTokens: number;
     capabilities?: ModelCapabilities;
     headers?: Record<string, string>;

package/dist/app/connectors/secret-store.d.ts

@@ -12,12 +12,20 @@
 export declare function setSecret(name: string, payload: Record<string, string>): void;
 /** Retrieve a secret payload for a connection. Returns undefined if not found. */
 export declare function getSecret(name: string): Record<string, string> | undefined;
+/**
+ * Retrieve several connection secrets without serially blocking the Node event loop.
+ * Windows uses one PowerShell process for the whole batch so the P/Invoke helper is
+ * compiled once. Other platforms perform their native lookups concurrently.
+ */
+export declare function getSecrets(names: readonly string[], timeoutMs?: number): Promise<Map<string, Record<string, string> | undefined>>;
 /** Remove a secret for a connection. Returns true if it existed. */
 export declare function removeSecret(name: string): boolean;
 /** Store a JSON payload in the OS keychain under a custom service namespace. */
 export declare function setNamespacedSecret(service: string, name: string, payload: object): void;
 /** Retrieve a JSON payload from the OS keychain for a custom service namespace. */
 export declare function getNamespacedSecret<T extends object>(service: string, name: string): T | undefined;
+/** Retrieve several secrets through a single asynchronous batch operation where possible. */
+export declare function getNamespacedSecrets<T extends object>(service: string, names: readonly string[], timeoutMs?: number): Promise<Map<string, T | undefined>>;
 /** Remove a JSON payload from the OS keychain for a custom service namespace. */
 export declare function removeNamespacedSecret(service: string, name: string): boolean;
 /**

package/dist/app/connectors/secret-store.js

@@ -8,7 +8,7 @@
  *
  * Imports: none from internal layers. Pure shell-out utility.
  */
-import { execFileSync } from 'child_process';
+import { execFile, execFileSync } from 'child_process';
 const CONNECTION_SERVICE = 'shortcut.connection';
 // =============================================================================
 // Public API
@@ -21,6 +21,14 @@ export function setSecret(name, payload) {
 export function getSecret(name) {
     return getNamespacedSecret(CONNECTION_SERVICE, name);
 }
+/**
+ * Retrieve several connection secrets without serially blocking the Node event loop.
+ * Windows uses one PowerShell process for the whole batch so the P/Invoke helper is
+ * compiled once. Other platforms perform their native lookups concurrently.
+ */
+export function getSecrets(names, timeoutMs = 10_000) {
+    return getNamespacedSecrets(CONNECTION_SERVICE, names, timeoutMs);
+}
 /** Remove a secret for a connection. Returns true if it existed. */
 export function removeSecret(name) {
     return removeNamespacedSecret(CONNECTION_SERVICE, name);
@@ -61,6 +69,45 @@ export function getNamespacedSecret(service, name) {
     }
     return undefined;
 }
+/** Retrieve several secrets through a single asynchronous batch operation where possible. */
+export async function getNamespacedSecrets(service, names, timeoutMs = 10_000) {
+    const uniqueNames = [...new Set(names)];
+    const result = new Map();
+    if (uniqueNames.length === 0)
+        return result;
+    if (process.platform === 'win32') {
+        const targets = uniqueNames.map((name) => `${service}/${name}`);
+        const psTargets = targets.map((target) => `'${psEsc(target)}'`).join(', ');
+        const ps = `${WIN_CRED_PREAMBLE}
+$result = @{}
+foreach ($target in @(${psTargets})) {
+  $value = [CredManager]::Read($target)
+  if ($null -ne $value) { $result[$target] = $value }
+}
+$result | ConvertTo-Json -Compress`;
+        const raw = await execFileUtf8('powershell', ['-NoProfile', '-EncodedCommand', psEncode(ps)], timeoutMs);
+        const values = raw.trim() ? JSON.parse(raw) : {};
+        for (const [index, name] of uniqueNames.entries()) {
+            result.set(name, parseSecretJson(values[targets[index]]));
+        }
+        return result;
+    }
+    if (process.platform === 'darwin') {
+        await Promise.all(uniqueNames.map(async (name) => {
+            try {
+                const raw = await execFileUtf8('security', ['find-generic-password', '-a', name, '-s', service, '-w'], timeoutMs);
+                result.set(name, parseSecretJson(raw));
+            }
+            catch {
+                result.set(name, undefined);
+            }
+        }));
+        return result;
+    }
+    for (const name of uniqueNames)
+        result.set(name, undefined);
+    return result;
+}
 /** Remove a JSON payload from the OS keychain for a custom service namespace. */
 export function removeNamespacedSecret(service, name) {
     try {
@@ -115,7 +162,11 @@ export function buildConnectionEnv(connectionNames) {
  * PowerShell script that uses P/Invoke to call CredRead/CredWrite/CredDelete
  * from advapi32.dll. Works on every Windows version. No external modules needed.
  */
+// Secrets are read back as .NET strings but serialized to stdout with the
+// console's OEM codepage, which varies per machine and locale. Force BOM-less
+// UTF-8 so Node decodes non-ASCII values correctly on every host.
 const WIN_CRED_PREAMBLE = `
+[Console]::OutputEncoding = New-Object System.Text.UTF8Encoding $false
 Add-Type -TypeDefinition @"
 using System;
 using System.Runtime.InteropServices;
@@ -161,6 +212,27 @@ public class CredManager {
 function psEncode(script) {
     return Buffer.from(script, 'utf16le').toString('base64');
 }
+function execFileUtf8(command, args, timeout) {
+    return new Promise((resolve, reject) => {
+        execFile(command, args, { encoding: 'utf-8', timeout, windowsHide: true }, (error, stdout) => {
+            if (error) {
+                reject(error);
+                return;
+            }
+            resolve(stdout);
+        });
+    });
+}
+function parseSecretJson(raw) {
+    if (!raw)
+        return undefined;
+    try {
+        return JSON.parse(raw.trim());
+    }
+    catch {
+        return undefined;
+    }
+}
 function winCredWrite(target, secret) {
     const ps = `${WIN_CRED_PREAMBLE}\n[CredManager]::Write('${psEsc(target)}', '${psEsc(secret)}')`;
     execFileSync('powershell', ['-NoProfile', '-EncodedCommand', psEncode(ps)], {

package/dist/app/local/tools/execute-code/approval-payload.d.ts

@@ -6,6 +6,10 @@ export interface ExcelDiffApprovalPayload {
     kind: 'diff';
     description: string;
 }
+export interface ExcelWriteApprovalPayload {
+    kind: 'write';
+    description: string;
+}
 export interface OfficeDangerousApprovalPayload {
     kind: 'dangerous';
     description: string;
@@ -13,5 +17,5 @@ export interface OfficeDangerousApprovalPayload {
     summary: string;
     operations: OfficeApprovalOperation[];
 }
-export type OfficeApprovalPayload = ExcelDiffApprovalPayload | OfficeDangerousApprovalPayload;
+export type OfficeApprovalPayload = ExcelDiffApprovalPayload | ExcelWriteApprovalPayload | OfficeDangerousApprovalPayload;
 //# sourceMappingURL=approval-payload.d.ts.map

package/dist/app/local/tools/execute-code/executor.d.ts

@@ -2,9 +2,9 @@
  * COM execute_code executor — local XLL-backed execution lifecycle.
  *
  * Owns the COM-specific execution flow:
- * 1. Send code to the local XLL via xllFetch
- * 2. Parse and validate the response
- * 3. Run the approval / revert / cleanup flow
+ * 1. Classify code and request write approval before execution
+ * 2. Send approved code to the local XLL via xllFetch
+ * 3. Parse and validate the response
  *
  * Used by:
  * - `createExcelExecTool()` (COM ToolDefinition wrapper)
@@ -23,7 +23,7 @@ export interface ComExecResult {
     cfTxId?: string;
     editMode?: boolean;
 }
-export type ApprovalOutcome = 'accepted' | 'approval-unavailable' | 'failed' | 'reverted' | 'revert-failed' | 'rejected';
+export type ApprovalOutcome = 'accepted' | 'approval-unavailable' | 'failed' | 'rejected';
 export interface LocalExecResult {
     result: ComExecResult;
     outcome: ApprovalOutcome;
@@ -33,19 +33,9 @@ export interface ExcelExecApprovalObservability {
     onRequested?: (request: ApprovalRequest<OfficeApprovalPayload>) => void;
     onAccepted?: (request: ApprovalRequest<OfficeApprovalPayload>, choice: ApprovalChoice) => void;
     onRejected?: (request: ApprovalRequest<OfficeApprovalPayload>) => void;
-    onReverted?: (request: ApprovalRequest<OfficeApprovalPayload>) => void;
-    onRevertFailed?: (request: ApprovalRequest<OfficeApprovalPayload>) => void;
-}
-interface ApprovalResolution {
-    outcome: ApprovalOutcome;
-    approvalSummaries?: string[];
 }
 /** Validate that a parsed JSON value has the COM execute result shape. */
 export declare function isComExecResult(v: unknown): v is ComExecResult;
-/**
- * Resolve approval for cell changes: show UI if needed, then revert or cleanup.
- */
-export declare function resolveApproval(result: ComExecResult, approval: ApprovalGate<OfficeApprovalPayload> | undefined, postControl: (body: object) => Promise<Response>, ctx: ExtensionContext, description?: string, observability?: ExcelExecApprovalObservability, priorApprovalSummaries?: string[]): Promise<ApprovalResolution>;
 /**
  * Execute code against the local XLL and run approval.
  *
@@ -60,5 +50,4 @@ export declare function executeComLocally(excelTarget: ExcelHostEndpoint, code:
     observability?: ExcelExecApprovalObservability;
     editModeTiming?: Partial<EditModeRetryTiming>;
 }): Promise<LocalExecResult>;
-export {};
 //# sourceMappingURL=executor.d.ts.map

package/dist/app/local/tools/execute-code/executor.js

@@ -2,14 +2,13 @@
  * COM execute_code executor — local XLL-backed execution lifecycle.
  *
  * Owns the COM-specific execution flow:
- * 1. Send code to the local XLL via xllFetch
- * 2. Parse and validate the response
- * 3. Run the approval / revert / cleanup flow
+ * 1. Classify code and request write approval before execution
+ * 2. Send approved code to the local XLL via xllFetch
+ * 3. Parse and validate the response
  *
  * Used by:
  * - `createExcelExecTool()` (COM ToolDefinition wrapper)
  */
-import { log } from '../../../../shared/logging/agent-log.js';
 import { INTERACTIVE_APPROVAL_UNAVAILABLE_MESSAGE } from '../../../approvals/approval-errors.js';
 import { APPROVAL } from '../../../approvals/types.js';
 import { getApprovalSurface, resolveApprovalExecutionDecision } from '../../../permissions/approval-surface.js';
@@ -31,13 +30,6 @@ export function isComExecResult(v) {
         (r.error === undefined || typeof r.error === 'string') &&
         (r.editMode === undefined || typeof r.editMode === 'boolean'));
 }
-// ---------------------------------------------------------------------------
-// Control constants
-// ---------------------------------------------------------------------------
-const CONTROL = {
-    REVERT: 'revert',
-    CLEANUP: 'cleanup'
-};
 function describeExcelApprovalChoice(choice) {
     switch (choice) {
         case APPROVAL.ACCEPT:
@@ -97,95 +89,41 @@ async function requestAlwaysConfirmApproval(approval, ctx, description, dangerou
     return { choice, unavailable: false };
 }
 // ---------------------------------------------------------------------------
-// Approval resolution
+// Pre-execution write approval
 // ---------------------------------------------------------------------------
-/**
- * Resolve approval for cell changes: show UI if needed, then revert or cleanup.
- */
-export async function resolveApproval(result, approval, postControl, ctx, description, observability, priorApprovalSummaries) {
-    const { diff, cfTxId } = result;
-    let approvalSummaries = priorApprovalSummaries;
-    if (diff) {
-        const request = {
-            kind: 'execute_code',
-            title: 'Review Excel changes',
-            choices: [APPROVAL.ACCEPT, APPROVAL.ACCEPT_ALL, APPROVAL.REJECT],
-            payload: {
-                kind: 'diff',
-                description: description?.trim() || 'Updating Excel'
-            }
-        };
-        const decision = resolveApprovalExecutionDecision({
-            surface: getApprovalSurface(ctx),
-            gateAvailable: approval !== undefined,
-            isSafe: false,
-            isAutoApproved: approval?.isAutoApproved() ?? false,
-            alwaysRequireExplicitApproval: false,
-            allowHeadlessApproval: ctx.permissionPolicy?.office.allowHeadlessApproval ?? false
-        });
-        if (decision === 'prompt') {
-            if (!approval) {
-                observability?.onRejected?.(request);
-                try {
-                    await postControl({ control: CONTROL.REVERT, cfTxId });
-                    observability?.onReverted?.(request);
-                    return { outcome: 'reverted' };
-                }
-                catch {
-                    if (cfTxId != null) {
-                        await postControl({ control: CONTROL.CLEANUP, cfTxId }).catch(() => { });
-                    }
-                    observability?.onRevertFailed?.(request);
-                    return { outcome: 'revert-failed' };
-                }
-            }
-            observability?.onRequested?.(request);
-            const choice = await approval.requestApproval(request, ctx);
-            if (choice === APPROVAL.REJECT || choice === undefined) {
-                observability?.onRejected?.(request);
-                try {
-                    await postControl({ control: CONTROL.REVERT, cfTxId });
-                    observability?.onReverted?.(request);
-                    return { outcome: 'rejected' };
-                }
-                catch {
-                    if (cfTxId != null) {
-                        await postControl({ control: CONTROL.CLEANUP, cfTxId }).catch(() => { });
-                    }
-                    observability?.onRevertFailed?.(request);
-                    return { outcome: 'revert-failed' };
-                }
-            }
-            observability?.onAccepted?.(request, choice);
-            if (choice === APPROVAL.ACCEPT_ALL) {
-                approval.onAcceptAll();
-            }
-            approvalSummaries = appendApprovalSummary(approvalSummaries, choice);
-        }
-        else if (decision === 'deny') {
-            observability?.onRejected?.(request);
-            try {
-                await postControl({ control: CONTROL.REVERT, cfTxId });
-                observability?.onReverted?.(request);
-                return { outcome: 'reverted' };
-            }
-            catch {
-                if (cfTxId != null) {
-                    await postControl({ control: CONTROL.CLEANUP, cfTxId }).catch(() => { });
-                }
-                observability?.onRevertFailed?.(request);
-                return { outcome: 'revert-failed' };
-            }
+async function requestWriteApproval(approval, ctx, description, observability) {
+    const request = {
+        kind: 'execute_code',
+        title: 'Review Excel changes',
+        choices: [APPROVAL.ACCEPT, APPROVAL.ACCEPT_ALL, APPROVAL.REJECT],
+        payload: {
+            kind: 'write',
+            description: description?.trim() || 'Updating Excel'
         }
+    };
+    const decision = resolveApprovalExecutionDecision({
+        surface: getApprovalSurface(ctx),
+        gateAvailable: approval !== undefined,
+        isSafe: false,
+        isAutoApproved: approval?.isAutoApproved() ?? false,
+        alwaysRequireExplicitApproval: false,
+        allowHeadlessApproval: ctx?.permissionPolicy?.office.allowHeadlessApproval ?? false
+    });
+    if (decision === 'allow') {
+        return { choice: APPROVAL.ACCEPT, unavailable: false, prompted: false };
     }
-    // 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);
-            log.error('excel-exec', `CF cleanup failed for tx ${cfTxId}: ${msg}`);
-        });
+    if (decision === 'deny' || !approval || !ctx) {
+        observability?.onRejected?.(request);
+        return { choice: APPROVAL.REJECT, unavailable: true, prompted: false };
+    }
+    observability?.onRequested?.(request);
+    const choice = await approval.requestApproval(request, ctx);
+    if (choice === APPROVAL.REJECT || choice === undefined) {
+        observability?.onRejected?.(request);
+        return { choice, unavailable: false, prompted: true };
     }
-    return { outcome: 'accepted', approvalSummaries };
+    observability?.onAccepted?.(request, choice);
+    return { choice, unavailable: false, prompted: true };
 }
 // ---------------------------------------------------------------------------
 // Core executor
@@ -200,7 +138,7 @@ export async function executeComLocally(excelTarget, code, options) {
     const resolvedExcelHttpUrl = excelTarget.url;
     const { approval, ctx, description, signal, observability, editModeTiming } = options ?? {};
     let approvalSummaries;
-    const postControl = (body, sig) => xllFetch(`${resolvedExcelHttpUrl}/exec`, {
+    const postExec = (body, sig) => xllFetch(`${resolvedExcelHttpUrl}/exec`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(body),
@@ -224,7 +162,7 @@ export async function executeComLocally(excelTarget, code, options) {
     const sendExecRequest = async () => {
         let response;
         try {
-            response = await postControl({ code, autoApprove }, signal);
+            response = await postExec({ code, autoApprove: true }, signal);
         }
         catch (e) {
             if (signal?.aborted || isEditModeAbortError(e)) {
@@ -237,7 +175,6 @@ export async function executeComLocally(excelTarget, code, options) {
     };
     // Static analysis: skip approval for code with no detectable writes.
     const analysis = analyzeComWriteCode(code);
-    const dangerousLifecycleBypassed = analysis.alwaysRequireApproval && isDangerousExcelLifecycleBypassed(ctx);
     if (analysis.alwaysRequireApproval) {
         const approvalResult = await requestAlwaysConfirmApproval(approval, ctx, description, analysis.dangerousOperations, observability);
         const { choice } = approvalResult;
@@ -257,25 +194,26 @@ export async function executeComLocally(excelTarget, code, options) {
         }
         approvalSummaries = appendApprovalSummary(approvalSummaries, choice);
     }
-    const autoApprove = analysis.isReadOnly || analysis.alwaysRequireApproval || (approval?.isAutoApproved() ?? false);
-    const executionDecision = dangerousLifecycleBypassed
-        ? 'allow'
-        : resolveApprovalExecutionDecision({
-            surface: getApprovalSurface(ctx),
-            gateAvailable: approval !== undefined,
-            isSafe: analysis.isReadOnly,
-            isAutoApproved: approval?.isAutoApproved() ?? false,
-            alwaysRequireExplicitApproval: false,
-            allowHeadlessApproval: ctx?.permissionPolicy?.office.allowHeadlessApproval ?? false
-        });
-    if (executionDecision === 'deny') {
-        return {
-            result: {
-                ok: true,
-                output: INTERACTIVE_APPROVAL_UNAVAILABLE_MESSAGE
-            },
-            outcome: 'approval-unavailable'
-        };
+    else if (!analysis.isReadOnly) {
+        const approvalResult = await requestWriteApproval(approval, ctx, description, observability);
+        const { choice } = approvalResult;
+        if (choice !== APPROVAL.ACCEPT && choice !== APPROVAL.ACCEPT_ALL) {
+            return {
+                result: {
+                    ok: true,
+                    output: approvalResult.unavailable
+                        ? INTERACTIVE_APPROVAL_UNAVAILABLE_MESSAGE
+                        : 'Excel operation rejected by user.'
+                },
+                outcome: approvalResult.unavailable ? 'approval-unavailable' : 'rejected'
+            };
+        }
+        if (approvalResult.prompted && choice === APPROVAL.ACCEPT_ALL) {
+            approval?.onAcceptAll();
+        }
+        if (approvalResult.prompted) {
+            approvalSummaries = appendApprovalSummary(approvalSummaries, choice);
+        }
     }
     let result = await sendExecRequest();
     if (result.editMode) {
@@ -289,34 +227,6 @@ export async function executeComLocally(excelTarget, code, options) {
     if (!result.ok) {
         return { result, outcome: 'failed' };
     }
-    if (ctx) {
-        const { outcome, approvalSummaries: resolvedApprovalSummaries } = await resolveApproval(result, approval, (b) => postControl(b), ctx, description, observability, approvalSummaries);
-        return { result, outcome, approvalSummaries: resolvedApprovalSummaries };
-    }
-    if (result.diff) {
-        try {
-            await postControl({ control: CONTROL.REVERT, cfTxId: result.cfTxId });
-            return {
-                result: { ...result, output: 'Excel operation rejected by user.' },
-                outcome: 'reverted'
-            };
-        }
-        catch {
-            if (result.cfTxId != null) {
-                await postControl({ control: CONTROL.CLEANUP, cfTxId: result.cfTxId }).catch(() => { });
-            }
-            return {
-                result: { ...result, output: 'Excel operation rejected by user.' },
-                outcome: 'revert-failed'
-            };
-        }
-    }
-    if (result.cfTxId != null) {
-        await postControl({ control: CONTROL.CLEANUP, cfTxId: result.cfTxId }).catch((e) => {
-            const msg = e instanceof Error ? e.message : String(e);
-            log.error('excel-exec', `CF cleanup failed for tx ${result.cfTxId}: ${msg}`);
-        });
-    }
     return { result, outcome: 'accepted', approvalSummaries };
 }
 //# sourceMappingURL=executor.js.map

package/dist/app/local/tools/execute-code/observability.js

@@ -31,26 +31,6 @@ export function createExecuteCodeApprovalObservability(clientLogger) {
                     approval_kind: request.payload.kind
                 }
             });
-        },
-        onReverted: (request) => {
-            clientLogger.info({
-                module: 'tool',
-                event: 'tool_approval_reverted',
-                data: {
-                    tool_name: TOOL_NAME,
-                    approval_kind: request.payload.kind
-                }
-            });
-        },
-        onRevertFailed: (request) => {
-            clientLogger.error({
-                module: 'tool',
-                event: 'tool_approval_revert_failed',
-                data: {
-                    tool_name: TOOL_NAME,
-                    approval_kind: request.payload.kind
-                }
-            });
         }
     };
 }

package/dist/app/local/tools/execute-code/tool.js

@@ -81,23 +81,6 @@ export function createExcelExecTool(resolveTarget, approval, observability) {
                 ctx: ctx,
                 signal: signal ?? undefined
             });
-            if (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 === 'reverted') {
-                return {
-                    content: [{ type: 'text', text: 'Changes reverted by user.' }],
-                    details: result
-                };
-            }
             if (outcome === 'rejected') {
                 return {
                     content: [{ type: 'text', text: USER_REJECTED_APPROVAL_MESSAGE }],

package/dist/app/local/tools/execute-code/write-analyzer.js

@@ -47,8 +47,10 @@ const RAW_COM_WRITES = [
     /\.ClearComments\s*\(/,
     /\.ClearNotes\s*\(/,
     /\.Copy\s*\(/,
+    /\.Cut\s*\(/,
     /\.PasteSpecial\s*\(/,
     /\.AutoFill\s*\(/,
+    /\.Resize\s*\(/,
     /\.Merge\s*\(/,
     /\.UnMerge\s*\(/,
     /\.Move\s*\(/,