@opencode-ai/core 0.0.0-beta-18414 → 0.0.0-beta-18600

package/dist/chunks/{tool-dcqm2659.js → project-6kmefejb.js}

@@ -1,30 +1,30 @@
 import {
-  exports_normalize
-} from "./tool-ffe33p6j.js";
+  exports_watcher
+} from "./project-ns0sdez7.js";
 import {
   exports_variable
-} from "./tool-d2gk9vpf.js";
+} from "./project-d2gk9vpf.js";
 import {
-  exports_watcher
-} from "./tool-y980s7ka.js";
+  exports_normalize
+} from "./project-sgh68dve.js";
 import {
   exports_credential
-} from "./tool-r958g7pm.js";
+} from "./project-qhe68xsc.js";
 import {
   exports_wellknown
-} from "./tool-e4n4v60w.js";
+} from "./project-qmbgqwhj.js";
 import {
   exports_location
-} from "./tool-2y40pff2.js";
+} from "./project-pm12wdxj.js";
 import {
   AbsolutePath
-} from "./tool-j07kk359.js";
+} from "./project-j07kk359.js";
 import {
   exports_bus
-} from "./tool-8dndtydw.js";
+} from "./project-gy9zm4ck.js";
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/config.ts
 var exports_config = {};
@@ -34,7 +34,6 @@ __export(exports_config, {
   layer: () => layer,
   latest: () => latest,
   configured: () => configured,
-  UpdateError: () => UpdateError,
   Test: () => Test,
   Service: () => Service,
   Options: () => Options,
@@ -44,9 +43,7 @@ import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import path from "path";
 import { isDeepStrictEqual } from "node:util";
 import { parse } from "jsonc-parser";
-import { applyEdits, modify } from "jsonc-parser";
 import { Context, Effect, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect";
-import { produce } from "immer";
 import {
   AgentsDirectory,
   ClaudeDirectory,
@@ -55,20 +52,14 @@ import {
   Info,
   Event
 } from "@opencode-ai/schema/config";
-import { isRecord } from "@opencode-ai/ai/utils/record";
 import { FSUtil } from "@opencode-ai/util/fs-util";
 import { Global } from "@opencode-ai/util/global";
 function latest(entries, key) {
   return entries.findLast((entry) => entry.type === "document" && entry.info[key] !== undefined)?.info[key];
 }
-
-class UpdateError extends Schema.TaggedError()("Config.UpdateError", {
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect())
-}) {
-}
 var Options = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
+  global: Schema.optional(Schema.Boolean),
   file: Schema.optional(Schema.String),
   content: Schema.optional(Schema.String)
 });
@@ -83,18 +74,6 @@ var testLayer = (initial = []) => Layer.effectContext(Effect.gen(function* () {
   const updates = yield* PubSub.unbounded();
   const service = Test.of({
     entries: () => Ref.get(entries),
-    update: (update) => Effect.gen(function* () {
-      const current = yield* Ref.get(entries);
-      const index = current.findIndex((entry2) => entry2.type === "document" && entry2.path !== undefined);
-      if (index === -1)
-        return yield* Effect.fail(new UpdateError({ message: "No editable config document found" }));
-      const entry = current[index];
-      if (!entry || entry.type !== "document")
-        return yield* Effect.fail(new UpdateError({ message: "No editable config document found" }));
-      const info = produce(entry.info, update);
-      yield* Ref.set(entries, current.with(index, new Document({ type: "document", path: entry.path, info })));
-      return info;
-    }),
     changes: () => Stream.fromPubSub(updates),
     setEntries: (next) => Ref.set(entries, next),
     emitChange: (update) => PubSub.publish(updates, update).pipe(Effect.asVoid)
@@ -191,23 +170,26 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       targets: [".opencode", ".claude", ".agents", ...names.toReversed()],
       start: location.directory
     }).pipe(Effect.orDie);
+    const globalEnabled = options?.global !== false;
+    const globalRoots = [globalDirectory, globalClaudeDirectory, globalAgentsDirectory].map((item) => path.resolve(item));
+    const visible = globalEnabled ? discovered : discovered.filter((item) => {
+      const resolved = path.resolve(item);
+      return !globalRoots.some((root) => resolved === root || resolved.startsWith(root + path.sep));
+    });
     const claude = [
       ...new Set([
-        ...(yield* fs.isDir(globalClaudeDirectory)) ? [globalClaudeDirectory] : [],
-        ...discovered.filter((item) => path.basename(item) === ".claude").toReversed()
+        ...globalEnabled && (yield* fs.isDir(globalClaudeDirectory)) ? [globalClaudeDirectory] : [],
+        ...visible.filter((item) => path.basename(item) === ".claude").toReversed()
       ])
     ].map((directory) => new ClaudeDirectory({ type: "claude", path: AbsolutePath.make(directory) }));
     const agents = [
       ...new Set([
-        ...(yield* fs.isDir(globalAgentsDirectory)) ? [globalAgentsDirectory] : [],
-        ...discovered.filter((item) => path.basename(item) === ".agents").toReversed()
+        ...globalEnabled && (yield* fs.isDir(globalAgentsDirectory)) ? [globalAgentsDirectory] : [],
+        ...visible.filter((item) => path.basename(item) === ".agents").toReversed()
       ])
     ].map((directory) => new AgentsDirectory({ type: "agents", path: AbsolutePath.make(directory) }));
-    const directories = [
-      globalDirectory,
-      ...discovered.filter((item) => path.basename(item) === ".opencode").toReversed().map((directory) => AbsolutePath.make(directory))
-    ];
-    const directPaths = discovered.filter((item) => ![".agents", ".claude", ".opencode"].includes(path.basename(item))).toReversed();
+    const projectDirectories = visible.filter((item) => path.basename(item) === ".opencode").toReversed().map((directory) => AbsolutePath.make(directory));
+    const directPaths = visible.filter((item) => ![".agents", ".claude", ".opencode"].includes(path.basename(item))).toReversed();
     fileTargets.clear();
     directPaths.forEach((filepath) => fileTargets.add(AbsolutePath.make(filepath)));
     const direct = yield* Effect.forEach(directPaths, (filepath) => loadFile(filepath)).pipe(Effect.orDie, Effect.map((entries) => entries.filter((entry) => entry !== undefined)));
@@ -221,15 +203,16 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       dir: location.directory,
       text: options.content
     }).pipe(Effect.flatMap((text) => parseInfo(text, "OPENCODE_CONFIG_CONTENT")), Effect.map((info) => info ? [new Document({ type: "document", info })] : []), Effect.orDie) : [];
-    const supplementary = yield* Effect.forEach(directories, loadDirectory).pipe(Effect.orDie);
+    const globalSupplementary = globalEnabled ? yield* loadDirectory(globalDirectory).pipe(Effect.orDie) : [];
+    const projectSupplementary = yield* Effect.forEach(projectDirectories, loadDirectory).pipe(Effect.orDie, Effect.map((entries) => entries.flat()));
     return [
       ...yield* loadWellknown().pipe(Effect.orDie),
       ...claude,
       ...agents,
-      ...supplementary[0] ?? [],
+      ...globalSupplementary,
       ...explicit,
       ...direct,
-      ...supplementary.slice(1).flat(),
+      ...projectSupplementary,
       ...content
     ];
   });
