@esankhan3/anvil-agent-core 0.1.2 → 0.3.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/__tests__/fetch-pool.integration.test.d.ts +15 -0
- package/dist/__tests__/fetch-pool.integration.test.d.ts.map +1 -0
- package/dist/__tests__/fetch-pool.integration.test.js +109 -0
- package/dist/__tests__/fetch-pool.integration.test.js.map +1 -0
- package/dist/__tests__/fetch-pool.test.d.ts +15 -0
- package/dist/__tests__/fetch-pool.test.d.ts.map +1 -0
- package/dist/__tests__/fetch-pool.test.js +115 -0
- package/dist/__tests__/fetch-pool.test.js.map +1 -0
- package/dist/__tests__/mcp-merged-executor.test.d.ts +2 -0
- package/dist/__tests__/mcp-merged-executor.test.d.ts.map +1 -0
- package/dist/__tests__/mcp-merged-executor.test.js +221 -0
- package/dist/__tests__/mcp-merged-executor.test.js.map +1 -0
- package/dist/__tests__/mcp.test.js +21 -15
- package/dist/__tests__/mcp.test.js.map +1 -1
- package/dist/__tests__/model-catalog.test.d.ts +11 -0
- package/dist/__tests__/model-catalog.test.d.ts.map +1 -0
- package/dist/__tests__/model-catalog.test.js +102 -0
- package/dist/__tests__/model-catalog.test.js.map +1 -0
- package/dist/__tests__/model-tier-resolver.test.d.ts +19 -0
- package/dist/__tests__/model-tier-resolver.test.d.ts.map +1 -0
- package/dist/__tests__/model-tier-resolver.test.js +97 -0
- package/dist/__tests__/model-tier-resolver.test.js.map +1 -0
- package/dist/adk-adapter.d.ts.map +1 -1
- package/dist/adk-adapter.js +11 -0
- package/dist/adk-adapter.js.map +1 -1
- package/dist/adk-anthropic-llm.d.ts.map +1 -1
- package/dist/adk-anthropic-llm.js +23 -10
- package/dist/adk-anthropic-llm.js.map +1 -1
- package/dist/agent/session/__tests__/spawn-telemetry.test.js +39 -4
- package/dist/agent/session/__tests__/spawn-telemetry.test.js.map +1 -1
- package/dist/agent/session/adapter.d.ts +44 -0
- package/dist/agent/session/adapter.d.ts.map +1 -1
- package/dist/agent/session/adapter.js +1 -0
- package/dist/agent/session/adapter.js.map +1 -1
- package/dist/agent/session/default-adapter-factory.d.ts.map +1 -1
- package/dist/agent/session/default-adapter-factory.js +66 -2
- package/dist/agent/session/default-adapter-factory.js.map +1 -1
- package/dist/agent/session/language-model-bridge.d.ts.map +1 -1
- package/dist/agent/session/language-model-bridge.js +59 -2
- package/dist/agent/session/language-model-bridge.js.map +1 -1
- package/dist/agent/session/session.d.ts +16 -0
- package/dist/agent/session/session.d.ts.map +1 -1
- package/dist/agent/session/session.js +86 -2
- package/dist/agent/session/session.js.map +1 -1
- package/dist/agent/session/types.d.ts +12 -0
- package/dist/agent/session/types.d.ts.map +1 -1
- package/dist/agent/session/types.js.map +1 -1
- package/dist/fetch-pool.d.ts +47 -0
- package/dist/fetch-pool.d.ts.map +1 -0
- package/dist/fetch-pool.js +132 -0
- package/dist/fetch-pool.js.map +1 -0
- package/dist/gemini-adapter.d.ts.map +1 -1
- package/dist/gemini-adapter.js +30 -6
- package/dist/gemini-adapter.js.map +1 -1
- package/dist/gemini-cli-adapter.d.ts.map +1 -1
- package/dist/gemini-cli-adapter.js +10 -0
- package/dist/gemini-cli-adapter.js.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -0
- package/dist/index.js.map +1 -1
- package/dist/mcp/client.d.ts +64 -18
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +190 -26
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/index.d.ts +5 -2
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +3 -8
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/merged-executor.d.ts +74 -0
- package/dist/mcp/merged-executor.d.ts.map +1 -0
- package/dist/mcp/merged-executor.js +198 -0
- package/dist/mcp/merged-executor.js.map +1 -0
- package/dist/mcp/pool.d.ts +71 -0
- package/dist/mcp/pool.d.ts.map +1 -0
- package/dist/mcp/pool.js +171 -0
- package/dist/mcp/pool.js.map +1 -0
- package/dist/mcp/tool-merger.d.ts +8 -5
- package/dist/mcp/tool-merger.d.ts.map +1 -1
- package/dist/mcp/tool-merger.js +8 -16
- package/dist/mcp/tool-merger.js.map +1 -1
- package/dist/model-catalog.d.ts +36 -0
- package/dist/model-catalog.d.ts.map +1 -0
- package/dist/model-catalog.js +102 -0
- package/dist/model-catalog.js.map +1 -0
- package/dist/model-tier-resolver.d.ts +61 -0
- package/dist/model-tier-resolver.d.ts.map +1 -0
- package/dist/model-tier-resolver.js +170 -0
- package/dist/model-tier-resolver.js.map +1 -0
- package/dist/ollama-adapter.d.ts.map +1 -1
- package/dist/ollama-adapter.js +33 -8
- package/dist/ollama-adapter.js.map +1 -1
- package/dist/opencode-adapter.d.ts +11 -0
- package/dist/opencode-adapter.d.ts.map +1 -1
- package/dist/opencode-adapter.js +13 -0
- package/dist/opencode-adapter.js.map +1 -1
- package/dist/openrouter-adapter.d.ts +15 -0
- package/dist/openrouter-adapter.d.ts.map +1 -1
- package/dist/openrouter-adapter.js +76 -19
- package/dist/openrouter-adapter.js.map +1 -1
- package/dist/provider-liveness.d.ts +5 -0
- package/dist/provider-liveness.d.ts.map +1 -1
- package/dist/provider-liveness.js +28 -21
- package/dist/provider-liveness.js.map +1 -1
- package/dist/registry.d.ts +1 -0
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +1 -1
- package/dist/registry.js.map +1 -1
- package/dist/router/local-executor.d.ts.map +1 -1
- package/dist/router/local-executor.js +19 -6
- package/dist/router/local-executor.js.map +1 -1
- package/dist/single-shot.d.ts.map +1 -1
- package/dist/single-shot.js +26 -1
- package/dist/single-shot.js.map +1 -1
- package/dist/tools/builtin.d.ts +19 -0
- package/dist/tools/builtin.d.ts.map +1 -1
- package/dist/tools/builtin.js +51 -0
- package/dist/tools/builtin.js.map +1 -1
- package/dist/upstream-error.d.ts.map +1 -1
- package/dist/upstream-error.js +11 -1
- package/dist/upstream-error.js.map +1 -1
- package/package.json +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-telemetry.test.js","sourceRoot":"","sources":["../../../../src/agent/session/__tests__/spawn-telemetry.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,GAEpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAG3E,IAAI,QAA8B,CAAC;AACnC,IAAI,QAA4B,CAAC;AAEjC,KAAK,UAAU,uBAAuB;IACpC,MAAM,WAAW,EAAE,CAAC;IACpB,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACtC,QAAQ,GAAG,IAAI,kBAAkB,CAAC;QAChC,QAAQ,EAAE,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,4BAA4B,EAAE,CAAC;QACvF,cAAc,EAAE,CAAC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC;KACpD,CAAC,CAAC;IACH,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,yBAAyB;IACtC,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,iBAAiB;IACnB,CAAC;IACD,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,KAAK,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn-telemetry.test.js","sourceRoot":"","sources":["../../../../src/agent/session/__tests__/spawn-telemetry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,50 @@ export interface AdapterRequest {
|
|
|
85
85
|
* forwards it to `ModelAdapterConfig.mcpConfigPath` so claude-cli
|
|
86
86
|
* reads it via `--mcp-config <path>`. Not user-facing. */
|
|
87
87
|
claudeMcpConfigPath?: string;
|
|
88
|
+
/** Internal — populated by `AgentProcess` once per session for non-Claude
|
|
89
|
+
* paths. The bridge wraps it into a `MergedToolExecutor` so the adapter's
|
|
90
|
+
* agentic loop can call MCP tools the same way it calls builtins. The
|
|
91
|
+
* pool is session-scoped so resume turns reuse already-connected
|
|
92
|
+
* servers. Not user-facing. */
|
|
93
|
+
mcpPool?: McpClientPoolLike;
|
|
94
|
+
/** Internal — callback fired by `MergedToolExecutor` whenever an MCP
|
|
95
|
+
* tool call starts/ends. Routed up to the agent's `activity` stream so
|
|
96
|
+
* the dashboard shows MCP work in the activity panel. */
|
|
97
|
+
mcpProgress?: (ev: McpActivityEvent) => void;
|
|
98
|
+
/** Wave 5 — memory recall callback. When the spawn site wires this
|
|
99
|
+
* AND `recall_memory` is in `allowedTools`, the executor advertises
|
|
100
|
+
* the tool to the agent. Caller (the dashboard) composes a
|
|
101
|
+
* project-scoped `hybridSearch` and returns the JSON the model sees.
|
|
102
|
+
* Bounded by a per-spawn budget enforced inside BuiltinToolExecutor. */
|
|
103
|
+
recallMemory?: (query: string, opts: {
|
|
104
|
+
kind?: string;
|
|
105
|
+
subtype?: string;
|
|
106
|
+
limit?: number;
|
|
107
|
+
}) => Promise<string>;
|
|
108
|
+
}
|
|
109
|
+
/** Subset of `McpClientPool` consumed via `AdapterRequest`. Avoids a
|
|
110
|
+
* hard import cycle with `mcp/pool.ts` from this adapter type file. */
|
|
111
|
+
export interface McpClientPoolLike {
|
|
112
|
+
hasServers(): boolean;
|
|
113
|
+
discoverTools(): Promise<unknown[]>;
|
|
114
|
+
callTool(name: string, args: Record<string, unknown>, signal?: AbortSignal): Promise<unknown>;
|
|
115
|
+
cancelInFlight(reason?: string): void;
|
|
116
|
+
close(): Promise<void>;
|
|
117
|
+
readonly failures: ReadonlyArray<{
|
|
118
|
+
server: string;
|
|
119
|
+
reason: string;
|
|
120
|
+
}>;
|
|
121
|
+
}
|
|
122
|
+
/** Activity events surfaced from the MCP layer to the agent stream. */
|
|
123
|
+
export interface McpActivityEvent {
|
|
124
|
+
kind: 'mcp-call-start' | 'mcp-call-end' | 'mcp-progress' | 'mcp-server-failed';
|
|
125
|
+
serverName: string;
|
|
126
|
+
toolName?: string;
|
|
127
|
+
durationMs?: number;
|
|
128
|
+
isError?: boolean;
|
|
129
|
+
progress?: number;
|
|
130
|
+
total?: number;
|
|
131
|
+
message?: string;
|
|
88
132
|
}
|
|
89
133
|
/**
|
|
90
134
|
* Factory the registry uses to construct adapters per spawn. Keeps the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/agent/session/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEvE;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5C,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9E,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACrC;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAa,SAAQ,YAAY;IAChD,iEAAiE;IACjE,KAAK,IAAI,IAAI,CAAC;IACd,sDAAsD;IACtD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,6EAA6E;IAC7E,kBAAkB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,mFAAmF;IACnF,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;kEAC8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;kCAG8B;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;iCAE6B;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;+DAG2D;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/agent/session/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/agent/session/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/agent/session/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiIH;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAiB,EACjB,SAAiB,EACjB,IAAiD;IAEjD,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,SAAS;QACT,GAAG,EAAE,IAAI,EAAE,WAAW,IAAI,IAAI,CAAC,GAAG;QAClC,MAAM,EAAE,IAAI,EAAE,MAAM;QACpB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-adapter-factory.d.ts","sourceRoot":"","sources":["../../../src/agent/session/default-adapter-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAOtB,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CA0D7D;AAmCD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"default-adapter-factory.d.ts","sourceRoot":"","sources":["../../../src/agent/session/default-adapter-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAOtB,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CA0D7D;AAmCD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,YAAY,CA+B3E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,cAAc,EACvB,QAAQ,EAAE,YAAY,GACrB,cAAc,CAgChB;AAoCD,gFAAgF;AAChF,eAAO,MAAM,uBAAuB,EAAE,mBAA2C,CAAC"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { execSync } from 'node:child_process';
|
|
17
17
|
import { trace } from '@opentelemetry/api';
|
|
18
|
-
import { ProviderRegistry } from '../../registry.js';
|
|
18
|
+
import { AGENTIC_STAGES, ProviderRegistry } from '../../registry.js';
|
|
19
19
|
import { loadModelRegistry } from '../../router/model-registry.js';
|
|
20
20
|
import { LanguageModelBridge } from './language-model-bridge.js';
|
|
21
21
|
import { composeSkillContext } from '../../skills/index.js';
|
|
@@ -120,7 +120,23 @@ function geminiCliAvailable() {
|
|
|
120
120
|
export function defaultAdapterFactory(request) {
|
|
121
121
|
const registry = ProviderRegistry.getInstance();
|
|
122
122
|
const provider = resolveProvider(request.model);
|
|
123
|
-
|
|
123
|
+
let resolved = resolveAdapterOrFallback(registry, provider);
|
|
124
|
+
// Stage-aware tier promotion. Agentic stages (`build`/`validate`/`ship`)
|
|
125
|
+
// need an adapter that drives a real tool loop — the bare `gemini` HTTP
|
|
126
|
+
// adapter is `tier: 'function-calling'` which emits bash commands as
|
|
127
|
+
// markdown text instead of `Bash` tool calls (PRs never get created).
|
|
128
|
+
// The registry exposes `resolveForStage` for this guard but the spawn
|
|
129
|
+
// path doesn't call it; check tier here so user-declared
|
|
130
|
+
// `provider: gemini` in `models.yaml` still gets a working agent when
|
|
131
|
+
// the stage demands one. Prefer family-preserving alternatives
|
|
132
|
+
// (gemini → gemini-cli) over claude fallback.
|
|
133
|
+
if (request.stage && AGENTIC_STAGES.has(request.stage) && resolved.adapter.capabilities.tier !== 'agentic') {
|
|
134
|
+
const promoted = promoteToAgentic(registry, resolved.provider, request.model);
|
|
135
|
+
if (promoted) {
|
|
136
|
+
annotateSpanWithPromotion(resolved.provider, promoted.provider, request.stage);
|
|
137
|
+
resolved = promoted;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
124
140
|
// Default workspaceDir to cwd when the spawn caller didn't set one. This
|
|
125
141
|
// makes skills + MCP first-class for every spawn site — dashboard, cli,
|
|
126
142
|
// eval — without each caller having to opt in. Per AGENT-PROCESS-
|
|
@@ -224,4 +240,52 @@ function resolveAdapterOrFallback(registry, provider) {
|
|
|
224
240
|
return { adapter: claude, provider: 'claude' };
|
|
225
241
|
throw new Error(`No agent-core adapter available for provider "${provider}" and no "claude" fallback registered.`);
|
|
226
242
|
}
|
|
243
|
+
/**
|
|
244
|
+
* Promote a non-agentic adapter to an agentic one for build/validate/ship.
|
|
245
|
+
*
|
|
246
|
+
* Family-preserving rules:
|
|
247
|
+
* - `gemini` (HTTP, function-calling tier) → `gemini-cli` (binary on PATH,
|
|
248
|
+
* agentic) → `adk` (if API key set, agentic) → `claude`.
|
|
249
|
+
* - Any other non-agentic provider → `claude`.
|
|
250
|
+
*
|
|
251
|
+
* Returns null when no agentic alternative is available (caller keeps the
|
|
252
|
+
* original adapter — the registry's own fallback path will surface this
|
|
253
|
+
* via a `provider not registered` error, or the run will surface
|
|
254
|
+
* tool-output-as-text symptoms downstream).
|
|
255
|
+
*/
|
|
256
|
+
function promoteToAgentic(registry, fromProvider, modelId) {
|
|
257
|
+
const tryPick = (p) => {
|
|
258
|
+
const a = registry.get(p);
|
|
259
|
+
if (a && a.capabilities.tier === 'agentic')
|
|
260
|
+
return { adapter: a, provider: p };
|
|
261
|
+
return null;
|
|
262
|
+
};
|
|
263
|
+
if (fromProvider === 'gemini') {
|
|
264
|
+
if (geminiCliAvailable()) {
|
|
265
|
+
const cli = tryPick('gemini-cli');
|
|
266
|
+
if (cli)
|
|
267
|
+
return cli;
|
|
268
|
+
}
|
|
269
|
+
if (adkGeminiAvailable() && !modelId.toLowerCase().startsWith('adk:')) {
|
|
270
|
+
// ADK adapter strips the `adk:` prefix before handing to LLMRegistry —
|
|
271
|
+
// for bare `gemini-*` ids we can't transparently route through ADK
|
|
272
|
+
// without rewriting the model id, which would invalidate downstream
|
|
273
|
+
// cost / telemetry attribution. Skip ADK auto-promotion; users who
|
|
274
|
+
// want it should declare `adk:gemini-…` explicitly in models.yaml.
|
|
275
|
+
}
|
|
276
|
+
return tryPick('claude');
|
|
277
|
+
}
|
|
278
|
+
return tryPick('claude');
|
|
279
|
+
}
|
|
280
|
+
function adkGeminiAvailable() {
|
|
281
|
+
return !!(process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY || process.env.GOOGLE_GENAI_API_KEY);
|
|
282
|
+
}
|
|
283
|
+
function annotateSpanWithPromotion(from, to, stage) {
|
|
284
|
+
const span = trace.getActiveSpan();
|
|
285
|
+
if (!span)
|
|
286
|
+
return;
|
|
287
|
+
span.setAttribute('anvil.adapter.promoted_from', from);
|
|
288
|
+
span.setAttribute('anvil.adapter.promoted_to', to);
|
|
289
|
+
span.setAttribute('anvil.adapter.promoted_stage', stage);
|
|
290
|
+
}
|
|
227
291
|
//# sourceMappingURL=default-adapter-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-adapter-factory.js","sourceRoot":"","sources":["../../../src/agent/session/default-adapter-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"default-adapter-factory.js","sourceRoot":"","sources":["../../../src/agent/session/default-adapter-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-model-bridge.d.ts","sourceRoot":"","sources":["../../../src/agent/session/language-model-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EACV,YAAY,EAIZ,YAAY,EAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"language-model-bridge.d.ts","sourceRoot":"","sources":["../../../src/agent/session/language-model-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EACV,YAAY,EAIZ,YAAY,EAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,2BAA2B,CAAC;AAyEnC,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,YAAY;IAC3E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,eAAe,CAAK;IAC5B;;;;;oBAKgB;IAChB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA2B;gBAGvD,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,YAAY,EACrB,YAAY,EAAE,YAAY;IAc5B,KAAK,IAAI,IAAI;IAMb,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAS5B,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAInC,IAAI,GAAG,IAAI,MAAM,GAAG,SAAS,CAE5B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAID,IAAI,YAAY,IAAI,mBAAmB,CAEtC;IAED;4DACwD;IACxD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKjC;+CAC2C;IAC3C,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAM7D,8CAA8C;IAC9C,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAID,OAAO,CAAC,kBAAkB;YAuCZ,UAAU;IA8CxB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,qBAAqB;IAmC7B,OAAO,CAAC,gBAAgB;IAgCxB;;;gFAG4E;IAC5E,OAAO,CAAC,YAAY;IAiBpB,+DAA+D;IAC/D,OAAO,CAAC,aAAa;IAYrB;sEACkE;IAClE,OAAO,CAAC,kBAAkB;CAO3B;AAuGD,4EAA4E;AAC5E,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
|
|
@@ -27,6 +27,7 @@ import { SpanStatusCode } from '@opentelemetry/api';
|
|
|
27
27
|
import { instrumentModelAdapter } from '../../telemetry/instrument.js';
|
|
28
28
|
import { getTracer } from '../../telemetry/tracer.js';
|
|
29
29
|
import { BuiltinToolExecutor } from '../../tools/index.js';
|
|
30
|
+
import { MergedToolExecutor } from '../../mcp/merged-executor.js';
|
|
30
31
|
import { loadModelRegistry } from '../../router/model-registry.js';
|
|
31
32
|
// ── Capability mapping ───────────────────────────────────────────────────
|
|
32
33
|
const STRUCTURED_OUTPUT_DEFAULT = 'best-effort';
|
|
@@ -182,7 +183,7 @@ export class LanguageModelBridge extends EventEmitter {
|
|
|
182
183
|
// here would be ignored. Keep the construction lazy so this method
|
|
183
184
|
// stays cheap when called by adapters that don't loop.
|
|
184
185
|
if (this.providerName !== 'claude') {
|
|
185
|
-
const executor =
|
|
186
|
+
const executor = buildMergedExecutor(this.request);
|
|
186
187
|
if (executor)
|
|
187
188
|
config.toolExecutor = executor;
|
|
188
189
|
const ctx = lookupContextWindow(this.request.model);
|
|
@@ -420,7 +421,63 @@ function buildBuiltinExecutor(req) {
|
|
|
420
421
|
const allowed = req.allowedTools && req.allowedTools.length > 0
|
|
421
422
|
? req.allowedTools
|
|
422
423
|
: ['read_file', 'grep', 'glob', 'list'];
|
|
423
|
-
return new BuiltinToolExecutor({
|
|
424
|
+
return new BuiltinToolExecutor({
|
|
425
|
+
allowedTools: allowed,
|
|
426
|
+
recallMemory: req.recallMemory,
|
|
427
|
+
});
|
|
428
|
+
}
|
|
429
|
+
/**
|
|
430
|
+
* Build the tool executor handed to non-Claude adapters. When the session
|
|
431
|
+
* carries a hot `mcpPool`, wrap it together with the builtins in a
|
|
432
|
+
* `MergedToolExecutor` so the agentic loop can call `mcp__<server>__<tool>`
|
|
433
|
+
* the same way it calls `read_file`. The pool is session-scoped (owned by
|
|
434
|
+
* `AgentProcess`), so the bridge does NOT close it on kill — only cancels
|
|
435
|
+
* in-flight MCP calls.
|
|
436
|
+
*
|
|
437
|
+
* Prime is awaited synchronously-ish: we kick `prime()` and return the
|
|
438
|
+
* executor; the adapter's first `listSchemas()` call is `await`-ed via
|
|
439
|
+
* the agentic loop anyway, but in adapters that consume schemas in the
|
|
440
|
+
* very first request before any tool call, this fast-path may miss MCP
|
|
441
|
+
* tools. Adapters that take the `tools[]` upfront should call
|
|
442
|
+
* `await executor.prime()` explicitly — `OpenRouterAdapter` already does
|
|
443
|
+
* this implicitly because its agentic loop awaits listSchemas() per
|
|
444
|
+
* iteration via `ModelAdapterConfig.toolExecutor`.
|
|
445
|
+
*/
|
|
446
|
+
function buildMergedExecutor(req) {
|
|
447
|
+
if (!req.cwd)
|
|
448
|
+
return undefined;
|
|
449
|
+
const allowed = req.allowedTools && req.allowedTools.length > 0
|
|
450
|
+
? req.allowedTools
|
|
451
|
+
: ['read_file', 'grep', 'glob', 'list'];
|
|
452
|
+
const builtin = new BuiltinToolExecutor({
|
|
453
|
+
allowedTools: allowed,
|
|
454
|
+
recallMemory: req.recallMemory,
|
|
455
|
+
});
|
|
456
|
+
if (!req.mcpPool)
|
|
457
|
+
return builtin;
|
|
458
|
+
const pool = req.mcpPool;
|
|
459
|
+
const merged = new MergedToolExecutor({
|
|
460
|
+
builtin,
|
|
461
|
+
pool,
|
|
462
|
+
allowedTools: req.allowedTools,
|
|
463
|
+
onMcpCallStart: ({ tool, serverName }) => req.mcpProgress?.({
|
|
464
|
+
kind: 'mcp-call-start',
|
|
465
|
+
serverName,
|
|
466
|
+
toolName: tool,
|
|
467
|
+
}),
|
|
468
|
+
onMcpCallEnd: ({ tool, serverName, durationMs, isError }) => req.mcpProgress?.({
|
|
469
|
+
kind: 'mcp-call-end',
|
|
470
|
+
serverName,
|
|
471
|
+
toolName: tool,
|
|
472
|
+
durationMs,
|
|
473
|
+
isError,
|
|
474
|
+
}),
|
|
475
|
+
});
|
|
476
|
+
// Fire-and-forget: warm the MCP tool cache. Adapters that read schemas
|
|
477
|
+
// before the first listSchemas-await will see only builtins on first
|
|
478
|
+
// pass; subsequent calls will see the merged set.
|
|
479
|
+
void merged.prime().catch(() => { });
|
|
480
|
+
return merged;
|
|
424
481
|
}
|
|
425
482
|
/**
|
|
426
483
|
* Look up the configured `context_window` for a model in the registry.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-model-bridge.js","sourceRoot":"","sources":["../../../src/agent/session/language-model-bridge.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"language-model-bridge.js","sourceRoot":"","sources":["../../../src/agent/session/language-model-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAa,MAAM,oBAAoB,CAAC;AAc/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,4EAA4E;AAE5E,MAAM,yBAAyB,GAAG,aAAsB,CAAC;AAEzD,SAAS,eAAe,CAAC,IAA0B;IACjD,MAAM,WAAW,GACf,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACvD,OAAO;QACL,WAAW;QACX,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,IAAI,yBAAyB;QACpE,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,IAAI;KAC/C,CAAC;AACJ,CAAC;AAED,4EAA4E;AAE5E,SAAS,gBAAgB,CAAC,IAAY,EAAE,KAA8B;IACpE,mEAAmE;IACnE,kEAAkE;IAClE,8DAA8D;IAC9D,iEAAiE;IACjE,mEAAmE;IACnE,iEAAiE;IACjE,gEAAgE;IAChE,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,CAAW,CAAC;IACjE,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW;YACd,OAAO,WAAW,IAAI,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,WAAW,IAAI,EAAE,CAAC;QAC3B,KAAK,OAAO,CAAC;QACb,KAAK,YAAY;YACf,OAAO,WAAW,IAAI,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,YAAY,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QACtF,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,kBAAkB,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC/G,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,kBAAkB,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACjD,KAAK,MAAM;YACT,OAAO,WAAW,KAAK,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QACxC,KAAK,OAAO;YACV,OAAO,uBAAuB,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;QAC1D,KAAK,OAAO;YACV,OAAO,gBAAgB,KAAK,CAAC,KAAK,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAClF,KAAK,YAAY;YACf,OAAO,oBAAoB,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACjD,KAAK,YAAY;YACf,OAAO,kBAAkB,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;QACrD,KAAK,YAAY;YACf,OAAO,kBAAkB,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACpE;YACE,OAAO,SAAS,IAAI,EAAE,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E,MAAM,OAAO,mBAAoB,SAAQ,YAAY;IAClC,OAAO,CAAiB;IACxB,OAAO,CAAe;IACtB,YAAY,CAAe;IAC3B,iBAAiB,CAAsB;IAChD,uBAAuB,CAAU;IACjC,SAAS,GAAG,KAAK,CAAC;IAClB,QAAQ,GAAG,KAAK,CAAC;IACjB,eAAe,GAAG,CAAC,CAAC;IAC5B;;;;;oBAKgB;IACC,aAAa,GAAG,IAAI,GAAG,EAAgB,CAAC;IAEzD,YACE,OAAuB,EACvB,OAAqB,EACrB,YAA0B;QAE1B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,wEAAwE;QACxE,oEAAoE;QACpE,qDAAqD;QACrD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,wEAAwE;IAExE,KAAK;QACH,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,OAAgB;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,cAAc;QAChB,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,CAAS;QAC1B,IAAI,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG;QACL,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,yEAAyE;IAEzE,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;4DACwD;IACxD,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACpC,CAAC;IAED;+CAC2C;IAC3C,mBAAmB,CAAC,MAAc,EAAE,QAAgB;QAClD,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,KAAK,UAAU;YAAE,OAAO,MAAM,CAAC;QACrE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,qCAAqC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5F,CAAC;IAED,8CAA8C;IAC9C,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,yEAAyE;IAEjE,kBAAkB;QACxB,MAAM,MAAM,GAAuB;YACjC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC/B,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YACzC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE;YACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;YAC7C,eAAe,EAAE,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe;SAC9E,CAAC;QAEF,uEAAuE;QACvE,sEAAsE;QACtE,mEAAmE;QACnE,uDAAuD;QACvD,IAAI,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,QAAQ;gBAAE,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC;YAC7C,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,GAAG,KAAK,SAAS;gBAAE,MAAM,CAAC,aAAa,GAAG,GAAG,CAAC;QACpD,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;YAC5C,iEAAiE;YACjE,iDAAiD;YACjD,kDAAkD;YAClD,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC1D,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QAC9B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,MAAM,GAA8B,IAAI,CAAC;QAC7C,IAAI,QAAQ,GAAiB,IAAI,CAAC;QAElC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,CAAC;gBAAS,CAAC;YACT,qEAAqE;YACrE,kEAAkE;YAClE,kDAAkD;YAClD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;QAEX,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,GAAoB;gBAC5B,QAAQ,EAAE,MAAM,CAAC,OAAO,IAAI,CAAC;gBAC7B,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,CAAC;gBACpC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC;gBACtC,eAAe,EAAE,MAAM,CAAC,eAAe,IAAI,CAAC;gBAC5C,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,CAAC;gBAC9C,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;gBAClC,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;gBAC3B,IAAI;gBACJ,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS;aACtD,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACK,gBAAgB;QACtB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,OAAO,IAAI,QAAQ,CAAC;YAClB,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBAC3B,KAAK,MAAM,IAAI,IAAI,KAAK;oBAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBACtD,EAAE,EAAE,CAAC;YACP,CAAC;YACD,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE;gBACZ,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC9B,MAAM,GAAG,EAAE,CAAC;gBACd,CAAC;gBACD,EAAE,EAAE,CAAC;YACP,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,cAAc;QACpB,OAAO,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC;IAC/E,CAAC;IAEO,gBAAgB,CAAC,IAAY;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,MAAiF,CAAC;QACtF,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QAED,kEAAkE;QAClE,qEAAqE;QACrE,+CAA+C;QAC/C,IAAI,MAAM,EAAE,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3E,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QACD,IAAI,MAAM,EAAE,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACtE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,MAAsC;QAClE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE;oBACzB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;oBACjC,OAAO,EAAE,KAAK,CAAC,IAAI;oBACnB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACvE,MAAM,KAAK,GAAI,KAAK,CAAC,KAAiC,IAAI,EAAE,CAAC;gBAC7D,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE;oBACzB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;oBAC5C,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;oBACvC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;gBACH,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACvE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE;oBACzB,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;oBACjC,OAAO,EAAE,KAAK,CAAC,IAAI;oBACnB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,MAAsC;QAC7D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;gBAAE,SAAS;YAC3C,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACxF,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC;YACxC,MAAM,UAAU,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,oEAAoE;YACpE,8DAA8D;YAC9D,kEAAkE;YAClE,4DAA4D;YAC5D,iEAAiE;YACjE,4DAA4D;YAC5D,0DAA0D;YAC1D,IAAI,UAAU,EAAE,CAAC;gBACf,kEAAkE;gBAClE,+DAA+D;gBAC/D,8DAA8D;gBAC9D,gEAAgE;gBAChE,qCAAqC;gBACrC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE;oBACzB,IAAI,EAAE,aAAa;oBACnB,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;oBACjC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;oBAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,SAAS;gBAAE,SAAS;YACzB,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED;;;gFAG4E;IACpE,YAAY,CAClB,IAAY,EACZ,KAA8B,EAC9B,SAA6B;QAE7B,IAAI,CAAC,SAAS;YAAE,OAAO,CAAC,gDAAgD;QACxE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,IAAI,EAAE,EAAE;YACnD,UAAU,EAAE;gBACV,kBAAkB,EAAE,IAAI;gBACxB,qBAAqB,EAAE,SAAS;gBAChC,2BAA2B,EAAE,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;aACzE;SACF,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,+DAA+D;IACvD,aAAa,CAAC,SAAiB,EAAE,MAA4B;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC;IAED;sEACkE;IAC1D,kBAAkB;QACxB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;YAC/C,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;CACF;AAED,0EAA0E;AAC1E,uEAAuE;AACvE,0EAA0E;AAE1E;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAAC,GAAmB;IAC/C,IAAI,CAAC,GAAG,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;QAC7D,CAAC,CAAC,GAAG,CAAC,YAAY;QAClB,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,OAAO,IAAI,mBAAmB,CAAC;QAC7B,YAAY,EAAE,OAAO;QACrB,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,mBAAmB,CAAC,GAAmB;IAC9C,IAAI,CAAC,GAAG,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;QAC7D,CAAC,CAAC,GAAG,CAAC,YAAY;QAClB,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;QACtC,YAAY,EAAE,OAAO;QACrB,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAmC,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC;QACpC,OAAO;QACP,IAAI;QACJ,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC1D,IAAI,EAAE,gBAAgB;YACtB,UAAU;YACV,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC7E,IAAI,EAAE,cAAc;YACpB,UAAU;YACV,QAAQ,EAAE,IAAI;YACd,UAAU;YACV,OAAO;SACR,CAAC;KACH,CAAC,CAAC;IACH,uEAAuE;IACvE,qEAAqE;IACrE,kDAAkD;IAClD,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAA6C,CAAC,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,IAAI,cAAc,GAA+B,IAAI,CAAC;AAEtD,SAAS,mBAAmB,CAAC,OAAe;IAC1C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,iBAAiB,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;oBACnC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;QAC9E,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,yBAAyB;IACvC,cAAc,GAAG,IAAI,CAAC;AACxB,CAAC"}
|
|
@@ -35,6 +35,11 @@ export declare class AgentProcess extends EventEmitter {
|
|
|
35
35
|
private sessionSpan;
|
|
36
36
|
private sessionContext;
|
|
37
37
|
private sessionEnded;
|
|
38
|
+
/** Lazy session-scoped MCP client pool. One workspace = one pool that
|
|
39
|
+
* outlives every individual adapter spawn within this session (resume
|
|
40
|
+
* turns reuse it). Constructed on first start() when workspaceDir is
|
|
41
|
+
* present and torn down by kill(). */
|
|
42
|
+
private mcpPool;
|
|
38
43
|
constructor(spec: SpawnConfig, opts: AgentProcessOpts);
|
|
39
44
|
on<K extends keyof AgentProcessEvents>(event: K, listener: AgentProcessEvents[K]): this;
|
|
40
45
|
emit<K extends keyof AgentProcessEvents>(event: K, ...args: Parameters<AgentProcessEvents[K]>): boolean;
|
|
@@ -47,6 +52,17 @@ export declare class AgentProcess extends EventEmitter {
|
|
|
47
52
|
sendInput(text: string): void;
|
|
48
53
|
/** Kill the underlying adapter and mark the process as `killed`. */
|
|
49
54
|
kill(signal?: NodeJS.Signals): void;
|
|
55
|
+
/**
|
|
56
|
+
* Attach the session-scoped MCP pool + activity callback to an
|
|
57
|
+
* `AdapterRequest` if the spawn has a workspaceDir AND mcp.json wires
|
|
58
|
+
* any servers. No-op when MCP isn't configured — the factory + bridge
|
|
59
|
+
* fall through to the builtin-only executor path.
|
|
60
|
+
*/
|
|
61
|
+
private augmentRequestWithMcp;
|
|
62
|
+
/** Surface an MCP activity event on the agent's `activity` stream so
|
|
63
|
+
* the dashboard's activity panel renders the same way it does for
|
|
64
|
+
* builtin tool_use. */
|
|
65
|
+
private emitMcpActivity;
|
|
50
66
|
/** Read-only snapshot of the process's runtime state. */
|
|
51
67
|
getState(): AgentState;
|
|
52
68
|
get status(): AgentStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/agent/session/session.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAS3C,OAAO,KAAK,EAEV,YAAY,EACZ,mBAAmB,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/agent/session/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { EventEmitter } from 'node:events';
|
|
|
10
10
|
import { randomBytes } from 'node:crypto';
|
|
11
11
|
import { context as otelContext, trace, SpanStatusCode, } from '@opentelemetry/api';
|
|
12
12
|
import { buildAdapterRequest } from './adapter.js';
|
|
13
|
+
import { McpClientPool } from '../../mcp/pool.js';
|
|
13
14
|
import { getTracer } from '../../telemetry/tracer.js';
|
|
14
15
|
// ── Tunables ────────────────────────────────────────────────────────────
|
|
15
16
|
/** Cap in-memory output to 500KB, keeping the tail. */
|
|
@@ -36,6 +37,11 @@ export class AgentProcess extends EventEmitter {
|
|
|
36
37
|
sessionSpan = null;
|
|
37
38
|
sessionContext = null;
|
|
38
39
|
sessionEnded = false;
|
|
40
|
+
/** Lazy session-scoped MCP client pool. One workspace = one pool that
|
|
41
|
+
* outlives every individual adapter spawn within this session (resume
|
|
42
|
+
* turns reuse it). Constructed on first start() when workspaceDir is
|
|
43
|
+
* present and torn down by kill(). */
|
|
44
|
+
mcpPool = null;
|
|
39
45
|
constructor(spec, opts) {
|
|
40
46
|
super();
|
|
41
47
|
this.spec = spec;
|
|
@@ -57,7 +63,8 @@ export class AgentProcess extends EventEmitter {
|
|
|
57
63
|
/** Start the process. Spawns the underlying adapter and begins streaming. */
|
|
58
64
|
start() {
|
|
59
65
|
this.openSessionSpan();
|
|
60
|
-
const
|
|
66
|
+
const baseReq = buildAdapterRequest(this.spec, this.sessionId);
|
|
67
|
+
const req = this.augmentRequestWithMcp(baseReq);
|
|
61
68
|
// Run the factory inside the session-span's context so any setAttribute
|
|
62
69
|
// calls inside `defaultAdapterFactory` (e.g. `anvil.skills.activated.*`,
|
|
63
70
|
// `anvil.mcp.*` from Phase 6) land on the session span. Without the
|
|
@@ -88,13 +95,15 @@ export class AgentProcess extends EventEmitter {
|
|
|
88
95
|
// Update agent status back to running
|
|
89
96
|
this.state.status = 'running';
|
|
90
97
|
this.state.finishedAt = null;
|
|
91
|
-
const
|
|
98
|
+
const baseReq = buildAdapterRequest({ ...this.spec, prompt: text }, this.sessionId,
|
|
92
99
|
// No cwdOverride — Claude's session storage is keyed by cwd, so a
|
|
93
100
|
// resume MUST use the same working directory as the original spawn.
|
|
94
101
|
// Forcing process.cwd() here breaks `claude --resume <id>` with
|
|
95
102
|
// "No conversation found" whenever the dashboard's cwd differs
|
|
96
103
|
// from the project workspace it spawned the agent in.
|
|
97
104
|
{ resume: true });
|
|
105
|
+
// Resume reuses the same session-scoped MCP pool — no reconnect.
|
|
106
|
+
const req = this.augmentRequestWithMcp(baseReq);
|
|
98
107
|
const resumeAdapter = this.factory(req);
|
|
99
108
|
if (typeof this.spec.maxOutputTokens === 'number'
|
|
100
109
|
&& this.spec.maxOutputTokens > 0
|
|
@@ -116,10 +125,68 @@ export class AgentProcess extends EventEmitter {
|
|
|
116
125
|
}
|
|
117
126
|
catch { /* already dead */ }
|
|
118
127
|
}
|
|
128
|
+
// Cancel any in-flight MCP tool calls + tear down the pool so stdio
|
|
129
|
+
// subprocesses don't leak. Async; fire-and-forget — kill() returns
|
|
130
|
+
// synchronously so callers don't block on stdio shutdown.
|
|
131
|
+
if (this.mcpPool) {
|
|
132
|
+
const pool = this.mcpPool;
|
|
133
|
+
this.mcpPool = null;
|
|
134
|
+
void pool.close().catch(() => { });
|
|
135
|
+
}
|
|
119
136
|
this.state.status = 'killed';
|
|
120
137
|
this.state.finishedAt = this.now();
|
|
121
138
|
this.closeSessionSpan('killed');
|
|
122
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* Attach the session-scoped MCP pool + activity callback to an
|
|
142
|
+
* `AdapterRequest` if the spawn has a workspaceDir AND mcp.json wires
|
|
143
|
+
* any servers. No-op when MCP isn't configured — the factory + bridge
|
|
144
|
+
* fall through to the builtin-only executor path.
|
|
145
|
+
*/
|
|
146
|
+
augmentRequestWithMcp(req) {
|
|
147
|
+
if (!req.workspaceDir)
|
|
148
|
+
return req;
|
|
149
|
+
if (!this.mcpPool) {
|
|
150
|
+
const pool = new McpClientPool({
|
|
151
|
+
workspaceRoot: req.workspaceDir,
|
|
152
|
+
runId: req.runId,
|
|
153
|
+
onProgress: (ev) => this.emitMcpActivity({
|
|
154
|
+
kind: 'mcp-progress',
|
|
155
|
+
serverName: ev.serverName,
|
|
156
|
+
toolName: ev.toolName,
|
|
157
|
+
progress: ev.progress,
|
|
158
|
+
total: ev.total,
|
|
159
|
+
message: ev.message,
|
|
160
|
+
}),
|
|
161
|
+
});
|
|
162
|
+
if (!pool.hasServers()) {
|
|
163
|
+
// No servers configured for this workspace — skip the pool entirely
|
|
164
|
+
// so the factory's MCP-aware path is bypassed.
|
|
165
|
+
return req;
|
|
166
|
+
}
|
|
167
|
+
this.mcpPool = pool;
|
|
168
|
+
}
|
|
169
|
+
const pool = this.mcpPool;
|
|
170
|
+
return {
|
|
171
|
+
...req,
|
|
172
|
+
mcpPool: pool,
|
|
173
|
+
mcpProgress: (ev) => this.emitMcpActivity(ev),
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
/** Surface an MCP activity event on the agent's `activity` stream so
|
|
177
|
+
* the dashboard's activity panel renders the same way it does for
|
|
178
|
+
* builtin tool_use. */
|
|
179
|
+
emitMcpActivity(ev) {
|
|
180
|
+
const summary = mcpActivitySummary(ev);
|
|
181
|
+
const activity = {
|
|
182
|
+
id: `mcp-${this.now()}-${Math.random().toString(36).slice(2, 8)}`,
|
|
183
|
+
kind: 'tool_use',
|
|
184
|
+
tool: ev.toolName ?? `mcp:${ev.serverName}`,
|
|
185
|
+
summary,
|
|
186
|
+
timestamp: this.now(),
|
|
187
|
+
};
|
|
188
|
+
this.emit('activity', activity);
|
|
189
|
+
}
|
|
123
190
|
// ── State queries ────────────────────────────────────────────────────
|
|
124
191
|
/** Read-only snapshot of the process's runtime state. */
|
|
125
192
|
getState() {
|
|
@@ -319,6 +386,23 @@ export function accumulateCost(prev, next) {
|
|
|
319
386
|
stopReason: next.stopReason ?? prev.stopReason,
|
|
320
387
|
};
|
|
321
388
|
}
|
|
389
|
+
/** Human-readable summary of an MCP activity event for the agent stream. */
|
|
390
|
+
function mcpActivitySummary(ev) {
|
|
391
|
+
switch (ev.kind) {
|
|
392
|
+
case 'mcp-call-start':
|
|
393
|
+
return `[mcp:${ev.serverName}] calling ${ev.toolName ?? ''}`;
|
|
394
|
+
case 'mcp-call-end':
|
|
395
|
+
return ev.isError
|
|
396
|
+
? `[mcp:${ev.serverName}] ${ev.toolName ?? ''} failed (${ev.durationMs ?? 0}ms)`
|
|
397
|
+
: `[mcp:${ev.serverName}] ${ev.toolName ?? ''} ok (${ev.durationMs ?? 0}ms)`;
|
|
398
|
+
case 'mcp-progress':
|
|
399
|
+
return `[mcp:${ev.serverName}] ${ev.message ?? `progress ${ev.progress ?? 0}/${ev.total ?? '?'}`}`;
|
|
400
|
+
case 'mcp-server-failed':
|
|
401
|
+
return `[mcp:${ev.serverName}] server unavailable: ${ev.message ?? 'unknown error'}`;
|
|
402
|
+
default:
|
|
403
|
+
return `[mcp:${ev.serverName}] ${ev.message ?? ''}`;
|
|
404
|
+
}
|
|
405
|
+
}
|
|
322
406
|
/**
|
|
323
407
|
* Generate a UUID v4. Claude CLI requires a valid v4 for `--session-id`.
|
|
324
408
|
*/
|