termdock 1.4.98 → 1.4.99

package/dist/server/routes/terminal.js

@@ -43,6 +43,7 @@ const TERMDOCK_DIR = `${os.homedir()}/.termdock`;
 const automationStore = new AutomationStore(`${TERMDOCK_DIR}/automations.json`);
 const collaborationStore = new CollaborationStore(`${TERMDOCK_DIR}/collaboration-groups.json`);
 const sessionSearchStore = new SessionSearchStore(`${TERMDOCK_DIR}/session-search`);
+let atomicJsonWriteSequence = 0;
 async function readJsonFileIfExists(filePath) {
     try {
         const raw = await fs.promises.readFile(filePath, 'utf-8');
@@ -56,7 +57,21 @@ async function readJsonFileIfExists(filePath) {
 }
 async function writeJsonFile(filePath, value) {
     await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
-    await fs.promises.writeFile(filePath, JSON.stringify(value, null, 2), 'utf-8');
+    const temporaryPath = `${filePath}.${process.pid}.${++atomicJsonWriteSequence}.tmp`;
+    let handle = null;
+    try {
+        handle = await fs.promises.open(temporaryPath, 'w');
+        await handle.writeFile(JSON.stringify(value, null, 2), 'utf-8');
+        await handle.sync();
+        await handle.close();
+        handle = null;
+        await fs.promises.rename(temporaryPath, filePath);
+    }
+    catch (error) {
+        await handle?.close().catch(() => undefined);
+        await fs.promises.rm(temporaryPath, { force: true }).catch(() => undefined);
+        throw error;
+    }
 }
 // Termdock metadata constants used to populate tmux user options
 // (`@termdock-*`) so external tools (e.g. `termdock --tls`) can identify
@@ -636,6 +651,8 @@ const CLEANUP_INTERVAL = TERMINAL.cleanupInterval;
 const RECONNECT_SCROLLBACK = TERMINAL.reconnectScrollback;
 const TMUX_POLL_INTERVAL = parseInt(process.env.TMUX_POLL_INTERVAL || '500', 10);
 const ACTIVE_PROGRAM_POLL_INTERVAL = parseInt(process.env.TERMINAL_ACTIVE_PROGRAM_POLL_INTERVAL || '1200', 10);
+const TMUX_LAYOUT_CACHE_TTL_MS = Math.max(TMUX_POLL_INTERVAL, 1000);
+const PROCESS_SNAPSHOT_CACHE_TTL_MS = Math.max(ACTIVE_PROGRAM_POLL_INTERVAL, 2500);
 const FLOW_CONTROL_PAUSE_LEASE_MS = TERMINAL.flowControlPauseLeaseMs;
 const TMUX_DELIMITER = '\x1f';
 const TERMDOCK_TMUX_HISTORY_LIMIT = TMUX.historyLimit;
@@ -2954,6 +2971,51 @@ try {
     }
 }
 catch { /* plugin loading must never block startup */ }
+let processSnapshot = null;
+let processSnapshotPromise = null;
+function parseProcessSnapshot(stdout) {
+    return stdout
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean)
+        .map((line) => {
+        // ps -o format: TTY PID PPID PGID TPGID STAT COMM ARGS
+        const match = line.match(/^(\S+)\s+(\d+)\s+(\d+)\s+(-?\d+)\s+(-?\d+)\s+(\S+)\s+(\S+)\s+(.+)$/);
+        if (!match)
+            return null;
+        return {
+            tty: match[1] || '',
+            pid: Number.parseInt(match[2] || '0', 10),
+            ppid: Number.parseInt(match[3] || '0', 10),
+            pgid: Number.parseInt(match[4] || '0', 10),
+            tpgid: Number.parseInt(match[5] || '0', 10),
+            stat: match[6] || '',
+            comm: match[7] || '',
+            args: match[8]?.trim() || '',
+        };
+    })
+        .filter((row) => row !== null);
+}
+async function getProcessSnapshot() {
+    const now = Date.now();
+    if (processSnapshot && now - processSnapshot.fetchedAt < PROCESS_SNAPSHOT_CACHE_TTL_MS) {
+        return processSnapshot.rows;
+    }
+    if (processSnapshotPromise)
+        return processSnapshotPromise;
+    processSnapshotPromise = execFileAsync('ps', [
+        '-e',
+        '-o',
+        'tty=,pid=,ppid=,pgid=,tpgid=,stat=,comm=,args=',
+    ], { timeout: 3000, maxBuffer: 4 * 1024 * 1024 }).then(({ stdout }) => {
+        const rows = parseProcessSnapshot(stdout);
+        processSnapshot = { rows, fetchedAt: Date.now() };
+        return rows;
+    }).finally(() => {
+        processSnapshotPromise = null;
+    });
+    return processSnapshotPromise;
+}
 async function resolveTmuxPaneProgram(pane) {
     // If pane command is a known shell, try to find a child foreground process
     const command = normalizeProgramName(pane.command);
@@ -2969,31 +3031,36 @@ async function resolveTmuxPaneProgram(pane) {
         return { command, source: 'tmux-pane', rawArgs: null };
     }
     try {
-        const psArgs = pane.tty
-            ? ['-t', pane.tty.replace(/^\/dev\//, ''), '-o', 'pid=,ppid=,pgid=,tpgid=,stat=,comm=,args=']
-            : ['-o', 'pid=,ppid=,pgid=,tpgid=,stat=,comm=,args='];
-        const { stdout } = await execFileAsync('ps', psArgs, { timeout: 3000, maxBuffer: 512 * 1024 });
-        const rows = stdout
-            .split('\n')
-            .map((line) => line.trim())
-            .filter(Boolean)
-            .map((line) => {
-            // ps -o format: PID PPID PGID TPGID STAT COMM ARGS
-            // COMM is a single token; ARGS is the rest of the line
-            const match = line.match(/^(\d+)\s+(\d+)\s+(-?\d+)\s+(-?\d+)\s+(\S+)\s+(\S+)\s+(.+)$/);
-            if (!match)
-                return null;
-            return {
-                pid: Number.parseInt(match[1] || '0', 10),
-                ppid: Number.parseInt(match[2] || '0', 10),
-                pgid: Number.parseInt(match[3] || '0', 10),
-                tpgid: Number.parseInt(match[4] || '0', 10),
-                stat: match[5] || '',
-                comm: match[6] || '',
-                args: match[7]?.trim() || '',
-            };
-        })
-            .filter((row) => row !== null);
+        let rows;
+        if (process.platform === 'linux' && pane.tty) {
+            const paneTty = pane.tty.replace(/^\/dev\//, '');
+            rows = (await getProcessSnapshot()).filter((row) => row.tty === paneTty);
+        }
+        else {
+            const psArgs = pane.tty
+                ? ['-t', pane.tty.replace(/^\/dev\//, ''), '-o', 'pid=,ppid=,pgid=,tpgid=,stat=,comm=,args=']
+                : ['-o', 'pid=,ppid=,pgid=,tpgid=,stat=,comm=,args='];
+            const { stdout } = await execFileAsync('ps', psArgs, { timeout: 3000, maxBuffer: 512 * 1024 });
+            rows = stdout
+                .split('\n')
+                .map((line) => line.trim())
+                .filter(Boolean)
+                .map((line) => {
+                const match = line.match(/^(\d+)\s+(\d+)\s+(-?\d+)\s+(-?\d+)\s+(\S+)\s+(\S+)\s+(.+)$/);
+                if (!match)
+                    return null;
+                return {
+                    pid: Number.parseInt(match[1] || '0', 10),
+                    ppid: Number.parseInt(match[2] || '0', 10),
+                    pgid: Number.parseInt(match[3] || '0', 10),
+                    tpgid: Number.parseInt(match[4] || '0', 10),
+                    stat: match[5] || '',
+                    comm: match[6] || '',
+                    args: match[7]?.trim() || '',
+                };
+            })
+                .filter((row) => row !== null);
+        }
         const selected = selectTmuxForegroundProgram({
             panePid: pane.pid,
             rows,
@@ -3463,6 +3530,115 @@ async function getTmuxLayout(sessionName) {
         inCopyMode: paneInMode === '1',
     };
 }
+let tmuxLayoutsSnapshot = null;
+let tmuxLayoutsSnapshotPromise = null;
+async function buildTmuxLayoutsSnapshot() {
+    const [sessionsRaw, windowsRaw, panesRaw] = await Promise.all([
+        runTmux([
+            'list-sessions',
+            '-F',
+            `#{session_id}${TMUX_DELIMITER}#{session_name}${TMUX_DELIMITER}#{window_id}${TMUX_DELIMITER}#{pane_id}${TMUX_DELIMITER}#{pane_in_mode}`,
+        ]),
+        runTmux([
+            'list-windows',
+            '-a',
+            '-F',
+            `#{session_name}${TMUX_DELIMITER}#{window_id}${TMUX_DELIMITER}#{window_name}${TMUX_DELIMITER}#{window_index}${TMUX_DELIMITER}#{window_active}`,
+        ]),
+        runTmux([
+            'list-panes',
+            '-a',
+            '-F',
+            `#{session_name}${TMUX_DELIMITER}#{window_id}${TMUX_DELIMITER}#{pane_id}${TMUX_DELIMITER}#{pane_index}${TMUX_DELIMITER}#{pane_active}${TMUX_DELIMITER}#{pane_width}${TMUX_DELIMITER}#{pane_height}${TMUX_DELIMITER}#{pane_top}${TMUX_DELIMITER}#{pane_left}${TMUX_DELIMITER}#{pane_current_command}${TMUX_DELIMITER}#{pane_pid}${TMUX_DELIMITER}#{pane_tty}${TMUX_DELIMITER}#{pane_title}${TMUX_DELIMITER}#{pane_current_path}`,
+        ]),
+    ]);
+    const layouts = new Map();
+    for (const line of sessionsRaw.trim().split('\n')) {
+        if (!line)
+            continue;
+        const row = parseDelimitedRow(line, 5);
+        if (!row)
+            continue;
+        const [sessionId, sessionName, activeWindowId, activePaneId, paneInMode] = row;
+        layouts.set(sessionName, {
+            sessionId,
+            sessionName,
+            windows: [],
+            activeWindowId,
+            activePaneId,
+            inCopyMode: paneInMode === '1',
+        });
+    }
+    const windowsById = new Map();
+    for (const line of windowsRaw.trim().split('\n')) {
+        if (!line)
+            continue;
+        const row = parseDelimitedRow(line, 5);
+        if (!row)
+            continue;
+        const [sessionName, windowId, windowName, windowIndexRaw, windowActiveRaw] = row;
+        const layout = layouts.get(sessionName);
+        if (!layout)
+            continue;
+        const window = {
+            id: windowId,
+            name: windowName || '',
+            index: parseInt(windowIndexRaw || '0', 10),
+            active: windowActiveRaw === '1',
+            panes: [],
+        };
+        layout.windows.push(window);
+        windowsById.set(`${sessionName}\0${windowId}`, window);
+    }
+    for (const line of panesRaw.trim().split('\n')) {
+        if (!line)
+            continue;
+        const row = parseDelimitedRow(line, 14);
+        if (!row)
+            continue;
+        const [sessionName, windowId, paneId, paneIndexRaw, paneActiveRaw, widthRaw, heightRaw, topRaw, leftRaw, command, pidRaw, tty, title, currentPath] = row;
+        const window = windowsById.get(`${sessionName}\0${windowId}`);
+        if (!window)
+            continue;
+        window.panes.push({
+            id: paneId,
+            index: parseInt(paneIndexRaw || '0', 10),
+            active: paneActiveRaw === '1',
+            width: parseInt(widthRaw || '0', 10),
+            height: parseInt(heightRaw || '0', 10),
+            top: parseInt(topRaw || '0', 10),
+            left: parseInt(leftRaw || '0', 10),
+            command: command || '',
+            pid: parseInt(pidRaw || '0', 10) || 0,
+            tty: tty || '',
+            title: title || '',
+            currentPath: currentPath || '',
+        });
+    }
+    return layouts;
+}
+async function getCachedTmuxLayout(sessionName) {
+    if (tmuxLayoutsSnapshot && Date.now() - tmuxLayoutsSnapshot.fetchedAt < TMUX_LAYOUT_CACHE_TTL_MS) {
+        const cached = tmuxLayoutsSnapshot.layouts.get(sessionName);
+        if (cached)
+            return cached;
+    }
+    if (!tmuxLayoutsSnapshotPromise) {
+        tmuxLayoutsSnapshotPromise = buildTmuxLayoutsSnapshot().then((layouts) => {
+            tmuxLayoutsSnapshot = { layouts, fetchedAt: Date.now() };
+            return layouts;
+        }).finally(() => {
+            tmuxLayoutsSnapshotPromise = null;
+        });
+    }
+    const layouts = await tmuxLayoutsSnapshotPromise;
+    const layout = layouts.get(sessionName);
+    if (layout)
+        return layout;
+    // A just-created session can race the global snapshot. Keep that rare path
+    // correct without returning stale metadata for the new terminal.
+    return getTmuxLayout(sessionName);
+}
 async function getRestoreHistory(sessionId, session) {
     // In tmux mode, scrollback belongs to tmux itself rather than the app layer,
     // so capture the active pane to rebuild the visible screen on refresh.
@@ -5650,7 +5826,7 @@ router.get('/:sessionId/stream', async (req, res) => {
                 session.activeProgram = ap;
         }
         else if (session.mode === 'tmux' && session.tmuxSessionName) {
-            const layout = await getTmuxLayout(session.tmuxSessionName);
+            const layout = await getCachedTmuxLayout(session.tmuxSessionName);
             const activePane = getActivePaneFromLayout(layout);
             const ap = activePane
                 ? await resolveTmuxPaneProgram(activePane)
@@ -5727,7 +5903,7 @@ router.get('/:sessionId/stream', async (req, res) => {
             return;
         }
         try {
-            const layout = await getTmuxLayout(session.tmuxSessionName);
+            const layout = await getCachedTmuxLayout(session.tmuxSessionName);
             // Resolve the active program — try ps-based detection for generic commands
             const activePane = getActivePaneFromLayout(layout);
             if (activePane) {
@@ -6336,7 +6512,7 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
                     session.activeProgram = ap;
             }
             else if (session.mode === 'tmux' && session.tmuxSessionName) {
-                const layout = await getTmuxLayout(session.tmuxSessionName);
+                const layout = await getCachedTmuxLayout(session.tmuxSessionName);
                 const ap = getActiveProgramFromTmuxLayout(layout);
                 if (ap)
                     session.activeProgram = ap;
@@ -6419,7 +6595,7 @@ export function handleTerminalWebSocket(ws, sessionId, clientId, options = {}) {
             if (ws.readyState !== ws.OPEN)
                 return;
             try {
-                const layout = await getTmuxLayout(session.tmuxSessionName);
+                const layout = await getCachedTmuxLayout(session.tmuxSessionName);
                 // Update active program — try ps-based detection for generic commands
                 const activePane = getActivePaneFromLayout(layout);
                 let ap = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.98",
+  "version": "1.4.99",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",
@@ -24,7 +24,7 @@
     "dev:client": "vite",
     "dev:server": "cross-env PORT=9835 tsx watch src/server/entry.ts",
     "build": "npm run clean && npm run build:client && npm run build:server && npm run build:runtime-manifest",
-    "build:desktop": "node scripts/prepare-desktop-tokens.mjs && tsc -p tsconfig.desktop.json",
+    "build:desktop": "node scripts/prepare-desktop-tokens.mjs && tsc -p tsconfig.desktop.json && esbuild desktop/preload.cts --bundle --platform=node --format=cjs --external:electron --outfile=.desktop-dist/preload.cjs",
     "desktop:dev": "npm run build && npm run build:desktop && electron-forge start",
     "desktop:prepare": "npm run build && npm run build:desktop && node scripts/prepare-desktop-runtime.mjs",
     "desktop:make": "node scripts/ensure-macos-appdmg.mjs && npm run desktop:prepare && electron-forge make",
@@ -111,6 +111,7 @@
     "concurrently": "^8.2.0",
     "cross-env": "^10.1.0",
     "electron": "^43.2.0",
+    "esbuild": "^0.27.7",
     "eslint": "^9.39.2",
     "jsdom": "^24.0.0",
     "postcss": "^8.4.0",

package/runtime-manifest.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.98",
+  "version": "1.4.99",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-emuXnf9w0kJF3ksMJVvdI0u8oLHKwZJ2/OzHBAXulZs=",
-  "serverBundleHash": "sha256-exDTuohFamGGte9Col2+A4qvyulcp5DfV4U3bOD1gWo=",
+  "serverBundleHash": "sha256-HoYNZvRYLVItcMdTryy29alYQdle/LCxvw2bx4YzWfk=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/dist/client/assets/channel-DPt818Jx.js

@@ -1 +0,0 @@
-import{U as a,C as n}from"./mermaid.core-D4Yy5OxZ.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/client/assets/classDiagram-OUVF2IWQ-C2hZbTnO.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-BRo0103H.js";import{b as i}from"./mermaid.core-D4Yy5OxZ.js";import"./chunk-5VM5RSS4-CVk_pzpf.js";import"./chunk-XXDRQBXY-BuWiQ0uq.js";import"./chunk-VR4S4FIN-CW-wSkDE.js";import"./chunk-32BRIVSS-B1dA4l5A.js";import"./purify.es-CC4Brkr_.js";import"./index-BuMMW0wS.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-EOCWNBFH-C2hZbTnO.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-BRo0103H.js";import{b as i}from"./mermaid.core-D4Yy5OxZ.js";import"./chunk-5VM5RSS4-CVk_pzpf.js";import"./chunk-XXDRQBXY-BuWiQ0uq.js";import"./chunk-VR4S4FIN-CW-wSkDE.js";import"./chunk-32BRIVSS-B1dA4l5A.js";import"./purify.es-CC4Brkr_.js";import"./index-BuMMW0wS.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/stateDiagram-v2-6OUMAXLB-BslbFNw3.js

@@ -1 +0,0 @@
-import{b as r,a as e,s as a,S as i}from"./chunk-EX3LRPZG-B46zhCa0.js";import{b as s}from"./mermaid.core-D4Yy5OxZ.js";import"./chunk-XXDRQBXY-BuWiQ0uq.js";import"./chunk-VR4S4FIN-CW-wSkDE.js";import"./chunk-32BRIVSS-B1dA4l5A.js";import"./purify.es-CC4Brkr_.js";import"./index-BuMMW0wS.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:a,get db(){return new i(2)},renderer:e,styles:r,init:s(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/swimlanesDiagram-G3AALYLV-B0V1XVQb.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-23GEKE2U-ggl4zaY9.js";import{b as o}from"./mermaid.core-D4Yy5OxZ.js";import"./chunk-5VM5RSS4-CVk_pzpf.js";import"./chunk-XXDRQBXY-BuWiQ0uq.js";import"./chunk-VR4S4FIN-CW-wSkDE.js";import"./chunk-32BRIVSS-B1dA4l5A.js";import"./purify.es-CC4Brkr_.js";import"./channel-DPt818Jx.js";import"./index-BuMMW0wS.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var a=o(t=>`${e(t)}
-  .swimlane.cluster rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),m=a,v=r({defaultLayout:"swimlane",styles:m});export{v as diagram};