@downcity/city 1.1.14 → 1.1.18
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/bin/cli/Index.js +44 -0
- package/bin/cli/Index.js.map +1 -1
- package/bin/cli/shared/IndexAgentCommand.d.ts +2 -0
- package/bin/cli/shared/IndexAgentCommand.d.ts.map +1 -1
- package/bin/cli/shared/IndexAgentCommand.js +1 -0
- package/bin/cli/shared/IndexAgentCommand.js.map +1 -1
- package/package.json +2 -2
- package/src/cli/Index.ts +52 -0
- package/src/cli/shared/IndexAgentCommand.ts +3 -0
package/bin/cli/Index.js
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import { readFileSync } from "fs";
|
|
11
11
|
import { basename, dirname, join } from "path";
|
|
12
|
+
import { createRequire } from "module";
|
|
12
13
|
import { fileURLToPath } from "url";
|
|
13
14
|
import { Command, Option } from "commander";
|
|
14
15
|
import { registerAllPluginsForCli } from "@downcity/agent";
|
|
@@ -25,8 +26,37 @@ import { setCliVerbosity } from "./shared/CliReporter.js";
|
|
|
25
26
|
const __filename = fileURLToPath(import.meta.url);
|
|
26
27
|
const __dirname = dirname(__filename);
|
|
27
28
|
const cliPath = join(__dirname, "./Index.js");
|
|
29
|
+
const require = createRequire(import.meta.url);
|
|
28
30
|
const packageJson = JSON.parse(readFileSync(join(__dirname, "../../package.json"), "utf-8"));
|
|
31
|
+
/**
|
|
32
|
+
* 解析当前 city 安装所绑定的 agent runtime 版本号。
|
|
33
|
+
*
|
|
34
|
+
* 关键点（中文）
|
|
35
|
+
* - 这里读取的是 city 当前安装依赖中的 `@downcity/agent` 版本，
|
|
36
|
+
* 不是 workspace 源码目录里的 package.json。
|
|
37
|
+
* - 这样 `city agent -v` 才能反映“这份 city CLI 实际会驱动哪个 agent runtime”。
|
|
38
|
+
*/
|
|
39
|
+
function resolveInstalledAgentVersion() {
|
|
40
|
+
try {
|
|
41
|
+
const agentEntryPath = require.resolve("@downcity/agent");
|
|
42
|
+
const agentPackageJson = JSON.parse(readFileSync(join(dirname(agentEntryPath), "../package.json"), "utf-8"));
|
|
43
|
+
const version = String(agentPackageJson.version || "").trim();
|
|
44
|
+
return version || "unknown";
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
try {
|
|
48
|
+
const siblingAgentPackageJson = JSON.parse(readFileSync(join(__dirname, "../../../agent/package.json"), "utf-8"));
|
|
49
|
+
const version = String(siblingAgentPackageJson.version || "").trim();
|
|
50
|
+
return version || "unknown";
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return "unknown";
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const installedAgentVersion = resolveInstalledAgentVersion();
|
|
29
58
|
const program = new Command();
|
|
59
|
+
const argv = process.argv.slice(2);
|
|
30
60
|
program
|
|
31
61
|
.name(basename(process.argv[1] || "downcity"))
|
|
32
62
|
.description("把一个代码仓库，启动为一个拥有自主意识和执行能力的 Agent")
|
|
@@ -40,6 +70,7 @@ registerControlPlaneCommands(program, {
|
|
|
40
70
|
});
|
|
41
71
|
registerAgentCommands(program, {
|
|
42
72
|
version: packageJson.version,
|
|
73
|
+
agentVersion: installedAgentVersion,
|
|
43
74
|
hiddenPortOption: Option,
|
|
44
75
|
});
|
|
45
76
|
registerTokenCommand(program);
|
|
@@ -54,6 +85,19 @@ registerAllServicesForCli(program);
|
|
|
54
85
|
registerAllPluginsForCli(program);
|
|
55
86
|
program.showHelpAfterError();
|
|
56
87
|
program.showSuggestionAfterError();
|
|
88
|
+
/**
|
|
89
|
+
* 处理 `city agent -v/--version`。
|
|
90
|
+
*
|
|
91
|
+
* 关键点（中文）
|
|
92
|
+
* - commander 根命令会优先消费全局 `-v`，导致 `city agent -v` 默认只显示 city 版本。
|
|
93
|
+
* - 这里在 parse 前做一次显式分流，确保 agent 命令能返回双版本信息。
|
|
94
|
+
*/
|
|
95
|
+
if (argv[0] === "agent" &&
|
|
96
|
+
argv.length === 2 &&
|
|
97
|
+
(argv[1] === "-v" || argv[1] === "--version")) {
|
|
98
|
+
console.log(`city ${packageJson.version} (agent ${installedAgentVersion})`);
|
|
99
|
+
process.exit(0);
|
|
100
|
+
}
|
|
57
101
|
if (process.argv.length <= 2) {
|
|
58
102
|
program.outputHelp();
|
|
59
103
|
process.exit(0);
|
package/bin/cli/Index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Index.js","sourceRoot":"","sources":["../../src/cli/Index.ts"],"names":[],"mappings":";AAEA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Index.js","sourceRoot":"","sources":["../../src/cli/Index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ import type { Command, Option } from "commander";
|
|
|
12
12
|
export interface AgentCommandRegistrationContext {
|
|
13
13
|
/** 当前 CLI 版本号。 */
|
|
14
14
|
version: string;
|
|
15
|
+
/** 当前 city 绑定的 agent runtime 版本号。 */
|
|
16
|
+
agentVersion: string;
|
|
15
17
|
/** commander 的隐藏 Option 构造器。 */
|
|
16
18
|
hiddenPortOption: typeof Option;
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexAgentCommand.d.ts","sourceRoot":"","sources":["../../../src/cli/shared/IndexAgentCommand.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AA8BjD;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,kBAAkB;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,gBAAgB,EAAE,OAAO,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,+BAA+B,GACvC,IAAI,
|
|
1
|
+
{"version":3,"file":"IndexAgentCommand.d.ts","sourceRoot":"","sources":["../../../src/cli/shared/IndexAgentCommand.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AA8BjD;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,kBAAkB;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,gBAAgB,EAAE,OAAO,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,+BAA+B,GACvC,IAAI,CAwPN"}
|
|
@@ -28,6 +28,7 @@ export function registerAgentCommands(program, context) {
|
|
|
28
28
|
const agent = program
|
|
29
29
|
.command("agent")
|
|
30
30
|
.description("管理 Agent：创建/列出/启停/重启（无参数时启动交互式管理器）")
|
|
31
|
+
.version(`city ${context.version} (agent ${context.agentVersion})`, "-v, --version")
|
|
31
32
|
.helpOption("--help", "display help for command")
|
|
32
33
|
.action(createVersionBanner(context.version, async () => {
|
|
33
34
|
if (process.stdin.isTTY === true && process.stdout.isTTY === true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IndexAgentCommand.js","sourceRoot":"","sources":["../../../src/cli/shared/IndexAgentCommand.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EACL,kCAAkC,EAClC,+BAA+B,GAChC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,uBAAuB,EACvB,0BAA0B,EAC1B,cAAc,IAAI,oBAAoB,EACtC,aAAa,GACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,gCAAgC,EAChC,sBAAsB,GACvB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"IndexAgentCommand.js","sourceRoot":"","sources":["../../../src/cli/shared/IndexAgentCommand.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.18",
|
|
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.18"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/better-sqlite3": "^7.6.13",
|
package/src/cli/Index.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
|
|
12
12
|
import { readFileSync } from "fs";
|
|
13
13
|
import { basename, dirname, join } from "path";
|
|
14
|
+
import { createRequire } from "module";
|
|
14
15
|
import { fileURLToPath } from "url";
|
|
15
16
|
import { Command, Option } from "commander";
|
|
16
17
|
import { registerAllPluginsForCli } from "@downcity/agent";
|
|
@@ -28,12 +29,45 @@ import { setCliVerbosity } from "./shared/CliReporter.js";
|
|
|
28
29
|
const __filename = fileURLToPath(import.meta.url);
|
|
29
30
|
const __dirname = dirname(__filename);
|
|
30
31
|
const cliPath = join(__dirname, "./Index.js");
|
|
32
|
+
const require = createRequire(import.meta.url);
|
|
31
33
|
|
|
32
34
|
const packageJson = JSON.parse(
|
|
33
35
|
readFileSync(join(__dirname, "../../package.json"), "utf-8"),
|
|
34
36
|
) as { version: string };
|
|
35
37
|
|
|
38
|
+
/**
|
|
39
|
+
* 解析当前 city 安装所绑定的 agent runtime 版本号。
|
|
40
|
+
*
|
|
41
|
+
* 关键点（中文）
|
|
42
|
+
* - 这里读取的是 city 当前安装依赖中的 `@downcity/agent` 版本，
|
|
43
|
+
* 不是 workspace 源码目录里的 package.json。
|
|
44
|
+
* - 这样 `city agent -v` 才能反映“这份 city CLI 实际会驱动哪个 agent runtime”。
|
|
45
|
+
*/
|
|
46
|
+
function resolveInstalledAgentVersion(): string {
|
|
47
|
+
try {
|
|
48
|
+
const agentEntryPath = require.resolve("@downcity/agent");
|
|
49
|
+
const agentPackageJson = JSON.parse(
|
|
50
|
+
readFileSync(join(dirname(agentEntryPath), "../package.json"), "utf-8"),
|
|
51
|
+
) as { version?: string };
|
|
52
|
+
const version = String(agentPackageJson.version || "").trim();
|
|
53
|
+
return version || "unknown";
|
|
54
|
+
} catch {
|
|
55
|
+
try {
|
|
56
|
+
const siblingAgentPackageJson = JSON.parse(
|
|
57
|
+
readFileSync(join(__dirname, "../../../agent/package.json"), "utf-8"),
|
|
58
|
+
) as { version?: string };
|
|
59
|
+
const version = String(siblingAgentPackageJson.version || "").trim();
|
|
60
|
+
return version || "unknown";
|
|
61
|
+
} catch {
|
|
62
|
+
return "unknown";
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const installedAgentVersion = resolveInstalledAgentVersion();
|
|
68
|
+
|
|
36
69
|
const program = new Command();
|
|
70
|
+
const argv = process.argv.slice(2);
|
|
37
71
|
|
|
38
72
|
program
|
|
39
73
|
.name(basename(process.argv[1] || "downcity"))
|
|
@@ -52,6 +86,7 @@ registerControlPlaneCommands(program, {
|
|
|
52
86
|
|
|
53
87
|
registerAgentCommands(program, {
|
|
54
88
|
version: packageJson.version,
|
|
89
|
+
agentVersion: installedAgentVersion,
|
|
55
90
|
hiddenPortOption: Option,
|
|
56
91
|
});
|
|
57
92
|
registerTokenCommand(program);
|
|
@@ -69,6 +104,23 @@ registerAllPluginsForCli(program);
|
|
|
69
104
|
|
|
70
105
|
program.showHelpAfterError();
|
|
71
106
|
program.showSuggestionAfterError();
|
|
107
|
+
|
|
108
|
+
/**
|
|
109
|
+
* 处理 `city agent -v/--version`。
|
|
110
|
+
*
|
|
111
|
+
* 关键点（中文）
|
|
112
|
+
* - commander 根命令会优先消费全局 `-v`，导致 `city agent -v` 默认只显示 city 版本。
|
|
113
|
+
* - 这里在 parse 前做一次显式分流，确保 agent 命令能返回双版本信息。
|
|
114
|
+
*/
|
|
115
|
+
if (
|
|
116
|
+
argv[0] === "agent" &&
|
|
117
|
+
argv.length === 2 &&
|
|
118
|
+
(argv[1] === "-v" || argv[1] === "--version")
|
|
119
|
+
) {
|
|
120
|
+
console.log(`city ${packageJson.version} (agent ${installedAgentVersion})`);
|
|
121
|
+
process.exit(0);
|
|
122
|
+
}
|
|
123
|
+
|
|
72
124
|
if (process.argv.length <= 2) {
|
|
73
125
|
program.outputHelp();
|
|
74
126
|
process.exit(0);
|
|
@@ -42,6 +42,8 @@ import {
|
|
|
42
42
|
export interface AgentCommandRegistrationContext {
|
|
43
43
|
/** 当前 CLI 版本号。 */
|
|
44
44
|
version: string;
|
|
45
|
+
/** 当前 city 绑定的 agent runtime 版本号。 */
|
|
46
|
+
agentVersion: string;
|
|
45
47
|
/** commander 的隐藏 Option 构造器。 */
|
|
46
48
|
hiddenPortOption: typeof Option;
|
|
47
49
|
}
|
|
@@ -56,6 +58,7 @@ export function registerAgentCommands(
|
|
|
56
58
|
const agent = program
|
|
57
59
|
.command("agent")
|
|
58
60
|
.description("管理 Agent：创建/列出/启停/重启（无参数时启动交互式管理器）")
|
|
61
|
+
.version(`city ${context.version} (agent ${context.agentVersion})`, "-v, --version")
|
|
59
62
|
.helpOption("--help", "display help for command")
|
|
60
63
|
.action(createVersionBanner(context.version, async () => {
|
|
61
64
|
if (process.stdin.isTTY === true && process.stdout.isTTY === true) {
|