@opencode/core 2.0.27 → 2.0.28

package/dist/bus.js

@@ -10,77 +10,77 @@ import {
   configured12,
   node88,
   exports_bus
-} from "./chunks/filesystem-vdfrtany.js";
+} from "./chunks/filesystem-zrdk58qt.js";
 import"./chunks/filesystem-2710q6r3.js";
 import"./chunks/filesystem-y71avatq.js";
-import"./chunks/filesystem-zqpzmbkm.js";
-import"./chunks/filesystem-zp2jr73m.js";
+import"./chunks/filesystem-r9h634c8.js";
+import"./chunks/filesystem-4wxv1g1t.js";
 import"./chunks/filesystem-pkyv6v7h.js";
-import"./chunks/filesystem-sy62yj56.js";
-import"./chunks/filesystem-q74kybfr.js";
-import"./chunks/filesystem-rcb2kzg1.js";
+import"./chunks/filesystem-0zkw76rk.js";
+import"./chunks/filesystem-krc3a0yk.js";
+import"./chunks/filesystem-n9kc33re.js";
+import"./chunks/filesystem-9sjeq45g.js";
+import"./chunks/filesystem-7mwvqe74.js";
+import"./chunks/filesystem-t8c0xvf3.js";
+import"./chunks/filesystem-822emrt2.js";
+import"./chunks/filesystem-m9w0rfyh.js";
+import"./chunks/filesystem-7bmhse3q.js";
+import"./chunks/filesystem-f0mxakyp.js";
+import"./chunks/filesystem-wd87259q.js";
+import"./chunks/filesystem-cf4snx6d.js";
+import"./chunks/filesystem-w3wsvvr9.js";
+import"./chunks/filesystem-emrn6kk6.js";
+import"./chunks/filesystem-tyts7tda.js";
+import"./chunks/filesystem-359p4xyc.js";
+import"./chunks/filesystem-j2ntwpah.js";
+import"./chunks/filesystem-bkyjaxrp.js";
 import"./chunks/filesystem-jr7sbwjy.js";
+import"./chunks/filesystem-njntx4h6.js";
+import"./chunks/filesystem-jzg6c2d5.js";
+import"./chunks/filesystem-2c3vjs8z.js";
+import"./chunks/filesystem-9a4afbnw.js";
+import"./chunks/filesystem-hk9envan.js";
+import"./chunks/filesystem-df08tz66.js";
+import"./chunks/filesystem-qrg20bc0.js";
 import"./chunks/filesystem-84wd9syh.js";
+import"./chunks/filesystem-n3j8tn72.js";
+import"./chunks/filesystem-y8f7s663.js";
+import"./chunks/filesystem-a6k6eb26.js";
 import"./chunks/filesystem-n05xt0ee.js";
-import"./chunks/filesystem-df08tz66.js";
-import"./chunks/filesystem-359p4xyc.js";
-import"./chunks/filesystem-8n3pysct.js";
-import"./chunks/filesystem-aqzs7mqg.js";
-import"./chunks/filesystem-4knz6hnm.js";
-import"./chunks/filesystem-43n2bw4t.js";
-import"./chunks/filesystem-wtztk69x.js";
-import"./chunks/filesystem-1cnp2v09.js";
+import"./chunks/filesystem-rcb2kzg1.js";
+import"./chunks/filesystem-mp448xyj.js";
+import"./chunks/filesystem-m18g726c.js";
+import"./chunks/filesystem-ygaqb7jw.js";
 import"./chunks/filesystem-d9fn303g.js";
+import"./chunks/filesystem-1cnp2v09.js";
 import"./chunks/filesystem-e5kj55wp.js";
-import"./chunks/filesystem-qrg20bc0.js";
+import"./chunks/filesystem-q74kybfr.js";
+import"./chunks/filesystem-7akdwqpd.js";
+import"./chunks/filesystem-sdp7kfr6.js";
+import"./chunks/filesystem-8n3pysct.js";
+import"./chunks/filesystem-wer8tq1h.js";
 import"./chunks/filesystem-7m9af43g.js";
