@opencode-ai/core 0.0.0-dev-19193 → 0.0.0-dev-19195

package/dist/chunks/{event-logger-ycvbw33x.js → workspace-xnbskdmk.js}

@@ -1,18 +1,18 @@
 import {
   PositiveInt2,
   RelativePath2
-} from "./event-logger-p8qxwesx.js";
+} from "./workspace-p8qxwesx.js";
 import {
-  Service74,
-  node78
-} from "./event-logger-rxnavyj8.js";
+  Service73,
+  node77
+} from "./workspace-m14vb86n.js";
 import {
-  Service15,
+  Service16,
   node19
-} from "./event-logger-7cczrbj9.js";
+} from "./workspace-v706g9gb.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/filesystem.ts
 var exports_filesystem = {};
@@ -21,7 +21,7 @@ __export(exports_filesystem, {
   DEFAULT_SEARCH_LIMIT: () => DEFAULT_SEARCH_LIMIT2,
   DEFAULT_SEARCH_TIMEOUT_MS: () => DEFAULT_SEARCH_TIMEOUT_MS2,
   Entry: () => Entry2,
-  Event: () => Event3,
+  Event: () => Event2,
   FileSystem: () => exports_filesystem,
   FindInput: () => FindInput2,
   GlobInput: () => GlobInput2,
@@ -29,7 +29,7 @@ __export(exports_filesystem, {
   ListInput: () => ListInput2,
   Match: () => Match2,
   ReadInput: () => ReadInput2,
-  Service: () => Service14,
+  Service: () => Service15,
   Submatch: () => Submatch2,
   node: () => node18
 });
@@ -72,14 +72,14 @@ class GrepInput2 extends Schema.Class("FileSystem.GrepInput")({
   limit: Schema.optionalKey(PositiveInt2)
 }) {
 }
-var Event3 = FileSystem.Event;
+var Event2 = FileSystem.Event;
 
-class Service14 extends Context.Service()("@opencode/FileSystem") {
+class Service15 extends Context.Service()("@opencode/FileSystem") {
 }
-var baseLayer = Layer.effect(Service14, Effect.gen(function* () {
+var baseLayer = Layer.effect(Service15, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service74;
-  const search = yield* Service15;
+  const location = yield* Service73;
+  const search = yield* Service16;
   const root = location.workspaceID ? location.directory : yield* fs.realPath(location.directory).pipe(Effect.orDie);
   const resolve = Effect.fnUntraced(function* (input) {
     const absolute = path.resolve(location.directory, input ?? ".");
@@ -90,7 +90,7 @@ var baseLayer = Layer.effect(Service14, Effect.gen(function* () {
       return yield* Effect.die(new Error("Path escapes the location"));
     return { absolute, real, directory: location.directory };
   });
-  return Service14.of({
+  return Service15.of({
     find: search.find,
     read: Effect.fn("FileSystem.read")(function* (input) {
       const target = yield* resolve(input.path);
@@ -123,9 +123,9 @@ var baseLayer = Layer.effect(Service14, Effect.gen(function* () {
   });
 }));
 var node18 = makeLocationNode({
-  service: Service14,
+  service: Service15,
   layer: baseLayer,
-  deps: [FSUtil.node, node78, node19]
+  deps: [FSUtil.node, node77, node19]
 });
 
-export { FindInput2, ReadInput2, Content2, ListInput2, DEFAULT_SEARCH_LIMIT2, DEFAULT_SEARCH_TIMEOUT_MS2, GlobInput2, GrepInput2, Event3, Service14, node18, exports_filesystem, Entry2, Match2, Submatch2 };
+export { FindInput2, ReadInput2, Content2, ListInput2, DEFAULT_SEARCH_LIMIT2, DEFAULT_SEARCH_TIMEOUT_MS2, GlobInput2, GrepInput2, Event2, Service15, node18, exports_filesystem, Entry2, Match2, Submatch2 };

package/dist/chunks/{event-logger-ftfew5mq.js → workspace-xtddbfj7.js}

@@ -1,17 +1,17 @@
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/workspace/driver.ts
 var exports_driver = {};
 __export(exports_driver, {
   Binding: () => Binding2,
-  Error: () => Error3,
+  Error: () => Error5,
   ProviderNotFound: () => ProviderNotFound2,
   RegistryService: () => RegistryService2,
   WorkspaceDriver: () => exports_driver,
-  make: () => make19,
-  node: () => node54,
+  make: () => make21,
+  node: () => node79,
   registry: () => registry2,
   registryNode: () => registryNode2
 });
@@ -19,7 +19,7 @@ import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
 var Binding2 = Schema.Record(Schema.String, Schema.Json);
 
-class Error3 extends Schema.TaggedError()("WorkspaceDriver.Error", {
+class Error5 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 make19 = (driver) => driver;
+var make21 = (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 node54 = registryNode2({});
+var node79 = registryNode2({});
 
-export { Binding2, Error3, ProviderNotFound2, make19, RegistryService2, registry2, registryNode2, node54, exports_driver };
+export { Binding2, Error5, ProviderNotFound2, make21, RegistryService2, registry2, registryNode2, node79, exports_driver };

package/dist/chunks/{event-logger-axzb5kc8.js → workspace-xv7dhr1k.js}

@@ -1,21 +1,21 @@
 import {
   call2
-} from "./event-logger-6z5bwd8g.js";
+} from "./workspace-w3jym6ha.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/plugin/websearch/exa.ts
 var exports_exa = {};
 __export(exports_exa, {
-  Plugin: () => Plugin4,
+  Plugin: () => Plugin22,
   WebSearchExa: () => exports_exa,
-  endpoint: () => endpoint2
+  endpoint: () => endpoint3
 });
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { Effect, Schema } from "effect";
 import { HttpClient } from "effect/unstable/http";
-var endpoint2 = "https://mcp.exa.ai/mcp";
+var endpoint3 = "https://mcp.exa.ai/mcp";
 var McpInput = Schema.Struct({
   query: Schema.String,
   numResults: Schema.Number.pipe(Schema.optional)
@@ -27,7 +27,7 @@ var McpOutput = Schema.Struct({
     _meta: Schema.Struct({ searchTime: Schema.Number }).pipe(Schema.optional)
   }))
 });
-var Plugin4 = define({
+var Plugin22 = define({
   id: "opencode.websearch.exa",
   effect: Effect.fn("WebSearchExa.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -49,7 +49,7 @@ var Plugin4 = define({
         execute: (input) => Effect.gen(function* () {
           const connection = yield* ctx.integration.connection.active("exa");
           const credential = connection ? yield* ctx.integration.connection.resolve(connection) : undefined;
-          const url = new URL(endpoint2);
+          const url = new URL(endpoint3);
           if (credential?.type === "key")
             url.searchParams.set("exaApiKey", credential.key);
           const result = yield* call2(http, url.toString(), "web_search_exa", { input: McpInput, output: McpOutput }, { query: input.query, numResults: 8 });
@@ -80,4 +80,4 @@ function parseResults(text) {
   });
 }
 
-export { endpoint2, Plugin4, exports_exa };
+export { endpoint3, Plugin22, exports_exa };

package/dist/chunks/{event-logger-cre9rc66.js → workspace-xwx3yayk.js}

@@ -1,50 +1,50 @@
 import {
   typeFollowing2
-} from "./event-logger-2a5m3afh.js";
+} from "./workspace-2a5m3afh.js";
 import {
   RelativePath2
-} from "./event-logger-p8qxwesx.js";
+} from "./workspace-p8qxwesx.js";
 import {
-  Service74
-} from "./event-logger-rxnavyj8.js";
+  Service73
+} from "./workspace-m14vb86n.js";
 import {
-  Service42
-} from "./event-logger-9z9bt1dn.js";
+  Service72
+} from "./workspace-bw8t122c.js";
 import {
-  Service17
-} from "./event-logger-33605td9.js";
+  Service60
+} from "./workspace-nz7385rw.js";
 import {
   DEFAULT_SEARCH_LIMIT2,
   DEFAULT_SEARCH_TIMEOUT_MS2,
   GlobInput2,
   Entry2
-} from "./event-logger-ycvbw33x.js";
+} from "./workspace-xnbskdmk.js";
 import {
   externalDirectoryPermission2,
-  Service19
-} from "./event-logger-t20yknkd.js";
+  Service14
+} from "./workspace-ys3raqdw.js";
 import {
-  Service45
-} from "./event-logger-9rxegtcz.js";
+  Service41
+} from "./workspace-3f3b7fxe.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/tool/plugin/glob.ts
 var exports_glob = {};
 __export(exports_glob, {
   GlobTool: () => exports_glob,
-  Input: () => Input8,
-  Output: () => Output5,
-  Plugin: () => Plugin23,
-  name: () => name8,
-  toModelContent: () => toModelContent3
+  Input: () => Input11,
+  Output: () => Output8,
+  Plugin: () => Plugin43,
+  name: () => name11,
+  toModelContent: () => toModelContent6
 });
 import { ToolFailure } from "@opencode-ai/ai";
 import { Effect, Schema } from "effect";
 import path from "path";
-var name8 = "glob";
-var Input8 = Schema.Struct({
+var name11 = "glob";
+var Input11 = Schema.Struct({
   pattern: GlobInput2.fields.pattern.annotate({ description: "Glob pattern to match files against" }),
   path: Schema.optionalKey(RelativePath2).annotate({
     description: "Directory to search. Defaults to the current working directory."
@@ -56,28 +56,28 @@ var Input8 = Schema.Struct({
     description: `Maximum number of matching files to return (default: ${DEFAULT_SEARCH_LIMIT2})`
   })
 });
-var Output5 = Schema.Array(Entry2);
-var toModelContent3 = (entries, truncated = false) => {
+var Output8 = Schema.Array(Entry2);
+var toModelContent6 = (entries, truncated = false) => {
   const lines = entries.length === 0 ? ["No files found"] : entries.map((item) => item.path);
   if (truncated)
     lines.push("", `(Results are truncated: showing first ${entries.length} results. Consider using a more specific path or pattern.)`);
   return lines.join(`
 `);
 };
-var Plugin23 = {
+var Plugin43 = {
   id: "opencode.tool.glob",
   effect: Effect.fn("GlobTool.Plugin")(function* (ctx) {
-    const environment = yield* Service42;
-    const ripgrep = yield* Service17;
-    const location = yield* Service74;
-    const mutation = yield* Service19;
-    const permission = yield* Service45;
+    const environment = yield* Service72;
+    const ripgrep = yield* Service60;
+    const location = yield* Service73;
+    const mutation = yield* Service14;
+    const permission = yield* Service41;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name8,
+      name: name11,
       options: { codemode: false },
       description: 'Search file paths using a glob pattern (examples: "**/*.ts", "src/**/*.tsx").',
-      input: Input8,
-      output: Output5,
+      input: Input11,
+      output: Output8,
       execute: (input, context) => Effect.gen(function* () {
         const searchPath = input.path === "undefined" || input.path === "null" ? undefined : input.path;
         const source = { type: "tool", messageID: context.messageID, id: context.id };
@@ -91,7 +91,7 @@ var Plugin23 = {
             source
           });
         yield* permission.assert({
-          action: name8,
+          action: name11,
           resources: [input.pattern],
           save: ["*"],
           metadata: {
@@ -126,11 +126,11 @@ var Plugin23 = {
         return { entries: entries.slice(0, limit), truncated: entries.length > limit };
       }).pipe(Effect.map((result) => ({
         output: result.entries,
-        content: toModelContent3(result.entries.map((entry) => ({ ...entry, path: path.resolve(location.directory, entry.path) })), result.truncated),
+        content: toModelContent6(result.entries.map((entry) => ({ ...entry, path: path.resolve(location.directory, entry.path) })), result.truncated),
         metadata: { count: result.entries.length, truncated: result.truncated }
       })), Effect.mapError((error) => error instanceof ToolFailure ? error : new ToolFailure({ message: `Unable to find files matching ${input.pattern}`, error })))
     })).pipe(Effect.orDie);
   })
 };
 
-export { name8, Input8, Output5, toModelContent3, Plugin23, exports_glob };
+export { name11, Input11, Output8, toModelContent6, Plugin43, exports_glob };

package/dist/chunks/{event-logger-y1fvbwt7.js → workspace-y1fvbwt7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/util/wildcard.ts
 var exports_wildcard = {};

package/dist/chunks/{event-logger-y2cqme3r.js → workspace-y2cqme3r.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath2
-} from "./event-logger-p8qxwesx.js";
+} from "./workspace-p8qxwesx.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/worktree/directory.ts
 var exports_directory = {};

package/dist/chunks/{event-logger-hmr1gr79.js → workspace-y5ktg927.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./event-logger-dpkg50ah.js";
+} from "./workspace-dpkg50ah.js";
 import {
-  Service76,
-  node80
-} from "./event-logger-wcpdckdd.js";
+  Service79,
+  node84
+} from "./workspace-xn3w44n0.js";
 import {
   Event18,
-  Service67,
-  node71
-} from "./event-logger-ydker4j1.js";
+  Service71,
+  node75
+} from "./workspace-ht3swkvd.js";
 import {
-  Service74,
-  node78
-} from "./event-logger-rxnavyj8.js";
+  Service73,
+  node77
+} from "./workspace-m14vb86n.js";
 import {
-  Service42,
-  node45
-} from "./event-logger-9z9bt1dn.js";
+  Service72,
+  node76
+} from "./workspace-bw8t122c.js";
 import {
-  ID12,
-  Service63,
-  node67
-} from "./event-logger-983egy01.js";
+  ID9,
+  Service53,
+  node56
+} from "./workspace-tgz09txt.js";
 import {
   reconcile2,
   create3
-} from "./event-logger-kg06axw8.js";
+} from "./workspace-kg06axw8.js";
 import {
-  ID11,
+  ID8,
   MethodID2,
-  Service62,
-  node66
-} from "./event-logger-1nwdnxvf.js";
+  Service52,
+  node55
+} from "./workspace-k167vvtr.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./workspace-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError3,
-  Options: () => Options4,
+  NotFoundError: () => NotFoundError2,
+  Options: () => Options3,
   Prompt: () => Prompt2,
   PromptArgument: () => PromptArgument2,
   PromptMessage: () => PromptMessage2,
@@ -56,15 +56,15 @@ __export(exports_mcp4, {
   ServerInfo: () => ServerInfo2,
   ServerInstructions: () => ServerInstructions2,
   ServerName: () => ServerName2,
-  Service: () => Service36,
+  Service: () => Service30,
   Status: () => Status2,
   Tool: () => Tool3,
   ToolCallError: () => ToolCallError2,
   ToolResult: () => ToolResult2,
   ToolResultContent: () => ToolResultContent2,
-  configured: () => configured4,
-  layer: () => layer16,
-  node: () => node39
+  configured: () => configured3,
+  layer: () => layer13,
+  node: () => node34
 });
 import { Mcp } from "@opencode-ai/schema/mcp";
 import { McpEvent } from "@opencode-ai/schema/mcp-event";
@@ -81,7 +81,7 @@ var Status2 = Mcp.Status;
 class ServerInfo2 extends Schema.Class("MCP.ServerInfo")({
   name: ServerName2,
   status: Status2,
-  integrationID: ID11.pipe(Schema.optional)
+  integrationID: ID8.pipe(Schema.optional)
 }) {
 }
 
@@ -147,7 +147,7 @@ var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContentPart2 = Mcp.ResourceContentPart;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -165,21 +165,21 @@ var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var cloneConfig = (config) => structuredClone(config);
 
-class Service36 extends Context.Service()("@opencode/MCP") {
+class Service30 extends Context.Service()("@opencode/MCP") {
 }
-var Options4 = Schema.Struct({
+var Options3 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
-  const location = yield* Service74;
-  const environment = yield* Service42;
-  const bus = yield* Service76;
-  const forms = yield* Service63;
-  const integration = yield* Service62;
-  const credentials = yield* Service67;
+var layer13 = (options) => Layer.effect(Service30, Effect.gen(function* () {
+  const location = yield* Service73;
+  const environment = yield* Service72;
+  const bus = yield* Service79;
+  const forms = yield* Service53;
+  const integration = yield* Service52;
+  const credentials = yield* Service71;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -191,7 +191,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID11.make(suffix);
+    const integrationID = ID8.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -216,7 +216,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError3({ server: name });
+      return yield* new NotFoundError2({ server: name });
     return { name, entry };
   });
   const connectProvider = Effect.fnUntraced(function* (entry) {
@@ -225,31 +225,54 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
     const remote = entry.config;
     const oauth = remote.oauth || undefined;
+    const run = Effect.runPromiseWith(yield* Effect.context());
     const base = {
       redirectUrl: oauth?.redirect_uri ?? "http://127.0.0.1/callback",
       scope: oauth?.scope,
       client: oauth?.client_id ? { id: oauth.client_id, secret: oauth.client_secret } : undefined,
-      onRedirect: () => {}
+      onRedirect: () => run(Effect.logInfo("mcp oauth authorization required"))
     };
     const found = (yield* credentials.list(entry.integrationID)).at(-1);
-    if (!found || found.value.type !== "oauth")
+    if (!found || found.value.type !== "oauth") {
+      yield* Effect.logInfo("mcp oauth credential unavailable", {
+        integrationID: entry.integrationID,
+        reason: found ? "not_oauth" : "missing"
+      });
       return McpOAuth.provider({ ...base, store: McpOAuth.memoryStore() });
+    }
     const credentialID = found.id;
     const methodID = found.value.methodID;
+    const fields = { credentialID, integrationID: entry.integrationID };
+    yield* Effect.logInfo("mcp oauth credential loaded", {
+      ...fields,
+      hasRefreshToken: Boolean(found.value.refresh),
+      hasClientInformation: Boolean(McpOAuth.clientFromCredential(found.value)),
+      expiresAt: found.value.expires,
+      expired: found.value.expires !== 0 && found.value.expires <= Date.now()
+    });
     let presented = found.value.refresh;
     const readOAuthCredential = async () => {
-      const stored = await Effect.runPromise(credentials.get(credentialID));
+      const stored = await run(credentials.get(credentialID));
       return stored?.value.type === "oauth" ? stored.value : undefined;
     };
     return McpOAuth.provider({
       ...base,
       invalidate: async (scope) => {
-        if (scope === "verifier" || scope === "discovery")
+        if (scope === "verifier" || scope === "discovery") {
+          await run(Effect.logDebug("mcp oauth invalidation skipped", { ...fields, scope, reason: "not_credentials" }));
           return;
+        }
         const oauth = await readOAuthCredential();
-        if (!oauth || oauth.refresh !== presented)
+        if (!oauth || oauth.refresh !== presented) {
+          await run(Effect.logInfo("mcp oauth invalidation skipped", {
+            ...fields,
+            scope,
+            reason: oauth ? "token_rotated" : "credential_missing"
+          }));
           return;
-        await Effect.runPromise(credentials.remove(credentialID));
+        }
+        await run(Effect.logWarning("mcp oauth credential invalidation requested", { ...fields, scope }));
+        await run(credentials.remove(credentialID));
       },
       store: {
         tokens: async () => {
@@ -268,7 +291,14 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
             client: previous ? McpOAuth.clientFromCredential(previous) : undefined
           });
           presented = value.refresh;
-          await Effect.runPromise(credentials.update(credentialID, { value }));
+          await run(Effect.logInfo("mcp oauth tokens received", {
+            ...fields,
+            credentialPresent: Boolean(previous),
+            refreshRotated: Boolean(previous && previous.refresh !== value.refresh),
+            hasRefreshToken: Boolean(value.refresh),
+            expiresAt: value.expires
+          }));
+          await run(credentials.update(credentialID, { value }));
         },
         clientInformation: async () => {
           const oauth = await readOAuthCredential();
@@ -285,7 +315,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID12.create();
+        const formID = ID9.create();
         const key = input.server + "\x00" + input.params.elicitationId;
         urlElicitations.set(key, formID);
         return yield* forms.ask({
@@ -403,7 +433,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const result = yield* McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service42, environment), Scope.provide(scope), Effect.exit);
+    const result = yield* McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service72, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
       entry.tools = result.value.tools.map((def) => toTool(name, entry, def));
@@ -423,7 +453,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     entry.status = error instanceof McpClient.NeedsAuthError ? { status: "needs_auth" } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
     yield* Effect.logWarning("mcp connect failed", { server: name, status: entry.status });
     yield* bus.publish(McpEvent.StatusChanged, { server: name });
-  }).pipe(Effect.ensuring(entry.startup.open));
+  }).pipe(Effect.ensuring(entry.startup.open), Effect.annotateLogs({ server: name, directory: location.directory, connectionID: crypto.randomUUID() }));
   const stopServer = Effect.fnUntraced(function* (name, entry) {
     const scope = entry.scope;
     if (!scope)
@@ -557,7 +587,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     concurrency: "unbounded",
     discard: true
   }));
-  return Service36.of({
+  return Service30.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -677,14 +707,14 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     })
   });
 }));
-function configured4(options) {
+function configured3(options) {
   return makeLocationNode({
-    service: Service36,
-    layer: layer16(options),
-    deps: [node78, node45, node80, node67, node66, node71]
+    service: Service30,
+    layer: layer13(options),
+    deps: [node77, node76, node84, node56, node55, node75]
   });
 }
-var node39 = configured4();
+var node34 = configured3();
 function toElicitationField(key, property, required) {
   const machineTitle = /^(boolean|string|number|integer|array|object)(\s+with\b.*|\s+in\b.*)?$/i;
   const title = property.title && !machineTitle.test(property.title.trim()) ? property.title : property.description ?? key;
@@ -735,4 +765,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, ServerInfo2, ServerInstructions2, Tool3, ToolResultContent2, ToolResult2, PromptArgument2, Prompt2, PromptMessage2, PromptResult2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service36, Options4, layer16, configured4, node39, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, ServerInfo2, ServerInstructions2, Tool3, ToolResultContent2, ToolResult2, PromptArgument2, Prompt2, PromptMessage2, PromptResult2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError2, ToolCallError2, Service30, Options3, layer13, configured3, node34, exports_mcp4 };