@kenkaiiii/ggcoder 5.26.3 → 5.28.0

package/dist/core/mcp/catalog-cache.js

@@ -0,0 +1,163 @@
+import crypto from "node:crypto";
+import fs from "node:fs/promises";
+import { getAppPaths } from "@kenkaiiii/gg-core";
+import { log } from "../logger.js";
+/** Cached entries older than this are ignored — a stale catalog misleads. */
+const MAX_ENTRY_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+/**
+ * Stable hash of everything that can change which tools a server exposes.
+ * Key order is normalized so a reordered config file is not a cache miss.
+ */
+export function hashServerConfig(config) {
+    const material = {
+        url: config.url ?? null,
+        headers: sortedEntries(config.headers),
+        command: config.command ?? null,
+        args: config.args ?? null,
+        env: sortedEntries(config.env),
+        transport: config.transport ?? null,
+    };
+    return crypto.createHash("sha256").update(JSON.stringify(material)).digest("hex").slice(0, 16);
+}
+function sortedEntries(record) {
+    if (!record)
+        return null;
+    return Object.entries(record).sort(([a], [b]) => a.localeCompare(b));
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Validate one persisted entry; unknown/partial shapes are dropped, not trusted. */
+function parseEntry(value) {
+    if (!isRecord(value))
+        return undefined;
+    const { configHash, savedAt, protocolEra, tools } = value;
+    if (typeof configHash !== "string" || !configHash)
+        return undefined;
+    if (typeof savedAt !== "number" || !Number.isFinite(savedAt))
+        return undefined;
+    if (!Array.isArray(tools))
+        return undefined;
+    const parsedTools = [];
+    for (const tool of tools) {
+        if (!isRecord(tool))
+            continue;
+        if (typeof tool.name !== "string" || !tool.name)
+            continue;
+        parsedTools.push({
+            name: tool.name,
+            description: typeof tool.description === "string" ? tool.description : "",
+            rawInputSchema: isRecord(tool.rawInputSchema) ? tool.rawInputSchema : undefined,
+        });
+    }
+    return {
+        configHash,
+        savedAt,
+        protocolEra: protocolEra === "legacy" || protocolEra === "modern" ? protocolEra : undefined,
+        tools: parsedTools,
+    };
+}
+/**
+ * File-backed MCP tool catalog cache at `~/.gg/mcp-catalog.json`. Every read
+ * re-reads the file so concurrent sidecars/windows see each other's writes;
+ * writes are read-modify-write so two servers don't clobber one another.
+ * Malformed files are treated as empty — a broken cache must never break a run.
+ */
+export class McpCatalogCache {
+    filePath;
+    /** Serializes read-modify-write cycles within one process. */
+    writeQueue = Promise.resolve();
+    constructor(filePath = getAppPaths().mcpCatalogFile) {
+        this.filePath = filePath;
+    }
+    async readAll() {
+        try {
+            const raw = await fs.readFile(this.filePath, "utf-8");
+            const parsed = JSON.parse(raw);
+            if (!isRecord(parsed) || !isRecord(parsed.servers))
+                return { version: 1, servers: {} };
+            const servers = {};
+            for (const [name, value] of Object.entries(parsed.servers)) {
+                const entry = parseEntry(value);
+                if (entry)
+                    servers[name] = entry;
+            }
+            return { version: 1, servers };
+        }
+        catch {
+            // Missing or malformed: an empty cache is always a safe answer.
+            return { version: 1, servers: {} };
+        }
+    }
+    async writeAll(data) {
+        try {
+            await fs.writeFile(this.filePath, JSON.stringify(data, null, 2), {
+                encoding: "utf-8",
+                mode: 0o600,
+            });
+        }
+        catch (err) {
+            log("WARN", "mcp", "failed to persist MCP catalog cache", {
+                message: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    /**
+     * Cached tools for the given configs, skipping any server whose config hash
+     * changed or whose entry has aged out. Servers with no usable entry are
+     * simply absent from the result.
+     */
+    async entriesFor(configs) {
+        const all = await this.readAll();
+        const fresh = new Map();
+        const now = Date.now();
+        for (const config of configs) {
+            const entry = all.servers[config.name];
+            if (!entry)
+                continue;
+            if (entry.configHash !== hashServerConfig(config))
+                continue;
+            if (now - entry.savedAt > MAX_ENTRY_AGE_MS)
+                continue;
+            fresh.set(config.name, entry);
+        }
+        return fresh;
+    }
+    /** Negotiated protocol era recorded for a server, if its config still matches. */
+    async protocolEraFor(config) {
+        const entries = await this.entriesFor([config]);
+        return entries.get(config.name)?.protocolEra;
+    }
+    /** Record a server's live tool list. Serialized against concurrent saves. */
+    async save(config, tools, protocolEra) {
+        const run = this.writeQueue.then(async () => {
+            const all = await this.readAll();
+            all.servers[config.name] = {
+                configHash: hashServerConfig(config),
+                savedAt: Date.now(),
+                protocolEra: protocolEra ?? all.servers[config.name]?.protocolEra,
+                tools: tools.map((tool) => ({
+                    name: tool.name,
+                    description: tool.description,
+                    ...(tool.rawInputSchema ? { rawInputSchema: tool.rawInputSchema } : {}),
+                })),
+            };
+            await this.writeAll(all);
+        });
+        this.writeQueue = run.catch(() => undefined);
+        await run;
+    }
+    /** Drop a server's cached tools (removal, or a connect that found none). */
+    async clear(name) {
+        const run = this.writeQueue.then(async () => {
+            const all = await this.readAll();
+            if (!all.servers[name])
+                return;
+            delete all.servers[name];
+            await this.writeAll(all);
+        });
+        this.writeQueue = run.catch(() => undefined);
+        await run;
+    }
+}
+//# sourceMappingURL=catalog-cache.js.map

package/dist/core/mcp/catalog-cache.js.map

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

package/dist/core/mcp/catalog-cache.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=catalog-cache.test.d.ts.map

package/dist/core/mcp/catalog-cache.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-cache.test.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/catalog-cache.test.ts"],"names":[],"mappings":""}

package/dist/core/mcp/catalog-cache.test.js

@@ -0,0 +1,99 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { McpCatalogCache, hashServerConfig } from "./catalog-cache.js";
+let dir;
+let file;
+const server = {
+    name: "kencode-search",
+    command: "node",
+    args: ["server.js"],
+};
+beforeEach(async () => {
+    dir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-mcp-catalog-"));
+    file = path.join(dir, "mcp-catalog.json");
+});
+afterEach(async () => {
+    await fs.rm(dir, { recursive: true, force: true });
+});
+describe("hashServerConfig", () => {
+    it("is stable across key and header ordering", () => {
+        const a = { name: "x", url: "https://x", headers: { a: "1", b: "2" } };
+        const b = { name: "x", headers: { b: "2", a: "1" }, url: "https://x" };
+        expect(hashServerConfig(a)).toBe(hashServerConfig(b));
+    });
+    it("changes when the command or args change", () => {
+        expect(hashServerConfig(server)).not.toBe(hashServerConfig({ ...server, args: ["other.js"] }));
+        expect(hashServerConfig(server)).not.toBe(hashServerConfig({ ...server, command: "bun" }));
+    });
+    it("ignores the fields that cannot change the exposed tools", () => {
+        expect(hashServerConfig(server)).toBe(hashServerConfig({ ...server, enabled: false, timeout: 999 }));
+    });
+});
+describe("McpCatalogCache", () => {
+    it("round-trips tools and the negotiated protocol era", async () => {
+        const cache = new McpCatalogCache(file);
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "search code", rawInputSchema: {} }], "legacy");
+        const entries = await new McpCatalogCache(file).entriesFor([server]);
+        expect(entries.get(server.name)?.tools).toEqual([
+            { name: "mcp__kencode-search__search", description: "search code", rawInputSchema: {} },
+        ]);
+        expect(await cache.protocolEraFor(server)).toBe("legacy");
+    });
+    it("invalidates an entry when the server config changes", async () => {
+        const cache = new McpCatalogCache(file);
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]);
+        const changed = { ...server, args: ["different.js"] };
+        expect((await cache.entriesFor([changed])).size).toBe(0);
+        expect((await cache.entriesFor([server])).size).toBe(1);
+    });
+    it("ignores servers that were never cached", async () => {
+        const cache = new McpCatalogCache(file);
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]);
+        expect((await cache.entriesFor([{ name: "other", command: "node" }])).size).toBe(0);
+    });
+    it("treats a malformed cache file as empty instead of throwing", async () => {
+        await fs.writeFile(file, "{ not json", "utf-8");
+        const cache = new McpCatalogCache(file);
+        expect((await cache.entriesFor([server])).size).toBe(0);
+        // And it recovers by overwriting.
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]);
+        expect((await cache.entriesFor([server])).size).toBe(1);
+    });
+    it("drops entries with an invalid shape but keeps the valid ones", async () => {
+        const other = { name: "other", command: "node", args: ["o.js"] };
+        await new McpCatalogCache(file).save(other, [{ name: "mcp__other__a", description: "a" }]);
+        const raw = JSON.parse(await fs.readFile(file, "utf-8"));
+        raw.servers[server.name] = { configHash: 42, tools: "nope" };
+        await fs.writeFile(file, JSON.stringify(raw), "utf-8");
+        const entries = await new McpCatalogCache(file).entriesFor([server, other]);
+        expect(entries.has(server.name)).toBe(false);
+        expect(entries.get(other.name)?.tools).toHaveLength(1);
+    });
+    it("ignores entries that have aged out", async () => {
+        const cache = new McpCatalogCache(file);
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]);
+        const raw = JSON.parse(await fs.readFile(file, "utf-8"));
+        raw.servers[server.name].savedAt = Date.now() - 400 * 24 * 60 * 60 * 1000;
+        await fs.writeFile(file, JSON.stringify(raw), "utf-8");
+        expect((await cache.entriesFor([server])).size).toBe(0);
+    });
+    it("does not lose a concurrent save from another server", async () => {
+        const cache = new McpCatalogCache(file);
+        const other = { name: "other", command: "node", args: ["o.js"] };
+        await Promise.all([
+            cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]),
+            cache.save(other, [{ name: "mcp__other__a", description: "a" }]),
+        ]);
+        const entries = await cache.entriesFor([server, other]);
+        expect([...entries.keys()].sort()).toEqual(["kencode-search", "other"]);
+    });
+    it("clears a server's entry", async () => {
+        const cache = new McpCatalogCache(file);
+        await cache.save(server, [{ name: "mcp__kencode-search__search", description: "x" }]);
+        await cache.clear(server.name);
+        expect((await cache.entriesFor([server])).size).toBe(0);
+    });
+});
+//# sourceMappingURL=catalog-cache.test.js.map

