zcode-acp-server 0.1.0 → 0.2.0

package/dist/config/provider-registry.js

@@ -0,0 +1,128 @@
+/**
+ * Build a provider-registry payload for `workspace/updateProviderRegistry`.
+ *
+ * The V4 backend doesn't auto-load providers from config.json — the host must
+ * push them via this RPC after `session/create`, otherwise third-party
+ * providers fail with `provider_not_configured` (misclassified as a network
+ * error after turn-retry exhausts). ZCode app does this from its
+ * ModelProviderService; the bridge mirrors it by reading config.json directly.
+ *
+ * Provider element schema (from the backend's `j7t` converter in zcode.cjs):
+ *   { providerId, apiKey?, apiKeyRequired?, apiFormat?, baseURL?, headers?,
+ *     kind?, label?, models?, providerOptions?, source? }
+ * `apiKey` is a discriminated union `{source:"inline", value:"<key>"}` — a
+ * bare string is rejected. `apiFormat` maps from `kind`:
+ *   anthropic → "anthropic-messages", openai-compatible → "openai-chat-completions".
+ */
+import { readFileSync } from "node:fs";
+import { ZCODE_CREDS_PATH, log } from "../utils.js";
+/** Map config.json `kind` → backend `apiFormat`. */
+function apiFormatForKind(kind) {
+    if (!kind)
+        return undefined;
+    if (kind.includes("anthropic"))
+        return "anthropic-messages";
+    if (kind.includes("openai"))
+        return "openai-chat-completions";
+    return undefined;
+}
+/**
+ * Build a single model element from a config.json model entry.
+ *
+ * Beyond `{modelId}`, the backend's schema accepts label / contextWindow /
+ * maxOutputTokens / reasoning. `reasoning` is the important one: without it
+ * the backend falls back to the apiFormat's default thought levels (a 2-state
+ * enabled/disabled for anthropic-messages), losing the provider's real
+ * variants (e.g. max/high/low) — the session then shows a wrong thought-level
+ * dropdown. config.json's `variants`/`defaultVariant` map to the protocol's
+ * `levels`/`defaultLevel`.
+ *
+ * Exported: runtime-model.ts reuses it for the `runtimeModel` overlay — both
+ * paths must carry identical model definitions or the overlay (resume /
+ * setModel) silently downgrades the session back to the 2-state default.
+ */
+export function buildModelElement(modelId, m) {
+    const el = { modelId };
+    if (m.name)
+        el.label = m.name;
+    if (m.limit?.context)
+        el.contextWindow = m.limit.context;
+    if (m.limit?.output)
+        el.maxOutputTokens = m.limit.output;
+    const variants = m.reasoning?.variants ?? [];
+    if (m.reasoning?.enabled && variants.length > 0) {
+        const reasoning = {
+            enabled: true,
+            levels: variants.map((v) => ({ value: v, label: v })),
+        };
+        if (m.reasoning.defaultVariant)
+            reasoning.defaultLevel = m.reasoning.defaultVariant;
+        el.reasoning = reasoning;
+    }
+    return el;
+}
+/** Build a single provider element from a config.json entry. */
+function buildProviderElement(providerId, p) {
+    // models MUST be an array — the backend's strict schema rejects the object
+    // form ({modelId: {...}}) that config.json uses.
+    const models = Object.entries(p.models ?? {}).map(([modelId, m]) => buildModelElement(modelId, m ?? {}));
+    const el = {
+        providerId,
+        kind: p.kind,
+        apiFormat: apiFormatForKind(p.kind),
+        baseURL: p.options?.baseURL,
+        label: p.name ?? providerId,
+        models,
+        source: p.source ?? "custom",
+    };
+    if (p.options?.apiKeyRequired !== undefined) {
+        el.apiKeyRequired = p.options.apiKeyRequired;
+    }
+    // apiKey MUST be the inline union shape — a bare string is rejected by the
+    // backend's strict schema. When present, the backend stores it into its
+    // session secrets and resolves auth from there (no separate headers callback
+    // needed for these providers).
+    if (p.options?.apiKey) {
+        el.apiKey = { source: "inline", value: p.options.apiKey };
+    }
+    // Omit undefined values so the payload stays clean.
+    for (const k of Object.keys(el)) {
+        if (el[k] === undefined)
+            delete el[k];
+    }
+    return el;
+}
+/**
+ * Build the registry payload from ALL providers in config.json.
+ *
+ * Unlike `loadAllModels` (dropdown, enabled-only), the registry pushes every
+ * configured provider so the backend recognises any of them when a session
+ * switches to it. The backend applies its own enable/availability rules.
+ */
+export function buildProviderRegistry() {
+    const cfg = JSON.parse(readFileSync(ZCODE_CREDS_PATH, "utf8"));
+    const providers = Object.entries(cfg.provider ?? {}).map(([pid, p]) => buildProviderElement(pid, p ?? {}));
+    const generatedAt = Date.now();
+    // revision is a content hash; the backend skips unchanged revisions. A stable
+    // JSON hash over provider ids+kinds+baseURLs is enough — apiKey changes are
+    // rare and a generatedAt bump alone won't force re-apply (revision is the gate).
+    const revision = hashRevision(providers);
+    log(`provider-registry: built ${providers.length} provider(s) ` +
+        `(ids: ${providers.map((p) => p.providerId).join(", ") || "none"})`);
+    return { providers, generatedAt, revision };
+}
+/** Stable short hash over provider ids + kind + baseURL + models (revision gate). */
+function hashRevision(providers) {
+    const sig = providers
+        .map((p) => `${p.providerId}|${p.kind ?? ""}|${p.baseURL ?? ""}|${JSON.stringify(p.models ?? [])}`)
+        .sort()
+        .join("\n");
+    // FNV-1a 32-bit → hex; cheap, dependency-free, stable.
+    let h = 0x811c9dc5;
+    for (let i = 0; i < sig.length; i++) {
+        h ^= sig.charCodeAt(i);
+        h = Math.imul(h, 0x01000193);
+    }
+    return (h >>> 0).toString(16).padStart(8, "0");
+}
+//# sourceMappingURL=provider-registry.js.map

