@agents-ensemble/core 0.18.0 → 0.19.0
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/dist/acp/acp-bridge.d.ts +5 -1
- package/dist/acp/acp-bridge.d.ts.map +1 -1
- package/dist/acp/acp-bridge.js +4 -2
- package/dist/acp/acp-bridge.js.map +1 -1
- package/dist/acp/acp-client.d.ts +12 -0
- package/dist/acp/acp-client.d.ts.map +1 -1
- package/dist/acp/acp-client.js +88 -2
- package/dist/acp/acp-client.js.map +1 -1
- package/dist/acp/resolve-acp-spawn.d.ts +20 -2
- package/dist/acp/resolve-acp-spawn.d.ts.map +1 -1
- package/dist/acp/resolve-acp-spawn.js +92 -31
- package/dist/acp/resolve-acp-spawn.js.map +1 -1
- package/dist/acp/testing/fake-acp-server.d.ts +11 -0
- package/dist/acp/testing/fake-acp-server.d.ts.map +1 -1
- package/dist/acp/testing/fake-acp-server.js +31 -2
- package/dist/acp/testing/fake-acp-server.js.map +1 -1
- package/dist/conductor/conductor-agent-factory-cleanup.d.ts +7 -0
- package/dist/conductor/conductor-agent-factory-cleanup.d.ts.map +1 -0
- package/dist/conductor/conductor-agent-factory-cleanup.js +14 -0
- package/dist/conductor/conductor-agent-factory-cleanup.js.map +1 -0
- package/dist/conductor/conductor-agent.d.ts +6 -0
- package/dist/conductor/conductor-agent.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +5 -7
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +8 -0
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +228 -54
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/cursor-sdk-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/cursor-sdk-conductor-agent.js +77 -5
- package/dist/conductor/cursor-sdk-conductor-agent.js.map +1 -1
- package/dist/conductor/index.d.ts +1 -0
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +1 -0
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/pi-conductor-agent.d.ts +1 -1
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +36 -1
- package/dist/conductor/pi-conductor-agent.js.map +1 -1
- package/dist/conductor/resolve-conductor-reasoning.d.ts +13 -0
- package/dist/conductor/resolve-conductor-reasoning.d.ts.map +1 -0
- package/dist/conductor/resolve-conductor-reasoning.js +16 -0
- package/dist/conductor/resolve-conductor-reasoning.js.map +1 -0
- package/dist/conductor/session/dispatch-hold.d.ts +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts.map +1 -1
- package/dist/conductor/session/dispatch-hold.js +2 -1
- package/dist/conductor/session/dispatch-hold.js.map +1 -1
- package/dist/conductor/session/session-logger.d.ts +1 -0
- package/dist/conductor/session/session-logger.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.js +1 -0
- package/dist/conductor/session/session-logger.js.map +1 -1
- package/dist/config/ensemble-config-digest.d.ts +47 -1
- package/dist/config/ensemble-config-digest.d.ts.map +1 -1
- package/dist/config/ensemble-config-digest.js +68 -2
- package/dist/config/ensemble-config-digest.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/load-ensemble-config.js +1 -1
- package/dist/config/load-ensemble-config.js.map +1 -1
- package/dist/config/parse-config.d.ts.map +1 -1
- package/dist/config/parse-config.js +12 -1
- package/dist/config/parse-config.js.map +1 -1
- package/dist/config/resolve-settings.d.ts +8 -0
- package/dist/config/resolve-settings.d.ts.map +1 -1
- package/dist/config/resolve-settings.js +10 -0
- package/dist/config/resolve-settings.js.map +1 -1
- package/dist/config/types.d.ts +4 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/dispatch/set-dispatch-hold-tool.d.ts.map +1 -1
- package/dist/dispatch/set-dispatch-hold-tool.js +5 -4
- package/dist/dispatch/set-dispatch-hold-tool.js.map +1 -1
- package/dist/dispatch/worker-acp-session.d.ts +1 -1
- package/dist/dispatch/worker-acp-session.d.ts.map +1 -1
- package/dist/dispatch/worker-acp-session.js +23 -7
- package/dist/dispatch/worker-acp-session.js.map +1 -1
- package/dist/operator-runtime.d.ts +1 -0
- package/dist/operator-runtime.d.ts.map +1 -1
- package/dist/operator-runtime.js +1 -0
- package/dist/operator-runtime.js.map +1 -1
- package/dist/permission/permission-deadlock-monitor.d.ts +7 -2
- package/dist/permission/permission-deadlock-monitor.d.ts.map +1 -1
- package/dist/permission/permission-deadlock-monitor.js +16 -9
- package/dist/permission/permission-deadlock-monitor.js.map +1 -1
- package/dist/profiles/implementer-and-reviewer-v2/team-conductor.md +2 -0
- package/dist/prompt/modules/ensemble/conductor-base-module.js +3 -3
- package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
- package/dist/prompt/modules/ensemble/worker-base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/worker-base-module.js +1 -0
- package/dist/prompt/modules/ensemble/worker-base-module.js.map +1 -1
- package/dist/session/build-session-models-summary.d.ts +39 -0
- package/dist/session/build-session-models-summary.d.ts.map +1 -0
- package/dist/session/build-session-models-summary.js +40 -0
- package/dist/session/build-session-models-summary.js.map +1 -0
- package/dist/session/index.d.ts +3 -1
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js +1 -0
- package/dist/session/index.js.map +1 -1
- package/dist/session/session-resume-store.d.ts +7 -2
- package/dist/session/session-resume-store.d.ts.map +1 -1
- package/dist/session/session-resume-store.js +48 -0
- package/dist/session/session-resume-store.js.map +1 -1
- package/package.json +1 -1
package/dist/acp/acp-bridge.d.ts
CHANGED
|
@@ -6,7 +6,11 @@ export interface AcpBridgeConnectOptions extends SpawnAcpProcessOptions {
|
|
|
6
6
|
export interface AcpBridgeRunSessionOptions {
|
|
7
7
|
cwd: string;
|
|
8
8
|
prompt: string;
|
|
9
|
-
/**
|
|
9
|
+
/**
|
|
10
|
+
* 指定した ID で `session/load` を試みる。通常の load 失敗時は新しい
|
|
11
|
+
* session を作って prompt を続行するが、ACP config-option の検証・適用
|
|
12
|
+
* エラーは伝播させ、新しい session は作らない。
|
|
13
|
+
*/
|
|
10
14
|
resumeSessionId?: string;
|
|
11
15
|
onUpdate?: SessionUpdateHandler;
|
|
12
16
|
/** 注入 bridge 利用時も worker ごとの handler を渡せる。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/acp-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"acp-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/acp-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAmB,KAAK,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAElE,MAAM,WAAW,uBAAwB,SAAQ,sBAAsB;CAAG;AAE1E,MAAM,WAAW,0BAA0B;IACzC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,8CAA8C;IAC9C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,SAAS;IACA,OAAO,CAAC,QAAQ,CAAC,MAAM;IAA3C,OAAO;WAEM,OAAO,CAClB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,SAAS,CAAC;IAMrB,uDAAuD;IACvD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAIzC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxC,WAAW,CACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,IAAI,CAAC;IASV,MAAM,CACV,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,CAAC,YAAY,CAAC;IAIlB,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QACR,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;QACtC,QAAQ,CAAC,EAAE,oBAAoB,CAAC;KACjC,GACA,OAAO,CAAC,YAAY,CAAC;IAQxB,4BAA4B;IAC5B,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,wEAAwE;IAClE,UAAU,CACd,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,yBAAyB,CAAC;IAkC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B;AAED,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC"}
|
package/dist/acp/acp-bridge.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AcpClient } from './acp-client.js';
|
|
1
|
+
import { AcpClient, AcpSessionConfigOptionError, } from './acp-client.js';
|
|
2
2
|
import { spawnAcpProcess } from './acp-process.js';
|
|
3
3
|
/**
|
|
4
4
|
* Facade for dispatch: holds a connected ACP client over a child process.
|
|
@@ -53,7 +53,9 @@ export class AcpBridge {
|
|
|
53
53
|
await this.loadSession(sessionId, options.cwd);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
catch {
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (error instanceof AcpSessionConfigOptionError)
|
|
58
|
+
throw error;
|
|
57
59
|
sessionId = undefined;
|
|
58
60
|
}
|
|
59
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-bridge.js","sourceRoot":"","sources":["../../src/acp/acp-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"acp-bridge.js","sourceRoot":"","sources":["../../src/acp/acp-bridge.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/acp-client.d.ts
CHANGED
|
@@ -10,13 +10,24 @@ export interface AcpClientOptions {
|
|
|
10
10
|
clientVersion?: string;
|
|
11
11
|
/** preset 解決結果。未指定時は Cursor 互換の `cursor_login`。 */
|
|
12
12
|
authenticate?: AcpAuthenticateStrategy;
|
|
13
|
+
/** ACP client capabilities metadata used by preset-specific extensions. */
|
|
14
|
+
clientCapabilitiesMeta?: Record<string, unknown>;
|
|
13
15
|
/** Preset-specific metadata passed to session/new and session/load. */
|
|
14
16
|
sessionMeta?: Record<string, unknown>;
|
|
17
|
+
/** Apply documented preset config options after session/new and session/load. */
|
|
18
|
+
sessionConfigOptionOverrides?: AcpSessionConfigOptionOverride[];
|
|
15
19
|
/** Set when backed by a child process (for cleanup). */
|
|
16
20
|
childProcess?: ChildProcess;
|
|
17
21
|
/** 子プロセス stderr capture の drain(close 時に呼ぶ)。 */
|
|
18
22
|
drainChildStderr?: () => Promise<void>;
|
|
19
23
|
}
|
|
24
|
+
export interface AcpSessionConfigOptionOverride {
|
|
25
|
+
id: string;
|
|
26
|
+
value: string;
|
|
27
|
+
}
|
|
28
|
+
export declare class AcpSessionConfigOptionError extends Error {
|
|
29
|
+
constructor(message: string);
|
|
30
|
+
}
|
|
20
31
|
export type SessionUpdateHandler = (update: SessionUpdateNotification) => void;
|
|
21
32
|
export interface AcpClientStreams {
|
|
22
33
|
readable: Readable;
|
|
@@ -38,6 +49,7 @@ export declare class AcpClient {
|
|
|
38
49
|
connect(): Promise<void>;
|
|
39
50
|
newSession(cwd: string, mcpServers?: unknown[]): Promise<string>;
|
|
40
51
|
loadSession(sessionId: string, cwd: string, mcpServers?: unknown[]): Promise<void>;
|
|
52
|
+
private applySessionConfigOptionOverrides;
|
|
41
53
|
/** 進行中の `session/prompt` を中止する(ACP `session/cancel` notification)。 */
|
|
42
54
|
cancelSession(sessionId: string): void;
|
|
43
55
|
prompt(sessionId: string, prompt: string | AcpPromptBlock[], onUpdate?: SessionUpdateHandler): Promise<PromptResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-client.d.ts","sourceRoot":"","sources":["../../src/acp/acp-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAEL,KAAK,cAAc,EAEnB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,yBAAyB,EAC/B,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,YAAY,CAAC,EAAE,uBAAuB,CAAC;IACvC,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,wDAAwD;IACxD,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,oBAAoB,GAAG,CACjC,MAAM,EAAE,yBAAyB,KAC9B,IAAI,CAAC;AAEV,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,SAAS;IAOlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,mBAAmB,CAAC,CAAuB;IACnD,OAAO,CAAC,yBAAyB,CAAC,CAAoB;IAEtD,OAAO;IAOP,MAAM,CAAC,MAAM,CACX,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,gBAAqB,GAC7B,SAAS;IAcZ,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"acp-client.d.ts","sourceRoot":"","sources":["../../src/acp/acp-client.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/acp-client.js
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { JsonRpcPeer } from './json-rpc-peer.js';
|
|
2
2
|
import { DEFAULT_PERMISSION_DECISION, } from './types.js';
|
|
3
|
+
export class AcpSessionConfigOptionError extends Error {
|
|
4
|
+
constructor(message) {
|
|
5
|
+
super(message);
|
|
6
|
+
this.name = 'AcpSessionConfigOptionError';
|
|
7
|
+
}
|
|
8
|
+
}
|
|
3
9
|
/**
|
|
4
10
|
* High-level ACP client: initialize → authenticate → session/* .
|
|
5
11
|
*/
|
|
@@ -33,6 +39,9 @@ export class AcpClient {
|
|
|
33
39
|
clientCapabilities: {
|
|
34
40
|
fs: { readTextFile: false, writeTextFile: false },
|
|
35
41
|
terminal: false,
|
|
42
|
+
...(this.options.clientCapabilitiesMeta
|
|
43
|
+
? { _meta: this.options.clientCapabilitiesMeta }
|
|
44
|
+
: {}),
|
|
36
45
|
},
|
|
37
46
|
clientInfo: {
|
|
38
47
|
name: optionsClientName(this.options),
|
|
@@ -59,15 +68,52 @@ export class AcpClient {
|
|
|
59
68
|
mcpServers,
|
|
60
69
|
...(this.options.sessionMeta ? { _meta: this.options.sessionMeta } : {}),
|
|
61
70
|
}));
|
|
71
|
+
await this.applySessionConfigOptionOverrides(result.sessionId, result.configOptions);
|
|
62
72
|
return result.sessionId;
|
|
63
73
|
}
|
|
64
74
|
async loadSession(sessionId, cwd, mcpServers = []) {
|
|
65
|
-
await this.peer.request('session/load', {
|
|
75
|
+
const result = (await this.peer.request('session/load', {
|
|
66
76
|
sessionId,
|
|
67
77
|
cwd,
|
|
68
78
|
mcpServers,
|
|
69
79
|
...(this.options.sessionMeta ? { _meta: this.options.sessionMeta } : {}),
|
|
70
|
-
});
|
|
80
|
+
}));
|
|
81
|
+
await this.applySessionConfigOptionOverrides(sessionId, result.configOptions);
|
|
82
|
+
}
|
|
83
|
+
async applySessionConfigOptionOverrides(sessionId, rawConfigOptions) {
|
|
84
|
+
const overrides = this.options.sessionConfigOptionOverrides ?? [];
|
|
85
|
+
if (overrides.length === 0)
|
|
86
|
+
return;
|
|
87
|
+
let configOptions = readSessionConfigOptions(rawConfigOptions);
|
|
88
|
+
for (const override of overrides) {
|
|
89
|
+
const option = findSessionConfigOption(configOptions, override.id);
|
|
90
|
+
const currentValue = option.currentValue;
|
|
91
|
+
if (typeof currentValue !== 'string') {
|
|
92
|
+
throw new AcpSessionConfigOptionError(`ACP agent returned an invalid currentValue for session config option "${override.id}"`);
|
|
93
|
+
}
|
|
94
|
+
if (currentValue === override.value)
|
|
95
|
+
continue;
|
|
96
|
+
const availableValues = readSessionConfigOptionValues(option.options);
|
|
97
|
+
if (!availableValues.includes(override.value)) {
|
|
98
|
+
throw new AcpSessionConfigOptionError(`ACP agent does not advertise "${override.value}" for session config option "${override.id}" (available: ${availableValues.join(', ') || 'none'})`);
|
|
99
|
+
}
|
|
100
|
+
let response;
|
|
101
|
+
try {
|
|
102
|
+
response = (await this.peer.request('session/set_config_option', {
|
|
103
|
+
sessionId,
|
|
104
|
+
configId: override.id,
|
|
105
|
+
value: override.value,
|
|
106
|
+
}));
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
throw new AcpSessionConfigOptionError(`ACP agent failed to set session config option "${override.id}" to "${override.value}": ${errorMessage(error)}`);
|
|
110
|
+
}
|
|
111
|
+
configOptions = readSessionConfigOptions(response.configOptions);
|
|
112
|
+
const updatedOption = findSessionConfigOption(configOptions, override.id);
|
|
113
|
+
if (updatedOption.currentValue !== override.value) {
|
|
114
|
+
throw new AcpSessionConfigOptionError(`ACP agent acknowledged session config option "${override.id}" but reported currentValue ${formatConfigOptionValue(updatedOption.currentValue)} instead of "${override.value}"`);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
71
117
|
}
|
|
72
118
|
/** 進行中の `session/prompt` を中止する(ACP `session/cancel` notification)。 */
|
|
73
119
|
cancelSession(sessionId) {
|
|
@@ -146,6 +192,46 @@ export class AcpClient {
|
|
|
146
192
|
}
|
|
147
193
|
}
|
|
148
194
|
}
|
|
195
|
+
function readSessionConfigOptions(value) {
|
|
196
|
+
if (!Array.isArray(value)) {
|
|
197
|
+
throw new AcpSessionConfigOptionError('ACP agent did not return session config options required by the configured worker model');
|
|
198
|
+
}
|
|
199
|
+
return value.filter((option) => option !== null && typeof option === 'object' && !Array.isArray(option));
|
|
200
|
+
}
|
|
201
|
+
function findSessionConfigOption(options, id) {
|
|
202
|
+
const matches = options.filter((option) => option.id === id);
|
|
203
|
+
if (matches.length !== 1) {
|
|
204
|
+
throw new AcpSessionConfigOptionError(matches.length === 0
|
|
205
|
+
? `ACP agent did not advertise configured session option "${id}"`
|
|
206
|
+
: `ACP agent advertised configured session option "${id}" more than once`);
|
|
207
|
+
}
|
|
208
|
+
return matches[0];
|
|
209
|
+
}
|
|
210
|
+
function readSessionConfigOptionValues(value) {
|
|
211
|
+
const values = [];
|
|
212
|
+
const visit = (items) => {
|
|
213
|
+
for (const item of items) {
|
|
214
|
+
if (!item || typeof item !== 'object' || Array.isArray(item))
|
|
215
|
+
continue;
|
|
216
|
+
const option = item;
|
|
217
|
+
if (typeof option.value === 'string')
|
|
218
|
+
values.push(option.value);
|
|
219
|
+
if (Array.isArray(option.options))
|
|
220
|
+
visit(option.options);
|
|
221
|
+
}
|
|
222
|
+
};
|
|
223
|
+
if (Array.isArray(value))
|
|
224
|
+
visit(value);
|
|
225
|
+
return values;
|
|
226
|
+
}
|
|
227
|
+
function formatConfigOptionValue(value) {
|
|
228
|
+
if (typeof value === 'string')
|
|
229
|
+
return JSON.stringify(value);
|
|
230
|
+
return JSON.stringify(value) ?? String(value);
|
|
231
|
+
}
|
|
232
|
+
function errorMessage(error) {
|
|
233
|
+
return error instanceof Error ? error.message : String(error);
|
|
234
|
+
}
|
|
149
235
|
function normalizeAcpUsage(usage) {
|
|
150
236
|
return {
|
|
151
237
|
inputTokens: usage.inputTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acp-client.js","sourceRoot":"","sources":["../../src/acp/acp-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"acp-client.js","sourceRoot":"","sources":["../../src/acp/acp-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EACL,2BAA2B,GAM5B,MAAM,YAAY,CAAC;AAuCpB,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IACpD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAWD;;GAEG;AACH,MAAM,OAAO,SAAS;IAOD;IANV,IAAI,CAAc;IACnB,mBAAmB,CAAwB;IAC3C,yBAAyB,CAAqB;IAEtD,YACE,IAAiB,EACA,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;QAE1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAM,CACX,OAAyB,EACzB,UAA4B,EAAE;QAE9B,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC;YAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,cAAc,EAAE,CAAC,YAAY,EAAE,EAAE,CAC/B,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;YACjD,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;SAC9D,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACpC,eAAe,EAAE,CAAC;YAClB,kBAAkB,EAAE;gBAClB,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;gBACjD,QAAQ,EAAE,KAAK;gBACf,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB;oBACrC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE;oBAChD,CAAC,CAAC,EAAE,CAAC;aACR;YACD,UAAU,EAAE;gBACV,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;gBACrC,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAQ,GAAG,cAAc;QAC1C,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI;YACxC,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,cAAc;SACzB,CAAC;QACF,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,aAAwB,EAAE;QACtD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YACrD,GAAG;YACH,UAAU;YACV,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzE,CAAC,CAAmD,CAAC;QACtD,MAAM,IAAI,CAAC,iCAAiC,CAC1C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,aAAa,CACrB,CAAC;QACF,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW,CACf,SAAiB,EACjB,GAAW,EACX,aAAwB,EAAE;QAE1B,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YACtD,SAAS;YACT,GAAG;YACH,UAAU;YACV,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzE,CAAC,CAAgC,CAAC;QACnC,MAAM,IAAI,CAAC,iCAAiC,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAC7C,SAAiB,EACjB,gBAAyB;QAEzB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,IAAI,EAAE,CAAC;QAClE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEnC,IAAI,aAAa,GAAG,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;QAC/D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,uBAAuB,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;YACnE,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YACzC,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;gBACrC,MAAM,IAAI,2BAA2B,CACnC,yEAAyE,QAAQ,CAAC,EAAE,GAAG,CACxF,CAAC;YACJ,CAAC;YACD,IAAI,YAAY,KAAK,QAAQ,CAAC,KAAK;gBAAE,SAAS;YAE9C,MAAM,eAAe,GAAG,6BAA6B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9C,MAAM,IAAI,2BAA2B,CACnC,iCAAiC,QAAQ,CAAC,KAAK,gCAAgC,QAAQ,CAAC,EAAE,iBAAiB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CACnJ,CAAC;YACJ,CAAC;YAED,IAAI,QAAqC,CAAC;YAC1C,IAAI,CAAC;gBACH,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE;oBAC/D,SAAS;oBACT,QAAQ,EAAE,QAAQ,CAAC,EAAE;oBACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAgC,CAAC;YACrC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,2BAA2B,CACnC,kDAAkD,QAAQ,CAAC,EAAE,SAAS,QAAQ,CAAC,KAAK,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,CAChH,CAAC;YACJ,CAAC;YAED,aAAa,GAAG,wBAAwB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACjE,MAAM,aAAa,GAAG,uBAAuB,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,aAAa,CAAC,YAAY,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAClD,MAAM,IAAI,2BAA2B,CACnC,iDAAiD,QAAQ,CAAC,EAAE,+BAA+B,uBAAuB,CAAC,aAAa,CAAC,YAAY,CAAC,gBAAgB,QAAQ,CAAC,KAAK,GAAG,CAChL,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,sEAAsE;IACtE,aAAa,CAAC,SAAiB;QAC7B,0EAA0E;QAC1E,wEAAwE;QACxE,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAChE,yDAAyD;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CACV,SAAiB,EACjB,MAAiC,EACjC,QAA+B;QAE/B,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,eAAe,GAAyB,CAAC,MAAM,EAAE,EAAE;YACvD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC;YAC1C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,OAAO,MAAM,KAAK,QAAQ;gBACvC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;gBAC3C,CAAC,CAAC,MAAM,CAAC;YACX,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBACxD,SAAS;gBACT,MAAM,EAAE,MAAM;aACf,CAAC,CAAwB,CAAC;YAC3B,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7C,OAAO;gBACL,GAAG,MAAM;gBACT,YAAY,EAAE,YAAY,IAAI,SAAS;gBACvC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;aAClE,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;QACvC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC9B,MAAM,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;IAED,qBAAqB,CACnB,OAA0B,EAC1B,EAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAChD,IAAI,CAAC,yBAAyB,GAAG,OAAO,CAAC;QACzC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACvB,IAAI,CAAC,yBAAyB,GAAG,QAAQ,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,YAAiC;QAClD,IAAI,YAAY,CAAC,MAAM,KAAK,gBAAgB;YAAE,OAAO;QACrD,IAAI,CAAC,mBAAmB,EAAE,CACxB,YAAY,CAAC,MAAmC,CACjD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAuB;QACzC,IAAI,OAAO,CAAC,MAAM,KAAK,4BAA4B;YAAE,OAAO;QAC5D,MAAM,OAAO,GACX,IAAI,CAAC,yBAAyB;YAC9B,IAAI,CAAC,OAAO,CAAC,iBAAiB;YAC9B,wBAAwB,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,sEAAsE;YACtE,uEAAuE;YACvE,uEAAuE;YACvE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAED,SAAS,wBAAwB,CAC/B,KAAc;IAEd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,2BAA2B,CACnC,yFAAyF,CAC1F,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,MAAM,EAAqC,EAAE,CAC5C,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAC1E,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,OAAuC,EACvC,EAAU;IAEV,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,2BAA2B,CACnC,OAAO,CAAC,MAAM,KAAK,CAAC;YAClB,CAAC,CAAC,0DAA0D,EAAE,GAAG;YACjE,CAAC,CAAC,mDAAmD,EAAE,kBAAkB,CAC5E,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAE,CAAC;AACrB,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAc;IACnD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,CAAC,KAAgB,EAAQ,EAAE;QACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,SAAS;YACvE,MAAM,MAAM,GAAG,IAA+B,CAAC;YAC/C,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ;gBAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC;IACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAmB;IAC5C,OAAO;QACL,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS;YACjC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE;YACpC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,KAAK,CAAC,gBAAgB,KAAK,QAAQ;YAC5C,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,gBAAgB,EAAE;YAC7C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,KAAK,CAAC,iBAAiB,KAAK,QAAQ;YAC7C,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,EAAE;YAC/C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ;YACzC,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,aAAa,EAAE;YAC1C,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAyB;IAClD,OAAO,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;AACjD,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAyB;IACrD,OAAO,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC;AAC1C,CAAC;AAED,SAAS,wBAAwB;IAC/B,OAAO,2BAA2B,CAAC;AACrC,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAmB,EACnB,UAA0C,EAAE;IAE5C,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO;IAEjE,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;IAEnB,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAC7C,KAAK,EACL,OAAO,CAAC,cAAc,IAAI,GAAG,CAC9B,CAAC;IACF,IAAI,gBAAgB;QAAE,OAAO;IAE7B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CACxC,KAAK,EACL,OAAO,CAAC,eAAe,IAAI,KAAK,CACjC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,iBAAiB,KAAK,CAAC,GAAG,IAAI,WAAW,6BAA6B,CACvE,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAmB,EAAE,SAAiB;IAC9D,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QACzD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SpawnAcpProcessOptions } from './acp-process.js';
|
|
2
|
+
import type { AcpSessionConfigOptionOverride } from './acp-client.js';
|
|
2
3
|
import { type AcpAuthenticateStrategy } from './resolve-acp-auth.js';
|
|
3
4
|
import type { AcpModelTag, EnsembleConfig } from '../config/types.js';
|
|
4
5
|
/** Built-in ACP preset id(Phase 1)。拡張時は adapter / capability を別途追加可能。 */
|
|
@@ -15,10 +16,21 @@ export interface ResolvedAcpSpawn {
|
|
|
15
16
|
/** Effective profile tier and environment-specific model ID. */
|
|
16
17
|
modelTag?: AcpModelTag;
|
|
17
18
|
model?: string;
|
|
19
|
+
reasoning?: string;
|
|
20
|
+
cursorFast?: boolean;
|
|
21
|
+
/** Hash of the effective Codex MODEL_PROVIDER, including inherited values. */
|
|
22
|
+
modelProviderDigest?: string;
|
|
18
23
|
/** Preset-specific session metadata, currently used by Claude ACP. */
|
|
19
24
|
sessionMeta?: Record<string, unknown>;
|
|
25
|
+
/** Metadata sent in ACP initialize.clientCapabilities._meta. */
|
|
26
|
+
clientCapabilitiesMeta?: Record<string, unknown>;
|
|
27
|
+
/** ACP session config options to set after session/new or session/load. */
|
|
28
|
+
sessionConfigOptionOverrides?: AcpSessionConfigOptionOverride[];
|
|
20
29
|
}
|
|
21
|
-
/**
|
|
30
|
+
/**
|
|
31
|
+
* Resume metadata. Model and environment fields are retained for diagnostics;
|
|
32
|
+
* compatibility checks compare the preset and, for custom, command and args.
|
|
33
|
+
*/
|
|
22
34
|
export interface AcpSpawnFingerprint {
|
|
23
35
|
preset: AcpPresetId;
|
|
24
36
|
command: string;
|
|
@@ -29,6 +41,12 @@ export interface AcpSpawnFingerprint {
|
|
|
29
41
|
modelTag?: AcpModelTag;
|
|
30
42
|
/** Resolved ACP model ID (model IDs are not credentials). */
|
|
31
43
|
model?: string;
|
|
44
|
+
/** Configured reasoning effort; not a credential. */
|
|
45
|
+
reasoning?: string;
|
|
46
|
+
/** Configured Cursor ACP fast option, when explicitly set. */
|
|
47
|
+
cursorFast?: boolean;
|
|
48
|
+
/** Hash of the effective Codex MODEL_PROVIDER, including inherited values. */
|
|
49
|
+
modelProviderDigest?: string;
|
|
32
50
|
}
|
|
33
51
|
export interface DefaultAcpResolutionOptions {
|
|
34
52
|
/** CLI `--default-acp-cli` */
|
|
@@ -62,7 +80,7 @@ export declare function resolveWorkerAcpSpawns(input: {
|
|
|
62
80
|
defaultOptions?: DefaultAcpResolutionOptions;
|
|
63
81
|
}): Map<string, ResolvedAcpSpawn>;
|
|
64
82
|
export declare function acpSpawnFingerprint(spawn: ResolvedAcpSpawn): AcpSpawnFingerprint;
|
|
65
|
-
/** Hash a canonical env map
|
|
83
|
+
/** Hash a canonical env map for persisted diagnostics without exposing values. */
|
|
66
84
|
export declare function computeAcpSpawnEnvDigest(env: Record<string, string>): string;
|
|
67
85
|
export declare function formatAcpSpawnFingerprint(spawn: AcpSpawnFingerprint): string;
|
|
68
86
|
export declare function assertAcpSpawnMatchesResume(input: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-acp-spawn.d.ts","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAEV,WAAW,EACX,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B,yEAAyE;AACzE,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,IAAI,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG,QAAQ,CAAC;AAExD,eAAO,MAAM,4BAA4B,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-acp-spawn.d.ts","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
2
|
import { resolveAcpAuthenticateStrategy, } from './resolve-acp-auth.js';
|
|
3
3
|
export const ENSEMBLE_DEFAULT_ACP_CLI_ENV = 'ENSEMBLE_DEFAULT_ACP_CLI';
|
|
4
|
+
const ACP_MODEL_CATALOG_DOC_URL = 'https://github.com/otolab/agents-ensemble/blob/main/docs/config.md#acp-model-tag-と-model-catalog';
|
|
5
|
+
const ACP_MODEL_CATALOG_ADR_URL = 'https://github.com/otolab/agents-ensemble/blob/main/docs/adr/0052-acp-model-injection-by-preset.md';
|
|
6
|
+
const ACP_CURSOR_FAST_ADR_URL = 'https://github.com/otolab/agents-ensemble/blob/main/docs/adr/0054-cursor-acp-runtime-verification.md';
|
|
4
7
|
const BUILTIN_PRESETS = {
|
|
5
8
|
cursor: {
|
|
6
9
|
command: 'agent',
|
|
@@ -99,9 +102,19 @@ export function resolveDefaultAcpSpawn(options = {}) {
|
|
|
99
102
|
export function resolveWorkerAcpSpawn(input) {
|
|
100
103
|
const modelTag = input?.modelTag ?? 'default';
|
|
101
104
|
const spawn = resolveDefaultAcpSpawn(input?.defaultOptions);
|
|
105
|
+
const processEnv = input?.defaultOptions?.env ?? process.env;
|
|
106
|
+
const modelProvider = spawn.preset === 'codex'
|
|
107
|
+
? spawn.env?.MODEL_PROVIDER ?? processEnv.MODEL_PROVIDER
|
|
108
|
+
: undefined;
|
|
109
|
+
const spawnWithProviderFingerprint = spawn.preset === 'codex'
|
|
110
|
+
? {
|
|
111
|
+
...spawn,
|
|
112
|
+
modelProviderDigest: computeCodexModelProviderDigest(modelProvider),
|
|
113
|
+
}
|
|
114
|
+
: spawn;
|
|
102
115
|
const modelKey = input?.defaultOptions?.config?.acp.tags?.[modelTag];
|
|
103
116
|
if (!modelKey) {
|
|
104
|
-
return { ...
|
|
117
|
+
return { ...spawnWithProviderFingerprint, modelTag };
|
|
105
118
|
}
|
|
106
119
|
const entry = input?.defaultOptions?.config?.acp.models?.[modelKey];
|
|
107
120
|
if (!entry) {
|
|
@@ -111,7 +124,7 @@ export function resolveWorkerAcpSpawn(input) {
|
|
|
111
124
|
if (!definition.model) {
|
|
112
125
|
throw new Error(`acp.models.${modelKey}.model is required`);
|
|
113
126
|
}
|
|
114
|
-
return injectAcpModel(
|
|
127
|
+
return injectAcpModel(spawnWithProviderFingerprint, modelTag, definition, processEnv);
|
|
115
128
|
}
|
|
116
129
|
export function resolveWorkerAcpSpawns(input) {
|
|
117
130
|
const result = new Map();
|
|
@@ -130,46 +143,54 @@ export function acpSpawnFingerprint(spawn) {
|
|
|
130
143
|
args: [...spawn.args],
|
|
131
144
|
...(spawn.modelTag !== undefined ? { modelTag: spawn.modelTag } : {}),
|
|
132
145
|
...(spawn.model !== undefined ? { model: spawn.model } : {}),
|
|
146
|
+
...(spawn.reasoning !== undefined ? { reasoning: spawn.reasoning } : {}),
|
|
147
|
+
...(spawn.cursorFast !== undefined ? { cursorFast: spawn.cursorFast } : {}),
|
|
148
|
+
...(spawn.modelProviderDigest !== undefined
|
|
149
|
+
? { modelProviderDigest: spawn.modelProviderDigest }
|
|
150
|
+
: {}),
|
|
133
151
|
...(spawn.env && Object.keys(spawn.env).length > 0
|
|
134
152
|
? { envDigest: computeAcpSpawnEnvDigest(spawn.env) }
|
|
135
153
|
: {}),
|
|
136
154
|
};
|
|
137
155
|
}
|
|
138
|
-
/** Hash a canonical env map
|
|
156
|
+
/** Hash a canonical env map for persisted diagnostics without exposing values. */
|
|
139
157
|
export function computeAcpSpawnEnvDigest(env) {
|
|
140
158
|
const canonicalEnv = Object.fromEntries(Object.keys(env)
|
|
141
159
|
.sort()
|
|
142
160
|
.map((key) => [key, env[key]]));
|
|
143
161
|
return createHash('sha256').update(JSON.stringify(canonicalEnv)).digest('hex');
|
|
144
162
|
}
|
|
163
|
+
function computeCodexModelProviderDigest(modelProvider) {
|
|
164
|
+
return createHash('sha256')
|
|
165
|
+
.update(JSON.stringify({ modelProvider: modelProvider ?? null }))
|
|
166
|
+
.digest('hex');
|
|
167
|
+
}
|
|
145
168
|
export function formatAcpSpawnFingerprint(spawn) {
|
|
146
169
|
const args = spawn.args.length > 0 ? ` ${spawn.args.join(' ')}` : '';
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
170
|
+
const details = [
|
|
171
|
+
...(spawn.modelTag !== undefined ? [`modelTag=${spawn.modelTag}`] : []),
|
|
172
|
+
...(spawn.model !== undefined ? [`model=${spawn.model}`] : []),
|
|
173
|
+
...(spawn.reasoning !== undefined ? [`reasoning=${spawn.reasoning}`] : []),
|
|
174
|
+
...(spawn.cursorFast !== undefined ? [`cursorFast=${spawn.cursorFast}`] : []),
|
|
175
|
+
];
|
|
176
|
+
return `${spawn.preset} (${spawn.command}${args}${details.length > 0 ? `, ${details.join(', ')}` : ''})`;
|
|
153
177
|
}
|
|
154
178
|
export function assertAcpSpawnMatchesResume(input) {
|
|
155
179
|
if (!input.expected)
|
|
156
180
|
return;
|
|
157
181
|
const actual = input.actual;
|
|
158
|
-
const
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
(input.expected.model === undefined ||
|
|
164
|
-
input.expected.model === actual.model) &&
|
|
165
|
-
(input.expected.envDigest === undefined ||
|
|
166
|
-
input.expected.envDigest === actual.envDigest);
|
|
167
|
-
if (same)
|
|
182
|
+
const presetMismatch = input.expected.preset !== actual.preset;
|
|
183
|
+
const customSpawnMismatch = input.expected.preset === 'custom' &&
|
|
184
|
+
(input.expected.command !== actual.command ||
|
|
185
|
+
!arraysEqual(input.expected.args, actual.args));
|
|
186
|
+
if (!presetMismatch && !customSpawnMismatch)
|
|
168
187
|
return;
|
|
169
188
|
const label = input.workerName ? `Worker "${input.workerName}"` : 'Worker';
|
|
170
|
-
const
|
|
171
|
-
|
|
172
|
-
|
|
189
|
+
const mismatchDetails = [
|
|
190
|
+
...(presetMismatch ? ['ACP preset differs'] : []),
|
|
191
|
+
...(customSpawnMismatch ? ['custom ACP command or arguments differ'] : []),
|
|
192
|
+
];
|
|
193
|
+
throw new Error(`${label} resume ACP spawn mismatch: saved resume store has ${formatAcpSpawnFingerprint(input.expected)}, current profile resolves to ${formatAcpSpawnFingerprint(actual)}${mismatchDetails.length > 0 ? `; ${mismatchDetails.join('; ')}` : ''}`);
|
|
173
194
|
}
|
|
174
195
|
export function resolvedAcpSpawnToOptions(spawn, base) {
|
|
175
196
|
return {
|
|
@@ -178,6 +199,12 @@ export function resolvedAcpSpawnToOptions(spawn, base) {
|
|
|
178
199
|
args: [...spawn.args],
|
|
179
200
|
authenticate: spawn.authenticate ?? resolveAcpAuthenticateStrategy(spawn),
|
|
180
201
|
...(spawn.sessionMeta ? { sessionMeta: spawn.sessionMeta } : {}),
|
|
202
|
+
...(spawn.clientCapabilitiesMeta
|
|
203
|
+
? { clientCapabilitiesMeta: spawn.clientCapabilitiesMeta }
|
|
204
|
+
: {}),
|
|
205
|
+
...(spawn.sessionConfigOptionOverrides
|
|
206
|
+
? { sessionConfigOptionOverrides: spawn.sessionConfigOptionOverrides }
|
|
207
|
+
: {}),
|
|
181
208
|
...(spawn.env
|
|
182
209
|
? {
|
|
183
210
|
env: {
|
|
@@ -189,11 +216,20 @@ export function resolvedAcpSpawnToOptions(spawn, base) {
|
|
|
189
216
|
};
|
|
190
217
|
}
|
|
191
218
|
function injectAcpModel(spawn, modelTag, definition, processEnv) {
|
|
192
|
-
const { model, reasoning } = definition;
|
|
219
|
+
const { model, reasoning, cursorFast } = definition;
|
|
220
|
+
if (cursorFast !== undefined &&
|
|
221
|
+
spawn.preset !== 'cursor' &&
|
|
222
|
+
spawn.preset !== 'custom') {
|
|
223
|
+
throw new Error(`acp.models entry cursorFast is supported only by the "cursor" ACP preset (worker modelTag "${modelTag}"). See ${ACP_MODEL_CATALOG_DOC_URL} and ${ACP_CURSOR_FAST_ADR_URL}`);
|
|
224
|
+
}
|
|
193
225
|
switch (spawn.preset) {
|
|
194
|
-
case 'cursor':
|
|
195
|
-
|
|
196
|
-
|
|
226
|
+
case 'cursor': {
|
|
227
|
+
const unsupportedOptions = [
|
|
228
|
+
...(reasoning !== undefined ? ['reasoning'] : []),
|
|
229
|
+
...(cursorFast !== undefined ? ['cursorFast'] : []),
|
|
230
|
+
];
|
|
231
|
+
if (unsupportedOptions.length > 0) {
|
|
232
|
+
throw new Error(`Cursor ACP cannot verify that configured ${unsupportedOptions.join(' and ')} reaches the runtime model; the available ACP response only reports session configuration. Refusing to start worker modelTag "${modelTag}". See ${ACP_MODEL_CATALOG_DOC_URL} and ${ACP_CURSOR_FAST_ADR_URL}`);
|
|
197
233
|
}
|
|
198
234
|
return {
|
|
199
235
|
...spawn,
|
|
@@ -201,14 +237,21 @@ function injectAcpModel(spawn, modelTag, definition, processEnv) {
|
|
|
201
237
|
modelTag,
|
|
202
238
|
model,
|
|
203
239
|
};
|
|
240
|
+
}
|
|
204
241
|
case 'claude':
|
|
205
|
-
if (reasoning !== undefined) {
|
|
206
|
-
throw new Error(`ACP preset "claude" does not support configured reasoning injection (worker modelTag "${modelTag}")`);
|
|
207
|
-
}
|
|
208
242
|
return {
|
|
209
243
|
...spawn,
|
|
210
244
|
modelTag,
|
|
211
245
|
model,
|
|
246
|
+
...(reasoning !== undefined
|
|
247
|
+
? { reasoning }
|
|
248
|
+
: {}),
|
|
249
|
+
sessionConfigOptionOverrides: [
|
|
250
|
+
{ id: 'model', value: model },
|
|
251
|
+
...(reasoning !== undefined
|
|
252
|
+
? [{ id: 'effort', value: reasoning }]
|
|
253
|
+
: []),
|
|
254
|
+
],
|
|
212
255
|
sessionMeta: {
|
|
213
256
|
...(spawn.sessionMeta ?? {}),
|
|
214
257
|
claudeCode: {
|
|
@@ -240,11 +283,29 @@ function injectAcpModel(spawn, modelTag, definition, processEnv) {
|
|
|
240
283
|
model,
|
|
241
284
|
...(reasoning !== undefined ? { model_reasoning_effort: reasoning } : {}),
|
|
242
285
|
});
|
|
243
|
-
return {
|
|
286
|
+
return {
|
|
287
|
+
...spawn,
|
|
288
|
+
env,
|
|
289
|
+
modelTag,
|
|
290
|
+
model,
|
|
291
|
+
...(reasoning !== undefined ? { reasoning } : {}),
|
|
292
|
+
};
|
|
244
293
|
}
|
|
245
294
|
case 'pi':
|
|
295
|
+
return {
|
|
296
|
+
...spawn,
|
|
297
|
+
modelTag,
|
|
298
|
+
model,
|
|
299
|
+
...(reasoning !== undefined ? { reasoning } : {}),
|
|
300
|
+
sessionConfigOptionOverrides: [
|
|
301
|
+
{ id: 'model', value: model },
|
|
302
|
+
...(reasoning !== undefined
|
|
303
|
+
? [{ id: 'thought_level', value: reasoning }]
|
|
304
|
+
: []),
|
|
305
|
+
],
|
|
306
|
+
};
|
|
246
307
|
case 'custom':
|
|
247
|
-
throw new Error(`ACP preset "
|
|
308
|
+
throw new Error(`ACP preset "custom" does not support configured model injection (worker modelTag "${modelTag}", model "${model}"). See ${ACP_MODEL_CATALOG_DOC_URL} and ${ACP_MODEL_CATALOG_ADR_URL}${cursorFast !== undefined ? `, ${ACP_CURSOR_FAST_ADR_URL}` : ''}`);
|
|
248
309
|
}
|
|
249
310
|
}
|
|
250
311
|
function arraysEqual(left, right) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-acp-spawn.js","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolve-acp-spawn.js","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,18 @@ export interface FakeAcpServerOptions {
|
|
|
18
18
|
onNewSession?: (params: unknown) => void;
|
|
19
19
|
/** Called when session/load is received. */
|
|
20
20
|
onLoadSession?: (params: unknown) => void;
|
|
21
|
+
/** Config options advertised by session/new and session/load. */
|
|
22
|
+
sessionConfigOptions?: Array<Record<string, unknown>>;
|
|
23
|
+
/** Called when session/set_config_option is received. Return options to override the default update. */
|
|
24
|
+
onSetConfigOption?: (params: {
|
|
25
|
+
sessionId: string;
|
|
26
|
+
configId: string;
|
|
27
|
+
value: string;
|
|
28
|
+
}) => Array<Record<string, unknown>> | void;
|
|
21
29
|
/** Emit session/request_permission before responding to session/prompt. */
|
|
22
30
|
requestPermissionOnPrompt?: boolean;
|
|
31
|
+
/** Let session/prompt finish while its permission request remains pending. */
|
|
32
|
+
permissionRequestDoesNotBlockPrompt?: boolean;
|
|
23
33
|
/** Emit these `session/update` payloads immediately before permission. */
|
|
24
34
|
toolCallUpdatesBeforePermission?: Array<Record<string, unknown>>;
|
|
25
35
|
/** Options to advertise in a fake session/request_permission request. */
|
|
@@ -44,6 +54,7 @@ export declare class FakeAcpServer {
|
|
|
44
54
|
private readonly lineBuffer;
|
|
45
55
|
private sessionCounter;
|
|
46
56
|
private readonly sessions;
|
|
57
|
+
private configOptions;
|
|
47
58
|
private readonly pendingCancels;
|
|
48
59
|
private permissionRequestCounter;
|
|
49
60
|
private running;
|