@opencode-ai/core 0.0.0-dev-18325 → 0.0.0-dev-18329

package/dist/chunks/{models-dev-hqh8yks9.js → session-hqh8yks9.js}

@@ -1,13 +1,13 @@
 import {
   DirectoryUnavailableError,
   canonical
-} from "./models-dev-mnb85w6b.js";
+} from "./session-mnb85w6b.js";
 import {
   exports_git
-} from "./models-dev-se1aqaya.js";
+} from "./session-se1aqaya.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/worktree/git.ts
 var exports_git2 = {};

package/dist/chunks/{models-dev-j2rwtkhe.js → session-j2rwtkhe.js}

@@ -1,15 +1,15 @@
 import {
   exports_repository
-} from "./models-dev-y198y2ra.js";
+} from "./session-y198y2ra.js";
 import {
   exports_git
-} from "./models-dev-se1aqaya.js";
+} from "./session-se1aqaya.js";
 import {
   AbsolutePath
-} from "./models-dev-j07kk359.js";
+} from "./session-j07kk359.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/repository-cache.ts
 var exports_repository_cache = {};

package/dist/chunks/{models-dev-j6hj5anp.js → session-j2ttq2wp.js}

@@ -1,73 +1,73 @@
 import {
   MAX_STEPS_PROMPT
-} from "./models-dev-qaarhjrp.js";
+} from "./session-qaarhjrp.js";
 import {
-  exports_prompt_cache_diagnostics
-} from "./models-dev-wd268jeg.js";
+  exports_title
+} from "./session-jaqzdgmv.js";
 import {
   exports_step
-} from "./models-dev-szyphmxh.js";
+} from "./session-qw1bvf5z.js";
 import {
   exports_retry
-} from "./models-dev-a09abg6q.js";
+} from "./session-a09abg6q.js";
 import {
-  exports_title
-} from "./models-dev-3vpp9cqa.js";
+  exports_prompt_cache_diagnostics
+} from "./session-wd268jeg.js";
 import {
   exports_context
-} from "./models-dev-n9bcnaja.js";
+} from "./session-sy78314g.js";
 import {
   exports_supervisor
-} from "./models-dev-78q6hcfj.js";
+} from "./session-sfph2zvw.js";
 import {
   exports_compaction
-} from "./models-dev-qnxychff.js";
+} from "./session-s3xy6e3w.js";
 import {
   exports_model_request
-} from "./models-dev-77fdnb9s.js";
+} from "./session-2ffstsrv.js";
+import {
+  exports_tool_output
+} from "./session-7ccgh94t.js";
 import {
   DrainResult,
   Service
-} from "./models-dev-2m0hgr65.js";
+} from "./session-2m0hgr65.js";
 import {
   exports_inbox
-} from "./models-dev-h3kcef9b.js";
+} from "./session-mkaeg0rc.js";
 import {
   exports_model_transport
-} from "./models-dev-d4ax61k3.js";
+} from "./session-d4ax61k3.js";
+import {
+  exports_snapshot
+} from "./session-nd7q3mav.js";
 import {
   llmClient
-} from "./models-dev-k42t1tha.js";
+} from "./session-k42t1tha.js";
 import {
   exports_store
-} from "./models-dev-pj2xv8zd.js";
+} from "./session-1ck4jt77.js";
 import {
   StepFailedError
-} from "./models-dev-fb7nfzf2.js";
+} from "./session-fb7nfzf2.js";
 import {
   exports_instruction_state
-} from "./models-dev-ztjk4rav.js";
-import {
-  SessionMessage
-} from "./models-dev-8rpfd2h6.js";
+} from "./session-ztjk4rav.js";
 import {
   SessionEvent
-} from "./models-dev-a83yvq99.js";
+} from "./session-a83yvq99.js";
 import {
-  exports_snapshot
-} from "./models-dev-mtag0w9g.js";
+  SessionMessage
+} from "./session-8rpfd2h6.js";
 import {
   exports_bus
-} from "./models-dev-f575khxt.js";
+} from "./session-8bkqvs3y.js";
 import {
   exports_database
-} from "./models-dev-c382v0jt.js";
-import {
-  exports_tool_output
-} from "./models-dev-8qrvdwwg.js";
+} from "./session-n3s7wkmf.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
@@ -112,74 +112,108 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   });
   const titles = yield* FiberMap.make();
   const drain = Effect.fn("SessionRunner.drain")(function* (input) {
+    const sessionID = input.sessionID;
     let force = input.force;
-    let continuation = input.continuation;
+    let continuing = input.continuation !== undefined;
+    let step = input.continuation?.step ?? 1;
+    let entering = true;
     const promotable = input.promotable ?? "input";
-    if (!force && !continuation && !(yield* eligible(input.sessionID, promotable)))
-      return DrainResult.Complete();
+    if (!force && !continuing) {
+      const pending = yield* exports_inbox.nextPromotable(db, sessionID, "input");
+      if (!pending || pending.delivery === "queue" && promotable === "steer" && pending.type !== "compaction" && pending.type !== "move")
+        return DrainResult.Complete();
+    }
     yield* plugins.flush;
-    yield* settleStaleToolCalls(input.sessionID);
-    while (true) {
-      if (yield* runPendingCompaction(input.sessionID, "input")) {
-        force = false;
-        continue;
+    yield* settleStaleToolCalls(sessionID);
+    const advanceToStep = Effect.fn("SessionRunner.advanceToStep")(() => Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
+      while (true) {
+        const pending = yield* exports_inbox.serialized(sessionID, Effect.gen(function* () {
+          const next = yield* exports_inbox.nextPromotable(db, sessionID, entering || !continuing ? "input" : "steer");
+          if (next?.type === "compaction")
+            yield* bus.publishAll([
+              [SessionEvent.InboxDelivered, { sessionID, inboxID: next.id }],
+              [SessionEvent.Compaction.Started, { sessionID, reason: "manual", recent: "", inputID: next.id }]
+            ]);
+          if (next?.type === "move")
+            yield* restore(Effect.gen(function* () {
+              yield* modelTransport.close(sessionID);
+              yield* bus.publishAll([
+                [SessionEvent.InboxDelivered, { sessionID, inboxID: next.id }],
+                [SessionEvent.Moved, { sessionID, ...next.payload }]
+              ]);
+            }));
+          return next;
+        }));
+        if (!continuing && pending?.delivery !== "steer") {
+          entering = true;
+          step = 1;
+        }
+        if (pending?.type === "move")
+          return DrainResult.Moved({ continuation: !entering && 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,
+              messages: yield* store.context(sessionID),
+              inputID: pending.id,
+              started: true
+            });
+          })).pipe(Effect.exit);
+          if (Exit.isFailure(compacted)) {
+            yield* bus.publish(SessionEvent.Compaction.Failed, {
+              sessionID,
+              reason: "manual",
+              error: Cause.hasInterruptsOnly(compacted.cause) ? { type: "aborted", message: "Compaction cancelled" } : { type: "compaction.failed", message: Cause.pretty(compacted.cause) },
+              inputID: pending.id
+            });
+            return yield* Effect.failCause(compacted.cause);
+          }
+          force = false;
+          continue;
+        }
+        if (!force && !continuing && (!pending || pending.delivery === "queue" && promotable === "steer"))
+          return DrainResult.Complete();
+        return yield* restore(Effect.gen(function* () {
+          const selected = yield* prepareContext(sessionID);
+          const promoted = yield* exports_inbox.promote(db, bus, sessionID, entering && !continuing ? promotable : "steer");
+          if (promoted > 0 && !selected.session.parentID && exports_title.isUntitled(selected.session))
+            yield* FiberMap.run(titles, sessionID, title.generate(sessionID).pipe(Effect.ignore), {
+              onlyIfMissing: true
+            });
+          if (promoted > 0)
+            step = 1;
+          return { _tag: "Ready", context: yield* context.load(selected) };
+        }));
       }
-      if (yield* runPendingMove(input.sessionID, "input"))
-        return DrainResult.Moved({});
-      if (!force && !continuation && !(yield* exports_inbox.has(db, input.sessionID, promotable)))
-        return DrainResult.Complete();
-      const result = yield* runSteps(input.sessionID, continuation, promotable);
-      if (result._tag === "Moved")
-        return result;
+    })));
+    while (true) {
+      const next = yield* advanceToStep();
+      if (next._tag !== "Ready")
+        return next;
+      continuing = yield* runStep(next.context, step);
+      step++;
       force = false;
-      continuation = undefined;
+      entering = false;
     }
   });
