termdock 1.4.131 → 1.4.133

package/dist/server/routes/terminal.js

@@ -15,7 +15,7 @@ import { getPtyHostManager } from '../ptyhost/manager.js';
 import { pathValidator } from '../utils/pathValidator.js';
 import { TERMINAL, TMUX } from '../config.js';
 import { localAccessManager } from '../utils/localAccess.js';
-import { normalizeLocalAccessName, getLocaleSetting, setLocaleSetting, getContextDraftHeightSetting, setContextDraftHeightSetting, getAutoRenameAgentsSetting, setAutoRenameAgentsSetting, getAutoRenameNamerSetting, setAutoRenameNamerSetting, getAutoRenameModelsSetting, setAutoRenameModelsSetting, getAutoRenameIntervalMinutesSetting, setAutoRenameIntervalMinutesSetting, getAutoRenamePromptPreferenceSetting, setAutoRenamePromptPreferenceSetting, getAutoRenamePromptPayloadCharsSetting, setAutoRenamePromptPayloadCharsSetting, getNewSessionAgentSlugSetting, setNewSessionAgentSlugSetting, getRunningSessionButtonEnabledSetting, setRunningSessionButtonEnabledSetting, getFileSortModesSetting, setFileSortModesSetting, setFileSortModeSetting, } from '../utils/settings.js';
+import { normalizeLocalAccessName, getLocaleSetting, setLocaleSetting, getContextDraftHeightSetting, setContextDraftHeightSetting, getAutoRenameAgentsSetting, setAutoRenameAgentsSetting, getAutoRenameNamerSetting, setAutoRenameNamerSetting, getAutoRenameModelsSetting, setAutoRenameModelsSetting, getAutoRenameIntervalMinutesSetting, setAutoRenameIntervalMinutesSetting, getAutoRenamePromptPreferenceSetting, setAutoRenamePromptPreferenceSetting, getAutoRenamePromptPayloadCharsSetting, setAutoRenamePromptPayloadCharsSetting, getNewSessionAgentSlugSetting, setNewSessionAgentSlugSetting, getRunningSessionButtonEnabledSetting, setRunningSessionButtonEnabledSetting, getFileSortModesSetting, setFileSortModesSetting, setFileSortModeSetting, getPinnedExplorerRootsSetting, setPinnedExplorerRootsSetting, setPinnedExplorerRootSetting, watchPinnedExplorerRootsSetting, } from '../utils/settings.js';
 import { loadContextDraft, saveContextDraft } from '../utils/contextDraft.js';
 import { getOnboardingServerUrl } from '../onboardingServer.js';
 import { inspectLinuxInotifyUsage, isWatchResourceExhaustion } from '../utils/fileWatchPolicy.js';