@@ -254,7 +237,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         continue;
       watched.add(key);
       const stream = yield* watcher.subscribe(target);
-      yield* stream.pipe(Stream.runForEach((update2) => PubSub.publish(updates, update2)), Effect.forkScoped({ startImmediately: true }));
+      yield* stream.pipe(Stream.runForEach((update) => PubSub.publish(updates, update)), Effect.forkScoped({ startImmediately: true }));
     }
   });
   const reload = Effect.fn("Config.reload")(() => reloadLock.withPermit(Effect.gen(function* () {
@@ -265,7 +248,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     configs = next;
     yield* bus.publish(Event.Updated, {});
   })));
-  yield* Stream.fromPubSub(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach((update2) => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { path: update2.path, cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* Stream.fromPubSub(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach((update) => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { path: update.path, cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* bus.subscribe(exports_credential.Event.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* bus.subscribe(exports_wellknown.Event.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* Effect.sleep("10 minutes").pipe(Effect.andThen(Effect.suspend(() => {
@@ -278,33 +261,10 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     }).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to refresh wellknown config", { cause })));
   })), Effect.forever, Effect.forkScoped({ startImmediately: true }));
   yield* reconcile(initial);
-  const update = Effect.fn("Config.update")((mutate) => reloadLock.withPermit(Effect.gen(function* () {
-    const document = configs.find((entry) => entry.type === "document" && entry.path !== undefined);
-    if (!document || document.type !== "document" || !document.path)
-      return yield* Effect.fail(new UpdateError({ message: "No editable config document found" }));
-    const next = yield* Effect.try({
-      try: () => produce(document.info, mutate),
-      catch: (cause) => new UpdateError({ message: "Config update failed", cause })
-    });
-    const edits = changes(document.info, next);
-    if (!edits.length)
-      return document.info;
-    const text = yield* fs.readFileString(document.path).pipe(Effect.mapError((cause) => new UpdateError({ message: `Failed to read config: ${document.path}`, cause })));
-    const updated = edits.reduce((text2, edit) => applyEdits(text2, modify(text2, edit.path, edit.value, { formattingOptions: { tabSize: 2, insertSpaces: true } })), text);
-    const info = yield* parseInfo(updated, document.path);
-    if (!info)
-      return yield* Effect.fail(new UpdateError({ message: `Invalid config update: ${document.path}` }));
-    const temporary = document.path + ".tmp";
-    yield* fs.writeFileString(temporary, updated.endsWith(`
-`) ? updated : updated + `
-`).pipe(Effect.andThen(fs.rename(temporary, document.path)), Effect.mapError((cause) => new UpdateError({ message: `Failed to write config: ${document.path}`, cause })));
-    return info;
-  })));
   return Service.of({
     entries: Effect.fnUntraced(function* () {
       return configs;
     }),
-    update,
     changes: () => Stream.fromPubSub(updates)
   });
 }));
@@ -316,19 +276,5 @@ function configured(options) {
   });
 }
 var node = configured();
-function changes(before, after, path2 = []) {
-  if (Object.is(before, after))
-    return [];
-  if (isRecord(before) && isRecord(after)) {
-    return [...new Set([...Object.keys(before), ...Object.keys(after)])].flatMap((key) => {
-      if (!(key in after))
-        return [{ path: [...path2, key], value: undefined }];
-      if (!(key in before))
-        return [{ path: [...path2, key], value: after[key] }];
-      return changes(before[key], after[key], [...path2, key]);
-    });
-  }
-  return [{ path: path2, value: after }];
-}
 
-export { latest, UpdateError, Options, Service, Test, testLayer, layer, configured, node, exports_config };
+export { latest, Options, Service, Test, testLayer, layer, configured, node, exports_config };

package/dist/chunks/{tool-6ky7rqk7.js → project-6ky7rqk7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/session/environment.ts
 var exports_environment = {};

package/dist/chunks/{tool-hjc64t6x.js → project-6tmgbn41.js}

@@ -1,73 +1,70 @@
 import {
   exports_step
-} from "./tool-m1wb9dgh.js";
-import {
-  exports_retry
-} from "./tool-txw0c3p3.js";
+} from "./project-63s588jq.js";
 import {
   MAX_STEPS_PROMPT
-} from "./tool-qaarhjrp.js";
+} from "./project-qaarhjrp.js";
 import {
-  exports_prompt_cache_diagnostics
-} from "./tool-wd268jeg.js";
+  exports_retry
+} from "./project-tqf07m3e.js";
 import {
   exports_title
-} from "./tool-d6sk6h82.js";
+} from "./project-7d6d29dh.js";
 import {
   exports_context
-} from "./tool-9cn9z662.js";
+} from "./project-sn6nad9v.js";
 import {
   exports_model_request
-} from "./tool-6mybbghn.js";
+} from "./project-rjnxxp68.js";
 import {
   exports_supervisor
-} from "./tool-5t37zp3f.js";
+} from "./project-4rg3anhc.js";
 import {
   exports_compaction
-} from "./tool-h4a7m801.js";
+} from "./project-dgmzb1tr.js";
 import {
   exports_tool_output
-} from "./tool-8qrvdwwg.js";
+} from "./project-f7q7a28y.js";
+import {
+  exports_model_transport
+} from "./project-tjrfm0xh.js";
 import {
   DrainResult,
   Service
-} from "./tool-2m0hgr65.js";
+} from "./project-2m0hgr65.js";
 import {
   exports_inbox
-} from "./tool-se8395as.js";
-import {
-  exports_model_transport
-} from "./tool-kgkfyy1j.js";
-import {
-  exports_snapshot
-} from "./tool-ay9jepqf.js";
-import {
-  llmClient
-} from "./tool-393a352g.js";
+} from "./project-ayrkq19e.js";
 import {
   exports_store
-} from "./tool-53vhya9m.js";
+} from "./project-vjmn5wwb.js";
 import {
   exports_instruction_state
-} from "./tool-f11jbhcb.js";
+} from "./project-0687t5rp.js";
 import {
   StepFailedError
-} from "./tool-fb7nfzf2.js";
+} from "./project-fb7nfzf2.js";
+import {
+  llmClient
+} from "./project-393a352g.js";
 import {
   SessionMessage
-} from "./tool-8rpfd2h6.js";
+} from "./project-8rpfd2h6.js";
+import {
+  exports_snapshot
+} from "./project-n79xa5zf.js";
 import {
   SessionEvent
-} from "./tool-a83yvq99.js";
+} from "./project-a83yvq99.js";
 import {
   exports_bus
-} from "./tool-8dndtydw.js";
+} from "./project-gy9zm4ck.js";
 import {
   exports_database
-} from "./tool-merfm3fd.js";
+} from "./project-gcc0jgqv.js";
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
@@ -76,7 +73,7 @@ __export(exports_llm, {
   SessionRunnerLLM: () => exports_llm
 });
 import { Message } from "@opencode-ai/ai";