-import"./chunks/filesystem-a6k6eb26.js";
-import"./chunks/filesystem-cvy3z8tj.js";
-import"./chunks/filesystem-fd410y7t.js";
-import"./chunks/filesystem-qb87gjwd.js";
-import"./chunks/filesystem-jzg6c2d5.js";
-import"./chunks/filesystem-53557ph1.js";
-import"./chunks/filesystem-9a4afbnw.js";
-import"./chunks/filesystem-mp448xyj.js";
+import"./chunks/filesystem-ssg3fenm.js";
+import"./chunks/filesystem-f6n9ztr4.js";
+import"./chunks/filesystem-wtztk69x.js";
+import"./chunks/filesystem-43n2bw4t.js";
 import"./chunks/filesystem-d9jj8t3e.js";
-import"./chunks/filesystem-ygaqb7jw.js";
-import"./chunks/filesystem-atq7p7m5.js";
+import"./chunks/filesystem-fd410y7t.js";
+import"./chunks/filesystem-4knz6hnm.js";
 import"./chunks/filesystem-msx8hqn2.js";
+import"./chunks/filesystem-q3sfg36h.js";
+import"./chunks/filesystem-w803qqfp.js";
 import"./chunks/filesystem-jwfs4k6c.js";
-import"./chunks/filesystem-7akdwqpd.js";
-import"./chunks/filesystem-m18g726c.js";
+import"./chunks/filesystem-qb87gjwd.js";
 import"./chunks/filesystem-17cy0kzp.js";
-import"./chunks/filesystem-w803qqfp.js";
-import"./chunks/filesystem-n3j8tn72.js";
-import"./chunks/filesystem-f6n9ztr4.js";
-import"./chunks/filesystem-q3sfg36h.js";
-import"./chunks/filesystem-2c3vjs8z.js";
+import"./chunks/filesystem-atq7p7m5.js";
 import"./chunks/filesystem-8wj87zfr.js";
-import"./chunks/filesystem-wer8tq1h.js";
 import"./chunks/filesystem-z9919s4g.js";
-import"./chunks/filesystem-y8f7s663.js";
-import"./chunks/filesystem-bmr6ed5q.js";
+import"./chunks/filesystem-cvy3z8tj.js";
+import"./chunks/filesystem-53557ph1.js";
 import"./chunks/filesystem-g86h250q.js";
-import"./chunks/filesystem-njntx4h6.js";
-import"./chunks/filesystem-j2ntwpah.js";
-import"./chunks/filesystem-bkyjaxrp.js";
-import"./chunks/filesystem-ssg3fenm.js";
-import"./chunks/filesystem-sdp7kfr6.js";
-import"./chunks/filesystem-hk9envan.js";
-import"./chunks/filesystem-0zkw76rk.js";
-import"./chunks/filesystem-d6jv500s.js";
-import"./chunks/filesystem-gacw69ge.js";
-import"./chunks/filesystem-e850ppb0.js";
-import"./chunks/filesystem-t63kk2n9.js";
-import"./chunks/filesystem-nnbqx04f.js";
-import"./chunks/filesystem-w3wsvvr9.js";
-import"./chunks/filesystem-822emrt2.js";
-import"./chunks/filesystem-f0mxakyp.js";
-import"./chunks/filesystem-cf4snx6d.js";
-import"./chunks/filesystem-7bmhse3q.js";
-import"./chunks/filesystem-m9w0rfyh.js";
-import"./chunks/filesystem-wd87259q.js";
-import"./chunks/filesystem-emrn6kk6.js";
+import"./chunks/filesystem-bmr6ed5q.js";
+import"./chunks/filesystem-aqzs7mqg.js";
 export {
   exports_bus as Bus,
   InvalidDurableEventError2 as InvalidDurableEventError,

package/dist/chunks/{filesystem-eaednpsc.js → filesystem-02hzg919.js}

@@ -3,22 +3,22 @@ import {
 } from "./filesystem-z5v4ffb3.js";
 import {
   Action2
-} from "./filesystem-97aeaand.js";
+} from "./filesystem-bmr56wjg.js";
 import {
-  Info9
-} from "./filesystem-n61013np.js";
+  Info10
+} from "./filesystem-bfegkxfd.js";
 import {
-  Info13
-} from "./filesystem-6hh8tjw2.js";
+  Info7
+} from "./filesystem-8rqycdgd.js";
 import {
-  Info11
-} from "./filesystem-g6yfr6ja.js";
+  Info9
+} from "./filesystem-w39jehkq.js";
 import {
   Spec2
-} from "./filesystem-0jwsre1p.js";
+} from "./filesystem-2k8khapm.js";
 import {
-  Info12
-} from "./filesystem-b674v2dg.js";
+  Info8
+} from "./filesystem-bx0gyb4h.js";
 import {
   normalizeAction2,
   migrateAgent2,
@@ -27,7 +27,7 @@ import {
   migrateMcp2,
   migrateProvider2,
   providerID2
-} from "./filesystem-40hy4nm0.js";
+} from "./filesystem-p3m2ynk3.js";
 import {
   __export
 } from "./filesystem-9rqn6x4v.js";
