@qodalis/cli 2.0.0-beta.19 → 2.0.0-beta.20

package/public-api.mjs

@@ -511,7 +511,7 @@ var CliKeyValueStore_TOKEN = createCliToken("cli-key-value-store");
 var SyntaxHighlighterRegistry_TOKEN = createCliToken("syntax-highlighter-registry");
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-beta.19";
+var LIBRARY_VERSION = "2.0.0-beta.20";
 var API_VERSION = 2;
 var ANONYMOUS = "\0anonymous";
 function aliasOwner(context2) {
@@ -5685,13 +5685,45 @@ var hotkeysInfo = [
     key: "Ctrl + L",
     description: "Clear the terminal screen"
   },
+  {
+    key: "Escape",
+    description: "Cancel and start a new line"
+  },
   {
     key: "\u2191 / \u2193",
-    description: "Navigate command history"
+    description: "Navigate command history (each user has their own)"
   },
   {
     key: "Tab",
     description: "Autocomplete command"
+  },
+  {
+    key: "Ctrl + A / Home",
+    description: "Move to the start of the line"
+  },
+  {
+    key: "Ctrl + E / End",
+    description: "Move to the end of the line"
+  },
+  {
+    key: "Ctrl + U",
+    description: "Cut from the start of the line to the cursor"
+  },
+  {
+    key: "Ctrl + K",
+    description: "Cut from the cursor to the end of the line"
+  },
+  {
+    key: "Ctrl + W",
+    description: "Cut the previous word (also Alt + Backspace)"
+  },
+  {
+    key: "Ctrl + Y",
+    description: "Paste the last cut text"
+  },
+  {
+    key: "Ctrl + D / Del",
+    description: "Delete the character under the cursor"
   }
 ];
 
@@ -6135,7 +6167,7 @@ var CliHotKeysCommandProcessor = class {
     const { writer } = context2;
     hotkeysInfo.forEach((hotkey) => {
       writer.writeln(
-        `    ${writer.wrapInColor(hotkey.key.padEnd(12), CliForegroundColor.Cyan)} ${DIM3}${hotkey.description}${RESET3}`
+        `    ${writer.wrapInColor(hotkey.key.padEnd(16), CliForegroundColor.Cyan)} ${DIM3}${hotkey.description}${RESET3}`
       );
     });
   }