-import { Cause, Config, Effect, Exit, FiberMap, Layer, Pull, Schedule } from "effect";
+import { Cause, Effect, Exit, FiberMap, Layer, Pull, Schedule } from "effect";
 import { makeLocationNode } from "@opencode-ai/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(Service, Effect.gen(function* () {
@@ -89,26 +86,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const plugins = yield* exports_supervisor.Service;
   const title = yield* exports_title.Service;
   const steps = yield* exports_step.make;
-  const diagnostics = yield* Config.boolean("OPENCODE_PROMPT_CACHE_DIAGNOSTICS").pipe(Config.withDefault(false), Effect.orDie);
-  const promptCacheSnapshots = diagnostics ? new Map : undefined;
-  const diagnosePromptCache = Effect.fn("SessionRunner.diagnosePromptCache")(function* (sessionID, request) {
-    if (!promptCacheSnapshots)
-      return;
-    const current = exports_prompt_cache_diagnostics.snapshot(request);
-    const comparison = exports_prompt_cache_diagnostics.compare(promptCacheSnapshots.get(sessionID), current);
-    promptCacheSnapshots.delete(sessionID);
-    promptCacheSnapshots.set(sessionID, current);
-    const oldest = promptCacheSnapshots.keys().next().value;
-    if (promptCacheSnapshots.size > 100 && oldest !== undefined)
-      promptCacheSnapshots.delete(oldest);
-    yield* Effect.logInfo("prompt cache prefix").pipe(Effect.annotateLogs({
-      sessionID,
-      toolCount: current.tools.length,
-      systemParts: current.system.length,
-      messageCount: current.messages.length,
-      ...comparison
-    }));
-  });
   const titles = yield* FiberMap.make();
   const drain = Effect.fn("SessionRunner.drain")(function* (input) {
     const sessionID = input.sessionID;
@@ -119,7 +96,10 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     const promotable = input.promotable ?? "input";
     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")
+      if (!pending)
+        return DrainResult.Complete();
+      const control = pending.type === "compaction" || pending.type === "move";
+      if (promotable === "steer" && pending.delivery === "queue" && !control)
         return DrainResult.Complete();
     }
     yield* plugins.flush;
@@ -181,7 +161,7 @@ var layer = Layer.effect(Service, 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), {
+            yield* FiberMap.run(titles, sessionID, title.generate(sessionID), {
               onlyIfMissing: true
             });
           if (promoted > 0)
@@ -245,37 +225,33 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         toolChoice: stepLimitReached ? "none" : undefined,
         webSocket: "session"
       });
