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

package/dist/chunks/{project-37ng30jt.js → state-cpqd33tw.js}

@@ -1,14 +1,14 @@
 import {
   exports_usage
-} from "./project-sw84ckhj.js";
+} from "./state-sw84ckhj.js";
 import {
   SessionEvent
-} from "./project-a83yvq99.js";
+} from "./state-a83yvq99.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Clock, Effect, Iterable } from "effect";
+import { isArrayNonEmpty, isReadonlyArrayNonEmpty } from "effect/Array";
 var asRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : { value };
-var nonEmpty = (content) => content.length > 0 ? content : undefined;
 var stringify = (value) => {
   if (typeof value === "string")
     return value;
@@ -19,11 +19,8 @@ var stringify = (value) => {
   }
 };
 var hostedContent = (result) => {
-  if (result.type === "content") {
-    const content = nonEmpty(result.value);
-    if (content !== undefined)
-      return content;
-  }
+  if (result.type === "content" && isReadonlyArrayNonEmpty(result.value))
+    return result.value;
   return [{ type: "text", text: stringify(result.value) }];
 };
 var createLLMEventPublisher = (bus, input) => {
@@ -432,7 +429,7 @@ var createLLMEventPublisher = (bus, input) => {
         yield* failAssistant({ type: "provider.unknown", message: event.message });
         return;
     }
-  });
+  }, Effect.uninterruptible);
   const publishTraced = Effect.fn("SessionRunner.publishLLMEvent")(publish);
   const progress = Effect.fnUntraced(function* (id, update) {
     const tool = tools.get(id);
@@ -456,13 +453,13 @@ var createLLMEventPublisher = (bus, input) => {
       return yield* Effect.die(new Error(`Duplicate tool execution: ${id}`));
     tool.settled = true;
     const content = typeof result.content === "string" ? [{ type: "text", text: result.content }] : result.content === undefined ? [] : [...result.content];
-    if (content.length === 0)
+    if (!isArrayNonEmpty(content))
       return yield* Effect.die(new Error(`Tool execution has no content: ${id}`));
     yield* bus.publish(SessionEvent.Tool.Success, {
       sessionID: input.sessionID,
       assistantMessageID,
       id,
-      content: [content[0], ...content.slice(1)],
+      content,
       ...result.metadata === undefined ? {} : { metadata: result.metadata },
       executed: tool.providerExecuted
     });

package/dist/chunks/state-cr7tbps7.js

@@ -0,0 +1,34 @@
+import {
+  exports_supervisor
+} from "./state-9cb4yhpj.js";
+import {
+  exports_prompt
+} from "./state-27ykzq5n.js";
+import {
+  exports_skill
+} from "./state-sz7acswn.js";
+import {
+  exports_image
+} from "./state-fp623900.js";
+import {
+  exports_hooks
+} from "./state-v2wshkax.js";
+import {
+  __export
+} from "./state-rvfvac9x.js";
+
+// src/session/prompt-node.ts
+var exports_prompt_node = {};
+__export(exports_prompt_node, {
+  node: () => node,
+  SessionPromptNode: () => exports_prompt_node
+});
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
+import { FSUtil } from "@opencode-ai/util/fs-util";
+var node = makeLocationNode({
+  service: exports_prompt.Service,
+  layer: exports_prompt.layer,
+  deps: [FSUtil.node, exports_supervisor.node, exports_hooks.node, exports_image.node, exports_skill.node]
+});
+
+export { node, exports_prompt_node };

package/dist/chunks/{project-qhe68xsc.js → state-cynvptsh.js}

@@ -1,15 +1,15 @@
 import {
   CredentialTable
-} from "./project-mf0hyk7z.js";
+} from "./state-mf0hyk7z.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/credential.ts
 var exports_credential = {};

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

@@ -1,9 +1,9 @@
 import {
   InvalidError
-} from "./project-nr76rjj3.js";
+} from "./state-nr76rjj3.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/config/variable.ts
 var exports_variable = {};

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

@@ -1,9 +1,9 @@
 import {
   ProjectTable
-} from "./project-c8ya26sa.js";
+} from "./state-c8ya26sa.js";
 import {
   Timestamps
-} from "./project-sem2g21k.js";
+} from "./state-sem2g21k.js";
 
 // src/permission/sql.ts
 import { sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";

package/dist/chunks/{project-9nk9mkqn.js → state-d4zkabyv.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./project-p2h03eta.js";
+} from "./state-sz7acswn.js";
 import {
   exports_instructions
-} from "./project-ec8vrfw5.js";
+} from "./state-ec8vrfw5.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/skill/instructions.ts
 var exports_instructions2 = {};

