tabminal 2.0.14 → 2.0.16

package/src/terminal-manager.mjs

@@ -56,6 +56,18 @@ function buildBashBootstrap({
     };
 }
 
+function clearBashPromptEnv(env) {
+    for (const key of [
+        'PROMPT_COMMAND',
+        'PS0',
+        'PS1',
+        'PS2',
+        'PS4'
+    ]) {
+        delete env[key];
+    }
+}
+
 export class TerminalManager {
     constructor() {
         this.sessions = new Map();
@@ -83,48 +95,49 @@ export class TerminalManager {
         return next;
     }
 
-    createSession(restoredData = null) {
-        // Use ID from options if present, otherwise generate new
-        const id = (restoredData && restoredData.id) ? restoredData.id : crypto.randomUUID();
-        const shell = resolveShell();
-
-        // Use CWD from options if present, otherwise default
-        const initialCwd = (restoredData && restoredData.cwd)
-            ? restoredData.cwd
-            : (process.env.TABMINAL_CWD || os.homedir());
-
-        const env = { ...process.env };
-
-        // Inject shell tools
-        const shellToolsPath = path.join(process.cwd(), 'shell');
-        const pathDelimiter = path.delimiter;
-        const pathKey = Object.keys(env).find((key) => key.toLowerCase() === 'path') || 'PATH';
-        const existingPath = env[pathKey];
-        env[pathKey] = existingPath
-            ? `${shellToolsPath}${pathDelimiter}${existingPath}`
-            : shellToolsPath;
-
-        let spawnShell = shell;
-        let args = [];
+    _createPtySession(options = {}) {
+        const id = options.id || crypto.randomUUID();
+        const shell = options.shell || resolveShell();
+        const initialCwd = options.cwd
+            || process.env.TABMINAL_CWD
+            || os.homedir();
+        const env = {
+            ...process.env,
+            ...(options.env || {})
+        };
+        let spawnShell = options.spawnCommand || shell;
+        let args = Array.isArray(options.spawnArgs) ? options.spawnArgs : [];
         let initDirPath = null;
 
-        try {
-            const shellName = path.basename(shell);
-            if (shellName === 'bash') {
-                const bootstrap = buildBashBootstrap({
-                    env,
-                    shell,
-                    shellToolsPath,
-                    sessionId: id
-                });
-                spawnShell = bootstrap.shell;
-                args = bootstrap.args;
-            } else if (shellName === 'zsh') {
-                initDirPath = path.join(os.tmpdir(), `tabminal-zsh-${id}`);
-                fs.mkdirSync(initDirPath, { recursive: true });
-                const initFilePath = path.join(initDirPath, '.zshrc');
-
-                const zshScript = `
+        if (!options.directSpawn) {
+            const shellToolsPath = path.join(process.cwd(), 'shell');
+            const pathDelimiter = path.delimiter;
+            const pathKey = Object.keys(env).find(
+                (key) => key.toLowerCase() === 'path'
+            ) || 'PATH';
+            const existingPath = env[pathKey];
+            env[pathKey] = existingPath
+                ? `${shellToolsPath}${pathDelimiter}${existingPath}`
+                : shellToolsPath;
+
+            try {
+                const shellName = path.basename(shell);
+                if (shellName === 'bash') {
+                    clearBashPromptEnv(env);
+                    const bootstrap = buildBashBootstrap({
+                        env,
+                        shell,
+                        shellToolsPath,
+                        sessionId: id
+                    });
+                    spawnShell = bootstrap.shell;
+                    args = bootstrap.args;
+                } else if (shellName === 'zsh') {
+                    initDirPath = path.join(os.tmpdir(), `tabminal-zsh-${id}`);
+                    fs.mkdirSync(initDirPath, { recursive: true });
+                    const initFilePath = path.join(initDirPath, '.zshrc');
+
+                    const zshScript = `
 unset ZDOTDIR
 [ -f ~/.zshrc ] && source ~/.zshrc
 export PATH="${shellToolsPath}:$PATH"
@@ -150,25 +163,26 @@ preexec_functions+=(_tabminal_zsh_preexec)
 precmd_functions+=(_tabminal_zsh_postexec)
 precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
 `;
-                fs.writeFileSync(initFilePath, zshScript);
-                env.ZDOTDIR = initDirPath;
-                args = ['-i'];
+                    fs.writeFileSync(initFilePath, zshScript);
+                    env.ZDOTDIR = initDirPath;
+                    args = ['-i'];
+                }
+            } catch (err) {
+                console.error('[Manager] Failed to create init script:', err);
             }
-        } catch (err) {
-            console.error('[Manager] Failed to create init script:', err);
         }
 
-        const cols = restoredData ? restoredData.cols : this.lastCols;
-        const rows = restoredData ? restoredData.rows : this.lastRows;
+        const cols = Number.isFinite(options.cols) ? options.cols : this.lastCols;
+        const rows = Number.isFinite(options.rows) ? options.rows : this.lastRows;
 
         let ptyProcess;
         try {
             const ptyOptions = {
                 name: 'xterm-256color',
-                cols: cols,
-                rows: rows,
+                cols,
+                rows,
                 cwd: initialCwd,
-                env: env
+                env
             };
             if (process.platform !== 'win32') {
                 ptyOptions.encoding = 'utf8';
@@ -200,17 +214,25 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
 
         const session = new TerminalSession(ptyProcess, {
             id,
-            historyLimit,
-            createdAt: restoredData ? new Date(restoredData.createdAt) : new Date(),
+            historyLimit: options.historyLimit ?? historyLimit,
+            createdAt: options.createdAt
+                ? new Date(options.createdAt)
+                : new Date(),
             manager: this,
             shell,
             initialCwd,
-            env: env,
-            editorState: restoredData ? restoredData.editorState : undefined,
-            executions: restoredData ? restoredData.executions : undefined
+            env,
+            title: options.title || '',
+            managed: options.managed || null,
+            persistent: options.persistent !== false,
+            removeOnExit: options.removeOnExit !== false,
+            enableAiHijack: options.enableAiHijack !== false,
+            enableTitlePolling: options.enableTitlePolling !== false,
+            editorState: options.editorState,
+            executions: options.executions
         });
 
-        if (restoredData) {
+        if (options.restoreSnapshot) {
             persistence.loadSessionSnapshot(id).then(async (snapshot) => {
                 if (!snapshot) return;
                 await session.restoreSnapshot(snapshot);
@@ -220,21 +242,70 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
 
         this.sessions.set(id, session);
 
-        // Initial save
-        void this.saveSessionState(session);
+        if (session.persistent) {
+            void this.saveSessionState(session);
+        }
 
         ptyProcess.onExit(() => {
-            void this.removeSession(id);
-            // Cleanup temp files
+            if (session.removeOnExit) {
+                void this.removeSession(id);
+            }
             try {
-                if (initDirPath && fs.existsSync(initDirPath)) fs.rmSync(initDirPath, { recursive: true, force: true });
-            } catch { /* ignore cleanup errors */ }
+                if (initDirPath && fs.existsSync(initDirPath)) {
+                    fs.rmSync(initDirPath, { recursive: true, force: true });
+                }
+            } catch {
+                // ignore cleanup errors
+            }
         });
         debugLog(`[Manager] Created session ${id}`);
         return session;
     }
 
+    createSession(restoredData = null) {
+        return this._createPtySession({
+            id: restoredData?.id,
+            shell: resolveShell(),
+            cwd: restoredData?.cwd,
+            cols: restoredData?.cols,
+            rows: restoredData?.rows,
+            createdAt: restoredData?.createdAt,
+            title: restoredData?.title,
+            editorState: restoredData?.editorState,
+            executions: restoredData?.executions,
+            restoreSnapshot: Boolean(restoredData),
+            persistent: true,
+            removeOnExit: true,
+            enableAiHijack: true,
+            enableTitlePolling: true
+        });
+    }
+
+    createManagedSession(options = {}) {
+        const spawnRequest = options.spawnRequest || {};
+        const shell = spawnRequest.command || resolveShell();
+        return this._createPtySession({
+            shell,
+            cwd: options.cwd,
+            env: options.env,
+            cols: options.cols,
+            rows: options.rows,
+            title: options.title || path.basename(shell) || 'Terminal',
+            directSpawn: true,
+            spawnCommand: spawnRequest.command,
+            spawnArgs: spawnRequest.args,
+            persistent: false,
+            removeOnExit: false,
+            enableAiHijack: false,
+            enableTitlePolling: false,
+            managed: options.managed || null
+        });
+    }
+
     saveSessionState(session) {
+        if (!session?.persistent) {
+            return Promise.resolve();
+        }
         if (this.sessions.get(session.id) !== session) {
             return Promise.resolve();
         }
@@ -259,13 +330,15 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
             if (data.editorState) {
                 session.editorState = { ...session.editorState, ...data.editorState };
             }
-            this.saveSessionState(session);
+            if (session.persistent) {
+                this.saveSessionState(session);
+            }
         }
     }
 
     scheduleSnapshotPersist(id) {
         const session = this.sessions.get(id);
-        if (!session) return;
+        if (!session || !session.persistent) return;
 
         const existing = this.snapshotPersistTimers.get(id);
         if (existing) {
@@ -341,6 +414,9 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
             env: s.env,
             cols: s.pty.cols,
             rows: s.pty.rows,
+            closed: !!s.closed,
+            exitStatus: s.exitStatus || null,
+            managed: s.managed || null,
             editorState: s.editorState,
             executions: s.executions
         }));

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,10 +130,16 @@ 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 = '';
@@ -152,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 {
@@ -161,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 */ }
@@ -198,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();
                 }
@@ -215,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() {
@@ -323,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 */ }
         };
@@ -372,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;
@@ -436,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];
 
@@ -726,10 +799,39 @@ 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;
@@ -741,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({
@@ -754,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()) {
@@ -1065,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;
         }
 
@@ -1096,6 +1215,8 @@ export class TerminalSession {
         if (this.manager) {
             this.manager.saveSessionState(this);
         }
+        this.updatedAt = new Date();
+        this._emitStateChange();
     }
 
     _broadcast(message) {
@@ -1117,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) {