@@ -25,6 +25,7 @@ import { agentBySlug, buildResumeCommand, detectAgentFromCommand, inferResumeSes
 import { applyAgentEvent, agentEventMatchesCurrentAgent, defaultAgentSessionState, parseAgentEvent, } from '../agent/session.js';
 import { canRestoreDeadAgentShell, normalizePersistedAgentResumeInfo, } from '../agent/resumePersistence.js';
 import { AgentResumeHistoryStore } from '../agent/resumeHistory.js';
+import { isTmuxRecoveryCandidate } from '../utils/tmuxRecoveryCandidate.js';
 import { AutomationStore, normalizeAutomationSchedule } from '../agent/automationStore.js';
 import { buildBracketedSubmitBytes, canDeliverPromptToAgent } from '../agent/promptDelivery.js';
 import { CollaborationStore } from '../agent/collaborationStore.js';
@@ -104,6 +105,7 @@ const TERMDOCK_VERSION = (() => {
 const TERMDOCK_HOST = os.hostname();
 const TERMDOCK_PID = String(process.pid);
 const TERMDOCK_GUI_DETACHED_AT_OPTION = '@termdock-gui-detached-at';
+const TERMDOCK_FRONTEND_SESSION_ID_OPTION = '@termdock-frontend-session-id';
 // WebSocket clients per session (separate from SSE clients).
 const wsClients = new Map();
 // Sessions where copy-mode -e just auto-exited at the bottom.
@@ -234,6 +236,17 @@ function sendClientStatePayload(payload) {
 function broadcastControlEvent(payload) {
     sendClientStatePayload(JSON.stringify(payload));
 }
+// Atomic settings writes replace the inode, so the utility watches the parent
+// directory. Besides this process's own writes, it observes sibling Termdock
+// server processes that share ~/.termdock and relays their pin list here.
+watchPinnedExplorerRootsSetting((pinnedExplorerRoots) => {
+    broadcastControlEvent({
+        type: 'pinned-explorer-roots',
+        pinnedExplorerRoots,
+        updatedAt: Date.now(),
+        origin: null,
+    });
+});
 let serverRestartScheduled = false;
 function requestServerRestartAfterUpdate() {
     if (serverRestartScheduled)
@@ -614,6 +627,7 @@ async function backfillPersistedTmuxMetadata() {
                 '@termdock-version': TERMDOCK_VERSION,
                 '@termdock-host': TERMDOCK_HOST,
                 '@termdock-pid': TERMDOCK_PID,
+                [TERMDOCK_FRONTEND_SESSION_ID_OPTION]: s.sessionId,
                 // Agent-hook plumbing (see ensureManagedTmuxSessionReady): backfilled
                 // at startup so sessions created before this feature get it too.
                 'allow-passthrough': 'on',
@@ -841,7 +855,7 @@ function parseNumberOption(raw) {
     return Number.isFinite(value) ? value : null;
 }
 function isTermdockManagedTmuxSession(session) {
-    return !!(session.version || session.host || session.pid || session.createdAt || session.lastActiveAt || session.label || session.program || session.cwd || session.guiDetachedAt);
+    return !!(session.version || session.host || session.pid || session.createdAt || session.lastActiveAt || session.label || session.program || session.cwd || session.guiDetachedAt || session.sourceFrontendSessionId);
 }
 function normalizeMetadataProgram(program) {
     return normalizeTmuxMetadataProgram(program, { shellNames: shellNamesBackend });
@@ -1221,6 +1235,7 @@ async function openInventorySession(req, input) {
             '@termdock-version': TERMDOCK_VERSION,
             '@termdock-host': TERMDOCK_HOST,
             '@termdock-pid': TERMDOCK_PID,
+            [TERMDOCK_FRONTEND_SESSION_ID_OPTION]: savedRecord.sessionId,
         });
     }
     const inventory = await getSessionInventorySnapshot({ refresh: true });
@@ -1237,6 +1252,7 @@ function orchestrationSessionSnapshot(record) {
     const latestPrompt = backend?.autoTitlePromptPayloads.at(-1)?.trim() ?? '';
     return {
         sessionId: record.sessionId,
+        agentNativeSessionId: backend?.agentSession?.sessionId ?? record.agentResume?.sessionId ?? null,
         backendSessionId: record.backendSessionId ?? null,
         name: record.name,
         cwd: backend?.cwd ?? record.cwd ?? '',
@@ -1349,7 +1365,12 @@ function tryDeliverCollaborationInbox(frontendSessionId) {
         groups: collaborationStore.groupsForSession(frontendSessionId),
         sessions: globalSessionState.sessions.map((candidate) => {
             const snapshot = orchestrationSessionSnapshot(candidate);
-            return { sessionId: snapshot.sessionId, name: snapshot.name, status: snapshot.status };
+            return {
+                sessionId: snapshot.sessionId,
+                agentNativeSessionId: snapshot.agentNativeSessionId,
+                name: snapshot.name,
+                status: snapshot.status,
+            };
         }),
     });
     session.ptyProcess.write(buildBracketedSubmitBytes(prompt));
@@ -1817,6 +1838,7 @@ async function listLiveTmuxInventorySessions() {
         '#{@termdock-created-at}',
         '#{@termdock-last-active-at}',
         `#{${TERMDOCK_GUI_DETACHED_AT_OPTION}}`,
+        `#{${TERMDOCK_FRONTEND_SESSION_ID_OPTION}}`,
     ].join(TMUX_DELIMITER);
     try {
         const raw = await runTmux(['list-sessions', '-F', format]);
@@ -1824,9 +1846,9 @@ async function listLiveTmuxInventorySessions() {
             .split('\n')
             .map((line) => line.trim())
             .filter(Boolean)
-            .map((line) => parseDelimitedRow(line, 14))
+            .map((line) => parseDelimitedRow(line, 15))
             .filter((row) => row !== null)
-            .map(([name, windowsRaw, attachedRaw, friendlyName, program, cwd, label, clientCountRaw, host, pidRaw, version, createdAtRaw, lastActiveAtRaw, guiDetachedAtRaw,]) => ({
+            .map(([name, windowsRaw, attachedRaw, friendlyName, program, cwd, label, clientCountRaw, host, pidRaw, version, createdAtRaw, lastActiveAtRaw, guiDetachedAtRaw, sourceFrontendSessionId,]) => ({
             name,
             windows: Number.parseInt(windowsRaw || '0', 10) || 0,
             attachedCount: Number.parseInt(attachedRaw || '0', 10) || 0,
@@ -1841,6 +1863,7 @@ async function listLiveTmuxInventorySessions() {
             createdAt: parseNumberOption(createdAtRaw),
             lastActiveAt: parseNumberOption(lastActiveAtRaw),
             guiDetachedAt: parseNumberOption(guiDetachedAtRaw),
+            sourceFrontendSessionId: sourceFrontendSessionId || null,
         }))
             .sort((a, b) => {
             const aCreated = a.createdAt ?? Number.POSITIVE_INFINITY;
@@ -1976,32 +1999,6 @@ async function buildSessionInventory() {
             return tmux;
         }
     }));
-    let discoveredManagedTmuxSession = false;
-    for (const tmux of refreshedTmuxSessions) {
-        if (!isTermdockManagedTmuxSession(tmux))
-            continue;
-        if (tmux.guiDetachedAt !== null)
-            continue;
-        const exists = globalSessionState.sessions.some((session) => session.mode === 'tmux' && session.tmuxSessionName === tmux.name);
-        if (exists)
-            continue;
-        const liveBackend = findBackendSessionForTmux(tmux.name);
-        const friendlyName = tmux.friendlyName?.trim() || null;
-        upsertGlobalSessionRecord({
-            sessionId: randomUUID(),
-            name: friendlyName ?? `tmux:${tmux.name}`,
-            customName: friendlyName ? true : undefined,
-            backendSessionId: liveBackend?.[0] ?? null,
-            mode: 'tmux',
-            tmuxSessionName: tmux.name,
-            createdAt: tmux.createdAt ?? Date.now(),
-            lastActivity: tmux.lastActiveAt ?? Date.now(),
-        });
-        discoveredManagedTmuxSession = true;
-    }
-    if (discoveredManagedTmuxSession) {
-        schedulePersistGlobalState();
-    }
     const liveTmuxByName = new Map(refreshedTmuxSessions.map((session) => [session.name, session]));
     let synchronizedPersistedFields = false;
     globalSessionState = {
@@ -2101,6 +2098,12 @@ async function buildSessionInventory() {
             connected: bound?.connected === true,
             live: true,
             restorable: bound?.restorable === true,
+            recoveryCandidate: isTmuxRecoveryCandidate({
+                managedByTermdock: isTermdockManagedTmuxSession(tmux),
+                sourceFrontendSessionId: tmux.sourceFrontendSessionId,
+                guiDetachedAt: tmux.guiDetachedAt,
+                boundFrontendSessionId: bound?.sessionId ?? null,
+            }),
             friendlyName: tmux.friendlyName,
             label: tmux.label,
             program: tmux.program,
@@ -4855,6 +4858,7 @@ router.get('/tmux/sessions', async (_req, res) => {
             connected: session.connected,
             live: session.live,
             restorable: session.restorable,
+            recoveryCandidate: session.recoveryCandidate,
             friendlyName: session.friendlyName,
             label: session.label,
             program: session.program,
@@ -5600,6 +5604,7 @@ async function getSettingsPayload() {
         newSessionAgentSlug: getNewSessionAgentSlugSetting(),
         runningSessionButtonEnabled: getRunningSessionButtonEnabledSetting(),
         fileSortModes: getFileSortModesSetting(),
+        pinnedExplorerRoots: getPinnedExplorerRootsSetting(),
         localAccess: {
             ...localAccess,
             interfaces,
@@ -5641,6 +5646,7 @@ router.post('/update/restart', async (_req, res) => {
 });
 router.put('/settings', async (req, res) => {
     const body = req.body ?? {};
+    let pinnedExplorerRootsChanged = false;
     if (typeof body.preventSleep === 'boolean') {
         caffeinateManager.setPreventSleep(body.preventSleep);
     }
@@ -5735,6 +5741,26 @@ router.put('/settings', async (req, res) => {
         }
         setFileSortModeSetting(preference.path, preference.mode);
     }
+    if (body.pinnedExplorerRoots && typeof body.pinnedExplorerRoots === 'object' && !Array.isArray(body.pinnedExplorerRoots)) {
+        setPinnedExplorerRootsSetting(body.pinnedExplorerRoots);
+        pinnedExplorerRootsChanged = true;
+    }
+    if (body.pinnedExplorerRoot && typeof body.pinnedExplorerRoot === 'object') {
+        const mutation = body.pinnedExplorerRoot;
+        const validAbsolutePath = (value) => typeof value === 'string'
+            && value.length > 0
+            && value.length <= 4096
+            && (value.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(value));
+        if (!validAbsolutePath(mutation.rootPath)
+            || !validAbsolutePath(mutation.path)
+            || (mutation.kind !== 'file' && mutation.kind !== 'directory')
+            || typeof mutation.pinned !== 'boolean') {
+            res.status(400).json({ error: 'Invalid pinned explorer entry', code: 'PINNED_EXPLORER_ROOT_INVALID' });
+            return;
+        }
+        setPinnedExplorerRootSetting(mutation.rootPath, mutation.path, mutation.kind, mutation.pinned);
+        pinnedExplorerRootsChanged = true;
+    }
     if (body.localAccess && typeof body.localAccess === 'object') {
         const localAccessBody = body.localAccess;
         if (localAccessBody.reset === true) {
@@ -5753,7 +5779,16 @@ router.put('/settings', async (req, res) => {
             }
         }
     }
-    res.json(await getSettingsPayload());
+    const payload = await getSettingsPayload();
+    if (pinnedExplorerRootsChanged) {
+        broadcastControlEvent({
+            type: 'pinned-explorer-roots',
+            pinnedExplorerRoots: payload.pinnedExplorerRoots,
+            updatedAt: Date.now(),
+            origin: typeof body.pinnedExplorerRootsOrigin === 'string' ? body.pinnedExplorerRootsOrigin : null,
+        });
+    }
+    res.json(payload);
 });
 // ── Context draft (cross-device realtime sync) ────────────────────────
 // 草稿内容存服务端（~/.termdock/context-draft.json），PUT 后通过 control

package/dist/server/utils/settings.js

@@ -70,6 +70,39 @@ export function normalizeFileSortModes(value) {
         && (filePath.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(filePath))))
         .slice(-500));
 }
+function isAbsoluteFilePath(value) {
+    return value.length > 0
+        && value.length <= 4096
+        && (value.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(value));
+}
+export function normalizePinnedExplorerRoots(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    const normalized = {};
+    for (const [rootPath, rawEntries] of Object.entries(value).slice(-200)) {
+        if (!isAbsoluteFilePath(rootPath) || !Array.isArray(rawEntries))
+            continue;
+        const seen = new Set();
+        const entries = [];
+        for (const rawEntry of rawEntries) {
+            if (!rawEntry || typeof rawEntry !== 'object' || Array.isArray(rawEntry))
+                continue;
+            const entry = rawEntry;
+            if (typeof entry.path !== 'string'
+                || !isAbsoluteFilePath(entry.path)
+                || (entry.kind !== 'file' && entry.kind !== 'directory')
+                || seen.has(entry.path))
+                continue;
+            seen.add(entry.path);
+            entries.push({ path: entry.path, kind: entry.kind });
+            if (entries.length >= 12)
+                break;
+        }
+        if (entries.length > 0)
+            normalized[rootPath] = entries;
+    }
+    return normalized;
+}
 function normalizeSettings(value) {
     const raw = value && typeof value === 'object' && !Array.isArray(value)
         ? value
@@ -117,6 +150,7 @@ function normalizeSettings(value) {
         newSessionAgentSlug: normalizeNewSessionAgentSlug(raw.newSessionAgentSlug),
         runningSessionButtonEnabled: raw.runningSessionButtonEnabled === true,
         fileSortModes: normalizeFileSortModes(raw.fileSortModes),
+        pinnedExplorerRoots: normalizePinnedExplorerRoots(raw.pinnedExplorerRoots),
         updatedAt: typeof raw.updatedAt === 'number' ? raw.updatedAt : Date.now(),
     };
 }
@@ -437,3 +471,79 @@ export function setFileSortModeSetting(filePath, mode) {
         settings.fileSortModes = normalizeFileSortModes(next);
     });
 }
+export function getPinnedExplorerRootsSetting() {
+    return loadSettings().pinnedExplorerRoots;
+}
+export function setPinnedExplorerRootsSetting(roots) {
+    return updateSettings((settings) => {
+        settings.pinnedExplorerRoots = normalizePinnedExplorerRoots(roots);
+    });
+}
+export function setPinnedExplorerRootSetting(rootPath, entryPath, kind, pinned) {
+    return updateSettings((settings) => {
+        const roots = { ...settings.pinnedExplorerRoots };
+        const current = roots[rootPath] ?? [];
+        if (pinned) {
+            if (!current.some((entry) => entry.path === entryPath)) {
+                roots[rootPath] = [{ path: entryPath, kind }, ...current].slice(0, 12);
+            }
+        }
+        else {
+            const next = current.filter((entry) => entry.path !== entryPath);
+            if (next.length > 0)
+                roots[rootPath] = next;
+            else
+                delete roots[rootPath];
+        }
+        settings.pinnedExplorerRoots = normalizePinnedExplorerRoots(roots);
+    });
+}
+/**
+ * Watch the settings file through its parent directory because atomic saves
+ * replace the file inode. This lets sibling Termdock server processes sharing
+ * the same home directory relay pin changes to their own connected clients.
+ */
+export function watchPinnedExplorerRootsSetting(listener, settingsFile = SETTINGS_FILE) {
+    const initial = loadSettingsFile(settingsFile);
+    let previous = JSON.stringify(initial.pinnedExplorerRoots);
+    let timer = null;
+    let closed = false;
+    const refresh = () => {
+        timer = null;
+        if (closed)
+            return;
+        try {
+            const roots = loadSettingsFile(settingsFile).pinnedExplorerRoots;
+            const serialized = JSON.stringify(roots);
+            if (serialized === previous)
+                return;
+            previous = serialized;
+            listener(roots);
+        }
+        catch (error) {
+            console.warn('[settings] failed to refresh pinned explorer roots:', error);
+        }
+    };
+    let watcher;
+    try {
+        watcher = fs.watch(path.dirname(settingsFile), (_eventType, filename) => {
+            if (filename && filename.toString() !== path.basename(settingsFile))
+                return;
+            if (timer)
+                clearTimeout(timer);
+            timer = setTimeout(refresh, 40);
+            timer.unref?.();
+        });
+        watcher.unref();
+    }
+    catch (error) {
+        console.warn('[settings] failed to watch pinned explorer roots:', error);
+        return () => undefined;
+    }
+    return () => {
+        closed = true;
+        if (timer)
+            clearTimeout(timer);
+        watcher.close();
+    };
+}

package/dist/server/utils/tmuxRecoveryCandidate.js

@@ -0,0 +1,11 @@
+/**
+ * A recovery entry is a Termdock GUI session whose frontend record vanished
+ * while its tmux process survived. Plain tmux sessions, CLI-created detached
+ * sessions, and sessions the user explicitly detached are not recoverable.
+ */
+export function isTmuxRecoveryCandidate({ managedByTermdock, sourceFrontendSessionId, guiDetachedAt, boundFrontendSessionId, }) {
+    return managedByTermdock
+        && sourceFrontendSessionId !== null
+        && guiDetachedAt === null
+        && boundFrontendSessionId === null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.131",
+  "version": "1.4.133",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.131",
+  "version": "1.4.133",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-3I9X7zF4J4BUYOvxi3lIuWSKfDy6S6GD61w8Ay95Ypw=",
-  "serverBundleHash": "sha256-KCwumftUV9M9Hc3M/FVXnKudXTFT73UU7xByvp81cfM=",
+  "serverBundleHash": "sha256-WwHpiehjhEPAzSG3ezDohB/qAqt6gUyH1Xco/uMsKyo=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

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

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

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

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CihoNZl2.js";import{b as i}from"./mermaid.core-DJ5djvRE.js";import"./chunk-5VM5RSS4-CecVqJ7p.js";import"./chunk-XXDRQBXY-CVtb44LI.js";import"./chunk-VR4S4FIN-CW3x8SlE.js";import"./chunk-32BRIVSS-yne3sS0_.js";import"./purify.es-CC4Brkr_.js";import"./index-C_AcUvk0.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-DHP8oEqL.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CihoNZl2.js";import{b as i}from"./mermaid.core-DJ5djvRE.js";import"./chunk-5VM5RSS4-CecVqJ7p.js";import"./chunk-XXDRQBXY-CVtb44LI.js";import"./chunk-VR4S4FIN-CW3x8SlE.js";import"./chunk-32BRIVSS-yne3sS0_.js";import"./purify.es-CC4Brkr_.js";import"./index-C_AcUvk0.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};