package/dist/core/mcp/catalog-cache.test.js.map

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

package/dist/core/mcp/client.d.ts

@@ -1,5 +1,6 @@
 import type { AgentTool } from "@kenkaiiii/gg-agent";
 import type { MCPServerConfig } from "./types.js";
+import { McpCatalogCache } from "./catalog-cache.js";
 /** Per-server connection outcome for the dashboard / non-interactive list. */
 export interface MCPConnectResult {
     name: string;
@@ -17,8 +18,59 @@ export interface MCPLoginResult {
     toolCount: number;
     error?: string;
 }
+/** Terminal state of one server's connection attempt, awaited by `whenConnected`. */
+type ConnectionOutcome = {
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+};
 export declare class MCPClientManager {
     private servers;
+    /**
+     * Per-server connection settlement, so a caller holding a cached-only tool
+     * can wait for the live client instead of failing or hanging forever.
+     */
+    private connections;
+    private readonly catalogCache;
+    /**
+     * Opt into the 2026-07-28 revision. Off by default: `mode: "auto"` probes with
+     * `server/discover` before falling back to `initialize`, and a legacy stdio
+     * server that ignores pre-`initialize` requests pays the full probe timeout.
+     */
+    private readonly modernProtocol;
+    constructor(opts?: {
+        catalogCache?: McpCatalogCache;
+        modernProtocol?: boolean;
+    });
+    /**
+     * Version-negotiation options for a real (non-probe) connect. `probe()` is
+     * spawn-per-invocation and deliberately never negotiates: a legacy stdio
+     * server that ignores the discovery request would stall it for the whole
+     * probe timeout, turning "validate this server" into a 30s hang.
+     *
+     * The probe timeout is transport-aware because the SDK's timeout VERDICT is:
+     *
+     * - **stdio** — silence on a local pipe means a legacy server, and the SDK
+     *   falls back to `initialize`. The probe runs on a disposable sibling
+     *   process, so the fallback is clean. Waiting the full connect timeout to
+     *   reach a conclusion we can draw in seconds is pure dead time, so cap it
+     *   short.
+     * - **HTTP** — silence means an outage, and the SDK REJECTS the connect
+     *   rather than falling back. A short timeout would therefore turn a slow
+     *   cold start into a hard connection failure, so inherit the full connect
+     *   timeout and let the normal timeout handling deal with a real outage.
+     */
+    private negotiationOptions;
+    /** Get-or-create the settlement record for one server name. */
+    private connectionSlot;
+    /**
+     * Resolve once a server's connection attempt has settled. Returns `ok:false`
+     * with the failure reason when that server could not connect, and times out
+     * rather than hanging when no attempt is ever made (e.g. a server that was
+     * removed from the config since the catalog cache was written).
+     */
+    whenConnected(name: string, timeoutMs?: number): Promise<ConnectionOutcome>;
     connectAll(configs: MCPServerConfig[]): Promise<AgentTool[]>;
     /**
      * Connect every enabled server and return one result per server (success →
@@ -56,6 +108,15 @@ export declare class MCPClientManager {
      * protocol mismatch as a login requirement.
      */
     private connectHttp;
+    /**
+     * Protocol era actually negotiated with a server, as the SDK reports it.
+     * Undefined before a connect completes; with negotiation off the SDK always
+     * settles on `legacy` (the 2025 `initialize` handshake).
+     */
+    private negotiatedEra;
+    /** Previously negotiated era for this exact server config, if still cached. */
+    private cachedEra;
     dispose(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/core/mcp/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiBlD,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oFACgF;IAChF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAyB;IAElC,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKlE;;;;OAIG;IACG,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAuBjF;;;;OAIG;IACG,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB/D;;;;;;;;;;OAUG;IACG,KAAK,CACT,MAAM,EAAE,eAAe,EACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,SAAU,GAClB,OAAO,CAAC,cAAc,CAAC;YAwHZ,aAAa;IAgI3B;;;;;;;;;OASG;YACW,WAAW;IAiDnB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AASlD,OAAO,EAAE,eAAe,EAAoB,MAAM,oBAAoB,CAAC;AASvE,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oFACgF;IAChF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qFAAqF;AACrF,KAAK,iBAAiB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAyB;IACxC;;;OAGG;IACH,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;gBAE7B,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,eAAe,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO;IAKnF;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,kBAAkB;IAU1B,+DAA+D;IAC/D,OAAO,CAAC,cAAc;IAetB;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkB3E,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKlE;;;;OAIG;IACG,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAmCjF;;;;OAIG;IACG,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB/D;;;;;;;;;;OAUG;IACG,KAAK,CACT,MAAM,EAAE,eAAe,EACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,SAAU,GAClB,OAAO,CAAC,cAAc,CAAC;YA2HZ,aAAa;IAkK3B;;;;;;;;;OASG;YACW,WAAW;IAkDzB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAIrB,+EAA+E;YACjE,SAAS;IAQjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAW/B"}