@downcity/plugins 1.0.213 → 1.0.214
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/task/runtime/TaskRunnerRound.d.ts.map +1 -1
- package/bin/task/runtime/TaskRunnerRound.js +5 -3
- 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 +4 -6
- package/bin/task/runtime/TaskRunnerSession.js.map +1 -1
- package/package.json +3 -3
- package/src/task/runtime/TaskRunnerRound.ts +5 -4
- package/src/task/runtime/TaskRunnerSession.ts +4 -6
|
@@ -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,iBAAiB,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,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAQ3C;;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,CAoCnF;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,CAgCjC;AAcD;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmBhC"}
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import path from "node:path";
|
|
9
9
|
import fs from "fs-extra";
|
|
10
|
-
import { run_sandbox_command } from "@downcity/shell/sandbox/Sandbox.js";
|
|
11
10
|
import { appendTaskRoundUserMessage } from "./TaskRunnerSession.js";
|
|
12
11
|
function stripTaskSecretEnv(env) {
|
|
13
12
|
delete env.DC_AUTH_TOKEN;
|
|
@@ -232,8 +231,11 @@ export async function runScriptTask(params) {
|
|
|
232
231
|
DC_SESSION_ID: params.sessionId,
|
|
233
232
|
};
|
|
234
233
|
stripTaskSecretEnv(childEnv);
|
|
235
|
-
const
|
|
236
|
-
|
|
234
|
+
const shell = params.context.shell;
|
|
235
|
+
if (!shell) {
|
|
236
|
+
throw new Error("Script task execution requires Agent to be configured with a Shell.");
|
|
237
|
+
}
|
|
238
|
+
const execResult = await shell.run_safe_command({
|
|
237
239
|
execution_id: `task-script:${params.sessionId}`,
|
|
238
240
|
execution_dir: params.runDirAbs,
|
|
239
241
|
cmd: `sh "${scriptAbs.replace(/(["\\$`])/g, "\\$1")}"`,
|
|
@@ -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;
|
|
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,EAAQ,MAAM,IAAI,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;
|
|
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,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAahF;;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,CAehB;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;IAC/B,kCAAkC;IAClC,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,0CAA0C;IAC1C,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,GAAG,sBAAsB,CAqIzB;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"}
|
|
@@ -11,7 +11,6 @@ import path from "node:path";
|
|
|
11
11
|
import { Executor } from "@downcity/agent";
|
|
12
12
|
import { DefaultSessionComposer, JsonlSessionMessageStore, SessionMessages, } from "@downcity/agent";
|
|
13
13
|
import { DefaultSessionSystemComposer } from "@downcity/agent";
|
|
14
|
-
import { Shell } from "@downcity/shell";
|
|
15
14
|
/**
|
|
16
15
|
* 把 task round 的 user query 落盘到对应 run context。
|
|
17
16
|
*/
|
|
@@ -55,11 +54,10 @@ export function createTaskSessionRuntimePort(params) {
|
|
|
55
54
|
const messages_by_session_id = new Map();
|
|
56
55
|
const created_at_by_session_id = new Map();
|
|
57
56
|
const runtimesBySessionId = new Map();
|
|
58
|
-
const shell =
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
});
|
|
57
|
+
const shell = context.shell;
|
|
58
|
+
if (!shell) {
|
|
59
|
+
throw new Error("Task agent execution requires Agent to be configured with a Shell.");
|
|
60
|
+
}
|
|
63
61
|
const shell_tools = shell.tools;
|
|
64
62
|
const resolve_task_messages = (session_id) => {
|
|
65
63
|
const existing = messages_by_session_id.get(session_id);
|
|
@@ -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,iBAAiB,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,wBAAwB,EACxB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;
|
|
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.214",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity 内建 plugin 集合包",
|
|
6
6
|
"main": "./bin/index.js",
|
|
@@ -48,8 +48,8 @@
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@downcity/agent": "^1.1.
|
|
52
|
-
"@downcity/shell": "^0.1.
|
|
51
|
+
"@downcity/agent": "^1.1.285",
|
|
52
|
+
"@downcity/shell": "^0.1.137",
|
|
53
53
|
"ai": "^6.0.193",
|
|
54
54
|
"better-sqlite3": "^12.10.0",
|
|
55
55
|
"commander": "^15.0.0",
|
|
@@ -9,8 +9,6 @@
|
|
|
9
9
|
import path from "node:path";
|
|
10
10
|
import fs from "fs-extra";
|
|
11
11
|
import type { AgentContext } from "@downcity/agent";
|
|
12
|
-
import { run_sandbox_command } from "@downcity/shell/sandbox/Sandbox.js";
|
|
13
|
-
import type { ShellHostContext } from "@downcity/shell/types/ShellHostContext.js";
|
|
14
12
|
import type { SessionRunResult } from "@downcity/agent";
|
|
15
13
|
import type { SessionRunContext } from "@downcity/agent";
|
|
16
14
|
import type { JsonObject } from "@downcity/agent";
|
|
@@ -288,8 +286,11 @@ export async function runScriptTask(params: {
|
|
|
288
286
|
DC_SESSION_ID: params.sessionId,
|
|
289
287
|
};
|
|
290
288
|
stripTaskSecretEnv(childEnv);
|
|
291
|
-
const
|
|
292
|
-
|
|
289
|
+
const shell = params.context.shell;
|
|
290
|
+
if (!shell) {
|
|
291
|
+
throw new Error("Script task execution requires Agent to be configured with a Shell.");
|
|
292
|
+
}
|
|
293
|
+
const execResult = await shell.run_safe_command({
|
|
293
294
|
execution_id: `task-script:${params.sessionId}`,
|
|
294
295
|
execution_dir: params.runDirAbs,
|
|
295
296
|
cmd: `sh "${scriptAbs.replace(/(["\\$`])/g, "\\$1")}"`,
|
|
@@ -20,7 +20,6 @@ import {
|
|
|
20
20
|
SessionMessages,
|
|
21
21
|
} from "@downcity/agent";
|
|
22
22
|
import { DefaultSessionSystemComposer } from "@downcity/agent";
|
|
23
|
-
import { Shell } from "@downcity/shell";
|
|
24
23
|
import type { SessionExecutor } from "@downcity/agent";
|
|
25
24
|
import type {
|
|
26
25
|
SessionComposeInput,
|
|
@@ -94,11 +93,10 @@ export function createTaskSessionRuntimePort(params: {
|
|
|
94
93
|
const messages_by_session_id = new Map<string, SessionMessages>();
|
|
95
94
|
const created_at_by_session_id = new Map<string, number>();
|
|
96
95
|
const runtimesBySessionId = new Map<string, SessionExecutor>();
|
|
97
|
-
const shell =
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
});
|
|
96
|
+
const shell = context.shell;
|
|
97
|
+
if (!shell) {
|
|
98
|
+
throw new Error("Task agent execution requires Agent to be configured with a Shell.");
|
|
99
|
+
}
|
|
102
100
|
const shell_tools = shell.tools as unknown as Record<string, Tool>;
|
|
103
101
|
|
|
104
102
|
const resolve_task_messages = (session_id: string): SessionMessages => {
|