-  const eligible = Effect.fnUntraced(function* (sessionID, promotable) {
-    if (yield* exports_inbox.has(db, sessionID, promotable))
-      return true;
-    if (promotable === "input")
-      return false;
-    const next = yield* exports_inbox.nextPromotable(db, sessionID, "input");
-    return next?.type === "compaction" || next?.type === "move";
-  });
-  const runSteps = Effect.fn("SessionRunner.runSteps")(function* (sessionID, continuation, drainPromotable) {
-    let promotable = continuation ? "steer" : drainPromotable;
-    let step = continuation?.step ?? 1;
-    let next = continuation;
-    let first = true;
-    while (true) {
-      if (yield* runPendingCompaction(sessionID, "steer"))
-        continue;
-      if (yield* runPendingMove(sessionID, "steer"))
-        return DrainResult.Moved({ continuation: next });
-      if (!first && !next && !(yield* exports_inbox.has(db, sessionID, "steer")))
-        return DrainResult.Complete();
-      const result = yield* runStep(sessionID, promotable, step);
-      first = false;
-      promotable = "steer";
-      step = result.step + 1;
-      next = result.needsContinuation ? { step } : undefined;
-    }
+  const prepareContext = Effect.fn("SessionRunner.prepareContext")(function* (sessionID) {
+    const selected = yield* context.select(sessionID);
+    yield* exports_instruction_state.prepare(db, bus, selected.instructions, sessionID);
+    return selected;
   });
-  const runStep = Effect.fn("SessionRunner.runStep")(function* (sessionID, promotable, step) {
+  const runStep = Effect.fn("SessionRunner.runStep")(function* (first, step) {
+    const sessionID = first.session.id;
     let assistantMessageID = SessionMessage.ID.create();
     const retry = yield* Schedule.toStepWithSleep(exports_retry.schedule(bus, sessionID));
-    let currentPromotable = promotable;
-    let currentStep = step;
+    let initial = first;
     let recoverOverflow = true;
     let recoverContinuation = true;
     while (true) {
-      const selected = yield* context.select(sessionID);
-      yield* exports_instruction_state.prepare(db, bus, selected.instructions, selected.session.id);
-      const promoted = currentPromotable ? yield* exports_inbox.promote(db, bus, selected.session.id, currentPromotable) : 0;
-      if (promoted > 0 && !selected.session.parentID && exports_title.isUntitled(selected.session))
-        yield* FiberMap.run(titles, sessionID, title.generate(sessionID).pipe(Effect.ignore), {
-          onlyIfMissing: true
-        });
-      currentStep = promoted > 0 ? 1 : currentStep;
-      currentPromotable = undefined;
-      const loaded = yield* context.load(selected);
+      const loaded = initial ?? (yield* prepareContext(sessionID).pipe(Effect.flatMap(context.load)));
+      initial = undefined;
       const compactionInput = { session: loaded.session, messages: loaded.messages, resolved: loaded.model };
       if (compaction.required(compactionInput)) {
         const compacted = yield* compaction.compact(compactionInput);
@@ -188,7 +222,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         assistantMessageID = SessionMessage.ID.create();
         continue;
       }
-      const stepLimitReached = loaded.agent.info.steps !== undefined && currentStep >= loaded.agent.info.steps;
+      const stepLimitReached = loaded.agent.info.steps !== undefined && step >= loaded.agent.info.steps;
       const transcript = exports_model_request.baseTranscript({
         agent: loaded.agent.info,
         model: loaded.model,
@@ -217,7 +251,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         recoverOverflow: Effect.suspend(() => recoverOverflow && compaction.enabled() ? compaction.compact(compactionInput).pipe(Effect.map((result) => result.status === "completed")) : Effect.succeed(false))
       });
       if (outcome._tag === "Completed")
-        return { needsContinuation: outcome.needsContinuation, step: currentStep };
+        return outcome.needsContinuation;
       if (outcome._tag === "Retry" || outcome._tag === "Continue") {
         yield* retry({ cause: outcome.cause, error: outcome.error, assistantMessageID }).pipe(Pull.catchDone(() => Effect.gen(function* () {
           if (outcome._tag === "Retry")
@@ -238,61 +272,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       recoverContinuation = false;
     }
   });
-  const runPendingCompaction = Effect.fn("SessionRunner.runPendingCompaction")(function* (sessionID, promotable) {
-    return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
-      const pending = yield* exports_inbox.serialized(sessionID, Effect.gen(function* () {
-        const selected = yield* exports_inbox.nextPromotable(db, sessionID, promotable);
-        if (selected?.type !== "compaction")
-          return;
-        yield* bus.publishAll([
-          [SessionEvent.InboxDelivered, { sessionID, inboxID: selected.id }],
-          [SessionEvent.Compaction.Started, { sessionID, reason: "manual", recent: "", inputID: selected.id }]
-        ]);
-        return selected;
-      }));
-      if (pending?.type !== "compaction")
-        return false;
-      const session = yield* getSession(sessionID);
-      const compacted = yield* restore(Effect.gen(function* () {
-        return yield* compaction.compactManual({
-          session,
-          messages: yield* store.context(sessionID),
-          inputID: pending.id,
-          started: true
-        });
-      })).pipe(Effect.exit);
-      if (Exit.isSuccess(compacted))
-        return true;
-      yield* bus.publish(SessionEvent.Compaction.Failed, {
-        sessionID,
-        reason: "manual",
-        error: Cause.hasInterruptsOnly(compacted.cause) ? { type: "aborted", message: "Compaction cancelled" } : { type: "compaction.failed", message: Cause.pretty(compacted.cause) },
-        inputID: pending.id
-      });
-      return yield* Effect.failCause(compacted.cause);
-    }));
-  });
-  const runPendingMove = Effect.fn("SessionRunner.runPendingMove")(function* (sessionID, promotable) {
-    return yield* exports_inbox.serialized(sessionID, Effect.gen(function* () {
-      const pending = yield* exports_inbox.nextPromotable(db, sessionID, promotable);
-      if (pending?.type !== "move")
-        return false;
-      yield* modelTransport.close(sessionID);
-      yield* bus.publishAll([
-        [SessionEvent.InboxDelivered, { sessionID, inboxID: pending.id }],
-        [
-          SessionEvent.Moved,
-          {
-            sessionID,
-            location: pending.payload.location,
-            projectID: pending.payload.projectID,
-            subpath: pending.payload.subpath
-          }
-        ]
-      ]);
-      return true;
-    }));
-  });
   const settleStaleToolCalls = Effect.fn("SessionRunner.settleStaleToolCalls")(function* (sessionID) {
     for (const message of yield* store.context(sessionID)) {
       if (message.type !== "assistant")
@@ -316,12 +295,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       }
     }
   });
-  const getSession = Effect.fn("SessionRunner.getSession")(function* (sessionID) {
-    const session = yield* store.get(sessionID);
-    if (!session)
-      return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
-    return session;
-  });
   return Service.of({ drain });
 }));
 var node = makeLocationNode({

package/dist/chunks/{models-dev-7nbsx8r2.js → session-j3eww3bt.js}

@@ -1,21 +1,21 @@
-import {
-  make
-} from "./models-dev-rfbm65k8.js";
 import {
   exports_entry_observer
-} from "./models-dev-kp1t5rcy.js";
+} from "./session-kp1t5rcy.js";
 import {
-  exports_formatter
-} from "./models-dev-bmh5ja2p.js";
+  make
+} from "./session-rfbm65k8.js";
 import {
   exports_config
-} from "./models-dev-4hdy3cm5.js";
+} from "./session-zmfvhpf3.js";
+import {
+  exports_formatter
+} from "./session-h28y3d5w.js";
 import {
   exports_location
-} from "./models-dev-4e5kwz9p.js";
+} from "./session-etsazzse.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/config/plugin/formatter.ts
 var exports_formatter2 = {};

