@qodalis/cli 2.0.0-beta.16 → 2.0.0-beta.17

package/public-api.js

@@ -1,13 +1,13 @@
 'use strict';
 
 var cliCore = require('@qodalis/cli-core');
-var rxjs = require('rxjs');
-var operators = require('rxjs/operators');
 var xterm = require('@xterm/xterm');
 var addonFit = require('@xterm/addon-fit');
 var addonWebLinks = require('@xterm/addon-web-links');
 var addonUnicode11 = require('@xterm/addon-unicode11');
 var addonSerialize = require('@xterm/addon-serialize');
+var rxjs = require('rxjs');
+var operators = require('rxjs/operators');
 
 // src/lib/parsers/command-parser.ts
 var CommandParser = class {
@@ -413,7 +413,7 @@ var CliKeyValueStore_TOKEN = "cli-key-value-store";
 var SyntaxHighlighterRegistry_TOKEN = "syntax-highlighter-registry";
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-beta.16";
+var LIBRARY_VERSION = "2.0.0-beta.17";
 var API_VERSION = 2;
 var ANONYMOUS = "\0anonymous";
 function aliasOwner(context2) {
@@ -2699,6 +2699,150 @@ var CliYesCommandProcessor = class {
     );
   }
 };
+
+// src/lib/addons/overlay.ts
+var OverlayAddon = class {
+  constructor() {
+    this.overlayNode = document.createElement("div");
+    this.overlayNode.style.cssText = `border-radius: 15px;
+font-size: xx-large;
+opacity: 0.75;
+padding: 0.2em 0.5em 0.2em 0.5em;
+position: absolute;
+-webkit-user-select: none;
+-webkit-transition: opacity 180ms ease-in;
+-moz-user-select: none;
+-moz-transition: opacity 180ms ease-in;`;
+    this.overlayNode.addEventListener(
+      "mousedown",
+      (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+      },
+      true
+    );
+  }
+  activate(terminal) {
+    this.terminal = terminal;
+  }
+  dispose() {
+  }
+  showOverlay(msg, timeout) {
+    const { terminal, overlayNode } = this;
+    if (!terminal.element) return;
+    overlayNode.style.color = "#101010";
+    overlayNode.style.backgroundColor = "#f0f0f0";
+    overlayNode.textContent = msg;
+    overlayNode.style.opacity = "0.75";
+    if (!overlayNode.parentNode) {
+      terminal.element.appendChild(overlayNode);
+    }
+    const divSize = terminal.element.getBoundingClientRect();
+    const overlaySize = overlayNode.getBoundingClientRect();
+    overlayNode.style.top = (divSize.height - overlaySize.height) / 2 + "px";
+    overlayNode.style.left = (divSize.width - overlaySize.width) / 2 + "px";
+    if (this.overlayTimeout) clearTimeout(this.overlayTimeout);
+    if (!timeout) return;
+    this.overlayTimeout = window.setTimeout(() => {
+      overlayNode.style.opacity = "0";
+      this.overlayTimeout = window.setTimeout(() => {
+        if (overlayNode.parentNode) {
+          overlayNode.parentNode.removeChild(overlayNode);
+        }
+        this.overlayTimeout = void 0;
+        overlayNode.style.opacity = "0.75";
+      }, 200);
+    }, timeout || 1500);
+  }
+};
+var CliDragDropService = class {
+  constructor(_container) {
+    this._container = _container;
+    this._subject = new rxjs.Subject();
+    this._dragOver = (e) => e.preventDefault();
+    this._drop = (e) => {
+      e.preventDefault();
+      const files = Array.from(e.dataTransfer?.files ?? []);
+      if (files.length > 0) {
+        this._subject.next(files);
+      }
+    };
+    this._container.addEventListener("dragover", this._dragOver);
+    this._container.addEventListener("drop", this._drop);
+  }
+  get onFileDrop() {
+    return this._subject.asObservable();
+  }
+  destroy() {
+    this._container.removeEventListener("dragover", this._dragOver);
+    this._container.removeEventListener("drop", this._drop);
+    this._subject.complete();
+  }
+};
+
+// src/lib/engine/cli-terminal-setup.ts
+var NARROW_VIEWPORT = 640;
+function defaultFontSize() {
+  const width = typeof window !== "undefined" ? window.innerWidth : 0;
+  return width > 0 && width <= NARROW_VIEWPORT ? 14 : 20;
+}
+function getTerminalOptions(userOptions) {
+  return {
+    cursorBlink: true,
+    allowProposedApi: true,
+    fontSize: defaultFontSize(),
+    theme: cliCore.DefaultThemes.default,
+    convertEol: true,
+    ...userOptions ?? {}
+  };
+}
+function initializeTerminal(container, opts) {
+  const terminal = new xterm.Terminal(opts);
+  const fitAddon = new addonFit.FitAddon();
+  terminal.loadAddon(fitAddon);
+  terminal.loadAddon(new addonWebLinks.WebLinksAddon());
+  terminal.loadAddon(new OverlayAddon());
+  terminal.loadAddon(new addonUnicode11.Unicode11Addon());
+  const serializeAddon = new addonSerialize.SerializeAddon();
+  terminal.loadAddon(serializeAddon);
+  terminal.open(container);
+  fitAddon.fit();
+  requestAnimationFrame(() => fitAddon.fit());
+  if (document.fonts?.ready) {
+    document.fonts.ready.then(() => {
+      requestAnimationFrame(() => fitAddon.fit());
+    });
+  }
+  container.classList.add("terminal-container");
+  container.style.background = opts.theme?.background ?? "#000";
+  const wheelListener = (e) => e.preventDefault();
+  container.addEventListener("wheel", wheelListener, { passive: false });
+  terminal.focus();
+  const dragDropService = new CliDragDropService(container);
+  return { terminal, fitAddon, serializeAddon, dragDropService, wheelListener };
+}
+var LAYOUT_TIMEOUT_MS = 1e4;
+function waitForLayout(container) {
+  return new Promise((resolve, reject) => {
+    const deadline = Date.now() + LAYOUT_TIMEOUT_MS;
+    const check = () => {
+      if (container.offsetWidth > 0 && container.offsetHeight > 0) {
+        resolve();
+        return;
+      }
+      if (Date.now() >= deadline) {
+        reject(new Error(
+          `CliEngine.start(): container has zero dimensions after ${LAYOUT_TIMEOUT_MS}ms. Ensure the container element is visible and laid out before calling start().`
+        ));
+        return;
+      }
+      requestAnimationFrame(check);
+    };
+    check();
+  });
+}
+
+// src/lib/processors/configure/cli-configure-command-processor.ts
 var SYSTEM_OPTIONS = [
   {
     key: "logLevel",
@@ -2775,7 +2919,7 @@ var SYSTEM_OPTIONS = [
     label: "Font Size",
     description: "Terminal font size in pixels",
     type: "number",
-    defaultValue: 20,
+    defaultValue: defaultFontSize(),
     validator: (value) => {
       if (value < 8 || value > 40) {
         return { valid: false, message: "Font size must be between 8 and 40" };
@@ -2855,7 +2999,7 @@ var CliConfigureCommandProcessor = class _CliConfigureCommandProcessor {
   async initialize(context2) {
     const state = context2.state.getState();
     if (state?.system) {
-      this.applySystemSettings(state.system, context2);
+      this.applySystemSettings(state.system, context2, true);
     }
   }
   writeDescription(context2) {
@@ -3090,7 +3234,11 @@ var CliConfigureCommandProcessor = class _CliConfigureCommandProcessor {
     }
     return result;
   }
-  applySystemSettings(settings, context2) {
+  /**
+   * @param onBoot at startup, terminal options still at their default are skipped so the
+   *               host's `terminalOptions` (e.g. its own fontSize) are not overridden.
+   */
+  applySystemSettings(settings, context2, onBoot = false) {
     if (settings["logLevel"]) {
       const level = LOG_LEVEL_MAP[settings["logLevel"]];
       if (level !== void 0) {
@@ -3104,23 +3252,29 @@ var CliConfigureCommandProcessor = class _CliConfigureCommandProcessor {
       translator?.setLocale(settings["language"]);
     }
     if (context2.terminal?.options) {
-      if (settings["cursorBlink"] !== void 0) {
-        context2.terminal.options.cursorBlink = settings["cursorBlink"];
+      const terminal = onBoot ? Object.fromEntries(
+        Object.entries(settings).filter(([key, value]) => {
+          const option = SYSTEM_OPTIONS.find((o) => o.key === key);
+          return !option || value !== option.defaultValue;
+        })
+      ) : settings;
+      if (terminal["cursorBlink"] !== void 0) {
+        context2.terminal.options.cursorBlink = terminal["cursorBlink"];
       }
-      if (settings["cursorStyle"]) {
-        context2.terminal.options.cursorStyle = settings["cursorStyle"];
+      if (terminal["cursorStyle"]) {
+        context2.terminal.options.cursorStyle = terminal["cursorStyle"];
       }
-      if (settings["scrollback"] !== void 0) {
-        context2.terminal.options.scrollback = settings["scrollback"];
+      if (terminal["scrollback"] !== void 0) {
+        context2.terminal.options.scrollback = terminal["scrollback"];
       }
-      if (settings["fontSize"] !== void 0) {
-        context2.terminal.options.fontSize = settings["fontSize"];
+      if (terminal["fontSize"] !== void 0) {
+        context2.terminal.options.fontSize = terminal["fontSize"];
       }
-      if (settings["fontFamily"]) {
-        context2.terminal.options.fontFamily = settings["fontFamily"];
+      if (terminal["fontFamily"]) {
+        context2.terminal.options.fontFamily = terminal["fontFamily"];
       }
-      if (settings["smoothScrollDuration"] !== void 0) {
-        context2.terminal.options.smoothScrollDuration = settings["smoothScrollDuration"];
+      if (terminal["smoothScrollDuration"] !== void 0) {
+        context2.terminal.options.smoothScrollDuration = terminal["smoothScrollDuration"];
       }
     }
   }
@@ -3718,6 +3872,7 @@ var CliHelpCommandProcessor = class {
           return 0;
         }
       );
+      const narrow = isNarrow(context2);
       sortedModules.forEach(([module, processors]) => {
         const displayName = this.formatModuleName(module);
         writer.writeln(
@@ -3726,7 +3881,7 @@ var CliHelpCommandProcessor = class {
         processors.forEach((processor) => {
           const icon = processor?.metadata?.icon || cliCore.CliIcon.Extension;
           const name = writer.wrapInColor(
-            processor.command.padEnd(20),
+            narrow ? processor.command : processor.command.padEnd(20),
             cliCore.CliForegroundColor.Cyan
           );
           const aliasText = processor.aliases?.length ? `${DIM} ${processor.aliases.join(", ")}${RESET}` : "";
@@ -3735,6 +3890,11 @@ var CliHelpCommandProcessor = class {
             processor.command,
             context2
           );
+          if (narrow) {
+            writer.writeln(`  ${icon} ${name}${aliasText}`);
+            writer.writeln(`      ${desc}`);
+            return;
+          }
           writer.writeln(`    ${icon}  ${name} ${desc}${aliasText}`);
         });
         writer.writeln();
@@ -3844,9 +4004,10 @@ var CliHelpCommandProcessor = class {
       writer.writeln(
         `  ${BOLD}${writer.wrapInColor(t.t("cli.help.subcommands", "Subcommands"), cliCore.CliForegroundColor.Yellow)}${RESET}`
       );
+      const narrow = isNarrow(context2);
       processor.processors.forEach((sub) => {
         const subName = writer.wrapInColor(
-          sub.command.padEnd(16),
+          narrow ? sub.command : sub.command.padEnd(16),
           cliCore.CliForegroundColor.Cyan
         );
         const subAliases = sub.aliases?.length ? `${DIM} (${sub.aliases.join(", ")})${RESET}` : "";
@@ -3855,6 +4016,11 @@ var CliHelpCommandProcessor = class {
           `${processor.command}.${sub.command}`,
           context2
         );
+        if (narrow) {
+          writer.writeln(`    ${subName}${subAliases}`);
+          writer.writeln(`      ${subDesc}`);
+          return;
+        }
         writer.writeln(
           `    ${subName} ${subDesc}${subAliases}`
         );
@@ -3868,7 +4034,7 @@ var CliHelpCommandProcessor = class {
         `  ${BOLD}${writer.wrapInColor(t.t("cli.help.options", "Options"), cliCore.CliForegroundColor.Yellow)}${RESET}`
       );
       commandParams.forEach((param) => {
-        this.writeParameter(param, writer, t);
+        this.writeParameter(param, writer, t, isNarrow(context2));
       });
     }
     if (globalParams.length > 0) {
@@ -3877,7 +4043,7 @@ var CliHelpCommandProcessor = class {
         `  ${BOLD}${writer.wrapInColor(t.t("cli.help.global_options", "Global options"), cliCore.CliForegroundColor.Yellow)}${RESET}`
       );
       globalParams.forEach((param) => {
-        this.writeParameter(param, writer, t);
+        this.writeParameter(param, writer, t, isNarrow(context2));
       });
     }
     if (processor.metadata?.requireServer) {
@@ -3899,7 +4065,7 @@ var CliHelpCommandProcessor = class {
     }
     return module.charAt(0).toUpperCase() + module.slice(1);
   }
-  writeParameter(param, writer, translator) {
+  writeParameter(param, writer, translator, narrow = false) {
     const aliases = param.aliases?.length ? `, ${param.aliases.map((a) => `-${a}`).join(", ")}` : "";
     const nameStr = writer.wrapInColor(
       `--${param.name}${aliases}`,
@@ -3908,11 +4074,19 @@ var CliHelpCommandProcessor = class {
     const typeStr = `${DIM}<${param.type}>${RESET}`;
     const required = param.required ? writer.wrapInColor(` ${translator.t("cli.help.required", "(required)")}`, cliCore.CliForegroundColor.Red) : "";
     const defaultVal = param.defaultValue !== void 0 && !param.required ? `${DIM} [${param.defaultValue}]${RESET}` : "";
+    if (narrow) {
+      writer.writeln(`    ${nameStr} ${typeStr}${required}${defaultVal}`);
+      writer.writeln(`      ${param.description}`);
+      return;
+    }
     writer.writeln(
       `    ${nameStr} ${typeStr}  ${param.description}${required}${defaultVal}`
     );
   }
 };
+function isNarrow(context2) {
+  return (context2.terminal?.cols ?? 80) < 60;
+}
 
 // src/lib/constants/index.ts
 var CLi_Name_Art_Full = `
@@ -9832,11 +10006,12 @@ function hexToRgb(hex) {
   const n = parseInt(m[1], 16);
   return { r: n >> 16 & 255, g: n >> 8 & 255, b: n & 255 };
 }
-function colorSwatch(hex) {
-  if (!hex) return "  ";
+function colorSwatch(hex, width = 2) {
+  const cell = " ".repeat(width);
+  if (!hex) return cell;
   const rgb = hexToRgb(hex);
-  if (!rgb) return "  ";
-  return `\x1B[48;2;${rgb.r};${rgb.g};${rgb.b}m  \x1B[0m`;
+  if (!rgb) return cell;
+  return `\x1B[48;2;${rgb.r};${rgb.g};${rgb.b}m${cell}\x1B[0m`;
 }
 function colorText(text, hex) {
   if (!hex) return text;
@@ -9903,11 +10078,20 @@ var CliThemeCommandProcessor = class {
               )
             );
             context2.writer.writeln();
+            const narrow = (context2.terminal?.cols ?? 80) < 60;
             for (const [name, info] of entries) {
               const active = name === currentName ? " (active)" : "";
               const swatches = PALETTE_KEYS.map(
                 (k) => colorSwatch(info.theme[k])
               ).join("");
+              if (narrow) {
+                const compact = PALETTE_KEYS.slice(0, 8).map((k) => colorSwatch(info.theme[k], 1)).join("");
+                context2.writer.writeln(
+                  `  ${compact} ${context2.writer.wrapInColor(name, cliCore.CliForegroundColor.Cyan)}${active}`
+                );
+                context2.writer.writeln(`    ${info.description}`);
+                continue;
+              }
               const nameLabel = context2.writer.wrapInColor(
                 name.padEnd(22),
                 cliCore.CliForegroundColor.Cyan
@@ -10609,37 +10793,106 @@ var CliPingCommandProcessor = class {
 var ICliEnvironment_TOKEN = "cli-environment";
 var CliEnvironment = class {
   constructor() {
-    this.vars = /* @__PURE__ */ new Map();
-    this.vars.set("SHELL", "/bin/sh");
-    this.vars.set("TERM", "xterm-256color");
-    this.vars.set("LANG", "en_US.UTF-8");
-    this.vars.set("PWD", "/");
-    this.vars.set("HOME", "/home/user");
-    this.vars.set("USER", "user");
-    this.vars.set("PATH", "/usr/local/bin:/usr/bin:/bin");
+    this.defaults = /* @__PURE__ */ new Map();
+    /** Variables computed on read; a user's own value wins over them. */
+    this.bound = /* @__PURE__ */ new Map();
+    this.profiles = /* @__PURE__ */ new Map();
+    this.profileKey = () => "";
+    this.defaults.set("SHELL", "/bin/sh");
+    this.defaults.set("TERM", "xterm-256color");
+    this.defaults.set("LANG", "en_US.UTF-8");
+    this.defaults.set("PWD", "/");
+    this.defaults.set("HOME", "/home/user");
+    this.defaults.set("USER", "user");
+    this.defaults.set("PATH", "/usr/local/bin:/usr/bin:/bin");
+  }
+  /** Compute a variable on every read; the seeded value is the fallback while it returns nothing. */
+  bind(name, resolver) {
+    this.bound.set(name, resolver);
+  }
+  /** Pick whose changes apply (the signed-in user's name, '' when signed out). */
+  setProfileResolver(resolver) {
+    this.profileKey = () => resolver() ?? "";
+  }
+  /** Restore saved profiles (replaces the ones in memory). */
+  load(snapshot) {
+    this.profiles.clear();
+    for (const [key, profile] of Object.entries(snapshot ?? {})) {
+      this.profiles.set(key, {
+        vars: new Map(Object.entries(profile?.vars ?? {})),
+        unset: new Set(profile?.unset ?? [])
+      });
+    }
+  }
+  snapshot() {
+    const result = {};
+    for (const [key, profile] of this.profiles) {
+      if (!profile.vars.size && !profile.unset.size) continue;
+      result[key] = { vars: Object.fromEntries(profile.vars), unset: [...profile.unset] };
+    }
+    return result;
   }
   get(name) {
-    return this.vars.get(name);
+    const profile = this.profiles.get(this.profileKey());
+    if (profile?.vars.has(name)) return profile.vars.get(name);
+    if (profile?.unset.has(name)) return void 0;
+    return this.bound.get(name)?.() || this.defaults.get(name);
   }
   set(name, value) {
-    this.vars.set(name, value);
+    const profile = this.currentProfile();
+    profile.unset.delete(name);
+    profile.vars.set(name, value);
+    this.onChange?.(this.snapshot());
   }
   unset(name) {
-    this.vars.delete(name);
+    const profile = this.currentProfile();
+    profile.vars.delete(name);
+    if (this.defaults.has(name) || this.bound.has(name)) profile.unset.add(name);
+    this.onChange?.(this.snapshot());
   }
   getAll() {
+    const profile = this.profiles.get(this.profileKey());
+    const names = /* @__PURE__ */ new Set([...this.defaults.keys(), ...this.bound.keys(), ...profile?.vars.keys() ?? []]);
     const result = {};
-    for (const [k, v] of this.vars) {
-      result[k] = v;
+    for (const name of names) {
+      const value = this.get(name);
+      if (value !== void 0) result[name] = value;
     }
     return result;
   }
   has(name) {
-    return this.vars.has(name);
+    return this.get(name) !== void 0;
+  }
+  currentProfile() {
+    const key = this.profileKey();
+    let profile = this.profiles.get(key);
+    if (!profile) {
+      profile = { vars: /* @__PURE__ */ new Map(), unset: /* @__PURE__ */ new Set() };
+      this.profiles.set(key, profile);
+    }
+    return profile;
   }
 };
 
 // src/lib/processors/cli-env-command-processor.ts
+var ASSIGNMENT = /([A-Za-z_][A-Za-z0-9_]*)=("[^"]*"|'[^']*'|\S*)/y;
+var NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+function parseAssignments(raw) {
+  const result = [];
+  for (const token of raw.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) ?? []) {
+    ASSIGNMENT.lastIndex = 0;
+    const match = ASSIGNMENT.exec(token);
+    if (match && ASSIGNMENT.lastIndex === token.length) {
+      const quoted = /^(["']).*\1$/.test(match[2]);
+      result.push({ name: match[1], value: quoted ? match[2].slice(1, -1) : match[2] });
+    } else if (NAME.test(token)) {
+      result.push({ name: token });
+    } else {
+      return null;
+    }
+  }
+  return result;
+}
 var CliExportCommandProcessor = class {
   constructor() {
     this.command = "export";
@@ -10647,6 +10900,21 @@ var CliExportCommandProcessor = class {
     this.author = cliCore.DefaultLibraryAuthor;
     this.acceptsRawInput = true;
     this.metadata = { icon: "\u{1F4E6}", module: "system" };
+    this.stateConfiguration = {
+      storeName: "environment",
+      initialState: { profiles: {} }
+    };
+  }
+  /** Restore saved variables and save every later change (export, unset, VAR=value). */
+  async initialize(context2) {
+    const env = context2.services.get(ICliEnvironment_TOKEN);
+    if (!(env instanceof CliEnvironment)) return;
+    const store = context2.state;
+    env.load(store.getState()?.profiles);
+    env.onChange = (profiles) => {
+      store.updateState({ profiles });
+      void store.persist();
+    };
   }
   async processCommand(command2, context2) {
     const env = context2.services.getRequired(
@@ -10663,20 +10931,21 @@ var CliExportCommandProcessor = class {
       }
       return;
     }
-    const match = raw.match(/^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
-    if (!match) {
+    const assignments = parseAssignments(raw);
+    if (!assignments?.length) {
       context2.writer.writeError(
         `export: invalid syntax: ${raw}`
       );
       context2.process.exit(1, { silent: true });
       return;
     }
-    const varName = match[1];
-    let varValue = match[2];
-    if (varValue.startsWith('"') && varValue.endsWith('"') || varValue.startsWith("'") && varValue.endsWith("'")) {
-      varValue = varValue.slice(1, -1);
+    for (const { name, value } of assignments) {
+      if (value !== void 0) {
+        env.set(name, value);
+      } else if (!env.has(name)) {
+        env.set(name, "");
+      }
     }
-    env.set(varName, varValue);
   }
   writeDescription(context2) {
     const { writer, translator: t } = context2;
@@ -10692,6 +10961,13 @@ var CliExportCommandProcessor = class {
     writer.writeln(
       `  ${writer.wrapInColor('export VAR="hello world"', cliCore.CliForegroundColor.Cyan)}  ${t.t("cli.export.set_spaces", "Set with spaces")}`
     );
+    writer.writeln(
+      `  ${writer.wrapInColor("export A=1 B=2", cliCore.CliForegroundColor.Cyan)}            ${t.t("cli.export.set_many", "Set several at once")}`
+    );
+    writer.writeln();
+    writer.writeln(
+      t.t("cli.export.saved", "Variables are saved for the signed-in user and used as $VAR or ${VAR} in commands.")
+    );
   }
 };
 var CliUnsetCommandProcessor = class {
@@ -10706,16 +10982,15 @@ var CliUnsetCommandProcessor = class {
     const env = context2.services.getRequired(
       ICliEnvironment_TOKEN
     );
-    const varName = (command2.value || "").trim();
-    if (!varName) {
+    const names = (command2.value || "").trim().split(/\s+/).filter(Boolean);
+    if (!names.length) {
       context2.writer.writeError("unset: missing variable name");
       context2.process.exit(1, { silent: true });
       return;
     }
-    if (!env.has(varName)) {
-      return;
+    for (const name of names) {
+      if (env.has(name)) env.unset(name);
     }
-    env.unset(varName);
   }
   writeDescription(context2) {
     const { writer, translator: t } = context2;
@@ -10723,7 +10998,7 @@ var CliUnsetCommandProcessor = class {
     writer.writeln();
     writer.writeln(t.t("cli.common.usage", "Usage:"));
     writer.writeln(
-      `  ${writer.wrapInColor("unset VAR", cliCore.CliForegroundColor.Cyan)}`
+      `  ${writer.wrapInColor("unset VAR [VAR...]", cliCore.CliForegroundColor.Cyan)}`
     );
   }
 };
@@ -10773,7 +11048,6 @@ var CliEnvCommandProcessor = class {
     );
   }
 };
-var DEFAULT_FONT_SIZE = 20;
 var MIN_FONT_SIZE = 8;
 var MAX_FONT_SIZE = 40;
 var STEP = 2;
@@ -10786,7 +11060,7 @@ var CliFontSizeCommandProcessor = class {
     this.metadata = { icon: cliCore.CliIcon.Settings, module: "system" };
     this.stateConfiguration = {
       storeName: "font-size",
-      initialState: { fontSize: DEFAULT_FONT_SIZE }
+      initialState: {}
     };
     this.processors = [
       {
@@ -10805,9 +11079,9 @@ var CliFontSizeCommandProcessor = class {
       },
       {
         command: "reset",
-        description: `Reset font size to default (${DEFAULT_FONT_SIZE}px)`,
+        description: "Reset font size to the default",
         processCommand: async (_, context2) => {
-          await this.setFontSize(context2, DEFAULT_FONT_SIZE);
+          await this.resetFontSize(context2);
         }
       },
       {
@@ -10831,6 +11105,7 @@ var CliFontSizeCommandProcessor = class {
     ];
   }
   async initialize(context2) {
+    this.hostFontSize = context2.terminal?.options?.fontSize;
     const state = context2.state.getState();
     if (state?.fontSize != null && context2.terminal?.options) {
       context2.terminal.options.fontSize = state.fontSize;
@@ -10851,7 +11126,7 @@ var CliFontSizeCommandProcessor = class {
       `  ${context2.writer.wrapInColor("font-size set <n>", cliCore.CliForegroundColor.Cyan)}    Set to exact size`
     );
     context2.writer.writeln(
-      `  ${context2.writer.wrapInColor("font-size reset", cliCore.CliForegroundColor.Cyan)}      Reset to default (${DEFAULT_FONT_SIZE}px)`
+      `  ${context2.writer.wrapInColor("font-size reset", cliCore.CliForegroundColor.Cyan)}      Reset to default (${this.getDefault()}px)`
     );
   }
   getCurrent(context2) {
@@ -10860,7 +11135,19 @@ var CliFontSizeCommandProcessor = class {
       return fromTerminal;
     }
     const state = context2.state.getState();
-    return state?.fontSize ?? DEFAULT_FONT_SIZE;
+    return state?.fontSize ?? this.getDefault();
+  }
+  getDefault() {
+    return this.hostFontSize ?? defaultFontSize();
+  }
+  async resetFontSize(context2) {
+    const size = this.getDefault();
+    if (context2.terminal?.options) {
+      context2.terminal.options.fontSize = size;
+    }
+    context2.state.updateState({ fontSize: void 0 });
+    await context2.state.persist();
+    context2.writer.writeSuccess(`Font size set to ${size}px`);
   }
   async setFontSize(context2, size) {
     const clamped = Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, size));
@@ -11811,6 +12098,7 @@ var CliTimerManager = class {
     this.managedTimers.clear();
   }
 };
+var MIN_READABLE_COLUMN = 8;
 var CliTerminalWriter = class {
   constructor(terminal) {
     this.terminal = terminal;
@@ -11942,6 +12230,24 @@ var CliTerminalWriter = class {
     const indent = "  ".repeat(level);
     this.writeln(`${indent}${text}`);
   }
+  /** One block per row, header names as keys; used when a table cannot fit the terminal. */
+  writeRecords(headers, rows) {
+    const keyWidth = Math.max(...headers.map((h) => cliCore.visibleLength(h)));
+    rows.forEach((row, index) => {
+      if (index > 0) this.write("\r\n");
+      headers.forEach((header, i) => {
+        const value = row[i] ?? "";
+        if (!header.trim()) {
+          if (value.trim()) this.write(`${value}\r
+`);
+          return;
+        }
+        const key = header + " ".repeat(keyWidth - cliCore.visibleLength(header));
+        this.write(`${this.wrapInColor(key, cliCore.CliForegroundColor.Yellow)} : ${value}\r
+`);
+      });
+    });
+  }
   writeTable(headers, rows, options) {
     const cols = this.terminal.cols;
     const naturalWidths = headers.map(
@@ -11979,6 +12285,11 @@ var CliTerminalWriter = class {
         used++;
       }
     }
+    const tooNarrow = colWidths.reduce((s, w) => s + w, 0) > Math.max(available, 0) || colWidths.some((w, i) => w < Math.min(naturalWidths[i], MIN_READABLE_COLUMN));
+    if (tooNarrow) {
+      this.writeRecords(headers, rows);
+      return;
+    }
     const truncateText = (text, maxWidth) => {
       const t = text ?? "";
       const vis = cliCore.visibleLength(t);
@@ -12416,6 +12727,10 @@ var InputModeBase = class {
    * Cut a line to the terminal width. Lines redrawn in place must stay on one row:
    * a wrapped line takes two rows and breaks the cursor-up arithmetic of the redraw.
    */
+  /** A prompt label without a trailing colon, for modes that append their own ": ". */
+  label(promptText) {
+    return promptText.replace(/:\s*$/, "");
+  }
   fitLine(text) {
     return cliCore.truncateToWidth(text, Math.max(1, this.host.getTerminalCols() - 1));
   }
@@ -12590,6 +12905,7 @@ var ConfirmInputMode = class extends InputModeBase {
   async handleInput(data) {
     if (data === "\r") {
       if (this.buffer === "") {
+        this.host.terminal.write(this.defaultValue ? "y" : "n");
         this.resolveAndPop(this.defaultValue);
       } else {
         const lower = this.buffer.toLowerCase();
@@ -12771,7 +13087,7 @@ var SelectInputMode = class extends InputModeBase {
     const selectedOpt = this.options.find((o) => o.value === value);
     const label = selectedOpt ? selectedOpt.label : value;
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.promptText} \x1B[36m${label}\x1B[0m`);
+    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.label(this.promptText)}: \x1B[36m${label}\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.resolveAndPop(value);
   }
@@ -12781,7 +13097,7 @@ var SelectInputMode = class extends InputModeBase {
   abort() {
     this.clearRenderedLines();
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.promptText} \x1B[2mcancelled\x1B[0m`);
+    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.label(this.promptText)}: \x1B[2mcancelled\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.abort();
   }
@@ -12942,15 +13258,15 @@ var SelectInputMode = class extends InputModeBase {
     if (this.selectOptions?.searchable) {
       if (this.filter.length > 0) {
         this.host.terminal.write(
-          this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}: ${this.filter}`)
+          this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: ${this.filter}`)
         );
       } else {
         this.host.terminal.write(
-          this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}: \x1B[2mType to filter...\x1B[0m`)
+          this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: \x1B[2mType to filter...\x1B[0m`)
         );
       }
     } else {
-      this.host.terminal.write(this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}:`));
+      this.host.terminal.write(this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}:`));
     }
   }
   /**
@@ -13122,7 +13438,7 @@ var InlineSelectInputMode = class extends InputModeBase {
     const selectedOpt = this.selectableOptions.find((o) => o.value === value);
     const label = selectedOpt ? selectedOpt.label : value;
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.promptText}: \x1B[36m${label}\x1B[0m`);
+    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.label(this.promptText)}: \x1B[36m${label}\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.resolveAndPop(value);
   }
@@ -13132,7 +13448,7 @@ var InlineSelectInputMode = class extends InputModeBase {
   abort() {
     this.clearExtraLines();
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.promptText}: \x1B[2mcancelled\x1B[0m`);
+    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.label(this.promptText)}: \x1B[2mcancelled\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.abort();
   }
@@ -13172,13 +13488,13 @@ var InlineSelectInputMode = class extends InputModeBase {
    * Get the prompt prefix string (without ANSI escapes for width calculation).
    */
   getPromptPrefix() {
-    return `? ${this.promptText}: `;
+    return `? ${this.label(this.promptText)}: `;
   }
   /**
    * Get the rendered prompt prefix (with ANSI color codes).
    */
   getRenderedPromptPrefix() {
-    return `\x1B[36m?\x1B[0m ${this.promptText}: `;
+    return `\x1B[36m?\x1B[0m ${this.label(this.promptText)}: `;
   }
   /**
    * Calculate the width needed for a single option.
@@ -13375,7 +13691,7 @@ var MultiSelectInputMode = class extends InputModeBase {
     });
     const summary = labels.length > 0 ? labels.join(", ") : "none";
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.promptText} \x1B[36m${summary}\x1B[0m`);
+    this.host.terminal.write(`\x1B[32m\u2714\x1B[0m ${this.label(this.promptText)}: \x1B[36m${summary}\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.resolveAndPop(value);
   }
@@ -13385,7 +13701,7 @@ var MultiSelectInputMode = class extends InputModeBase {
   abort() {
     this.clearRenderedLines();
     this.host.terminal.write("\x1B[2K\r");
-    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.promptText} \x1B[2mcancelled\x1B[0m`);
+    this.host.terminal.write(`\x1B[33m\u2718\x1B[0m ${this.label(this.promptText)}: \x1B[2mcancelled\x1B[0m`);
     this.host.terminal.write("\x1B[?25h");
     super.abort();
   }
@@ -13559,15 +13875,15 @@ var MultiSelectInputMode = class extends InputModeBase {
     if (this.selectOptions?.searchable) {
       if (this.filter.length > 0) {
         this.host.terminal.write(
-          this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}: ${this.filter}`)
+          this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: ${this.filter}`)
         );
       } else {
         this.host.terminal.write(
-          this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}: \x1B[2mType to filter...\x1B[0m`)
+          this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: \x1B[2mType to filter...\x1B[0m`)
         );
       }
     } else {
-      this.host.terminal.write(this.fitLine(`\x1B[36m?\x1B[0m ${this.promptText}:`));
+      this.host.terminal.write(this.fitLine(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}:`));
     }
   }
   /**
@@ -13902,13 +14218,13 @@ var FileInputMode = class extends InputModeBase {
       this.waiting = false;
       if (!results || this.isResolved) {
         this.host.terminal.write("\x1B[2K\r");
-        this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.promptText}: \x1B[2m(cancelled)\x1B[0m\r
+        this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: \x1B[2m(cancelled)\x1B[0m\r
 `);
         if (!this.isResolved) this.abort();
         return;
       }
       this.host.terminal.write("\x1B[2K\r");
-      this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.promptText}:\r
+      this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}:\r
 `);
       let totalSize = 0;
       for (const file of results) {
@@ -13926,7 +14242,7 @@ var FileInputMode = class extends InputModeBase {
       this.waiting = false;
       if (this.isResolved) return;
       this.host.terminal.write("\x1B[2K\r");
-      this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.promptText}: \x1B[31m(error)\x1B[0m\r
+      this.host.writeToTerminal(`\x1B[36m?\x1B[0m ${this.label(this.promptText)}: \x1B[31m(error)\x1B[0m\r
 `);
       this.abort();
     }
@@ -15396,7 +15712,7 @@ function substituteVars(input, variables) {
   );
   return result;
 }
-function expandEnvironmentVars(command2, context2) {
+function expandEnvironmentVars(command2, context2, lastExitCode) {
   const env = context2.services.get(ICliEnvironment_TOKEN);
   if (!env) {
     return command2;
@@ -15404,6 +15720,9 @@ function expandEnvironmentVars(command2, context2) {
   const parts = command2.split("'");
   for (let i = 0; i < parts.length; i++) {
     if (i % 2 === 0) {
+      if (lastExitCode !== void 0) {
+        parts[i] = parts[i].replace(/\$\?/g, String(lastExitCode));
+      }
       parts[i] = parts[i].replace(
         /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g,
         (_, name) => env.get(name) ?? ""
@@ -15412,17 +15731,30 @@ function expandEnvironmentVars(command2, context2) {
         /\$([A-Za-z_][A-Za-z0-9_]*)/g,
         (_, name) => env.get(name) ?? ""
       );
+      const home = env.get("HOME");
+      if (home) {
+        parts[i] = parts[i].replace(
+          /(^|\s)~(?=\/|\s|$)/g,
+          (match, before, offset) => i > 0 && offset === 0 && !before ? match : `${before}${home}`
+        );
+      }
     }
   }
   return parts.join("'");
 }
 
 // src/lib/executor/cli-command-executor.ts
+function toExitStatus(code) {
+  if (code === void 0) return 0;
+  return code < 0 ? 1 : code;
+}
 var CliCommandExecutor = class {
   constructor(registry) {
     this.registry = registry;
     this.commandParser = new CommandParser();
     this.globalParameters = [];
+    /** Exit status of the last command, expanded as `$?` (0 = success). */
+    this.lastExitCode = 0;
     this.registerGlobalParameter(versionGlobalParameter);
     this.registerGlobalParameter(helpGlobalParameter);
     this.registerGlobalParameter(contextGlobalParameter);
@@ -15526,6 +15858,7 @@ var CliCommandExecutor = class {
             rootContext
           );
           lastExitSuccess = context2.process.exitCode === void 0 || context2.process.exitCode === 0;
+          this.lastExitCode = toExitStatus(context2.process.exitCode);
           rootContext.lastCommandResult = {
             command: part.value,
             success: lastExitSuccess
@@ -15533,6 +15866,7 @@ var CliCommandExecutor = class {
           pipelineData = context2.process.data;
         } catch (e) {
           lastExitSuccess = false;
+          this.lastExitCode = 1;
           rootContext.lastCommandResult = {
             command: part.value,
             success: false
@@ -15548,7 +15882,7 @@ var CliCommandExecutor = class {
   }
   async executeSingleCommand(command2, data, context2) {
     const process = context2.process;
-    command2 = expandEnvironmentVars(command2, context2);
+    command2 = expandEnvironmentVars(command2, context2, this.lastExitCode);
     const assignMatch = command2.match(/^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
     if (assignMatch) {
       const env = context2.services.get(ICliEnvironment_TOKEN);
@@ -16604,30 +16938,6 @@ var CliDefaultPingServerService = class {
     return new Promise((resolve) => setTimeout(resolve, 2e3));
   }
 };
-var CliDragDropService = class {
-  constructor(_container) {
-    this._container = _container;
-    this._subject = new rxjs.Subject();
-    this._dragOver = (e) => e.preventDefault();
-    this._drop = (e) => {
-      e.preventDefault();
-      const files = Array.from(e.dataTransfer?.files ?? []);
-      if (files.length > 0) {
-        this._subject.next(files);
-      }
-    };
-    this._container.addEventListener("dragover", this._dragOver);
-    this._container.addEventListener("drop", this._drop);
-  }
-  get onFileDrop() {
-    return this._subject.asObservable();
-  }
-  destroy() {
-    this._container.removeEventListener("dragover", this._dragOver);
-    this._container.removeEventListener("drop", this._drop);
-    this._subject.complete();
-  }
-};
 
 // src/lib/services/cli-permission-registry.ts
 var CliPermissionRegistry = class {
@@ -16652,62 +16962,6 @@ var CliPermissionRegistry = class {
   }
 };
 
-// src/lib/addons/overlay.ts
-var OverlayAddon = class {
-  constructor() {
-    this.overlayNode = document.createElement("div");
-    this.overlayNode.style.cssText = `border-radius: 15px;
-font-size: xx-large;
-opacity: 0.75;
-padding: 0.2em 0.5em 0.2em 0.5em;
-position: absolute;
--webkit-user-select: none;
--webkit-transition: opacity 180ms ease-in;
--moz-user-select: none;
--moz-transition: opacity 180ms ease-in;`;
-    this.overlayNode.addEventListener(
-      "mousedown",
-      (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-      },
-      true
-    );
-  }
-  activate(terminal) {
-    this.terminal = terminal;
-  }
-  dispose() {
-  }
-  showOverlay(msg, timeout) {
-    const { terminal, overlayNode } = this;
-    if (!terminal.element) return;
-    overlayNode.style.color = "#101010";
-    overlayNode.style.backgroundColor = "#f0f0f0";
-    overlayNode.textContent = msg;
-    overlayNode.style.opacity = "0.75";
-    if (!overlayNode.parentNode) {
-      terminal.element.appendChild(overlayNode);
-    }
-    const divSize = terminal.element.getBoundingClientRect();
-    const overlaySize = overlayNode.getBoundingClientRect();
-    overlayNode.style.top = (divSize.height - overlaySize.height) / 2 + "px";
-    overlayNode.style.left = (divSize.width - overlaySize.width) / 2 + "px";
-    if (this.overlayTimeout) clearTimeout(this.overlayTimeout);
-    if (!timeout) return;
-    this.overlayTimeout = window.setTimeout(() => {
-      overlayNode.style.opacity = "0";
-      this.overlayTimeout = window.setTimeout(() => {
-        if (overlayNode.parentNode) {
-          overlayNode.parentNode.removeChild(overlayNode);
-        }
-        this.overlayTimeout = void 0;
-        overlayNode.style.opacity = "0.75";
-      }, 200);
-    }, timeout || 1500);
-  }
-};
-
 // src/lib/storage/cli-key-value-store.ts
 var CliKeyValueStore = class {
   constructor() {
@@ -17882,61 +18136,6 @@ function createServerModule() {
     services: []
   };
 }
-function getTerminalOptions(userOptions) {
-  return {
-    cursorBlink: true,
-    allowProposedApi: true,
-    fontSize: 20,
-    theme: cliCore.DefaultThemes.default,
-    convertEol: true,
-    ...userOptions ?? {}
-  };
-}
-function initializeTerminal(container, opts) {
-  const terminal = new xterm.Terminal(opts);
-  const fitAddon = new addonFit.FitAddon();
-  terminal.loadAddon(fitAddon);
-  terminal.loadAddon(new addonWebLinks.WebLinksAddon());
-  terminal.loadAddon(new OverlayAddon());
-  terminal.loadAddon(new addonUnicode11.Unicode11Addon());
-  const serializeAddon = new addonSerialize.SerializeAddon();
-  terminal.loadAddon(serializeAddon);
-  terminal.open(container);
-  fitAddon.fit();
-  requestAnimationFrame(() => fitAddon.fit());
-  if (document.fonts?.ready) {
-    document.fonts.ready.then(() => {
-      requestAnimationFrame(() => fitAddon.fit());
-    });
-  }
-  container.classList.add("terminal-container");
-  container.style.background = opts.theme?.background ?? "#000";
-  const wheelListener = (e) => e.preventDefault();
-  container.addEventListener("wheel", wheelListener, { passive: false });
-  terminal.focus();
-  const dragDropService = new CliDragDropService(container);
-  return { terminal, fitAddon, serializeAddon, dragDropService, wheelListener };
-}
-var LAYOUT_TIMEOUT_MS = 1e4;
-function waitForLayout(container) {
-  return new Promise((resolve, reject) => {
-    const deadline = Date.now() + LAYOUT_TIMEOUT_MS;
-    const check = () => {
-      if (container.offsetWidth > 0 && container.offsetHeight > 0) {
-        resolve();
-        return;
-      }
-      if (Date.now() >= deadline) {
-        reject(new Error(
-          `CliEngine.start(): container has zero dimensions after ${LAYOUT_TIMEOUT_MS}ms. Ensure the container element is visible and laid out before calling start().`
-        ));
-        return;
-      }
-      requestAnimationFrame(check);
-    };
-    check();
-  });
-}
 
 // src/lib/editor/syntax/registry.ts
 var SyntaxHighlighterRegistry = class {
@@ -18328,6 +18527,14 @@ var CliEngine = class {
       { ...this.options ?? {}, terminalOptions: terminalOpts }
     );
     this.executionContext.initializeTerminalListeners();
+    const environment = services.get(ICliEnvironment_TOKEN);
+    if (environment instanceof CliEnvironment) {
+      const ctx = this.executionContext;
+      environment.bind("USER", () => ctx.userSession?.user.name);
+      environment.bind("HOME", () => ctx.userSession?.user.homeDir);
+      environment.bind("PWD", () => ctx.promptPathProvider?.());
+      environment.setProfileResolver(() => ctx.userSession?.user.name);
+    }
     this.executionContext.backgroundServices.setProcessRegistry(processRegistry);
     services.set([{
       provide: CliBackgroundServiceRegistry_TOKEN,
@@ -19033,6 +19240,7 @@ exports.builtinProcessors = builtinProcessors;
 exports.computeDiff = computeDiff;
 exports.contextGlobalParameter = contextGlobalParameter;
 exports.createServerModule = createServerModule;
+exports.defaultFontSize = defaultFontSize;
 exports.describeShellClose = describeShellClose;
 exports.executeOnServer = executeOnServer;
 exports.expandEnvironmentVars = expandEnvironmentVars;
@@ -19050,6 +19258,7 @@ exports.initializeTerminal = initializeTerminal;
 exports.isWasmAccelerated = isWasmAccelerated;
 exports.miscProcessors = miscProcessors;
 exports.openLink = openLink;
+exports.parseAssignments = parseAssignments;
 exports.reconcileArgs = reconcileArgs;
 exports.renderServerResponse = renderServerResponse;
 exports.renderSingleOutput = renderSingleOutput;