@opencode-ai/core 0.0.0-beta-18866 → 0.0.0-beta-18965

package/dist/chunks/{reference-8q7rztf6.js → aisdk-yf78bf3z.js}

@@ -1,30 +1,30 @@
+import {
+  exports_module
+} from "./aisdk-r7a2r1m6.js";
 import {
   exports_instance
-} from "./reference-qf52r0wh.js";
+} from "./aisdk-qf52r0wh.js";
 import {
   exports_internal
-} from "./reference-n5yhfyk0.js";
-import {
-  exports_sdk
-} from "./reference-jesbcz0e.js";
+} from "./aisdk-wvq8c2n1.js";
 import {
   exports_update
-} from "./reference-dtm6fkaa.js";
+} from "./aisdk-dtm6fkaa.js";
 import {
-  exports_module
-} from "./reference-gte2a4bk.js";
+  exports_sdk
+} from "./aisdk-d3jhter6.js";
 import {
   exports_source
-} from "./reference-n256kz7s.js";
+} from "./aisdk-rgtj2rve.js";
 import {
   exports_plugin
-} from "./reference-g0z4yfdj.js";
+} from "./aisdk-j2yp1r0h.js";
 import {
   exports_bus
-} from "./reference-jghhn6h0.js";
+} from "./aisdk-p87673dz.js";
 import {
   __export
-} from "./reference-vpjkya7h.js";
+} from "./aisdk-vpjkya7h.js";
 
 // src/plugin/supervisor.ts
 var exports_supervisor = {};
@@ -34,11 +34,11 @@ __export(exports_supervisor, {
   node: () => node
 });
 import { Event } from "@opencode-ai/schema/config";
-import { Cause, Effect, Layer, Stream } from "effect";
+import { Cause, Effect, Layer, PubSub, Stream } from "effect";
 import path from "path";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import { Npm } from "@opencode-ai/util/npm";
-var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operations, install) {
+var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operations, install, running) {
   const matches = (selector, target) => selector === "*" || (selector.endsWith(".*") ? target.startsWith(selector.slice(0, -1)) : selector === target);
   const definitions = [...pre, ...post];
   const enabled = new Set(definitions.map((plugin) => plugin.id));
@@ -74,6 +74,11 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operat
         state: { status: "failed", error: plugin.error, ref: plugin.ref },
         features: { server: true }
       });
+      const retained = packages.get(operation.target) ?? running.get(operation.target);
+      if (!retained)
+        continue;
+      packages.set(operation.target, retained);
+      enabled.add(retained.id);
       continue;
     }
     failures.delete(operation.target);
@@ -83,13 +88,24 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operat
     packages.set(operation.target, plugin);
     enabled.add(plugin.id);
   }
+  const ordered = [
+    ...pre.filter((plugin) => enabled.has(plugin.id)),
+    ...[...packages.values()].filter((plugin) => enabled.has(plugin.id)),
+    ...post.filter((plugin) => enabled.has(plugin.id))
+  ];
+  const duplicate = (plugin, index) => ordered.findIndex((other) => other.id === plugin.id) !== index;
   return {
-    plugins: [
-      ...pre.filter((plugin) => enabled.has(plugin.id)),
-      ...[...packages.values()].filter((plugin) => enabled.has(plugin.id)),
-      ...post.filter((plugin) => enabled.has(plugin.id))
+    plugins: ordered.filter((plugin, index) => !duplicate(plugin, index)),
+    packages: new Map([...packages].filter(([, plugin]) => enabled.has(plugin.id))),
+    failures: [
+      ...failures.values(),
+      ...ordered.filter(duplicate).map((plugin) => ({
+        id: exports_plugin.ID.make(plugin.id),
+        source: plugin.source ?? { type: "builtin" },
+        state: { status: "failed", error: `Duplicate plugin ID: ${plugin.id}` },
+        features: { server: true, ...plugin.features }
+      }))
     ],
-    failures: [...failures.values()],
     pending: [...pending]
   };
 });
@@ -105,10 +121,12 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
   yield* Effect.addFinalizer(() => release ?? Effect.void);
   yield* Effect.addFinalizer(registry.close);
   let packages = new Set;
