termdock 1.4.284 → 1.4.286

package/dist/server/agent/collaborationService.js

@@ -33,6 +33,15 @@ export class CollaborationService {
                 throw new Error('INVALID_DIRECTORY');
             for (const peer of data.peers)
                 validateCollaborationNode(peer);
+            if (data.removedPeers !== undefined) {
+                if (!Array.isArray(data.removedPeers) || data.removedPeers.length > 768)
+                    throw new Error('INVALID_DIRECTORY');
+                for (const peer of data.removedPeers) {
+                    validateCollaborationNode(peer);
+                    if (peer.scope && !/^12D3KooW[a-zA-Z0-9]{30,60}$/.test(peer.scope.device))
+                        throw new Error('INVALID_DIRECTORY');
+                }
+            }
             if (data.scoped !== undefined) {
                 if (!data.scoped || typeof data.scoped !== 'object' || Array.isArray(data.scoped))
                     throw new Error('INVALID_DIRECTORY');
@@ -61,10 +70,12 @@ export class CollaborationService {
         throw new Error('COLLABORATION_ORIGIN_REQUIRED'); const node = { ...this.options.node(), origin }; validateCollaborationNode(node); return node; }
     setOrigin(origin) { this.node(origin); if (this.document.origin && this.document.origin !== origin)
         throw new Error('COLLABORATION_ORIGIN_MISMATCH'); this.document.origin = origin; }
-    remember(node) {
+    remember(node, explicitPair = false) {
         validateCollaborationNode(node);
         if (node.serviceId === this.options.node().serviceId || node.origin === this.document.origin)
             throw new Error('CANNOT_PAIR_SELF');
+        if (this.document.removedPeers?.some(peer => peer.serviceId === node.serviceId) && !explicitPair)
+            throw new Error('COLLABORATION_PEER_REMOVED');
         const old = this.document.peers.find(peer => peer.serviceId === node.serviceId || peer.origin === node.origin);
         if (old && (old.serviceId !== node.serviceId || old.origin !== node.origin || old.caFingerprint256 !== node.caFingerprint256))
             throw new Error('PEER_IDENTITY_CHANGED');
@@ -73,6 +84,8 @@ export class CollaborationService {
                 throw new Error('PEER_LIMIT');
             this.document.peers.push(node);
         }
+        if (explicitPair)
+            this.document.removedPeers = this.document.removedPeers?.filter(peer => peer.serviceId !== node.serviceId);
         this.persist();
     }
     descriptor() { return { ...this.options.node(), ...(this.document.origin ? { origin: this.document.origin } : {}) }; }
@@ -96,14 +109,72 @@ export class CollaborationService {
             if (old && (old.serviceId !== node.serviceId || old.origin !== node.origin || old.caFingerprint256 !== node.caFingerprint256))
                 throw new Error('PEER_IDENTITY_CHANGED');
         }
-        if (new Set([...this.document.peers.map(peer => peer.serviceId), ...nodes.filter(node => node.serviceId !== self.serviceId).map(node => node.serviceId)]).size > 63)
+        const removed = new Set(this.document.removedPeers?.map(peer => peer.serviceId));
+        const eligible = nodes.filter(node => node.serviceId !== self.serviceId && !removed.has(node.serviceId));
+        if (new Set([...this.document.peers.map(peer => peer.serviceId), ...eligible.map(node => node.serviceId)]).size > 63)
             throw new Error('PEER_LIMIT');
         this.setOrigin(origin);
-        this.document.peers = [...new Map([...this.document.peers, ...nodes.filter(node => node.serviceId !== self.serviceId)].map(node => [node.serviceId, node])).values()];
+        this.document.peers = [...new Map([...this.document.peers, ...eligible].map(node => [node.serviceId, node])).values()];
         this.persist();
         void this.refresh();
         return { ok: true, registered: this.document.peers.map(peer => peer.serviceId) };
     }
+    groupsUsing(peer) {
+        return this.options.store.list().filter(group => group.sessionIds.some(id => address(id)?.origin === peer.origin)
+            || group.federated && this.document.replicas?.[group.id]?.includes(peer.origin)).map(group => ({ id: group.id, name: group.name }));
+    }
+    /** Explicit removal is durable: other open clients may still enroll their
+     * stale saved catalogs, but only a deliberate restore or pairing re-adds it. */
+    removePeer(serviceId) {
+        const peer = this.document.peers.find(item => item.serviceId === serviceId);
+        if (!peer)
+            throw new CollaborationError('PEER_NOT_FOUND', '该协作服务已移除，请刷新列表', 404);
+        const groups = this.groupsUsing(peer);
+        if (groups.length)
+            throw new CollaborationError('PEER_IN_USE', `该服务仍用于协作组「${groups.map(group => group.name).join('」「')}」，请先移出对应成员或删除协作组`, 409, { groups });
+        this.options.transport.forgetUnusedPeer(serviceId);
+        const previous = this.document;
+        const scope = previous.scoped?.[serviceId];
+        this.document = { ...previous, peers: previous.peers.filter(item => item.serviceId !== serviceId),
+            scoped: Object.fromEntries(Object.entries(previous.scoped ?? {}).filter(([id]) => id !== serviceId)),
+            removedPeers: [...(previous.removedPeers ?? []).filter(item => item.serviceId !== serviceId), { ...peer, ...(scope ? { scope } : {}) }].slice(-768) };
+        try {
+            this.persist();
+        }
+        catch (error) {
+            this.document = previous;
+            throw error;
+        }
+        const client = this.clients.get(serviceId);
+        this.clients.delete(serviceId);
+        this.observations.delete(serviceId);
+        if (client)
+            void client.then(rpc => rpc.close()).catch(() => { });
+        return { ok: true, origin: peer.origin };
+    }
+    restorePeer(serviceId) {
+        const removed = this.document.removedPeers?.find(item => item.serviceId === serviceId);
+        if (!removed)
+            throw new CollaborationError('PEER_NOT_FOUND', '找不到这条已移除的协作连接', 404);
+        const { scope, ...node } = removed;
+        validateCollaborationNode(node);
+        if (this.document.peers.some(peer => peer.serviceId === node.serviceId || peer.origin === node.origin))
+            throw new CollaborationError('PEER_IDENTITY_CHANGED', '该地址已属于另一条服务连接，请重新配对', 409);
+        if (this.document.peers.length >= 63)
+            throw new CollaborationError('PEER_LIMIT', '协作服务数量已达上限', 400);
+        const previous = this.document;
+        this.document = { ...previous, peers: [...previous.peers, node], removedPeers: previous.removedPeers?.filter(item => item.serviceId !== serviceId),
+            scoped: { ...previous.scoped, ...(scope ? { [serviceId]: scope } : {}) } };
+        try {
+            this.persist();
+        }
+        catch (error) {
+            this.document = previous;
+            throw error;
+        }
+        void this.refresh();
+        return { ok: true, origin: node.origin };
+    }
     /** Effective local sessions a peer may touch. `undefined` means a fully
      * authorized directory peer; an array (possibly empty) means a peer that
      * exists only because a device shared a write invitation for those sessions. */
@@ -157,7 +228,7 @@ export class CollaborationService {
         const rpc = await (this.options.pairConnect ?? this.options.connect)(invitation.node);
         try {
             await rpc.request({ type: 'collaboration-service', action: 'pair', code: invitation.code, node: this.node() });
-            this.remember(invitation.node);
+            this.remember(invitation.node, true);
             void this.refresh();
             return { ok: true, peer: invitation.node };
         }
@@ -178,7 +249,7 @@ export class CollaborationService {
             if (offer.acceptedBy && !this.document.peers.some(peer => peer.serviceId === subject))
                 throw new Error('PAIRING_REVOKED');
             offer.acceptedBy = subject;
-            this.remember(node);
+            this.remember(node, true);
             void this.refresh();
             return { ok: true };
         }
@@ -298,6 +369,8 @@ export class CollaborationService {
             try {
                 const client = await this.client(peer);
                 const data = await client.request({ type: 'collaboration-service', action: 'directory' });
+                if (!this.document.peers.some(item => item.serviceId === peer.serviceId))
+                    return;
                 if (!Array.isArray(data.sessions) || data.sessions.length > 5000 || !Array.isArray(data.groups))
                     throw new Error('INVALID_DIRECTORY');
                 const sessions = data.sessions.filter((s) => s && typeof s.sessionId === 'string' && !s.sessionId.startsWith('remote:'));
@@ -318,7 +391,8 @@ export class CollaborationService {
                 }
             }
             catch (error) {
-                this.observations.set(peer.serviceId, { sessions: this.observations.get(peer.serviceId)?.sessions ?? [], checkedAt: Date.now(), error: error instanceof Error ? error.message.slice(0, 240) : 'PEER_UNAVAILABLE' });
+                if (this.document.peers.some(item => item.serviceId === peer.serviceId))
+                    this.observations.set(peer.serviceId, { sessions: this.observations.get(peer.serviceId)?.sessions ?? [], checkedAt: Date.now(), error: error instanceof Error ? error.message.slice(0, 240) : 'PEER_UNAVAILABLE' });
             }
         })).then(() => { }).finally(() => { this.inFlight = undefined; });
     }
