dsh-bundle-antigravity-host 0.1.22 → 0.1.24
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/README.md +108 -303
- package/dist/adapter/antigravity-adapter.d.ts +24 -3
- package/dist/adapter/antigravity-adapter.js +169 -33
- package/dist/adapter/antigravity-adapter.js.map +1 -1
- package/dist/adapter/continuation-state.d.ts +8 -0
- package/dist/adapter/continuation-state.js +45 -0
- package/dist/adapter/continuation-state.js.map +1 -0
- package/dist/adapter/image-content.d.ts +13 -0
- package/dist/adapter/image-content.js +71 -0
- package/dist/adapter/image-content.js.map +1 -0
- package/dist/adapter/permission-diagnostic.d.ts +2 -2
- package/dist/adapter/permission-diagnostic.js +1 -1
- package/dist/adapter/permission-diagnostic.js.map +1 -1
- package/dist/adapter/permission-handoff.js +21 -7
- package/dist/adapter/permission-handoff.js.map +1 -1
- package/dist/adapter/prompt-transcript.d.ts +9 -14
- package/dist/adapter/prompt-transcript.js +17 -14
- package/dist/adapter/prompt-transcript.js.map +1 -1
- package/dist/adapter/prompt-turn.d.ts +16 -9
- package/dist/adapter/prompt-turn.js +69 -53
- package/dist/adapter/prompt-turn.js.map +1 -1
- package/dist/adapter/tool-args.d.ts +39 -0
- package/dist/adapter/tool-args.js +113 -0
- package/dist/adapter/tool-args.js.map +1 -0
- package/dist/bridge/mcp-bridge.d.ts +10 -0
- package/dist/bridge/mcp-bridge.js +24 -2
- package/dist/bridge/mcp-bridge.js.map +1 -1
- package/dist/client.js +230 -71
- package/dist/index.d.ts +6 -0
- package/dist/index.js +289 -169
- package/dist/index.js.map +1 -1
- package/dist/pool/pooled-adapter.d.ts +49 -0
- package/dist/pool/pooled-adapter.js +266 -0
- package/dist/pool/pooled-adapter.js.map +1 -0
- package/dist/protocol/agent-link.d.ts +4 -0
- package/dist/protocol/agent-link.js +53 -17
- package/dist/protocol/agent-link.js.map +1 -1
- package/dist/quota/control.d.ts +7 -1
- package/dist/quota/control.js +9 -6
- package/dist/quota/control.js.map +1 -1
- package/dist/quota/quota-remote.d.ts +7 -1
- package/dist/quota/quota-remote.js +6 -4
- package/dist/quota/quota-remote.js.map +1 -1
- package/dist/runtime/agy-cli.d.ts +2 -2
- package/dist/runtime/agy-cli.js +16 -10
- package/dist/runtime/agy-cli.js.map +1 -1
- package/dist/runtime/binary.d.ts +76 -22
- package/dist/runtime/binary.js +221 -47
- package/dist/runtime/binary.js.map +1 -1
- package/dist/runtime/catalog-cache.js +23 -3
- package/dist/runtime/catalog-cache.js.map +1 -1
- package/dist/runtime/credentials.d.ts +2 -0
- package/dist/runtime/credentials.js +21 -4
- package/dist/runtime/credentials.js.map +1 -1
- package/dist/runtime/lifecycle.d.ts +68 -0
- package/dist/runtime/lifecycle.js +147 -0
- package/dist/runtime/lifecycle.js.map +1 -0
- package/dist/runtime/proxied-fetch.d.ts +14 -7
- package/dist/runtime/proxied-fetch.js +76 -18
- package/dist/runtime/proxied-fetch.js.map +1 -1
- package/dist/runtime/proxy-env.js +4 -11
- package/dist/runtime/proxy-env.js.map +1 -1
- package/dist/runtime/quota.d.ts +5 -1
- package/dist/runtime/quota.js +27 -28
- package/dist/runtime/quota.js.map +1 -1
- package/dist/runtime/redact.js +3 -0
- package/dist/runtime/redact.js.map +1 -1
- package/dist/settings.d.ts +16 -0
- package/dist/settings.js +5 -1
- package/dist/settings.js.map +1 -1
- package/docs/changelog.md +61 -0
- package/docs/configuration.md +70 -0
- package/docs/development.md +114 -0
- package/docs/reference.md +189 -0
- package/package.json +7 -1
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
* 关键性质:**finish 之后队列不再追加任何 chunk**,因此 `nextChunk()` 返回
|
|
13
13
|
* undefined 时消费者已经拿全了本轮的全部内容(含 usage 与最后的 finish)。
|
|
14
14
|
*/
|
|
15
|
-
import { randomUUID } from 'node:crypto';
|
|
16
15
|
import { ToolCallId } from '@deepseek-ai/dsh-llm';
|
|
17
16
|
import { BRIDGE_MCP_SERVER_NAME } from '../bridge/mcp-bridge.js';
|
|
18
17
|
import { describePermissionRequest } from './permission-diagnostic.js';
|
|
19
18
|
import { parsePermissionHandoff } from './permission-handoff.js';
|
|
19
|
+
import { inspectToolArguments, normalizeToolArguments, safeKeyNames } from './tool-args.js';
|
|
20
20
|
/** 本文件使用的原创错误码(AGY_* 体系,与 agent-link / mcp-bridge 同族)。 */
|
|
21
21
|
export const AGY_TURN_ERROR = {
|
|
22
22
|
/** ACP 工具权限请求被拒,不能据此判断请求一定是原生能力。 */
|
|
@@ -69,8 +69,9 @@ export class PromptTurn {
|
|
|
69
69
|
#abortCleanup;
|
|
70
70
|
#terminated = false;
|
|
71
71
|
#hasOutput = false;
|
|
72
|
-
#
|
|
73
|
-
#
|
|
72
|
+
#permissionIds = new Set();
|
|
73
|
+
#onBridgePermission;
|
|
74
|
+
#onArgumentIssues;
|
|
74
75
|
#onTerminate;
|
|
75
76
|
/** 本轮封口不等于 ACP prompt 结束;封口后的事件留给下一次 stream 消费。 */
|
|
76
77
|
#deferred = [];
|
|
@@ -84,11 +85,8 @@ export class PromptTurn {
|
|
|
84
85
|
this.#onNativeRefusal = options.onNativeRefusal;
|
|
85
86
|
this.#onPermissionDiagnostic = options.onPermissionDiagnostic;
|
|
86
87
|
this.#onTerminate = options.onTerminate;
|
|
87
|
-
this.#
|
|
88
|
-
|
|
89
|
-
/** 官方调用已拒绝,工具改由 DSH 执行;下一轮必须重建,不能回喂官方调用。 */
|
|
90
|
-
get requiresRebuild() {
|
|
91
|
-
return this.#handoff;
|
|
88
|
+
this.#onBridgePermission = options.onBridgePermission;
|
|
89
|
+
this.#onArgumentIssues = options.onArgumentIssues;
|
|
92
90
|
}
|
|
93
91
|
/** 本回合的 ACP prompt 是否已有应答;应答后无法再「在同一 prompt 内续轮」。 */
|
|
94
92
|
get promptSettled() {
|
|
@@ -104,11 +102,11 @@ export class PromptTurn {
|
|
|
104
102
|
}
|
|
105
103
|
/** 本回合是否停在「等待 DSH 回喂工具结果」的续轮状态。 */
|
|
106
104
|
get awaitingToolResults() {
|
|
107
|
-
return !this.#terminated && this.#roundEnded &&
|
|
105
|
+
return !this.#terminated && this.#roundEnded && this.#parked.some((call) => this.#bridge.hasPending(call.callId));
|
|
108
106
|
}
|
|
109
107
|
/** 把 session/update 交给当前回合(由 adapter 的稳定 handler 转发)。 */
|
|
110
108
|
handleSessionUpdate(notification) {
|
|
111
|
-
if (notification.sessionId !== this.sessionId || this.#terminated || this.#promptSettled
|
|
109
|
+
if (notification.sessionId !== this.sessionId || this.#terminated || this.#promptSettled)
|
|
112
110
|
return;
|
|
113
111
|
if (this.#roundEnded) {
|
|
114
112
|
this.#deferred.push({ kind: 'update', update: notification.update });
|
|
@@ -117,56 +115,75 @@ export class PromptTurn {
|
|
|
117
115
|
this.#applyUpdate(notification.update);
|
|
118
116
|
}
|
|
119
117
|
/**
|
|
120
|
-
*
|
|
121
|
-
*
|
|
122
|
-
*
|
|
123
|
-
*
|
|
124
|
-
* 不按 title/rawInput/_meta 授予官方执行权。其余请求保留重复拒绝上限。
|
|
118
|
+
* 仅私有 MCP 路由选择 allow_once,让实际 tools/call 在桥上 park;
|
|
119
|
+
* 不从权限提示合成第二次工具执行,不在这里封口或回收进程。
|
|
120
|
+
* 前提是 session/new 已移除 AGY 内置工具,且客户端 fs/terminal 已关闭。
|
|
121
|
+
* eager 工具按官方固定标题匹配目录;allow_always 从不选择。
|
|
125
122
|
*/
|
|
126
123
|
handleRequestPermission(request) {
|
|
127
|
-
this.#onPermissionDiagnostic?.(describePermissionRequest(request, {
|
|
128
|
-
sessionId: this.sessionId,
|
|
129
|
-
serverName: BRIDGE_MCP_SERVER_NAME,
|
|
130
|
-
toolNames: this.#bridge.toolNames(),
|
|
131
|
-
}));
|
|
132
124
|
// 迟到/外来会话的请求不能消耗当前回合的拒绝预算,也不能获准继续。
|
|
133
|
-
if (request.sessionId !== this.sessionId || this.#terminated || this.#promptSettled
|
|
125
|
+
if (request.sessionId !== this.sessionId || this.#terminated || this.#promptSettled) {
|
|
126
|
+
this.#reportPermissionDiagnostic(request);
|
|
134
127
|
return { outcome: { outcome: 'cancelled' } };
|
|
135
128
|
}
|
|
136
129
|
const rejection = request.options.find((option) => option.kind === 'reject_once')
|
|
137
130
|
?? request.options.find((option) => option.kind === 'reject_always');
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
this.#handoff
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
this.#emitToolCallBlock(call);
|
|
150
|
-
this.finishRound();
|
|
151
|
-
this.#onHandoff();
|
|
152
|
-
// 绝不返回 allow_once/allow_always;官方原始调用不获得执行权。
|
|
153
|
-
return rejection
|
|
154
|
-
? { outcome: { outcome: 'selected', optionId: rejection.optionId } }
|
|
155
|
-
: { outcome: { outcome: 'cancelled' } };
|
|
131
|
+
const handoff = parsePermissionHandoff(request, {
|
|
132
|
+
sessionId: this.sessionId, serverName: BRIDGE_MCP_SERVER_NAME, tools: this.#bridge.toolSchemas(),
|
|
133
|
+
});
|
|
134
|
+
const allowance = request.options.find((option) => option.kind === 'allow_once');
|
|
135
|
+
if (handoff && allowance) {
|
|
136
|
+
if (this.#permissionIds.has(request.toolCall.toolCallId))
|
|
137
|
+
return { outcome: { outcome: 'cancelled' } };
|
|
138
|
+
this.#permissionIds.add(request.toolCall.toolCallId);
|
|
139
|
+
this.#reportArgumentIssues(handoff);
|
|
140
|
+
this.#onBridgePermission?.(handoff.name);
|
|
141
|
+
return { outcome: { outcome: 'selected', optionId: allowance.optionId } };
|
|
156
142
|
}
|
|
143
|
+
this.#reportPermissionDiagnostic(request);
|
|
157
144
|
// 调用 id 同样是不可信字符串,不进入日志或错误正文。
|
|
158
145
|
this.#recordNativeRefusal('permission', 'session/request_permission');
|
|
159
146
|
return rejection
|
|
160
147
|
? { outcome: { outcome: 'selected', optionId: rejection.optionId } }
|
|
161
148
|
: { outcome: { outcome: 'cancelled' } };
|
|
162
149
|
}
|
|
150
|
+
#reportPermissionDiagnostic(request) {
|
|
151
|
+
this.#onPermissionDiagnostic?.(describePermissionRequest(request, {
|
|
152
|
+
sessionId: this.sessionId,
|
|
153
|
+
serverName: BRIDGE_MCP_SERVER_NAME,
|
|
154
|
+
toolNames: this.#bridge.toolNames(),
|
|
155
|
+
}));
|
|
156
|
+
}
|
|
157
|
+
/** 对照当前目录 schema 预检转交调用的参数键(只诊断,不改写、不拦截)。 */
|
|
158
|
+
#reportArgumentIssues(handoff) {
|
|
159
|
+
if (!this.#onArgumentIssues)
|
|
160
|
+
return;
|
|
161
|
+
const tool = this.#bridge.toolSchemas().find((item) => item.name === handoff.name);
|
|
162
|
+
if (!tool)
|
|
163
|
+
return;
|
|
164
|
+
let args;
|
|
165
|
+
try {
|
|
166
|
+
args = JSON.parse(handoff.arguments);
|
|
167
|
+
}
|
|
168
|
+
catch {
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
const { missing, unknown } = inspectToolArguments(tool, normalizeToolArguments(tool, args).arguments);
|
|
172
|
+
if (missing.length === 0 && unknown.length === 0)
|
|
173
|
+
return;
|
|
174
|
+
this.#onArgumentIssues({
|
|
175
|
+
tool: tool.name,
|
|
176
|
+
missing: safeKeyNames(missing),
|
|
177
|
+
unknown: safeKeyNames(unknown),
|
|
178
|
+
unknownCount: unknown.length,
|
|
179
|
+
});
|
|
180
|
+
}
|
|
163
181
|
/**
|
|
164
182
|
* clientCapabilities 已全部关闭,因此这里出现的任何 agent→client 请求都是非预期的。
|
|
165
183
|
* 与权限询问同样处理:响应照旧由 AgentLink 回 method-not-found,本回合先继续。
|
|
166
184
|
*/
|
|
167
185
|
handleUnexpectedAgentRequest(method) {
|
|
168
|
-
|
|
169
|
-
this.#recordNativeRefusal('request', method);
|
|
186
|
+
this.#recordNativeRefusal('request', method);
|
|
170
187
|
}
|
|
171
188
|
/** 计数并在超过上限时终止回合;未超限只记录(回合继续跑)。 */
|
|
172
189
|
#recordNativeRefusal(kind, detail) {
|
|
@@ -202,14 +219,14 @@ export class PromptTurn {
|
|
|
202
219
|
}
|
|
203
220
|
/** 收到 abort 信号:取消 ACP 会话当前回合并以 aborted 结束。 */
|
|
204
221
|
abort(reason) {
|
|
205
|
-
if (this.#terminated ||
|
|
222
|
+
if (this.#terminated || this.#promptSettled)
|
|
206
223
|
return;
|
|
207
224
|
this.#aborted = true;
|
|
208
225
|
this.#fail({ code: AGY_TURN_ERROR.ABORTED, message: `Antigravity ACP 回合被调用方中止:${reason}` });
|
|
209
226
|
}
|
|
210
227
|
/** 桥 park 了新调用:进入当前回合。 */
|
|
211
228
|
handleParked(call) {
|
|
212
|
-
if (this.#terminated
|
|
229
|
+
if (this.#terminated)
|
|
213
230
|
return;
|
|
214
231
|
if (this.#roundEnded) {
|
|
215
232
|
this.#deferred.push({ kind: 'call', call });
|
|
@@ -295,13 +312,10 @@ export class PromptTurn {
|
|
|
295
312
|
try {
|
|
296
313
|
const response = await prompt;
|
|
297
314
|
this.#markPromptSettled();
|
|
298
|
-
|
|
299
|
-
this.#finishWith(response);
|
|
315
|
+
this.#finishWith(response);
|
|
300
316
|
}
|
|
301
317
|
catch (error) {
|
|
302
318
|
this.#markPromptSettled();
|
|
303
|
-
if (this.#handoff)
|
|
304
|
-
return;
|
|
305
319
|
this.#fail({
|
|
306
320
|
code: readErrorCode(error),
|
|
307
321
|
message: error instanceof Error ? error.message : String(error),
|
|
@@ -310,8 +324,7 @@ export class PromptTurn {
|
|
|
310
324
|
}
|
|
311
325
|
#markPromptSettled() {
|
|
312
326
|
this.#promptSettled = true;
|
|
313
|
-
|
|
314
|
-
this.dispose();
|
|
327
|
+
this.dispose();
|
|
315
328
|
const waiters = this.#settledWaiters;
|
|
316
329
|
this.#settledWaiters = [];
|
|
317
330
|
for (const resolve of waiters)
|
|
@@ -402,7 +415,7 @@ export class PromptTurn {
|
|
|
402
415
|
}
|
|
403
416
|
// 只在**仍有未回喂的 park** 时才是 tool-calls:续轮把结果交付后,同一批
|
|
404
417
|
// park 已经结算,本轮的结束原因回到 stop/max-tokens。
|
|
405
|
-
if (this.#
|
|
418
|
+
if (this.#parked.some((call) => this.#bridge.hasPending(call.callId)))
|
|
406
419
|
return { kind: 'tool-calls' };
|
|
407
420
|
if (this.#truncated)
|
|
408
421
|
return { kind: 'max-tokens' };
|
|
@@ -429,6 +442,10 @@ export class PromptTurn {
|
|
|
429
442
|
}
|
|
430
443
|
}
|
|
431
444
|
#appendText(blockType, messageId, content) {
|
|
445
|
+
if (content && typeof content === 'object' && 'type' in content && content.type !== 'text') {
|
|
446
|
+
this.#fail({ code: 'AGY_UNSUPPORTED_CONTENT', message: 'ACP 返回了当前 DSH 输出通道尚不能保存的非文本内容,未将二进制数据作为文字显示' });
|
|
447
|
+
return;
|
|
448
|
+
}
|
|
432
449
|
const text = renderContentText(content);
|
|
433
450
|
if (text === undefined)
|
|
434
451
|
return;
|
|
@@ -496,8 +513,7 @@ function readErrorCode(error) {
|
|
|
496
513
|
}
|
|
497
514
|
/**
|
|
498
515
|
* 把一个 ACP ContentBlock 渲染为纯文本。
|
|
499
|
-
*
|
|
500
|
-
* 按其 JSON 原样作为文本传递,保留信息而不是静默丢弃。
|
|
516
|
+
* 输入图像通过附件服务传递;输出当前只有文本通道,非文本输出由调用方明确拒绝。
|
|
501
517
|
*/
|
|
502
518
|
function renderContentText(content) {
|
|
503
519
|
if (typeof content === 'string')
|
|
@@ -506,7 +522,7 @@ function renderContentText(content) {
|
|
|
506
522
|
const block = content;
|
|
507
523
|
if (block.type === 'text' && typeof block.text === 'string')
|
|
508
524
|
return block.text;
|
|
509
|
-
return
|
|
525
|
+
return undefined;
|
|
510
526
|
}
|
|
511
527
|
return undefined;
|
|
512
528
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-turn.js","sourceRoot":"","sources":["../../src/adapter/prompt-turn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prompt-turn.js","sourceRoot":"","sources":["../../src/adapter/prompt-turn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 工具参数签名渲染与参数预检(原创实现)。
|
|
3
|
+
*
|
|
4
|
+
* 背景:官方 agy 只把 MCP 工具 schema 写成磁盘文件,模型调用时常常没读,凭原生
|
|
5
|
+
* 工具的习惯猜参数名(`path` 而非 `file_path`)或漏掉看起来只给 UI 用的必填项
|
|
6
|
+
* (`description`)。这里提供签名、保守别名修正和桥内预检:
|
|
7
|
+
* 1. `renderToolSignatures`:把当前目录渲染成紧凑的类 TypeScript 签名,进入 prompt;
|
|
8
|
+
* 2. `inspectToolArguments`:只对照 schema 的 `properties` / `required` 做**保守**
|
|
9
|
+
* 检查(不校验类型),供桥提前给模型可操作的错误、供日志诊断。
|
|
10
|
+
*
|
|
11
|
+
* DSH 工具管线的最终校验仍然是权威;这里的检查绝不能比它更严格。
|
|
12
|
+
*/
|
|
13
|
+
import type { ToolSchema } from '@deepseek-ai/dsh-llm';
|
|
14
|
+
/** 参数预检结果。 */
|
|
15
|
+
export interface ToolArgumentIssues {
|
|
16
|
+
/** schema `required` 里声明、但调用里缺失的键;null 是否合法由 DSH 校验。 */
|
|
17
|
+
missing: string[];
|
|
18
|
+
/** 调用里出现、但 schema `properties` 未声明的键(仅在 schema 声明了 properties 时判定)。 */
|
|
19
|
+
unknown: string[];
|
|
20
|
+
}
|
|
21
|
+
/** `read(file_path: string, offset?: number, limit?: number)`;必填在前,可选带 `?`。 */
|
|
22
|
+
export declare function renderToolSignature(tool: ToolSchema): string;
|
|
23
|
+
/** 整个目录的签名块正文;空目录返回 undefined(不产生块)。 */
|
|
24
|
+
export declare function renderToolSignatures(tools: readonly ToolSchema[]): string | undefined;
|
|
25
|
+
/**
|
|
26
|
+
* 对照 schema 检查一次调用的参数键。只看 `required` 与 `properties`,不检查类型、
|
|
27
|
+
* 取值或 `additionalProperties`,因此不会拒绝 DSH 自己会接受的调用。
|
|
28
|
+
*/
|
|
29
|
+
export declare function inspectToolArguments(tool: Pick<ToolSchema, 'parameters'>, args: unknown): ToolArgumentIssues;
|
|
30
|
+
/** 仅当 schema 中目标唯一、输入中来源唯一且目标缺失时,修正常见的字符串参数名。 */
|
|
31
|
+
export declare function normalizeToolArguments(tool: Pick<ToolSchema, 'parameters'>, args: unknown): {
|
|
32
|
+
arguments: Record<string, unknown>;
|
|
33
|
+
renamed: Array<{
|
|
34
|
+
from: string;
|
|
35
|
+
to: string;
|
|
36
|
+
}>;
|
|
37
|
+
};
|
|
38
|
+
/** 键名只有形如标识符且不过长时才可进日志/错误文案(模型可控字符串不原样回显)。 */
|
|
39
|
+
export declare function safeKeyNames(keys: readonly string[], limit?: number): string[];
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
const MAX_ENUM_VALUES = 6;
|
|
2
|
+
const MAX_UNION_PARTS = 4;
|
|
3
|
+
function record(value) {
|
|
4
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value)
|
|
5
|
+
? value
|
|
6
|
+
: undefined;
|
|
7
|
+
}
|
|
8
|
+
function requiredKeys(parameters) {
|
|
9
|
+
const required = record(parameters)?.required;
|
|
10
|
+
return Array.isArray(required) ? required.filter((key) => typeof key === 'string') : [];
|
|
11
|
+
}
|
|
12
|
+
/** 把一个属性 schema 渲染成短类型串;无法识别时退化为 `any`。 */
|
|
13
|
+
function renderType(schema, depth = 0) {
|
|
14
|
+
const node = record(schema);
|
|
15
|
+
if (!node)
|
|
16
|
+
return 'any';
|
|
17
|
+
if (Array.isArray(node.enum) && node.enum.length > 0) {
|
|
18
|
+
const values = node.enum.slice(0, MAX_ENUM_VALUES).map((value) => JSON.stringify(value));
|
|
19
|
+
return node.enum.length > MAX_ENUM_VALUES ? `${values.join('|')}|…` : values.join('|');
|
|
20
|
+
}
|
|
21
|
+
if (node.const !== undefined)
|
|
22
|
+
return JSON.stringify(node.const);
|
|
23
|
+
for (const key of ['anyOf', 'oneOf']) {
|
|
24
|
+
const parts = node[key];
|
|
25
|
+
if (Array.isArray(parts) && parts.length > 0 && depth < 2) {
|
|
26
|
+
return parts.slice(0, MAX_UNION_PARTS).map((part) => renderType(part, depth + 1)).join('|');
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
const type = node.type;
|
|
30
|
+
if (Array.isArray(type))
|
|
31
|
+
return type.filter((item) => typeof item === 'string').join('|') || 'any';
|
|
32
|
+
if (type === 'array')
|
|
33
|
+
return depth < 2 ? `${renderType(node.items, depth + 1)}[]` : 'array';
|
|
34
|
+
if (typeof type === 'string')
|
|
35
|
+
return type;
|
|
36
|
+
return 'any';
|
|
37
|
+
}
|
|
38
|
+
/** `read(file_path: string, offset?: number, limit?: number)`;必填在前,可选带 `?`。 */
|
|
39
|
+
export function renderToolSignature(tool) {
|
|
40
|
+
const parameters = record(tool.parameters);
|
|
41
|
+
const properties = record(parameters?.properties) ?? {};
|
|
42
|
+
const required = new Set(requiredKeys(parameters));
|
|
43
|
+
const names = Object.keys(properties);
|
|
44
|
+
// 必填项按 `required` 声明顺序在前(DSH 工具常要求特定的参数出现顺序),可选项按声明顺序在后。
|
|
45
|
+
const ordered = [
|
|
46
|
+
...requiredKeys(parameters).filter((name, index, all) => all.indexOf(name) === index),
|
|
47
|
+
...names.filter((name) => !required.has(name)),
|
|
48
|
+
];
|
|
49
|
+
const parts = ordered.map((name) => `${name}${required.has(name) ? '' : '?'}: ${renderType(properties[name])}`);
|
|
50
|
+
return `${tool.name}(${parts.join(', ')})`;
|
|
51
|
+
}
|
|
52
|
+
/** 整个目录的签名块正文;空目录返回 undefined(不产生块)。 */
|
|
53
|
+
export function renderToolSignatures(tools) {
|
|
54
|
+
if (tools.length === 0)
|
|
55
|
+
return undefined;
|
|
56
|
+
return [
|
|
57
|
+
'随会话工具的参数签名(调用时参数名必须与此逐字一致):',
|
|
58
|
+
'- 不带 ? 的参数是必填项,不得省略;带 ? 的是可选项。',
|
|
59
|
+
'- 不要沿用 agy 原生工具的参数名(如 path / AbsolutePath / CommandLine),也不要自造别名。',
|
|
60
|
+
'- 调用前先对照签名补齐全部必填参数;说明类必填参数(如 description)也必须提供。',
|
|
61
|
+
...tools.map((tool) => `- ${renderToolSignature(tool)}`),
|
|
62
|
+
].join('\n');
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 对照 schema 检查一次调用的参数键。只看 `required` 与 `properties`,不检查类型、
|
|
66
|
+
* 取值或 `additionalProperties`,因此不会拒绝 DSH 自己会接受的调用。
|
|
67
|
+
*/
|
|
68
|
+
export function inspectToolArguments(tool, args) {
|
|
69
|
+
const input = record(args) ?? {};
|
|
70
|
+
const properties = record(record(tool.parameters)?.properties);
|
|
71
|
+
const missing = requiredKeys(tool.parameters).filter((key) => !Object.hasOwn(input, key) || input[key] === undefined);
|
|
72
|
+
const unknown = properties
|
|
73
|
+
? Object.keys(input).filter((key) => !Object.hasOwn(properties, key))
|
|
74
|
+
: [];
|
|
75
|
+
return { missing: [...new Set(missing)], unknown };
|
|
76
|
+
}
|
|
77
|
+
// 不换算单位、不猜测字段内容;例如 timeout 和 timeoutMs 绝不能按别名处理。
|
|
78
|
+
const ARGUMENT_ALIASES = [
|
|
79
|
+
['file_path', 'path', 'absolute_path', 'AbsolutePath', 'target_file', 'TargetFile'],
|
|
80
|
+
['command', 'command_line', 'CommandLine'],
|
|
81
|
+
['cwd', 'working_directory', 'working_dir', 'Cwd'],
|
|
82
|
+
['description', 'Description'],
|
|
83
|
+
];
|
|
84
|
+
/** 仅当 schema 中目标唯一、输入中来源唯一且目标缺失时,修正常见的字符串参数名。 */
|
|
85
|
+
export function normalizeToolArguments(tool, args) {
|
|
86
|
+
const input = { ...record(args) };
|
|
87
|
+
const properties = record(record(tool.parameters)?.properties) ?? {};
|
|
88
|
+
const renamed = [];
|
|
89
|
+
for (const group of ARGUMENT_ALIASES) {
|
|
90
|
+
const targets = group.filter((key) => Object.hasOwn(properties, key));
|
|
91
|
+
if (targets.length !== 1)
|
|
92
|
+
continue;
|
|
93
|
+
const target = targets[0];
|
|
94
|
+
if (Object.hasOwn(input, target))
|
|
95
|
+
continue;
|
|
96
|
+
const sources = group.filter((key) => !Object.hasOwn(properties, key) && Object.hasOwn(input, key));
|
|
97
|
+
if (sources.length !== 1)
|
|
98
|
+
continue;
|
|
99
|
+
const source = sources[0];
|
|
100
|
+
// 这些别名只对字符串字段有确定含义,其他 schema 形状交给原校验路径。
|
|
101
|
+
if (record(properties[target])?.type !== 'string' || typeof input[source] !== 'string')
|
|
102
|
+
continue;
|
|
103
|
+
input[target] = input[source];
|
|
104
|
+
delete input[source];
|
|
105
|
+
renamed.push({ from: source, to: target });
|
|
106
|
+
}
|
|
107
|
+
return { arguments: input, renamed };
|
|
108
|
+
}
|
|
109
|
+
/** 键名只有形如标识符且不过长时才可进日志/错误文案(模型可控字符串不原样回显)。 */
|
|
110
|
+
export function safeKeyNames(keys, limit = 8) {
|
|
111
|
+
return keys.filter((key) => /^[A-Za-z_][\w.-]{0,39}$/.test(key)).slice(0, limit);
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=tool-args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-args.js","sourceRoot":"","sources":["../../src/adapter/tool-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
|
|
2
|
+
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
2
3
|
import type { McpServer as AcpMcpServer } from '@agentclientprotocol/sdk';
|
|
3
4
|
import type { ToolSchema } from '@deepseek-ai/dsh-llm';
|
|
4
5
|
/** 本模块原创错误码(AGY_BRIDGE_*)。 */
|
|
@@ -15,6 +16,8 @@ export declare const AGY_BRIDGE_ERROR: {
|
|
|
15
16
|
readonly UNKNOWN_SESSION: "AGY_BRIDGE_UNKNOWN_SESSION";
|
|
16
17
|
/** 桥已绑定一条 transport 后再次 attach。 */
|
|
17
18
|
readonly ALREADY_ATTACHED: "AGY_BRIDGE_ALREADY_ATTACHED";
|
|
19
|
+
/** tools/call 缺少 schema 声明的必填参数;不入 park,立即把可操作的错误还给模型。 */
|
|
20
|
+
readonly INVALID_ARGUMENTS: "AGY_BRIDGE_INVALID_ARGUMENTS";
|
|
18
21
|
};
|
|
19
22
|
/** 桥为 agent 暴露的 MCP server 名称(ACP 侧注册名)。 */
|
|
20
23
|
export declare const BRIDGE_MCP_SERVER_NAME = "dsh-tools";
|
|
@@ -37,6 +40,8 @@ export interface BridgeToolResult {
|
|
|
37
40
|
callId: string;
|
|
38
41
|
/** 结果文本(MCP text content)。 */
|
|
39
42
|
text: string;
|
|
43
|
+
/** Native image and text blocks, prepared through the host attachment service. */
|
|
44
|
+
content?: CallToolResult['content'];
|
|
40
45
|
/** 工具是否失败(映射到 MCP `isError`,且让 agent 自行决定重试/放弃)。 */
|
|
41
46
|
isError: boolean;
|
|
42
47
|
}
|
|
@@ -45,6 +50,11 @@ export interface McpToolBridgeOptions {
|
|
|
45
50
|
port?: number;
|
|
46
51
|
/** 固定 token(仅测试用);缺省随机 32 字节 hex。 */
|
|
47
52
|
token?: string;
|
|
53
|
+
/** 只包含目录工具名与固定别名,不记录参数值。 */
|
|
54
|
+
onArgumentsNormalized?(tool: string, renamed: Array<{
|
|
55
|
+
from: string;
|
|
56
|
+
to: string;
|
|
57
|
+
}>): void;
|
|
48
58
|
}
|
|
49
59
|
/**
|
|
50
60
|
* 进程内 MCP 工具桥。一个 adapter 实例持有一个桥,跨 ACP 回合与 ACP 会话复用;
|
|
@@ -26,6 +26,7 @@ import { createServer } from 'node:http';
|
|
|
26
26
|
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
27
27
|
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
|
28
28
|
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
|
|
29
|
+
import { inspectToolArguments, normalizeToolArguments, renderToolSignature, safeKeyNames } from '../adapter/tool-args.js';
|
|
29
30
|
/** 本模块原创错误码(AGY_BRIDGE_*)。 */
|
|
30
31
|
export const AGY_BRIDGE_ERROR = {
|
|
31
32
|
/** 桥尚未 start/attach 就被要求提供 MCP 注册信息。 */
|
|
@@ -40,6 +41,8 @@ export const AGY_BRIDGE_ERROR = {
|
|
|
40
41
|
UNKNOWN_SESSION: 'AGY_BRIDGE_UNKNOWN_SESSION',
|
|
41
42
|
/** 桥已绑定一条 transport 后再次 attach。 */
|
|
42
43
|
ALREADY_ATTACHED: 'AGY_BRIDGE_ALREADY_ATTACHED',
|
|
44
|
+
/** tools/call 缺少 schema 声明的必填参数;不入 park,立即把可操作的错误还给模型。 */
|
|
45
|
+
INVALID_ARGUMENTS: 'AGY_BRIDGE_INVALID_ARGUMENTS',
|
|
43
46
|
};
|
|
44
47
|
/** 桥为 agent 暴露的 MCP server 名称(ACP 侧注册名)。 */
|
|
45
48
|
export const BRIDGE_MCP_SERVER_NAME = 'dsh-tools';
|
|
@@ -70,9 +73,11 @@ export class McpToolBridge {
|
|
|
70
73
|
#callSeq = 0;
|
|
71
74
|
/** HTTP 监听器的最近一次运行期错误(诊断用;listen 阶段的错误走 spawn 的 reject)。 */
|
|
72
75
|
#httpError;
|
|
76
|
+
#onArgumentsNormalized;
|
|
73
77
|
constructor(options = {}) {
|
|
74
78
|
this.#token = options.token ?? randomBytes(32).toString('hex');
|
|
75
79
|
this.#requestedPort = options.port ?? 0;
|
|
80
|
+
this.#onArgumentsNormalized = options.onArgumentsNormalized;
|
|
76
81
|
}
|
|
77
82
|
/** 本桥的随机访问 token(注册进 ACP mcpServers 的 header 值即 `Bearer ${token}`)。 */
|
|
78
83
|
get token() {
|
|
@@ -168,7 +173,7 @@ export class McpToolBridge {
|
|
|
168
173
|
throw new Error(`${AGY_BRIDGE_ERROR.UNKNOWN_TOOL}: 未登记的 park 调用 ${result.callId}`);
|
|
169
174
|
this.#pending.delete(result.callId);
|
|
170
175
|
entry.settle({
|
|
171
|
-
content: [{ type: 'text', text: result.text }],
|
|
176
|
+
content: result.content ?? [{ type: 'text', text: result.text }],
|
|
172
177
|
isError: result.isError,
|
|
173
178
|
});
|
|
174
179
|
}
|
|
@@ -361,8 +366,25 @@ export class McpToolBridge {
|
|
|
361
366
|
isError: true,
|
|
362
367
|
});
|
|
363
368
|
}
|
|
369
|
+
// 修正无歧义的常见别名后再预检。缺必填参数的调用不进 DSH 队列,
|
|
370
|
+
// 这里只检查 required 键是否存在(不比 DSH 更严格),并把期望签名一并
|
|
371
|
+
// 返回,模型可在同一个 ACP prompt 内立即改正重试。
|
|
372
|
+
const tool = this.#tools.find((item) => item.name === name);
|
|
373
|
+
const normalized = tool ? normalizeToolArguments(tool, args) : { arguments: args ?? {}, renamed: [] };
|
|
374
|
+
if (normalized.renamed.length > 0)
|
|
375
|
+
this.#onArgumentsNormalized?.(name, normalized.renamed);
|
|
376
|
+
const { missing } = tool ? inspectToolArguments(tool, normalized.arguments) : { missing: [] };
|
|
377
|
+
if (tool && missing.length > 0) {
|
|
378
|
+
return Promise.resolve({
|
|
379
|
+
content: [{
|
|
380
|
+
type: 'text',
|
|
381
|
+
text: `${AGY_BRIDGE_ERROR.INVALID_ARGUMENTS}: ${name} 缺少必填参数 ${safeKeyNames(missing).join(', ')}。正确签名:${renderToolSignature(tool)}。请补齐后重新调用。`,
|
|
382
|
+
}],
|
|
383
|
+
isError: true,
|
|
384
|
+
});
|
|
385
|
+
}
|
|
364
386
|
const callId = `${BRIDGE_MCP_SERVER_NAME}-${++this.#callSeq}`;
|
|
365
|
-
const call = { callId, name, arguments: JSON.stringify(
|
|
387
|
+
const call = { callId, name, arguments: JSON.stringify(normalized.arguments) };
|
|
366
388
|
return new Promise((resolve) => {
|
|
367
389
|
this.#pending.set(callId, { call, settle: resolve });
|
|
368
390
|
for (const listener of this.#listeners)
|