@opencode/core 0.0.0-dev-20203 → 0.0.0-dev-20207

package/dist/chunks/{location-services-gap9hmaf.js → skill-k1m56zwf.js}

@@ -1,67 +1,68 @@
 import {
   Service84,
   node88
-} from "./location-services-94mr9t66.js";
+} from "./skill-f0q3zgp7.js";
 import {
-  Service82,
-  node86
-} from "./location-services-xaaqc030.js";
+  Service83,
+  node87
+} from "./skill-w4ja1ymy.js";
 import {
   llmClient2
-} from "./location-services-5t3nmthw.js";
+} from "./skill-5t3nmthw.js";
 import {
   create3
-} from "./location-services-rdw6cm16.js";
+} from "./skill-rdw6cm16.js";
 import {
   estimate2
-} from "./location-services-h6vf3j39.js";
+} from "./skill-h6vf3j39.js";
 import {
   SessionEvent2
-} from "./location-services-ec1grn59.js";
+} from "./skill-ec1grn59.js";
 import {
   provenance2,
   compatible2,
   isCheckpoint2,
   encode2
-} from "./location-services-1rn5pcm9.js";
+} from "./skill-a81kfqvn.js";
 import {
-  load4
-} from "./location-services-3664e2vt.js";
+  load5
+} from "./skill-tgak7z6d.js";
 import {
   toLLMMessages2
-} from "./location-services-xp3fh2h7.js";
+} from "./skill-gg3hnhsj.js";
 import {
   baseTranscript2,
   unsupportedParts2,
   boundImages2,
-  Service24,
-  node27
-} from "./location-services-h9m1c2w5.js";
+  Service39,
+  node43
+} from "./skill-abmzmmfq.js";
 import {
   toSessionError2
-} from "./location-services-c1pmqqvm.js";
+} from "./skill-d0k4a5wc.js";
 import {
   isRetryable2,
   policy2
-} from "./location-services-1hbenywt.js";
+} from "./skill-17jhsav0.js";
 import {
   calculateCost2,
   record2,
   add2
-} from "./location-services-tdstcens.js";
+} from "./skill-tdstcens.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/session/compaction.ts
 var exports_compaction2 = {};
 __export(exports_compaction2, {
-  Service: () => Service11,
+  Service: () => Service9,
   SessionCompaction: () => exports_compaction2,
   buildPrompt: () => buildPrompt2,
   estimateContext: () => estimateContext2,
+  estimatePrompt: () => estimatePrompt2,
   layer: () => layer7,
-  node: () => node13,
+  node: () => node11,
   recentUserMessages: () => recentUserMessages2
 });
 import {
@@ -77,10 +78,11 @@ import {
 } from "@opencode/ai";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Result, Stream } from "effect";