package/dist/chunks/{project-n80x9yrx.js → state-ddkxdmhk.js}

@@ -1,21 +1,38 @@
-import {
-  fileSearchArgsSchema
-} from "./project-wj4sxzqa.js";
 import {
   imageGenerationArgsSchema
-} from "./project-4b2tz2m9.js";
+} from "./state-4b2tz2m9.js";
+import {
+  webSearchArgsSchema
+} from "./state-gy500k2r.js";
+import {
+  fileSearchArgsSchema
+} from "./state-wj4sxzqa.js";
 import {
   codeInterpreterArgsSchema
-} from "./project-5a5ch9ts.js";
+} from "./state-5a5ch9ts.js";
 import {
   webSearchPreviewArgsSchema
-} from "./project-7n9qwqk4.js";
-import {
-  webSearchArgsSchema
-} from "./project-gy500k2r.js";
+} from "./state-7n9qwqk4.js";
 
 // src/github-copilot/responses/openai-responses-prepare-tools.ts
-import { UnsupportedFunctionalityError } from "@ai-sdk/provider";
+import {
+  UnsupportedFunctionalityError
+} from "@ai-sdk/provider";
+function getResponsesHostedTool(tool) {
+  switch (tool.id) {
+    case "openai.file_search":
+      return { name: tool.name, type: "file_search", responseType: "file_search" };
+    case "openai.web_search_preview":
+      return { name: tool.name, type: "web_search_preview", responseType: "web_search" };
+    case "openai.web_search":
+      return { name: tool.name, type: "web_search", responseType: "web_search" };
+    case "openai.code_interpreter":
+      return { name: tool.name, type: "code_interpreter", responseType: "code_interpreter" };
+    case "openai.image_generation":
+      return { name: tool.name, type: "image_generation", responseType: "image_generation" };
+  }
+  return;
+}
 function prepareResponsesTools({
   tools,
   toolChoice,
@@ -24,7 +41,36 @@ function prepareResponsesTools({
   tools = tools?.length ? tools : undefined;
   const toolWarnings = [];
   if (tools == null) {
-    return { tools: undefined, toolChoice: undefined, toolWarnings };
+    return { tools: undefined, toolChoice: undefined, hostedTools: [], toolWarnings };
+  }
+  const hostedTools = tools.flatMap((tool) => {
+    if (tool.type !== "provider")
+      return [];
+    const hostedTool = getResponsesHostedTool(tool);
+    return hostedTool ? [hostedTool] : [];
+  });
+  const selectedToolName = toolChoice?.type === "tool" ? toolChoice.toolName : undefined;
+  const selectedTools = selectedToolName === undefined ? [] : tools.filter((tool) => tool.name === selectedToolName);
+  if (selectedTools.length > 1) {
+    throw new UnsupportedFunctionalityError({
+      functionality: `ambiguous tool choice '${selectedToolName}': multiple tool definitions share this name`
+    });
+  }
+  const selectedHostedTool = selectedTools[0]?.type === "provider" ? getResponsesHostedTool(selectedTools[0]) : undefined;
+  const ambiguousHostedResponse = toolChoice?.type === "none" || toolChoice?.type === "tool" ? undefined : hostedTools.find((tool) => new Set(hostedTools.filter((candidate) => candidate.responseType === tool.responseType).map((item) => item.name)).size > 1);
+  if (ambiguousHostedResponse) {
+    const names = new Set(hostedTools.filter((tool) => tool.responseType === ambiguousHostedResponse.responseType).map((tool) => tool.name));
+    throw new UnsupportedFunctionalityError({
+      functionality: `ambiguous ${ambiguousHostedResponse.responseType} response for hosted tools: ${[...names].join(", ")}`
+    });
+  }
+  if (selectedHostedTool) {
+    const names = new Set(hostedTools.filter((tool) => tool.type === selectedHostedTool.type).map((tool) => tool.name));
+    if (names.size > 1) {
+      throw new UnsupportedFunctionalityError({
+        functionality: `ambiguous ${selectedHostedTool.type} tool choice for hosted tools: ${[...names].join(", ")}`
+      });
+    }
   }
   const openaiTools = [];
   for (const tool of tools) {
@@ -110,20 +156,23 @@ function prepareResponsesTools({
     }
   }
   if (toolChoice == null) {
-    return { tools: openaiTools, toolChoice: undefined, toolWarnings };
+    return { tools: openaiTools, toolChoice: undefined, hostedTools, selectedHostedTool, toolWarnings };
   }
   const type = toolChoice.type;
   switch (type) {
     case "auto":
     case "none":
     case "required":
-      return { tools: openaiTools, toolChoice: type, toolWarnings };
-    case "tool":
+      return { tools: openaiTools, toolChoice: type, hostedTools, selectedHostedTool, toolWarnings };
+    case "tool": {
       return {
         tools: openaiTools,
-        toolChoice: toolChoice.toolName === "code_interpreter" || toolChoice.toolName === "file_search" || toolChoice.toolName === "image_generation" || toolChoice.toolName === "web_search_preview" || toolChoice.toolName === "web_search" ? { type: toolChoice.toolName } : { type: "function", name: toolChoice.toolName },
+        toolChoice: selectedHostedTool ? { type: selectedHostedTool.type } : { type: "function", name: toolChoice.toolName },
+        hostedTools,
+        selectedHostedTool,
         toolWarnings
       };
+    }
     default: {
       const _exhaustiveCheck = type;
       throw new UnsupportedFunctionalityError({
@@ -133,4 +182,4 @@ function prepareResponsesTools({
   }
 }
 
-export { prepareResponsesTools };
+export { getResponsesHostedTool, prepareResponsesTools };

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

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/mime.ts
 var exports_mime = {};

package/dist/chunks/{project-1r30nvhb.js → state-dhvv2dke.js}

@@ -1,12 +1,12 @@
 import {
   exports_reference
-} from "./project-qxsjpy8c.js";
+} from "./state-4twq59qz.js";
 import {
   exports_instructions
-} from "./project-ec8vrfw5.js";
+} from "./state-ec8vrfw5.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/reference/instructions.ts
 var exports_instructions2 = {};

package/dist/chunks/{project-fhg07p44.js → state-dstxbc7s.js}

@@ -1,28 +1,28 @@
 import {
   exports_tool
-} from "./project-57ej80dx.js";
+} from "./state-57ej80dx.js";
 import {
   definition,
   effectiveName,
   execute,
   normalizeContent,
   normalizedName
-} from "./project-f1jj19e8.js";
+} from "./state-f1jj19e8.js";
 import {
   exports_image
-} from "./project-1cvksg4c.js";
+} from "./state-fp623900.js";
 import {
   exports_wildcard
-} from "./project-y67x6rf6.js";
+} from "./state-y67x6rf6.js";
 import {
   exports_hooks
-} from "./project-v2wshkax.js";
+} from "./state-v2wshkax.js";
 import {
   exports_state
-} from "./project-x89rah0x.js";
+} from "./state-x89rah0x.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/tool.ts
 var exports_tool2 = {};

package/dist/chunks/{project-63s588jq.js → state-dx3ash2a.js}

@@ -1,36 +1,36 @@
-import {
-  createLLMEventPublisher
-} from "./project-37ng30jt.js";
 import {
   exports_retry
-} from "./project-tqf07m3e.js";
+} from "./state-2pd1mgzx.js";
 import {
-  exports_usage
-} from "./project-sw84ckhj.js";
+  createLLMEventPublisher
+} from "./state-cpqd33tw.js";
 import {
-  exports_tool_output
-} from "./project-f7q7a28y.js";
+  exports_usage
+} from "./state-sw84ckhj.js";
 import {
   toSessionError
-} from "./project-8xpa4rfs.js";
+} from "./state-z2v2g0w5.js";
+import {
+  exports_snapshot
+} from "./state-mhk3rrcb.js";
+import {
+  exports_tool_output
+} from "./state-7ccgh94t.js";
 import {
   exports_tool
-} from "./project-fhg07p44.js";
+} from "./state-dstxbc7s.js";
 import {
   StepFailedError
-} from "./project-fb7nfzf2.js";
-import {
-  exports_snapshot
-} from "./project-n79xa5zf.js";
+} from "./state-cgqn2mrm.js";
 import {
   SessionEvent
-} from "./project-a83yvq99.js";
+} from "./state-a83yvq99.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/runner/step.ts
 var exports_step = {};