package/dist/config/provider-registry.js.map

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

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

@@ -1,33 +1,69 @@
 /**
  * runtimeModel overlay plumbing.
  *
- * The backend resolves auth from its OAuth token store, so the `runtimeModel`
- * provider deliberately carries NO `apiKey` (the config.json apiKey is the
- * legacy plain key and has expired → 401). Two uses:
+ * The runtimeModel names the provider+model a session should use. For THIRD-
+ * PARTY providers it also carries `apiKey` as `{source:"inline", value:"<key>"}`;
+ * the backend resolves model-call auth from the overlay itself, so omitting it
+ * yields HTTP 401 "Missing API key". Builtin providers keep using their own
+ * OAuth/config auth and never inline a key. `apiFormat` mirrors `kind`.
  *
- *   1. Resume overlay (`buildResumeRuntimeModel`): a resumed session may carry
- *      a stale provider id in its history that the backend can no longer
- *      authenticate. Sending the *current* enabled provider's runtimeModel at
- *      resume makes the backend overlay it and use its own OAuth creds.
+ * Two uses:
+ *
+ *   1. Resume/load overlay (`buildResumeRuntimeModel`): a resumed session may
+ *      carry a stale/revoked model in its history → send fails with "历史模型
+ *      不可用". The overlay pins the session onto the default model — the FIRST
+ *      enabled provider's FIRST model, the same one a fresh `session/new` lands
+ *      on — so resume never inherits the session's last-used (possibly
+ *      third-party / unavailable) model.
  *
  *   2. Model switch (`applyModelSwitch`): UI/slash model switching goes through
- *      `session/updateRuntimeModelConfig` with `applyModelSelection:true` (a
- *      runtime-only change, sidestepping `session/setModel`'s "no loaded config
- *      file" persistence failure).
+ *      `session/setModel` with both a `model` ref and a `runtimeModel` provider
+ *      definition (runtime-only via `persistAsWorkspaceLastUsed:false`).
+ *
+ * Note: a provider registry push (`workspace/updateProviderRegistry`) is ALSO
+ * required for the backend to recognise third-party providers at all — without
+ * it the turn fails with `provider_not_configured` before auth is even tried.
+ * See provider-registry.ts.
  */
