@opencode-ai/core 0.0.0-beta-18985 → 0.0.0-beta-18999

package/dist/chunks/{bus-38jrhbbw.js → model-resolver-yt21b5ce.js}

@@ -1,30 +1,36 @@
+import {
+  exports_watcher
+} from "./model-resolver-v9qxqszp.js";
+import {
+  exports_discovery
+} from "./model-resolver-vsqc2j7q.js";
 import {
   exports_variable
-} from "./bus-6vbv4je1.js";
+} from "./model-resolver-6vbv4je1.js";
 import {
-  exports_normalize
-} from "./bus-r670sqm5.js";
+  exports_watch
+} from "./model-resolver-t9t544b9.js";
 import {
-  exports_watcher
-} from "./bus-aqq7me5d.js";
+  exports_normalize
+} from "./model-resolver-njadyfry.js";
 import {
   exports_wellknown
-} from "./bus-pr7p5gdp.js";
-import {
-  exports_credential
-} from "./bus-32fc3eer.js";
+} from "./model-resolver-aqjetpt7.js";
 import {
   exports_location
-} from "./bus-0fhc0xf7.js";
-import {
-  exports_bus
-} from "./bus-sxwqt151.js";
+} from "./model-resolver-vbaqktrz.js";
 import {
   AbsolutePath
-} from "./bus-j07kk359.js";
+} from "./model-resolver-j07kk359.js";
+import {
+  exports_credential
+} from "./model-resolver-pmxa1kd1.js";
+import {
+  exports_bus
+} from "./model-resolver-b2mj9w79.js";
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/config.ts
 var exports_config = {};
@@ -43,7 +49,7 @@ import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import path from "path";
 import { isDeepStrictEqual } from "node:util";
 import { parse } from "jsonc-parser";