@@ -97,12 +97,12 @@ function normalize2(input) {
   const legacyReferences = decodeMap(input.reference, ConfigReference.Entry, ["reference"], diagnostics, decodeEncoded);
   const nativeReferences = decodeMap(input.references, ConfigReference.Entry, ["references"], diagnostics, decodeEncoded);
   mergeMap(encoded, "references", legacyReferences, nativeReferences, isRecord(input.reference) || isRecord(input.references), diagnostics);
-  const legacyCommands = decodeMap(input.command, Info13, ["command"], diagnostics, decodeValue);
+  const legacyCommands = decodeMap(input.command, Info7, ["command"], diagnostics, decodeValue);
   diagnoseSelectionMap(input.command, ["command"], diagnostics);
   const migratedCommands = mapValues(legacyCommands, (value) => canonical(ConfigCommand.Info, migrateCommand2(value)));
   const nativeCommands = decodeMap(input.commands, ConfigCommand.Info, ["commands"], diagnostics, decodeEncoded);
   mergeMap(encoded, "commands", migratedCommands, nativeCommands, isRecord(input.command) || isRecord(input.commands), diagnostics);
-  const legacyAgents = mapValues(decodeMap(input.agent, Info9, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
+  const legacyAgents = mapValues(decodeMap(input.agent, Info10, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
   const legacySmallModel = own(input, "small_model") ? decodeValue(Schema.String, input.small_model, ["small_model"], diagnostics) : undefined;
   const migratedSmallModel = modelSelection2(legacySmallModel);
   if (legacySmallModel && !migratedSmallModel)
@@ -116,7 +116,7 @@ function normalize2(input) {
       model: migratedSmallModel,
       ...legacyAgents.title
     };
-  const modeAgents = mapValues(decodeMap(input.mode, Info9, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
+  const modeAgents = mapValues(decodeMap(input.mode, Info10, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
   const migratedAgents = mergeMaps(legacyAgents, modeAgents, ["agents"], diagnostics);
   const nativeAgents = decodeMap(input.agents, ConfigAgent.Info, ["agents"], diagnostics, decodeEncoded);
   diagnoseAgentUnsupported(input.agent, ["agent"], diagnostics);
@@ -217,7 +217,7 @@ function normalizeMcp(input, encoded, diagnostics) {
           normalizeMcpTimeout(value, timeout, path, diagnostics);
           return;
         }
-        const server = decodeValue(Info11, value, path, diagnostics);
+        const server = decodeValue(Info9, value, path, diagnostics);
         if (server !== undefined)
           setOwn(legacyServers, name, canonical(ConfigMCP.Server, migrateMcp2(server)));
       });
@@ -413,7 +413,7 @@ function migrateProviders(value, diagnostics) {
     diagnoseProviderUnsupported(raw, path, diagnostics);
     if (invalidProviderOverlays(raw, path, diagnostics))
       return [];
-    const provider = decodeValue(Info12, raw, path, diagnostics);
+    const provider = decodeValue(Info8, raw, path, diagnostics);
     if (provider === undefined)
       return [];
     const destination = providerID2(name);

package/dist/chunks/{filesystem-tn22h724.js → filesystem-09ygvw9n.js}

@@ -1,7 +1,7 @@
 import {
   Service81,
   node85
-} from "./filesystem-42nthewb.js";
+} from "./filesystem-53rak1ew.js";
 import {
   Key3,
   make20,
@@ -15,18 +15,18 @@ import {
 var exports_builtins = {};
 __export(exports_builtins, {
   InstructionBuiltIns: () => exports_builtins,
-  Service: () => Service25,
-  node: () => node28
+  Service: () => Service30,
+  node: () => node34
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, DateTime, Effect, Layer, Schema } from "effect";
 import { Global } from "@opencode/util/global";
-class Service25 extends Context.Service()("@opencode/InstructionBuiltIns") {
+class Service30 extends Context.Service()("@opencode/InstructionBuiltIns") {
 }
-var layer = Layer.effect(Service25, Effect.gen(function* () {
+var layer = Layer.effect(Service30, Effect.gen(function* () {
   const global = yield* Global.Service;
   const location = yield* Service81;
-  return Service25.of({
+  return Service30.of({
     load: () => Effect.succeed(combine2([
       make20({
         key: Key3.make("core/date"),
@@ -60,6 +60,6 @@ var layer = Layer.effect(Service25, Effect.gen(function* () {
     ]))
   });
 }));
-var node28 = makeLocationNode({ service: Service25, layer, deps: [Global.node, node85] });
+var node34 = makeLocationNode({ service: Service30, layer, deps: [Global.node, node85] });
 
-export { Service25, node28, exports_builtins };
+export { Service30, node34, exports_builtins };

package/dist/chunks/{filesystem-jex0hdh0.js → filesystem-0m69c59p.js}

@@ -1,24 +1,24 @@
 import {
   Service81
-} from "./filesystem-42nthewb.js";
+} from "./filesystem-53rak1ew.js";
 import {
-  Service65
-} from "./filesystem-n59f5cqe.js";
+  Service73
+} from "./filesystem-faat08va.js";
 import {
-  Service35,
+  Service16,
   readText2,
   syncTextBom2
-} from "./filesystem-x7xmxswz.js";
+} from "./filesystem-ws0htp7c.js";
 import {
-  Service39
-} from "./filesystem-njatc343.js";
+  Service76
+} from "./filesystem-z7d7tagb.js";
 import {
-  Service69
-} from "./filesystem-q3kzbh51.js";
+  Service59
+} from "./filesystem-q0zsatc3.js";
 import {
-  Service31,
+  Service18,
   resolvePath2
-} from "./filesystem-28mv0yws.js";
+} from "./filesystem-rb70syh1.js";
 import {
   fileDiff2
 } from "./filesystem-6prwharc.js";
@@ -30,17 +30,17 @@ import {
 var exports_edit = {};
 __export(exports_edit, {
   EditTool: () => exports_edit,
-  Input: () => Input9,
-  Output: () => Output7,
-  Plugin: () => Plugin9,
-  name: () => name9
+  Input: () => Input5,
+  Output: () => Output4,
+  Plugin: () => Plugin23,
+  name: () => name5
 });
 import { ToolFailure } from "@opencode/ai";
 import { FileDiff } from "@opencode/schema/file-diff";
 import { Bom } from "@opencode/util/bom";
 import { Effect, Schema } from "effect";
-var name9 = "edit";
-var Input9 = Schema.Struct({
+var name5 = "edit";
+var Input5 = Schema.Struct({
   path: Schema.String.annotate({
     description: "File to edit"
   }),
@@ -50,7 +50,7 @@ var Input9 = Schema.Struct({
     description: "Whether to replace every occurrence of oldString. When false, oldString must match exactly once. Defaults to false."
   })
 });
-var Output7 = Schema.Struct({
+var Output4 = Schema.Struct({
   files: Schema.Array(FileDiff.Info),
   replacements: Schema.Number
 });
@@ -103,21 +103,108 @@ var findLineOccurrences = (content, search) => {
     return result;
   }, []);
 };
-var Plugin9 = {
+var lineEnding = (text, fallback) => {
+  const crlfCount = text.split(crlf).length - 1;
+  const lfCount = text.split(`
+`).length - 1 - crlfCount;
+  if (crlfCount === lfCount)
+    return fallback;
+  return crlfCount > lfCount ? crlf : `
+`;
+};
+var withRegionEndings = (region, replacement, fallback) => {
+  const before = region.split(/\r?\n/);
+  const endings = [...region.matchAll(/\r?\n/g)].map((match) => match[0]);
+  const after = replacement.split(`
+`);
+  const key = (line) => normalizeForMatch(line.trimEnd());
+  const source = alignLines(before.map(key), after.map(key));
+  return after.map((line, index) => index === after.length - 1 ? line : line + (endings[source[index]] ?? fallback)).join("");
+};
+var alignLines = (before, after) => {
+  const width = after.length + 1;
+  const table = new Uint32Array((before.length + 1) * width);
+  for (let i = before.length - 1;i >= 0; i--)
+    for (let j = after.length - 1;j >= 0; j--)
+      table[i * width + j] = before[i] === after[j] ? table[(i + 1) * width + j + 1] + 1 : Math.max(table[(i + 1) * width + j], table[i * width + j + 1]);
+  const result = [];
+  const gap = { before: [], after: [] };
+  const flush = () => {
+    gap.after.forEach((j, k) => result[j] = gap.before[k]);
+    gap.before = [];
+    gap.after = [];
+  };
+  let i = 0;
+  let j = 0;
+  while (i < before.length && j < after.length) {
+    if (before[i] === after[j]) {
+      flush();
+      result[j++] = i++;
+      continue;
+    }
+    if (table[(i + 1) * width + j] >= table[i * width + j + 1])
+      gap.before.push(i++);
+    else
+      gap.after.push(j++);
+  }
+  while (i < before.length)
+    gap.before.push(i++);
+  while (j < after.length)
+    gap.after.push(j++);
+  flush();
+  return result;
+};
+var matchView = (source, oldString, newString) => {
+  const view = source.replaceAll(crlf, `
+`);
+  const removed = [...source.matchAll(/\r\n/g)].map((match, index) => match.index - index);
+  const fileEnding = lineEnding(source, `
+`);
+  const search = oldString.replaceAll(crlf, `
+`);
+  const replacement = newString.replaceAll(crlf, `
+`);
+  const exact = findOccurrences(view, search);
+  const unicode = exact.length > 0 ? [] : findOccurrences(normalizeForMatch(view), normalizeForMatch(search));
+  const trailing = exact.length > 0 || unicode.length > 0 ? [] : findLineOccurrences(view, search);
+  return {
+    matches: (exact.length > 0 ? exact : unicode.length > 0 ? unicode : trailing).map((match) => ({
+      start: match.start + countBefore(removed, match.start),
+      end: match.end + countBefore(removed, match.end)
+    })),
+    replace: (match) => {
+      const region = source.slice(match.start, match.end);
+      return withRegionEndings(region, replacement, lineEnding(region, fileEnding));
+    }
+  };
+};
+var countBefore = (positions, offset) => {
+  let low = 0;
+  let high = positions.length;
+  while (low < high) {
+    const middle = low + high >> 1;
+    if (positions[middle] < offset)
+      low = middle + 1;
+    else
+      high = middle;
+  }
+  return low;
+};
+var Plugin23 = {
   id: "opencode.tool.edit",
   effect: Effect.fn("EditTool.Plugin")(function* (ctx) {
-    const access = yield* Service31;
-    const fileMutation = yield* Service35;
-    const environment = yield* Service65;
-    const formatter = yield* Service39;
+    const access = yield* Service18;
+    const fileMutation = yield* Service16;
+    const environment = yield* Service73;
+    const formatter = yield* Service76;
     const location = yield* Service81;
-    const permission = yield* Service69;
+    const permission = yield* Service59;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name9,
+      name: name5,
       options: { codemode: false, permission: "edit" },
-      description: "Edit the contents of a file by finding and replacing exact text. When editing text from Read output, preserve the exact indentation (tabs or spaces) and omit the line-number prefix, such as `1: `. Never include the prefix in oldString or newString. The edit fails if oldString is not found. By default, oldString must identify a UNIQUE location. Multiple matches FAIL unless replaceAll is true. Add more surrounding context to disambiguate, or set replaceAll to true to replace every occurrence. Use replaceAll when the change should apply to every occurrence, such as renaming a variable.",
-      input: Input9,
-      output: Output7,
+      description: "Edit the contents of a file by finding and replacing exact text. When editing text from Read output, preserve the exact indentation (tabs or spaces) and omit the line-number prefix, such as `1: `. Never include the prefix in oldString or newString. Write line breaks as \\n; the file's existing CRLF or LF line endings are matched and preserved. To change line endings themselves, make oldString and newString differ only in \\r; that edit applies to the exact bytes. If there is no exact match, the edit retries while ignoring typographic quote, dash, and space variants, then trailing whitespace on each line. The edit fails if oldString is not found. By default, oldString must identify a UNIQUE location. Multiple matches FAIL unless replaceAll is true. Add more surrounding context to disambiguate, or set replaceAll to true to replace every occurrence. Use replaceAll when the change should apply to every occurrence, such as renaming a variable.",
+      input: Input5,
+      output: Output4,
       execute: (input, context) => {
         return Effect.gen(function* () {
           const permissionSource = {
@@ -139,20 +226,10 @@ var Plugin9 = {
           yield* access.authorizeExternal([target], context);
           const original = yield* readText2(environment.files, target.absolute).pipe(Effect.catchTag("Environment.NotFound", () => Effect.fail(new ToolFailure({ message: `File not found: ${input.path}` }))), Effect.catchTag("Environment.WrongKind", (error) => error.actual === "directory" ? Effect.fail(new ToolFailure({ message: `Path is a directory, not a file: ${input.path}` })) : Effect.fail(new ToolFailure({ message: `Unable to edit ${input.path}`, error }))));
           const source = original.text;
-          const ending = source.includes(crlf) ? crlf : `
-`;
-          const oldString = input.oldString.replaceAll(crlf, `
-`).replaceAll(`
-`, ending);
-          const newString = input.newString.replaceAll(crlf, `
-`).replaceAll(`
-`, ending);
-          const exact = findOccurrences(source, oldString);
-          const unicode = exact.length > 0 ? [] : findOccurrences(normalizeForMatch(source), normalizeForMatch(oldString));
-          const trailing = exact.length > 0 || unicode.length > 0 ? [] : findLineOccurrences(source, oldString);
-          const matches = exact.length > 0 ? exact : unicode.length > 0 ? unicode : trailing;
+          const endingsOnly = input.oldString.replaceAll("\r", "") === input.newString.replaceAll("\r", "");
+          const { matches, replace } = endingsOnly ? { matches: findOccurrences(source, input.oldString), replace: () => input.newString } : matchView(source, input.oldString, input.newString);
           const replacements = matches.length;
-          const replaced = (input.replaceAll === true ? matches : matches.slice(0, 1)).toReversed().reduce((content, match) => `${content.slice(0, match.start)}${newString}${content.slice(match.end)}`, source);
+          const replaced = (input.replaceAll === true ? matches : matches.slice(0, 1)).toReversed().reduce((content, match) => `${content.slice(0, match.start)}${replace(match)}${content.slice(match.end)}`, source);
           const preview = replacements > 0 && (replacements === 1 || input.replaceAll === true) ? fileDiff2(target.resource, source, replaced) : undefined;
           yield* permission.assert({
             action: "edit",
@@ -173,6 +250,11 @@ var Plugin9 = {
               message: `Found ${replacements} matches for oldString, but expected exactly one. Add more surrounding context to make oldString unique, or set replaceAll to true to replace every occurrence.`
             });
           }
+          if (replaced === source) {
+            return yield* new ToolFailure({
+              message: endingsOnly ? `No changes to apply: ${input.path} already has those line endings.` : `No changes to apply: the edit leaves ${input.path} unchanged. Line endings follow the file; to change them, write \\r explicitly in oldString or newString.`
+            });
+          }
           const replacementBom = replaced.startsWith("\uFEFF");
           const result = yield* fileMutation.write({
             target,
@@ -194,4 +276,4 @@ var Plugin9 = {
   })
 };
 
-export { name9, Input9, Output7, Plugin9, exports_edit };
+export { name5, Input5, Output4, Plugin23, exports_edit };