cursor-opencode-provider 0.7.6 → 0.8.0

package/dist/context/dynamic-catalog.d.ts

@@ -1,10 +1,3 @@
-export type AgentSkillLike = {
-    /** OpenCode skill id (frontmatter `name`, else directory name). */
-    id?: unknown;
-    full_path?: unknown;
-    description?: unknown;
-    content?: unknown;
-};
 /**
  * Configured MCP servers that own at least one advertised tool. Uses the same
  * server resolution as the RequestContext descriptors, so guidance never names
@@ -12,63 +5,14 @@ export type AgentSkillLike = {
  * `sourceName` when present).
  */
 export declare function listAdvertisedMcpServers(toolNames: Iterable<string>, knownMcpServers?: Iterable<string>): string[];
-/** Skill id OpenCode's `skill` tool expects: the discovered id, else `…/skills/<id>/SKILL.md`. */
-export declare function skillNameFromAgentSkill(skill: AgentSkillLike): string | undefined;
 /**
  * Shared system-guidance line: name advertised dynamic-catalog tools and prefer
  * them over Grep/Shell when skills or project rules apply. Concrete skill ids
- * stay out of the frozen baseline (they live in RequestContext `agent_skills`
- * and in Mid-Conversation updates when the catalog changes — same split as
+ * stay out of the frozen baseline (they live in the host system prompt / skill
+ * tool, and in host `<system-update>` when the catalog changes — same split as
  * OpenCode's SkillGuidance / SkillInstructions).
  */
 export declare function buildDynamicCatalogRoutingInstruction(options: {
     toolNames: Iterable<string>;
     knownMcpServers?: Iterable<string>;
 }): string | undefined;
-/**
- * OpenCode-shaped Mid-Conversation skill update.
- *
- * Pure: compare `previousSkillIds` (null = not yet admitted this conversation)
- * to the current catalog. First admission returns undefined — baseline
- * RequestContext + routing instruction already carry the list. Later turns
- * only speak when the id set changes (agent switch / discovery growth), matching
- * `SkillGuidance.update` / `SkillInstructions.update`.
- */
-export declare function buildSkillCatalogChangeReminder(options: {
-    hasSkillTool: boolean;
-    skills: readonly AgentSkillLike[];
-    /** Sorted skill ids already admitted; `null` means first admission this conversation. */
-    previousSkillIds: readonly string[] | null;
-    /**
-     * Host skill parameter key from the advertised schema.
-     * OpenCode 1.x: `name`. OpenCode 2.0: `id`.
-     */
-    skillArgKey?: "name" | "id";
-}): {
-    text: string | undefined;
-    nextSkillIds: string[];
-};
-/**
- * Admit the current skill catalog for a conversation and return a Mid-Conversation
- * reminder only when OpenCode would (catalog changed after baseline admission).
- */
-export declare function takeSkillCatalogChangeReminder(conversationId: string, options: {
-    hasSkillTool: boolean;
-    skills: readonly AgentSkillLike[];
-    skillArgKey?: "name" | "id";
-}): string | undefined;
-export declare function clearSkillCatalogAdmission(conversationId: string): void;
-export declare function transferSkillCatalogAdmission(previousConversationId: string, nextConversationId: string): void;
-export declare function resetSkillCatalogAdmissionsForTests(): void;
-/**
- * @deprecated Prefer `buildSkillCatalogChangeReminder` / `takeSkillCatalogChangeReminder`.
- * Kept as a thin alias for callers that still expect the old name; always returns
- * undefined for userText-based matching (OpenCode never did per-turn id nudges).
- */
-export declare function buildSkillCatalogNudge(options: {
-    hasSkillTool: boolean;
-    skills: readonly AgentSkillLike[];
-    userText?: string;
-    skillArgKey?: "name" | "id";
-    previousSkillIds?: readonly string[] | null;
-}): string | undefined;

package/dist/context/dynamic-catalog.js

