@opencode/core 2.0.17 → 2.0.19

package/dist/chunks/{schema-vr2z87y7.js → ripgrep-gfm6y7px.js}

@@ -1,121 +1,125 @@
 import {
-  Service83,
+  Service84,
   node87
-} from "./schema-qg2cf98c.js";
+} from "./ripgrep-sf4xqwvj.js";
 import {
-  Service82,
+  Service83,
   node86
-} from "./schema-cmsm0fmq.js";
+} from "./ripgrep-jyx4k4a6.js";
 import {
   SessionMessage2
-} from "./schema-gftt206x.js";
+} from "./ripgrep-gftt206x.js";
 import {
   StepFailedError2
-} from "./schema-0e81x99y.js";
+} from "./ripgrep-e6q37ddf.js";
 import {
   SessionEvent2
-} from "./schema-ec1grn59.js";
+} from "./ripgrep-ec1grn59.js";
 import {
   SessionMessageTable2
-} from "./schema-z07pqspn.js";
+} from "./ripgrep-bjtzbw4r.js";
 import {
   prepare4
-} from "./schema-mvksx64m.js";
+} from "./ripgrep-784hb5j4.js";
 import {
   provenance2
-} from "./schema-ssdqnhy0.js";
+} from "./ripgrep-5dkn69vz.js";
 import {
   decodeMessageRow2,
   preview2
-} from "./schema-3ybey094.js";
+} from "./ripgrep-qsjn5gcs.js";
 import {
-  Service67,
-  node70
-} from "./schema-5m1y3qk6.js";
+  Service52,
+  node54
+} from "./ripgrep-mtndfwk2.js";
 import {
-  Service62,
-  node65
-} from "./schema-wzhdnf6z.js";
+  Service16,
+  node18
+} from "./ripgrep-fgmy5dam.js";
 import {
   llmClient2
-} from "./schema-5t3nmthw.js";
+} from "./ripgrep-5t3nmthw.js";
 import {
-  Service22,
-  node25
-} from "./schema-mj50c66e.js";
+  Service23,
+  node26
+} from "./ripgrep-kxhj4mfa.js";
 import {
   baseTranscript2
-} from "./schema-jmanypz0.js";
+} from "./ripgrep-rwk8kepb.js";
+import {
+  make4
+} from "./ripgrep-8zh4h089.js";
 import {
-  make9
-} from "./schema-x8bbrmd5.js";
+  toSessionError2
+} from "./ripgrep-vpq7wwjy.js";
 import {
-  Service10,
-  node12
-} from "./schema-mpjr2ekw.js";
+  Service5,
+  node7,
+  estimatePrompt2
+} from "./ripgrep-wrw0pdsr.js";
 import {
-  Service18,
-  node21
-} from "./schema-tfvhzp6w.js";
+  Service19,
+  node22
+} from "./ripgrep-v0rxv5z8.js";
 import {
   serialized2,
   nextPromotable2,
   promote2
-} from "./schema-rwvzjkqg.js";
+} from "./ripgrep-5qt97ybp.js";
 import {
-  Service11,
+  Service2,
   isUntitled2,
-  node13
-} from "./schema-bw1k523x.js";
+  node3
+} from "./ripgrep-35qaqz32.js";
 import {
   DrainResult2,
-  Service38
-} from "./schema-hn57h045.js";
+  Service32
+} from "./ripgrep-t2az9yje.js";
 import {
-  node35
-} from "./schema-n72gykqt.js";
+  node77
+} from "./ripgrep-y18nyng0.js";
 import {
-  node39
-} from "./schema-9vhpts05.js";
+  node50
+} from "./ripgrep-rd8q201w.js";
 import {
   Outcome2,
-  make8
-} from "./schema-2627m7vs.js";
+  make3
+} from "./ripgrep-prwn914c.js";
 import {
-  Service24
-} from "./schema-v1faaxn9.js";
+  Service27
+} from "./ripgrep-1x11rq2a.js";
 import {
-  node17
-} from "./schema-8kn7kdrq.js";
+  node19
+} from "./ripgrep-rpwtn2yk.js";
 import {
   MAX_STEPS_PROMPT2
-} from "./schema-y44na4kk.js";
+} from "./ripgrep-y44na4kk.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
 __export(exports_llm, {
   SessionRunnerLLM: () => exports_llm,
-  node: () => node11
+  node: () => node2
 });
 import { Message } from "@opencode/ai";
 import { and, desc, eq, sql } from "drizzle-orm";
 import { Cause, Effect, Exit, FiberMap, Layer } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 var CONTINUE_AFTER_INCOMPLETE_STREAM = "The previous response was interrupted. Continue from where you left off without repeating completed content.";
