@opencode/core 2.0.27 → 2.0.29

package/dist/chunks/{filesystem-rezt1fjs.js → websearch-a2647qfq.js}

@@ -1,131 +1,132 @@
 import {
   Metadata2,
-  node43
-} from "./filesystem-xw91mmsj.js";
+  node58
+} from "./websearch-0wmc8652.js";
 import {
   Service84,
   node88
-} from "./filesystem-vdfrtany.js";
+} from "./websearch-g5x1q65a.js";
 import {
-  ID12,
-  Service73,
-  node77
-} from "./filesystem-3xq304at.js";
+  ID10,
+  Service70,
+  node74
+} from "./websearch-f7ayr8mx.js";
 import {
   ID15,
   OAuth3
-} from "./filesystem-x5s67ttw.js";
+} from "./websearch-30n06459.js";
 import {
   ID14,
   MethodID2,
   AttemptID2,
   Method2,
-  Service77,
-  node81
-} from "./filesystem-h0s8229g.js";
+  Service78,
+  node82
+} from "./websearch-5hft8km6.js";
 import {
   AbsolutePath2
-} from "./filesystem-z5v4ffb3.js";
+} from "./websearch-z5v4ffb3.js";
 import {
   Info27,
   Ref4,
   Service81,
   node85
-} from "./filesystem-42nthewb.js";
+} from "./websearch-1p799z25.js";
 import {
-  ID8,
-  Service61,
-  node64
-} from "./filesystem-zxe4qb9c.js";
+  ID13,
+  Service77,
+  node81
+} from "./websearch-caa8k32f.js";
 import {
-  Service59,
-  node62
-} from "./filesystem-6p6bhjzq.js";
+  Service60,
+  node64
+} from "./websearch-3c656pdg.js";
 import {
-  Service30,
-  node33
-} from "./filesystem-75yaxqej.js";
+  Service51,
+  node53
+} from "./websearch-1pekzpef.js";
 import {
   Service76,
   node80
-} from "./filesystem-mqbwmym3.js";
+} from "./websearch-v1kmxtyj.js";
 import {
-  Service80,
-  node84
-} from "./filesystem-shj64zqm.js";
+  Service66,
+  node70
+} from "./websearch-73ndx0kt.js";
 import {
-  ID7,
-  Service60,
-  node63
-} from "./filesystem-4dd6559a.js";
+  ID12,
+  Service75,
+  node79
+} from "./websearch-n33ezsnm.js";
 import {
-  ID9
-} from "./filesystem-qjke1250.js";
+  ID7
+} from "./websearch-mq0qga5n.js";
 import {
-  Service22,
-  node25
-} from "./filesystem-v7gjr6wa.js";
+  Service40,
+  node43
+} from "./websearch-z938xz10.js";
 import {
-  Service72,
-  node76
-} from "./filesystem-4w5f3qm5.js";
+  Service71,
+  node75
+} from "./websearch-qwjmgwmn.js";
 import {
-  Service69,
-  node73
-} from "./filesystem-q3kzbh51.js";
+  Service67,
+  node71
+} from "./websearch-2yb0fdev.js";
 import {
-  Service47,
-  node51
-} from "./filesystem-h18kbg2g.js";
+  Service54,
+  node56,
+  Error4
+} from "./websearch-tx4eqkkw.js";
 import {
   Source4,
-  Service41,
-  node45
-} from "./filesystem-x5w8kc5x.js";
+  Service56,
+  node59
+} from "./websearch-4ft0y05w.js";
+import {
+  Info7,
+  Service43,
+  node46
+} from "./websearch-stv64172.js";
 import {
-  Info4,
   Service28,
   node31
-} from "./filesystem-nr11xpps.js";
+} from "./websearch-44gjh96b.js";
 import {
-  Service14,
-  node17
-} from "./filesystem-jtpxbk3r.js";
+  Service26,
+  node29
+} from "./websearch-d883s65k.js";
 import {
-  Service55,
-  node58
-} from "./filesystem-zsa8nsz8.js";
-import {
-  Service74,
-  node78
-} from "./filesystem-tjefdw4f.js";
+  Service65,
+  node69
+} from "./websearch-g6vmwyfr.js";
 import {
-  Service38,
-  node41
-} from "./filesystem-gvc0m829.js";
+  Service24,
+  node27
+} from "./websearch-ztvjr4k5.js";
 import {
-  ID3,
+  ID4,
   Service27,
   node30
-} from "./filesystem-45gnhb3v.js";
+} from "./websearch-arkfezfn.js";
 import {
-  Service33,
-  node36
-} from "./filesystem-wfk26c6d.js";
+  Service23,
+  node26
+} from "./websearch-7xrzajz9.js";
 import {
   StrategyID2,
-  Info6,
+  Info4,
   ListEntry3,
-  Service32,
-  node35
-} from "./filesystem-jcr0a5xm.js";
+  Service22,
+  node25
+} from "./websearch-rgxvqbqk.js";
 import {
-  Service57,
-  node60
-} from "./filesystem-qf68ybps.js";
+  Service25,
+  node28
+} from "./websearch-br0hqn3c.js";
 import {
   __export
-} from "./filesystem-9rqn6x4v.js";
+} from "./websearch-9rqn6x4v.js";
 
 // src/plugin/host.ts
 var exports_host = {};
