@opencode/core 2.0.7 → 2.0.9

package/dist/chunks/{integration-jthw9jrm.js → tool-s4fep8mk.js}

@@ -1,24 +1,27 @@
 import {
-  Service81
-} from "./integration-dw76zyaf.js";
+  Service82
+} from "./tool-9endzh9e.js";
 import {
   OAuth3,
   Event19
-} from "./integration-yhmfm09s.js";
+} from "./tool-dz1mzf7h.js";
 import {
-  ID15,
+  ID14,
   MethodID2
-} from "./integration-ch54p1a9.js";
+} from "./tool-mh3xs90e.js";
 import {
-  ID12,
+  key2
+} from "./tool-h6r3nrb9.js";
+import {
+  ID13,
   mergeOverlay2,
   mergeHeaders2
-} from "./integration-fwdrt8y0.js";
+} from "./tool-qqcjb6jx.js";
 import {
   ID6,
   Input14,
   Response2
-} from "./integration-b5y8n1e6.js";
+} from "./tool-7gyssj7x.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Equal, Schema, Semaphore, Stream } from "effect";
@@ -54,7 +57,7 @@ var User = Schema.Struct({ id: Schema.String, email: Schema.String });
 var Org = Schema.Struct({ id: Schema.String, name: Schema.String });
 function oauth(http) {
   return {
-    integrationID: ID15.make("opencode"),
+    integrationID: ID14.make("opencode"),
     method: {
       id: methodID,
       type: "oauth",
@@ -108,7 +111,7 @@ function oauth(http) {
 var OpencodePlugin2 = define({
   id: "opencode.provider.opencode",
   effect: Effect.fn(function* (ctx) {
-    const bus = yield* Service81;
+    const bus = yield* Service82;
     const http = yield* HttpClient.HttpClient;
     const loading = Semaphore.makeUnsafe(1);
     let snapshot = { config: undefined, connection: undefined };
@@ -117,7 +120,7 @@ var OpencodePlugin2 = define({
       const credential = connection ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.orElseSucceed(() => {
         return;
       })) : undefined;
-      const config = credential ? yield* fetchConfig(http, credential).pipe(Effect.catch((cause) => Effect.logWarning("failed to load OpenCode provider config", { cause }).pipe(Effect.as(undefined)))) : undefined;
+      const config = credential ? yield* fetchConfig(http, credential).pipe(Effect.catch((cause) => Effect.logWarning("failed to load OpenCode provider config", { cause }).pipe(Effect.as(key2(snapshot.connection) === key2(connection) ? snapshot.config : undefined)))) : undefined;
       return { config, connection };
     });
     yield* ctx.integration.transform((editor) => {
@@ -134,7 +137,7 @@ var OpencodePlugin2 = define({
         providers.update(providerID, (provider) => {
           if (source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), { id: provider.id });
-          provider.integrationID = ID15.make("opencode");
+          provider.integrationID = ID14.make("opencode");
           if (item.canonical !== undefined)
             provider.canonical = item.canonical;
           if (item.name !== undefined)
@@ -204,7 +207,7 @@ var OpencodePlugin2 = define({
             sourceConnection: snapshot.connection
           });
       }
-      const item = providers.get(ID12.opencode);
+      const item = providers.get(ID13.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey);
@@ -216,7 +219,7 @@ var OpencodePlugin2 = define({
       });
     });
     yield* ctx.model.transform((models) => {
-      const item = models.provider.get(ID12.opencode);
+      const item = models.provider.get(ID13.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey && item.provider.settings.apiKey !== "public");
@@ -271,7 +274,7 @@ var OpencodePlugin2 = define({
       yield* Effect.all([ctx.provider.reload(), ctx.websearch.reload()], { concurrency: 2, discard: true });
     });
     const refresh = () => loading.withPermit(load().pipe(Effect.andThen(apply)));
-    yield* bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID15.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID14.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
     yield* Effect.sleep(Duration.minutes(1)).pipe(Effect.andThen(loading.withPermit(load().pipe(Effect.flatMap((next) => Equal.equals(snapshot, next) ? Effect.void : apply(next))))), Effect.forever, Effect.forkScoped);
   })
 });

package/dist/chunks/{integration-rhjbct0v.js → tool-s8d7rejh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/instructions/index.ts
 var exports_instructions6 = {};
@@ -18,7 +18,7 @@ __export(exports_instructions6, {
   diffByKey: () => diffByKey2,
   empty: () => empty3,
   hash: () => hash2,
-  make: () => make20,
+  make: () => make21,
   read: () => read3,
   removed: () => removed2,
   renderInitial: () => renderInitial2,
@@ -50,7 +50,7 @@ class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKey
   }
 }
 var empty3 = [];
-function make20(source) {
+function make21(source) {
   const decode = Schema.decodeUnknownOption(source.codec);
   const encode = Schema.encodeSync(source.codec);
   const initial = (value) => requireText(source.key, "initial", source.render.initial(value));
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make20, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };
+export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make21, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };

package/dist/chunks/{integration-qcwz4p84.js → tool-sd3ysec1.js}

@@ -1,65 +1,65 @@
+import {
+  Service83,
+  node87
+} from "./tool-5y430q9n.js";
 import {
   Service82,
   node86
-} from "./integration-zqsm83yf.js";
-import {
-  Service81,
-  node85
-} from "./integration-dw76zyaf.js";
+} from "./tool-9endzh9e.js";
 import {
   llmClient2
-} from "./integration-5t3nmthw.js";
+} from "./tool-5t3nmthw.js";
 import {
   SessionEvent2
-} from "./integration-ec1grn59.js";
+} from "./tool-ec1grn59.js";
 import {
   provenance2,
   compatible2,
   isCheckpoint2,
   encode2
-} from "./integration-mfhfdr54.js";
+} from "./tool-5c0f1prt.js";
 import {
   load5
-} from "./integration-8ybgfkrt.js";
+} from "./tool-czgzge8y.js";
 import {
   create3
-} from "./integration-rdw6cm16.js";
+} from "./tool-rdw6cm16.js";
 import {
   toLLMMessages2
-} from "./integration-fch79rh9.js";
+} from "./tool-zhq6vg7a.js";
 import {
   baseTranscript2,
   unsupportedParts2,
   boundImages2
-} from "./integration-ptz1vvyt.js";
+} from "./tool-x6z1bn3h.js";
 import {
   toSessionError2
-} from "./integration-ngnbq9bc.js";
+} from "./tool-8szgh749.js";
 import {
   policy2,
   transient2
-} from "./integration-pqt18mke.js";
+} from "./tool-z89cezv7.js";
 import {
   estimate2
-} from "./integration-h6vf3j39.js";
+} from "./tool-h6vf3j39.js";
 import {
   calculateCost2,
   record2,
   add2
-} from "./integration-tdstcens.js";
+} from "./tool-tdstcens.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/session/compaction.ts
-var exports_compaction2 = {};
-__export(exports_compaction2, {
-  Service: () => Service5,
-  SessionCompaction: () => exports_compaction2,
+var exports_compaction3 = {};
+__export(exports_compaction3, {
+  Service: () => Service10,
+  SessionCompaction: () => exports_compaction3,
   buildPrompt: () => buildPrompt2,
   estimateTokens: () => estimateTokens2,
-  layer: () => layer6,
-  node: () => node7,
+  layer: () => layer7,
+  node: () => node12,
   retainUsers: () => retainUsers2,
   serializeToolContent: () => serializeToolContent2,
   truncateToolOutput: () => truncateToolOutput2
@@ -125,7 +125,7 @@ var SUMMARY_HEADINGS = SUMMARY_TEMPLATE.split(`
 `).filter((line) => line.startsWith("##"));
 var LEGACY_HEADING = "## Additional Context";
 
-class Service5 extends Context.Service()("@opencode/SessionCompaction") {
+class Service10 extends Context.Service()("@opencode/SessionCompaction") {
 }
 var hasInputUsage = (message) => message.type === "assistant" && !message.error && message.tokens !== undefined && message.tokens.input + message.tokens.cache.read + message.tokens.cache.write > 0;
 var estimateTokens2 = (input) => {
@@ -298,13 +298,13 @@ var buildPrompt2 = (update, legacy = false) => {
 };
 var hasSummarySection = (summary) => summary.split(`
 `).some((line) => SUMMARY_HEADINGS.includes(line.trim()));
-var layer6 = Layer.effect(Service5, Effect.gen(function* () {
-  const bus = yield* Service81;
+var layer7 = Layer.effect(Service10, Effect.gen(function* () {
+  const bus = yield* Service82;
   const llm = yield* LLMClient.Service;
-  const db = (yield* Service82).db;
+  const db = (yield* Service83).db;
   const state = create3({
     name: "session-compaction",
-    initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS }),
+    initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS, native: [] }),
     editor: (editor) => ({
       configure: (settings) => {
         if (settings.auto !== undefined)
@@ -313,6 +313,9 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
           editor.buffer = settings.buffer;
         if (settings.tokens !== undefined)
           editor.tokens = settings.tokens;
+      },
+      native: (strategy) => {
+        editor.native.push(strategy);
       }
     })
   });
@@ -395,6 +398,13 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
       return yield* reject("Provider compaction requires a stable, configured endpoint");
     if (!compatible2(provenance, provenance2({ model: request.model, ref: context.model.ref })))
       return yield* reject("Provider compaction requires the endpoint in provider/model settings, not a model.request rewrite");
+    const native = state.get().native.toReversed().map((strategy) => strategy({
+      request,
+      options: prepared.options,
+      retained: original(context.session.id).pipe(Effect.map((messages) => retainUsers2(messages, context.model, state.get().tokens)))
+    })).find((effect) => effect !== undefined);
+    if (!native)
+      return yield* reject(`No plugin provides native compaction for ${request.model.provider}/${request.model.route.id}`);
     const transient = transient2(yield* policy2(context.session.id), {
       agent: context.agent.id,
       model: context.model.ref,
@@ -402,16 +412,7 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
     });
     yield* started(input, "");
     return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
-      const result = yield* restore(Effect.gen(function* () {
-        if (LLMClient.canCompact(request, { mechanism: "trigger" })) {
-          const retained = retainUsers2(yield* original(context.session.id), context.model, state.get().tokens);
-          const result = yield* llm.compact(request, { ...prepared.options, mechanism: "trigger" }).pipe(transient);
-          return { replacement: [...retained, Message.assistant(result.checkpoint)], usage: result.usage };
-        }
-        if (LLMClient.canCompact(request))
-          return yield* llm.compact(request, { mechanism: "endpoint", http: prepared.options.http }).pipe(transient);
-        return yield* Effect.die(new Error(`${request.model.provider}/${request.model.route.id} has no compaction operation`));
-      }));
+      const result = yield* restore(native.pipe(transient));
       const usage = result.usage ? record2(result.usage, context.model.cost) : undefined;
       if (usage)
         yield* bus.publish(SessionEvent2.UsageRecorded, {
@@ -556,7 +557,7 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
     const request = { ...input, reason: "auto" };
     if (input.overflow)
       return yield* recoverLocally(request);
-    if (input.context.model.compaction?.mode !== "provider")
+    if (input.context.model.compaction?.type !== "native")
       return yield* execute(request);
     return yield* executeProvider(request);
   });
@@ -575,9 +576,7 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
       return false;
     const output = Math.min(limit.output, OUTPUT_TOKEN_MAX);
     const promptCeiling = Math.min(limit.input === undefined ? Number.POSITIVE_INFINITY : limit.input - config.buffer, context - Math.max(output, config.buffer));
-    const policy = input.resolved.compaction;
-    const threshold = policy?.mode === "provider" && policy.threshold !== undefined ? Math.min(policy.threshold, promptCeiling) : promptCeiling;
-    return estimateTokens2(input) >= threshold;
+    return estimateTokens2(input) >= promptCeiling;
   };
   const compactManual = Effect.fn("SessionCompaction.compactManual")(function* (input) {
     if (findTailStart(input.messages, state.get().tokens) === undefined)
@@ -603,11 +602,11 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
           inputID: input.inputID,
           started: input.started
         };
-        return context.model.compaction?.mode === "provider" ? executeProvider(request) : execute(request);
+        return context.model.compaction?.type === "native" ? executeProvider(request) : execute(request);
       }
     }));
   });
-  return Service5.of({
+  return Service10.of({
     transform: state.transform,
     reload: state.reload,
     enabled: () => state.get().auto,
@@ -616,10 +615,10 @@ var layer6 = Layer.effect(Service5, Effect.gen(function* () {
     compactManual
   });
 }));
-var node7 = makeLocationNode({
-  service: Service5,
-  layer: layer6,
-  deps: [node85, node86, llmClient2]
+var node12 = makeLocationNode({
+  service: Service10,
+  layer: layer7,
+  deps: [node86, node87, llmClient2]
 });
 
-export { Service5, estimateTokens2, retainUsers2, truncateToolOutput2, serializeToolContent2, buildPrompt2, layer6, node7, exports_compaction2 };
+export { Service10, estimateTokens2, retainUsers2, truncateToolOutput2, serializeToolContent2, buildPrompt2, layer7, node12, exports_compaction3 };

package/dist/chunks/{integration-bje2awg5.js → tool-skq2eby0.js}

@@ -1,30 +1,30 @@
 import {
-  Service71,
-  node74
-} from "./integration-e7190871.js";
+  Service79,
+  node83
+} from "./tool-wyd4vgvd.js";
 import {
   create3
-} from "./integration-rdw6cm16.js";
+} from "./tool-rdw6cm16.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/formatter.ts
-var exports_formatter2 = {};
-__export(exports_formatter2, {
-  Formatter: () => exports_formatter2,
-  Service: () => Service20,
-  node: () => node22
+var exports_formatter3 = {};
+__export(exports_formatter3, {
+  Formatter: () => exports_formatter3,
+  Service: () => Service74,
+  node: () => node78
 });
 import { Context, Effect, Layer } from "effect";
 import { ChildProcess } from "effect/unstable/process";
 import path from "path";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { AppProcess } from "@opencode/util/process";
-class Service20 extends Context.Service()("@opencode/v2/Formatter") {
+class Service74 extends Context.Service()("@opencode/v2/Formatter") {
 }
-var layer = Layer.effect(Service20, Effect.gen(function* () {
-  const location = yield* Service71;
+var layer = Layer.effect(Service74, Effect.gen(function* () {
+  const location = yield* Service79;
   const processes = yield* AppProcess.Service;
   const commands = new WeakMap;
   const state = create3({
@@ -85,12 +85,12 @@ var layer = Layer.effect(Service20, Effect.gen(function* () {
     }
     return false;
   });
-  return Service20.of({ transform: state.transform, reload: state.reload, file });
+  return Service74.of({ transform: state.transform, reload: state.reload, file });
 }));
-var node22 = makeLocationNode({
-  service: Service20,
+var node78 = makeLocationNode({
+  service: Service74,
   layer,
-  deps: [node74, AppProcess.node]
+  deps: [node83, AppProcess.node]
 });
 
-export { Service20, node22, exports_formatter2 };
+export { Service74, node78, exports_formatter3 };

package/dist/chunks/{integration-1x4zaxp7.js → tool-sr2ca446.js}

@@ -1,7 +1,7 @@
 import {
   isAISDK2,
   packageName2
-} from "./integration-fwdrt8y0.js";
+} from "./tool-qqcjb6jx.js";
 
 // src/plugin/provider/vercel.ts
 import { Effect } from "effect";

package/dist/chunks/{integration-wpm2rk0p.js → tool-stag65f9.js}

@@ -1,17 +1,17 @@
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/workspace/driver.ts
 var exports_driver = {};
 __export(exports_driver, {
   Binding: () => Binding2,
-  Error: () => Error5,
+  Error: () => Error3,
   ProviderNotFound: () => ProviderNotFound2,
   RegistryService: () => RegistryService2,
   WorkspaceDriver: () => exports_driver,
-  make: () => make21,
-  node: () => node80,
+  make: () => make17,
+  node: () => node50,
   registry: () => registry2,
   registryNode: () => registryNode2
 });
@@ -19,7 +19,7 @@ import { makeGlobalNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
 var Binding2 = Schema.Record(Schema.String, Schema.Json);
 
-class Error5 extends Schema.TaggedError()("WorkspaceDriver.Error", {
+class Error3 extends Schema.TaggedError()("WorkspaceDriver.Error", {
   message: Schema.optional(Schema.String),
   cause: Schema.optional(Schema.Defect())
 }) {
@@ -29,7 +29,7 @@ class ProviderNotFound2 extends Schema.TaggedError()("WorkspaceDriver.ProviderNo
   provider: Schema.String
 }) {
 }
-var make21 = (driver) => driver;
+var make17 = (driver) => driver;
 
 class RegistryService2 extends Context.Service()("@opencode/WorkspaceDriverRegistry") {
 }
@@ -44,6 +44,6 @@ var registryNode2 = (drivers) => makeGlobalNode({
   layer: Layer.succeed(RegistryService2, RegistryService2.of(registry2(drivers))),
   deps: []
 });
-var node80 = registryNode2({});
+var node50 = registryNode2({});
 
-export { Binding2, Error5, ProviderNotFound2, make21, RegistryService2, registry2, registryNode2, node80, exports_driver };
+export { Binding2, Error3, ProviderNotFound2, make17, RegistryService2, registry2, registryNode2, node50, exports_driver };

package/dist/chunks/{integration-7ejxwnn2.js → tool-t0e82vdg.js}

@@ -2,29 +2,29 @@ import {
   Key3,
   removed2,
   empty3,
-  make20,
+  make21,
   diffByKey2
-} from "./integration-rhjbct0v.js";
+} from "./tool-s8d7rejh.js";
 import {
   evaluate2
-} from "./integration-tj7ekckq.js";
+} from "./tool-8t1mk3vk.js";
 import {
-  Service32,
-  node35
-} from "./integration-mnaavyqg.js";
+  Service31,
+  node34
+} from "./tool-5y6wgat7.js";
 import {
   namespace2,
   name13
-} from "./integration-wk7afg2y.js";
+} from "./tool-t15tae8c.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/mcp/instructions.ts
-var exports_instructions2 = {};
-__export(exports_instructions2, {
-  McpInstructions: () => exports_instructions2,
-  Service: () => Service26,
+var exports_instructions4 = {};
+__export(exports_instructions4, {
+  McpInstructions: () => exports_instructions4,
+  Service: () => Service27,
   layer: () => layer10,
   node: () => node30
 });
@@ -62,16 +62,16 @@ var update = (previous, current) => {
 `);
 };
 
-class Service26 extends Context.Service()("@opencode/McpInstructions") {
+class Service27 extends Context.Service()("@opencode/McpInstructions") {
 }
-var layer10 = Layer.effect(Service26, Effect.gen(function* () {
-  const mcp = yield* Service32;
-  return Service26.of({
+var layer10 = Layer.effect(Service27, Effect.gen(function* () {
+  const mcp = yield* Service31;
+  return Service27.of({
     load: Effect.fn("McpInstructions.load")(function* (selection) {
       const agent = selection.info;
       if (!agent)
         return empty3;
-      const source = (value) => make20({
+      const source = (value) => make21({
         key: Key3.make("core/mcp-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),
         read: Effect.succeed(value),
@@ -100,6 +100,6 @@ var layer10 = Layer.effect(Service26, Effect.gen(function* () {
     })
   });
 }));
-var node30 = makeLocationNode({ service: Service26, layer: layer10, deps: [node35] });
+var node30 = makeLocationNode({ service: Service27, layer: layer10, deps: [node34] });
 
-export { Service26, layer10, node30, exports_instructions2 };
+export { Service27, layer10, node30, exports_instructions4 };

package/dist/chunks/{integration-wk7afg2y.js → tool-t15tae8c.js}

@@ -1,32 +1,32 @@
 import {
-  Service81,
-  node85
-} from "./integration-dw76zyaf.js";
+  Service82,
+  node86
+} from "./tool-9endzh9e.js";
 import {
-  Service32,
-  node35
-} from "./integration-mnaavyqg.js";
+  Service31,
+  node34
+} from "./tool-5y6wgat7.js";
 import {
-  Service63,
-  node66
-} from "./integration-tj7ekckq.js";
+  Service69,
+  node73
+} from "./tool-8t1mk3vk.js";
 import {
-  Service39,
-  node42
-} from "./integration-4f6d0pew.js";
+  Service65,
+  node69
+} from "./tool-ebdw14y1.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/tool/mcp.ts
 var exports_mcp3 = {};
 __export(exports_mcp3, {
   McpTool: () => exports_mcp3,
-  Service: () => Service31,
-  layer: () => layer13,
+  Service: () => Service28,
+  layer: () => layer11,
   name: () => name13,
   namespace: () => namespace2,
-  node: () => node34
+  node: () => node31
 });
 import { ToolFailure } from "@opencode/ai";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -35,13 +35,13 @@ import { makeLocationNode } from "@opencode/util/effect/app-node";
 var namespace2 = (server) => server.replace(/[^a-zA-Z0-9_-]/g, "_");
 var name13 = (server, tool) => `${namespace2(server)}_${tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`;
 
-class Service31 extends Context.Service()("@opencode/McpTool") {
+class Service28 extends Context.Service()("@opencode/McpTool") {
 }
-var layer13 = Layer.effect(Service31, Effect.gen(function* () {
-  const mcp = yield* Service32;
-  const tools = yield* Service39;
-  const bus = yield* Service81;
-  const permission = yield* Service63;
+var layer11 = Layer.effect(Service28, Effect.gen(function* () {
+  const mcp = yield* Service31;
+  const tools = yield* Service65;
+  const bus = yield* Service82;
+  const permission = yield* Service69;
   const lock = Semaphore.makeUnsafe(1);
   let discovered = [];
   const initial = yield* lock.withPermit(Effect.gen(function* () {
@@ -118,12 +118,12 @@ var layer13 = Layer.effect(Service31, Effect.gen(function* () {
   yield* bus.subscribe(McpEvent.ToolsChanged).pipe(Stream.runForEach(() => PubSub.publish(changes, undefined)), Effect.forkScoped({ startImmediately: true }));
   const updates = yield* PubSub.subscribe(changes);
   yield* Stream.fromSubscription(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reconcile), Effect.forkScoped({ startImmediately: true }));
-  return Service31.of({ flush: Effect.asVoid(Fiber.await(initial)) });
+  return Service28.of({ flush: Effect.asVoid(Fiber.await(initial)) });
 }));
-var node34 = makeLocationNode({
-  service: Service31,
-  layer: layer13,
-  deps: [node42, node35, node85, node66]
+var node31 = makeLocationNode({
+  service: Service28,
+  layer: layer11,
+  deps: [node69, node34, node86, node73]
 });
 
-export { namespace2, name13, Service31, layer13, node34, exports_mcp3 };
+export { namespace2, name13, Service28, layer11, node31, exports_mcp3 };