-import { Context, Effect, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect";
+import { Context, Effect, FiberMap, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect";
 import {
   AgentsDirectory,
   ClaudeDirectory,
@@ -82,15 +88,12 @@ var testLayer = (initial = []) => Layer.effectContext(Effect.gen(function* () {
 }));
 var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const global = yield* Global.Service;
   const location = yield* exports_location.Service;
   const watcher = yield* exports_watcher.Service;
   const bus = yield* exports_bus.Service;
   const credentials = yield* exports_credential.Service;
   const wellknown = yield* exports_wellknown.Service;
-  const names = ["opencode.json", "opencode.jsonc"];
   const reloadLock = Semaphore.makeUnsafe(1);
-  const fileTargets = new Set;
   const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" };
   const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions);
   const parseInfo = Effect.fn("Config.parseInfo")(function* (text, source) {
@@ -157,56 +160,25 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   });
   const loadDirectory = Effect.fnUntraced(function* (directory) {
     return [
-      ...yield* Effect.forEach(names, (file) => loadFile(path.join(directory, file))).pipe(Effect.map((configs2) => configs2.filter((config) => config !== undefined))),
+      ...yield* Effect.forEach(exports_discovery.names, (file) => loadFile(path.join(directory, file))).pipe(Effect.map((configs2) => configs2.filter((config) => config !== undefined))),
       new Directory({ type: "directory", path: directory })
     ];
   });
-  const discover = Effect.fn("Config.discover")(function* () {
-    const globalDirectory = AbsolutePath.make(global.config);
-    const globalAgentsDirectory = AbsolutePath.make(path.join(global.home, ".agents"));
-    const globalClaudeDirectory = AbsolutePath.make(path.join(global.home, ".claude"));
-    const globalRoots = yield* Effect.forEach([globalDirectory, globalClaudeDirectory, globalAgentsDirectory], (item) => fs.resolve(item));
-    const locationIsGlobal = (yield* fs.resolve(location.directory)) === globalRoots[0];
-    const discovered = locationIsGlobal || options?.project === false ? [] : yield* fs.up({
-      targets: [".opencode", ".claude", ".agents", ...names.toReversed()],
-      start: location.directory
-    }).pipe(Effect.flatMap((items) => Effect.forEach(items, (item) => fs.resolve(item).pipe(Effect.map((resolved) => ({ item, resolved }))))), Effect.orDie);
-    const globalEnabled = options?.global !== false;
-    const globalFiles = yield* Effect.forEach(names, (name) => fs.resolve(path.join(globalDirectory, name)));
-    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 claude = [
-      ...new Set([
-        ...globalEnabled && (yield* fs.isDir(globalClaudeDirectory)) ? [globalClaudeDirectory] : [],
-        ...visible.filter((item) => path.basename(item) === ".claude").toReversed()
-      ])
-    ].map((directory) => new ClaudeDirectory({ type: "claude", path: AbsolutePath.make(directory) }));
-    const agents = [
-      ...new Set([
-        ...globalEnabled && (yield* fs.isDir(globalAgentsDirectory)) ? [globalAgentsDirectory] : [],
-        ...visible.filter((item) => path.basename(item) === ".agents").toReversed()
-      ])
-    ].map((directory) => new AgentsDirectory({ type: "agents", path: AbsolutePath.make(directory) }));
-    const projectDirectories = visible.filter((item) => path.basename(item) === ".opencode").toReversed().map((directory) => AbsolutePath.make(directory));
-    const directPaths = visible.filter((item) => ![".agents", ".claude", ".opencode"].includes(path.basename(item))).toReversed();
-    fileTargets.clear();
-    directPaths.forEach((filepath) => fileTargets.add(AbsolutePath.make(filepath)));
-    const direct = yield* Effect.forEach(directPaths, (filepath) => loadFile(filepath)).pipe(Effect.orDie, Effect.map((entries) => entries.filter((entry) => entry !== undefined)));
-    const file = options?.file;
-    if (file)
-      fileTargets.add(AbsolutePath.make(path.resolve(file)));
-    const explicit = file ? yield* loadFile(path.resolve(file)).pipe(Effect.map((config) => config ? [config] : []), Effect.orDie) : [];
+  const load = Effect.fn("Config.load")(function* (sources) {
+    const direct = yield* Effect.forEach(sources.direct, (filepath) => loadFile(filepath)).pipe(Effect.orDie, Effect.map((entries) => entries.filter((entry) => entry !== undefined)));
+    const explicit = sources.explicit ? yield* loadFile(sources.explicit).pipe(Effect.map((config) => config ? [config] : []), Effect.orDie) : [];
     const content = options?.content !== undefined ? yield* exports_variable.substitute({
       type: "virtual",
       source: "OPENCODE_CONFIG_CONTENT",
       dir: location.directory,
       text: options.content
     }).pipe(Effect.flatMap((text) => parseInfo(text, "OPENCODE_CONFIG_CONTENT")), Effect.map((info) => info ? [new Document({ type: "document", info })] : []), Effect.orDie) : [];
-    const globalSupplementary = globalEnabled ? yield* loadDirectory(globalDirectory).pipe(Effect.orDie) : [];
-    const projectSupplementary = yield* Effect.forEach(projectDirectories, loadDirectory).pipe(Effect.orDie, Effect.map((entries) => entries.flat()));
+    const globalSupplementary = sources.global ? yield* loadDirectory(sources.global).pipe(Effect.orDie) : [];
+    const projectSupplementary = yield* Effect.forEach(sources.project.filter((root) => root.present), (root) => loadDirectory(root.path)).pipe(Effect.orDie, Effect.map((entries) => entries.flat()));
     return [
       ...yield* loadWellknown().pipe(Effect.orDie),
-      ...claude,
-      ...agents,
+      ...sources.claude.map((path2) => new ClaudeDirectory({ type: "claude", path: path2 })),
+      ...sources.agents.map((path2) => new AgentsDirectory({ type: "agents", path: path2 })),
       ...globalSupplementary,
       ...explicit,
       ...direct,
@@ -214,39 +186,33 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       ...content
     ];
   });
-  const initial = yield* discover();
-  let configs = initial;
+  const initial = yield* exports_discovery.discover(options);
+  let configs = yield* load(initial);
   const updates = yield* PubSub.unbounded();
-  const ignore = ["node_modules", ".git", "**/{node_modules,.git}/**"];
-  const watched = new Set;
-  const reconcile = Effect.fn("Config.reconcileWatches")(function* (entries) {
-    const directories = entries.flatMap((entry) => entry.type === "directory" ? [entry.path] : []);
-    const files = [
-      ...entries.flatMap((entry) => entry.type === "document" && entry.path ? [entry.path] : []),
-      ...fileTargets
-    ];
-    const targets = [
-      ...directories.map((path2) => ({ path: path2, type: "directory", ignore })),
-      ...files.filter((file) => !directories.some((directory) => FSUtil.contains(directory, file))).map((path2) => ({ path: path2, type: "file" }))
-    ];
-    for (const target of targets) {
-      const key = JSON.stringify(target);
-      if (watched.has(key))
-        continue;
-      watched.add(key);
-      const stream = yield* watcher.subscribe(target);
-      yield* stream.pipe(Stream.runForEach((update) => PubSub.publish(updates, update)), Effect.forkScoped({ startImmediately: true }));
+  const reloads = yield* PubSub.sliding(1);
+  const requestReload = PubSub.publish(reloads, undefined).pipe(Effect.asVoid);
+  const watched = yield* FiberMap.make();
+  const reconcile = Effect.fn("Config.reconcileWatches")(function* (sources) {
+    const plan = exports_watch.plan(sources);
+    for (const key of Array.from(watched, ([key2]) => key2)) {
+      if (!plan.has(key))
+        yield* FiberMap.remove(watched, key);
+    }
+    for (const [key, target] of plan) {
+      yield* watcher.subscribe(target, requestReload).pipe(Effect.flatMap(Stream.runForEach((update) => PubSub.publish(updates, update).pipe(Effect.andThen(requestReload)))), FiberMap.run(watched, key, { onlyIfMissing: true, startImmediately: true }));
     }
   });
   const reload = Effect.fn("Config.reload")(function* () {
-    const next = yield* discover();
-    yield* reconcile(next);
+    const sources = yield* exports_discovery.discover(options);
+    const next = yield* load(sources);
+    yield* reconcile(sources);
     if (isDeepStrictEqual(configs, next))
       return;
     configs = next;
     yield* bus.publish(Event.Updated, {});
   }, (effect) => reloadLock.withPermit(effect));
-  yield* Stream.fromPubSub(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach((update) => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { path: update.path, cause })))), Effect.forkScoped({ startImmediately: true }));
+  const pendingReloads = yield* PubSub.subscribe(reloads);
+  yield* Stream.fromSubscription(pendingReloads).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* bus.subscribe(exports_credential.Event.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* bus.subscribe(exports_wellknown.Event.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* Effect.sleep("10 minutes").pipe(Effect.andThen(Effect.suspend(() => {
@@ -258,7 +224,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         yield* reload();
     }).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to refresh wellknown config", { cause })));
   })), Effect.forever, Effect.forkScoped({ startImmediately: true }));
-  yield* reconcile(initial);
+  yield* reloadLock.withPermit(reconcile(initial));
   return Service.of({
     entries: Effect.fnUntraced(function* () {
       return configs;

package/dist/chunks/{bus-h79t5qqp.js → model-resolver-yxwnec9y.js}

@@ -1,21 +1,21 @@
 import {
-  convertToOpenAICompatibleChatMessages
-} from "./bus-brsh5f65.js";
+  prepareTools
+} from "./model-resolver-ezs3tagn.js";
 import {
   openaiCompatibleProviderOptions
-} from "./bus-a02svayp.js";
+} from "./model-resolver-a02svayp.js";
+import {
+  convertToOpenAICompatibleChatMessages
+} from "./model-resolver-brsh5f65.js";
 import {
   mapOpenAICompatibleFinishReason
-} from "./bus-0cgt0xh2.js";
+} from "./model-resolver-0cgt0xh2.js";
 import {
   getResponseMetadata
-} from "./bus-bbqs2y60.js";
-import {
-  prepareTools
-} from "./bus-ezs3tagn.js";
+} from "./model-resolver-bbqs2y60.js";
 import {
   defaultOpenAICompatibleErrorStructure
-} from "./bus-1wcz8fvj.js";
+} from "./model-resolver-1wcz8fvj.js";
 
 // src/github-copilot/chat/openai-compatible-chat-language-model.ts
 import {

package/dist/chunks/{bus-pjvbc90q.js → model-resolver-z50wtwd6.js}

@@ -1,63 +1,63 @@
 import {
   exports_instructions as exports_instructions3
-} from "./bus-pk4ewrrh.js";
+} from "./model-resolver-895xgr1f.js";
 import {
   exports_instructions as exports_instructions2
-} from "./bus-136c8mz3.js";
-import {
-  exports_builtins
-} from "./bus-24cmgfns.js";
-import {
-  exports_instructions as exports_instructions4
-} from "./bus-5c3dahjh.js";
+} from "./model-resolver-136c8mz3.js";
 import {
   exports_instructions as exports_instructions5
-} from "./bus-4c3c87f8.js";
+} from "./model-resolver-eptw9fc8.js";
 import {
-  exports_instruction_entry
-} from "./bus-24tjmdvb.js";
+  exports_builtins
+} from "./model-resolver-m0zebzgf.js";
+import {
+  exports_mcp
+} from "./model-resolver-50zp5qas.js";
 import {
   exports_model_request
-} from "./bus-xh5s9db9.js";
+} from "./model-resolver-ryxrw20d.js";
 import {
   exports_model
-} from "./bus-8qbh3htc.js";
+} from "./model-resolver-se5h029t.js";
 import {
-  exports_mcp
-} from "./bus-k8qag8st.js";
+  exports_instruction_entry
+} from "./model-resolver-7ke4vm17.js";
+import {
+  exports_instructions as exports_instructions4
+} from "./model-resolver-psa1vmjb.js";
 import {
   exports_instruction_discovery
-} from "./bus-zsm32t6f.js";
+} from "./model-resolver-qjkhdsbm.js";
 import {
   exports_tool
-} from "./bus-n4ht9m54.js";
+} from "./model-resolver-egjtzeas.js";
 import {
   exports_store
-} from "./bus-mjrdwwg1.js";
+} from "./model-resolver-wz5907jr.js";
 import {
   exports_history
-} from "./bus-8e14rd69.js";
+} from "./model-resolver-ax34jjm3.js";
 import {
   AgentNotFoundError
-} from "./bus-2sqw2jjm.js";
-import {
-  exports_agent
-} from "./bus-hqmmy6j3.js";
+} from "./model-resolver-2sqw2jjm.js";
 import {
   exports_instructions
-} from "./bus-c54e84vp.js";
+} from "./model-resolver-c54e84vp.js";
 import {
-  exports_catalog
-} from "./bus-er3ecgf9.js";
+  exports_agent
+} from "./model-resolver-jsmyr6k0.js";
 import {
   exports_location
-} from "./bus-0fhc0xf7.js";
+} from "./model-resolver-vbaqktrz.js";
+import {
+  exports_catalog
+} from "./model-resolver-4fhh1fay.js";
 import {
   exports_database
-} from "./bus-0gmpy2nr.js";
+} from "./model-resolver-tn3vtv4h.js";
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/session/context.ts
 var exports_context = {};

