termdock 1.4.303 → 1.4.304

package/dist/server/agent/nativeResumeOwner.js

@@ -1,26 +1,50 @@
 import { integrationError } from './integrationStore.js';
-/** Last-known bindings select uncertain conflicts; only process observations
- * prove a conversation is running. The caller separately verifies its own pane. */
+/** A tmux remains observable without a browser/PTY attachment, including after
+ * service restart. Inventory UUIDs never filter the candidate set. */
+export function collectNativeResumeOwnerCandidates(inventory, backends) {
+    const candidates = [];
+    const seenTmux = new Set(), seenBackend = new Set();
+    for (const entry of inventory) {
+        if (entry.mode !== 'tmux' || !entry.tmuxSessionName || seenTmux.has(entry.tmuxSessionName))
+            continue;
+        const backend = entry.backendSessionId ? backends.get(entry.backendSessionId) : null;
+        candidates.push({ backendSessionId: entry.backendSessionId ?? `inventory:${entry.sessionId}`,
+            tmuxSessionName: entry.tmuxSessionName, cachedSlug: backend?.agent?.slug ?? entry.agentResume?.slug ?? null,
+            cachedNativeId: backend?.agentSession?.sessionId ?? entry.agentResume?.sessionId ?? null });
+        seenTmux.add(entry.tmuxSessionName);
+        if (entry.backendSessionId)
+            seenBackend.add(entry.backendSessionId);
+    }
+    for (const [backendSessionId, backend] of backends) {
+        if (seenBackend.has(backendSessionId) || backend.mode === 'tmux' && backend.tmuxSessionName && seenTmux.has(backend.tmuxSessionName))
+            continue;
+        candidates.push({ backendSessionId, tmuxSessionName: backend.mode === 'tmux' ? backend.tmuxSessionName : null,
+            cachedSlug: backend.agent?.slug ?? null, cachedNativeId: backend.agentSession?.sessionId ?? null });
+        if (backend.mode === 'tmux' && backend.tmuxSessionName)
+            seenTmux.add(backend.tmuxSessionName);
+    }
+    return candidates;
+}
+/** Only process observations prove presence or absence of another owner.
+ * Cached UUIDs cannot exclude a terminal; the caller verifies its own pane. */
 export async function assertNativeResumeAvailable(target, excludedBackendSessionId, candidates, observe) {
     let uncertain = false;
     for (const candidate of candidates) {
         if (candidate.backendSessionId === excludedBackendSessionId)
             continue;
-        const cachedMatch = candidate.cachedSlug === target.slug && candidate.cachedNativeId === target.nativeSessionId;
         let processes;
         try {
             processes = await observe(candidate);
         }
         catch {
-            if (cachedMatch)
-                uncertain = true;
+            uncertain = true;
             continue;
         }
         for (const process of processes) {
             if (process.confirmed && process.agentSlug === target.slug && process.nativeId === target.nativeSessionId) {
                 integrationError('NATIVE_SESSION_ALREADY_RUNNING', 'Another terminal process proves the exact native conversation is running', 409);
             }
-            if (cachedMatch && (!process.confirmed || process.agentSlug === target.slug && !process.nativeId))
+            if (!process.confirmed || process.agentSlug === target.slug && !process.nativeId)
                 uncertain = true;
         }
     }

package/dist/server/routes/terminal.js

@@ -1,6 +1,6 @@
 import { collaborationSessionDisplayName } from '../utils/sessionDisplayName.js';
 import { integrationError } from '../agent/integrationStore.js';
-import { assertNativeResumeAvailable } from '../agent/nativeResumeOwner.js';
+import { assertNativeResumeAvailable, collectNativeResumeOwnerCandidates } from '../agent/nativeResumeOwner.js';
 import { integrationLaunchCommand } from '../agent/integrationSessions.js';
 import { ensureTeam } from '../agent/collaborationTeam.js';
 import { androidRecordings } from '../android/recording.js';
@@ -1910,29 +1910,24 @@ async function assertIntegrationNativeResumeAvailable(record) {
     // Never use a recovered hook or the last-known UUID as live-owner proof.
     if (process.platform === 'linux')
         await getProcessSnapshot(true);
-    const candidates = [...terminalSessions].map(([backendSessionId, backend]) => {
-        const persisted = globalSessionState.sessions.find(entry => entry.backendSessionId === backendSessionId)?.agentResume;
-        return { backendSessionId, cachedSlug: backend.agent?.slug ?? persisted?.slug ?? null,
-            cachedNativeId: backend.agentSession?.sessionId ?? persisted?.sessionId ?? null };
-    });
+    const candidates = collectNativeResumeOwnerCandidates(globalSessionState.sessions, terminalSessions);
     await assertNativeResumeAvailable({ slug: record.agent_slug, nativeSessionId: record.agent_native_session_id }, own?.backendSessionId ?? null, candidates, async (candidate) => {
         const backend = terminalSessions.get(candidate.backendSessionId);
-        if (!backend)
-            return [];
+        const tmuxSessionName = candidate.tmuxSessionName;
         // Duplicate inventory attachments to the original owned pane are not
         // another process; launchIntegrationTerminal verifies that pane again.
-        if (backend.mode === 'tmux' && backend.tmuxSessionName === own?.tmuxSessionName)
+        if (tmuxSessionName && tmuxSessionName === own?.tmuxSessionName)
             return [];
-        if (backend.mode === 'tmux' && backend.tmuxSessionName) {
+        if (tmuxSessionName) {
             try {
-                await runTmux(['has-session', '-t', `=${backend.tmuxSessionName}`]);
+                await runTmux(['has-session', '-t', `=${tmuxSessionName}`]);
             }
             catch (error) {
                 if (/can't find session|no server running|no sessions|error connecting.*No such file/i.test(getErrorMessage(error)))
                     return [];
                 throw error;
             }
-            const layout = await getTmuxLayout(backend.tmuxSessionName);
+            const layout = await getTmuxLayout(tmuxSessionName);
             return Promise.all(layout.windows.flatMap(window => window.panes).map(async (pane) => {
                 const program = await resolveTmuxPaneProgram(pane, true, true);
                 const agent = detectAgentFromCommand(program?.rawArgs ?? program?.command ?? '', agentCustomCommands());
@@ -1943,6 +1938,8 @@ async function assertIntegrationNativeResumeAvailable(record) {
                     nativeId: agent && program?.rawArgs ? inferResumeSessionId(agent, splitCommandToArgv(program.rawArgs)) : null };
             }));
         }
+        if (!backend)
+            return [];
         const program = await detectShellActiveProgram(backend);
         const agent = detectAgentFromCommand(program?.rawArgs ?? program?.command ?? '', agentCustomCommands());
         return [{ confirmed: !!program && program.source !== 'unknown', agentSlug: agent?.slug ?? null,

package/docs/integrations.md

@@ -4,7 +4,8 @@
 启动输入条件与保留凭据的策略更新要求 **CLI / 实际运行服务均至少 1.4.301**；协议仍为 1。
 插件原生 ID 的前台 argv 回读及服务重启后的运行中 restore 核验修复要求
 **实际运行服务至少 1.4.302**。退出后的重复原生会话检查修复要求
-**实际运行服务至少 1.4.303**；建议 CLI 与服务同步安装 1.4.303（CLI 最低仍为 1.4.301）。
+**实际运行服务至少 1.4.303**。没有 PTY 附着的已登记 tmux 的重复保护修复要求
+**实际运行服务至少 1.4.304**；建议 CLI 与服务同步安装 1.4.304（CLI 最低仍为 1.4.301）。
 现有 `--session`、消息投递、任务报告与自动协作入口继续兼容；旧的
 `task create --integration` 仍表示代码集成子任务，新身份使用 `--principal`。
 
@@ -303,6 +304,12 @@ operation/pane，不启动第二个 Agent；进程携带不同 UUID 时继续拒
 返回 `NATIVE_SESSION_OWNER_UNCONFIRMED` 并停止恢复；应检查该终端，不绕过保护。
 此检查覆盖服务已登记终端，不声称枚举其他应用中全部原生会话。
 
+1.4.304 起，检查合并持久终端清单和当前 PTY backend；服务重启后无需网页挂接，
+已登记 tmux 的每个 pane 都会现场核验。旧登记 UUID C 不会排除当前实际运行 UUID A
+的终端，终端的协作路由为 recovering/offline 或绑定不匹配也不会跳过检查。
+仅在确认 tmux 已消失或当前进程排除冲突时继续；未知进程、同 Agent 缺少精确 UUID、
+观察失败均返回 `NATIVE_SESSION_OWNER_UNCONFIRMED`，不以旧 UUID 证明没有冲突。
+
 常见失败码（每项都是完整字符串）：
 
 - 配置/权限：`LAUNCH_PROFILE_DENIED`, `LAUNCHER_UNAVAILABLE`, `COLLAB_AGENT_UNAVAILABLE`, `SESSION_CWD_MISSING`, `SESSION_CWD_DENIED`, `INTEGRATION_SESSION_NOT_FOUND`, `INTEGRATION_SESSION_LIMIT`。
@@ -325,7 +332,10 @@ operation/pane，不启动第二个 Agent；进程携带不同 UUID 时继续拒
 不重复启动、不同 UUID 拒绝，以及进程退出后缓存 UUID 不再阻挡恢复。使用方已报告
 1.4.302 真实 TraeX 服务重启回读、运行中恢复不重启、不同 UUID 拒绝通过；显式恢复
 原 UUID 也已回读 ready，但配置的模型 footer 条件被暂态提示替换，输入仍保持待投递。
-**1.4.303 的真实 TraeX 退出后恢复与稳定输入条件仍须使用方实机复验**。
+使用方已报告 1.4.303 退出后精确恢复通过，也发现未挂接 PTY 的已登记 tmux 重复保护
+遗漏；维护机已用“旧 UUID C、实际运行 UUID A、无 PTY 附着”的真实隔离 tmux 复现，
+并验证 1.4.304 编译后检查在该状态下拒绝再次启动。
+**1.4.304 的真实 TraeX 重复保护与稳定输入条件仍须使用方实机复验**。
 回读 capabilities 后，应核对原 TD ID、真实 TraeX UUID 与原 argv/cwd/包装器快照，
 并验证 Agent 真正加载原对话。
 先完成测试环境的创建→追问→关联答复，再验重复键、追加咨询、断线重投和精确恢复。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.303",
+  "version": "1.4.304",
   "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.303",
+  "version": "1.4.304",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-E9GDa4nrCXADRXdyPKufusZt6IcCr4m2mGdx5h34KMQ=",
-  "serverBundleHash": "sha256-+P0Zwo5Zg52vSfyTrvxcfAIAuwY0+n4i4f0kTf8BC0g=",
+  "serverBundleHash": "sha256-7LaEwk0ur5djmnXCjBBkhMPg2z5dB5dcYm7tmh14Pko=",
   "clientBundleHash": "sha256-HOoNMOYhnph9XwUhSYE5W2CdI9Vb4g0c64ubW49LnXE=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"