@downcity/plugins 1.0.64 → 1.0.71
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/BuiltinPlugins.d.ts +0 -5
- package/bin/BuiltinPlugins.d.ts.map +1 -1
- package/bin/BuiltinPlugins.js +1 -5
- package/bin/BuiltinPlugins.js.map +1 -1
- package/bin/index.d.ts +0 -2
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js +0 -1
- package/bin/index.js.map +1 -1
- package/bin/task/runtime/TaskRunnerRound.d.ts.map +1 -1
- package/bin/task/runtime/TaskRunnerRound.js +7 -2
- package/bin/task/runtime/TaskRunnerRound.js.map +1 -1
- package/bin/task/runtime/TaskRunnerSession.d.ts.map +1 -1
- package/bin/task/runtime/TaskRunnerSession.js +10 -3
- package/bin/task/runtime/TaskRunnerSession.js.map +1 -1
- package/package.json +4 -3
- package/scripts/unrestricted-sandbox-approval.test.mjs +184 -5
- package/src/BuiltinPlugins.ts +0 -9
- package/src/index.ts +0 -5
- package/src/task/runtime/TaskRunnerRound.ts +15 -5
- package/src/task/runtime/TaskRunnerSession.ts +11 -4
- package/bin/shell/Index.d.ts +0 -9
- package/bin/shell/Index.d.ts.map +0 -1
- package/bin/shell/Index.js +0 -9
- package/bin/shell/Index.js.map +0 -1
- package/bin/shell/ShellPlugin.d.ts +0 -65
- package/bin/shell/ShellPlugin.d.ts.map +0 -1
- package/bin/shell/ShellPlugin.js +0 -175
- package/bin/shell/ShellPlugin.js.map +0 -1
- package/bin/shell/ShellRuntimeTypes.d.ts +0 -145
- package/bin/shell/ShellRuntimeTypes.d.ts.map +0 -1
- package/bin/shell/ShellRuntimeTypes.js +0 -10
- package/bin/shell/ShellRuntimeTypes.js.map +0 -1
- package/bin/shell/runtime/Paths.d.ts +0 -12
- package/bin/shell/runtime/Paths.d.ts.map +0 -1
- package/bin/shell/runtime/Paths.js +0 -21
- package/bin/shell/runtime/Paths.js.map +0 -1
- package/bin/shell/runtime/ShellActionResponse.d.ts +0 -52
- package/bin/shell/runtime/ShellActionResponse.d.ts.map +0 -1
- package/bin/shell/runtime/ShellActionResponse.js +0 -73
- package/bin/shell/runtime/ShellActionResponse.js.map +0 -1
- package/bin/shell/runtime/ShellActionRuntime.d.ts +0 -70
- package/bin/shell/runtime/ShellActionRuntime.d.ts.map +0 -1
- package/bin/shell/runtime/ShellActionRuntime.js +0 -587
- package/bin/shell/runtime/ShellActionRuntime.js.map +0 -1
- package/bin/shell/runtime/ShellActionRuntimeSupport.d.ts +0 -88
- package/bin/shell/runtime/ShellActionRuntimeSupport.d.ts.map +0 -1
- package/bin/shell/runtime/ShellActionRuntimeSupport.js +0 -353
- package/bin/shell/runtime/ShellActionRuntimeSupport.js.map +0 -1
- package/bin/shell/runtime/ShellApprovalRuntime.d.ts +0 -57
- package/bin/shell/runtime/ShellApprovalRuntime.d.ts.map +0 -1
- package/bin/shell/runtime/ShellApprovalRuntime.js +0 -182
- package/bin/shell/runtime/ShellApprovalRuntime.js.map +0 -1
- package/bin/shell/runtime/ShellProcessEvents.d.ts +0 -22
- package/bin/shell/runtime/ShellProcessEvents.d.ts.map +0 -1
- package/bin/shell/runtime/ShellProcessEvents.js +0 -41
- package/bin/shell/runtime/ShellProcessEvents.js.map +0 -1
- package/bin/shell/runtime/ShellRuntimeEnvironment.d.ts +0 -21
- package/bin/shell/runtime/ShellRuntimeEnvironment.d.ts.map +0 -1
- package/bin/shell/runtime/ShellRuntimeEnvironment.js +0 -70
- package/bin/shell/runtime/ShellRuntimeEnvironment.js.map +0 -1
- package/bin/shell/types/ShellPluginOptions.d.ts +0 -103
- package/bin/shell/types/ShellPluginOptions.d.ts.map +0 -1
- package/bin/shell/types/ShellPluginOptions.js +0 -10
- package/bin/shell/types/ShellPluginOptions.js.map +0 -1
- package/src/shell/Index.ts +0 -9
- package/src/shell/ShellPlugin.ts +0 -239
- package/src/shell/ShellRuntimeTypes.ts +0 -152
- package/src/shell/runtime/Paths.ts +0 -28
- package/src/shell/runtime/ShellActionResponse.ts +0 -135
- package/src/shell/runtime/ShellActionRuntime.ts +0 -728
- package/src/shell/runtime/ShellActionRuntimeSupport.ts +0 -477
- package/src/shell/runtime/ShellApprovalRuntime.ts +0 -236
- package/src/shell/runtime/ShellProcessEvents.ts +0 -65
- package/src/shell/runtime/ShellRuntimeEnvironment.ts +0 -71
- package/src/shell/types/ShellPluginOptions.ts +0 -122
package/bin/BuiltinPlugins.d.ts
CHANGED
|
@@ -12,7 +12,6 @@ import type { AsrPluginOptions } from "./asr/types/AsrPlugin.js";
|
|
|
12
12
|
import type { TtsPluginOptions } from "./tts/types/TtsPlugin.js";
|
|
13
13
|
import type { TaskPluginOptions } from "./task/types/TaskPluginOptions.js";
|
|
14
14
|
import type { MemoryPluginOptions } from "./memory/types/Memory.js";
|
|
15
|
-
import type { ShellPluginOptions } from "./shell/types/ShellPluginOptions.js";
|
|
16
15
|
/**
|
|
17
16
|
* 内建 plugin class 构造器。
|
|
18
17
|
*/
|
|
@@ -47,10 +46,6 @@ export interface BuiltinPluginOptions {
|
|
|
47
46
|
* memory plugin 的 LLM Wiki 能力注入。
|
|
48
47
|
*/
|
|
49
48
|
memory?: MemoryPluginOptions;
|
|
50
|
-
/**
|
|
51
|
-
* shell plugin 的可选 runtime 参数。
|
|
52
|
-
*/
|
|
53
|
-
shell?: ShellPluginOptions;
|
|
54
49
|
}
|
|
55
50
|
/**
|
|
56
51
|
* 创建完整内建 plugin 实例集合。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltinPlugins.d.ts","sourceRoot":"","sources":["../src/BuiltinPlugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"BuiltinPlugins.d.ts","sourceRoot":"","sources":["../src/BuiltinPlugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAWrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,UAAU,CAAC,CAAC;AAEhF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,EAQtD,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAE3B;;OAEG;IACH,GAAG,CAAC,EAAE,gBAAgB,CAAC;IAEvB;;OAEG;IACH,GAAG,CAAC,EAAE,gBAAgB,CAAC;IAEvB;;OAEG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC;IAEzB;;OAEG;IACH,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAE9B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,oBAAyB,GAAG,UAAU,EAAE,CAkBrF"}
|
package/bin/BuiltinPlugins.js
CHANGED
|
@@ -13,7 +13,6 @@ import { ChatPlugin } from "./chat/ChatPlugin.js";
|
|
|
13
13
|
import { ContactPlugin } from "./contact/ContactPlugin.js";
|
|
14
14
|
import { TaskPlugin } from "./task/TaskPlugin.js";
|
|
15
15
|
import { MemoryPlugin } from "./memory/MemoryPlugin.js";
|
|
16
|
-
import { ShellPlugin } from "./shell/ShellPlugin.js";
|
|
17
16
|
import { ImagePlugin } from "./image/ImagePlugin.js";
|
|
18
17
|
import { AsrPlugin } from "./asr/Plugin.js";
|
|
19
18
|
import { TtsPlugin } from "./tts/Plugin.js";
|
|
@@ -30,7 +29,6 @@ export const BUILTIN_PLUGIN_CLASSES = [
|
|
|
30
29
|
ContactPlugin,
|
|
31
30
|
TaskPlugin,
|
|
32
31
|
MemoryPlugin,
|
|
33
|
-
ShellPlugin,
|
|
34
32
|
];
|
|
35
33
|
/**
|
|
36
34
|
* 创建完整内建 plugin 实例集合。
|
|
@@ -40,9 +38,7 @@ export function createBuiltinPlugins(options = {}) {
|
|
|
40
38
|
? new TaskPlugin(options.task)
|
|
41
39
|
: PluginClass === MemoryPlugin
|
|
42
40
|
? new MemoryPlugin(options.memory)
|
|
43
|
-
: PluginClass
|
|
44
|
-
? new ShellPlugin(options.shell)
|
|
45
|
-
: new PluginClass());
|
|
41
|
+
: new PluginClass());
|
|
46
42
|
if (options.image?.image_create && options.image?.image_result) {
|
|
47
43
|
plugins.push(new ImagePlugin(options.image));
|
|
48
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltinPlugins.js","sourceRoot":"","sources":["../src/BuiltinPlugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"BuiltinPlugins.js","sourceRoot":"","sources":["../src/BuiltinPlugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAyB;IAC1D,WAAW;IACX,SAAS;IACT,eAAe;IACf,UAAU;IACV,aAAa;IACb,UAAU;IACV,YAAY;CACb,CAAC;AAiCF;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,UAAgC,EAAE;IACrE,MAAM,OAAO,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACzD,WAAW,KAAK,UAAU;QACxB,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;QAC9B,CAAC,CAAC,WAAW,KAAK,YAAY;YAC5B,CAAC,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,CAAC,CAAC,IAAI,WAAW,EAAE,CACtB,CAAC;IACF,IAAI,OAAO,CAAC,KAAK,EAAE,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC;QAC/D,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/bin/index.d.ts
CHANGED
|
@@ -20,7 +20,6 @@ export { TtsPlugin } from "./tts/Plugin.js";
|
|
|
20
20
|
export { WorkboardPlugin } from "./workboard/Plugin.js";
|
|
21
21
|
export { TaskPlugin } from "./task/TaskPlugin.js";
|
|
22
22
|
export { MemoryPlugin } from "./memory/MemoryPlugin.js";
|
|
23
|
-
export { ShellPlugin } from "./shell/ShellPlugin.js";
|
|
24
23
|
export { listChatAuthorizationRoles, readChatAuthorizationConfigSync, setChatAuthorizationUserRole, } from "./auth/runtime/AuthorizationConfig.js";
|
|
25
24
|
export { resolveAuthorizedUserRole } from "./auth/runtime/AuthorizationPolicy.js";
|
|
26
25
|
export { CHAT_AUTHORIZATION_ACTIONS, CHAT_AUTHORIZATION_CHANNELS, CHAT_AUTHORIZATION_POINTS, createDefaultChatAuthorizationRoles, isChatAuthorizationChannel, } from "./auth/types/AuthPlugin.js";
|
|
@@ -29,7 +28,6 @@ export type { BaseChatChannelOptions, ChatChannelEnv, FeishuChannelOptions, QqCh
|
|
|
29
28
|
export type { ChatChannel, ChatChannelRuntimePatch, ChatPluginOptions, } from "./chat/types/ChatPluginOptions.js";
|
|
30
29
|
export type { ContactPluginOptions } from "./contact/types/ContactPluginOptions.js";
|
|
31
30
|
export type { TaskPluginOptions } from "./task/types/TaskPluginOptions.js";
|
|
32
|
-
export type { ResolvedShellPluginOptions, ShellPluginOptions, } from "./shell/types/ShellPluginOptions.js";
|
|
33
31
|
export type { MemoryActionPayload, MemoryDefaults, MemoryDigestHandler, MemoryDigestHandlerInput, MemoryDigestHandlerOutput, MemoryDigestPayload, MemoryDigestResponse, MemoryPluginOptions, MemoryReadPayload, MemoryReadResponse, MemoryRememberPayload, MemoryRememberResponse, MemoryReviseHandler, MemoryReviseHandlerInput, MemoryReviseHandlerOutput, MemoryRevisePayload, MemoryReviseResponse, MemorySearchMode, MemorySearchPayload, MemorySearchResponse, MemorySearchResultItem, MemorySourceStat, MemorySourceType, MemoryStatusResponse, MemoryWikiPageDraft, } from "./memory/types/Memory.js";
|
|
34
32
|
export type { AsrPluginInput, AsrPluginOptions, AsrPluginResult, } from "./asr/types/AsrPlugin.js";
|
|
35
33
|
export type { TtsPluginInput, TtsPluginOptions, TtsPluginResult, TtsPluginSimpleAudioResult, TtsPluginUiMessageResult, } from "./tts/types/TtsPlugin.js";
|
package/bin/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACL,aAAa,EACb,SAAS,EACT,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/bin/index.js
CHANGED
|
@@ -19,7 +19,6 @@ export { TtsPlugin } from "./tts/Plugin.js";
|
|
|
19
19
|
export { WorkboardPlugin } from "./workboard/Plugin.js";
|
|
20
20
|
export { TaskPlugin } from "./task/TaskPlugin.js";
|
|
21
21
|
export { MemoryPlugin } from "./memory/MemoryPlugin.js";
|
|
22
|
-
export { ShellPlugin } from "./shell/ShellPlugin.js";
|
|
23
22
|
export { listChatAuthorizationRoles, readChatAuthorizationConfigSync, setChatAuthorizationUserRole, } from "./auth/runtime/AuthorizationConfig.js";
|
|
24
23
|
export { resolveAuthorizedUserRole } from "./auth/runtime/AuthorizationPolicy.js";
|
|
25
24
|
export { CHAT_AUTHORIZATION_ACTIONS, CHAT_AUTHORIZATION_CHANNELS, CHAT_AUTHORIZATION_POINTS, createDefaultChatAuthorizationRoles, isChatAuthorizationChannel, } from "./auth/types/AuthPlugin.js";
|
package/bin/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACL,aAAa,EACb,SAAS,EACT,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACL,aAAa,EACb,SAAS,EACT,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,EAC3B,yBAAyB,EACzB,mCAAmC,EACnC,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRunnerRound.d.ts","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerRound.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskRunnerRound.d.ts","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerRound.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;AAIjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAE9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAS3C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAgCpE;AAiBD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,GACrD,kBAAkB,CAOpB;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,CA0CpF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,MAAM,CAoBT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,GAAG,MAAM,CA+BT;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,kBAAkB,EAAE,sBAAsB,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA+CnF;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkCjC;AAcD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmBhC"}
|
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import path from "node:path";
|
|
9
9
|
import fs from "fs-extra";
|
|
10
|
-
import { runSandboxCommand } from "@downcity/
|
|
10
|
+
import { runSandboxCommand } from "@downcity/shell/sandbox/SandboxRunner.js";
|
|
11
|
+
import { withShellRunScope } from "@downcity/shell";
|
|
11
12
|
import { withSessionRunScope } from "@downcity/agent/internal/executor/SessionRunScope.js";
|
|
12
13
|
import { appendTaskRoundUserMessage } from "./TaskRunnerSession.js";
|
|
13
14
|
function stripTaskSecretEnv(env) {
|
|
@@ -201,9 +202,13 @@ export async function runAgentRound(params) {
|
|
|
201
202
|
}
|
|
202
203
|
const result = await withSessionRunScope({
|
|
203
204
|
runContext: create_task_run_context(params.sessionId),
|
|
205
|
+
}, () => withShellRunScope({
|
|
206
|
+
run_context: {
|
|
207
|
+
session_id: params.sessionId,
|
|
208
|
+
},
|
|
204
209
|
}, () => params.taskSessionRuntime.getExecutor(params.sessionId).run({
|
|
205
210
|
query: params.query,
|
|
206
|
-
}));
|
|
211
|
+
})));
|
|
207
212
|
const outputPick = pickAgentOutput(result.assistantMessage);
|
|
208
213
|
if (!result.success) {
|
|
209
214
|
const reason = outputPick.text || "agent run returned success=false";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRunnerRound.js","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerRound.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"TaskRunnerRound.js","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerRound.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRunnerSession.d.ts","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"TaskRunnerSession.d.ts","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,IAAI,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;AAEjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAUhF;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,kBAAkB,EAAE,sBAAsB,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE;IACnD,OAAO,EAAE,YAAY,CAAC;IACtB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,sBAAsB,EAAE,MAAM,CAAC;CAChC,GAAG,sBAAsB,CAwGzB;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,kBAAkB,EAAE,sBAAsB,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,gBAAgB,CAAC;CAC7B,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhB"}
|
|
@@ -15,7 +15,7 @@ import { JsonlSessionHistoryStore } from "@downcity/agent/internal/executor/stor
|
|
|
15
15
|
import { JsonlSessionCompactionComposer } from "@downcity/agent/internal/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
|
|
16
16
|
import { LocalSessionContextComposer } from "@downcity/agent/internal/executor/composer/context/LocalSessionContextComposer.js";
|
|
17
17
|
import { DefaultSessionSystemComposer } from "@downcity/agent/internal/executor/composer/system/default/DefaultSessionSystemComposer.js";
|
|
18
|
-
import {
|
|
18
|
+
import { Shell } from "@downcity/shell";
|
|
19
19
|
/**
|
|
20
20
|
* 把 task round 的 user query 落盘到对应 run context。
|
|
21
21
|
*/
|
|
@@ -55,6 +55,13 @@ export function createTaskSessionRuntimePort(params) {
|
|
|
55
55
|
const historyStoresBySessionId = new Map();
|
|
56
56
|
const historyComposersBySessionId = new Map();
|
|
57
57
|
const runtimesBySessionId = new Map();
|
|
58
|
+
const shell = new Shell({
|
|
59
|
+
root_path: context.rootPath,
|
|
60
|
+
env: context.env,
|
|
61
|
+
sandbox: context.config.sandbox,
|
|
62
|
+
logger: context.logger,
|
|
63
|
+
});
|
|
64
|
+
const shell_tools = shell.tools;
|
|
58
65
|
const resolveTaskHistoryStore = (sessionId) => {
|
|
59
66
|
const existing = historyStoresBySessionId.get(sessionId);
|
|
60
67
|
if (existing)
|
|
@@ -113,7 +120,7 @@ export function createTaskSessionRuntimePort(params) {
|
|
|
113
120
|
const historyComposer = resolveTaskHistoryComposer(key);
|
|
114
121
|
const contextComposer = new LocalSessionContextComposer({
|
|
115
122
|
sessionId: key,
|
|
116
|
-
getTools: () =>
|
|
123
|
+
getTools: () => shell_tools,
|
|
117
124
|
});
|
|
118
125
|
const created = new Executor({
|
|
119
126
|
sessionId: key,
|
|
@@ -124,7 +131,7 @@ export function createTaskSessionRuntimePort(params) {
|
|
|
124
131
|
compactionComposer,
|
|
125
132
|
contextComposer,
|
|
126
133
|
systemComposer,
|
|
127
|
-
getTools: () =>
|
|
134
|
+
getTools: () => shell_tools,
|
|
128
135
|
});
|
|
129
136
|
runtimesBySessionId.set(key, created);
|
|
130
137
|
return created;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRunnerSession.js","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAGzE,OAAO,EAAE,kCAAkC,EAAE,MAAM,sDAAsD,CAAC;AAC1G,OAAO,EAAE,2BAA2B,EAAE,MAAM,yFAAyF,CAAC;AACtI,OAAO,EAAE,wBAAwB,EAAE,MAAM,mFAAmF,CAAC;AAC7H,OAAO,EAAE,8BAA8B,EAAE,MAAM,+FAA+F,CAAC;AAC/I,OAAO,EAAE,2BAA2B,EAAE,MAAM,mFAAmF,CAAC;AAChI,OAAO,EAAE,4BAA4B,EAAE,MAAM,2FAA2F,CAAC;AACzI,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TaskRunnerSession.js","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerSession.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@downcity/plugins",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.71",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity 内建 plugin 集合包",
|
|
6
6
|
"main": "./bin/index.js",
|
|
@@ -12,6 +12,8 @@
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
+
"@downcity/agent": "^1.1.118",
|
|
16
|
+
"@downcity/shell": "^0.1.4",
|
|
15
17
|
"@larksuiteoapi/node-sdk": "^1.66.0",
|
|
16
18
|
"ai": "^6.0.193",
|
|
17
19
|
"better-sqlite3": "^12.10.0",
|
|
@@ -21,8 +23,7 @@
|
|
|
21
23
|
"js-yaml": "^4.1.1",
|
|
22
24
|
"node-cron": "^4.2.1",
|
|
23
25
|
"ws": "^8.21.0",
|
|
24
|
-
"zod": "^4.4.3"
|
|
25
|
-
"@downcity/agent": "^1.1.111"
|
|
26
|
+
"zod": "^4.4.3"
|
|
26
27
|
},
|
|
27
28
|
"devDependencies": {
|
|
28
29
|
"@types/better-sqlite3": "^7.6.13",
|
|
@@ -15,11 +15,13 @@ import path from "node:path";
|
|
|
15
15
|
import {
|
|
16
16
|
approveShellApproval,
|
|
17
17
|
closeAllShellSessions,
|
|
18
|
-
|
|
18
|
+
createShellRuntimeState,
|
|
19
19
|
denyShellApproval,
|
|
20
20
|
execShellCommand,
|
|
21
|
+
readShellSession,
|
|
21
22
|
startShellSession,
|
|
22
|
-
|
|
23
|
+
writeShellSession,
|
|
24
|
+
} from "@downcity/shell/session/ShellActionRuntime.js";
|
|
23
25
|
|
|
24
26
|
async function create_fixture() {
|
|
25
27
|
const root_path = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-unrestricted-"));
|
|
@@ -58,7 +60,7 @@ async function wait_for_approval(state) {
|
|
|
58
60
|
|
|
59
61
|
test("shell_start unrestricted requires reason", async () => {
|
|
60
62
|
const fixture = await create_fixture();
|
|
61
|
-
const state =
|
|
63
|
+
const state = createShellRuntimeState({ defaultApprovalTimeoutMs: 500 });
|
|
62
64
|
try {
|
|
63
65
|
await assert.rejects(
|
|
64
66
|
startShellSession(state, fixture.context, {
|
|
@@ -78,7 +80,7 @@ test("shell_start unrestricted requires reason", async () => {
|
|
|
78
80
|
|
|
79
81
|
test("shell_start unrestricted denied returns denied tool result without execution", async () => {
|
|
80
82
|
const fixture = await create_fixture();
|
|
81
|
-
const state =
|
|
83
|
+
const state = createShellRuntimeState({
|
|
82
84
|
defaultApprovalTimeoutMs: 2000,
|
|
83
85
|
defaultInlineWaitMs: 20,
|
|
84
86
|
});
|
|
@@ -120,7 +122,7 @@ test("shell_start unrestricted denied returns denied tool result without executi
|
|
|
120
122
|
|
|
121
123
|
test("shell_exec unrestricted approved executes in unrestricted sandbox", async () => {
|
|
122
124
|
const fixture = await create_fixture();
|
|
123
|
-
const state =
|
|
125
|
+
const state = createShellRuntimeState({
|
|
124
126
|
defaultApprovalTimeoutMs: 2000,
|
|
125
127
|
defaultInlineWaitMs: 20,
|
|
126
128
|
defaultExecTimeoutMs: 2000,
|
|
@@ -154,3 +156,180 @@ test("shell_exec unrestricted approved executes in unrestricted sandbox", async
|
|
|
154
156
|
await fs.rm(fixture.root_path, { recursive: true, force: true });
|
|
155
157
|
}
|
|
156
158
|
});
|
|
159
|
+
|
|
160
|
+
test("shell_write unrestricted requires reason", async () => {
|
|
161
|
+
const fixture = await create_fixture();
|
|
162
|
+
const state = createShellRuntimeState({
|
|
163
|
+
defaultApprovalTimeoutMs: 2000,
|
|
164
|
+
defaultInlineWaitMs: 20,
|
|
165
|
+
});
|
|
166
|
+
try {
|
|
167
|
+
const pending_result = startShellSession(state, fixture.context, {
|
|
168
|
+
cmd: "cat",
|
|
169
|
+
cwd: fixture.root_path,
|
|
170
|
+
shell: "/bin/sh",
|
|
171
|
+
login: false,
|
|
172
|
+
sandbox: "unrestricted",
|
|
173
|
+
reason: "测试启动 unrestricted 交互进程。",
|
|
174
|
+
ownerContextId: "session_test",
|
|
175
|
+
inlineWaitMs: 20,
|
|
176
|
+
});
|
|
177
|
+
const start_approval = await wait_for_approval(state);
|
|
178
|
+
await approveShellApproval(state, fixture.context, start_approval.approvalId);
|
|
179
|
+
const started = await pending_result;
|
|
180
|
+
|
|
181
|
+
await assert.rejects(
|
|
182
|
+
writeShellSession(state, fixture.context, {
|
|
183
|
+
shellId: started.shell.shellId,
|
|
184
|
+
chars: "should-not-write\n",
|
|
185
|
+
}),
|
|
186
|
+
/requires a non-empty reason/,
|
|
187
|
+
);
|
|
188
|
+
} finally {
|
|
189
|
+
await closeAllShellSessions(state, true);
|
|
190
|
+
await fs.rm(fixture.root_path, { recursive: true, force: true });
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
test("shell_write unrestricted denied does not write stdin", async () => {
|
|
195
|
+
const fixture = await create_fixture();
|
|
196
|
+
const state = createShellRuntimeState({
|
|
197
|
+
defaultApprovalTimeoutMs: 2000,
|
|
198
|
+
defaultInlineWaitMs: 20,
|
|
199
|
+
});
|
|
200
|
+
try {
|
|
201
|
+
const pending_result = startShellSession(state, fixture.context, {
|
|
202
|
+
cmd: "cat",
|
|
203
|
+
cwd: fixture.root_path,
|
|
204
|
+
shell: "/bin/sh",
|
|
205
|
+
login: false,
|
|
206
|
+
sandbox: "unrestricted",
|
|
207
|
+
reason: "测试启动 unrestricted 交互进程。",
|
|
208
|
+
ownerContextId: "session_test",
|
|
209
|
+
inlineWaitMs: 20,
|
|
210
|
+
});
|
|
211
|
+
const start_approval = await wait_for_approval(state);
|
|
212
|
+
await approveShellApproval(state, fixture.context, start_approval.approvalId);
|
|
213
|
+
const started = await pending_result;
|
|
214
|
+
|
|
215
|
+
const pending_write = writeShellSession(state, fixture.context, {
|
|
216
|
+
shellId: started.shell.shellId,
|
|
217
|
+
chars: "denied-write\n",
|
|
218
|
+
reason: "测试拒绝 unrestricted shell_write 不会写入 stdin。",
|
|
219
|
+
});
|
|
220
|
+
const write_approval = await wait_for_approval(state);
|
|
221
|
+
assert.equal(write_approval.toolName, "shell_write");
|
|
222
|
+
assert.equal(write_approval.operation, "write");
|
|
223
|
+
assert.equal(write_approval.inputPreview, "denied-write\n");
|
|
224
|
+
assert.equal(write_approval.inputChars, "denied-write\n".length);
|
|
225
|
+
assert.equal(fixture.events.at(-1)?.type, "tool-approval-request");
|
|
226
|
+
assert.equal(fixture.events.at(-1)?.toolName, "shell_write");
|
|
227
|
+
assert.equal(fixture.events.at(-1)?.operation, "write");
|
|
228
|
+
|
|
229
|
+
await denyShellApproval(state, fixture.context, write_approval.approvalId);
|
|
230
|
+
const denied = await pending_write;
|
|
231
|
+
assert.equal(denied.shell.approvalStatus, "denied");
|
|
232
|
+
assert.match(denied.chunk.output, /User denied unrestricted sandbox execution/);
|
|
233
|
+
|
|
234
|
+
const read = await readShellSession(state, fixture.context, {
|
|
235
|
+
shellId: started.shell.shellId,
|
|
236
|
+
fromCursor: 0,
|
|
237
|
+
maxOutputTokens: 1000,
|
|
238
|
+
});
|
|
239
|
+
assert.equal(read.chunk.output, "");
|
|
240
|
+
} finally {
|
|
241
|
+
await closeAllShellSessions(state, true);
|
|
242
|
+
await fs.rm(fixture.root_path, { recursive: true, force: true });
|
|
243
|
+
}
|
|
244
|
+
});
|
|
245
|
+
|
|
246
|
+
test("shell_write unrestricted approved writes stdin", async () => {
|
|
247
|
+
const fixture = await create_fixture();
|
|
248
|
+
const state = createShellRuntimeState({
|
|
249
|
+
defaultApprovalTimeoutMs: 2000,
|
|
250
|
+
defaultInlineWaitMs: 20,
|
|
251
|
+
});
|
|
252
|
+
try {
|
|
253
|
+
const pending_result = startShellSession(state, fixture.context, {
|
|
254
|
+
cmd: "cat",
|
|
255
|
+
cwd: fixture.root_path,
|
|
256
|
+
shell: "/bin/sh",
|
|
257
|
+
login: false,
|
|
258
|
+
sandbox: "unrestricted",
|
|
259
|
+
reason: "测试启动 unrestricted 交互进程。",
|
|
260
|
+
ownerContextId: "session_test",
|
|
261
|
+
inlineWaitMs: 20,
|
|
262
|
+
});
|
|
263
|
+
const start_approval = await wait_for_approval(state);
|
|
264
|
+
await approveShellApproval(state, fixture.context, start_approval.approvalId);
|
|
265
|
+
const started = await pending_result;
|
|
266
|
+
|
|
267
|
+
const pending_write = writeShellSession(state, fixture.context, {
|
|
268
|
+
shellId: started.shell.shellId,
|
|
269
|
+
chars: "approved-write\n",
|
|
270
|
+
reason: "测试批准 unrestricted shell_write 后写入 stdin。",
|
|
271
|
+
});
|
|
272
|
+
const write_approval = await wait_for_approval(state);
|
|
273
|
+
assert.equal(write_approval.toolName, "shell_write");
|
|
274
|
+
await approveShellApproval(state, fixture.context, write_approval.approvalId);
|
|
275
|
+
const written = await pending_write;
|
|
276
|
+
assert.equal(written.shell.approvalStatus, "approved");
|
|
277
|
+
|
|
278
|
+
const started_at = Date.now();
|
|
279
|
+
let output = "";
|
|
280
|
+
while (Date.now() - started_at < 1000) {
|
|
281
|
+
const read = await readShellSession(state, fixture.context, {
|
|
282
|
+
shellId: started.shell.shellId,
|
|
283
|
+
fromCursor: 0,
|
|
284
|
+
maxOutputTokens: 1000,
|
|
285
|
+
});
|
|
286
|
+
output = read.chunk.output;
|
|
287
|
+
if (output.includes("approved-write")) break;
|
|
288
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
289
|
+
}
|
|
290
|
+
assert.match(output, /approved-write/);
|
|
291
|
+
} finally {
|
|
292
|
+
await closeAllShellSessions(state, true);
|
|
293
|
+
await fs.rm(fixture.root_path, { recursive: true, force: true });
|
|
294
|
+
}
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
test("shell_write safe writes without approval", async () => {
|
|
298
|
+
const fixture = await create_fixture();
|
|
299
|
+
const state = createShellRuntimeState({
|
|
300
|
+
defaultApprovalTimeoutMs: 2000,
|
|
301
|
+
defaultInlineWaitMs: 20,
|
|
302
|
+
});
|
|
303
|
+
try {
|
|
304
|
+
const started = await startShellSession(state, fixture.context, {
|
|
305
|
+
cmd: "cat",
|
|
306
|
+
cwd: fixture.root_path,
|
|
307
|
+
shell: "/bin/sh",
|
|
308
|
+
login: false,
|
|
309
|
+
sandbox: "safe",
|
|
310
|
+
inlineWaitMs: 20,
|
|
311
|
+
});
|
|
312
|
+
await writeShellSession(state, fixture.context, {
|
|
313
|
+
shellId: started.shell.shellId,
|
|
314
|
+
chars: "safe-write\n",
|
|
315
|
+
});
|
|
316
|
+
assert.equal(state.approvals.size, 0);
|
|
317
|
+
|
|
318
|
+
const started_at = Date.now();
|
|
319
|
+
let output = "";
|
|
320
|
+
while (Date.now() - started_at < 1000) {
|
|
321
|
+
const read = await readShellSession(state, fixture.context, {
|
|
322
|
+
shellId: started.shell.shellId,
|
|
323
|
+
fromCursor: 0,
|
|
324
|
+
maxOutputTokens: 1000,
|
|
325
|
+
});
|
|
326
|
+
output = read.chunk.output;
|
|
327
|
+
if (output.includes("safe-write")) break;
|
|
328
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
329
|
+
}
|
|
330
|
+
assert.match(output, /safe-write/);
|
|
331
|
+
} finally {
|
|
332
|
+
await closeAllShellSessions(state, true);
|
|
333
|
+
await fs.rm(fixture.root_path, { recursive: true, force: true });
|
|
334
|
+
}
|
|
335
|
+
});
|
package/src/BuiltinPlugins.ts
CHANGED
|
@@ -15,7 +15,6 @@ import { ChatPlugin } from "@/chat/ChatPlugin.js";
|
|
|
15
15
|
import { ContactPlugin } from "@/contact/ContactPlugin.js";
|
|
16
16
|
import { TaskPlugin } from "@/task/TaskPlugin.js";
|
|
17
17
|
import { MemoryPlugin } from "@/memory/MemoryPlugin.js";
|
|
18
|
-
import { ShellPlugin } from "@/shell/ShellPlugin.js";
|
|
19
18
|
import { ImagePlugin } from "@/image/ImagePlugin.js";
|
|
20
19
|
import { AsrPlugin } from "@/asr/Plugin.js";
|
|
21
20
|
import { TtsPlugin } from "@/tts/Plugin.js";
|
|
@@ -24,7 +23,6 @@ import type { AsrPluginOptions } from "@/asr/types/AsrPlugin.js";
|
|
|
24
23
|
import type { TtsPluginOptions } from "@/tts/types/TtsPlugin.js";
|
|
25
24
|
import type { TaskPluginOptions } from "@/task/types/TaskPluginOptions.js";
|
|
26
25
|
import type { MemoryPluginOptions } from "@/memory/types/Memory.js";
|
|
27
|
-
import type { ShellPluginOptions } from "@/shell/types/ShellPluginOptions.js";
|
|
28
26
|
|
|
29
27
|
/**
|
|
30
28
|
* 内建 plugin class 构造器。
|
|
@@ -44,7 +42,6 @@ export const BUILTIN_PLUGIN_CLASSES: BuiltinPluginClass[] = [
|
|
|
44
42
|
ContactPlugin,
|
|
45
43
|
TaskPlugin,
|
|
46
44
|
MemoryPlugin,
|
|
47
|
-
ShellPlugin,
|
|
48
45
|
];
|
|
49
46
|
|
|
50
47
|
/**
|
|
@@ -76,10 +73,6 @@ export interface BuiltinPluginOptions {
|
|
|
76
73
|
*/
|
|
77
74
|
memory?: MemoryPluginOptions;
|
|
78
75
|
|
|
79
|
-
/**
|
|
80
|
-
* shell plugin 的可选 runtime 参数。
|
|
81
|
-
*/
|
|
82
|
-
shell?: ShellPluginOptions;
|
|
83
76
|
}
|
|
84
77
|
|
|
85
78
|
/**
|
|
@@ -91,8 +84,6 @@ export function createBuiltinPlugins(options: BuiltinPluginOptions = {}): BasePl
|
|
|
91
84
|
? new TaskPlugin(options.task)
|
|
92
85
|
: PluginClass === MemoryPlugin
|
|
93
86
|
? new MemoryPlugin(options.memory)
|
|
94
|
-
: PluginClass === ShellPlugin
|
|
95
|
-
? new ShellPlugin(options.shell)
|
|
96
87
|
: new PluginClass(),
|
|
97
88
|
);
|
|
98
89
|
if (options.image?.image_create && options.image?.image_result) {
|
package/src/index.ts
CHANGED
|
@@ -31,7 +31,6 @@ export { TtsPlugin } from "./tts/Plugin.js";
|
|
|
31
31
|
export { WorkboardPlugin } from "./workboard/Plugin.js";
|
|
32
32
|
export { TaskPlugin } from "./task/TaskPlugin.js";
|
|
33
33
|
export { MemoryPlugin } from "./memory/MemoryPlugin.js";
|
|
34
|
-
export { ShellPlugin } from "./shell/ShellPlugin.js";
|
|
35
34
|
export {
|
|
36
35
|
listChatAuthorizationRoles,
|
|
37
36
|
readChatAuthorizationConfigSync,
|
|
@@ -63,10 +62,6 @@ export type {
|
|
|
63
62
|
} from "./chat/types/ChatPluginOptions.js";
|
|
64
63
|
export type { ContactPluginOptions } from "./contact/types/ContactPluginOptions.js";
|
|
65
64
|
export type { TaskPluginOptions } from "./task/types/TaskPluginOptions.js";
|
|
66
|
-
export type {
|
|
67
|
-
ResolvedShellPluginOptions,
|
|
68
|
-
ShellPluginOptions,
|
|
69
|
-
} from "./shell/types/ShellPluginOptions.js";
|
|
70
65
|
export type {
|
|
71
66
|
MemoryActionPayload,
|
|
72
67
|
MemoryDefaults,
|
|
@@ -9,7 +9,9 @@
|
|
|
9
9
|
import path from "node:path";
|
|
10
10
|
import fs from "fs-extra";
|
|
11
11
|
import type { AgentContext } from "@downcity/agent/internal/types/runtime/agent/AgentContext.js";
|
|
12
|
-
import { runSandboxCommand } from "@downcity/
|
|
12
|
+
import { runSandboxCommand } from "@downcity/shell/sandbox/SandboxRunner.js";
|
|
13
|
+
import type { ShellHostContext } from "@downcity/shell/types/ShellHostContext.js";
|
|
14
|
+
import { withShellRunScope } from "@downcity/shell";
|
|
13
15
|
import type { SessionRunResult } from "@downcity/agent/internal/executor/types/SessionRun.js";
|
|
14
16
|
import type { SessionRunContext } from "@downcity/agent/internal/types/executor/SessionRunContext.js";
|
|
15
17
|
import type { JsonObject } from "@downcity/agent/internal/types/common/Json.js";
|
|
@@ -249,9 +251,17 @@ export async function runAgentRound(params: {
|
|
|
249
251
|
runContext: create_task_run_context(params.sessionId),
|
|
250
252
|
},
|
|
251
253
|
() =>
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
254
|
+
withShellRunScope(
|
|
255
|
+
{
|
|
256
|
+
run_context: {
|
|
257
|
+
session_id: params.sessionId,
|
|
258
|
+
},
|
|
259
|
+
},
|
|
260
|
+
() =>
|
|
261
|
+
params.taskSessionRuntime.getExecutor(params.sessionId).run({
|
|
262
|
+
query: params.query,
|
|
263
|
+
}),
|
|
264
|
+
),
|
|
255
265
|
);
|
|
256
266
|
const outputPick = pickAgentOutput(result.assistantMessage);
|
|
257
267
|
|
|
@@ -295,7 +305,7 @@ export async function runScriptTask(params: {
|
|
|
295
305
|
};
|
|
296
306
|
stripTaskSecretEnv(childEnv);
|
|
297
307
|
return runSandboxCommand({
|
|
298
|
-
context: params.context,
|
|
308
|
+
context: params.context as unknown as ShellHostContext,
|
|
299
309
|
executionId: `task-script:${params.sessionId}`,
|
|
300
310
|
executionDir: params.runDirAbs,
|
|
301
311
|
cmd: `sh "${scriptAbs.replace(/(["\\$`])/g, "\\$1")}"`,
|