@agents-ensemble/core 0.16.0 → 0.17.1
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-client.d.ts +2 -0
- package/dist/acp/acp-client.d.ts.map +1 -1
- package/dist/acp/acp-client.js +2 -0
- package/dist/acp/acp-client.js.map +1 -1
- package/dist/acp/resolve-acp-spawn.d.ts +12 -1
- package/dist/acp/resolve-acp-spawn.d.ts.map +1 -1
- package/dist/acp/resolve-acp-spawn.js +76 -4
- package/dist/acp/resolve-acp-spawn.js.map +1 -1
- package/dist/acp/testing/fake-acp-server.d.ts +6 -0
- package/dist/acp/testing/fake-acp-server.d.ts.map +1 -1
- package/dist/acp/testing/fake-acp-server.js +4 -1
- package/dist/acp/testing/fake-acp-server.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +1 -1
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +79 -23
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/parse-config.d.ts.map +1 -1
- package/dist/config/parse-config.js +39 -1
- package/dist/config/parse-config.js.map +1 -1
- package/dist/config/types.d.ts +7 -1
- package/dist/config/types.d.ts.map +1 -1
- package/dist/ensemble-paths.d.ts +7 -0
- package/dist/ensemble-paths.d.ts.map +1 -1
- package/dist/ensemble-paths.js +27 -1
- package/dist/ensemble-paths.js.map +1 -1
- package/dist/operator-runtime.d.ts +1 -1
- package/dist/operator-runtime.d.ts.map +1 -1
- package/dist/operator-runtime.js +1 -1
- package/dist/operator-runtime.js.map +1 -1
- package/dist/profile/types.d.ts +7 -1
- package/dist/profile/types.d.ts.map +1 -1
- package/dist/profile/types.js +34 -13
- package/dist/profile/types.js.map +1 -1
- package/dist/profiles/implementer-and-reviewer-v2/profile.yaml +2 -0
- package/dist/session/index.d.ts +2 -2
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js +1 -1
- package/dist/session/index.js.map +1 -1
- package/dist/session/open-questions-store.d.ts +3 -0
- package/dist/session/open-questions-store.d.ts.map +1 -1
- package/dist/session/open-questions-store.js +8 -1
- package/dist/session/open-questions-store.js.map +1 -1
- package/dist/session/session-resume-store.d.ts +30 -1
- package/dist/session/session-resume-store.d.ts.map +1 -1
- package/dist/session/session-resume-store.js +162 -22
- package/dist/session/session-resume-store.js.map +1 -1
- package/dist/session/session-state-store.d.ts +4 -1
- package/dist/session/session-state-store.d.ts.map +1 -1
- package/dist/session/session-state-store.js +18 -4
- package/dist/session/session-state-store.js.map +1 -1
- package/package.json +2 -2
package/dist/acp/acp-client.d.ts
CHANGED
|
@@ -10,6 +10,8 @@ export interface AcpClientOptions {
|
|
|
10
10
|
clientVersion?: string;
|
|
11
11
|
/** preset 解決結果。未指定時は Cursor 互換の `cursor_login`。 */
|
|
12
12
|
authenticate?: AcpAuthenticateStrategy;
|
|
13
|
+
/** Preset-specific metadata passed to session/new and session/load. */
|
|
14
|
+
sessionMeta?: Record<string, unknown>;
|
|
13
15
|
/** Set when backed by a child process (for cleanup). */
|
|
14
16
|
childProcess?: ChildProcess;
|
|
15
17
|
/** 子プロセス stderr capture の drain（close 時に呼ぶ）。 */
|
|
@@ -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,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;IAc3B,YAAY,CAAC,QAAQ,SAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,MAAM,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
|
@@ -57,6 +57,7 @@ export class AcpClient {
|
|
|
57
57
|
const result = (await this.peer.request('session/new', {
|
|
58
58
|
cwd,
|
|
59
59
|
mcpServers,
|
|
60
|
+
...(this.options.sessionMeta ? { _meta: this.options.sessionMeta } : {}),
|
|
60
61
|
}));
|
|
61
62
|
return result.sessionId;
|
|
62
63
|
}
|
|
@@ -65,6 +66,7 @@ export class AcpClient {
|
|
|
65
66
|
sessionId,
|
|
66
67
|
cwd,
|
|
67
68
|
mcpServers,
|
|
69
|
+
...(this.options.sessionMeta ? { _meta: this.options.sessionMeta } : {}),
|
|
68
70
|
});
|
|
69
71
|
}
|
|
70
72
|
/** 進行中の `session/prompt` を中止する（ACP `session/cancel` notification）。 */
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"acp-client.js","sourceRoot":"","sources":["../../src/acp/acp-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SpawnAcpProcessOptions } from './acp-process.js';
|
|
2
2
|
import { type AcpAuthenticateStrategy } from './resolve-acp-auth.js';
|
|
3
|
-
import type { EnsembleConfig } from '../config/types.js';
|
|
3
|
+
import type { AcpModelTag, EnsembleConfig } from '../config/types.js';
|
|
4
4
|
/** Built-in ACP preset id（Phase 1）。拡張時は adapter / capability を別途追加可能。 */
|
|
5
5
|
export type BuiltinAcpPresetId = 'cursor' | 'claude' | 'codex' | 'pi';
|
|
6
6
|
export type AcpPresetId = BuiltinAcpPresetId | 'custom';
|
|
@@ -12,6 +12,11 @@ export interface ResolvedAcpSpawn {
|
|
|
12
12
|
args: string[];
|
|
13
13
|
env?: Record<string, string>;
|
|
14
14
|
authenticate?: AcpAuthenticateStrategy;
|
|
15
|
+
/** Effective profile tier and environment-specific model ID. */
|
|
16
|
+
modelTag?: AcpModelTag;
|
|
17
|
+
model?: string;
|
|
18
|
+
/** Preset-specific session metadata, currently used by Claude ACP. */
|
|
19
|
+
sessionMeta?: Record<string, unknown>;
|
|
15
20
|
}
|
|
16
21
|
/** resume 検証用。SessionResumeStore に保存する最小フィンガープリント。 */
|
|
17
22
|
export interface AcpSpawnFingerprint {
|
|
@@ -20,6 +25,10 @@ export interface AcpSpawnFingerprint {
|
|
|
20
25
|
args: string[];
|
|
21
26
|
/** spawn env の canonical SHA-256。値そのものは保存しない。 */
|
|
22
27
|
envDigest?: string;
|
|
28
|
+
/** Worker tier used to resolve this process. */
|
|
29
|
+
modelTag?: AcpModelTag;
|
|
30
|
+
/** Resolved ACP model ID (model IDs are not credentials). */
|
|
31
|
+
model?: string;
|
|
23
32
|
}
|
|
24
33
|
export interface DefaultAcpResolutionOptions {
|
|
25
34
|
/** CLI `--default-acp-cli` */
|
|
@@ -43,10 +52,12 @@ export declare function mergeAcpSpawnEnv(preset: AcpPresetId, configEnv?: Record
|
|
|
43
52
|
export declare function resolveDefaultAcpSpawn(options?: DefaultAcpResolutionOptions): ResolvedAcpSpawn;
|
|
44
53
|
export declare function resolveWorkerAcpSpawn(input?: {
|
|
45
54
|
defaultOptions?: DefaultAcpResolutionOptions;
|
|
55
|
+
modelTag?: AcpModelTag;
|
|
46
56
|
}): ResolvedAcpSpawn;
|
|
47
57
|
export declare function resolveWorkerAcpSpawns(input: {
|
|
48
58
|
workers: Array<{
|
|
49
59
|
name: string;
|
|
60
|
+
modelTag?: AcpModelTag;
|
|
50
61
|
}>;
|
|
51
62
|
defaultOptions?: DefaultAcpResolutionOptions;
|
|
52
63
|
}): Map<string, ResolvedAcpSpawn>;
|
|
@@ -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,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-acp-spawn.d.ts","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,13 +97,25 @@ export function resolveDefaultAcpSpawn(options = {}) {
|
|
|
97
97
|
return withConfigAcpEnv(resolveBuiltinAcpPreset('cursor'), configEnv);
|
|
98
98
|
}
|
|
99
99
|
export function resolveWorkerAcpSpawn(input) {
|
|
100
|
-
|
|
100
|
+
const modelTag = input?.modelTag ?? 'default';
|
|
101
|
+
const spawn = resolveDefaultAcpSpawn(input?.defaultOptions);
|
|
102
|
+
const modelKey = input?.defaultOptions?.config?.acp.tags?.[modelTag];
|
|
103
|
+
if (!modelKey) {
|
|
104
|
+
return { ...spawn, modelTag };
|
|
105
|
+
}
|
|
106
|
+
const model = input?.defaultOptions?.config?.acp.models?.[modelKey];
|
|
107
|
+
if (!model) {
|
|
108
|
+
throw new Error(`ACP model tag "${modelTag}" references undefined acp.models key "${modelKey}"`);
|
|
109
|
+
}
|
|
110
|
+
return injectAcpModel(spawn, modelTag, model, input?.defaultOptions?.env ?? process.env);
|
|
101
111
|
}
|
|
102
112
|
export function resolveWorkerAcpSpawns(input) {
|
|
103
|
-
const spawn = resolveDefaultAcpSpawn(input.defaultOptions);
|
|
104
113
|
const result = new Map();
|
|
105
114
|
for (const worker of input.workers) {
|
|
106
|
-
result.set(worker.name,
|
|
115
|
+
result.set(worker.name, resolveWorkerAcpSpawn({
|
|
116
|
+
defaultOptions: input.defaultOptions,
|
|
117
|
+
modelTag: worker.modelTag,
|
|
118
|
+
}));
|
|
107
119
|
}
|
|
108
120
|
return result;
|
|
109
121
|
}
|
|
@@ -112,6 +124,8 @@ export function acpSpawnFingerprint(spawn) {
|
|
|
112
124
|
preset: spawn.preset,
|
|
113
125
|
command: spawn.command,
|
|
114
126
|
args: [...spawn.args],
|
|
127
|
+
...(spawn.modelTag !== undefined ? { modelTag: spawn.modelTag } : {}),
|
|
128
|
+
...(spawn.model !== undefined ? { model: spawn.model } : {}),
|
|
115
129
|
...(spawn.env && Object.keys(spawn.env).length > 0
|
|
116
130
|
? { envDigest: computeAcpSpawnEnvDigest(spawn.env) }
|
|
117
131
|
: {}),
|
|
@@ -126,7 +140,12 @@ export function computeAcpSpawnEnvDigest(env) {
|
|
|
126
140
|
}
|
|
127
141
|
export function formatAcpSpawnFingerprint(spawn) {
|
|
128
142
|
const args = spawn.args.length > 0 ? ` ${spawn.args.join(' ')}` : '';
|
|
129
|
-
|
|
143
|
+
const model = spawn.model
|
|
144
|
+
? `, modelTag=${spawn.modelTag ?? 'unknown'}, model=${spawn.model}`
|
|
145
|
+
: spawn.modelTag
|
|
146
|
+
? `, modelTag=${spawn.modelTag}`
|
|
147
|
+
: '';
|
|
148
|
+
return `${spawn.preset} (${spawn.command}${args}${model})`;
|
|
130
149
|
}
|
|
131
150
|
export function assertAcpSpawnMatchesResume(input) {
|
|
132
151
|
if (!input.expected)
|
|
@@ -135,6 +154,10 @@ export function assertAcpSpawnMatchesResume(input) {
|
|
|
135
154
|
const same = input.expected.preset === actual.preset &&
|
|
136
155
|
input.expected.command === actual.command &&
|
|
137
156
|
arraysEqual(input.expected.args, actual.args) &&
|
|
157
|
+
(input.expected.modelTag === undefined ||
|
|
158
|
+
input.expected.modelTag === actual.modelTag) &&
|
|
159
|
+
(input.expected.model === undefined ||
|
|
160
|
+
input.expected.model === actual.model) &&
|
|
138
161
|
(input.expected.envDigest === undefined ||
|
|
139
162
|
input.expected.envDigest === actual.envDigest);
|
|
140
163
|
if (same)
|
|
@@ -148,6 +171,7 @@ export function resolvedAcpSpawnToOptions(spawn, base) {
|
|
|
148
171
|
command: spawn.command,
|
|
149
172
|
args: [...spawn.args],
|
|
150
173
|
authenticate: spawn.authenticate ?? resolveAcpAuthenticateStrategy(spawn),
|
|
174
|
+
...(spawn.sessionMeta ? { sessionMeta: spawn.sessionMeta } : {}),
|
|
151
175
|
...(spawn.env
|
|
152
176
|
? {
|
|
153
177
|
env: {
|
|
@@ -158,6 +182,54 @@ export function resolvedAcpSpawnToOptions(spawn, base) {
|
|
|
158
182
|
: {}),
|
|
159
183
|
};
|
|
160
184
|
}
|
|
185
|
+
function injectAcpModel(spawn, modelTag, model, processEnv) {
|
|
186
|
+
switch (spawn.preset) {
|
|
187
|
+
case 'cursor':
|
|
188
|
+
return {
|
|
189
|
+
...spawn,
|
|
190
|
+
args: ['--model', model, ...spawn.args],
|
|
191
|
+
modelTag,
|
|
192
|
+
model,
|
|
193
|
+
};
|
|
194
|
+
case 'claude':
|
|
195
|
+
return {
|
|
196
|
+
...spawn,
|
|
197
|
+
modelTag,
|
|
198
|
+
model,
|
|
199
|
+
sessionMeta: {
|
|
200
|
+
...(spawn.sessionMeta ?? {}),
|
|
201
|
+
claudeCode: {
|
|
202
|
+
options: {
|
|
203
|
+
settings: { model },
|
|
204
|
+
},
|
|
205
|
+
},
|
|
206
|
+
},
|
|
207
|
+
};
|
|
208
|
+
case 'codex': {
|
|
209
|
+
const env = { ...(spawn.env ?? {}) };
|
|
210
|
+
let sessionConfig = {};
|
|
211
|
+
const existing = env.CODEX_CONFIG ?? processEnv.CODEX_CONFIG;
|
|
212
|
+
if (existing !== undefined) {
|
|
213
|
+
let parsed;
|
|
214
|
+
try {
|
|
215
|
+
parsed = JSON.parse(existing);
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
throw new Error('ACP model injection for codex requires acp.env.CODEX_CONFIG to be a JSON object');
|
|
219
|
+
}
|
|
220
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
221
|
+
throw new Error('ACP model injection for codex requires acp.env.CODEX_CONFIG to be a JSON object');
|
|
222
|
+
}
|
|
223
|
+
sessionConfig = parsed;
|
|
224
|
+
}
|
|
225
|
+
env.CODEX_CONFIG = JSON.stringify({ ...sessionConfig, model });
|
|
226
|
+
return { ...spawn, env, modelTag, model };
|
|
227
|
+
}
|
|
228
|
+
case 'pi':
|
|
229
|
+
case 'custom':
|
|
230
|
+
throw new Error(`ACP preset "${spawn.preset}" does not support configured model injection (worker modelTag "${modelTag}", model "${model}")`);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
161
233
|
function arraysEqual(left, right) {
|
|
162
234
|
return left.length === right.length && left.every((value, index) => value === right[index]);
|
|
163
235
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-acp-spawn.js","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,8BAA8B,GAE/B,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,CAAC,MAAM,4BAA4B,GAAG,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-acp-spawn.js","sourceRoot":"","sources":["../../src/acp/resolve-acp-spawn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,8BAA8B,GAE/B,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,CAAC,MAAM,4BAA4B,GAAG,0BAA0B,CAAC;AAwCvE,MAAM,eAAe,GAAiE;IACpF,MAAM,EAAE;QACN,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,CAAC,KAAK,CAAC;KACd;IACD,MAAM,EAAE;QACN,OAAO,EAAE,kBAAkB;QAC3B,IAAI,EAAE,EAAE;KACT;IACD,KAAK,EAAE;QACL,OAAO,EAAE,WAAW;QACpB,IAAI,EAAE,EAAE;QACR,0EAA0E;QAC1E,GAAG,EAAE,EAAE,kBAAkB,EAAE,OAAO,EAAE;KACrC;IACD,EAAE,EAAE;QACF,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE,EAAE;KACT;CACF,CAAC;AAEF,MAAM,UAAU,uBAAuB;IACrC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,uBAAuB,EAAE,CAAC,QAAQ,CAAC,KAA2B,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA0B;IAChE,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO;QACL,MAAM;QACN,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC;QAC1B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAmB,EACnB,SAAkC;IAElC,MAAM,UAAU,GACd,oBAAoB,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG;QACzD,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE;QACpC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,MAAM,GAAG;QACb,GAAG,UAAU;QACb,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;KACrB,CAAC;IACF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,qBAAqB,CAC5B,KAA2C,EAC3C,SAAkC;IAElC,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACxD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,KAAuB,EACvB,SAAkC;IAElC,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5D,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,UAAuC,EAAE;IAEzC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC;IAClD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,qBAAqB,CAC1B;YACE,OAAO;YACP,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;gBAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE;gBAClC,CAAC,CAAC,EAAE,CAAC;SACR,EACD,SAAS,CACV,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;IAChD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,8BAA8B,SAAS,eAAe,uBAAuB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAC/F,CAAC;QACJ,CAAC;QACD,OAAO,gBAAgB,CAAC,uBAAuB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,4BAA4B,CAAC,EAAE,IAAI,EAAE,CAAC;IAC5D,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,WAAW,4BAA4B,KAAK,SAAS,eAAe,uBAAuB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAC7G,CAAC;QACJ,CAAC;QACD,OAAO,gBAAgB,CAAC,uBAAuB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,CAAC;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,gBAAgB,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,gBAAgB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAGrC;IACC,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAQ,IAAI,SAAS,CAAC;IAC9C,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,0CAA0C,QAAQ,GAAG,CAChF,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CACnB,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAGtC;IACC,MAAM,MAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;IACnD,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,CACR,MAAM,CAAC,IAAI,EACX,qBAAqB,CAAC;YACpB,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAuB;IACzD,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC;YAChD,CAAC,CAAC,EAAE,SAAS,EAAE,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACpD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,wBAAwB,CAAC,GAA2B;IAClE,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;SACb,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CACjC,CAAC;IACF,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAA0B;IAClE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK;QACvB,CAAC,CAAC,cAAc,KAAK,CAAC,QAAQ,IAAI,SAAS,WAAW,KAAK,CAAC,KAAK,EAAE;QACnE,CAAC,CAAC,KAAK,CAAC,QAAQ;YACd,CAAC,CAAC,cAAc,KAAK,CAAC,QAAQ,EAAE;YAChC,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,GAAG,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAI3C;IACC,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO;IAE5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,IAAI,GACR,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QACvC,KAAK,CAAC,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO;QACzC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAC7C,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,KAAK,SAAS;YACpC,KAAK,CAAC,QAAQ,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC;QAC9C,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,KAAK,SAAS;YACjC,KAAK,CAAC,QAAQ,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC;QACxC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,KAAK,SAAS;YACrC,KAAK,CAAC,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,IAAI;QAAE,OAAO;IAEjB,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC3E,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,sDAAsD,yBAAyB,CAAC,KAAK,CAAC,QAAQ,CAAC,iCAAiC,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAC5K,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,KAAuB,EACvB,IAA6B;IAE7B,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;QACrB,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,8BAA8B,CAAC,KAAK,CAAC;QACzE,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,KAAK,CAAC,GAAG;YACX,CAAC,CAAC;gBACE,GAAG,EAAE;oBACH,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;oBAC7B,GAAG,KAAK,CAAC,GAAG;iBACb;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAAuB,EACvB,QAAqB,EACrB,KAAa,EACb,UAA6B;IAE7B,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,OAAO;gBACL,GAAG,KAAK;gBACR,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBACvC,QAAQ;gBACR,KAAK;aACN,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO;gBACL,GAAG,KAAK;gBACR,QAAQ;gBACR,KAAK;gBACL,WAAW,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;oBAC5B,UAAU,EAAE;wBACV,OAAO,EAAE;4BACP,QAAQ,EAAE,EAAE,KAAK,EAAE;yBACpB;qBACF;iBACF;aACF,CAAC;QACJ,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;YACrC,IAAI,aAAa,GAA4B,EAAE,CAAC;YAChD,MAAM,QAAQ,GACZ,GAAG,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,CAAC;YAC9C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,MAAe,CAAC;gBACpB,IAAI,CAAC;oBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChC,CAAC;gBAAC,MAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnE,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;gBACJ,CAAC;gBACD,aAAa,GAAG,MAAiC,CAAC;YACpD,CAAC;YACD,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/D,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC5C,CAAC;QACD,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACX,MAAM,IAAI,KAAK,CACb,eAAe,KAAK,CAAC,MAAM,mEAAmE,QAAQ,aAAa,KAAK,IAAI,CAC7H,CAAC;IACN,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAc,EAAE,KAAe;IAClD,OAAO,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9F,CAAC"}
|
|
@@ -8,10 +8,16 @@ export interface FakeAcpPromptResult {
|
|
|
8
8
|
export interface FakeAcpServerOptions {
|
|
9
9
|
readable: Readable;
|
|
10
10
|
writable: Writable;
|
|
11
|
+
/** Session ids persisted by a previous fake process and accepted by `session/load`. */
|
|
12
|
+
initialSessions?: string[];
|
|
11
13
|
/** Called when authenticate is received. */
|
|
12
14
|
onAuthenticate?: (methodId: string) => void;
|
|
13
15
|
/** Called when initialize is received. */
|
|
14
16
|
onInitialize?: (params: unknown) => void;
|
|
17
|
+
/** Called when session/new is received. */
|
|
18
|
+
onNewSession?: (params: unknown) => void;
|
|
19
|
+
/** Called when session/load is received. */
|
|
20
|
+
onLoadSession?: (params: unknown) => void;
|
|
15
21
|
/** Emit session/request_permission before responding to session/prompt. */
|
|
16
22
|
requestPermissionOnPrompt?: boolean;
|
|
17
23
|
/** Emit these `session/update` payloads immediately before permission. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake-acp-server.d.ts","sourceRoot":"","sources":["../../../src/acp/testing/fake-acp-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,0CAA0C;IAC1C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,2EAA2E;IAC3E,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0EAA0E;IAC1E,+BAA+B,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACjE,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,4DAA4D;IAC5D,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,oFAAoF;IACpF,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;KACnD,KAAK,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC1D;AAED;;;GAGG;AACH,qBAAa,aAAa;IAYZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"fake-acp-server.d.ts","sourceRoot":"","sources":["../../../src/acp/testing/fake-acp-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,uFAAuF;IACvF,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,0CAA0C;IAC1C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,2CAA2C;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,4CAA4C;IAC5C,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1C,2EAA2E;IAC3E,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0EAA0E;IAC1E,+BAA+B,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACjE,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,4DAA4D;IAC5D,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,oFAAoF;IACpF,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;KACnD,KAAK,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC1D;AAED;;;GAGG;AACH,qBAAa,aAAa;IAYZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiC;IAChE,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAGvC;gBAEyB,OAAO,EAAE,oBAAoB;IAI1D,KAAK,IAAI,IAAI;IAOb,IAAI,IAAI,IAAI;IAIZ,OAAO,CAAC,WAAW;YAML,UAAU;IA0HxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,wBAAwB;IAqBhC,OAAO,CAAC,KAAK;CAGd;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,oBAAoB,GAC5B,aAAa,CAIf"}
|
|
@@ -7,13 +7,14 @@ export class FakeAcpServer {
|
|
|
7
7
|
options;
|
|
8
8
|
lineBuffer = new NdJsonLineBuffer();
|
|
9
9
|
sessionCounter = 0;
|
|
10
|
-
sessions
|
|
10
|
+
sessions;
|
|
11
11
|
pendingCancels = new Map();
|
|
12
12
|
permissionRequestCounter = 0;
|
|
13
13
|
running = false;
|
|
14
14
|
pendingPermissionResolvers = new Map();
|
|
15
15
|
constructor(options) {
|
|
16
16
|
this.options = options;
|
|
17
|
+
this.sessions = new Set(options.initialSessions);
|
|
17
18
|
}
|
|
18
19
|
start() {
|
|
19
20
|
if (this.running)
|
|
@@ -69,6 +70,7 @@ export class FakeAcpServer {
|
|
|
69
70
|
break;
|
|
70
71
|
}
|
|
71
72
|
case 'session/new': {
|
|
73
|
+
this.options.onNewSession?.(params);
|
|
72
74
|
this.sessionCounter += 1;
|
|
73
75
|
const sessionId = `fake-session-${this.sessionCounter}`;
|
|
74
76
|
this.sessions.add(sessionId);
|
|
@@ -76,6 +78,7 @@ export class FakeAcpServer {
|
|
|
76
78
|
break;
|
|
77
79
|
}
|
|
78
80
|
case 'session/load': {
|
|
81
|
+
this.options.onLoadSession?.(params);
|
|
79
82
|
const sessionId = params?.sessionId ?? '';
|
|
80
83
|
if (!this.sessions.has(sessionId)) {
|
|
81
84
|
this.respondError(id, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake-acp-server.js","sourceRoot":"","sources":["../../../src/acp/testing/fake-acp-server.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,GAEjB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"fake-acp-server.js","sourceRoot":"","sources":["../../../src/acp/testing/fake-acp-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ export interface RunConductorSessionOptions {
|
|
|
60
60
|
onPostLoopWait?: () => void;
|
|
61
61
|
/** integration 等で Fake ACP に差し替える。未指定時は実 `agent acp`。 */
|
|
62
62
|
connectAcp?: ConnectWorkerAcpFn;
|
|
63
|
-
/**
|
|
63
|
+
/** 全 worker 共通の preset 解決（CLI > env > config > cursor）。 */
|
|
64
64
|
defaultAcp?: DefaultAcpResolutionOptions;
|
|
65
65
|
/**
|
|
66
66
|
* Conductor が worker 向け作業ディレクトリをどう用意するか。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-session.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAG3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAKnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAKnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAW1E,OAAO,KAAK,EAAW,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EAAE,2BAA2B,EAAuB,MAAM,6BAA6B,CAAC;AA4BpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAGV,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAShE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkB5D,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-session.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ import { isOperatorExitCommand } from './operator-exit.js';
|
|
|
39
39
|
import { isOperatorCloseCommand } from './operator-close.js';
|
|
40
40
|
import { isOperatorReconnectCommand } from './operator-reconnect.js';
|
|
41
41
|
import { parseOperatorMessageDelivery } from './operator-command.js';
|
|
42
|
-
import { assertSessionResumeStoreMatches,
|
|
42
|
+
import { assertSessionResumeStoreMatches, requireLocatedSessionResumeStoreForResume, saveSessionResumeStore, SESSION_RESUME_STORE_VERSION, sessionResumeStorePath, } from '../session/session-resume-store.js';
|
|
43
43
|
import { saveSessionStatusLine, sessionStateStorePath, loadSessionStateStore, legacySessionStateStorePath, } from '../session/session-state-store.js';
|
|
44
44
|
import { loadToolCallSnapshotHistory, pruneExpiredToolCallSnapshotHistoryFiles, saveToolCallSnapshotHistory, toolCallSnapshotHistoryPath, } from '../session/tool-call-snapshot-history.js';
|
|
45
45
|
import { loadOpenQuestionsStore, legacyOpenQuestionsStorePath, openQuestionsStorePath, saveOpenQuestionsStore, } from '../session/open-questions-store.js';
|
|
@@ -121,6 +121,8 @@ export async function runConductorSession(options) {
|
|
|
121
121
|
const workerSessions = new Map();
|
|
122
122
|
let githubMonitorCursor;
|
|
123
123
|
let githubMonitor;
|
|
124
|
+
let activeResumeStorePath;
|
|
125
|
+
let activeStoreLocation = 'user-path-hash';
|
|
124
126
|
const pendingGitHubRecoveries = [];
|
|
125
127
|
const conductorCwd = options.conductorCwd ?? process.cwd();
|
|
126
128
|
let cursorBootstrapRunId;
|
|
@@ -130,10 +132,13 @@ export async function runConductorSession(options) {
|
|
|
130
132
|
let resumeToolCallSnapshots = [];
|
|
131
133
|
let toolCallHistoryNeedsRewrite = false;
|
|
132
134
|
if (options.resumeAgentId) {
|
|
133
|
-
const
|
|
135
|
+
const locatedResumeStore = await requireLocatedSessionResumeStoreForResume({
|
|
134
136
|
repoRoot: options.repoRoot,
|
|
135
137
|
conductorAgentId: options.resumeAgentId,
|
|
136
138
|
});
|
|
139
|
+
const loadedResumeStore = locatedResumeStore.resumeStore;
|
|
140
|
+
activeResumeStorePath = locatedResumeStore.path;
|
|
141
|
+
activeStoreLocation = locatedResumeStore.location;
|
|
137
142
|
assertSessionResumeStoreMatches(loadedResumeStore, {
|
|
138
143
|
conductorAgentId: options.resumeAgentId,
|
|
139
144
|
issueUrl: options.issueUrl,
|
|
@@ -164,10 +169,7 @@ export async function runConductorSession(options) {
|
|
|
164
169
|
cursorBootstrapRunId = loadedResumeStore.cursorBootstrapRunId;
|
|
165
170
|
harnessPhase = 'running';
|
|
166
171
|
harnessModifiedAt = resumeStore.modifiedAt;
|
|
167
|
-
await saveSessionResumeStore(
|
|
168
|
-
repoRoot: options.repoRoot,
|
|
169
|
-
conductorAgentId: options.resumeAgentId,
|
|
170
|
-
}), resumeStore);
|
|
172
|
+
await saveSessionResumeStore(activeResumeStorePath, resumeStore);
|
|
171
173
|
const history = await loadToolCallSnapshotHistory({
|
|
172
174
|
repoRoot: options.repoRoot,
|
|
173
175
|
conductorAgentId: options.resumeAgentId,
|
|
@@ -183,14 +185,31 @@ export async function runConductorSession(options) {
|
|
|
183
185
|
const openQuestionsPath = openQuestionsStorePath({
|
|
184
186
|
repoRoot: options.repoRoot,
|
|
185
187
|
conductorAgentId: options.resumeAgentId,
|
|
188
|
+
issueUrl: options.issueUrl,
|
|
189
|
+
location: activeStoreLocation,
|
|
186
190
|
});
|
|
187
191
|
let openQuestionsSnapshot = await loadOpenQuestionsStore(openQuestionsPath);
|
|
188
192
|
if (!openQuestionsSnapshot) {
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
193
|
+
const fallbackPaths = [
|
|
194
|
+
...(activeStoreLocation === 'canonical-slug'
|
|
195
|
+
? [
|
|
196
|
+
openQuestionsStorePath({
|
|
197
|
+
repoRoot: options.repoRoot,
|
|
198
|
+
conductorAgentId: options.resumeAgentId,
|
|
199
|
+
location: 'user-path-hash',
|
|
200
|
+
}),
|
|
201
|
+
]
|
|
202
|
+
: []),
|
|
203
|
+
legacyOpenQuestionsStorePath({
|
|
204
|
+
repoRoot: options.repoRoot,
|
|
205
|
+
conductorAgentId: options.resumeAgentId,
|
|
206
|
+
}),
|
|
207
|
+
];
|
|
208
|
+
for (const fallbackPath of fallbackPaths) {
|
|
209
|
+
openQuestionsSnapshot = await loadOpenQuestionsStore(fallbackPath);
|
|
210
|
+
if (openQuestionsSnapshot)
|
|
211
|
+
break;
|
|
212
|
+
}
|
|
194
213
|
if (openQuestionsSnapshot) {
|
|
195
214
|
try {
|
|
196
215
|
await saveOpenQuestionsStore(openQuestionsPath, openQuestionsSnapshot);
|
|
@@ -360,6 +379,7 @@ export async function runConductorSession(options) {
|
|
|
360
379
|
if (workers.length > 0) {
|
|
361
380
|
validateWorkerAcpPrerequisites(workers.map((worker) => resolveWorkerAcpSpawn({
|
|
362
381
|
defaultOptions: options.defaultAcp,
|
|
382
|
+
modelTag: worker.modelTag,
|
|
363
383
|
})));
|
|
364
384
|
finalizeSessionWorkerSpecs(workers, options.defaultAcp);
|
|
365
385
|
}
|
|
@@ -698,10 +718,23 @@ export async function runConductorSession(options) {
|
|
|
698
718
|
const write = sessionStateWriteQueue.then(() => saveSessionStatusLine(sessionStateStorePath({
|
|
699
719
|
repoRoot: options.repoRoot,
|
|
700
720
|
conductorAgentId: conductorAgent.agentId,
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
721
|
+
issueUrl: options.issueUrl,
|
|
722
|
+
location: activeStoreLocation,
|
|
723
|
+
}), statusLine, undefined, [
|
|
724
|
+
...(activeStoreLocation === 'canonical-slug'
|
|
725
|
+
? [
|
|
726
|
+
sessionStateStorePath({
|
|
727
|
+
repoRoot: options.repoRoot,
|
|
728
|
+
conductorAgentId: conductorAgent.agentId,
|
|
729
|
+
location: 'user-path-hash',
|
|
730
|
+
}),
|
|
731
|
+
]
|
|
732
|
+
: []),
|
|
733
|
+
legacySessionStateStorePath({
|
|
734
|
+
repoRoot: options.repoRoot,
|
|
735
|
+
conductorAgentId: conductorAgent.agentId,
|
|
736
|
+
}),
|
|
737
|
+
]));
|
|
705
738
|
sessionStateWriteQueue = write.catch(() => { });
|
|
706
739
|
return write;
|
|
707
740
|
},
|
|
@@ -779,6 +812,10 @@ export async function runConductorSession(options) {
|
|
|
779
812
|
? await conductorAgentFactory.resume(options.resumeAgentId, conductorOptions)
|
|
780
813
|
: await conductorAgentFactory.create(conductorOptions);
|
|
781
814
|
const conductorHandle = { conductor: conductorAgent };
|
|
815
|
+
activeResumeStorePath ??= sessionResumeStorePath({
|
|
816
|
+
repoRoot: options.repoRoot,
|
|
817
|
+
conductorAgentId: conductorAgent.agentId,
|
|
818
|
+
});
|
|
782
819
|
// Keep auth/transport reconnects on the same backend factory as the session.
|
|
783
820
|
const sendReconnect = {
|
|
784
821
|
conductorAgentFactory,
|
|
@@ -860,13 +897,12 @@ export async function runConductorSession(options) {
|
|
|
860
897
|
await saveOpenQuestionsStore(openQuestionsStorePath({
|
|
861
898
|
repoRoot: options.repoRoot,
|
|
862
899
|
conductorAgentId: conductorHandle.conductor.agentId,
|
|
900
|
+
issueUrl: options.issueUrl,
|
|
901
|
+
location: activeStoreLocation,
|
|
863
902
|
}), snapshot);
|
|
864
903
|
};
|
|
865
904
|
const persistSessionResumeStore = async (snapshot, lifecycle) => {
|
|
866
|
-
await saveSessionResumeStore(
|
|
867
|
-
repoRoot: options.repoRoot,
|
|
868
|
-
conductorAgentId: conductorHandle.conductor.agentId,
|
|
869
|
-
}), createSessionResumeStore(snapshot, lifecycle));
|
|
905
|
+
await saveSessionResumeStore(activeResumeStorePath, createSessionResumeStore(snapshot, lifecycle));
|
|
870
906
|
};
|
|
871
907
|
flushSessionResumeStore = (lifecycle) => {
|
|
872
908
|
if (terminalResumeStoreFinalFlushQueued && lifecycle === undefined) {
|
|
@@ -1231,14 +1267,33 @@ export async function runConductorSession(options) {
|
|
|
1231
1267
|
listConductorMessages: () => conductorMessages,
|
|
1232
1268
|
observeSession: async () => {
|
|
1233
1269
|
await sessionStateWriteQueue;
|
|
1234
|
-
const
|
|
1270
|
+
const currentStatePath = sessionStateStorePath({
|
|
1235
1271
|
repoRoot: options.repoRoot,
|
|
1236
1272
|
conductorAgentId: conductorAgent.agentId,
|
|
1237
|
-
|
|
1238
|
-
|
|
1273
|
+
issueUrl: options.issueUrl,
|
|
1274
|
+
location: activeStoreLocation,
|
|
1275
|
+
});
|
|
1276
|
+
const fallbackStatePaths = [
|
|
1277
|
+
...(activeStoreLocation === 'canonical-slug'
|
|
1278
|
+
? [
|
|
1279
|
+
sessionStateStorePath({
|
|
1280
|
+
repoRoot: options.repoRoot,
|
|
1281
|
+
conductorAgentId: conductorAgent.agentId,
|
|
1282
|
+
location: 'user-path-hash',
|
|
1283
|
+
}),
|
|
1284
|
+
]
|
|
1285
|
+
: []),
|
|
1286
|
+
legacySessionStateStorePath({
|
|
1239
1287
|
repoRoot: options.repoRoot,
|
|
1240
1288
|
conductorAgentId: conductorAgent.agentId,
|
|
1241
|
-
})
|
|
1289
|
+
}),
|
|
1290
|
+
];
|
|
1291
|
+
let sessionState = await loadSessionStateStore(currentStatePath);
|
|
1292
|
+
for (const fallbackPath of fallbackStatePaths) {
|
|
1293
|
+
if (sessionState)
|
|
1294
|
+
break;
|
|
1295
|
+
sessionState = await loadSessionStateStore(fallbackPath);
|
|
1296
|
+
}
|
|
1242
1297
|
return {
|
|
1243
1298
|
...openQuestions.snapshot(),
|
|
1244
1299
|
...(sessionState ? { sessionState } : {}),
|
|
@@ -1835,6 +1890,7 @@ function finalizeSessionWorkerSpecs(workers, defaultAcp) {
|
|
|
1835
1890
|
for (const worker of workers) {
|
|
1836
1891
|
const resolved = resolveWorkerAcpSpawn({
|
|
1837
1892
|
defaultOptions: defaultAcp,
|
|
1893
|
+
modelTag: worker.modelTag,
|
|
1838
1894
|
});
|
|
1839
1895
|
const finalized = finalizeResolvedAcpSpawn(resolved);
|
|
1840
1896
|
worker.spawn = resolvedAcpSpawnToOptions(finalized, worker.spawn);
|