-class Service11 extends Context.Service()("@opencode/SessionCompaction") {
+class Service9 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 UNKNOWN_WINDOW = 200000;
 var TOOL_OUTPUT_MAX_CHARS = 1250;
 var IMAGE_TOKEN_ESTIMATE = 1500;
@@ -155,11 +157,11 @@ 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 layer7 = Layer.effect(Service11, Effect.gen(function* () {
-  const bus = yield* Service82;
+var layer7 = Layer.effect(Service9, Effect.gen(function* () {
+  const bus = yield* Service83;
   const llm = yield* LLMClient.Service;
   const db = (yield* Service84).db;
-  const requests = yield* Service24;
+  const requests = yield* Service39;
   const state = create3({
     name: "session-compaction",
     initial: () => ({ auto: true, keep: 15000 }),
@@ -206,7 +208,7 @@ var layer7 = Layer.effect(Service11, 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);
+    const prepared = yield* prepare(context, split.older, budget);
     const send = (request) => Effect.gen(function* () {
       const prompted = LLMRequest.update(request, { messages: [...request.messages, Message.user(prompt)] });
       const reply = yield* stream(context, prompted, prepared.options);
@@ -231,7 +233,7 @@ var layer7 = Layer.effect(Service11, Effect.gen(function* () {
     if (!context.messages.some(messageToText))
       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, "session");
+    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");
@@ -247,7 +249,7 @@ var layer7 = Layer.effect(Service11, Effect.gen(function* () {
     const send = (request) => {
       if (LLMClient.canCompact(request, { mechanism: "trigger" })) {
         return Effect.gen(function* () {
-          const history = yield* load4(db, context.session.id, "local").pipe(Effect.orDie);
+          const history = yield* load5(db, context.session.id, "local").pipe(Effect.orDie);
           const retained = recentUserMessages2(history, context.model, keep);
           const response = yield* llm.compact(request, { ...prepared.options, mechanism: "trigger" });
           return yield* toResult([...retained, Message.assistant(response.checkpoint)], response.usage);
@@ -390,7 +392,7 @@ ${text}`;
       }
     }));
   };
-  const prepare = (context, messages, webSocket) => {
+  const prepare = (context, messages, budget, webSocket) => {
     const base = transcript(context, messages);
     return requests.compaction({
       session: context.session,
@@ -399,7 +401,8 @@ ${text}`;
       tools: context.tools,
       system: base.system,
       messages: base.messages,
-      webSocket
+      webSocket,
+      inputTokens: { measured: budget, estimated: 0 }
     });
   };
   const fromHook = (context, supplied, recent) => {
@@ -449,16 +452,16 @@ ${text}`;
     }, { metadata: outcome.metadata });
     return { status: "completed" };
   });
-  return Service11.of({
+  return Service9.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 node13 = makeLocationNode({
-  service: Service11,
+var node11 = makeLocationNode({
+  service: Service9,
   layer: layer7,
-  deps: [node86, node88, llmClient2, node27]
+  deps: [node87, node88, llmClient2, node43]
 });
 var previousCompaction = (messages) => {
   const [first] = messages;
@@ -602,22 +605,33 @@ var recentUserMessages2 = (messages, model, keep) => {
   return sendable.slice(oldestToDrop(sendable, estimateMessage, keep));
 };
 var estimateContext2 = (context) => {
+  const prompt = estimatePrompt2(context);
+  return prompt.measured + prompt.estimated;
+};
+var estimatePrompt2 = (context) => {
   const anchorIndex = context.messages.findLastIndex((message) => hasMeasuredPrompt(message, context.model.ref));
   const anchor = context.messages[anchorIndex];
   const base = transcript(context, context.messages.slice(Math.max(0, anchorIndex)));
   const sent = boundImages2(unsupportedParts2(base.messages, context.model.capabilities));
   const unmeasured = sent.filter((message) => message.role !== "assistant" || message.id !== anchor?.id);
   if (anchor?.type !== "assistant" || !anchor.tokens)
-    return estimateRequest({ system: base.system, tools: context.tools.definitions, messages: unmeasured });
+    return {
+      measured: 0,
+      estimated: estimateRequest({ system: base.system, tools: context.tools.definitions, messages: unmeasured })
+    };
   const tokens = anchor.tokens;
-  const measured = tokens.input + tokens.cache.read + tokens.cache.write + tokens.output + tokens.reasoning;
-  return measured + unmeasured.reduce((sum, message) => sum + estimateMessage(message), 0);
+  return {
+    measured: tokens.input + tokens.cache.read + tokens.cache.write + tokens.output + tokens.reasoning,
+    estimated: unmeasured.reduce((sum, message) => sum + estimateMessage(message), 0)
+  };
 };
 var calculateCeiling = (limit, buffer) => {
   const window = limit.input || limit.context;
   if (window <= 0)
     return Number.POSITIVE_INFINITY;
-  return buffer === undefined ? Math.floor(window * 0.9) : window - buffer;
+  if (buffer !== undefined)
+    return window - buffer;
+  return window - Math.max(Math.floor(window * 0.1), window >= 2 * RESERVE_MIN ? RESERVE_MIN : 0);
 };
 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 estimateRequest = (request) => request.system.reduce((sum, part) => sum + estimate2(part.text), 0) + request.tools.reduce((sum, tool) => sum + estimateTool(tool), 0) + request.messages.reduce((sum, message) => sum + estimateMessage(message), 0);
@@ -652,4 +666,4 @@ var estimateMedia = (mime) => {
   return 0;
 };
 
-export { Service11, buildPrompt2, layer7, node13, recentUserMessages2, estimateContext2, exports_compaction2 };
+export { Service9, buildPrompt2, layer7, node11, recentUserMessages2, estimateContext2, estimatePrompt2, exports_compaction2 };

package/dist/chunks/{location-services-k3c624dm.js → skill-k3c624dm.js}

@@ -1,14 +1,14 @@
 import {
   definition2,
   normalizedName2
-} from "./location-services-3w5fmr99.js";
+} from "./skill-3w5fmr99.js";
 import {
   extension2,
   display2
-} from "./location-services-m3fdjcah.js";
+} from "./skill-m3fdjcah.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/codemode/tool.ts
 var exports_tool2 = {};

package/dist/chunks/{location-services-e9xwgjwy.js → skill-kbs8t6dd.js}

@@ -1,18 +1,18 @@
 import {
-  ID13
-} from "./location-services-129hjeyj.js";
+  ID8
+} from "./skill-5b3a1c7c.js";
 import {
   iife2
-} from "./location-services-1kg9ymc8.js";
+} from "./skill-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./location-services-b3za54ys.js";
+} from "./skill-g16crsyf.js";
 
 // src/plugin/provider/cloudflare-ai-gateway.ts
 import { Effect } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
 import { Form } from "@opencode/schema/form";
-var providerID = ID13.make("cloudflare-ai-gateway");
+var providerID = ID8.make("cloudflare-ai-gateway");
 var CloudflareAIGatewayPlugin2 = define({
   id: "opencode.provider.cloudflare.ai.gateway",
   effect: Effect.fn(function* (ctx) {

package/dist/chunks/{location-services-ndwv7bs8.js → skill-kpr1h2gp.js}

@@ -1,28 +1,28 @@
 import {
-  Service77
-} from "./location-services-6v2f9cm4.js";
+  Service76
+} from "./skill-29etqs2x.js";
 import {
   latest2,
-  Service63
-} from "./location-services-5e1npf9a.js";
+  Service50
+} from "./skill-0mc464d2.js";
 import {
-  Service49
-} from "./location-services-sdvc1rg6.js";
+  Service16
+} from "./skill-7w1x3s5v.js";
 import {
-  make10
-} from "./location-services-73tb2d7t.js";
+  make4
+} from "./skill-mvfsc1pv.js";
 import {
   observe2
-} from "./location-services-qsdy395h.js";
+} from "./skill-qsdy395h.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/config/plugin/formatter.ts
 var exports_formatter = {};
 __export(exports_formatter, {
   ConfigFormatterPlugin: () => exports_formatter,
-  Plugin: () => Plugin37
+  Plugin: () => Plugin4
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { FSUtil } from "@opencode/util/fs-util";
@@ -30,14 +30,14 @@ import { Global } from "@opencode/util/global";
 import { Npm } from "@opencode/util/npm";
 import { AppProcess } from "@opencode/util/process";
 import { Effect } from "effect";
-var Plugin37 = define({
+var Plugin4 = define({
   id: "opencode.config.formatter",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service63;
-    const formatter = yield* Service49;
+    const config = yield* Service50;
+    const formatter = yield* Service16;
     const fs = yield* FSUtil.Service;
     const global = yield* Global.Service;
-    const location = yield* Service77;
+    const location = yield* Service76;
     const npm = yield* Npm.Service;
     const processes = yield* AppProcess.Service;
     const loaded = yield* observe2(config, ctx.event, formatter.reload());
@@ -45,7 +45,7 @@ var Plugin37 = define({
       const configured = latest2(loaded.entries, "formatter");
       if (!configured)
         return;
-      const builtIns = make10({
+      const builtIns = make4({
         directory: location.directory,
         worktree: location.project.directory,
         fs,
@@ -74,4 +74,4 @@ var Plugin37 = define({
   })
 });
 
-export { Plugin37, exports_formatter };
+export { Plugin4, exports_formatter };

package/dist/chunks/{location-services-qzyph8ek.js → skill-kxh1rwc9.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/app.ts
 var exports_app = {};
@@ -8,17 +8,17 @@ __export(exports_app, {
   App: () => exports_app,
   Metadata: () => Metadata2,
   configured: () => configured11,
-  layer: () => layer24,
-  make: () => make21,
-  node: () => node75,
+  layer: () => layer23,
+  make: () => make20,
+  node: () => node70,
   useragent: () => useragent2
 });
 import { Context, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
 var Metadata2 = Context.Reference("@opencode/App", {
-  defaultValue: () => make21()
+  defaultValue: () => make20()
 });
-function make21(input = {}) {
+function make20(input = {}) {
   return {
     name: input.name ?? "opencode",
     version: input.version ?? "unknown",
@@ -28,8 +28,8 @@ function make21(input = {}) {
 function useragent2(app) {
   return `opencode/${app.channel}/${app.version}/${app.name}`;
 }
-var layer24 = (input) => Layer.succeed(Metadata2, make21(input));
-var configured11 = (input) => makeGlobalNode({ service: Metadata2, layer: layer24(input), deps: [] });
-var node75 = configured11();
+var layer23 = (input) => Layer.succeed(Metadata2, make20(input));
+var configured11 = (input) => makeGlobalNode({ service: Metadata2, layer: layer23(input), deps: [] });
+var node70 = configured11();
 
-export { Metadata2, make21, useragent2, layer24, configured11, node75, exports_app };
+export { Metadata2, make20, useragent2, layer23, configured11, node70, exports_app };

package/dist/chunks/{location-services-qg0jgkcp.js → skill-m2d0j7c0.js}

@@ -1,16 +1,16 @@
 import {
   AbsolutePath2
-} from "./location-services-922hggd3.js";
+} from "./skill-922hggd3.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/skill/discovery.ts
 var exports_discovery = {};
 __export(exports_discovery, {
-  Service: () => Service10,
+  Service: () => Service7,
   SkillDiscovery: () => exports_discovery,
-  node: () => node12
+  node: () => node9
 });
 import path from "path";
 import { Context, Effect, Layer, Schedule, Schema } from "effect";
@@ -48,9 +48,9 @@ class Index extends Schema.Class("SkillDiscovery.Index")({
 }) {
 }
 
-class Service10 extends Context.Service()("@opencode/SkillDiscovery") {
+class Service7 extends Context.Service()("@opencode/SkillDiscovery") {
 }
-var layer = Layer.effect(Service10, Effect.gen(function* () {
+var layer = Layer.effect(Service7, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const http = (yield* HttpClient.HttpClient).pipe(HttpClient.retryTransient({
@@ -63,7 +63,7 @@ var layer = Layer.effect(Service10, Effect.gen(function* () {
       return true;
     return yield* HttpClientRequest.get(url).pipe(http.execute, Effect.flatMap((response) => response.arrayBuffer), Effect.flatMap((body) => fs.writeWithDirs(destination, new Uint8Array(body))), Effect.as(true), Effect.catch((error) => Effect.logError("failed to download skill file", { url, error }).pipe(Effect.as(false))));
   });
-  return Service10.of({
+  return Service7.of({
     pull: Effect.fn("SkillDiscovery.pull")(function* (url) {
       const base = url.endsWith("/") ? url : `${url}/`;
       const source = new URL(base);
@@ -150,6 +150,6 @@ var layer = Layer.effect(Service10, Effect.gen(function* () {
     })
   });
 }));
-var node12 = makeGlobalNode({ service: Service10, layer, deps: [httpClient, FSUtil.node, Global.node] });
+var node9 = makeGlobalNode({ service: Service7, layer, deps: [httpClient, FSUtil.node, Global.node] });
 
-export { Service10, node12, exports_discovery };
+export { Service7, node9, exports_discovery };

package/dist/chunks/{location-services-m3fdjcah.js → skill-m3fdjcah.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/codemode/web.ts
 var exports_web = {};

package/dist/chunks/{location-services-m9w0rfyh.js → skill-m9w0rfyh.js}

@@ -4,7 +4,7 @@ import {
   orderSelectedFields2,
   mapUpdateSet2,
   getTableLikeName2
-} from "./location-services-emrn6kk6.js";
+} from "./skill-emrn6kk6.js";
 
 // src/database/drizzle/sqlite-core/effect/update.ts
 import { applyEffectWrapper } from "drizzle-orm/effect-core/query-effect";

package/dist/chunks/{location-services-faxt9yky.js → skill-mbkr92z7.js}

@@ -1,27 +1,27 @@
 import {
-  Service37
-} from "./location-services-pttdfhpz.js";
+  Service60
+} from "./skill-6tb6gx4y.js";
 import {
-  Service14
-} from "./location-services-mv9w5stb.js";
+  Service30
+} from "./skill-6fchhapm.js";
 import {
   text2,
   deliver2
-} from "./location-services-x1ezjp6w.js";
+} from "./skill-x1ezjp6w.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/session/subagent-job.ts
 var exports_subagent_job = {};
 __export(exports_subagent_job, {
   SubagentJob: () => exports_subagent_job,
-  make: () => make9
+  make: () => make6
 });
 import { Effect, Scope } from "effect";
-var make9 = Effect.gen(function* () {
-  const sessions = yield* Service14;
-  const jobs = yield* Service37;
+var make6 = Effect.gen(function* () {
+  const sessions = yield* Service30;
+  const jobs = yield* Service60;
   const scope = yield* Scope.Scope;
   const notifications = new Set;
   const notify = Effect.fn("SubagentJob.notify")(function* (recovery, startedAt) {
@@ -58,4 +58,4 @@ var make9 = Effect.gen(function* () {
   };
 });
 
-export { make9, exports_subagent_job };
+export { make6, exports_subagent_job };

package/dist/chunks/{location-services-xzhjr7c3.js → skill-mcqskrh7.js}

@@ -4,43 +4,43 @@ import {
   normalizeContent2,
   normalizedName2,
   effectiveName2
-} from "./location-services-3w5fmr99.js";
+} from "./skill-3w5fmr99.js";
 import {
   create2,
   catalog2
-} from "./location-services-k3c624dm.js";
+} from "./skill-k3c624dm.js";
 import {
   create3
-} from "./location-services-rdw6cm16.js";
+} from "./skill-rdw6cm16.js";
 import {
-  Service39,
-  node41
-} from "./location-services-xs0sd5xy.js";
+  Service44,
+  node47
+} from "./skill-f0ftzx98.js";
 import {
-  Service59,
-  node61
-} from "./location-services-jvnghvnw.js";
+  Service75,
+  node79
+} from "./skill-166kng33.js";
 import {
   match2
-} from "./location-services-y1fvbwt7.js";
+} from "./skill-y1fvbwt7.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/tool.ts
 var exports_tool = {};
 __export(exports_tool, {
   CallID: () => CallID2,
-  Content: () => Content2,
-  Error: () => Error2,
+  Content: () => Content3,
+  Error: () => Error3,
   FileContent: () => FileContent3,
   RegistrationError: () => RegistrationError2,
-  Service: () => Service38,
+  Service: () => Service43,
   TextContent: () => TextContent2,
   Tool: () => exports_tool,
-  node: () => node40
+  node: () => node46
 });
-import { CallID as CallID2, Content as Content2, Error as Error2, FileContent as FileContent3, TextContent as TextContent2 } from "@opencode/schema/tool";
+import { CallID as CallID2, Content as Content3, Error as Error3, FileContent as FileContent3, TextContent as TextContent2 } from "@opencode/schema/tool";
 import { ToolDefinition } from "@opencode/ai";
 import { Tool } from "@opencode/schema/tool";
 import { Context, Effect, Layer, Result, Schema, SchemaIssue } from "effect";
@@ -51,11 +51,11 @@ class RegistrationError2 extends Schema.TaggedError()("Tool.RegistrationError",
 }) {
 }
 
-class Service38 extends Context.Service()("@opencode/Tool") {
+class Service43 extends Context.Service()("@opencode/Tool") {
 }
-var layer = Layer.effect(Service38, Effect.gen(function* () {
-  const hooks = yield* Service59;
-  const image = yield* Service39;
+var layer = Layer.effect(Service43, Effect.gen(function* () {
+  const hooks = yield* Service75;
+  const image = yield* Service44;
   const normalizeImages = Effect.fnUntraced(function* (content) {
     const normalized = yield* Effect.forEach(content, (item) => {
       if (item.type !== "file" || !item.mime.startsWith("image/"))
@@ -184,7 +184,7 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
       }), { discard: true });
     }
   });
-  return Service38.of({
+  return Service43.of({
     transform: state.transform,
     reload: state.reload,
     list: () => Effect.sync(() => Array.from(state.get().tools.values())),
@@ -273,10 +273,10 @@ function namespaceError(name) {
     return;
   return new RegistrationError2({ name, message: `Invalid tool namespace: ${JSON.stringify(name)}` });
 }
-var node40 = makeLocationNode({
-  service: Service38,
+var node46 = makeLocationNode({
+  service: Service43,
   layer,
-  deps: [node61, node41]
+  deps: [node79, node47]
 });
 
-export { RegistrationError2, Service38, node40, exports_tool, CallID2, Content2, Error2, FileContent3, TextContent2 };
+export { RegistrationError2, Service43, node46, exports_tool, CallID2, Content3, Error3, FileContent3, TextContent2 };