zcode-acp-server 0.1.0 → 0.2.0

package/dist/config/mcp-discovery.js

@@ -0,0 +1,153 @@
+/**
+ * MCP server discovery — reads MCP server configurations from the same sources
+ * ZCode uses, so `/mcp` can show users exactly which servers are available.
+ *
+ * Sources:
+ *   1. ~/.zcode/cli/config.json → mcp.servers (user-configured)
+ *   2. Enabled plugin .mcp.json files (two formats: flat and nested)
+ *
+ * The ZCode backend loads these automatically and exposes their tools to the
+ * model. This module is purely informational — it lists what's configured so
+ * users know what's available without needing the TUI.
+ */
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import path from "node:path";
+import { compareVersions, log } from "../utils.js";
+const HOME = homedir();
+const CLI_CONFIG_PATH = path.join(HOME, ".zcode", "cli", "config.json");
+const PLUGIN_CACHE_DIR = path.join(HOME, ".zcode", "cli", "plugins", "cache");
+/**
+ * Discover all MCP servers from config.json and enabled plugins.
+ *
+ * Best-effort: failures are logged and swallowed.
+ */
+export function loadMcpServers() {
+    const results = [];
+    let config = null;
+    try {
+        if (existsSync(CLI_CONFIG_PATH)) {
+            config = JSON.parse(readFileSync(CLI_CONFIG_PATH, "utf8"));
+        }
+    }
+    catch (e) {
+        log(`mcp-discovery: config read failed (${e instanceof Error ? e.message : String(e)})`);
+        return results;
+    }
+    // 1. User-configured servers from config.json.
+    const servers = config?.mcp?.servers ?? {};
+    for (const [name, cfg] of Object.entries(servers)) {
+        results.push({
+            name,
+            type: cfg.type ?? "stdio",
+            command: cfg.command,
+            args: cfg.args,
+            url: cfg.url,
+            source: "config",
+        });
+    }
+    // 2. Plugin-provided servers from .mcp.json files.
+    const enabledPlugins = config?.plugins?.enabledPlugins ?? {};
+    for (const [pluginKey, enabledFlag] of Object.entries(enabledPlugins)) {
+        if (!enabledFlag)
+            continue;
+        const atIdx = pluginKey.indexOf("@");
+        if (atIdx <= 0)
+            continue;
+        const pluginName = pluginKey.slice(0, atIdx);
+        const marketplace = pluginKey.slice(atIdx + 1);
+        const pluginDir = path.join(PLUGIN_CACHE_DIR, marketplace, pluginName);
+        if (!existsSync(pluginDir))
+            continue;
+        // Find the latest version directory.
+        let latestVersion = "";
+        try {
+            for (const entry of readdirSync(pluginDir)) {
+                const vDir = path.join(pluginDir, entry);
+                if (statSync(vDir).isDirectory() && compareVersions(entry, latestVersion) > 0) {
+                    latestVersion = entry;
+                }
+            }
+        }
+        catch {
+            continue;
+        }
+        if (!latestVersion)
+            continue;
+        const mcpFile = path.join(pluginDir, latestVersion, ".mcp.json");
+        if (!existsSync(mcpFile))
+            continue;
+        try {
+            const mcpConfig = JSON.parse(readFileSync(mcpFile, "utf8"));
+            // Two formats:
+            //   Flat:   { "server-name": { "command": "..." } }
+            //   Nested: { "mcpServers": { "server-name": { ... } } }
+            const serverMap = mcpConfig["mcpServers"] ?? mcpConfig;
+            for (const [name, cfg] of Object.entries(serverMap)) {
+                results.push({
+                    name,
+                    type: cfg.type ?? "stdio",
+                    command: cfg.command,
+                    args: cfg.args,
+                    url: cfg.url,
+                    source: `plugin: ${pluginName}`,
+                });
+            }
+        }
+        catch (e) {
+            log(`mcp-discovery: failed to read ${mcpFile} (${e instanceof Error ? e.message : String(e)})`);
+        }
+    }
+    log(`mcp-discovery: found ${results.length} MCP server(s)`);
+    return results;
+}
+/**
+ * Format MCP servers into a human-readable card for the `/mcp` command.
+ *
+ * Groups by source (config vs plugins) and aligns columns for readability.
+ */
+export function formatMcpServers(servers) {
+    if (servers.length === 0) {
+        return "📡 No MCP servers configured.\nUse the ZCode desktop app to add MCP servers.";
+    }
+    const configServers = servers.filter((s) => s.source === "config");
+    const pluginServers = servers.filter((s) => s.source !== "config");
+    const lines = [`📡 MCP Servers (${servers.length})`];
+    if (configServers.length > 0) {
+        lines.push("", "From config.json:");
+        for (const s of configServers) {
+            lines.push(`  ${pad(s.name, 16)} ${pad(s.type, 6)} ${formatEndpoint(s)}`);
+        }
+    }
+    if (pluginServers.length > 0) {
+        lines.push("", "From plugins:");
+        for (const s of pluginServers) {
+            const pluginLabel = `[${s.source.replace("plugin: ", "")}]`;
+            lines.push(`  ${pad(s.name, 16)} ${pad(s.type, 6)} ${formatEndpoint(s)}  ${pluginLabel}`);
+        }
+    }
+    lines.push("", "MCP tools are auto-invoked by the model when needed.");
+    return lines.join("\n");
+}
+/** Format the endpoint/command string for display. */
+function formatEndpoint(s) {
+    if (s.url) {
+        try {
+            const u = new URL(s.url);
+            return u.host + u.pathname;
+        }
+        catch {
+            return s.url;
+        }
+    }
+    if (s.command) {
+        const args = s.args?.length ? " " + s.args.join(" ") : "";
+        return s.command + args;
+    }
+    return "?";
+}
+/** Pad a string to the given width for column alignment. */
+function pad(s, width) {
+    return s.length >= width ? s : s + " ".repeat(width - s.length);
+}
+//# sourceMappingURL=mcp-discovery.js.map

