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

package/dist/chunks/{state-jgvtg6c9.js → job-3smmxcq1.js}

@@ -1,28 +1,31 @@
+import {
+  exports_markers
+} from "./job-gbnb8jff.js";
 import {
   exports_schema
-} from "./state-wptv627x.js";
+} from "./job-h94zdhz8.js";
 import {
   WorktreeTable
-} from "./state-mh28new4.js";
+} from "./job-mh28new4.js";
 import {
   ProjectTable,
   upsertProject
-} from "./state-88jbfw8z.js";
+} from "./job-88jbfw8z.js";
 import {
   exports_git
-} from "./state-se1aqaya.js";
+} from "./job-se1aqaya.js";
 import {
   AbsolutePath
-} from "./state-j07kk359.js";
+} from "./job-j07kk359.js";
 import {
   exports_bus
-} from "./state-kxp8ef5p.js";
+} from "./job-frw2f85x.js";
 import {
   exports_database
-} from "./state-1z63g373.js";
+} from "./job-tdjnen9r.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/project.ts
 var exports_project = {};
@@ -57,8 +60,8 @@ class NotFoundError extends Schema.TaggedError()("Project.NotFoundError", {
   projectID: ID
 }) {
 }
-var root = Effect.fn("Project.root")(function* (fs, input) {
-  return yield* fs.up({ targets: [".git", ".hg"], start: input, mode: "first" }).pipe(Effect.map((matches) => matches[0] ? AbsolutePath.make(path.dirname(matches[0])) : undefined), Effect.orElseSucceed(() => {
+var root = Effect.fn("Project.root")(function* (fs, input, markers = [".git", ".hg"]) {
+  return yield* fs.up({ targets: [...markers], start: input, mode: "first" }).pipe(Effect.map((matches) => matches[0] ? AbsolutePath.make(path.dirname(matches[0])) : undefined), Effect.orElseSucceed(() => {
     return;
   }));
 });
@@ -89,6 +92,7 @@ function fromRow(row) {
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const git = yield* exports_git.Service;
+  const markers = yield* exports_markers.Service;
   const proc = yield* AppProcess.Service;
   const bus = yield* exports_bus.Service;
   const db = (yield* exports_database.Service).db;
@@ -128,10 +132,10 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
             return false;
           if (!FSUtil.contains(directory, candidate.directory))
             return false;
-          const markers = yield* fs.up({ targets: [".git", ".hg"], start: candidate.directory, stop: directory, mode: "first" }).pipe(Effect.orElseSucceed(() => []));
-          if (!markers[0])
+          const found = yield* fs.up({ targets: [...markers.targets()], start: candidate.directory, stop: directory, mode: "first" }).pipe(Effect.orElseSucceed(() => []));
+          if (!found[0])
             return false;
-          return (yield* fs.resolve(path.dirname(markers[0]))) === directory;
+          return (yield* fs.resolve(path.dirname(found[0]))) === directory;
         }));
         yield* bus.publish(Worktree.Event.Resolved, {
           projectID: item.projectID,
@@ -233,11 +237,12 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   });
   const resolve = Effect.fn("Project.resolve")(function* (input) {
     const directory = AbsolutePath.make(yield* fs.resolve(input));
-    const marker = yield* fs.up({ targets: [".git", ".hg"], start: directory, mode: "first" }).pipe(Effect.map((matches) => matches[0]), Effect.orElseSucceed(() => {
+    const marker = yield* markers.discover(directory);
+    const native = yield* fs.up({ targets: [".git", ".hg"], start: directory, mode: "first" }).pipe(Effect.map((matches) => matches[0]), Effect.orElseSucceed(() => {
       return;
     }));
-    const repo = marker && path.basename(marker) === ".git" ? yield* git.repo.discover(AbsolutePath.make(path.dirname(marker))) : undefined;
-    if (repo) {
+    const repo = native && path.basename(native) === ".git" ? yield* git.repo.discover(AbsolutePath.make(path.dirname(native))) : undefined;
+    if (repo && (!marker || FSUtil.contains(marker.directory, repo.worktree))) {
       const previous = yield* cached(repo.commonDirectory);
       const id = (yield* remote(repo)) ?? previous ?? (yield* rootCommit(repo));
       const canonical = repo.gitDirectory === repo.commonDirectory ? repo.worktree : yield* git.worktree.list(repo).pipe(Effect.map((items) => items.find((item) => item.kind === "main")?.directory ?? repo.worktree), Effect.orElseSucceed(() => repo.worktree));
@@ -246,12 +251,28 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         id: id ?? ID.global,
         directory: repo.worktree,
         canonical,
-        vcs: { type: "git", store: repo.commonDirectory }
+        vcs: { type: "git", store: repo.commonDirectory },
+        ...marker?.directory === repo.worktree && marker.type !== "git" ? { vcsBackend: marker.type } : {}
+      });
+    }
+    const hg = native && path.basename(native) === ".hg" ? yield* hgDiscover(AbsolutePath.make(native)) : undefined;
+    if (hg && (!marker || FSUtil.contains(marker.directory, hg.directory))) {
+      return yield* persist({
+        ...hg,
+        canonical: hg.directory,
+        ...marker?.directory === hg.directory && marker.type !== "hg" ? { vcsBackend: marker.type } : {}
+      });
+    }
+    if (marker) {
+      const previous = yield* cached(marker.marker);
+      return yield* persist({
+        previous,
+        id: previous ?? ID.make(Hash.fast(`vcs-repository:${marker.type}:${marker.marker}`)),
+        directory: marker.directory,
+        canonical: marker.directory,
+        vcs: { type: marker.type, store: marker.marker }
       });
     }
-    const hg = marker && path.basename(marker) === ".hg" ? yield* hgDiscover(AbsolutePath.make(marker)) : undefined;
-    if (hg)
-      return yield* persist({ ...hg, canonical: hg.directory });
     return yield* persist({
       id: ID.make(Hash.fast(`directory:${directory}`)),
       directory,
@@ -264,7 +285,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
 var node = makeGlobalNode({
   service: Service,
   layer,
-  deps: [exports_bus.node, exports_database.node, FSUtil.node, exports_git.node, AppProcess.node]
+  deps: [exports_bus.node, exports_database.node, FSUtil.node, exports_git.node, exports_markers.node, AppProcess.node]
 });
 
 export { ID, Vcs, Current, Info, UpdateInput, NotFoundError, root, Service, node, exports_project };

package/dist/chunks/{state-3thh6229.js → job-3thh6229.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./state-0zz82cjq.js";
+} from "./job-0zz82cjq.js";
 import {
   __require
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/provider/mistral.ts
 var MistralPlugin = createProviderPlugin({

package/dist/chunks/{state-a600x74j.js → job-3ws7dzb8.js}

@@ -1,9 +1,9 @@
 import {
   exports_bus
-} from "./state-kxp8ef5p.js";
+} from "./job-frw2f85x.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/form.ts
 var exports_form = {};

package/dist/chunks/{state-emksydcf.js → job-4d0g1h1w.js}

@@ -1,81 +1,81 @@
 import {
   createLLMEventPublisher
-} from "./state-dyrphakh.js";
-import {
-  exports_retry
-} from "./state-0b17sr9d.js";
+} from "./job-9fxjt5sk.js";
 import {
   MAX_STEPS_PROMPT
-} from "./state-qaarhjrp.js";
-import {
-  exports_title
-} from "./state-0qdyn92p.js";
+} from "./job-qaarhjrp.js";
 import {
-  exports_prompt_cache_diagnostics
-} from "./state-wd268jeg.js";
+  exports_retry
+} from "./job-0b17sr9d.js";
 import {
   exports_context
-} from "./state-p1c6e6m1.js";
+} from "./job-drtsm3dn.js";
 import {
   exports_supervisor
-} from "./state-7rn7c1wb.js";
+} from "./job-5dqh46tn.js";
 import {
   exports_compaction
-} from "./state-h3y01asp.js";
+} from "./job-kd8bnpma.js";
 import {
-  exports_usage
-} from "./state-sw84ckhj.js";
+  exports_prompt_cache_diagnostics
+} from "./job-wd268jeg.js";
+import {
+  exports_title
+} from "./job-ddfrc481.js";
 import {
   exports_model_request
-} from "./state-kb33ew3e.js";
+} from "./job-zj8wvy7w.js";
+import {
+  exports_usage
+} from "./job-sw84ckhj.js";
 import {
   exports_tool_output
-} from "./state-19nk26qg.js";
+} from "./job-7ccgh94t.js";
 import {
   exports_tool
-} from "./state-rpqdmjwk.js";
+} from "./job-thy9431f.js";
 import {
   Service
-} from "./state-cz3dkvcz.js";
-import {
-  exports_inbox
-} from "./state-j5q8scqt.js";
+} from "./job-cz3dkvcz.js";
 import {
   toSessionError
-} from "./state-jabxf61s.js";
+} from "./job-2zwe4rpe.js";
 import {
   exports_model_transport
-} from "./state-d4ax61k3.js";
+} from "./job-d4ax61k3.js";
 import {
-  llmClient
-} from "./state-k42t1tha.js";
+  exports_inbox
+} from "./job-084s09rb.js";
 import {
   exports_snapshot
-} from "./state-zmtjwfap.js";
+} from "./job-d8pmf8rs.js";
 import {
-  exports_store
-} from "./state-6m78tbrd.js";
+  llmClient
+} from "./job-k42t1tha.js";
 import {
-  StepFailedError
-} from "./state-fb7nfzf2.js";
+  exports_store
+} from "./job-gy2yfbjm.js";
 import {
   exports_instruction_state
-} from "./state-f11jbhcb.js";
+} from "./job-f11jbhcb.js";
+import {
+  StepFailedError
+} from "./job-fb7nfzf2.js";
 import {
   SessionMessage
-} from "./state-8rpfd2h6.js";
+} from "./job-8rpfd2h6.js";
 import {
   SessionEvent
-} from "./state-a83yvq99.js";
+} from "./job-a83yvq99.js";
 import {
   exports_bus
-} from "./state-kxp8ef5p.js";
+} from "./job-frw2f85x.js";
 import {
   exports_database
-} from "./state-1z63g373.js";
+} from "./job-tdjnen9r.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
@@ -349,6 +349,8 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       const stream = yield* restore(providerStream).pipe(Effect.exit);
       const streamFailure = Option.getOrUndefined(Exit.findErrorOption(stream));
       const streamInterrupted = stream._tag === "Failure" && Cause.hasInterrupts(stream.cause);
