@opencode/core 2.0.31 → 2.1.0

package/dist/chunks/{location-f6v6e9jj.js → shell-s389npg2.js}

@@ -1,83 +1,84 @@
+import {
+  Service86,
+  node90
+} from "./shell-9d6xe95g.js";
 import {
   Service85,
   node89
-} from "./location-pyv4m8ny.js";
-import {
-  Service84,
-  node88
-} from "./location-wapmwjpk.js";
+} from "./shell-trg827xp.js";
 import {
   create3
-} from "./location-rdw6cm16.js";
+} from "./shell-rdw6cm16.js";
 import {
-  ID17,
-  Service81,
-  node85
-} from "./location-wmx2yec4.js";
+  ID13,
+  Service77,
+  node81
+} from "./shell-fmax1t4t.js";
 import {
   llmClient2
-} from "./location-775gj3j1.js";
+} from "./shell-775gj3j1.js";
 import {
-  Service65,
-  node68
-} from "./location-b476w8hy.js";
+  Service63,
+  node66
+} from "./shell-3atk1qyf.js";
 import {
   estimate2
-} from "./location-h6vf3j39.js";
+} from "./shell-h6vf3j39.js";
 import {
   SessionEvent2
-} from "./location-ec1grn59.js";
+} from "./shell-ec1grn59.js";
 import {
-  provenance2,
-  compatible2,
-  isCheckpoint2,
-  encode2
-} from "./location-syf57q56.js";
+  kept2,
+  messageToText2,
+  truncateToolOutput2,
+  serializeToolContent2
+} from "./shell-8mywswrd.js";
 import {
+  isNativeCompaction2,
   load5
-} from "./location-xx6gh137.js";
+} from "./shell-9jvjhjkm.js";
 import {
   toLLMMessages2
-} from "./location-bczx5ry5.js";
+} from "./shell-h0bzvw2w.js";
 import {
   outputLimit2,
   baseTranscript2,
   unsupportedParts2,
   boundImages2,
-  Service34,
-  node37
-} from "./location-7fpfrasm.js";
+  Service37,
+  node40
+} from "./shell-mwpm31k7.js";
 import {
-  Service55,
-  node58
-} from "./location-q89amkt5.js";
+  Service51,
+  node53
+} from "./shell-hdn28k8z.js";
 import {
   isRetryable2,
   policy2
-} from "./location-b3f8fkhc.js";
+} from "./shell-tt8gc4fv.js";
 import {
   toSessionError2,
   contentFilterError2
-} from "./location-kfspy82a.js";
+} from "./shell-v6abvp0h.js";
 import {
   calculateCost2,
   record2,
   add2
-} from "./location-tdstcens.js";
+} from "./shell-tdstcens.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/session/compaction.ts
 var exports_compaction2 = {};
 __export(exports_compaction2, {
-  Service: () => Service9,
+  Service: () => Service13,
   SessionCompaction: () => exports_compaction2,
   buildPrompt: () => buildPrompt2,
   estimateContext: () => estimateContext2,
   estimatePrompt: () => estimatePrompt2,
-  layer: () => layer6,
-  node: () => node11,
+  layer: () => layer8,
+  node: () => node15,
   recentUserMessages: () => recentUserMessages2
 });
 import {
@@ -93,13 +94,13 @@ import {
 } from "@opencode/ai";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Result, Stream } from "effect";