@@ -14911,6 +14943,111 @@ ${this.fitLine(`  \x1B[31m\u2718 ${message}\x1B[0m`)}\x1B[${this.extraLines}A`
   }
 };
 
+// src/lib/input/cli-line-buffer.ts
+var CliLineBuffer = class {
+  constructor() {
+    this._text = "";
+    this._cursorPosition = 0;
+  }
+  get text() {
+    return this._text;
+  }
+  get cursorPosition() {
+    return this._cursorPosition;
+  }
+  set cursorPosition(value) {
+    this._cursorPosition = Math.max(0, Math.min(value, this._text.length));
+  }
+  insert(str) {
+    this._text = this._text.slice(0, this._cursorPosition) + str + this._text.slice(this._cursorPosition);
+    this._cursorPosition += str.length;
+  }
+  deleteCharBefore() {
+    if (this._cursorPosition > 0) {
+      this._text = this._text.slice(0, this._cursorPosition - 1) + this._text.slice(this._cursorPosition);
+      this._cursorPosition--;
+    }
+  }
+  deleteCharAt() {
+    if (this._cursorPosition < this._text.length) {
+      this._text = this._text.slice(0, this._cursorPosition) + this._text.slice(this._cursorPosition + 1);
+    }
+  }
+  moveCursorLeft() {
+    if (this._cursorPosition > 0) {
+      this._cursorPosition--;
+    }
+  }
+  moveCursorRight() {
+    if (this._cursorPosition < this._text.length) {
+      this._cursorPosition++;
+    }
+  }
+  moveHome() {
+    this._cursorPosition = 0;
+  }
+  moveEnd() {
+    this._cursorPosition = this._text.length;
+  }
+  clear() {
+    this._text = "";
+    this._cursorPosition = 0;
+  }
+  setText(str) {
+    this._text = str;
+    this._cursorPosition = str.length;
+  }
+  /** Remove the text before the cursor (Ctrl+U); returns it */
+  deleteToStart() {
+    const removed = this._text.slice(0, this._cursorPosition);
+    this._text = this._text.slice(this._cursorPosition);
+    this._cursorPosition = 0;
+    return removed;
+  }
+  /** Remove the text from the cursor to the end (Ctrl+K); returns it */
+  deleteToEnd() {
+    const removed = this._text.slice(this._cursorPosition);
+    this._text = this._text.slice(0, this._cursorPosition);
+    return removed;
+  }
+  /** Remove the whitespace-delimited word before the cursor (Ctrl+W); returns it */
+  deleteWordBefore() {
+    let start = this._cursorPosition;
+    while (start > 0 && /\s/.test(this._text[start - 1])) start--;
+    while (start > 0 && !/\s/.test(this._text[start - 1])) start--;
+    const removed = this._text.slice(start, this._cursorPosition);
+    this._text = this._text.slice(0, start) + this._text.slice(this._cursorPosition);
+    this._cursorPosition = start;
+    return removed;
+  }
+};
+var HOME_KEYS = ["
", "\x1B[H", "\x1BOH", "\x1B[1~", "\x1B[7~"];
+var END_KEYS = ["", "\x1B[F", "\x1BOF", "\x1B[4~", "\x1B[8~"];
+var DELETE_KEYS = ["\x1B[3~", ""];
+function applyEditingKey(buffer, data, killRing) {
+  if (HOME_KEYS.includes(data)) {
+    buffer.moveHome();
+  } else if (END_KEYS.includes(data)) {
+    buffer.moveEnd();
+  } else if (DELETE_KEYS.includes(data)) {
+    buffer.deleteCharAt();
+  } else if (data === "") {
+    killRing.text = buffer.deleteToStart() || killRing.text;
+  } else if (data === "\v") {
+    killRing.text = buffer.deleteToEnd() || killRing.text;
+  } else if (data === "" || data === "\x1B\x7F") {
+    killRing.text = buffer.deleteWordBefore() || killRing.text;
+  } else if (data === "") {
+    if (killRing.text) buffer.insert(killRing.text);
+  } else {
+    return false;
+  }
+  return true;
+}
+function isEscapeSequence(data) {
+  return /^\u001b(\[[0-9;?]*[~A-Za-z]|O[A-Za-z])$/.test(data);
+}
+
 // src/lib/input/modes/line-input-mode.ts
 var LineInputMode = class extends InputModeBase {
   constructor(host, resolve, promptText, options) {
@@ -14918,6 +15055,7 @@ var LineInputMode = class extends InputModeBase {
     this.promptText = promptText;
     this.options = options;
     this.hasError = false;
+    this.killRing = { text: "" };
     this.buffer = options?.default ?? "";
     this.cursorPosition = this.buffer.length;
   }
@@ -14962,7 +15100,7 @@ var LineInputMode = class extends InputModeBase {
         this.cursorPosition++;
         this.host.terminal.write(data);
       }
-    } else if (data.startsWith("\x1B")) ; else {
+    } else if (this.applyEditingKey(data)) ; else if (data.startsWith("\x1B")) ; else {
       const text = data.replace(/[\r\n]+/g, "");
       this.buffer = this.buffer.slice(0, this.cursorPosition) + text + this.buffer.slice(this.cursorPosition);
       this.cursorPosition += text.length;
@@ -14973,6 +15111,16 @@ var LineInputMode = class extends InputModeBase {
       }
     }
   }
+  applyEditingKey(data) {
+    const line2 = new CliLineBuffer();
+    line2.setText(this.buffer);
+    line2.cursorPosition = this.cursorPosition;
+    if (!applyEditingKey(line2, data, this.killRing)) return false;
+    this.buffer = line2.text;
+    this.cursorPosition = line2.cursorPosition;
+    this.renderLine();
+    return true;
+  }
   onResize() {
     this.renderLine();
   }
@@ -16708,67 +16856,13 @@ var CliCompletionEngine = class {
   }
 };
 
-// src/lib/input/cli-line-buffer.ts
-var CliLineBuffer = class {
-  constructor() {
-    this._text = "";
-    this._cursorPosition = 0;
-  }
-  get text() {
-    return this._text;
-  }
-  get cursorPosition() {
-    return this._cursorPosition;
-  }
-  set cursorPosition(value) {
-    this._cursorPosition = Math.max(0, Math.min(value, this._text.length));
-  }
-  insert(str) {
-    this._text = this._text.slice(0, this._cursorPosition) + str + this._text.slice(this._cursorPosition);
-    this._cursorPosition += str.length;
-  }
-  deleteCharBefore() {
-    if (this._cursorPosition > 0) {
-      this._text = this._text.slice(0, this._cursorPosition - 1) + this._text.slice(this._cursorPosition);
-      this._cursorPosition--;
-    }
-  }
-  deleteCharAt() {
-    if (this._cursorPosition < this._text.length) {
-      this._text = this._text.slice(0, this._cursorPosition) + this._text.slice(this._cursorPosition + 1);
-    }
-  }
-  moveCursorLeft() {
-    if (this._cursorPosition > 0) {
-      this._cursorPosition--;
-    }
-  }
-  moveCursorRight() {
-    if (this._cursorPosition < this._text.length) {
-      this._cursorPosition++;
-    }
-  }
-  moveHome() {
-    this._cursorPosition = 0;
-  }
-  moveEnd() {
-    this._cursorPosition = this._text.length;
-  }
-  clear() {
-    this._text = "";
-    this._cursorPosition = 0;
-  }
-  setText(str) {
-    this._text = str;
-    this._cursorPosition = str.length;
-  }
-};
-
 // src/lib/input/command-line-mode.ts
 var CommandLineMode = class {
   constructor(host) {
     this.host = host;
     this.historyIndex = 0;
+    /** History generation `historyIndex` points into (another user's history may be loaded since) */
+    this.historyGeneration = 0;
     this.isExecutingCommand = false;
     this.selectionStart = null;
     this.selectionEnd = null;
@@ -16784,6 +16878,7 @@ var CommandLineMode = class {
      * into the command's output and appended to the line just submitted.
      */
     this.typeAhead = [];
+    this.killRing = { text: "" };
   }
   activate() {
     this.host.commandHistory.initialize().then(() => {
@@ -16839,7 +16934,7 @@ var CommandLineMode = class {
       }
     } else if (data === "\x7F") {
       this.handleBackspace();
-    } else {
+    } else if (this.applyEditingKey(data)) ; else if (isEscapeSequence(data)) ; else {
       this.handleInputText(data);
     }
   }
@@ -16937,6 +17032,16 @@ var CommandLineMode = class {
     } catch {
     }
   }
+  applyEditingKey(data) {
+    const buffer = this.host.lineBuffer;
+    const before = buffer.text;
+    const previousContentLength = this.host.getPromptLength() + before.length;
+    if (!applyEditingKey(buffer, data, this.killRing)) return false;
+    this.clearGhostText();
+    if (buffer.text !== before) this.clearHistorySearch();
+    this.refreshLine(previousContentLength);
+    return true;
+  }
   handleBackspace() {
     const buffer = this.host.lineBuffer;
     this.clearGhostText();
@@ -17002,7 +17107,17 @@ var CommandLineMode = class {
       }
     }
   }
+  /** Start over at the end when another history was loaded (`su`, `exit`, login) */
+  syncHistory() {
+    const generation = this.host.commandHistory.generation;
+    if (generation === this.historyGeneration) return;
+    this.historyGeneration = generation;
+    this.historySearchPrefix = null;
+    this.bufferSetByHistory = false;
+    this.historyIndex = this.host.commandHistory.getLastIndex();
+  }
   showPreviousCommand() {
+    this.syncHistory();
     this.clearGhostText();
     const buffer = this.host.lineBuffer;
     if (buffer.text && !this.bufferSetByHistory && this.historySearchPrefix === null) {
@@ -17026,6 +17141,7 @@ var CommandLineMode = class {
     }
   }
   showNextCommand() {
+    this.syncHistory();
     this.clearGhostText();
     const buffer = this.host.lineBuffer;
     if (this.historySearchPrefix !== null) {
@@ -17289,6 +17405,7 @@ var CliExecutionContext = class {
   set userSession(session) {
     const previous = this._userSession?.user?.name;
     this._userSession = session;
+    void this.commandHistory?.useUser(session?.user?.id);
     if (session?.user?.name !== previous) {
       this.events?.emit("session:changed", { user: session?.user?.name });
     }
@@ -18861,15 +18978,41 @@ var CliLogger = class {
 };
 
 // src/lib/services/cli-command-history.ts
+var SHARED_KEY = "cli-command-history";
+var MIGRATED_KEY = "cli-command-history:migrated";
 var CliCommandHistory = class {
   constructor(store) {
     this.store = store;
-    this.storageKey = "cli-command-history";
     this.commandHistory = [];
+    this.loading = Promise.resolve();
+    /** Counts user switches (a load for an older one is dropped) */
+    this.switches = 0;
+    this._generation = 0;
+  }
+  /** Changes whenever the history is replaced: switched or loaded (positions into it are stale) */
+  get generation() {
+    return this._generation;
+  }
+  get storageKey() {
+    return this.userId === void 0 ? SHARED_KEY : `${SHARED_KEY}:user:${this.userId}`;
+  }
+  /**
+   * Switch to the history of `userId` (undefined: nobody signed in).
+   * Resolves once it is loaded; a no-op for the user already loaded.
+   */
+  useUser(userId) {
+    if (userId === this.userId) return this.loading;
+    this.userId = userId;
+    this.commandHistory = [];
+    this.switches++;
+    this._generation++;
+    this.loading = this.loadHistory();
+    return this.loading;
   }
   async addCommand(command2) {
     const normalizedCommand = command2.trim();
     if (!normalizedCommand) return;
+    await this.loading;
     const existingIndex = this.commandHistory.indexOf(normalizedCommand);
     if (existingIndex !== -1) {
       this.commandHistory.splice(existingIndex, 1);
@@ -18936,18 +19079,32 @@ var CliCommandHistory = class {
     return await this.store.set(this.storageKey, trimmedHistory);
   }
   async loadHistory() {
-    const savedOldHistory = localStorage.getItem("cliCommandHistory");
+    const key = this.storageKey;
+    const switches = this.switches;
+    const savedOldHistory = typeof localStorage !== "undefined" ? localStorage.getItem("cliCommandHistory") : null;
     if (savedOldHistory) {
       localStorage.removeItem("cliCommandHistory");
-      await this.store.set(this.storageKey, JSON.parse(savedOldHistory));
+      await this.store.set(SHARED_KEY, JSON.parse(savedOldHistory));
+    }
+    let savedHistory = await this.store.get(key);
+    if (!savedHistory && key !== SHARED_KEY && !await this.store.get(MIGRATED_KEY)) {
+      await this.store.set(MIGRATED_KEY, true);
+      const shared = await this.store.get(SHARED_KEY);
+      if (shared?.length) {
+        await this.store.set(key, shared);
+        await this.store.remove(SHARED_KEY);
+        savedHistory = shared;
+      }
     }
-    const savedHistory = await this.store.get(this.storageKey);
+    if (switches !== this.switches) return;
     if (savedHistory) {
       this.commandHistory = savedHistory;
+      this._generation++;
     }
   }
   async initialize() {
-    await this.loadHistory();
+    this.loading = this.loadHistory();
+    await this.loading;
   }
 };
 var welcomeModule = {
@@ -22989,6 +23146,9 @@ var CliTestHarness = class {
   createContext(writer) {
     const process = new CliExecutionProcess(null);
     const reader = createQueuedReader(this.readerResponses);
+    const provider = this.userSessionProvider;
+    const fallback = this.userSession;
+    const assigned = { set: false };
     const context2 = {
       writer,
       services: this.services,
@@ -23004,7 +23164,14 @@ var CliTestHarness = class {
       options: void 0,
       logger: createNoopLogger(),
       process,
-      userSession: this.userSessionProvider ? this.userSessionProvider() : this.userSession,
+      // Live, like the engine's root context (commands run by a command see changes)
+      get userSession() {
+        return assigned.set ? assigned.value : provider ? provider() : fallback;
+      },
+      set userSession(value) {
+        assigned.set = true;
+        assigned.value = value;
+      },
       state: this.stateStoreManager.getStateStore("shared"),
       backgroundServices: createNoopBackgroundServices(),
       http: new CliHttpClient(),