+      if (!overflowFailure && publisher.hasStarted())
+        yield* publisher.streamed();
       if (streamInterrupted)
         yield* interruptTools;
       const joined = yield* restore(Effect.forEach(toolRuns, (run) => Fiber.await(run.fiber), { concurrency: "unbounded" })).pipe(Effect.exit);

package/dist/chunks/{state-4s2xwh5d.js → job-4s2xwh5d.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./state-v9bfv94f.js";
+} from "./job-v9bfv94f.js";
 import {
   PositiveInt
-} from "./state-j07kk359.js";
+} from "./job-j07kk359.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/v1/config/agent.ts
 var exports_agent = {};

package/dist/chunks/{state-6zrz2gj9.js → job-4zk15ffz.js}

@@ -1,21 +1,21 @@
 import {
   exports_entry_observer
-} from "./state-kp1t5rcy.js";
-import {
-  exports_config
-} from "./state-b17xd5mf.js";
+} from "./job-kp1t5rcy.js";
 import {
   exports_reference
-} from "./state-91frc5mm.js";
+} from "./job-qfa3tbfc.js";
+import {
+  exports_config
+} from "./job-t0wrnah1.js";
 import {
   exports_location
-} from "./state-1jg449r0.js";
+} from "./job-vx668anc.js";
 import {
   AbsolutePath
-} from "./state-j07kk359.js";
+} from "./job-j07kk359.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/config/plugin/reference.ts
 var exports_reference2 = {};

