@opencode-ai/core 0.0.0-beta-18600 → 0.0.0-beta-18684

package/dist/chunks/{project-dsrkn9fq.js → state-7yxdgcdg.js}

@@ -1,15 +1,15 @@
 import {
-  openaiFailedResponseHandler
-} from "./project-r8f4w671.js";
+  convertToOpenAIResponsesInput
+} from "./state-vac9eqd2.js";
 import {
   mapOpenAIResponseFinishReason
-} from "./project-m8cbvarh.js";
+} from "./state-m8cbvarh.js";
 import {
-  prepareResponsesTools
-} from "./project-n80x9yrx.js";
+  openaiFailedResponseHandler
+} from "./state-r8f4w671.js";
 import {
-  convertToOpenAIResponsesInput
-} from "./project-vac9eqd2.js";
+  prepareResponsesTools
+} from "./state-ddkxdmhk.js";
 
 // src/github-copilot/responses/openai-responses-language-model.ts
 import {
@@ -162,8 +162,23 @@ class OpenAIResponsesLanguageModel {
     if (topLogprobs) {
       addInclude("message.output_text.logprobs");
     }
-    const webSearchToolName = tools?.find((tool) => tool.type === "provider" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview"))?.name;
-    if (webSearchToolName) {
+    const {
+      tools: openaiTools,
+      toolChoice: openaiToolChoice,
+      hostedTools,
+      selectedHostedTool,
+      toolWarnings
+    } = prepareResponsesTools({
+      tools,
+      toolChoice,
+      strictJsonSchema
+    });
+    const getHostedToolName = (responseType) => {
+      if (selectedHostedTool?.responseType === responseType)
+        return selectedHostedTool.name;
+      return hostedTools.find((tool) => tool.responseType === responseType)?.name ?? responseType;
+    };
+    if (hostedTools.some((tool) => tool.responseType === "web_search")) {
       addInclude("web_search_call.action.sources");
     }
     if (hasOpenAITool("openai.code_interpreter")) {
@@ -266,17 +281,8 @@ class OpenAIResponsesLanguageModel {
       });
       baseArgs.service_tier = undefined;
     }
-    const {
-      tools: openaiTools,
-      toolChoice: openaiToolChoice,
-      toolWarnings
-    } = prepareResponsesTools({
-      tools,
-      toolChoice,
-      strictJsonSchema
-    });
     return {
-      webSearchToolName,
+      getHostedToolName,
       args: {
         ...baseArgs,
         tools: openaiTools,
@@ -286,7 +292,7 @@ class OpenAIResponsesLanguageModel {
     };
   }
   async doGenerate(options) {
-    const { args: body, warnings, webSearchToolName } = await this.getArgs(options);
+    const { args: body, warnings, getHostedToolName } = await this.getArgs(options);
     const url = this.config.url({
       path: "/responses",
       modelId: this.modelId
@@ -411,14 +417,14 @@ class OpenAIResponsesLanguageModel {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "image_generation",
+            toolName: getHostedToolName("image_generation"),
             input: "{}",
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "image_generation",
+            toolName: getHostedToolName("image_generation"),
             result: {
               result: part.result
             }
@@ -481,14 +487,14 @@ class OpenAIResponsesLanguageModel {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: webSearchToolName ?? "web_search",
+            toolName: getHostedToolName("web_search"),
             input: JSON.stringify({ action: part.action }),
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: webSearchToolName ?? "web_search",
+            toolName: getHostedToolName("web_search"),
             result: { status: part.status }
           });
           break;
@@ -516,14 +522,14 @@ class OpenAIResponsesLanguageModel {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "file_search",
+            toolName: getHostedToolName("file_search"),
             input: "{}",
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "file_search",
+            toolName: getHostedToolName("file_search"),
             result: {
               queries: part.queries,
               results: part.results?.map((result) => ({
@@ -541,7 +547,7 @@ class OpenAIResponsesLanguageModel {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "code_interpreter",
+            toolName: getHostedToolName("code_interpreter"),
             input: JSON.stringify({
               code: part.code,
               containerId: part.container_id
@@ -551,7 +557,7 @@ class OpenAIResponsesLanguageModel {
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "code_interpreter",
+            toolName: getHostedToolName("code_interpreter"),
             result: {
               outputs: part.outputs
             }
@@ -605,7 +611,7 @@ class OpenAIResponsesLanguageModel {
     };
   }
   async doStream(options) {
-    const { args: body, warnings, webSearchToolName } = await this.getArgs(options);
+    const { args: body, warnings, getHostedToolName } = await this.getArgs(options);
     const { responseHeaders, value: response } = await postJsonToApi({
       url: this.config.url({
         path: "/responses",
@@ -676,7 +682,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-input-start",
                 id: value.item.id,
-                toolName: webSearchToolName ?? "web_search"
+                toolName: getHostedToolName("web_search")
               });
             } else if (value.item.type === "computer_call") {
               ongoingToolCalls[value.output_index] = {
@@ -697,7 +703,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-input-start",
                 id: value.item.id,
-                toolName: "code_interpreter"
+                toolName: getHostedToolName("code_interpreter")
               });
               controller.enqueue({
                 type: "tool-input-delta",
@@ -708,7 +714,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-call",
                 toolCallId: value.item.id,
-                toolName: "file_search",
+                toolName: getHostedToolName("file_search"),
                 input: "{}",
                 providerExecuted: true
               });
@@ -716,7 +722,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-call",
                 toolCallId: value.item.id,
-                toolName: "image_generation",
+                toolName: getHostedToolName("image_generation"),
                 input: "{}",
                 providerExecuted: true
               });
@@ -781,14 +787,14 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-call",
                 toolCallId: value.item.id,
-                toolName: "web_search",
+                toolName: getHostedToolName("web_search"),
                 input: JSON.stringify({ action: value.item.action }),
                 providerExecuted: true
               });
               controller.enqueue({
                 type: "tool-result",
                 toolCallId: value.item.id,
-                toolName: "web_search",
+                toolName: getHostedToolName("web_search"),
                 result: { status: value.item.status }
               });
             } else if (value.item.type === "computer_call") {
@@ -818,7 +824,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-result",
                 toolCallId: value.item.id,
-                toolName: "file_search",
+                toolName: getHostedToolName("file_search"),
                 result: {
                   queries: value.item.queries,
                   results: value.item.results?.map((result) => ({
@@ -835,7 +841,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-result",
                 toolCallId: value.item.id,
-                toolName: "code_interpreter",
+                toolName: getHostedToolName("code_interpreter"),
                 result: {
                   outputs: value.item.outputs
                 }
@@ -844,7 +850,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-result",
                 toolCallId: value.item.id,
-                toolName: "image_generation",
+                toolName: getHostedToolName("image_generation"),
                 result: {
                   result: value.item.result
                 }
@@ -893,7 +899,7 @@ class OpenAIResponsesLanguageModel {
             controller.enqueue({
               type: "tool-result",
               toolCallId: value.item_id,
-              toolName: "image_generation",
+              toolName: getHostedToolName("image_generation"),
               result: {
                 result: value.partial_image_b64
               }
@@ -922,7 +928,7 @@ class OpenAIResponsesLanguageModel {
               controller.enqueue({
                 type: "tool-call",
                 toolCallId: toolCall.toolCallId,
-                toolName: "code_interpreter",
+                toolName: getHostedToolName("code_interpreter"),
                 input: JSON.stringify({
                   code: value.code,
                   containerId: toolCall.codeInterpreter.containerId

package/dist/chunks/{project-83ba1yz6.js → state-83ba1yz6.js}

@@ -1,9 +1,9 @@
 import {
   loadSDKFactory
-} from "./project-j32vdj8r.js";
+} from "./state-j32vdj8r.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 
 // src/plugin/provider/sap-ai-core.ts
 import { Effect } from "effect";

package/dist/chunks/{project-zn8r3q6e.js → state-8a4hfbqs.js}

@@ -1,16 +1,16 @@
 import {
-  exports_wildcard
-} from "./project-y67x6rf6.js";
+  lazy
+} from "./state-8w9tzfz1.js";
 import {
   exports_select
-} from "./project-bbhffenw.js";
+} from "./state-bbhffenw.js";
 import {
-  lazy
-} from "./project-8w9tzfz1.js";
+  exports_wildcard
+} from "./state-y67x6rf6.js";
 import {
   __export,
   __require
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/shell/parse.ts
 var exports_parse = {};

package/dist/chunks/{project-c6yz00sq.js → state-8br4d03d.js}

@@ -1,24 +1,24 @@
 import {
   exports_supervisor
-} from "./project-4rg3anhc.js";
+} from "./state-9cb4yhpj.js";
 import {
   exports_location_watcher_policy
-} from "./project-6wkzvma0.js";
+} from "./state-6wkzvma0.js";
 import {
   exports_watcher
-} from "./project-ns0sdez7.js";
+} from "./state-ns0sdez7.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./state-qph0wk53.js";
 import {
   exports_git
-} from "./project-kt491qp2.js";
+} from "./state-dyj7wa6j.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/filesystem/location-watcher.ts
 var exports_location_watcher = {};

package/dist/chunks/{project-7d6d29dh.js → state-8ee4ayyt.js}

@@ -1,30 +1,30 @@
 import {
   exports_context
-} from "./project-sn6nad9v.js";
+} from "./state-8qrx9cj0.js";
 import {
   exports_usage
-} from "./project-sw84ckhj.js";
+} from "./state-sw84ckhj.js";
+import {
+  llmClient
+} from "./state-393a352g.js";
 import {
   exports_store
-} from "./project-vjmn5wwb.js";
+} from "./state-tfd8n8cn.js";
 import {
   exports_history
-} from "./project-y85nmh9b.js";
-import {
-  llmClient
-} from "./project-393a352g.js";
+} from "./state-v16fefw3.js";
 import {
   SessionEvent
-} from "./project-a83yvq99.js";
+} from "./state-a83yvq99.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   exports_database
-} from "./project-gcc0jgqv.js";
+} from "./state-vpac0x8g.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/title.ts
 var exports_title = {};

package/dist/chunks/{project-dmd300cs.js → state-8gggym7s.js}

@@ -1,21 +1,21 @@
 import {
   exports_app
-} from "./project-50jxp3hw.js";
+} from "./state-50jxp3hw.js";
 import {
   exports_model
-} from "./project-r13w8t0w.js";
+} from "./state-r13w8t0w.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 import {
   exports_kv
-} from "./project-cbdh5emr.js";
+} from "./state-a2jfr9gs.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/models-dev.ts
 var exports_models_dev = {};
@@ -532,8 +532,8 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     return;
   })) : Effect.undefined;
   const loadSnapshot = options?.snapshot === false ? Effect.undefined : bundledSnapshot;
-  const writeCache = Effect.fn("ModelsDev.writeCache")(function* (text) {
-    yield* kv.set(key, { updatedAt: Date.now(), digest: bodyDigest(text), body: text }).pipe(Effect.catchCauseIf((cause) => !Cause.hasInterruptsOnly(cause), (cause) => Effect.logWarning("Failed to cache models.dev catalog", { cause })));
+  const writeCache = Effect.fn("ModelsDev.writeCache")(function* (text, digest = bodyDigest(text)) {
+    yield* kv.set(key, { updatedAt: Date.now(), digest, body: text }).pipe(Effect.catchCauseIf((cause) => !Cause.hasInterruptsOnly(cause), (cause) => Effect.logWarning("Failed to cache models.dev catalog", { cause })));
   });
   const fetchAndWrite = Effect.fn("ModelsDev.fetchAndWrite")(function* () {
     const text = yield* fetchApi();
@@ -569,10 +569,11 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       if (!force && stored && Date.now() - stored.updatedAt < Duration.toMillis(ttl))
         return;
       const text = yield* fetchApi();
-      if (!force && stored?.digest === bodyDigest(text))
+      const digest = bodyDigest(text);
+      if (!force && stored?.digest === digest)
         return;
       yield* decodeCatalog(text);
-      yield* writeCache(text);
+      yield* writeCache(text, digest);
       yield* invalidate;
       yield* bus.publish(ModelsDev.Event.Refreshed, {});
     })).pipe(Effect.tapCause((cause) => Effect.logError("Failed to fetch models.dev", { cause })), Effect.ignore);

package/dist/chunks/{project-8pngjawd.js → state-8pngjawd.js}

@@ -1,9 +1,9 @@
 import {
   exports_model
-} from "./project-r13w8t0w.js";
+} from "./state-r13w8t0w.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 
 // src/plugin/provider/openrouter.ts
 import { Effect } from "effect";

package/dist/chunks/{project-vphhr7s2.js → state-8q7v1yfa.js}

@@ -1,15 +1,15 @@
 import {
   exports_entry_observer
-} from "./project-kp1t5rcy.js";
+} from "./state-kp1t5rcy.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/config/plugin/provider.ts
 var exports_provider2 = {};

package/dist/chunks/{project-sn6nad9v.js → state-8qrx9cj0.js}

@@ -1,69 +1,66 @@
 import {
-  exports_model_request
-} from "./project-rjnxxp68.js";
+  exports_builtins
+} from "./state-2a5pw7n9.js";
 import {
-  exports_instructions as exports_instructions4
-} from "./project-88g69gay.js";
+  exports_instructions as exports_instructions3
+} from "./state-xxpvz42q.js";
 import {
-  exports_builtins
-} from "./project-w7b874ta.js";
+  exports_instructions as exports_instructions2
+} from "./state-dhvv2dke.js";
 import {
-  exports_mcp
-} from "./project-apgan3pt.js";
+  exports_instructions as exports_instructions4
+} from "./state-0cg1xda9.js";
 import {
-  exports_instructions as exports_instructions3
-} from "./project-xxpvz42q.js";
+  exports_mcp
+} from "./state-tk21pea4.js";
 import {
   exports_instructions as exports_instructions5
-} from "./project-9nk9mkqn.js";
+} from "./state-d4zkabyv.js";
 import {
-  exports_supervisor
-} from "./project-4rg3anhc.js";
+  exports_model_request
+} from "./state-a9rzcc94.js";
 import {
-  exports_instructions as exports_instructions2
-} from "./project-1r30nvhb.js";
+  exports_supervisor
+} from "./state-9cb4yhpj.js";
 import {
   exports_instruction_discovery
-} from "./project-zy5j9fqq.js";
+} from "./state-n3j6ek0z.js";
 import {
   exports_instruction_entry
-} from "./project-yq1fxjb2.js";
+} from "./state-cnsekzdm.js";
+import {
+  exports_model
+} from "./state-az57h3s3.js";
 import {
-  exports_model as exports_model2
-} from "./project-k3my2f3q.js";
+  exports_catalog
+} from "./state-330v609d.js";
 import {
   exports_tool
-} from "./project-fhg07p44.js";
+} from "./state-dstxbc7s.js";
 import {
   exports_store
-} from "./project-vjmn5wwb.js";
+} from "./state-tfd8n8cn.js";
 import {
   exports_history
-} from "./project-y85nmh9b.js";
+} from "./state-v16fefw3.js";
 import {
   AgentNotFoundError
-} from "./project-fb7nfzf2.js";
-import {
-  exports_catalog
-} from "./project-bq1qdn80.js";
-import {
-  exports_agent
-} from "./project-vqt151v9.js";
+} from "./state-cgqn2mrm.js";
 import {
   exports_instructions
-} from "./project-ec8vrfw5.js";
+} from "./state-ec8vrfw5.js";
 import {
-  exports_model
-} from "./project-r13w8t0w.js";
+  exports_agent
+} from "./state-mg2nmqys.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./state-qph0wk53.js";
 import {
   exports_database
-} from "./project-gcc0jgqv.js";
+} from "./state-vpac0x8g.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/context.ts
 var exports_context = {};
