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
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { ContentBlock as DshContentBlock, RequestMessage, ToolSchema } from '@deepseek-ai/dsh-llm';
|
|
2
|
+
import type { ImageAttachmentRef, StoredImageAttachment } from '@deepseek-ai/dsh-attachment';
|
|
3
|
+
import type { ContentBlock } from '@agentclientprotocol/sdk';
|
|
4
|
+
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
5
|
+
export type ImageReader = (ref: ImageAttachmentRef, signal?: AbortSignal) => Promise<StoredImageAttachment>;
|
|
6
|
+
export interface ImageContentOptions {
|
|
7
|
+
readImage?: ImageReader;
|
|
8
|
+
supported: boolean;
|
|
9
|
+
signal?: AbortSignal;
|
|
10
|
+
}
|
|
11
|
+
/** Native image blocks follow the message envelope that owns them; bytes only come from the host attachment service. */
|
|
12
|
+
export declare function buildPromptWithImages(system: string | undefined, messages: readonly RequestMessage[], tools: readonly ToolSchema[], options: ImageContentOptions): Promise<ContentBlock[]>;
|
|
13
|
+
export declare function buildToolResultContent(blocks: readonly DshContentBlock[], options: ImageContentOptions): Promise<CallToolResult['content']>;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { LlmError } from '@deepseek-ai/dsh-llm';
|
|
2
|
+
import { buildPromptContent, encodeMessage } from './prompt-transcript.js';
|
|
3
|
+
function aborted(signal) {
|
|
4
|
+
if (signal?.aborted)
|
|
5
|
+
throw new LlmError('图像读取已取消', 'AGY_ABORTED');
|
|
6
|
+
}
|
|
7
|
+
async function imageContent(block, options) {
|
|
8
|
+
aborted(options.signal);
|
|
9
|
+
if (block.offloaded)
|
|
10
|
+
return { type: 'text', text: '[此图像已由 DSH 卸载,本次没有发送图像像素。]' };
|
|
11
|
+
if (!options.supported || !options.readImage) {
|
|
12
|
+
throw new LlmError('当前 ACP 连接或 DSH 附件服务不支持图像读取,无法发送这张图片;请连接支持图像的 ACP 服务后重试', 'AGY_IMAGE_UNAVAILABLE');
|
|
13
|
+
}
|
|
14
|
+
const signal = options.signal;
|
|
15
|
+
let cleanup = () => { };
|
|
16
|
+
const cancelled = new Promise((_resolve, reject) => {
|
|
17
|
+
const cancel = () => reject(new LlmError('图像读取已取消', 'AGY_ABORTED'));
|
|
18
|
+
signal?.addEventListener('abort', cancel, { once: true });
|
|
19
|
+
cleanup = () => signal?.removeEventListener('abort', cancel);
|
|
20
|
+
if (signal?.aborted)
|
|
21
|
+
cancel();
|
|
22
|
+
});
|
|
23
|
+
let stored;
|
|
24
|
+
try {
|
|
25
|
+
stored = await Promise.race([options.readImage(block.attachment, signal), cancelled]);
|
|
26
|
+
}
|
|
27
|
+
finally {
|
|
28
|
+
cleanup();
|
|
29
|
+
}
|
|
30
|
+
aborted(signal);
|
|
31
|
+
if (stored.ref.attachmentId !== block.attachment.attachmentId || stored.ref.mediaType !== block.attachment.mediaType
|
|
32
|
+
|| !(stored.data instanceof Uint8Array) || stored.data.byteLength !== block.attachment.bytes
|
|
33
|
+
|| stored.data.byteLength === 0 || !['image/png', 'image/jpeg', 'image/webp', 'image/gif'].includes(stored.ref.mediaType)) {
|
|
34
|
+
throw new LlmError('DSH 附件读取结果与图像引用不一致,已停止发送', 'AGY_INVALID_IMAGE');
|
|
35
|
+
}
|
|
36
|
+
return { type: 'image', mimeType: stored.ref.mediaType, data: Buffer.from(stored.data).toString('base64') };
|
|
37
|
+
}
|
|
38
|
+
/** Native image blocks follow the message envelope that owns them; bytes only come from the host attachment service. */
|
|
39
|
+
export async function buildPromptWithImages(system, messages, tools, options) {
|
|
40
|
+
const content = buildPromptContent(system, [], tools);
|
|
41
|
+
for (const message of messages) {
|
|
42
|
+
aborted(options.signal);
|
|
43
|
+
content.push({ type: 'text', text: encodeMessage(message) });
|
|
44
|
+
for (const block of message.content) {
|
|
45
|
+
if (block.type === 'image')
|
|
46
|
+
content.push(await imageContent(block, options));
|
|
47
|
+
else if (block.type === 'file')
|
|
48
|
+
throw new LlmError('文件引用必须先由 DSH 投影为可读文本', 'AGY_UNSUPPORTED_CONTENT');
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return content;
|
|
52
|
+
}
|
|
53
|
+
export async function buildToolResultContent(blocks, options) {
|
|
54
|
+
const content = [];
|
|
55
|
+
for (const block of blocks) {
|
|
56
|
+
aborted(options.signal);
|
|
57
|
+
if (block.type === 'image') {
|
|
58
|
+
const image = await imageContent(block, options);
|
|
59
|
+
if (image.type === 'image')
|
|
60
|
+
content.push({ type: 'image', data: image.data, mimeType: image.mimeType });
|
|
61
|
+
else if (image.type === 'text')
|
|
62
|
+
content.push({ type: 'text', text: image.text });
|
|
63
|
+
}
|
|
64
|
+
else if (block.type === 'text')
|
|
65
|
+
content.push({ type: 'text', text: block.text });
|
|
66
|
+
else
|
|
67
|
+
throw new LlmError(`工具结果包含尚不支持的内容类型:${block.type}`, 'AGY_UNSUPPORTED_CONTENT');
|
|
68
|
+
}
|
|
69
|
+
return content;
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=image-content.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-content.js","sourceRoot":"","sources":["../../src/adapter/image-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAK/C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAS1E,SAAS,OAAO,CAAC,MAAoB;IACnC,IAAI,MAAM,EAAE,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;AACnE,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,KAAiB,EAAE,OAA4B;IACzE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACvB,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAA;IAChF,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC7C,MAAM,IAAI,QAAQ,CAAC,wDAAwD,EAAE,uBAAuB,CAAC,CAAA;IACvG,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,IAAI,OAAO,GAAG,GAAS,EAAE,GAAE,CAAC,CAAA;IAC5B,MAAM,SAAS,GAAG,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACxD,MAAM,MAAM,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAA;QACzE,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC5D,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,EAAE,CAAA;IAC/B,CAAC,CAAC,CAAA;IACF,IAAI,MAA6B,CAAA;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;IACvF,CAAC;YAAS,CAAC;QAAC,OAAO,EAAE,CAAA;IAAC,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC,CAAA;IACf,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,KAAK,KAAK,CAAC,UAAU,CAAC,YAAY,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,UAAU,CAAC,SAAS;WAC/G,CAAC,CAAC,MAAM,CAAC,IAAI,YAAY,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,CAAC,KAAK;WACzF,MAAM,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5H,MAAM,IAAI,QAAQ,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,CAAA;IACrE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;AAC7G,CAAC;AAED,wHAAwH;AACxH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAA0B,EAAE,QAAmC,EAAE,KAA4B,EAAE,OAA4B;IAE3H,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;IACrD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC5D,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;iBACvE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;gBAAE,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAA;QACvG,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAkC,EAAE,OAA4B;IAEhE,MAAM,OAAO,GAA8B,EAAE,CAAA;IAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAChD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;iBAClG,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QAClF,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;;YAC7E,MAAM,IAAI,QAAQ,CAAC,mBAAmB,KAAK,CAAC,IAAI,EAAE,EAAE,yBAAyB,CAAC,CAAA;IACrF,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
@@ -20,13 +20,13 @@ export declare function describePermissionRequest(request: RequestPermissionRequ
|
|
|
20
20
|
};
|
|
21
21
|
input: {
|
|
22
22
|
shape: string;
|
|
23
|
-
fields: ("
|
|
23
|
+
fields: ("parameters" | "name" | "input" | "arguments" | "ServerName" | "ToolName" | "Arguments" | "tool_name" | "toolName" | "server_name" | "serverName" | "args" | "tool_input" | "toolInput")[];
|
|
24
24
|
serverMatches: boolean;
|
|
25
25
|
toolAdvertised: boolean;
|
|
26
26
|
};
|
|
27
27
|
nested: {
|
|
28
28
|
shape: string;
|
|
29
|
-
fields: ("
|
|
29
|
+
fields: ("parameters" | "name" | "input" | "arguments" | "ServerName" | "ToolName" | "Arguments" | "tool_name" | "toolName" | "server_name" | "serverName" | "args" | "tool_input" | "toolInput")[];
|
|
30
30
|
serverMatches: boolean;
|
|
31
31
|
toolAdvertised: boolean;
|
|
32
32
|
field: string;
|
|
@@ -38,7 +38,7 @@ export function describePermissionRequest(request, context) {
|
|
|
38
38
|
kind: call.kind == null ? 'absent' : TOOL_KINDS.has(call.kind) ? call.kind : 'unrecognized',
|
|
39
39
|
titlePresent: typeof call.title === 'string',
|
|
40
40
|
metaPresent: request._meta != null || call._meta != null,
|
|
41
|
-
// 官方
|
|
41
|
+
// 官方 1.4.0 从参数信封生成;需结合会话工具过滤,不能作为独立执行身份。
|
|
42
42
|
mcpMeta: {
|
|
43
43
|
marked: meta?.is_mcp_tool_call === true,
|
|
44
44
|
serverMatches: mcp?.server === context.serverName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-diagnostic.js","sourceRoot":"","sources":["../../src/adapter/permission-diagnostic.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"permission-diagnostic.js","sourceRoot":"","sources":["../../src/adapter/permission-diagnostic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
*
|
|
2
|
+
* 识别官方 ACP 权限提示中的私有 MCP 路由。元数据不是独立身份证明:
|
|
3
|
+
* 调用方必须同时通过 session/new 禁用 AGY 内置工具和 ACP fs/terminal 能力。
|
|
4
|
+
* 此处只允许进入私有桥,最终参数校验、审批、沙箱与执行仍由 DSH 负责。
|
|
5
5
|
*/
|
|
6
6
|
import { isDeepStrictEqual } from 'node:util';
|
|
7
7
|
function record(value) {
|
|
@@ -14,12 +14,26 @@ export function parsePermissionHandoff(request, context) {
|
|
|
14
14
|
return undefined;
|
|
15
15
|
const meta = record(request.toolCall._meta);
|
|
16
16
|
const mcp = record(meta?.mcp);
|
|
17
|
-
if (meta?.is_mcp_tool_call !== true || mcp?.server !== context.serverName || typeof mcp?.tool !== 'string')
|
|
18
|
-
return undefined;
|
|
19
|
-
const tool = context.tools.find((item) => item.name === mcp.tool);
|
|
20
17
|
const input = record(request.toolCall.rawInput);
|
|
21
|
-
if (!
|
|
18
|
+
if (!input)
|
|
19
|
+
return undefined;
|
|
20
|
+
// eager MCP 工具在官方 1.4.0 的权限请求中没有 _meta.mcp,也没有 name;
|
|
21
|
+
// server.py 从实际工具名生成固定的 "Run <name>?" 标题。会话已关闭内置工具,
|
|
22
|
+
// 因此这里可用当前目录精确匹配该形式,不从任意描述中猜测工具名。
|
|
23
|
+
const wrappedMcp = meta?.is_mcp_tool_call === true;
|
|
24
|
+
const tool = wrappedMcp
|
|
25
|
+
? mcp?.server === context.serverName ? context.tools.find((item) => item.name === mcp?.tool) : undefined
|
|
26
|
+
: context.tools.find((item) => request.toolCall.title === `Run ${item.name}?`
|
|
27
|
+
|| request.toolCall.title === `Run ${context.serverName}_${item.name}?`);
|
|
28
|
+
if (!tool)
|
|
29
|
+
return undefined;
|
|
30
|
+
// 明确的原生名称/种类不能仅凭伪造的 MCP 参数信封获得授权。
|
|
31
|
+
const name = request.toolCall.name;
|
|
32
|
+
if ((name != null && name !== 'call_mcp_tool' && name !== tool.name)
|
|
33
|
+
|| (request.toolCall.kind != null && request.toolCall.kind !== 'other'))
|
|
22
34
|
return undefined;
|
|
35
|
+
if (!wrappedMcp)
|
|
36
|
+
return { name: tool.name, arguments: JSON.stringify(input) };
|
|
23
37
|
// server 1.4.0:rawInput = { arguments: 原参数, ...原参数 }。
|
|
24
38
|
// 工具自己声明 arguments 时该字段属于工具,不能把它误当包装层剥掉。
|
|
25
39
|
const properties = record(record(tool.parameters)?.properties);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-handoff.js","sourceRoot":"","sources":["../../src/adapter/permission-handoff.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAC,KAAgC;QAClC,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAAiC,EACjC,OAAgF;IAEhF,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU;QAAE,OAAO,SAAS,CAAA;IAC7F,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC7B,IAAI,IAAI,EAAE,gBAAgB,KAAK,IAAI,IAAI,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"permission-handoff.js","sourceRoot":"","sources":["../../src/adapter/permission-handoff.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAC,KAAgC;QAClC,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,OAAiC,EACjC,OAAgF;IAEhF,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU;QAAE,OAAO,SAAS,CAAA;IAC7F,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC/C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAA;IAC5B,qDAAqD;IACrD,oDAAoD;IACpD,kCAAkC;IAClC,MAAM,UAAU,GAAG,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAClD,MAAM,IAAI,GAAG,UAAU;QACrB,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;QACxG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,KAAK,OAAO,IAAI,CAAC,IAAI,GAAG;eACxE,OAAO,CAAC,QAAQ,CAAC,KAAK,KAAK,OAAO,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;IAC5E,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,kCAAkC;IAClC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;IAClC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;WAC/D,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC;QAAE,OAAO,SAAS,CAAA;IAC3F,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAA;IAE7E,sDAAsD;IACtD,yCAAyC;IACzC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACtC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;IAC9C,MAAM,OAAO,GAAG,MAAM,KAAK,SAAS,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACvE,IAAI,IAA6B,CAAA;IACjC,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC;QACzD,sCAAsC;QACtC,IAAI,OAAO;YAAE,OAAO,SAAS,CAAA;QAC7B,IAAI,GAAG,KAAK,CAAA;IACd,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAA;QACzC,IAAI,GAAG,MAAM,CAAA;IACf,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAA;AAC7D,CAAC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* DSH 请求历史 → ACP `session/prompt` 内容的序列化(原创实现)。
|
|
3
3
|
*
|
|
4
4
|
* 设计前提(硬约束):**DSH 是历史权威**。本文件不建任何会话存储、数据库
|
|
5
|
-
*
|
|
6
|
-
*
|
|
5
|
+
* 或文件——新轮把 `GenerateOptions.messages` + `options.system` 完整编码进
|
|
6
|
+
* ACP prompt,工具续轮则直接通过 MCP 返回结果,不重复发送历史。
|
|
7
7
|
*
|
|
8
8
|
* 载体格式:ACP 的 `PromptRequest.prompt` 是 `ContentBlock[]`,本实现把每条
|
|
9
9
|
* DSH 消息编码成一个 `TextContent` 信封块:
|
|
@@ -13,23 +13,18 @@
|
|
|
13
13
|
* 信封用尖括号标签(与 JSON 字符串正文互不干扰:标签本身不是合法 JSON),
|
|
14
14
|
* role 属性保留了角色边界,正文是该消息 content 块的 JSON 数组。
|
|
15
15
|
* `parsePromptTranscript` 可无损还原 role 与 content,因此映射是**可逆**的;
|
|
16
|
-
*
|
|
17
|
-
*
|
|
16
|
+
* 需要建立新轮时,历史里的 tool-call / tool result 同样以信封进入 prompt,
|
|
17
|
+
* agent 得以看到完整的 DSH 侧工具轨迹。
|
|
18
18
|
*
|
|
19
19
|
* `options.system` 单独编码为一个 `<dsh-system>` 块放在最前。
|
|
20
20
|
*/
|
|
21
21
|
import type { ContentBlock } from '@agentclientprotocol/sdk';
|
|
22
|
-
import type { RequestMessage } from '@deepseek-ai/dsh-llm';
|
|
22
|
+
import type { RequestMessage, ToolSchema } from '@deepseek-ai/dsh-llm';
|
|
23
23
|
/**
|
|
24
24
|
* 每次 prompt 都会附带的一段工具策略说明。
|
|
25
25
|
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
* `find_by_name`…),而本集成**不声明** fs/terminal 客户端能力,这些原生步骤在这里
|
|
29
|
-
* 必然拿不到权限。**只拒绝不告知**时,偏好原生工具的型号会反复索要原生权限——实测
|
|
30
|
-
* 2026-10-17 表现为「默认占位模型能对话,选具体型号就没反应」。明确告诉模型「用随会话
|
|
31
|
-
* 提供的工具」后,它会改用桥过去的 DSH 工具。
|
|
32
|
-
* 同类做法见 `@estebanforge/pi-antigravity-bridge` 的 tool-priority note(MIT)。
|
|
26
|
+
* 会话同时关闭 AGY 内置工具和 ACP fs/terminal,并加载 DSH 的 MCP schema。
|
|
27
|
+
* 此处说明工具入口与结果语义,避免模型沿用原生工具习惯或误解 DSH 的拒绝。
|
|
33
28
|
*/
|
|
34
29
|
export declare const TOOL_POLICY_TEXT: string;
|
|
35
30
|
/** 解析出的单条消息信封。 */
|
|
@@ -48,7 +43,7 @@ export declare function encodeMessage(message: RequestMessage): string;
|
|
|
48
43
|
* DSH 消息一个信封块。空 system 文本不产生块(ACP 的 TextContent.text 为空串
|
|
49
44
|
* 没有语义价值)。
|
|
50
45
|
*/
|
|
51
|
-
export declare function buildPromptContent(system: string | undefined, messages: readonly RequestMessage[]): ContentBlock[];
|
|
46
|
+
export declare function buildPromptContent(system: string | undefined, messages: readonly RequestMessage[], tools?: readonly ToolSchema[]): ContentBlock[];
|
|
52
47
|
/**
|
|
53
48
|
* 逆解析:从一组 ACP TextContent 文本中还原 system 文本与消息信封序列。
|
|
54
49
|
* 供测试断言 prompt 重建结果;生产路径不依赖它。
|
|
@@ -57,7 +52,7 @@ export declare function parsePromptTranscript(blocks: readonly ContentBlock[]):
|
|
|
57
52
|
system?: string;
|
|
58
53
|
entries: TranscriptEntry[];
|
|
59
54
|
};
|
|
60
|
-
/**
|
|
55
|
+
/** Legacy text-only helper; native image results use buildToolResultContent. */
|
|
61
56
|
export declare function renderToolResultText(blocks: readonly {
|
|
62
57
|
type: string;
|
|
63
58
|
[key: string]: unknown;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { LlmError } from '@deepseek-ai/dsh-llm';
|
|
2
|
+
import { renderToolSignatures } from './tool-args.js';
|
|
1
3
|
/** 消息信封的起始标签前缀(后跟 `role="…"` 与 `>`)。 */
|
|
2
4
|
const MESSAGE_OPEN_PREFIX = '<dsh-message role="';
|
|
3
5
|
const MESSAGE_OPEN_SUFFIX = '">';
|
|
@@ -7,23 +9,21 @@ const SYSTEM_CLOSE = '</dsh-system>';
|
|
|
7
9
|
/** 工具策略说明块的哨兵(固定文本,不参与消息逆解析)。 */
|
|
8
10
|
const POLICY_OPEN = '<dsh-tool-policy>';
|
|
9
11
|
const POLICY_CLOSE = '</dsh-tool-policy>';
|
|
12
|
+
/** 工具参数签名块的哨兵(固定文本,不参与消息逆解析)。 */
|
|
13
|
+
const SIGNATURES_OPEN = '<dsh-tool-signatures>';
|
|
14
|
+
const SIGNATURES_CLOSE = '</dsh-tool-signatures>';
|
|
10
15
|
/**
|
|
11
16
|
* 每次 prompt 都会附带的一段工具策略说明。
|
|
12
17
|
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
* `find_by_name`…),而本集成**不声明** fs/terminal 客户端能力,这些原生步骤在这里
|
|
16
|
-
* 必然拿不到权限。**只拒绝不告知**时,偏好原生工具的型号会反复索要原生权限——实测
|
|
17
|
-
* 2026-10-17 表现为「默认占位模型能对话,选具体型号就没反应」。明确告诉模型「用随会话
|
|
18
|
-
* 提供的工具」后,它会改用桥过去的 DSH 工具。
|
|
19
|
-
* 同类做法见 `@estebanforge/pi-antigravity-bridge` 的 tool-priority note(MIT)。
|
|
18
|
+
* 会话同时关闭 AGY 内置工具和 ACP fs/terminal,并加载 DSH 的 MCP schema。
|
|
19
|
+
* 此处说明工具入口与结果语义,避免模型沿用原生工具习惯或误解 DSH 的拒绝。
|
|
20
20
|
*/
|
|
21
21
|
export const TOOL_POLICY_TEXT = [
|
|
22
22
|
'本会话运行在 DSH(DeepSeek Harness)集成中,工具与 DSH 对齐:',
|
|
23
23
|
'- 随本会话提供的工具列表就是你的工具入口;读写文件、执行命令、搜索代码请一律使用它们,它们与 DSH 的权限与审计一致。',
|
|
24
|
-
'- agy 的原生工具(read_file / write_file / edit_file / run_command / view_file / list_dir / grep_search / find_by_name
|
|
24
|
+
'- agy 的原生工具(read_file / write_file / edit_file / run_command / view_file / list_dir / grep_search / find_by_name 等)在本集成中不可用:会话已关闭内置工具与客户端 fs/terminal 能力。',
|
|
25
25
|
'- 不要反复索要原生能力;直接改用等价的随会话工具完成。',
|
|
26
|
-
'-
|
|
26
|
+
'- 随会话 MCP 工具由 DSH 审批和执行,结果会在当前 ACP prompt 内返回;isError=true 的拒绝/失败是权威结果,不要绕过审批或重复执行。',
|
|
27
27
|
'- ACP 权限拒绝可能发生在插件转交 DSH 之前。仅凭 Denied by user 或 pre-tool hook 文本,不能断言 DSH 全局禁用了工具,也不能建议关闭沙箱或审批。请明确报告拒绝来源尚未核实。',
|
|
28
28
|
].join('\n');
|
|
29
29
|
function textBlock(text) {
|
|
@@ -41,12 +41,17 @@ export function encodeMessage(message) {
|
|
|
41
41
|
* DSH 消息一个信封块。空 system 文本不产生块(ACP 的 TextContent.text 为空串
|
|
42
42
|
* 没有语义价值)。
|
|
43
43
|
*/
|
|
44
|
-
export function buildPromptContent(system, messages) {
|
|
44
|
+
export function buildPromptContent(system, messages, tools = []) {
|
|
45
45
|
const blocks = [];
|
|
46
46
|
if (system !== undefined && system !== '')
|
|
47
47
|
blocks.push(textBlock(`${SYSTEM_OPEN}${system}${SYSTEM_CLOSE}`));
|
|
48
48
|
// 工具策略紧随 system:告诉模型原生 fs/terminal 在这里拿不到权限,请用随会话工具。
|
|
49
49
|
blocks.push(textBlock(`${POLICY_OPEN}${TOOL_POLICY_TEXT}${POLICY_CLOSE}`));
|
|
50
|
+
// 官方只把 MCP 工具 schema 落成磁盘文件,模型常常不读就猜参数;把紧凑签名直接放进
|
|
51
|
+
// prompt,让必填项与参数名在调用时就可见。
|
|
52
|
+
const signatures = renderToolSignatures(tools);
|
|
53
|
+
if (signatures !== undefined)
|
|
54
|
+
blocks.push(textBlock(`${SIGNATURES_OPEN}${signatures}${SIGNATURES_CLOSE}`));
|
|
50
55
|
for (const message of messages)
|
|
51
56
|
blocks.push(textBlock(encodeMessage(message)));
|
|
52
57
|
return blocks;
|
|
@@ -107,7 +112,7 @@ function parseMessageEnvelopes(text) {
|
|
|
107
112
|
}
|
|
108
113
|
return entries;
|
|
109
114
|
}
|
|
110
|
-
/**
|
|
115
|
+
/** Legacy text-only helper; native image results use buildToolResultContent. */
|
|
111
116
|
export function renderToolResultText(blocks) {
|
|
112
117
|
const parts = [];
|
|
113
118
|
for (const block of blocks) {
|
|
@@ -115,9 +120,7 @@ export function renderToolResultText(blocks) {
|
|
|
115
120
|
parts.push(block.text);
|
|
116
121
|
continue;
|
|
117
122
|
}
|
|
118
|
-
|
|
119
|
-
// 声明 text 输入模态,这里按 JSON 原样保留形状而不是丢弃信息。
|
|
120
|
-
parts.push(JSON.stringify(block));
|
|
123
|
+
throw new LlmError('非文本工具结果必须使用原生内容通道,不能序列化为 JSON 文本', 'AGY_UNSUPPORTED_CONTENT');
|
|
121
124
|
}
|
|
122
125
|
return parts.join('\n');
|
|
123
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-transcript.js","sourceRoot":"","sources":["../../src/adapter/prompt-transcript.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompt-transcript.js","sourceRoot":"","sources":["../../src/adapter/prompt-transcript.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,18 @@ export interface PromptTurnOptions {
|
|
|
49
49
|
}): void;
|
|
50
50
|
/** 固定词表的权限结构摘要;仅诊断,不作为放行依据。 */
|
|
51
51
|
onPermissionDiagnostic?(diagnostic: PermissionDiagnostic): void;
|
|
52
|
-
/**
|
|
53
|
-
|
|
52
|
+
/** 仅允许私有 MCP 请求进入桥;不代表 DSH 已批准执行。 */
|
|
53
|
+
onBridgePermission?(tool: string): void;
|
|
54
|
+
/**
|
|
55
|
+
* MCP 权限提示中的参数与目录 schema 不符(缺必填 / 出现未声明键)。仅诊断:
|
|
56
|
+
* 实际入桥时再修正别名与预检,DSH 负责最终校验;这里只含可安全回显的键名。
|
|
57
|
+
*/
|
|
58
|
+
onArgumentIssues?(info: {
|
|
59
|
+
tool: string;
|
|
60
|
+
missing: string[];
|
|
61
|
+
unknown: string[];
|
|
62
|
+
unknownCount: number;
|
|
63
|
+
}): void;
|
|
54
64
|
}
|
|
55
65
|
/**
|
|
56
66
|
* 同一回合重复拒绝的保护上限(历史导出名保留)。
|
|
@@ -64,8 +74,6 @@ export declare class PromptTurn {
|
|
|
64
74
|
/** ACP 会话 id。 */
|
|
65
75
|
readonly sessionId: string;
|
|
66
76
|
constructor(sessionId: string, options: PromptTurnOptions);
|
|
67
|
-
/** 官方调用已拒绝,工具改由 DSH 执行;下一轮必须重建,不能回喂官方调用。 */
|
|
68
|
-
get requiresRebuild(): boolean;
|
|
69
77
|
/** 本回合的 ACP prompt 是否已有应答;应答后无法再「在同一 prompt 内续轮」。 */
|
|
70
78
|
get promptSettled(): boolean;
|
|
71
79
|
/** 本地已终止,不再允许续接;对端回收由 adapter 的屏障保证。 */
|
|
@@ -77,11 +85,10 @@ export declare class PromptTurn {
|
|
|
77
85
|
/** 把 session/update 交给当前回合(由 adapter 的稳定 handler 转发)。 */
|
|
78
86
|
handleSessionUpdate(notification: SessionNotification): void;
|
|
79
87
|
/**
|
|
80
|
-
*
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
* 不按 title/rawInput/_meta 授予官方执行权。其余请求保留重复拒绝上限。
|
|
88
|
+
* 仅私有 MCP 路由选择 allow_once,让实际 tools/call 在桥上 park;
|
|
89
|
+
* 不从权限提示合成第二次工具执行,不在这里封口或回收进程。
|
|
90
|
+
* 前提是 session/new 已移除 AGY 内置工具,且客户端 fs/terminal 已关闭。
|
|
91
|
+
* eager 工具按官方固定标题匹配目录;allow_always 从不选择。
|
|
85
92
|
*/
|
|
86
93
|
handleRequestPermission(request: RequestPermissionRequest): RequestPermissionResponse;
|
|
87
94
|
/**
|