@post-print/agent-harness 1.1.9 → 2.0.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/README.md +11 -93
- package/dist/agent-definition.d.ts +77 -0
- package/dist/agent-definition.d.ts.map +1 -0
- package/dist/agent-definition.js +46 -0
- package/dist/agent-definition.js.map +1 -0
- package/dist/agent-session.d.ts +17 -0
- package/dist/agent-session.d.ts.map +1 -0
- package/dist/agent-session.js +165 -0
- package/dist/agent-session.js.map +1 -0
- package/dist/agent-worker.d.ts +2 -0
- package/dist/agent-worker.d.ts.map +1 -0
- package/dist/agent-worker.js +167 -0
- package/dist/agent-worker.js.map +1 -0
- package/dist/capture.d.ts +1 -0
- package/dist/capture.d.ts.map +1 -1
- package/dist/capture.js +119 -101
- package/dist/capture.js.map +1 -1
- package/dist/claude-capture.d.ts +0 -1
- package/dist/claude-capture.d.ts.map +1 -1
- package/dist/claude-capture.js +96 -106
- package/dist/claude-capture.js.map +1 -1
- package/dist/claude-run.d.ts +3 -11
- package/dist/claude-run.d.ts.map +1 -1
- package/dist/claude-run.js +178 -166
- package/dist/claude-run.js.map +1 -1
- package/dist/cursor-auth.d.ts +0 -1
- package/dist/cursor-auth.d.ts.map +1 -1
- package/dist/cursor-auth.js +5 -3
- package/dist/cursor-auth.js.map +1 -1
- package/dist/cursor-run.d.ts +6 -34
- package/dist/cursor-run.d.ts.map +1 -1
- package/dist/cursor-run.js +123 -175
- package/dist/cursor-run.js.map +1 -1
- package/dist/index.d.ts +8 -40
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -47
- package/dist/index.js.map +1 -1
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +37 -39
- package/dist/mcp.js.map +1 -1
- package/dist/openai-capture.d.ts.map +1 -1
- package/dist/openai-capture.js +66 -57
- package/dist/openai-capture.js.map +1 -1
- package/dist/openai-run.d.ts +4 -13
- package/dist/openai-run.d.ts.map +1 -1
- package/dist/openai-run.js +168 -159
- package/dist/openai-run.js.map +1 -1
- package/dist/sealed-workspace.d.ts +0 -8
- package/dist/sealed-workspace.d.ts.map +1 -1
- package/dist/sealed-workspace.js +32 -65
- package/dist/sealed-workspace.js.map +1 -1
- package/dist/skills-context.d.ts +0 -24
- package/dist/skills-context.d.ts.map +1 -1
- package/dist/skills-context.js +12 -156
- package/dist/skills-context.js.map +1 -1
- package/dist/types.d.ts +0 -84
- package/dist/types.d.ts.map +1 -1
- package/dist/user-skills.d.ts +6 -6
- package/dist/user-skills.d.ts.map +1 -1
- package/dist/user-skills.js +32 -27
- package/dist/user-skills.js.map +1 -1
- package/dist/working-tree-guard.d.ts.map +1 -1
- package/dist/working-tree-guard.js +3 -1
- package/dist/working-tree-guard.js.map +1 -1
- package/package.json +3 -3
- package/dist/adapters/index.d.ts +0 -28
- package/dist/adapters/index.d.ts.map +0 -1
- package/dist/adapters/index.js +0 -271
- package/dist/adapters/index.js.map +0 -1
- package/dist/classifier.d.ts +0 -15
- package/dist/classifier.d.ts.map +0 -1
- package/dist/classifier.js +0 -102
- package/dist/classifier.js.map +0 -1
- package/dist/context.d.ts +0 -26
- package/dist/context.d.ts.map +0 -1
- package/dist/context.js +0 -227
- package/dist/context.js.map +0 -1
- package/dist/conversation.d.ts +0 -28
- package/dist/conversation.d.ts.map +0 -1
- package/dist/conversation.js +0 -191
- package/dist/conversation.js.map +0 -1
- package/dist/host-registry.d.ts +0 -11
- package/dist/host-registry.d.ts.map +0 -1
- package/dist/host-registry.js +0 -36
- package/dist/host-registry.js.map +0 -1
- package/dist/judge.d.ts +0 -132
- package/dist/judge.d.ts.map +0 -1
- package/dist/judge.js +0 -795
- package/dist/judge.js.map +0 -1
- package/dist/logger.d.ts +0 -11
- package/dist/logger.d.ts.map +0 -1
- package/dist/logger.js +0 -20
- package/dist/logger.js.map +0 -1
- package/dist/main.d.ts +0 -9
- package/dist/main.d.ts.map +0 -1
- package/dist/main.js +0 -7
- package/dist/main.js.map +0 -1
- package/dist/retry.d.ts +0 -14
- package/dist/retry.d.ts.map +0 -1
- package/dist/retry.js +0 -52
- package/dist/retry.js.map +0 -1
- package/dist/user-simulator.d.ts +0 -10
- package/dist/user-simulator.d.ts.map +0 -1
- package/dist/user-simulator.js +0 -47
- package/dist/user-simulator.js.map +0 -1
- package/dist/worktree-leak.d.ts +0 -16
- package/dist/worktree-leak.d.ts.map +0 -1
- package/dist/worktree-leak.js +0 -110
- package/dist/worktree-leak.js.map +0 -1
- package/dist/worktree.d.ts +0 -10
- package/dist/worktree.d.ts.map +0 -1
- package/dist/worktree.js +0 -58
- package/dist/worktree.js.map +0 -1
package/dist/cursor-run.js
CHANGED
|
@@ -59,21 +59,6 @@ import { AgentRunTimeoutError, isUserInputTool, UserInputRequiredError, withRunT
|
|
|
59
59
|
import { cursorSettingSources, withCursorUserHome } from "./user-skills.js";
|
|
60
60
|
/** Default local agent model; override with CURSOR_AGENT_MODEL or options.model. */
|
|
61
61
|
const DEFAULT_CURSOR_MODEL = "auto";
|
|
62
|
-
function judgeModelSelection(override) {
|
|
63
|
-
const id = override?.id ??
|
|
64
|
-
process.env.CURSOR_JUDGE_MODEL ??
|
|
65
|
-
process.env.CURSOR_AGENT_MODEL ??
|
|
66
|
-
DEFAULT_CURSOR_MODEL;
|
|
67
|
-
const params = override?.params ?? judgeModelParamsFromEnv();
|
|
68
|
-
return params ? { id, params } : { id };
|
|
69
|
-
}
|
|
70
|
-
function judgeModelParamsFromEnv() {
|
|
71
|
-
const raw = process.env.CURSOR_JUDGE_TEMPERATURE ?? "0";
|
|
72
|
-
if (!raw.trim()) {
|
|
73
|
-
return undefined;
|
|
74
|
-
}
|
|
75
|
-
return [{ id: "temperature", value: raw.trim() }];
|
|
76
|
-
}
|
|
77
62
|
export const CURSOR_AUTH_MODE_ENV = "CURSOR_AUTH_MODE";
|
|
78
63
|
export const CURSOR_MISSING_KEY_MESSAGE = "CURSOR_API_KEY required for --auth-mode api-key";
|
|
79
64
|
export function resolveCursorAuthMode(raw = process.env[CURSOR_AUTH_MODE_ENV], apiKey, explicit) {
|
|
@@ -180,172 +165,145 @@ export function takeLastCursorRunTrace() {
|
|
|
180
165
|
lastCursorRunTrace = undefined;
|
|
181
166
|
return trace;
|
|
182
167
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
168
|
+
class CursorExecution {
|
|
169
|
+
options;
|
|
170
|
+
agent;
|
|
171
|
+
acc = createTraceAccumulator();
|
|
172
|
+
liveState = createLiveNotifyState();
|
|
173
|
+
timedOut = false;
|
|
174
|
+
constructor(options, agent) {
|
|
175
|
+
this.options = options;
|
|
176
|
+
this.agent = agent;
|
|
189
177
|
}
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
lastCursorRunTrace = withUsage;
|
|
218
|
-
return withUsage;
|
|
219
|
-
};
|
|
220
|
-
const execute = async () => {
|
|
221
|
-
const run = (await agent.send(options.prompt));
|
|
222
|
-
activeCursorRun = run;
|
|
223
|
-
if (timedOut) {
|
|
224
|
-
cancelSdkRun(run);
|
|
225
|
-
activeCursorRun = undefined;
|
|
226
|
-
const timeoutError = new AgentRunTimeoutError(options.timeoutMs ?? 0);
|
|
227
|
-
timeoutError.trace = stashTrace();
|
|
228
|
-
throw timeoutError;
|
|
229
|
-
}
|
|
230
|
-
try {
|
|
231
|
-
for await (const event of run.stream()) {
|
|
232
|
-
accumulateSdkEvent(acc, event);
|
|
233
|
-
emitLiveAgentEvents(acc, liveState, options.onAgentEvent);
|
|
234
|
-
const lastTool = acc.toolCalls.at(-1);
|
|
235
|
-
if (lastTool && isUserInputTool(lastTool.name)) {
|
|
236
|
-
if (failOnUserInput) {
|
|
237
|
-
const userInputError = new UserInputRequiredError(lastTool.name);
|
|
238
|
-
userInputError.trace = stashTrace();
|
|
239
|
-
throw userInputError;
|
|
240
|
-
}
|
|
241
|
-
cancelSdkRun(run);
|
|
242
|
-
return {
|
|
243
|
-
status: "completed",
|
|
244
|
-
trace: stashTrace(),
|
|
245
|
-
rawStatus: "user_input",
|
|
246
|
-
};
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
const result = await run.wait();
|
|
250
|
-
const rawStatus = result.status;
|
|
251
|
-
const status = normalizeSdkRunStatus(rawStatus);
|
|
252
|
-
const sdkError = extractJudgeSdkError(result.error);
|
|
253
|
-
// Prefer wait()/handle cumulative usage over summed stream turns when present.
|
|
254
|
-
const waitUsage = normalizeAgentUsage(result.usage) ?? normalizeAgentUsage(run.usage);
|
|
255
|
-
return {
|
|
256
|
-
status,
|
|
257
|
-
trace: stashTrace(waitUsage),
|
|
258
|
-
rawStatus,
|
|
259
|
-
sdkError,
|
|
260
|
-
usage: waitUsage,
|
|
261
|
-
};
|
|
262
|
-
}
|
|
263
|
-
catch (error) {
|
|
264
|
-
cancelSdkRun(run);
|
|
265
|
-
const partial = stashTrace();
|
|
266
|
-
if (error instanceof AgentRunTimeoutError ||
|
|
267
|
-
error instanceof UserInputRequiredError) {
|
|
268
|
-
error.trace = error.trace ?? partial;
|
|
269
|
-
throw error;
|
|
270
|
-
}
|
|
271
|
-
throw wrapCursorSdkAuthError(error);
|
|
272
|
-
}
|
|
273
|
-
finally {
|
|
274
|
-
if (activeCursorRun === run) {
|
|
275
|
-
activeCursorRun = undefined;
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
};
|
|
279
|
-
if (options.timeoutMs && options.timeoutMs > 0) {
|
|
280
|
-
await options.onDeadlineStart?.();
|
|
281
|
-
try {
|
|
282
|
-
return await withRunTimeout(execute, options.timeoutMs, {
|
|
283
|
-
onTimeout: () => {
|
|
284
|
-
timedOut = true;
|
|
285
|
-
cancelSdkRun(activeCursorRun);
|
|
286
|
-
},
|
|
287
|
-
});
|
|
288
|
-
}
|
|
289
|
-
catch (error) {
|
|
290
|
-
if (error instanceof AgentRunTimeoutError) {
|
|
291
|
-
error.trace = error.trace ?? takeLastCursorRunTrace();
|
|
292
|
-
}
|
|
293
|
-
throw error;
|
|
294
|
-
}
|
|
295
|
-
}
|
|
296
|
-
return execute();
|
|
297
|
-
}
|
|
298
|
-
catch (e_1) {
|
|
299
|
-
env_1.error = e_1;
|
|
300
|
-
env_1.hasError = true;
|
|
178
|
+
stashTrace(usageOverride) {
|
|
179
|
+
const trace = finalizeTraceAccumulator(this.acc);
|
|
180
|
+
const usage = usageOverride ?? normalizeAgentUsage(this.acc.usage) ?? trace.usage;
|
|
181
|
+
const withUsage = usage ? { ...trace, usage } : trace;
|
|
182
|
+
lastCursorRunTrace = withUsage;
|
|
183
|
+
return withUsage;
|
|
184
|
+
}
|
|
185
|
+
checkDeadline(run) {
|
|
186
|
+
if (!this.timedOut)
|
|
187
|
+
return;
|
|
188
|
+
cancelSdkRun(run);
|
|
189
|
+
activeCursorRun = undefined;
|
|
190
|
+
const error = new AgentRunTimeoutError(this.options.timeoutMs ?? 0);
|
|
191
|
+
error.trace = this.stashTrace();
|
|
192
|
+
throw error;
|
|
193
|
+
}
|
|
194
|
+
async readStream(run) {
|
|
195
|
+
for await (const event of run.stream()) {
|
|
196
|
+
accumulateSdkEvent(this.acc, event);
|
|
197
|
+
emitLiveAgentEvents(this.acc, this.liveState, this.options.onAgentEvent);
|
|
198
|
+
const lastTool = this.acc.toolCalls.at(-1);
|
|
199
|
+
if (!lastTool || !isUserInputTool(lastTool.name))
|
|
200
|
+
continue;
|
|
201
|
+
if (this.options.failOnUserInput !== false) {
|
|
202
|
+
const error = new UserInputRequiredError(lastTool.name);
|
|
203
|
+
error.trace = this.stashTrace();
|
|
204
|
+
throw error;
|
|
301
205
|
}
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
206
|
+
cancelSdkRun(run);
|
|
207
|
+
return { status: "completed", trace: this.stashTrace(), rawStatus: "user_input" };
|
|
208
|
+
}
|
|
209
|
+
return undefined;
|
|
210
|
+
}
|
|
211
|
+
async finish(run) {
|
|
212
|
+
const early = await this.readStream(run);
|
|
213
|
+
if (early)
|
|
214
|
+
return early;
|
|
215
|
+
const result = await run.wait();
|
|
216
|
+
const usage = normalizeAgentUsage(result.usage) ?? normalizeAgentUsage(run.usage);
|
|
217
|
+
return {
|
|
218
|
+
status: normalizeSdkRunStatus(result.status),
|
|
219
|
+
trace: this.stashTrace(usage),
|
|
220
|
+
rawStatus: result.status,
|
|
221
|
+
sdkError: extractCursorSdkError(result.error),
|
|
222
|
+
usage,
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
async execute() {
|
|
226
|
+
const run = (await this.agent.send(this.options.prompt));
|
|
227
|
+
activeCursorRun = run;
|
|
228
|
+
this.checkDeadline(run);
|
|
229
|
+
try {
|
|
230
|
+
return await this.finish(run);
|
|
231
|
+
}
|
|
232
|
+
catch (error) {
|
|
233
|
+
cancelSdkRun(run);
|
|
234
|
+
const partial = this.stashTrace();
|
|
235
|
+
if (error instanceof AgentRunTimeoutError || error instanceof UserInputRequiredError) {
|
|
236
|
+
error.trace = error.trace ?? partial;
|
|
237
|
+
throw error;
|
|
306
238
|
}
|
|
307
|
-
|
|
239
|
+
throw wrapCursorSdkAuthError(error);
|
|
240
|
+
}
|
|
241
|
+
finally {
|
|
242
|
+
if (activeCursorRun === run)
|
|
243
|
+
activeCursorRun = undefined;
|
|
244
|
+
}
|
|
308
245
|
}
|
|
309
|
-
|
|
310
|
-
|
|
246
|
+
async run() {
|
|
247
|
+
if (!this.options.timeoutMs || this.options.timeoutMs <= 0)
|
|
248
|
+
return this.execute();
|
|
249
|
+
await this.options.onDeadlineStart?.();
|
|
250
|
+
try {
|
|
251
|
+
return await withRunTimeout(() => this.execute(), this.options.timeoutMs, {
|
|
252
|
+
onTimeout: () => {
|
|
253
|
+
this.timedOut = true;
|
|
254
|
+
cancelSdkRun(activeCursorRun);
|
|
255
|
+
},
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
catch (error) {
|
|
259
|
+
if (error instanceof AgentRunTimeoutError)
|
|
260
|
+
error.trace = error.trace ?? takeLastCursorRunTrace();
|
|
261
|
+
throw error;
|
|
262
|
+
}
|
|
311
263
|
}
|
|
312
264
|
}
|
|
313
|
-
/**
|
|
314
|
-
export async function
|
|
265
|
+
/** Shared Cursor SDK path with one owner for stream, deadline, and cancellation. */
|
|
266
|
+
export async function runCursorAgent(options) {
|
|
315
267
|
const authMode = resolveCursorAuthMode(undefined, options.apiKey, options.authMode);
|
|
316
268
|
const apiKey = options.apiKey ?? process.env.CURSOR_API_KEY;
|
|
317
|
-
if (authMode === "api-key" && !apiKey?.trim())
|
|
269
|
+
if (authMode === "api-key" && !apiKey?.trim())
|
|
318
270
|
throw new Error(CURSOR_MISSING_KEY_MESSAGE);
|
|
319
|
-
}
|
|
320
271
|
const sdkModule = await import("@cursor/sdk");
|
|
321
|
-
|
|
272
|
+
const modelId = options.model?.id ?? process.env.CURSOR_AGENT_MODEL ?? DEFAULT_CURSOR_MODEL;
|
|
273
|
+
const mcpServers = resolveMcpServers(options.mcpServers, { cwd: options.cwd });
|
|
274
|
+
const execute = async () => {
|
|
275
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
276
|
+
try {
|
|
277
|
+
const agent = __addDisposableResource(env_1, await sdkModule.Agent.create({
|
|
278
|
+
model: { id: modelId },
|
|
279
|
+
local: {
|
|
280
|
+
cwd: options.cwd,
|
|
281
|
+
settingSources: cursorSettingSources(options.includeGlobalSkills === true),
|
|
282
|
+
},
|
|
283
|
+
...(mcpServers ? { mcpServers } : {}),
|
|
284
|
+
...(authMode === "api-key" && apiKey ? { apiKey } : {}),
|
|
285
|
+
}), true);
|
|
286
|
+
return await new CursorExecution(options, agent).run();
|
|
287
|
+
}
|
|
288
|
+
catch (e_1) {
|
|
289
|
+
env_1.error = e_1;
|
|
290
|
+
env_1.hasError = true;
|
|
291
|
+
}
|
|
292
|
+
finally {
|
|
293
|
+
const result_1 = __disposeResources(env_1);
|
|
294
|
+
if (result_1)
|
|
295
|
+
await result_1;
|
|
296
|
+
}
|
|
297
|
+
};
|
|
322
298
|
try {
|
|
323
|
-
|
|
324
|
-
...(authMode === "api-key" && apiKey ? { apiKey } : {}),
|
|
325
|
-
model: judgeModelSelection(options.model),
|
|
326
|
-
name: "agent-spec-judge",
|
|
327
|
-
local: { cwd: options.cwd, settingSources: ["project"] },
|
|
328
|
-
})));
|
|
299
|
+
return await withCursorAuthEnv(authMode, () => withCursorUserHome(options.includeGlobalSkills === true, () => withProcessWorkingDirectory(options.cwd, execute)));
|
|
329
300
|
}
|
|
330
301
|
catch (error) {
|
|
331
302
|
throw wrapCursorSdkAuthError(error);
|
|
332
303
|
}
|
|
333
|
-
const text = result.result?.trim() ?? "";
|
|
334
|
-
if (text)
|
|
335
|
-
options.onText?.(text);
|
|
336
|
-
const rawStatus = result.status;
|
|
337
|
-
const status = rawStatus === "finished" ? "completed" : rawStatus;
|
|
338
|
-
const sdkError = extractJudgeSdkError(result.error);
|
|
339
|
-
const usage = normalizeAgentUsage(result.usage);
|
|
340
|
-
return {
|
|
341
|
-
status: normalizeSdkRunStatus(status),
|
|
342
|
-
text,
|
|
343
|
-
rawStatus,
|
|
344
|
-
sdkError,
|
|
345
|
-
usage,
|
|
346
|
-
};
|
|
347
304
|
}
|
|
348
|
-
|
|
305
|
+
/** Classifier-only judge path — one-shot Agent.prompt, JSON reply, temperature 0 when supported. */
|
|
306
|
+
function extractCursorSdkError(error) {
|
|
349
307
|
if (!error || typeof error !== "object") {
|
|
350
308
|
return undefined;
|
|
351
309
|
}
|
|
@@ -358,16 +316,6 @@ function extractJudgeSdkError(error) {
|
|
|
358
316
|
return { message, code };
|
|
359
317
|
}
|
|
360
318
|
/** Assistant prose from a Cursor SDK message stream (last assistant block wins for short replies). */
|
|
361
|
-
export function assistantTextFromSdkMessages(messages) {
|
|
362
|
-
const chunks = [];
|
|
363
|
-
for (const event of messages) {
|
|
364
|
-
const text = textBlocksFromSdkMessage(event);
|
|
365
|
-
if (text.length > 0 && (event.type === "assistant" || event.message?.role === "assistant")) {
|
|
366
|
-
chunks.push(text);
|
|
367
|
-
}
|
|
368
|
-
}
|
|
369
|
-
return chunks.join("\n").trim();
|
|
370
|
-
}
|
|
371
319
|
export function textBlocksFromSdkMessage(event) {
|
|
372
320
|
const parts = [];
|
|
373
321
|
if (event.message?.content) {
|
package/dist/cursor-run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-run.js","sourceRoot":"","sources":["../src/cursor-run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cursor-run.js","sourceRoot":"","sources":["../src/cursor-run.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,41 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export {
|
|
4
|
-
export {
|
|
5
|
-
export
|
|
6
|
-
export {
|
|
7
|
-
export {
|
|
8
|
-
export {
|
|
9
|
-
export { buildClaudeEnv, buildClaudeMcpConfigJson, CLAUDE_AUTH_MODE_ENV, type ClaudeAuthMode, type ClaudeRunOptions, type ClaudeRunResult, cancelActiveClaudeRun, formatClaudeRunFailure, parseClaudeAuthMode, resolveClaudeAuthMode, resolveClaudeBin, runClaudeAgent, runClaudeClassifier, takeLastClaudeRunTrace, withMcpAllowedTools, } from "./claude-run.js";
|
|
10
|
-
export { type LoadContextOptions, loadContext, parseSkeletonAlwaysInclude, summarizeSkeletonConfig, } from "./context.js";
|
|
11
|
-
export { composeFollowUpPrompt, extractUserQuestions, mergeConversationTraces, type RunConversationOptions, runConversation, type UserQuestion, type UserSimulator, } from "./conversation.js";
|
|
12
|
-
export { CURSOR_SDK_AUTH_REL, CURSOR_SDK_AUTH_TOO_OLD, CURSOR_SDK_LOGIN_HINT, type CursorSdkAuthClient, type CursorSdkAuthStatus, type CursorSdkLoginPublicResult, cursorSdkAuthFilePath, hasCursorSdkAuthFile, isInvalidCursorUserApiKey, loginCursorSdk, readCursorSdkAuthStatus, wrapCursorSdkAuthError, } from "./cursor-auth.js";
|
|
13
|
-
export { assistantTextFromSdkMessages, CURSOR_AUTH_MODE_ENV, CURSOR_MISSING_KEY_MESSAGE, type CursorAuthMode, type CursorRunOptions, type CursorRunResult, cancelActiveCursorRun, formatCursorRunFailure, type JudgeClassifierOptions, type JudgeClassifierResult, type JudgeSdkError, resolveCursorAuthMode, runCursorAgent, runJudgeClassifier, takeLastCursorRunTrace, textBlocksFromSdkMessage, withCursorAuthEnv, } from "./cursor-run.js";
|
|
14
|
-
export { clearRegisteredHostAdapters, getRegisteredAdapter, isKnownAgentHost, knownAgentHosts, listRegisteredHosts, registerHostAdapter, unregisterHostAdapter, } from "./host-registry.js";
|
|
15
|
-
export { buildCompareJudgePrompt, buildMultiArmCompareJudgePrompt, type CompareJudgeArm, type CompareJudgeInput, type CompareJudgePair, formatTraceForJudge, type JudgeCriterion, type JudgeProgressEvent, type JudgeTraceOptions, type JudgeTraceResult, type JudgeVerdict, judgeCompareTraces, judgeTrace, type ParsedJudgeJson, parseJudgeJsonResponse, parseJudgeLegacyResponse, parseJudgeResponse, skillInvokeJudgeCriteria, } from "./judge.js";
|
|
16
|
-
export { createLiveNotifyState, drainLiveAgentEvents, emitLiveAgentEvents, type LiveNotifyState, } from "./live-agent-event.js";
|
|
17
|
-
export { type Logger, type LogLevel, logger } from "./logger.js";
|
|
18
|
-
export { getHealthStatus, HEALTH_CHECK_PATH, type HealthStatus, } from "./main.js";
|
|
19
|
-
export { expandEnvPlaceholders, mergeMcpServers, resolveMcpServers, } from "./mcp.js";
|
|
20
|
-
export { buildOpenaiEnv, buildOpenaiExecArgs, buildOpenaiMcpConfigArgs, buildOpenaiMcpOverride, cancelActiveOpenaiRun, formatOpenaiRunFailure, OPENAI_AUTH_MODE_ENV, OPENAI_MISSING_KEY_MESSAGE, type OpenaiAuthMode, type OpenaiRunOptions, type OpenaiRunResult, resolveOpenaiAuthMode, resolveOpenaiBin, runOpenaiAgent, runOpenaiClassifier, takeLastOpenaiRunTrace, } from "./openai-run.js";
|
|
21
|
-
export { isTransientInfraError, resolveRetryMaxAttempts, withRetry, } from "./retry.js";
|
|
22
|
-
export { buildRoutingContract } from "./routing-contract.js";
|
|
23
|
-
export { AgentRunTimeoutError, getPartialTrace, isUserInputTool, type PartialTraceCarrier, type RunTimeoutOptions, traceHasUserInputTool, UserInputRequiredError, withRunTimeout, } from "./run-guards.js";
|
|
24
|
-
export { createReadOnlyWorkspaceSnapshot, createSealedWorkspace, defaultSealedOverlayPaths, isCallerHeadWorkspace, type ParsedScenarioWorkspace, parseScenarioWorkspace, type ReadOnlyWorkspaceSnapshot, SEALED_WORKSPACE_DIR_PREFIX, type SealedWorkspace, toolPathsOutsideWorkspace, } from "./sealed-workspace.js";
|
|
25
|
-
export { isRepoRelativeSkillPath, loadSkillContext, normalizeRelSkillPath, normalizeSkillContext, SKILL_ROOTS, type SkillCatalogEntry, skillManifestRelPath, skillNameFromWorkflowPath, skillOverlayRelPath, skillPathsFromSetting, } from "./skills-context.js";
|
|
26
|
-
export { AGENT_HOSTS, type AgentHost, type AgentMessage, type AgentSession, type AgentToolCall, type AgentTrace, type AgentUsage, type BuiltinAgentHost, type ContextMode, type ContextProfile, type HostAdapter, isAgentHost, isBuiltinAgentHost, isHostSlug, type JudgeWorkspaceContext, type LiveAgentEvent, type LoadedContext, type McpServerConfig, type RoutingContract, type RunAgentOptions, type RunStatus, type SkillContextMode, type SkillContextOptions, type SkillContextSetting, } from "./types.js";
|
|
27
|
-
export { buildScenarioUsageBreakdown, type ScenarioUsageBreakdown, sumUsageParts, } from "./usage-breakdown.js";
|
|
28
|
-
export { createJudgeUserSimulator, type JudgeUserSimulatorOptions, } from "./user-simulator.js";
|
|
29
|
-
export { CURSOR_USER_HOME_DIR_PREFIX, CURSOR_USER_SKILL_ROOTS, type CursorSettingSource, type CursorUserHome, claudeSessionFlags, countUserSkillEntries, createCursorUserHome, cursorSettingSources, cursorUserSkillRoots, openaiUserConfigArgs, resolveAllowUserSkills, withCursorUserHome, } from "./user-skills.js";
|
|
30
|
-
export { captureWorkingTreeStatus, filterWorkingTreeLeaks, findWorkingTreeLeak, formatWorkingTreeLeak, isPathUnderRoot, normalizePorcelainStatus, porcelainPathFromStatusLine, resolveHarnessArtifactIgnoreRoots, restoreWorkingTreePaths, } from "./working-tree-guard.js";
|
|
31
|
-
export { cleanupStaleScenarioWorktrees, createScenarioWorktree, SCENARIO_WORKTREE_DIR_PREFIX, type ScenarioWorktree, } from "./worktree.js";
|
|
32
|
-
export { loadUnifiedDiffPaths, parseUnifiedDiffPaths, partitionSeedCollateralLeaks, porcelainPathsFromLines, traceEditsOutsideWorktree, } from "./worktree-leak.js";
|
|
33
|
-
export interface RunAgentInput extends Omit<RunAgentOptions, "context"> {
|
|
34
|
-
context?: RunAgentOptions["context"];
|
|
35
|
-
profile?: ContextProfile;
|
|
36
|
-
/** Injected user agent for conversation turns. Default is a judge-backed user. */
|
|
37
|
-
userSimulator?: UserSimulator;
|
|
38
|
-
}
|
|
39
|
-
/** Run an agent session via the selected host adapter. */
|
|
40
|
-
export declare function runAgent(input: RunAgentInput): Promise<AgentSession>;
|
|
1
|
+
export { AdapterSession, AgentAdapter, AgentAuth, AgentCapabilities, AgentContext, AgentDefinition, AgentEvent, AgentOptions, claude, cursor, customAgent, defineAgent, openai, } from "./agent-definition.js";
|
|
2
|
+
export { createAgentSession, HarnessSession } from "./agent-session.js";
|
|
3
|
+
export { resolvedTotalTokens } from "./capture.js";
|
|
4
|
+
export { loginCursorSdk } from "./cursor-auth.js";
|
|
5
|
+
export { resolveOpenaiBin } from "./openai-run.js";
|
|
6
|
+
export { createSealedWorkspace, SealedWorkspace, toolPathsOutsideWorkspace, } from "./sealed-workspace.js";
|
|
7
|
+
export { AgentHost, AgentMessage, AgentToolCall, AgentTrace, AgentUsage, ContextMode, ContextProfile, McpServerConfig, SkillContextSetting, } from "./types.js";
|
|
8
|
+
export { buildScenarioUsageBreakdown, ScenarioUsageBreakdown, sumUsageParts, } from "./usage-breakdown.js";
|
|
41
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,EACd,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,UAAU,EACV,YAAY,EACZ,MAAM,EACN,MAAM,EACN,WAAW,EACX,WAAW,EACX,MAAM,GACN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACN,qBAAqB,EACrB,eAAe,EACf,yBAAyB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,SAAS,EACT,YAAY,EACZ,aAAa,EACb,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,eAAe,EACf,mBAAmB,GACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,2BAA2B,EAC3B,sBAAsB,EACtB,aAAa,GACb,MAAM,sBAAsB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,49 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export {
|
|
6
|
-
export {
|
|
7
|
-
export { assistantPrefixBeforeTools, buildTraceFromSdkMessages, captureGitDiff, collapseTraceWhitespace, enrichTrace, extractShellCommands, extractShellCommandsFromToolCalls, extractSkillsInvokedFromText, extractSkillsInvokedFromToolCalls, handsOnTierBeforeTools, inferReviewDepthFromText, inferRoutingFromText, mergeAgentUsage, mergeSkillsInvoked, normalizeAgentUsage, resolvedTotalTokens, routingBlockBeforeTools, } from "./capture.js";
|
|
8
|
-
export { missingClassifierAuth, runClassifier, } from "./classifier.js";
|
|
9
|
-
export { accumulateClaudeEvent, buildTraceFromClaudeEvents, createClaudeTraceAccumulator, finalizeClaudeTraceAccumulator, normalizeClaudeToolArgs, normalizeClaudeUsage, parseClaudeNdjsonLine, } from "./claude-capture.js";
|
|
10
|
-
export { buildClaudeEnv, buildClaudeMcpConfigJson, CLAUDE_AUTH_MODE_ENV, cancelActiveClaudeRun, formatClaudeRunFailure, parseClaudeAuthMode, resolveClaudeAuthMode, resolveClaudeBin, runClaudeAgent, runClaudeClassifier, takeLastClaudeRunTrace, withMcpAllowedTools, } from "./claude-run.js";
|
|
11
|
-
export { loadContext, parseSkeletonAlwaysInclude, summarizeSkeletonConfig, } from "./context.js";
|
|
12
|
-
export { composeFollowUpPrompt, extractUserQuestions, mergeConversationTraces, runConversation, } from "./conversation.js";
|
|
13
|
-
export { CURSOR_SDK_AUTH_REL, CURSOR_SDK_AUTH_TOO_OLD, CURSOR_SDK_LOGIN_HINT, cursorSdkAuthFilePath, hasCursorSdkAuthFile, isInvalidCursorUserApiKey, loginCursorSdk, readCursorSdkAuthStatus, wrapCursorSdkAuthError, } from "./cursor-auth.js";
|
|
14
|
-
export { assistantTextFromSdkMessages, CURSOR_AUTH_MODE_ENV, CURSOR_MISSING_KEY_MESSAGE, cancelActiveCursorRun, formatCursorRunFailure, resolveCursorAuthMode, runCursorAgent, runJudgeClassifier, takeLastCursorRunTrace, textBlocksFromSdkMessage, withCursorAuthEnv, } from "./cursor-run.js";
|
|
15
|
-
export { clearRegisteredHostAdapters, getRegisteredAdapter, isKnownAgentHost, knownAgentHosts, listRegisteredHosts, registerHostAdapter, unregisterHostAdapter, } from "./host-registry.js";
|
|
16
|
-
export { buildCompareJudgePrompt, buildMultiArmCompareJudgePrompt, formatTraceForJudge, judgeCompareTraces, judgeTrace, parseJudgeJsonResponse, parseJudgeLegacyResponse, parseJudgeResponse, skillInvokeJudgeCriteria, } from "./judge.js";
|
|
17
|
-
export { createLiveNotifyState, drainLiveAgentEvents, emitLiveAgentEvents, } from "./live-agent-event.js";
|
|
18
|
-
export { logger } from "./logger.js";
|
|
19
|
-
export { getHealthStatus, HEALTH_CHECK_PATH, } from "./main.js";
|
|
20
|
-
export { expandEnvPlaceholders, mergeMcpServers, resolveMcpServers, } from "./mcp.js";
|
|
21
|
-
export { buildOpenaiEnv, buildOpenaiExecArgs, buildOpenaiMcpConfigArgs, buildOpenaiMcpOverride, cancelActiveOpenaiRun, formatOpenaiRunFailure, OPENAI_AUTH_MODE_ENV, OPENAI_MISSING_KEY_MESSAGE, resolveOpenaiAuthMode, resolveOpenaiBin, runOpenaiAgent, runOpenaiClassifier, takeLastOpenaiRunTrace, } from "./openai-run.js";
|
|
22
|
-
export { isTransientInfraError, resolveRetryMaxAttempts, withRetry, } from "./retry.js";
|
|
23
|
-
export { buildRoutingContract } from "./routing-contract.js";
|
|
24
|
-
export { AgentRunTimeoutError, getPartialTrace, isUserInputTool, traceHasUserInputTool, UserInputRequiredError, withRunTimeout, } from "./run-guards.js";
|
|
25
|
-
export { createReadOnlyWorkspaceSnapshot, createSealedWorkspace, defaultSealedOverlayPaths, isCallerHeadWorkspace, parseScenarioWorkspace, SEALED_WORKSPACE_DIR_PREFIX, toolPathsOutsideWorkspace, } from "./sealed-workspace.js";
|
|
26
|
-
export { isRepoRelativeSkillPath, loadSkillContext, normalizeRelSkillPath, normalizeSkillContext, SKILL_ROOTS, skillManifestRelPath, skillNameFromWorkflowPath, skillOverlayRelPath, skillPathsFromSetting, } from "./skills-context.js";
|
|
27
|
-
export { AGENT_HOSTS, isAgentHost, isBuiltinAgentHost, isHostSlug, } from "./types.js";
|
|
1
|
+
export { claude, cursor, customAgent, defineAgent, openai, } from "./agent-definition.js";
|
|
2
|
+
export { createAgentSession } from "./agent-session.js";
|
|
3
|
+
export { resolvedTotalTokens } from "./capture.js";
|
|
4
|
+
export { loginCursorSdk } from "./cursor-auth.js";
|
|
5
|
+
export { resolveOpenaiBin } from "./openai-run.js";
|
|
6
|
+
export { createSealedWorkspace, toolPathsOutsideWorkspace, } from "./sealed-workspace.js";
|
|
28
7
|
export { buildScenarioUsageBreakdown, sumUsageParts, } from "./usage-breakdown.js";
|
|
29
|
-
export { createJudgeUserSimulator, } from "./user-simulator.js";
|
|
30
|
-
export { CURSOR_USER_HOME_DIR_PREFIX, CURSOR_USER_SKILL_ROOTS, claudeSessionFlags, countUserSkillEntries, createCursorUserHome, cursorSettingSources, cursorUserSkillRoots, openaiUserConfigArgs, resolveAllowUserSkills, withCursorUserHome, } from "./user-skills.js";
|
|
31
|
-
export { captureWorkingTreeStatus, filterWorkingTreeLeaks, findWorkingTreeLeak, formatWorkingTreeLeak, isPathUnderRoot, normalizePorcelainStatus, porcelainPathFromStatusLine, resolveHarnessArtifactIgnoreRoots, restoreWorkingTreePaths, } from "./working-tree-guard.js";
|
|
32
|
-
export { cleanupStaleScenarioWorktrees, createScenarioWorktree, SCENARIO_WORKTREE_DIR_PREFIX, } from "./worktree.js";
|
|
33
|
-
export { loadUnifiedDiffPaths, parseUnifiedDiffPaths, partitionSeedCollateralLeaks, porcelainPathsFromLines, traceEditsOutsideWorktree, } from "./worktree-leak.js";
|
|
34
|
-
/** Run an agent session via the selected host adapter. */
|
|
35
|
-
export async function runAgent(input) {
|
|
36
|
-
const context = input.context ?? (await loadContext({ cwd: input.cwd, profile: input.profile ?? "shared" }));
|
|
37
|
-
const adapter = createAdapter(input.host);
|
|
38
|
-
const runOptions = { ...input, context };
|
|
39
|
-
if (input.failOnUserInput !== false) {
|
|
40
|
-
return adapter.run(runOptions);
|
|
41
|
-
}
|
|
42
|
-
return runConversation({
|
|
43
|
-
initialPrompt: input.prompt,
|
|
44
|
-
maxTurns: input.maxConversationTurns,
|
|
45
|
-
userSimulator: input.userSimulator ?? createJudgeUserSimulator({ cwd: input.cwd, host: input.host }),
|
|
46
|
-
runTurn: (prompt) => adapter.run({ ...runOptions, prompt, failOnUserInput: false }),
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASN,MAAM,EACN,MAAM,EACN,WAAW,EACX,WAAW,EACX,MAAM,GACN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAkB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACN,qBAAqB,EAErB,yBAAyB,GACzB,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EACN,2BAA2B,EAE3B,aAAa,GACb,MAAM,sBAAsB,CAAC"}
|
package/dist/mcp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAEA,wDAAwD;AACxD,MAAM,MAAM,eAAe,GACxB;IACA,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC;CACZ,GACD;IACA,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACtB,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACD,CAAC;AAIL,8EAA8E;AAC9E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAQjG;
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAEA,wDAAwD;AACxD,MAAM,MAAM,eAAe,GACxB;IACA,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC;CACZ,GACD;IACA,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACtB,oFAAoF;IACpF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACD,CAAC;AAIL,8EAA8E;AAC9E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAQjG;AAqDD,qFAAqF;AACrF,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SAAS,EACpD,OAAO,GAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;CAA2B,GACxE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SAAS,CAS7C;AAED,4FAA4F;AAC5F,wBAAgB,eAAe,CAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACzC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,SAAS,CAM7C"}
|
package/dist/mcp.js
CHANGED
|
@@ -20,49 +20,47 @@ function expandRecord(record, env) {
|
|
|
20
20
|
}
|
|
21
21
|
return out;
|
|
22
22
|
}
|
|
23
|
+
function expandAuth(auth, env) {
|
|
24
|
+
if (!auth)
|
|
25
|
+
return undefined;
|
|
26
|
+
return {
|
|
27
|
+
CLIENT_ID: expandEnvPlaceholders(auth.CLIENT_ID, env),
|
|
28
|
+
CLIENT_SECRET: auth.CLIENT_SECRET === undefined ? undefined : expandEnvPlaceholders(auth.CLIENT_SECRET, env),
|
|
29
|
+
scopes: auth.scopes,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
function resolveStdio(config, cwd, env) {
|
|
33
|
+
const serverCwd = config.cwd === undefined ? cwd : isAbsolute(config.cwd) ? config.cwd : join(cwd, config.cwd);
|
|
34
|
+
return {
|
|
35
|
+
type: config.type ?? "stdio",
|
|
36
|
+
command: expandEnvPlaceholders(config.command, env),
|
|
37
|
+
args: config.args?.map((arg) => expandEnvPlaceholders(arg, env)),
|
|
38
|
+
env: expandRecord(config.env, env),
|
|
39
|
+
cwd: serverCwd,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
function resolveServer(config, options) {
|
|
43
|
+
const { name, cwd, env } = options;
|
|
44
|
+
if ("command" in config && config.command)
|
|
45
|
+
return resolveStdio(config, cwd, env);
|
|
46
|
+
if ("url" in config && config.url)
|
|
47
|
+
return {
|
|
48
|
+
type: config.type ?? "http",
|
|
49
|
+
url: expandEnvPlaceholders(config.url, env),
|
|
50
|
+
headers: expandRecord(config.headers, env),
|
|
51
|
+
auth: expandAuth(config.auth, env),
|
|
52
|
+
};
|
|
53
|
+
throw new Error(`Invalid MCP server "${name}": expected stdio command or http/sse url`);
|
|
54
|
+
}
|
|
23
55
|
/** Resolve cwd-relative stdio paths and expand env placeholders for Agent.create. */
|
|
24
56
|
export function resolveMcpServers(servers, options = { cwd: process.cwd() }) {
|
|
25
|
-
if (!servers || Object.keys(servers).length === 0)
|
|
57
|
+
if (!servers || Object.keys(servers).length === 0)
|
|
26
58
|
return undefined;
|
|
27
|
-
}
|
|
28
59
|
const env = options.env ?? process.env;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
? options.cwd
|
|
34
|
-
: isAbsolute(config.cwd)
|
|
35
|
-
? config.cwd
|
|
36
|
-
: join(options.cwd, config.cwd);
|
|
37
|
-
resolved[name] = {
|
|
38
|
-
type: config.type ?? "stdio",
|
|
39
|
-
command: expandEnvPlaceholders(config.command, env),
|
|
40
|
-
args: config.args?.map((arg) => expandEnvPlaceholders(arg, env)),
|
|
41
|
-
env: expandRecord(config.env, env),
|
|
42
|
-
cwd: serverCwd,
|
|
43
|
-
};
|
|
44
|
-
continue;
|
|
45
|
-
}
|
|
46
|
-
if ("url" in config && config.url) {
|
|
47
|
-
resolved[name] = {
|
|
48
|
-
type: config.type ?? "http",
|
|
49
|
-
url: expandEnvPlaceholders(config.url, env),
|
|
50
|
-
headers: expandRecord(config.headers, env),
|
|
51
|
-
auth: config.auth
|
|
52
|
-
? {
|
|
53
|
-
CLIENT_ID: expandEnvPlaceholders(config.auth.CLIENT_ID, env),
|
|
54
|
-
CLIENT_SECRET: config.auth.CLIENT_SECRET === undefined
|
|
55
|
-
? undefined
|
|
56
|
-
: expandEnvPlaceholders(config.auth.CLIENT_SECRET, env),
|
|
57
|
-
scopes: config.auth.scopes,
|
|
58
|
-
}
|
|
59
|
-
: undefined,
|
|
60
|
-
};
|
|
61
|
-
continue;
|
|
62
|
-
}
|
|
63
|
-
throw new Error(`Invalid MCP server "${name}": expected stdio command or http/sse url`);
|
|
64
|
-
}
|
|
65
|
-
return resolved;
|
|
60
|
+
return Object.fromEntries(Object.entries(servers).map(([name, config]) => [
|
|
61
|
+
name,
|
|
62
|
+
resolveServer(config, { name, cwd: options.cwd, env }),
|
|
63
|
+
]));
|
|
66
64
|
}
|
|
67
65
|
/** Shallow-merge suite defaults with scenario overrides (scenario wins per server name). */
|
|
68
66
|
export function mergeMcpServers(defaults, overrides) {
|