@@ -2,15 +2,14 @@ import { resolveToolServerIdentity } from "../protocol/tools.js";
 /**
  * Issue #29: Cursor keeps OpenCode `skill` and MCP tools off its native
  * top-level function list. Both OpenCode 1.x and OpenCode 2.0 reach the model
- * as MCP-shaped RequestContext ads, then GetDynamicTools / CallDynamicTool
- * (exec `mcp_args`). This module builds the shared routing guidance and the
- * OpenCode-shaped Mid-Conversation skill-catalog update used on both hosts.
+ * as names in RequestContext `mcp_meta_tool_options`, then GetDynamicTools /
+ * CallDynamicTool (exec `mcp_args`). This module builds the shared routing
+ * guidance for both hosts.
  *
- * OpenCode itself does **not** per-turn nudge matched skill ids. It:
- * - Puts name/description guidance in the frozen baseline (`SystemPrompt.skills`
- *   / `SkillGuidance` / `SkillInstructions`)
- * - Emits a Mid-Conversation update only when the available-skills list changes
- * - OpenCode 2: skips re-invoke when `<skill_content>` is already in the turn
+ * Skill names and descriptions are not repeated here: OpenCode puts them in
+ * its own system prompt (`SystemPrompt.skills` / `SkillGuidance` /
+ * `SkillInstructions`) and announces catalog changes itself (OpenCode 2
+ * `<system-update>`).
  *
  * OpenCode 2 still needs `exposeDirectMcpTools` so MCP tools leave Code Mode
  * and enter the AI SDK catalog; without that step they never reach this
@@ -19,12 +18,6 @@ import { resolveToolServerIdentity } from "../protocol/tools.js";
 const MAX_MCP_SERVERS_IN_GUIDANCE = 8;
 /** Synthetic server builtins and unknown tools are advertised under (`toolsToMcpDescriptors`). */
 const DEFAULT_TOOL_SERVER = "opencode";
-/**
- * Skill ids already admitted to the model for a conversation (baseline RequestContext
- * freeze, or the last Mid-Conversation catalog update). First admission is silent —
- * OpenCode puts that list in the system baseline, not a per-turn reminder.
- */
-const admittedSkillIdsByConversation = new Map();
 function listWithOverflow(items, limit) {
     const shown = items.slice(0, limit).map((item) => `\`${item}\``).join(", ");
     const hidden = items.length - limit;
@@ -48,42 +41,11 @@ export function listAdvertisedMcpServers(toolNames, knownMcpServers = []) {
     }
     return [...servers];
 }
-/** Skill id OpenCode's `skill` tool expects: the discovered id, else `…/skills/<id>/SKILL.md`. */
-export function skillNameFromAgentSkill(skill) {
-    const id = typeof skill.id === "string" ? skill.id.trim() : "";
-    if (id)
-        return id;
-    const fullPath = typeof skill.full_path === "string" ? skill.full_path.trim() : "";
-    const parts = fullPath.split(/[\\/]+/).filter(Boolean);
-    if (parts.length < 2 || parts.at(-1).toLowerCase() !== "skill.md")
-        return undefined;
-    return parts.at(-2);
-}
-function skillIds(skills) {
-    const ids = [];
-    const seen = new Set();
-    for (const skill of skills) {
-        const name = skillNameFromAgentSkill(skill);
-        if (!name || seen.has(name))
-            continue;
-        seen.add(name);
-        ids.push(name);
-    }
-    return [...ids].sort((left, right) => (left < right ? -1 : left > right ? 1 : 0));
-}
-function sameIdList(left, right) {
-    if (left.length !== right.length)
-        return false;
-    for (let i = 0; i < left.length; i++)
-        if (left[i] !== right[i])
-            return false;
-    return true;
-}
 /**
  * Shared system-guidance line: name advertised dynamic-catalog tools and prefer
  * them over Grep/Shell when skills or project rules apply. Concrete skill ids
- * stay out of the frozen baseline (they live in RequestContext `agent_skills`
- * and in Mid-Conversation updates when the catalog changes — same split as
+ * stay out of the frozen baseline (they live in the host system prompt / skill
+ * tool, and in host `<system-update>` when the catalog changes — same split as
  * OpenCode's SkillGuidance / SkillInstructions).
  */
 export function buildDynamicCatalogRoutingInstruction(options) {
@@ -108,121 +70,9 @@ export function buildDynamicCatalogRoutingInstruction(options) {
         // Mirror OpenCode 1 SystemPrompt.skills / OC2 SkillInstructions.render.
         lines.push("- Skills provide specialized instructions and workflows for specific tasks. " +
             "Use the `skill` tool to load a skill when a task matches its description " +
-            "(RequestContext `agent_skills` lists names and descriptions). " +
+            "(the host system prompt and `skill` tool carry names and descriptions). " +
             "A skill that is already present in the conversation as a `<skill_content>` block " +
             "does not need to be invoked again.");
     }
     return lines.join("\n");
 }