+  let running = new Map;
   let outdated = new Set;
   const updating = new Set;
   let generation = 0;
   let observed = 0;
+  const refresh = yield* PubSub.unbounded();
   const activate = Effect.fn("PluginSupervisor.activate")(function* () {
     const current = ++generation;
     const pre = [
@@ -122,7 +140,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
       source: { type: "builtin" }
     }));
     const operations = yield* sources.operations();
-    const immediate = yield* resolve(pre, post, operations, false);
+    const immediate = yield* resolve(pre, post, operations, false, running);
     const source = (source2) => source2.type === "package" ? {
       ...source2,
       ...outdated.has(source2.target) ? { outdated: true } : {},
@@ -130,12 +148,13 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     } : source2;
     const apply = (resolved2) => registry.activate(resolved2.plugins.map((plugin) => plugin.source ? { ...plugin, source: source(plugin.source) } : plugin), resolved2.failures.map((failure) => ({ ...failure, source: source(failure.source) })));
     yield* apply(immediate);
-    const resolved = immediate.pending.length ? yield* resolve(pre, post, operations, true) : immediate;
+    const resolved = immediate.pending.length ? yield* resolve(pre, post, operations, true, running) : immediate;
     if (resolved !== immediate)
       yield* apply(resolved);
-    const loaded = new Set([...resolved.plugins, ...resolved.failures].flatMap((plugin) => plugin.source?.type === "package" ? [plugin.source.target] : []));
-    packages = loaded;
-    yield* Effect.forEach(loaded, (target) => updates.check(target).pipe(Effect.map((available) => [target, available])), { concurrency: "unbounded" }).pipe(Effect.flatMap((checked) => {
+    running = resolved.packages;
+    const targets = new Set([...resolved.plugins, ...resolved.failures].flatMap((plugin) => plugin.source?.type === "package" ? [plugin.source.target] : []));
+    packages = targets;
+    yield* Effect.forEach(targets, (target) => updates.check(target).pipe(Effect.map((available) => [target, available])), { concurrency: "unbounded" }).pipe(Effect.flatMap((checked) => {
       if (current !== generation)
         return Effect.void;
       const next = new Set(checked.flatMap(([target, available]) => available ? [target] : []));
@@ -145,7 +164,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
       return apply(resolved);
     }), Effect.forkScoped({ startImmediately: true }));
   });
-  const reloads = Stream.merge(Stream.merge(sources.changes(), bus.subscribe([Event.Updated, exports_sdk.Updated])), updates.changes().pipe(Stream.filter((update) => packages.has(update.target)), Stream.tap((update) => Effect.sync(() => {
+  const reloads = Stream.merge(Stream.merge(Stream.merge(sources.changes(), Stream.fromPubSub(refresh)), bus.subscribe([Event.Updated, exports_sdk.Updated])), updates.changes().pipe(Stream.filter((update) => packages.has(update.target)), Stream.tap((update) => Effect.sync(() => {
     update.outdated ? outdated.add(update.target) : outdated.delete(update.target);
     update.updating ? updating.add(update.target) : updating.delete(update.target);
   })), Stream.map(() => {
@@ -165,7 +184,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     if (settled)
       yield* settled;
   })), Effect.forkScoped({ startImmediately: true }));
-  yield* Effect.sleep("24 hours").pipe(Effect.andThen(Effect.acquireUseRelease(registry.hold(), () => activate(), (release2) => release2)), Effect.forever, Effect.forkScoped);
+  yield* Effect.sleep("24 hours").pipe(Effect.andThen(PubSub.publish(refresh, undefined)), Effect.forever, Effect.forkScoped);
 }));
 var nodeDeps = [
   exports_plugin.node,

package/dist/chunks/{reference-6qa4ddqm.js → aisdk-yns4vmk5.js}

@@ -1,33 +1,33 @@
+import {
+  exports_token
+} from "./aisdk-z8c1ty6e.js";
 import {
   exports_usage
-} from "./reference-nn16cgj7.js";
+} from "./aisdk-nn16cgj7.js";
 import {
-  exports_token
-} from "./reference-z8c1ty6e.js";
+  toSessionError
+} from "./aisdk-mmnzh4s0.js";
 import {
   exports_model_request
-} from "./reference-3529n0tr.js";
+} from "./aisdk-0awdwz49.js";
 import {
   toLLMMessages
-} from "./reference-g23fad86.js";
-import {
-  toSessionError
-} from "./reference-1btf37k0.js";
+} from "./aisdk-g23fad86.js";
 import {
   llmClient
-} from "./reference-326j4s6w.js";
+} from "./aisdk-326j4s6w.js";
 import {
   SessionEvent
-} from "./reference-a83yvq99.js";
+} from "./aisdk-a83yvq99.js";
 import {
   exports_state
-} from "./reference-b7rje112.js";
+} from "./aisdk-dyrfpcd0.js";
 import {
   exports_bus
-} from "./reference-jghhn6h0.js";
+} from "./aisdk-p87673dz.js";
 import {
   __export
-} from "./reference-vpjkya7h.js";
+} from "./aisdk-vpjkya7h.js";
 
 // src/session/compaction.ts
 var exports_compaction = {};