package/dist/chunks/{models-dev-3vpp9cqa.js → session-jaqzdgmv.js}

@@ -1,42 +1,42 @@
-import {
-  exports_model_request
-} from "./models-dev-77fdnb9s.js";
 import {
   exports_usage
-} from "./models-dev-sw84ckhj.js";
+} from "./session-sw84ckhj.js";
+import {
+  exports_model_request
+} from "./session-2ffstsrv.js";
 import {
   exports_model as exports_model2
-} from "./models-dev-dchmhvrc.js";
+} from "./session-bbf5k6g5.js";
 import {
   llmClient
-} from "./models-dev-k42t1tha.js";
+} from "./session-k42t1tha.js";
 import {
   exports_store
-} from "./models-dev-pj2xv8zd.js";
+} from "./session-1ck4jt77.js";
 import {
   exports_history
-} from "./models-dev-fxq037mg.js";
-import {
-  exports_agent
-} from "./models-dev-cyc7gsb9.js";
+} from "./session-dndvd0y6.js";
 import {
   SessionEvent
-} from "./models-dev-a83yvq99.js";
+} from "./session-a83yvq99.js";
+import {
+  exports_agent
+} from "./session-60w3n897.js";
 import {
   exports_catalog
-} from "./models-dev-qg9j0s40.js";
+} from "./session-45dnwnw4.js";
+import {
+  exports_model
+} from "./session-r13w8t0w.js";
 import {
   exports_bus
-} from "./models-dev-f575khxt.js";
+} from "./session-8bkqvs3y.js";
 import {
   exports_database
-} from "./models-dev-c382v0jt.js";
-import {
-  exports_model
-} from "./models-dev-r13w8t0w.js";
+} from "./session-n3s7wkmf.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/session/title.ts
 var exports_title = {};

