@jingyi0605/codingns4dsh 0.2.1-beta.1 → 0.2.1-beta.3
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.en.md +25 -14
- package/README.md +21 -17
- package/data/build/dist/client/bundle.js +366 -81
- package/data/build/dist/client/bundle.js.map +1 -1
- package/data/build/dist/client/locales/fileWorkspace.d.ts.map +1 -1
- package/data/build/dist/client/locales/fileWorkspace.js +4 -0
- package/data/build/dist/client/locales/fileWorkspace.js.map +1 -1
- package/data/build/dist/client/locales/peerHostWorkspace.d.ts.map +1 -1
- package/data/build/dist/client/locales/peerHostWorkspace.js +16 -2
- package/data/build/dist/client/locales/peerHostWorkspace.js.map +1 -1
- package/data/build/dist/client/peer-host-native-projection.d.ts +4 -3
- package/data/build/dist/client/peer-host-native-projection.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-native-projection.js +7 -6
- package/data/build/dist/client/peer-host-native-projection.js.map +1 -1
- package/data/build/dist/client/peer-host-native-store-projection.js +9 -21
- package/data/build/dist/client/peer-host-native-store-projection.js.map +1 -1
- package/data/build/dist/client/peer-host-workspace-tab.d.ts.map +1 -1
- package/data/build/dist/client/peer-host-workspace-tab.js +139 -10
- package/data/build/dist/client/peer-host-workspace-tab.js.map +1 -1
- package/data/build/dist/client/session-changed-files-view.d.ts.map +1 -1
- package/data/build/dist/client/session-changed-files-view.js +162 -58
- package/data/build/dist/client/session-changed-files-view.js.map +1 -1
- package/data/build/dist/client/skill-command.d.ts +1 -1
- package/data/build/dist/client/skill-command.d.ts.map +1 -1
- package/data/build/dist/client/skill-command.js +25 -2
- package/data/build/dist/client/skill-command.js.map +1 -1
- package/data/build/dist/client/skill-reference-dom.js +1 -1
- package/data/build/dist/client/skill-reference-dom.js.map +1 -1
- package/data/build/dist/client/terminal/styles.js +2 -2
- package/data/build/dist/dsh-capabilities/host/sidebar-session-compat.d.ts +28 -0
- package/data/build/dist/dsh-capabilities/host/sidebar-session-compat.d.ts.map +1 -0
- package/data/build/dist/dsh-capabilities/host/sidebar-session-compat.js +109 -0
- package/data/build/dist/dsh-capabilities/host/sidebar-session-compat.js.map +1 -0
- package/data/build/dist/host/cli-adapters/acp-cli-driver.d.ts +25 -3
- package/data/build/dist/host/cli-adapters/acp-cli-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/acp-cli-driver.js +120 -9
- package/data/build/dist/host/cli-adapters/acp-cli-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/acp-elicitation.d.ts +31 -0
- package/data/build/dist/host/cli-adapters/acp-elicitation.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/acp-elicitation.js +144 -0
- package/data/build/dist/host/cli-adapters/acp-elicitation.js.map +1 -0
- package/data/build/dist/host/cli-adapters/antigravity-driver.d.ts +2 -1
- package/data/build/dist/host/cli-adapters/antigravity-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/antigravity-driver.js +15 -2
- package/data/build/dist/host/cli-adapters/antigravity-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/attachment-utils.d.ts +16 -5
- package/data/build/dist/host/cli-adapters/attachment-utils.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/attachment-utils.js +152 -42
- package/data/build/dist/host/cli-adapters/attachment-utils.js.map +1 -1
- package/data/build/dist/host/cli-adapters/claude-driver.d.ts +23 -8
- package/data/build/dist/host/cli-adapters/claude-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/claude-driver.js +227 -70
- package/data/build/dist/host/cli-adapters/claude-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/codebuddy-driver.d.ts +7 -1
- package/data/build/dist/host/cli-adapters/codebuddy-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/codebuddy-driver.js +143 -6
- package/data/build/dist/host/cli-adapters/codebuddy-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/codex-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/codex-driver.js +74 -6
- package/data/build/dist/host/cli-adapters/codex-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-acp-loader.d.ts +23 -0
- package/data/build/dist/host/cli-adapters/command-code-acp-loader.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/command-code-acp-loader.js +39 -0
- package/data/build/dist/host/cli-adapters/command-code-acp-loader.js.map +1 -0
- package/data/build/dist/host/cli-adapters/command-code-driver.d.ts +17 -6
- package/data/build/dist/host/cli-adapters/command-code-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-driver.js +448 -26
- package/data/build/dist/host/cli-adapters/command-code-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-subscription.d.ts +1 -1
- package/data/build/dist/host/cli-adapters/command-code-subscription.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/command-code-subscription.js +7 -4
- package/data/build/dist/host/cli-adapters/command-code-subscription.js.map +1 -1
- package/data/build/dist/host/cli-adapters/cursor-driver.d.ts +1 -1
- package/data/build/dist/host/cli-adapters/cursor-driver.js +2 -2
- package/data/build/dist/host/cli-adapters/cursor-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/delegation-mention-rewrite.js +1 -1
- package/data/build/dist/host/cli-adapters/delegation-mention-rewrite.js.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-message-projector.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-message-projector.js +28 -0
- package/data/build/dist/host/cli-adapters/dsh-message-projector.js.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-tool-history.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/dsh-tool-history.js +23 -1
- package/data/build/dist/host/cli-adapters/dsh-tool-history.js.map +1 -1
- package/data/build/dist/host/cli-adapters/feature.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/feature.js +5 -3
- package/data/build/dist/host/cli-adapters/feature.js.map +1 -1
- package/data/build/dist/host/cli-adapters/gemini-driver.d.ts +2 -1
- package/data/build/dist/host/cli-adapters/gemini-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/gemini-driver.js +66 -11
- package/data/build/dist/host/cli-adapters/gemini-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/grok-driver.d.ts +5 -2
- package/data/build/dist/host/cli-adapters/grok-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/grok-driver.js +268 -18
- package/data/build/dist/host/cli-adapters/grok-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/json-rpc-process.d.ts +2 -0
- package/data/build/dist/host/cli-adapters/json-rpc-process.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/json-rpc-process.js +8 -3
- package/data/build/dist/host/cli-adapters/json-rpc-process.js.map +1 -1
- package/data/build/dist/host/cli-adapters/kimi-driver.d.ts +4 -0
- package/data/build/dist/host/cli-adapters/kimi-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/kimi-driver.js +11 -4
- package/data/build/dist/host/cli-adapters/kimi-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/kiro-driver.js +1 -1
- package/data/build/dist/host/cli-adapters/kiro-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/mcode-driver.d.ts +6 -2
- package/data/build/dist/host/cli-adapters/mcode-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/mcode-driver.js +95 -26
- package/data/build/dist/host/cli-adapters/mcode-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.d.ts +55 -1
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.js +148 -6
- package/data/build/dist/host/cli-adapters/native-subagent-dispatch.js.map +1 -1
- package/data/build/dist/host/cli-adapters/native-team-subagent.d.ts +7 -0
- package/data/build/dist/host/cli-adapters/native-team-subagent.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/native-team-subagent.js.map +1 -1
- package/data/build/dist/host/cli-adapters/new-api-subscription.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/new-api-subscription.js +11 -58
- package/data/build/dist/host/cli-adapters/new-api-subscription.js.map +1 -1
- package/data/build/dist/host/cli-adapters/opencode-driver.d.ts +5 -2
- package/data/build/dist/host/cli-adapters/opencode-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/opencode-driver.js +136 -18
- package/data/build/dist/host/cli-adapters/opencode-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/pi-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/pi-driver.js +2 -1
- package/data/build/dist/host/cli-adapters/pi-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/process-utils.d.ts +10 -0
- package/data/build/dist/host/cli-adapters/process-utils.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/process-utils.js +20 -0
- package/data/build/dist/host/cli-adapters/process-utils.js.map +1 -1
- package/data/build/dist/host/cli-adapters/provider-subscription.d.ts +3 -0
- package/data/build/dist/host/cli-adapters/provider-subscription.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/provider-subscription.js +42 -8
- package/data/build/dist/host/cli-adapters/provider-subscription.js.map +1 -1
- package/data/build/dist/host/cli-adapters/qoder-driver.d.ts +4 -4
- package/data/build/dist/host/cli-adapters/qoder-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/qoder-driver.js +31 -8
- package/data/build/dist/host/cli-adapters/qoder-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/registry.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/registry.js +5 -3
- package/data/build/dist/host/cli-adapters/registry.js.map +1 -1
- package/data/build/dist/host/cli-adapters/rpc-driver-utils.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/rpc-driver-utils.js +2 -9
- package/data/build/dist/host/cli-adapters/rpc-driver-utils.js.map +1 -1
- package/data/build/dist/host/cli-adapters/skill-filesystem.d.ts +25 -0
- package/data/build/dist/host/cli-adapters/skill-filesystem.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/skill-filesystem.js +161 -0
- package/data/build/dist/host/cli-adapters/skill-filesystem.js.map +1 -0
- package/data/build/dist/host/cli-adapters/standard-stream-driver.d.ts +1 -0
- package/data/build/dist/host/cli-adapters/standard-stream-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/standard-stream-driver.js +7 -1
- package/data/build/dist/host/cli-adapters/standard-stream-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/subagent-tool.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/subagent-tool.js +40 -10
- package/data/build/dist/host/cli-adapters/subagent-tool.js.map +1 -1
- package/data/build/dist/host/cli-adapters/zcode-driver.d.ts +8 -2
- package/data/build/dist/host/cli-adapters/zcode-driver.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/zcode-driver.js +166 -55
- package/data/build/dist/host/cli-adapters/zcode-driver.js.map +1 -1
- package/data/build/dist/host/cli-adapters/zcode-interactions.d.ts +18 -0
- package/data/build/dist/host/cli-adapters/zcode-interactions.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-interactions.js +90 -0
- package/data/build/dist/host/cli-adapters/zcode-interactions.js.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-provider-config.d.ts +26 -0
- package/data/build/dist/host/cli-adapters/zcode-provider-config.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-provider-config.js +102 -0
- package/data/build/dist/host/cli-adapters/zcode-provider-config.js.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-subscription.d.ts +2 -7
- package/data/build/dist/host/cli-adapters/zcode-subscription.d.ts.map +1 -1
- package/data/build/dist/host/cli-adapters/zcode-subscription.js.map +1 -1
- package/data/build/dist/host/cli-adapters/zcode-telemetry.d.ts +17 -0
- package/data/build/dist/host/cli-adapters/zcode-telemetry.d.ts.map +1 -0
- package/data/build/dist/host/cli-adapters/zcode-telemetry.js +124 -0
- package/data/build/dist/host/cli-adapters/zcode-telemetry.js.map +1 -0
- package/data/build/dist/host/cli-bridge/bridge-holder.d.ts +4 -1
- package/data/build/dist/host/cli-bridge/bridge-holder.d.ts.map +1 -1
- package/data/build/dist/host/cli-bridge/bridge-holder.js.map +1 -1
- package/data/build/dist/host/cli-bridge/bridge-server.d.ts +11 -3
- package/data/build/dist/host/cli-bridge/bridge-server.d.ts.map +1 -1
- package/data/build/dist/host/cli-bridge/bridge-server.js +8 -4
- package/data/build/dist/host/cli-bridge/bridge-server.js.map +1 -1
- package/data/build/dist/host/cli-bridge/command-code-mod.js +18 -2
- package/data/build/dist/host/cli-bridge/command-code-mod.js.map +1 -1
- package/data/build/dist/host/cli-bridge/dispatch.d.ts.map +1 -1
- package/data/build/dist/host/cli-bridge/dispatch.js +30 -5
- package/data/build/dist/host/cli-bridge/dispatch.js.map +1 -1
- package/data/build/dist/host/cli-bridge/injections.d.ts +2 -9
- package/data/build/dist/host/cli-bridge/injections.d.ts.map +1 -1
- package/data/build/dist/host/cli-bridge/injections.js +9 -19
- package/data/build/dist/host/cli-bridge/injections.js.map +1 -1
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js +49 -7
- package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js.map +1 -1
- package/data/build/dist/host/features/peer-host.d.ts.map +1 -1
- package/data/build/dist/host/features/peer-host.js +23 -0
- package/data/build/dist/host/features/peer-host.js.map +1 -1
- package/data/build/dist/host/index.d.ts +1 -1
- package/data/build/dist/host/index.d.ts.map +1 -1
- package/data/build/dist/host/index.js +4 -1
- package/data/build/dist/host/index.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.d.ts +2 -0
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.js +5 -0
- package/data/build/dist/host/modules/peer-host/peer-host-native-protocol.js.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.d.ts.map +1 -1
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.js +3 -1
- package/data/build/dist/host/modules/peer-host/peer-host-remote-summary-source.js.map +1 -1
- package/data/build/dist/host/rpc.d.ts.map +1 -1
- package/data/build/dist/host/rpc.js +5 -0
- package/data/build/dist/host/rpc.js.map +1 -1
- package/data/build/dist/shared/contracts/cli-adapter.d.ts +4 -0
- package/data/build/dist/shared/contracts/cli-adapter.d.ts.map +1 -1
- package/data/build/dist/shared/contracts/version.d.ts +1 -1
- package/data/build/dist/shared/contracts/version.js +1 -1
- package/package.json +3 -1
- package/profile/README.md +2 -2
- package/profile/package.json +2 -2
- package/profile/version.json +1 -1
- package/version.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { DEFAULT_SUBAGENT_BRIDGE_SETTINGS } from '../../shared/contracts/config.js';
|
|
2
2
|
import { externalTeamProvider, withTeamSubagentSelection } from './native-team-subagent.js';
|
|
3
|
-
/**
|
|
3
|
+
/** 同步子代理首轮的最长等待时间;后台任务不会把这个预算绑定到调用方。 */
|
|
4
4
|
export const NATIVE_SUBAGENT_TIMEOUT_MS = 15 * 60_000;
|
|
5
|
+
/** 后台子代理的执行保护上限;工具调用已经立即返回,长任务只通过生命周期查询观察。 */
|
|
6
|
+
export const BACKGROUND_NATIVE_SUBAGENT_TIMEOUT_MS = 60 * 60_000;
|
|
5
7
|
/**
|
|
6
8
|
* 同一父会话可同时保留的子代理任务数缺省值。
|
|
7
9
|
*
|
|
@@ -33,10 +35,72 @@ export function getMaxNativeSubagentsPerParent() {
|
|
|
33
35
|
* 否则 Provider 侧的 `request.signal.throwIfAborted()` 会直接抛 TypeError。
|
|
34
36
|
*/
|
|
35
37
|
const fallbackSignal = new AbortController().signal;
|
|
38
|
+
/** 向已创建的直接子代理发送后续消息,使用 DSH 原生 sendMessage 的父身份校验。 */
|
|
39
|
+
export async function sendNativeSubagentMessage(service, request) {
|
|
40
|
+
const childSessionId = request.childSessionId.trim();
|
|
41
|
+
const message = request.message.trim();
|
|
42
|
+
if (childSessionId === '' || message === '') {
|
|
43
|
+
return { ok: false, childSessionId, error: '子会话 ID 和消息内容不能为空。' };
|
|
44
|
+
}
|
|
45
|
+
if (typeof service.sendMessage !== 'function') {
|
|
46
|
+
return { ok: false, childSessionId, error: '当前 DSH 未提供可续子会话 sendMessage 能力。' };
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
const result = await service.sendMessage(request.parentAgent, childSessionId, [{ type: 'text', text: message }], { signal: request.signal ?? fallbackSignal });
|
|
50
|
+
return {
|
|
51
|
+
ok: true,
|
|
52
|
+
childSessionId,
|
|
53
|
+
...(typeof result === 'string' && result.trim() !== '' ? { messageId: result } : {}),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
return {
|
|
58
|
+
ok: false,
|
|
59
|
+
childSessionId,
|
|
60
|
+
error: error instanceof Error ? error.message : String(error),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/** 读取子会话当前事件游标;后续 follow-up 只消费游标之后的新一轮。 */
|
|
65
|
+
export function nativeSubagentEventCursor(sessions, childSessionId) {
|
|
66
|
+
const session = sessions.get(childSessionId.trim());
|
|
67
|
+
let cursor = 0;
|
|
68
|
+
for (const event of session?.snapshotEvents?.() ?? []) {
|
|
69
|
+
const row = asRecord(event);
|
|
70
|
+
const seq = row?.seq;
|
|
71
|
+
if (typeof seq === 'number' && Number.isFinite(seq))
|
|
72
|
+
cursor = Math.max(cursor, seq);
|
|
73
|
+
}
|
|
74
|
+
return cursor;
|
|
75
|
+
}
|
|
76
|
+
/** 后续消息被 DSH 接受后,重新打开该子会话的生命周期观察窗口。 */
|
|
77
|
+
export function trackNativeSubagentFollowup(sessions, childSessionId, afterSeq) {
|
|
78
|
+
const id = childSessionId.trim();
|
|
79
|
+
const current = lifecycleStates.get(id);
|
|
80
|
+
if (current === undefined || lifecycleWaiters.has(id))
|
|
81
|
+
return;
|
|
82
|
+
const lifecycle = {
|
|
83
|
+
childSessionId: current.childSessionId,
|
|
84
|
+
parentSessionId: current.parentSessionId,
|
|
85
|
+
adapterId: current.adapterId,
|
|
86
|
+
status: 'running',
|
|
87
|
+
completed: false,
|
|
88
|
+
...(current.toolCalls === undefined ? {} : { toolCalls: current.toolCalls }),
|
|
89
|
+
};
|
|
90
|
+
saveLifecycle(lifecycle);
|
|
91
|
+
const completion = waitForChildFirstTurn(sessions, id, undefined, BACKGROUND_NATIVE_SUBAGENT_TIMEOUT_MS, afterSeq).then((result) => {
|
|
92
|
+
saveLifecycle(lifecycleFromResult(lifecycle, result));
|
|
93
|
+
return result;
|
|
94
|
+
});
|
|
95
|
+
lifecycleWaiters.set(id, completion);
|
|
96
|
+
void completion.finally(() => { lifecycleWaiters.delete(id); });
|
|
97
|
+
}
|
|
36
98
|
const parentTaskStates = new Map();
|
|
37
99
|
const lifecycleStates = new Map();
|
|
38
100
|
const lifecycleWaiters = new Map();
|
|
39
101
|
const MAX_LIFECYCLE_STATES = 2048;
|
|
102
|
+
/** 已经拦截过父会话当前轮次的结束事件,避免重复注入相同提醒。 */
|
|
103
|
+
const guardedParentTurns = new Set();
|
|
40
104
|
function saveLifecycle(value) {
|
|
41
105
|
lifecycleStates.set(value.childSessionId, value);
|
|
42
106
|
while (lifecycleStates.size > MAX_LIFECYCLE_STATES) {
|
|
@@ -54,11 +118,84 @@ function lifecycleFromResult(base, result) {
|
|
|
54
118
|
text: result.text,
|
|
55
119
|
...(result.error === undefined ? {} : { error: result.error }),
|
|
56
120
|
toolCalls: result.toolCalls,
|
|
121
|
+
...(result.status === 'failed' ? { failureReviewed: false } : {}),
|
|
57
122
|
};
|
|
58
123
|
}
|
|
59
124
|
export function readNativeSubagentLifecycle(childSessionId) {
|
|
60
125
|
return lifecycleStates.get(childSessionId.trim());
|
|
61
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* 标记一次 failed 子代理已经被父 Agent 查看。
|
|
129
|
+
*
|
|
130
|
+
* 查看本身不替父 Agent 做决定;调用方仍必须根据错误和已有报告选择重新创建、
|
|
131
|
+
* 通过 send 接管,或明确结束当前任务。这里单独记录查看事实,避免父会话在没有
|
|
132
|
+
* 读取失败状态时直接收尾。
|
|
133
|
+
*/
|
|
134
|
+
export function reviewNativeSubagentFailure(childSessionId) {
|
|
135
|
+
const id = childSessionId.trim();
|
|
136
|
+
const current = lifecycleStates.get(id);
|
|
137
|
+
if (current === undefined || current.status !== 'failed' || current.failureReviewed === true)
|
|
138
|
+
return current;
|
|
139
|
+
const reviewed = { ...current, failureReviewed: true };
|
|
140
|
+
saveLifecycle(reviewed);
|
|
141
|
+
return reviewed;
|
|
142
|
+
}
|
|
143
|
+
/** failed 且尚未查看的子代理必须阻塞父会话收尾。 */
|
|
144
|
+
export function nativeSubagentFailureNeedsReview(lifecycle) {
|
|
145
|
+
return lifecycle.status === 'failed' && lifecycle.failureReviewed !== true;
|
|
146
|
+
}
|
|
147
|
+
/** 给模型的失败复核提示;正常运行和成功终态不增加额外字段。 */
|
|
148
|
+
export function nativeSubagentFailureReviewFields(lifecycle) {
|
|
149
|
+
if (lifecycle.status !== 'failed')
|
|
150
|
+
return {};
|
|
151
|
+
return {
|
|
152
|
+
failureReviewed: lifecycle.failureReviewed === true,
|
|
153
|
+
failureReviewRequired: lifecycle.failureReviewed !== true,
|
|
154
|
+
failureGuidance: '请评估是否需要 action=start 重新创建子代理,或用 action=send 接管并继续;确认无需继续后才能结束主任务。',
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
/** 读取父会话下仍未完成或尚未复核失败的子代理。 */
|
|
158
|
+
export function readNativeSubagentParentPending(parentSessionId) {
|
|
159
|
+
const id = parentSessionId.trim();
|
|
160
|
+
if (id === '')
|
|
161
|
+
return [];
|
|
162
|
+
return [...lifecycleStates.values()]
|
|
163
|
+
.filter((state) => state.parentSessionId === id && (state.status === 'creating' || state.status === 'running' || nativeSubagentFailureNeedsReview(state)));
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* 父会话 turn/end 前的收尾屏障。
|
|
167
|
+
*
|
|
168
|
+
* DSH 没有可取消的原生 turn/end 事件,最安全的做法是在检测到仍有后台子代理
|
|
169
|
+
* 时注入下一步用户上下文,让父 Agent 继续等待并汇总。注入成功后同一父轮次不
|
|
170
|
+
* 再重复注入;下一次 turn/start 会由 `markNativeSubagentParentTurnStarted` 解锁。
|
|
171
|
+
*/
|
|
172
|
+
export function guardNativeSubagentParentTurn(sessions, parentSessionId) {
|
|
173
|
+
const id = parentSessionId.trim();
|
|
174
|
+
const pending = readNativeSubagentParentPending(id);
|
|
175
|
+
const activeCount = Math.max(parentTaskStates.get(id)?.active ?? 0, pending.length);
|
|
176
|
+
if (id === '' || activeCount === 0) {
|
|
177
|
+
guardedParentTurns.delete(id);
|
|
178
|
+
return { parentSessionId: id, blocked: false, pending, activeCount: 0, injected: false };
|
|
179
|
+
}
|
|
180
|
+
if (guardedParentTurns.has(id)) {
|
|
181
|
+
return { parentSessionId: id, blocked: true, pending, activeCount, injected: false };
|
|
182
|
+
}
|
|
183
|
+
const childIds = pending.map((state) => `${state.childSessionId}(${state.status})`).join(', ');
|
|
184
|
+
const hasFailed = pending.some((state) => nativeSubagentFailureNeedsReview(state));
|
|
185
|
+
const summary = hasFailed
|
|
186
|
+
? `存在 failed 子代理,主任务暂不能收尾。请先使用 agent_subagent 的 action=read/wait 查看失败原因和已有报告,再评估是否需要 action=start 重新创建,或 action=send 接管继续;确认无需继续后才能汇总报告:${childIds}。`
|
|
187
|
+
: `子代理尚未结束,主任务暂不能收尾。请先使用 agent_subagent 的 action=wait/read 检查:${childIds || `${String(activeCount)} 个子代理正在创建`}。所有子代理进入终态后再汇总报告。`;
|
|
188
|
+
const injected = sessions.injectNextStep?.(id, summary) === true;
|
|
189
|
+
if (injected)
|
|
190
|
+
guardedParentTurns.add(id);
|
|
191
|
+
return { parentSessionId: id, blocked: true, pending, activeCount, injected };
|
|
192
|
+
}
|
|
193
|
+
/** 父会话真正开始下一轮后清除上一轮的收尾屏障。 */
|
|
194
|
+
export function markNativeSubagentParentTurnStarted(parentSessionId) {
|
|
195
|
+
const id = parentSessionId.trim();
|
|
196
|
+
if (id !== '')
|
|
197
|
+
guardedParentTurns.delete(id);
|
|
198
|
+
}
|
|
62
199
|
/** 等待后台子会话进入终态;进程重启后只能返回已持有的最后状态。 */
|
|
63
200
|
export async function waitNativeSubagentLifecycle(childSessionId, timeoutMs = NATIVE_SUBAGENT_TIMEOUT_MS) {
|
|
64
201
|
const id = childSessionId.trim();
|
|
@@ -123,7 +260,7 @@ export async function dispatchNativeSubagent(service, sessions, request) {
|
|
|
123
260
|
completed: false,
|
|
124
261
|
};
|
|
125
262
|
saveLifecycle(lifecycle);
|
|
126
|
-
const completion = waitForChildFirstTurn(sessions, started.childId, request.background ? undefined : request.signal).then((result) => {
|
|
263
|
+
const completion = waitForChildFirstTurn(sessions, started.childId, request.background ? undefined : request.signal, request.background ? BACKGROUND_NATIVE_SUBAGENT_TIMEOUT_MS : NATIVE_SUBAGENT_TIMEOUT_MS).then((result) => {
|
|
127
264
|
saveLifecycle(lifecycleFromResult(lifecycle, result));
|
|
128
265
|
return result;
|
|
129
266
|
});
|
|
@@ -166,12 +303,12 @@ export async function dispatchNativeSubagent(service, sessions, request) {
|
|
|
166
303
|
if (startedChildId !== undefined) {
|
|
167
304
|
const current = lifecycleStates.get(startedChildId);
|
|
168
305
|
if (current !== undefined)
|
|
169
|
-
saveLifecycle({ ...current, status: 'failed', completed: false, error: message });
|
|
306
|
+
saveLifecycle({ ...current, status: 'failed', completed: false, error: message, failureReviewed: false });
|
|
170
307
|
}
|
|
171
308
|
throw new Error(startedChildId === undefined ? message : `子代理 ${startedChildId} 派发失败:${message}`);
|
|
172
309
|
}
|
|
173
310
|
}
|
|
174
|
-
function waitForChildFirstTurn(sessions, childId, signal) {
|
|
311
|
+
function waitForChildFirstTurn(sessions, childId, signal, timeoutMs, afterSeq = 0) {
|
|
175
312
|
return new Promise((resolve) => {
|
|
176
313
|
let text = '';
|
|
177
314
|
let toolCalls = 0;
|
|
@@ -200,6 +337,8 @@ function waitForChildFirstTurn(sessions, childId, signal) {
|
|
|
200
337
|
const row = asRecord(event);
|
|
201
338
|
if (row === undefined)
|
|
202
339
|
return;
|
|
340
|
+
if (typeof row.seq === 'number' && row.seq <= afterSeq)
|
|
341
|
+
return;
|
|
203
342
|
const key = typeof row.seq === 'number' || typeof row.eventSeq === 'number' ? String(row.seq ?? row.eventSeq) : JSON.stringify(row);
|
|
204
343
|
if (seen.has(key))
|
|
205
344
|
return;
|
|
@@ -230,7 +369,7 @@ function waitForChildFirstTurn(sessions, childId, signal) {
|
|
|
230
369
|
const snapshot = sessions.get(childId);
|
|
231
370
|
for (const event of snapshot?.snapshotEvents?.() ?? [])
|
|
232
371
|
processEvent(event);
|
|
233
|
-
timeout = setTimeout(() => finish(false, false, `子代理首轮在 ${String(Math.round(
|
|
372
|
+
timeout = setTimeout(() => finish(false, false, `子代理首轮在 ${String(Math.round(timeoutMs / 60_000))} 分钟内未收到 turn/end。`), timeoutMs);
|
|
234
373
|
timeout.unref?.();
|
|
235
374
|
});
|
|
236
375
|
}
|
|
@@ -261,8 +400,11 @@ function readErrorText(value) {
|
|
|
261
400
|
}
|
|
262
401
|
/** 从任务提示中提取目标文件;没有文件时用规范化提示词作为去重键。 */
|
|
263
402
|
export function nativeSubagentTaskKey(prompt) {
|
|
264
|
-
const files = [...prompt.matchAll(/[^\s"'
|
|
403
|
+
const files = [...prompt.matchAll(/[^\s"'`,。!?;:、:()()<>《》「」【】]+?\.(?:md|markdown|txt|json|ya?ml|toml|ts|tsx|js|jsx|mjs|cjs|py|go|rs|java|css|html|vue|svelte|csv|xlsx?)(?=$|[\s"'`,。!?;:、:()()<>《》「」【】])/giu)]
|
|
265
404
|
.map((match) => normalizeTargetFile(match[0]))
|
|
405
|
+
// AGENTS.md/README.md 是任务上下文,不是目标文件。多个并行任务都会引用
|
|
406
|
+
// 它们;把这些公共说明文件拿来去重会把完全不同的任务误判成重复。
|
|
407
|
+
.filter((file) => !['agents.md', 'readme.md', 'readme.en.md'].includes(file.toLocaleLowerCase()))
|
|
266
408
|
.filter((file) => file !== '');
|
|
267
409
|
const uniqueFiles = [...new Set(files)].sort();
|
|
268
410
|
if (uniqueFiles.length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-subagent-dispatch.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-subagent-dispatch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"native-subagent-dispatch.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-subagent-dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,13 @@ export interface NativeSubagentService {
|
|
|
43
43
|
readonly childId: string;
|
|
44
44
|
readonly messageId: string;
|
|
45
45
|
}>;
|
|
46
|
+
/** DSH 0.2 可续子会话的后续消息入口;sender 必须是精确的父 Agent。 */
|
|
47
|
+
sendMessage?(sender: unknown, targetId: string, content: readonly {
|
|
48
|
+
readonly type: 'text';
|
|
49
|
+
readonly text: string;
|
|
50
|
+
}[], options?: {
|
|
51
|
+
readonly signal?: AbortSignal;
|
|
52
|
+
}): Promise<string> | string;
|
|
46
53
|
}
|
|
47
54
|
/** DSH Agent 工具不是并发安全的,同一父会话同一 Provider 只允许一个预留。 */
|
|
48
55
|
export declare function withTeamSubagentSelection<T>(parentId: string, adapterId: string, modelId: string | undefined, action: () => Promise<T>): Promise<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-team-subagent.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-team-subagent.ts"],"names":[],"mappings":"AAEA,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,wHAKxB,CAAA;AAEV,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAClE;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,QAAQ,EAAE;QACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;QACrB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9C,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAA;QACvC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,CAAA;QAC9B,kBAAkB,CAAC,OAAO,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;SAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;KACzJ,GAAG,OAAO,CAAA;IACX,gBAAgB,CAAC,CAAC,IAAI,EAAE;QACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;QACvB,QAAQ,CAAC,OAAO,EAAE;YAChB,QAAQ,CAAC,MAAM,EAAE,SAAS;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;YAC5E,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;YACxB,yCAAyC;YACzC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;gBACvB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;gBACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;aAC5B,CAAA;SACF,CAAA;QACD,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAC9B,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"native-team-subagent.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-team-subagent.ts"],"names":[],"mappings":"AAEA,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,wHAKxB,CAAA;AAEV,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAClE;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,QAAQ,EAAE;QACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;QACrB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9C,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAA;QACvC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,CAAA;QAC9B,kBAAkB,CAAC,OAAO,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;YAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;SAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;KACzJ,GAAG,OAAO,CAAA;IACX,gBAAgB,CAAC,CAAC,IAAI,EAAE;QACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;QACvB,QAAQ,CAAC,OAAO,EAAE;YAChB,QAAQ,CAAC,MAAM,EAAE,SAAS;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;YAC5E,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;YACxB,yCAAyC;YACzC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;gBACvB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;gBACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;aAC5B,CAAA;SACF,CAAA;QACD,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAC9B,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACrE,iDAAiD;IACjD,WAAW,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;CAC7L;AAUD,oDAAoD;AACpD,wBAAsB,yBAAyB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAKzJ;AAID;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAetJ;AAED,yDAAyD;AACzD,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,IAAI,CAoD9F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-team-subagent.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-team-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,6DAA6D;IAC7D,0DAA0D;IAC1D,qBAAqB;IACrB,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;CACnG,CAAA;AAEV,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,kDAAkD;IAClD,sDAAsD;IACtD,uBAAuB;IACvB,IAAI,SAAS,KAAK,KAAK;QAAE,OAAO,OAAO,CAAA;IACvC,OAAO,qBAAqB,SAAS,EAAE,CAAA;AACzC,CAAC;
|
|
1
|
+
{"version":3,"file":"native-team-subagent.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/native-team-subagent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-api-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/new-api-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,wCAAwC,CAAA;AAM/C,KAAK,SAAS,GAAG,OAAO,KAAK,CAAA;AAE7B,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAED,4CAA4C;AAC5C,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,YAAY,EAAE,CAAC,CAAC,CAAA;CACnF;AAED,KAAK,aAAa,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAA;AAEzD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,aAAa,GAChC,YAAY,EAAE,CAShB;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAmBjF;
|
|
1
|
+
{"version":3,"file":"new-api-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/new-api-subscription.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { createDecipheriv, createHash } from 'node:crypto';
|
|
2
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
3
|
-
import { homedir
|
|
2
|
+
import { homedir } from 'node:os';
|
|
4
3
|
import { join } from 'node:path';
|
|
4
|
+
import { readZcodeProviderConfigs } from './zcode-provider-config.js';
|
|
5
5
|
/**
|
|
6
6
|
* 从显式配置中解析某个 Agent 的 New-API 来源。
|
|
7
7
|
*
|
|
@@ -70,7 +70,7 @@ function discoverNewApiSources(adapterId, providerId) {
|
|
|
70
70
|
if (adapterId === 'command-code')
|
|
71
71
|
readCommandCodeSources(providerId).forEach(add);
|
|
72
72
|
if (adapterId === 'zcode')
|
|
73
|
-
readZcodeSources().forEach(add);
|
|
73
|
+
readZcodeSources(providerId).forEach(add);
|
|
74
74
|
if (adapterId === 'codebuddy' || adapterId === 'workbuddy')
|
|
75
75
|
readCodeBuddySources(adapterId, providerId).forEach(add);
|
|
76
76
|
if (adapterId === 'dsh') {
|
|
@@ -129,65 +129,18 @@ function readDshYamlSource(path, providerId) {
|
|
|
129
129
|
const apiKey = keyRef === null ? null : textValue(process.env[keyRef]) ?? readDshCredential(keyRef);
|
|
130
130
|
return baseUrl === null || apiKey === null ? null : { baseUrl, apiKey };
|
|
131
131
|
}
|
|
132
|
-
function readZcodeSources() {
|
|
132
|
+
function readZcodeSources(providerId) {
|
|
133
133
|
const paths = [process.env.ZCODE_PERSONAL_PROVIDER_CONFIG_FILE, process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE, join(homedir(), '.zcode', 'v2', 'provider_config.json')].filter((value) => typeof value === 'string' && value.trim() !== '');
|
|
134
134
|
const result = paths.flatMap((path) => {
|
|
135
135
|
const value = readJson(path);
|
|
136
|
-
|
|
136
|
+
const rules = recordValue(recordValue(value?.config)?.providerConfigRules)?.providerRules;
|
|
137
|
+
// 旧导出格式可能直接把地址和密钥放在规则上;兼容时仍只读当前 Provider。
|
|
138
|
+
if (Array.isArray(rules))
|
|
139
|
+
return rules.filter((rule) => providerId === undefined || recordValue(rule)?.providerId === providerId)
|
|
140
|
+
.flatMap((rule) => readConfigSources(rule));
|
|
141
|
+
return readConfigSources(value, providerId);
|
|
137
142
|
});
|
|
138
|
-
return result;
|
|
139
|
-
}
|
|
140
|
-
/** ZCode 的 Provider 规则和凭据分开保存;这里只拼出明确声明了 endpoint 的来源。 */
|
|
141
|
-
function readZcodeRuleSources(value) {
|
|
142
|
-
const config = recordValue(value?.config);
|
|
143
|
-
const rules = recordValue(config?.providerConfigRules)?.providerRules;
|
|
144
|
-
if (!Array.isArray(rules))
|
|
145
|
-
return [];
|
|
146
|
-
return rules.flatMap((item) => {
|
|
147
|
-
const rule = recordValue(item);
|
|
148
|
-
const providerId = textValue(rule?.providerId);
|
|
149
|
-
const ruleConfig = recordValue(rule?.config);
|
|
150
|
-
const baseUrl = textValue(ruleConfig?.baseURL ?? ruleConfig?.baseUrl ?? ruleConfig?.base_url ?? ruleConfig?.apiBaseUrl ?? ruleConfig?.api_base_url ?? ruleConfig?.endpoint ?? rule?.baseURL ?? rule?.baseUrl ?? rule?.endpoint);
|
|
151
|
-
const apiKey = textValue(ruleConfig?.apiKey ?? ruleConfig?.api_key ?? rule?.apiKey ?? rule?.api_key)
|
|
152
|
-
?? (providerId === null ? null : readZcodeProviderApiKey(providerId));
|
|
153
|
-
return baseUrl === null || apiKey === null ? [] : [{ baseUrl, apiKey }];
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
|
-
function readZcodeProviderApiKey(providerId) {
|
|
157
|
-
const path = process.env.ZCODE_CREDENTIALS_FILE ?? join(homedir(), '.zcode', 'v2', 'credentials.json');
|
|
158
|
-
const credentials = readJson(path);
|
|
159
|
-
if (credentials === null)
|
|
160
|
-
return null;
|
|
161
|
-
const prefix = `account-provider:coding-plan:${providerId}:account:`;
|
|
162
|
-
const key = Object.keys(credentials).find((candidate) => candidate.startsWith(prefix) && candidate.endsWith(':api-key'));
|
|
163
|
-
const value = key === undefined ? null : textValue(credentials[key]);
|
|
164
|
-
return value === null ? null : decryptZcodeCredential(value);
|
|
165
|
-
}
|
|
166
|
-
function decryptZcodeCredential(value) {
|
|
167
|
-
if (!value.startsWith('enc:v1:'))
|
|
168
|
-
return value;
|
|
169
|
-
const [ivRaw, authTagRaw, cipherRaw] = value.slice('enc:v1:'.length).split('.');
|
|
170
|
-
if (ivRaw === undefined || authTagRaw === undefined || cipherRaw === undefined)
|
|
171
|
-
return '';
|
|
172
|
-
try {
|
|
173
|
-
const iv = Buffer.from(ivRaw, 'base64url');
|
|
174
|
-
const authTag = Buffer.from(authTagRaw, 'base64url');
|
|
175
|
-
const cipherText = Buffer.from(cipherRaw, 'base64url');
|
|
176
|
-
if (iv.length !== 12 || authTag.length !== 16)
|
|
177
|
-
return '';
|
|
178
|
-
let username = 'unknown';
|
|
179
|
-
try {
|
|
180
|
-
username = userInfo().username;
|
|
181
|
-
}
|
|
182
|
-
catch { /* 沙箱环境可能无法读取用户名。 */ }
|
|
183
|
-
const secret = `zcode-credential-fallback:${process.platform}:${homedir()}:${username}`;
|
|
184
|
-
const decipher = createDecipheriv('aes-256-gcm', createHash('sha256').update(secret).digest(), iv);
|
|
185
|
-
decipher.setAuthTag(authTag);
|
|
186
|
-
return Buffer.concat([decipher.update(cipherText), decipher.final()]).toString('utf8').trim();
|
|
187
|
-
}
|
|
188
|
-
catch {
|
|
189
|
-
return '';
|
|
190
|
-
}
|
|
143
|
+
return [...readZcodeProviderConfigs(providerId).flatMap((provider) => provider.source === null ? [] : [provider.source]), ...result];
|
|
191
144
|
}
|
|
192
145
|
function readCommandCodeSources(providerId) {
|
|
193
146
|
const home = process.env.COMMANDCODE_HOME ?? join(homedir(), '.commandcode');
|