@@ -328,12 +402,13 @@ export class CollaborationService {
         const services = this.document.peers.map(peer => {
             const observed = this.observations.get(peer.serviceId);
             return { origin: peer.origin, serviceId: peer.serviceId, label: peer.origin,
-                connected: !!observed && !observed.error && Date.now() - observed.checkedAt < 15_000, error: observed?.error ?? (!observed ? 'CONNECTING' : undefined) };
+                groups: this.groupsUsing(peer), connected: !!observed && !observed.error && Date.now() - observed.checkedAt < 15_000, error: observed?.error ?? (!observed ? 'CONNECTING' : undefined) };
         });
         return { protocolVersion: 2, sessions: this.document.peers.flatMap(peer => this.document.scoped?.[peer.serviceId] ? [] : (this.observations.get(peer.serviceId)?.sessions ?? []).map(session => ({ ...session,
                 sessionId: remoteSession(peer.origin, session.sessionId), backendSessionId: null, agentNativeSessionId: null, serviceOrigin: peer.origin, serviceLabel: peer.origin,
                 serviceConnected: services.find(s => s.origin === peer.origin).connected, serviceCheckedAt: this.observations.get(peer.serviceId)?.checkedAt }))),
-            services: [...services, ...missing.map(origin => ({ origin, label: origin, connected: false, error: '服务连接授权尚未同步；在已授权服务页面连接后会自动完成' }))] };
+            services: [...services, ...missing.map(origin => ({ origin, label: origin, connected: false, error: '服务连接授权尚未同步；在已授权服务页面连接后会自动完成' }))],
+            removedServices: this.document.removedPeers?.map(peer => ({ serviceId: peer.serviceId, origin: peer.origin, label: peer.origin, connected: false })) ?? [] };
     }
     async save(input) {
         const existing = input.id ? this.options.store.getGroup(input.id) : null;

package/dist/server/agent/nativeSessionSearch.js

@@ -0,0 +1,84 @@
+import os from 'node:os';
+import path from 'node:path';
+import fs from 'node:fs';
+import { Worker } from 'node:worker_threads';
+/** Keep transcript parsing and text scans off the terminal server's event loop.
+ * The worker and its private, incremental cache start only when search is used.
+ */
+export class NativeSessionSearch {
+    directory;
+    worker = null;
+    sequence = 0;
+    pending = new Map();
+    constructor(directory) {
+        this.directory = directory;
+    }
+    search(query, limit, titles, signal) {
+        return this.request({ type: 'search', query, limit, titles }, signal);
+    }
+    get(key) {
+        return this.request({ type: 'get', key });
+    }
+    request(input, signal) {
+        if (signal?.aborted)
+            return Promise.reject(new Error('搜索已取消'));
+        if (!this.worker) {
+            const compiled = new URL('../workers/nativeSessionSearchWorker.js', import.meta.url);
+            // tsx development runs source files; production always uses compiled JS.
+            const url = fs.existsSync(compiled) ? compiled : new URL('../workers/nativeSessionSearchWorker.ts', import.meta.url);
+            this.worker = new Worker(url, { workerData: {
+                    directory: this.directory,
+                    codexHome: process.env.CODEX_HOME || path.join(os.homedir(), '.codex'),
+                    claudeHome: process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude'),
+                } });
+            const worker = this.worker;
+            worker.unref();
+            worker.on('message', (message) => {
+                const entry = this.pending.get(message.id);
+                if (!entry)
+                    return;
+                clearTimeout(entry.timer);
+                entry.cleanup();
+                this.pending.delete(message.id);
+                if (message.error)
+                    entry.reject(new Error(message.error));
+                else
+                    entry.resolve(message.value);
+            });
+            const fail = (error) => {
+                if (this.worker !== worker)
+                    return;
+                this.worker = null;
+                for (const entry of this.pending.values()) {
+                    clearTimeout(entry.timer);
+                    entry.cleanup();
+                    entry.reject(error);
+                }
+                this.pending.clear();
+                void worker.terminate();
+            };
+            worker.on('error', fail);
+            worker.on('exit', () => fail(new Error('历史会话索引服务已退出，请重新搜索')));
+        }
+        return new Promise((resolve, reject) => {
+            const id = ++this.sequence;
+            const worker = this.worker;
+            const cancel = () => {
+                clearTimeout(timer);
+                this.pending.delete(id);
+                signal?.removeEventListener('abort', cancel);
+                worker.postMessage({ id, type: 'cancel' });
+                reject(new Error('搜索已取消'));
+            };
+            const timer = setTimeout(() => {
+                this.pending.delete(id);
+                signal?.removeEventListener('abort', cancel);
+                worker.postMessage({ id, type: 'cancel' });
+                reject(new Error('历史会话搜索超时，请缩短关键词后重试'));
+            }, 60_000);
+            this.pending.set(id, { resolve, reject, timer, cleanup: () => signal?.removeEventListener('abort', cancel) });
+            signal?.addEventListener('abort', cancel, { once: true });
+            worker.postMessage({ id, ...input });
+        });
+    }
+}

package/dist/server/agent/sessionSearchStore.js

@@ -53,7 +53,8 @@ export class SessionSearchStore {
         this.flush();
         const needle = query.trim().toLocaleLowerCase();
         if (!needle)
-            return [];
+            return [...this.metadata.values()].sort((a, b) => b.updatedAt - a.updatedAt)
+                .slice(0, Math.max(1, Math.min(limit, 100))).map(metadata => ({ ...metadata, snippet: '', matchCount: 0 }));
         const results = [];
         for (const metadata of this.metadata.values()) {
             const text = this.readLog(metadata.sessionId);

package/dist/server/entry.js

@@ -50,7 +50,7 @@ import { RuntimeMonitor } from './utils/runtimeMonitor.js';
 import { startOnboardingServer, stopOnboardingServer, getOnboardingServerUrl } from './onboardingServer.js';
 import { CertificateWatcher } from './certificateWatcher.js';
 import { startTermdockLogMaintenance, writeDiffTraceLog, writeErrorLog, writeJsonLog, writeTextLog, } from './utils/serverLogger.js';
-import { indexRetainedClientModules, pinBundledRuntimeClientDist, resolveRuntimeClientDist } from './utils/runtimeClient.js';
+import { indexRetainedClientModules, pinBundledRuntimeClientDist } from './utils/runtimeClient.js';
 import { installCrashForensics } from './utils/crashForensics.js';
 import { getTermdockVersion, TERMDOCK_CAPABILITIES, TERMDOCK_PROTOCOL_VERSION, } from './utils/version.js';
 import { PORT, DEFAULT_HOST } from './config.js';
@@ -265,7 +265,6 @@ export function createApp(options = {}) {
             version: getTermdockVersion(),
             protocolVersion: TERMDOCK_PROTOCOL_VERSION,
             capabilities: TERMDOCK_CAPABILITIES,
-            desktopManaged: process.env.TERMDOCK_DESKTOP === '1',
         });
     });
     // Client-side log relay — enables collecting browser/device logs