package/dist/config/mcp-discovery.js.map

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

package/dist/config/model-cache.d.ts

@@ -9,12 +9,23 @@
 import type * as acp from "@agentclientprotocol/sdk";
 import type { ZcodeAcpServer } from "../server.js";
 import type { ProjectionDiffer } from "../translators/projection-differ.js";
-/** Read the session's current model id, with a per-session cache. */
+/**
+ * Read the session's current model as an encoded `"providerId\modelId"` string,
+ * with a per-session cache. Returns the encoded form so callers can resolve the
+ * provider (for context-window lookup / model switching) without a second read.
+ */
 export declare function currentModelCached(server: ZcodeAcpServer, zcodeSid: string): Promise<string>;
 /**
  * Emit an initial usage_update after resume/load so the editor shows the
  * context bar. Skips when there's no token data (resume before any turn → 0).
  * Also syncs the differ's usage baseline so the first turn won't re-emit it.
+ *
+ * Note: the backend's `projection.contextUsed` is 0 after resume — it only
+ * updates after a new turn completes. So a resumed session with history won't
+ * show a context bar until the first post-resume message. That's acceptable:
+ * we don't have a reliable way to estimate the pre-resume context size, and
+ * guessing wrong (e.g. from per-turn token totals that include re-sent history)
+ * is worse than showing nothing.
  */
 export declare function emitInitialUsage(server: ZcodeAcpServer, cx: acp.AgentContext, acpSid: string, zcodeSid: string, differ: ProjectionDiffer | undefined): Promise<void>;
 //# sourceMappingURL=model-cache.d.ts.map