package/dist/chunks/{bus-7979e7qr.js → model-resolver-z5qwd455.js}

@@ -1,9 +1,9 @@
 import {
   exports_config
-} from "./bus-38jrhbbw.js";
+} from "./model-resolver-yt21b5ce.js";
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/plugin/warming.ts
 var exports_warming = {};

package/dist/chunks/{bus-z8c1ty6e.js → model-resolver-z8c1ty6e.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/util/token.ts
 var exports_token = {};

package/dist/chunks/{bus-zbqqnp0n.js → model-resolver-zbqqnp0n.js}

@@ -1,6 +1,6 @@
 import {
   AbsolutePath
-} from "./bus-j07kk359.js";
+} from "./model-resolver-j07kk359.js";
 
 // src/database/path.ts
 import nodePath from "path";

package/dist/chunks/{bus-ar26s8t3.js → model-resolver-zfc8v838.js}

@@ -1,9 +1,9 @@
 import {
   exports_instance
-} from "./bus-cxzqns4k.js";
+} from "./model-resolver-7qpdgm16.js";
 import {
   exports_location_service_map
-} from "./bus-jx69v2zk.js";
+} from "./model-resolver-y6z22yy0.js";
 
 // src/location-services.ts
 import { Duration, Effect, Layer, LayerMap } from "effect";