-      yield* diagnosePromptCache(sessionID, prepared.request);
       const outcome = yield* steps.attempt({
         sessionID,
         assistantMessageID,
         agent: loaded.agent.id,
         model: loaded.model,
         prepared,
-        toolsDisabled: stepLimitReached,
         recoverContinuation,
         recoverOverflow: Effect.suspend(() => recoverOverflow && compaction.enabled() ? compaction.compact(compactionInput).pipe(Effect.map((result) => result.status === "completed")) : Effect.succeed(false))
       });
-      if (outcome._tag === "Completed")
-        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")
-            yield* bus.publish(SessionEvent.Step.Failed, { sessionID, assistantMessageID, error: outcome.error });
-          return yield* outcome.cause;
-        })));
-        if (outcome._tag === "Continue") {
+      const completed = yield* exports_step.Outcome.$match(outcome, {
+        Completed: (outcome2) => Effect.succeed(outcome2.needsContinuation),
+        Retry: (outcome2) => retry({ cause: outcome2.cause, error: outcome2.error, assistantMessageID }).pipe(Pull.catchDone(() => bus.publish(SessionEvent.Step.Failed, { sessionID, assistantMessageID, error: outcome2.error }).pipe(Effect.andThen(outcome2.cause))), Effect.asVoid),
+        Continue: Effect.fnUntraced(function* (outcome2) {
+          yield* retry({ cause: outcome2.cause, error: outcome2.error, assistantMessageID }).pipe(Pull.catchDone(() => outcome2.cause));
           yield* bus.publish(SessionEvent.Synthetic, { sessionID, text: CONTINUE_AFTER_INCOMPLETE_STREAM });
           assistantMessageID = SessionMessage.ID.create();
-        }
-        continue;
-      }
-      if (outcome._tag === "Compacted") {
-        recoverOverflow = false;
-        assistantMessageID = SessionMessage.ID.create();
-        continue;
-      }
-      recoverContinuation = false;
+        }),
+        Compacted: Effect.fnUntraced(function* () {
+          recoverOverflow = false;
+          assistantMessageID = SessionMessage.ID.create();
+        }),
+        RecoverFull: Effect.fnUntraced(function* () {
+          recoverContinuation = false;
+        })
+      });
+      if (completed !== undefined)
+        return completed;
     }
   });
   const settleStaleToolCalls = Effect.fn("SessionRunner.settleStaleToolCalls")(function* (sessionID) {

package/dist/chunks/{tool-6wkzvma0.js → project-6wkzvma0.js}

@@ -1,9 +1,9 @@
 import {
   exports_state
-} from "./tool-x89rah0x.js";
+} from "./project-x89rah0x.js";
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/filesystem/location-watcher-policy.ts
 var exports_location_watcher_policy = {};

package/dist/chunks/{tool-75h1hfe2.js → project-75h1hfe2.js}

@@ -1,9 +1,9 @@
 import {
   exports_promise
-} from "./tool-5vcssjzn.js";
+} from "./project-5vcssjzn.js";
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/plugin/module.ts
 var exports_module = {};