-class Service9 extends Context.Service()("@opencode/SessionCompaction") {
+class Service13 extends Context.Service()("@opencode/SessionCompaction") {
 }
 var NOTHING_TO_COMPACT = { error: { type: "compaction.unavailable", message: "Nothing to compact yet" } };
 var SHRINK_STEPS = [0.7, 0.5, 0.35];
 var RESERVE_MIN = 16000;
+var RESERVE_SHARE = 0.15;
 var UNKNOWN_WINDOW = 200000;
-var TOOL_OUTPUT_MAX_CHARS = 1250;
 var IMAGE_TOKEN_ESTIMATE = 1500;
 var PDF_TOKEN_ESTIMATE = 2000;
 var SUMMARY_TEMPLATE = `You MUST use this format for your response (you may omit sections that aren't applicable). Do not include the <template> tags in your response.
@@ -172,14 +173,14 @@ var buildPrompt2 = (update, legacy = false) => {
 };
 var NUDGE = "The previous response did not fill in the required summary template. Do not call tools. Return the summary as text using the exact section headings from the template.";
 var LEGACY_HEADING = "## Additional Context";
-var layer6 = Layer.effect(Service9, Effect.gen(function* () {
-  const agents = yield* Service81;
-  const bus = yield* Service84;
+var layer8 = Layer.effect(Service13, Effect.gen(function* () {
+  const agents = yield* Service77;
+  const bus = yield* Service85;
   const llm = yield* LLMClient.Service;
-  const catalog = yield* Service65;
-  const models = yield* Service55;
-  const db = (yield* Service85).db;
-  const requests = yield* Service34;
+  const catalog = yield* Service63;
+  const models = yield* Service51;
+  const db = (yield* Service86).db;
+  const requests = yield* Service37;
   const state = create3({
     name: "session-compaction",
     initial: () => ({ auto: true, keep: 15000 }),
@@ -197,7 +198,7 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
     if (trigger.reason === "auto" && !due(context, calculateCeiling(context.model.limit, settings.buffer)))
       return { status: "skipped" };
     const native = context.model.compaction?.type === "native";
-    const agent = native ? undefined : yield* agents.get(ID17.make("compaction"));
+    const agent = native ? undefined : yield* agents.get(ID13.make("compaction"));
     const model = (agent?.model && (yield* models.resolve({ ...context.session, model: agent.model }, catalog.available).pipe(Effect.orElseSucceed(() => {
       return;
     })))) ?? context.model;
@@ -217,14 +218,14 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
     if (last?.type === "compaction" && last.status === "completed")
       return false;
     const measured = messages.findLastIndex((message) => hasMeasuredPrompt(message, context.model.ref));
-    if (measured < messages.findLastIndex(isCheckpoint2))
+    if (measured < messages.findLastIndex(isNativeCompaction2))
       return false;
     return estimateContext2(context) >= ceiling;
   };
   const summarize = Effect.fnUntraced(function* (trigger, budget, keep) {
     const context = trigger.context;
     const split = splitConversation(context.messages, keep);
-    if (!split)
+    if (split === undefined)
       return yield* Effect.fail(NOTHING_TO_COMPACT);
     const previous = previousCompaction(context.messages);
     const prompt = buildPrompt2(previous !== undefined, previous?.summary.includes(LEGACY_HEADING) ?? false);
@@ -232,16 +233,16 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
 `).filter((line) => line.startsWith("##"));
     const filled = (text) => text.split(`
 `).some((line) => headings.includes(line.trim()));
