@downcity/plugins 1.0.194 → 1.0.196
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.
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import path from "node:path";
|
|
9
9
|
import fs from "fs-extra";
|
|
10
|
-
import {
|
|
10
|
+
import { run_sandbox_command } from "@downcity/shell/sandbox/Sandbox.js";
|
|
11
11
|
import { appendTaskRoundUserMessage } from "./TaskRunnerSession.js";
|
|
12
12
|
function stripTaskSecretEnv(env) {
|
|
13
13
|
delete env.DC_AUTH_TOKEN;
|
|
@@ -232,15 +232,15 @@ export async function runScriptTask(params) {
|
|
|
232
232
|
DC_SESSION_ID: params.sessionId,
|
|
233
233
|
};
|
|
234
234
|
stripTaskSecretEnv(childEnv);
|
|
235
|
-
const execResult = await
|
|
235
|
+
const execResult = await run_sandbox_command({
|
|
236
236
|
context: params.context,
|
|
237
|
-
|
|
238
|
-
|
|
237
|
+
execution_id: `task-script:${params.sessionId}`,
|
|
238
|
+
execution_dir: params.runDirAbs,
|
|
239
239
|
cmd: `sh "${scriptAbs.replace(/(["\\$`])/g, "\\$1")}"`,
|
|
240
240
|
cwd: params.runDirAbs,
|
|
241
|
-
|
|
241
|
+
shell_path: "/bin/sh",
|
|
242
242
|
login: false,
|
|
243
|
-
|
|
243
|
+
base_env: childEnv,
|
|
244
244
|
});
|
|
245
245
|
const stdout = String(execResult.stdout || "").trim();
|
|
246
246
|
const stderr = String(execResult.stderr || "").trim();
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"TaskRunnerRound.js","sourceRoot":"","sources":["../../../src/task/runtime/TaskRunnerRound.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.196",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity 内建 plugin 集合包",
|
|
6
6
|
"main": "./bin/index.js",
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@downcity/agent": "^1.1.
|
|
16
|
-
"@downcity/shell": "^0.1.
|
|
15
|
+
"@downcity/agent": "^1.1.260",
|
|
16
|
+
"@downcity/shell": "^0.1.115",
|
|
17
17
|
"ai": "^6.0.193",
|
|
18
18
|
"better-sqlite3": "^12.10.0",
|
|
19
19
|
"commander": "^15.0.0",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import path from "node:path";
|
|
10
10
|
import fs from "fs-extra";
|
|
11
11
|
import type { AgentContext } from "@downcity/agent";
|
|
12
|
-
import {
|
|
12
|
+
import { run_sandbox_command } from "@downcity/shell/sandbox/Sandbox.js";
|
|
13
13
|
import type { ShellHostContext } from "@downcity/shell/types/ShellHostContext.js";
|
|
14
14
|
import type { SessionRunResult } from "@downcity/agent";
|
|
15
15
|
import type { SessionRunContext } from "@downcity/agent";
|
|
@@ -288,15 +288,15 @@ export async function runScriptTask(params: {
|
|
|
288
288
|
DC_SESSION_ID: params.sessionId,
|
|
289
289
|
};
|
|
290
290
|
stripTaskSecretEnv(childEnv);
|
|
291
|
-
const execResult = await
|
|
291
|
+
const execResult = await run_sandbox_command({
|
|
292
292
|
context: params.context as unknown as ShellHostContext,
|
|
293
|
-
|
|
294
|
-
|
|
293
|
+
execution_id: `task-script:${params.sessionId}`,
|
|
294
|
+
execution_dir: params.runDirAbs,
|
|
295
295
|
cmd: `sh "${scriptAbs.replace(/(["\\$`])/g, "\\$1")}"`,
|
|
296
296
|
cwd: params.runDirAbs,
|
|
297
|
-
|
|
297
|
+
shell_path: "/bin/sh",
|
|
298
298
|
login: false,
|
|
299
|
-
|
|
299
|
+
base_env: childEnv,
|
|
300
300
|
});
|
|
301
301
|
|
|
302
302
|
const stdout = String(execResult.stdout || "").trim();
|