downcity 1.0.322 → 1.0.335
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/agent/context/manager/ContextManager.d.ts.map +1 -1
- package/bin/agent/context/manager/ContextManager.js +42 -5
- package/bin/agent/context/manager/ContextManager.js.map +1 -1
- package/bin/agent/context/manager/RuntimeState.d.ts.map +1 -1
- package/bin/agent/context/manager/RuntimeState.js +15 -29
- package/bin/agent/context/manager/RuntimeState.js.map +1 -1
- package/bin/agent/prompts/system/assets/core.prompt.txt +9 -7
- package/bin/agent/tools/shell/ShellHelpers.d.ts.map +1 -1
- package/bin/agent/tools/shell/ShellHelpers.js +30 -267
- package/bin/agent/tools/shell/ShellHelpers.js.map +1 -1
- package/bin/agent/tools/shell/Tool.d.ts.map +1 -1
- package/bin/agent/tools/shell/Tool.js +475 -195
- package/bin/agent/tools/shell/Tool.js.map +1 -1
- package/bin/agent/types/Shell.d.ts.map +1 -1
- package/bin/agent/types/Shell.js +2 -2
- package/bin/agent/types/ShipConfig.d.ts.map +1 -1
- package/bin/console/constants/Ship.js +1 -1
- package/bin/console/constants/Ship.js.map +1 -1
- package/bin/console/constants/ShipSchema.js +1 -1
- package/bin/console/constants/ShipSchema.js.map +1 -1
- package/bin/console/plugin/HookRegistry.d.ts.map +1 -1
- package/bin/console/plugin/HookRegistry.js +112 -35
- package/bin/console/plugin/HookRegistry.js.map +1 -1
- package/bin/console/plugin/PluginRegistry.d.ts.map +1 -1
- package/bin/console/plugin/PluginRegistry.js +41 -9
- package/bin/console/plugin/PluginRegistry.js.map +1 -1
- package/bin/console/service/ServiceRuntime.d.ts.map +1 -1
- package/bin/console/service/Services.d.ts.map +1 -1
- package/bin/console/service/Services.js +2 -0
- package/bin/console/service/Services.js.map +1 -1
- package/bin/console/ui/PluginApiRoutes.d.ts.map +1 -1
- package/bin/console/ui/PluginApiRoutes.js +55 -8
- package/bin/console/ui/PluginApiRoutes.js.map +1 -1
- package/bin/console/ui/dashboard/ContextRoutes.d.ts.map +1 -1
- package/bin/console/ui/dashboard/ContextRoutes.js +3 -0
- package/bin/console/ui/dashboard/ContextRoutes.js.map +1 -1
- package/bin/console/ui/dashboard/ContextStore.d.ts.map +1 -1
- package/bin/console/ui/dashboard/ContextStore.js +1 -0
- package/bin/console/ui/dashboard/ContextStore.js.map +1 -1
- package/bin/console/ui/dashboard/ExecuteByContext.js +4 -4
- package/bin/console/ui/dashboard/ExecuteByContext.js.map +1 -1
- package/bin/plugins/auth/Api.js +1 -1
- package/bin/plugins/auth/Plugin.d.ts.map +1 -1
- package/bin/plugins/auth/Plugin.js +50 -36
- package/bin/plugins/auth/Plugin.js.map +1 -1
- package/bin/plugins/auth/Runtime.d.ts.map +1 -1
- package/bin/plugins/auth/Runtime.js +3 -73
- package/bin/plugins/auth/Runtime.js.map +1 -1
- package/bin/plugins/voice/Plugin.d.ts.map +1 -1
- package/bin/plugins/voice/Plugin.js +67 -22
- package/bin/plugins/voice/Plugin.js.map +1 -1
- package/bin/services/chat/channels/BaseChatChannel.d.ts.map +1 -1
- package/bin/services/chat/channels/BaseChatChannel.js +144 -41
- package/bin/services/chat/channels/BaseChatChannel.js.map +1 -1
- package/bin/services/chat/channels/feishu/Feishu.d.ts.map +1 -1
- package/bin/services/chat/channels/feishu/Feishu.js +86 -13
- package/bin/services/chat/channels/feishu/Feishu.js.map +1 -1
- package/bin/services/chat/channels/feishu/ReplyContext.d.ts.map +1 -0
- package/bin/services/chat/channels/feishu/ReplyContext.js +56 -0
- package/bin/services/chat/channels/feishu/ReplyContext.js.map +1 -0
- package/bin/services/chat/channels/qq/QQ.d.ts.map +1 -1
- package/bin/services/chat/channels/qq/QQ.js +43 -15
- package/bin/services/chat/channels/qq/QQ.js.map +1 -1
- package/bin/services/chat/channels/qq/VoiceInput.d.ts.map +1 -1
- package/bin/services/chat/channels/qq/VoiceInput.js +13 -100
- package/bin/services/chat/channels/qq/VoiceInput.js.map +1 -1
- package/bin/services/chat/channels/telegram/Bot.d.ts.map +1 -1
- package/bin/services/chat/channels/telegram/Bot.js +32 -22
- package/bin/services/chat/channels/telegram/Bot.js.map +1 -1
- package/bin/services/chat/channels/telegram/ReplyContext.d.ts.map +1 -0
- package/bin/services/chat/channels/telegram/ReplyContext.js +57 -0
- package/bin/services/chat/channels/telegram/ReplyContext.js.map +1 -0
- package/bin/services/chat/channels/telegram/Shared.d.ts.map +1 -1
- package/bin/services/chat/channels/telegram/Shared.js.map +1 -1
- package/bin/services/chat/runtime/ChatIngressStore.d.ts.map +1 -0
- package/bin/services/chat/runtime/ChatIngressStore.js +66 -0
- package/bin/services/chat/runtime/ChatIngressStore.js.map +1 -0
- package/bin/services/chat/runtime/ChatQueueWorker.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatQueueWorker.js +91 -8
- package/bin/services/chat/runtime/ChatQueueWorker.js.map +1 -1
- package/bin/services/chat/runtime/EnqueueDispatch.d.ts.map +1 -0
- package/bin/services/chat/runtime/EnqueueDispatch.js +28 -0
- package/bin/services/chat/runtime/EnqueueDispatch.js.map +1 -0
- package/bin/services/chat/runtime/InboundAugment.d.ts.map +1 -0
- package/bin/services/chat/runtime/InboundAugment.js +50 -0
- package/bin/services/chat/runtime/InboundAugment.js.map +1 -0
- package/bin/services/chat/runtime/PluginPoints.d.ts.map +1 -0
- package/bin/services/chat/runtime/PluginPoints.js +78 -0
- package/bin/services/chat/runtime/PluginPoints.js.map +1 -0
- package/bin/services/chat/runtime/PluginRuntime.d.ts.map +1 -0
- package/bin/services/chat/runtime/PluginRuntime.js +57 -0
- package/bin/services/chat/runtime/PluginRuntime.js.map +1 -0
- package/bin/services/chat/runtime/ReplyContextFormatter.d.ts.map +1 -0
- package/bin/services/chat/runtime/ReplyContextFormatter.js +74 -0
- package/bin/services/chat/runtime/ReplyContextFormatter.js.map +1 -0
- package/bin/services/chat/runtime/ReplyDispatch.d.ts.map +1 -0
- package/bin/services/chat/runtime/ReplyDispatch.js +51 -0
- package/bin/services/chat/runtime/ReplyDispatch.js.map +1 -0
- package/bin/services/chat/types/ChatQueue.d.ts.map +1 -1
- package/bin/services/chat/types/ReplyContext.d.ts.map +1 -0
- package/bin/services/chat/types/ReplyContext.js +10 -0
- package/bin/services/chat/types/ReplyContext.js.map +1 -0
- package/bin/services/shell/Index.d.ts.map +1 -0
- package/bin/services/shell/Index.js +85 -0
- package/bin/services/shell/Index.js.map +1 -0
- package/bin/services/shell/runtime/Paths.d.ts.map +1 -0
- package/bin/services/shell/runtime/Paths.js +21 -0
- package/bin/services/shell/runtime/Paths.js.map +1 -0
- package/bin/services/shell/runtime/SessionStore.d.ts.map +1 -0
- package/bin/services/shell/runtime/SessionStore.js +724 -0
- package/bin/services/shell/runtime/SessionStore.js.map +1 -0
- package/bin/services/shell/types/ShellService.d.ts.map +1 -0
- package/bin/services/shell/types/ShellService.js +9 -0
- package/bin/services/shell/types/ShellService.js.map +1 -0
- package/bin/types/AuthPlugin.d.ts.map +1 -1
- package/bin/types/AuthPlugin.js +8 -7
- package/bin/types/AuthPlugin.js.map +1 -1
- package/bin/types/ChatPlugin.d.ts.map +1 -0
- package/bin/types/ChatPlugin.js +10 -0
- package/bin/types/ChatPlugin.js.map +1 -0
- package/bin/types/DashboardData.d.ts.map +1 -1
- package/bin/types/Plugin.d.ts.map +1 -1
- package/bin/types/Plugin.js +1 -1
- package/bin/types/PluginApi.d.ts.map +1 -1
- package/bin/utils/logger/Format.js +1 -1
- package/bin/utils/logger/Format.js.map +1 -1
- package/package.json +1 -1
- package/public/app.js +68 -68
- package/public/styles.css +1 -1
- package/src/agent/prompts/system/assets/core.prompt.txt +9 -7
- package/src/types/README.md +1 -1
- package/test/chat/enqueue-dispatch.test.mjs +83 -0
- package/test/chat/qq-voice-input.test.mjs +91 -78
- package/test/chat/reply-context.test.mjs +110 -0
- package/test/chat/reply-dispatch.test.mjs +67 -0
- package/test/chat/telegram-voice-input.test.mjs +65 -58
- package/test/logger/format.test.mjs +35 -8
- package/test/plugin/voice-plugin.test.mjs +5 -11
- package/test/runtime/shell-env.test.mjs +1 -1
- package/test/runtime/shell-service.test.mjs +110 -0
- package/bin/agent/tools/shell/ShellContextManager.d.ts.map +0 -1
- package/bin/agent/tools/shell/ShellContextManager.js +0 -168
- package/bin/agent/tools/shell/ShellContextManager.js.map +0 -1
- package/bin/agent/tools/shell/ShellResponse.d.ts.map +0 -1
- package/bin/agent/tools/shell/ShellResponse.js +0 -34
- package/bin/agent/tools/shell/ShellResponse.js.map +0 -1
- package/bin/console/plugin/CapabilityRegistry.d.ts.map +0 -1
- package/bin/console/plugin/CapabilityRegistry.js +0 -82
- package/bin/console/plugin/CapabilityRegistry.js.map +0 -1
- package/bin/services/chat/channels/telegram/VoiceInput.d.ts.map +0 -1
- package/bin/services/chat/channels/telegram/VoiceInput.js +0 -63
- package/bin/services/chat/channels/telegram/VoiceInput.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextManager.d.ts","sourceRoot":"","sources":["../../../../src/agent/context/manager/ContextManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EACV,gBAAgB,EAEjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAEhG;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAuC;
|
|
1
|
+
{"version":3,"file":"ContextManager.d.ts","sourceRoot":"","sources":["../../../../src/agent/context/manager/ContextManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EACV,gBAAgB,EAEjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAEhG;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAuC;IAC/E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA0B;IAE9D;;OAEG;gBACS,MAAM,EAAE;QAClB,UAAU,EAAE,sBAAsB,CAAC;QACnC,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KAC/D;IAKD;;OAEG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM;IAI1B;;;;;;OAMG;IACG,GAAG,CAAC,MAAM,EAAE;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,cAAc,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KACpD,GAAG,OAAO,CAAC,WAAW,CAAC;IAsBxB;;OAEG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAM9C;;OAEG;IACH,uBAAuB,IAAI,MAAM,EAAE;IAInC;;OAEG;IACH,wBAAwB,IAAI,MAAM;IAIlC;;OAEG;IACH,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAIpC;;OAEG;IACG,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE;;OAEG;IACG,iBAAiB,CAAC,MAAM,EAAE;QAC9B,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BjB;;OAEG;IACG,sBAAsB,CAAC,MAAM,EAAE;QACnC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;CAiClB"}
|
|
@@ -13,6 +13,7 @@ import { withRequestContext } from "../../context/manager/RequestContext.js";
|
|
|
13
13
|
export class ContextManager {
|
|
14
14
|
dispatcher;
|
|
15
15
|
runAfterContextUpdated;
|
|
16
|
+
executingContextIds = new Set();
|
|
16
17
|
/**
|
|
17
18
|
* 构造函数:装配组件。
|
|
18
19
|
*/
|
|
@@ -47,10 +48,37 @@ export class ContextManager {
|
|
|
47
48
|
const query = String(params.query || "").trim();
|
|
48
49
|
const agent = this.dispatcher.getAgent(contextId);
|
|
49
50
|
const requestContext = params.requestContext || {};
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
this.executingContextIds.add(contextId);
|
|
52
|
+
try {
|
|
53
|
+
return await withRequestContext({
|
|
54
|
+
contextId,
|
|
55
|
+
...requestContext,
|
|
56
|
+
}, () => agent.run({ query }));
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
this.executingContextIds.delete(contextId);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* 判断指定 context 是否正在执行。
|
|
64
|
+
*/
|
|
65
|
+
isContextExecuting(contextId) {
|
|
66
|
+
const key = String(contextId || "").trim();
|
|
67
|
+
if (!key)
|
|
68
|
+
return false;
|
|
69
|
+
return this.executingContextIds.has(key);
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* 返回当前正在执行的 context id 列表。
|
|
73
|
+
*/
|
|
74
|
+
listExecutingContextIds() {
|
|
75
|
+
return [...this.executingContextIds];
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* 返回当前执行中的 context 数量。
|
|
79
|
+
*/
|
|
80
|
+
getExecutingContextCount() {
|
|
81
|
+
return this.executingContextIds.size;
|
|
54
82
|
}
|
|
55
83
|
/**
|
|
56
84
|
* 清理 ContextAgent 缓存。
|
|
@@ -83,8 +111,17 @@ export class ContextManager {
|
|
|
83
111
|
return;
|
|
84
112
|
try {
|
|
85
113
|
const persistor = this.dispatcher.getPersistor(contextId);
|
|
114
|
+
const message = params.message;
|
|
115
|
+
if (message && typeof message === "object") {
|
|
116
|
+
await persistor.append(message);
|
|
117
|
+
void this.afterContextUpdatedAsync(contextId);
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const fallbackText = String(params.text || "").trim();
|
|
121
|
+
if (!fallbackText)
|
|
122
|
+
return;
|
|
86
123
|
const msg = persistor.userText({
|
|
87
|
-
text:
|
|
124
|
+
text: fallbackText,
|
|
88
125
|
metadata: {
|
|
89
126
|
contextId,
|
|
90
127
|
requestId: params.requestId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextManager.js","sourceRoot":"","sources":["../../../../src/agent/context/manager/ContextManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAU9E;;GAEG;AACH,MAAM,OAAO,cAAc;IACR,UAAU,CAAyB;IACnC,sBAAsB,CAAwC;
|
|
1
|
+
{"version":3,"file":"ContextManager.js","sourceRoot":"","sources":["../../../../src/agent/context/manager/ContextManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeState.d.ts","sourceRoot":"","sources":["../../../../src/agent/context/manager/RuntimeState.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAI1E,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"RuntimeState.d.ts","sourceRoot":"","sources":["../../../../src/agent/context/manager/RuntimeState.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAI1E,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,yBAAyB,CAAC;AAoCjC;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAsDF;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAI3C;AAuMD;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,cAAc,CAEvD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,cAAc,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAGhE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAGxD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAKtD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAU9C;AAED;;;;;;;;GAQG;AAEH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsIjE"}
|
|
@@ -6,7 +6,6 @@ import { createModel } from "../../../console/model/CreateModel.js";
|
|
|
6
6
|
import { loadGlobalEnvFromStore, loadAgentRuntimeEnv, loadShipConfig, } from "../../../console/env/Config.js";
|
|
7
7
|
import { getTaskRunDir, parseTaskRunContextId, } from "../../../services/task/runtime/Paths.js";
|
|
8
8
|
import { runServiceCommand } from "../../../console/service/Manager.js";
|
|
9
|
-
import { CapabilityRegistry } from "../../../console/plugin/CapabilityRegistry.js";
|
|
10
9
|
import { HookRegistry } from "../../../console/plugin/HookRegistry.js";
|
|
11
10
|
import { AssetRegistry } from "../../../console/plugin/AssetRegistry.js";
|
|
12
11
|
import { PluginRegistry } from "../../../console/plugin/PluginRegistry.js";
|
|
@@ -23,12 +22,10 @@ let base = null;
|
|
|
23
22
|
let ready = null;
|
|
24
23
|
let promptRuntime = null;
|
|
25
24
|
let serviceModel = null;
|
|
26
|
-
const capabilityRegistry = new CapabilityRegistry(() => getPluginRuntimeState());
|
|
27
25
|
const hookRegistry = new HookRegistry(() => getPluginRuntimeState());
|
|
28
26
|
const assetRegistry = new AssetRegistry(() => getPluginRuntimeState());
|
|
29
27
|
const pluginRegistry = new PluginRegistry({
|
|
30
28
|
runtimeResolver: () => getPluginRuntimeState(),
|
|
31
|
-
capabilityRegistry,
|
|
32
29
|
hookRegistry,
|
|
33
30
|
assetRegistry,
|
|
34
31
|
});
|
|
@@ -133,24 +130,6 @@ const serviceInvokePort = {
|
|
|
133
130
|
};
|
|
134
131
|
},
|
|
135
132
|
};
|
|
136
|
-
/**
|
|
137
|
-
* capability 调用端口实现。
|
|
138
|
-
*
|
|
139
|
-
* 关键点(中文)
|
|
140
|
-
* - 主动能力调用统一通过 capability 名称路由。
|
|
141
|
-
* - 这是新插件体系最核心的显式调用入口。
|
|
142
|
-
*/
|
|
143
|
-
const capabilityInvokePort = {
|
|
144
|
-
list() {
|
|
145
|
-
return capabilityRegistry.list();
|
|
146
|
-
},
|
|
147
|
-
has(capabilityName) {
|
|
148
|
-
return capabilityRegistry.has(capabilityName);
|
|
149
|
-
},
|
|
150
|
-
async invoke(params) {
|
|
151
|
-
return capabilityRegistry.invoke(params);
|
|
152
|
-
},
|
|
153
|
-
};
|
|
154
133
|
/**
|
|
155
134
|
* asset 调用端口实现。
|
|
156
135
|
*
|
|
@@ -195,6 +174,18 @@ const pluginPort = {
|
|
|
195
174
|
async runAction(params) {
|
|
196
175
|
return pluginRegistry.runAction(params);
|
|
197
176
|
},
|
|
177
|
+
async pipeline(pointName, value) {
|
|
178
|
+
return pluginRegistry.pipeline(pointName, value);
|
|
179
|
+
},
|
|
180
|
+
async guard(pointName, value) {
|
|
181
|
+
return pluginRegistry.guard(pointName, value);
|
|
182
|
+
},
|
|
183
|
+
async effect(pointName, value) {
|
|
184
|
+
return pluginRegistry.effect(pointName, value);
|
|
185
|
+
},
|
|
186
|
+
async resolve(pointName, value) {
|
|
187
|
+
return pluginRegistry.resolve(pointName, value);
|
|
188
|
+
},
|
|
198
189
|
};
|
|
199
190
|
/**
|
|
200
191
|
* 构建 service context(会话管理 + 模型)。
|
|
@@ -244,7 +235,6 @@ function buildServiceRuntime(input) {
|
|
|
244
235
|
context: buildServiceContext(input),
|
|
245
236
|
invoke: serviceInvokePort,
|
|
246
237
|
services: serviceInvokePort,
|
|
247
|
-
capabilities: capabilityInvokePort,
|
|
248
238
|
assets: assetPort,
|
|
249
239
|
plugins: pluginPort,
|
|
250
240
|
};
|
|
@@ -354,13 +344,6 @@ export async function initRuntimeState(cwd) {
|
|
|
354
344
|
env: projectEnv,
|
|
355
345
|
systems,
|
|
356
346
|
});
|
|
357
|
-
// 关键点(中文):在 runtime 初始化阶段注入 shell 所需快照,避免 tools/shell 反向依赖 RuntimeState。
|
|
358
|
-
setShellToolRuntime({
|
|
359
|
-
rootPath,
|
|
360
|
-
config,
|
|
361
|
-
globalEnv,
|
|
362
|
-
agentEnv: projectEnv,
|
|
363
|
-
});
|
|
364
347
|
// 关键点(中文):模型实例在 main 启动时创建一次,并注入给 services 复用。
|
|
365
348
|
// 模型是 ServiceContext 必需能力,初始化失败直接中断启动(fail-fast)。
|
|
366
349
|
serviceModel = null;
|
|
@@ -437,6 +420,9 @@ export async function initRuntimeState(cwd) {
|
|
|
437
420
|
systems,
|
|
438
421
|
contextManager,
|
|
439
422
|
});
|
|
423
|
+
setShellToolRuntime({
|
|
424
|
+
invokeService: (params) => serviceInvokePort.invoke(params),
|
|
425
|
+
});
|
|
440
426
|
startRuntimeHotReload();
|
|
441
427
|
}
|
|
442
428
|
//# sourceMappingURL=RuntimeState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeState.js","sourceRoot":"","sources":["../../../../src/agent/context/manager/RuntimeState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAe,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAM5D,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,GAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,aAAa,EACb,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RuntimeState.js","sourceRoot":"","sources":["../../../../src/agent/context/manager/RuntimeState.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,13 +22,15 @@
|
|
|
22
22
|
|
|
23
23
|
# 最重要
|
|
24
24
|
【关于命令执行工具】(重要)
|
|
25
|
-
-
|
|
26
|
-
-
|
|
27
|
-
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
-
|
|
31
|
-
-
|
|
25
|
+
- 短命令、一次性命令优先使用 `shell_exec`。
|
|
26
|
+
- 长任务、需要中途查状态、需要 stdin 交互时,使用 `shell_start` / `shell_status` / `shell_read` / `shell_write` / `shell_wait` / `shell_close`。
|
|
27
|
+
- 先用 `shell_start` 启动命令并拿到 `shell_id`。
|
|
28
|
+
- `shell_id` 是 shell 会话标识;它不是 chat `context_id`。
|
|
29
|
+
- 长任务期间,优先使用 `shell_status` 查询进度,或使用 `shell_wait` 等待状态变化;不要自己写高频空轮询循环。
|
|
30
|
+
- 只有在确实需要原始增量输出时,才使用 `shell_read` 按 `from_cursor` 继续读取。
|
|
31
|
+
- 需要向进程 stdin 输入内容时,使用 `shell_write`。
|
|
32
|
+
- 命令会话完成后若不再需要,使用 `shell_close` 主动释放资源。
|
|
33
|
+
- 不要把原始超长 shell 输出直接转发给用户,应先总结。
|
|
32
34
|
|
|
33
35
|
# 很重要
|
|
34
36
|
【关于上下文(messages)】(关键)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellHelpers.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/shell/ShellHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"ShellHelpers.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/shell/ShellHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AA2BH;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiBlE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,MAAM,CAAC,UAAU,CAWnB"}
|
|
@@ -1,58 +1,36 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Shell
|
|
2
|
+
* Shell 工具辅助函数。
|
|
3
3
|
*
|
|
4
4
|
* 关键点(中文)
|
|
5
|
-
* -
|
|
6
|
-
* -
|
|
5
|
+
* - shell 会话生命周期已经迁移到 `shellService`。
|
|
6
|
+
* - 这里仅保留当前仍被 tool 与测试复用的最小能力:命令安全校验与 env 注入。
|
|
7
7
|
*/
|
|
8
|
-
import path from "path";
|
|
9
|
-
import { randomBytes } from "crypto";
|
|
10
8
|
import { requestContext } from "../../context/manager/RequestContext.js";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
export const MAX_YIELD_TIME_MS = 30_000;
|
|
19
|
-
/**
|
|
20
|
-
* 会话缓存上限。
|
|
21
|
-
*
|
|
22
|
-
* 关键点(中文)
|
|
23
|
-
* - 缓存的是“尚未被读取”的输出。
|
|
24
|
-
* - 超出上限时丢弃最旧部分,保证进程不会无限吃内存。
|
|
25
|
-
*/
|
|
26
|
-
export const MAX_CONTEXT_PENDING_CHARS = 1_000_000;
|
|
27
|
-
export function clampYieldTimeMs(value, fallback) {
|
|
28
|
-
const n = typeof value === "number" && Number.isFinite(value)
|
|
29
|
-
? Math.floor(value)
|
|
30
|
-
: fallback;
|
|
31
|
-
return Math.min(MAX_YIELD_TIME_MS, Math.max(MIN_YIELD_TIME_MS, n));
|
|
32
|
-
}
|
|
33
|
-
export function generateChunkId() {
|
|
34
|
-
return randomBytes(3).toString("hex");
|
|
35
|
-
}
|
|
36
|
-
export function approxTokenCountFromChars(chars) {
|
|
37
|
-
if (chars <= 0)
|
|
38
|
-
return 0;
|
|
39
|
-
return Math.ceil(chars / APPROX_CHARS_PER_TOKEN);
|
|
9
|
+
function setEnvString(env, key, value) {
|
|
10
|
+
if (typeof value !== "string")
|
|
11
|
+
return;
|
|
12
|
+
const trimmed = value.trim();
|
|
13
|
+
if (!trimmed)
|
|
14
|
+
return;
|
|
15
|
+
env[key] = trimmed;
|
|
40
16
|
}
|
|
41
|
-
function
|
|
42
|
-
if (!
|
|
43
|
-
return
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
17
|
+
function applyEnvMap(env, entries) {
|
|
18
|
+
if (!entries)
|
|
19
|
+
return;
|
|
20
|
+
for (const [rawKey, rawValue] of Object.entries(entries)) {
|
|
21
|
+
const key = String(rawKey || "").trim();
|
|
22
|
+
if (!key)
|
|
23
|
+
continue;
|
|
24
|
+
setEnvString(env, key, rawValue);
|
|
25
|
+
}
|
|
47
26
|
}
|
|
48
27
|
/**
|
|
49
28
|
* 对 `city chat send` 命令做前置安全校验。
|
|
50
29
|
*
|
|
51
30
|
* 关键点(中文)
|
|
52
31
|
* - 历史上模型会把长文本直接拼进多行 shell 命令,导致后续行被 zsh 当作独立命令解析。
|
|
53
|
-
* -
|
|
54
|
-
* - 默认建议多行正文通过 `--stdin
|
|
55
|
-
* - 兼容需求:若显式使用 `--text`,允许命令中包含真实换行。
|
|
32
|
+
* - 这会出现“前面已发送,后面才报错”的副作用。
|
|
33
|
+
* - 默认建议多行正文通过 `--stdin`、`--text-file` 或显式 `--text` 传入。
|
|
56
34
|
*/
|
|
57
35
|
export function validateChatSendCommand(cmd) {
|
|
58
36
|
const source = String(cmd ?? "");
|
|
@@ -60,250 +38,35 @@ export function validateChatSendCommand(cmd) {
|
|
|
60
38
|
return null;
|
|
61
39
|
if (!/[\r\n]/.test(source))
|
|
62
40
|
return null;
|
|
63
|
-
if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--stdin(?:\s|$)/.test(source))
|
|
41
|
+
if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--stdin(?:\s|$)/.test(source)) {
|
|
64
42
|
return null;
|
|
65
|
-
|
|
43
|
+
}
|
|
44
|
+
if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--text(?:\s|$)/.test(source)) {
|
|
66
45
|
return null;
|
|
67
|
-
|
|
46
|
+
}
|
|
47
|
+
if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--text-file(?:\s|$)/.test(source)) {
|
|
68
48
|
return null;
|
|
49
|
+
}
|
|
69
50
|
return [
|
|
70
51
|
"Unsafe `city chat send` command: real newlines are not allowed.",
|
|
71
52
|
"If your message is multi-line, use `city chat send --stdin` (with heredoc/pipe), `--text-file`, or explicit `--text`.",
|
|
72
53
|
].join(" ");
|
|
73
54
|
}
|
|
74
55
|
/**
|
|
75
|
-
*
|
|
76
|
-
*
|
|
77
|
-
* 配置来源(中文)
|
|
78
|
-
* - `ship.json.permissions.exec_command.maxOutputChars/maxOutputLines`
|
|
79
|
-
* - 工具入参 `max_output_tokens` 会进一步收紧 maxChars
|
|
80
|
-
*/
|
|
81
|
-
export function resolveOutputLimits(config, maxOutputTokens) {
|
|
82
|
-
const cfg = config.permissions?.exec_command;
|
|
83
|
-
const cfgObject = cfg && typeof cfg === "object" ? cfg : undefined;
|
|
84
|
-
const maxCharsRaw = cfgObject?.maxOutputChars;
|
|
85
|
-
const maxLinesRaw = cfgObject?.maxOutputLines;
|
|
86
|
-
const maxChars = typeof maxCharsRaw === "number" &&
|
|
87
|
-
Number.isFinite(maxCharsRaw) &&
|
|
88
|
-
maxCharsRaw >= 500
|
|
89
|
-
? Math.floor(maxCharsRaw)
|
|
90
|
-
: DEFAULT_MAX_OUTPUT_CHARS;
|
|
91
|
-
const maxLines = typeof maxLinesRaw === "number" &&
|
|
92
|
-
Number.isFinite(maxLinesRaw) &&
|
|
93
|
-
maxLinesRaw >= 20
|
|
94
|
-
? Math.floor(maxLinesRaw)
|
|
95
|
-
: DEFAULT_MAX_OUTPUT_LINES;
|
|
96
|
-
const byTokens = typeof maxOutputTokens === "number" &&
|
|
97
|
-
Number.isFinite(maxOutputTokens) &&
|
|
98
|
-
maxOutputTokens > 0
|
|
99
|
-
? Math.max(200, Math.floor(maxOutputTokens * APPROX_CHARS_PER_TOKEN))
|
|
100
|
-
: null;
|
|
101
|
-
return {
|
|
102
|
-
maxChars: byTokens == null ? maxChars : Math.min(maxChars, byTokens),
|
|
103
|
-
maxLines,
|
|
104
|
-
};
|
|
105
|
-
}
|
|
106
|
-
/**
|
|
107
|
-
* 解析命令工作目录。
|
|
108
|
-
*
|
|
109
|
-
* - 空值回退 projectRoot;相对路径按 projectRoot 解析。
|
|
110
|
-
*/
|
|
111
|
-
export function resolveShellWorkdir(projectRoot, workdir) {
|
|
112
|
-
const trimmed = String(workdir ?? "").trim();
|
|
113
|
-
if (!trimmed)
|
|
114
|
-
return projectRoot;
|
|
115
|
-
return path.isAbsolute(trimmed)
|
|
116
|
-
? trimmed
|
|
117
|
-
: path.resolve(projectRoot, trimmed);
|
|
118
|
-
}
|
|
119
|
-
function setEnvString(env, key, value) {
|
|
120
|
-
if (typeof value !== "string")
|
|
121
|
-
return;
|
|
122
|
-
const trimmed = value.trim();
|
|
123
|
-
if (!trimmed)
|
|
124
|
-
return;
|
|
125
|
-
env[key] = trimmed;
|
|
126
|
-
}
|
|
127
|
-
/**
|
|
128
|
-
* 批量叠加 env map。
|
|
56
|
+
* 构建 shell 子进程环境变量。
|
|
129
57
|
*
|
|
130
58
|
* 关键点(中文)
|
|
131
|
-
* -
|
|
132
|
-
* -
|
|
133
|
-
*/
|
|
134
|
-
function applyEnvMap(env, entries) {
|
|
135
|
-
if (!entries)
|
|
136
|
-
return;
|
|
137
|
-
for (const [rawKey, rawValue] of Object.entries(entries)) {
|
|
138
|
-
const key = String(rawKey || "").trim();
|
|
139
|
-
if (!key)
|
|
140
|
-
continue;
|
|
141
|
-
setEnvString(env, key, rawValue);
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
/**
|
|
145
|
-
* 构建子进程环境变量。
|
|
146
|
-
*
|
|
147
|
-
* 关键点(中文)
|
|
148
|
-
* - 把 context/request 上下文字段透传给命令执行环境。
|
|
59
|
+
* - 当前仍用于 shell tool/service 与相关测试。
|
|
60
|
+
* - 优先级:显式注入 > 当前请求上下文 `DC_CTX_*` > 宿主进程环境。
|
|
149
61
|
*/
|
|
150
62
|
export function buildShellContextEnv(injected) {
|
|
151
63
|
const env = { ...process.env };
|
|
152
64
|
const contextCtx = requestContext.getStore();
|
|
153
|
-
// 关键点(中文):显式参数作为最终覆盖层,确保 `exec_command` 调用点可精准控制注入结果。
|
|
154
65
|
applyEnvMap(env, injected);
|
|
155
66
|
setEnvString(env, "DC_CTX_CONTEXT_ID", contextCtx?.contextId);
|
|
156
67
|
setEnvString(env, "DC_CTX_REQUEST_ID", contextCtx?.requestId);
|
|
157
|
-
// 关键点(中文):把当前 server 地址透传给子进程,便于 `city message/skill/task` 自动命中本地服务。
|
|
158
68
|
setEnvString(env, "DC_CTX_SERVER_HOST", process.env.DC_SERVER_HOST);
|
|
159
69
|
setEnvString(env, "DC_CTX_SERVER_PORT", process.env.DC_SERVER_PORT);
|
|
160
70
|
return env;
|
|
161
71
|
}
|
|
162
|
-
export function touchContext(context) {
|
|
163
|
-
context.lastActiveAt = Date.now();
|
|
164
|
-
}
|
|
165
|
-
export function notifyContextWaiters(context) {
|
|
166
|
-
const waiters = Array.from(context.waiters);
|
|
167
|
-
context.waiters.clear();
|
|
168
|
-
for (const resolve of waiters)
|
|
169
|
-
resolve();
|
|
170
|
-
}
|
|
171
|
-
/**
|
|
172
|
-
* 追加进程输出到会话缓冲区。
|
|
173
|
-
*
|
|
174
|
-
* - 达到上限后截断最旧内容,并累计 `droppedChars`。
|
|
175
|
-
*/
|
|
176
|
-
export function appendContextOutput(context, raw) {
|
|
177
|
-
const chunk = normalizeOutputChunk(raw);
|
|
178
|
-
if (!chunk)
|
|
179
|
-
return;
|
|
180
|
-
context.pendingOutput += chunk;
|
|
181
|
-
if (context.pendingOutput.length > MAX_CONTEXT_PENDING_CHARS) {
|
|
182
|
-
const overflow = context.pendingOutput.length - MAX_CONTEXT_PENDING_CHARS;
|
|
183
|
-
context.pendingOutput = context.pendingOutput.slice(overflow);
|
|
184
|
-
context.droppedChars += overflow;
|
|
185
|
-
}
|
|
186
|
-
touchContext(context);
|
|
187
|
-
notifyContextWaiters(context);
|
|
188
|
-
}
|
|
189
|
-
function splitOutputPage(text, limits) {
|
|
190
|
-
if (!text)
|
|
191
|
-
return { head: "", tail: "" };
|
|
192
|
-
const byChar = text.slice(0, Math.min(text.length, limits.maxChars));
|
|
193
|
-
let head = byChar;
|
|
194
|
-
if (limits.maxLines > 0) {
|
|
195
|
-
const lines = byChar.split("\n");
|
|
196
|
-
if (lines.length > limits.maxLines) {
|
|
197
|
-
head = lines.slice(0, limits.maxLines).join("\n");
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
return {
|
|
201
|
-
head,
|
|
202
|
-
tail: text.slice(head.length),
|
|
203
|
-
};
|
|
204
|
-
}
|
|
205
|
-
/**
|
|
206
|
-
* 消费一页输出并更新会话缓冲区。
|
|
207
|
-
*/
|
|
208
|
-
export function consumeContextOutputPage(context, limits) {
|
|
209
|
-
const text = context.pendingOutput;
|
|
210
|
-
const originalChars = text.length;
|
|
211
|
-
const originalLines = text ? text.split("\n").length : 0;
|
|
212
|
-
const droppedChars = context.droppedChars;
|
|
213
|
-
context.droppedChars = 0;
|
|
214
|
-
if (!text) {
|
|
215
|
-
return {
|
|
216
|
-
output: "",
|
|
217
|
-
hasMoreOutput: false,
|
|
218
|
-
originalChars,
|
|
219
|
-
originalLines,
|
|
220
|
-
droppedChars,
|
|
221
|
-
};
|
|
222
|
-
}
|
|
223
|
-
const { head, tail } = splitOutputPage(text, limits);
|
|
224
|
-
context.pendingOutput = tail;
|
|
225
|
-
touchContext(context);
|
|
226
|
-
return {
|
|
227
|
-
output: head,
|
|
228
|
-
hasMoreOutput: tail.length > 0,
|
|
229
|
-
originalChars,
|
|
230
|
-
originalLines,
|
|
231
|
-
droppedChars,
|
|
232
|
-
};
|
|
233
|
-
}
|
|
234
|
-
/**
|
|
235
|
-
* 等待会话信号(输出到达或进程退出)。
|
|
236
|
-
*/
|
|
237
|
-
async function waitForContextSignal(context, timeoutMs) {
|
|
238
|
-
if (timeoutMs <= 0)
|
|
239
|
-
return false;
|
|
240
|
-
return await new Promise((resolve) => {
|
|
241
|
-
let resolved = false;
|
|
242
|
-
const onSignal = () => {
|
|
243
|
-
if (resolved)
|
|
244
|
-
return;
|
|
245
|
-
resolved = true;
|
|
246
|
-
clearTimeout(timer);
|
|
247
|
-
context.waiters.delete(onSignal);
|
|
248
|
-
resolve(true);
|
|
249
|
-
};
|
|
250
|
-
const timer = setTimeout(() => {
|
|
251
|
-
if (resolved)
|
|
252
|
-
return;
|
|
253
|
-
resolved = true;
|
|
254
|
-
context.waiters.delete(onSignal);
|
|
255
|
-
resolve(false);
|
|
256
|
-
}, timeoutMs);
|
|
257
|
-
context.waiters.add(onSignal);
|
|
258
|
-
});
|
|
259
|
-
}
|
|
260
|
-
/**
|
|
261
|
-
* 在一个 yield 窗口内收集输出。
|
|
262
|
-
*
|
|
263
|
-
* 关键点(中文)
|
|
264
|
-
* - 若已经有输出,会再短等 30ms 抓取“紧随其后的块”,减少碎片化。
|
|
265
|
-
*/
|
|
266
|
-
export async function collectOutputUntilDeadline(context, yieldTimeMs) {
|
|
267
|
-
const deadline = Date.now() + yieldTimeMs;
|
|
268
|
-
while (Date.now() < deadline) {
|
|
269
|
-
if (context.pendingOutput.length > 0) {
|
|
270
|
-
const remaining = deadline - Date.now();
|
|
271
|
-
if (remaining <= 0)
|
|
272
|
-
return;
|
|
273
|
-
const gotMore = await waitForContextSignal(context, Math.min(30, remaining));
|
|
274
|
-
if (!gotMore)
|
|
275
|
-
return;
|
|
276
|
-
continue;
|
|
277
|
-
}
|
|
278
|
-
if (context.exited)
|
|
279
|
-
return;
|
|
280
|
-
const remaining = deadline - Date.now();
|
|
281
|
-
if (remaining <= 0)
|
|
282
|
-
return;
|
|
283
|
-
const signaled = await waitForContextSignal(context, remaining);
|
|
284
|
-
if (!signaled)
|
|
285
|
-
return;
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
/**
|
|
289
|
-
* 向会话 stdin 写入输入。
|
|
290
|
-
*/
|
|
291
|
-
export async function writeContextStdin(context, chars) {
|
|
292
|
-
if (!chars)
|
|
293
|
-
return;
|
|
294
|
-
if (context.exited)
|
|
295
|
-
throw new Error(`Context ${context.id} already exited`);
|
|
296
|
-
if (!context.child.stdin.writable)
|
|
297
|
-
throw new Error(`Context ${context.id} stdin is closed`);
|
|
298
|
-
await new Promise((resolve, reject) => {
|
|
299
|
-
context.child.stdin.write(chars, (err) => {
|
|
300
|
-
if (err) {
|
|
301
|
-
reject(err);
|
|
302
|
-
return;
|
|
303
|
-
}
|
|
304
|
-
resolve();
|
|
305
|
-
});
|
|
306
|
-
});
|
|
307
|
-
touchContext(context);
|
|
308
|
-
}
|
|
309
72
|
//# sourceMappingURL=ShellHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellHelpers.js","sourceRoot":"","sources":["../../../../src/agent/tools/shell/ShellHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"ShellHelpers.js","sourceRoot":"","sources":["../../../../src/agent/tools/shell/ShellHelpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,SAAS,YAAY,CACnB,GAAsB,EACtB,GAAW,EACX,KAAyB;IAEzB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;AACrB,CAAC;AAED,SAAS,WAAW,CAClB,GAAsB,EACtB,OAAgC;IAEhC,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAW;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACjC,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACrE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,IAAI,6DAA6D,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,4DAA4D,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,iEAAiE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACnF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,iEAAiE;QACjE,uHAAuH;KACxH,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAiC;IAEjC,MAAM,GAAG,GAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;IAE7C,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3B,YAAY,CAAC,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAC9D,YAAY,CAAC,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAC9D,YAAY,CAAC,GAAG,EAAE,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpE,YAAY,CAAC,GAAG,EAAE,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEpE,OAAO,GAAG,CAAC;AACb,CAAC"}
|