+import { formatModelValue } from "./options.js";
+import type { ModelRef } from "./options.js";
 import type { ZcodeAcpServer } from "../server.js";
-/** Build a runtimeModel overlay object for the enabled provider. */
-export declare function buildRuntimeModel(modelId?: string, revision?: string): unknown | null;
-/** Build the resume-time overlay (current enabled provider, default model). */
+/**
+ * Build a runtimeModel overlay for the given provider+model.
+ *
+ * For THIRD-PARTY providers the overlay MUST carry `apiKey` as the inline union
+ * `{source:"inline", value:"<key>"}` — the backend resolves model-call auth from
+ * the runtimeModel itself, so omitting it yields HTTP 401 "Missing API key".
+ * (This was previously believed unnecessary; live probing proved otherwise.)
+ * Builtin providers resolve auth from their own OAuth/config store, so no
+ * apiKey is sent for them. `apiFormat` mirrors `kind` per the backend's catalog.
+ */
+export declare function buildRuntimeModel(ref: ModelRef, revision?: string): unknown | null;
+/**
+ * Build the resume-time overlay pinned to the default model: the FIRST enabled
+ * provider's FIRST model (the same one a fresh `session/new` lands on). This
+ * ensures resume never inherits the session's last-used model, which may be a
+ * now-unavailable third-party model (e.g. Nvidia) and cause "历史模型不可用".
+ */
 export declare function buildResumeRuntimeModel(): unknown | null;
 /**
- * Switch a session's model via session/updateRuntimeModelConfig.
+ * Switch a session's model via `session/setModel`.
+ *
+ * `value` is the configOption value: either `"providerId\modelId"` (encoded) or
+ * a legacy plain modelId (resolved to the first enabled builtin provider).
+ *
+ * Sends BOTH a `model` ref (the target) AND a `runtimeModel` (the full provider
+ * definition). The runtimeModel lets the backend register the provider into its
+ * workspace catalog (so even third-party / non-default models are recognised),
+ * while `model` names the selection. `persistAsWorkspaceLastUsed:false` keeps
+ * this a runtime-only change. Invalidates the model cache on success.
  *
- * Uses `applyModelSelection:true` so the change applies at runtime without
- * persistence — sidestepping `session/setModel`'s "no loaded config file"
- * failure. Invalidates the model cache on success. Returns true on success.
+ * NOTE: the older `session/updateRuntimeModelConfig` path returns `changed:false`
+ * on current backends without applying — `session/setModel` is the working
+ * protocol since the backend model-management refactor.
  */
-export declare function applyModelSwitch(server: ZcodeAcpServer, zcodeSid: string, modelId: string): Promise<boolean>;
+export declare function applyModelSwitch(server: ZcodeAcpServer, zcodeSid: string, value: string): Promise<boolean>;
 /** Invalidate the session-level model cache after a switch. */
 export declare function invalidateModelCache(server: ZcodeAcpServer, zcodeSid: string): void;
+export { formatModelValue };
 //# sourceMappingURL=runtime-model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime-model.d.ts","sourceRoot":"","sources":["../../src/config/runtime-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAoDnD,oEAAoE;AACpE,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,SAAW,GAAG,OAAO,GAAG,IAAI,CAcvF;AAED,+EAA+E;AAC/E,wBAAgB,uBAAuB,IAAI,OAAO,GAAG,IAAI,CAExD;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED,+DAA+D;AAC/D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAEnF"}