package/dist/chunks/{state-4zzdwbaz.js → job-4zzdwbaz.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./state-0zz82cjq.js";
+} from "./job-0zz82cjq.js";
 import {
   __require
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/provider/alibaba.ts
 var AlibabaPlugin = createProviderPlugin({

package/dist/chunks/{state-50jxp3hw.js → job-50jxp3hw.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/app.ts
 var exports_app = {};

package/dist/chunks/{state-57tzwnz4.js → job-57tzwnz4.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/codemode/catalog.ts
 var exports_catalog = {};

package/dist/chunks/{state-pspf2xyp.js → job-58f5w9q3.js}

@@ -1,12 +1,12 @@
 import {
   exports_config
-} from "./state-b17xd5mf.js";
+} from "./job-t0wrnah1.js";
 import {
   exports_model
-} from "./state-3zyjx98r.js";
+} from "./job-r13w8t0w.js";
 import {
   exports_provider
-} from "./state-hhajr42d.js";
+} from "./job-krsqcmnj.js";
 
 // src/plugin/provider/lmstudio.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";

package/dist/chunks/{state-58xdvehb.js → job-58xdvehb.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/id/id.ts
 var exports_id = {};

package/dist/chunks/{state-zh7kq3j8.js → job-5bgse5wx.js}

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

package/dist/chunks/{state-11jmdqxk.js → job-5cdnkd94.js}

@@ -1,12 +1,12 @@
 import {
   exports_model
-} from "./state-3zyjx98r.js";
+} from "./job-r13w8t0w.js";
 import {
   exports_provider
-} from "./state-hhajr42d.js";
+} from "./job-krsqcmnj.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/variant.ts
 var exports_variant = {};

package/dist/chunks/{state-7rn7c1wb.js → job-5dqh46tn.js}

@@ -1,27 +1,27 @@
-import {
-  exports_sdk
-} from "./state-yxz07vzv.js";
 import {
   exports_internal
-} from "./state-4p1mqhwg.js";
-import {
-  exports_promise
-} from "./state-5vcssjzn.js";
+} from "./job-ydk11412.js";
 import {
   exports_source
-} from "./state-2q2hjh4d.js";
+} from "./job-922w9t38.js";
 import {
   exports_plugin
-} from "./state-b64x4rkh.js";
+} from "./job-qja57hk7.js";
 import {
   Service
-} from "./state-s33fw6zm.js";
+} from "./job-s33fw6zm.js";
+import {
+  exports_sdk
+} from "./job-cvb5zfes.js";
+import {
+  exports_module
+} from "./job-75h1hfe2.js";
 import {
   exports_bus
-} from "./state-kxp8ef5p.js";
+} from "./job-frw2f85x.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/supervisor.ts
 var exports_supervisor = {};