package/dist/chunks/{models-dev-k42t1tha.js → session-k42t1tha.js}

@@ -1,9 +1,9 @@
 import {
   WebSocketConstructor
-} from "./models-dev-ck5pgha0.js";
+} from "./session-ck5pgha0.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/effect/app-node-platform.ts
 var exports_app_node_platform = {};

package/dist/chunks/{models-dev-kg1345f7.js → session-kg1345f7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/filesystem/protected.ts
 var exports_protected = {};

package/dist/chunks/{models-dev-0ka3h7gh.js → session-kh1xvhay.js}

@@ -1,15 +1,15 @@
 import {
   exports_source
-} from "./models-dev-rj49fqkq.js";
+} from "./session-ej2g6wsy.js";
 import {
   exports_skill
-} from "./models-dev-7p0jw41j.js";
+} from "./session-93vmbns3.js";
 import {
   AbsolutePath
-} from "./models-dev-j07kk359.js";
+} from "./session-j07kk359.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/plugin/skill.ts
 var exports_skill2 = {};

package/dist/chunks/{models-dev-2kkxv1q9.js → session-khy2pa4e.js}

@@ -1,27 +1,27 @@
+import {
+  makeMemoryDriver
+} from "./session-yf0knd5z.js";
 import {
   makeLocalDriver
-} from "./models-dev-zxe9jjhn.js";
+} from "./session-zxe9jjhn.js";
 import {
   execDefaults
-} from "./models-dev-3g8vftxb.js";
-import {
-  makeMemoryDriver
-} from "./models-dev-yf0knd5z.js";
+} from "./session-3g8vftxb.js";
 import {
   Failed,
   NotFound,
   WrongKind,
   typeFollowing
-} from "./models-dev-xczfw7dq.js";
-import {
-  exports_workspace
-} from "./models-dev-jw7gxmg0.js";
+} from "./session-xczfw7dq.js";
 import {
   exports_location
-} from "./models-dev-4e5kwz9p.js";
+} from "./session-etsazzse.js";
+import {
+  exports_workspace
+} from "./session-0qny67pd.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};

