tabminal 2.0.13 → 2.0.15

package/src/terminal-session.mjs

@@ -13,7 +13,7 @@ const {
 const WS_STATE_OPEN = 1;
 const DEFAULT_HISTORY_LIMIT = 512 * 1024; // chars
 const OSC_SEQUENCE_REGEX =
-    /\u001b\]1337;(ExitCode=(\d+);CommandB64=([a-zA-Z0-9+/=]+)|TabminalPrompt)\u0007/g;
+    /\u001b\]1337;(ExitCode=(\d+);CommandB64=([a-zA-Z0-9+/=]+)|CommandStartB64=([a-zA-Z0-9+/=]+)|TabminalPrompt)\u0007/g;
 const EXTRA_PRIVATE_MODE_REGEX = /\u001b\[\?(1005|1006|1015)([hl])/g;
 const CSI_SEQUENCE_REGEX = /\u001b\[[0-9;?]*[ -\/]*[@-~]/g;
 const OSC_STRIP_REGEX = /\u001b\][\s\S]*?(?:\u0007|\u001b\\)/g;
@@ -29,6 +29,13 @@ const IGNORED_COMMANDS = [
     'TABMINAL_SHELL_READY=1'
 ];
 
+function isIgnoredExecutionCommand(command) {
+    return !!(
+        command
+        && IGNORED_COMMANDS.some((ignored) => command.includes(ignored))
+    );
+}
+
 const PROMPT_PREFIX = "You are now operating as an AI terminal assistant. Your name is `Tabminal`. You will assist users in resolving terminal or coding issues and answering other inquiries. When troubleshooting terminal errors, you will be provided with the execution history to understand the context. However, please focus primarily on the most recent runtime errors and the user's latest questions. Keep your answers concise and accurate. Resolve the issue clearly and provide the reasoning while avoiding lengthy elaborations. Most user terminal variable keys are normal under typical circumstances and do not need to be treated as security risks.\n\n";
 
 async function loadHeadlessXtermPackages() {
@@ -96,10 +103,17 @@ export class TerminalSession {
         this.id = options.id;
         this.manager = options.manager;
         this.createdAt = options.createdAt ?? new Date();
+        this.updatedAt = this.createdAt;
         this.shell = options.shell;
         this.initialCwd = options.initialCwd;
-
-        this.title = this.shell ? this.shell.split('/').pop() : 'Terminal';
+        this.managed = options.managed || null;
+        this.persistent = options.persistent !== false;
+        this.removeOnExit = options.removeOnExit !== false;
+        this.enableAiHijack = options.enableAiHijack !== false;
+        this.enableTitlePolling = options.enableTitlePolling !== false;
+
+        this.title = options.title
+            || (this.shell ? this.shell.split('/').pop() : 'Terminal');
         this.cwd = this.initialCwd;
         this.inputBuffer = '';
 
@@ -116,12 +130,20 @@ export class TerminalSession {
         this.clients = new Set();
         this.pendingClients = new Map();
         this.closed = false;
+        this.exitStatus = null;
+        this.exitWaiters = [];
+        this.stateListeners = new Set();
         this.pollingInterval = null;
         this.captureBuffer = '';
         this.captureStartedAt = null;
         this.lastExecution = null;
+        this.executionCounter = 0;
+        this.currentExecutionId = '';
+        this.ignoreCurrentExecution = false;
         this.skipNextShellLog = false;
+        this.skipNextShellLogResetTimer = null;
         this.partialSequenceBuffer = '';
+        this.activeAiRun = null;
         this.snapshotScrollback = estimateSnapshotScrollback(
             this.pty.cols,
             this.pty.rows,
@@ -150,7 +172,9 @@ export class TerminalSession {
                     const newTitle = s.substring(2);
                     if (newTitle && newTitle !== this.title) {
                         this.title = newTitle;
+                        this.updatedAt = new Date();
                         this._broadcast({ type: 'meta', title: this.title, cwd: this.cwd, env: this.env, cols: this.pty.cols, rows: this.pty.rows });
+                        this._emitStateChange();
                     }
                 } else if (s.startsWith('7;')) {
                     try {
@@ -159,7 +183,9 @@ export class TerminalSession {
                             const newCwd = decodeURIComponent(url.pathname);
                             if (newCwd !== this.cwd) {
                                 this.cwd = newCwd;
+                                this.updatedAt = new Date();
                                 this._broadcast({ type: 'meta', title: this.title, cwd: this.cwd, env: this.env, cols: this.pty.cols, rows: this.pty.rows });
+                                this._emitStateChange();
                             }
                         }
                     } catch { /* ignore */ }
@@ -196,6 +222,8 @@ export class TerminalSession {
                     const exitCodeStr = match[2];
                     const cmdB64 = match[3];
                     this._handleExitCodeSequence(exitCodeStr, cmdB64);
+                } else if (sequence.startsWith('CommandStartB64=')) {
+                    this._handleCommandStartSequence(match[4]);
                 } else {
                     this._handlePromptMarker();
                 }
@@ -213,27 +241,43 @@ export class TerminalSession {
 
             this._appendSnapshotData(cleaned);
             this._appendHistory(cleaned);
+            this.updatedAt = new Date();
             this.ansiParser.parse(cleaned);
             if (this.manager?.scheduleSnapshotPersist) {
                 this.manager.scheduleSnapshotPersist(this.id);
             }
             this._broadcast({ type: 'output', data: cleaned });
+            this._emitStateChange();
         };
 
         this._handleExit = (details) => {
             this.closed = true;
+            this.exitStatus = {
+                exitCode: Number.isFinite(details?.exitCode)
+                    ? details.exitCode
+                    : null,
+                signal: details?.signal ?? null
+            };
+            this.updatedAt = new Date();
             this.stopTitlePolling();
             this._broadcast({
                 type: 'status',
                 status: 'terminated',
-                code: details?.exitCode ?? 0,
-                signal: details?.signal ?? null
+                code: this.exitStatus.exitCode ?? 0,
+                signal: this.exitStatus.signal
             });
+            this._emitStateChange();
+            for (const waiter of this.exitWaiters) {
+                waiter(this.exitStatus);
+            }
+            this.exitWaiters.length = 0;
         };
 
         this.dataSubscription = this.pty.onData(this._handleData);
         this.exitSubscription = this.pty.onExit(this._handleExit);
-        this.startTitlePolling();
+        if (this.enableTitlePolling) {
+            this.startTitlePolling();
+        }
     }
 
     startTitlePolling() {
@@ -321,7 +365,9 @@ export class TerminalSession {
                     if (titleChanged) this.title = newTitle;
                     if (envChanged) this.env = newEnv;
                     if (cwdChanged) this.cwd = newCwd;
+                    this.updatedAt = new Date();
                     this._broadcast({ type: 'meta', title: this.title, cwd: this.cwd, env: this.env, cols: this.pty.cols, rows: this.pty.rows });
+                    this._emitStateChange();
                 }
             } catch { /* ignore */ }
         };
@@ -352,6 +398,7 @@ export class TerminalSession {
 
     dispose() {
         this.stopTitlePolling();
+        this._clearSkipNextShellLogResetTimer();
         this.clients.clear();
         this.pendingClients.clear();
         this.dataSubscription?.dispose?.();
@@ -369,11 +416,40 @@ export class TerminalSession {
             this.manager.scheduleSnapshotPersist(this.id);
         }
         this._broadcast({ type: 'meta', title: this.title, cwd: this.cwd, env: this.env, cols, rows });
+        this.updatedAt = new Date();
+        this._emitStateChange();
         if (this.manager && this.manager.saveSessionState) {
             this.manager.saveSessionState(this);
         }
     }
 
+    waitForExit() {
+        if (this.exitStatus) {
+            return Promise.resolve(this.exitStatus);
+        }
+        return new Promise((resolve) => {
+            this.exitWaiters.push(resolve);
+        });
+    }
+
+    onStateChange(listener) {
+        if (typeof listener !== 'function') return () => {};
+        this.stateListeners.add(listener);
+        return () => {
+            this.stateListeners.delete(listener);
+        };
+    }
+
+    _emitStateChange() {
+        for (const listener of this.stateListeners) {
+            try {
+                listener(this);
+            } catch {
+                // Ignore state listener failures.
+            }
+        }
+    }
+
     async restoreSnapshot(snapshot) {
         if (typeof snapshot !== 'string' || !snapshot) return;
         this.history = snapshot;
@@ -416,6 +492,11 @@ export class TerminalSession {
     }
 
     write(data) {
+        if (this.activeAiRun && typeof data === 'string') {
+            this._handleInputDuringAi(data);
+            return;
+        }
+
         if (typeof data === 'string' && data.startsWith('\x1b')) {
             this.pty.write(data);
             this.inputBuffer = '';
@@ -428,7 +509,7 @@ export class TerminalSession {
         }
 
         let startIndex = 0;
-        const aiEnabled = this._isAiEnabled();
+        const aiEnabled = this.enableAiHijack && this._isAiEnabled();
         for (let i = 0; i < data.length; i++) {
             const char = data[i];
 
@@ -503,6 +584,19 @@ export class TerminalSession {
         }
     }
 
+    _handleInputDuringAi(data) {
+        for (const char of data) {
+            if (char === '\x03') {
+                this._cancelActiveAiRun('ctrl_c');
+                return;
+            }
+            if (char === '\x04') {
+                this._cancelActiveAiRun('ctrl_d');
+                return;
+            }
+        }
+    }
+
     _buildAiContext(history) {
         let pendingShellHistory = '';
         const conversationHistory = [];
@@ -526,9 +620,67 @@ export class TerminalSession {
         return { conversationHistory, pendingShellHistory };
     }
 
+    _promptAi(prompt, options) {
+        return alan.prompt(prompt, options);
+    }
+
+    _clearSkipNextShellLogResetTimer() {
+        if (this.skipNextShellLogResetTimer) {
+            clearTimeout(this.skipNextShellLogResetTimer);
+            this.skipNextShellLogResetTimer = null;
+        }
+    }
+
+    _scheduleSkipNextShellLogReset() {
+        this._clearSkipNextShellLogResetTimer();
+        this.skipNextShellLogResetTimer = setTimeout(() => {
+            this.skipNextShellLog = false;
+            this.skipNextShellLogResetTimer = null;
+        }, 500);
+        this.skipNextShellLogResetTimer.unref?.();
+    }
+
+    _finishAiInteraction(mode = 'normal') {
+        this.suppressPtyOutput = false;
+        this._scheduleSkipNextShellLogReset();
+
+        if (mode === 'ctrl_c') {
+            this._writeToLogAndBroadcast('\x1b[0m');
+            this.pty.write('\x03');
+            return;
+        }
+
+        this._writeToLogAndBroadcast('\x1b[0m\r\n');
+        if (mode === 'ctrl_d') {
+            this.pty.write('\x15');
+        }
+        this.pty.write('\r');
+    }
+
+    _cancelActiveAiRun(reason) {
+        const run = this.activeAiRun;
+        if (!run || run.cancelled) {
+            return false;
+        }
+
+        run.cancelled = true;
+        this.activeAiRun = null;
+        this._logCommandExecution({
+            command: 'ai',
+            exitCode: 130,
+            input: run.prompt,
+            output: 'AI generation cancelled.',
+            startedAt: run.startedAt,
+            completedAt: new Date()
+        });
+        this._finishAiInteraction(reason);
+        return true;
+    }
+
     async _handleAiCommand(prompt) {
         // Prevent duplicate logging from shell integration
         this.skipNextShellLog = true;
+        this._clearSkipNextShellLogResetTimer();
         // Ensure clean line start and set Cyan color (No prefix yet)
         this._writeToLogAndBroadcast('\r\x1b[K\x1b[36m');
         // Gather Context (Current Session Only)
@@ -546,8 +698,17 @@ export class TerminalSession {
         const startTime = new Date();
         let fullResponse = '';
         let isFirstChunk = true;
+        const run = {
+            prompt,
+            startedAt: startTime,
+            cancelled: false
+        };
+        this.activeAiRun = run;
         try {
             const streamCallback = (chunk) => {
+                if (this.activeAiRun !== run || run.cancelled) {
+                    return;
+                }
                 // console.log('Chunk Received:');
                 // console.log(chunk);
                 if (chunk && chunk.text) {
@@ -563,13 +724,17 @@ export class TerminalSession {
                 }
             };
             // console.log('Start AI Prompt...');
-            const result = await alan.prompt(finalPrompt, {
+            const result = await this._promptAi(finalPrompt, {
                 stream: streamCallback,
                 delta: true,
                 messages: conversationHistory,
                 trimBeginning: true
             });
 
+            if (this.activeAiRun !== run || run.cancelled) {
+                return;
+            }
+
             if (result && result.text) {
                 fullResponse = result.text;
             }
@@ -588,6 +753,9 @@ export class TerminalSession {
             });
 
         } catch (e) {
+            if (this.activeAiRun !== run || run.cancelled) {
+                return;
+            }
             this._writeToLogAndBroadcast(`\x1b[31mAI Error: ${e.message}\x1b[0m\r\n`);
 
             this._logCommandExecution({
@@ -598,13 +766,12 @@ export class TerminalSession {
                 startedAt: startTime,
                 completedAt: new Date()
             });
+        } finally {
+            if (this.activeAiRun === run) {
+                this.activeAiRun = null;
+                this._finishAiInteraction('normal');
+            }
         }
-
-        // Resume PTY output
-        this.suppressPtyOutput = false;
-
-        // Restore prompt by sending \r to pty (empty command)
-        this.pty.write('\r');
     }
 
     _handleResize(cols, rows) {
@@ -632,13 +799,43 @@ export class TerminalSession {
     }
 
     _handlePromptMarker() {
+        if (this.currentExecutionId && !this.ignoreCurrentExecution) {
+            this._broadcast({
+                type: 'execution',
+                phase: 'idle',
+                executionId: this.currentExecutionId
+            });
+        }
+        this.currentExecutionId = '';
+        this.ignoreCurrentExecution = false;
         this.captureBuffer = '';
         this.captureStartedAt = null;
     }
 
+    _handleCommandStartSequence(cmdB64) {
+        const command = this._decodeCommandSafe(cmdB64);
+        const startedAt = new Date();
+        this.captureStartedAt = startedAt;
+        this.ignoreCurrentExecution = isIgnoredExecutionCommand(command);
+        if (this.ignoreCurrentExecution) {
+            this.currentExecutionId = '';
+            return;
+        }
+        this.executionCounter += 1;
+        this.currentExecutionId = `exec-${this.executionCounter}`;
+        this._broadcast({
+            type: 'execution',
+            phase: 'started',
+            executionId: this.currentExecutionId,
+            command,
+            startedAt
+        });
+    }
+
     _handleExitCodeSequence(exitCodeStr, cmdB64) {
         if (this.skipNextShellLog) {
             this.skipNextShellLog = false;
+            this._clearSkipNextShellLogResetTimer();
             this.captureBuffer = '';
             this.captureStartedAt = null;
             return;
@@ -646,6 +843,10 @@ export class TerminalSession {
 
         const exitCode = Number.parseInt(exitCodeStr, 10);
         const command = this._decodeCommandSafe(cmdB64);
+        const executionId = this.currentExecutionId
+            || `exec-${++this.executionCounter}`;
+        const isIgnored = this.ignoreCurrentExecution
+            || isIgnoredExecutionCommand(command);
 
         const completedAt = new Date();
         const entry = this._postProcessExecutionEntry({
@@ -659,9 +860,22 @@ export class TerminalSession {
         });
 
         this.lastExecution = entry;
+        this.currentExecutionId = '';
+        this.ignoreCurrentExecution = false;
+        if (isIgnored) {
+            this.captureBuffer = '';
+            this.captureStartedAt = null;
+            return;
+        }
         this._logCommandExecution(entry);
         this.captureBuffer = '';
         this.captureStartedAt = null;
+        this._broadcast({
+            type: 'execution',
+            phase: 'completed',
+            executionId,
+            entry
+        });
 
         // Auto-Fix: If command failed, ask AI for help
         if (exitCode !== 0 && entry.command && this._isAiEnabled()) {
@@ -970,7 +1184,7 @@ export class TerminalSession {
 
     _logCommandExecution(entry) {
         // Filter out internal shell integration commands
-        if (entry.command && IGNORED_COMMANDS.some(ignored => entry.command.includes(ignored))) {
+        if (isIgnoredExecutionCommand(entry.command)) {
             return;
         }
 
@@ -1001,6 +1215,8 @@ export class TerminalSession {
         if (this.manager) {
             this.manager.saveSessionState(this);
         }
+        this.updatedAt = new Date();
+        this._emitStateChange();
     }
 
     _broadcast(message) {
@@ -1022,10 +1238,12 @@ export class TerminalSession {
         if (!text) return;
         this._appendSnapshotData(text);
         this._appendHistory(text);
+        this.updatedAt = new Date();
         if (this.manager?.scheduleSnapshotPersist) {
             this.manager.scheduleSnapshotPersist(this.id);
         }
         this._broadcast({ type: 'output', data: text });
+        this._emitStateChange();
     }
 
     _queueSnapshotMutation(mutate) {