cursor-opencode-provider 0.7.5 → 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,32 +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
- * are deliberately absent: this line is part of the frozen baseline system
- * context, and per-turn ids go through `buildSkillCatalogNudge` instead.
+ * 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;
-/**
- * Mid-Conversation nudge after RequestContext skills are known. Prefer skills
- * that match the user turn; otherwise stay quiet unless the user asked about
- * skills explicitly (avoids dumping dozens of firecrawl-* ids every turn).
- * `hasSkillTool` must reflect what the host permits this turn, not the
- * epoch-held advertisement.
- */
-export declare function buildSkillCatalogNudge(options: {
-    hasSkillTool: boolean;
-    skills: readonly AgentSkillLike[];
-    userText?: string;
-    /**
-     * Host skill parameter key from the advertised schema.
-     * OpenCode 1.x: `name`. OpenCode 2.0: `id`.
-     */
-    skillArgKey?: "name" | "id";
-}): string | undefined;

package/dist/context/dynamic-catalog.js

@@ -2,43 +2,22 @@ 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
- * skill-aware Mid-Conversation nudge 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.
+ *
+ * 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
  * advertisement path at all.
  */
-const MAX_NAMED_SKILLS = 8;
 const MAX_MCP_SERVERS_IN_GUIDANCE = 8;
 /** Synthetic server builtins and unknown tools are advertised under (`toolsToMcpDescriptors`). */
 const DEFAULT_TOOL_SERVER = "opencode";
-/** Common words that carry no skill-matching signal. */
-const STOPWORDS = new Set([
-    "about", "all", "and", "any", "are", "but", "can", "for", "from", "has", "have",
-    "how", "into", "its", "not", "one", "only", "that", "the", "their", "them",
-    "then", "there", "these", "this", "use", "used", "uses", "using", "via", "was",
-    "what", "when", "which", "who", "why", "will", "with", "you", "your",
-    // Host/MCP instruction boilerplate — otherwise a server-instruction dump
-    // matches every firecrawl/search skill on "search"/"tools"/"server".
-    "tool", "tools", "server", "servers", "call", "calls", "fetch", "search",
-    "documentation", "library", "framework", "query", "please", "through",
-]);
-/** An explicit question/request about skills, not incidental prose ("has the skills to"). */
-const SKILL_INQUIRY = /\b(?:which|what|list|show|available|any|use|using|call|invoke|load|run)\b[^.?!\n]{0,40}\bskills?\b|\bskills?\b[^.?!\n]{0,40}\b(?:available|installed|loaded|exist|do you have|can you)\b/i;
-/** Description-only hits above this look like instruction-dump false positives. */
-const MAX_DESCRIPTION_ONLY_MATCHES = 2;
-/**
- * Match against the live user utterance only. Mid-conversation / MCP instruction
- * injections and prior reminders must not re-trigger skill dumps.
- */
-function skillMatchCorpus(userText) {
-    return userText
-        .replace(/<system_reminder\b[^>]*>[\s\S]*?<\/system_reminder>/gi, " ")
-        .replace(/<system-update\b[^>]*>[\s\S]*?<\/system-update>/gi, " ")
-        .replace(/New MCP server instructions[\s\S]*?(?=\n[A-Z]|\n\n|$)/gi, " ");
-}
 function listWithOverflow(items, limit) {
     const shown = items.slice(0, limit).map((item) => `\`${item}\``).join(", ");
     const hidden = items.length - limit;
@@ -62,22 +41,12 @@ 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);
-}
 /**
  * Shared system-guidance line: name advertised dynamic-catalog tools and prefer
  * them over Grep/Shell when skills or project rules apply. Concrete skill ids
- * are deliberately absent: this line is part of the frozen baseline system
- * context, and per-turn ids go through `buildSkillCatalogNudge` instead.
+ * 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) {
     const names = [...options.toolNames];
@@ -91,93 +60,19 @@ export function buildDynamicCatalogRoutingInstruction(options) {
     if (mcpServers.length > 0) {
         extras.push(`MCP servers such as ${listWithOverflow(mcpServers, MAX_MCP_SERVERS_IN_GUIDANCE)}`);
     }
-    return (`- OpenCode host tools that are not in Cursor's native top-level list (including ${extras.join(" and ")}) ` +
-        "are reached through GetDynamicTools / CallDynamicTool (or the host's equivalent dynamic catalog). " +
-        "When a skill matches or project rules name an MCP server, discover and call those tools that way " +
-        "before Grep/Shell fallbacks. Do not narrate that they are unavailable.");
-}
-function wordTokens(text) {
-    return new Set(text
-        .toLowerCase()
-        .split(/[^a-z0-9]+/)
-        .filter((token) => token.length >= 3 && !STOPWORDS.has(token)));
-}
-function descriptionMatchesUserText(description, userTokens) {
-    let hits = 0;
-    let distinctive = false;
-    for (const token of wordTokens(description)) {
-        if (!userTokens.has(token))
-            continue;
-        hits += 1;
-        if (token.length >= 8)
-            distinctive = true;
-        if (hits >= 2)
-            return true;
-    }
-    // Single distinctive token (library names, skill ids) is enough.
-    return distinctive;
-}
-function nameMatchesUserText(name, userText) {
-    const haystack = userText.toLowerCase();
-    const candidates = [name.toLowerCase(), ...name.toLowerCase().split(/[-_]+/).filter((part) => part.length >= 5)];
-    for (const candidate of [...new Set(candidates)]) {
-        const escaped = candidate.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        if (new RegExp(`(?<![a-z0-9_-])${escaped}(?![a-z0-9_-])`).test(haystack))
-            return true;
+    const lines = [
+        `- OpenCode host tools that are not in Cursor's native top-level list (including ${extras.join(" and ")}) ` +
+            "are reached through GetDynamicTools / CallDynamicTool (or the host's equivalent dynamic catalog). " +
+            "When a skill matches or project rules name an MCP server, discover and call those tools that way " +
+            "before Grep/Shell fallbacks. Do not narrate that they are unavailable.",
+    ];
+    if (hasSkill) {
+        // 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 " +
+            "(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 false;
-}
-/**
- * Mid-Conversation nudge after RequestContext skills are known. Prefer skills
- * that match the user turn; otherwise stay quiet unless the user asked about
- * skills explicitly (avoids dumping dozens of firecrawl-* ids every turn).
- * `hasSkillTool` must reflect what the host permits this turn, not the
- * epoch-held advertisement.
- */
-export function buildSkillCatalogNudge(options) {
-    if (!options.hasSkillTool || options.skills.length === 0)
-        return undefined;
-    const userText = skillMatchCorpus(options.userText ?? "");
-    const userTokens = wordTokens(userText);
-    const skillInquiry = SKILL_INQUIRY.test(userText);
-    const named = options.skills
-        .map((skill) => {
-        const name = skillNameFromAgentSkill(skill);
-        if (!name)
-            return undefined;
-        const description = typeof skill.description === "string" ? skill.description : "";
-        const nameHit = nameMatchesUserText(name, userText);
-        const descHit = !!description && descriptionMatchesUserText(description, userTokens);
-        return { name, nameHit, descHit };
-    })
-        .filter((row) => !!row);
-    if (named.length === 0)
-        return undefined;
-    const nameMatched = named.filter((row) => row.nameHit);
-    const descOnly = named.filter((row) => row.descHit && !row.nameHit);
-    // Mass description-only hits are almost always instruction-dump noise
-    // (MCP server blurbs sharing "search"/"tools" with firecrawl skills).
-    const descMatched = descOnly.length <= MAX_DESCRIPTION_ONLY_MATCHES ? descOnly : [];
-    const selected = nameMatched.length > 0
-        ? [...nameMatched, ...descMatched]
-        : skillInquiry
-            ? named
-            : descMatched;
-    if (selected.length === 0)
-        return undefined;
-    const ids = [...new Set(selected.map((row) => row.name))];
-    // Prefer the advertised schema key; fall back to naming both so a stale
-    // Mid-Conversation hint cannot contradict GetDynamicTools on either host.
-    const argKey = options.skillArgKey;
-    const callHint = argKey
-        ? `Call \`skill\` with \`{ "${argKey}": "<skill-id>" }\` (host schema key is \`${argKey}\`) `
-        : "Call `skill` with the skill identifier using the parameter key from GetDynamicTools " +
-            "(`name` on OpenCode 1.x, `id` on OpenCode 2.0) ";
-    return ("<system_reminder>\n" +
-        "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. ` +
-        `Relevant skill id(s) this turn: ${listWithOverflow(ids, MAX_NAMED_SKILLS)}. ` +
-        callHint +
-        "before answering from memory or falling back to shell/search tools.\n" +
-        "</system_reminder>");
+    return lines.join("\n");
 }

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,4 +1,4 @@
-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 { trace } from "../debug.js";
@@ -10,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();
@@ -84,7 +84,7 @@ 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);
@@ -120,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);
@@ -143,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;
         }