@@ -41,7 +41,7 @@ __export(exports_compaction, {
   serializeToolContent: () => serializeToolContent,
   truncateToolOutput: () => truncateToolOutput
 });
-import { LLMClient, LLMEvent, Message } from "@opencode-ai/ai";
+import { LLMClient, LLMEvent, LLMRequest, Message } from "@opencode-ai/ai";
 import { Agent } from "@opencode-ai/schema/agent";
 import { Context, Effect, Layer, Stream } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
@@ -51,13 +51,16 @@ var OUTPUT_TOKEN_MAX = 32000;
 var TOOL_OUTPUT_MAX_CHARS = 2000;
 var IMAGE_TOKEN_ESTIMATE = 1500;
 var PDF_TOKEN_ESTIMATE = 2000;
-var SUMMARY_TEMPLATE = `Output exactly the Markdown structure shown inside <template> and keep the section order unchanged. Do not include the <template> tags in your response.
+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.
 <template>
 ## Objective
 - [one or two brief sentences describing what the user is trying to accomplish]
 
-## Important Details
-- [constraints/preferences, decisions and why, important facts/assumptions, exact context needed to continue, or "(none)"]
+## Requirements
+- [constraints, preferences, requirements, and scope boundaries, or "(none)"]
+
+## Decisions
+- [decisions already made and why, or "(none)"]
 
 ## Work State
 ### Completed
@@ -70,18 +73,24 @@ var SUMMARY_TEMPLATE = `Output exactly the Markdown structure shown inside <temp
 - [blockers, failing commands, or unknowns; otherwise "(none)"]
 
 ## Next Move
-1. [immediate concrete action, or "(none)"]
-2. [next action if known, or "(none)"]
+1. [ordered list of next actions, or "(none)"]
 
 ## Relevant Files
-- [file or directory path: why it matters, or "(none)"]
-</template>
+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]
 
-Rules:
-- Keep every section, even when empty.
+## 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:
 - 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("##"));
 
 class Service extends Context.Service()("@opencode/SessionCompaction") {
 }
@@ -105,6 +114,8 @@ var estimateMedia = (mime) => {
   return type.startsWith("image/") ? IMAGE_TOKEN_ESTIMATE : type === "application/pdf" ? PDF_TOKEN_ESTIMATE : 0;
 };
 var estimatePart = (part) => {
+  if (part.type === "compaction")
+    return exports_token.estimate(part.text ?? "");
   if (part.type === "text" || part.type === "reasoning")
     return exports_token.estimate(part.text);
   if (part.type === "media")
@@ -130,7 +141,9 @@ var truncateToolOutput = (value) => {
 };
 var serializeToolContent = (content) => content.map((item) => item.type === "text" ? item.text : `[Attached ${item.mime}${item.name === undefined ? "" : `: ${item.name}`}]`).join(`
 `);
-var serialize = (message) => {
+var serializeRecentMessage = (message) => {
+  if (message.type === "compaction" || message.type === "system")
+    return "";
   if (message.type === "user") {
     const files = message.files?.map((file) => `[Attached ${file.mime}: ${file.name ?? (file.source.type === "uri" ? file.source.uri : "inline attachment")}]`) ?? [];
     const skills = message.skills?.flatMap((skill) => skill.text === undefined ? [] : [`[Skill activated: ${skill.name}]
@@ -158,8 +171,6 @@ ${skill.text}`]) ?? [];
     }).join(`
 `);
   }
-  if (message.type === "system")
-    return `[System update]: ${message.text}`;
   if (message.type === "synthetic")
     return `[Synthetic context]: ${message.text}`;
   if (message.type === "skill")
@@ -170,79 +181,85 @@ ${message.text}`;
 ${truncateToolOutput(message.output?.output ?? "")}`;
   return "";
 };