@@ -350,10 +349,7 @@ export function createApp(options = {}) {
     app.use('/api/android', csrfProtection.verifyMiddleware({ bypass: isTrustedLocalCliRequest }));
     app.use('/api/android', androidRoutes);
     if (fs.existsSync(bundledClientIndexPath)) {
-        const selectedClientPath = resolveRuntimeClientDist(bundledClientDistPath);
-        const clientPath = selectedClientPath === bundledClientDistPath
-            ? pinBundledRuntimeClientDist(bundledClientDistPath)
-            : selectedClientPath;
+        const clientPath = pinBundledRuntimeClientDist(bundledClientDistPath);
         const compression = createStaticCompressionMiddleware(clientPath);
         const staticFiles = express.static(clientPath, {
             setHeaders: (res, filePath, stat) => {

package/dist/server/federation/trustedCa.js

@@ -14,7 +14,8 @@ export function readPinnedCertificateAuthority(origin, fingerprint) {
     if (cached && cached.expires > Date.now())
         return cached.value;
     const value = new Promise((resolve, reject) => {
-        const request = get(url, { agent: false, rejectUnauthorized: false, signal: AbortSignal.timeout(5000) }, response => {
+        const signal = AbortSignal.timeout(5000);
+        const request = get(url, { agent: false, rejectUnauthorized: false, signal }, response => {
             if (response.statusCode !== 200) {
                 response.resume();
                 reject(new Error('Pinned certificate authority unavailable'));
@@ -44,7 +45,13 @@ export function readPinnedCertificateAuthority(origin, fingerprint) {
                 }
             });
         });
-        request.on('error', reject);
+        request.on('error', error => {
+            if (signal.aborted && signal.reason?.name === 'TimeoutError') {
+                reject(new Error(`连接 ${url.origin} 超时（5 秒）：未能读取远端服务证书，请确认远端服务已启动且网络可达`, { cause: error }));
+            }
+            else
+                reject(error);
+        });
     });
     if (cache.size >= 64)
         cache.delete(cache.keys().next().value);

package/dist/server/routes/filesystem.js

@@ -1,3 +1,4 @@
+import { getHideGitIgnoredRootsSetting } from '../utils/settings.js';
 import { readRecentCommitHistory } from '../utils/recentCommitHistory.js';
 import { AUTH_COOKIE, isSessionValid } from '../utils/authProtection.js';
 import { Router } from 'express';
@@ -2703,6 +2704,35 @@ async function getCachedNestedGitRoots(workspaceRoot, options = {}) {
     }
     return promise;
 }
+// Ask Git in one batch so nested .gitignore, .git/info/exclude and global
+// exclusions follow Git semantics; NUL separators preserve unusual filenames.
+function getGitIgnoredPaths(directory, entries, signal) {
+    if (entries.length === 0)
+        return Promise.resolve(new Set());
+    return new Promise((resolve, reject) => {
+        const proc = execFile('git', ['check-ignore', '-z', '--stdin'], {
+            cwd: directory,
+            timeout: GIT_TIMEOUT_MS,
+            maxBuffer: 16 * 1024 * 1024,
+            signal,
+        }, (error, stdout, stderr) => {
+            if (error && error.code !== 1) {
+                // Ordinary non-repository directories remain browsable with the filter.
+                if (error.code === 'ENOENT' || /not a git repository/i.test(stderr)) {
+                    resolve(new Set());
+                }
+                else {
+                    reject(error);
+                }
+                return;
+            }
+            resolve(new Set(stdout.split('\0').filter(Boolean)));
+        });
+        // Git may exit before consuming stdin (e.g. outside a repository).
+        proc.stdin?.on('error', () => undefined);
+        proc.stdin?.end(entries.map((entry) => path.join(directory, entry.name)).join('\0') + '\0');
+    });
+}
 // Directory listing
 router.get('/list', async (req, res) => {
     const requestId = ++fsIoRequestSeq;
@@ -2735,7 +2765,19 @@ router.get('/list', async (req, res) => {
             const sortMode = req.query.sort === 'modified' ? 'modified' : 'name';
             const allEntries = await fs.promises.readdir(resolvedPath, { withFileTypes: true });
             throwIfAborted(controller.signal, 'fs.list');
-            const visibleDirents = allEntries.filter(dirent => showHidden || !dirent.name.startsWith('.'));
+            let visibleDirents = allEntries.filter(dirent => showHidden || !dirent.name.startsWith('.'));
+            const gitIgnoreRoot = typeof req.query.gitIgnoreRoot === 'string' ? req.query.gitIgnoreRoot : null;
+            if (gitIgnoreRoot && getHideGitIgnoredRootsSetting()[gitIgnoreRoot]) {
+                const resolvedRoot = await pathValidator.validatePathAsync(gitIgnoreRoot);
+                const relative = path.relative(resolvedRoot, resolvedPath);
+                if (relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative))) {
+                    const ignored = await getGitIgnoredPaths(resolvedPath, visibleDirents, controller.signal);
+                    throwIfAborted(controller.signal, 'fs.list');
+                    // Filter before sorting and capping so ignored folders don't crowd
+                    // useful files out of the first page of a large directory.
+                    visibleDirents = visibleDirents.filter((entry) => entry.name !== '.git' && !ignored.has(path.join(resolvedPath, entry.name)));
+                }
+            }
             const entries = sortMode === 'modified'
                 ? (await loadDirectoryEntriesWithModified(resolvedPath, visibleDirents, controller.signal))
                     .sort(compareDirectoryEntriesByModified)

package/dist/server/routes/terminal.js

@@ -19,13 +19,12 @@ import { execFile, spawn } from 'child_process';
 import { createHash, randomBytes, randomUUID } from 'crypto';
 import { promisify } from 'util';
 import { caffeinateManager } from '../utils/caffeinate.js';
-import { DesktopRuntimeOwnerClient } from '../utils/desktopRuntimeOwner.js';
 import { gitStatusCache } from '../utils/gitStatus.js';
 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, getAttentionButtonEnabledSetting, getCollaborationPanelsSetting, setCollaborationPanelSetting, getAndroidPanelSetting, setAndroidPanelSetting, normalizeAndroidPanel, getCollaborationFloatingGroupIdSetting, setCollaborationFloatingGroupIdSetting, getServiceSwitcherExpandedSetting, setServiceSwitcherExpandedSetting, setRunningSessionButtonEnabledSetting, setAttentionButtonEnabledSetting, getFileSortModesSetting, setFileSortModesSetting, setFileSortModeSetting, getNestedGitScanRootsSetting, setNestedGitScanRootSetting, getPinnedExplorerRootsSetting, setPinnedExplorerRootsSetting, setPinnedExplorerRootSetting, watchPinnedExplorerRootsSetting, getActiveGitReposSetting, setActiveGitRepoSetting, } 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, getAttentionButtonEnabledSetting, getCollaborationPanelsSetting, setCollaborationPanelSetting, getAndroidPanelSetting, setAndroidPanelSetting, normalizeAndroidPanel, getCollaborationFloatingGroupIdSetting, setCollaborationFloatingGroupIdSetting, getServiceSwitcherExpandedSetting, setServiceSwitcherExpandedSetting, setRunningSessionButtonEnabledSetting, setAttentionButtonEnabledSetting, getFileSortModesSetting, getHideGitIgnoredRootsSetting, setHideGitIgnoredRootSetting, setFileSortModesSetting, setFileSortModeSetting, getNestedGitScanRootsSetting, setNestedGitScanRootSetting, getPinnedExplorerRootsSetting, setPinnedExplorerRootsSetting, setPinnedExplorerRootSetting, watchPinnedExplorerRootsSetting, getActiveGitReposSetting, setActiveGitRepoSetting, } from '../utils/settings.js';
 import { loadContextDraft, saveContextDraft } from '../utils/contextDraft.js';
 import { getOnboardingServerUrl } from '../onboardingServer.js';
 import { inspectLinuxInotifyUsage, isWatchResourceExhaustion } from '../utils/fileWatchPolicy.js';
@@ -48,6 +47,8 @@ import { COLLAB_NAME_FORBIDDEN, formatCollaborationDelivery } from '../agent/col
 import { ambiguousIdMessage } from '../agent/collaborationProtocol.js';
 import { buildCollaborationSpawnCommand, resolveCollaborationSpawnMode } from '../agent/collaborationSpawn.js';
 import { SessionSearchStore } from '../agent/sessionSearchStore.js';
+import { NativeSessionSearch } from '../agent/nativeSessionSearch.js';
+import { CollaborationError } from '../agent/collaborationProtocol.js';
 import { resolveCollaborationBackend, resolveCollaborationSessionId } from '../agent/sessionBindingRecovery.js';
 import { CollaborationRoutingStore, selectCollaborationPane, selectDrivePane } from '../agent/collaborationRouting.js';
 import { CollaborationDeliveryWorker } from '../agent/collaborationDeliveryWorker.js';
@@ -82,6 +83,7 @@ const collaborationDeliveryWorker = new CollaborationDeliveryWorker({
     onError: (error) => console.warn('[collaboration] background delivery failed:', getErrorMessage(error)),
 });
 const sessionSearchStore = new SessionSearchStore(`${TERMDOCK_DIR}/session-search`);
+const nativeSessionSearch = new NativeSessionSearch(`${TERMDOCK_DIR}/session-search/native`);
 let atomicJsonWriteSequence = 0;
 async function readJsonFileIfExists(filePath) {
     try {
@@ -385,18 +387,7 @@ const npmAutoUpdateManager = new TermdockAutoUpdateManager({
     requestRestart: requestServerRestartAfterUpdate,
     log: (message) => console.warn(message),
 });
-const desktopRuntimeOwner = process.env.TERMDOCK_DESKTOP_OWNER_SOCKET
-    ? new DesktopRuntimeOwnerClient(process.env.TERMDOCK_DESKTOP_OWNER_SOCKET, TERMDOCK_VERSION, (state) => broadcastControlEvent({ type: 'update-state', state }))
-    : null;
-// Packaged desktop builds already have a signed app/runtime updater. The npm
-// updater only owns standalone CLI services, otherwise both mechanisms could
-// race to replace the runtime.
-if (desktopRuntimeOwner) {
-    desktopRuntimeOwner.start();
-}
-else {
-    npmAutoUpdateManager.start();
-}
+npmAutoUpdateManager.start();
 async function flushClientStateBroadcast() {
     if (broadcastClientStateInFlight) {
         broadcastClientStateNeedsRerun = true;
@@ -3415,8 +3406,8 @@ async function findCodexSessionFile(nativeSessionId) {
         return cachedPath;
     if (!/^[a-zA-Z0-9._-]{8,160}$/.test(nativeSessionId))
         return null;
-    const root = path.join(os.homedir(), '.codex', 'sessions');
-    const pending = [root];
+    const codexHome = process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
+    const pending = [path.join(codexHome, 'sessions'), path.join(codexHome, 'archived_sessions')];
     let visited = 0;
     while (pending.length > 0 && visited < 20_000) {
         const directory = pending.pop();
@@ -3448,7 +3439,9 @@ async function findExternalCodexWriter(target) {
         return null;
     try {
         const { stdout } = await execFileAsync('lsof', ['-t', '--', sessionFile], { timeout: 2500, maxBuffer: 64 * 1024 });
-        const pid = stdout.split(/\s+/).map(Number).find((value) => Number.isInteger(value) && value > 1);
+        // Our search worker reads these files in this process; that read-only
+        // descriptor must not be mistaken for an external Codex conversation owner.
+        const pid = stdout.split(/\s+/).map(Number).find((value) => Number.isInteger(value) && value > 1 && value !== process.pid);
         return pid ?? null;
     }
     catch {
@@ -5588,6 +5581,31 @@ router.get('/operations/collaboration-directory', (req, res) => {
     void service.refresh();
     res.json(service.directory());
 });
+router.delete('/operations/collaboration-connections/:serviceId', (req, res) => {
+    try {
+        assertPeerRegistrationAuthority(req);
+        const service = req.app.locals.collaborationService;
+        if (!service)
+            return res.status(503).json({ error: '协作服务正在启动' });
+        res.json(service.removePeer(req.params.serviceId));
+    }
+    catch (error) {
+        res.status(error instanceof CollaborationError ? error.httpStatus : getErrorMessage(error) === 'AUTHORIZATION_DENIED' ? 403 : 400)
+            .json({ error: getErrorMessage(error), ...(error instanceof CollaborationError ? { code: error.code, ...error.details } : {}) });
+    }
+});
+router.post('/operations/collaboration-connections/:serviceId/restore', (req, res) => {
+    try {
+        assertPeerRegistrationAuthority(req);
+        const service = req.app.locals.collaborationService;
+        if (!service)
+            return res.status(503).json({ error: '协作服务正在启动' });
+        res.json(service.restorePeer(req.params.serviceId));
+    }
+    catch (error) {
+        res.status(error instanceof CollaborationError ? error.httpStatus : getErrorMessage(error) === 'AUTHORIZATION_DENIED' ? 403 : 400).json({ error: getErrorMessage(error) });
+    }
+});
 export function collaborationDirectorySessions() { return globalSessionState.sessions.map(orchestrationSessionSnapshot); }
 export function collaborationLocalActivity() {
     return globalSessionState.sessions.map(record => {
@@ -5987,16 +6005,81 @@ router.use('/operations/orchestration', collaborationRoutes({ store: collaborati
         broadcastClientState();
         return { ok: true };
     } }));
-router.get('/operations/session-search', (req, res) => {
-    const query = typeof req.query.q === 'string' ? req.query.q : '';
-    const results = sessionSearchStore.search(query, Number(req.query.limit) || 30).map((result) => {
+router.get('/operations/session-search', async (req, res) => {
+    const query = typeof req.query.q === 'string' ? req.query.q.trim().slice(0, 512) : '';
+    const limit = Math.max(1, Math.min(5000, Math.floor(Number(req.query.limit)) || 50));
+    const controller = new AbortController();
+    const disconnected = () => { if (!res.writableEnded)
+        controller.abort(); };
+    res.once('close', disconnected);
+    const terminalResults = sessionSearchStore.search(query, 100).map((result) => {
         const live = globalSessionState.sessions.some((candidate) => candidate.sessionId === result.sessionId);
         const resumeEntry = result.agentNativeSessionId
-            ? agentResumeHistory.list().find((entry) => entry.agent.sessionId === result.agentNativeSessionId)
+            ? agentResumeHistory.list().find((entry) => entry.agent.slug === result.agentSlug && entry.agent.sessionId === result.agentNativeSessionId)
             : null;
-        return { ...result, live, resumeHistoryId: resumeEntry?.id ?? null };
+        return { ...result, source: 'terminal', nativeKey: null, live, resumeHistoryId: resumeEntry?.id ?? null };
     });
-    res.json({ query, results });
+    try {
+        // Preserve the names users see in Termdock as searchable aliases, including
+        // custom titles for conversations that have already been closed.
+        const titles = [
+            ...sessionSearchStore.search('', 100).flatMap(entry => entry.agentSlug && entry.agentNativeSessionId ? [{ agentSlug: entry.agentSlug, agentNativeSessionId: entry.agentNativeSessionId, title: entry.title }] : []),
+            ...agentResumeHistory.list().reverse().map(entry => ({ agentSlug: entry.agent.slug, agentNativeSessionId: entry.agent.sessionId, title: entry.title })),
+            ...globalSessionState.sessions.flatMap(entry => entry.customName && entry.agentResume?.sessionId ? [{ agentSlug: entry.agentResume.slug, agentNativeSessionId: entry.agentResume.sessionId, title: entry.name }] : []),
+        ];
+        const native = await nativeSessionSearch.search(query, limit + terminalResults.length, titles, controller.signal);
+        if (controller.signal.aborted)
+            return;
+        const matched = new Set(native.matchedSessions);
+        const additional = terminalResults.filter(result => !result.agentNativeSessionId || !matched.has(`${result.agentSlug}:${result.agentNativeSessionId}`));
+        const results = native.results.map(result => {
+            const owner = findActiveAgentResumeOwner('', { slug: result.agentSlug, nativeSessionId: result.agentNativeSessionId, command: '' });
+            const liveRecord = owner ? globalSessionState.sessions.find(candidate => candidate.backendSessionId === owner) : null;
+            return { ...result, source: result.agentSlug, nativeKey: result.key, sessionId: liveRecord?.sessionId || `native:${result.key}`,
+                live: Boolean(liveRecord), resumeHistoryId: null };
+        });
+        res.json({ query, results: [...results, ...additional].sort((a, b) => b.updatedAt - a.updatedAt).slice(0, limit), total: native.total + additional.length, index: native.index });
+    }
+    catch (error) {
+        if (controller.signal.aborted)
+            return;
+        res.json({ query, results: terminalResults.slice(0, limit), total: terminalResults.length,
+            index: { total: 0, indexed: 0, building: false, failed: 0, warning: `历史会话暂时无法搜索：${getErrorMessage(error)}` } });
+    }
+    finally {
+        res.off('close', disconnected);
+    }
+});
+router.post('/operations/session-search/prepare', async (req, res) => {
+    const key = typeof req.body?.nativeKey === 'string' ? req.body.nativeKey : '';
+    if (!/^[a-f0-9]{64}$/.test(key))
+        return res.status(400).json({ error: '无效的历史会话' });
+    try {
+        // Resolve the original file and command on the server; never accept a
+        // transcript path, working directory or shell command from search clients.
+        const entry = await nativeSessionSearch.get(key);
+        if (!entry)
+            return res.status(404).json({ error: '这条历史会话已不存在，请重新搜索' });
+        const agent = agentBySlug(entry.agentSlug);
+        const history = agentResumeHistory.list().find(candidate => candidate.agent.slug === entry.agentSlug && candidate.agent.sessionId === entry.agentNativeSessionId);
+        const command = agent ? buildResumeCommand(agent, entry.agentNativeSessionId, history?.agent.launchArgv) : null;
+        if (!command)
+            return res.status(410).json({ error: '当前 Agent 不支持恢复这条历史会话' });
+        const target = { slug: entry.agentSlug, nativeSessionId: entry.agentNativeSessionId, command };
+        const owner = findActiveAgentResumeOwner('', target);
+        const liveRecord = owner ? globalSessionState.sessions.find(candidate => candidate.backendSessionId === owner) : null;
+        if (liveRecord)
+            return res.json({ sessionId: liveRecord.sessionId });
+        if (owner || await findExternalCodexWriter(target))
+            return res.status(409).json({ error: '这条会话已在其他终端运行，请先切换到原终端或关闭后恢复', code: 'AGENT_SESSION_ACTIVE_ELSEWHERE' });
+        if (!entry.cwd)
+            return res.status(409).json({ error: '尚未找到这条会话的项目目录，请等待索引完成后重试' });
+        const cwd = await resolveWorkingDirectory(req, entry.cwd);
+        res.json({ command, cwd, title: entry.title, agent });
+    }
+    catch (error) {
+        res.status(400).json({ error: `无法恢复会话：${getErrorMessage(error)}` });
+    }
 });
 router.get('/agent-resume-history', (_req, res) => {
     const entries = agentResumeHistory.list().flatMap((entry) => {
@@ -6238,6 +6321,7 @@ async function getSettingsPayload() {
         collaborationFloatingGroupId: getCollaborationFloatingGroupIdSetting(),
         serviceSwitcherExpanded: getServiceSwitcherExpandedSetting(),
         fileSortModes: getFileSortModesSetting(),
+        hideGitIgnoredRoots: getHideGitIgnoredRootsSetting(),
         nestedGitScanRoots: getNestedGitScanRootsSetting(),
         activeGitRepos: getActiveGitReposSetting(),
         pinnedExplorerRoots: getPinnedExplorerRootsSetting(),
@@ -6257,14 +6341,10 @@ router.get('/auto-title/catalog', async (req, res) => {
     res.json({ namers: await getTitleNamerCatalog(force) });
 });
 router.get('/update', (_req, res) => {
-    res.json(desktopRuntimeOwner?.getState() ?? npmAutoUpdateManager.getState());
+    res.json(npmAutoUpdateManager.getState());
 });
 router.post('/update/check', async (_req, res) => {
     try {
-        if (desktopRuntimeOwner) {
-            res.json(await desktopRuntimeOwner.checkForUpdates());
-            return;
-        }
         // npm 查询加全局安装动辄二三十秒，而加密传输对 30s 内收不到任何回包就判超时，
         // 客户端会弹「服务响应超时」——更新其实装完了。检查照常跑，进度与结果都由控制
         // WS 的 update-state 广播推送，这里立刻回当前状态（通常是 checking）即可。
@@ -6279,9 +6359,7 @@ router.post('/update/check', async (_req, res) => {
 });
 router.post('/update/restart', async (_req, res) => {
     try {
-        const state = desktopRuntimeOwner
-            ? await desktopRuntimeOwner.restart()
-            : npmAutoUpdateManager.confirmRestart();
+        const state = npmAutoUpdateManager.confirmRestart();
         res.status(202).json(state);
     }
     catch (error) {
@@ -6427,6 +6505,18 @@ router.put('/settings', async (req, res) => {
         }
         setFileSortModeSetting(preference.path, preference.mode);
     }
+    if (body.hideGitIgnoredRoot && typeof body.hideGitIgnoredRoot === 'object') {
+        const preference = body.hideGitIgnoredRoot;
+        const validPath = typeof preference.rootPath === 'string'
+            && preference.rootPath.length > 0
+            && preference.rootPath.length <= 4096
+            && (preference.rootPath.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(preference.rootPath));
+        if (!validPath || typeof preference.enabled !== 'boolean') {
+            res.status(400).json({ error: 'Invalid Git ignore visibility preference', code: 'GIT_IGNORE_VISIBILITY_INVALID' });
+            return;
+        }
+        setHideGitIgnoredRootSetting(preference.rootPath, preference.enabled);
+    }
     if (body.nestedGitScanRoot && typeof body.nestedGitScanRoot === 'object') {
         const preference = body.nestedGitScanRoot;
         const isAbsoluteRootPath = (value) => typeof value === 'string'
@@ -8297,7 +8387,7 @@ export function handleControlWebSocket(ws, clientId) {
             ws.send(JSON.stringify({ type: 'client-state', seq: initialSeq, state: globalSessionState, inventory: inventory ?? latestSessionInventory }));
             ws.send(JSON.stringify({
                 type: 'update-state',
-                state: desktopRuntimeOwner?.getState() ?? npmAutoUpdateManager.getState(),
+                state: npmAutoUpdateManager.getState(),
             }));
             // 服务健康快照：崩溃时服务自己已经死了、推不出任何东西，所以"红点"这件事
             // 只能靠客户端重连时的这一发。客户端断线重连的既有逻辑正好覆盖了那个时刻。