termdock 1.4.284 → 1.4.286

package/dist/server/utils/enableSupervision.js

@@ -5,14 +5,13 @@ import { getSupervisorStatus } from './supervisorClient.js';
 import { SERVER_LOG_PATH } from './termdockState.js';
 let config = null;
 let pending = false;
-// Only the production CLI registers a launch recipe. Desktop and development
-// runtimes must remain owned by their original launcher.
+// Only the production CLI registers a launch recipe. Development runtimes
+// must remain owned by their original launcher.
 export function configureSupervisionEnable(value) {
     config = value;
 }
 export function canEnableSupervision() {
     return config !== null && !(process.env.TERMDOCK_SUPERVISED === '1' && process.connected)
-        && !process.env.TERMDOCK_DESKTOP && !process.env.TERMDOCK_DESKTOP_OWNER_SOCKET
         && !process.env.INVOCATION_ID && !process.env.NOTIFY_SOCKET && !process.env.PM2_HOME
         && !getSupervisorStatus()?.alive;
 }

package/dist/server/utils/runtimeClient.js

@@ -119,35 +119,3 @@ export function indexRetainedClientModules(homeDir = os.homedir()) {
     catch { /* No retained snapshots on first install. */ }
     return modules;
 }
-export function resolveRuntimeClientDist(defaultClientDist, homeDir = os.homedir()) {
-    try {
-        const defaultPackageRoot = path.resolve(defaultClientDist, '..', '..');
-        const runningManifest = readManifest(path.join(defaultPackageRoot, 'runtime-manifest.json'));
-        if (runningManifest?.schemaVersion !== 1
-            || typeof runningManifest.serverBundleHash !== 'string'
-            || typeof runningManifest.clientBundleHash !== 'string') {
-            return defaultClientDist;
-        }
-        const runtimeRoot = path.join(homeDir, '.termdock', 'desktop-runtime');
-        const versionsRoot = fs.realpathSync(path.join(runtimeRoot, 'versions'));
-        const selectedVersionRoot = fs.realpathSync(path.join(runtimeRoot, 'client-current'));
-        const relative = path.relative(versionsRoot, selectedVersionRoot);
-        if (!relative || relative.startsWith('..') || path.isAbsolute(relative))
-            return defaultClientDist;
-        const selectedPackageRoot = path.join(selectedVersionRoot, 'package');
-        const selectedManifest = readManifest(path.join(selectedPackageRoot, 'runtime-manifest.json'));
-        if (selectedManifest?.schemaVersion !== 1
-            || selectedManifest.serverBundleHash !== runningManifest.serverBundleHash
-            || selectedManifest.clientBundleHash !== runningManifest.clientBundleHash
-            || selectedManifest.clientEntrypoint !== 'dist/client/index.html') {
-            return defaultClientDist;
-        }
-        const selectedClientDist = path.join(selectedPackageRoot, 'dist', 'client');
-        if (!fs.existsSync(path.join(selectedClientDist, 'index.html')))
-            return defaultClientDist;
-        return selectedClientDist;
-    }
-    catch {
-        return defaultClientDist;
-    }
-}

package/dist/server/utils/settings.js

@@ -235,6 +235,7 @@ function normalizeSettings(value) {
         collaborationFloatingGroupId: typeof raw.collaborationFloatingGroupId === 'string' && raw.collaborationFloatingGroupId.trim() ? raw.collaborationFloatingGroupId.trim() : null,
         serviceSwitcherExpanded: raw.serviceSwitcherExpanded === true,
         fileSortModes: normalizeFileSortModes(raw.fileSortModes),
+        hideGitIgnoredRoots: normalizeNestedGitScanRoots(raw.hideGitIgnoredRoots),
         nestedGitScanRoots: normalizeNestedGitScanRoots(raw.nestedGitScanRoots),
         pinnedExplorerRoots: normalizePinnedExplorerRoots(raw.pinnedExplorerRoots),
         activeGitRepos: normalizeActiveGitRepos(raw.activeGitRepos),
@@ -580,6 +581,19 @@ export function setFileSortModeSetting(filePath, mode) {
         settings.fileSortModes = normalizeFileSortModes(next);
     });
 }
