@opencode-ai/core 0.0.0-beta-18311 → 0.0.0-beta-18371

package/dist/chunks/{job-x409j943.js → model-resolver-ad93zf3w.js}

@@ -1,21 +1,21 @@
-import {
-  exports_runtime
-} from "./job-yjbbj1k8.js";
 import {
   exports_config
-} from "./job-t0wrnah1.js";
+} from "./model-resolver-n6kt309t.js";
+import {
+  exports_runtime
+} from "./model-resolver-q1z6zb5q.js";
 import {
   exports_permission
-} from "./job-0b3sj2cr.js";
+} from "./model-resolver-zr9p7tag.js";
 import {
   exports_agent
-} from "./job-2vjv0cws.js";
+} from "./model-resolver-1c7r7zzs.js";
 import {
   SessionSchema
-} from "./job-bjwj8hwv.js";
+} from "./model-resolver-bjwj8hwv.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/tool/plugin/subagent.ts
 var exports_subagent = {};
@@ -83,30 +83,28 @@ var Plugin = {
       const text = assistant.content.filter((part) => part.type === "text").map((part) => part.text).join("");
       return text.length > 0 ? text : NO_TEXT;
     });
-    const injectCompletion = Effect.fn("SubagentTool.injectCompletion")(function* (parentID, childID, agent, description2, state, text) {
-      yield* runtime.session.synthetic({
-        sessionID: parentID,
-        text: `<subagent sessionID="${childID}" state="${state}" description="${description2}">
-${text}
-</subagent>`,
-        description: description2,
-        metadata: { source: "subagent", childID, agent, state }
-      });
-    });
     const notifyWhenDone = Effect.fn("SubagentTool.notifyWhenDone")(function* (parentID, childID, agent, description2, startedAt) {
       const key = `${childID}:${startedAt}`;
       if (notifications.has(key))
         return;
       notifications.add(key);
-      yield* runtime.job.wait({ id: childID }).pipe(Effect.flatMap((result) => {
-        if (result.info?.status === "completed")
-          return injectCompletion(parentID, childID, agent, description2, "completed", result.info.output ?? NO_TEXT);
-        if (result.info?.status === "error")
-          return injectCompletion(parentID, childID, agent, description2, "error", result.info.error ?? "Subagent failed");
-        if (result.info?.status === "cancelled")
-          return injectCompletion(parentID, childID, agent, description2, "cancelled", "Subagent cancelled");
-        return Effect.void;
-      }), Effect.ensuring(Effect.sync(() => notifications.delete(key))), Effect.forkIn(scope, { startImmediately: true }));
+      yield* Effect.gen(function* () {
+        const info = (yield* runtime.job.wait({ id: childID })).info;
+        if (!info || info.status === "running")
+          return;
+        const text = info.status === "completed" ? info.output ?? NO_TEXT : info.status === "error" ? info.error ?? "Subagent failed" : "Subagent cancelled";
+        yield* runtime.session.synthetic({
+          ...info.notificationID ? { id: info.notificationID } : {},
+          sessionID: parentID,
+          text: `<subagent sessionID="${childID}" state="${info.status}" description="${description2}">
+${text}
+</subagent>`,
+          description: description2,
+          metadata: { source: "subagent", childID, agent, state: info.status }
+        });
+        if (info.notificationID)
+          yield* runtime.job.completeBackground(info.notificationID);
+      }).pipe(Effect.ensuring(Effect.sync(() => notifications.delete(key))), Effect.forkIn(scope, { startImmediately: true }));
     });
     yield* ctx.tool.transform((draft) => draft.add({
       name,
@@ -164,18 +162,22 @@ ${text}
         yield* runtime.session.prompt({
           sessionID: child.id,
           text: existing === undefined ? ["You are a subagent spawned by another session.", input.prompt].join(`
-`) : input.prompt
+`) : input.prompt,
+          ...background && existing === undefined ? { resume: false } : {}
         }).pipe(Effect.mapError((error) => new ToolFailure({ message: `Failed to prompt subagent: ${child.id}`, error })));
-        const run = Effect.gen(function* () {
-          yield* runtime.session.resume(child.id);
-          return yield* latestAssistantText(child.id);
-        }).pipe(Effect.onInterrupt(() => runtime.session.interrupt(child.id)));
         const info = yield* runtime.job.start({
           id: child.id,
           type: name,
           title: input.description,
           metadata: {},
-          run
+          recovery: {
+            kind: "subagent",
+            parentSessionID: context.sessionID,
+            childSessionID: child.id,
+            agent: agent.name,
+            description: input.description
+          },
+          run: runtime.session.resume(child.id).pipe(Effect.andThen(latestAssistantText(child.id)))
         });
         if (background) {
           yield* runtime.job.background(info.id);

package/dist/chunks/{job-ttxk3sr7.js → model-resolver-ahjey3nf.js}

@@ -1,12 +1,12 @@
 import {
   exports_config
-} from "./job-t0wrnah1.js";
+} from "./model-resolver-n6kt309t.js";
 import {
   exports_model
-} from "./job-r13w8t0w.js";
+} from "./model-resolver-r13w8t0w.js";
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
+} from "./model-resolver-krsqcmnj.js";
 
 // src/plugin/provider/ollama.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";

package/dist/chunks/{job-r0q3zwjk.js → model-resolver-an4sq5sg.js}

@@ -3,15 +3,15 @@ import {
   EffectSQLiteDatabase,
   make,
   makeWithDefaults
-} from "./job-23gqx3mw.js";
+} from "./model-resolver-vve06gze.js";
 import {
   EffectSQLiteSession,
   EffectSQLiteTransaction,
   managesTransactionsNatively
-} from "./job-22nyqdp0.js";
+} from "./model-resolver-27q8pxga.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/database/drizzle/index.ts
 var exports_drizzle = {};

package/dist/chunks/{job-awg5d31a.js → model-resolver-awg5d31a.js}

@@ -1,6 +1,6 @@
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
+} from "./model-resolver-krsqcmnj.js";
 
 // src/plugin/provider/zenmux.ts
 import { Effect } from "effect";

package/dist/chunks/{job-kd8bnpma.js → model-resolver-bgmcctn4.js}

@@ -1,36 +1,30 @@
-import {
-  exports_model_request
-} from "./job-zj8wvy7w.js";
 import {
   exports_usage
-} from "./job-sw84ckhj.js";
+} from "./model-resolver-sw84ckhj.js";
 import {
   exports_token
-} from "./job-v972xay6.js";
+} from "./model-resolver-v972xay6.js";
 import {
   toSessionError
-} from "./job-2zwe4rpe.js";
-import {
-  exports_model
-} from "./job-bxm4888t.js";
+} from "./model-resolver-5sfdg351.js";
 import {
   llmClient
-} from "./job-k42t1tha.js";
+} from "./model-resolver-k42t1tha.js";
 import {
   exports_agent
-} from "./job-2vjv0cws.js";
-import {
-  exports_state
-} from "./job-x89rah0x.js";
+} from "./model-resolver-1c7r7zzs.js";
 import {
   SessionEvent
-} from "./job-a83yvq99.js";
+} from "./model-resolver-a83yvq99.js";
+import {
+  exports_state
+} from "./model-resolver-x89rah0x.js";
 import {
   exports_bus
-} from "./job-frw2f85x.js";
+} from "./model-resolver-7hhsvv9w.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/session/compaction.ts
 var exports_compaction = {};
@@ -233,7 +227,7 @@ var make = (dependencies) => {
       source: "compaction",
       ...usage
     }) : Effect.void);
-    const prepared = yield* dependencies.modelRequests.prepare({
+    const prepared = yield* plan.prepare({
       scope: { session: plan.session, agentID: exports_agent.ID.make("compaction"), model: plan.resolved },
       transcript: { system: [], messages: [Message.user(plan.prompt)] },
       contextHooks: false
@@ -289,6 +283,7 @@ var make = (dependencies) => {
       return yield* execute({
         session: input.session,
         resolved: input.resolved,
+        prepare: input.prepare,
         reason: "auto",
         ...content
       });
@@ -325,7 +320,7 @@ var make = (dependencies) => {
         error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
         inputID: input.inputID
       });
-    const resolved = yield* dependencies.models.resolve(input.session).pipe(Effect.catch((cause) => failed({
+    const resolved = yield* input.resolveModel(input.session).pipe(Effect.catch((cause) => failed({
       sessionID: input.session.id,
       reason: "manual",
       error: toSessionError(cause),
@@ -336,6 +331,7 @@ var make = (dependencies) => {
     return yield* execute({
       session: input.session,
       resolved,
+      prepare: input.prepare,
       reason: "manual",
       inputID: input.inputID,
       started: input.started,
@@ -354,14 +350,12 @@ var make = (dependencies) => {
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const bus = yield* exports_bus.Service;
   const llm = yield* LLMClient.Service;
-  const models = yield* exports_model.Service;
-  const modelRequests = yield* exports_model_request.Service;
-  return make({ bus, llm, models, modelRequests });
+  return make({ bus, llm });
 }));
 var node = makeLocationNode({
   service: Service,
   layer,
-  deps: [exports_bus.node, llmClient, exports_model.node, exports_model_request.node]
+  deps: [exports_bus.node, llmClient]
 });
 
 export { Service, truncateToolOutput, serializeToolContent, buildPrompt, layer, node, exports_compaction };

package/dist/chunks/{job-gbnb8jff.js → model-resolver-bgxd79er.js}

@@ -1,18 +1,18 @@
-import {
-  exports_sdk
-} from "./job-cvb5zfes.js";
 import {
   exports_source_directory
-} from "./job-6272rtjg.js";
+} from "./model-resolver-6272rtjg.js";
+import {
+  exports_sdk
+} from "./model-resolver-s9x5m3kb.js";
 import {
   exports_module
-} from "./job-75h1hfe2.js";
+} from "./model-resolver-75h1hfe2.js";
 import {
   AbsolutePath
-} from "./job-j07kk359.js";
+} from "./model-resolver-j07kk359.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/project/markers.ts
 var exports_markers = {};

package/dist/chunks/{job-bh1wr8rq.js → model-resolver-bh1wr8rq.js}

@@ -1,9 +1,9 @@
 import {
   exports_app
-} from "./job-50jxp3hw.js";
+} from "./model-resolver-50jxp3hw.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/plugin/websearch/tavily.ts
 var exports_tavily = {};

package/dist/chunks/{job-dnkp33vf.js → model-resolver-bh4farnk.js}

@@ -1,9 +1,9 @@
 import {
   exports_integration
-} from "./job-nxzsxngj.js";
+} from "./model-resolver-3yrv3sh0.js";
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
+} from "./model-resolver-krsqcmnj.js";
 
 // src/plugin/provider/llmgateway.ts
 import { Effect } from "effect";

package/dist/chunks/{job-bmknfyv0.js → model-resolver-bmknfyv0.js}

@@ -1,9 +1,9 @@
 import {
   SessionMessage
-} from "./job-8rpfd2h6.js";
+} from "./model-resolver-8rpfd2h6.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/session/message-updater.ts
 var exports_message_updater = {};

package/dist/chunks/{job-5bgse5wx.js → model-resolver-bmw7xqpn.js}

@@ -1,12 +1,12 @@
 import {
   exports_state
-} from "./job-x89rah0x.js";
+} from "./model-resolver-x89rah0x.js";
 import {
   exports_location
-} from "./job-vx668anc.js";
+} from "./model-resolver-dnf3rn1j.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/formatter.ts
 var exports_formatter = {};

package/dist/chunks/{job-b5w7bc63.js → model-resolver-bpqydscm.js}

@@ -1,21 +1,21 @@
 import {
   exports_integration
-} from "./job-nxzsxngj.js";
+} from "./model-resolver-3yrv3sh0.js";
 import {
   exports_model
-} from "./job-r13w8t0w.js";
+} from "./model-resolver-r13w8t0w.js";
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
+} from "./model-resolver-krsqcmnj.js";
 import {
   exports_state
-} from "./job-x89rah0x.js";
+} from "./model-resolver-x89rah0x.js";
 import {
   exports_bus
-} from "./job-frw2f85x.js";
+} from "./model-resolver-7hhsvv9w.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/catalog.ts
 var exports_catalog = {};

package/dist/chunks/{job-byab506k.js → model-resolver-byab506k.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/database/v1-migration.ts
 var exports_v1_migration = {};

package/dist/chunks/{job-cejssq4g.js → model-resolver-bymt1gaf.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./job-6tn66jn4.js";
+} from "./model-resolver-8ynsv3dn.js";
 import {
   exports_instructions
-} from "./job-ec8vrfw5.js";
+} from "./model-resolver-ec8vrfw5.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/skill/instructions.ts
 var exports_instructions2 = {};

package/dist/chunks/{job-c4wcb9vc.js → model-resolver-c4wcb9vc.js}

@@ -1,9 +1,9 @@
 import {
   collectBoundedResponseBody
-} from "./job-jve7t217.js";
+} from "./model-resolver-jve7t217.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/plugin/websearch/mcp.ts
 var exports_mcp = {};

package/dist/chunks/{job-pkhb510r.js → model-resolver-cag041wd.js}

@@ -1,78 +1,78 @@
 import {
   exports_runtime
-} from "./job-yjbbj1k8.js";
+} from "./model-resolver-q1z6zb5q.js";
 import {
   exports_mcp
-} from "./job-jr3d74gv.js";
-import {
-  exports_websearch
-} from "./job-2zhgdb62.js";
-import {
-  exports_reference
-} from "./job-qfa3tbfc.js";
+} from "./model-resolver-kpj1z3d3.js";
 import {
   exports_tool
-} from "./job-thy9431f.js";
+} from "./model-resolver-1qf08dc2.js";
+import {
+  exports_vcs
+} from "./model-resolver-3b4q8hk0.js";
 import {
   exports_app
-} from "./job-50jxp3hw.js";
+} from "./model-resolver-50jxp3hw.js";
 import {
   exports_generate
-} from "./job-ejvr8t0r.js";
+} from "./model-resolver-shhypnhg.js";
 import {
-  exports_catalog
-} from "./job-b5w7bc63.js";
+  exports_command
+} from "./model-resolver-aa2ma3z3.js";
 import {
-  exports_integration
-} from "./job-nxzsxngj.js";
+  exports_websearch
+} from "./model-resolver-2p7kqv8d.js";
+import {
+  exports_kv
+} from "./model-resolver-7c49b741.js";
 import {
   exports_aisdk
-} from "./job-yc2vxtaa.js";
+} from "./model-resolver-yc2vxtaa.js";
+import {
+  exports_catalog
+} from "./model-resolver-bpqydscm.js";
+import {
+  exports_integration
+} from "./model-resolver-3yrv3sh0.js";
 import {
   exports_credential
-} from "./job-ghbdxb5r.js";
+} from "./model-resolver-x2syzpyj.js";
+import {
+  exports_reference
+} from "./model-resolver-40d9hg4b.js";
 import {
   exports_skill
-} from "./job-6tn66jn4.js";
+} from "./model-resolver-8ynsv3dn.js";
 import {
   exports_permission
-} from "./job-0b3sj2cr.js";
+} from "./model-resolver-zr9p7tag.js";
 import {
   exports_agent
-} from "./job-2vjv0cws.js";
+} from "./model-resolver-1c7r7zzs.js";
 import {
   exports_hooks
-} from "./job-v2wshkax.js";
+} from "./model-resolver-v2wshkax.js";
 import {
   exports_model
-} from "./job-r13w8t0w.js";
+} from "./model-resolver-r13w8t0w.js";
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
-import {
-  exports_vcs
-} from "./job-vmg26dpj.js";
-import {
-  exports_kv
-} from "./job-jab8gc94.js";
-import {
-  exports_command
-} from "./job-0x5nc8t6.js";
+} from "./model-resolver-krsqcmnj.js";
 import {
   exports_workspace
-} from "./job-kraj6rvs.js";
+} from "./model-resolver-1hzaa9cx.js";
 import {
   exports_location
-} from "./job-vx668anc.js";
-import {
-  AbsolutePath
-} from "./job-j07kk359.js";
+} from "./model-resolver-dnf3rn1j.js";
 import {
   exports_bus
-} from "./job-frw2f85x.js";
+} from "./model-resolver-7hhsvv9w.js";
+import {
+  AbsolutePath
+} from "./model-resolver-j07kk359.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/plugin/host.ts
 var exports_host = {};
@@ -118,6 +118,7 @@ var make = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test") {
   const response = (effect) => effect.pipe(Effect.map((data) => ({ location: locationInfo(), data })));
   return {
     app,
+    location: locationInfo(),
     options: {},
     agent: {
       get: (input) => {
@@ -287,30 +288,6 @@ var make = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test") {
           return runtime.location.mcp.list(ref);
         return response(mcp.servers());
       },
-      add: (input) => {
-        const ref = locationRef(input);
-        if (ref && !isCurrentLocation(ref))
-          return runtime.location.mcp.add(ref, input.server, input.config);
-        return mcp.add(input.server, input.config);
-      },
-      remove: (input) => {
-        const ref = locationRef(input);
-        if (ref && !isCurrentLocation(ref))
-          return runtime.location.mcp.remove(ref, input.server);
-        return mcp.remove(input.server);
-      },
-      connect: (input) => {
-        const ref = locationRef(input);
-        if (ref && !isCurrentLocation(ref))
-          return runtime.location.mcp.connect(ref, input.server);
-        return mcp.connect(input.server);
-      },
-      disconnect: (input) => {
-        const ref = locationRef(input);
-        if (ref && !isCurrentLocation(ref))
-          return runtime.location.mcp.disconnect(ref, input.server);
-        return mcp.disconnect(input.server);
-      },
       reload: mcp.reload,
       transform: (callback) => mcp.transform((draft) => {
         callback({
@@ -359,9 +336,8 @@ var make = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test") {
       hook: (name, callback) => hooks.register("shell", name, callback)
     },
     tool: {
-      transform: (callback) => tools.transform((draft) => callback({
-        add: (tool) => draft.add(tool)
-      })).pipe(Effect.orDie, Effect.as({ dispose: Effect.void })),
+      transform: tools.transform,
+      reload: tools.reload,
       hook: (name, callback) => hooks.register("tool", name, callback)
     },
     vcs: {

package/dist/chunks/{job-cp3ysfxd.js → model-resolver-cbajjvnv.js}

@@ -1,19 +1,19 @@
 import {
   exports_protected
-} from "./job-kg1345f7.js";
+} from "./model-resolver-kg1345f7.js";
 import {
   exports_ripgrep
-} from "./job-n9wayrda.js";
+} from "./model-resolver-1fzcbgr0.js";
 import {
   exports_location
-} from "./job-vx668anc.js";
+} from "./model-resolver-dnf3rn1j.js";
 import {
   PositiveInt,
   RelativePath
-} from "./job-j07kk359.js";
+} from "./model-resolver-j07kk359.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/filesystem/search.ts
 var exports_search = {};

package/dist/chunks/{job-gk1pa81x.js → model-resolver-cczrd96b.js}

@@ -1,26 +1,26 @@
 import {
-  exports_catalog
-} from "./job-b5w7bc63.js";
-import {
-  exports_integration
-} from "./job-nxzsxngj.js";
+  exports_aisdk_native
+} from "./model-resolver-q9b4qnv8.js";
 import {
   exports_aisdk
-} from "./job-yc2vxtaa.js";
+} from "./model-resolver-yc2vxtaa.js";
 import {
-  exports_aisdk_native
-} from "./job-q9b4qnv8.js";
+  exports_catalog
+} from "./model-resolver-bpqydscm.js";
+import {
+  exports_integration
+} from "./model-resolver-3yrv3sh0.js";
 import {
   ID,
   Ref,
   VariantID
-} from "./job-r13w8t0w.js";
+} from "./model-resolver-r13w8t0w.js";
 import {
   exports_provider
-} from "./job-krsqcmnj.js";
+} from "./model-resolver-krsqcmnj.js";
 import {
   __export
-} from "./job-rvfvac9x.js";
+} from "./model-resolver-rvfvac9x.js";
 
 // src/model-resolver.ts
 var exports_model_resolver = {};

package/dist/chunks/{job-frpc6wke.js → model-resolver-cjgkryjg.js}

@@ -1,18 +1,18 @@
 import {
-  fileSearchArgsSchema
-} from "./job-wj4sxzqa.js";
+  imageGenerationArgsSchema
+} from "./model-resolver-4b2tz2m9.js";
 import {
   codeInterpreterArgsSchema
-} from "./job-5a5ch9ts.js";
+} from "./model-resolver-5a5ch9ts.js";
 import {
   webSearchArgsSchema
-} from "./job-gy500k2r.js";
-import {
-  imageGenerationArgsSchema
-} from "./job-4b2tz2m9.js";
+} from "./model-resolver-gy500k2r.js";
 import {
   webSearchPreviewArgsSchema
-} from "./job-7n9qwqk4.js";
+} from "./model-resolver-7n9qwqk4.js";
+import {
+  fileSearchArgsSchema
+} from "./model-resolver-wj4sxzqa.js";
 
 // src/github-copilot/responses/openai-responses-prepare-tools.ts
 import { UnsupportedFunctionalityError } from "@ai-sdk/provider";