-function skillEntriesXml(skills, argKey) {
-    const lines = ["<available_skills>"];
-    for (const skill of skills) {
-        const name = skillNameFromAgentSkill(skill);
-        if (!name)
-            continue;
-        const description = typeof skill.description === "string" ? skill.description : "";
-        lines.push("  <skill>");
-        if (argKey === "id")
-            lines.push(`    <id>${name}</id>`);
-        lines.push(`    <name>${name}</name>`);
-        if (description)
-            lines.push(`    <description>${description}</description>`);
-        lines.push("  </skill>");
-    }
-    lines.push("</available_skills>");
-    return lines;
-}
-/**
- * OpenCode-shaped Mid-Conversation skill update.
- *
- * Pure: compare `previousSkillIds` (null = not yet admitted this conversation)
- * to the current catalog. First admission returns undefined — baseline
- * RequestContext + routing instruction already carry the list. Later turns
- * only speak when the id set changes (agent switch / discovery growth), matching
- * `SkillGuidance.update` / `SkillInstructions.update`.
- */
-export function buildSkillCatalogChangeReminder(options) {
-    const nextSkillIds = skillIds(options.skills);
-    if (!options.hasSkillTool) {
-        return { text: undefined, nextSkillIds: options.previousSkillIds ? [...options.previousSkillIds] : [] };
-    }
-    if (options.previousSkillIds === null) {
-        return { text: undefined, nextSkillIds };
-    }
-    if (sameIdList(options.previousSkillIds, nextSkillIds)) {
-        return { text: undefined, nextSkillIds };
-    }
-    const argKey = options.skillArgKey === "id" ? "id" : "name";
-    const callHint = argKey === "id"
-        ? "Call `skill` with `{ \"id\": \"<skill-id>\" }` (host schema key is `id`)."
-        : "Call `skill` with `{ \"name\": \"<skill-id>\" }` (host schema key is `name`).";
-    const body = nextSkillIds.length === 0
-        ? ["Skill guidance is no longer available. Do not use any previously listed skill."]
-        : [
-            "The available skills have changed. This list supersedes the previous available skills list.",
-            "Skills provide specialized instructions and workflows for specific tasks.",
-            "Use the skill tool to load a skill when a task matches its description.",
-            "The user may also invoke a skill directly. When that happens, its instructions appear in the conversation as a <skill_content> block, the same shape the skill tool returns. A skill that is already present this way does not need to be invoked again.",
-            `OpenCode skills are invoked with the host \`skill\` tool through GetDynamicTools / CallDynamicTool (MCP server \`${DEFAULT_TOOL_SERVER}\`, tool \`skill\`), not by Grep/Read of SKILL.md. ${callHint}`,
-            ...skillEntriesXml(options.skills, argKey),
-        ];
-    return {
-        text: `<system_reminder>\n${body.join("\n")}\n</system_reminder>`,
-        nextSkillIds,
-    };
-}
-/**
- * Admit the current skill catalog for a conversation and return a Mid-Conversation
- * reminder only when OpenCode would (catalog changed after baseline admission).
- */
-export function takeSkillCatalogChangeReminder(conversationId, options) {
-    const previous = conversationId
-        ? (admittedSkillIdsByConversation.get(conversationId) ?? null)
-        : null;
-    const { text, nextSkillIds } = buildSkillCatalogChangeReminder({
-        ...options,
-        previousSkillIds: previous,
-    });
-    if (!conversationId)
-        return text;
-    if (!options.hasSkillTool && previous === null && nextSkillIds.length === 0) {
-        return text;
-    }
-    admittedSkillIdsByConversation.delete(conversationId);
-    admittedSkillIdsByConversation.set(conversationId, nextSkillIds);
-    while (admittedSkillIdsByConversation.size > 256) {
-        const oldest = admittedSkillIdsByConversation.keys().next().value;
-        if (!oldest)
-            break;
-        admittedSkillIdsByConversation.delete(oldest);
-    }
-    return text;
-}
-export function clearSkillCatalogAdmission(conversationId) {
-    admittedSkillIdsByConversation.delete(conversationId);
-}
-export function transferSkillCatalogAdmission(previousConversationId, nextConversationId) {
-    if (!previousConversationId || !nextConversationId)
-        return;
-    const prior = admittedSkillIdsByConversation.get(previousConversationId);
-    admittedSkillIdsByConversation.delete(previousConversationId);
-    admittedSkillIdsByConversation.delete(nextConversationId);
-    if (prior)
-        admittedSkillIdsByConversation.set(nextConversationId, prior);
-}
-export function resetSkillCatalogAdmissionsForTests() {
-    admittedSkillIdsByConversation.clear();
-}
-/**
- * @deprecated Prefer `buildSkillCatalogChangeReminder` / `takeSkillCatalogChangeReminder`.
- * Kept as a thin alias for callers that still expect the old name; always returns
- * undefined for userText-based matching (OpenCode never did per-turn id nudges).
- */
-export function buildSkillCatalogNudge(options) {
-    return buildSkillCatalogChangeReminder({
-        hasSkillTool: options.hasSkillTool,
-        skills: options.skills,
-        previousSkillIds: options.previousSkillIds ?? null,
-        skillArgKey: options.skillArgKey,
-    }).text;
-}