-var select = (messages, tokens) => {
-  const conversation = messages.filter((message) => message.type !== "compaction" && message.type !== "system").flatMap((message) => {
-    const text = serialize(message);
-    return text ? [{ message, text }] : [];
+var splitHistory = (messages, keepTokens) => {
+  const tailStart = findTailStart(messages, keepTokens);
+  if (tailStart === undefined)
+    return;
+  return {
+    messages: messages.slice(0, tailStart),
+    recent: messages.slice(tailStart).map(serializeRecentMessage).filter(Boolean).join(`
+
+`)
+  };
+};
+var findTailStart = (messages, keepTokens) => {
+  const conversation = messages.flatMap((message, index) => {
+    const text = serializeRecentMessage(message);
+    return text ? [{ message, text, index }] : [];
   });
   if (conversation.length === 0)
     return;
   let total = 0;
-  let split = conversation.length;
+  let start = conversation.length;
   for (let index = conversation.length - 1;index >= 0; index--) {
     const next = total + exports_token.estimate(conversation[index].text);
-    if (split < conversation.length && next > tokens)
+    if (start < conversation.length && next > keepTokens)
       break;
     total = next;
-    split = index;
-  }
-  while (split > 0 && conversation[split].message.type !== "user")
-    split--;
-  if (split === 0) {
-    const latestUser = conversation.findLastIndex((item) => item.message.type === "user");
-    if (latestUser > 0)
-      split = latestUser;
+    start = index;
   }
-  return {
-    head: conversation.slice(0, split).map((item) => item.text).join(`
-
-`),
-    recent: conversation.slice(split).map((item) => item.text).join(`
-
-`)
-  };
+  while (start > 0 && conversation[start].message.type !== "user")
+    start--;
+  if (start > 0)
+    return conversation[start].index;
+  const latestUser = conversation.findLastIndex((item) => item.message.type === "user");
+  if (latestUser > 0)
+    return conversation[latestUser].index;
+  const previousSummary = messages.findLast((message) => message.type === "compaction" && message.status === "completed");
+  return previousSummary?.recent ? conversation[0].index : messages.length;
 };
-var buildPrompt = (input) => [
-  input.previousSummary ? `Update the anchored summary below using the conversation history below.
-Preserve still-true details, remove stale details, and merge in the new facts.
-<previous-summary>
-${input.previousSummary}
-</previous-summary>` : "Create a new anchored summary from the conversation history.",
-  SUMMARY_TEMPLATE,
-  "The following is the conversation history:",
-  ...input.context
-].join(`
+var buildPrompt = (update) => {
+  const shared = [
+    "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.",
+    "Return only the structured summary in the requested format. Do not include a preamble, explanation, or other commentary."
+  ];
+  if (update) {
+    return [
+      "Update the existing checkpoint in the conversation above into one consolidated summary.",
+      "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
+    ].join(`
+
+`);
+  }
+  return [
+    "You MUST summarize the conversation above into a structured summary that will be given to another agent to resume the work.",
+    ...shared
+  ].join(`
 
 `);
-var planContent = (messages, tokens) => {
-  const selected = select(messages, tokens);
-  if (!selected)
-    return;
-  const previousSummary = messages.findLast((message) => message.type === "compaction" && message.status === "completed");
-  const previousRecent = previousSummary?.recent ?? "";
-  const summarizeRecent = !previousRecent && !selected.head;
-  return {
-    prompt: buildPrompt({
-      previousSummary: previousSummary?.summary,
-      context: summarizeRecent ? [selected.recent] : [previousRecent, selected.head].filter(Boolean)
-    }),
-    recent: summarizeRecent ? "" : selected.recent
-  };
 };
+var hasSummarySection = (summary) => summary.split(`
+`).some((line) => SUMMARY_HEADINGS.includes(line.trim()));
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const bus = yield* exports_bus.Service;
   const llm = yield* LLMClient.Service;
   const state = exports_state.create({
     name: "session-compaction",
     initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS }),
-    draft: (draft) => ({
+    editor: (editor) => ({
       configure: (settings) => {
         if (settings.auto !== undefined)
-          draft.auto = settings.auto;
+          editor.auto = settings.auto;
         if (settings.buffer !== undefined)
-          draft.buffer = settings.buffer;
+          editor.buffer = settings.buffer;
         if (settings.tokens !== undefined)
-          draft.tokens = settings.tokens;
+          editor.tokens = settings.tokens;
       }
     })
   });
@@ -250,88 +267,114 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     yield* bus.publish(SessionEvent.Compaction.Failed, input);
     return { status: "failed", error: input.error };
   });
-  const execute = Effect.fn("SessionCompaction.execute")(function* (plan) {
-    if (!plan.started)
+  const execute = Effect.fn("SessionCompaction.execute")(function* (input) {
+    const context = input.context;
+    const history = splitHistory(context.messages, state.get().tokens);
+    if (!history)
+      return yield* failed({
+        sessionID: context.session.id,
+        reason: input.reason,
+        error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
+        inputID: input.inputID
+      });
+    if (!input.started)
       yield* bus.publish(SessionEvent.Compaction.Started, {
-        sessionID: plan.session.id,
-        reason: plan.reason,
-        recent: plan.recent,
-        inputID: plan.inputID
+        sessionID: context.session.id,
+        reason: input.reason,
+        recent: history.recent,
+        inputID: input.inputID
       });
     const chunks = [];
     let failure;
     let usage;
     const recordUsage = Effect.suspend(() => usage ? bus.publish(SessionEvent.UsageRecorded, {
-      sessionID: plan.session.id,
+      sessionID: context.session.id,
       source: "compaction",
       ...usage
     }) : Effect.void);
-    const prepared = yield* plan.prepare({
-      scope: { session: plan.session, agentID: Agent.ID.make("compaction"), model: plan.resolved },
-      transcript: { system: [], messages: [Message.user(plan.prompt)] },
-      contextHooks: false
+    const transcript = exports_model_request.baseTranscript({
+      agent: context.agent.info,
+      model: context.model,
+      tools: context.tools,
+      initial: context.initial,
+      messages: history.messages
     });
-    yield* llm.stream(prepared.request, prepared.options).pipe(Stream.runForEach((event) => {
-      if (LLMEvent.is.providerError(event))
-        failure = {
-          type: event.classification === "context-overflow" ? "provider.invalid-request" : "provider.error",
-          message: event.message
-        };
-      if (LLMEvent.is.textDelta(event)) {
-        chunks.push(event.text);
-        return bus.publish(SessionEvent.Compaction.Delta, {
-          sessionID: plan.session.id,
-          text: event.text
-        });
-      }
-      if (LLMEvent.is.stepFinish(event)) {
-        const step = exports_usage.record(event.usage, plan.resolved.cost);
-        usage = usage ? exports_usage.add(usage, step) : step;
+    const prepared = yield* input.prepare({
+      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)] : [],
+          Message.user(buildPrompt(history.messages.some((message) => message.type === "compaction" && message.status === "completed")))
+        ]
       }
-      return Effect.void;
-    }), Effect.catchTag("AI.Error", (error) => Effect.sync(() => {
-      failure = toSessionError(error);
-    })), Effect.onInterrupt(() => recordUsage.pipe(Effect.andThen(plan.reason === "auto" ? failed({
-      sessionID: plan.session.id,
-      reason: plan.reason,
-      error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
-      inputID: plan.inputID
-    }).pipe(Effect.asVoid) : Effect.void))));
+    });
+    for (let attempt = 0;attempt < 2; attempt++) {
+      chunks.length = 0;
+      yield* llm.stream(attempt === 0 ? prepared.request : LLMRequest.update(prepared.request, {
+        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.")
+        ]
+      }), prepared.options).pipe(Stream.runForEach((event) => {
+        if (LLMEvent.is.providerError(event))
+          failure = {
+            type: event.classification === "context-overflow" ? "provider.invalid-request" : "provider.error",
+            message: event.message
+          };
+        if (LLMEvent.is.textDelta(event)) {
+          chunks.push(event.text);
+          return bus.publish(SessionEvent.Compaction.Delta, {
+            sessionID: context.session.id,
+            text: event.text
+          });
+        }
+        if (LLMEvent.is.stepFinish(event)) {
+          const step = exports_usage.record(event.usage, context.model.cost);
+          usage = usage ? exports_usage.add(usage, step) : step;
+        }
+        return Effect.void;
+      }), Effect.catchTag("AI.Error", (error) => Effect.sync(() => {
+        failure = toSessionError(error);
+      })), Effect.onInterrupt(() => recordUsage.pipe(Effect.andThen(input.reason === "auto" ? failed({
+        sessionID: context.session.id,
+        reason: input.reason,
+        error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
+        inputID: input.inputID
+      }).pipe(Effect.asVoid) : Effect.void))));
+      if (failure || hasSummarySection(chunks.join("")))
+        break;
+    }
     yield* recordUsage;
     const summary = chunks.join("");
-    if (failure || !summary.trim()) {
-      const error = failure ?? { type: "compaction.failed", message: "Compaction produced no summary" };
+    if (failure || !hasSummarySection(summary)) {
+      const error = failure ?? {
+        type: "compaction.failed",
+        message: summary.trim() ? "Compaction summary did not match the required template" : "Compaction produced no summary"
+      };
       return yield* failed({
-        sessionID: plan.session.id,
-        reason: plan.reason,
+        sessionID: context.session.id,
+        reason: input.reason,
         error,
-        inputID: plan.inputID
+        inputID: input.inputID
       });
     }
     yield* bus.publish(SessionEvent.Compaction.Ended, {
-      sessionID: plan.session.id,
-      reason: plan.reason,
+      sessionID: context.session.id,
+      reason: input.reason,
       text: summary,
-      recent: plan.recent
+      recent: history.recent
     });
     return { status: "completed" };
   });
-  const compact = Effect.fn("SessionCompaction.compact")(function* (input) {
-    const content = planContent(input.messages, state.get().tokens);
-    if (content)
-      return yield* execute({
-        session: input.session,
-        resolved: input.resolved,
-        prepare: input.prepare,
-        reason: "auto",
-        ...content
-      });
-    return yield* failed({
-      sessionID: input.session.id,
-      reason: "auto",
-      error: { type: "compaction.unavailable", message: "Nothing to compact yet" }
-    });
-  });
+  const compact = (input) => execute({ ...input, reason: "auto" });
   const required = (input) => {
     const config = state.get();
     if (!config.auto)
@@ -348,29 +391,27 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     return estimateTokens(input) >= promptCeiling;
   };
   const compactManual = Effect.fn("SessionCompaction.compactManual")(function* (input) {
-    const content = planContent(input.messages, state.get().tokens);
-    if (!content)
+    if (findTailStart(input.messages, state.get().tokens) === undefined)
       return yield* failed({
         sessionID: input.session.id,
         reason: "manual",
         error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
         inputID: input.inputID
       });
-    return yield* input.resolveModel(input.session).pipe(Effect.matchEffect({
+    return yield* input.resolveContext(input.session).pipe(Effect.matchEffect({
       onFailure: (cause) => failed({
         sessionID: input.session.id,
         reason: "manual",
         error: toSessionError(cause),
         inputID: input.inputID
       }),
-      onSuccess: (resolved) => execute({
-        session: input.session,
-        resolved,
+      onSuccess: (context) => execute({
+        context,
+        instructionUpdate: context.instructionUpdate,
         prepare: input.prepare,
         reason: "manual",
         inputID: input.inputID,
-        started: input.started,
-        ...content
+        started: input.started
       })
     }));
   });