-    const prepared = yield* prepare(context, split.older, budget);
+    const prepared = yield* prepare(context, context.messages, budget);
     const send = (request) => Effect.gen(function* () {
       const prompted = fitOutput(LLMRequest.update(request, { messages: [...request.messages, Message.user(prompt)] }), context.model.limit);
       const reply = yield* stream(context, prompted, prepared.options);
       if (filled(reply.text))
-        return { ...reply, recent: split.recent };
+        return reply;
       const nudged = fitOutput(LLMRequest.update(prompted, { messages: [...prompted.messages, Message.user(NUDGE)] }), context.model.limit);
       const retry = yield* stream(context, nudged, prepared.options);
       if (filled(retry.text))
-        return { ...retry, recent: split.recent };
+        return retry;
       return yield* Effect.fail({
         error: {
           type: "compaction.failed",
@@ -250,25 +251,24 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
       });
     });
     const overhead = estimate2(prompt) + estimate2(NUDGE);
-    return yield* deliver(trigger, prepared, split.recent, budget - overhead, send);
+    const fit = trigger.reason === "overflow" ? budget : Math.max(budget, summaryRoom(context.model.limit));
+    const result = yield* deliver(trigger, prepared, budget - overhead, send, {
+      fit: fit - overhead,
+      history: withoutTail(prepared.request, split.keepID)
+    });
+    if (!split.keepID)
+      return result;
+    return { ...result, metadata: { keepID: split.keepID, ...result.metadata } };
   });
   const compactNatively = Effect.fnUntraced(function* (trigger, budget, keep) {
     const context = trigger.context;
-    if (!context.messages.some(messageToText))
+    if (!context.messages.some(messageToText2))
       return yield* Effect.fail(NOTHING_TO_COMPACT);
     const unsupported = (message) => Effect.fail({ error: { type: "provider.unsupported-operation", message } });
     const prepared = yield* prepare(context, context.messages, budget, "session");
-    const provenance = provenance2(context.model);
-    if (!provenance)
-      return yield* unsupported("Provider compaction requires a stable, configured endpoint");
-    const routed = provenance2({ model: prepared.request.model, ref: context.model.ref });
-    if (!compatible2(provenance, routed)) {
-      return yield* unsupported("Provider compaction requires the endpoint in provider/model settings, not a model.request rewrite");
-    }
     const toResult = (window, usage) => spend(context.session.id, usage && record2(usage, context.model.cost)).pipe(Effect.as({
       text: "",
-      recent: "",
-      providerContext: encode2(provenance, window)
+      native: { messages: JSON.parse(JSON.stringify(window)) }
     }));
     const send = (request) => {
       if (LLMClient.canCompact(request, { mechanism: "trigger" })) {
@@ -284,22 +284,23 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
       }
       return unsupported(`Native compaction is not supported for ${request.model.provider}/${request.model.route.id}`);
     };
-    return yield* deliver(trigger, prepared, "", budget, send);
+    return yield* deliver(trigger, prepared, budget, send);
   });