package/dist/chunks/{tool-d6sk6h82.js → project-7d6d29dh.js}

@@ -1,30 +1,30 @@
 import {
   exports_context
-} from "./tool-9cn9z662.js";
+} from "./project-sn6nad9v.js";
 import {
   exports_usage
-} from "./tool-sw84ckhj.js";
-import {
-  llmClient
-} from "./tool-393a352g.js";
+} from "./project-sw84ckhj.js";
 import {
   exports_store
-} from "./tool-53vhya9m.js";
+} from "./project-vjmn5wwb.js";
 import {
   exports_history
-} from "./tool-q70gvhbx.js";
+} from "./project-y85nmh9b.js";
+import {
+  llmClient
+} from "./project-393a352g.js";
 import {
   SessionEvent
-} from "./tool-a83yvq99.js";
+} from "./project-a83yvq99.js";
 import {
   exports_bus
-} from "./tool-8dndtydw.js";
+} from "./project-gy9zm4ck.js";
 import {
   exports_database
-} from "./tool-merfm3fd.js";
+} from "./project-gcc0jgqv.js";
 import {
   __export
-} from "./tool-rvfvac9x.js";
+} from "./project-rvfvac9x.js";
 
 // src/session/title.ts
 var exports_title = {};
@@ -52,51 +52,56 @@ var isUntitled = (session) => isExactRootFallback({
   title: session.title,
   time: { created: DateTime.toEpochMillis(session.time.created) }
 });
