shortcutxl 0.2.24 → 0.2.25

package/dist/cli.js

@@ -93564,14 +93564,14 @@ var require_fromHttp = __commonJS({
       const full = options2.awsContainerCredentialsFullUri ?? process.env[AWS_CONTAINER_CREDENTIALS_FULL_URI];
       const token = options2.awsContainerAuthorizationToken ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN];
       const tokenFile = options2.awsContainerAuthorizationTokenFile ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE];
-      const warn3 = options2.logger?.constructor?.name === "NoOpLogger" || !options2.logger?.warn ? console.warn : options2.logger.warn.bind(options2.logger);
+      const warn2 = options2.logger?.constructor?.name === "NoOpLogger" || !options2.logger?.warn ? console.warn : options2.logger.warn.bind(options2.logger);
       if (relative4 && full) {
-        warn3("@aws-sdk/credential-provider-http: you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
-        warn3("awsContainerCredentialsFullUri will take precedence.");
+        warn2("@aws-sdk/credential-provider-http: you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
+        warn2("awsContainerCredentialsFullUri will take precedence.");
       }
       if (token && tokenFile) {
-        warn3("@aws-sdk/credential-provider-http: you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
-        warn3("awsContainerAuthorizationToken will take precedence.");
+        warn2("@aws-sdk/credential-provider-http: you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
+        warn2("awsContainerAuthorizationToken will take precedence.");
       }
       if (full) {
         host = full;
@@ -103224,7 +103224,7 @@ var require_lru_cache = __commonJS({
     var deprecatedOption = (opt, instead) => {
       const code = `LRU_CACHE_OPTION_${opt}`;
       if (shouldWarn(code)) {
-        warn3(code, `${opt} option`, `options.${instead}`, LRUCache);
+        warn2(code, `${opt} option`, `options.${instead}`, LRUCache);
       }
     };
     var deprecatedMethod = (method, instead) => {
@@ -103232,7 +103232,7 @@ var require_lru_cache = __commonJS({
       if (shouldWarn(code)) {
         const { prototype } = LRUCache;
         const { get: get4 } = Object.getOwnPropertyDescriptor(prototype, method);
-        warn3(code, `${method} method`, `cache.${instead}()`, get4);
+        warn2(code, `${method} method`, `cache.${instead}()`, get4);
       }
     };
     var deprecatedProperty = (field, instead) => {
@@ -103240,14 +103240,14 @@ var require_lru_cache = __commonJS({
       if (shouldWarn(code)) {
         const { prototype } = LRUCache;
         const { get: get4 } = Object.getOwnPropertyDescriptor(prototype, field);
-        warn3(code, `${field} property`, `cache.${instead}`, get4);
+        warn2(code, `${field} property`, `cache.${instead}`, get4);
       }
     };
     var emitWarning = (...a5) => {
       typeof process === "object" && process && typeof process.emitWarning === "function" ? process.emitWarning(...a5) : console.error(...a5);
     };
     var shouldWarn = (code) => !warned.has(code);
-    var warn3 = (code, what, instead, fn) => {
+    var warn2 = (code, what, instead, fn) => {
       warned.add(code);
       const msg = `The ${what} is deprecated. Please use ${instead} instead.`;
       emitWarning(msg, "DeprecationWarning", code, fn);
@@ -234670,7 +234670,7 @@ var require_log = __commonJS({
       if (logLevel === "debug")
         console.log(...messages);
     }
-    function warn3(logLevel, warning) {
+    function warn2(logLevel, warning) {
       if (logLevel === "debug" || logLevel === "warn") {
         if (typeof node_process.emitWarning === "function")
           node_process.emitWarning(warning);
@@ -234679,7 +234679,7 @@ var require_log = __commonJS({
       }
     }
     exports.debug = debug2;
-    exports.warn = warn3;
+    exports.warn = warn2;
   }
 });
 
@@ -248056,7 +248056,7 @@ var require_core4 = __commonJS({
     var error2 = (message) => {
       console.error(message);
     };
-    var warn3 = (message, ...args) => {
+    var warn2 = (message, ...args) => {
       console.log(`WARN: ${message}`, ...args);
     };
     var deprecated = (version2, message) => {
@@ -248096,8 +248096,8 @@ var require_core4 = __commonJS({
         if (match2) {
           const language = getLanguage(match2[1]);
           if (!language) {
-            warn3(LANGUAGE_NOT_FOUND.replace("{}", match2[1]));
-            warn3("Falling back to no-highlight mode for this block.", block2);
+            warn2(LANGUAGE_NOT_FOUND.replace("{}", match2[1]));
+            warn2("Falling back to no-highlight mode for this block.", block2);
           }
           return language ? match2[1] : "no-highlight";
         }
@@ -301356,7 +301356,7 @@ Keep solutions simple and focused. For example, don't add extra sheets, reformat
 excel_exec: use it for all spreadsheet interactions
 ${newSheet ? NEW_SHEET_PROMPTS.execTool : COM_PROMPTS.execTool}
 
-bash: use it for everything else, including python
+bash: use it for everything else
 ${newSheet ? NEW_SHEET_PROMPTS.bashTool : COM_PROMPTS.bashTool}
 
 
@@ -302418,47 +302418,21 @@ var init_install_utils = __esm({
   }
 });
 
-// src/custom/preflight.ts
+// src/custom/preflight-utils.ts
 import { spawn as cpSpawn, spawnSync as spawnSync11 } from "child_process";
-import { existsSync as existsSync24, readFileSync as readFileSync24, writeFileSync as writeFileSync10 } from "fs";
-import { join as join32, resolve as resolve12 } from "path";
 import { createInterface as createInterface3 } from "readline";
-function refreshPath() {
-  try {
-    const user = spawnSync11("reg", ["query", "HKCU\\Environment", "/v", "Path"], {
-      encoding: "utf-8",
-      timeout: 5e3
-    });
-    const system = spawnSync11(
-      "reg",
-      [
-        "query",
-        "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment",
-        "/v",
-        "Path"
-      ],
-      { encoding: "utf-8", timeout: 5e3 }
-    );
-    const extract = (out) => (out.match(/REG_(?:EXPAND_)?SZ\s+(.+)/i)?.[1] ?? "").split(";").map((p6) => p6.trim()).filter(Boolean);
-    const fresh = /* @__PURE__ */ new Set([...extract(system.stdout ?? ""), ...extract(user.stdout ?? "")]);
-    const current = (process.env.PATH ?? "").split(";").filter(Boolean);
-    const currentSet = new Set(current.map((p6) => p6.toLowerCase()));
-    for (const dir of fresh) {
-      if (!currentSet.has(dir.toLowerCase())) {
-        current.push(dir);
-      }
-    }
-    process.env.PATH = current.join(";");
-  } catch {
-  }
+function setCurrentStep(step) {
+  currentStep = step;
 }
-function emit(level, msg) {
-  const { icon, color } = LOG_STYLES[level];
-  console.log(color(`  ${icon} `) + msg);
+function emit(level, msg, silent = false) {
+  if (!silent) {
+    const { icon, color } = LOG_STYLES[level];
+    console.log(color(`  ${icon} `) + msg);
+  }
   preflightLog.push({ level, step: currentStep, message: msg });
 }
 function header2(step) {
-  currentStep = step.toLowerCase().replace(/\s+/g, "-");
+  setCurrentStep(step.toLowerCase().replace(/\s+/g, "-"));
   console.log();
   console.log(source_default.bold.white(`  ${step}`));
   console.log(source_default.dim("  " + "\u2500".repeat(40)));
@@ -302524,69 +302498,74 @@ function runWithProgress(cmd, options2) {
     child2.on("error", () => finish(false));
   });
 }
-async function ensureGitBash() {
-  header2("Git");
-  const bashCheck = run("git --version", { timeout: 5e3 });
-  if (bashCheck.ok) {
-    ok2("Installed.");
-    return;
-  }
-  warn2("Git Bash not found.");
-  const confirmed = await promptConfirm(
-    "Install Git Bash for Windows? ShortcutXL needs this to work on your machine."
-  );
-  if (!confirmed) {
-    warn2("Skipped \u2014 the setup agent will help.");
-    return;
-  }
-  const wingetCheck = run("winget --version");
-  if (!wingetCheck.ok) {
-    log("Installing package manager...");
-    run(
-      'powershell -Command "Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe"',
-      { timeout: 6e4 }
+function refreshPath() {
+  try {
+    const user = spawnSync11("reg", ["query", "HKCU\\Environment", "/v", "Path"], {
+      encoding: "utf-8",
+      timeout: 5e3
+    });
+    const system = spawnSync11(
+      "reg",
+      [
+        "query",
+        "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment",
+        "/v",
+        "Path"
+      ],
+      { encoding: "utf-8", timeout: 5e3 }
     );
-    const retry = run("winget --version");
-    if (!retry.ok) {
-      warn2("Auto-install failed \u2014 the setup agent will help.");
-      return;
+    const extract = (out) => (out.match(/REG_(?:EXPAND_)?SZ\s+(.+)/i)?.[1] ?? "").split(";").map((p6) => p6.trim()).filter(Boolean);
+    const fresh = /* @__PURE__ */ new Set([...extract(system.stdout ?? ""), ...extract(user.stdout ?? "")]);
+    const current = (process.env.PATH ?? "").split(";").filter(Boolean);
+    const currentSet = new Set(current.map((p6) => p6.toLowerCase()));
+    for (const dir of fresh) {
+      if (!currentSet.has(dir.toLowerCase())) {
+        current.push(dir);
+      }
     }
+    process.env.PATH = current.join(";");
+  } catch {
   }
-  log("Installing Git (you may see a permissions prompt \u2014 click Yes)...");
-  const result = await runWithProgress(
-    "winget install --id Git.Git -e -h --accept-source-agreements --accept-package-agreements",
-    { timeout: 3e5, label: "Installing Git" }
-  );
-  if (!result.ok && !result.stdout.includes("already installed")) {
-    warn2("Install failed \u2014 the setup agent will help.");
-    return;
-  }
-  refreshPath();
-  resetShellConfig();
-  const gitCheck = run("git --version");
-  if (!gitCheck.ok) {
-    warn2("Installed but not detected yet \u2014 try restarting your terminal.");
-    return;
-  }
-  ok2("Installed.");
 }
+var preflightLog, currentStep, LOG_STYLES, log, ok2, note, SPINNER_FRAMES;
+var init_preflight_utils = __esm({
+  "src/custom/preflight-utils.ts"() {
+    "use strict";
+    init_source();
+    preflightLog = [];
+    currentStep = "setup";
+    LOG_STYLES = {
+      info: { icon: "\u2192", color: source_default.cyan },
+      ok: { icon: "\u2713", color: source_default.green },
+      warn: { icon: "\u26A0", color: source_default.yellow }
+    };
+    log = (msg) => emit("info", msg);
+    ok2 = (msg) => emit("ok", msg);
+    note = (msg) => emit("info", msg, true);
+    SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  }
+});
+
+// src/custom/preflight.ts
+import { existsSync as existsSync24, readFileSync as readFileSync24, writeFileSync as writeFileSync10 } from "fs";
+import { join as join32, resolve as resolve12 } from "path";
 async function ensurePipPackages() {
   header2("Python Packages");
   const pythonExe = getEmbeddedPythonExe();
   if (!existsSync24(pythonExe)) {
-    warn2("Embedded Python not found \u2014 the setup agent will help.");
+    log("Shortcut agent will set up Python.");
     return;
   }
   const versionCheck = run(`"${pythonExe}" --version`);
   if (versionCheck.ok) {
     ok2(versionCheck.stdout);
   } else {
-    warn2("Embedded Python failed to run \u2014 the setup agent will help.");
+    log("Shortcut agent will configure Python.");
     return;
   }
   const pipCheck = run(`"${pythonExe}" -m pip --version`);
   if (!pipCheck.ok) {
-    warn2("pip not found in embedded Python \u2014 the setup agent will help.");
+    log("Shortcut agent will configure pip.");
     return;
   }
   const pipStampFile = join32(getStableXllDir(), ".pip-version");
@@ -302611,27 +302590,31 @@ async function ensurePipPackages() {
     } catch {
     }
   } else {
-    warn2("Package install had issues \u2014 the setup agent will help.");
+    log("Shortcut agent will finish installing packages.");
   }
 }
-async function ensureChrome() {
+function ensureChromeMac() {
   header2("Chrome");
-  const pythonExe = getEmbeddedPythonExe();
-  const chromeCheck = runPS(`
-    $path = (Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe' -ErrorAction SilentlyContinue).'(default)'
-    if ($path -and (Test-Path $path)) { Write-Output 'FOUND' } else { Write-Output 'MISSING' }
-  `);
-  const hasSystemChrome = chromeCheck.ok && chromeCheck.stdout.includes("FOUND");
+  if (existsSync24("/Applications/Google Chrome.app")) {
+    ok2("Chrome found \u2014 SEC filing support ready.");
+  } else {
+    log("Chrome not installed \u2014 Shortcut agent can set this up for SEC filing support.");
+  }
+}
+async function ensureChromeWindows() {
+  header2("Chrome");
+  const hasSystemChrome = detectChromeWindows();
   if (hasSystemChrome) {
     ok2("Chrome found \u2014 SEC filing support ready.");
     return;
   }
+  const pythonExe = getEmbeddedPythonExe();
   if (!existsSync24(pythonExe)) {
-    warn2("Chrome not found and embedded Python unavailable \u2014 the setup agent will help.");
+    log("Shortcut agent will set up Chrome.");
     return;
   }
   const installChrome = await promptConfirm(
-    "Chrome not found. Install it? (Required for SEC filing PDF conversion)"
+    "Install Chrome? (Used for SEC filing PDF conversion)"
   );
   if (installChrome) {
     log("Installing Chrome for PDF conversion...");
@@ -302642,17 +302625,84 @@ async function ensureChrome() {
     if (pwResult.ok) {
       ok2("Browser installed.");
     } else {
-      warn2("Browser install had issues \u2014 the setup agent will help.");
+      log("Shortcut agent will finish setting up Chrome.");
     }
   } else {
     ok2("Skipped \u2014 can be installed later if needed.");
   }
 }
+function detectChromeWindows() {
+  const chromeCheck = runPS(`
+    $path = (Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe' -ErrorAction SilentlyContinue).'(default)'
+    if ($path -and (Test-Path $path)) { Write-Output 'FOUND' } else { Write-Output 'MISSING' }
+  `);
+  return chromeCheck.ok && chromeCheck.stdout.includes("FOUND");
+}
+function ensureNewSheet() {
+  header2("Sheet Engine");
+  const settingsPath = getSettingsPath();
+  let settings = {};
+  try {
+    settings = JSON.parse(readFileSync24(settingsPath, "utf-8"));
+  } catch {
+  }
+  if (settings.newSheet === true) {
+    ok2("Headless sheet engine already enabled.");
+    return;
+  }
+  settings.newSheet = true;
+  writeFileSync10(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+  ok2("Headless sheet engine enabled.");
+}
+async function ensureGitBash() {
+  header2("Git");
+  const bashCheck = run("git --version", { timeout: 5e3 });
+  if (bashCheck.ok) {
+    ok2("Installed.");
+    return;
+  }
+  log("Git not found.");
+  const confirmed = await promptConfirm("Install Git for Windows?");
+  if (!confirmed) {
+    log("Shortcut agent will set up Git.");
+    return;
+  }
+  const wingetCheck = run("winget --version");
+  if (!wingetCheck.ok) {
+    log("Installing package manager...");
+    run(
+      'powershell -Command "Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe"',
+      { timeout: 6e4 }
+    );
+    const retry = run("winget --version");
+    if (!retry.ok) {
+      log("Shortcut agent will set up the package manager.");
+      return;
+    }
+  }
+  log("Installing Git (you may see a permissions prompt \u2014 click Yes)...");
+  const result = await runWithProgress(
+    "winget install --id Git.Git -e -h --accept-source-agreements --accept-package-agreements",
+    { timeout: 3e5, label: "Installing Git" }
+  );
+  if (!result.ok && !result.stdout.includes("already installed")) {
+    log("Shortcut agent will finish installing Git.");
+    return;
+  }
+  refreshPath();
+  resetShellConfig();
+  const gitCheck = run("git --version");
+  if (!gitCheck.ok) {
+    log("Git installed \u2014 Shortcut agent will verify the setup.");
+    return;
+  }
+  ok2("Installed.");
+}
 function ensureXllRegistry() {
   header2("Excel Add-in");
   const xllPath = resolve12(getXllPath()).replace(/\//g, "\\");
   if (!existsSync24(xllPath)) {
-    warn2("Add-in file not found \u2014 the setup agent will help.");
+    log("Shortcut agent will set up the Excel add-in.");
     return;
   }
   const safeXllPath = escapePSString(xllPath);
@@ -302710,10 +302760,10 @@ function ensureXllRegistry() {
   } else if (result.stdout.includes("REGISTERED:")) {
     ok2("Registered with Excel.");
   } else if (result.stdout.includes("NO_OFFICE")) {
-    warn2("Excel not found \u2014 the setup agent will help.");
+    log("Shortcut agent will configure Excel.");
   } else {
-    warn2("Registration failed \u2014 the setup agent will help.");
-    if (result.stderr) log(source_default.dim(result.stderr));
+    log("Shortcut agent will finish add-in registration.");
+    if (result.stderr) note(result.stderr);
   }
 }
 async function ensureExcelAndXll() {
@@ -302730,8 +302780,7 @@ async function ensureExcelAndXll() {
   const tasklist = run('tasklist /FI "IMAGENAME eq EXCEL.EXE" /NH');
   const excelRunning = tasklist.ok && tasklist.stdout.includes("EXCEL.EXE");
   if (excelRunning) {
-    warn2("Excel is running but ShortcutXL is not loaded.");
-    log("Please close Excel completely, then reopen it.");
+    log("Excel is running \u2014 please close and reopen it so the add-in loads.");
   } else {
     log("Please open Excel.");
   }
@@ -302755,23 +302804,23 @@ async function ensureExcelAndXll() {
     }
   }
   process.stderr.write("\r\x1B[K");
-  warn2("ShortcutXL did not start \u2014 the setup agent will help.");
+  log("Shortcut agent will finish connecting to Excel.");
 }
 async function verifyXllConfig() {
   const expectedModulesDir = resolve12(getStableXllDir(), "modules");
   const config = await fetchExcelConfig({ maxRetries: 2, intervalMs: 1e3 });
   if (!config) {
-    warn2("Could not verify add-in config.");
+    log("Shortcut agent will verify the add-in config.");
     return;
   }
   const actualModules = resolve12(config.modulesPath);
   if (actualModules !== expectedModulesDir) {
-    warn2("Add-in config mismatch \u2014 the setup agent will help.");
+    log("Shortcut agent will update the add-in config.");
     return;
   }
   ok2("Add-in config verified.");
 }
-async function smokeTest() {
+async function smokeTestExcel() {
   header2("Connection Test");
   log("Verifying Excel connection...");
   const MAX_ATTEMPTS = 3;
@@ -302790,7 +302839,8 @@ async function smokeTest() {
           await new Promise((r6) => setTimeout(r6, 2e3));
           continue;
         }
-        warn2(`Connection error (${res.status}).`);
+        log("Shortcut agent will troubleshoot the connection.");
+        note(`HTTP status ${res.status}`);
         return false;
       }
       const data2 = await res.json();
@@ -302800,7 +302850,8 @@ async function smokeTest() {
           await new Promise((r6) => setTimeout(r6, 2e3));
           continue;
         }
-        warn2(`Connection failed: ${data2.error}`);
+        log("Shortcut agent will troubleshoot Excel.");
+        note(data2.error);
         return false;
       }
       ok2(data2.output?.trim() ?? "Connected");
@@ -302810,7 +302861,8 @@ async function smokeTest() {
         await new Promise((r6) => setTimeout(r6, 2e3));
         continue;
       }
-      warn2(`Connection failed: ${e6 instanceof Error ? e6.message : e6}`);
+      log("Shortcut agent will troubleshoot the connection.");
+      note(e6 instanceof Error ? e6.message : String(e6));
       return false;
     }
   }
@@ -302818,25 +302870,29 @@ async function smokeTest() {
 }
 async function runPreflight() {
   preflightLog.length = 0;
-  currentStep = "setup";
+  setCurrentStep("setup");
   console.log();
   console.log(source_default.bold.white("  Setting up ShortcutXL..."));
   console.log(source_default.dim("  " + "\u2500".repeat(40)));
-  if (process.platform === "win32") {
+  let passed;
+  if (process.platform === "darwin") {
+    ensureChromeMac();
+    ensureNewSheet();
+    passed = true;
+  } else {
     await ensureGitBash();
+    await ensurePipPackages();
+    await ensureChromeWindows();
+    ensureXllRegistry();
+    await ensureExcelAndXll();
+    passed = await smokeTestExcel();
   }
-  await ensurePipPackages();
-  await ensureChrome();
-  ensureXllRegistry();
-  await ensureExcelAndXll();
-  const passed = await smokeTest();
-  currentStep = "summary";
+  setCurrentStep("summary");
   console.log();
-  passed ? ok2("Preflight complete.") : warn2("Some steps need attention \u2014 the setup agent will help.");
+  passed ? ok2("Preflight complete.") : log("Shortcut agent will finish the remaining setup.");
   console.log();
   return { passed, log: [...preflightLog] };
 }
-var preflightLog, currentStep, LOG_STYLES, log, ok2, warn2, SPINNER_FRAMES;
 var init_preflight = __esm({
   "src/custom/preflight.ts"() {
     "use strict";
@@ -302847,18 +302903,8 @@ var init_preflight = __esm({
     init_excel_config();
     init_excel_session();
     init_install_utils();
+    init_preflight_utils();
     init_sync_xll();
-    preflightLog = [];
-    currentStep = "setup";
-    LOG_STYLES = {
-      info: { icon: "\u2192", color: source_default.cyan },
-      ok: { icon: "\u2713", color: source_default.green },
-      warn: { icon: "\u26A0", color: source_default.yellow }
-    };
-    log = (msg) => emit("info", msg);
-    ok2 = (msg) => emit("ok", msg);
-    warn2 = (msg) => emit("warn", msg);
-    SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   }
 });
 
@@ -305817,43 +305863,6 @@ var init_sandbox = __esm({
   }
 });
 
-// src/custom/tools/render-helpers.ts
-function highlightCode2(code, lang) {
-  const validLang = lang && (0, import_cli_highlight2.supportsLanguage)(lang) ? lang : void 0;
-  const cliTheme = {
-    keyword: (s7) => theme.fg("syntaxKeyword", s7),
-    built_in: (s7) => theme.fg("syntaxType", s7),
-    literal: (s7) => theme.fg("syntaxNumber", s7),
-    number: (s7) => theme.fg("syntaxNumber", s7),
-    string: (s7) => theme.fg("syntaxString", s7),
-    comment: (s7) => theme.fg("syntaxComment", s7),
-    function: (s7) => theme.fg("syntaxFunction", s7),
-    title: (s7) => theme.fg("syntaxFunction", s7),
-    class: (s7) => theme.fg("syntaxType", s7),
-    type: (s7) => theme.fg("syntaxType", s7),
-    attr: (s7) => theme.fg("syntaxVariable", s7),
-    variable: (s7) => theme.fg("syntaxVariable", s7),
-    params: (s7) => theme.fg("syntaxVariable", s7),
-    operator: (s7) => theme.fg("syntaxOperator", s7),
-    punctuation: (s7) => theme.fg("syntaxPunctuation", s7)
-  };
-  try {
-    return (0, import_cli_highlight2.highlight)(code, { language: validLang, ignoreIllegals: true, theme: cliTheme }).split(
-      "\n"
-    );
-  } catch {
-    return code.split("\n");
-  }
-}
-var import_cli_highlight2;
-var init_render_helpers = __esm({
-  "src/custom/tools/render-helpers.ts"() {
-    "use strict";
-    import_cli_highlight2 = __toESM(require_dist15(), 1);
-    init_theme();
-  }
-});
-
 // src/custom/tools/bash-approval.ts
 var BashApprovalComponent;
 var init_bash_approval = __esm({
@@ -305861,7 +305870,6 @@ var init_bash_approval = __esm({
     "use strict";
     init_tui2();
     init_approval();
-    init_render_helpers();
     BashApprovalComponent = class extends Container {
       buttonBar;
       onDone;
@@ -305870,13 +305878,10 @@ var init_bash_approval = __esm({
         this.onDone = onDone;
         const borderColor = (s7) => theme2.fg("border", s7);
         this.addChild(new Border(borderColor));
-        this.addChild(new Text(theme2.bold(theme2.fg("accent", " Review Command")), 0, 0));
-        if (data2.description) {
-          this.addChild(new Text("  " + theme2.fg("dim", data2.description), 0, 0));
-        }
+        const header3 = data2.description ? theme2.fg("accent", " Review changes") + theme2.fg("dim", " \u2013 ") + data2.description : theme2.fg("accent", " Review changes");
+        this.addChild(new Text(header3, 0, 0));
         this.addChild(new Spacer(1));
-        const highlighted = highlightCode2(data2.command, "bash");
-        this.addChild(new Text(highlighted.map((line) => "  " + line).join("\n"), 0, 0));
+        this.addChild(new Text("  " + theme2.fg("dim", data2.command), 0, 0));
         this.addChild(new Spacer(1));
         this.buttonBar = new ApprovalButtonBar(theme2);
         this.addChild(this.buttonBar.getContainer());
@@ -306060,6 +306065,43 @@ var init_excel_range = __esm({
   }
 });
 
+// src/custom/tools/render-helpers.ts
+function highlightCode2(code, lang) {
+  const validLang = lang && (0, import_cli_highlight2.supportsLanguage)(lang) ? lang : void 0;
+  const cliTheme = {
+    keyword: (s7) => theme.fg("syntaxKeyword", s7),
+    built_in: (s7) => theme.fg("syntaxType", s7),
+    literal: (s7) => theme.fg("syntaxNumber", s7),
+    number: (s7) => theme.fg("syntaxNumber", s7),
+    string: (s7) => theme.fg("syntaxString", s7),
+    comment: (s7) => theme.fg("syntaxComment", s7),
+    function: (s7) => theme.fg("syntaxFunction", s7),
+    title: (s7) => theme.fg("syntaxFunction", s7),
+    class: (s7) => theme.fg("syntaxType", s7),
+    type: (s7) => theme.fg("syntaxType", s7),
+    attr: (s7) => theme.fg("syntaxVariable", s7),
+    variable: (s7) => theme.fg("syntaxVariable", s7),
+    params: (s7) => theme.fg("syntaxVariable", s7),
+    operator: (s7) => theme.fg("syntaxOperator", s7),
+    punctuation: (s7) => theme.fg("syntaxPunctuation", s7)
+  };
+  try {
+    return (0, import_cli_highlight2.highlight)(code, { language: validLang, ignoreIllegals: true, theme: cliTheme }).split(
+      "\n"
+    );
+  } catch {
+    return code.split("\n");
+  }
+}
+var import_cli_highlight2;
+var init_render_helpers = __esm({
+  "src/custom/tools/render-helpers.ts"() {
+    "use strict";
+    import_cli_highlight2 = __toESM(require_dist15(), 1);
+    init_theme();
+  }
+});
+
 // src/custom/tools/excel-exec.ts
 function isExcelExecResult(v7) {
   if (typeof v7 !== "object" || v7 === null || !("ok" in v7)) return false;
@@ -400535,10 +400577,10 @@ var require_typescript3 = __commonJS({
             logMessage(1, s7);
           }
           _log.error = error22;
-          function warn3(s7) {
+          function warn2(s7) {
             logMessage(2, s7);
           }
-          _log.warn = warn3;
+          _log.warn = warn2;
           function log22(s7) {
             logMessage(3, s7);
           }
@@ -594564,8 +594606,8 @@ ${options2.prefix}` : "\n" : options2.prefix
         const warnAfter = typeof options2.warnAfter === "string" ? new Version(options2.warnAfter) : options2.warnAfter;
         const since = typeof options2.since === "string" ? new Version(options2.since) : options2.since ?? warnAfter;
         const error22 = options2.error || errorAfter && version2.compareTo(errorAfter) >= 0;
-        const warn3 = !warnAfter || version2.compareTo(warnAfter) >= 0;
-        return error22 ? createErrorDeprecation(name, errorAfter, since, options2.message) : warn3 ? createWarningDeprecation(name, errorAfter, since, options2.message) : noop5;
+        const warn2 = !warnAfter || version2.compareTo(warnAfter) >= 0;
+        return error22 ? createErrorDeprecation(name, errorAfter, since, options2.message) : warn2 ? createWarningDeprecation(name, errorAfter, since, options2.message) : noop5;
       }
       function wrapFunction(deprecation, func) {
         return function() {