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

package/dist/chunks/{project-1mvr5yep.js → state-3feq69af.js}

@@ -1,16 +1,19 @@
+import {
+  DiffError
+} from "./state-fd8j0005.js";
 import {
   MAX_PATCH_BYTES,
   MAX_TOTAL_PATCH_BYTES,
   PATCH_CONTEXT_LINES,
   chunksByFile,
   emptyPatch
-} from "./project-vz89hfgr.js";
+} from "./state-vz89hfgr.js";
 import {
   exports_location
-} from "./project-pm12wdxj.js";
+} from "./state-qph0wk53.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/plugin/vcs/git.ts
 var exports_git = {};
@@ -39,9 +42,10 @@ var Plugin = define({
         id: "git",
         name: "Git",
         info: () => adapter.info(),
+        base: () => adapter.base(),
         branches: (input) => adapter.branches({ search: input.search, limit: input.limit }),
         status: () => adapter.status(),
-        diff: (input) => adapter.diff(input.mode, { context: input.context })
+        diff: (input) => adapter.diff(input.mode, { context: input.context, base: input.base })
       });
     });
   })
@@ -55,6 +59,7 @@ function make(proc, input) {
       });
       return { branch: { current, default: root?.name } };
     }),
+    base: () => ctx.git.base(ctx.directory),
     branches: Effect.fn("VcsGit.branches")(function* (options) {
       return yield* ctx.git.branches(ctx.directory, options);
     }),
@@ -78,17 +83,17 @@ function make(proc, input) {
       if (mode === "working") {
         return yield* track(ctx, (yield* git.hasHead(ctx.directory)) ? "HEAD" : undefined, options);
       }
-      const [current, root] = yield* Effect.all([git.branch(ctx.directory), git.defaultBranch(ctx.directory)], {
-        concurrency: 2
-      });
-      if (!root)
-        return [];
-      if (current && current === root.name)
-        return [];
-      const ref = yield* git.mergeBase(ctx.directory, root.ref);
-      if (!ref)
-        return [];
-      return yield* diffAgainstRef(ctx, ref, options);
+      if (!(yield* git.hasHead(ctx.directory))) {
+        return mode === "committed" ? [] : yield* track(ctx, undefined, options);
+      }
+      const base = options?.base ?? (yield* git.defaultBranch(ctx.directory))?.ref;
+      const ref = base ? yield* git.mergeBase(ctx.directory, base) : undefined;
+      if (!ref) {
+        return yield* new DiffError({
+          message: base ? `No merge base available for ${base}` : "No review base available"
+        });
+      }
+      return yield* diffAgainstRef(ctx, ref, { ...options, target: mode === "committed" ? "HEAD" : undefined });
     })
   };
 }
@@ -191,12 +196,65 @@ function makeGit(proc) {
     if (list.includes("master"))
       return { name: "master", ref: "master" };
   });