@@ -32,26 +32,10 @@ __export(exports_supervisor, {
   PluginSupervisor: () => exports_supervisor
 });
 import { Event } from "@opencode-ai/schema/config";
-import { Cause, Effect, Latch, Layer, Schema, Stream } from "effect";
+import { Cause, Effect, Latch, Layer, Stream } from "effect";
 import path from "path";
-import { pathToFileURL } from "url";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import { Npm } from "@opencode-ai/util/npm";
-import { importModule } from "@opencode-ai/util/runtime-import";
-var PluginModule = Schema.Struct({
-  default: Schema.Union([
-    Schema.Struct({
-      id: Schema.String,
-      tui: Schema.optional(Schema.Boolean),
-      effect: Schema.declare((input) => typeof input === "function")
-    }),
-    Schema.Struct({
-      id: Schema.String,
-      tui: Schema.optional(Schema.Boolean),
-      setup: Schema.declare((input) => typeof input === "function")
-    })
-  ])
-});
 var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operations) {
   const matches = (selector, target) => selector === "*" || (selector.endsWith(".*") ? target.startsWith(selector.slice(0, -1)) : selector === target);
   const definitions = [...pre, ...post];
@@ -72,7 +56,7 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operat
       matched.forEach((plugin2) => enabled.add(plugin2.id));
       continue;
     }
