@downcity/shell 0.1.38 → 0.1.40
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/Shell.d.ts +8 -0
- package/bin/Shell.d.ts.map +1 -1
- package/bin/Shell.js +42 -13
- package/bin/Shell.js.map +1 -1
- package/bin/approval/ShellApprovalRuntime.d.ts +3 -0
- package/bin/approval/ShellApprovalRuntime.d.ts.map +1 -1
- package/bin/approval/ShellApprovalRuntime.js +58 -28
- package/bin/approval/ShellApprovalRuntime.js.map +1 -1
- package/bin/session/ShellRuntimeEnvironment.d.ts +4 -1
- package/bin/session/ShellRuntimeEnvironment.d.ts.map +1 -1
- package/bin/session/ShellRuntimeEnvironment.js +8 -4
- package/bin/session/ShellRuntimeEnvironment.js.map +1 -1
- package/bin/session/ShellRuntimeTypes.d.ts +8 -0
- package/bin/session/ShellRuntimeTypes.d.ts.map +1 -1
- package/bin/session/actions/ShellExecActions.d.ts.map +1 -1
- package/bin/session/actions/ShellExecActions.js +3 -0
- package/bin/session/actions/ShellExecActions.js.map +1 -1
- package/bin/session/actions/ShellStartActions.d.ts.map +1 -1
- package/bin/session/actions/ShellStartActions.js +12 -3
- package/bin/session/actions/ShellStartActions.js.map +1 -1
- package/bin/session/actions/ShellWriteActions.d.ts.map +1 -1
- package/bin/session/actions/ShellWriteActions.js +6 -0
- package/bin/session/actions/ShellWriteActions.js.map +1 -1
- package/bin/tool/ShellTools.d.ts +5 -20
- package/bin/tool/ShellTools.d.ts.map +1 -1
- package/bin/tool/ShellTools.js +82 -86
- package/bin/tool/ShellTools.js.map +1 -1
- package/bin/types/ShellAction.d.ts +31 -0
- package/bin/types/ShellAction.d.ts.map +1 -1
- package/bin/types/ShellRuntime.d.ts +76 -1
- package/bin/types/ShellRuntime.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellStartActions.js","sourceRoot":"","sources":["../../../src/session/actions/ShellStartActions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,eAAe,
|
|
1
|
+
{"version":3,"file":"ShellStartActions.js","sourceRoot":"","sources":["../../../src/session/actions/ShellStartActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellWriteActions.d.ts","sourceRoot":"","sources":["../../../src/session/actions/ShellWriteActions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAchC;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"ShellWriteActions.d.ts","sourceRoot":"","sources":["../../../src/session/actions/ShellWriteActions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,KAAK,EACV,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAchC;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAiG9B"}
|
|
@@ -35,6 +35,9 @@ export async function writeShellSession(state, context, request) {
|
|
|
35
35
|
let approvalId;
|
|
36
36
|
let approvalStatus;
|
|
37
37
|
const reason = String(request.reason || "").trim();
|
|
38
|
+
// 关键点（中文）
|
|
39
|
+
// - 优先使用显式传入的 turnId；未传入时保留 AsyncLocalStorage fallback。
|
|
40
|
+
const turnId = String(request.turnId || context.shellIntegration?.getRunContext?.()?.turnId || "").trim() || undefined;
|
|
38
41
|
if (session.snapshot.sandboxMode === "unrestricted") {
|
|
39
42
|
const validationError = validateUnrestrictedRequest({ cmd: chars, reason });
|
|
40
43
|
if (validationError)
|
|
@@ -55,6 +58,7 @@ export async function writeShellSession(state, context, request) {
|
|
|
55
58
|
...(session.snapshot.ownerContextId ? { ownerContextId: session.snapshot.ownerContextId } : {}),
|
|
56
59
|
inputPreview: chars,
|
|
57
60
|
inputChars: chars.length,
|
|
61
|
+
...(request.toolCallId ? { toolCallId: request.toolCallId } : {}),
|
|
58
62
|
}).catch(() => undefined);
|
|
59
63
|
}
|
|
60
64
|
else {
|
|
@@ -67,8 +71,10 @@ export async function writeShellSession(state, context, request) {
|
|
|
67
71
|
cwd: session.snapshot.cwd,
|
|
68
72
|
reason,
|
|
69
73
|
...(session.snapshot.ownerContextId ? { ownerContextId: session.snapshot.ownerContextId } : {}),
|
|
74
|
+
...(turnId ? { turnId } : {}),
|
|
70
75
|
inputPreview: chars,
|
|
71
76
|
inputChars: chars.length,
|
|
77
|
+
...(request.toolCallId ? { toolCallId: request.toolCallId } : {}),
|
|
72
78
|
});
|
|
73
79
|
approvalId = approval.approvalId;
|
|
74
80
|
approvalStatus = approval.status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellWriteActions.js","sourceRoot":"","sources":["../../../src/session/actions/ShellWriteActions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,GACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAAwB,EACxB,OAAyB,EACzB,OAA0B;IAE1B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE;QACnD,OAAO;QACP,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACpF,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,iBAAiB,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,kBAAkB,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,kBAAkB,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,UAA8B,CAAC;IACnC,IAAI,cAA+C,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,KAAK,cAAc,EAAE,CAAC;QACpD,MAAM,eAAe,GAAG,2BAA2B,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5E,IAAI,eAAe;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,oBAAoB,CAAC;YACxC,KAAK;YACL,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,cAAc;SAChD,CAAC,CAAC;QACH,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;YACpC,cAAc,GAAG,UAAU,CAAC;YAC5B,MAAM,0BAA0B,CAAC;gBAC/B,OAAO;gBACP,OAAO;gBACP,QAAQ,EAAE,aAAa;gBACvB,GAAG,EAAE,KAAK;gBACV,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG;gBACzB,MAAM;gBACN,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/F,YAAY,EAAE,KAAK;gBACnB,UAAU,EAAE,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"ShellWriteActions.js","sourceRoot":"","sources":["../../../src/session/actions/ShellWriteActions.ts"],"names":[],"mappings":"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"}
|
package/bin/tool/ShellTools.d.ts
CHANGED
|
@@ -5,28 +5,13 @@
|
|
|
5
5
|
* - `@downcity/shell` 自己拥有 shell tool 的 schema、执行逻辑与响应整理。
|
|
6
6
|
* - Agent 只把 Shell 实例的 tools 合并到模型可调用工具集合中。
|
|
7
7
|
*/
|
|
8
|
-
import type {
|
|
9
|
-
import type { ShellToolSet } from "../types/ShellRuntime.js";
|
|
10
|
-
type JsonObject = Record<string, unknown>;
|
|
11
|
-
export type ShellToolAction = "start" | "exec" | "status" | "read" | "write" | "wait" | "close";
|
|
12
|
-
export interface ShellToolRunner {
|
|
13
|
-
/**
|
|
14
|
-
* 执行 shell action。
|
|
15
|
-
*/
|
|
16
|
-
run_action(params: {
|
|
17
|
-
/**
|
|
18
|
-
* action 名称。
|
|
19
|
-
*/
|
|
20
|
-
action: ShellToolAction;
|
|
21
|
-
/**
|
|
22
|
-
* action payload。
|
|
23
|
-
*/
|
|
24
|
-
payload: JsonObject;
|
|
25
|
-
}): Promise<ShellActionResponse>;
|
|
26
|
-
}
|
|
8
|
+
import type { ShellToolRunner, ShellToolSet } from "../types/ShellRuntime.js";
|
|
27
9
|
/**
|
|
28
10
|
* 创建 shell tools。
|
|
11
|
+
*
|
|
12
|
+
* 关键点（中文）
|
|
13
|
+
* - 每个 tool.execute 都会通过 runner.getRunContext() 拿到显式 session/turn 上下文，
|
|
14
|
+
* 并随 action 请求一起传给 Shell 内部，避免依赖 AsyncLocalStorage。
|
|
29
15
|
*/
|
|
30
16
|
export declare function createShellTools(runner: ShellToolRunner): ShellToolSet;
|
|
31
|
-
export {};
|
|
32
17
|
//# sourceMappingURL=ShellTools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellTools.d.ts","sourceRoot":"","sources":["../../src/tool/ShellTools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"ShellTools.d.ts","sourceRoot":"","sources":["../../src/tool/ShellTools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuBH,OAAO,KAAK,EAEV,eAAe,EACf,YAAY,EACb,MAAM,yBAAyB,CAAC;AAqHjC;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,YAAY,CAkRtE"}
|
package/bin/tool/ShellTools.js
CHANGED
|
@@ -97,12 +97,29 @@ function formatToolError(prefix, error) {
|
|
|
97
97
|
}
|
|
98
98
|
/**
|
|
99
99
|
* 创建 shell tools。
|
|
100
|
+
*
|
|
101
|
+
* 关键点（中文）
|
|
102
|
+
* - 每个 tool.execute 都会通过 runner.getRunContext() 拿到显式 session/turn 上下文，
|
|
103
|
+
* 并随 action 请求一起传给 Shell 内部，避免依赖 AsyncLocalStorage。
|
|
100
104
|
*/
|
|
101
105
|
export function createShellTools(runner) {
|
|
106
|
+
/**
|
|
107
|
+
* 统一包装 run_action，自动注入当前 tool 运行上下文。
|
|
108
|
+
*/
|
|
109
|
+
function run_action_with_context(action, payload, toolCallId) {
|
|
110
|
+
const run_context = runner.getRunContext?.() || null;
|
|
111
|
+
return runner.run_action({
|
|
112
|
+
action,
|
|
113
|
+
payload,
|
|
114
|
+
ownerContextId: run_context?.ownerContextId,
|
|
115
|
+
turnId: run_context?.turnId,
|
|
116
|
+
toolCallId,
|
|
117
|
+
});
|
|
118
|
+
}
|
|
102
119
|
const shell_start = tool({
|
|
103
120
|
description: "Start a shell session. Returns shell_id plus initial status/output. Long-running commands should usually be checked later with shell_status or shell_wait instead of repeated polling.",
|
|
104
121
|
inputSchema: shellStartInputSchema,
|
|
105
|
-
execute: async ({ cmd, workdir, shell, login = true, inline_wait_ms = 1200, max_output_tokens, auto_notify_on_exit, sandbox = "safe", reason, }) => {
|
|
122
|
+
execute: async ({ cmd, workdir, shell, login = true, inline_wait_ms = 1200, max_output_tokens, auto_notify_on_exit, sandbox = "safe", reason, }, options) => {
|
|
106
123
|
const started_at = Date.now();
|
|
107
124
|
try {
|
|
108
125
|
const validation_error = validateChatSendCommand(cmd);
|
|
@@ -112,24 +129,21 @@ export function createShellTools(runner) {
|
|
|
112
129
|
error: `shell_start rejected: ${validation_error}`,
|
|
113
130
|
};
|
|
114
131
|
}
|
|
115
|
-
const response = await
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
...(reason ? { reason } : {}),
|
|
131
|
-
},
|
|
132
|
-
});
|
|
132
|
+
const response = await run_action_with_context("start", {
|
|
133
|
+
cmd,
|
|
134
|
+
...(workdir ? { cwd: workdir } : {}),
|
|
135
|
+
...(shell ? { shell } : {}),
|
|
136
|
+
login,
|
|
137
|
+
inlineWaitMs: inline_wait_ms,
|
|
138
|
+
...(typeof max_output_tokens === "number"
|
|
139
|
+
? { maxOutputTokens: max_output_tokens }
|
|
140
|
+
: {}),
|
|
141
|
+
...(typeof auto_notify_on_exit === "boolean"
|
|
142
|
+
? { autoNotifyOnExit: auto_notify_on_exit }
|
|
143
|
+
: {}),
|
|
144
|
+
sandbox,
|
|
145
|
+
...(reason ? { reason } : {}),
|
|
146
|
+
}, options.toolCallId);
|
|
133
147
|
return flattenShellActionResponse({ response, started_at });
|
|
134
148
|
}
|
|
135
149
|
catch (error) {
|
|
@@ -140,7 +154,7 @@ export function createShellTools(runner) {
|
|
|
140
154
|
const shell_exec = tool({
|
|
141
155
|
description: "Execute a short shell command in one-shot mode and wait for completion. Prefer shell_start for long-running or interactive commands.",
|
|
142
156
|
inputSchema: shellExecInputSchema,
|
|
143
|
-
execute: async ({ cmd, workdir, shell, login = true, timeout_ms = 60000, max_output_tokens, sandbox = "safe", reason, }) => {
|
|
157
|
+
execute: async ({ cmd, workdir, shell, login = true, timeout_ms = 60000, max_output_tokens, sandbox = "safe", reason, }, options) => {
|
|
144
158
|
const started_at = Date.now();
|
|
145
159
|
try {
|
|
146
160
|
const validation_error = validateChatSendCommand(cmd);
|
|
@@ -150,21 +164,18 @@ export function createShellTools(runner) {
|
|
|
150
164
|
error: `shell_exec rejected: ${validation_error}`,
|
|
151
165
|
};
|
|
152
166
|
}
|
|
153
|
-
const response = await
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
...(reason ? { reason } : {}),
|
|
166
|
-
},
|
|
167
|
-
});
|
|
167
|
+
const response = await run_action_with_context("exec", {
|
|
168
|
+
cmd,
|
|
169
|
+
...(workdir ? { cwd: workdir } : {}),
|
|
170
|
+
...(shell ? { shell } : {}),
|
|
171
|
+
login,
|
|
172
|
+
timeoutMs: timeout_ms,
|
|
173
|
+
...(typeof max_output_tokens === "number"
|
|
174
|
+
? { maxOutputTokens: max_output_tokens }
|
|
175
|
+
: {}),
|
|
176
|
+
sandbox,
|
|
177
|
+
...(reason ? { reason } : {}),
|
|
178
|
+
}, options.toolCallId);
|
|
168
179
|
return flattenShellExecResponse({ response, started_at });
|
|
169
180
|
}
|
|
170
181
|
catch (error) {
|
|
@@ -175,17 +186,14 @@ export function createShellTools(runner) {
|
|
|
175
186
|
const shell_status = tool({
|
|
176
187
|
description: "Query the current status of a shell session. Prefer this to ask for progress during long-running commands.",
|
|
177
188
|
inputSchema: shellStatusInputSchema,
|
|
178
|
-
execute: async ({ shell_id, cmd }) => {
|
|
189
|
+
execute: async ({ shell_id, cmd }, options) => {
|
|
179
190
|
const started_at = Date.now();
|
|
180
191
|
try {
|
|
181
|
-
const response = await
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
includeCompleted: true,
|
|
187
|
-
},
|
|
188
|
-
});
|
|
192
|
+
const response = await run_action_with_context("status", {
|
|
193
|
+
...(shell_id ? { shellId: shell_id } : {}),
|
|
194
|
+
...(cmd ? { cmd } : {}),
|
|
195
|
+
includeCompleted: true,
|
|
196
|
+
}, options.toolCallId);
|
|
189
197
|
return flattenShellActionResponse({ response, started_at });
|
|
190
198
|
}
|
|
191
199
|
catch (error) {
|
|
@@ -196,20 +204,17 @@ export function createShellTools(runner) {
|
|
|
196
204
|
const shell_read = tool({
|
|
197
205
|
description: "Read output from a shell session starting at a character cursor. Use this only when you truly need the raw incremental output.",
|
|
198
206
|
inputSchema: shellReadInputSchema,
|
|
199
|
-
execute: async ({ shell_id, from_cursor, max_output_tokens,
|
|
207
|
+
execute: async ({ shell_id, from_cursor, max_output_tokens }, options) => {
|
|
200
208
|
const started_at = Date.now();
|
|
201
209
|
try {
|
|
202
|
-
const response = await
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
includeCompleted: true,
|
|
211
|
-
},
|
|
212
|
-
});
|
|
210
|
+
const response = await run_action_with_context("read", {
|
|
211
|
+
shellId: shell_id,
|
|
212
|
+
...(typeof from_cursor === "number" ? { fromCursor: from_cursor } : {}),
|
|
213
|
+
...(typeof max_output_tokens === "number"
|
|
214
|
+
? { maxOutputTokens: max_output_tokens }
|
|
215
|
+
: {}),
|
|
216
|
+
includeCompleted: true,
|
|
217
|
+
}, options.toolCallId);
|
|
213
218
|
return flattenShellActionResponse({ response, started_at });
|
|
214
219
|
}
|
|
215
220
|
catch (error) {
|
|
@@ -220,17 +225,14 @@ export function createShellTools(runner) {
|
|
|
220
225
|
const shell_write = tool({
|
|
221
226
|
description: "Write text to the stdin of an existing shell session. When the target session runs in unrestricted sandbox mode, provide reason; every write requires user approval.",
|
|
222
227
|
inputSchema: shellWriteInputSchema,
|
|
223
|
-
execute: async ({ shell_id, chars, reason }) => {
|
|
228
|
+
execute: async ({ shell_id, chars, reason }, options) => {
|
|
224
229
|
const started_at = Date.now();
|
|
225
230
|
try {
|
|
226
|
-
const response = await
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
...(reason ? { reason } : {}),
|
|
232
|
-
},
|
|
233
|
-
});
|
|
231
|
+
const response = await run_action_with_context("write", {
|
|
232
|
+
shellId: shell_id,
|
|
233
|
+
chars,
|
|
234
|
+
...(reason ? { reason } : {}),
|
|
235
|
+
}, options.toolCallId);
|
|
234
236
|
return flattenShellActionResponse({ response, started_at });
|
|
235
237
|
}
|
|
236
238
|
catch (error) {
|
|
@@ -241,21 +243,18 @@ export function createShellTools(runner) {
|
|
|
241
243
|
const shell_wait = tool({
|
|
242
244
|
description: "Wait for a shell session to change state or produce more output. Prefer this over manual high-frequency polling loops.",
|
|
243
245
|
inputSchema: shellWaitInputSchema,
|
|
244
|
-
execute: async ({ shell_id, after_version, from_cursor, timeout_ms = 10000, max_output_tokens, }) => {
|
|
246
|
+
execute: async ({ shell_id, after_version, from_cursor, timeout_ms = 10000, max_output_tokens, }, options) => {
|
|
245
247
|
const started_at = Date.now();
|
|
246
248
|
try {
|
|
247
|
-
const response = await
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
: {}),
|
|
257
|
-
},
|
|
258
|
-
});
|
|
249
|
+
const response = await run_action_with_context("wait", {
|
|
250
|
+
shellId: shell_id,
|
|
251
|
+
...(typeof after_version === "number" ? { afterVersion: after_version } : {}),
|
|
252
|
+
...(typeof from_cursor === "number" ? { fromCursor: from_cursor } : {}),
|
|
253
|
+
timeoutMs: timeout_ms,
|
|
254
|
+
...(typeof max_output_tokens === "number"
|
|
255
|
+
? { maxOutputTokens: max_output_tokens }
|
|
256
|
+
: {}),
|
|
257
|
+
}, options.toolCallId);
|
|
259
258
|
return flattenShellActionResponse({ response, started_at });
|
|
260
259
|
}
|
|
261
260
|
catch (error) {
|
|
@@ -266,16 +265,13 @@ export function createShellTools(runner) {
|
|
|
266
265
|
const shell_close = tool({
|
|
267
266
|
description: "Close a shell session and release runtime resources. Use force only when a process will not exit normally.",
|
|
268
267
|
inputSchema: shellCloseInputSchema,
|
|
269
|
-
execute: async ({ shell_id, force = false }) => {
|
|
268
|
+
execute: async ({ shell_id, force = false }, options) => {
|
|
270
269
|
const started_at = Date.now();
|
|
271
270
|
try {
|
|
272
|
-
const response = await
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
force,
|
|
277
|
-
},
|
|
278
|
-
});
|
|
271
|
+
const response = await run_action_with_context("close", {
|
|
272
|
+
shellId: shell_id,
|
|
273
|
+
force,
|
|
274
|
+
}, options.toolCallId);
|
|
279
275
|
return flattenShellActionResponse({ response, started_at });
|
|
280
276
|
}
|
|
281
277
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellTools.js","sourceRoot":"","sources":["../../src/tool/ShellTools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ShellTools.js","sourceRoot":"","sources":["../../src/tool/ShellTools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,IAAI,EAA6B,MAAM,IAAI,CAAC;AAWrD,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AASxE,SAAS,0BAA0B,CAAC,MASnC;IACC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IACpC,MAAM,SAAS,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/F,MAAM,OAAO,GACX,cAAc,CAAC,cAAc,KAAK,QAAQ;QAC1C,cAAc,CAAC,cAAc,KAAK,SAAS;QAC3C,CAAC,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC;IAC1C,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,cAAc,CAAC,OAAO;QAChC,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,SAAS,EAAE,cAAc,CAAC,SAAS,KAAK,IAAI;QAC5C,OAAO,EAAE,cAAc,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;QACrG,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,WAAW,EAAE,cAAc,CAAC,UAAU,IAAI,IAAI;QAC9C,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,cAAc,EAAE,cAAc,CAAC,aAAa,KAAK,KAAK;QACtD,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,oBAAoB,EAAE,cAAc,CAAC,kBAAkB,IAAI,IAAI;QAC/D,WAAW,EAAE,cAAc,CAAC,UAAU,IAAI,IAAI;QAC9C,gBAAgB,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACvD,eAAe,EAAE,cAAc,CAAC,aAAa,IAAI,IAAI;QACrD,iBAAiB,EAAE,cAAc,CAAC,eAAe,IAAI,IAAI;QACzD,GAAG,EAAE,OAAO,cAAc,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;QACvE,OAAO,EAAE,cAAc,CAAC,OAAO;QAC/B,UAAU,EAAE,cAAc,CAAC,SAAS;QACpC,UAAU,EAAE,cAAc,CAAC,SAAS;QACpC,QAAQ,EAAE,OAAO,cAAc,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACpF,SAAS;QACT,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE;QAC3B,YAAY,EAAE,OAAO,KAAK,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;QAC/E,UAAU,EAAE,OAAO,KAAK,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACzE,cAAc,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACzC,cAAc,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACzC,eAAe,EAAE,KAAK,EAAE,aAAa,KAAK,IAAI;QAC9C,mBAAmB,EAAE,cAAc,CAAC,iBAAiB,IAAI,EAAE;QAC3D,YAAY,EAAE,cAAc,CAAC,WAAW;QACxC,aAAa,EAAE,cAAc,CAAC,YAAY;QAC1C,mBAAmB,EAAE,cAAc,CAAC,gBAAgB;QACpD,iBAAiB,EAAE,cAAc,CAAC,gBAAgB;QAClD,gBAAgB,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACvD,aAAa,EAAE,cAAc,CAAC,YAAY;QAC1C,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;QACvE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,MASjC;IACC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;IACpC,MAAM,SAAS,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/F,MAAM,OAAO,GACX,cAAc,CAAC,cAAc,KAAK,QAAQ;QAC1C,cAAc,CAAC,cAAc,KAAK,SAAS;QAC3C,CAAC,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC;IAC1C,OAAO;QACL,OAAO;QACP,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,SAAS,EAAE,cAAc,CAAC,SAAS,KAAK,IAAI;QAC5C,OAAO,EAAE,cAAc,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;QACrG,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,WAAW,EAAE,cAAc,CAAC,UAAU,IAAI,IAAI;QAC9C,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,cAAc,EAAE,cAAc,CAAC,aAAa,KAAK,KAAK;QACtD,eAAe,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACtD,oBAAoB,EAAE,cAAc,CAAC,kBAAkB,IAAI,IAAI;QAC/D,WAAW,EAAE,cAAc,CAAC,UAAU,IAAI,IAAI;QAC9C,gBAAgB,EAAE,cAAc,CAAC,cAAc,IAAI,IAAI;QACvD,eAAe,EAAE,cAAc,CAAC,aAAa,IAAI,IAAI;QACrD,iBAAiB,EAAE,cAAc,CAAC,eAAe,IAAI,IAAI;QACzD,SAAS;QACT,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE;QAC3B,cAAc,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACzC,cAAc,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACzC,aAAa,EAAE,cAAc,CAAC,YAAY;QAC1C,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;QACvE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,MAAc,EACd,KAAc;IAEd,OAAO;QACL,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,GAAG,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE;KACrC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAuB;IACtD;;OAEG;IACH,SAAS,uBAAuB,CAC9B,MAAuB,EACvB,OAAmB,EACnB,UAAmB;QAEnB,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,IAAI,CAAC;QACrD,OAAO,MAAM,CAAC,UAAU,CAAC;YACvB,MAAM;YACN,OAAO;YACP,cAAc,EAAE,WAAW,EAAE,cAAc;YAC3C,MAAM,EAAE,WAAW,EAAE,MAAM;YAC3B,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC;QACvB,WAAW,EACT,wLAAwL;QAC1L,WAAW,EAAE,qBAAqB;QAClC,OAAO,EAAE,KAAK,EACZ,EACE,GAAG,EACH,OAAO,EACP,KAAK,EACL,KAAK,GAAG,IAAI,EACZ,cAAc,GAAG,IAAI,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,OAAO,GAAG,MAAM,EAChB,MAAM,GACU,EAClB,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,yBAAyB,gBAAgB,EAAE;qBACnD,CAAC;gBACJ,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,OAAO,EACP;oBACE,GAAG;oBACH,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,KAAK;oBACL,YAAY,EAAE,cAAc;oBAC5B,GAAG,CAAC,OAAO,iBAAiB,KAAK,QAAQ;wBACvC,CAAC,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAE;wBACxC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,mBAAmB,KAAK,SAAS;wBAC1C,CAAC,CAAC,EAAE,gBAAgB,EAAE,mBAAmB,EAAE;wBAC3C,CAAC,CAAC,EAAE,CAAC;oBACP,OAAO;oBACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9B,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAI,CAAC;QACtB,WAAW,EACT,sIAAsI;QACxI,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE,KAAK,EACZ,EACE,GAAG,EACH,OAAO,EACP,KAAK,EACL,KAAK,GAAG,IAAI,EACZ,UAAU,GAAG,KAAK,EAClB,iBAAiB,EACjB,OAAO,GAAG,MAAM,EAChB,MAAM,GACS,EACjB,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,wBAAwB,gBAAgB,EAAE;qBAClD,CAAC;gBACJ,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,MAAM,EACN;oBACE,GAAG;oBACH,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,KAAK;oBACL,SAAS,EAAE,UAAU;oBACrB,GAAG,CAAC,OAAO,iBAAiB,KAAK,QAAQ;wBACvC,CAAC,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAE;wBACxC,CAAC,CAAC,EAAE,CAAC;oBACP,OAAO;oBACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9B,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,wBAAwB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,CAAC;QACxB,WAAW,EACT,4GAA4G;QAC9G,WAAW,EAAE,sBAAsB;QACnC,OAAO,EAAE,KAAK,EACZ,EAAE,QAAQ,EAAE,GAAG,EAAoB,EACnC,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,QAAQ,EACR;oBACE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvB,gBAAgB,EAAE,IAAI;iBACvB,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAI,CAAC;QACtB,WAAW,EACT,gIAAgI;QAClI,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE,KAAK,EACZ,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAkB,EAC5D,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,MAAM,EACN;oBACE,OAAO,EAAE,QAAQ;oBACjB,GAAG,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvE,GAAG,CAAC,OAAO,iBAAiB,KAAK,QAAQ;wBACvC,CAAC,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAE;wBACxC,CAAC,CAAC,EAAE,CAAC;oBACP,gBAAgB,EAAE,IAAI;iBACvB,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,CAAC;QACvB,WAAW,EACT,sKAAsK;QACxK,WAAW,EAAE,qBAAqB;QAClC,OAAO,EAAE,KAAK,EACZ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAmB,EAC5C,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,OAAO,EACP;oBACE,OAAO,EAAE,QAAQ;oBACjB,KAAK;oBACL,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9B,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAI,CAAC;QACtB,WAAW,EACT,wHAAwH;QAC1H,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE,KAAK,EACZ,EACE,QAAQ,EACR,aAAa,EACb,WAAW,EACX,UAAU,GAAG,KAAK,EAClB,iBAAiB,GACF,EACjB,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,MAAM,EACN;oBACE,OAAO,EAAE,QAAQ;oBACjB,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7E,GAAG,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvE,SAAS,EAAE,UAAU;oBACrB,GAAG,CAAC,OAAO,iBAAiB,KAAK,QAAQ;wBACvC,CAAC,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAE;wBACxC,CAAC,CAAC,EAAE,CAAC;iBACR,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,CAAC;QACvB,WAAW,EACT,4GAA4G;QAC9G,WAAW,EAAE,qBAAqB;QAClC,OAAO,EAAE,KAAK,EACZ,EAAE,QAAQ,EAAE,KAAK,GAAG,KAAK,EAAmB,EAC5C,OAA6B,EAC7B,EAAE;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,OAAO,EACP;oBACE,OAAO,EAAE,QAAQ;oBACjB,KAAK;iBACN,EACD,OAAO,CAAC,UAAU,CACnB,CAAC;gBACF,OAAO,0BAA0B,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,eAAe,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,OAAO;QACL,UAAU;QACV,WAAW;QACX,YAAY;QACZ,UAAU;QACV,WAAW;QACX,UAAU;QACV,WAAW;KACZ,CAAC;AACJ,CAAC"}
|
|
@@ -131,6 +131,8 @@ export type ShellStartRequest = {
|
|
|
131
131
|
maxOutputTokens?: number;
|
|
132
132
|
/** 显式指定 owner sessionId；为空时优先从 SessionRunScope 推断。 */
|
|
133
133
|
ownerContextId?: string;
|
|
134
|
+
/** 显式指定当前 turn id。 */
|
|
135
|
+
turnId?: string;
|
|
134
136
|
/** 是否在 shell 结束后自动回投主 chat agent。 */
|
|
135
137
|
autoNotifyOnExit?: boolean;
|
|
136
138
|
/** 命令执行 sandbox 模式；默认 safe。 */
|
|
@@ -139,6 +141,13 @@ export type ShellStartRequest = {
|
|
|
139
141
|
reason?: string;
|
|
140
142
|
/** 内部审批来源工具名；普通调用方不需要传。 */
|
|
141
143
|
approvalToolName?: ShellApprovalToolName;
|
|
144
|
+
/**
|
|
145
|
+
* AI SDK 分配给当前 tool 调用的 id。
|
|
146
|
+
*
|
|
147
|
+
* 说明（中文）
|
|
148
|
+
* - 用于让 shell approval 事件与 AI SDK 的 tool-call / tool-result 事件共用同一 toolCallId。
|
|
149
|
+
*/
|
|
150
|
+
toolCallId?: string;
|
|
142
151
|
};
|
|
143
152
|
/**
|
|
144
153
|
* shell 一次性执行请求。
|
|
@@ -164,6 +173,17 @@ export type ShellExecRequest = {
|
|
|
164
173
|
sandbox?: ShellSandboxMode;
|
|
165
174
|
/** 请求 unrestricted sandbox 时展示给用户的原因。 */
|
|
166
175
|
reason?: string;
|
|
176
|
+
/** 显式指定 owner sessionId。 */
|
|
177
|
+
ownerContextId?: string;
|
|
178
|
+
/** 显式指定当前 turn id。 */
|
|
179
|
+
turnId?: string;
|
|
180
|
+
/**
|
|
181
|
+
* AI SDK 分配给当前 tool 调用的 id。
|
|
182
|
+
*
|
|
183
|
+
* 说明（中文）
|
|
184
|
+
* - 用于让 shell approval 事件与 AI SDK 的 tool-call / tool-result 事件共用同一 toolCallId。
|
|
185
|
+
*/
|
|
186
|
+
toolCallId?: string;
|
|
167
187
|
};
|
|
168
188
|
/**
|
|
169
189
|
* shell 查询请求。
|
|
@@ -201,6 +221,17 @@ export type ShellWriteRequest = {
|
|
|
201
221
|
chars: string;
|
|
202
222
|
/** 向 unrestricted shell session 写入 stdin 时展示给用户的原因。 */
|
|
203
223
|
reason?: string;
|
|
224
|
+
/** 显式指定 owner sessionId。 */
|
|
225
|
+
ownerContextId?: string;
|
|
226
|
+
/** 显式指定当前 turn id。 */
|
|
227
|
+
turnId?: string;
|
|
228
|
+
/**
|
|
229
|
+
* AI SDK 分配给当前 tool 调用的 id。
|
|
230
|
+
*
|
|
231
|
+
* 说明（中文）
|
|
232
|
+
* - 用于让 shell approval 事件与 AI SDK 的 tool-call / tool-result 事件共用同一 toolCallId。
|
|
233
|
+
*/
|
|
234
|
+
toolCallId?: string;
|
|
204
235
|
};
|
|
205
236
|
/**
|
|
206
237
|
* shell 等待请求。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellAction.d.ts","sourceRoot":"","sources":["../../src/types/ShellAction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ShellAction.d.ts","sourceRoot":"","sources":["../../src/types/ShellAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* - Shell 自己拥有 tools、sessions、sandbox 与 approvals；Agent 只负责提供宿主上下文。
|
|
7
7
|
*/
|
|
8
8
|
import type { Tool } from "ai";
|
|
9
|
-
import type { ShellApprovalMode, ShellApprovalStatus } from "../types/ShellAction.js";
|
|
9
|
+
import type { ShellActionResponse, ShellApprovalMode, ShellApprovalStatus } from "../types/ShellAction.js";
|
|
10
10
|
/**
|
|
11
11
|
* Shell 运行时日志器。
|
|
12
12
|
*/
|
|
@@ -20,6 +20,27 @@ export interface ShellRuntimeLogger {
|
|
|
20
20
|
* Shell 事件。
|
|
21
21
|
*/
|
|
22
22
|
export type ShellEvent = Record<string, unknown>;
|
|
23
|
+
/**
|
|
24
|
+
* Shell tool 执行时需要的宿主运行上下文。
|
|
25
|
+
*
|
|
26
|
+
* 关键点（中文）
|
|
27
|
+
* - 替代 AsyncLocalStorage，显式把 session/turn 上下文传给 Shell action。
|
|
28
|
+
* - 由 Agent 在 tool.execute 入口提供，Shell 内部不再隐式读取 run scope。
|
|
29
|
+
*/
|
|
30
|
+
export interface ShellToolRunContext {
|
|
31
|
+
/**
|
|
32
|
+
* 当前 tool 调用所属的 agent session id。
|
|
33
|
+
*/
|
|
34
|
+
ownerContextId?: string;
|
|
35
|
+
/**
|
|
36
|
+
* 当前 tool 调用所属的 turn id。
|
|
37
|
+
*/
|
|
38
|
+
turnId?: string;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* 读取当前 Shell tool 运行上下文。
|
|
42
|
+
*/
|
|
43
|
+
export type ShellGetRunContext = () => ShellToolRunContext | null | undefined;
|
|
23
44
|
/**
|
|
24
45
|
* Shell 构造参数。
|
|
25
46
|
*/
|
|
@@ -44,6 +65,14 @@ export interface ShellOptions {
|
|
|
44
65
|
* Shell 事件出口。Agent 会把这些事件转成 session event。
|
|
45
66
|
*/
|
|
46
67
|
emit_event?: (event: ShellEvent) => void;
|
|
68
|
+
/**
|
|
69
|
+
* 读取当前 tool 调用所属的 session/turn 上下文。
|
|
70
|
+
*
|
|
71
|
+
* 说明（中文）
|
|
72
|
+
* - 若未提供，Shell 会回退到 `getShellRunContext()`（AsyncLocalStorage）。
|
|
73
|
+
* - 推荐由 Agent 显式注入，避免 AI SDK 并行 tool callback 丢失 async context。
|
|
74
|
+
*/
|
|
75
|
+
get_run_context?: ShellGetRunContext;
|
|
47
76
|
}
|
|
48
77
|
/**
|
|
49
78
|
* Agent 内部补齐给 Shell 的宿主参数。
|
|
@@ -159,6 +188,52 @@ export interface ShellApprovalModeUpdateResult extends ShellSessionApprovalModeV
|
|
|
159
188
|
*/
|
|
160
189
|
success: true;
|
|
161
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* Shell tool action 名称。
|
|
193
|
+
*/
|
|
194
|
+
export type ShellToolAction = "start" | "exec" | "status" | "read" | "write" | "wait" | "close";
|
|
195
|
+
/**
|
|
196
|
+
* Shell tool 执行器协议。
|
|
197
|
+
*
|
|
198
|
+
* 关键点（中文）
|
|
199
|
+
* - `getRunContext` 让 tool 在执行入口拿到显式 session/turn 上下文。
|
|
200
|
+
* - `run_action` 显式携带 `ownerContextId`/`turnId`，替代 Shell 内部读 AsyncLocalStorage。
|
|
201
|
+
*/
|
|
202
|
+
export interface ShellToolRunner {
|
|
203
|
+
/**
|
|
204
|
+
* 读取当前 tool 调用所属的 session/turn 上下文。
|
|
205
|
+
*/
|
|
206
|
+
getRunContext?: ShellGetRunContext;
|
|
207
|
+
/**
|
|
208
|
+
* 执行 shell action。
|
|
209
|
+
*/
|
|
210
|
+
run_action(params: {
|
|
211
|
+
/**
|
|
212
|
+
* action 名称。
|
|
213
|
+
*/
|
|
214
|
+
action: ShellToolAction;
|
|
215
|
+
/**
|
|
216
|
+
* action payload。
|
|
217
|
+
*/
|
|
218
|
+
payload: Record<string, unknown>;
|
|
219
|
+
/**
|
|
220
|
+
* 当前 tool 调用所属的 agent session id。
|
|
221
|
+
*/
|
|
222
|
+
ownerContextId?: string;
|
|
223
|
+
/**
|
|
224
|
+
* 当前 tool 调用所属的 turn id。
|
|
225
|
+
*/
|
|
226
|
+
turnId?: string;
|
|
227
|
+
/**
|
|
228
|
+
* AI SDK 分配给当前 tool 调用的 id。
|
|
229
|
+
*
|
|
230
|
+
* 关键点（中文）
|
|
231
|
+
* - tool-approval-request / tool-approval-result 事件需要用它作为 toolCallId，
|
|
232
|
+
* 才能与 tool-call / tool-result 事件对齐。
|
|
233
|
+
*/
|
|
234
|
+
toolCallId?: string;
|
|
235
|
+
}): Promise<ShellActionResponse>;
|
|
236
|
+
}
|
|
162
237
|
/**
|
|
163
238
|
* Shell 工具集合。
|
|
164
239
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellRuntime.d.ts","sourceRoot":"","sources":["../../src/types/ShellRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ShellRuntime.d.ts","sourceRoot":"","sources":["../../src/types/ShellRuntime.ts"],"names":[],"mappings":"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"}
|