@opencode/core 2.0.24 → 2.0.26

package/dist/chunks/{repository-f6sbv01c.js → location-services-j5w85phq.js}

@@ -2,7 +2,7 @@ import {
   ID14,
   Service76,
   node80
-} from "./repository-mfct962c.js";
+} from "./location-services-gnwdqr3s.js";
 import {
   ID13,
   isAISDK2,
@@ -16,22 +16,22 @@ import {
   mergeHeaders2,
   Service75,
   node79
-} from "./repository-9815d8pv.js";
+} from "./location-services-2qatx596.js";
 import {
-  Service55,
-  node57
-} from "./repository-x4k83k5f.js";
+  Service41,
+  node43
+} from "./location-services-qbqyxtrr.js";
 import {
-  ID12,
+  ID6,
   VariantID2,
   Ref2,
-  Service74,
-  node78,
+  Service60,
+  node63,
   supportsText2
-} from "./repository-b5f9cqb8.js";
+} from "./location-services-v8rmp2e0.js";
 import {
   __export
-} from "./repository-9rqn6x4v.js";
+} from "./location-services-9rqn6x4v.js";
 
 // src/model-resolver.ts
 var exports_model_resolver = {};
@@ -40,15 +40,15 @@ __export(exports_model_resolver, {
   ModelConfigurationError: () => ModelConfigurationError2,
   ModelInitializationError: () => ModelInitializationError2,
   ModelResolver: () => exports_model_resolver,
-  Service: () => Service54,
+  Service: () => Service38,
   UnresolvedProviderVariablesError: () => UnresolvedProviderVariablesError2,
   UnsupportedCompactionError: () => UnsupportedCompactionError2,
   UnsupportedPackageError: () => UnsupportedPackageError2,
   VariantUnavailableError: () => VariantUnavailableError2,
   fromCatalogModel: () => fromCatalogModel2,
   hasPackage: () => hasPackage2,
-  layer: () => layer19,
-  node: () => node56,
+  layer: () => layer18,
+  node: () => node40,
   resolveModel: () => resolveModel2,
   withVariant: () => withVariant2
 });