+  const resolve = Effect.fnUntraced(function* (cwd, ref) {
+    const result = yield* run(["rev-parse", "--verify", "--end-of-options", `${ref}^{commit}`], { cwd });
+    if (result.exitCode !== 0)
+      return;
+    return result.text().trim() || undefined;
+  });
+  const ancestor = Effect.fnUntraced(function* (cwd, commit, ref) {
+    if (!/^[a-f0-9]{40,64}$/.test(commit))
+      return false;
+    return (yield* run(["merge-base", "--is-ancestor", commit, ref], { cwd })).exitCode === 0;
+  });
+  const namedRef = Effect.fnUntraced(function* (cwd, input) {
+    if (input === "HEAD" || input.endsWith("/HEAD") || /[~^:@{}\s]/.test(input))
+      return;
+    const ref = (yield* text(["rev-parse", "--symbolic-full-name", "--verify", "--end-of-options", input], {
+      cwd
+    })).trim();
+    if (!/^refs\/(heads|remotes)\/.+/.test(ref) || ref.endsWith("/HEAD") || !(yield* resolve(cwd, ref)))
+      return;
+    return { name: ref.replace(/^refs\/heads\//, "").replace(/^refs\/remotes\/[^/]+\//, ""), ref };
+  });
+  const base = Effect.fn("VcsGit.base")(function* (cwd) {
+    if (!(yield* hasHead(cwd)))
+      return null;
+    const current = yield* branch(cwd);
+    if (!current)
+      return yield* new DiffError({ message: "Choose a review base" });
+    const history = (yield* lines(["reflog", "show", "--max-count=256", "--format=%H%x00%gs", `refs/heads/${current}`], {
+      cwd
+    })).flatMap((line) => {
+      const match = /^([a-f0-9]+)\0(.+)$/.exec(line);
+      return match ? [{ commit: match[1], message: match[2] }] : [];
+    });
+    const renamed = history.some((entry) => entry.message.startsWith("Branch: renamed "));
+    const creation = renamed ? undefined : history.find((entry) => entry.message.startsWith("branch: Created from "));
+    const origin = creation?.message.slice("branch: Created from ".length);
+    if (creation && origin) {
+      const candidate2 = yield* namedRef(cwd, origin);
+      if (candidate2 && candidate2.name !== current && (yield* ancestor(cwd, creation.commit, "HEAD")) && (yield* ancestor(cwd, creation.commit, candidate2.ref))) {
+        return { ...candidate2, source: "reflog" };
+      }
+    }
+    const root = yield* defaultBranch(cwd);
+    if (!root || current !== root.name)
+      return yield* new DiffError({ message: "Choose a review base" });
+    const candidate = yield* namedRef(cwd, root.ref);
+    if (!candidate)
+      return yield* new DiffError({ message: "The default review base is unavailable" });
+    return { name: root.name, ref: candidate.ref, source: "default" };
+  });
   const hasHead = Effect.fn("VcsGit.hasHead")(function* (cwd) {
     const result = yield* run(["rev-parse", "--verify", "HEAD"], { cwd });
     return result.exitCode === 0;
   });
-  const mergeBase = Effect.fn("VcsGit.mergeBase")(function* (cwd, base) {
-    const result = yield* run(["merge-base", base, "HEAD"], { cwd });
+  const mergeBase = Effect.fn("VcsGit.mergeBase")(function* (cwd, base2) {
+    const ref = yield* resolve(cwd, base2);
+    if (!ref)
+      return;
+    const result = yield* run(["merge-base", ref, "HEAD"], { cwd });
     if (result.exitCode !== 0)
       return;
     return result.text().trim() || undefined;
@@ -210,8 +268,11 @@ function makeGit(proc) {
       return [{ file, code, status: kind(code) }];
     });
   });
-  const diff = Effect.fn("VcsGit.diffNames")(function* (cwd, ref) {
-    const list = nuls(yield* text(["diff", "--no-ext-diff", "--no-renames", "--name-status", "-z", ref, "--", "."], { cwd }));
+  const diff = Effect.fn("VcsGit.diffNames")(function* (cwd, ref, target) {
+    const result = yield* run(["diff", "--no-ext-diff", "--no-renames", "--name-status", "-z", ref, ...target ? [target] : [], "--", "."], { cwd });
+    if (result.exitCode !== 0)
+      return yield* new DiffError({ message: "Unable to list Git changes" });
+    const list = nuls(result.text());
     return list.flatMap((code, idx) => {
       if (idx % 2 !== 0)
         return [];
@@ -221,8 +282,8 @@ function makeGit(proc) {
       return [{ file, code, status: kind(code) }];
     });
   });
-  const stats = Effect.fn("VcsGit.stats")(function* (cwd, ref) {
-    return nuls(yield* text(["diff", "--no-ext-diff", "--no-renames", "--numstat", "-z", ref, "--", "."], { cwd })).flatMap((item) => {
+  const stats = Effect.fn("VcsGit.stats")(function* (cwd, ref, target) {
+    return nuls(yield* text(["diff", "--no-ext-diff", "--no-renames", "--numstat", "-z", ref, ...target ? [target] : [], "--", "."], { cwd })).flatMap((item) => {
       const a = item.indexOf("\t");
       const b = item.indexOf("\t", a + 1);
       if (a === -1 || b === -1)
@@ -244,11 +305,31 @@ function makeGit(proc) {
     });
   });
   const patch = Effect.fn("VcsGit.patch")(function* (cwd, ref, file, options) {
-    const result = yield* run(["diff", "--patch", "--no-ext-diff", "--no-renames", `--unified=${options?.context ?? 3}`, ref, "--", file], { cwd, maxOutputBytes: options?.maxOutputBytes });
+    const result = yield* run([
+      "diff",
+      "--patch",
+      "--no-ext-diff",
+      "--no-renames",
+      `--unified=${options?.context ?? 3}`,
+      ref,
+      ...options?.target ? [options.target] : [],
+      "--",
+      file
+    ], { cwd, maxOutputBytes: options?.maxOutputBytes });
     return { text: result.truncated ? "" : result.text(), truncated: result.truncated };
   });
   const patchAll = Effect.fn("VcsGit.patchAll")(function* (cwd, ref, options) {
-    const result = yield* run(["diff", "--patch", "--no-ext-diff", "--no-renames", `--unified=${options?.context ?? 3}`, ref, "--", "."], { cwd, maxOutputBytes: options?.maxOutputBytes });
+    const result = yield* run([
+      "diff",
+      "--patch",
+      "--no-ext-diff",
+      "--no-renames",
+      `--unified=${options?.context ?? 3}`,
+      ref,
+      ...options?.target ? [options.target] : [],
+      "--",
+      "."
+    ], { cwd, maxOutputBytes: options?.maxOutputBytes });
     return { text: result.text(), truncated: result.truncated };
   });
   const patchUntracked = Effect.fn("VcsGit.patchUntracked")(function* (cwd, file, options) {
@@ -286,6 +367,7 @@ function makeGit(proc) {
   return {
     branch,
     branches,
+    base,
     defaultBranch,
     hasHead,
     mergeBase,
@@ -312,6 +394,7 @@ var batchPatches = Effect.fnUntraced(function* (ctx, ref, list, options) {
   if (list.length === 0)
     return emptyBatch();
   const result = yield* ctx.git.patchAll(ctx.directory, ref, {
+    target: options?.target,
     context: options?.context ?? PATCH_CONTEXT_LINES,
     maxOutputBytes: MAX_TOTAL_PATCH_BYTES
   });
@@ -325,6 +408,7 @@ var nativePatch = Effect.fnUntraced(function* (ctx, ref, item, options) {
     context: options?.context ?? PATCH_CONTEXT_LINES,
     maxOutputBytes: MAX_PATCH_BYTES
   }) : yield* ctx.git.patch(ctx.worktree, ref, item.file, {
+    target: options?.target,
     context: options?.context ?? PATCH_CONTEXT_LINES,
     maxOutputBytes: MAX_PATCH_BYTES
   });
@@ -352,7 +436,7 @@ var files = Effect.fnUntraced(function* (ctx, ref, list, map, batch, options) {
   let total = 0;
   let capped = false;
   for (const item of list.toSorted((a, b) => a.file.localeCompare(b.file))) {
-    const stat = map.get(item.file) ?? (item.status === "added" ? yield* ctx.git.statUntracked(ctx.worktree, item.file) : undefined);
+    const stat = map.get(item.file) ?? (!options?.target && item.status === "added" ? yield* ctx.git.statUntracked(ctx.worktree, item.file) : undefined);
     const patch = yield* patchForItem(ctx, ref, item, batch, capped, options);
     const result = capped ? { patch, capped: true } : totalPatch(item.file, patch, total);
     capped = capped || result.capped;
@@ -371,7 +455,11 @@ var files = Effect.fnUntraced(function* (ctx, ref, list, map, batch, options) {
   return next;
 });
 var diffAgainstRef = Effect.fnUntraced(function* (ctx, ref, options) {
-  const [list, stats, extra] = yield* Effect.all([ctx.git.diff(ctx.directory, ref), ctx.git.stats(ctx.directory, ref), ctx.git.status(ctx.directory)], { concurrency: 3 });
+  const [list, stats, extra] = yield* Effect.all([
+    ctx.git.diff(ctx.directory, ref, options?.target),
+    ctx.git.stats(ctx.directory, ref, options?.target),
+    options?.target ? Effect.succeed([]) : ctx.git.status(ctx.directory)
+  ], { concurrency: 3 });
   return yield* files(ctx, ref, merge(list, extra.filter((item) => item.code === "??")), nums(stats), yield* batchPatches(ctx, ref, list, options), options);
 });
 var track = Effect.fnUntraced(function* (ctx, ref, options) {

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

@@ -2,10 +2,10 @@ import {
   Failed,
   NotFound,
   WrongKind
-} from "./project-xczfw7dq.js";
+} from "./state-xczfw7dq.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/environment/exec-defaults.ts
 var exports_exec_defaults = {};

package/dist/chunks/{project-fw3c683y.js → state-3qmndtx9.js}

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

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

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

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

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

package/dist/chunks/{project-xtjxhef7.js → state-3yz9d04b.js}

@@ -1,9 +1,9 @@
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/plugin/warming.ts
 var exports_warming = {};

package/dist/chunks/{project-7khw64yh.js → state-41qzzbpz.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};
@@ -38,6 +38,7 @@ var make = (options) => Effect.gen(function* () {
       executions.delete(key);
     Deferred.doneUnsafe(execution.done, exit);
   };
+  const isActive = (key) => Effect.sync(() => executions.has(key));
   const run = (key) => Effect.suspend(() => {
     const execution = executions.get(key);
     if (execution !== undefined) {
@@ -75,7 +76,7 @@ var make = (options) => Effect.gen(function* () {
       return Effect.void;
     return Deferred.await(execution.done).pipe(Effect.ignoreCause, Effect.andThen(awaitIdle(key)));
   });
-  return { active: Effect.sync(() => new Set(executions.keys())), run, wake, interrupt, awaitIdle };
+  return { active: Effect.sync(() => new Set(executions.keys())), isActive, run, wake, interrupt, awaitIdle };
 });
 
 export { make, exports_run_coordinator };

package/dist/chunks/{project-fj3jkv63.js → state-442jakqw.js}

@@ -1,15 +1,15 @@
 import {
   exports_entry_observer
-} from "./project-kp1t5rcy.js";
-import {
-  exports_tool_output
-} from "./project-f7q7a28y.js";
+} from "./state-kp1t5rcy.js";
 import {
   exports_config
-} from "./project-6kmefejb.js";
+} from "./state-rrqrf7hs.js";
+import {
+  exports_tool_output
+} from "./state-7ccgh94t.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/config/plugin/tool-output.ts
 var exports_tool_output2 = {};

package/dist/chunks/{project-gm95ds07.js → state-48kmwd7y.js}

@@ -1,21 +1,21 @@
-import {
-  mapOpenAICompatibleFinishReason
-} from "./project-0cgt0xh2.js";
-import {
-  prepareTools
-} from "./project-ezs3tagn.js";
 import {
   getResponseMetadata
-} from "./project-bbqs2y60.js";
+} from "./state-bbqs2y60.js";
 import {
-  convertToOpenAICompatibleChatMessages
-} from "./project-brsh5f65.js";
+  prepareTools
+} from "./state-ezs3tagn.js";
 import {
   defaultOpenAICompatibleErrorStructure
-} from "./project-1wcz8fvj.js";
+} from "./state-1wcz8fvj.js";
 import {
   openaiCompatibleProviderOptions
-} from "./project-a02svayp.js";
+} from "./state-a02svayp.js";
+import {
+  convertToOpenAICompatibleChatMessages
+} from "./state-brsh5f65.js";
+import {
+  mapOpenAICompatibleFinishReason
+} from "./state-0cgt0xh2.js";
 
 // src/github-copilot/chat/openai-compatible-chat-language-model.ts
 import {
@@ -480,7 +480,11 @@ class OpenAICompatibleChatLanguageModel {
             });
           }
           if (isActiveText) {
-            controller.enqueue({ type: "text-end", id: "txt-0" });
+            controller.enqueue({
+              type: "text-end",
+              id: "txt-0",
+              providerMetadata: reasoningOpaque ? { copilot: { reasoningOpaque } } : undefined
+            });
           }
           for (const toolCall of toolCalls.filter((toolCall2) => !toolCall2.hasFinished)) {
             controller.enqueue({

package/dist/chunks/{project-1v4q2qp6.js → state-4n623fxr.js}

@@ -1,15 +1,15 @@
 import {
   makeDaemonTransport
-} from "./project-9maxscqf.js";
+} from "./state-9maxscqf.js";
 import {
   exports_select
-} from "./project-bbhffenw.js";
+} from "./state-bbhffenw.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/persistent-pty/index.ts
 var exports_persistent_pty = {};

package/dist/chunks/{project-qxsjpy8c.js → state-4twq59qz.js}

@@ -1,21 +1,21 @@
 import {
   exports_repository_cache
-} from "./project-eeta29b7.js";
+} from "./state-k828h0dz.js";
 import {
   exports_repository
-} from "./project-y198y2ra.js";
+} from "./state-y198y2ra.js";
 import {
   exports_state
-} from "./project-x89rah0x.js";
+} from "./state-x89rah0x.js";
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   exports_bus
-} from "./project-gy9zm4ck.js";
+} from "./state-cgy4zpa6.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/reference.ts
 var exports_reference = {};