package/dist/config/model-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-cache.d.ts","sourceRoot":"","sources":["../../src/config/model-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAKrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,qEAAqE;AACrE,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,GAAG,CAAC,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"model-cache.d.ts","sourceRoot":"","sources":["../../src/config/model-cache.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAYrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,GAAG,CAAC,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist/config/model-cache.js

@@ -6,32 +6,52 @@
  * after resume/load so the editor shows the context bar immediately (only when
  * there's actual token data — resume before any turn has 0, which we skip).
  */
-import { modelContextWindow } from "./options.js";
+import { DEFAULT_MODEL_ID, DEFAULT_PROVIDER_ID, formatModelValue, loadAllModels, modelContextWindow, parseModelValue, } from "./options.js";
 import { log } from "../utils.js";
 import { dispatchEvent } from "../handlers/dispatch.js";
-/** Read the session's current model id, with a per-session cache. */
+/**
+ * Read the session's current model as an encoded `"providerId\modelId"` string,
+ * with a per-session cache. Returns the encoded form so callers can resolve the
+ * provider (for context-window lookup / model switching) without a second read.
+ */
 export async function currentModelCached(server, zcodeSid) {
     const cached = server.modelCache.get(zcodeSid);
     if (cached)
         return cached;
-    let modelId = "GLM-5.2";
+    let providerId = "";
+    let modelId = DEFAULT_MODEL_ID;
     try {
         const read = await sessionRead(server, zcodeSid);
         const settings = (read.settings ?? {});
-        const cur = settings.model?.current;
+        const cur = settings.model
+            ?.current;
+        if (cur?.providerId)
+            providerId = cur.providerId;
         if (cur?.modelId)
             modelId = cur.modelId;
     }
     catch (e) {
         log(`model-cache: session/read failed (${e instanceof Error ? e.message : String(e)})`);
     }
-    server.modelCache.set(zcodeSid, modelId);
-    return modelId;
+    if (!providerId) {
+        // Legacy session without a providerId — resolve to the first enabled provider.
+        providerId = loadAllModels()[0]?.providerId ?? DEFAULT_PROVIDER_ID;
+    }
+    const encoded = formatModelValue(providerId, modelId);
+    server.modelCache.set(zcodeSid, encoded);
+    return encoded;
 }
 /**
  * Emit an initial usage_update after resume/load so the editor shows the
  * context bar. Skips when there's no token data (resume before any turn → 0).
  * Also syncs the differ's usage baseline so the first turn won't re-emit it.
+ *
+ * Note: the backend's `projection.contextUsed` is 0 after resume — it only
+ * updates after a new turn completes. So a resumed session with history won't
+ * show a context bar until the first post-resume message. That's acceptable:
+ * we don't have a reliable way to estimate the pre-resume context size, and
+ * guessing wrong (e.g. from per-turn token totals that include re-sent history)
+ * is worse than showing nothing.
  */
 export async function emitInitialUsage(server, cx, acpSid, zcodeSid, differ) {
     try {
@@ -43,8 +63,10 @@ export async function emitInitialUsage(server, cx, acpSid, zcodeSid, differ) {
         if (!used)
             return; // resume before any turn: skip to avoid showing 0.
         let size = proj.contextWindow ?? 0;
-        if (!size)
-            size = modelContextWindow(await currentModelCached(server, zcodeSid));
+        if (!size) {
+            const { providerId, modelId } = parseModelValue(await currentModelCached(server, zcodeSid));
+            size = modelContextWindow(providerId, modelId);
+        }
         await dispatchEvent(server, cx, acpSid, { kind: "UsageDelta", used, size }, `init_${zcodeSid.slice(0, 8)}`);
         differ?.setLastUsage(used);
     }

package/dist/config/model-cache.js.map

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

package/dist/config/options.d.ts

@@ -11,14 +11,87 @@
  */
 import type * as acp from "@agentclientprotocol/sdk";
 import type { ZcodeAcpServer } from "../server.js";
-/** Read the model id list for the enabled provider from config.json. */
-export declare function loadProviderModels(): string[];
-/** Read the context-window size for a model from config.json (limit.context). */
-export declare function modelContextWindow(modelId: string): number;
-/** Build the ACP SessionModeState ({currentModeId, availableModes}). */
-export declare function buildModes(server: ZcodeAcpServer, zcodeSid: string): Promise<acp.SessionModeState>;
-/** Build the ACP configOptions array (3 items: model/mode/thought). */
-export declare function buildConfigOptions(server: ZcodeAcpServer, zcodeSid: string): Promise<acp.SessionConfigOption[]>;
+interface ProviderModelsJson {
+    [modelId: string]: {
+        limit?: {
+            context?: number;
+        };
+    } | undefined;
+}
+/** A single provider's entry in config.json (`provider.<providerId>`). */
+interface ProviderEntry {
+    name?: string;
+    kind?: string;
+    enabled?: boolean;
+    options?: {
+        baseURL?: string;
+        apiKey?: string;
+    };
+    models?: ProviderModelsJson;
+}
+/**
+ * Fallback defaults for when config.json is unreadable or has no enabled
+ * provider — keeps a freshly-installed editor functional. Must stay in sync
+ * with the model the app ships first in its provider list.
+ */
+export declare const DEFAULT_PROVIDER_ID = "builtin:bigmodel-coding-plan";
+export declare const DEFAULT_PROVIDER_NAME = "BigModel";
+export declare const DEFAULT_MODEL_ID = "GLM-5.3";
+/** A model selectable in the dropdown, with its owning provider. */
+export interface ModelRef {
+    providerId: string;
+    providerName: string;
+    modelId: string;
+}
+/**
+ * Collect models from config.json for the dropdown.
+ *
+ * Builtin providers (id prefix `builtin:`) must be `enabled: true` — they
+ * reflect the plans the user activated in the ZCode desktop app. Custom
+ * (third-party) providers are included UNLESS explicitly `enabled: false`:
+ * the newer CLI leaves the flag unset on active third-party providers, so
+ * treating "absent" as enabled keeps them in the dropdown while still
+ * honoring an explicit disable.
+ */
+export declare function loadAllModels(): ModelRef[];
+/** Look up a provider entry by id (any provider, not just enabled). */
+export declare function findProviderConfig(providerId: string): ProviderEntry | null;
+/** Read the context-window size for a provider+model from config.json. */
+export declare function modelContextWindow(providerId: string, modelId: string): number;
+/** Builtin providerIds are prefixed with `builtin:` (e.g. `builtin:bigmodel`). */
+export declare function isBuiltinProvider(providerId: string): boolean;
+/**
+ * Encode a provider+model pair into a configOption `value` string.
+ *
+ * Builtin providers encode as the bare modelId (legacy form, keeps the dropdown
+ * clean for the common case). Third-party providers encode as
+ * `providerId\modelId` — `\` is unambiguous because providerIds (UUIDs) and
+ * modelIds (`/`-separated) never contain it.
+ */
+export declare function formatModelValue(providerId: string, modelId: string): string;
+/**
+ * Parse a configOption `value` back into { providerId, modelId }.
+ *
+ * A value without `\` is a builtin modelId (legacy form) → resolve to the first
+ * enabled builtin provider. A value with `\` is a third-party provider+model.
+ */
+export declare function parseModelValue(value: string): {
+    providerId: string;
+    modelId: string;
+};
+/** Build the ACP SessionModeState ({currentModeId, availableModes}).
+ *  zcodeSid null = pending session (session/new not yet materialized) — skip
+ *  the backend read and return defaults. */
+export declare function buildModes(server: ZcodeAcpServer, zcodeSid: string | null): Promise<acp.SessionModeState>;
+export declare function orderThoughtVariants(variants: string[]): Array<{
+    value: string;
+    name: string;
+}>;
+/** Build the ACP configOptions array (3 items: model/mode/thought).
+ *  zcodeSid null = pending session — skip the backend read and use defaults;
+ *  mode defaults to "yolo" (the mode session/create hardcodes) so the dropdown
+ *  matches the mode indicator for a fresh session. */
+export declare function buildConfigOptions(server: ZcodeAcpServer, zcodeSid: string | null): Promise<acp.SessionConfigOption[]>;
 /**
  * Dispatch session/set_config_option. mode/thought forward to setMode/
  * setThoughtLevel; model routes through applyModelSwitch (runtime-model.ts).
@@ -31,6 +104,11 @@ export declare function setConfigOption(server: ZcodeAcpServer, zcodeSid: string
     currentValue: string;
 } | null>;
 /** Emit a config_option_update (+ current_mode_update for mode) after a change.
- *  Returns the rebuilt options so the caller can include them in the response. */
+ *  Returns the rebuilt options so the caller can include them in the response.
+ *
+ *  For model switches, also emit a usage_update with the NEW model's context
+ *  window (from config.json) so the editor's context bar refreshes immediately
+ *  instead of waiting for the next turn's UsageDelta. */
 export declare function emitConfigOptionUpdate(server: ZcodeAcpServer, cx: acp.AgentContext, acpSid: string, zcodeSid: string, kind: "model" | "mode" | "thought"): Promise<acp.SessionConfigOption[]>;
+export {};
 //# sourceMappingURL=options.d.ts.map

package/dist/config/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/config/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAIrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAgBnD,wEAAwE;AACxE,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAS7C;AAED,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAS1D;AAED,wEAAwE;AACxE,wBAAsB,UAAU,CAC9B,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAc/B;AAED,uEAAuE;AACvE,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAyDpC;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAkB9E;AAED;kFACkF;AAClF,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,GAAG,CAAC,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GACjC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAcpC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/config/options.ts"],"names":[],"mappings":"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"}