package/dist/chunks/{bus-zmbmd7xf.js → model-resolver-zmbmd7xf.js}

@@ -1,9 +1,9 @@
 import {
   loadSDKFactory
-} from "./bus-snpn6bap.js";
+} from "./model-resolver-snpn6bap.js";
 import {
   exports_provider
-} from "./bus-68yag814.js";
+} from "./model-resolver-68yag814.js";
 
 // src/plugin/provider/sap-ai-core.ts
 import { Effect } from "effect";

package/dist/chunks/{bus-zn935gjz.js → model-resolver-zn935gjz.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/session/environment.ts
 var exports_environment = {};

package/dist/chunks/{bus-zseh86v1.js → model-resolver-zseh86v1.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./bus-68yag814.js";
+} from "./model-resolver-68yag814.js";
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/plugin/variant.ts
 var exports_variant = {};

package/dist/chunks/{bus-5m28scbt.js → model-resolver-zt42x7wk.js}

@@ -1,15 +1,15 @@
 import {
   exports_integration
-} from "./bus-cf85wa46.js";
+} from "./model-resolver-158s554p.js";
+import {
+  exports_provider
+} from "./model-resolver-68yag814.js";
 import {
   exports_credential
-} from "./bus-32fc3eer.js";
+} from "./model-resolver-pmxa1kd1.js";
 import {
   exports_bus
-} from "./bus-sxwqt151.js";
-import {
-  exports_provider
-} from "./bus-68yag814.js";
+} from "./model-resolver-b2mj9w79.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Schema, Semaphore, Stream } from "effect";

