termdock 1.4.117 → 1.4.119

package/dist/server/routes/terminal.js

@@ -26,6 +26,7 @@ import { AgentResumeHistoryStore } from '../agent/resumeHistory.js';
 import { AutomationStore, normalizeAutomationSchedule } from '../agent/automationStore.js';
 import { buildBracketedSubmitBytes, canDeliverPromptToAgent } from '../agent/promptDelivery.js';
 import { CollaborationStore } from '../agent/collaborationStore.js';
+import { formatCollaborationDelivery } from '../agent/collaborationPrompt.js';
 import { SessionSearchStore } from '../agent/sessionSearchStore.js';
 import { listAllHookAgents, refreshStaleHooksAtLaunch, installHooksForSlug, uninstallHooksForSlug, } from '../agent/installers.js';
 import { loadPlugins, savePlugin, removePlugin, readPluginIcon, validateManifest, } from '../agent/plugins.js';
@@ -1303,9 +1304,6 @@ async function runAgentAutomation(automation, req) {
         throw error;
     }
 }
-function collaborationMessageLabel(kind) {
-    return { message: '消息', ask: '问题', reply: '回复', task: '任务', handoff: '交接', done: '完成' }[kind];
-}
 function resolveFrontendSessionId(input) {
     const sessionId = typeof input.sessionId === 'string' ? input.sessionId.trim() : '';
     if (sessionId && globalSessionState.sessions.some((record) => record.sessionId === sessionId))
@@ -1319,17 +1317,6 @@ function resolveFrontendSessionId(input) {
     const tmuxSessionName = typeof input.tmuxSessionName === 'string' ? input.tmuxSessionName.trim() : '';
     return globalSessionState.sessions.find((record) => record.tmuxSessionName === tmuxSessionName)?.sessionId ?? null;
 }
-function formatCollaborationDelivery(targetSessionId, messages) {
-    const targetGroups = new Map(collaborationStore.groupsForSession(targetSessionId).map((group) => [group.id, group]));
-    const lines = messages.map((message) => {
-        const from = message.fromSessionId
-            ? globalSessionState.sessions.find((record) => record.sessionId === message.fromSessionId)?.name ?? message.fromSessionId
-            : '用户';
-        const group = targetGroups.get(message.groupId)?.name ?? '协作组';
-        return `- [${collaborationMessageLabel(message.kind)} #${message.id}] ${from} → ${group}: ${message.content}`;
-    });
-    return `[Termdock 协作收件箱]\n${lines.join('\n')}\n请处理这些消息。需要回复时运行：td collab reply <消息ID> "回复内容"；查看成员和未读消息运行：td collab status / td collab inbox。`;
-}
 function tryDeliverCollaborationInbox(frontendSessionId) {
     const record = globalSessionState.sessions.find((candidate) => candidate.sessionId === frontendSessionId);
     const session = record?.backendSessionId ? terminalSessions.get(record.backendSessionId) : null;
@@ -1339,10 +1326,60 @@ function tryDeliverCollaborationInbox(frontendSessionId) {
     if (!session || !canDeliverPromptToAgent(session) || pending.length === 0) {
         return { delivered: [], pending: pending.length };
     }
-    session.ptyProcess.write(buildBracketedSubmitBytes(formatCollaborationDelivery(frontendSessionId, pending)));
+    const prompt = formatCollaborationDelivery({
+        targetSessionId: frontendSessionId,
+        messages: pending,
+        groups: collaborationStore.groupsForSession(frontendSessionId),
+        sessions: globalSessionState.sessions.map((candidate) => {
+            const snapshot = orchestrationSessionSnapshot(candidate);
+            return { sessionId: snapshot.sessionId, name: snapshot.name, status: snapshot.status };
+        }),
+    });
+    session.ptyProcess.write(buildBracketedSubmitBytes(prompt));
     collaborationStore.markDelivered(pending.map((message) => message.id));
     return { delivered: pending.map((message) => message.id), pending: 0 };
 }
+async function spawnCollaborationAgentSession(req, group, sourceSessionId, input) {
+    const agentSlug = typeof input.agentSlug === 'string' ? input.agentSlug.trim().toLowerCase() : '';
+    const launchers = await listDetectedAgentLaunchers();
+    const launcher = launchers.find((candidate) => candidate.slug === agentSlug);
+    if (!launcher)
+        throw new HttpStatusError(400, '所选 Agent 当前不可用', 'COLLAB_AGENT_UNAVAILABLE');
+    const sourceRecord = sourceSessionId
+        ? globalSessionState.sessions.find((candidate) => candidate.sessionId === sourceSessionId)
+        : null;
+    const fallbackRecord = sourceRecord
+        ?? globalSessionState.sessions.find((candidate) => group.sessionIds.includes(candidate.sessionId))
+        ?? null;
+    const requestedName = typeof input.name === 'string' ? input.name.trim().slice(0, 120) : '';
+    const requestedCwd = typeof input.cwd === 'string' ? input.cwd.trim() : '';
+    const opened = await openInventorySession(req, {
+        name: requestedName || `${launcher.displayName} · ${group.name}`,
+        customName: true,
+        mode: 'shell',
+        cwd: requestedCwd || fallbackRecord?.cwd || undefined,
+    });
+    const frontendSessionId = opened.session.sessionId;
+    const backend = terminalSessions.get(opened.terminalSession.sessionId);
+    if (!backend)
+        throw new HttpStatusError(500, 'Agent Session 创建失败', 'COLLAB_AGENT_SESSION_FAILED');
+    const updatedGroup = collaborationStore.save({
+        id: group.id,
+        name: group.name,
+        sessionIds: [...group.sessionIds, frontendSessionId],
+    });
+    writeTerminalInput(backend, `${launcher.command}\r`);
+    const requestedTask = typeof input.task === 'string' ? input.task.trim().slice(0, 20_000) : '';
+    collaborationStore.send({
+        groupId: updatedGroup.id,
+        fromSessionId: sourceSessionId,
+        toSessionIds: [frontendSessionId],
+        kind: 'handoff',
+        content: requestedTask || `你已创建并加入协作组“${updatedGroup.name}”。请运行 td collab status 查看成员，并准备参与协作。`,
+    });
+    setTimeout(() => tryDeliverCollaborationInbox(frontendSessionId), 300).unref?.();
+    return { group: updatedGroup, session: orchestrationSessionSnapshot(globalSessionState.sessions.find((candidate) => candidate.sessionId === frontendSessionId)) };
+}
 function getTmuxBinary() {
     if (process.env.TMUX_BIN)
         return process.env.TMUX_BIN;
@@ -5108,6 +5145,19 @@ router.post('/operations/collaboration-groups', (req, res) => {
     });
     res.json({ group });
 });
+router.post('/operations/collaboration-groups/:groupId/spawn', async (req, res) => {
+    const group = collaborationStore.getGroup(req.params.groupId);
+    if (!group)
+        return res.status(404).json({ error: '协作组不存在' });
+    try {
+        res.json(await spawnCollaborationAgentSession(req, group, null, req.body ?? {}));
+    }
+    catch (error) {
+        if (error instanceof HttpStatusError)
+            return res.status(error.statusCode).json({ error: error.message, code: error.code });
+        res.status(400).json({ error: getErrorMessage(error) });
+    }
+});
 router.delete('/operations/collaboration-groups/:groupId', (req, res) => {
     if (!collaborationStore.remove(req.params.groupId))
         return res.status(404).json({ error: '协作组不存在' });
@@ -5152,14 +5202,60 @@ router.post('/operations/collaboration-groups/:groupId/messages', (req, res) =>
         res.status(400).json({ error: getErrorMessage(error) });
     }
 });
-router.get('/operations/orchestration/peers', (req, res) => {
+router.get('/operations/orchestration/peers', async (req, res) => {
     const sourceSessionId = resolveFrontendSessionId(req.query);
     const source = globalSessionState.sessions.find((candidate) => candidate.sessionId === sourceSessionId);
     if (!source)
         return res.status(404).json({ error: '会话不存在' });
     const groups = collaborationStore.groupsForSession(source.sessionId);
     const peerIds = new Set(groups.flatMap((group) => group.sessionIds).filter((id) => id !== source.sessionId));
-    res.json({ source: orchestrationSessionSnapshot(source), groups, peers: globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot) });
+    res.json({
+        source: orchestrationSessionSnapshot(source),
+        groups,
+        peers: globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot),
+        sessions: globalSessionState.sessions.map(orchestrationSessionSnapshot),
+        agents: await listDetectedAgentLaunchers(),
+    });
+});
+router.post('/operations/orchestration/members', (req, res) => {
+    const sourceSessionId = resolveFrontendSessionId(req.body ?? {});
+    const groupId = typeof req.body?.groupId === 'string' ? req.body.groupId.trim() : '';
+    const targetSessionId = typeof req.body?.targetSessionId === 'string' ? req.body.targetSessionId.trim() : '';
+    const action = req.body?.action === 'remove' ? 'remove' : req.body?.action === 'add' ? 'add' : null;
+    const group = collaborationStore.getGroup(groupId);
+    if (!sourceSessionId)
+        return res.status(400).json({ error: '无法识别当前会话；请从 Termdock 会话内运行 td collab' });
+    if (!group || !group.sessionIds.includes(sourceSessionId))
+        return res.status(403).json({ error: '当前会话不在该协作组中' });
+    if (!action)
+        return res.status(400).json({ error: '成员操作无效' });
+    if (!globalSessionState.sessions.some((candidate) => candidate.sessionId === targetSessionId)) {
+        return res.status(404).json({ error: '目标会话不存在' });
+    }
+    const nextSessionIds = action === 'add'
+        ? Array.from(new Set([...group.sessionIds, targetSessionId]))
+        : group.sessionIds.filter((sessionId) => sessionId !== targetSessionId);
+    if (nextSessionIds.length < 2)
+        return res.status(400).json({ error: '协作组至少需要两个会话' });
+    const updated = collaborationStore.save({ id: group.id, name: group.name, sessionIds: nextSessionIds });
+    res.json({ ok: true, group: updated });
+});
+router.post('/operations/orchestration/spawn', async (req, res) => {
+    const sourceSessionId = resolveFrontendSessionId(req.body ?? {});
+    const groupId = typeof req.body?.groupId === 'string' ? req.body.groupId.trim() : '';
+    const group = collaborationStore.getGroup(groupId);
+    if (!sourceSessionId)
+        return res.status(400).json({ error: '无法识别当前会话；请从 Termdock 会话内运行 td collab' });
+    if (!group || !group.sessionIds.includes(sourceSessionId))
+        return res.status(403).json({ error: '当前会话不在该协作组中' });
+    try {
+        res.json({ ok: true, ...await spawnCollaborationAgentSession(req, group, sourceSessionId, req.body ?? {}) });
+    }
+    catch (error) {
+        if (error instanceof HttpStatusError)
+            return res.status(error.statusCode).json({ error: error.message, code: error.code });
+        res.status(400).json({ error: getErrorMessage(error) });
+    }
 });
 router.post('/operations/orchestration/send', (req, res) => {
     const sourceSessionId = resolveFrontendSessionId(req.body ?? {});
@@ -5626,7 +5722,7 @@ router.put('/context-draft', (req, res) => {
 router.get('/agent-hooks', async (_req, res) => {
     res.json({ agents: await listAllHookAgents() });
 });
-router.get('/agent-launchers', async (_req, res) => {
+async function listDetectedAgentLaunchers() {
     const pathEntries = buildAugmentedPath().split(path.delimiter).filter(Boolean);
     const executableExtensions = process.platform === 'win32'
         ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';')
@@ -5665,7 +5761,10 @@ router.get('/agent-launchers', async (_req, res) => {
             });
         }
     }
-    res.json({ agents: detected });
+    return detected;
+}
+router.get('/agent-launchers', async (_req, res) => {
+    res.json({ agents: await listDetectedAgentLaunchers() });
 });
 router.get('/directory-suggestions', async (req, res) => {
     const rawQuery = typeof req.query.q === 'string' ? req.query.q.trim() : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.117",
+  "version": "1.4.119",
   "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.117",
+  "version": "1.4.119",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-3I9X7zF4J4BUYOvxi3lIuWSKfDy6S6GD61w8Ay95Ypw=",
-  "serverBundleHash": "sha256-fIJAGb5/As0/Hnw2oLYaErYncFbAjzJ9FbKR07ntTds=",
+  "serverBundleHash": "sha256-4DiQ+SQaI4CdpeOrKGu2FVgmff+N4IrL14Dwx+uhwXA=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/dist/client/assets/channel-Dh-rQuvK.js

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

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

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CgCvJDfW.js";import{b as i}from"./mermaid.core-CA8slCHp.js";import"./chunk-5VM5RSS4-CqVqdapS.js";import"./chunk-XXDRQBXY-C64rSk_7.js";import"./chunk-VR4S4FIN-BfPxfJ9d.js";import"./chunk-32BRIVSS-BNUkaz_y.js";import"./purify.es-CC4Brkr_.js";import"./index-CpRY32uJ.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-EOCWNBFH-aSOSNXz9.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-CgCvJDfW.js";import{b as i}from"./mermaid.core-CA8slCHp.js";import"./chunk-5VM5RSS4-CqVqdapS.js";import"./chunk-XXDRQBXY-C64rSk_7.js";import"./chunk-VR4S4FIN-BfPxfJ9d.js";import"./chunk-32BRIVSS-BNUkaz_y.js";import"./purify.es-CC4Brkr_.js";import"./index-CpRY32uJ.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};