@opencode/core 0.0.0-beta-19507 → 0.0.0-dev-19274

package/dist/chunks/{file-access-5kn1j1nt.js → file-25kqvm6v.js}

@@ -1,23 +1,23 @@
 import {
   llmClient2
-} from "./file-access-5t3nmthw.js";
+} from "./file-5t3nmthw.js";
 import {
-  Service58,
-  node62
-} from "./file-access-xjcerejp.js";
+  Service47,
+  node50
+} from "./file-4hszn1mb.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/generate.ts
 var exports_generate = {};
 __export(exports_generate, {
   Generate: () => exports_generate,
   ModelSelectionError: () => ModelSelectionError2,
-  Service: () => Service22,
+  Service: () => Service20,
   UnavailableError: () => UnavailableError3,
-  layer: () => layer11,
-  node: () => node26
+  layer: () => layer10,
+  node: () => node24
 });
 import { LLM, LLMClient } from "@opencode/ai";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -33,17 +33,15 @@ class UnavailableError3 extends Schema.TaggedError()("Generate.UnavailableError"
 }) {
 }
 
-class Service22 extends Context.Service()("@opencode/Generate") {
+class Service20 extends Context.Service()("@opencode/Generate") {
 }
-var layer11 = Layer.effect(Service22, Effect.gen(function* () {
+var layer10 = Layer.effect(Service20, Effect.gen(function* () {
   const llm = yield* LLMClient.Service;
-  const resolver = yield* Service58;
+  const resolver = yield* Service47;
   const runText = Effect.fn("Generate.text")(function* (input) {
     const resolved = yield* resolver.resolve(input.model).pipe(Effect.catchTag([
       "SessionRunnerModel.VariantUnavailableError",
       "SessionRunnerModel.UnsupportedPackageError",
-      "SessionRunnerModel.ModelConfigurationError",
-      "SessionRunnerModel.ModelInitializationError",
       "SessionRunnerModel.UnresolvedProviderVariablesError",
       "SessionRunnerModel.UnsupportedCompactionError"
     ], (error) => {
@@ -63,12 +61,12 @@ var layer11 = Layer.effect(Service22, Effect.gen(function* () {
   const text = (input) => runText(input).pipe(Effect.catchTag("Integration.Authorization", () => new UnavailableError3({
     message: "Generation credentials are unavailable"
   })));
-  return Service22.of({ text });
+  return Service20.of({ text });
 }));
-var node26 = makeLocationNode({
-  service: Service22,
-  layer: layer11,
-  deps: [node62, llmClient2]
+var node24 = makeLocationNode({
+  service: Service20,
+  layer: layer10,
+  deps: [node50, llmClient2]
 });
 
-export { ModelSelectionError2, UnavailableError3, Service22, layer11, node26, exports_generate };
+export { ModelSelectionError2, UnavailableError3, Service20, layer10, node24, exports_generate };

package/dist/chunks/{file-access-29x78va6.js → file-29x78va6.js}

@@ -1,9 +1,9 @@
 import {
   NamedError2
-} from "./file-access-2axfhc9x.js";
+} from "./file-2axfhc9x.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/v1/config/error.ts
 var exports_error2 = {};

package/dist/chunks/{file-access-2a5m3afh.js → file-2a5m3afh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/environment/files.ts
 var exports_files = {};

package/dist/chunks/{file-access-ndzempgb.js → file-2bdsn8gv.js}

@@ -1,12 +1,12 @@
 import {
   PositiveInt2
-} from "./file-access-922hggd3.js";
+} from "./file-922hggd3.js";
 import {
-  Info24
-} from "./file-access-kk00bynn.js";
+  Info22
+} from "./file-axmvebxj.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/v1/config/agent.ts
 var exports_agent4 = {};
@@ -44,7 +44,7 @@ var AgentSchema = Schema.StructWithRest(Schema.Struct({
     description: "Maximum number of agentic iterations before forcing text-only response"
   }),
   maxSteps: Schema.optional(PositiveInt2).annotate({ description: "@deprecated Use 'steps' field instead." }),
-  permission: Schema.optional(Info24)
+  permission: Schema.optional(Info22)
 }), [Schema.Record(Schema.String, Schema.Any)]);
 var KNOWN_KEYS = new Set(["name", ...Object.keys(AgentSchema.schema.fields)]);
 var normalize = (agent) => {

package/dist/chunks/{file-access-cmrf6j2e.js → file-2bk70kd1.js}

@@ -1,33 +1,33 @@
 import {
   useragent2
-} from "./file-access-rvyy05ds.js";
+} from "./file-agg557zn.js";
 import {
-  Service78
-} from "./file-access-kntbkpw6.js";
+  Service79
+} from "./file-hw2gt29t.js";
 import {
   OAuth3,
   Event19
-} from "./file-access-0sxmdcx0.js";
+} from "./file-1xzdp18p.js";
 import {
-  ID9,
+  ID6,
   MethodID2
-} from "./file-access-ehknnwyx.js";
+} from "./file-8gbf9msb.js";
 import {
   ID16
-} from "./file-access-g14zqp48.js";
+} from "./file-84tssp1s.js";
 import {
   Family2
-} from "./file-access-9d8v8ke2.js";
+} from "./file-nx4935gj.js";
 import {
   bootstrap2
-} from "./file-access-pjvnvgmy.js";
+} from "./file-pjvnvgmy.js";
 
 // src/plugin/provider/digitalocean.ts
 import { define } from "@opencode/plugin/effect/plugin";
 import { Clock, Deferred, Effect, Option, Schedule, Schema, Semaphore, Stream } from "effect";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 var providerID = ID16.make("digitalocean");
-var integrationID = ID9.make("digitalocean");
+var integrationID = ID6.make("digitalocean");
 var methodID = MethodID2.make("browser");
 var clientID = "b1a6c5158156caac821fd1b30253ca8acb52454a48fa744420e41889cb589f82";
 var authorizeEndpoint = "https://cloud.digitalocean.com/v1/oauth/authorize";
@@ -115,7 +115,7 @@ var oauth = {
 var DigitalOceanPlugin2 = define({
   id: "opencode.provider.digitalocean",
   effect: Effect.fn(function* (ctx) {
-    const bus = yield* Service78;
+    const bus = yield* Service79;
     const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient);
     const loading = Semaphore.makeUnsafe(1);
     const loaded = { routers: [] };

package/dist/chunks/{file-access-9b1t164c.js → file-2cws46q3.js}

@@ -1,29 +1,29 @@
 import {
-  Service67
-} from "./file-access-9655radm.js";
+  Service69
+} from "./file-1xb0henf.js";
 import {
-  Service7
-} from "./file-access-a5gt7g2r.js";
+  Service12
+} from "./file-t0x5rdq8.js";
 import {
   observe2
-} from "./file-access-qsdy395h.js";
+} from "./file-qsdy395h.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/config/plugin/location-watcher.ts
 var exports_location_watcher = {};
 __export(exports_location_watcher, {
   ConfigLocationWatcherPlugin: () => exports_location_watcher,
-  Plugin: () => Plugin14
+  Plugin: () => Plugin40
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin14 = define({
+var Plugin40 = define({
   id: "opencode.config.location-watcher",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service67;
-    const policy = yield* Service7;
+    const config = yield* Service69;
+    const policy = yield* Service12;
     const loaded = yield* observe2(config, ctx.event, policy.reload());
     yield* policy.transform((editor) => {
       for (const entry of loaded.entries) {
@@ -35,4 +35,4 @@ var Plugin14 = define({
   })
 });
 
-export { Plugin14, exports_location_watcher };
+export { Plugin40, exports_location_watcher };

package/dist/chunks/{file-access-54r5fgfq.js → file-2erbc7c4.js}

@@ -1,34 +1,34 @@
 import {
-  Service75
-} from "./file-access-bap3gy1s.js";
+  Service76
+} from "./file-enk99f8n.js";
 import {
   PATCH_CONTEXT_LINES2,
   MAX_PATCH_BYTES2,
   MAX_TOTAL_PATCH_BYTES2,
   emptyPatch2,
   chunksByFile2
-} from "./file-access-tazgh4e4.js";
+} from "./file-tazgh4e4.js";
 import {
   DiffError2
-} from "./file-access-dpnaqgym.js";
+} from "./file-z3syage6.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/plugin/vcs/git.ts
 var exports_git = {};
 __export(exports_git, {
-  Plugin: () => Plugin21,
+  Plugin: () => Plugin5,
   VcsGitPlugin: () => exports_git
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
 import { ChildProcess } from "effect/unstable/process";
 import { AppProcess } from "@opencode/util/process";
-var Plugin21 = define({
+var Plugin5 = define({
   id: "opencode.vcs.git",
   effect: Effect.fn("VcsGitPlugin")(function* (ctx) {
-    const location = yield* Service75;
+    const location = yield* Service76;
     if (location.vcs?.type !== "git")
       return;
     const processes = yield* AppProcess.Service;
@@ -467,4 +467,4 @@ var track = Effect.fnUntraced(function* (ctx, ref, options) {
   return yield* diffAgainstRef(ctx, ref, options);
 });
 
-export { Plugin21, exports_git };
+export { Plugin5, exports_git };

package/dist/chunks/{file-access-7hbsyrtj.js → file-2f1k6btd.js}

@@ -1,65 +1,64 @@
 import {
   Service80,
   node85
-} from "./file-access-t9jk0gx5.js";
+} from "./file-2tv38tk1.js";
 import {
-  Service78,
-  node83
-} from "./file-access-kntbkpw6.js";
+  Service79,
+  node84
+} from "./file-hw2gt29t.js";
 import {
   llmClient2
-} from "./file-access-5t3nmthw.js";
+} from "./file-5t3nmthw.js";
 import {
   SessionEvent2
-} from "./file-access-ec1grn59.js";
+} from "./file-ec1grn59.js";
 import {
   provenance2,
   compatible2,
   isCheckpoint2,
   encode2
-} from "./file-access-csf2jhsg.js";
+} from "./file-csf2jhsg.js";
 import {
   load2
-} from "./file-access-1bagj3va.js";
+} from "./file-7g79e5pr.js";
 import {
   create3
-} from "./file-access-kg06axw8.js";
+} from "./file-kg06axw8.js";
 import {
   toLLMMessages2
-} from "./file-access-3jp54z3r.js";
+} from "./file-3jp54z3r.js";
 import {
   baseTranscript2,
   unsupportedParts2,
   boundImages2
-} from "./file-access-7jrfegz8.js";
+} from "./file-eex81ar0.js";
 import {
   toSessionError2
-} from "./file-access-r1hceb3x.js";
+} from "./file-4x6ztkk5.js";
 import {
   policy2,
   transient2
-} from "./file-access-wqg2ybf7.js";
+} from "./file-c9kt1fwd.js";
 import {
   estimate2
-} from "./file-access-h6vf3j39.js";
+} from "./file-h6vf3j39.js";
 import {
-  calculateCost2,
   record2,
   add2
-} from "./file-access-tdstcens.js";
+} from "./file-tdstcens.js";
 import {
   __export
-} from "./file-access-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/session/compaction.ts
 var exports_compaction2 = {};
 __export(exports_compaction2, {
-  Service: () => Service8,
+  Service: () => Service9,
   SessionCompaction: () => exports_compaction2,
   buildPrompt: () => buildPrompt2,
   estimateTokens: () => estimateTokens2,
   layer: () => layer6,
-  node: () => node11,
+  node: () => node12,
   retainUsers: () => retainUsers2,
   serializeToolContent: () => serializeToolContent2,
   truncateToolOutput: () => truncateToolOutput2
@@ -74,6 +73,7 @@ import {
   LLMRequest,
   Message
 } from "@opencode/ai";
+import { Agent } from "@opencode/schema/agent";
 import { Context, Effect, Layer, Stream } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 var DEFAULT_BUFFER = 20000;
@@ -88,44 +88,42 @@ var SUMMARY_TEMPLATE = `You MUST use this format for your response (you may omit
 - [one or two brief sentences describing what the user is trying to accomplish]
 
 ## Requirements
-- [constraints, preferences, requirements, and scope boundaries stated by the user, or "(none)"]
+- [constraints, preferences, requirements, and scope boundaries, or "(none)"]
 
 ## Decisions
 - [decisions already made and why, or "(none)"]
 
 ## Work State
-Break the objective into smaller goals and report which are completed, which are being worked on, and which are blocked.
 ### Completed
-- [goals that have been completed; otherwise "(none)"]
+- [finished work or changes made; otherwise "(none)"]
 
 ### Active
-- [goals currently being worked on; otherwise "(none)"]
+- [current work, partial changes, or investigation state; otherwise "(none)"]
 
 ### Blocked
-- [anything blocking progress, and why; otherwise "(none)"]
+- [blockers, failing commands, or unknowns; otherwise "(none)"]
 
 ## Next Move
 1. [ordered list of next actions, or "(none)"]
 
 ## Relevant Files
-List the files and directories, other than the current working directory, that another agent would need to open to continue this work. Include at most 15, most important first. Do not list every file that was read or changed. Include paths outside the current working directory when relevant. If none, write "(none)".
-- \`[file or directory path]\`: [brief reason it matters]
+List files and directories that are important to the conversation. Include paths outside the current working directory when relevant. If none are relevant, write "(none)".
+- \`[exact path]\`: [why it matters]
 
-## Important Context
-- [facts the next agent cannot continue without and cannot easily find on its own; or "(none)"]
+## Additional Context
+- [facts or references needed to continue the work that are not captured above; omit this section if none]
 </template>`;
 var SUMMARY_RULES = `Rules:
-- Keep each section concise. Use terse, single-line bullets, not prose paragraphs or nested lists.
-- Prefer short references over detailed restatement. It is fine to leave out information the next agent can recover from the code or the files listed above.
-- Preserve exact file paths, symbols, commands, error strings, URLs, and identifiers.
+- Use terse bullets, not prose paragraphs.
+- Preserve exact file paths, symbols, commands, error strings, URLs, and identifiers when known.
 - Carry forward only user questions or requests that remain unanswered or require further action. Do not repeat ones that newer history has answered or resolved. Preserve exact wording when carrying one forward.
 - Preserve consequential workflow state, including whether changes are uncommitted, committed, pushed, under review, or merged.
+- Do not include ambient environment metadata such as the session ID, current working directory, repository root, current branch, or worktree path. The next agent receives current environment information separately. Include these details only when they directly affect the task.
 - Do not mention the summary process or that context was compacted.`;
 var SUMMARY_HEADINGS = SUMMARY_TEMPLATE.split(`
 `).filter((line) => line.startsWith("##"));
-var LEGACY_HEADING = "## Additional Context";
 
-class Service8 extends Context.Service()("@opencode/SessionCompaction") {
+class Service9 extends Context.Service()("@opencode/SessionCompaction") {
 }
 var hasInputUsage = (message) => message.type === "assistant" && !message.error && message.tokens !== undefined && message.tokens.input + message.tokens.cache.read + message.tokens.cache.write > 0;
 var estimateTokens2 = (input) => {
@@ -265,9 +263,9 @@ var findTailStart = (messages, keepTokens) => {
   const previousSummary = messages.findLast((message) => message.type === "compaction" && message.status === "completed");
   return previousSummary?.recent ? conversation[0].index : messages.length;
 };
-var buildPrompt2 = (update, legacy = false) => {
+var buildPrompt2 = (update) => {
   const shared = [
-    "Summarize only what the user and the assistant said and did. Leave out instructions and setup the assistant was given rather than told by the user: repository conventions, instruction files such as AGENTS.md, and environment details like the session ID. The next agent receives current versions of all of these separately.",
+    "Summarize only the history shown. More recent context may be retained and presented after this summary.",
     SUMMARY_TEMPLATE,
     SUMMARY_RULES,
     "Do not continue the task or call tools.",
@@ -276,10 +274,7 @@ var buildPrompt2 = (update, legacy = false) => {
   if (update) {
     return [
       "Update the existing checkpoint in the conversation above into one consolidated summary.",
-      ...legacy ? [
-        "The existing checkpoint was written with an earlier format that recorded far more detail than this one asks for. Rewrite it at the level of detail described below rather than carrying its detail forward. Keep its requirements, decisions, and open questions; they came from earlier conversation with the user."
-      ] : [],
-      "Newer history always takes precedence over the existing checkpoint. Preserve previous information unless newer history clearly contradicts, supersedes, resolves, or makes it stale. If something is no longer relevant to continuing the work, you may remove it.",
+      "Newer history always takes precedence over the existing checkpoint. Preserve previous information unless newer history clearly contradicts, supersedes, resolves, or makes it stale. When uncertain and there is no conflict, retain it under Additional Context.",
       "Incorporate newer requirements, decisions, progress, and context. Reconcile Work State and Next Move: move completed work out of Active, remove resolved blockers and answered questions, and preserve unresolved or pending work.",
       "Return only the updated Markdown sections. Do not reproduce the `<conversation-checkpoint>`, `<summary>`, or `<recent-context>` wrapper tags from the previous checkpoint.",
       ...shared
@@ -296,8 +291,8 @@ var buildPrompt2 = (update, legacy = false) => {
 };
 var hasSummarySection = (summary) => summary.split(`
 `).some((line) => SUMMARY_HEADINGS.includes(line.trim()));
-var layer6 = Layer.effect(Service8, Effect.gen(function* () {
-  const bus = yield* Service78;
+var layer6 = Layer.effect(Service9, Effect.gen(function* () {
+  const bus = yield* Service79;
   const llm = yield* LLMClient.Service;
   const db = (yield* Service80).db;
   const state = create3({
@@ -324,33 +319,13 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
     recent,
     inputID: input.inputID
   });
-  const supplied = Effect.fn("SessionCompaction.supplied")(function* (input, result, recent) {
-    const context = input.context;
-    const usage = result.tokens ? { tokens: result.tokens, cost: calculateCost2(context.model.cost, result.tokens) } : undefined;
-    if (usage)
-      yield* bus.publish(SessionEvent2.UsageRecorded, {
-        sessionID: context.session.id,
-        source: "compaction",
-        ...usage
-      });
-    yield* bus.publish(SessionEvent2.Compaction.Ended, {
-      sessionID: context.session.id,
-      reason: input.reason,
-      model: context.model.ref,
-      providerState: result.providerState,
-      text: result.summary,
-      recent,
-      ...usage
-    }, { metadata: result.metadata });
-    return { status: "completed" };
-  });
   const interrupted = (input) => input.reason === "auto" ? failed({
     sessionID: input.context.session.id,
     reason: input.reason,
     inputID: input.inputID,
     error: { type: "compaction.interrupted", message: "Compaction was interrupted" }
   }).pipe(Effect.asVoid) : Effect.void;
-  const compactionRequest = (input, messages, webSocket) => {
+  const compactionRequest = (input, messages, prompt, webSocket) => {
     const context = input.context;
     const transcript = baseTranscript2({
       agent: context.agent.info,
@@ -360,15 +335,22 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
       messages
     });
     return input.prepare({
-      session: context.session,
-      agent: context.agent.id,
-      model: context.model,
-      tools: context.tools,
-      system: transcript.system,
-      messages: [
-        ...transcript.messages,
-        ...input.instructionUpdate ? [Message.system(input.instructionUpdate)] : []
-      ],
+      kind: "compaction",
+      scope: {
+        session: context.session,
+        agentID: Agent.ID.make("compaction"),
+        contextAgentID: context.agent.id,
+        model: context.model,
+        tools: context.tools
+      },
+      transcript: {
+        system: transcript.system,
+        messages: [
+          ...transcript.messages,
+          ...input.instructionUpdate ? [Message.system(input.instructionUpdate)] : [],
+          ...prompt
+        ]
+      },
       webSocket
     });
   };
@@ -382,11 +364,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
       inputID: input.inputID,
       error: { type: "provider.unsupported-operation", message }
     });
-    const prepared = yield* compactionRequest(input, context.messages, "session");
-    if (prepared.event.result) {
-      yield* started(input, "");
-      return yield* supplied(input, prepared.event.result, "");
-    }
+    const prepared = yield* compactionRequest(input, context.messages, [], "session");
     const request = prepared.request;
     const provenance = provenance2(context.model);
     if (!provenance)
@@ -394,7 +372,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
     if (!compatible2(provenance, provenance2({ model: request.model, ref: context.model.ref })))
       return yield* reject("Provider compaction requires the endpoint in provider/model settings, not a model.request rewrite");
     const transient = transient2(yield* policy2(context.session.id), {
-      agent: context.agent.id,
+      agent: Agent.ID.make("compaction"),
       model: context.model.ref,
       hook: prepared.retry
     });
@@ -410,12 +388,11 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
           return yield* llm.compact(request, { mechanism: "endpoint", http: prepared.options.http }).pipe(transient);
         return yield* Effect.die(new Error(`${request.model.provider}/${request.model.route.id} has no compaction operation`));
       }));
-      const usage = result.usage ? record2(result.usage, context.model.cost) : undefined;
-      if (usage)
+      if (result.usage)
         yield* bus.publish(SessionEvent2.UsageRecorded, {
           sessionID: context.session.id,
           source: "compaction",
-          ...usage
+          ...record2(result.usage, context.model.cost)
         });
       yield* bus.publish(SessionEvent2.Compaction.Ended, {
         sessionID: context.session.id,
@@ -423,8 +400,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
         model: context.model.ref,
         text: "",
         recent: "",
-        providerContext: encode2(provenance, result.replacement),
-        ...usage
+        providerContext: encode2(provenance, result.replacement)
       });
       return { status: "completed" };
     })).pipe(Effect.onInterrupt(() => interrupted(input)), Effect.catchTag("AI.Error", (cause) => input.reason === "auto" && isContextOverflowFailure(cause) ? recoverLocally({ ...input, started: true }).pipe(Effect.map((result) => result.status === "completed" ? { ...result, recoveredOverflow: true } : result)) : failed({
@@ -454,24 +430,19 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
       source: "compaction",
       ...usage
     }) : Effect.void);
-    const previous = history.messages.findLast((message) => message.type === "compaction" && message.status === "completed");
-    const legacy = previous?.summary.includes(LEGACY_HEADING) ?? false;
-    const prepared = yield* compactionRequest(input, history.messages);
-    if (prepared.event.result)
-      return yield* supplied(input, prepared.event.result, history.recent);
-    const first = LLMRequest.update(prepared.request, {
-      messages: [...prepared.request.messages, Message.user(buildPrompt2(previous !== undefined, legacy))]
-    });
+    const prepared = yield* compactionRequest(input, history.messages, [
+      Message.user(buildPrompt2(history.messages.some((message) => message.type === "compaction" && message.status === "completed")))
+    ]);
     const transient = transient2(yield* policy2(context.session.id), {
-      agent: context.agent.id,
+      agent: Agent.ID.make("compaction"),
       model: context.model.ref,
       hook: prepared.retry
     });
     for (const request of [
-      first,
-      LLMRequest.update(first, {
+      prepared.request,
+      LLMRequest.update(prepared.request, {
         messages: [
-          ...first.messages,
+          ...prepared.request.messages,
           Message.user("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.")
         ]
       })
@@ -535,8 +506,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
         sessionID: context.session.id,
         reason: input.reason,
         error,
-        inputID: input.inputID,
-        ...usage
+        inputID: input.inputID
       });
     }
     yield* bus.publish(SessionEvent2.Compaction.Ended, {
@@ -545,8 +515,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
       model: context.model.ref,
       providerState,
       text: summary,
-      recent: history.recent,
-      ...usage
+      recent: history.recent
     });
     return { status: "completed" };
   });
@@ -605,7 +574,7 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
       }
     }));
   });
-  return Service8.of({
+  return Service9.of({
     transform: state.transform,
     reload: state.reload,
     enabled: () => state.get().auto,
@@ -614,10 +583,10 @@ var layer6 = Layer.effect(Service8, Effect.gen(function* () {
     compactManual
   });
 }));
-var node11 = makeLocationNode({
-  service: Service8,
+var node12 = makeLocationNode({
+  service: Service9,
   layer: layer6,
-  deps: [node83, node85, llmClient2]
+  deps: [node84, node85, llmClient2]
 });
 
-export { Service8, estimateTokens2, retainUsers2, truncateToolOutput2, serializeToolContent2, buildPrompt2, layer6, node11, exports_compaction2 };
+export { Service9, estimateTokens2, retainUsers2, truncateToolOutput2, serializeToolContent2, buildPrompt2, layer6, node12, exports_compaction2 };