@@ -122,9 +122,10 @@ var make = Effect.gen(function* () {
       const llmError = llmFailure && !recorded.providerFailed ? toSessionError(llmFailure) : undefined;
       if (input.recoverContinuation && llmFailure?.reason._tag === "Transport" && (llmFailure.reason.recovery === "retry-full" || llmFailure.reason.recovery === "rotate-and-retry-full") && !recorded.outputStarted)
         return Outcome.RecoverFull();
-      if (llmFailure && llmError && exports_retry.isRetryable(llmFailure) && !recorded.outputStarted) {
+      const retry = llmFailure && llmError && !isContextOverflowFailure(llmFailure) ? yield* restore(input.retry(llmFailure, llmError, exports_retry.isRetryable(llmFailure) || recorded.outputStarted && isInterruptedStream(llmFailure))) : undefined;
+      if (llmFailure && llmError && retry?.retry && !recorded.outputStarted) {
         yield* publisher.startAssistant();
-        return Outcome.Retry({ cause: llmFailure, error: llmError });
+        return Outcome.Retry({ error: llmError, decision: retry });
       }
       if (llmError)
         yield* publisher.failAssistant(llmError);
@@ -165,8 +166,8 @@ var make = Effect.gen(function* () {
             files
           });
       }
-      if (llmFailure && llmError && (isInterruptedStream(llmFailure) || exports_retry.isRetryable(llmFailure)) && record.outputStarted && tools.declines.length === 0 && !tools.interrupted)
-        return Outcome.Continue({ cause: llmFailure, error: llmError });
+      if (llmFailure && llmError && retry?.retry && record.outputStarted && tools.declines.length === 0 && !tools.interrupted)
+        return Outcome.Continue({ error: llmError, decision: retry });
       if (Exit.isFailure(stream))
         return yield* Effect.failCause(stream.cause);
       if (tools.declines.length > 0)

package/dist/chunks/{project-kt491qp2.js → state-dyj7wa6j.js}

@@ -1,13 +1,13 @@
 import {
   AbsolutePath,
   RelativePath
-} from "./project-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   exports_keyed_mutex
-} from "./project-0kvmztkf.js";
+} from "./state-0kvmztkf.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/git.ts
 var exports_git = {};