@@ -182,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, buildSkillCatalogNudge, 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, buildSkillCatalogNudge, 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;

package/dist/context/paths.js

@@ -68,9 +68,18 @@ export function getHostCacheDirOverride() {
 export function resolveHostCacheDir(env = process.env) {
     return bridgeGlobalCacheDir() ?? openCodeGlobalCacheDir(env);
 }
-/** Native OpenCode global config dir. */
-export function opencodeGlobalConfigDir() {
-    return path.join(resolveHome(), ".config", "opencode");
+function xdgConfigHome(env = process.env) {
+    if (env.XDG_CONFIG_HOME && env.XDG_CONFIG_HOME.length > 0)
+        return env.XDG_CONFIG_HOME;
+    return path.join(resolveHome(env), ".config");
+}
+/**
+ * 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 function opencodeGlobalConfigDir(env = process.env) {
+    return path.join(xdgConfigHome(env), "opencode");
 }
 /**
  * Host global cache dir for Cursor project metadata + model/version caches.
@@ -116,7 +125,7 @@ export function hostPlansDir(_workspaceRoot) {
     return path.join(hostGlobalDataDir(), "plans");
 }
 /**
- * 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 function slugifyWorkspacePath(workspaceRoot) {
@@ -157,8 +166,3 @@ export function ensureOpencodeProjectDir(workspaceRoot) {
         `xdg_cache_home=${process.env.XDG_CACHE_HOME ?? "(unset)"}`);
     return dir;
 }
-export function resolveHomeRelative(p) {
-    if (p.startsWith("~/"))
-        return path.join(homedir(), p.slice(2));
-    return p;
-}