-  const deliver = Effect.fnUntraced(function* (trigger, prepared, recent, target, send) {
+  const deliver = Effect.fnUntraced(function* (trigger, prepared, target, send, shrink = { fit: target, history: prepared.request }) {
     const context = trigger.context;
     if (trigger.reason !== "manual") {
-      yield* bus.publish(SessionEvent2.Compaction.Started, { sessionID: context.session.id, reason: "auto", recent });
+      yield* bus.publish(SessionEvent2.Compaction.Started, { sessionID: context.session.id, reason: "auto" });
     }
     if (prepared.event.result)
-      return yield* fromHook(context, prepared.event.result, recent);
+      return yield* fromHook(context, prepared.event.result);
     const policy = yield* policy2(context.session.id);
     let rejections = 0;
     let rejected;
     let asText = false;
+    let fit = shrink.fit;
     while (true) {
-      const fits = !asText && estimateRequest(prepared.request) <= target;
-      const request = fits ? prepared.request : flattenAndDropOldest(prepared.request, context, target) ?? (rejections > 0 ? undefined : asText ? flattenAndDropOldest(prepared.request, context, Number.POSITIVE_INFINITY) : prepared.request);
+      const unchanged = asText ? undefined : estimateRequest(prepared.request) <= fit ? prepared.request : estimateRequest(shrink.history) <= target ? shrink.history : undefined;
+      const request = unchanged ?? flattenAndDropOldest(shrink.history, context, target) ?? (rejections > 0 ? undefined : asText ? flattenAndDropOldest(shrink.history, context, Number.POSITIVE_INFINITY) : shrink.history);
       if (!request) {
         return yield* Effect.fail({
           error: {
@@ -316,7 +317,7 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
         return yield* Effect.fail(cause);
       const error = toSessionError2(cause);
       const tooLarge = cause.reason._tag === "InvalidRequest" && cause.reason.classification === "payload-too-large";
-      if (tooLarge && request === prepared.request) {
+      if (tooLarge && (request === prepared.request || request === shrink.history)) {
         asText = true;
         continue;
       }
@@ -326,6 +327,7 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
           return yield* Effect.fail({ error });
         rejected ??= estimateRequest(request);
         target = Math.floor(rejected * step);
+        fit = target;
         rejections++;
         continue;
       }
@@ -345,8 +347,9 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
   const flattenAndDropOldest = (request, context, target) => {
     const previous = previousCompaction(context.messages);
     const end = request.messages.findLastIndex((message) => previous !== undefined && message.id === previous.id || message.content.some((part) => part.type === "compaction")) + 1;
-    const summary = previous !== undefined && !isCheckpoint2(previous) ? previous : undefined;
-    const lead = summary ? toLLMMessages2([{ ...summary, recent: "" }], context.model.ref) : request.messages.slice(0, end);
+    const summary = previous !== undefined && !isNativeCompaction2(previous) ? previous : undefined;
+    const lead = summary ? toLLMMessages2([{ ...summary, metadata: { ...summary.metadata, recent: "" } }], context.model.ref) : request.messages.slice(0, end);
+    const recent = summary ? kept2(summary) : "";
     const exchanges = request.messages.slice(end).reduce((groups, message) => {
       const text = flattenMessage(message);
       if (!text)
@@ -357,7 +360,7 @@ var layer6 = Layer.effect(Service9, Effect.gen(function* () {
         groups[groups.length - 1] += `
 ${text}`;
       return groups;
-    }, summary?.recent ? [summary.recent] : []);
+    }, recent ? [recent] : []);
     const note = (omitted) => omitted ? `[${omitted} older ${omitted === 1 ? "exchange" : "exchanges"} omitted]
 
 ` : "";
@@ -373,7 +376,6 @@ ${text}`;
   };
   const stream = (context, request, options) => {
     const sessionID = context.session.id;
-    const metadataKey = context.model.model.route.providerMetadataKey ?? context.model.model.provider;
     const unusable = (error) => Effect.fail({ error });
     return llm.stream(request, options).pipe(Stream.runFoldEffect(() => ({ text: "" }), (streamed, event) => {
       if (LLMEvent.is.providerError(event)) {
@@ -387,7 +389,7 @@ ${text}`;
         return bus.publish(SessionEvent2.Compaction.Delta, { sessionID, text: event.text }).pipe(Effect.as({ ...streamed, text: streamed.text + event.text }));
       }
       if (LLMEvent.is.stepFinish(event)) {
-        return spend(sessionID, record2(event.usage, context.model.cost)).pipe(Effect.as({ ...streamed, providerState: event.providerMetadata?.[metadataKey] }));
+        return spend(sessionID, record2(event.usage, context.model.cost)).pipe(Effect.as(streamed));
       }
       if (!LLMEvent.is.finish(event))
         return Effect.succeed(streamed);
@@ -426,15 +428,14 @@ ${text}`;
       inputTokens: { measured: budget, estimated: 0 }
     });
   };
-  const fromHook = (context, supplied, recent) => {
+  const fromHook = (context, supplied) => {
     const usage = supplied.tokens && {
       tokens: supplied.tokens,
       cost: calculateCost2(context.model.cost, supplied.tokens)
     };
     return spend(context.session.id, usage).pipe(Effect.as({
       text: supplied.summary,
-      recent,
-      providerState: supplied.providerState,
+      native: supplied.native,
       metadata: supplied.metadata
     }));
   };
@@ -465,24 +466,22 @@ ${text}`;
       sessionID,
       reason,
       model: context.model.ref,
-      providerState: outcome.providerState,
-      providerContext: outcome.providerContext,
+      native: outcome.native,
       text: outcome.text,
-      recent: outcome.recent,
       ...usage
     }, { metadata: outcome.metadata });
     return { status: "completed" };
   });
-  return Service9.of({
+  return Service13.of({
     transform: state.transform,
     reload: state.reload,
     compact: (trigger) => compact(trigger).pipe(Effect.onInterrupt(() => trigger.reason === "manual" ? Effect.void : publish(trigger, { error: { type: "compaction.interrupted", message: "Compaction was interrupted" } })), Effect.ensuring(Effect.sync(() => spent.delete(trigger.context.session.id))))
   });
 }));
-var node11 = makeLocationNode({
-  service: Service9,
-  layer: layer6,
-  deps: [node85, node88, node89, llmClient2, node68, node37, node58]
+var node15 = makeLocationNode({
+  service: Service13,
+  layer: layer8,
+  deps: [node81, node89, node90, llmClient2, node66, node40, node53]
 });
 var previousCompaction = (messages) => {
   const [first] = messages;
@@ -496,20 +495,23 @@ var transcript = (context, messages) => baseTranscript2({
   messages
 });
 var splitConversation = (messages, keep) => {
-  const entries = messages.flatMap((message, index) => {
-    const text = messageToText(message);
-    return text ? [{ message, text, index }] : [];
+  const entries = messages.flatMap((message) => {
+    const text = messageToText2(message);
+    return text ? [{ message, text }] : [];
   });
   if (entries.length === 0)
     return;
-  const recent = entries.slice(recentStart(entries, keep, previousCompaction(messages)));
+  const first = entries[recentStart(entries, keep, previousCompaction(messages))];
   return {
-    older: messages.slice(0, recent[0]?.index ?? messages.length),
-    recent: recent.map((entry) => entry.text).join(`
-
-`)
+    keepID: first?.message.id
   };
 };
+var withoutTail = (request, from) => {
+  const index = from === undefined ? -1 : request.messages.findIndex((message) => message.id === from);
+  if (index < 0)
+    return request;
+  return LLMRequest.update(request, { messages: request.messages.slice(0, index) });
+};
 var recentStart = (entries, keep, previous) => {
   const dropped = Math.min(oldestToDrop(entries, (entry) => estimate2(entry.text), keep), entries.length - 1);
   const userBoundary = entries.findLastIndex((entry, index) => index <= dropped && entry.message.type === "user");
@@ -518,7 +520,7 @@ var recentStart = (entries, keep, previous) => {
   const latestUser = entries.findLastIndex((entry) => entry.message.type === "user");
   if (latestUser > 0)
     return latestUser;
-  return previous?.recent ? 0 : entries.length;
+  return previous && kept2(previous) ? 0 : entries.length;
 };
 var oldestToDrop = (items, size, budget) => {
   let total = 0;
@@ -532,69 +534,6 @@ var oldestToDrop = (items, size, budget) => {
   }
   return start;
 };
-var messageToText = (message) => {
-  switch (message.type) {
-    case "compaction":
-    case "system":
-      return "";
-    case "user": {
-      const skills = message.skills?.flatMap((skill) => skill.text === undefined ? [] : [`[Skill activated: ${skill.name}]
-${skill.text}`]) ?? [];
-      const files = message.files?.map((file) => {
-        const name = file.name ?? (file.source.type === "uri" ? file.source.uri : "inline attachment");
-        return `[Attached ${file.mime}: ${name}]`;
-      }) ?? [];
-      return [...skills, `[User]: ${message.text}`, ...files].join(`
-`);
-    }
-    case "location-switched":
-      return `[User]: The working directory has been changed to ${message.location.directory}.`;
-    case "assistant":
-      return message.content.flatMap((part) => {
-        if (part.type === "text")
-          return [`[Assistant]: ${part.text}`];
-        if (part.type === "reasoning")
-          return part.text ? [`[Assistant reasoning]: ${part.text}`] : [];
-        const input = typeof part.state.input === "string" ? part.state.input : JSON.stringify(part.state.input);
-        const call = `[Assistant tool call]: ${part.name}(${input})`;
-        if (part.state.status === "completed") {
-          return [call, `[Tool result]: ${truncateToolOutput(serializeToolContent(part.state.content))}`];
-        }
-        if (part.state.status === "error")
-          return [call, `[Tool error]: ${part.state.error.message}`];
-        return [call];
-      }).join(`
-`);
-    case "synthetic":
-      return `[Synthetic context]: ${message.text}`;
-    case "skill":
-      return `[Skill activated: ${message.name}]
-${message.text}`;
-    case "shell":
-      if (message.metadata?.background === true)
-        return "";
-      return `[Shell]: ${message.command}
-${truncateToolOutput(message.output?.output ?? "")}`;
-    default:
-      return "";
-  }
-};
-var truncateToolOutput = (value) => {
-  if (value.length <= TOOL_OUTPUT_MAX_CHARS)
-    return value;
-  let end = 0;
-  let kept = 0;
-  for (const char of value) {
-    if (kept === TOOL_OUTPUT_MAX_CHARS)
-      break;
-    end += char.length;
-    kept++;
-  }
-  if (end === value.length)
-    return value;
-  return `${value.slice(0, end)}
-[truncated]`;
-};
 var flattenMessage = (message) => {
   if (message.role === "system")
     return "";
@@ -608,18 +547,12 @@ var flattenMessage = (message) => {
     if (part.type !== "tool-result")
       return [];
     const result = part.result;
-    const output = result.type === "content" ? serializeToolContent(result.value) : typeof result.value === "string" ? result.value : JSON.stringify(result.value) ?? "";
+    const output = result.type === "content" ? serializeToolContent2(result.value) : typeof result.value === "string" ? result.value : JSON.stringify(result.value) ?? "";
     const label = result.type === "error" ? "Tool error" : "Tool result";
-    return [`[${label}]: ${truncateToolOutput(output)}`];
+    return [`[${label}]: ${truncateToolOutput2(output)}`];
   }).join(`
 `);
 };
-var serializeToolContent = (content) => content.map((item) => {
-  if (item.type === "text")
-    return item.text;
-  return `[Attached ${item.mime}${item.name === undefined ? "" : `: ${item.name}`}]`;
-}).join(`
-`);
 var recentUserMessages2 = (messages, model, keep) => {
   const users = messages.filter((message) => message.type === "user").map((message) => ({ ...message, skills: undefined }));
   const sendable = boundImages2(unsupportedParts2(toLLMMessages2(users, model.ref), model.capabilities));
@@ -652,8 +585,9 @@ var calculateCeiling = (limit, buffer) => {
     return Number.POSITIVE_INFINITY;
   if (buffer !== undefined)
     return window - buffer;
-  return window - Math.max(Math.floor(window * 0.1), window >= 2 * RESERVE_MIN ? RESERVE_MIN : 0);
+  return window - Math.max(Math.floor(window * RESERVE_SHARE), window >= 2 * RESERVE_MIN ? RESERVE_MIN : 0);
 };
+var summaryRoom = (limit) => Math.max(0, (limit.input || limit.context) - RESERVE_MIN);
 var hasMeasuredPrompt = (message, model) => message.type === "assistant" && message.model.providerID === model.providerID && !message.error && message.tokens !== undefined && message.tokens.input + message.tokens.cache.read + message.tokens.cache.write > 0;
 var fitOutput = (request, limit) => {
   const current = request.generation?.maxTokens;
@@ -696,4 +630,4 @@ var estimateMedia = (mime) => {
   return 0;
 };
 
-export { Service9, buildPrompt2, layer6, node11, recentUserMessages2, estimateContext2, estimatePrompt2, exports_compaction2 };
+export { Service13, buildPrompt2, layer8, node15, recentUserMessages2, estimateContext2, estimatePrompt2, exports_compaction2 };

package/dist/chunks/{location-02nrjc1r.js → shell-s8d7rejh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/instructions/index.ts
 var exports_instructions6 = {};
@@ -10,7 +10,7 @@ __export(exports_instructions6, {
   Hash: () => Hash2,
   InitializationBlocked: () => InitializationBlocked2,
   Instructions: () => exports_instructions6,
-  Key: () => Key4,
+  Key: () => Key3,
   Values: () => Values2,
   applyHashDelta: () => applyHashDelta2,
   combine: () => combine2,
@@ -18,7 +18,7 @@ __export(exports_instructions6, {
   diffByKey: () => diffByKey2,
   empty: () => empty3,
   hash: () => hash2,
-  make: () => make20,
+  make: () => make21,
   read: () => read3,
   removed: () => removed2,
   renderInitial: () => renderInitial2,
@@ -28,7 +28,7 @@ __export(exports_instructions6, {
 import { createHash } from "crypto";
 import { Instruction } from "@opencode/schema/instruction";
 import { Data, Effect, Option, Schema } from "effect";
-var Key4 = Instruction.Key;
+var Key3 = Instruction.Key;
 var Hash2 = Instruction.Hash;
 var Values2 = Instruction.Values;
 var Delta2 = Instruction.Delta;
@@ -36,21 +36,21 @@ var NonValue = Data.taggedEnum();
 var unavailable3 = NonValue.Unavailable();
 var removed2 = NonValue.Removed();
 
-class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key4) }) {
+class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key3) }) {
   get message() {
     return `Instruction initialization blocked by unavailable sources: ${this.keys.join(", ")}`;
   }
 }
 
 class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKeyError", {
-  key: Key4
+  key: Key3
 }) {
   get message() {
     return `Duplicate instruction key: ${this.key}`;
   }
 }
 var empty3 = [];
-function make20(source) {
+function make21(source) {
   const decode = Schema.decodeUnknownOption(source.codec);
   const encode = Schema.encodeSync(source.codec);
   const initial = (value) => requireText(source.key, "initial", source.render.initial(value));
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key4, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make20, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };
+export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make21, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };

package/dist/chunks/{location-sa8ekw3f.js → shell-sa8ekw3f.js}

@@ -1,9 +1,9 @@
 import {
   absoluteColumn2
-} from "./location-qnc92qwc.js";
+} from "./shell-qnc92qwc.js";
 import {
   ProjectTable2
-} from "./location-rj3eygr5.js";
+} from "./shell-rj3eygr5.js";
 
 // src/worktree/sql.ts
 import { integer, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{location-rx3mvgkr.js → shell-sh0qrkbh.js}

@@ -1,30 +1,30 @@
 import {
-  Key4,
+  Key3,
   removed2,
-  make20,
+  make21,
   diffByKey2
-} from "./location-02nrjc1r.js";
+} from "./shell-s8d7rejh.js";
 import {
   evaluate2
-} from "./location-0k8emadn.js";
+} from "./shell-envzrdm3.js";
 import {
-  Service37,
-  node40
-} from "./location-d2kjhx1e.js";
+  Service36,
+  node39
+} from "./shell-gmbs0yfc.js";
 import {
   namespace2,
-  name13
-} from "./location-htx0x9rj.js";
+  name14
+} from "./shell-ztk94t9n.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/mcp/instructions.ts
 var exports_instructions3 = {};
 __export(exports_instructions3, {
   McpInstructions: () => exports_instructions3,
   Service: () => Service32,
-  layer: () => layer11,
+  layer: () => layer13,
   node: () => node35
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -63,12 +63,12 @@ var update = (previous, current) => {
 
 class Service32 extends Context.Service()("@opencode/McpInstructions") {
 }
-var layer11 = Layer.effect(Service32, Effect.gen(function* () {
-  const mcp = yield* Service37;
+var layer13 = Layer.effect(Service32, Effect.gen(function* () {
+  const mcp = yield* Service36;
   return Service32.of({
     load: Effect.fn("McpInstructions.load")(function* (permissions) {
-      const source = (value) => make20({
-        key: Key4.make("core/mcp-guidance"),
+      const source = (value) => make21({
+        key: Key3.make("core/mcp-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),
         read: Effect.succeed(value),
         render: {
@@ -86,7 +86,7 @@ var layer11 = Layer.effect(Service32, Effect.gen(function* () {
         const codemode = owned[0]?.codemode !== false;
         if (codemode && !canExecute)
           return [];
-        if (!owned.some((tool) => evaluate2(name13(tool.server, tool.name), "*", permissions).effect !== "deny"))
+        if (!owned.some((tool) => evaluate2(name14(tool.server, tool.name), "*", permissions).effect !== "deny"))
           return [];
         return [
           codemode ? { server: item.server, instructions: item.instructions } : { server: item.server, instructions: item.instructions, codemode: false }
@@ -96,6 +96,6 @@ var layer11 = Layer.effect(Service32, Effect.gen(function* () {
     })
   });
 }));
-var node35 = makeLocationNode({ service: Service32, layer: layer11, deps: [node40] });
+var node35 = makeLocationNode({ service: Service32, layer: layer13, deps: [node39] });
 
-export { Service32, layer11, node35, exports_instructions3 };
+export { Service32, layer13, node35, exports_instructions3 };