-    const plugin = yield* load(operation).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to load plugin", { target: operation.target, cause }).pipe(Effect.as({ error: Cause.pretty(cause) }))));
+    const plugin = yield* exports_module.load(operation).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to load plugin", { target: operation.target, cause }).pipe(Effect.as({ error: Cause.pretty(cause) }))));
     if ("error" in plugin) {
       failures.set(operation.target, {
         source: pluginSource(operation.target),
@@ -98,24 +82,6 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (pre, post, operat
     failures: [...failures.values()]
   };
 });
-var load = Effect.fn("PluginSupervisor.load")(function* (operation) {
-  const npm = yield* Npm.Service;
-  const entrypoint = path.isAbsolute(operation.target) ? pathToFileURL(operation.target).href : (yield* npm.add(operation.target, { subpaths: ["server", ""], refresh: true })).entrypoint;
-  if (!entrypoint)
-    return yield* Effect.fail(new Error(`Plugin entrypoint not found: ${operation.target}`));
-  const source = operation.mtime === undefined ? entrypoint : typeof Bun !== "undefined" ? `${operation.target.replaceAll("\\", "/")}?mtime=${operation.mtime}` : `${entrypoint}?mtime=${operation.mtime}`;
-  yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint: source });
-  const mod = yield* Effect.promise(() => importModule(source));
-  const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default;
-  const plugin = "effect" in value ? value : exports_promise.fromPromise(value);
-  return {
-    id: plugin.id,
-    tui: plugin.tui,
-    version: JSON.stringify(operation),
-    source: pluginSource(operation.target),
-    effect: (host) => plugin.effect({ ...host, options: operation.options })
-  };
-});
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const registry = yield* exports_plugin.Service;
   const sdk = yield* exports_sdk.Service;

package/dist/chunks/{state-fj104twx.js → job-5eh8r8bf.js}

@@ -1,9 +1,9 @@
 import {
   exports_environment1 as exports_environment
-} from "./state-8mcwjqk5.js";
+} from "./job-me0wdj6t.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/mcp/stdio.ts
 var exports_stdio = {};

package/dist/chunks/{state-5fe026tx.js → job-5fe026tx.js}

@@ -1,12 +1,12 @@
 import {
   exports_mcp
-} from "./state-c4wcb9vc.js";
+} from "./job-c4wcb9vc.js";
 import {
   exports_app
-} from "./state-50jxp3hw.js";
+} from "./job-50jxp3hw.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/websearch/parallel.ts
 var exports_parallel = {};

package/dist/chunks/{state-5rs65q6p.js → job-5rs65q6p.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/database/sqlite.ts
 var exports_sqlite = {};

package/dist/chunks/{state-5vcssjzn.js → job-5vcssjzn.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/plugin/promise.ts
 var exports_promise = {};

package/dist/chunks/{state-gyrwtw78.js → job-5y8r1r74.js}

@@ -1,15 +1,15 @@
 import {
   InstructionEntryTable
-} from "./state-ygy0xbqa.js";
+} from "./job-ygy0xbqa.js";
 import {
   exports_instructions
-} from "./state-ec8vrfw5.js";
+} from "./job-ec8vrfw5.js";
 import {
   exports_database
-} from "./state-1z63g373.js";
+} from "./job-tdjnen9r.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/session/instruction-entry.ts
 var exports_instruction_entry = {};

package/dist/chunks/{state-5z4zwtb4.js → job-5z4zwtb4.js}

@@ -1,9 +1,9 @@
 import {
   definition
-} from "./state-drean1vx.js";
+} from "./job-drean1vx.js";
 import {
   __export
-} from "./state-rvfvac9x.js";
+} from "./job-rvfvac9x.js";
 
 // src/codemode/tool.ts
 var exports_tool = {};

package/dist/chunks/{state-21cqa2vh.js → job-62634baa.js}

@@ -1,15 +1,15 @@
 import {
   exports_app
-} from "./state-50jxp3hw.js";
+} from "./job-50jxp3hw.js";
 import {
   exports_integration
-} from "./state-61ba6bgr.js";
+} from "./job-nxzsxngj.js";
 import {
   exports_credential
-} from "./state-e3fd12s5.js";
+} from "./job-ghbdxb5r.js";
 import {
   exports_provider
-} from "./state-hhajr42d.js";
+} from "./job-krsqcmnj.js";
 
 // src/plugin/provider/xai.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";