agim-cli 1.2.45 → 1.2.49

package/dist/core/llm/mcp-registry.js

@@ -0,0 +1,155 @@
+// mcp-registry — owns the McpClient lifecycle (Stage 2 sub-PR #2).
+//
+// The native agent loop (sub-PR #3) doesn't want to know about
+// individual MCP connections. It asks the registry "give me all tools
+// I can call" and "run tool X with args Y", and the registry routes
+// to the right McpClient by name prefix.
+//
+// Lifecycle:
+//   - `loadFromConfig(cfg)` builds the clients (but does NOT connect)
+//   - `connectAll()` runs connect handshakes in parallel; per-server
+//     failures are recorded as `unhealthy` rows but don't abort the
+//     whole startup (one broken MCP shouldn't take down agim)
+//   - `getAllTools()` returns the union of every connected client's
+//     ToolDef[]; safe to call before connectAll, just returns empty
+//   - `callToolByName(callName, args)` dispatches by the namespaced
+//     prefix `mcp_{server}_…`; unknown names return a {error} result
+//   - `closeAll()` graceful shutdown, called from cli.ts SIGTERM hook
+//
+// Module-level singleton (same pattern as llm/registry.ts) — agim is
+// single-process so this is safe.
+import { logger as rootLogger } from '../logger.js';
+import { McpClient } from './mcp-client.js';
+const log = rootLogger.child({ component: 'mcp-registry' });
+function freshState() {
+    return {
+        clients: new Map(),
+        unhealthy: new Map(),
+        toolsByCallName: new Map(),
+    };
+}
+let state = freshState();
+/**
+ * Build McpClient instances from config. Idempotent — repeated calls
+ * fully replace the previous state (any open connections are closed
+ * first via closeAll).
+ */
+export async function loadFromConfig(cfg) {
+    await closeAll();
+    const next = freshState();
+    const servers = Array.isArray(cfg.mcpServers) ? cfg.mcpServers : [];
+    for (const sc of servers) {
+        if (!sc || typeof sc !== 'object' || typeof sc.name !== 'string')
+            continue;
+        if (sc.enabled === false) {
+            log.debug({ event: 'mcp-registry.skip_disabled', server: sc.name });
+            continue;
+        }
+        if (next.clients.has(sc.name)) {
+            log.warn({ event: 'mcp-registry.duplicate', server: sc.name }, `Duplicate mcpServers entry "${sc.name}"; last wins`);
+        }
+        next.clients.set(sc.name, new McpClient(sc));
+    }
+    state = next;
+    log.info({ event: 'mcp-registry.loaded', servers: state.clients.size });
+}
+/**
+ * Connect every registered client. Failures are recorded in
+ * `state.unhealthy` so a broken server doesn't poison the startup
+ * sequence. Returns a summary so callers (cli.ts boot log) can print
+ * something useful.
+ */
+export async function connectAll() {
+    const ok = [];
+    const failed = {};
+    // Parallel connect — each MCP server is independent. setMaxListeners
+    // isn't needed: the SDK uses its own internal abort plumbing.
+    await Promise.all(Array.from(state.clients.values()).map(async (client) => {
+        try {
+            await client.connect();
+            const tools = await client.listAvailableTools();
+            for (const t of tools) {
+                if (state.toolsByCallName.has(t.name)) {
+                    // Tool name collision across servers — should be impossible
+                    // given the `mcp_{server}_` prefix, but defend anyway.
+                    log.warn({ event: 'mcp-registry.tool_name_collision', tool: t.name });
+                    continue;
+                }
+                state.toolsByCallName.set(t.name, { server: client.name, tool: t });
+            }
+            ok.push(client.name);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            state.unhealthy.set(client.name, msg);
+            failed[client.name] = msg;
+            log.warn({ event: 'mcp-registry.connect_failed', server: client.name, err: msg });
+        }
+    }));
+    return { ok, failed, toolCount: state.toolsByCallName.size };
+}
+/** All tools across every connected client. Safe to call before
+ *  connectAll (returns []). The order is insertion order of the
+ *  mcpServers config — useful for the web UI listing. */
+export function getAllTools() {
+    return Array.from(state.toolsByCallName.values()).map((entry) => entry.tool);
+}
+/** Look up which server owns a given namespaced tool name. */
+export function getOwningServer(callName) {
+    const entry = state.toolsByCallName.get(callName);
+    return entry ? entry.server : null;
+}
+/**
+ * Dispatch a tool call to the right client. Returns a "tool unknown"
+ * error result rather than throwing; the agent loop converts that into
+ * a `{role:'tool', isError:true}` message so the model can recover.
+ */
+export async function callToolByName(callName, args, opts = {}) {
+    const entry = state.toolsByCallName.get(callName);
+    if (!entry) {
+        return { text: `unknown MCP tool: ${callName}`, isError: true };
+    }
+    const client = state.clients.get(entry.server);
+    if (!client?.isConnected()) {
+        return {
+            text: `MCP server "${entry.server}" not connected (was it shut down or never connected at startup?)`,
+            isError: true,
+        };
+    }
+    return client.callTool(callName, args, opts);
+}
+/**
+ * Snapshot for cli.ts boot log + future web UI. Reports server count,
+ * total advertised tools, and which servers are unhealthy.
+ */
+export function describeRegistry() {
+    const servers = Array.from(state.clients.values()).map((c) => {
+        const tools = Array.from(state.toolsByCallName.values()).filter((e) => e.server === c.name);
+        const err = state.unhealthy.get(c.name);
+        const entry = {
+            name: c.name,
+            connected: c.isConnected(),
+            toolCount: tools.length,
+        };
+        if (err)
+            entry.error = err;
+        return entry;
+    });
+    return { servers, totalTools: state.toolsByCallName.size };
+}
+/**
+ * Close every client connection. Idempotent — safe to call from
+ * graceful shutdown paths even when nothing is connected.
+ */
+export async function closeAll() {
+    if (state.clients.size === 0)
+        return;
+    await Promise.all(Array.from(state.clients.values()).map((c) => c.close()));
+    state = freshState();
+}
+/** Test-only: clear without close. Use only in test setups where the
+ *  real clients were never instantiated. */
+export function _resetRegistry() {
+    state = freshState();
+}
+//# sourceMappingURL=mcp-registry.js.map