-var layer = Layer.effect(Service38, Effect.gen(function* () {
-  const bus = yield* Service82;
-  const lifecycle = yield* Service62;
-  const store = yield* Service67;
-  const context = yield* Service18;
-  const modelTransport = yield* Service22;
-  const db = (yield* Service83).db;
-  const compaction = yield* Service10;
-  const plugins = yield* Service24;
-  const title = yield* Service11;
-  const steps = yield* make8;
+var layer = Layer.effect(Service32, Effect.gen(function* () {
+  const bus = yield* Service83;
+  const lifecycle = yield* Service16;
+  const store = yield* Service52;
+  const context = yield* Service19;
+  const modelTransport = yield* Service23;
+  const db = (yield* Service84).db;
+  const compaction = yield* Service5;
+  const plugins = yield* Service27;
+  const title = yield* Service2;
+  const steps = yield* make3;
   const titles = yield* FiberMap.make();
   const drain = Effect.fn("SessionRunner.drain")(function* (input) {
     const sessionID = input.sessionID;
@@ -165,32 +169,28 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
         if (pending?.type === "move")
           return DrainResult2.Moved({ continuation: continuing ? { step } : undefined });
         if (pending?.type === "compaction") {
-          const session = yield* store.get(sessionID);
-          if (!session)
-            return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
           const compacted = yield* restore(Effect.gen(function* () {
-            return yield* compaction.compactManual({
-              session,
-              resolveContext: (session) => Effect.gen(function* () {
-                const selected = yield* context.select(session.id);
-                const model = yield* context.resolveModel(selected.session);
-                const history = yield* preview2(db, session.id, selected.instructions, provenance2(model) ?? "local");
-                return {
-                  session: selected.session,
-                  agent: selected.agent,
-                  tools: selected.tools,
-                  model,
-                  initial: history.initial,
-                  messages: history.messages,
-                  instructionUpdate: history.instructionUpdate
-                };
-              }),
-              prepare: context.request.compaction,
-              messages: yield* store.context(sessionID),
+            const selected = yield* context.select(sessionID);
+            const model = yield* context.resolveModel(selected.session);
+            const history = yield* preview2(db, sessionID, selected.instructions, provenance2(model) ?? "local");
+            return yield* compaction.compact({
+              reason: "manual",
               inputID: pending.id,
-              started: true
+              context: {
+                session: selected.session,
+                agent: selected.agent,
+                tools: selected.tools,
+                model,
+                initial: history.initial,
+                messages: history.messages
+              }
             });
-          })).pipe(Effect.exit);
+          }).pipe(Effect.catch((error) => bus.publish(SessionEvent2.Compaction.Failed, {
+            sessionID,
+            reason: "manual",
+            inputID: pending.id,
+            error: toSessionError2(error)
+          })))).pipe(Effect.exit);
           if (Exit.isFailure(compacted)) {
             yield* bus.publish(SessionEvent2.Compaction.Failed, {
               sessionID,
@@ -240,23 +240,17 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
   const runStep = Effect.fn("SessionRunner.runStep")(function* (first, step) {
     const sessionID = first.session.id;
     let assistantMessageID = SessionMessage2.ID.create();
-    const retry = yield* make9(bus, sessionID);
+    const retry = yield* make4(bus, sessionID);
     let initial = first;
     let recoverOverflow = true;
     let recoverContinuation = true;
     while (true) {
       const loaded = initial ?? (yield* prepareContext(sessionID).pipe(Effect.flatMap(context.load)));
       initial = undefined;
-      const compactionInput = {
-        context: loaded,
-        prepare: context.request.compaction
-      };
-      if (compaction.required({ messages: loaded.messages, resolved: loaded.model, context: loaded })) {
-        const result = yield* compaction.compact(compactionInput);
-        if (result.status !== "completed")
-          return yield* new StepFailedError2({ error: result.error });
-        if (result.recoveredOverflow)
-          recoverOverflow = false;
+      const compacted = yield* compaction.compact({ reason: "auto", context: loaded });
+      if (compacted.status === "failed")
+        return yield* new StepFailedError2({ error: compacted.error });
+      if (compacted.status === "completed") {
         assistantMessageID = SessionMessage2.ID.create();
         continue;
       }
@@ -276,7 +270,8 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
         system: transcript.system,
         messages: stepLimitReached ? [...transcript.messages, Message.assistant(MAX_STEPS_PROMPT2)] : transcript.messages,
         toolChoice: stepLimitReached ? "none" : undefined,
-        webSocket: "session"
+        webSocket: "session",
+        inputTokens: estimatePrompt2(loaded)
       });
       const outcome = yield* steps.attempt({
         isLocationClosed: lifecycle.isClosed,
@@ -294,7 +289,7 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
           retry: proposed
         }),
         recoverContinuation,
-        recoverOverflow: Effect.suspend(() => recoverOverflow && compaction.enabled() ? compaction.compact({ ...compactionInput, overflow: true }).pipe(Effect.map((result) => result.status === "completed")) : Effect.succeed(false))
+        recoverOverflow: Effect.suspend(() => recoverOverflow ? compaction.compact({ reason: "overflow", context: loaded }).pipe(Effect.map((result) => result.status === "completed")) : Effect.succeed(false))
       });
       const completed = yield* Outcome2.$match(outcome, {
         Completed: (outcome) => Effect.succeed(outcome.needsContinuation),
@@ -361,25 +356,25 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
       }
     }
   });
-  return Service38.of({ drain });
+  return Service32.of({ drain });
 }));
-var node11 = makeLocationNode({
-  service: Service38,
+var node2 = makeLocationNode({
+  service: Service32,
   layer,
   deps: [
     node86,
-    node65,
+    node18,
     llmClient2,
-    node21,
-    node25,
-    node70,
-    node12,
-    node17,
-    node13,
-    node35,
-    node39,
+    node22,
+    node26,
+    node54,
+    node7,
+    node19,
+    node3,
+    node77,
+    node50,
     node87
   ]
 });
 
-export { node11, exports_llm };
+export { node2, exports_llm };

package/dist/chunks/{schema-94ek1h2f.js → ripgrep-gfvb90ym.js}

@@ -1,9 +1,9 @@
 import {
   absoluteColumn2
-} from "./schema-6msgmcgs.js";
+} from "./ripgrep-6msgmcgs.js";
 import {
   ProjectTable2
-} from "./schema-wd3x2cqz.js";
+} from "./ripgrep-psazpmmj.js";
 
 // src/worktree/sql.ts
 import { integer, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{schema-q4q3y0ma.js → ripgrep-gfwqm0th.js}

@@ -1,34 +1,32 @@
 import {
-  Service82,
+  Service83,
   node86
-} from "./schema-cmsm0fmq.js";
+} from "./ripgrep-jyx4k4a6.js";
 import {
-  Service79,
+  Service80,
   node83
-} from "./schema-wxnc2egh.js";
+} from "./ripgrep-87ppwq26.js";
 import {
-  ID4
-} from "./schema-6kdq0pjd.js";
-import {
-  Service50,
+  Service64,
   login2,
-  node52
-} from "./schema-5atn9wfq.js";
+  node66
+} from "./ripgrep-bvbkwbsh.js";
 import {
   lazy2
-} from "./schema-88xbtdfr.js";
+} from "./ripgrep-88xbtdfr.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/pty.ts
 var exports_pty = {};
 __export(exports_pty, {
-  CreateInput: () => CreateInput2,
-  Event: () => Event8,
+  CreateInput: () => CreateInput3,
+  Event: () => Event7,
   ExitedError: () => ExitedError2,
-  Info: () => Info17,
-  NotFoundError: () => NotFoundError7,
+  ID: () => ID3,
+  Info: () => Info8,
+  NotFoundError: () => NotFoundError5,
   Pty: () => exports_pty,
   Service: () => Service49,
   UpdateInput: () => UpdateInput2,
@@ -37,30 +35,31 @@ __export(exports_pty, {
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
 import { Pty } from "@opencode/schema/pty";
-import { Event as Event8 } from "@opencode/schema/pty";
+import { Event as Event7 } from "@opencode/schema/pty";
 var BUFFER_LIMIT = 1024 * 1024 * 2;
 var EXITED_LIMIT = 25;
 var pty = lazy2(() => import("#pty"));
-var Info17 = Pty.Info;
-var CreateInput2 = Pty.CreateInput;
+var ID3 = Pty.ID;
+var Info8 = Pty.Info;
+var CreateInput3 = Pty.CreateInput;
 var UpdateInput2 = Pty.UpdateInput;
 
-class NotFoundError7 extends Schema.TaggedError()("Pty.NotFoundError", {
-  ptyID: ID4
+class NotFoundError5 extends Schema.TaggedError()("Pty.NotFoundError", {
+  ptyID: ID3
 }) {
 }
 
 class ExitedError2 extends Schema.TaggedError()("Pty.ExitedError", {
-  ptyID: ID4
+  ptyID: ID3
 }) {
 }
 
 class Service49 extends Context.Service()("@opencode/Pty") {
 }
 var layer = Layer.effect(Service49, Effect.gen(function* () {
-  const bus = yield* Service82;
-  const location = yield* Service79;
-  const shell = yield* Service50;
+  const bus = yield* Service83;
+  const location = yield* Service80;
+  const shell = yield* Service64;
   const context = yield* Effect.context();
   const runFork = Effect.runForkWith(context);
   const sessions = new Map;
@@ -97,7 +96,7 @@ var layer = Layer.effect(Service49, Effect.gen(function* () {
   const requireSession = Effect.fn("Pty.requireSession")(function* (id) {
     const session = sessions.get(id);
     if (!session)
-      return yield* new NotFoundError7({ ptyID: id });
+      return yield* new NotFoundError5({ ptyID: id });
     return session;
   });
   const removeSession = Effect.fnUntraced(function* (id) {
@@ -123,7 +122,7 @@ var layer = Layer.effect(Service49, Effect.gen(function* () {
     return (yield* requireSession(id)).info;
   });
   const create = Effect.fn("Pty.create")(function* (input) {
-    const id = ID4.ascending();
+    const id = ID3.ascending();
     const command = input.command || (yield* shell.resolve({ priority: "config" }));
     const args = login2(command) ? [...input.args ?? [], "-l"] : [...input.args ?? []];
     const cwd = input.cwd || location.directory;
@@ -273,7 +272,7 @@ var layer = Layer.effect(Service49, Effect.gen(function* () {
 var node51 = makeLocationNode({
   service: Service49,
   layer,
-  deps: [node86, node83, node52]
+  deps: [node86, node83, node66]
 });
 
-export { Info17, CreateInput2, UpdateInput2, NotFoundError7, ExitedError2, Service49, node51, exports_pty, Event8 };
+export { ID3, Info8, CreateInput3, UpdateInput2, NotFoundError5, ExitedError2, Service49, node51, exports_pty, Event7 };

package/dist/chunks/{schema-jnqxgjh5.js → ripgrep-gjepqxj6.js}

@@ -1,76 +1,70 @@
 import {
-  Service83,
+  Service84,
   node87
-} from "./schema-qg2cf98c.js";
+} from "./ripgrep-sf4xqwvj.js";
 import {
-  Service82,
+  Service83,
   node86
-} from "./schema-cmsm0fmq.js";
+} from "./ripgrep-jyx4k4a6.js";
 import {
-  Service58,
-  node60
-} from "./schema-52vmy6ww.js";
+  Service38,
+  node40
+} from "./ripgrep-p8xjr5qr.js";
 import {
-  Service41,
-  node43
-} from "./schema-vqfzq50h.js";
+  Service35,
+  node37
+} from "./ripgrep-cdm0dq9n.js";
 import {
   SessionEvent2
-} from "./schema-ec1grn59.js";
+} from "./ripgrep-ec1grn59.js";
 import {
   make15
-} from "./schema-f2n192rq.js";
+} from "./ripgrep-f2n192rq.js";
 import {
   DrainResult2,
-  Service38
-} from "./schema-hn57h045.js";
-import {
-  UserInterruptedError2
-} from "./schema-0e81x99y.js";
+  Service32
+} from "./ripgrep-t2az9yje.js";
 import {
-  Service67,
-  node70
-} from "./schema-5m1y3qk6.js";
+  Service52,
+  node54
+} from "./ripgrep-mtndfwk2.js";
 import {
   toSessionError2
-} from "./schema-wzgg19r1.js";
+} from "./ripgrep-vpq7wwjy.js";
 import {
   nextPromotable2
-} from "./schema-rwvzjkqg.js";
+} from "./ripgrep-5qt97ybp.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/session/execution.ts
 var exports_execution = {};
 __export(exports_execution, {
-  Service: () => Service37,
+  Service: () => Service31,
   SessionExecution: () => exports_execution,
-  layer: () => layer17,
-  node: () => node40,
-  noopLayer: () => noopLayer3,
+  layer: () => layer14,
+  node: () => node34,
+  noopLayer: () => noopLayer2,
   terminal: () => terminal2
 });
 import { Cause, Context, Effect, Exit, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-class Service37 extends Context.Service()("@opencode/SessionExecution") {
+class Service31 extends Context.Service()("@opencode/SessionExecution") {
 }
 function terminal2(exit, reason) {
   if (Exit.isSuccess(exit))
     return { type: "succeeded" };
   if (Cause.hasInterrupts(exit.cause))
     return { type: "interrupted", reason: reason ?? "shutdown" };
-  const failure = Cause.squash(exit.cause);
-  if (failure instanceof UserInterruptedError2)
-    return { type: "interrupted", reason: "user" };
-  return { type: "failed", error: toSessionError2(failure) };
+  return { type: "failed", error: toSessionError2(Cause.squash(exit.cause)) };
 }
-var layer17 = Layer.effect(Service37, Effect.gen(function* () {
-  const store = yield* Service67;
-  const instances = yield* Service41;
-  const bus = yield* Service82;
-  const jobs = yield* Service58;
-  const db = (yield* Service83).db;
+var layer14 = Layer.effect(Service31, Effect.gen(function* () {
+  const store = yield* Service52;
+  const instances = yield* Service35;
+  const bus = yield* Service83;
+  const jobs = yield* Service38;
+  const db = (yield* Service84).db;
   const reportLifecycle = (sessionID, effect) => effect.pipe(Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to publish Session execution lifecycle", cause).pipe(Effect.annotateLogs({ sessionID }))), Effect.asVoid);
   const claimOnCommit = (sessionID) => ({
     commit: () => store.claim(sessionID)
@@ -82,7 +76,7 @@ var layer17 = Layer.effect(Service37, Effect.gen(function* () {
     const session = yield* store.get(sessionID);
     if (!session)
       return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
-    const result = yield* Service38.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
+    const result = yield* Service32.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
     return yield* DrainResult2.$match(result, {
       Complete: () => Effect.void,
       Moved: (result) => drain(sessionID, false, result.continuation, promotable),
@@ -110,7 +104,7 @@ var layer17 = Layer.effect(Service37, Effect.gen(function* () {
       }, releaseOnCommit(sessionID));
     }))
   });
-  return Service37.of({
+  return Service31.of({
     active: coordinator.active,
     isActive: coordinator.isActive,
     interrupt: (sessionID, options) => Effect.gen(function* () {
@@ -129,12 +123,12 @@ var layer17 = Layer.effect(Service37, Effect.gen(function* () {
     awaitIdle: coordinator.awaitIdle
   });
 }));
-var node40 = makeGlobalNode({
-  service: Service37,
-  layer: layer17,
-  deps: [node70, node43, node86, node87, node60]
+var node34 = makeGlobalNode({
+  service: Service31,
+  layer: layer14,
+  deps: [node54, node37, node86, node87, node40]
 });
-var noopLayer3 = Layer.succeed(Service37, Service37.of({
+var noopLayer2 = Layer.succeed(Service31, Service31.of({
   active: Effect.succeed(new Set),
   isActive: () => Effect.succeed(false),
   resume: () => Effect.void,
@@ -143,4 +137,4 @@ var noopLayer3 = Layer.succeed(Service37, Service37.of({
   awaitIdle: () => Effect.void
 }));
 
-export { Service37, terminal2, layer17, node40, noopLayer3, exports_execution };
+export { Service31, terminal2, layer14, node34, noopLayer2, exports_execution };