@@ -143,30 +144,30 @@ var mutable = (value) => value;
 var isRpcEvent = (event) => event.type.startsWith("rpc.");
 var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test") {
   const app = yield* Metadata2;
-  const agents = yield* Service73;
-  const aisdk = yield* Service59;
-  const providers = yield* Service61;
-  const models = yield* Service60;
-  const commands = yield* Service30;
+  const agents = yield* Service70;
+  const aisdk = yield* Service60;
+  const providers = yield* Service77;
+  const models = yield* Service75;
+  const commands = yield* Service51;
   const bus = yield* Service84;
-  const integration = yield* Service77;
+  const integration = yield* Service78;
   const kv = yield* Service76;
-  const mcp = yield* Service22;
+  const mcp = yield* Service40;
   const location = yield* Service81;
-  const reference = yield* Service41;
-  const rpc = yield* Service74;
-  const skill = yield* Service28;
-  const tools = yield* Service47;
-  const vcs = yield* Service38;
+  const reference = yield* Service56;
+  const rpc = yield* Service65;
+  const skill = yield* Service43;
+  const tools = yield* Service54;
+  const vcs = yield* Service24;
   const websearch = yield* Service27;
-  const generate = yield* Service57;
-  const permission = yield* Service69;
-  const hooks = yield* Service72;
-  const sessions = yield* Service14;
-  const persistentPty = yield* Service55;
-  const locations = yield* Service80;
-  const worktrees = yield* Service32;
-  const worktreeStrategies = yield* Service33;
+  const generate = yield* Service25;
+  const permission = yield* Service67;
+  const hooks = yield* Service71;
+  const sessions = yield* Service28;
+  const persistentPty = yield* Service26;
+  const locations = yield* Service66;
+  const worktrees = yield* Service22;
+  const worktreeStrategies = yield* Service23;
   const currentWorktreeStrategies = location.workspaceID ? undefined : worktreeStrategies;
   const locationInfo = () => new Info27({
     directory: location.directory,
@@ -175,15 +176,15 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
   });
   const locationRef = (input) => input?.location === undefined ? undefined : Ref4.make({
     directory: AbsolutePath2.make(input.location.directory ?? location.directory),
-    workspaceID: input.location.workspace === undefined ? location.workspaceID : ID9.make(input.location.workspace)
+    workspaceID: input.location.workspace === undefined ? location.workspaceID : ID7.make(input.location.workspace)
   });
   const isCurrentLocation = (ref) => ref.directory === location.directory && ref.workspaceID === location.workspaceID;
   const response = (effect) => effect.pipe(Effect.map((data) => ({ location: locationInfo(), data })));