@@ -99,7 +99,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     if (!dotgit)
       return;
     const cwd = path.dirname(dotgit);
-    const result = yield* run(cwd, proc)(["rev-parse", "--git-dir", "--git-common-dir", "--show-toplevel"]);
+    const result = yield* run(cwd, proc, ["rev-parse", "--git-dir", "--git-common-dir", "--show-toplevel"]);
     const [gitDir, commonDir, topLevel] = result.text.split(/\r?\n/);
     if (!gitDir || !commonDir)
       return;
@@ -110,38 +110,38 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     });
   });
   const remote = Effect.fn("Git.remote.get")(function* (repository, name = "origin") {
-    const result = yield* run(repository.worktree, proc)(["remote", "get-url", name]);
+    const result = yield* run(repository.worktree, proc, ["remote", "get-url", name]);
     if (result.exitCode !== 0)
       return;
     return result.text.trim() || undefined;
   });
   const roots = Effect.fn("Git.history.rootCommits")(function* (repository) {
-    const result = yield* run(repository.worktree, proc)(["rev-list", "--max-parents=0", "HEAD"]);
+    const result = yield* run(repository.worktree, proc, ["rev-list", "--max-parents=0", "HEAD"]);
     if (result.exitCode !== 0)
       return [];
     return result.text.split(`
 `).map((item) => item.trim()).filter(Boolean).toSorted();
   });
   const head = Effect.fn("Git.history.head")(function* (repository) {
-    const result = yield* run(repository.worktree, proc)(["rev-parse", "HEAD"]);
+    const result = yield* run(repository.worktree, proc, ["rev-parse", "HEAD"]);
     if (result.exitCode !== 0)
       return;
     return result.text.trim() || undefined;
   });
   const branch = Effect.fn("Git.history.branch")(function* (repository) {
-    const result = yield* run(repository.worktree, proc)(["symbolic-ref", "--quiet", "--short", "HEAD"]);
+    const result = yield* run(repository.worktree, proc, ["symbolic-ref", "--quiet", "--short", "HEAD"]);
     if (result.exitCode !== 0)
       return;
     return result.text.trim() || undefined;
   });
   const remoteHead = Effect.fn("Git.history.defaultRemoteBranch")(function* (repository, remoteName = "origin") {
-    const result = yield* run(repository.worktree, proc)(["symbolic-ref", `refs/remotes/${remoteName}/HEAD`]);
+    const result = yield* run(repository.worktree, proc, ["symbolic-ref", `refs/remotes/${remoteName}/HEAD`]);
     if (result.exitCode !== 0)
       return;
     return result.text.trim().replace(new RegExp(`^refs/remotes/${remoteName}/`), "") || undefined;
   });
   const operation = Effect.fnUntraced(function* (operation2, directory, args) {
-    const result = yield* execute(directory, proc)(args).pipe(Effect.mapError((cause) => new OperationError({ operation: operation2, directory, message: cause.message, cause })));
+    const result = yield* execute(directory, proc, args).pipe(Effect.mapError((cause) => new OperationError({ operation: operation2, directory, message: cause.message, cause })));
     if (result.exitCode === 0)
       return;
     return yield* new OperationError({
@@ -426,11 +426,11 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   });
 }));
 var node = makeGlobalNode({ service: Service, layer, deps: [FSUtil.node, AppProcess.node] });
