@franzzemen/brokenstock-shell 0.9.1 → 0.9.2

package/fesm2022/franzzemen-brokenstock-shell.mjs

@@ -3068,6 +3068,12 @@ class PendingPromptState {
 const CommandInputSchema = z.string().trim().min(1, 'Command cannot be empty');
 class CommandService {
     #prompts;
+    /**
+     * True while a command (or an answer) runs. A question it asks is written to the history only
+     * after the command's own lines, so it reads as the last thing said, under the preview it is about.
+     */
+    #running;
+    #deferredQuestion;
     constructor() {
         this.history = signal([], /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "history" }] : /* istanbul ignore next */ []));
@@ -3084,6 +3090,11 @@ class CommandService {
         this.pending = signal(null, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "pending" }] : /* istanbul ignore next */ []));
         this.#prompts = new PendingPromptState();
+        /**
+         * True while a command (or an answer) runs. A question it asks is written to the history only
+         * after the command's own lines, so it reads as the last thing said, under the preview it is about.
+         */
+        this.#running = false;
         this.authService = inject(AuthenticationService);
         this.registry = inject(CommandRegistryService);
         this.router = inject(Router);
@@ -3108,11 +3119,25 @@ class CommandService {
     ask(prompt) {
         this.#prompts.ask(prompt);
         this.pending.set(prompt);
+        if (this.#running)
+            this.#deferredQuestion = prompt;
+        else
+            this.#writeQuestion(prompt);
+    }
+    #writeQuestion(prompt) {
         this.history.update(h => [...h, {
                 input: '',
                 result: { success: true, message: prompt.question, timestamp: new Date(), severity: 'info' },
             }]);
     }
+    /** After a command's or an answer's own lines: the question it asked, if it is still open. */
+    #finishRun() {
+        this.#running = false;
+        const q = this.#deferredQuestion;
+        this.#deferredQuestion = undefined;
+        if (q && this.#prompts.current === q)
+            this.#writeQuestion(q);
+    }
     /** Esc: closes the open question, if any. True when there was one. */
     cancelPending() {
         if (!this.#prompts.cancel())
@@ -3135,11 +3160,9 @@ class CommandService {
         this.currentInput.set('');
         const record = (result) => {
             this.history.update(h => [...h, { input: echo, result }]);
-            // An answer may ask again; show the new question after the answer's line.
-            const next = this.#prompts.current;
-            if (next && next !== this.pending())
-                this.pending.set(next);
+            this.#finishRun();
         };
+        this.#running = true;
         let out;
         try {
             out = prompt.answer(text);
@@ -3200,7 +3223,14 @@ class CommandService {
         // masked under `login` stays masked under any other word for it).
         const def = this.registry.resolve(command)?.command;
         const displayInput = def?.sanitizeInput ? def.sanitizeInput(input) : input;
-        const resultOrPromise = this.#dispatch(command, parts.slice(1));
+        this.#running = true;
+        let resultOrPromise;
+        try {
+            resultOrPromise = this.#dispatch(command, parts.slice(1));
+        }
+        catch (err) {
+            resultOrPromise = { success: false, message: err?.message ?? String(err), timestamp: new Date() };
+        }
         this.currentInput.set('');
         if (resultOrPromise instanceof Promise) {
             this.isProcessing.set(true);
@@ -3214,7 +3244,10 @@ class CommandService {
                     this.history.update(h => [...h, { input: displayInput, result: historyResult, repeatCount: 1 }]);
                 }
             })
-                .finally(() => this.isProcessing.set(false));
+                .finally(() => {
+                this.#finishRun();
+                this.isProcessing.set(false);
+            });
         }
         else {
             if (resultOrPromise.isHelp && resultOrPromise.message) {
@@ -3224,6 +3257,7 @@ class CommandService {
             if (!this.#coalesce(displayInput)) {
                 this.history.update(h => [...h, { input: displayInput, result: historyResult, repeatCount: 1 }]);
             }
+            this.#finishRun();
         }
     }
     #coalesce(input) {