package/dist/context/epoch.d.ts

@@ -7,10 +7,10 @@ export type ContextSourceSnapshot = {
 };
 export type ContextEpoch = {
     conversationId: string;
-    /** Exact system text seeded at epoch start. Empty when recovered from checkpoint. */
+    /** Exact system text at epoch start. Empty if a legacy checkpoint has no persisted rule. */
     baselineSystemPrompt: string;
     baselineHash: string;
-    /** True when restart hydrated past a checkpoint without the original baseline bytes. */
+    /** True when restart hydrated past a checkpoint without the last source snapshot. */
     recovered: boolean;
     snapshot: ContextSourceSnapshot;
 };
@@ -27,6 +27,8 @@ export type AdmitContextEpochInput = {
      * never folded into the frozen baseline.
      */
     oneShotReminders?: readonly string[];
+    /** Original system rule restored with RequestContext after a restart. */
+    recoveredBaseline?: string;
 };
 export type AdmitContextEpochResult = {
     action: "initialize" | "unchanged" | "updated" | "recovered";
@@ -42,8 +44,8 @@ export type AdmitContextEpochResult = {
  * - First seed: freeze baseline, return it as seedSystemPrompt; one-shots → mid.
  * - Checkpoint turn: never returns seedSystemPrompt; source diffs + one-shots → mid.
  * - Reseed same epoch: return frozen baseline bytes (not live host text).
- * - Recovered (restart past a checkpoint, original bytes unknown): never freeze
- *   live host text as a new baseline and never send a seed systemPrompt.
+ * - Recovered: restore the persisted rule and reassert live context once on the
+ *   user turn. A legacy checkpoint without a rule has no original bytes.
  */
 export declare function admitContextEpoch(input: AdmitContextEpochInput): AdmitContextEpochResult;
 export declare function getContextEpoch(conversationId: string): ContextEpoch | undefined;

package/dist/context/epoch.js

@@ -4,11 +4,13 @@
  * Mirrors OpenCode research CONTEXT.md:
  * - One Baseline System Context per conversation_id (provider-cache prefix)
  * - Later Context Source changes → Mid-Conversation System Message on the
- *   user turn (Cursor checkpoint Runs cannot rewrite systemPrompt)
+ *   user turn; the baseline itself never changes within the epoch
  * - Epoch ends on conversation remint (compaction / post-compaction rebase)
  *
- * Cursor constraint: systemPrompt is only sent on seed Runs. Checkpointed
- * Runs admit updates exclusively via the live user message.
+ * The baseline reaches Cursor as the frozen system-instructions rule in
+ * RequestContext (`systemInstructionsRule`), on every Run. `seedSystemPrompt`
+ * marks the Runs that start a conversation; it is not sent as a `system`
+ * message, which Cursor does not follow.
  */
 import { createHash } from "node:crypto";
 import { trace } from "../debug.js";
@@ -80,8 +82,8 @@ function combineMessages(parts) {
  * - First seed: freeze baseline, return it as seedSystemPrompt; one-shots → mid.
  * - Checkpoint turn: never returns seedSystemPrompt; source diffs + one-shots → mid.
  * - Reseed same epoch: return frozen baseline bytes (not live host text).
- * - Recovered (restart past a checkpoint, original bytes unknown): never freeze
- *   live host text as a new baseline and never send a seed systemPrompt.
+ * - Recovered: restore the persisted rule and reassert live context once on the
+ *   user turn. A legacy checkpoint without a rule has no original bytes.
  */
 export function admitContextEpoch(input) {
     const conversationId = input.conversationId;
@@ -90,17 +92,27 @@ export function admitContextEpoch(input) {
     const existing = byConversationId.get(conversationId);
     if (!existing) {
         if (input.hasCheckpoint) {
-            // Restart / soft-evict recovery: Cursor already holds the baseline in the
-            // checkpoint. Record the live snapshot without reseeding systemPrompt.
+            // Restart / soft-evict recovery: keep the original rule and reassert the
+            // live instructions chronologically without changing the cache prefix.
+            const baselineSystemPrompt = input.recoveredBaseline ?? "";
             const epoch = {
                 conversationId,
-                baselineSystemPrompt: "",
-                baselineHash: "",
+                baselineSystemPrompt,
+                baselineHash: baselineSystemPrompt ? sha(baselineSystemPrompt) : "",
                 recovered: true,
                 snapshot: nextSnap,
             };
             touch(epoch);
-            const midConversationMessage = combineMessages(oneShots);
+            // The persisted rule is the original prefix, not necessarily the current
+            // host instructions. Reconcile live context once before recording its
+            // snapshot; otherwise a changed prompt is silently treated as admitted.
+            // Even equality with the original baseline needs an update: the last
+            // checkpoint may contain an intervening mode/instruction change.
+            const liveBaseline = buildBaseline(input);
+            const recoveryUpdate = baselineSystemPrompt && liveBaseline
+                ? wrapReminder("Current host system instructions after session recovery:\n\n" + liveBaseline)
+                : "";
+            const midConversationMessage = combineMessages([recoveryUpdate, ...oneShots]);
             trace(`context epoch: recovered conversationId=${conversationId} ` +
                 `oneShots=${oneShots.length}`);
             return { action: "recovered", midConversationMessage, epoch };

package/dist/context/frozen.js

@@ -1,7 +1,6 @@
-import { buildDynamicRequestContext, buildRequestContext, materializeRequestContext, requestContextBase, } from "./build.js";
+import { buildDynamicRequestContext, buildRequestContext, materializeRequestContext, requestContextBase, withSystemInstructions, } from "./build.js";
 import { clearContextEpoch, endContextEpoch, resetContextEpochsForTests } from "./epoch.js";
 import { clearOverlayHold, resetOverlayHoldsForTests, transferOverlayHold, } from "./overlay.js";
-import { clearSkillCatalogAdmission, resetSkillCatalogAdmissionsForTests, transferSkillCatalogAdmission, } from "./dynamic-catalog.js";
 import { trace } from "../debug.js";
 import { encodeMessage } from "../protocol/messages.js";
 /**
@@ -11,10 +10,10 @@ import { encodeMessage } from "../protocol/messages.js";
  * base plus live plugin/tool overlays. Rebuilding volatile git/layout data on
  * every Run shifts the prompt prefix and tanks prompt-cache hits.
  *
- * Skills, subagents, plugin metadata, and tool/MCP capabilities are rediscovered
- * each Run, then epoch-held (equal ids keep frozen bytes; new ids append) and
- * overlaid on that base. If the encoded overlay bytes did not change, the exact
- * prior materialized object is reused.
+ * Host-advertised subagents, plugin metadata, and tool/MCP capabilities are
+ * rediscovered each Run, then epoch-held (equal ids keep frozen bytes; new ids
+ * append) and overlaid on that base. If the encoded overlay bytes did not
+ * change, the exact prior materialized object is reused.
  */
 const byConversationId = new Map();
 const materializedByConversationId = new Map();
@@ -45,7 +44,6 @@ function remember(conversationId, context) {
         byConversationId.delete(oldest);
         materializedByConversationId.delete(oldest);
         clearOverlayHold(oldest);
-        clearSkillCatalogAdmission(oldest);
     }
 }
 /** Frozen stable RequestContext base for this conversation, if any. */
@@ -69,7 +67,6 @@ export function clearFrozenRequestContext(conversationId) {
     byConversationId.delete(conversationId);
     materializedByConversationId.delete(conversationId);
     clearOverlayHold(conversationId);
-    clearSkillCatalogAdmission(conversationId);
     clearContextEpoch(conversationId);
 }
 /**
@@ -87,12 +84,11 @@ export function transferFrozenRequestContext(previousConversationId, nextConvers
     const base = byConversationId.get(previousConversationId);
     const materialized = materializedByConversationId.get(previousConversationId);
     // System Context epoch does not transfer — compaction starts a fresh baseline.
-    // Overlay hold does transfer: same workspace, same advertised skill/agent/plugin
+    // Overlay hold does transfer: same workspace, same advertised agent/plugin
     // bytes, so the comparison seed can still match. clearFrozenRequestContext
     // also drops epoch state for each id.
     endContextEpoch(previousConversationId, nextConversationId);
     transferOverlayHold(previousConversationId, nextConversationId);
-    transferSkillCatalogAdmission(previousConversationId, nextConversationId);
     byConversationId.delete(previousConversationId);
     materializedByConversationId.delete(previousConversationId);
     byConversationId.delete(nextConversationId);
@@ -114,7 +110,6 @@ export function resetFrozenRequestContextsForTests() {
     materializedByConversationId.clear();
     buildsByConversationId.clear();
     resetOverlayHoldsForTests();
-    resetSkillCatalogAdmissionsForTests();
     resetContextEpochsForTests();
 }
 function sameBytes(a, b) {
@@ -125,6 +120,23 @@ function sameBytes(a, b) {
             return false;
     return true;
 }
+function advertisedMetaToolCount(context) {
+    const meta = context.mcp_meta_tool_options;
+    if (!meta || typeof meta !== "object")
+        return 0;
+    const descriptors = meta.mcp_descriptors;
+    if (!Array.isArray(descriptors))
+        return 0;
+    let count = 0;
+    for (const descriptor of descriptors) {
+        if (!descriptor || typeof descriptor !== "object")
+            continue;
+        const tools = descriptor.tools;
+        if (Array.isArray(tools))
+            count += tools.length;
+    }
+    return count;
+}
 function rememberMaterialized(conversationId, context) {
     const bytes = encodeMessage("RequestContext", context);
     const previous = materializedByConversationId.get(conversationId);
@@ -148,12 +160,23 @@ export async function getOrBuildRequestContext(conversationId, input, opts) {
     if (opts?.refresh && conversationId)
         clearOverlayHold(conversationId);
     if (!opts?.refresh && conversationId) {
-        const base = getFrozenRequestContext(conversationId);
+        let base = getFrozenRequestContext(conversationId);
         if (base) {
+            // The system-instructions rule is frozen with the base. A new epoch
+            // baseline (compaction rebase, binding reset) replaces it; a recovered
+            // epoch only fills a base persisted without one.
+            const instructed = withSystemInstructions(base, input.systemInstructions);
+            if (instructed !== base) {
+                setFrozenRequestContext(conversationId, instructed);
+                base = getFrozenRequestContext(conversationId);
+                trace(`request_context: system instructions frozen conversationId=${conversationId} ` +
+                    `len=${input.systemInstructions?.text.length ?? 0} ` +
+                    `authoritative=${input.systemInstructions?.authoritative ?? false}`);
+            }
             const dynamic = await buildDynamicRequestContext(scoped);
             const materialized = rememberMaterialized(conversationId, materializeRequestContext(base, dynamic));
             trace(`request_context: materialized conversationId=${conversationId} ` +
-                `tools=${Array.isArray(materialized.context.tools) ? materialized.context.tools.length : 0} ` +
+                `tools=${advertisedMetaToolCount(materialized.context)} ` +
                 `reused=${materialized.reused}`);
             return materialized;
         }
@@ -187,7 +210,7 @@ export async function getOrBuildRequestContext(conversationId, input, opts) {
         ? rememberMaterialized(conversationId, context)
         : { context: freezeSnapshot(structuredClone(context)), reused: false };
     trace(`request_context: built+frozen conversationId=${conversationId || "(none)"} ` +
-        `tools=${Array.isArray(materialized.context.tools) ? materialized.context.tools.length : 0} ` +
+        `tools=${advertisedMetaToolCount(materialized.context)} ` +
         `refresh=${!!opts?.refresh}`);
     return { context: materialized.context, reused: false };
 }

package/dist/context/index.d.ts

@@ -1,5 +1,5 @@
 export { buildDynamicRequestContext, buildRequestContext, DYNAMIC_REQUEST_CONTEXT_KEYS, materializeRequestContext, requestContextBase, type BuildRequestContextInput, } from "./build.js";
-export { buildDynamicCatalogRoutingInstruction, buildSkillCatalogChangeReminder, buildSkillCatalogNudge, takeSkillCatalogChangeReminder, listAdvertisedMcpServers, skillNameFromAgentSkill, type AgentSkillLike, } from "./dynamic-catalog.js";
+export { buildDynamicCatalogRoutingInstruction, listAdvertisedMcpServers, } from "./dynamic-catalog.js";
 export { clearFrozenRequestContext, getFrozenRequestContext, getOrBuildRequestContext, MAX_FROZEN_REQUEST_CONTEXTS, resetFrozenRequestContextsForTests, setFrozenRequestContext, transferFrozenRequestContext, } from "./frozen.js";
 export { MAX_OVERLAY_HOLDS, holdCapabilityOverlay, resetOverlayHoldsForTests, } from "./overlay.js";
 export { admitContextEpoch, appendMidConversationMessage, clearContextEpoch, endContextEpoch, getContextEpoch, MAX_CONTEXT_EPOCHS, resetContextEpochsForTests, type AdmitContextEpochInput, type AdmitContextEpochResult, type ContextEpoch, type ContextSourceSnapshot, } from "./epoch.js";

package/dist/context/index.js

@@ -1,5 +1,5 @@
 export { buildDynamicRequestContext, buildRequestContext, DYNAMIC_REQUEST_CONTEXT_KEYS, materializeRequestContext, requestContextBase, } from "./build.js";
-export { buildDynamicCatalogRoutingInstruction, buildSkillCatalogChangeReminder, buildSkillCatalogNudge, takeSkillCatalogChangeReminder, listAdvertisedMcpServers, skillNameFromAgentSkill, } from "./dynamic-catalog.js";
+export { buildDynamicCatalogRoutingInstruction, listAdvertisedMcpServers, } from "./dynamic-catalog.js";
 export { clearFrozenRequestContext, getFrozenRequestContext, getOrBuildRequestContext, MAX_FROZEN_REQUEST_CONTEXTS, resetFrozenRequestContextsForTests, setFrozenRequestContext, transferFrozenRequestContext, } from "./frozen.js";
 export { MAX_OVERLAY_HOLDS, holdCapabilityOverlay, resetOverlayHoldsForTests, } from "./overlay.js";
 export { admitContextEpoch, appendMidConversationMessage, clearContextEpoch, endContextEpoch, getContextEpoch, MAX_CONTEXT_EPOCHS, resetContextEpochsForTests, } from "./epoch.js";

package/dist/context/overlay.d.ts

@@ -1,5 +1,5 @@
 /**
- * Epoch-hold live RequestContext overlay lists (skills, subagents, plugins).
+ * Epoch-hold live RequestContext overlay lists (subagents, plugins).
  *
  * Same policy as the tool catalog: first nonempty freeze is UTF-16 by id,
  * equal ids keep frozen bytes (including content), new ids append at the
@@ -7,12 +7,6 @@
  * Run; this only canonicalizes what is advertised.
  */
 export declare const MAX_OVERLAY_HOLDS = 256;
-export type OverlaySkill = {
-    id: string;
-    full_path: string;
-    content: string;
-    description: string;
-};
 export type OverlaySubagent = {
     full_path: string;
     name: string;
@@ -24,26 +18,11 @@ export type OverlayPlugin = {
     line: string;
 };
 export type OverlayHold = {
-    skills: OverlaySkill[];
-    subagents: OverlaySubagent[];
-    plugins: OverlayPlugin[];
-};
-export type OverlayWire = {
-    skills: Array<{
-        full_path: string;
-        content: string;
-        description: string;
-    }>;
     subagents: OverlaySubagent[];
     plugins: OverlayPlugin[];
 };
 /** Merge live discovery into the conversation overlay epoch. */
-export declare function holdCapabilityOverlay(conversationId: string, live: OverlayHold): OverlayWire;
-/**
- * Epoch-held skills with their OpenCode ids. The wire shape drops `id`
- * (`AgentSkill` has no name field), but the host `skill` tool needs it.
- */
-export declare function getHeldOverlaySkills(conversationId: string): OverlaySkill[];
+export declare function holdCapabilityOverlay(conversationId: string, live: OverlayHold): OverlayHold;
 export declare function clearOverlayHold(conversationId: string): void;
 export declare function transferOverlayHold(previousConversationId: string, nextConversationId: string): void;
 export declare function resetOverlayHoldsForTests(): void;

package/dist/context/overlay.js

@@ -1,5 +1,5 @@
 /**
- * Epoch-hold live RequestContext overlay lists (skills, subagents, plugins).
+ * Epoch-hold live RequestContext overlay lists (subagents, plugins).
  *
  * Same policy as the tool catalog: first nonempty freeze is UTF-16 by id,
  * equal ids keep frozen bytes (including content), new ids append at the
@@ -29,7 +29,6 @@ function holdList(cached, incoming, idOf) {
 }
 function remember(conversationId, hold) {
     const stored = {
-        skills: structuredClone(hold.skills),
         subagents: structuredClone(hold.subagents),
         plugins: structuredClone(hold.plugins),
     };
@@ -43,47 +42,24 @@ function remember(conversationId, hold) {
     }
     return stored;
 }
-function skillId(skill) {
-    return skill.id || skill.full_path;
-}
-function toWire(hold) {
-    return {
-        skills: hold.skills.map(({ full_path, content, description }) => ({
-            full_path,
-            content,
-            description,
-        })),
-        subagents: hold.subagents,
-        plugins: hold.plugins,
-    };
-}
 /** Merge live discovery into the conversation overlay epoch. */
 export function holdCapabilityOverlay(conversationId, live) {
     if (!conversationId) {
-        return toWire({
-            skills: inFixedOrder(live.skills, skillId),
+        return {
             subagents: inFixedOrder(live.subagents, (agent) => agent.name),
             plugins: inFixedOrder(live.plugins, (plugin) => plugin.id),
-        });
+        };
     }
     const cached = byConversationId.get(conversationId);
     const next = {
-        skills: holdList(cached?.skills, live.skills, skillId),
         subagents: holdList(cached?.subagents, live.subagents, (agent) => agent.name),
         plugins: holdList(cached?.plugins, live.plugins, (plugin) => plugin.id),
     };
-    if (next.skills.length === 0 && next.subagents.length === 0 && next.plugins.length === 0) {
+    if (next.subagents.length === 0 && next.plugins.length === 0) {
         byConversationId.delete(conversationId);
-        return toWire(next);
+        return next;
     }
-    return toWire(remember(conversationId, next));
-}
-/**
- * Epoch-held skills with their OpenCode ids. The wire shape drops `id`
- * (`AgentSkill` has no name field), but the host `skill` tool needs it.
- */
-export function getHeldOverlaySkills(conversationId) {
-    return structuredClone(byConversationId.get(conversationId)?.skills ?? []);
+    return remember(conversationId, next);
 }
 export function clearOverlayHold(conversationId) {
     byConversationId.delete(conversationId);

package/dist/context/paths.d.ts

@@ -21,8 +21,12 @@ export declare function setHostCacheDirOverride(dir: string | undefined): void;
 export declare function getHostCacheDirOverride(): string | undefined;
 /** Resolve the native OpenCode cache root when no host bridge is installed. */
 export declare function resolveHostCacheDir(env?: HostPathEnv): string;
-/** Native OpenCode global config dir. */
-export declare function opencodeGlobalConfigDir(): string;
+/**
+ * Native OpenCode global config dir: `$XDG_CONFIG_HOME/opencode`, otherwise
+ * `~/.config/opencode` — OpenCode's `Global.Path.config` (`xdg-basedir`
+ * `xdgConfig`, `packages/core/src/global.ts`), the same in 1.x and 2.0.
+ */
+export declare function opencodeGlobalConfigDir(env?: HostPathEnv): string;
 /**
  * Host global cache dir for Cursor project metadata + model/version caches.
  *
@@ -57,7 +61,7 @@ export declare function hostGlobalDataDir(env?: HostPathEnv): string;
  */
 export declare function hostPlansDir(_workspaceRoot?: string): string;
 /**
- * Cursor-compatible path slug (`/Users/a/b` → `Users-a-b`).
+ * Cursor-compatible path slug (`/workspace/a/b` → `workspace-a-b`).
  * Used for per-workspace metadata under the host cache.
  */
 export declare function slugifyWorkspacePath(workspaceRoot: string): string;
@@ -72,4 +76,3 @@ export declare function slugifyWorkspacePath(workspaceRoot: string): string;
 export declare function opencodeProjectDir(workspaceRoot: string): string;
 /** Ensure {@link opencodeProjectDir} exists (mode 0o700) and return it. */
 export declare function ensureOpencodeProjectDir(workspaceRoot: string): string;
-export declare function resolveHomeRelative(p: string): string;