chatccc 0.2.252 → 0.2.254
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -1
- package/bin/cccagent.mjs +12 -3
- package/bin/chatccc.mjs +15 -6
- package/config.sample.json +2 -1
- package/deepccc-agent/README.md +40 -35
- package/deepccc-agent/os-prompts/darwin.md +8 -8
- package/deepccc-agent/os-prompts/linux.md +8 -8
- package/deepccc-agent/os-prompts/win32.md +11 -11
- package/deepccc-agent/package.json +65 -65
- package/dist/deepccc-agent/src/cli.js +634 -0
- package/dist/deepccc-agent/src/config.js +81 -0
- package/dist/deepccc-agent/src/context.js +348 -0
- package/dist/deepccc-agent/src/file-log.js +34 -0
- package/dist/deepccc-agent/src/file-tools.js +1208 -0
- package/dist/deepccc-agent/src/index.js +601 -0
- package/dist/deepccc-agent/src/permissions.js +170 -0
- package/dist/deepccc-agent/src/privacy.js +124 -0
- package/dist/deepccc-agent/src/proc-tree-kill.js +60 -0
- package/dist/deepccc-agent/src/progress/cards-helpers.js +70 -0
- package/dist/deepccc-agent/src/progress/reducer.js +102 -0
- package/dist/deepccc-agent/src/progress/terminal-renderer.js +264 -0
- package/dist/deepccc-agent/src/progress/view.js +30 -0
- package/dist/deepccc-agent/src/raw-stream-log.js +106 -0
- package/dist/deepccc-agent/src/session-search.js +276 -0
- package/dist/deepccc-agent/src/session-select.js +23 -0
- package/dist/deepccc-agent/src/sigint.js +26 -0
- package/dist/deepccc-agent/src/skills.js +178 -0
- package/dist/deepccc-agent/src/web-tools.js +246 -0
- package/dist/src/adapters/adapter-interface.js +19 -0
- package/dist/src/adapters/ccc-adapter.js +112 -0
- package/dist/src/adapters/claude-adapter.js +497 -0
- package/dist/src/adapters/claude-session-meta-store.js +92 -0
- package/dist/src/adapters/codex-adapter.js +279 -0
- package/dist/src/adapters/codex-session-meta-store.js +94 -0
- package/dist/src/adapters/cursor-adapter.js +491 -0
- package/dist/src/adapters/cursor-session-meta-store.js +116 -0
- package/dist/src/adapters/jsonl-stream.js +104 -0
- package/{src/adapters/proc-tree-kill.ts → dist/src/adapters/proc-tree-kill.js} +94 -97
- package/dist/src/adapters/raw-stream-log.js +106 -0
- package/dist/src/adapters/resource-monitor.js +113 -0
- package/dist/src/agent-activity.js +133 -0
- package/dist/src/agent-delegate-task-rpc.js +129 -0
- package/dist/src/agent-delegate-task.js +48 -0
- package/dist/src/agent-file-rpc.js +152 -0
- package/dist/src/agent-image-rpc.js +148 -0
- package/dist/src/agent-platform-routing.js +13 -0
- package/dist/src/agent-reload-config-rpc.js +23 -0
- package/dist/src/agent-rpc-body.js +87 -0
- package/dist/src/agent-stop-stuck.js +110 -0
- package/dist/src/agent-team/application/board-service.js +142 -0
- package/dist/src/agent-team/application/main-agent-service.js +151 -0
- package/dist/src/agent-team/domain/board.js +69 -0
- package/dist/src/agent-team/http/board-routes.js +213 -0
- package/dist/src/agent-team/infrastructure/filesystem-browser.js +112 -0
- package/dist/src/agent-team/infrastructure/main-agent-session-runtime.js +30 -0
- package/dist/src/agent-team/main-agent-bootstrap.js +15 -0
- package/dist/src/agent-team/repositories/board-repository.js +10 -0
- package/dist/src/agent-team/repositories/feishu-p2p-contact-store.js +64 -0
- package/dist/src/agent-team/repositories/json-board-repository.js +209 -0
- package/dist/src/agent-team/repositories/main-agent-binding-repository.js +84 -0
- package/dist/src/agent-team/sync/board-sync-adapter.js +1 -0
- package/dist/src/agent-team/web/agent-team-page.js +219 -0
- package/dist/src/agent-tool.js +10 -0
- package/dist/src/card-action-routing.js +7 -0
- package/dist/src/card-plain-text.js +101 -0
- package/dist/src/cardkit.js +158 -0
- package/dist/src/cards.js +573 -0
- package/dist/src/chatgpt-subscription-rpc.js +18 -0
- package/dist/src/chatgpt-subscription.js +199 -0
- package/dist/src/chrome-devtools-guard.js +238 -0
- package/dist/src/claude-sdk-installer.js +249 -0
- package/dist/src/codex-reset-actions.js +143 -0
- package/dist/src/config-utils.js +149 -0
- package/dist/src/config.js +808 -0
- package/dist/src/cursor-usage.js +77 -0
- package/dist/src/exit-banner.js +28 -0
- package/dist/src/feishu-api.js +1404 -0
- package/dist/src/feishu-message-ingress.js +137 -0
- package/dist/src/feishu-platform.js +97 -0
- package/dist/src/format-message.js +252 -0
- package/dist/src/git-command.js +155 -0
- package/dist/src/im-skills.js +121 -0
- package/dist/src/index.js +835 -0
- package/dist/src/litellm-proxy.js +300 -0
- package/dist/src/orchestrator.js +2096 -0
- package/dist/src/package-root.js +26 -0
- package/dist/src/platform-adapter.js +7 -0
- package/dist/src/platform-startup.js +6 -0
- package/dist/src/privacy.js +100 -0
- package/dist/src/progress/reducer.js +102 -0
- package/dist/src/progress/terminal-renderer.js +264 -0
- package/dist/src/progress/view.js +30 -0
- package/dist/src/response-stall.js +14 -0
- package/dist/src/runtime-entry.js +13 -0
- package/dist/src/runtime-reload.js +19 -0
- package/dist/src/session-chat-binding.js +183 -0
- package/dist/src/session-name.js +7 -0
- package/dist/src/session.js +2147 -0
- package/dist/src/shared-prefix.js +16 -0
- package/dist/src/shared.js +493 -0
- package/dist/src/sim-agent.js +105 -0
- package/dist/src/sim-platform.js +142 -0
- package/dist/src/sim-store.js +231 -0
- package/dist/src/simplify.js +99 -0
- package/dist/src/startup-lifecycle.js +209 -0
- package/dist/src/stream-state.js +141 -0
- package/dist/src/terminal-error.js +100 -0
- package/dist/src/trace.js +50 -0
- package/dist/src/turn-cards.js +92 -0
- package/dist/src/update-command-guard.js +114 -0
- package/{src/web-ui.ts → dist/src/web-ui.js} +753 -839
- package/dist/src/wechat-platform.js +545 -0
- package/package.json +76 -74
- package/deepccc-agent/LICENSE +0 -201
- package/deepccc-agent/bin/deepccc.mjs +0 -26
- package/deepccc-agent/docs/cache-hit-rate-1.jpg +0 -0
- package/deepccc-agent/docs/cache-hit-rate-2.jpg +0 -0
- package/deepccc-agent/package-lock.json +0 -2027
- package/deepccc-agent/src/__tests__/chat-session.test.ts +0 -877
- package/deepccc-agent/src/__tests__/cli-json.test.ts +0 -49
- package/deepccc-agent/src/__tests__/config.test.ts +0 -34
- package/deepccc-agent/src/__tests__/context.test.ts +0 -341
- package/deepccc-agent/src/__tests__/file-tools.test.ts +0 -240
- package/deepccc-agent/src/__tests__/permissions.test.ts +0 -199
- package/deepccc-agent/src/__tests__/privacy.test.ts +0 -318
- package/deepccc-agent/src/__tests__/progress-reducer.test.ts +0 -121
- package/deepccc-agent/src/__tests__/session-search.test.ts +0 -262
- package/deepccc-agent/src/__tests__/session-select.test.ts +0 -116
- package/deepccc-agent/src/__tests__/sigint.test.ts +0 -56
- package/deepccc-agent/src/__tests__/skills.test.ts +0 -284
- package/deepccc-agent/src/__tests__/terminal-renderer.test.ts +0 -247
- package/deepccc-agent/src/__tests__/web-tools.test.ts +0 -220
- package/deepccc-agent/src/cli.ts +0 -682
- package/deepccc-agent/src/config.ts +0 -101
- package/deepccc-agent/src/context.ts +0 -465
- package/deepccc-agent/src/file-log.ts +0 -38
- package/deepccc-agent/src/file-tools.ts +0 -1493
- package/deepccc-agent/src/index.ts +0 -710
- package/deepccc-agent/src/permissions.ts +0 -226
- package/deepccc-agent/src/privacy.ts +0 -141
- package/deepccc-agent/src/proc-tree-kill.ts +0 -61
- package/deepccc-agent/src/progress/cards-helpers.ts +0 -76
- package/deepccc-agent/src/progress/reducer.ts +0 -113
- package/deepccc-agent/src/progress/terminal-renderer.ts +0 -294
- package/deepccc-agent/src/progress/view.ts +0 -77
- package/deepccc-agent/src/raw-stream-log.ts +0 -124
- package/deepccc-agent/src/session-search.ts +0 -370
- package/deepccc-agent/src/session-select.ts +0 -48
- package/deepccc-agent/src/sigint.ts +0 -50
- package/deepccc-agent/src/skills.ts +0 -205
- package/deepccc-agent/src/web-tools.ts +0 -313
- package/deepccc-agent/tsconfig.build.json +0 -13
- package/deepccc-agent/tsconfig.json +0 -13
- package/deepccc-agent/vitest.config.ts +0 -7
- package/src/__tests__/adapter-interface.test.ts +0 -152
- package/src/__tests__/agent-activity.test.ts +0 -86
- package/src/__tests__/agent-delegate-task-rpc.test.ts +0 -165
- package/src/__tests__/agent-image-rpc.test.ts +0 -34
- package/src/__tests__/agent-platform-routing.test.ts +0 -26
- package/src/__tests__/agent-reload-config-rpc.test.ts +0 -99
- package/src/__tests__/agent-rpc-body.test.ts +0 -42
- package/src/__tests__/builtin-chat-session.test.ts +0 -532
- package/src/__tests__/builtin-cli-json.test.ts +0 -39
- package/src/__tests__/builtin-config.test.ts +0 -26
- package/src/__tests__/builtin-context.test.ts +0 -319
- package/src/__tests__/builtin-file-tools.test.ts +0 -240
- package/src/__tests__/builtin-permissions.test.ts +0 -219
- package/src/__tests__/builtin-session-search.test.ts +0 -262
- package/src/__tests__/builtin-session-select.test.ts +0 -116
- package/src/__tests__/builtin-sigint.test.ts +0 -56
- package/src/__tests__/builtin-skills.test.ts +0 -284
- package/src/__tests__/builtin-web-tools.test.ts +0 -220
- package/src/__tests__/card-action-routing.test.ts +0 -18
- package/src/__tests__/card-plain-text.test.ts +0 -45
- package/src/__tests__/cardkit.test.ts +0 -60
- package/src/__tests__/cards.test.ts +0 -607
- package/src/__tests__/ccc-adapter.test.ts +0 -194
- package/src/__tests__/chatgpt-subscription-rpc.test.ts +0 -89
- package/src/__tests__/chatgpt-subscription.test.ts +0 -135
- package/src/__tests__/chrome-devtools-guard.test.ts +0 -165
- package/src/__tests__/claude-adapter.test.ts +0 -614
- package/src/__tests__/claude-raw-stream-log.test.ts +0 -96
- package/src/__tests__/claude-sdk-installer.test.ts +0 -285
- package/src/__tests__/codex-adapter.test.ts +0 -331
- package/src/__tests__/codex-raw-stream-log.test.ts +0 -170
- package/src/__tests__/codex-reset-actions.test.ts +0 -146
- package/src/__tests__/config-reload.test.ts +0 -284
- package/src/__tests__/config-sample.test.ts +0 -97
- package/src/__tests__/config-utils.test.ts +0 -40
- package/src/__tests__/config.test.ts +0 -395
- package/src/__tests__/crash-logging.test.ts +0 -360
- package/src/__tests__/cursor-adapter.test.ts +0 -890
- package/src/__tests__/cursor-session-meta-store.test.ts +0 -212
- package/src/__tests__/feishu-api.test.ts +0 -60
- package/src/__tests__/feishu-avatar.test.ts +0 -504
- package/src/__tests__/feishu-message-ingress.test.ts +0 -138
- package/src/__tests__/feishu-platform.test.ts +0 -75
- package/src/__tests__/fixtures/codex_simple_text.jsonl +0 -4
- package/src/__tests__/fixtures/codex_with_tool.jsonl +0 -6
- package/src/__tests__/fixtures/cursor_partial_only.jsonl +0 -5
- package/src/__tests__/fixtures/cursor_partial_with_final.jsonl +0 -13
- package/src/__tests__/fixtures/cursor_with_tool_call.jsonl +0 -12
- package/src/__tests__/format-message.test.ts +0 -316
- package/src/__tests__/git-command.test.ts +0 -288
- package/src/__tests__/im-skills.test.ts +0 -125
- package/src/__tests__/jsonl-stream.test.ts +0 -79
- package/src/__tests__/orchestrator.test.ts +0 -1268
- package/src/__tests__/package-files.test.ts +0 -24
- package/src/__tests__/platform-startup.test.ts +0 -19
- package/src/__tests__/privacy.test.ts +0 -198
- package/src/__tests__/proc-tree-kill.test.ts +0 -108
- package/src/__tests__/progress-reducer.test.ts +0 -121
- package/src/__tests__/raw-stream-log.test.ts +0 -106
- package/src/__tests__/response-stall.test.ts +0 -49
- package/src/__tests__/restart.test.ts +0 -232
- package/src/__tests__/session-ccc-config.test.ts +0 -66
- package/src/__tests__/session.test.ts +0 -3004
- package/src/__tests__/shared-prefix.test.ts +0 -36
- package/src/__tests__/sim-agent.test.ts +0 -174
- package/src/__tests__/sim-platform.test.ts +0 -93
- package/src/__tests__/sim-store.test.ts +0 -214
- package/src/__tests__/simplify.test.ts +0 -283
- package/src/__tests__/startup-lifecycle.test.ts +0 -231
- package/src/__tests__/stop-session.test.ts +0 -162
- package/src/__tests__/stream-state.test.ts +0 -164
- package/src/__tests__/terminal-error.test.ts +0 -54
- package/src/__tests__/terminal-renderer.test.ts +0 -247
- package/src/__tests__/update-command-guard.test.ts +0 -144
- package/src/__tests__/web-ui.test.ts +0 -438
- package/src/__tests__/wechat-platform.test.ts +0 -111
- package/src/adapters/adapter-interface.ts +0 -217
- package/src/adapters/ccc-adapter.ts +0 -150
- package/src/adapters/claude-adapter.ts +0 -673
- package/src/adapters/claude-session-meta-store.ts +0 -120
- package/src/adapters/codex-adapter.ts +0 -426
- package/src/adapters/codex-session-meta-store.ts +0 -131
- package/src/adapters/cursor-adapter.ts +0 -681
- package/src/adapters/cursor-session-meta-store.ts +0 -154
- package/src/adapters/jsonl-stream.ts +0 -157
- package/src/adapters/raw-stream-log.ts +0 -124
- package/src/adapters/resource-monitor.ts +0 -141
- package/src/agent-activity.ts +0 -175
- package/src/agent-delegate-task-rpc.ts +0 -153
- package/src/agent-delegate-task.ts +0 -91
- package/src/agent-file-rpc.ts +0 -172
- package/src/agent-image-rpc.ts +0 -168
- package/src/agent-platform-routing.ts +0 -28
- package/src/agent-reload-config-rpc.ts +0 -34
- package/src/agent-rpc-body.ts +0 -92
- package/src/agent-stop-stuck.ts +0 -129
- package/src/card-action-routing.ts +0 -14
- package/src/card-plain-text.ts +0 -108
- package/src/cardkit.ts +0 -179
- package/src/cards.ts +0 -684
- package/src/chatgpt-subscription-rpc.ts +0 -27
- package/src/chatgpt-subscription.ts +0 -299
- package/src/chrome-devtools-guard.ts +0 -318
- package/src/claude-sdk-installer.ts +0 -324
- package/src/codex-reset-actions.ts +0 -184
- package/src/config-utils.ts +0 -211
- package/src/config.ts +0 -1063
- package/src/cursor-usage.ts +0 -128
- package/src/exit-banner.ts +0 -33
- package/src/feishu-api.ts +0 -1616
- package/src/feishu-message-ingress.ts +0 -195
- package/src/feishu-platform.ts +0 -159
- package/src/format-message.ts +0 -293
- package/src/git-command.ts +0 -202
- package/src/im-skills.ts +0 -149
- package/src/index.ts +0 -1089
- package/src/litellm-proxy.ts +0 -374
- package/src/orchestrator.ts +0 -2543
- package/src/platform-adapter.ts +0 -70
- package/src/platform-startup.ts +0 -16
- package/src/privacy.ts +0 -118
- package/src/progress/reducer.ts +0 -113
- package/src/progress/terminal-renderer.ts +0 -294
- package/src/progress/view.ts +0 -77
- package/src/response-stall.ts +0 -28
- package/src/runtime-reload.ts +0 -34
- package/src/session-chat-binding.ts +0 -292
- package/src/session-name.ts +0 -8
- package/src/session.ts +0 -2659
- package/src/shared-prefix.ts +0 -29
- package/src/shared.ts +0 -552
- package/src/sim-agent.ts +0 -167
- package/src/sim-platform.ts +0 -177
- package/src/sim-store.ts +0 -317
- package/src/simplify.ts +0 -120
- package/src/startup-lifecycle.ts +0 -250
- package/src/stream-state.ts +0 -177
- package/src/terminal-error.ts +0 -129
- package/src/trace.ts +0 -51
- package/src/turn-cards.ts +0 -118
- package/src/update-command-guard.ts +0 -165
- package/src/wechat-platform.ts +0 -680
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { readUtf8JsonBody } from "./agent-rpc-body.js";
|
|
2
|
+
import { activePrompts, getChatsForSession } from "./session-chat-binding.js";
|
|
3
|
+
import { getPlatformForChat } from "./session.js";
|
|
4
|
+
import { readStreamState, writeStreamState } from "./stream-state.js";
|
|
5
|
+
import { ts } from "./config.js";
|
|
6
|
+
export const AGENT_STOP_STUCK_PATH = "/api/agent/stop-stuck-loop";
|
|
7
|
+
const MAX_REQUEST_BYTES = 8 * 1024;
|
|
8
|
+
function jsonReply(res, status, data) {
|
|
9
|
+
res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
|
|
10
|
+
res.end(JSON.stringify(data));
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* 从原始 body 字节中用正则尽力提取 session_id。
|
|
14
|
+
* 兼容 JSON 编码异常(如 GBK 中文导致 JSON.parse 失败)的场景。
|
|
15
|
+
*/
|
|
16
|
+
function extractSessionIdFromRaw(buf) {
|
|
17
|
+
// 匹配 "session_id":"<uuid>" 或 "session_id": "<uuid>"
|
|
18
|
+
const match = buf.toString("latin1").match(/"session_id"\s*:\s*"([^"]+)"/);
|
|
19
|
+
return match?.[1] ?? null;
|
|
20
|
+
}
|
|
21
|
+
export async function handleAgentStopStuckRequest(req, res) {
|
|
22
|
+
const url = new URL(req.url ?? "/", "http://127.0.0.1");
|
|
23
|
+
if (url.pathname !== AGENT_STOP_STUCK_PATH)
|
|
24
|
+
return false;
|
|
25
|
+
if (req.method !== "POST") {
|
|
26
|
+
jsonReply(res, 405, { error: "Method not allowed, use POST" });
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
let body;
|
|
30
|
+
let rawBody = null;
|
|
31
|
+
try {
|
|
32
|
+
body = await readUtf8JsonBody(req, MAX_REQUEST_BYTES);
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
// JSON 解析失败时仍尝试从原始字节中提取 session_id 并强行停止
|
|
36
|
+
// 宁可输出乱码,也不能让 agent 持续循环
|
|
37
|
+
rawBody = err.rawBody ?? null;
|
|
38
|
+
if (!rawBody) {
|
|
39
|
+
jsonReply(res, 400, { error: `Invalid request body: ${err.message}` });
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
const fallbackId = extractSessionIdFromRaw(rawBody);
|
|
43
|
+
if (!fallbackId) {
|
|
44
|
+
jsonReply(res, 400, { error: `Invalid request body: ${err.message}` });
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
body = { session_id: fallbackId };
|
|
48
|
+
}
|
|
49
|
+
const sessionId = typeof body?.session_id === "string" ? body.session_id.trim() : "";
|
|
50
|
+
if (!sessionId) {
|
|
51
|
+
jsonReply(res, 400, { error: "session_id is required" });
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
const prompt = activePrompts.get(sessionId);
|
|
55
|
+
if (!prompt) {
|
|
56
|
+
jsonReply(res, 404, { error: "Session not found or not running" });
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
// 先发"卡住"提示消息给所有绑定的群聊
|
|
60
|
+
const chats = getChatsForSession(sessionId);
|
|
61
|
+
for (const chatId of chats) {
|
|
62
|
+
const platform = getPlatformForChat(chatId);
|
|
63
|
+
if (platform) {
|
|
64
|
+
await platform.sendText(chatId, "⚠️ Agent 检测到自己陷入了循环,正在结束生成…").catch(() => { });
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
// 不丢弃缓存队列中的消息,让 runAgentSession 的 finally 块正常消费,
|
|
68
|
+
// 确保 stop-stuck-loop 结束后排队的消息仍能被正常处理。
|
|
69
|
+
const finalReply = typeof body?.final_reply === "string" ? body.final_reply.trim() : "";
|
|
70
|
+
// fire-and-forget:立即把 stream-state 标为 done(而非 stopped),
|
|
71
|
+
// 让 display loop 以"正常完成"而非"已停止"来渲染卡片和最终回复。
|
|
72
|
+
// 不设 prompt.stopped = true,这样 runAgentSession 的 finally 也会写 "done"。
|
|
73
|
+
void (async () => {
|
|
74
|
+
try {
|
|
75
|
+
const current = await readStreamState(sessionId);
|
|
76
|
+
if (!current)
|
|
77
|
+
return;
|
|
78
|
+
if (current.status !== "running")
|
|
79
|
+
return;
|
|
80
|
+
await writeStreamState({
|
|
81
|
+
...current,
|
|
82
|
+
status: "done",
|
|
83
|
+
stuckAt: Date.now(),
|
|
84
|
+
finalReply: finalReply ? current.finalReply + "\n\n" + finalReply : current.finalReply,
|
|
85
|
+
updatedAt: Date.now(),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
catch (err) {
|
|
89
|
+
console.warn(`[${ts()}] [STUCK-LOOP] writeStreamState(done) failed for ${sessionId}: ${err.message}`);
|
|
90
|
+
}
|
|
91
|
+
})();
|
|
92
|
+
// 先关闭底层 SDK session,终止 CLI 子进程,然后再 abort 清理 adapter 层
|
|
93
|
+
prompt.closeSession?.();
|
|
94
|
+
// 强制杀死 CLI 子进程。controller.abort() 只在 for-await 收到下一条
|
|
95
|
+
// stream 消息时才被检测到——如果 agent 陷入无输出的计算循环,abort 信号
|
|
96
|
+
// 永远不会生效;SDK 的 session.close() 也不保证立即终止子进程。
|
|
97
|
+
if (prompt.processPid !== undefined) {
|
|
98
|
+
try {
|
|
99
|
+
process.kill(prompt.processPid);
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
// 进程可能已退出,忽略错误
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
// 不设 stopped 标记 → finally block 写 "done" → 卡片正常结束
|
|
106
|
+
prompt.controller.abort();
|
|
107
|
+
console.log(`[${ts()}] [STUCK-LOOP] Session ${sessionId} aborted as done (agent detected stuck loop, final_reply=${finalReply ? "yes" : "no"})`);
|
|
108
|
+
jsonReply(res, 200, { ok: true });
|
|
109
|
+
return true;
|
|
110
|
+
}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { isAgentTool } from "../../agent-tool.js";
|
|
3
|
+
import { isBoardColumnId } from "../domain/board.js";
|
|
4
|
+
import { BoardStoreError } from "../repositories/board-repository.js";
|
|
5
|
+
export class BoardService {
|
|
6
|
+
repository;
|
|
7
|
+
now;
|
|
8
|
+
idFactory;
|
|
9
|
+
constructor(repository, options = {}) {
|
|
10
|
+
this.repository = repository;
|
|
11
|
+
this.now = options.now ?? (() => new Date());
|
|
12
|
+
this.idFactory = options.idFactory ?? randomUUID;
|
|
13
|
+
}
|
|
14
|
+
openWorkspace(workspacePath) {
|
|
15
|
+
return this.repository.openWorkspace(workspacePath);
|
|
16
|
+
}
|
|
17
|
+
findWorkspace(workspacePath) {
|
|
18
|
+
return this.repository.findWorkspace(workspacePath);
|
|
19
|
+
}
|
|
20
|
+
getBoard(boardId) {
|
|
21
|
+
return this.repository.getBoard(boardId);
|
|
22
|
+
}
|
|
23
|
+
listWorkspaces() {
|
|
24
|
+
return this.repository.listWorkspaces();
|
|
25
|
+
}
|
|
26
|
+
relinkWorkspace(boardId, workspacePath, expectedRevision) {
|
|
27
|
+
assertRevision(expectedRevision);
|
|
28
|
+
return this.repository.relinkWorkspace(boardId, workspacePath, expectedRevision);
|
|
29
|
+
}
|
|
30
|
+
setPrimaryAgent(boardId, agentId, expectedRevision) {
|
|
31
|
+
if (!isAgentTool(agentId)) {
|
|
32
|
+
throw new BoardStoreError("invalid_request", `Unsupported primary Agent: ${String(agentId)}`, 400);
|
|
33
|
+
}
|
|
34
|
+
return this.mutate(boardId, expectedRevision, (board) => ({ ...board, primaryAgentId: agentId }));
|
|
35
|
+
}
|
|
36
|
+
createTask(boardId, input) {
|
|
37
|
+
const title = cleanTitle(input.title);
|
|
38
|
+
const description = cleanDescription(input.description ?? "");
|
|
39
|
+
const columnId = cleanColumn(input.columnId);
|
|
40
|
+
return this.mutate(boardId, input.expectedRevision, (board, now) => {
|
|
41
|
+
const siblings = activeTasks(board, columnId);
|
|
42
|
+
const task = {
|
|
43
|
+
id: this.idFactory(),
|
|
44
|
+
title,
|
|
45
|
+
description,
|
|
46
|
+
columnId,
|
|
47
|
+
order: (siblings.at(-1)?.order ?? 0) + 1000,
|
|
48
|
+
createdAt: now,
|
|
49
|
+
updatedAt: now,
|
|
50
|
+
deletedAt: null,
|
|
51
|
+
};
|
|
52
|
+
return { ...board, tasks: [...board.tasks, task] };
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
updateTask(boardId, taskId, input) {
|
|
56
|
+
const title = cleanTitle(input.title);
|
|
57
|
+
const description = cleanDescription(input.description ?? "");
|
|
58
|
+
return this.mutate(boardId, input.expectedRevision, (board, now) => ({
|
|
59
|
+
...board,
|
|
60
|
+
tasks: board.tasks.map((task) => task.id === taskId && !task.deletedAt
|
|
61
|
+
? { ...task, title, description, updatedAt: now }
|
|
62
|
+
: task),
|
|
63
|
+
}), taskId);
|
|
64
|
+
}
|
|
65
|
+
moveTask(boardId, taskId, input) {
|
|
66
|
+
const targetColumn = cleanColumn(input.columnId);
|
|
67
|
+
if (!Number.isInteger(input.index) || input.index < 0) {
|
|
68
|
+
throw new BoardStoreError("invalid_request", "Task index must be a non-negative integer", 400);
|
|
69
|
+
}
|
|
70
|
+
return this.mutate(boardId, input.expectedRevision, (board, now) => {
|
|
71
|
+
const moving = board.tasks.find((task) => task.id === taskId && !task.deletedAt);
|
|
72
|
+
const sourceColumn = moving.columnId;
|
|
73
|
+
const targetTasks = activeTasks(board, targetColumn).filter((task) => task.id !== taskId);
|
|
74
|
+
targetTasks.splice(Math.min(input.index, targetTasks.length), 0, { ...moving, columnId: targetColumn, updatedAt: now });
|
|
75
|
+
const targetTaskIds = new Set(targetTasks.map((task) => task.id));
|
|
76
|
+
let tasks = board.tasks.filter((task) => task.id !== taskId && !targetTaskIds.has(task.id));
|
|
77
|
+
tasks.push(...targetTasks.map((task, index) => ({ ...task, columnId: targetColumn, order: (index + 1) * 1000 })));
|
|
78
|
+
if (sourceColumn !== targetColumn) {
|
|
79
|
+
const sourceTasks = activeTasks({ ...board, tasks }, sourceColumn);
|
|
80
|
+
const sourceIds = new Set(sourceTasks.map((task) => task.id));
|
|
81
|
+
tasks = tasks.map((task) => sourceIds.has(task.id)
|
|
82
|
+
? { ...task, order: (sourceTasks.findIndex((source) => source.id === task.id) + 1) * 1000 }
|
|
83
|
+
: task);
|
|
84
|
+
}
|
|
85
|
+
return { ...board, tasks };
|
|
86
|
+
}, taskId);
|
|
87
|
+
}
|
|
88
|
+
deleteTask(boardId, taskId, input) {
|
|
89
|
+
return this.mutate(boardId, input.expectedRevision, (board, now) => ({
|
|
90
|
+
...board,
|
|
91
|
+
tasks: board.tasks.map((task) => task.id === taskId && !task.deletedAt
|
|
92
|
+
? { ...task, deletedAt: now, updatedAt: now }
|
|
93
|
+
: task),
|
|
94
|
+
}), taskId);
|
|
95
|
+
}
|
|
96
|
+
async mutate(boardId, expectedRevision, transform, requiredTaskId) {
|
|
97
|
+
assertRevision(expectedRevision);
|
|
98
|
+
const board = await this.repository.getBoard(boardId);
|
|
99
|
+
if (board.revision !== expectedRevision) {
|
|
100
|
+
throw new BoardStoreError("revision_conflict", `Board changed in another page (expected revision ${expectedRevision}, current ${board.revision})`, 409);
|
|
101
|
+
}
|
|
102
|
+
if (requiredTaskId && !board.tasks.some((task) => task.id === requiredTaskId && !task.deletedAt)) {
|
|
103
|
+
throw new BoardStoreError("not_found", `Task not found: ${requiredTaskId}`, 404);
|
|
104
|
+
}
|
|
105
|
+
const now = this.now().toISOString();
|
|
106
|
+
const next = transform(board, now);
|
|
107
|
+
const updated = { ...next, revision: board.revision + 1, updatedAt: now };
|
|
108
|
+
await this.repository.saveBoard(updated, board.revision);
|
|
109
|
+
return updated;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
function assertRevision(value) {
|
|
113
|
+
if (!Number.isInteger(value) || value < 0) {
|
|
114
|
+
throw new BoardStoreError("invalid_request", "expectedRevision must be a non-negative integer", 400);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function cleanTitle(value) {
|
|
118
|
+
if (typeof value !== "string" || !value.trim()) {
|
|
119
|
+
throw new BoardStoreError("invalid_request", "Task title must be a non-empty string", 400);
|
|
120
|
+
}
|
|
121
|
+
const title = value.trim();
|
|
122
|
+
if (title.length > 200)
|
|
123
|
+
throw new BoardStoreError("invalid_request", "Task title cannot exceed 200 characters", 400);
|
|
124
|
+
return title;
|
|
125
|
+
}
|
|
126
|
+
function cleanDescription(value) {
|
|
127
|
+
if (typeof value !== "string")
|
|
128
|
+
throw new BoardStoreError("invalid_request", "Task description must be a string", 400);
|
|
129
|
+
if (value.length > 20_000)
|
|
130
|
+
throw new BoardStoreError("invalid_request", "Task description cannot exceed 20000 characters", 400);
|
|
131
|
+
return value;
|
|
132
|
+
}
|
|
133
|
+
function cleanColumn(value) {
|
|
134
|
+
if (!isBoardColumnId(value))
|
|
135
|
+
throw new BoardStoreError("invalid_request", `Unknown board column: ${String(value)}`, 400);
|
|
136
|
+
return value;
|
|
137
|
+
}
|
|
138
|
+
function activeTasks(board, columnId) {
|
|
139
|
+
return board.tasks
|
|
140
|
+
.filter((task) => !task.deletedAt && task.columnId === columnId)
|
|
141
|
+
.sort((a, b) => a.order - b.order || a.createdAt.localeCompare(b.createdAt));
|
|
142
|
+
}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { isAgentTool } from "../../agent-tool.js";
|
|
2
|
+
import { sessionChatName } from "../../session-name.js";
|
|
3
|
+
import { BoardStoreError } from "../repositories/board-repository.js";
|
|
4
|
+
export class MainAgentService {
|
|
5
|
+
options;
|
|
6
|
+
now;
|
|
7
|
+
projectOperations = new Map();
|
|
8
|
+
constructor(options) {
|
|
9
|
+
this.options = options;
|
|
10
|
+
this.now = options.now ?? (() => new Date());
|
|
11
|
+
}
|
|
12
|
+
getContact() {
|
|
13
|
+
return this.options.contactStore.get();
|
|
14
|
+
}
|
|
15
|
+
getBinding(projectId) {
|
|
16
|
+
return this.options.bindingRepository.get(projectId);
|
|
17
|
+
}
|
|
18
|
+
setPrimaryAgent(projectId, agentId, expectedRevision) {
|
|
19
|
+
if (!isAgentTool(agentId)) {
|
|
20
|
+
throw new BoardStoreError("invalid_request", `Unsupported primary Agent: ${String(agentId)}`, 400);
|
|
21
|
+
}
|
|
22
|
+
return this.exclusive(projectId, async () => {
|
|
23
|
+
const board = await this.options.boardService.getBoard(projectId);
|
|
24
|
+
if (board.revision !== expectedRevision) {
|
|
25
|
+
throw new BoardStoreError("revision_conflict", `Board changed in another page (expected revision ${expectedRevision}, current ${board.revision})`, 409);
|
|
26
|
+
}
|
|
27
|
+
return this.provision(board, agentId, false);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
relinkWorkspace(projectId, workspacePath, expectedRevision) {
|
|
31
|
+
return this.exclusive(projectId, async () => {
|
|
32
|
+
const existing = await this.options.bindingRepository.get(projectId);
|
|
33
|
+
const currentSessionId = existing ? (await this.resolveCurrentSession(existing)).sessionId : null;
|
|
34
|
+
if (currentSessionId && this.options.runtime.isSessionRunning(currentSessionId)) {
|
|
35
|
+
throw new BoardStoreError("main_agent_running", "主 Agent 正在执行任务,请先停止后再重新关联目录", 409);
|
|
36
|
+
}
|
|
37
|
+
const board = await this.options.boardService.relinkWorkspace(projectId, workspacePath, expectedRevision);
|
|
38
|
+
if (!existing || !board.primaryAgentId)
|
|
39
|
+
return { board, binding: null };
|
|
40
|
+
return this.provision(board, board.primaryAgentId, true);
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
async provision(board, agentId, forceNewSession) {
|
|
44
|
+
const existing = await this.options.bindingRepository.get(board.boardId);
|
|
45
|
+
const currentSession = existing ? await this.resolveCurrentSession(existing) : null;
|
|
46
|
+
const currentSessionId = currentSession?.sessionId ?? null;
|
|
47
|
+
if (currentSessionId && this.options.runtime.isSessionRunning(currentSessionId)) {
|
|
48
|
+
throw new BoardStoreError("main_agent_running", "主 Agent 正在执行任务,请先停止后再切换", 409);
|
|
49
|
+
}
|
|
50
|
+
if (!forceNewSession &&
|
|
51
|
+
existing?.status === "ready" &&
|
|
52
|
+
existing.agentId === agentId &&
|
|
53
|
+
currentSession?.agentId === agentId) {
|
|
54
|
+
const savedBoard = board.primaryAgentId === agentId
|
|
55
|
+
? board
|
|
56
|
+
: await this.options.boardService.setPrimaryAgent(board.boardId, agentId, board.revision);
|
|
57
|
+
return { board: savedBoard, binding: existing };
|
|
58
|
+
}
|
|
59
|
+
const contact = existing?.ownerOpenId
|
|
60
|
+
? { openId: existing.ownerOpenId }
|
|
61
|
+
: await this.options.contactStore.get();
|
|
62
|
+
if (!contact) {
|
|
63
|
+
throw new BoardStoreError("feishu_dm_required", "请先给飞书机器人私聊发送任意消息,再回到网页重试", 409);
|
|
64
|
+
}
|
|
65
|
+
const chatName = sessionChatName("主Agent", board.workspacePath);
|
|
66
|
+
let binding = {
|
|
67
|
+
schemaVersion: 1,
|
|
68
|
+
projectId: board.boardId,
|
|
69
|
+
platform: "feishu",
|
|
70
|
+
...(existing?.chatId ? { chatId: existing.chatId } : {}),
|
|
71
|
+
...(currentSessionId ? { sessionId: currentSessionId } : {}),
|
|
72
|
+
agentId,
|
|
73
|
+
namingPolicy: "project-fixed",
|
|
74
|
+
status: "provisioning",
|
|
75
|
+
ownerOpenId: contact.openId,
|
|
76
|
+
updatedAt: this.now().toISOString(),
|
|
77
|
+
};
|
|
78
|
+
await this.options.bindingRepository.save(binding);
|
|
79
|
+
try {
|
|
80
|
+
const created = await this.options.runtime.createSession(agentId, board.workspacePath);
|
|
81
|
+
let chatId = existing?.chatId;
|
|
82
|
+
if (!chatId) {
|
|
83
|
+
chatId = await this.options.platform.createGroup(chatName, [contact.openId]);
|
|
84
|
+
}
|
|
85
|
+
binding = {
|
|
86
|
+
...binding,
|
|
87
|
+
chatId,
|
|
88
|
+
sessionId: created.sessionId,
|
|
89
|
+
updatedAt: this.now().toISOString(),
|
|
90
|
+
};
|
|
91
|
+
// Persist irreversible identifiers before the remaining steps so a retry reuses the group.
|
|
92
|
+
await this.options.bindingRepository.save(binding);
|
|
93
|
+
await this.options.runtime.bindSession({
|
|
94
|
+
chatId,
|
|
95
|
+
oldSessionId: currentSessionId,
|
|
96
|
+
newSessionId: created.sessionId,
|
|
97
|
+
agentId,
|
|
98
|
+
cwd: created.cwd,
|
|
99
|
+
chatName,
|
|
100
|
+
namingPolicy: "project-fixed",
|
|
101
|
+
});
|
|
102
|
+
binding = { ...binding, status: "ready", updatedAt: this.now().toISOString() };
|
|
103
|
+
await this.options.bindingRepository.save(binding);
|
|
104
|
+
const savedBoard = board.primaryAgentId === agentId
|
|
105
|
+
? board
|
|
106
|
+
: await this.options.boardService.setPrimaryAgent(board.boardId, agentId, board.revision);
|
|
107
|
+
await this.options.platform.sendCard(chatId, "主 Agent 已就绪", `项目:**${chatName.slice("主Agent-".length)}**\n\n工作目录:\`${created.cwd}\`\n\n可以直接在本群与主 Agent 对话。`, "green").catch(() => false);
|
|
108
|
+
return { board: savedBoard, binding };
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
const failed = {
|
|
112
|
+
...binding,
|
|
113
|
+
status: "error",
|
|
114
|
+
lastError: err.message,
|
|
115
|
+
updatedAt: this.now().toISOString(),
|
|
116
|
+
};
|
|
117
|
+
await this.options.bindingRepository.save(failed).catch(() => { });
|
|
118
|
+
throw err;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
async resolveCurrentSession(binding) {
|
|
122
|
+
if (!binding.chatId)
|
|
123
|
+
return { sessionId: binding.sessionId ?? null, agentId: binding.agentId };
|
|
124
|
+
try {
|
|
125
|
+
const info = await this.options.platform.getChatInfo(binding.chatId);
|
|
126
|
+
const session = this.options.platform.extractSessionInfo(info.description);
|
|
127
|
+
return {
|
|
128
|
+
sessionId: session?.sessionId ?? binding.sessionId ?? null,
|
|
129
|
+
agentId: isAgentTool(session?.tool) ? session.tool : binding.agentId,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
catch {
|
|
133
|
+
return { sessionId: binding.sessionId ?? null, agentId: binding.agentId };
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
async exclusive(projectId, operation) {
|
|
137
|
+
const previous = this.projectOperations.get(projectId) ?? Promise.resolve();
|
|
138
|
+
let release;
|
|
139
|
+
const current = new Promise((resolve) => { release = resolve; });
|
|
140
|
+
this.projectOperations.set(projectId, current);
|
|
141
|
+
await previous;
|
|
142
|
+
try {
|
|
143
|
+
return await operation();
|
|
144
|
+
}
|
|
145
|
+
finally {
|
|
146
|
+
release();
|
|
147
|
+
if (this.projectOperations.get(projectId) === current)
|
|
148
|
+
this.projectOperations.delete(projectId);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { isAgentTool } from "../../agent-tool.js";
|
|
2
|
+
export const BOARD_SCHEMA_VERSION = 1;
|
|
3
|
+
export const BOARD_COLUMNS = [
|
|
4
|
+
{ id: "brainstorm", title: "头脑风暴", order: 0 },
|
|
5
|
+
{ id: "todo", title: "Todo", order: 1 },
|
|
6
|
+
{ id: "doing", title: "Doing", order: 2 },
|
|
7
|
+
{ id: "done", title: "Done", order: 3 },
|
|
8
|
+
{ id: "on_hold", title: "搁置", order: 4 },
|
|
9
|
+
];
|
|
10
|
+
export const BOARD_COLUMN_IDS = new Set(BOARD_COLUMNS.map((column) => column.id));
|
|
11
|
+
export function isBoardColumnId(value) {
|
|
12
|
+
return typeof value === "string" && BOARD_COLUMN_IDS.has(value);
|
|
13
|
+
}
|
|
14
|
+
export function createEmptyBoard(input) {
|
|
15
|
+
return {
|
|
16
|
+
schemaVersion: BOARD_SCHEMA_VERSION,
|
|
17
|
+
boardId: input.boardId,
|
|
18
|
+
workspacePath: input.workspacePath,
|
|
19
|
+
revision: 0,
|
|
20
|
+
columns: BOARD_COLUMNS.map((column) => ({ ...column })),
|
|
21
|
+
tasks: [],
|
|
22
|
+
createdAt: input.now,
|
|
23
|
+
updatedAt: input.now,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export function parseBoard(value) {
|
|
27
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
28
|
+
throw new Error("Board JSON must be an object");
|
|
29
|
+
const board = value;
|
|
30
|
+
if (board.schemaVersion !== BOARD_SCHEMA_VERSION)
|
|
31
|
+
throw new Error(`Unsupported board schema version: ${String(board.schemaVersion)}`);
|
|
32
|
+
if (typeof board.boardId !== "string" || !board.boardId)
|
|
33
|
+
throw new Error("Board is missing boardId");
|
|
34
|
+
if (typeof board.workspacePath !== "string" || !board.workspacePath)
|
|
35
|
+
throw new Error("Board is missing workspacePath");
|
|
36
|
+
if (board.primaryAgentId !== undefined && !isAgentTool(board.primaryAgentId)) {
|
|
37
|
+
throw new Error(`Unsupported primary Agent: ${String(board.primaryAgentId)}`);
|
|
38
|
+
}
|
|
39
|
+
if (!Number.isInteger(board.revision) || board.revision < 0)
|
|
40
|
+
throw new Error("Board revision is invalid");
|
|
41
|
+
if (!Array.isArray(board.tasks))
|
|
42
|
+
throw new Error("Board tasks must be an array");
|
|
43
|
+
for (const task of board.tasks) {
|
|
44
|
+
if (!task || typeof task !== "object")
|
|
45
|
+
throw new Error("Board task is invalid");
|
|
46
|
+
const candidate = task;
|
|
47
|
+
if (typeof candidate.id !== "string" || !candidate.id)
|
|
48
|
+
throw new Error("Board task is missing id");
|
|
49
|
+
if (typeof candidate.title !== "string")
|
|
50
|
+
throw new Error("Board task title is invalid");
|
|
51
|
+
if (typeof candidate.description !== "string")
|
|
52
|
+
throw new Error("Board task description is invalid");
|
|
53
|
+
if (!isBoardColumnId(candidate.columnId))
|
|
54
|
+
throw new Error(`Unknown board column: ${String(candidate.columnId)}`);
|
|
55
|
+
if (!Number.isFinite(candidate.order))
|
|
56
|
+
throw new Error("Board task order is invalid");
|
|
57
|
+
if (typeof candidate.createdAt !== "string" || typeof candidate.updatedAt !== "string") {
|
|
58
|
+
throw new Error("Board task timestamps are invalid");
|
|
59
|
+
}
|
|
60
|
+
if (candidate.deletedAt !== null && typeof candidate.deletedAt !== "string") {
|
|
61
|
+
throw new Error("Board task deletedAt is invalid");
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
...board,
|
|
66
|
+
columns: BOARD_COLUMNS.map((column) => ({ ...column })),
|
|
67
|
+
tasks: board.tasks,
|
|
68
|
+
};
|
|
69
|
+
}
|