@downcity/city 1.1.9 → 1.1.12
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 +1 -1
- package/bin/cli/agent/AgentChat.d.ts.map +1 -1
- package/bin/cli/agent/AgentChat.js +23 -1
- package/bin/cli/agent/AgentChat.js.map +1 -1
- package/bin/cli/agent/Run.d.ts.map +1 -1
- package/bin/cli/agent/Run.js +56 -56
- package/bin/cli/agent/Run.js.map +1 -1
- package/bin/control/PluginApiRoutes.d.ts.map +1 -1
- package/bin/control/PluginApiRoutes.js +2 -4
- package/bin/control/PluginApiRoutes.js.map +1 -1
- package/bin/control/instant/InstantSessionService.d.ts.map +1 -1
- package/bin/control/instant/InstantSessionService.js +7 -10
- package/bin/control/instant/InstantSessionService.js.map +1 -1
- package/package.json +2 -2
- package/src/cli/agent/AgentChat.ts +31 -10
- package/src/cli/agent/Run.ts +64 -68
- package/src/control/PluginApiRoutes.ts +3 -7
- package/src/control/instant/InstantSessionService.ts +8 -13
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EAEzB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EAEzB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AA4G7B;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,yBAAyB,CAAC;CACvC,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAiFrC;AAyKD;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC7E"}
|
|
@@ -20,6 +20,16 @@ const AGENT_CHAT_EXECUTE_TIMEOUT_MS = 120_000;
|
|
|
20
20
|
function normalizeChatMessage(input) {
|
|
21
21
|
return String(input || "").trim();
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* 判断 readline 在交互期间抛出的 Ctrl+C 中断是否属于正常退出。
|
|
25
|
+
*/
|
|
26
|
+
function isReadlineAbortError(error) {
|
|
27
|
+
if (!error || typeof error !== "object")
|
|
28
|
+
return false;
|
|
29
|
+
const code = "code" in error ? String(error.code || "") : "";
|
|
30
|
+
const name = "name" in error ? String(error.name || "") : "";
|
|
31
|
+
return code === "ABORT_ERR" || name === "AbortError";
|
|
32
|
+
}
|
|
23
33
|
function isChatSuccess(payload) {
|
|
24
34
|
if (!payload || payload.success !== true)
|
|
25
35
|
return false;
|
|
@@ -258,7 +268,19 @@ async function runInteractiveChat(params) {
|
|
|
258
268
|
});
|
|
259
269
|
try {
|
|
260
270
|
while (true) {
|
|
261
|
-
|
|
271
|
+
let line = "";
|
|
272
|
+
try {
|
|
273
|
+
line = await rl.question(prompt);
|
|
274
|
+
}
|
|
275
|
+
catch (error) {
|
|
276
|
+
// 关键点（中文）：Node 24 下 Ctrl+C 会让 readline.question 以 AbortError 拒绝。
|
|
277
|
+
// 这里按正常退出处理，避免把交互式 chat 变成未捕获异常。
|
|
278
|
+
if (isReadlineAbortError(error)) {
|
|
279
|
+
console.log();
|
|
280
|
+
break;
|
|
281
|
+
}
|
|
282
|
+
throw error;
|
|
283
|
+
}
|
|
262
284
|
const text = normalizeChatMessage(line);
|
|
263
285
|
if (!text)
|
|
264
286
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentChat.js","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AgentChat.js","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Run.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"Run.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKpD;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,YAAM,EACjB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Gf"}
|
package/bin/cli/agent/Run.js
CHANGED
|
@@ -9,10 +9,11 @@
|
|
|
9
9
|
* - 后台常驻启动请使用 `downcity agent start`，并用
|
|
10
10
|
* `downcity agent restart` 管理。
|
|
11
11
|
*/
|
|
12
|
-
import
|
|
13
|
-
import {
|
|
12
|
+
import path from "node:path";
|
|
13
|
+
import { Agent, createModel, loadStaticSystemPrompts, StaticPromptCatalog, } from "@downcity/agent";
|
|
14
14
|
import { CliError } from "../shared/CliError.js";
|
|
15
15
|
import { createAgentPlatformRuntime } from "../../process/registry/AgentHostRuntime.js";
|
|
16
|
+
import { resolveAgentName } from "../shared/IndexSupport.js";
|
|
16
17
|
/**
|
|
17
18
|
* 前台启动入口（由 `agent start` 前台模式与内部 daemon 子进程复用）。
|
|
18
19
|
*
|
|
@@ -24,10 +25,8 @@ import { createAgentPlatformRuntime } from "../../process/registry/AgentHostRunt
|
|
|
24
25
|
* - 统一处理进程信号并优雅停机
|
|
25
26
|
*/
|
|
26
27
|
export async function runCommand(cwd = ".", options) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
platform: createAgentPlatformRuntime(),
|
|
30
|
-
});
|
|
28
|
+
const projectRoot = path.resolve(cwd);
|
|
29
|
+
const platform = createAgentPlatformRuntime();
|
|
31
30
|
// 端口解析（中文）：允许 number / string；空值返回 undefined 以便走配置回退链。
|
|
32
31
|
const parsePort = (value, label) => {
|
|
33
32
|
if (value === undefined || value === null || value === "")
|
|
@@ -53,17 +52,54 @@ export async function runCommand(cwd = ".", options) {
|
|
|
53
52
|
});
|
|
54
53
|
}
|
|
55
54
|
const host = (options.host ?? "0.0.0.0").trim();
|
|
55
|
+
const agentName = resolveAgentName(projectRoot);
|
|
56
|
+
let currentSystems = loadStaticSystemPrompts(projectRoot);
|
|
57
|
+
const agent = new Agent({
|
|
58
|
+
id: agentName,
|
|
59
|
+
path: projectRoot,
|
|
60
|
+
instruction: currentSystems,
|
|
61
|
+
platform,
|
|
62
|
+
useBuiltinServices: true,
|
|
63
|
+
useBuiltinPlugins: true,
|
|
64
|
+
configureSession: async (session) => {
|
|
65
|
+
const model = await createModel({
|
|
66
|
+
config: agent.getRuntime().config,
|
|
67
|
+
projectRoot,
|
|
68
|
+
platform,
|
|
69
|
+
});
|
|
70
|
+
await session.set({
|
|
71
|
+
model,
|
|
72
|
+
});
|
|
73
|
+
},
|
|
74
|
+
});
|
|
75
|
+
const promptCatalog = new StaticPromptCatalog({
|
|
76
|
+
rootPath: projectRoot,
|
|
77
|
+
logger: agent.getRuntime().logger,
|
|
78
|
+
getCurrentSystems: () => currentSystems,
|
|
79
|
+
applySystems: (nextSystems) => {
|
|
80
|
+
currentSystems = nextSystems;
|
|
81
|
+
agent.setInstruction(nextSystems);
|
|
82
|
+
},
|
|
83
|
+
});
|
|
84
|
+
promptCatalog.start();
|
|
56
85
|
process.env.DC_SERVER_PORT = String(port);
|
|
57
86
|
process.env.DC_SERVER_HOST = host;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
87
|
+
process.env.DC_AGENT_PATH = projectRoot;
|
|
88
|
+
process.env.DC_AGENT_NAME = agentName;
|
|
89
|
+
const startResult = await agent.start({
|
|
90
|
+
http: {
|
|
91
|
+
port,
|
|
92
|
+
host,
|
|
93
|
+
},
|
|
94
|
+
rpc: true,
|
|
95
|
+
services: true,
|
|
66
96
|
});
|
|
97
|
+
const server = startResult.http?.server;
|
|
98
|
+
const localRpc = startResult.rpc?.server;
|
|
99
|
+
if (!server || !localRpc) {
|
|
100
|
+
throw new Error("Agent start did not return expected HTTP/RPC bindings");
|
|
101
|
+
}
|
|
102
|
+
const agentLogger = agent.getRuntime().logger;
|
|
67
103
|
// 处理进程信号
|
|
68
104
|
// 停机顺序（中文）：services -> API server -> flush logs。
|
|
69
105
|
let isShuttingDown = false;
|
|
@@ -71,52 +107,16 @@ export async function runCommand(cwd = ".", options) {
|
|
|
71
107
|
if (isShuttingDown)
|
|
72
108
|
return;
|
|
73
109
|
isShuttingDown = true;
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
// 先停持久化调度器，避免关停过程中继续触发新的 service action。
|
|
78
|
-
try {
|
|
79
|
-
await stopServiceScheduleRuntime();
|
|
80
|
-
}
|
|
81
|
-
catch {
|
|
82
|
-
// ignore
|
|
83
|
-
}
|
|
84
|
-
// 停止全部 service
|
|
85
|
-
try {
|
|
86
|
-
await stopAllServices(getAgentContext());
|
|
87
|
-
}
|
|
88
|
-
catch {
|
|
89
|
-
// ignore
|
|
90
|
-
}
|
|
91
|
-
// 停止服务器
|
|
92
|
-
await localRpc.stop();
|
|
93
|
-
await server.stop();
|
|
110
|
+
agentLogger.info(`Received ${signal} signal, shutting down...`);
|
|
111
|
+
promptCatalog.stop();
|
|
112
|
+
await agent.stop();
|
|
94
113
|
// Save logs
|
|
95
|
-
await
|
|
96
|
-
|
|
114
|
+
await agentLogger.saveAllLogs();
|
|
115
|
+
agentLogger.info("👋 Downcity stopped");
|
|
97
116
|
process.exit(0);
|
|
98
117
|
};
|
|
99
118
|
process.on("SIGINT", () => shutdown("SIGINT"));
|
|
100
119
|
process.on("SIGTERM", () => shutdown("SIGTERM"));
|
|
101
|
-
|
|
102
|
-
// 调度策略（中文）：单服务失败不阻断主服务启动，仅记录日志。
|
|
103
|
-
try {
|
|
104
|
-
const lifecycle = await startAllServices(getAgentContext());
|
|
105
|
-
for (const item of lifecycle.results) {
|
|
106
|
-
if (item.success)
|
|
107
|
-
continue;
|
|
108
|
-
logger.error(`Service start failed: ${item.service?.name || "unknown"} - ${item.error || "unknown error"}`);
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
catch (e) {
|
|
112
|
-
logger.error(`Service bootstrap failed: ${String(e)}`);
|
|
113
|
-
}
|
|
114
|
-
try {
|
|
115
|
-
await startServiceScheduleRuntime(getAgentContext());
|
|
116
|
-
}
|
|
117
|
-
catch (e) {
|
|
118
|
-
logger.error(`Service schedule runtime bootstrap failed: ${String(e)}`);
|
|
119
|
-
}
|
|
120
|
-
logger.info("=== Downcity Started ===");
|
|
120
|
+
agentLogger.info("=== Downcity Started ===");
|
|
121
121
|
}
|
|
122
122
|
//# sourceMappingURL=Run.js.map
|
package/bin/cli/agent/Run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Run.js","sourceRoot":"","sources":["../../../src/cli/agent/Run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"Run.js","sourceRoot":"","sources":["../../../src/cli/agent/Run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginApiRoutes.d.ts","sourceRoot":"","sources":["../../src/control/PluginApiRoutes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAMjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"PluginApiRoutes.d.ts","sourceRoot":"","sources":["../../src/control/PluginApiRoutes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAMjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA0T3D;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE;IACnD;;OAEG;IACH,GAAG,EAAE,IAAI,CAAC;IACV;;OAEG;IACH,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACnD;;OAEG;IACH,oBAAoB,EAAE,CACpB,gBAAgB,EAAE,MAAM,KACrB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;CAC1C,GAAG,IAAI,CAyFP"}
|
|
@@ -17,14 +17,12 @@ function getErrorMessage(error) {
|
|
|
17
17
|
function buildPluginActionConfig(plugin) {
|
|
18
18
|
if (!plugin)
|
|
19
19
|
return [];
|
|
20
|
-
|
|
20
|
+
const actions = (plugin.actions || {});
|
|
21
|
+
return Object.entries(actions)
|
|
21
22
|
.map(([actionName, action]) => ({
|
|
22
23
|
name: actionName,
|
|
23
24
|
supportsCommand: Boolean(action?.command),
|
|
24
|
-
supportsApi: Boolean(action?.api),
|
|
25
25
|
commandDescription: String(action?.command?.description || "").trim(),
|
|
26
|
-
apiMethod: String(action?.api?.method || "").trim().toUpperCase(),
|
|
27
|
-
apiPath: String(action?.api?.path || "").trim(),
|
|
28
26
|
}))
|
|
29
27
|
.sort((a, b) => a.name.localeCompare(b.name));
|
|
30
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginApiRoutes.js","sourceRoot":"","sources":["../../src/control/PluginApiRoutes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"PluginApiRoutes.js","sourceRoot":"","sources":["../../src/control/PluginApiRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstantSessionService.d.ts","sourceRoot":"","sources":["../../../src/control/instant/InstantSessionService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"InstantSessionService.d.ts","sourceRoot":"","sources":["../../../src/control/instant/InstantSessionService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAkBH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EACV,6BAA6B,EAC7B,8BAA8B,EAC9B,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AAIzB,KAAK,4BAA4B,GAAG;IAClC;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IAE5E;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAgEF;;GAEG;AACH,qBAAa,qBAAsB,YAAW,4BAA4B;IACxE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmD;IACpF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,OAAO,CAAC,EAAE,4BAA4B;IAK5C,GAAG,CACP,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,8BAA8B,CAAC;YAY5B,yBAAyB;YA2BzB,kBAAkB;IAgDhC,OAAO,CAAC,cAAc;YAIR,eAAe;CA0D9B"}
|
|
@@ -10,7 +10,7 @@ import fs from "fs-extra";
|
|
|
10
10
|
import path from "node:path";
|
|
11
11
|
import os from "node:os";
|
|
12
12
|
import { mkdtemp } from "node:fs/promises";
|
|
13
|
-
import { createModel, drainDeferredPersistedUserMessages, getLogger, JsonlSessionCompactionComposer, JsonlSessionHistoryComposer,
|
|
13
|
+
import { createModel, drainDeferredPersistedUserMessages, Executor, getLogger, JsonlSessionCompactionComposer, JsonlSessionHistoryComposer, pickLastSuccessfulChatSendText, resolveAssistantMessageForPersistence, } from "@downcity/agent";
|
|
14
14
|
import { InstantSystemComposer } from "../../control/instant/InstantSystemComposer.js";
|
|
15
15
|
function buildInstantPrompt(input) {
|
|
16
16
|
const prompt = String(input.prompt || "").trim();
|
|
@@ -149,17 +149,14 @@ export class InstantSessionService {
|
|
|
149
149
|
prompts: [String(input.system || "").trim()].filter(Boolean),
|
|
150
150
|
projectRoot: rootPath,
|
|
151
151
|
});
|
|
152
|
-
const session = new
|
|
152
|
+
const session = new Executor({
|
|
153
153
|
sessionId,
|
|
154
154
|
historyComposer,
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
systemComposer,
|
|
161
|
-
getTools: () => ({}),
|
|
162
|
-
}),
|
|
155
|
+
getModel: () => model,
|
|
156
|
+
logger: this.logger,
|
|
157
|
+
compactionComposer,
|
|
158
|
+
systemComposer,
|
|
159
|
+
getTools: () => ({}),
|
|
163
160
|
});
|
|
164
161
|
const text = await this.executeTempSession({
|
|
165
162
|
sessionRuntime: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstantSessionService.js","sourceRoot":"","sources":["../../../src/control/instant/InstantSessionService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EACL,WAAW,EACX,kCAAkC,EAClC,SAAS,EACT,8BAA8B,EAC9B,2BAA2B,EAE3B,
|
|
1
|
+
{"version":3,"file":"InstantSessionService.js","sourceRoot":"","sources":["../../../src/control/instant/InstantSessionService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@downcity/city",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.12",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity City 平台 — CLI、daemon 管理、Console 网关、能力平台",
|
|
6
6
|
"bin": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"prompts": "^2.4.0",
|
|
37
37
|
"ws": "^8.19.0",
|
|
38
38
|
"zod": "^3.24.0",
|
|
39
|
-
"@downcity/agent": "^1.1.
|
|
39
|
+
"@downcity/agent": "^1.1.14"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/better-sqlite3": "^7.6.13",
|
|
@@ -37,6 +37,16 @@ function normalizeChatMessage(input: string): string {
|
|
|
37
37
|
return String(input || "").trim();
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
+
/**
|
|
41
|
+
* 判断 readline 在交互期间抛出的 Ctrl+C 中断是否属于正常退出。
|
|
42
|
+
*/
|
|
43
|
+
function isReadlineAbortError(error: unknown): boolean {
|
|
44
|
+
if (!error || typeof error !== "object") return false;
|
|
45
|
+
const code = "code" in error ? String(error.code || "") : "";
|
|
46
|
+
const name = "name" in error ? String(error.name || "") : "";
|
|
47
|
+
return code === "ABORT_ERR" || name === "AbortError";
|
|
48
|
+
}
|
|
49
|
+
|
|
40
50
|
function isChatSuccess(payload: AgentChatExecuteResponse | undefined): boolean {
|
|
41
51
|
if (!payload || payload.success !== true) return false;
|
|
42
52
|
if (payload.result?.success === false) return false;
|
|
@@ -117,11 +127,11 @@ function printQueuedResult(params: {
|
|
|
117
127
|
},
|
|
118
128
|
...(params.payload.result?.queueItemId
|
|
119
129
|
? [
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
130
|
+
{
|
|
131
|
+
label: "queue item",
|
|
132
|
+
value: params.payload.result.queueItemId,
|
|
133
|
+
},
|
|
134
|
+
]
|
|
125
135
|
: []),
|
|
126
136
|
],
|
|
127
137
|
});
|
|
@@ -210,10 +220,10 @@ export async function executeAgentChatTurn(params: {
|
|
|
210
220
|
...(isChatSuccess(remote.data)
|
|
211
221
|
? {}
|
|
212
222
|
: {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
223
|
+
error:
|
|
224
|
+
String(remote.data.result?.error || remote.data.error || "").trim() ||
|
|
225
|
+
"Daemon error (check `city agent status` and `city agent doctor`)",
|
|
226
|
+
}),
|
|
217
227
|
};
|
|
218
228
|
}
|
|
219
229
|
|
|
@@ -312,7 +322,18 @@ async function runInteractiveChat(params: {
|
|
|
312
322
|
|
|
313
323
|
try {
|
|
314
324
|
while (true) {
|
|
315
|
-
|
|
325
|
+
let line = "";
|
|
326
|
+
try {
|
|
327
|
+
line = await rl.question(prompt);
|
|
328
|
+
} catch (error) {
|
|
329
|
+
// 关键点（中文）：Node 24 下 Ctrl+C 会让 readline.question 以 AbortError 拒绝。
|
|
330
|
+
// 这里按正常退出处理，避免把交互式 chat 变成未捕获异常。
|
|
331
|
+
if (isReadlineAbortError(error)) {
|
|
332
|
+
console.log();
|
|
333
|
+
break;
|
|
334
|
+
}
|
|
335
|
+
throw error;
|
|
336
|
+
}
|
|
316
337
|
const text = normalizeChatMessage(line);
|
|
317
338
|
if (!text) continue;
|
|
318
339
|
if (text === "/exit" || text === "/quit") break;
|
package/src/cli/agent/Run.ts
CHANGED
|
@@ -10,22 +10,17 @@
|
|
|
10
10
|
* `downcity agent restart` 管理。
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
+
import path from "node:path";
|
|
13
14
|
import {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
startLocalRpcServer,
|
|
19
|
-
startServer,
|
|
20
|
-
startServiceScheduleRuntime,
|
|
21
|
-
stopAgentHotReload,
|
|
22
|
-
stopAllServices,
|
|
23
|
-
stopServiceScheduleRuntime,
|
|
15
|
+
Agent,
|
|
16
|
+
createModel,
|
|
17
|
+
loadStaticSystemPrompts,
|
|
18
|
+
StaticPromptCatalog,
|
|
24
19
|
} from "@downcity/agent";
|
|
25
20
|
import type { StartOptions } from "@downcity/agent";
|
|
26
|
-
import { logger } from "@downcity/agent";
|
|
27
21
|
import { CliError } from "../shared/CliError.js";
|
|
28
22
|
import { createAgentPlatformRuntime } from "@/process/registry/AgentHostRuntime.js";
|
|
23
|
+
import { resolveAgentName } from "../shared/IndexSupport.js";
|
|
29
24
|
|
|
30
25
|
/**
|
|
31
26
|
* 前台启动入口（由 `agent start` 前台模式与内部 daemon 子进程复用）。
|
|
@@ -41,10 +36,8 @@ export async function runCommand(
|
|
|
41
36
|
cwd: string = ".",
|
|
42
37
|
options: StartOptions,
|
|
43
38
|
): Promise<void> {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
platform: createAgentPlatformRuntime(),
|
|
47
|
-
});
|
|
39
|
+
const projectRoot = path.resolve(cwd);
|
|
40
|
+
const platform = createAgentPlatformRuntime();
|
|
48
41
|
// 端口解析（中文）：允许 number / string；空值返回 undefined 以便走配置回退链。
|
|
49
42
|
const parsePort = (
|
|
50
43
|
value: string | number | undefined,
|
|
@@ -73,20 +66,61 @@ export async function runCommand(
|
|
|
73
66
|
}
|
|
74
67
|
|
|
75
68
|
const host = (options.host ?? "0.0.0.0").trim();
|
|
69
|
+
const agentName = resolveAgentName(projectRoot);
|
|
70
|
+
let currentSystems = loadStaticSystemPrompts(projectRoot);
|
|
71
|
+
|
|
72
|
+
const agent = new Agent({
|
|
73
|
+
id: agentName,
|
|
74
|
+
path: projectRoot,
|
|
75
|
+
instruction: currentSystems,
|
|
76
|
+
platform,
|
|
77
|
+
useBuiltinServices: true,
|
|
78
|
+
useBuiltinPlugins: true,
|
|
79
|
+
configureSession: async (session) => {
|
|
80
|
+
const model = await createModel({
|
|
81
|
+
config: agent.getRuntime().config,
|
|
82
|
+
projectRoot,
|
|
83
|
+
platform,
|
|
84
|
+
});
|
|
85
|
+
await session.set({
|
|
86
|
+
model,
|
|
87
|
+
});
|
|
88
|
+
},
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
const promptCatalog = new StaticPromptCatalog({
|
|
92
|
+
rootPath: projectRoot,
|
|
93
|
+
logger: agent.getRuntime().logger,
|
|
94
|
+
getCurrentSystems: () => currentSystems,
|
|
95
|
+
applySystems: (nextSystems) => {
|
|
96
|
+
currentSystems = nextSystems;
|
|
97
|
+
agent.setInstruction(nextSystems);
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
promptCatalog.start();
|
|
76
101
|
|
|
77
102
|
process.env.DC_SERVER_PORT = String(port);
|
|
78
103
|
process.env.DC_SERVER_HOST = host;
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
104
|
+
process.env.DC_AGENT_PATH = projectRoot;
|
|
105
|
+
process.env.DC_AGENT_NAME = agentName;
|
|
106
|
+
|
|
107
|
+
const startResult = await agent.start({
|
|
108
|
+
http: {
|
|
109
|
+
port,
|
|
110
|
+
host,
|
|
111
|
+
},
|
|
112
|
+
rpc: true,
|
|
113
|
+
services: true,
|
|
88
114
|
});
|
|
89
115
|
|
|
116
|
+
const server = startResult.http?.server;
|
|
117
|
+
const localRpc = startResult.rpc?.server;
|
|
118
|
+
if (!server || !localRpc) {
|
|
119
|
+
throw new Error("Agent start did not return expected HTTP/RPC bindings");
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
const agentLogger = agent.getRuntime().logger;
|
|
123
|
+
|
|
90
124
|
// 处理进程信号
|
|
91
125
|
// 停机顺序（中文）：services -> API server -> flush logs。
|
|
92
126
|
let isShuttingDown = false;
|
|
@@ -94,58 +128,20 @@ export async function runCommand(
|
|
|
94
128
|
if (isShuttingDown) return;
|
|
95
129
|
isShuttingDown = true;
|
|
96
130
|
|
|
97
|
-
|
|
131
|
+
agentLogger.info(`Received ${signal} signal, shutting down...`);
|
|
132
|
+
promptCatalog.stop();
|
|
98
133
|
|
|
99
|
-
|
|
100
|
-
stopAgentHotReload();
|
|
101
|
-
|
|
102
|
-
// 先停持久化调度器，避免关停过程中继续触发新的 service action。
|
|
103
|
-
try {
|
|
104
|
-
await stopServiceScheduleRuntime();
|
|
105
|
-
} catch {
|
|
106
|
-
// ignore
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
// 停止全部 service
|
|
110
|
-
try {
|
|
111
|
-
await stopAllServices(getAgentContext());
|
|
112
|
-
} catch {
|
|
113
|
-
// ignore
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
// 停止服务器
|
|
117
|
-
await localRpc.stop();
|
|
118
|
-
await server.stop();
|
|
134
|
+
await agent.stop();
|
|
119
135
|
|
|
120
136
|
// Save logs
|
|
121
|
-
await
|
|
137
|
+
await agentLogger.saveAllLogs();
|
|
122
138
|
|
|
123
|
-
|
|
139
|
+
agentLogger.info("👋 Downcity stopped");
|
|
124
140
|
process.exit(0);
|
|
125
141
|
};
|
|
126
142
|
|
|
127
143
|
process.on("SIGINT", () => shutdown("SIGINT"));
|
|
128
144
|
process.on("SIGTERM", () => shutdown("SIGTERM"));
|
|
129
145
|
|
|
130
|
-
|
|
131
|
-
// 调度策略（中文）：单服务失败不阻断主服务启动，仅记录日志。
|
|
132
|
-
try {
|
|
133
|
-
const lifecycle = await startAllServices(getAgentContext());
|
|
134
|
-
for (const item of lifecycle.results) {
|
|
135
|
-
if (item.success) continue;
|
|
136
|
-
logger.error(
|
|
137
|
-
`Service start failed: ${item.service?.name || "unknown"} - ${item.error || "unknown error"}`,
|
|
138
|
-
);
|
|
139
|
-
}
|
|
140
|
-
} catch (e) {
|
|
141
|
-
logger.error(`Service bootstrap failed: ${String(e)}`);
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
try {
|
|
145
|
-
await startServiceScheduleRuntime(getAgentContext());
|
|
146
|
-
} catch (e) {
|
|
147
|
-
logger.error(`Service schedule runtime bootstrap failed: ${String(e)}`);
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
logger.info("=== Downcity Started ===");
|
|
146
|
+
agentLogger.info("=== Downcity Started ===");
|
|
151
147
|
}
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
import type { PlatformAgentOption } from "@downcity/agent";
|
|
17
17
|
import type {
|
|
18
18
|
PluginActionResult,
|
|
19
|
+
PluginAction,
|
|
19
20
|
PluginAvailability,
|
|
20
21
|
PluginSetupDefinition,
|
|
21
22
|
PluginUsageDefinition,
|
|
@@ -30,10 +31,7 @@ import {
|
|
|
30
31
|
type PluginActionConfigItem = {
|
|
31
32
|
name: string;
|
|
32
33
|
supportsCommand: boolean;
|
|
33
|
-
supportsApi: boolean;
|
|
34
34
|
commandDescription: string;
|
|
35
|
-
apiMethod: string;
|
|
36
|
-
apiPath: string;
|
|
37
35
|
};
|
|
38
36
|
|
|
39
37
|
type PluginUiItem = PluginView & {
|
|
@@ -81,14 +79,12 @@ function buildPluginActionConfig(
|
|
|
81
79
|
plugin: ReturnType<typeof findBuiltinPlugin>,
|
|
82
80
|
): PluginActionConfigItem[] {
|
|
83
81
|
if (!plugin) return [];
|
|
84
|
-
|
|
82
|
+
const actions = (plugin.actions || {}) as Record<string, PluginAction>;
|
|
83
|
+
return Object.entries(actions)
|
|
85
84
|
.map(([actionName, action]) => ({
|
|
86
85
|
name: actionName,
|
|
87
86
|
supportsCommand: Boolean(action?.command),
|
|
88
|
-
supportsApi: Boolean(action?.api),
|
|
89
87
|
commandDescription: String(action?.command?.description || "").trim(),
|
|
90
|
-
apiMethod: String(action?.api?.method || "").trim().toUpperCase(),
|
|
91
|
-
apiPath: String(action?.api?.path || "").trim(),
|
|
92
88
|
}))
|
|
93
89
|
.sort((a, b) => a.name.localeCompare(b.name));
|
|
94
90
|
}
|
|
@@ -15,14 +15,13 @@ import { generateId } from "@/utils/Id.js";
|
|
|
15
15
|
import {
|
|
16
16
|
createModel,
|
|
17
17
|
drainDeferredPersistedUserMessages,
|
|
18
|
+
Executor,
|
|
18
19
|
getLogger,
|
|
19
20
|
JsonlSessionCompactionComposer,
|
|
20
21
|
JsonlSessionHistoryComposer,
|
|
21
22
|
loadStaticSystemPrompts,
|
|
22
|
-
LocalSessionExecutor,
|
|
23
23
|
pickLastSuccessfulChatSendText,
|
|
24
24
|
resolveAssistantMessageForPersistence,
|
|
25
|
-
Session,
|
|
26
25
|
} from "@downcity/agent";
|
|
27
26
|
import type { Logger } from "@downcity/agent";
|
|
28
27
|
import type { PlatformAgentOption } from "@downcity/agent";
|
|
@@ -60,7 +59,7 @@ type TempSessionRuntime = {
|
|
|
60
59
|
/**
|
|
61
60
|
* 当前临时 session 实例。
|
|
62
61
|
*/
|
|
63
|
-
session:
|
|
62
|
+
session: Executor;
|
|
64
63
|
};
|
|
65
64
|
|
|
66
65
|
function buildInstantPrompt(input: {
|
|
@@ -241,18 +240,14 @@ export class InstantSessionService implements PlatformInlineInstantService {
|
|
|
241
240
|
projectRoot: rootPath,
|
|
242
241
|
});
|
|
243
242
|
|
|
244
|
-
const session = new
|
|
243
|
+
const session = new Executor({
|
|
245
244
|
sessionId,
|
|
246
245
|
historyComposer,
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
compactionComposer,
|
|
253
|
-
systemComposer,
|
|
254
|
-
getTools: () => ({}),
|
|
255
|
-
}),
|
|
246
|
+
getModel: () => model,
|
|
247
|
+
logger: this.logger as unknown as AgentLogger,
|
|
248
|
+
compactionComposer,
|
|
249
|
+
systemComposer,
|
|
250
|
+
getTools: () => ({}),
|
|
256
251
|
});
|
|
257
252
|
|
|
258
253
|
const text = await this.executeTempSession({
|