package/dist/chunks/{models-dev-kp1t5rcy.js → session-kp1t5rcy.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/config/plugin/entry-observer.ts
 var exports_entry_observer = {};

package/dist/chunks/{models-dev-krsqcmnj.js → session-krsqcmnj.js}

@@ -1,7 +1,7 @@
 import {
   __export,
   __require
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/provider.ts
 var exports_provider = {};

package/dist/chunks/{models-dev-3sjdqqg6.js → session-kv49rahq.js}

@@ -1,24 +1,24 @@
 import {
   exports_supervisor
-} from "./models-dev-78q6hcfj.js";
+} from "./session-sfph2zvw.js";
 import {
   exports_location_watcher_policy
-} from "./models-dev-6wkzvma0.js";
+} from "./session-6wkzvma0.js";
 import {
   exports_watcher
-} from "./models-dev-y980s7ka.js";
+} from "./session-y980s7ka.js";
 import {
   exports_location
-} from "./models-dev-4e5kwz9p.js";
+} from "./session-etsazzse.js";
 import {
   exports_git
-} from "./models-dev-se1aqaya.js";
+} from "./session-se1aqaya.js";
 import {
   exports_bus
-} from "./models-dev-f575khxt.js";
+} from "./session-8bkqvs3y.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/filesystem/location-watcher.ts
 var exports_location_watcher = {};

package/dist/chunks/{models-dev-x8wyf06h.js → session-kznp9qwd.js}

@@ -1,9 +1,9 @@
 import {
   exports_environment1 as exports_environment
-} from "./models-dev-2kkxv1q9.js";
+} from "./session-khy2pa4e.js";
 import {
   __export
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/mcp/stdio.ts
 var exports_stdio = {};

package/dist/chunks/{models-dev-m55whf0h.js → session-m55whf0h.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./models-dev-krsqcmnj.js";
+} from "./session-krsqcmnj.js";
 import {
   __require
-} from "./models-dev-rvfvac9x.js";
+} from "./session-rvfvac9x.js";
 
 // src/plugin/provider/amazon-bedrock.ts
 import { Effect } from "effect";