@@ -72,6 +69,7 @@ __export(exports_context, {
   SessionContext: () => exports_context,
   Service: () => Service
 });
+import { Model } from "@opencode-ai/schema/model";
 import { Context, Effect, Layer } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 class Service extends Context.Service()("@opencode/SessionContext") {
@@ -86,7 +84,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const location = yield* exports_location.Service;
   const mcpInstructions = yield* exports_instructions4.Service;
   const mcpTools = yield* exports_mcp.Service;
-  const models = yield* exports_model2.Service;
+  const models = yield* exports_model.Service;
   const modelRequests = yield* exports_model_request.Service;
   const plugins = yield* exports_supervisor.Service;
   const referenceInstructions = yield* exports_instructions2.Service;
@@ -111,7 +109,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     const variant = agent.model?.variant ?? MINIMAL_REASONING_VARIANTS.find((id) => info?.variants.some((item) => item.id === id));
     const preferred = info && (yield* resolveModel({
       ...session,
-      model: exports_model.Ref.make({
+      model: Model.Ref.make({
         providerID: info.providerID,
         id: info.id,
         ...variant ? { variant } : {}
@@ -173,7 +171,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   });
   return Service.of({ select, load, resolveModel, selectTitle, prepare: modelRequests.prepare });
 }));
-var MINIMAL_REASONING_VARIANTS = ["none", "minimal", "low"].map((id) => exports_model.VariantID.make(id));
+var MINIMAL_REASONING_VARIANTS = ["none", "minimal", "low"].map((id) => Model.VariantID.make(id));
 var node = makeLocationNode({
   service: Service,
   layer,
@@ -189,7 +187,7 @@ var node = makeLocationNode({
     exports_mcp.node,
     exports_supervisor.node,
     exports_instructions2.node,
-    exports_model2.node,
+    exports_model.node,
     exports_model_request.node,
     exports_store.node,
     exports_instructions5.node,

package/dist/chunks/{project-2tnd1ag8.js → state-8y3819y8.js}

@@ -1,12 +1,12 @@
 import {
   foldSettings
-} from "./project-sdcydb11.js";
+} from "./state-zqpaf5g0.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
 import {
   exports_model
-} from "./project-r13w8t0w.js";
+} from "./state-r13w8t0w.js";
 
 // src/plugin/provider/lmstudio.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";

package/dist/chunks/{project-a0s5dkct.js → state-8ya4n8zg.js}

@@ -1,21 +1,21 @@
 import {
   exports_entry_observer
-} from "./project-kp1t5rcy.js";
+} from "./state-kp1t5rcy.js";
 import {
   exports_reference
-} from "./project-qxsjpy8c.js";
+} from "./state-4twq59qz.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./state-qph0wk53.js";
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/config/plugin/reference.ts
 var exports_reference2 = {};
@@ -35,7 +35,6 @@ var Plugin = define({
     const global = yield* Global.Service;
     const loaded = yield* exports_entry_observer.observe(config, ctx.event, ctx.reference.reload());
     yield* ctx.reference.transform((draft) => {
-      const entries = new Map;
       for (const doc of loaded.entries.filter((entry) => entry.type === "document")) {
         const directory = doc.path ? path.dirname(doc.path) : location.directory;
         for (const [name, entry] of Object.entries(doc.info.references ?? {})) {
@@ -43,7 +42,7 @@ var Plugin = define({
             continue;
           const description = typeof entry === "string" ? undefined : entry.description;
           const hidden = typeof entry === "string" ? undefined : entry.hidden;
-          entries.set(name, local(entry) ? exports_reference.LocalSource.make({
+          draft.add(name, local(entry) ? exports_reference.LocalSource.make({
             type: "local",
             path: AbsolutePath.make(localPath(directory, global.home, typeof entry === "string" ? entry : entry.path)),
             ...description === undefined ? {} : { description },
@@ -57,8 +56,6 @@ var Plugin = define({
           }));
         }
       }
-      for (const [name, source] of entries)
-        draft.add(name, source);
     });
   })
 });