-function run(cwd, proc) {
-  return (args) => execute(cwd, proc)(args).pipe(Effect.orElseSucceed(() => ({ exitCode: 1, text: "", stderr: "" })));
+function run(cwd, proc, args) {
+  return execute(cwd, proc, args).pipe(Effect.orElseSucceed(() => ({ exitCode: 1, text: "", stderr: "" })));
 }
-function execute(cwd, proc) {
-  return (args) => proc.run(ChildProcess.make("git", args, {
+function execute(cwd, proc, args) {
+  return proc.run(ChildProcess.make("git", args, {
     cwd,
     extendEnv: true,
     stdin: "ignore"

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

@@ -1,9 +1,9 @@
 import {
   PositiveInt
-} from "./project-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/v1/config/mcp.ts
 var exports_mcp = {};

package/dist/chunks/{project-qw097fy7.js → state-ebnnd043.js}

@@ -1,27 +1,27 @@
-import {
-  exports_discovery
-} from "./project-fm3b2wbt.js";
 import {
   exports_skill_file
-} from "./project-63n18kwk.js";
+} from "./state-qjfz0d3t.js";
 import {
-  exports_skill
-} from "./project-p2h03eta.js";
+  exports_discovery
+} from "./state-fm3b2wbt.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
 import {
   exports_watcher
-} from "./project-ns0sdez7.js";
+} from "./state-ns0sdez7.js";
+import {
+  exports_skill
+} from "./state-sz7acswn.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/skill.ts
 var exports_skill2 = {};
@@ -152,24 +152,22 @@ var Plugin = define({
       return skills;
     });
     const refresh = Effect.fn("ConfigSkillPlugin.refresh")(function* (file) {
-      yield* lock.withPermit(Effect.gen(function* () {
-        yield* FiberMap.clear(watches);
-        const skills = new Map;
-        const current = sources();
-        for (const source of current) {
-          for (const skill of yield* load(source))
-            skills.set(skill.id, skill);
-        }
-        loaded.skills = Array.from(skills.values());
-        if (file) {
-          yield* Effect.logInfo("skills rescanned", {
-            file,
-            sources: current.map(exports_skill.Source.key),
-            skills: loaded.skills.map((skill) => skill.id)
-          });
-        }
-      }));
-    });
+      yield* FiberMap.clear(watches);
+      const skills = new Map;
+      const current = sources();
+      for (const source of current) {
+        for (const skill of yield* load(source))
+          skills.set(skill.id, skill);
+      }
+      loaded.skills = Array.from(skills.values());
+      if (file) {
+        yield* Effect.logInfo("skills rescanned", {
+          file,
+          sources: current.map(exports_skill.Source.key),
+          skills: loaded.skills.map((skill) => skill.id)
+        });
+      }
+    }, (effect, ..._args) => lock.withPermit(effect));
     yield* Stream.fromPubSub(changes).pipe(Stream.runForEach((file) => refresh(file).pipe(Effect.andThen(ctx.skill.reload()))), Effect.forkScoped({ startImmediately: true }));
     yield* refresh();
     yield* ctx.skill.transform((draft) => {

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

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/instructions/index.ts
 var exports_instructions = {};