termdock 1.4.363 → 1.4.365

package/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const c=e=>n(e,o),d={module:{uri:o},exports:r,require:c};s[o]=Promise.all(i.map(e=>d[e]||c(e))).then(e=>(a(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"cb67fe6e9b791b71848aefa78863952c"},{url:"assets/app-window-mac-CMQXdVwr.js",revision:null},{url:"assets/app-window-DEIG61aE.js",revision:null},{url:"assets/app-OBYdRRSY.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-DGJJ6lEb.js",revision:null},{url:"assets/terminal-DaiFCKy_.js",revision:null},{url:"assets/index-1ThhtVNZ.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});
+if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const c=e=>n(e,o),d={module:{uri:o},exports:r,require:c};s[o]=Promise.all(i.map(e=>d[e]||c(e))).then(e=>(a(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"e77c4ef414c1b61fffab6d5a7d550634"},{url:"assets/app-window-mac-AkI6wk74.js",revision:null},{url:"assets/app-window-D3z1OR9z.js",revision:null},{url:"assets/app-JdTbd-dH.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-DGJJ6lEb.js",revision:null},{url:"assets/terminal-DaiFCKy_.js",revision:null},{url:"assets/index-5C6wZNeo.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});

package/dist/server/agent/chatUIPrompt.js

@@ -1,11 +1,10 @@
 import { generateSystemPrompt } from '@openuidev/lang-core';
 import { chatUILibrary } from '../shared/chatUILibrary.js';
-import { chatFullUISpec, chatFullUIOptions } from '../shared/chatFullUICatalog.js';
+import { chatFullUISpec } from '../shared/chatFullUICatalog.js';
 export function chatUIPrompt() {
     const legacy = chatUILibrary.toSpec();
     return [
-        '请按信息特点选择清楚、多样的表达：比较用表格，趋势、占比和分布用图表；多组内容用卡片、标签页或折叠区；步骤用步骤条；需要用户填写或选择时用表单、日期、滑块、单选或多选；文件和链接提供可点击入口。简单说明用 Markdown。',
-        '排版紧凑，优先保证内容完整、可读和方便操作。不要为每句话套卡片，不为装饰重复同一组事实；图表只使用实际数据。',
+        '可使用 Markdown、布局与卡片、表格、图表、表单及交互组件、图片、文件预览和链接，支持状态绑定、工具调用和逐步更新。自行选择合适的表达方式。',
         '适用边界：仅回复明确标记“来自用户的普通对话界面”的原消息。其他协作组或后台集成按原话题和接收方回复。',
         '将回复写入 UTF-8 JSON 文件，格式 {"text":"完整、可独立阅读的 Markdown 说明","ui":"界面表达程序"}。text 包含全部关键事实，供引用、复制、旧客户端和降级显示。',
         '通过 td collab --session <你的会话id> reply <原消息id> --file <文件路径> --metadata \'{"openui":{"version":2}}\' --response-kind result --idempotency-key <稳定唯一key> --text 回复。不要把 JSON 或程序打印到聊天正文。',
@@ -14,9 +13,14 @@ export function chatUIPrompt() {
         'Resource(label, kind, target, description?) 提供文件预览或外部链接；文件使用当前服务已授权绝对路径，链接仅 http/https。本地图片沿用页面加密读取，勿自行构造业务接口。',
         'Query 可调用 read_file({path})、list_directory({path}) 读取获准文件和目录。Mutation 可调用 continue_conversation({message})，只在用户点击的 @Run 中执行；查询不能发送消息。未知工具会明确报错，勿编造工具。',
         '只展示实际数据和明确报告，不推断 Agent 内部进度。ui 最长64000字符，text 最长32000字符。',
-        generateSystemPrompt({ ...chatFullUISpec, components: { ...chatFullUISpec.components, Resource: legacy.components.Resource },
-            ...chatFullUIOptions, bindings: true, builtinFunctions: true, toolCalls: true,
+        generateSystemPrompt({ ...chatFullUISpec,
+            // Keep the catalog factual; expression and layout choices belong to the agent.
+            componentGroups: chatFullUISpec.componentGroups?.map(({ name, components }) => ({ name, components })),
+            components: { ...chatFullUISpec.components,
+                HorizontalBarChart: { ...chatFullUISpec.components.HorizontalBarChart, description: 'Horizontal bar chart.' },
+                Resource: legacy.components.Resource },
+            bindings: true, builtinFunctions: true, toolCalls: true,
             tools: ['read_file({path: string}) -> {path, content, size, binary}', 'list_directory({path: string}) -> {path, entries}', 'continue_conversation({message: string}) -> {submitted: boolean}; Mutation only, never Query'],
-            preamble: '使用下列组件和表达式把答案组织成可阅读、可操作的界面。' }),
+            preamble: '以下是结构化表达的组件与语法说明。' }),
     ].join('\n\n');
 }

package/dist/server/agent/collaborationPrompt.js

@@ -104,7 +104,7 @@ export function formatCollaborationDelivery(input) {
             .map((sessionId) => sanitizeCollaborationName(sessionsById.get(sessionId)?.name ?? sessionId));
         blocks.push(formatCollaborationMessage({ ...message, content: body }, source, fannedNames, fence, token));
         if (message.integrationOrigin?.source === 'session-chat')
-            blocks.push(`此消息来自用户的普通对话界面。请自然地与用户交流，并用 td collab --session ${input.targetSessionId} reply ${token} \"答复正文\" --response-kind result --idempotency-key <稳定唯一key> --text 将面向用户的答复写回对话。终端中的普通输出不会成为聊天回复。需要补充问题时也使用 reply；不要仅在终端打印答案。请按内容选择清楚、多样的表达：方案比较用表格，趋势和分布用图表，需要用户填写或选择时用表单，相关结果用卡片组织，文件和链接提供可点击入口。先运行 td collab ui --text 查看可用表达组件、交互和回复格式，再用 --file 和 --metadata 提交；简短说明直接回复 Markdown。`);
+            blocks.push(`此消息来自用户的普通对话界面。请自然地与用户交流，并用 td collab --session ${input.targetSessionId} reply ${token} \"答复正文\" --response-kind result --idempotency-key <稳定唯一key> --text 将面向用户的答复写回对话。终端中的普通输出不会成为聊天回复。需要补充问题时也使用 reply；不要仅在终端打印答案。可使用 Markdown、卡片、表格、图表、交互表单、图片、文件预览和链接等表达形式，自行选择合适的表达方式。组件、交互及提交格式可运行 td collab ui --text 查看，结构化回复用 --file 和 --metadata 提交。`);
         else if (message.integrationOrigin)
             blocks.push(`此消息来自后台程序，使用原消息 id 回复：td collab --session ${input.targetSessionId} reply ${token} "答复正文" --response-kind result --idempotency-key <稳定唯一key> --text\n需要时用 --response-kind ack|progress 明确回复收到或进展；result 提交结果。回复持久保存为 stored 并主动推送给后台，不创建看板任务，不代表用户验收。此回复不会进入普通对话界面，不要使用普通对话的结构化展示协议。`);
         if (message.integrationOrigin?.source === 'session-chat' && message.content.includes('```termdock-context\n'))

package/dist/server/cli.js

@@ -1190,7 +1190,7 @@ async function runSetPassword() {
     const wasEnabled = isAuthEnabled();
     if (isTty) {
         console.log(`${ICON.lock} ${c.bold('Termdock — set access password')}`);
-        console.log(c.dim('  Password must be at least 16 characters. Input is hidden.'));
+        console.log(c.dim('  Password must be at least 8 characters. Input is hidden.'));
         console.log('');
     }
     const password = await promptHidden('  New password: ');
@@ -1198,8 +1198,8 @@ async function runSetPassword() {
         console.error(`\n${ICON.err} ${c.red('Password cannot be empty.')}`);
         process.exit(1);
     }
-    if (password.length < 16) {
-        console.error(`\n${ICON.err} ${c.red('Password must be at least 16 characters.')}`);
+    if (password.length < 8) {
+        console.error(`\n${ICON.err} ${c.red('Password must be at least 8 characters.')}`);
         process.exit(1);
     }
     if (isTty) {
@@ -1359,6 +1359,17 @@ async function runNotify(command) {
         process.exitCode = 1;
     }
 }
+async function resolveCurrentLocalSessionId(baseUrl, localToken) {
+    const context = await detectLocalSessionContext();
+    if (!context.backendSessionId && !context.tmuxSessionName)
+        throw new Error('--self requires a Termdock-managed session');
+    const query = new URLSearchParams(Object.fromEntries(Object.entries(context).filter((entry) => typeof entry[1] === 'string')));
+    const response = await getLocalJson(baseUrl, localToken, `/api/terminal/operations/orchestration/peers?${query}`);
+    const data = JSON.parse(response.body);
+    if (response.statusCode !== 200 || !data.source?.sessionId)
+        throw new Error(data.error || 'Current session could not be resolved');
+    return data.source.sessionId;
+}
 async function runAutomation(command) {
     if (command.action === 'help') {
         console.log(AUTOMATION_HELP);
@@ -1375,17 +1386,7 @@ async function runAutomation(command) {
         request: (method, endpoint, body) => method === 'POST'
             ? postLocalJson(baseUrl, state.localApiToken, endpoint, body)
             : getLocalJson(baseUrl, state.localApiToken, endpoint, 30_000, method),
-        self: async () => {
-            const context = await detectLocalSessionContext();
-            if (!context.backendSessionId && !context.tmuxSessionName)
-                throw new Error('--self requires a Termdock-managed session');
-            const query = new URLSearchParams(Object.fromEntries(Object.entries(context).filter((entry) => typeof entry[1] === 'string')));
-            const response = await getLocalJson(baseUrl, state.localApiToken, `/api/terminal/operations/orchestration/peers?${query}`);
-            const data = JSON.parse(response.body);
-            if (response.statusCode !== 200 || !data.source?.sessionId)
-                throw new Error(data.error || 'Current session could not be resolved');
-            return data.source.sessionId;
-        },
+        self: () => resolveCurrentLocalSessionId(baseUrl, state.localApiToken),
         stdin: readStdinText, write: (line) => console.log(line),
     });
 }
@@ -3459,6 +3460,7 @@ async function main() {
             request: (method, endpoint, body) => method === 'POST'
                 ? postLocalJson(baseUrl, state.localApiToken, endpoint, body)
                 : getLocalJson(baseUrl, state.localApiToken, endpoint),
+            self: () => resolveCurrentLocalSessionId(baseUrl, state.localApiToken),
             stdin: readStdinText, write: line => console.log(line),
         });
         return;

package/dist/server/entry.js

@@ -2,7 +2,7 @@ import { IntegrationRuntime, integrationSocketPath } from './agent/integrationSe
 import { CollaborationService } from './agent/collaborationService.js';
 import { X509Certificate } from 'node:crypto';
 import { CollaborationPeerTransport, connectCollaborationRpc } from './agent/collaborationPeerTransport.js';
-import { collaborationStore, collaborationTaskStore, deliverPeerCollaboration, collaborationLocalActivity, collaborationDirectorySessions, prepareCollaborationTaskWorker, integrationSessionAdapter } from './routes/terminal.js';
+import { collaborationStore, collaborationTaskStore, deliverPeerCollaboration, collaborationLocalActivity, collaborationDirectorySessions, todoWebhookRouter, prepareCollaborationTaskWorker, integrationSessionAdapter } from './routes/terminal.js';
 import { CollaborationTaskService } from './agent/collaborationTaskService.js';
 import { setPushTargetPeerId } from './notifications/pushService.js';
 import { desktopServiceTargets } from './federation/desktopTargets.js';
@@ -164,6 +164,8 @@ export function createApp(options = {}) {
     app.disable('x-powered-by');
     app.use(securityHeaders);
     app.use(validateHostMiddleware);
+    // External senders have only a per-source webhook capability; no private API bypass.
+    app.use('/hooks/todo', todoWebhookRouter());
     if (options.secureRequired)
         app.use('/api/auth/open', createOpenAccessRouter(() => app.locals.passwordRuntime?.serviceId));
     if (options.secureRequired)
@@ -494,12 +496,13 @@ export function startServer(options = {}) {
     const desktopTargets = () => desktopServiceTargets(homedir(), federationServiceId);
     const routeAccess = new RouteAccess(path.join(homedir(), '.termdock', 'federation', 'routes.json'), Date.now, (subjectId, targetServiceId) => routeInvitations?.allows(subjectId, targetServiceId) === true || collaborationTransport?.canRoute(subjectId, targetServiceId) === true, desktopTargets, () => activeRouteIds());
     const relayRouter = new RelayRouter({
+        requirePasswordProtectedTargets: true,
         isLocalTarget: id => id === federationServiceId,
         authenticate: context => context,
         allowRegister: (principal, serviceId) => routeAccess.allowRegister(principal, serviceId),
         allowRoute: (principal, serviceId) => routeAccess.allowRoute(principal, serviceId),
     });
-    activeRouteIds = () => relayRouter.activeRouteIds();
+    activeRouteIds = () => relayRouter.registeredRouteIds();
     const directTargetRegistry = new DirectTargetRegistry(relayRouter, path.join(homedir(), '.termdock', 'federation'));
     const refreshDirectTargets = () => {
         directTargetRegistry.refresh(routeAccess.configuredDirectTargets().filter(target => target.serviceId !== federationServiceId));
@@ -553,6 +556,9 @@ export function startServer(options = {}) {
         grantRouteAccess: async (issuerId, targetServiceId, subjectId, url) => {
             if (!routeInvitations)
                 throw new Error('ROUTE_NOT_AVAILABLE');
+            const failure = relayRouter.routeError(targetServiceId) || directTargetRegistry.error(targetServiceId);
+            if (failure === 'TARGET_PASSWORD_REQUIRED' || failure === 'TARGET_SECURITY_UPGRADE_REQUIRED')
+                throw new Error(failure);
             if (!routeAccess.hasConfiguredTarget(targetServiceId)) {
                 if (!url)
                     throw new Error('ROUTE_TARGET_NOT_CONFIGURED');
@@ -567,7 +573,12 @@ export function startServer(options = {}) {
             return routeInvitations.grant(issuerId, targetServiceId, subjectId);
         },
         revokeRouteAccess: id => routeInvitations?.revoke(id) || false,
-        issueRouteTicket: (subjectId, serviceId) => routeAccess.issueRouteTicket(subjectId, serviceId),
+        issueRouteTicket: (subjectId, serviceId) => {
+            const failure = relayRouter.routeError(serviceId) || directTargetRegistry.error(serviceId);
+            if (failure === 'TARGET_PASSWORD_REQUIRED' || failure === 'TARGET_SECURITY_UPGRADE_REQUIRED')
+                throw new Error(failure);
+            return routeAccess.issueRouteTicket(subjectId, serviceId);
+        },
         issueSelfRelayTicket: (serviceId) => routeAccess.issueSelfRelayTicket(serviceId),
         hasRouteGrant: (subjectId, serviceId) => routeInvitations?.allows(subjectId, serviceId) === true || collaborationTransport?.canRoute(subjectId, serviceId) === true,
         createRouteInvitation: (issuerId, serviceId) => {
@@ -784,7 +795,7 @@ export function startServer(options = {}) {
             });
             return;
         }
-        if (pathname === '/api/federation/secure') {
+        if (pathname === '/api/federation/secure' || pathname === '/api/federation/relay-target') {
             // This exception applies only to the cookie-independent Noise handshake.
             // Target pinning and device authorization remain mandatory inside it.
             if (!secureChannelOriginAllowed(request.headers.origin, () => isUpgradeOriginAllowed(request.headers.origin, request.headers.host))) {
@@ -792,7 +803,7 @@ export function startServer(options = {}) {
                 return;
             }
             wss.handleUpgrade(request, socket, head, (ws) => {
-                void federation.then(runtime => runtime.accept(ws, { allowOpenAccess: !!request.headers.origin && isUpgradeOriginAllowed(request.headers.origin, request.headers.host) })).catch(() => ws.close(1011, 'Encrypted access unavailable'));
+                void federation.then(runtime => runtime.accept(ws, { relayed: pathname === '/api/federation/relay-target', allowOpenAccess: pathname === '/api/federation/secure' && !!request.headers.origin && isUpgradeOriginAllowed(request.headers.origin, request.headers.host) })).catch(() => ws.close(1011, 'Encrypted access unavailable'));
             });
             return;
         }

package/dist/server/federation/cli.js

@@ -6,6 +6,7 @@ import QRCode from 'qrcode';
 import { RelayClient } from './relay.js';
 import { openServiceSocket } from './serviceTransport.js';
 import { serviceEndpoint } from './connectionModel.js';
+import { verifyDirectTarget } from './directRoutes.js';
 function secureEndpoint(value, endpoint) {
     const url = new URL(value);
     if (!['https:', 'wss:'].includes(url.protocol) || url.username || url.password || url.search || url.hash)
@@ -114,13 +115,66 @@ export async function runFederationCli(args) {
                         upstream.terminate();
                         break;
                     }
-                    client = new RelayClient(upstream, { targets: new Map(targets.map(t => [t.serviceId, (signal) => connect(secureEndpoint(t.url, '/api/federation/secure'), t.ca, sockets, undefined, false, AbortSignal.any([signal, lifetime.signal]))])) });
-                    process.stderr.write('加密中继已连接。\n');
-                    delay = 1000;
-                    await new Promise(done => { if (upstream.readyState !== WebSocket.OPEN)
-                        done();
-                    else
-                        upstream.once('close', () => done()); });
+                    const protectedTargets = new Set();
+                    const verify = (t, signal) => verifyDirectTarget({ serviceId: t.serviceId, url: t.url,
+                        ...(t.caPath ?? config.caPath ? { caPath: t.caPath ?? config.caPath } : {}) }, dirname(configPath), signal);
+                    const targetFactories = new Map();
+                    const verification = new AbortController();
+                    const verificationSignal = AbortSignal.any([lifetime.signal, verification.signal]);
+                    upstream.once('close', () => verification.abort());
+                    let refreshTimer;
+                    // A failed proof withdraws the route. A confirmed missing password
+                    // remains advertised as blocked, so the directory can explain it.
+                    const refreshTargets = async () => {
+                        let index = 0;
+                        await Promise.all(Array.from({ length: Math.min(4, targets.length) }, async () => {
+                            while (!verificationSignal.aborted && index < targets.length) {
+                                const target = targets[index++];
+                                let configured;
+                                try {
+                                    await verify(target, verificationSignal);
+                                    configured = true;
+                                }
+                                catch (error) {
+                                    if (!(error instanceof Error) || error.message !== 'TARGET_PASSWORD_REQUIRED') {
+                                        protectedTargets.delete(target.serviceId);
+                                        targetFactories.delete(target.serviceId);
+                                        continue;
+                                    }
+                                    configured = false;
+                                }
+                                if (verificationSignal.aborted)
+                                    return;
+                                if (configured)
+                                    protectedTargets.add(target.serviceId);
+                                else
+                                    protectedTargets.delete(target.serviceId);
+                                targetFactories.set(target.serviceId, async (signal) => {
+                                    await verify(target, AbortSignal.any([signal, verificationSignal]));
+                                    return connect(serviceEndpoint(target.url, 'relay-target').href, target.ca, sockets, undefined, false, AbortSignal.any([signal, verificationSignal]));
+                                });
+                            }
+                        }));
+                    };
+                    try {
+                        await refreshTargets();
+                        if (verificationSignal.aborted)
+                            throw new Error('Relay disconnected');
+                        client = new RelayClient(upstream, { routeTtlMs: 4000, isPasswordProtected: id => protectedTargets.has(id), targets: targetFactories });
+                        const poll = async () => { await refreshTargets(); if (!verificationSignal.aborted)
+                            refreshTimer = setTimeout(() => void poll(), 2000); };
+                        refreshTimer = setTimeout(() => void poll(), 2000);
+                        process.stderr.write('加密中继已连接。\n');
+                        delay = 1000;
+                        await new Promise(done => { if (upstream.readyState !== WebSocket.OPEN)
+                            done();
+                        else
+                            upstream.once('close', () => done()); });
+                    }
+                    finally {
+                        verification.abort();
+                        clearTimeout(refreshTimer);
+                    }
                 }
                 catch {
                     if (!stopped)

package/dist/server/federation/connectionErrors.js

@@ -2,6 +2,8 @@ const messages = {
     RELAY_AUTHORIZATION_REQUIRED: '没有有效中转授权', TARGET_AUTHORIZATION_REQUIRED: '目标服务需要重新登录',
     PERMISSION_DENIED: '当前权限不允许此操作', TARGET_IDENTITY_MISMATCH: '服务身份与保存的身份不一致',
     RELAY_SELF_TARGET: '不能通过服务中转到其自身；同一服务的其它地址请添加为备用地址。',
+    TARGET_PASSWORD_REQUIRED: '目标服务未配置有效访问密码，已禁用中转。请让目标服务管理员先配置访问密码。',
+    TARGET_SECURITY_UPGRADE_REQUIRED: '中转服务版本不支持密码保护核验，已禁用中转。请更新目标服务和中继程序。',
 };
 export class ConnectionAccessError extends Error {
     code;
@@ -18,6 +20,10 @@ export function connectionAccessError(error, context = {}) {
         Object.assign(error.context, { ...context, ...error.context });
         return error;
     }
+    // These fixed target-side protocol denials can arrive after a route ticket
+    // was issued but before the target's first permission response.
+    if (error instanceof Error && (error.message === 'TARGET_PASSWORD_REQUIRED' || error.message === 'TARGET_SECURITY_UPGRADE_REQUIRED'))
+        return new ConnectionAccessError(error.message, context);
     // Retained workspaces/test module reloads can carry the same protocol error
     // from another module instance. Never accept arbitrary messages as a code.
     if (error instanceof Error && error.name === 'ConnectionAccessError' && 'code' in error
@@ -29,6 +35,8 @@ export function connectionAccessError(error, context = {}) {
     return undefined;
 }
 export function relayAuthorizationError(error, context) {
+    if (error instanceof Error && (error.message === 'TARGET_PASSWORD_REQUIRED' || error.message === 'TARGET_SECURITY_UPGRADE_REQUIRED'))
+        return new ConnectionAccessError(error.message, context);
     if (error instanceof Error && (error.message === 'AUTHORIZATION_DENIED'
         || error instanceof ConnectionAccessError && error.code === 'PERMISSION_DENIED')) {
         return new ConnectionAccessError('RELAY_AUTHORIZATION_REQUIRED', context);

package/dist/server/federation/directRoutes.js

@@ -2,6 +2,7 @@ import { createIdentity, secureConnection } from './secureProtocol.js';
 import { socketDuplex } from './socketDuplex.js';
 import { openServiceSocket } from './serviceTransport.js';
 import { serviceEndpoint } from './connectionModel.js';
+import { PacketChannel } from './packets.js';
 function endpoint(config) {
     if (!config || typeof config !== 'object' || Object.keys(config).some(key => !['serviceId', 'url', 'caPath', 'caFingerprint256', 'certificateFingerprint256', 'label'].includes(key)) || !/^[a-zA-Z0-9_.:-]{1,160}$/.test(config.serviceId) || typeof config.url !== 'string' || (config.caPath !== undefined && typeof config.caPath !== 'string'))
         throw new Error('Invalid direct target configuration');
@@ -41,7 +42,9 @@ export function attachRegisteredDirectTargets(router, configs, baseDir = process
             cleanups.push(router.registerDirect(target.serviceId, async (signal) => {
                 if (stopped)
                     throw new Error('Direct target stopped');
-                const ws = await openServiceSocket(target.url, target.config, { baseDir, maxPayload: 256 * 1024, handshakeTimeout: 10000, signal: AbortSignal.any([signal, lifetime.signal]) });
+                const relayUrl = new URL(target.url);
+                relayUrl.pathname = '/api/federation/relay-target';
+                const ws = await openServiceSocket(relayUrl.href, target.config, { baseDir, maxPayload: 256 * 1024, handshakeTimeout: 10000, signal: AbortSignal.any([signal, lifetime.signal]) });
                 if (stopped) {
                     ws.terminate();
                     throw new Error('Direct target stopped');
@@ -64,7 +67,32 @@ export async function verifyDirectTarget(config, baseDir = process.cwd(), signal
     const ws = await openServiceSocket(url, config, { baseDir, maxPayload: 256 * 1024, signal });
     const duplex = socketDuplex(ws);
     try {
-        await secureConnection({ identity: await createIdentity(), initiator: true, targetPinnedPeerId: config.serviceId, duplex, signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000) });
+        const timeout = signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000);
+        const abort = () => ws.terminate();
+        timeout.addEventListener('abort', abort, { once: true });
+        try {
+            const secure = await secureConnection({ identity: await createIdentity(), initiator: true, targetPinnedPeerId: config.serviceId, duplex, signal: timeout });
+            const channel = new PacketChannel(secure.duplex);
+            try {
+                channel.send({ type: 'password-parameters', id: 'relay-policy' });
+                for await (const packet of channel.read()) {
+                    if (packet.id !== 'relay-policy')
+                        continue;
+                    if (packet.type === 'error' && packet.error === 'PASSWORD_NOT_CONFIGURED')
+                        throw new Error('TARGET_PASSWORD_REQUIRED');
+                    if (packet.type !== 'result' || typeof packet.saltHex !== 'string' || !/^[0-9a-f]{32}$/.test(packet.saltHex))
+                        throw new Error('TARGET_SECURITY_UPGRADE_REQUIRED');
+                    return;
+                }
+                throw new Error('TARGET_SECURITY_UPGRADE_REQUIRED');
+            }
+            finally {
+                channel.close();
+            }
+        }
+        finally {
+            timeout.removeEventListener('abort', abort);
+        }
     }
     finally {
         ws.close();

package/dist/server/federation/directTargetRegistry.js

@@ -54,16 +54,16 @@ export class DirectTargetRegistry {
         const states = this.providers(serviceId);
         if (states.some(state => state.close))
             return;
-        return ['TARGET_CHECKING', 'TARGET_IDENTITY_MISMATCH', 'TARGET_UNREACHABLE'].find(error => states.some(state => state.error === error));
+        return ['TARGET_PASSWORD_REQUIRED', 'TARGET_SECURITY_UPGRADE_REQUIRED', 'TARGET_CHECKING', 'TARGET_IDENTITY_MISMATCH', 'TARGET_UNREACHABLE'].find(error => states.some(state => state.error === error));
     }
     describe(target) {
-        const state = this.providers(target.serviceId).find(provider => provider.close);
+        const state = this.providers(target.serviceId).find(provider => provider.close || provider.error === 'TARGET_PASSWORD_REQUIRED');
         const available = this.router.hasRoute(target.serviceId);
         // A valid reverse tunnel may coexist with an incorrect static URL. Do not
         // borrow the unverified URL/name and make A look like the entry B.
         const metadata = state ? { serviceId: target.serviceId, url: normalizeServiceAddress(state.target.url), ...(state.target.label ? { label: state.target.label } : {}) }
             : target.url ? { serviceId: target.serviceId } : target;
-        const error = this.error(target.serviceId);
+        const error = this.router.routeError(target.serviceId) || this.error(target.serviceId);
         return { ...metadata, available, ...(!available && error ? { error } : {}) };
     }
     async check(target, state) {
@@ -85,7 +85,8 @@ export class DirectTargetRegistry {
                 return;
             state.close?.();
             state.close = undefined;
-            state.error = error instanceof Error && error.name === 'UnexpectedPeerError' ? 'TARGET_IDENTITY_MISMATCH' : 'TARGET_UNREACHABLE';
+            state.error = error instanceof Error && error.name === 'UnexpectedPeerError' ? 'TARGET_IDENTITY_MISMATCH'
+                : error instanceof Error && ['TARGET_PASSWORD_REQUIRED', 'TARGET_SECURITY_UPGRADE_REQUIRED'].includes(error.message) ? error.message : 'TARGET_UNREACHABLE';
             state.nextCheck = this.now() + 5000;
         }
         finally {

package/dist/server/federation/passwordBootstrap.js

@@ -43,6 +43,8 @@ export class PasswordBootstrapServer {
     now() { return this.options.now?.() ?? Date.now(); }
     credential() {
         const hash = this.options.getPasswordHash();
+        if (!hash)
+            throw new Error('PASSWORD_NOT_CONFIGURED');
         if (!hash || !/^scrypt\$[0-9a-f]{32}\$[0-9a-f]{128}$/.test(hash))
             throw new Error('Password authentication unavailable');
         return hash;

package/dist/server/federation/passwordLoginRoutes.js

@@ -29,8 +29,11 @@ export function createPasswordLoginRouter(getRuntime) {
         try {
             res.json(bootstrap.parameters());
         }
-        catch {
-            res.status(503).json({ error: 'Password login unavailable' });
+        catch (error) {
+            if (error instanceof Error && error.message === 'PASSWORD_NOT_CONFIGURED')
+                res.status(403).json({ code: 'PASSWORD_NOT_CONFIGURED', error: 'Password not configured' });
+            else
+                res.status(503).json({ error: 'Password login unavailable' });
         }
     });
     router.use(express.json({ limit: '8kb' }));

package/dist/server/federation/relay.js

@@ -10,7 +10,8 @@ function parse(raw, limits) {
     const f = JSON.parse(raw.toString());
     if (f.type === 'register') {
         if (!Array.isArray(f.serviceIds) || f.serviceIds.length > 64 || !f.serviceIds.every(identifier)
-            || !Number.isFinite(f.ttlMs) || f.ttlMs <= 0)
+            || !Number.isFinite(f.ttlMs) || f.ttlMs <= 0
+            || (f.protectedServiceIds !== undefined && (!Array.isArray(f.protectedServiceIds) || f.protectedServiceIds.length > 64 || !f.protectedServiceIds.every(id => identifier(id) && f.serviceIds.includes(id)))))
             throw new Error('Invalid registration');
     }
     else if (!identifier(f.streamId) || !['open', 'opened', 'data', 'close'].includes(f.type)
@@ -112,7 +113,7 @@ export class RelayRouter {
     }
     providers(serviceId) {
         return [...(this.routes.get(serviceId) || [])]
-            .filter(([peer, route]) => route.expires > Date.now() && peer.ws.readyState === 1 && this.canRegister(peer, serviceId))
+            .filter(([peer, route]) => !route.error && route.expires > Date.now() && peer.ws.readyState === 1 && this.canRegister(peer, serviceId))
             // Recent target failures lower priority but never make the only route disappear.
             .sort((a, b) => Math.max(0, a[1].retryAfter - Date.now()) - Math.max(0, b[1].retryAfter - Date.now()))
             .map(([peer]) => peer);
@@ -124,6 +125,15 @@ export class RelayRouter {
     activeRouteIds() {
         return [...this.routes.keys()].filter(serviceId => this.hasRoute(serviceId));
     }
+    registeredRouteIds() {
+        return [...this.routes.keys()].filter(id => [...this.routes.get(id)].some(([peer, route]) => route.expires > Date.now() && peer.ws.readyState === 1 && this.canRegister(peer, id)));
+    }
+    routeError(serviceId) {
+        if (this.hasRoute(serviceId))
+            return;
+        const routes = [...(this.routes.get(serviceId) || [])].filter(([peer, route]) => route.expires > Date.now() && peer.ws.readyState === 1 && this.canRegister(peer, serviceId));
+        return routes.some(([, route]) => route.error === 'TARGET_PASSWORD_REQUIRED') ? 'TARGET_PASSWORD_REQUIRED' : routes.find(([, route]) => route.error)?.[1].error;
+    }
     /** Trusted local configuration only. Clients never supply a target URL or factory. */
     registerDirect(serviceId, connect) {
         if (this.stopped || !identifier(serviceId) || typeof connect !== 'function')
@@ -213,7 +223,8 @@ export class RelayRouter {
             send(s.provider.ws, { type: 'close', streamId: s.providerId, reason }, this.limits);
         }
         send(s.owner.ws, { type: 'close', streamId: s.ownerId, reason,
-            ...(!this.canRoute(s.owner, s.serviceId) ? { code: 'RELAY_AUTHORIZATION_REQUIRED' } : {}) }, this.limits);
+            ...(!this.canRoute(s.owner, s.serviceId) ? { code: 'RELAY_AUTHORIZATION_REQUIRED' }
+                : reason === 'TARGET_PASSWORD_REQUIRED' || reason === 'TARGET_SECURITY_UPGRADE_REQUIRED' ? { code: reason } : {}) }, this.limits);
     }
     providerFailed(s, reason) {
         if (s.owner.streams.get(s.ownerId) !== s)
@@ -273,7 +284,14 @@ export class RelayRouter {
                     routes = new Map();
                     this.routes.set(id, routes);
                 }
-                routes.set(peer, { expires: Date.now() + Math.min(f.ttlMs, this.limits.maxRouteTtlMs), retryAfter: routes.get(peer)?.retryAfter ?? 0 });
+                const error = this.options.requirePasswordProtectedTargets && !this.directPeers.has(peer)
+                    ? f.protectedServiceIds === undefined ? 'TARGET_SECURITY_UPGRADE_REQUIRED'
+                        : !f.protectedServiceIds.includes(id) ? 'TARGET_PASSWORD_REQUIRED' : undefined : undefined;
+                routes.set(peer, { expires: Date.now() + Math.min(f.ttlMs, this.limits.maxRouteTtlMs), retryAfter: routes.get(peer)?.retryAfter ?? 0, error });
+                if (error)
+                    for (const stream of [...peer.streams.values()])
+                        if (stream.provider === peer && stream.serviceId === id)
+                            this.closeStream(stream, error);
             }
             return;
         }
@@ -286,7 +304,7 @@ export class RelayRouter {
                 throw new Error('Duplicate stream');
             if (!this.canRoute(peer, f.serviceId) || !this.hasRoute(f.serviceId)) {
                 send(peer.ws, { type: 'close', streamId: f.streamId, reason: 'Route unavailable or denied',
-                    ...(!this.canRoute(peer, f.serviceId) ? { code: 'RELAY_AUTHORIZATION_REQUIRED' } : {}) }, this.limits);
+                    ...(!this.canRoute(peer, f.serviceId) ? { code: 'RELAY_AUTHORIZATION_REQUIRED' } : this.routeError(f.serviceId) ? { code: this.routeError(f.serviceId) } : {}) }, this.limits);
                 return;
             }
             if (peer.streams.size >= this.limits.maxStreams)
@@ -311,7 +329,7 @@ export class RelayRouter {
         }
         if (f.type === 'close') {
             if (peer === s.provider)
-                this.providerFailed(s, 'Channel closed');
+                this.providerFailed(s, f.code === 'TARGET_PASSWORD_REQUIRED' ? 'TARGET_PASSWORD_REQUIRED' : 'Channel closed');
             else
                 this.closeStream(s, 'Channel closed');
             return;
@@ -350,7 +368,8 @@ export class RelayClient {
         this.options = options;
         this.limits = { ...defaults, ...options };
         const ttl = Math.min(options.routeTtlMs ?? 60_000, this.limits.maxRouteTtlMs);
-        const register = () => send(upstream, { type: 'register', serviceIds: [...options.targets.keys()], ttlMs: ttl }, this.limits);
+        const register = () => send(upstream, { type: 'register', serviceIds: [...options.targets.keys()], ttlMs: ttl,
+            ...(options.isPasswordProtected ? { protectedServiceIds: [...options.targets.keys()].filter(id => options.isPasswordProtected(id)) } : {}) }, this.limits);
         register();
         this.renewal = setInterval(register, Math.max(1, Math.floor(ttl / 2)));
         this.renewal.unref?.();
@@ -365,7 +384,7 @@ export class RelayClient {
         const target = this.streams.get(id);
         this.streams.delete(id);
         target?.close();
-        send(this.upstream, { type: 'close', streamId: id, reason }, this.limits);
+        send(this.upstream, { type: 'close', streamId: id, reason, ...(reason === 'TARGET_PASSWORD_REQUIRED' ? { code: 'TARGET_PASSWORD_REQUIRED' } : {}) }, this.limits);
     }
     async receive(raw) {
         const f = parse(raw, this.limits);
@@ -373,6 +392,10 @@ export class RelayClient {
             throw new Error('Unexpected registration');
         if (f.type === 'open') {
             const connect = this.options.targets.get(f.serviceId);
+            if (this.options.isPasswordProtected && !this.options.isPasswordProtected(f.serviceId)) {
+                this.drop(f.streamId, 'TARGET_PASSWORD_REQUIRED');
+                return;
+            }
             if (this.streams.has(f.streamId))
                 throw new Error('Duplicate stream');
             if (!connect || this.streams.size >= this.limits.maxStreams) {
@@ -389,9 +412,9 @@ export class RelayClient {
             try {
                 target = await connect(controller.signal);
             }
-            catch {
+            catch (error) {
                 if (this.pending.get(f.streamId) === timer)
-                    this.drop(f.streamId, 'Target unavailable');
+                    this.drop(f.streamId, error instanceof Error && error.message === 'TARGET_PASSWORD_REQUIRED' ? 'TARGET_PASSWORD_REQUIRED' : 'Target unavailable');
                 return;
             }
             // A canceled attempt may complete after the same ID has been reused.

package/dist/server/federation/relaySecurity.js

@@ -0,0 +1,9 @@
+import { getPasswordVerifier } from '../utils/authProtection.js';
+/** A broken credential must never enable a relay, even if auth is enabled. */
+export function relayPasswordConfigured() {
+    return /^scrypt\$[0-9a-f]{32}\$[0-9a-f]{128}$/.test(getPasswordVerifier() ?? '');
+}
+export function requireRelayPassword() {
+    if (!relayPasswordConfigured())
+        throw new Error('TARGET_PASSWORD_REQUIRED');
+}

package/dist/server/federation/relayTransport.js

@@ -71,6 +71,8 @@ export class RelayTransport extends EventTarget {
                     }
                     if (frame.code === 'RELAY_SELF_TARGET')
                         this.transportFailure = new ConnectionAccessError('RELAY_SELF_TARGET', { ...context, targetServiceId });
+                    if (frame.code === 'TARGET_PASSWORD_REQUIRED' || frame.code === 'TARGET_SECURITY_UPGRADE_REQUIRED')
+                        this.transportFailure = new ConnectionAccessError(frame.code, { ...context, targetServiceId });
                     this.finish(1001, this.transportFailure?.message || 'Relay route closed');
                     this.upstream.close();
                     return;