package/dist/core/llm/mcp-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-registry.js","sourceRoot":"","sources":["../../../src/core/llm/mcp-registry.ts"],"names":[],"mappings":"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"}

package/dist/core/llm/openai-compat-provider.d.ts

@@ -0,0 +1,65 @@
+import { LlmProvider, type ChatResult, type ChatStreamChunk, type LlmMessage, type NormalizedOptions, type ProviderConfigBase } from './provider-base.js';
+export interface OpenAICompatProviderConfig extends Omit<ProviderConfigBase, 'providerType'> {
+    /** Full base URL up to (but not including) `/chat/completions`. Each
+     *  vendor publishes its own; we default to OpenAI's. Examples:
+     *    - OpenAI:       https://api.openai.com/v1
+     *    - DeepSeek:     https://api.deepseek.com/v1
+     *    - Moonshot:     https://api.moonshot.cn/v1
+     *    - Qwen compat:  https://dashscope.aliyuncs.com/compatible-mode/v1
+     *    - Ollama:       http://localhost:11434/v1
+     *    - vLLM:         http://localhost:8000/v1
+     *    - OpenRouter:   https://openrouter.ai/api/v1
+     */
+    baseUrl?: string;
+    /** Headers merged into every request. Useful for OpenRouter's
+     *  `HTTP-Referer` / `X-Title`, Azure's `api-key`, etc. The Authorization
+     *  header is set automatically from `apiKey` and cannot be overridden
+     *  here — that would defeat the secrets layer. */
+    extraHeaders?: Record<string, string>;
+    /** Number of retries on transient (429 / 5xx) failures. Default 1.
+     *  Caller-side retry budgets (audit / cost) make >2 wasteful. */
+    retryOnTransient?: number;
+    /** Display label for logs / web UI. Defaults to "openai-compat" but
+     *  individual deployments may want "deepseek" / "kimi" / "qwen" so the
+     *  cost dashboard groups correctly. */
+    providerLabel?: string;
+    /** Operator opt-in: this provider's configured model understands the
+     *  OpenAI vision content shape ({type:'image_url'} blocks). When true,
+     *  `LlmMessage.media` is encoded into the request; otherwise media is
+     *  silently ignored and only the text path travels.
+     *  Default heuristic: true if the model id contains 'vision', 'gpt-4o',
+     *  'gpt-4.1', 'qwen-vl', or 'glm-4v'. Override explicitly when needed. */
+    vision?: boolean;
+}
+/**
+ * Concrete provider for any OpenAI-compatible `/v1/chat/completions`
+ * endpoint. Single-shot chat is the only Stage-1 path we care about —
+ * the streaming method is wired up for Stage 2 / future "show thinking
+ * in web UI" features and is fully functional.
+ */
+export declare class OpenAICompatProvider extends LlmProvider {
+    private readonly baseUrl;
+    private readonly extraHeaders;
+    private readonly retryOnTransient;
+    private readonly vision;
+    constructor(cfg: OpenAICompatProviderConfig);
+    supportsVision(): boolean;
+    protected _callApi(messages: LlmMessage[], opts: NormalizedOptions, signal: AbortSignal): Promise<ChatResult>;
+    protected _callApiStream(messages: LlmMessage[], opts: NormalizedOptions, signal: AbortSignal): AsyncIterable<ChatStreamChunk>;
+    /**
+     * Compose the JSON body. Kept tiny on purpose — the messages array
+     * goes through as-is and the rest of the OpenAI surface (logprobs,
+     * top_p, stop, …) lands when callers ask for it via providerOptions.
+     */
+    private _buildBody;
+    private _postJson;
+    /**
+     * fetch + minimal retry. We backoff with a tiny fixed delay rather
+     * than honoring Retry-After because Stage 1 callers (distill /
+     * intent) have very short deadlines — long backoffs would force a
+     * fallback to CLI anyway, which is the whole point of "transient
+     * retry, then surrender".
+     */
+    private _fetchWithRetry;
+}
+//# sourceMappingURL=openai-compat-provider.d.ts.map

package/dist/core/llm/openai-compat-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compat-provider.d.ts","sourceRoot":"","sources":["../../../src/core/llm/openai-compat-provider.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,WAAW,EAEX,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,UAAU,EAEf,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAKxB,MAAM,oBAAoB,CAAA;AAG3B,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAC1F;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;sDAGkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC;qEACiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;2CAEuC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;;;;8EAK0E;IAC1E,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAKD;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,GAAG,EAAE,0BAA0B;IAiBlC,cAAc,IAAI,OAAO;cAIlB,QAAQ,CACtB,QAAQ,EAAE,UAAU,EAAE,EACtB,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,UAAU,CAAC;cAkBL,cAAc,CAC7B,QAAQ,EAAE,UAAU,EAAE,EACtB,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,WAAW,GAClB,aAAa,CAAC,eAAe,CAAC;IAsDjC;;;;OAIG;IACH,OAAO,CAAC,UAAU;YA0BJ,SAAS;IAevB;;;;;;OAMG;YACW,eAAe;CAiD9B"}