+export function getHideGitIgnoredRootsSetting() {
+    return { ...loadSettings().hideGitIgnoredRoots };
+}
+export function setHideGitIgnoredRootSetting(rootPath, enabled) {
+    return updateSettings((settings) => {
+        const next = { ...settings.hideGitIgnoredRoots };
+        if (enabled)
+            next[rootPath] = true;
+        else
+            delete next[rootPath];
+        settings.hideGitIgnoredRoots = normalizeNestedGitScanRoots(next);
+    });
+}
 export function getNestedGitScanRootsSetting() {
     return { ...loadSettings().nestedGitScanRoots };
 }

package/dist/server/workers/nativeSessionSearchWorker.js

@@ -0,0 +1,416 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { createInterface } from 'node:readline';
+import { once } from 'node:events';
+import { parentPort, threadId, workerData } from 'node:worker_threads';
+const { directory, codexHome, claudeHome } = workerData;
+const entries = new Map();
+const failures = new Set();
+let warning = null;
+let building = false;
+let refreshedAt = 0;
+let refreshPromise = null;
+const manifest = path.join(directory, 'manifest.json');
+const temporarySuffix = `.tmp-${process.pid}-${threadId}`;
+const uuid = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\.jsonl$/i;
+const asJson = (value) => value && typeof value === 'object' ? value : {};
+const text = (value) => typeof value === 'string' ? value : '';
+const indexed = (entry) => entry.size === entry.indexedSize && entry.mtime === entry.indexedMtime;
+const textPath = (entry) => path.join(directory, `${entry.key}.txt`);
+const status = () => ({ total: entries.size, indexed: [...entries.values()].filter(indexed).length, building, failed: failures.size, warning });
+const publicRecord = (entry) => ({ key: entry.key, agentSlug: entry.agentSlug, agentNativeSessionId: entry.agentNativeSessionId, title: entry.title, cwd: entry.cwd, updatedAt: entry.updatedAt });
+async function save() {
+    const temporary = `${manifest}${temporarySuffix}`;
+    await fs.promises.writeFile(temporary, JSON.stringify({ version: 2, entries: [...entries.values()] }), { mode: 0o600 });
+    await fs.promises.rename(temporary, manifest);
+}
+async function* lines(file) {
+    const stream = fs.createReadStream(file, { encoding: 'utf8' });
+    const reader = createInterface({ input: stream, crlfDelay: Infinity });
+    try {
+        for await (const line of reader)
+            yield line;
+    }
+    finally {
+        reader.close();
+        stream.destroy();
+    }
+}
+async function discover(root, recursive, depth = 0) {
+    let children;
+    try {
+        children = await fs.promises.readdir(root, { withFileTypes: true });
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            warning = '部分历史目录无法读取，请检查当前服务账户的文件权限';
+        return [];
+    }
+    const found = [];
+    for (const child of children) {
+        const file = path.join(root, child.name);
+        if (child.isDirectory() && child.name !== 'subagents' && (recursive || depth === 0))
+            found.push(...await discover(file, recursive, depth + 1));
+        else if (child.isFile() && uuid.test(child.name))
+            found.push(file);
+    }
+    return found;
+}
+async function codexNames() {
+    const names = new Map();
+    try {
+        for await (const line of lines(path.join(codexHome, 'session_index.jsonl'))) {
+            try {
+                const record = JSON.parse(line);
+                const id = text(record.id);
+                const name = text(record.thread_name).trim();
+                if (id && name)
+                    names.set(id, name);
+            }
+            catch { /* Ignore a trailing partial record while Codex writes. */ }
+        }
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            warning = 'Codex 会话名称索引无法读取，暂用对话内容作为名称';
+    }
+    return names;
+}
+function content(value) {
+    if (typeof value === 'string')
+        return value;
+    if (!Array.isArray(value))
+        return '';
+    return value.map(block => {
+        const item = asJson(block);
+        if (['text', 'input_text', 'output_text'].includes(text(item.type)))
+            return text(item.text);
+        return item.type === 'tool_result' ? content(item.content) : '';
+    }).filter(Boolean).join('\n');
+}
+function parse(entry, line) {
+    // Codex world_state and tool snapshots dominate transcript size. These
+    // records contain no user/assistant dialogue; avoid parsing their payloads.
+    if (entry.agentSlug === 'codex') {
+        const type = /^\{[^\n]{0,200}?"type"\s*:\s*"([^"]+)"/.exec(line)?.[1];
+        if (type && !['session_meta', 'response_item', 'event_msg'].includes(type))
+            return '';
+    }
+    let record;
+    try {
+        record = JSON.parse(line);
+    }
+    catch {
+        return '';
+    }
+    let value = '';
+    let user = false;
+    if (entry.agentSlug === 'codex') {
+        const payload = asJson(record.payload);
+        if (record.type === 'session_meta') {
+            const id = text(payload.id) || text(payload.session_id);
+            if (id && id !== entry.agentNativeSessionId)
+                return '';
+            entry.cwd = text(payload.cwd) || entry.cwd;
+        }
+        else if (record.type === 'response_item' && payload.type === 'message' && ['user', 'assistant'].includes(text(payload.role))) {
+            value = content(payload.content);
+            user = payload.role === 'user';
+        }
+        else if (record.type === 'response_item' && ['function_call_output', 'custom_tool_call_output'].includes(text(payload.type))) {
+            value = content(payload.output);
+        }
+        else if (record.type === 'event_msg' && ['user_message', 'agent_message'].includes(text(payload.type))) {
+            value = text(payload.message);
+            user = payload.type === 'user_message';
+        }
+    }
+    else {
+        if (record.isSidechain)
+            return '';
+        const id = text(record.sessionId);
+        if (id && id !== entry.agentNativeSessionId)
+            return '';
+        entry.cwd = text(record.cwd) || entry.cwd;
+        const name = text(record.customTitle) || text(record.aiTitle);
+        if (name) {
+            entry.title = name;
+            entry.named = true;
+        }
+        if (['user', 'assistant'].includes(text(record.type)) && !record.isMeta) {
+            const message = asJson(record.message);
+            value = content(message.content);
+            user = record.type === 'user' && (typeof message.content === 'string' || Array.isArray(message.content) && message.content.some(block => asJson(block).type === 'text'));
+        }
+    }
+    value = value.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, '').replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, '').replace(/\s+/g, ' ').trim();
+    if (user && !entry.named && value && !/^(?:# AGENTS\.md|<environment_context>|<INSTRUCTIONS>|<system-reminder>|\[Request interrupted)/.test(value)) {
+        entry.title = value.slice(0, 100);
+        entry.named = true;
+    }
+    return value;
+}
+async function readHead(entry) {
+    const handle = await fs.promises.open(entry.file, 'r');
+    try {
+        const buffer = Buffer.alloc(256 * 1024);
+        const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
+        const head = buffer.subarray(0, bytesRead).toString('utf8');
+        const complete = bytesRead < buffer.length ? head : head.slice(0, head.lastIndexOf('\n'));
+        for (const line of complete.split('\n'))
+            if (line)
+                parse(entry, line);
+    }
+    finally {
+        await handle.close();
+    }
+}
+async function refresh() {
+    if (building || Date.now() - refreshedAt < 30_000)
+        return;
+    if (refreshPromise)
+        return refreshPromise;
+    refreshPromise = (async () => {
+        warning = null;
+        const names = await codexNames();
+        const sources = [
+            { slug: 'codex', files: await discover(path.join(codexHome, 'sessions'), true) },
+            { slug: 'codex', files: await discover(path.join(codexHome, 'archived_sessions'), true) },
+            { slug: 'claude', files: await discover(path.join(claudeHome, 'projects'), false) },
+        ];
+        const seen = new Set();
+        for (const source of sources)
+            for (const file of source.files) {
+                const id = uuid.exec(path.basename(file))[1];
+                const key = createHash('sha256').update(file).digest('hex');
+                seen.add(key);
+                try {
+                    const stat = await fs.promises.stat(file);
+                    const previous = entries.get(key);
+                    const entry = { ...previous, key, file, agentSlug: source.slug, agentNativeSessionId: id,
+                        title: previous?.title || `${source.slug === 'codex' ? 'Codex' : 'Claude'} · ${id.slice(0, 8)}`,
+                        cwd: previous?.cwd || '', updatedAt: stat.mtimeMs, mtime: stat.mtimeMs, size: stat.size };
+                    const name = source.slug === 'codex' ? names.get(id) : null;
+                    if (name) {
+                        entry.title = name;
+                        entry.named = true;
+                    }
+                    if (!previous || !entry.cwd)
+                        await readHead(entry);
+                    // A cache is disposable: missing text must be rebuilt, not counted ready.
+                    if (indexed(entry) && !fs.existsSync(textPath(entry))) {
+                        entry.indexedMtime = undefined;
+                        entry.indexedSize = undefined;
+                    }
+                    entries.set(key, entry);
+                }
+                catch {
+                    warning = '部分历史文件暂时无法读取，其余会话仍可搜索';
+                }
+            }
+        for (const [key, entry] of entries)
+            if (!seen.has(key)) {
+                entries.delete(key);
+                failures.delete(key);
+                await fs.promises.rm(textPath(entry), { force: true });
+            }
+        refreshedAt = Date.now();
+        failures.clear();
+        void build().catch(() => { warning = '历史索引写入失败，请检查当前服务账户的磁盘空间与文件权限'; });
+    })();
+    try {
+        await refreshPromise;
+    }
+    finally {
+        refreshPromise = null;
+    }
+}
+async function indexEntry(entry) {
+    const temporary = `${textPath(entry)}${temporarySuffix}`;
+    // Native transcripts are append-only. Reuse extracted dialogue and read only
+    // newly appended source bytes; atomic replacement keeps searches consistent.
+    const append = entry.indexedOffset !== undefined && entry.indexedSize !== undefined && entry.size > entry.indexedSize && fs.existsSync(textPath(entry));
+    if (append)
+        await fs.promises.copyFile(textPath(entry), temporary);
+    const start = append ? entry.indexedOffset : 0;
+    const output = fs.createWriteStream(temporary, { mode: 0o600, flags: append ? 'a' : 'w' });
+    let outputError = null;
+    output.on('error', error => { outputError = error; });
+    const recent = new Set();
+    let offset = start;
+    let fragments = [];
+    let fragmentBytes = 0;
+    const stream = fs.createReadStream(entry.file, { encoding: 'utf8', start, ...(entry.size > start ? { end: entry.size - 1 } : {}) });
+    try {
+        for await (const chunk of stream) {
+            if (outputError)
+                throw outputError;
+            const valueChunk = chunk;
+            let cursor = 0;
+            let newline;
+            // Scan each incoming chunk once. Re-scanning a growing multi-megabyte
+            // world_state line on every chunk makes first-time indexing quadratic.
+            while ((newline = valueChunk.indexOf('\n', cursor)) >= 0) {
+                const piece = valueChunk.slice(cursor, newline);
+                const line = fragments.length ? fragments.join('') + piece : piece;
+                offset += fragmentBytes + Buffer.byteLength(piece) + 1;
+                fragments = [];
+                fragmentBytes = 0;
+                cursor = newline + 1;
+                const value = parse(entry, line);
+                if (!value)
+                    continue;
+                const hash = createHash('sha256').update(value).digest('hex');
+                if (recent.has(hash))
+                    continue;
+                recent.add(hash);
+                if (recent.size > 64)
+                    recent.delete(recent.values().next().value);
+                if (!output.write(`${value}\n`))
+                    await once(output, 'drain');
+            }
+            if (cursor < valueChunk.length) {
+                const remainder = valueChunk.slice(cursor);
+                fragments.push(remainder);
+                fragmentBytes += Buffer.byteLength(remainder);
+            }
+        }
+        output.end();
+        await once(output, 'finish');
+        if (outputError)
+            throw outputError;
+        await fs.promises.rename(temporary, textPath(entry));
+        // A file appended during indexing will be picked up on the next refresh.
+        entry.indexedSize = entry.size;
+        entry.indexedMtime = entry.mtime;
+        entry.indexedOffset = offset;
+    }
+    catch (error) {
+        output.destroy();
+        await fs.promises.rm(temporary, { force: true }).catch(() => { });
+        throw error;
+    }
+    finally {
+        stream.destroy();
+    }
+}
+async function build() {
+    if (building)
+        return;
+    building = true;
+    try {
+        const pending = [...entries.values()].filter(entry => !indexed(entry)).sort((a, b) => b.updatedAt - a.updatedAt);
+        let count = 0;
+        for (const entry of pending) {
+            try {
+                await indexEntry(entry);
+            }
+            catch {
+                failures.add(entry.key);
+            }
+            if (++count % 10 === 0)
+                await save();
+        }
+        await save();
+    }
+    finally {
+        building = false;
+    }
+}
+async function initialize() {
+    await fs.promises.mkdir(directory, { recursive: true, mode: 0o700 });
+    try {
+        const cached = JSON.parse(await fs.promises.readFile(manifest, 'utf8'));
+        if (cached.version === 2 && Array.isArray(cached.entries))
+            for (const entry of cached.entries) {
+                if (/^[a-f0-9]{64}$/.test(entry.key))
+                    entries.set(entry.key, entry);
+            }
+    }
+    catch { /* First use or an interrupted cache write: derive from originals. */ }
+    await refresh();
+}
+const ready = initialize();
+async function search(query, limit, titles, signal) {
+    await ready;
+    await refresh();
+    const startedBuilding = building;
+    const needle = query.trim().toLocaleLowerCase();
+    const results = [];
+    const matchedSessions = new Set();
+    const names = new Map(titles.map(entry => [`${entry.agentSlug}:${entry.agentNativeSessionId}`, entry.title]));
+    const ordered = [...entries.values()].sort((a, b) => b.updatedAt - a.updatedAt);
+    let total = 0;
+    for (const entry of ordered) {
+        if (signal.aborted)
+            throw new Error('搜索已取消');
+        const identity = `${entry.agentSlug}:${entry.agentNativeSessionId}`;
+        if (matchedSessions.has(identity))
+            continue;
+        const title = names.get(identity) || entry.title;
+        let matchCount = 0;
+        let snippet = '';
+        const consider = (value) => {
+            const lower = value.toLocaleLowerCase();
+            let cursor = 0;
+            let first = -1;
+            while ((cursor = lower.indexOf(needle, cursor)) >= 0) {
+                if (first < 0)
+                    first = cursor;
+                matchCount = Math.min(999, matchCount + 1);
+                cursor += needle.length;
+            }
+            if (first >= 0 && !snippet)
+                snippet = value.slice(Math.max(0, first - 90), first + needle.length + 170);
+        };
+        if (needle) {
+            consider(`${title}${title !== entry.title ? `\n${entry.title}` : ''}\n${entry.cwd}\n${entry.agentSlug}\n${entry.agentNativeSessionId}`);
+            const metadataSnippet = snippet;
+            snippet = '';
+            try {
+                if (entry.indexedSize !== undefined)
+                    for await (const line of lines(textPath(entry))) {
+                        if (signal.aborted)
+                            throw new Error('搜索已取消');
+                        consider(line);
+                    }
+            }
+            catch (error) {
+                if (signal.aborted)
+                    throw error;
+                if (error.code !== 'ENOENT')
+                    warning = '部分历史索引无法读取，请检查文件权限';
+            }
+            snippet ||= metadataSnippet;
+            if (!matchCount)
+                continue;
+        }
+        total += 1;
+        matchedSessions.add(identity);
+        if (results.length < limit)
+            results.push({ ...publicRecord(entry), title, snippet: snippet.replace(/\s+/g, ' ').trim(), matchCount });
+    }
+    // A scan begun during indexing may have read an older snapshot. Keep one
+    // more automatic refresh even if the background build finished meanwhile.
+    return { results, matchedSessions: [...matchedSessions], total, index: { ...status(), building: building || startedBuilding } };
+}
+const requests = new Map();
+parentPort.on('message', (input) => {
+    if (input.type === 'cancel') {
+        requests.get(input.id)?.abort();
+        return;
+    }
+    const controller = new AbortController();
+    requests.set(input.id, controller);
+    void (async () => {
+        await ready;
+        if (input.type === 'search')
+            return search(input.query || '', Math.max(1, Math.min(input.limit || 50, 5100)), input.titles || [], controller.signal);
+        const entry = entries.get(input.key || '');
+        if (!entry)
+            return null;
+        await fs.promises.access(entry.file, fs.constants.R_OK);
+        return publicRecord(entry);
+    })().then(value => parentPort.postMessage({ id: input.id, value }), error => parentPort.postMessage({ id: input.id, error: error instanceof Error ? error.message : '历史会话搜索失败' })).finally(() => requests.delete(input.id));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.284",
+  "version": "1.4.286",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",
@@ -24,9 +24,9 @@
     "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 && esbuild desktop/preload.cts --bundle --platform=node --format=cjs --external:electron --outfile=.desktop-dist/preload.cjs && esbuild desktop/renderer/services.tsx --bundle --platform=browser --format=iife --minify --outfile=desktop/renderer/services.js",
+    "build:desktop": "rimraf .desktop-dist && 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 && esbuild desktop/renderer/services.tsx --bundle --platform=browser --format=iife --minify --outfile=desktop/renderer/services.js",
     "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:prepare": "npm run build && npm run build:desktop",
     "desktop:make": "node scripts/ensure-macos-appdmg.mjs && npm run desktop:prepare && electron-forge make",
     "build:client": "vite build && node scripts/precompress-client.mjs",
     "build:server": "tsc -p tsconfig.server.json && node -e \"require('fs').chmodSync('dist/server/cli.js', 0o755)\"",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.284",
+  "version": "1.4.286",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-+FK03eSUIISxxpGNQTlYLuAcpuytFuT+tiLAMYVhwl4=",
-  "serverBundleHash": "sha256-0r6Gzanqmtt0Nigx9rbfdtSHHIB9Ly14aXcLHkZaCQg=",
-  "clientBundleHash": "sha256-jeTDwvOS9vYtS9ulgVFya/PJF0XmEVpqpU+a11iLdPI=",
+  "serverBundleHash": "sha256-33BE/DfALuHz0I4M1KpzP2FGyHvT0+q/HUoo53/4vr4=",
+  "clientBundleHash": "sha256-+fhjhiC4857WrUnBMe8tfO8cTLNKPLvdU8oNwYLAIEM=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/scripts/classify-release.mjs

@@ -44,7 +44,6 @@ const desktopPatterns = [
   /^desktop\//,
   /^forge\.config\.cjs$/,
   /^tsconfig\.desktop\.json$/,
-  /^scripts\/prepare-desktop-runtime\.mjs$/,
   /^scripts\/prepare-desktop-tokens\.mjs$/,
   /^\.github\/workflows\/release-macos\.yml$/,
 ];