package/dist/chunks/{bus-zyyhrfr9.js → model-resolver-zyyhrfr9.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/workspace/driver.ts
 var exports_driver = {};

package/dist/chunks/{bus-px0vn80d.js → model-resolver-zz8p0qp8.js}

@@ -3,15 +3,15 @@ import {
   EffectSQLiteDatabase,
   make,
   makeWithDefaults
-} from "./bus-cr4vrvnn.js";
+} from "./model-resolver-dc1577g0.js";
 import {
   EffectSQLiteSession,
   EffectSQLiteTransaction,
   managesTransactionsNatively
-} from "./bus-cjdmz35s.js";
+} from "./model-resolver-7fndj6sb.js";
 import {
   __export
-} from "./bus-vpjkya7h.js";
+} from "./model-resolver-vpjkya7h.js";
 
 // src/database/drizzle/index.ts
 var exports_drizzle = {};

package/dist/codemode/catalog.js

@@ -4,8 +4,8 @@ import {
   exports_catalog,
   namespaceLine,
   summarize
-} from "../chunks/bus-rr7wbarq.js";
-import"../chunks/bus-vpjkya7h.js";
+} from "../chunks/model-resolver-rr7wbarq.js";
+import"../chunks/model-resolver-vpjkya7h.js";
 export {
   exports_catalog as CodeModeCatalog,
   Summary,

package/dist/codemode/instructions.js

@@ -3,10 +3,10 @@ import {
   make,
   render,
   update
-} from "../chunks/bus-136c8mz3.js";
-import"../chunks/bus-rr7wbarq.js";
-import"../chunks/bus-c54e84vp.js";
-import"../chunks/bus-vpjkya7h.js";
+} from "../chunks/model-resolver-136c8mz3.js";
+import"../chunks/model-resolver-rr7wbarq.js";
+import"../chunks/model-resolver-c54e84vp.js";
+import"../chunks/model-resolver-vpjkya7h.js";
 export {
   exports_instructions as CodeModeInstructions,
   make,

package/dist/codemode/tool.js

@@ -2,10 +2,10 @@ import {
   catalog,
   create,
   exports_tool
-} from "../chunks/bus-0gpahtwn.js";
-import"../chunks/bus-rr7wbarq.js";
-import"../chunks/bus-f1jj19e8.js";
-import"../chunks/bus-vpjkya7h.js";
+} from "../chunks/model-resolver-0gpahtwn.js";
+import"../chunks/model-resolver-rr7wbarq.js";
+import"../chunks/model-resolver-f1jj19e8.js";
+import"../chunks/model-resolver-vpjkya7h.js";
 export {
   exports_tool as CodeModeTool,
   catalog,