@@ -59,7 +59,7 @@ import { Context, Effect, Layer, Schema, Struct } from "effect";
 import { Npm } from "@opencode/util/npm";
 class VariantUnavailableError2 extends Schema.TaggedError()("SessionRunnerModel.VariantUnavailableError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   variant: VariantID2
 }) {
   get message() {
@@ -69,7 +69,7 @@ class VariantUnavailableError2 extends Schema.TaggedError()("SessionRunnerModel.
 
 class UnsupportedPackageError2 extends Schema.TaggedError()("SessionRunnerModel.UnsupportedPackageError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   package: Schema.String
 }) {
   get message() {
@@ -80,7 +80,7 @@ var InitializationPhase2 = Schema.Literals(["load", "init", "construct"]);
 
 class ModelConfigurationError2 extends Schema.TaggedError()("SessionRunnerModel.ModelConfigurationError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   package: Schema.String,
   detail: Schema.String
 }) {
@@ -91,7 +91,7 @@ class ModelConfigurationError2 extends Schema.TaggedError()("SessionRunnerModel.
 
 class ModelInitializationError2 extends Schema.TaggedError()("SessionRunnerModel.ModelInitializationError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   package: Schema.String,
   phase: InitializationPhase2,
   detail: Schema.String
@@ -103,7 +103,7 @@ class ModelInitializationError2 extends Schema.TaggedError()("SessionRunnerModel
 
 class UnresolvedProviderVariablesError2 extends Schema.TaggedError()("SessionRunnerModel.UnresolvedProviderVariablesError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   variables: Schema.Array(Schema.String)
 }) {
   get message() {
@@ -113,7 +113,7 @@ class UnresolvedProviderVariablesError2 extends Schema.TaggedError()("SessionRun
 
 class UnsupportedCompactionError2 extends Schema.TaggedError()("SessionRunnerModel.UnsupportedCompactionError", {
   providerID: ID13,
-  modelID: ID12,
+  modelID: ID6,
   route: Schema.String
 }) {
   get message() {
@@ -121,7 +121,7 @@ class UnsupportedCompactionError2 extends Schema.TaggedError()("SessionRunnerMod
   }
 }
 
-class Service54 extends Context.Service()("@opencode/ModelResolver") {
+class Service38 extends Context.Service()("@opencode/ModelResolver") {
 }
 var withVariant2 = (model, variantID) => {
   const id = variantID === "default" ? undefined : variantID;
@@ -145,7 +145,7 @@ var fromCatalogModel2 = (model, credential, dependencies) => resolveCatalogModel
   return Effect.fail(new UnsupportedCompactionError2({ providerID: model.providerID, modelID: model.id, route: resolved.route.id }));
 }));
 var resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(function* (model, credential, dependencies) {
-  const resolved = prepareRuntimeModel(model, credential);
+  const resolved = prepareRuntimeModel(model);
   const configuration = credential?.type === "key" ? credential.configuration : undefined;
   const configured = { ...resolved.settings, ...credential?.metadata, ...configuration };
   if (isAISDK2(resolved.package)) {
@@ -153,7 +153,7 @@ var resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(functio
     if (!loadAISDK)
       return yield* unsupported(resolved);
     const settings = yield* prepareProviderSettings(resolved, mergeOverlay2(resolved.settings, {
-      ...nativeCredentialSettings(resolved.package ?? "", credential),
+      ...nativeCredentialSettings(resolved, resolved.package ?? "", credential),
       ...credential?.metadata,
       ...configuration
     }) ?? {});
@@ -167,7 +167,7 @@ var resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(functio
   const settings = {
     ...credential ? Struct.omit(mapped, ["accessToken", "apiKey", "authToken"]) : mapped,
     ...resolved.canonical === undefined ? {} : { provider: resolved.canonical },
-    ...nativeCredentialSettings(specifier, credential),
+    ...nativeCredentialSettings(resolved, specifier, credential),
     headers: resolved.headers,
     body: resolved.body
   };
@@ -191,14 +191,10 @@ var resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(functio
     }) : initialization(resolved, "construct", cause)
   });
 });
-function prepareRuntimeModel(model, credential) {
-  if (model.settings?.apiKey !== "" && (credential?.type !== "key" || credential.metadata === undefined))
+function prepareRuntimeModel(model) {
+  if (model.settings?.apiKey !== "")
     return model;
-  return {
-    ...model,
-    ...model.settings?.apiKey === "" ? { settings: Struct.omit(model.settings, ["apiKey"]) } : {},
-    ...credential?.type === "key" && credential.metadata !== undefined ? { body: mergeOverlay2(model.body, credential.metadata) } : {}
-  };
+  return { ...model, settings: Struct.omit(model.settings, ["apiKey"]) };
 }
 function validateProviderVariables(model, resolved) {
   const baseURL = resolved.route.endpoint.baseURL;
@@ -230,16 +226,25 @@ function unresolvedProviderVariables(model, baseURL) {
     variables: Array.from(variables)
   });
 }
-var nativeCredentialSettings = (specifier, credential) => {
+var nativeCredentialSettings = (model, specifier, credential) => {
   if (!credential)
     return {};
   if (credential.type === "key")
     return { apiKey: credential.key };
+  if (credential.type === "oauth")
+    return tokenSettings(specifier, credential.access);
+  if (specifier.startsWith("@opencode/ai/providers/amazon-bedrock"))
+    return { auth: "sigv4" };
+  if (model.providerID === ID13.azure)
+    return tokenSettings(specifier, "azure-cli");
+  return {};
+};
+var tokenSettings = (specifier, token) => {
   if (specifier === "@opencode/ai/providers/anthropic" || specifier === "@opencode/ai/providers/anthropic-compatible")
-    return { authToken: credential.access };
+    return { authToken: token };
   if (specifier === "@opencode/ai/providers/google-vertex" || specifier.startsWith("@opencode/ai/providers/google-vertex/"))
-    return { accessToken: credential.access };
-  return { apiKey: credential.access };
+    return { accessToken: token };
+  return { apiKey: token };
 };
 var unsupported = (model) => new UnsupportedPackageError2({
   providerID: model.providerID,
@@ -265,12 +270,12 @@ var causeMessage = (cause) => {
 };
 var resolveModel2 = (model, variant, credential, dependencies) => withVariant2(model, variant).pipe(Effect.flatMap((model) => fromCatalogModel2(model, credential, dependencies)));
 var hasPackage2 = (model) => Boolean(model.package);
-var layer19 = Layer.effect(Service54, Effect.gen(function* () {
+var layer18 = Layer.effect(Service38, Effect.gen(function* () {
   const providers = yield* Service75;
-  const models = yield* Service74;
+  const models = yield* Service60;
   const integrations = yield* Service76;
   const npm = yield* Npm.Service;
-  const aisdk = yield* Service55;
+  const aisdk = yield* Service41;
   const load = Effect.fn("ModelResolver.resolveModel")(function* (selected, variant) {
     const provider = yield* providers.get(selected.providerID);
     const connection = yield* integrations.connection.active(provider?.integrationID ?? ID14.make(selected.providerID));
@@ -300,7 +305,7 @@ var layer19 = Layer.effect(Service54, Effect.gen(function* () {
       chunkTimeout: timeout2(provider?.settings?.chunkTimeout)
     };
   });
-  return Service54.of({
+  return Service38.of({
     resolve: Effect.fn("ModelResolver.resolve")(function* (requested) {
       const selected = requested ? yield* models.get(requested.providerID, requested.id) : yield* models.default().pipe(Effect.flatMap((model) => model && hasPackage2(model) ? Effect.succeed(model) : Effect.map(models.available(), (models) => models.find((model) => hasPackage2(model) && supportsText2(model)))));
       if (!selected)
@@ -317,10 +322,10 @@ function usesAPIKeyAuth(packageName) {
   const name = packageName2(packageName);
   return name === "@ai-sdk/openai" || name === "@ai-sdk/anthropic" || name === "@ai-sdk/cerebras" || name === "@ai-sdk/deepinfra" || name === "@ai-sdk/openai-compatible" || name === "@ai-sdk/google" || name === "@ai-sdk/groq" || name === "@ai-sdk/mistral" || name === "@ai-sdk/togetherai" || name === "@ai-sdk/xai" || name === "@openrouter/ai-sdk-provider" || name === "@ai-sdk/azure" || name === "@opencode/ai/providers/openai" || name?.startsWith("@opencode/ai/providers/openai/") === true || name === "@opencode/ai/providers/anthropic" || name === "@opencode/ai/providers/anthropic-compatible" || name === "@opencode/ai/providers/baseten" || name === "@opencode/ai/providers/cerebras" || name === "@opencode/ai/providers/cloudflare-ai-gateway" || name === "@opencode/ai/providers/cloudflare-workers-ai" || name === "@opencode/ai/providers/deepinfra" || name === "@opencode/ai/providers/deepseek" || name === "@opencode/ai/providers/fireworks" || name === "@opencode/ai/providers/openai-compatible" || name === "@opencode/ai/providers/google" || name === "@opencode/ai/providers/google/interactions" || name === "@opencode/ai/providers/groq" || name === "@opencode/ai/providers/mistral" || name === "@opencode/ai/providers/togetherai" || name === "@opencode/ai/providers/vercel-ai-gateway" || name === "@opencode/ai/providers/xai" || name === "@opencode/ai/providers/openrouter" || name === "@opencode/ai/providers/azure" || name?.startsWith("@opencode/ai/providers/azure/") === true;
 }
-var node56 = makeLocationNode({
-  service: Service54,
-  layer: layer19,
-  deps: [node79, node78, node80, Npm.node, node57]
+var node40 = makeLocationNode({
+  service: Service38,
+  layer: layer18,
+  deps: [node79, node63, node80, Npm.node, node43]
 });
 
-export { VariantUnavailableError2, UnsupportedPackageError2, InitializationPhase2, ModelConfigurationError2, ModelInitializationError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service54, withVariant2, fromCatalogModel2, resolveModel2, hasPackage2, layer19, node56, exports_model_resolver };
+export { VariantUnavailableError2, UnsupportedPackageError2, InitializationPhase2, ModelConfigurationError2, ModelInitializationError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service38, withVariant2, fromCatalogModel2, resolveModel2, hasPackage2, layer18, node40, exports_model_resolver };

package/dist/chunks/{repository-rn938jk3.js → location-services-j7ecp1pt.js}

@@ -1,62 +1,62 @@
 import {
   NonNegativeInt2
-} from "./repository-z5v4ffb3.js";
+} from "./location-services-z5v4ffb3.js";
 import {
   latest2,
-  Service68
-} from "./repository-9s1pr29s.js";
+  Service45
+} from "./location-services-s9pfz9kw.js";
 import {
   typeFollowing2
-} from "./repository-2a5m3afh.js";
+} from "./location-services-2a5m3afh.js";
 import {
-  Service66
-} from "./repository-hkgfm0m5.js";
+  Service64
+} from "./location-services-jbqrqj8a.js";
 import {
-  Service62
-} from "./repository-g69c5a8v.js";
+  Service39
+} from "./location-services-22dd1myg.js";
 import {
-  Service56
-} from "./repository-5r637m3f.js";
+  Service70
+} from "./location-services-qmemjc4c.js";
 import {
-  Service19,
+  Service16,
   resolvePath2
-} from "./repository-zhwzkc0c.js";
+} from "./location-services-nq21c0gd.js";
 import {
   output2,
   notice2,
   metadata2,
   notification2
-} from "./repository-vzs5sf6e.js";
+} from "./location-services-vzs5sf6e.js";
 import {
-  Service65,
+  Service56,
   name15
-} from "./repository-5t80mpw4.js";
+} from "./location-services-fm6nvr4y.js";
 import {
-  NotFoundError9,
-  Service63
-} from "./repository-47phkfqm.js";
+  NotFoundError5,
+  Service43
+} from "./location-services-b83ajrzw.js";
 import {
-  Service29
-} from "./repository-nszdq9jy.js";
+  Service19
+} from "./location-services-4n7p58nn.js";
 import {
   scan2
-} from "./repository-5pptr25h.js";
+} from "./location-services-y7b45w3g.js";
 import {
   __export
-} from "./repository-9rqn6x4v.js";
+} from "./location-services-9rqn6x4v.js";
 
 // src/tool/plugin/shell.ts
-var exports_shell = {};
-__export(exports_shell, {
+var exports_shell2 = {};
+__export(exports_shell2, {
   DEFAULT_TIMEOUT_MS: () => DEFAULT_TIMEOUT_MS2,
-  Input: () => Input10,
-  Plugin: () => Plugin12,
-  ShellTool: () => exports_shell,
-  name: () => name10
+  Input: () => Input11,
+  Plugin: () => Plugin47,
+  ShellTool: () => exports_shell2,
+  name: () => name11
 });
 import { ToolFailure } from "@opencode/ai";
 import { Deferred, Effect, Schema, Scope } from "effect";
-var name10 = "shell";
+var name11 = "shell";
 var DEFAULT_TIMEOUT_MS2 = 2 * 60 * 1000;
 var BACKGROUND_INSTRUCTION = "You will be notified automatically when the command finishes. The notification will include the command's output. Unless the user explicitly asks otherwise, DO NOT poll for completion, even if you need the final result to continue. Repeatedly sleeping and reading or searching the output file is polling, not useful work. You may read the current output if it lets you do useful work now, but do not repeatedly check it while waiting for the command to finish. Keep working on anything that does not depend on the result. If you have nothing else to do, end your response; you will be resumed automatically when the command finishes.";
 var OS = process.platform === "darwin" ? "macOS" : process.platform === "win32" ? "Windows" : process.platform === "linux" ? "Linux" : process.platform;
@@ -70,7 +70,7 @@ var description = (shell) => [
   "Commands accept an optional timeout, background commands have no timeout by default.",
   "Background commands return immediately, and you will be notified when they complete."
 ].join(" ");
-var Input10 = Schema.Struct({
+var Input11 = Schema.Struct({
   command: Schema.String.annotate({ description: "Shell command string to execute" }),
   workdir: Schema.optionalKey(Schema.String).annotate({
     description: "Working directory to execute the command in. Defaults to the current working directory. When possible, avoid changing directories in the command and set the working directory here instead."
@@ -116,19 +116,19 @@ Output is streaming to: ${file}`,
   truncated: false,
   status: "running"
 });
-var Plugin12 = {
+var Plugin47 = {
   id: "opencode.tool.shell",
   effect: Effect.fn("ShellTool.Plugin")(function* (ctx) {
-    const sessions = yield* Service29;
-    const jobs = yield* Service62;
+    const sessions = yield* Service19;
+    const jobs = yield* Service39;
     const scope = yield* Scope.Scope;
-    const environment = yield* Service66;
-    const access = yield* Service19;
-    const shell = yield* Service63;
-    const shellSelect = yield* Service65;
+    const environment = yield* Service64;
+    const access = yield* Service16;
+    const shell = yield* Service43;
+    const shellSelect = yield* Service56;
     const compatibleShell = shellSelect.resolve({ priority: "compat" });
-    const permission = yield* Service56;
-    const config = yield* Service68;
+    const permission = yield* Service70;
+    const config = yield* Service45;
     const prepare = Effect.fn("ShellTool.prepare")(function* (invocation, context) {
       const source = {
         type: "tool",
@@ -138,7 +138,7 @@ var Plugin12 = {
       const target = yield* access.resolve({ path: invocation.cwd, kind: "directory" });
       invocation.cwd = target.absolute;
       const timeout = invocation.timeout;
-      const portable = latest2(yield* config.entries(), "experimental")?.portable_shell_scanner === true;
+      const portable = latest2(yield* config.entries(), "experimental")?.portable_shell_scanner ?? (ctx.app.channel === "local" || ctx.app.channel === "dev");
       const parsed = yield* scan2(invocation.command, invocation.shell, target.absolute, { portable });
       const directories = yield* Effect.forEach(parsed.directories, (directory) => access.resolve({
         path: resolvePath2(target.absolute, directory),
@@ -147,7 +147,7 @@ var Plugin12 = {
       yield* access.authorizeExternal([target, ...directories], context);
       if (parsed.commands.length > 0)
         yield* permission.assert({
-          action: name10,
+          action: name11,
           resources: parsed.commands.map((command) => command.resource),
           save: parsed.commands.map((command) => command.save),
           sessionID: context.sessionID,
@@ -184,10 +184,10 @@ var Plugin12 = {
         yield* jobs.completeBackground(info.notificationID);
     }, Effect.forkIn(scope, { startImmediately: true }));
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name10,
+      name: name11,
       options: { codemode: false },
       description: description(),
-      input: Input10,
+      input: Input11,
       output: Output,
       execute: (input, context) => Effect.gen(function* () {
         const timeout = input.background === true ? input.timeout ?? 0 : input.timeout ?? DEFAULT_TIMEOUT_MS2;
@@ -210,7 +210,7 @@ var Plugin12 = {
         const run = Effect.gen(function* () {
           const result = yield* shell.result(info);
           if (!result.capture)
-            return yield* new NotFoundError9({ id: info.id });
+            return yield* new NotFoundError5({ id: info.id });
           const output = output2(result);
           return {
             ...output,
@@ -224,7 +224,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
 `)), Effect.onInterrupt(() => shell.remove(info.id).pipe(Effect.ignore)));
         const job = yield* jobs.start({
           id: info.id,
-          type: name10,
+          type: name11,
           title: info.command,
           metadata: { sessionID: context.sessionID, shellID: info.id },
           recovery: {
@@ -254,7 +254,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
       }).pipe(Effect.map(toolResult), Effect.mapError((error) => new ToolFailure({ message: `Unable to execute command: ${input.command}`, error })))
     })).pipe(Effect.orDie);
     const hook = (event) => Effect.gen(function* () {
-      const tool = event.tools[name10];
+      const tool = event.tools[name11];
       if (!tool)
         return;
       tool.description = description(name15(yield* compatibleShell));
@@ -265,4 +265,4 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
   })
 };
 
-export { name10, DEFAULT_TIMEOUT_MS2, Input10, Plugin12, exports_shell };
+export { name11, DEFAULT_TIMEOUT_MS2, Input11, Plugin47, exports_shell2 };

package/dist/chunks/{repository-68ga000j.js → location-services-j7kpd95e.js}

@@ -1,60 +1,60 @@
 import {
   makeUnsafe2
-} from "./repository-dpkg50ah.js";
+} from "./location-services-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./repository-9yxvhatz.js";
+} from "./location-services-g93vh8n3.js";
 import {
   Event19,
   Service77,
   node81
-} from "./repository-5ng375bv.js";
+} from "./location-services-8ansnb3t.js";
 import {
-  Service78,
-  node82
-} from "./repository-w7a2abxy.js";
+  Service80,
+  node84
+} from "./location-services-8sc63a00.js";
 import {
-  Service66,
-  node68
-} from "./repository-hkgfm0m5.js";
+  Service64,
+  node67
+} from "./location-services-jbqrqj8a.js";
 import {
   ID16,
-  Service79,
-  node83
-} from "./repository-7z6z4pna.js";
+  Service78,
+  node82
+} from "./location-services-7f0130xc.js";
 import {
   reconcile2,
   create3
-} from "./repository-rdw6cm16.js";
+} from "./location-services-rdw6cm16.js";
 import {
   ID14,
   MethodID2,
   Service76,
   node80
-} from "./repository-mfct962c.js";
+} from "./location-services-gnwdqr3s.js";
 import {
   __export
-} from "./repository-9rqn6x4v.js";
+} from "./location-services-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError5,
-  Options: () => Options4,
+  NotFoundError: () => NotFoundError3,
+  Options: () => Options3,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service41,
+  Service: () => Service29,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured4,
-  layer: () => layer15,
-  node: () => node44
+  configured: () => configured3,
+  layer: () => layer14,
+  node: () => node30
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -72,7 +72,7 @@ var ResourceTemplate2 = Mcp.ResourceTemplate;
 var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -103,19 +103,19 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service41 extends Context.Service()("@opencode/MCP") {
+class Service29 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 layer15 = (options) => Layer.effect(Service41, Effect.gen(function* () {
-  const location = yield* Service78;
-  const environment = yield* Service66;
+var layer14 = (options) => Layer.effect(Service29, Effect.gen(function* () {
+  const location = yield* Service80;
+  const environment = yield* Service64;
   const bus = yield* Service83;
-  const forms = yield* Service79;
+  const forms = yield* Service78;
   const integration = yield* Service76;
   const credentials = yield* Service77;
   const root = yield* Effect.scope;
@@ -154,7 +154,7 @@ var layer15 = (options) => Layer.effect(Service41, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError5({ server: name });
+      return yield* new NotFoundError3({ server: name });
     return { name, entry };
   });
   const connectProvider = Effect.fnUntraced(function* (entry) {
@@ -269,7 +269,7 @@ var layer15 = (options) => Layer.effect(Service41, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const load = 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(Service66, environment), Scope.provide(scope));
+    const load = 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(Service64, environment), Scope.provide(scope));
     const result = yield* (entry.config.type === "remote" ? endpointLoads.withLock(entry.config.url)(load) : load).pipe(Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
@@ -420,7 +420,7 @@ var layer15 = (options) => Layer.effect(Service41, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service41.of({
+  return Service29.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -530,14 +530,14 @@ function mergeCatalogs(catalogs) {
     templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
   });
 }
-function configured4(options) {
+function configured3(options) {
   return makeLocationNode({
-    service: Service41,
-    layer: layer15(options),
-    deps: [node82, node68, node87, node83, node80, node81]
+    service: Service29,
+    layer: layer14(options),
+    deps: [node84, node67, node87, node82, node80, node81]
   });
 }
-var node44 = configured4();
+var node30 = 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;
@@ -588,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError5, ToolCallError2, Service41, Options4, layer15, configured4, node44, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError3, ToolCallError2, Service29, Options3, layer14, configured3, node30, exports_mcp4 };

package/dist/chunks/{repository-89za3yyg.js → location-services-j8s9ab9g.js}

@@ -1,16 +1,16 @@
 import {
   SessionMessage2
-} from "./repository-gftt206x.js";
+} from "./location-services-gftt206x.js";
 import {
   SessionSchema2
-} from "./repository-my4zabxr.js";
+} from "./location-services-arz7hw7x.js";
 import {
   __export
-} from "./repository-9rqn6x4v.js";
+} from "./location-services-9rqn6x4v.js";
 
 // src/session/error.ts
-var exports_error = {};
-__export(exports_error, {
+var exports_error2 = {};
+__export(exports_error2, {
   AgentNotFoundError: () => AgentNotFoundError2,
   AttachmentError: () => AttachmentError2,
   BusyError: () => BusyError2,
@@ -19,9 +19,9 @@ __export(exports_error, {
   InboxConflictError: () => InboxConflictError2,
   MessageDecodeError: () => MessageDecodeError2,
   MessageNotFoundError: () => MessageNotFoundError2,
-  NotFoundError: () => NotFoundError8,
+  NotFoundError: () => NotFoundError9,
   PromptConflictError: () => PromptConflictError2,
-  SessionErrors: () => exports_error,
+  SessionErrors: () => exports_error2,
   SkillNotFoundError: () => SkillNotFoundError2,
   StepFailedError: () => StepFailedError2,
   SyntheticConflictError: () => SyntheticConflictError2
@@ -31,7 +31,7 @@ import { Agent } from "@opencode/schema/agent";
 import { Skill } from "@opencode/schema/skill";
 import { SessionError } from "@opencode/schema/session-error";
 
-class NotFoundError8 extends Schema.TaggedError()("Session.NotFoundError", {
+class NotFoundError9 extends Schema.TaggedError()("Session.NotFoundError", {
   sessionID: SessionSchema2.ID
 }) {
 }
@@ -116,4 +116,4 @@ class SkillNotFoundError2 extends Schema.TaggedError()("Session.SkillNotFoundErr
 }) {
 }
 
-export { NotFoundError8, MessageNotFoundError2, ForkEmptyError2, MessageDecodeError2, AgentNotFoundError2, StepFailedError2, PromptConflictError2, SyntheticConflictError2, AttachmentError2, CompactionConflictError2, BusyError2, InboxConflictError2, SkillNotFoundError2, exports_error };
+export { NotFoundError9, MessageNotFoundError2, ForkEmptyError2, MessageDecodeError2, AgentNotFoundError2, StepFailedError2, PromptConflictError2, SyntheticConflictError2, AttachmentError2, CompactionConflictError2, BusyError2, InboxConflictError2, SkillNotFoundError2, exports_error2 };