-  const decodeWorktree = Schema.decodeUnknownEffect(Info6);
+  const decodeWorktree = Schema.decodeUnknownEffect(Info4);
   const decodeWorktrees = Schema.decodeUnknownEffect(Schema.Array(ListEntry3));
   const listAgents = Effect.fn("PluginHost.listAgents")((ref) => Effect.gen(function* () {
     const location = yield* Service81;
-    const agents = yield* Service73;
+    const agents = yield* Service70;
     return {
       location: new Info27({
         directory: location.directory,
@@ -217,10 +218,10 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       transform: (callback) => agents.transform((editor) => {
         callback({
           list: () => mutable(editor.list()),
-          get: (id) => mutable(editor.get(ID12.make(id))),
-          default: (id) => editor.default(id === undefined ? undefined : ID12.make(id)),
-          update: (id, update) => editor.update(ID12.make(id), update),
-          remove: (id) => editor.remove(ID12.make(id))
+          get: (id) => mutable(editor.get(ID10.make(id))),
+          default: (id) => editor.default(id === undefined ? undefined : ID10.make(id)),
+          update: (id, update) => editor.update(ID10.make(id), update),
+          remove: (id) => editor.remove(ID10.make(id))
         });
       })
     },
@@ -254,22 +255,22 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
     },
     provider: {
       list: () => response(providers.available()),
-      get: (input) => providers.get(ID8.make(input.providerID)).pipe(Effect.flatMap((provider) => provider === undefined ? Effect.fail(new Error(`Provider not found: ${input.providerID}`)) : response(Effect.succeed(provider)))),
+      get: (input) => providers.get(ID13.make(input.providerID)).pipe(Effect.flatMap((provider) => provider === undefined ? Effect.fail(new Error(`Provider not found: ${input.providerID}`)) : response(Effect.succeed(provider)))),
       reload: providers.reload,
       transform: (callback) => providers.transform((editor) => {
         callback({
           list: editor.list,
-          get: (id) => editor.get(ID8.make(id)),
+          get: (id) => editor.get(ID13.make(id)),
           add: (definition) => editor.add({
             ...definition,
             sourceConnection: definition.sourceConnection?.type === "credential" ? { ...definition.sourceConnection, id: ID15.make(definition.sourceConnection.id) } : definition.sourceConnection
           }),
-          update: (id, update) => editor.update(ID8.make(id), update),
-          remove: (id) => editor.remove(ID8.make(id)),
+          update: (id, update) => editor.update(ID13.make(id), update),
+          remove: (id) => editor.remove(ID13.make(id)),
           models: {
-            set: (id, models) => editor.models.set(ID8.make(id), models),
-            update: (providerID, modelID, update) => editor.models.update(ID8.make(providerID), ID7.make(modelID), update),
-            remove: (providerID, modelID) => editor.models.remove(ID8.make(providerID), ID7.make(modelID))
+            set: (id, models) => editor.models.set(ID13.make(id), models),
+            update: (providerID, modelID, update) => editor.models.update(ID13.make(providerID), ID12.make(modelID), update),
+            remove: (providerID, modelID) => editor.models.remove(ID13.make(providerID), ID12.make(modelID))
           }
         });
       })
@@ -279,17 +280,17 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       default: () => response(models.default()),
       reload: models.reload,
       transform: (callback) => models.transform((editor) => callback({
-        list: (providerID) => editor.list(providerID === undefined ? undefined : ID8.make(providerID)),
-        get: (providerID, modelID) => editor.get(ID8.make(providerID), ID7.make(modelID)),
-        update: (providerID, modelID, update) => editor.update(ID8.make(providerID), ID7.make(modelID), update),
-        remove: (providerID, modelID) => editor.remove(ID8.make(providerID), ID7.make(modelID)),
+        list: (providerID) => editor.list(providerID === undefined ? undefined : ID13.make(providerID)),
+        get: (providerID, modelID) => editor.get(ID13.make(providerID), ID12.make(modelID)),
+        update: (providerID, modelID, update) => editor.update(ID13.make(providerID), ID12.make(modelID), update),
+        remove: (providerID, modelID) => editor.remove(ID13.make(providerID), ID12.make(modelID)),
         default: {
           get: editor.default.get,
-          set: (providerID, modelID) => editor.default.set(ID8.make(providerID), ID7.make(modelID))
+          set: (providerID, modelID) => editor.default.set(ID13.make(providerID), ID12.make(modelID))
         },
         provider: {
           list: editor.provider.list,
-          get: (id) => editor.provider.get(ID8.make(id))
+          get: (id) => editor.provider.get(ID13.make(id))
         }
       }))
     },
@@ -298,6 +299,9 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       reload: commands.reload,
       transform: commands.transform
     },
+    credential: {
+      activate: (input) => integration.connection.activate(input.credentialID)
+    },
     event: {
       subscribe: () => bus.subscribe().pipe(Stream.filter((event) => EventManifest.isServer(event) || isRpcEvent(event)))
     },
@@ -397,7 +401,7 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
         if (ref && !isCurrentLocation(ref))
           return Effect.gen(function* () {
             const location = yield* Service81;
-            const mcp = yield* Service22;
+            const mcp = yield* Service40;
             return {
               location: new Info27({
                 directory: location.directory,
@@ -424,7 +428,12 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       hook: (name, callback) => hooks.register("permission", name, callback),
       list: (input) => permission.forSession(input.sessionID),
       get: (input) => permission.get(input.requestID).pipe(Effect.flatMap((request) => request?.sessionID === input.sessionID ? Effect.succeed(request) : Effect.fail(new Error(`Permission request not found: ${input.requestID}`)))),
-      reply: (input) => permission.get(input.requestID).pipe(Effect.flatMap((request) => request?.sessionID === input.sessionID ? permission.reply({ requestID: input.requestID, reply: input.decision, message: input.message }) : Effect.fail(new Error(`Permission request not found: ${input.requestID}`))))
+      reply: (input) => permission.get(input.requestID).pipe(Effect.flatMap((request) => request?.sessionID === input.sessionID ? permission.reply({ requestID: input.requestID, reply: input.decision, message: input.message }) : Effect.fail(new Error(`Permission request not found: ${input.requestID}`)))),
+      assert: (input) => permission.assert(input).pipe(Effect.catchTags({
+        "Permission.BlockedError": (error) => Effect.fail(new Error4({ message: error.message, error })),
+        "Permission.CorrectedError": (error) => Effect.fail(new Error4({ message: error.feedback, error })),
+        "Session.NotFoundError": (error) => Effect.fail(new Error4({ message: `Session not found: ${error.sessionID}`, error }))
+      }))
     },
     plugin: {
       list: () => response(plugin.list())
@@ -448,7 +457,7 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
         callback({
           list: () => mutable(editor.list()),
           get: editor.get,
-          add: (value) => editor.add(Schema.decodeUnknownSync(Info4)(value)),
+          add: (value) => editor.add(Schema.decodeUnknownSync(Info7)(value)),
           update: editor.update,
           remove: editor.remove
         });
@@ -479,19 +488,19 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       providers: () => response(websearch.providers()),
       query: (input) => response(websearch.query({
         query: input.query,
-        providerID: input.providerID === undefined ? undefined : ID3.make(input.providerID)
+        providerID: input.providerID === undefined ? undefined : ID4.make(input.providerID)
       })),
       reload: websearch.reload,
       transform: (callback) => websearch.transform((editor) => {
         callback({
           add: (definition) => editor.add({
-            id: ID3.make(definition.id),
+            id: ID4.make(definition.id),
             name: definition.name,
             execute: definition.execute
           }),
           default: {
             get: editor.default.get,
-            set: (selection) => editor.default.set(selection === false || selection === "random" ? selection : ID3.make(selection))
+            set: (selection) => editor.default.set(selection === false || selection === "random" ? selection : ID4.make(selection))
           }
         });
       })
@@ -551,31 +560,31 @@ var make11 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
   return context;
 });
 var requirements3 = LayerNode.group([
-  node43,
-  node77,
-  node62,
+  node58,
+  node74,
   node64,
-  node63,
-  node33,
-  node88,
   node81,
+  node79,
+  node53,
+  node88,
+  node82,
   node80,
-  node25,
+  node43,
   node85,
-  node45,
-  node78,
-  node31,
-  node51,
-  node41,
+  node59,
+  node69,
+  node46,
+  node56,
+  node27,
   node30,
-  node35,
-  node36,
-  node60,
-  node73,
-  node76,
-  node17,
-  node58,
-  node84
+  node25,
+  node26,
+  node28,
+  node71,
+  node75,
+  node31,
+  node29,
+  node70
 ]);
 function storage2(kv, pluginID) {
   const namespace = `plugin:${pluginID.split("").map((value) => value.charCodeAt(0).toString(16).padStart(4, "0")).join("")}:`;

package/dist/chunks/websearch-a4h58p2q.js

@@ -0,0 +1,102 @@
+import {
+  AbsolutePath2
+} from "./websearch-z5v4ffb3.js";
+import {
+  Service81
+} from "./websearch-1p799z25.js";
+import {
+  __export
+} from "./websearch-9rqn6x4v.js";
+
+// src/config/discovery.ts
+var exports_discovery2 = {};
+__export(exports_discovery2, {
+  ConfigDiscovery: () => exports_discovery2,
+  discover: () => discover3,
+  names: () => names4,
+  preferencePaths: () => preferencePaths2,
+  stripPreferenceMetadata: () => stripPreferenceMetadata2,
+  systemDirectory: () => systemDirectory2
+});
+import os from "os";
+import path from "path";
+import { Effect } from "effect";
+import { FSUtil } from "@opencode/util/fs-util";
+import { Global } from "@opencode/util/global";
+var names4 = ["opencode.json", "opencode.jsonc"];
+function systemDirectory2(platform = process.platform, env = process.env) {
+  if (platform === "darwin")
+    return AbsolutePath2.make("/Library/Application Support/opencode");
+  if (platform === "win32")
+    return AbsolutePath2.make(path.join(env.ProgramData || "C:\\ProgramData", "opencode"));
+  return AbsolutePath2.make("/etc/opencode");
+}
+function preferencePaths2(user) {
+  return [
+    AbsolutePath2.make(path.join("/Library/Managed Preferences", user, "ai.opencode.managed.plist")),
+    AbsolutePath2.make("/Library/Managed Preferences/ai.opencode.managed.plist")
+  ];
+}
+var preferenceMetadata = new Set([
+  "PayloadDisplayName",
+  "PayloadIdentifier",
+  "PayloadType",
+  "PayloadUUID",
+  "PayloadVersion",
+  "_manualProfile"
+]);
+function stripPreferenceMetadata2(json) {
+  const parsed = JSON.parse(json);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+    return json;
+  return JSON.stringify(Object.fromEntries(Object.entries(parsed).filter(([key]) => !preferenceMetadata.has(key))));
+}
+var discover3 = Effect.fn("ConfigDiscovery.discover")(function* (options) {
+  const fs = yield* FSUtil.Service;
+  const global = yield* Global.Service;
+  const location = yield* Service81;
+  const system = (() => {
+    if (options?.system === false)
+      return;
+    if (typeof options?.system === "string")
+      return AbsolutePath2.make(path.resolve(options.system));
+    return systemDirectory2();
+  })();
+  const globalDirectory = AbsolutePath2.make(global.config);
+  const globalAgentsDirectory = AbsolutePath2.make(path.join(global.home, ".agents"));
+  const globalClaudeDirectory = AbsolutePath2.make(path.join(global.home, ".claude"));
+  const configDirectories = [...system ? [system] : [], globalDirectory];
+  const globalRoots = yield* Effect.forEach([...configDirectories, globalClaudeDirectory, globalAgentsDirectory], (item) => fs.resolve(item));
+  const current = yield* fs.resolve(location.directory);
+  const directories = globalRoots.slice(0, configDirectories.length).includes(current) || options?.project === false ? [] : yield* fs.up({ targets: ["."], start: location.directory }).pipe(Effect.orDie);
+  const discovered = yield* Effect.forEach(directories, (directory) => Effect.gen(function* () {
+    const parent = yield* fs.resolve(directory);
+    return yield* Effect.forEach([".claude", ".agents", ".opencode", ...names4.toReversed()], (name) => fs.resolve(path.join(parent, name)).pipe(Effect.map((resolved) => ({ item: AbsolutePath2.make(path.join(directory, name)), resolved }))));
+  })).pipe(Effect.map((items) => items.flat()), Effect.orDie);
+  const globalEnabled = options?.global !== false;
+  const globalFiles = yield* Effect.forEach(configDirectories.flatMap((directory) => names4.map((name) => path.join(directory, name))), (file) => fs.resolve(file));
+  const visible = discovered.filter(({ resolved }) => globalEnabled ? !globalRoots.includes(resolved) && !globalFiles.includes(resolved) : !globalRoots.some((root) => resolved === root || resolved.startsWith(root + path.sep))).map(({ item }) => item);
+  const preferences = globalEnabled && (options?.system ?? true) === true && process.platform === "darwin" ? (yield* Effect.filter(preferencePaths2(yield* Effect.try(() => os.userInfo().username).pipe(Effect.orElseSucceed(() => "user"))), fs.isFile)).at(0) : undefined;
+  return {
+    system: globalEnabled && system ? { path: system, present: yield* fs.isDir(system) } : undefined,
+    preferences,
+    global: globalEnabled ? globalDirectory : undefined,
+    explicit: options?.file ? AbsolutePath2.make(path.resolve(options.file)) : undefined,
+    direct: visible.filter((item) => ![".agents", ".claude", ".opencode"].includes(path.basename(item))).toReversed(),
+    project: yield* Effect.forEach(visible.filter((item) => path.basename(item) === ".opencode").toReversed(), (directory) => fs.isDir(directory).pipe(Effect.map((present) => ({ path: directory, present })))),
+    claude: [
+      ...new Set([
+        ...globalEnabled ? [globalClaudeDirectory] : [],
+        ...visible.filter((item) => path.basename(item) === ".claude").toReversed()
+      ])
+    ],
+    agents: [
+      ...new Set([
+        ...globalEnabled ? [globalAgentsDirectory] : [],
+        ...visible.filter((item) => path.basename(item) === ".agents").toReversed()
+      ])
+    ]
+  };
+});
+
+export { names4, systemDirectory2, preferencePaths2, stripPreferenceMetadata2, discover3, exports_discovery2 };

package/dist/chunks/{filesystem-yj5krche.js → websearch-a73a6c6h.js}

@@ -1,32 +1,32 @@
 import {
   Service84
-} from "./filesystem-vdfrtany.js";
+} from "./websearch-g5x1q65a.js";
 import {
   key2
-} from "./filesystem-addxnjmp.js";
+} from "./websearch-addxnjmp.js";
 import {
   Event19
-} from "./filesystem-x5s67ttw.js";
+} from "./websearch-30n06459.js";
 import {
   ID14
-} from "./filesystem-h0s8229g.js";
+} from "./websearch-5hft8km6.js";
 import {
-  ID8,
-  Service61
-} from "./filesystem-zxe4qb9c.js";
+  ID13,
+  Service77
+} from "./websearch-caa8k32f.js";
 import {
-  load3,
-  derive3
-} from "./filesystem-cp3h7zv6.js";
+  load2,
+  derive2
+} from "./websearch-phepkm1d.js";
 
 // src/plugin/provider/modal.ts
 import { Effect, Semaphore, Stream } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
-var providerID = ID8.make("modal");
+var providerID = ID13.make("modal");
 var ModalPlugin2 = define({
   id: "opencode.provider.modal",
   effect: Effect.fn(function* (ctx) {
-    const providers = yield* Service61;
+    const providers = yield* Service77;
     const bus = yield* Service84;
     const loading = Semaphore.makeUnsafe(1);
     const loaded = {};
@@ -45,7 +45,7 @@ var ModalPlugin2 = define({
         return;
       }
       const remote = yield* Effect.tryPromise({
-        try: () => load3(baseURL, apiKey),
+        try: () => load2(baseURL, apiKey),
         catch: (cause) => cause
       }).pipe(Effect.catch((cause) => Effect.logWarning("failed to sync Modal models", { cause }).pipe(Effect.as(undefined))));
       if (key2(connection) !== key2(yield* ctx.integration.connection.active("modal")))
@@ -62,7 +62,7 @@ var ModalPlugin2 = define({
         return;
       evt.add({
         info: item.provider,
-        models: Array.from(derive3(loaded.baseURL, loaded.models, Array.from(item.models.values())).values()),
+        models: Array.from(derive2(loaded.baseURL, loaded.models, Array.from(item.models.values())).values()),
         sourceConnection: loaded.connection
       });
     });