+{"version":3,"file":"runtime-model.d.ts","sourceRoot":"","sources":["../../src/config/runtime-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,EAEL,gBAAgB,EAIjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAWnD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,SAAW,GAAG,OAAO,GAAG,IAAI,CAkCpF;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,GAAG,IAAI,CAOxD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,+DAA+D;AAC/D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAEnF;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/config/runtime-model.js

@@ -1,87 +1,129 @@
 /**
  * runtimeModel overlay plumbing.
  *
- * The backend resolves auth from its OAuth token store, so the `runtimeModel`
- * provider deliberately carries NO `apiKey` (the config.json apiKey is the
- * legacy plain key and has expired → 401). Two uses:
+ * The runtimeModel names the provider+model a session should use. For THIRD-
+ * PARTY providers it also carries `apiKey` as `{source:"inline", value:"<key>"}`;
+ * the backend resolves model-call auth from the overlay itself, so omitting it
+ * yields HTTP 401 "Missing API key". Builtin providers keep using their own
+ * OAuth/config auth and never inline a key. `apiFormat` mirrors `kind`.
  *
- *   1. Resume overlay (`buildResumeRuntimeModel`): a resumed session may carry
- *      a stale provider id in its history that the backend can no longer
- *      authenticate. Sending the *current* enabled provider's runtimeModel at
- *      resume makes the backend overlay it and use its own OAuth creds.
+ * Two uses:
+ *
+ *   1. Resume/load overlay (`buildResumeRuntimeModel`): a resumed session may
+ *      carry a stale/revoked model in its history → send fails with "历史模型
+ *      不可用". The overlay pins the session onto the default model — the FIRST
+ *      enabled provider's FIRST model, the same one a fresh `session/new` lands
+ *      on — so resume never inherits the session's last-used (possibly
+ *      third-party / unavailable) model.
  *
  *   2. Model switch (`applyModelSwitch`): UI/slash model switching goes through
- *      `session/updateRuntimeModelConfig` with `applyModelSelection:true` (a
- *      runtime-only change, sidestepping `session/setModel`'s "no loaded config
- *      file" persistence failure).
+ *      `session/setModel` with both a `model` ref and a `runtimeModel` provider
+ *      definition (runtime-only via `persistAsWorkspaceLastUsed:false`).
+ *
+ * Note: a provider registry push (`workspace/updateProviderRegistry`) is ALSO
+ * required for the backend to recognise third-party providers at all — without
+ * it the turn fails with `provider_not_configured` before auth is even tried.
+ * See provider-registry.ts.
  */
-import { readFileSync } from "node:fs";
-import { ZCODE_CREDS_PATH, log, warn } from "../utils.js";
-const DEFAULTS = {
-    providerId: "builtin:bigmodel-coding-plan",
-    kind: "anthropic",
-    baseURL: "https://open.bigmodel.cn/api/anthropic",
-    modelId: "GLM-5.2",
-    models: ["GLM-5.2"],
-};
-/** Read the enabled provider's config from config.json (no apiKey). */
-function readEnabledProvider() {
-    try {
-        const cfg = JSON.parse(readFileSync(ZCODE_CREDS_PATH, "utf8"));
-        for (const [pid, p] of Object.entries(cfg.provider ?? {})) {
-            if (p?.enabled) {
-                const opts = p.options ?? {};
-                const modelKeys = Object.keys(p.models ?? {});
-                return {
-                    providerId: pid,
-                    kind: p.kind ?? DEFAULTS.kind,
-                    baseURL: opts.baseURL || DEFAULTS.baseURL,
-                    modelId: modelKeys[0] ?? DEFAULTS.modelId,
-                    models: modelKeys.length > 0 ? modelKeys : DEFAULTS.models,
-                };
-            }
-        }
+import { buildModelElement } from "./provider-registry.js";
+import { findProviderConfig, formatModelValue, isBuiltinProvider, loadAllModels, parseModelValue, } from "./options.js";
+import { log, warn } from "../utils.js";
+const DEFAULT_KIND = "anthropic";
+const DEFAULT_BASE_URL = "https://open.bigmodel.cn/api/anthropic";
+/** Map config.json `kind` → backend `apiFormat`. */
+function apiFormatForKind(kind) {
+    if (kind?.includes("anthropic"))
+        return "anthropic-messages";
+    return "openai-chat-completions";
+}
+/**
+ * Build a runtimeModel overlay for the given provider+model.
+ *
+ * For THIRD-PARTY providers the overlay MUST carry `apiKey` as the inline union
+ * `{source:"inline", value:"<key>"}` — the backend resolves model-call auth from
+ * the runtimeModel itself, so omitting it yields HTTP 401 "Missing API key".
+ * (This was previously believed unnecessary; live probing proved otherwise.)
+ * Builtin providers resolve auth from their own OAuth/config store, so no
+ * apiKey is sent for them. `apiFormat` mirrors `kind` per the backend's catalog.
+ */
+export function buildRuntimeModel(ref, revision = "bridge") {
+    const p = findProviderConfig(ref.providerId);
+    if (!p) {
+        log(`runtime-model: provider "${ref.providerId}" not in config.json`);
+        return null;
     }
-    catch (e) {
-        log(`runtime-model: read config.json failed (${e instanceof Error ? e.message : String(e)})`);
+    const baseURL = p.options?.baseURL ?? DEFAULT_BASE_URL;
+    // Model elements must carry the full definition (reasoning variants /
+    // contextWindow / label) — a bare {modelId} overlay makes the backend fall
+    // back to the apiFormat's default 2-state thought levels (enabled/disabled),
+    // silently resetting the session's max/high/low dropdown on resume/switch.
+    const models = Object.entries(p.models ?? {}).map(([modelId, m]) => buildModelElement(modelId, (m ?? {})));
+    if (models.length === 0)
+        models.push({ modelId: ref.modelId });
+    const provider = {
+        providerId: ref.providerId,
+        kind: p.kind ?? DEFAULT_KIND,
+        apiFormat: apiFormatForKind(p.kind),
+        baseURL,
+        models,
+    };
+    // Third-party providers must inline their apiKey — the backend won't resolve
+    // it from anywhere else and the call fails with 401 without it. Builtin
+    // providers use OAuth/config auth and must NOT send an inline key.
+    if (!isBuiltinProvider(ref.providerId) && p.options?.apiKey) {
+        provider.apiKey = { source: "inline", value: p.options.apiKey };
     }
-    return DEFAULTS;
-}
-/** Build a runtimeModel overlay object for the enabled provider. */
-export function buildRuntimeModel(modelId, revision = "bridge") {
-    const pc = readEnabledProvider();
-    const targetModel = modelId ?? pc.modelId;
     return {
         revision,
         generatedAt: Date.now(),
-        model: { providerId: pc.providerId, modelId: targetModel },
-        provider: {
-            providerId: pc.providerId,
-            kind: pc.kind,
-            baseURL: pc.baseURL,
-            models: pc.models.map((m) => ({ modelId: m })),
-        },
+        model: { providerId: ref.providerId, modelId: ref.modelId },
+        provider,
     };
 }
-/** Build the resume-time overlay (current enabled provider, default model). */
+/**
+ * Build the resume-time overlay pinned to the default model: the FIRST enabled
+ * provider's FIRST model (the same one a fresh `session/new` lands on). This
+ * ensures resume never inherits the session's last-used model, which may be a
+ * now-unavailable third-party model (e.g. Nvidia) and cause "历史模型不可用".
+ */
 export function buildResumeRuntimeModel() {
-    return buildRuntimeModel(undefined, "bridge-resume");
+    const first = loadAllModels()[0];
+    if (!first) {
+        log("runtime-model: no enabled provider in config.json (resume overlay skipped)");
+        return null;
+    }
+    return buildRuntimeModel(first, "bridge-resume");
 }
 /**
- * Switch a session's model via session/updateRuntimeModelConfig.
+ * Switch a session's model via `session/setModel`.
+ *
+ * `value` is the configOption value: either `"providerId\modelId"` (encoded) or
+ * a legacy plain modelId (resolved to the first enabled builtin provider).
+ *
+ * Sends BOTH a `model` ref (the target) AND a `runtimeModel` (the full provider
+ * definition). The runtimeModel lets the backend register the provider into its
+ * workspace catalog (so even third-party / non-default models are recognised),
+ * while `model` names the selection. `persistAsWorkspaceLastUsed:false` keeps
+ * this a runtime-only change. Invalidates the model cache on success.
  *
- * Uses `applyModelSelection:true` so the change applies at runtime without
- * persistence — sidestepping `session/setModel`'s "no loaded config file"
- * failure. Invalidates the model cache on success. Returns true on success.
+ * NOTE: the older `session/updateRuntimeModelConfig` path returns `changed:false`
+ * on current backends without applying — `session/setModel` is the working
+ * protocol since the backend model-management refactor.
  */
-export async function applyModelSwitch(server, zcodeSid, modelId) {
-    const runtimeModel = buildRuntimeModel(modelId, "bridge-switch");
+export async function applyModelSwitch(server, zcodeSid, value) {
+    const { providerId, modelId } = parseModelValue(value);
+    const runtimeModel = buildRuntimeModel({ providerId, providerName: providerId, modelId });
     if (runtimeModel === null) {
-        log("runtime-model: cannot read provider config (config.json)");
+        log(`runtime-model: cannot build overlay for "${value}" (provider not found)`);
         return false;
     }
     const backend = server.ensureBackend();
-    const resp = await backend.request(server.nextId(), "session/updateRuntimeModelConfig", { sessionId: zcodeSid, runtimeModel, applyModelSelection: true }, 15000);
+    const resp = await backend.request(server.nextId(), "session/setModel", {
+        sessionId: zcodeSid,
+        model: { providerId, modelId },
+        runtimeModel,
+        persistAsWorkspaceLastUsed: false,
+    }, 15000);
     if (resp.error) {
         warn(`runtime-model: switch failed: ${resp.error.message}`);
         return false;
@@ -93,4 +135,6 @@ export async function applyModelSwitch(server, zcodeSid, modelId) {
 export function invalidateModelCache(server, zcodeSid) {
     server.modelCache.delete(zcodeSid);
 }
+// Re-exported so callers that only import runtime-model.ts can format values.
+export { formatModelValue };
 //# sourceMappingURL=runtime-model.js.map

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

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

package/dist/config/skill-discovery.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Skill discovery — scans the same directories ZCode uses to discover Skills,
+ * reads each SKILL.md frontmatter, and returns entries suitable for the ACP
+ * `available_commands_update` notification.
+ *
+ * Each discovered skill becomes its own `/skill-name` slash command in the
+ * editor's completion menu (matching Claude Code's behaviour). The model
+ * resolves the invocation via its `Skill` tool — the bridge just lists them
+ * and passes the text through.
+ *
+ * Discovery sources (in priority order — first occurrence wins on name clash):
+ *   1. ~/.zcode/skills/*/SKILL.md          (user scope, ZCode native)
+ *   2. ~/.agents/skills/*/SKILL.md          (user scope, shared agents)
+ *   3. enabled plugin <cache>/skills/&#42;/SKILL.md
+ *   4. <cwd>/.agents/skills/&#42;/SKILL.md      (project scope)
+ *
+ * Skills explicitly disabled in `~/.zcode/cli/config.json` (skills map with
+ * `enable: false`, keyed by absolute SKILL.md path) are excluded.
+ */
+/** A slash-command entry compatible with `sendAvailableCommands`. */
+export interface SkillEntry {
+    name: string;
+    description: string;
+    input?: {
+        hint: string;
+    };
+}
+/**
+ * Discover all enabled skills from the filesystem.
+ *
+ * Returns entries suitable for `available_commands_update`. Best-effort:
+ * failures are logged and swallowed (returns whatever was found).
+ */
+export declare function loadSkillCommands(): SkillEntry[];
+//# sourceMappingURL=skill-discovery.d.ts.map

package/dist/config/skill-discovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-discovery.d.ts","sourceRoot":"","sources":["../../src/config/skill-discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AASH,qEAAqE;AACrE,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1B;AAkHD;;;;;GAKG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,EAAE,CAwDhD"}