-var attempt = Effect.fn("SessionTitle.attempt")(function* (dependencies, input) {
-  const chunks = [];
-  let failed = false;
-  let usage;
-  const recordUsage = Effect.suspend(() => usage ? dependencies.bus.publish(SessionEvent.UsageRecorded, {
-    sessionID: input.session.id,
-    source: "title",
-    ...usage
-  }) : Effect.void);
-  const prepared = yield* dependencies.context.prepare({
-    scope: { session: input.session, agentID: input.agent.id, model: input.model },
-    transcript: {
-      system: input.agent.system ? [SystemPart.make(input.agent.system)] : [],
-      messages: [Message.user(input.text)]
-    },
-    contextHooks: false
-  });
-  yield* dependencies.llm.stream(prepared.request, prepared.options).pipe(Stream.runForEach((event) => {
-    if (LLMEvent.is.providerError(event))
+var layer = Layer.effect(Service, Effect.gen(function* () {
+  const bus = yield* exports_bus.Service;
+  const llm = yield* LLMClient.Service;
+  const context = yield* exports_context.Service;
+  const store = yield* exports_store.Service;
+  const db = (yield* exports_database.Service).db;
+  const attempt = Effect.fn("SessionTitle.attempt")(function* (input) {
+    const chunks = [];
+    let failed = false;
+    let usage;
+    const recordUsage = Effect.suspend(() => usage ? bus.publish(SessionEvent.UsageRecorded, {
+      sessionID: input.session.id,
+      source: "title",
+      ...usage
+    }) : Effect.void);
+    const prepared = yield* context.prepare({
+      scope: { session: input.session, agentID: input.agent.id, model: input.model },
+      transcript: {
+        system: input.agent.system ? [SystemPart.make(input.agent.system)] : [],
+        messages: [Message.user(input.text)]
+      },
+      contextHooks: false
+    });
+    yield* llm.stream(prepared.request, prepared.options).pipe(Stream.runForEach((event) => {
+      if (LLMEvent.is.providerError(event))
+        failed = true;
+      if (LLMEvent.is.textDelta(event))
+        chunks.push(event.text);
+      if (LLMEvent.is.stepFinish(event)) {
+        const step = exports_usage.record(event.usage, input.model.cost);
+        usage = usage ? exports_usage.add(usage, step) : step;
+      }
+      return Effect.void;
+    }), Effect.catchTag("AI.Error", () => Effect.sync(() => {
       failed = true;
-    if (LLMEvent.is.textDelta(event))
-      chunks.push(event.text);
-    if (LLMEvent.is.stepFinish(event)) {
-      const step = exports_usage.record(event.usage, input.model.cost);
-      usage = usage ? exports_usage.add(usage, step) : step;
-    }
-    return Effect.void;
-  }), Effect.catchTag("AI.Error", () => Effect.sync(() => {
-    failed = true;
-  })), Effect.onInterrupt(() => recordUsage.pipe(Effect.asVoid)));
-  yield* recordUsage;
-  if (failed)
-    return;
-  return chunks.join("").split(`
+    })), Effect.onInterrupt(() => recordUsage.pipe(Effect.asVoid)));
+    yield* recordUsage;
+    if (failed)
+      return;
+    return chunks.join("").split(`
 `).map((line) => line.trim()).find((line) => line.length > 0);
-});
-var make = (dependencies) => {
-  const generate = Effect.fn("SessionTitle.generate")(function* (db, sessionID) {
-    const session = yield* dependencies.store.get(sessionID);
+  });
+  const generate = Effect.fn("SessionTitle.generate")(function* (sessionID) {
+    const session = yield* store.get(sessionID);
     if (!session)
       return;
     const firstUser = yield* exports_history.firstUserMessage(db, session.id);
     if (!firstUser)
       return;
-    const text = !isUntitled(session) ? yield* dependencies.store.context(session.id).pipe(Effect.map((messages) => {
+    const text = !isUntitled(session) ? yield* store.context(session.id).pipe(Effect.map((messages) => {
       const original = `Original request:
 ${firstUser.text.slice(0, MAX_FIRST_MESSAGE_LENGTH)}`;
       const recent = messages.flatMap((message) => {
@@ -118,33 +123,22 @@ Recent conversation:
 `;
       return `${prefix}${recent.slice(-(MAX_CONTEXT_LENGTH - prefix.length))}`;
     }), Effect.orElseSucceed(() => firstUser.text)) : firstUser.text;
-    const selection = yield* dependencies.context.selectTitle(session);
+    const selection = yield* context.selectTitle(session);
     if (!selection)
       return;
-    const title = (yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.selected })) ?? (selection.primary && !isDeepStrictEqual(selection.selected.ref, selection.primary.ref) ? yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.primary }) : undefined);
+    const title = (yield* attempt({ session, agent: selection.agent, text, model: selection.selected })) ?? (selection.primary && !isDeepStrictEqual(selection.selected.ref, selection.primary.ref) ? yield* attempt({ session, agent: selection.agent, text, model: selection.primary }) : undefined);
     if (!title)
       return;
     const expectedSequence = (yield* exports_bus.latestSequence(db, sessionID)) + 1;
-    const current = yield* dependencies.store.get(sessionID);
+    const current = yield* store.get(sessionID);
     if (!current || current.title !== session.title || current.title === truncate(title))
       return;
-    yield* dependencies.bus.publish(SessionEvent.Renamed, {
+    yield* bus.publish(SessionEvent.Renamed, {
       sessionID: session.id,
       title: truncate(title)
     }, { commit: (sequence) => sequence === expectedSequence ? Effect.void : Effect.die(titleChanged) }).pipe(Effect.catchDefect((defect) => defect === titleChanged ? Effect.void : Effect.die(defect)));
   });
-  return { generate };
-};
-var layer = Layer.effect(Service, Effect.gen(function* () {
-  const bus = yield* exports_bus.Service;
-  const llm = yield* LLMClient.Service;
-  const context = yield* exports_context.Service;
-  const store = yield* exports_store.Service;
-  const database = yield* exports_database.Service;
-  const title = make({ bus, llm, context, store });
-  return Service.of({
-    generate: (sessionID) => title.generate(database.db, sessionID)
-  });
+  return Service.of({ generate });
 }));
 var node = makeLocationNode({
   service: Service,