@opencode-ai/core 0.0.0-dev-19087 → 0.0.0-dev-19093

package/dist/chunks/{instance-j9gxaphs.js → kv-3gng8nv9.js}

@@ -1,76 +1,80 @@
 import {
-  exports_state
-} from "./instance-j6s3yjyb.js";
+  AbsolutePath2,
+  RelativePath2
+} from "./kv-p8qxwesx.js";
 import {
-  exports_location
-} from "./instance-0xgrsc61.js";
+  Repository2,
+  TreeID2,
+  Service72,
+  node76
+} from "./kv-fw8cvjkv.js";
 import {
-  exports_git
-} from "./instance-qz5gwjr7.js";
+  Service70,
+  node74
+} from "./kv-c7r09442.js";
 import {
-  AbsolutePath,
-  RelativePath
-} from "./instance-j07kk359.js";
+  create3
+} from "./kv-kg06axw8.js";
 import {
   __export
-} from "./instance-vpjkya7h.js";
+} from "./kv-9rqn6x4v.js";
 
 // src/snapshot.ts
-var exports_snapshot = {};
-__export(exports_snapshot, {
-  Error: () => Error,
-  ID: () => ID,
-  Service: () => Service,
-  Snapshot: () => exports_snapshot,
-  node: () => node,
-  noopLayer: () => noopLayer
+var exports_snapshot2 = {};
+__export(exports_snapshot2, {
+  Error: () => Error3,
+  ID: () => ID4,
+  Service: () => Service48,
+  Snapshot: () => exports_snapshot2,
+  node: () => node51,
+  noopLayer: () => noopLayer3
 });
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import path from "path";
 import { Context, Effect, Fiber, Layer, Schema, Scope } from "effect";
 import { FSUtil } from "@opencode-ai/util/fs-util";
 import { Global } from "@opencode-ai/util/global";
-import { ID } from "@opencode-ai/schema/snapshot";
+import { ID as ID4 } from "@opencode-ai/schema/snapshot";
 import { Hash } from "@opencode-ai/util/hash";
-class Error extends Schema.TaggedError()("Snapshot.Error", {
+class Error3 extends Schema.TaggedError()("Snapshot.Error", {
   operation: Schema.Literals(["capture", "files", "diff", "restore"]),
   message: Schema.String,
   cause: Schema.optional(Schema.Defect())
 }) {
 }
 
-class Service extends Context.Service()("@opencode/Snapshot") {
+class Service48 extends Context.Service()("@opencode/Snapshot") {
 }
-var layer = Layer.effect(Service, Effect.gen(function* () {
+var layer = Layer.effect(Service48, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const git = yield* exports_git.Service;
+  const git = yield* Service72;
   const global = yield* Global.Service;
-  const location = yield* exports_location.Service;
+  const location = yield* Service70;
   const lifetime = yield* Scope.Scope;
-  const state = exports_state.create({
+  const state = create3({
     name: "snapshot",
     initial: () => ({ enabled: true }),
     editor: (editor) => ({
-      configure: (enabled2) => {
-        editor.enabled = enabled2;
+      configure: (enabled) => {
+        editor.enabled = enabled;
       }
     })
   });
   const repositoryFiber = yield* Effect.cached(Effect.gen(function* () {
     const source = yield* git.repo.discover(location.project.directory);
     if (!source)
-      return yield* new Error({ operation: "capture", message: "Project is not a Git repository" });
-    const worktree = AbsolutePath.make(yield* fs.realPath(source.worktree).pipe(Effect.orDie));
-    const gitDirectory = AbsolutePath.make(path.join(global.data, "snapshot", location.project.id, Hash.fast(worktree)));
-    const snapshotRepository = (yield* fs.existsSafe(path.join(gitDirectory, "HEAD"))) ? new exports_git.Repository({ worktree, gitDirectory, commonDirectory: gitDirectory }) : yield* git.repo.create({ worktree, gitDirectory, seed: source }).pipe(Effect.mapError((cause) => failure("capture", cause)));
+      return yield* new Error3({ operation: "capture", message: "Project is not a Git repository" });
+    const worktree = AbsolutePath2.make(yield* fs.realPath(source.worktree).pipe(Effect.orDie));
+    const gitDirectory = AbsolutePath2.make(path.join(global.data, "snapshot", location.project.id, Hash.fast(worktree)));
+    const snapshotRepository = (yield* fs.existsSafe(path.join(gitDirectory, "HEAD"))) ? new Repository2({ worktree, gitDirectory, commonDirectory: gitDirectory }) : yield* git.repo.create({ worktree, gitDirectory, seed: source }).pipe(Effect.mapError((cause) => failure("capture", cause)));
     return { source, worktree, snapshotRepository };
   }).pipe(Effect.forkIn(lifetime)));
   const repository = repositoryFiber.pipe(Effect.uninterruptible, Effect.flatMap(Fiber.join));
   const scope = Effect.fnUntraced(function* (worktree) {
     const relative = path.relative(worktree, location.directory);
     if (relative.startsWith("..") || path.isAbsolute(relative))
-      return yield* new Error({ operation: "capture", message: "Location is outside the project" });
-    return RelativePath.make(relative.replaceAll("\\", "/") || ".");
+      return yield* new Error3({ operation: "capture", message: "Location is outside the project" });
+    return RelativePath2.make(relative.replaceAll("\\", "/") || ".");
   });
   const enabled = () => location.vcs?.type === "git" && state.get().enabled;
   const capture = Effect.fn("Snapshot.capture")(function* () {
@@ -78,7 +82,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       return;
     return yield* Effect.gen(function* () {
       const repo = yield* repository;
-      return ID.make(yield* git.tree.capture({
+      return ID4.make(yield* git.tree.capture({
         repository: repo.snapshotRepository,
         scopes: [yield* scope(repo.worktree)],
         ignores: repo.source,
@@ -90,14 +94,14 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     const repo = yield* repository.pipe(Effect.mapError((cause) => failure(operation, cause)));
     const comparison = {
       repository: repo.snapshotRepository,
-      from: exports_git.TreeID.make(input.from),
-      to: exports_git.TreeID.make(input.to)
+      from: TreeID2.make(input.from),
+      to: TreeID2.make(input.to)
     };
-    const files2 = yield* git.tree.files(comparison).pipe(Effect.mapError((cause) => failure(operation, cause)));
-    const ignored = yield* git.index.ignored({ repository: repo.source, paths: files2 }).pipe(Effect.mapError((cause) => failure(operation, cause)));
+    const files = yield* git.tree.files(comparison).pipe(Effect.mapError((cause) => failure(operation, cause)));
+    const ignored = yield* git.index.ignored({ repository: repo.source, paths: files }).pipe(Effect.mapError((cause) => failure(operation, cause)));
     return {
       input: comparison,
-      files: files2,
+      files,
       ignored
     };
   });
@@ -114,29 +118,29 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     }).pipe(Effect.mapError((cause) => failure("diff", cause)));
   });
   const plan = Effect.fnUntraced(function* (worktree, input) {
-    const files2 = new Map;
+    const files = new Map;
     for (const [file, snapshot] of input.files) {
       const absolute = path.resolve(worktree, file);
       if (!FSUtil.contains(worktree, absolute))
-        return yield* new Error({ operation: "restore", message: `Path escapes the project: ${file}` });
-      files2.set(file, exports_git.TreeID.make(snapshot));
+        return yield* new Error3({ operation: "restore", message: `Path escapes the project: ${file}` });
+      files.set(file, TreeID2.make(snapshot));
     }
-    return files2;
+    return files;
   });
   const restore = Effect.fn("Snapshot.restore")(function* (input) {
     if (!enabled())
-      return yield* new Error({ operation: "restore", message: "Snapshots are disabled" });
+      return yield* new Error3({ operation: "restore", message: "Snapshots are disabled" });
     const repo = yield* repository.pipe(Effect.mapError((cause) => failure("restore", cause)));
     yield* git.tree.restore({ repository: repo.snapshotRepository, files: yield* plan(repo.worktree, input) }).pipe(Effect.mapError((cause) => failure("restore", cause)));
   });
-  return Service.of({ transform: state.transform, reload: state.reload, capture, files, diff, restore });
+  return Service48.of({ transform: state.transform, reload: state.reload, capture, files, diff, restore });
 }).pipe(Effect.withSpan("Snapshot.boot")));
-var node = makeLocationNode({
-  service: Service,
+var node51 = makeLocationNode({
+  service: Service48,
   layer,
-  deps: [FSUtil.node, exports_git.node, Global.node, exports_location.node]
+  deps: [FSUtil.node, node76, Global.node, node74]
 });
-var noopLayer = Layer.succeed(Service, Service.of({
+var noopLayer3 = Layer.succeed(Service48, Service48.of({
   transform: () => Effect.succeed({ dispose: Effect.void }),
   reload: () => Effect.void,
   capture: () => Effect.undefined,
@@ -145,13 +149,13 @@ var noopLayer = Layer.succeed(Service, Service.of({
   restore: () => Effect.void
 }));
 function failure(operation, cause) {
-  if (cause instanceof Error && cause.operation === operation)
+  if (cause instanceof Error3 && cause.operation === operation)
     return cause;
-  return new Error({
+  return new Error3({
     operation,
     message: cause instanceof globalThis.Error ? cause.message : String(cause),
     cause
   });
 }
 
-export { ID, Error, Service, node, noopLayer, exports_snapshot };
+export { ID4, Error3, Service48, node51, noopLayer3, exports_snapshot2 };

package/dist/chunks/kv-3gnxtrwc.js

@@ -0,0 +1,24 @@
+import {
+  mergeOverlay2
+} from "./kv-64z8z5x5.js";
+import {
+  Service75
+} from "./kv-fqf57vhm.js";
+import {
+  Service50
+} from "./kv-7m27rx9w.js";
+
+// src/plugin/provider/configured.ts
+import { Effect, Option } from "effect";
+var configuredSettings2 = Effect.fn("ProviderPlugin.configuredSettings")(function* (id) {
+  const catalog = yield* Service75;
+  const current = (yield* catalog.provider.get(id))?.settings;
+  const service = yield* Effect.serviceOption(Service50);
+  const entries = Option.isSome(service) ? yield* service.value.entries() : [];
+  return foldSettings2(entries, id, current);
+});
+function foldSettings2(entries, id, initial) {
+  return entries.filter((entry) => entry.type === "document").reduce((settings, entry) => mergeOverlay2(settings, entry.info.providers?.[id]?.settings), initial);
+}
+
+export { configuredSettings2, foldSettings2 };

package/dist/chunks/{instance-jar52fmb.js → kv-3gqhfq1r.js}

@@ -1,18 +1,15 @@
 import {
-  exports_app
-} from "./instance-hs51b0fc.js";
+  useragent2
+} from "./kv-y0bse006.js";
 import {
-  exports_provider
-} from "./instance-68yag814.js";
-import {
-  __require
-} from "./instance-vpjkya7h.js";
+  ID17
+} from "./kv-64z8z5x5.js";
 
 // src/plugin/provider/gitlab.ts
 import os from "os";
 import { Effect } from "effect";
 import { define } from "@opencode-ai/plugin/effect/plugin";
-var GitLabPlugin = define({
+var GitLabPlugin2 = define({
   id: "opencode.provider.gitlab",
   effect: Effect.fn(function* (ctx) {
     yield* ctx.aisdk.hook("sdk", Effect.fn(function* (evt) {
@@ -24,7 +21,7 @@ var GitLabPlugin = define({
         instanceUrl: typeof evt.options.instanceUrl === "string" ? evt.options.instanceUrl : process.env.GITLAB_INSTANCE_URL ?? "https://gitlab.com",
         apiKey: typeof evt.options.apiKey === "string" ? evt.options.apiKey : process.env.GITLAB_TOKEN,
         aiGatewayHeaders: {
-          "User-Agent": `${exports_app.useragent(ctx.app)} gitlab-ai-provider/${mod.VERSION} (${os.platform()} ${os.release()}; ${os.arch()})`,
+          "User-Agent": `${useragent2(ctx.app)} gitlab-ai-provider/${mod.VERSION} (${os.platform()} ${os.release()}; ${os.arch()})`,
           "anthropic-beta": "context-1m-2025-08-07",
           ...evt.options.aiGatewayHeaders
         },
@@ -36,7 +33,7 @@ var GitLabPlugin = define({
       });
     }));
     yield* ctx.aisdk.hook("language", Effect.fn(function* (evt) {
-      if (evt.model.providerID !== exports_provider.ID.gitlab)
+      if (evt.model.providerID !== ID17.gitlab)
         return;
       const featureFlags = typeof evt.options.featureFlags === "object" && evt.options.featureFlags ? evt.options.featureFlags : {};
       const id = evt.model.modelID ?? evt.model.id;
@@ -61,4 +58,4 @@ var GitLabPlugin = define({
   })
 });
 
-export { GitLabPlugin };
+export { GitLabPlugin2 };

package/dist/chunks/{instance-wmxdh12w.js → kv-3hepkmqq.js}

@@ -1,13 +1,13 @@
 import {
-  Timestamps
-} from "./instance-sem2g21k.js";
+  Timestamps2
+} from "./kv-qfa1cgps.js";
 
 // src/kv/sql.ts
 import { sqliteTable, text } from "drizzle-orm/sqlite-core";
-var KVTable = sqliteTable("kv", {
+var KVTable2 = sqliteTable("kv", {
   key: text().primaryKey(),
   value: text({ mode: "json" }).$type().notNull(),
-  ...Timestamps
+  ...Timestamps2
 });
 
-export { KVTable };
+export { KVTable2 };

package/dist/chunks/{instance-zr29p06e.js → kv-3jn85j34.js}

@@ -1,22 +1,27 @@
 import {
-  exports_model
-} from "./instance-8manx9kj.js";
+  ID17,
+  aisdk2,
+  mergeOverlay2
+} from "./kv-64z8z5x5.js";
 import {
-  exports_provider
-} from "./instance-68yag814.js";
+  ID15,
+  VariantID2,
+  Info29,
+  compatibility2
+} from "./kv-azv14p53.js";
 import {
   __export
-} from "./instance-vpjkya7h.js";
+} from "./kv-9rqn6x4v.js";
 
 // src/modal/models.ts
 var exports_models = {};
 __export(exports_models, {
   ModalModels: () => exports_models,
-  get: () => get
+  get: () => get2
 });
 import { Money } from "@opencode-ai/schema/money";
 import { Option, Schema } from "effect";
-var providerID = exports_provider.ID.make("modal");
+var providerID = ID17.make("modal");
 var ReasoningOption = Schema.Struct({
   type: Schema.Literal("effort"),
   values: Schema.Array(Schema.NullOr(Schema.String))
@@ -48,7 +53,7 @@ var RemoteModel = Schema.Struct({
 var Response = Schema.Struct({ data: Schema.Array(Schema.Unknown) });
 var decodeResponse = Schema.decodeUnknownSync(Response);
 var decodeModel = Schema.decodeUnknownOption(RemoteModel);
-async function get(baseURL, apiKey, existing) {
+async function get2(baseURL, apiKey, existing) {
   const response = await fetch(`${baseURL.replace(/\/+$/, "")}/models`, {
     headers: {
       Authorization: `Bearer ${apiKey}`
@@ -64,8 +69,8 @@ async function get(baseURL, apiKey, existing) {
   const templates = new Map(existing.map((model) => [model.id, model]));
   const result = new Map;
   for (const item of remote) {
-    const template = templates.get(exports_model.ID.make(item.base_model_id ?? item.hugging_face_id ?? item.id));
-    const id = exports_model.ID.make(item.id);
+    const template = templates.get(ID15.make(item.base_model_id ?? item.hugging_face_id ?? item.id));
+    const id = ID15.make(item.id);
     result.set(id, build(id, item, baseURL, template));
   }
   return result;
@@ -83,16 +88,16 @@ function limit(value, fallback) {
 function build(id, remote, baseURL, previous) {
   const cost = previous?.cost[0];
   const input = previous?.limit.input;
-  return exports_model.Info.make({
-    ...exports_model.Info.default(providerID, id),
+  return Info29.make({
+    ...Info29.default(providerID, id),
     id,
-    modelID: exports_model.ID.make(remote.id),
+    modelID: ID15.make(remote.id),
     providerID,
     name: remote.name ?? previous?.name ?? remote.id,
     family: previous?.family,
-    compatibility: remote.interleaved === undefined ? previous?.compatibility : exports_model.compatibility(remote.interleaved) ?? previous?.compatibility,
-    package: exports_provider.aisdk("@ai-sdk/openai-compatible"),
-    settings: exports_provider.mergeOverlay(previous?.settings, { baseURL }),
+    compatibility: remote.interleaved === undefined ? previous?.compatibility : compatibility2(remote.interleaved) ?? previous?.compatibility,
+    package: aisdk2("@ai-sdk/openai-compatible"),
+    settings: mergeOverlay2(previous?.settings, { baseURL }),
     headers: previous?.headers,
     body: previous?.body,
     capabilities: {
@@ -127,10 +132,10 @@ function variants(remote) {
     for (const value of option.values) {
       const effort = value ?? "none";
       if (!seen.has(effort))
-        seen.set(effort, { id: exports_model.VariantID.make(effort), settings: { reasoningEffort: effort } });
+        seen.set(effort, { id: VariantID2.make(effort), settings: { reasoningEffort: effort } });
     }
   }
   return [...seen.values()];
 }
 
-export { get, exports_models };
+export { get2, exports_models };

package/dist/chunks/{instance-4xf915ct.js → kv-3qzbfqsy.js}

@@ -1,9 +1,9 @@
 import {
-  exports_usage
-} from "./instance-nn16cgj7.js";
+  SessionEvent2
+} from "./kv-mntxs535.js";
 import {
-  SessionEvent
-} from "./instance-a83yvq99.js";
+  tokens2
+} from "./kv-tjykrgmx.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Effect, Fiber, Iterable } from "effect";
@@ -23,7 +23,7 @@ var hostedContent = (result) => {
     return result.value;
   return [{ type: "text", text: stringify(result.value) }];
 };
-var createLLMEventPublisher = (bus, input) => {
+var createLLMEventPublisher2 = (bus, input) => {
   const deltaBatchInterval = 100;
   const tools = new Map;
   const failureSnapshot = (tool, metadata) => {
@@ -43,7 +43,7 @@ var createLLMEventPublisher = (bus, input) => {
     if (stepStarted)
       return assistantMessageID;
     stepStarted = true;
-    yield* bus.publish(SessionEvent.Step.Started, {
+    yield* bus.publish(SessionEvent2.Step.Started, {
       sessionID: input.sessionID,
       agent: input.agent,
       model: input.model,
@@ -54,7 +54,7 @@ var createLLMEventPublisher = (bus, input) => {
   });
   const currentAssistantMessageID = () => stepStarted ? Effect.succeed(assistantMessageID) : Effect.die(new Error("Tool event before assistant step start"));
   const streamed = Effect.fnUntraced(function* () {
-    yield* bus.publish(SessionEvent.Step.Streamed, {
+    yield* bus.publish(SessionEvent2.Step.Streamed, {
       sessionID: input.sessionID,
       assistantMessageID: yield* startAssistant()
     });
@@ -117,14 +117,14 @@ var createLLMEventPublisher = (bus, input) => {
       chunks.delete(id);
       return;
     });
-    const flush2 = Effect.fnUntraced(function* () {
+    const flush = Effect.fnUntraced(function* () {
       for (const id of Array.from(chunks.keys()))
         yield* end(id);
     });
-    return { start, append, end, flush: flush2, has: (id) => chunks.has(id) };
+    return { start, append, end, flush, has: (id) => chunks.has(id) };
   };
   const text = fragments("text", (_textID, value, ordinal, state) => Effect.gen(function* () {
-    yield* bus.publish(SessionEvent.Text.Ended, {
+    yield* bus.publish(SessionEvent2.Text.Ended, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
@@ -132,7 +132,7 @@ var createLLMEventPublisher = (bus, input) => {
       state
     });
   }), (_textID, value, ordinal) => Effect.gen(function* () {
-    yield* bus.publish(SessionEvent.Text.Delta, {
+    yield* bus.publish(SessionEvent2.Text.Delta, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
@@ -140,7 +140,7 @@ var createLLMEventPublisher = (bus, input) => {
     });
   }), true);
   const reasoning = fragments("reasoning", (_reasoningID, value, ordinal, state) => Effect.gen(function* () {
-    yield* bus.publish(SessionEvent.Reasoning.Ended, {
+    yield* bus.publish(SessionEvent2.Reasoning.Ended, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
@@ -148,7 +148,7 @@ var createLLMEventPublisher = (bus, input) => {
       state
     });
   }), (_reasoningID, value, ordinal) => Effect.gen(function* () {
-    yield* bus.publish(SessionEvent.Reasoning.Delta, {
+    yield* bus.publish(SessionEvent2.Reasoning.Delta, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
@@ -159,7 +159,7 @@ var createLLMEventPublisher = (bus, input) => {
     const tool = tools.get(id);
     if (!tool)
       return yield* Effect.die(new Error(`Tool input end before start: ${id}`));
-    yield* bus.publish(SessionEvent.Tool.Input.Ended, {
+    yield* bus.publish(SessionEvent2.Tool.Input.Ended, {
       sessionID: input.sessionID,
       assistantMessageID,
       id,
@@ -183,7 +183,7 @@ var createLLMEventPublisher = (bus, input) => {
     };
     tools.set(event.id, tool);
     yield* toolInput.start(event.id);
-    yield* bus.publish(SessionEvent.Tool.Input.Started, {
+    yield* bus.publish(SessionEvent2.Tool.Input.Started, {
       sessionID: input.sessionID,
       assistantMessageID,
       id: event.id,
@@ -210,7 +210,7 @@ var createLLMEventPublisher = (bus, input) => {
     if (toolInput.has(event.id))
       yield* endToolInput(event, event.raw);
     tool.settled = true;
-    yield* bus.publish(SessionEvent.Tool.Failed, {
+    yield* bus.publish(SessionEvent2.Tool.Failed, {
       sessionID: input.sessionID,
       assistantMessageID,
       id: event.id,
@@ -228,7 +228,7 @@ var createLLMEventPublisher = (bus, input) => {
     if (!tool || tool.settled)
       return false;
     tool.settled = true;
-    yield* bus.publish(SessionEvent.Tool.Failed, {
+    yield* bus.publish(SessionEvent2.Tool.Failed, {
       sessionID: input.sessionID,
       assistantMessageID,
       id,
@@ -257,10 +257,10 @@ var createLLMEventPublisher = (bus, input) => {
   const publishStepFailure = Effect.fnUntraced(function* (details) {
     if (stepFailure === undefined)
       return;
-    const assistantMessageID2 = yield* startAssistant();
-    yield* bus.publish(SessionEvent.Step.Failed, {
+    const assistantMessageID = yield* startAssistant();
+    yield* bus.publish(SessionEvent2.Step.Failed, {
       sessionID: input.sessionID,
-      assistantMessageID: assistantMessageID2,
+      assistantMessageID,
       error: stepFailure,
       finish: stepSettlement?.finish === "content-filter" ? stepSettlement.finish : undefined,
       rawFinish: stepSettlement?.rawFinish,
@@ -277,7 +277,7 @@ var createLLMEventPublisher = (bus, input) => {
       case "text-start":
         outputStarted = true;
         const startedTextOrdinal = yield* text.start(event.id, providerState(event.providerMetadata));
-        yield* bus.publish(SessionEvent.Text.Started, {
+        yield* bus.publish(SessionEvent2.Text.Started, {
           sessionID: input.sessionID,
           assistantMessageID: yield* startAssistant(),
           ordinal: startedTextOrdinal
@@ -292,7 +292,7 @@ var createLLMEventPublisher = (bus, input) => {
       case "reasoning-start":
         outputStarted = true;
         const startedReasoningOrdinal = yield* reasoning.start(event.id, providerState(event.providerMetadata));
-        yield* bus.publish(SessionEvent.Reasoning.Started, {
+        yield* bus.publish(SessionEvent2.Reasoning.Started, {
           sessionID: input.sessionID,
           assistantMessageID: yield* startAssistant(),
           ordinal: startedReasoningOrdinal,
@@ -338,7 +338,7 @@ var createLLMEventPublisher = (bus, input) => {
           return yield* Effect.die(new Error(`Duplicate tool call: ${event.id}`));
         tool.called = true;
         tool.providerExecuted = event.providerExecuted === true;
-        yield* bus.publish(SessionEvent.Tool.Called, {
+        yield* bus.publish(SessionEvent2.Tool.Called, {
           sessionID: input.sessionID,
           assistantMessageID,
           id: event.id,
@@ -363,7 +363,7 @@ var createLLMEventPublisher = (bus, input) => {
         const executed = event.providerExecuted === true || tool.providerExecuted;
         const resultState = providerState(event.providerMetadata);
         if (event.result.type === "error") {
-          yield* bus.publish(SessionEvent.Tool.Failed, {
+          yield* bus.publish(SessionEvent2.Tool.Failed, {
             sessionID: input.sessionID,
             assistantMessageID,
             id: event.id,
@@ -374,7 +374,7 @@ var createLLMEventPublisher = (bus, input) => {
           });
           return;
         }
-        yield* bus.publish(SessionEvent.Tool.Success, {
+        yield* bus.publish(SessionEvent2.Tool.Success, {
           sessionID: input.sessionID,
           assistantMessageID,
           id: event.id,
@@ -393,7 +393,7 @@ var createLLMEventPublisher = (bus, input) => {
         if (tool.settled)
           return yield* Effect.die(new Error(`Duplicate tool error: ${event.id}`));
         tool.settled = true;
-        yield* bus.publish(SessionEvent.Tool.Failed, {
+        yield* bus.publish(SessionEvent2.Tool.Failed, {
           sessionID: input.sessionID,
           assistantMessageID,
           id: event.id,
@@ -412,7 +412,7 @@ var createLLMEventPublisher = (bus, input) => {
           finish: event.reason.normalized,
           rawFinish: event.reason.raw,
           providerState: providerState(event.providerMetadata),
-          tokens: exports_usage.tokens(event.usage)
+          tokens: tokens2(event.usage)
         };
         if (event.reason.normalized === "content-filter") {
           providerFailed = true;
@@ -434,7 +434,7 @@ var createLLMEventPublisher = (bus, input) => {
     if (!tool?.called || tool.settled)
       return yield* Effect.die(new Error(`Tool progress outside running call: ${id}`));
     tool.progress = update;
-    yield* bus.publish(SessionEvent.Tool.Progress, {
+    yield* bus.publish(SessionEvent2.Tool.Progress, {
       sessionID: input.sessionID,
       assistantMessageID,
       id,
@@ -453,7 +453,7 @@ var createLLMEventPublisher = (bus, input) => {
     const content = result.content;
     if (!isReadonlyArrayNonEmpty(content))
       return yield* Effect.die(new Error(`Tool execution has no content: ${id}`));
-    yield* bus.publish(SessionEvent.Tool.Success, {
+    yield* bus.publish(SessionEvent2.Tool.Success, {
       sessionID: input.sessionID,
       assistantMessageID,
       id,
@@ -489,4 +489,4 @@ var createLLMEventPublisher = (bus, input) => {
   };
 };
 
-export { createLLMEventPublisher };
+export { createLLMEventPublisher2 };