downcity 1.0.431 → 1.0.434
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/main/agent/AgentRuntime.d.ts.map +1 -1
- package/bin/main/agent/AgentRuntime.js +16 -6
- package/bin/main/agent/AgentRuntime.js.map +1 -1
- package/bin/main/modules/cli/Alias.d.ts.map +1 -1
- package/bin/main/modules/cli/Alias.js +43 -13
- package/bin/main/modules/cli/Alias.js.map +1 -1
- package/bin/main/modules/cli/CliReporter.d.ts.map +1 -0
- package/bin/main/modules/cli/CliReporter.js +233 -0
- package/bin/main/modules/cli/CliReporter.js.map +1 -0
- package/bin/main/modules/cli/Console.d.ts.map +1 -1
- package/bin/main/modules/cli/Console.js +61 -32
- package/bin/main/modules/cli/Console.js.map +1 -1
- package/bin/main/modules/cli/ConsoleAuthBootstrap.d.ts.map +1 -1
- package/bin/main/modules/cli/ConsoleAuthBootstrap.js +22 -9
- package/bin/main/modules/cli/ConsoleAuthBootstrap.js.map +1 -1
- package/bin/main/modules/cli/ConsoleInit.d.ts.map +1 -1
- package/bin/main/modules/cli/ConsoleInit.js +38 -4
- package/bin/main/modules/cli/ConsoleInit.js.map +1 -1
- package/bin/main/modules/cli/IndexAgentCommand.d.ts.map +1 -1
- package/bin/main/modules/cli/IndexAgentCommand.js +56 -13
- package/bin/main/modules/cli/IndexAgentCommand.js.map +1 -1
- package/bin/main/modules/cli/IndexConsoleProcess.d.ts.map +1 -1
- package/bin/main/modules/cli/IndexConsoleProcess.js +95 -42
- package/bin/main/modules/cli/IndexConsoleProcess.js.map +1 -1
- package/bin/main/modules/cli/IndexConsoleStatus.d.ts.map +1 -1
- package/bin/main/modules/cli/IndexConsoleStatus.js +84 -74
- package/bin/main/modules/cli/IndexConsoleStatus.js.map +1 -1
- package/bin/main/modules/cli/IndexSupport.d.ts.map +1 -1
- package/bin/main/modules/cli/IndexSupport.js +3 -1
- package/bin/main/modules/cli/IndexSupport.js.map +1 -1
- package/bin/main/modules/cli/Init.d.ts.map +1 -1
- package/bin/main/modules/cli/Init.js +128 -32
- package/bin/main/modules/cli/Init.js.map +1 -1
- package/bin/main/modules/cli/Restart.d.ts.map +1 -1
- package/bin/main/modules/cli/Restart.js +14 -4
- package/bin/main/modules/cli/Restart.js.map +1 -1
- package/bin/main/modules/cli/Start.d.ts.map +1 -1
- package/bin/main/modules/cli/Start.js +14 -4
- package/bin/main/modules/cli/Start.js.map +1 -1
- package/bin/main/modules/cli/Status.d.ts.map +1 -1
- package/bin/main/modules/cli/Status.js +59 -45
- package/bin/main/modules/cli/Status.js.map +1 -1
- package/bin/services/chat/runtime/ChatQueueWorker.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatQueueWorker.js +37 -6
- package/bin/services/chat/runtime/ChatQueueWorker.js.map +1 -1
- package/bin/services/chat/runtime/ChatSession.d.ts.map +1 -0
- package/bin/services/chat/runtime/ChatSession.js +77 -0
- package/bin/services/chat/runtime/ChatSession.js.map +1 -0
- package/bin/services/chat/runtime/ChatSessionExecutionComposer.d.ts.map +1 -0
- package/bin/services/chat/runtime/ChatSessionExecutionComposer.js +60 -0
- package/bin/services/chat/runtime/ChatSessionExecutionComposer.js.map +1 -0
- package/bin/session/Session.d.ts.map +1 -1
- package/bin/session/Session.js +11 -9
- package/bin/session/Session.js.map +1 -1
- package/bin/session/executors/local/LocalSessionExecutor.d.ts.map +1 -1
- package/bin/session/executors/local/LocalSessionExecutor.js +5 -4
- package/bin/session/executors/local/LocalSessionExecutor.js.map +1 -1
- package/bin/types/chat/ChatSession.d.ts.map +1 -0
- package/bin/types/chat/ChatSession.js +9 -0
- package/bin/types/chat/ChatSession.js.map +1 -0
- package/bin/types/cli/CliReporter.d.ts.map +1 -0
- package/bin/types/cli/CliReporter.js +10 -0
- package/bin/types/cli/CliReporter.js.map +1 -0
- package/package.json +1 -1
- package/test/chat/chat-queue-worker-step-only.test.mjs +156 -0
- package/test/main/cli-output.test.mjs +128 -0
- package/test/runtime/session-runtime-store.test.mjs +7 -12
- package/test/runtime/session-store.test.mjs +97 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentRuntime.d.ts","sourceRoot":"","sources":["../../../src/main/agent/AgentRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"AgentRuntime.d.ts","sourceRoot":"","sources":["../../../src/main/agent/AgentRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA2DH,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACxF,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA+B/D;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAUzC;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAanD;AA8CD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkJjE"}
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
import path from "path";
|
|
10
10
|
import fs from "fs";
|
|
11
11
|
import { logger as defaultLogger } from "../../shared/utils/logger/Logger.js";
|
|
12
|
-
import { Session } from "../../session/Session.js";
|
|
13
12
|
import { LocalSessionExecutor } from "../../session/executors/local/LocalSessionExecutor.js";
|
|
14
13
|
import { createModel } from "../../main/city/model/CreateModel.js";
|
|
15
14
|
import { loadGlobalEnvFromStore, loadAgentEnvSnapshot, loadDowncityConfig, } from "../../main/city/env/Config.js";
|
|
@@ -21,6 +20,8 @@ import { JsonlSessionHistoryComposer } from "../../session/composer/history/json
|
|
|
21
20
|
import { JsonlSessionCompactionComposer } from "../../session/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
|
|
22
21
|
import { DefaultSessionSystemComposer } from "../../session/composer/system/default/DefaultSessionSystemComposer.js";
|
|
23
22
|
import { AcpSessionExecutor } from "../../session/executors/acp/AcpSessionExecutor.js";
|
|
23
|
+
import { ChatSession } from "../../services/chat/runtime/ChatSession.js";
|
|
24
|
+
import { ChatSessionExecutionComposer } from "../../services/chat/runtime/ChatSessionExecutionComposer.js";
|
|
24
25
|
import { readEnabledSessionAgentConfig, resolveAcpLaunchConfig, } from "../../session/executors/acp/AcpLaunchConfig.js";
|
|
25
26
|
import { ensureRuntimeProjectReady } from "../../main/city/daemon/ProjectSetup.js";
|
|
26
27
|
import { loadStaticSystemPrompts, StaticPromptCatalog, } from "../../session/composer/system/default/StaticPromptCatalog.js";
|
|
@@ -206,25 +207,34 @@ export async function initAgentRuntime(cwd) {
|
|
|
206
207
|
const existing = sessionsById.get(key);
|
|
207
208
|
if (existing)
|
|
208
209
|
return existing;
|
|
209
|
-
const
|
|
210
|
+
const historyComposer = createSessionHistoryComposer(rootPath, key);
|
|
211
|
+
let created;
|
|
212
|
+
const executionComposer = new ChatSessionExecutionComposer({
|
|
210
213
|
sessionId: key,
|
|
211
|
-
|
|
212
|
-
|
|
214
|
+
getTools: () => shellTools,
|
|
215
|
+
getTurnState: () => created.getTurnState(),
|
|
216
|
+
});
|
|
217
|
+
created = new ChatSession({
|
|
218
|
+
sessionId: key,
|
|
219
|
+
historyComposer,
|
|
220
|
+
executionComposer,
|
|
221
|
+
createExecutor: (sessionHistoryComposer, chatExecutionComposer) => sessionAgent
|
|
213
222
|
? new AcpSessionExecutor({
|
|
214
223
|
rootPath,
|
|
215
224
|
sessionId: key,
|
|
216
225
|
logger: defaultLogger,
|
|
217
|
-
historyComposer,
|
|
226
|
+
historyComposer: sessionHistoryComposer,
|
|
218
227
|
systemComposer,
|
|
219
228
|
launch: resolveAcpLaunchConfig(sessionAgent),
|
|
220
229
|
})
|
|
221
230
|
: new LocalSessionExecutor({
|
|
222
231
|
model: model,
|
|
223
232
|
logger: defaultLogger,
|
|
224
|
-
historyComposer,
|
|
233
|
+
historyComposer: sessionHistoryComposer,
|
|
225
234
|
compactionComposer,
|
|
226
235
|
systemComposer,
|
|
227
236
|
getTools: () => shellTools,
|
|
237
|
+
executionComposer: chatExecutionComposer,
|
|
228
238
|
}),
|
|
229
239
|
});
|
|
230
240
|
sessionsById.set(key, created);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentRuntime.js","sourceRoot":"","sources":["../../../src/main/agent/AgentRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AgentRuntime.js","sourceRoot":"","sources":["../../../src/main/agent/AgentRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,aAAa,EACb,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gEAAgE,CAAC;AAC7G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sEAAsE,CAAC;AACtH,OAAO,EAAE,4BAA4B,EAAE,MAAM,kEAAkE,CAAC;AAEhH,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wDAAwD,CAAC;AACtG,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EACL,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,eAAe,GAChB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,mBAAmB,GAEpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC7F,OAAO,EACL,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,8BAA8B,GAC/B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAG7E,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,IAAI,mBAAmB,GAA+B,IAAI,CAAC;AAC3D,IAAI,eAAe,GAAkB,IAAI,CAAC;AAE1C;;GAEG;AACH,SAAS,iBAAiB,CAAC,WAAqB;IAC9C,MAAM,WAAW,GAAG,mBAAmB,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,CAAC;YACH,OAAO,eAAe,EAAE,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,mBAAmB,CAAC;QAClB,GAAG,WAAW;QACd,OAAO,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,IAAI,YAAY,EAAE,CAAC;QACjB,eAAe,CAAC;YACd,GAAG,YAAY;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,IAAI,mBAAmB,EAAE,CAAC;QACxB,mBAAmB,CAAC,IAAI,EAAE,CAAC;QAC3B,mBAAmB,GAAG,IAAI,CAAC;IAC7B,CAAC;IACD,IAAI,eAAe,EAAE,CAAC;QACpB,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAChC,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,iCAAiC,EAAE,CAAC;AACtC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB;IACvC,MAAM,WAAW,GAAG,mBAAmB,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,kBAAkB,CAAC,WAAW,CAAC,QAAQ,EAAE;QAC1D,UAAU,EAAE,WAAW,CAAC,GAAG;QAC3B,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,cAAc,KAAK,cAAc,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACrC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB;IAC1B,kBAAkB,EAAE,CAAC;IACrB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC;QAC5C,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,iBAAiB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,OAAO;QACtD,YAAY,EAAE,CAAC,WAAW,EAAE,EAAE;YAC5B,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;KACF,CAAC,CAAC;IACH,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAE5B,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7D,eAAe,GAAG,gBAAgB,CAAC;IACnC,EAAE,CAAC,SAAS,CACV,gBAAgB,EAChB;QACE,QAAQ,EAAE,GAAG;QACb,UAAU,EAAE,KAAK;KAClB,EACD,GAAG,EAAE;QACH,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;YAC5C,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE;oBACzC,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,IAAI,EAAE,gBAAgB;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE;gBACjD,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAW;IAChD,kBAAkB,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC;IAErB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;IACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,aAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACxC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG,sBAAsB,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,EAAE;QAC1C,UAAU;QACV,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3E,mBAAmB,CAAC;QAClB,GAAG,EAAE,WAAW;QAChB,QAAQ;QACR,MAAM,EAAE,aAAa;QACrB,MAAM;QACN,GAAG,EAAE,UAAU;QACf,SAAS;QACT,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QACvC,IAAI,EAAE,sBAAsB,EAAE;QAC9B,YAAY,EAAE,8BAA8B,CAAC,QAAQ,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAClD,mBAAmB,CAAC;QAClB,GAAG,EAAE,WAAW;QAChB,QAAQ;QACR,MAAM,EAAE,aAAa;QACrB,MAAM;QACN,GAAG,EAAE,UAAU;QACf,SAAS;QACT,OAAO;QACP,KAAK,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QACvC,IAAI,EAAE,sBAAsB,EAAE;QAC9B,YAAY,EAAE,8BAA8B,CAAC,QAAQ,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,KAAK,GACT,YAAY,IAAI,CAAC,cAAc;QAC7B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,WAAW,CAAC;YAChB,MAAM;YACN,kBAAkB,EAAE,kBAAkB;SACvC,CAAC,CAAC;IAET,MAAM,kBAAkB,GAAG,IAAI,8BAA8B,CAAC;QAC5D,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QAC5D,oBAAoB,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB;QACpE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB;QAC5D,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;KACrD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,4BAA4B,CAAC;QACtD,WAAW,EAAE,QAAQ;QACrB,sBAAsB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,OAAO;QAC3D,UAAU,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;QACnC,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAC;IACpD,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAe,EAAE;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,eAAe,GAAG,4BAA4B,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACpE,IAAI,OAAqB,CAAC;QAC1B,MAAM,iBAAiB,GAAG,IAAI,4BAA4B,CAAC;YACzD,SAAS,EAAE,GAAG;YACd,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;YAC1B,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE;SAC3C,CAAC,CAAC;QACH,OAAO,GAAG,IAAI,WAAW,CAAC;YACxB,SAAS,EAAE,GAAG;YACd,eAAe;YACf,iBAAiB;YACjB,cAAc,EAAE,CACd,sBAA8C,EAC9C,qBAAmD,EACnD,EAAE,CACF,YAAY;gBACV,CAAC,CAAC,IAAI,kBAAkB,CAAC;oBACrB,QAAQ;oBACR,SAAS,EAAE,GAAG;oBACd,MAAM,EAAE,aAAa;oBACrB,eAAe,EAAE,sBAAsB;oBACvC,cAAc;oBACd,MAAM,EAAE,sBAAsB,CAAC,YAAY,CAAC;iBAC7C,CAAC;gBACJ,CAAC,CAAC,IAAI,oBAAoB,CAAC;oBACvB,KAAK,EAAE,KAAkC;oBACzC,MAAM,EAAE,aAAa;oBACrB,eAAe,EAAE,sBAAsB;oBACvC,kBAAkB;oBAClB,cAAc;oBACd,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;oBAC1B,iBAAiB,EAAE,qBAAqB;iBACzC,CAAC;SACT,CAAC,CAAC;QACH,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAiB;QAC/B,GAAG,EAAE,WAAW;QAChB,QAAQ;QACR,MAAM,EAAE,aAAa;QACrB,MAAM;QACN,GAAG,EAAE,UAAU;QACf,SAAS;QACT,OAAO;QACP,KAAK,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QACvC,IAAI,EAAE,sBAAsB,EAAE;QAC9B,YAAY,EAAE,8BAA8B,CAAC,QAAQ,CAAC;QACtD,KAAK;QACL,UAAU;QACV,uBAAuB,EAAE,GAAG,EAAE,CAC5B,CAAC,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC;QACpC,wBAAwB,EAAE,GAAG,EAAE,CAC7B,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM;QAC9E,QAAQ,EAAE,IAAI,GAAG,EAAE;KACpB,CAAC;IACF,UAAU,CAAC,QAAQ,GAAG,gCAAgC,CAAC,UAAU,CAAC,CAAC;IAEnE,eAAe,CAAC,UAAU,CAAC,CAAC;IAC5B,+BAA+B,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;IACzD,uBAAuB,EAAE,CAAC;IAC1B,mBAAmB,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9C,mBAAmB,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,4BAA4B,CACnC,QAAgB,EAChB,SAAiB;IAEjB,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,SAAS;QACrB,CAAC,CAAC,CAAC,GAAG,EAAE;YACJ,MAAM,MAAM,GAAG,aAAa,CAC1B,QAAQ,EACR,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,SAAS,CACpB,CAAC;YACF,OAAO;gBACL,cAAc,EAAE,MAAM;aACvB,CAAC;QACJ,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,IAAI,2BAA2B,CAAC;QACrC,SAAS;QACT,QAAQ;QACR,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Alias.d.ts","sourceRoot":"","sources":["../../../../src/main/modules/cli/Alias.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"Alias.d.ts","sourceRoot":"","sources":["../../../../src/main/modules/cli/Alias.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH;;GAEG;AACH,UAAU,YAAY;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAoCD;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8E5E"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import os from "os";
|
|
9
9
|
import path from "path";
|
|
10
10
|
import fs from "fs-extra";
|
|
11
|
+
import { emitCliBlock, emitCliList } from "./CliReporter.js";
|
|
11
12
|
/**
|
|
12
13
|
* 幂等写入 alias block。
|
|
13
14
|
*
|
|
@@ -43,7 +44,14 @@ function upsertAliasBlock(content, aliasLines) {
|
|
|
43
44
|
export async function aliasCommand(options = {}) {
|
|
44
45
|
const aliasLines = [`alias city="downcity"`];
|
|
45
46
|
if (options.print) {
|
|
46
|
-
|
|
47
|
+
emitCliBlock({
|
|
48
|
+
tone: "info",
|
|
49
|
+
title: "Alias preview",
|
|
50
|
+
facts: aliasLines.map((line) => ({
|
|
51
|
+
label: "line",
|
|
52
|
+
value: line,
|
|
53
|
+
})),
|
|
54
|
+
});
|
|
47
55
|
return;
|
|
48
56
|
}
|
|
49
57
|
const shell = String(options.shell || "both").toLowerCase();
|
|
@@ -66,20 +74,42 @@ export async function aliasCommand(options = {}) {
|
|
|
66
74
|
changedFiles.push(rcPath);
|
|
67
75
|
}
|
|
68
76
|
if (options.dryRun) {
|
|
69
|
-
|
|
77
|
+
emitCliBlock({
|
|
78
|
+
tone: "info",
|
|
79
|
+
title: "Alias update preview",
|
|
80
|
+
summary: "dry run",
|
|
81
|
+
});
|
|
70
82
|
}
|
|
71
83
|
else {
|
|
72
|
-
|
|
84
|
+
emitCliBlock({
|
|
85
|
+
tone: "success",
|
|
86
|
+
title: "Alias written",
|
|
87
|
+
});
|
|
73
88
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
89
|
+
emitCliList({
|
|
90
|
+
tone: "accent",
|
|
91
|
+
title: "Updated",
|
|
92
|
+
items: changedFiles.map((item) => ({ title: item })),
|
|
93
|
+
});
|
|
94
|
+
if (skippedFiles.length > 0) {
|
|
95
|
+
emitCliList({
|
|
96
|
+
tone: "info",
|
|
97
|
+
title: "Skipped",
|
|
98
|
+
items: skippedFiles.map((item) => ({ title: item })),
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
emitCliList({
|
|
102
|
+
tone: "accent",
|
|
103
|
+
title: "Refresh shell",
|
|
104
|
+
items: [
|
|
105
|
+
...(targets.includes("zsh")
|
|
106
|
+
? [{ title: `source ${path.join(home, ".zshrc")}` }]
|
|
107
|
+
: []),
|
|
108
|
+
...(targets.includes("bash")
|
|
109
|
+
? [{ title: `source ${path.join(home, ".bashrc")}` }]
|
|
110
|
+
: []),
|
|
111
|
+
{ title: "或重新打开一个终端" },
|
|
112
|
+
],
|
|
113
|
+
});
|
|
84
114
|
}
|
|
85
115
|
//# sourceMappingURL=Alias.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Alias.js","sourceRoot":"","sources":["../../../../src/main/modules/cli/Alias.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Alias.js","sourceRoot":"","sources":["../../../../src/main/modules/cli/Alias.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CliReporter.d.ts","sourceRoot":"","sources":["../../../../src/main/modules/cli/CliReporter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EAEd,aAAa,EAGd,MAAM,4BAA4B,CAAC;AAyKpC;;GAEG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAwBR;AAuBD;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAgBR;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAiBD;;GAEG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,gBAAgB,GACzB,IAAI,CAEN;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,IAAI,CAEN;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,IAAI,CAEN;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAGR"}
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI Reporter：统一渲染 city 命令行输出。
|
|
3
|
+
*
|
|
4
|
+
* 关键点（中文）
|
|
5
|
+
* - 为 lifecycle 类命令提供稳定、统一、层级清晰的文本版式。
|
|
6
|
+
* - 将颜色、符号、对齐规则集中在这里，避免命令文件继续散落 `console.log` 模板串。
|
|
7
|
+
* - 保持纯函数输出，方便测试并保证非 TTY 场景仍可读。
|
|
8
|
+
*/
|
|
9
|
+
import chalk, { Chalk as ChalkConstructor } from "chalk";
|
|
10
|
+
const FACT_LABEL_MIN_WIDTH = 8;
|
|
11
|
+
const HEADLINE_WIDTH = 60;
|
|
12
|
+
const SECTION_DIVIDER = "─".repeat(HEADLINE_WIDTH);
|
|
13
|
+
let cliSectionPrinted = false;
|
|
14
|
+
/**
|
|
15
|
+
* 解析当前渲染应使用的 chalk 实例。
|
|
16
|
+
*/
|
|
17
|
+
function resolveChalk(options) {
|
|
18
|
+
if (options?.color === true) {
|
|
19
|
+
return new ChalkConstructor({ level: 1 });
|
|
20
|
+
}
|
|
21
|
+
if (options?.color === false) {
|
|
22
|
+
return new ChalkConstructor({ level: 0 });
|
|
23
|
+
}
|
|
24
|
+
return chalk;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* 解析语气对应的完整视觉调色板。
|
|
28
|
+
*/
|
|
29
|
+
function resolveTonePalette(tone, palette) {
|
|
30
|
+
switch (tone) {
|
|
31
|
+
case "success":
|
|
32
|
+
return {
|
|
33
|
+
title: palette.bold,
|
|
34
|
+
statusText: palette.black,
|
|
35
|
+
statusBackground: palette.bgGreen,
|
|
36
|
+
};
|
|
37
|
+
case "warning":
|
|
38
|
+
return {
|
|
39
|
+
title: palette.bold,
|
|
40
|
+
statusText: palette.black,
|
|
41
|
+
statusBackground: palette.bgYellow,
|
|
42
|
+
};
|
|
43
|
+
case "error":
|
|
44
|
+
return {
|
|
45
|
+
title: palette.bold,
|
|
46
|
+
statusText: palette.white,
|
|
47
|
+
statusBackground: palette.bgRed,
|
|
48
|
+
};
|
|
49
|
+
case "accent":
|
|
50
|
+
return {
|
|
51
|
+
title: palette.bold,
|
|
52
|
+
statusText: palette.black,
|
|
53
|
+
statusBackground: palette.bgCyan,
|
|
54
|
+
};
|
|
55
|
+
case "info":
|
|
56
|
+
default:
|
|
57
|
+
return {
|
|
58
|
+
title: palette.bold,
|
|
59
|
+
statusText: palette.white,
|
|
60
|
+
statusBackground: palette.bgBlue,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 计算详情标签列宽。
|
|
66
|
+
*/
|
|
67
|
+
function resolveFactLabelWidth(facts) {
|
|
68
|
+
return facts.reduce((maxWidth, item) => {
|
|
69
|
+
return Math.max(maxWidth, normalizeFactLabel(String(item.label || "").trim()).length);
|
|
70
|
+
}, FACT_LABEL_MIN_WIDTH);
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* 规范化详情标签。
|
|
74
|
+
*/
|
|
75
|
+
function normalizeFactLabel(label) {
|
|
76
|
+
return String(label || "").trim().toLowerCase();
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* 渲染详情键值对行。
|
|
80
|
+
*/
|
|
81
|
+
function formatFactLines(facts, indent, options) {
|
|
82
|
+
const palette = resolveChalk(options);
|
|
83
|
+
const labelWidth = resolveFactLabelWidth(facts);
|
|
84
|
+
return facts.map((item) => {
|
|
85
|
+
const label = normalizeFactLabel(String(item.label || "")).padEnd(labelWidth, " ");
|
|
86
|
+
const value = formatFactValue(item.value, options);
|
|
87
|
+
return `${indent}${palette.dim(label)} ${value}`;
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* 渲染标题行。
|
|
92
|
+
*/
|
|
93
|
+
function formatHeadingLine(params) {
|
|
94
|
+
const palette = resolveChalk(params.options);
|
|
95
|
+
const tonePalette = resolveTonePalette(params.tone, palette);
|
|
96
|
+
const title = tonePalette.title(params.title);
|
|
97
|
+
if (!params.summary) {
|
|
98
|
+
return title;
|
|
99
|
+
}
|
|
100
|
+
const plainSummary = String(params.summary).toUpperCase();
|
|
101
|
+
const statusChip = palette.bold(`[${plainSummary}]`);
|
|
102
|
+
const coloredChip = tonePalette.statusBackground(tonePalette.statusText(statusChip));
|
|
103
|
+
const spacing = Math.max(2, HEADLINE_WIDTH - params.title.length - statusChip.length);
|
|
104
|
+
return `${title}${" ".repeat(spacing)}${coloredChip}`;
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* 根据值内容做轻量语义高亮。
|
|
108
|
+
*/
|
|
109
|
+
function formatFactValue(value, options) {
|
|
110
|
+
const palette = resolveChalk(options);
|
|
111
|
+
const normalized = String(value || "");
|
|
112
|
+
if (/^https?:\/\//.test(normalized)) {
|
|
113
|
+
return palette.underline(normalized);
|
|
114
|
+
}
|
|
115
|
+
if (/^(started|stopped|ready|running)$/i.test(normalized)) {
|
|
116
|
+
return palette.green(normalized);
|
|
117
|
+
}
|
|
118
|
+
if (/^(already stopped|foreground)$/i.test(normalized)) {
|
|
119
|
+
return palette.blue(normalized);
|
|
120
|
+
}
|
|
121
|
+
if (/^(error|failed)$/i.test(normalized)) {
|
|
122
|
+
return palette.red(normalized);
|
|
123
|
+
}
|
|
124
|
+
return normalized;
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* 渲染单个信息区块。
|
|
128
|
+
*/
|
|
129
|
+
export function formatCliBlock(block, options) {
|
|
130
|
+
const tone = block.tone || "info";
|
|
131
|
+
const palette = resolveChalk(options);
|
|
132
|
+
const lines = [
|
|
133
|
+
formatHeadingLine({
|
|
134
|
+
tone,
|
|
135
|
+
title: block.title,
|
|
136
|
+
summary: block.summary,
|
|
137
|
+
options,
|
|
138
|
+
}),
|
|
139
|
+
];
|
|
140
|
+
if (Array.isArray(block.facts) && block.facts.length > 0) {
|
|
141
|
+
lines.push(...formatFactLines(block.facts, " ", options));
|
|
142
|
+
}
|
|
143
|
+
if (block.note) {
|
|
144
|
+
const noteLabel = normalizeFactLabel("note").padEnd(Math.max(FACT_LABEL_MIN_WIDTH, "note".length), " ");
|
|
145
|
+
lines.push(` ${palette.dim(noteLabel)} ${block.note}`);
|
|
146
|
+
}
|
|
147
|
+
return lines.join("\n");
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* 渲染列表项。
|
|
151
|
+
*/
|
|
152
|
+
function formatCliListItem(item, options) {
|
|
153
|
+
const tone = item.tone || "info";
|
|
154
|
+
const lines = [
|
|
155
|
+
` ${formatHeadingLine({
|
|
156
|
+
tone,
|
|
157
|
+
title: item.title,
|
|
158
|
+
options,
|
|
159
|
+
})}`,
|
|
160
|
+
];
|
|
161
|
+
if (Array.isArray(item.facts) && item.facts.length > 0) {
|
|
162
|
+
lines.push(...formatFactLines(item.facts, " ", options));
|
|
163
|
+
}
|
|
164
|
+
return lines;
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* 渲染列表分组。
|
|
168
|
+
*/
|
|
169
|
+
export function formatCliList(list, options) {
|
|
170
|
+
const tone = list.tone || "accent";
|
|
171
|
+
const lines = [
|
|
172
|
+
formatHeadingLine({
|
|
173
|
+
tone,
|
|
174
|
+
title: list.title,
|
|
175
|
+
summary: list.summary,
|
|
176
|
+
options,
|
|
177
|
+
}),
|
|
178
|
+
];
|
|
179
|
+
for (const item of list.items) {
|
|
180
|
+
lines.push(...formatCliListItem(item, options));
|
|
181
|
+
}
|
|
182
|
+
return lines.join("\n");
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* 重置当前命令的输出分组节奏。
|
|
186
|
+
*
|
|
187
|
+
* 关键点（中文）
|
|
188
|
+
* - 每次新的 CLI 命令开始输出前都应先重置。
|
|
189
|
+
* - 这样不同命令之间不会串联复用上一条命令的留白状态。
|
|
190
|
+
*/
|
|
191
|
+
export function resetCliSectionFlow() {
|
|
192
|
+
cliSectionPrinted = false;
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* 以统一节奏输出一个 section。
|
|
196
|
+
*
|
|
197
|
+
* 关键点（中文）
|
|
198
|
+
* - 第二个 section 起会自动插入一个空行，拉开模块层级。
|
|
199
|
+
* - 只负责打印节奏，不参与格式拼装。
|
|
200
|
+
*/
|
|
201
|
+
function emitCliSection(text) {
|
|
202
|
+
if (cliSectionPrinted) {
|
|
203
|
+
console.log(SECTION_DIVIDER);
|
|
204
|
+
}
|
|
205
|
+
console.log(text);
|
|
206
|
+
cliSectionPrinted = true;
|
|
207
|
+
}
|
|
208
|
+
/**
|
|
209
|
+
* 输出 header section。
|
|
210
|
+
*/
|
|
211
|
+
export function emitCliHeader(version, options) {
|
|
212
|
+
emitCliSection(formatCliHeader(version, options));
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* 输出 block section。
|
|
216
|
+
*/
|
|
217
|
+
export function emitCliBlock(block, options) {
|
|
218
|
+
emitCliSection(formatCliBlock(block, options));
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* 输出 list section。
|
|
222
|
+
*/
|
|
223
|
+
export function emitCliList(list, options) {
|
|
224
|
+
emitCliSection(formatCliList(list, options));
|
|
225
|
+
}
|
|
226
|
+
/**
|
|
227
|
+
* 渲染命令顶部 banner。
|
|
228
|
+
*/
|
|
229
|
+
export function formatCliHeader(version, options) {
|
|
230
|
+
const palette = resolveChalk(options);
|
|
231
|
+
return `${palette.bold("downcity")} ${palette.dim(`v${version}`)}`;
|
|
232
|
+
}
|
|
233
|
+
//# sourceMappingURL=CliReporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CliReporter.js","sourceRoot":"","sources":["../../../../src/main/modules/cli/CliReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Console.d.ts","sourceRoot":"","sources":["../../../../src/main/modules/cli/Console.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAmBH,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Console.d.ts","sourceRoot":"","sources":["../../../../src/main/modules/cli/Console.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAmBH,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAMnC;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS7D;AAgDD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,IAAI,CAcP;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,QAAQ,EAAE;IACR,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GACA;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,IAAI,CAgBP;AA2CD;;GAEG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CA4C7E;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GhB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,CAAC,EAAE;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDhB"}
|
|
@@ -11,6 +11,7 @@ import { getCityRuntimeDirPath, getConsoleLogPath, getConsoleMetaPath, getConsol
|
|
|
11
11
|
import { isCityProcessAlive, isCityRunning, } from "../../../main/city/runtime/CityRuntime.js";
|
|
12
12
|
import { findDetachedCityProcesses, sweepDetachedCityProcesses, } from "../../../main/city/runtime/ProcessSweep.js";
|
|
13
13
|
import { createConsoleGateway } from "../../../main/modules/console/ConsoleGateway.js";
|
|
14
|
+
import { emitCliBlock } from "./CliReporter.js";
|
|
14
15
|
const DEFAULT_CONSOLE_HOST = "127.0.0.1";
|
|
15
16
|
const DEFAULT_CONSOLE_PORT = 5315;
|
|
16
17
|
/**
|
|
@@ -208,8 +209,18 @@ export async function runConsoleRuntimeCommand(options) {
|
|
|
208
209
|
const gateway = createConsoleGateway();
|
|
209
210
|
await gateway.start({ host, port });
|
|
210
211
|
const visibleHost = normalizeHost(host);
|
|
211
|
-
|
|
212
|
-
|
|
212
|
+
emitCliBlock({
|
|
213
|
+
tone: "success",
|
|
214
|
+
title: "Console started",
|
|
215
|
+
summary: "foreground",
|
|
216
|
+
facts: [
|
|
217
|
+
{
|
|
218
|
+
label: "URL",
|
|
219
|
+
value: `http://${visibleHost}:${port}`,
|
|
220
|
+
},
|
|
221
|
+
],
|
|
222
|
+
note: "单个 Console 实例可切换查看多个已运行 agent。",
|
|
223
|
+
});
|
|
213
224
|
const shutdown = async (signal) => {
|
|
214
225
|
console.log(`\nReceived ${signal}, stopping console...`);
|
|
215
226
|
await gateway.stop();
|
|
@@ -232,11 +243,18 @@ export async function startConsoleCommand(params) {
|
|
|
232
243
|
}
|
|
233
244
|
const status = await getConsoleRuntimeStatus();
|
|
234
245
|
if (status.running) {
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
246
|
+
emitCliBlock({
|
|
247
|
+
tone: "info",
|
|
248
|
+
title: "Console already running",
|
|
249
|
+
facts: status.url
|
|
250
|
+
? [
|
|
251
|
+
{
|
|
252
|
+
label: "URL",
|
|
253
|
+
value: status.url,
|
|
254
|
+
},
|
|
255
|
+
]
|
|
256
|
+
: [],
|
|
257
|
+
});
|
|
240
258
|
return;
|
|
241
259
|
}
|
|
242
260
|
// 关键点（中文）：没有 pid 文件但可能还有旧版 UI 孤儿进程占着端口，先做一次兜底清扫。
|
|
@@ -244,10 +262,16 @@ export async function startConsoleCommand(params) {
|
|
|
244
262
|
includeUi: true,
|
|
245
263
|
});
|
|
246
264
|
for (const item of sweep.stopped) {
|
|
247
|
-
|
|
265
|
+
emitCliBlock({
|
|
266
|
+
tone: "warning",
|
|
267
|
+
title: "Orphan Console process cleaned",
|
|
268
|
+
});
|
|
248
269
|
}
|
|
249
270
|
for (const item of sweep.alive) {
|
|
250
|
-
|
|
271
|
+
emitCliBlock({
|
|
272
|
+
tone: "warning",
|
|
273
|
+
title: "Orphan Console process still alive",
|
|
274
|
+
});
|
|
251
275
|
}
|
|
252
276
|
const host = String(params.options?.host || DEFAULT_CONSOLE_HOST).trim() || DEFAULT_CONSOLE_HOST;
|
|
253
277
|
const port = typeof params.options?.port === "number" && Number.isInteger(params.options.port)
|
|
@@ -291,10 +315,16 @@ export async function startConsoleCommand(params) {
|
|
|
291
315
|
await cleanupConsoleStateFiles();
|
|
292
316
|
throw new Error(`Console exited before becoming ready. Please check log: ${logPath}`);
|
|
293
317
|
}
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
318
|
+
emitCliBlock({
|
|
319
|
+
tone: "success",
|
|
320
|
+
title: "Console started",
|
|
321
|
+
facts: [
|
|
322
|
+
{
|
|
323
|
+
label: "URL",
|
|
324
|
+
value: `http://${normalizeHost(host)}:${port}`,
|
|
325
|
+
},
|
|
326
|
+
],
|
|
327
|
+
});
|
|
298
328
|
}
|
|
299
329
|
/**
|
|
300
330
|
* 重启后台 Console。
|
|
@@ -320,20 +350,23 @@ export async function stopConsoleCommand(params) {
|
|
|
320
350
|
});
|
|
321
351
|
if (sweep.stopped.length > 0 || sweep.alive.length > 0) {
|
|
322
352
|
for (const item of sweep.stopped) {
|
|
323
|
-
|
|
324
|
-
|
|
353
|
+
emitCliBlock({
|
|
354
|
+
tone: "success",
|
|
355
|
+
title: "Orphan Console stopped",
|
|
356
|
+
});
|
|
325
357
|
}
|
|
326
358
|
for (const item of sweep.alive) {
|
|
327
|
-
|
|
328
|
-
|
|
359
|
+
emitCliBlock({
|
|
360
|
+
tone: "warning",
|
|
361
|
+
title: "Orphan Console may still be running",
|
|
362
|
+
});
|
|
329
363
|
}
|
|
330
|
-
console.log(` pidFile: ${status.pidPath}`);
|
|
331
|
-
console.log(` log: ${status.logPath}`);
|
|
332
364
|
return;
|
|
333
365
|
}
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
366
|
+
emitCliBlock({
|
|
367
|
+
tone: "info",
|
|
368
|
+
title: "Console not running",
|
|
369
|
+
});
|
|
337
370
|
return;
|
|
338
371
|
}
|
|
339
372
|
const pid = status.pid;
|
|
@@ -353,15 +386,11 @@ export async function stopConsoleCommand(params) {
|
|
|
353
386
|
}
|
|
354
387
|
}
|
|
355
388
|
await cleanupConsoleStateFiles();
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
console.log(` pid: ${pid}`);
|
|
363
|
-
}
|
|
364
|
-
console.log(` pidFile: ${getConsolePidPath()}`);
|
|
365
|
-
console.log(` log: ${getConsoleLogPath()}`);
|
|
389
|
+
emitCliBlock({
|
|
390
|
+
tone: isCityProcessAlive(pid) ? "warning" : "success",
|
|
391
|
+
title: isCityProcessAlive(pid)
|
|
392
|
+
? "Console may still be running"
|
|
393
|
+
: "Console stopped",
|
|
394
|
+
});
|
|
366
395
|
}
|
|
367
396
|
//# sourceMappingURL=Console.js.map
|