@plannotator/opencode 0.26.0 → 0.26.1

package/dist/embedded.js

@@ -77755,6 +77755,9 @@ var init_jj_core = __esm(() => {
 // ../../packages/shared/gitbutler-core.ts
 import { lstat as lstat3, readlink } from "fs/promises";
 import { basename as basename6, resolve as resolve10 } from "path";
+function isUnexpectedArgumentRejection(result, flag) {
+  return result.exitCode !== 0 && result.stderr.includes(`unexpected argument '${flag}'`);
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -77803,12 +77806,12 @@ function parseStack(value, path2) {
   const branches = requireArray(record.branches, `${path2}.branches`).map((branch, index) => parseBranch(branch, `${path2}.branches[${index}]`));
   return { branches };
 }
-function parseGitButlerStatus(output) {
+function parseGitButlerStatus(output, commandLabel = GITBUTLER_STATUS_SYNTAXES[0].label) {
   let decoded;
   try {
     decoded = JSON.parse(output);
   } catch {
-    throw new GitButlerContractError("GitButler returned invalid JSON from `but --format json status`.");
+    throw new GitButlerContractError(`GitButler returned invalid JSON from \`${commandLabel}\`.`);
   }
   const root3 = requireRecord(decoded, "root");
   requireArray(root3.uncommittedChanges, "uncommittedChanges");
@@ -77879,15 +77882,33 @@ async function loadStatus(runtime, cwd) {
   if (existing && (existing.inFlight || existing.expiresAt > now))
     return existing.status;
   const status = (async () => {
-    const result = await runtime.runBut(["--format", "json", "status"], {
+    const preferredIndex = statusSyntaxPreferences.get(runtime) ?? 0;
+    let syntaxIndex = preferredIndex;
+    let syntax = GITBUTLER_STATUS_SYNTAXES[syntaxIndex];
+    let result = await runtime.runBut([...syntax.args], {
       cwd,
       timeoutMs: STATUS_TIMEOUT_MS
     });
+    if (isUnexpectedArgumentRejection(result, syntax.flag)) {
+      syntaxIndex = preferredIndex === 0 ? 1 : 0;
+      const fallback = GITBUTLER_STATUS_SYNTAXES[syntaxIndex];
+      const retried = await runtime.runBut([...fallback.args], {
+        cwd,
+        timeoutMs: STATUS_TIMEOUT_MS
+      });
+      if (isUnexpectedArgumentRejection(retried, fallback.flag)) {
+        throw new GitButlerContractError(`GitButler rejected both \`${syntax.label}\` and \`${fallback.label}\`; ` + `Plannotator requires GitButler ${GITBUTLER_MIN_VERSION} or newer.`);
+      }
+      syntax = fallback;
+      result = retried;
+    }
     if (result.exitCode !== 0) {
       const detail = result.stderr.trim();
-      throw new GitButlerContractError(`GitButler status failed${detail ? `: ${detail}` : ` with exit code ${result.exitCode}`}`);
+      throw new GitButlerContractError(`GitButler status (\`${syntax.label}\`) failed${detail ? `: ${detail}` : ` with exit code ${result.exitCode}`}`);
     }
-    return parseGitButlerStatus(result.stdout);
+    const parsed = parseGitButlerStatus(result.stdout, syntax.label);
+    statusSyntaxPreferences.set(runtime, syntaxIndex);
+    return parsed;
   })();
   const entry = { expiresAt: 0, inFlight: true, status };
   cache2.set(cwd, entry);
@@ -78262,7 +78283,7 @@ async function getGitButlerDiffFingerprint(runtime, diffType, cwd, options) {
   const detail = result.error ?? `No fingerprint for ${result.label}`;
   return `gitbutler:${diffType}:error:${hashFingerprintPart(detail)}`;
 }
-var GITBUTLER_MIN_VERSION = "0.21.0", GITBUTLER_WORKSPACE_DIFF = "gitbutler:workspace", GITBUTLER_STACK_PREFIX = "gitbutler:stack:", GITBUTLER_BRANCH_PREFIX = "gitbutler:branch:", GITBUTLER_WORKSPACE_REFS, STATUS_TIMEOUT_MS = 30000, VERSION_TIMEOUT_MS = 5000, OBJECT_ID_RE, STATUS_CACHE_MS = 1000, GitButlerContractError, versionChecks, statusCaches;
+var GITBUTLER_MIN_VERSION = "0.21.0", GITBUTLER_WORKSPACE_DIFF = "gitbutler:workspace", GITBUTLER_STACK_PREFIX = "gitbutler:stack:", GITBUTLER_BRANCH_PREFIX = "gitbutler:branch:", GITBUTLER_WORKSPACE_REFS, STATUS_TIMEOUT_MS = 30000, VERSION_TIMEOUT_MS = 5000, OBJECT_ID_RE, STATUS_CACHE_MS = 1000, GITBUTLER_STATUS_SYNTAXES, GitButlerContractError, versionChecks, statusSyntaxPreferences, statusCaches;
 var init_gitbutler_core = __esm(() => {
   init_review_core();
   GITBUTLER_WORKSPACE_REFS = new Set([
@@ -78270,6 +78291,10 @@ var init_gitbutler_core = __esm(() => {
     "refs/heads/gitbutler/integration"
   ]);
   OBJECT_ID_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/i;
+  GITBUTLER_STATUS_SYNTAXES = [
+    { args: ["--format", "json", "status"], flag: "--format", label: "but --format json status" },
+    { args: ["--json", "status"], flag: "--json", label: "but --json status" }
+  ];
   GitButlerContractError = class GitButlerContractError extends Error {
     _tag = "GitButlerContractError";
     constructor(message) {
@@ -78278,6 +78303,7 @@ var init_gitbutler_core = __esm(() => {
     }
   };
   versionChecks = new WeakMap;
+  statusSyntaxPreferences = new WeakMap;
   statusCaches = new WeakMap;
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/opencode",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "type": "module",
   "description": "Plannotator plugin for OpenCode - interactive plan review with visual annotation",
   "author": "backnotprop",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@opencode-ai/plugin": "0.0.0-next-16775",
-    "@plannotator/server": "0.26.0",
+    "@plannotator/server": "0.26.1",
     "@plannotator/shared": "0.0.1"
   },
   "engines": {