tabminal 2.0.10 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabminal",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "A modern, persistent web terminal with multi-tab support and real-time system monitoring.",
   "type": "module",
   "bin": {

package/shell/tabminal-bashrc

@@ -0,0 +1,17 @@
+if [[ -n "${TABMINAL_SHELL_TOOLS_PATH:-}" ]]; then
+    export PATH="${TABMINAL_SHELL_TOOLS_PATH}:$PATH"
+fi
+
+if [[ -f ~/.bashrc ]]; then
+    source ~/.bashrc
+fi
+
+if [[ -n "${TABMINAL_SHELL_TOOLS_PATH:-}" ]]; then
+    export PATH="${TABMINAL_SHELL_TOOLS_PATH}:$PATH"
+fi
+
+if [[ -n "${TABMINAL_HOOKS_PATH:-}" ]] && [[ -f "$TABMINAL_HOOKS_PATH" ]]; then
+    source "$TABMINAL_HOOKS_PATH"
+fi
+
+TABMINAL_SHELL_READY=1

package/shell/tabminal-hooks.bash

@@ -0,0 +1,78 @@
+if [[ -z "${TABMINAL_SESSION_ID:-}" ]]; then
+    return 0
+fi
+
+if [[ -n "${TABMINAL_BASH_HOOKS_LOADED:-}" ]]; then
+    return 0
+fi
+
+TABMINAL_BASH_HOOKS_LOADED=1
+
+_tabminal_bash_preexec() {
+    if [[ "${BASH_COMMAND:-}" == *"_tabminal_"* ]]; then
+        return
+    fi
+    if [[ "${BASH_COMMAND:-}" == "${PROMPT_COMMAND:-}" ]]; then
+        return
+    fi
+    _tabminal_last_command="$BASH_COMMAND"
+}
+
+_tabminal_bash_postexec() {
+    local exit_code="$?"
+    if [[ -n "${_tabminal_last_command:-}" ]]; then
+        local command_b64
+        command_b64=$(
+            echo -n "$_tabminal_last_command" | base64 | tr -d '\n'
+        )
+        printf '\x1b]1337;ExitCode=%s;CommandB64=%s\x07' \
+            "$exit_code" "$command_b64"
+        _tabminal_last_command=''
+    fi
+}
+
+_tabminal_apply_prompt_marker() {
+    local marker=$'\[\e]1337;TabminalPrompt\a\]'
+    if [[ "${PS1:-}" != *'TabminalPrompt'* ]]; then
+        PS1="${PS1}${marker}"
+    fi
+}
+
+_tabminal_prompt_contains() {
+    local needle="$1"
+    local current="${PROMPT_COMMAND:-}"
+    [[ "$current" == *"$needle"* ]]
+}
+
+_tabminal_install_prompt_command() {
+    if ! _tabminal_prompt_contains '_tabminal_bash_postexec'; then
+        if [[ -n "${PROMPT_COMMAND:-}" ]]; then
+            printf -v PROMPT_COMMAND '_tabminal_bash_postexec; %s' \
+                "$PROMPT_COMMAND"
+        else
+            PROMPT_COMMAND='_tabminal_bash_postexec'
+        fi
+    fi
+
+    if ! _tabminal_prompt_contains '_tabminal_apply_prompt_marker'; then
+        if [[ -n "${PROMPT_COMMAND:-}" ]]; then
+            PROMPT_COMMAND="${PROMPT_COMMAND}; _tabminal_apply_prompt_marker"
+        else
+            PROMPT_COMMAND='_tabminal_apply_prompt_marker'
+        fi
+    fi
+}
+
+_tabminal_install_tmux_wrapper() {
+    if ! command -v tmux >/dev/null 2>&1; then
+        return 0
+    fi
+
+    tmux() {
+        command tmux -u "$@"
+    }
+}
+
+trap '_tabminal_bash_preexec' DEBUG
+_tabminal_install_prompt_command
+_tabminal_install_tmux_wrapper

package/src/server.mjs

@@ -275,6 +275,14 @@ app.use(router.allowedMethods());
 
 const httpServer = createServer(app.callback());
 const wss = new WebSocketServer({ noServer: true, verifyClient });
+const httpConnections = new Set();
+
+httpServer.on('connection', (socket) => {
+    httpConnections.add(socket);
+    socket.on('close', () => {
+        httpConnections.delete(socket);
+    });
+});
 
 httpServer.on('upgrade', (request, socket, head) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
@@ -370,6 +378,9 @@ function shutdown(signal) {
     isShuttingDown = true;
     console.log(`Shutting down (${signal})...`);
     clearInterval(heartbeatInterval);
+    for (const socket of wss.clients) {
+        socket.terminate();
+    }
     wss.close();
     terminalManager.dispose();
 
@@ -382,6 +393,11 @@ function shutdown(signal) {
         clearTimeout(forceExitTimer);
         process.exit(0);
     });
+    httpServer.closeIdleConnections?.();
+    httpServer.closeAllConnections?.();
+    for (const socket of httpConnections) {
+        socket.destroy();
+    }
 }
 
 process.on('SIGINT', () => shutdown('SIGINT'));

package/src/terminal-manager.mjs

@@ -9,13 +9,12 @@ import * as persistence from './persistence.mjs';
 import { config } from './config.mjs';
 
 function resolveShell() {
-    if (process.platform === 'win32') {
-        return process.env.COMSPEC || 'cmd.exe';
-    }
-    // config.shell has already handled process.env.SHELL and TABMINAL_SHELL via config.mjs
     if (config.shell) {
         return config.shell;
     }
+    if (process.platform === 'win32') {
+        return process.env.COMSPEC || 'cmd.exe';
+    }
     // Try to use Homebrew installed bash if available (newer version)
     if (fs.existsSync('/opt/homebrew/bin/bash')) {
         return '/opt/homebrew/bin/bash';
@@ -38,6 +37,25 @@ const initialRows = Number.parseInt(
     10
 ) || 30;
 
+function buildBashBootstrap({
+    env,
+    shell,
+    shellToolsPath,
+    sessionId
+}) {
+    const hookPath = path.join(shellToolsPath, 'tabminal-hooks.bash');
+    const rcfilePath = path.join(shellToolsPath, 'tabminal-bashrc');
+
+    env.TABMINAL_SESSION_ID = sessionId;
+    env.TABMINAL_SHELL_TOOLS_PATH = shellToolsPath;
+    env.TABMINAL_HOOKS_PATH = hookPath;
+
+    return {
+        shell,
+        args: ['--rcfile', rcfilePath, '-i']
+    };
+}
+
 export class TerminalManager {
     constructor() {
         this.sessions = new Map();
@@ -60,57 +78,32 @@ export class TerminalManager {
 
         // Inject shell tools
         const shellToolsPath = path.join(process.cwd(), 'shell');
-        env.PATH = `${shellToolsPath}:${env.PATH}`;
+        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 = [];
-        let initFilePath = null;
         let initDirPath = null;
 
         try {
             const shellName = path.basename(shell);
             if (shellName === 'bash') {
-                initFilePath = path.join(os.tmpdir(), `tabminal-init-${id}.bashrc`);
-                const bashScript = `
-export PATH="${shellToolsPath}:$PATH"
-[ -f ~/.bashrc ] && source ~/.bashrc
-export PATH="${shellToolsPath}:$PATH"
-
-_tabminal_bash_preexec() {
-  # Prevent capturing any of our own internal or setup commands.
-  if [[ "$BASH_COMMAND" == *"_tabminal_"* || "$BASH_COMMAND" == "$PROMPT_COMMAND" ]]; then
-    return
-  fi
-  _tabminal_last_command="$BASH_COMMAND"
-}
-trap '_tabminal_bash_preexec' DEBUG
-
-_tabminal_bash_postexec() {
-  local EC="$?"
-  if [[ -n "$_tabminal_last_command" ]]; then
-    local CMD=$(echo -n "$_tabminal_last_command" | base64 | tr -d '\\n')
-    printf "\\x1b]1337;ExitCode=%s;CommandB64=%s\\x07" "$EC" "$CMD"
-    _tabminal_last_command="" # Reset after use
-  fi
-}
-_tabminal_apply_prompt_marker() {
-  local marker=$'\\[\\e]1337;TabminalPrompt\\a\\]'
-  if [[ "$PS1" != *"TabminalPrompt"* ]]; then
-    PS1="$PS1$marker"
-  fi
-}
-if [[ -n "$PROMPT_COMMAND" ]]; then
-  printf -v PROMPT_COMMAND "_tabminal_bash_postexec; %s; _tabminal_apply_prompt_marker" "$PROMPT_COMMAND"
-else
-  PROMPT_COMMAND="_tabminal_bash_postexec; _tabminal_apply_prompt_marker"
-fi
-export PROMPT_COMMAND
-`;
-                fs.writeFileSync(initFilePath, bashScript);
-                args = ['--rcfile', initFilePath, '-i'];
+                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 });
-                initFilePath = path.join(initDirPath, '.zshrc');
+                const initFilePath = path.join(initDirPath, '.zshrc');
 
                 const zshScript = `
 unset ZDOTDIR
@@ -151,17 +144,21 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
 
         let ptyProcess;
         try {
-            ptyProcess = pty.spawn(shell, args, {
+            const ptyOptions = {
                 name: 'xterm-256color',
                 cols: cols,
                 rows: rows,
                 cwd: initialCwd,
-                env: env,
-                encoding: 'utf8'
-            });
+                env: env
+            };
+            if (process.platform !== 'win32') {
+                ptyOptions.encoding = 'utf8';
+            }
+            ptyProcess = pty.spawn(spawnShell, args, ptyOptions);
         } catch (err) {
             const spawnInfo = {
-                shell,
+                shell: spawnShell,
+                requestedShell: shell,
                 args,
                 cwd: initialCwd,
                 cols,
@@ -207,7 +204,6 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
             this.removeSession(id);
             // Cleanup temp files
             try {
-                if (initFilePath && fs.existsSync(initFilePath)) fs.unlinkSync(initFilePath);
                 if (initDirPath && fs.existsSync(initDirPath)) fs.rmSync(initDirPath, { recursive: true, force: true });
             } catch { /* ignore cleanup errors */ }
         });
@@ -295,7 +291,11 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
         this.disposing = true;
         for (const session of this.sessions.values()) {
             try {
-                session.pty.kill('SIGHUP');
+                if (process.platform === 'win32') {
+                    session.pty.kill();
+                } else {
+                    session.pty.kill('SIGHUP');
+                }
             } catch {
                 // ignore
             }

package/src/terminal-session.mjs

@@ -20,11 +20,31 @@ const TITLE_POLL_INTERVAL_MS = 3000;
 
 const IGNORED_COMMANDS = [
     'export PROMPT_COMMAND',
-    '__bash_prompt'
+    '__bash_prompt',
+    'TABMINAL_SHELL_READY=1'
 ];
 
 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";
 
+function splitTrailingPartialSequence(chunk) {
+    if (!chunk) {
+        return { complete: '', partial: '' };
+    }
+
+    const oscStart = chunk.lastIndexOf('\u001b]1337;');
+    if (oscStart >= 0) {
+        const oscTail = chunk.slice(oscStart);
+        if (!oscTail.includes('\u0007')) {
+            return {
+                complete: chunk.slice(0, oscStart),
+                partial: oscTail
+            };
+        }
+    }
+
+    return { complete: chunk, partial: '' };
+}
+
 export class TerminalSession {
     constructor(pty, options = {}) {
         this.pty = pty;
@@ -55,6 +75,7 @@ export class TerminalSession {
         this.captureStartedAt = null;
         this.lastExecution = null;
         this.skipNextShellLog = false;
+        this.partialSequenceBuffer = '';
 
         this.ansiParser = new AnsiParser({
             inst_o: (s) => {
@@ -83,6 +104,13 @@ export class TerminalSession {
             if (this.suppressPtyOutput) return;
 
             if (typeof chunk !== 'string') chunk = chunk.toString('utf8');
+            if (this.partialSequenceBuffer) {
+                chunk = this.partialSequenceBuffer + chunk;
+                this.partialSequenceBuffer = '';
+            }
+            const split = splitTrailingPartialSequence(chunk);
+            chunk = split.complete;
+            this.partialSequenceBuffer = split.partial;
 
             if (this.manager) {
                 this.manager.appendLog(this.id, chunk);