opencode-gitbutler 0.1.6 → 0.1.8

package/dist/cli.d.ts

@@ -22,7 +22,9 @@ export type FileBranchResult = {
     branchCliId?: string;
     branchName?: string;
     unassignedCliId?: string;
+    confidence?: BranchInferenceConfidence;
 };
+export type BranchInferenceConfidence = "high" | "medium" | "ambiguous";
 export type ButStatusBranch = {
     cliId: string;
     name: string;
@@ -81,5 +83,8 @@ export type Cli = {
     hasMultiBranchHunks: (filePath: string, statusData?: ButStatusFull | null) => boolean;
     toRelativePath: (absPath: string) => string;
 };
-export declare function createCli(cwd: string, log: Logger): Cli;
+export type CliOptions = {
+    inferenceEnabled?: boolean;
+};
+export declare function createCli(cwd: string, log: Logger, options?: CliOptions): Cli;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/cmd.js

@@ -29052,7 +29052,8 @@ var DEFAULT_CONFIG = {
   stale_lock_ms: 300000,
   edit_debounce_ms: 200,
   gc_on_session_start: false,
-  notification_max_age_ms: 300000
+  notification_max_age_ms: 300000,
+  inference_enabled: true
 };
 var CONFIG_FILE_NAME = ".opencode/gitbutler.json";
 function stripJsonComments(input) {
@@ -29129,6 +29130,7 @@ async function loadConfig(cwd) {
       edit_debounce_ms: typeof parsed.edit_debounce_ms === "number" && parsed.edit_debounce_ms >= 0 ? parsed.edit_debounce_ms : DEFAULT_CONFIG.edit_debounce_ms,
       gc_on_session_start: typeof parsed.gc_on_session_start === "boolean" ? parsed.gc_on_session_start : DEFAULT_CONFIG.gc_on_session_start,
       notification_max_age_ms: typeof parsed.notification_max_age_ms === "number" && parsed.notification_max_age_ms >= 0 ? parsed.notification_max_age_ms : DEFAULT_CONFIG.notification_max_age_ms,
+      inference_enabled: typeof parsed.inference_enabled === "boolean" ? parsed.inference_enabled : DEFAULT_CONFIG.inference_enabled,
       ...typeof parsed.branch_target === "string" && parsed.branch_target.length > 0 ? { branch_target: parsed.branch_target } : {}
     };
   } catch (err) {

package/dist/config.d.ts

@@ -25,6 +25,7 @@ export type GitButlerPluginConfig = {
     notification_max_age_ms: number;
     /** When set, all sessions use this value for conversation_id instead of rootSessionID */
     branch_target?: string;
+    inference_enabled: boolean;
 };
 export declare const DEFAULT_CONFIG: Readonly<GitButlerPluginConfig>;
 /**

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,qBAAqB,GAAG;IAClC,yDAAyD;IACzD,WAAW,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oDAAoD;IACpD,uBAAuB,EAAE,MAAM,CAAC;IAChC,sDAAsD;IACtD,cAAc,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;IACvB,8CAA8C;IAC9C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,6CAA6C;IAC7C,WAAW,EAAE,OAAO,CAAC;IACrB,iFAAiF;IACjF,sBAAsB,EAAE,MAAM,CAAC;IAC/B,0DAA0D;IAC1D,aAAa,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,8EAA8E;IAC9E,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gGAAgG;IAChG,uBAAuB,EAAE,MAAM,CAAC;IAChC,yFAAyF;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,qBAAqB,CAa1D,CAAC;AAIF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA6CvD;AAYD,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,qBAAqB,CAAC,CA4DhC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,qBAAqB,GAAG;IAClC,yDAAyD;IACzD,WAAW,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oDAAoD;IACpD,uBAAuB,EAAE,MAAM,CAAC;IAChC,sDAAsD;IACtD,cAAc,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;IACvB,8CAA8C;IAC9C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,6CAA6C;IAC7C,WAAW,EAAE,OAAO,CAAC;IACrB,iFAAiF;IACjF,sBAAsB,EAAE,MAAM,CAAC;IAC/B,0DAA0D;IAC1D,aAAa,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,8EAA8E;IAC9E,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gGAAgG;IAChG,uBAAuB,EAAE,MAAM,CAAC;IAChC,yFAAyF;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,qBAAqB,CAc1D,CAAC;AAIF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA6CvD;AAYD,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,qBAAqB,CAAC,CA+DhC"}

package/dist/index.js

@@ -13,7 +13,8 @@ var DEFAULT_CONFIG = {
   stale_lock_ms: 300000,
   edit_debounce_ms: 200,
   gc_on_session_start: false,
-  notification_max_age_ms: 300000
+  notification_max_age_ms: 300000,
+  inference_enabled: true
 };
 var CONFIG_FILE_NAME = ".opencode/gitbutler.json";
 function stripJsonComments(input) {
@@ -90,6 +91,7 @@ async function loadConfig(cwd) {
       edit_debounce_ms: typeof parsed.edit_debounce_ms === "number" && parsed.edit_debounce_ms >= 0 ? parsed.edit_debounce_ms : DEFAULT_CONFIG.edit_debounce_ms,
       gc_on_session_start: typeof parsed.gc_on_session_start === "boolean" ? parsed.gc_on_session_start : DEFAULT_CONFIG.gc_on_session_start,
       notification_max_age_ms: typeof parsed.notification_max_age_ms === "number" && parsed.notification_max_age_ms >= 0 ? parsed.notification_max_age_ms : DEFAULT_CONFIG.notification_max_age_ms,
+      inference_enabled: typeof parsed.inference_enabled === "boolean" ? parsed.inference_enabled : DEFAULT_CONFIG.inference_enabled,
       ...typeof parsed.branch_target === "string" && parsed.branch_target.length > 0 ? { branch_target: parsed.branch_target } : {}
     };
   } catch (err) {
@@ -127,8 +129,117 @@ var CURSOR_RETRY_PARAMS = {
   stop: { maxRetries: 5, baseMs: 500 },
   default: { maxRetries: 3, baseMs: 200 }
 };
-function createCli(cwd, log) {
+function createCli(cwd, log, options = {}) {
   const resolvedCwd = resolve2(cwd);
+  const inferenceEnabled = options.inferenceEnabled ?? true;
+  function toPathSegments(filePath) {
+    return filePath.replace(/\\/g, "/").split("/").filter(Boolean);
+  }
+  function sharedPrefixDepth(a, b) {
+    const limit = Math.min(a.length, b.length);
+    let depth = 0;
+    while (depth < limit && a[depth] === b[depth]) {
+      depth++;
+    }
+    return depth;
+  }
+  function scoreBranchByDirectoryPrefix(filePath, branch) {
+    const targetSegments = toPathSegments(filePath);
+    let maxScore = 0;
+    for (const commit of branch.commits ?? []) {
+      for (const change of commit.changes ?? []) {
+        if (!change.filePath)
+          continue;
+        const candidateSegments = toPathSegments(change.filePath);
+        const score = sharedPrefixDepth(targetSegments, candidateSegments);
+        if (score > maxScore) {
+          maxScore = score;
+        }
+      }
+    }
+    return maxScore;
+  }
+  function inferAssignedBranch(filePath, stackBranches, unassignedCliId) {
+    if (!inferenceEnabled) {
+      log.info("inference-disabled", {
+        file: filePath,
+        branchCount: stackBranches.length
+      });
+      return {
+        inBranch: true,
+        unassignedCliId,
+        confidence: "ambiguous"
+      };
+    }
+    if (stackBranches.length === 0) {
+      log.warn("inference-no-branches", {
+        file: filePath
+      });
+      return {
+        inBranch: true,
+        unassignedCliId,
+        confidence: "ambiguous"
+      };
+    }
+    if (stackBranches.length === 1) {
+      const [branch] = stackBranches;
+      if (!branch) {
+        return {
+          inBranch: true,
+          unassignedCliId,
+          confidence: "ambiguous"
+        };
+      }
+      log.info("inference-single-branch", {
+        file: filePath,
+        branchCliId: branch.cliId,
+        branchName: branch.name
+      });
+      return {
+        inBranch: true,
+        branchCliId: branch.cliId,
+        branchName: branch.name,
+        unassignedCliId,
+        confidence: "high"
+      };
+    }
+    const scoredBranches = stackBranches.map((branch) => ({
+      branch,
+      score: scoreBranchByDirectoryPrefix(filePath, branch)
+    })).sort((a, b) => b.score - a.score);
+    const best = scoredBranches[0];
+    const second = scoredBranches[1];
+    if (best?.branch && second && best.score >= 2 && best.score > second.score) {
+      log.info("inference-directory-match", {
+        file: filePath,
+        branchCliId: best.branch.cliId,
+        branchName: best.branch.name,
+        score: best.score,
+        margin: best.score - second.score,
+        branchCount: stackBranches.length
+      });
+      return {
+        inBranch: true,
+        branchCliId: best.branch.cliId,
+        branchName: best.branch.name,
+        unassignedCliId,
+        confidence: "medium"
+      };
+    }
+    log.warn("inference-ambiguous", {
+      file: filePath,
+      branchCount: stackBranches.length,
+      scores: scoredBranches.map((entry) => ({
+        branchCliId: entry.branch.cliId,
+        score: entry.score
+      }))
+    });
+    return {
+      inBranch: true,
+      unassignedCliId,
+      confidence: "ambiguous"
+    };
+  }
   function toRelativePath(absPath) {
     const resolved = resolve2(absPath);
     const rel = relative(resolvedCwd, resolved);
@@ -159,9 +270,10 @@ function createCli(cwd, log) {
       }
       const normalized = toRelativePath(filePath);
       const unassigned = data.unassignedChanges?.find((ch) => ch.filePath === normalized);
+      const assignedStacks = [];
       for (const stack of data.stacks ?? []) {
         if (stack.assignedChanges?.some((ch) => ch.filePath === normalized)) {
-          return { inBranch: true };
+          assignedStacks.push(stack);
         }
         for (const branch of stack.branches ?? []) {
           for (const commit of branch.commits ?? []) {
@@ -170,12 +282,40 @@ function createCli(cwd, log) {
                 inBranch: true,
                 branchCliId: branch.cliId,
                 branchName: branch.name,
-                unassignedCliId: unassigned?.cliId
+                unassignedCliId: unassigned?.cliId,
+                confidence: "high"
               };
             }
           }
         }
       }
+      if (assignedStacks.length === 1) {
+        const [stack] = assignedStacks;
+        if (stack) {
+          return inferAssignedBranch(normalized, stack.branches ?? [], unassigned?.cliId);
+        }
+      }
+      if (assignedStacks.length > 1) {
+        const uniqueBranches = new Set;
+        for (const stack of assignedStacks) {
+          for (const branch of stack.branches ?? []) {
+            if (branch.cliId) {
+              uniqueBranches.add(branch.cliId);
+            }
+          }
+        }
+        log.warn("inference-ambiguous", {
+          file: normalized,
+          reason: "multiple-assigned-stacks",
+          stackCount: assignedStacks.length,
+          branchCount: uniqueBranches.size
+        });
+        return {
+          inBranch: true,
+          unassignedCliId: unassigned?.cliId,
+          confidence: "ambiguous"
+        };
+      }
       return { inBranch: false };
     } catch {
       return { inBranch: false };
@@ -835,39 +975,65 @@ function createRewordManager(deps) {
       });
     }
     reapStaleLocks();
+    const statusForSweep = cli.getFullStatus();
     const editedFiles = editedFilesPerConversation.get(conversationId);
     let sweepRubCount = 0;
+    let sweepSkippedAmbiguous = 0;
+    let sweepSkippedMultiBranch = 0;
+    let sweepNoTarget = 0;
     if (editedFiles && editedFiles.size > 0) {
       for (const filePath of editedFiles) {
         try {
-          const branchInfo = cli.findFileBranch(filePath);
+          const branchInfo = cli.findFileBranch(filePath, statusForSweep);
           if (branchInfo.unassignedCliId && branchInfo.branchCliId) {
-            if (!cli.hasMultiBranchHunks(filePath)) {
+            if (!cli.hasMultiBranchHunks(filePath, statusForSweep)) {
               const rubOk = cli.butRub(branchInfo.unassignedCliId, branchInfo.branchCliId);
               if (rubOk) {
                 sweepRubCount++;
                 log.info("post-stop-sweep-rub", {
                   file: filePath,
                   source: branchInfo.unassignedCliId,
-                  dest: branchInfo.branchCliId
+                  dest: branchInfo.branchCliId,
+                  confidence: branchInfo.confidence
                 });
               }
+            } else {
+              sweepSkippedMultiBranch++;
+              log.warn("post-stop-sweep-skip-multi-branch", {
+                file: filePath,
+                source: branchInfo.unassignedCliId,
+                dest: branchInfo.branchCliId,
+                confidence: branchInfo.confidence
+              });
             }
+          } else if (branchInfo.inBranch && !branchInfo.branchCliId) {
+            sweepSkippedAmbiguous++;
+            log.warn("post-stop-sweep-skip-ambiguous", {
+              file: filePath,
+              confidence: branchInfo.confidence
+            });
+          } else {
+            sweepNoTarget++;
+            log.info("post-stop-sweep-no-target", {
+              file: filePath,
+              inBranch: branchInfo.inBranch
+            });
           }
         } catch {}
       }
-      if (sweepRubCount > 0) {
-        log.info("post-stop-sweep-summary", {
-          conversationId,
-          filesChecked: editedFiles.size,
-          rubbed: sweepRubCount
-        });
-      }
+      log.info("post-stop-sweep-summary", {
+        conversationId,
+        filesChecked: editedFiles.size,
+        rubbed: sweepRubCount,
+        skippedAmbiguous: sweepSkippedAmbiguous,
+        skippedMultiBranch: sweepSkippedMultiBranch,
+        noTarget: sweepNoTarget
+      });
     }
     const prompt = await fetchUserPrompt(rootSessionID);
     if (!prompt)
       return;
-    const status = cli.getFullStatus();
+    const status = statusForSweep ?? cli.getFullStatus();
     if (!status?.stacks)
       return;
     const ownershipSnapshot = [];
@@ -902,13 +1068,47 @@ function createRewordManager(deps) {
       });
     }
     const candidateBranchCliIds = new Set;
+    const candidateConfidenceByBranch = new Map;
+    let candidateAmbiguousCount = 0;
+    const confidenceRank = {
+      ambiguous: 0,
+      medium: 1,
+      high: 2
+    };
     if (ownershipMatches && editedFiles && editedFiles.size > 0) {
       for (const filePath of editedFiles) {
         const branchInfo = cli.findFileBranch(filePath, status);
         if (branchInfo.branchCliId) {
           candidateBranchCliIds.add(branchInfo.branchCliId);
+          const nextConfidence = branchInfo.confidence ?? "high";
+          const existingConfidence = candidateConfidenceByBranch.get(branchInfo.branchCliId);
+          const mergedConfidence = existingConfidence ? confidenceRank[nextConfidence] < confidenceRank[existingConfidence.confidence] ? nextConfidence : existingConfidence.confidence : nextConfidence;
+          candidateConfidenceByBranch.set(branchInfo.branchCliId, {
+            confidence: mergedConfidence,
+            fileCount: (existingConfidence?.fileCount ?? 0) + 1,
+            branchName: branchInfo.branchName ?? existingConfidence?.branchName ?? branchInfo.branchCliId
+          });
+        } else if (branchInfo.inBranch) {
+          candidateAmbiguousCount++;
+          log.warn("post-stop-candidate-skip-ambiguous", {
+            conversationId,
+            file: filePath,
+            confidence: branchInfo.confidence
+          });
         }
       }
+      if (candidateConfidenceByBranch.size > 0 || candidateAmbiguousCount > 0) {
+        log.info("post-stop-candidate-confidence", {
+          conversationId,
+          candidates: [...candidateConfidenceByBranch.entries()].map(([branchCliId, info]) => ({
+            branchCliId,
+            branchName: info.branchName,
+            confidence: info.confidence,
+            fileCount: info.fileCount
+          })),
+          skippedAmbiguous: candidateAmbiguousCount
+        });
+      }
     }
     if (ownershipMatches && owner?.branchName && !owner.branchName.startsWith("conversation-")) {
       for (const stack of status.stacks) {
@@ -1082,11 +1282,28 @@ function createRewordManager(deps) {
 }
 
 // src/plugin.ts
+async function toUUID(input) {
+  const data = new TextEncoder().encode(input);
+  const hash = await crypto.subtle.digest("SHA-256", data);
+  const hex = [...new Uint8Array(hash)].map((b) => b.toString(16).padStart(2, "0")).join("");
+  return [
+    hex.slice(0, 8),
+    hex.slice(8, 12),
+    `4${hex.slice(12, 15)}`,
+    `8${hex.slice(15, 18)}`,
+    hex.slice(18, 30)
+  ].join("-");
+}
+function sessionCacheKey(rootSessionID, filePath) {
+  return `${rootSessionID}\x00${filePath}`;
+}
 function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
   return async ({ client, directory, worktree }) => {
     const cwd = worktree ?? directory;
     const log = createLogger(config.log_enabled, cwd);
-    const cli = createCli(cwd, log);
+    const cli = createCli(cwd, log, {
+      inferenceEnabled: config.inference_enabled
+    });
     const state = createStateManager(cwd, log);
     const diskSessionMap = await state.loadSessionMap();
     for (const [k, v] of diskSessionMap) {
@@ -1169,18 +1386,6 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
       cachedStatus = { data: fresh, timestamp: Date.now() };
       return fresh;
     }
-    async function toUUID(input) {
-      const data = new TextEncoder().encode(input);
-      const hash = await crypto.subtle.digest("SHA-256", data);
-      const hex = [...new Uint8Array(hash)].map((b) => b.toString(16).padStart(2, "0")).join("");
-      return [
-        hex.slice(0, 8),
-        hex.slice(8, 12),
-        `4${hex.slice(12, 15)}`,
-        `8${hex.slice(15, 18)}`,
-        hex.slice(18, 30)
-      ].join("-");
-    }
     function extractFilePathFromArgs(args) {
       const raw = args.filePath ?? args.file_path ?? args.path;
       return raw ? cli.toRelativePath(raw) : undefined;
@@ -1279,60 +1484,23 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
         }
         const relativePath = cli.toRelativePath(filePath);
         try {
-          const cached = assignmentCache.get(relativePath);
+          const rootSessionID = state.resolveSessionRoot(input.sessionID);
+          const branchSeed = config.branch_target ?? rootSessionID;
+          const cacheKey = sessionCacheKey(rootSessionID, relativePath);
+          const cached = assignmentCache.get(cacheKey);
           const cacheHit = cached && Date.now() - cached.timestamp < ASSIGNMENT_CACHE_TTL_MS;
-          if (!cacheHit) {
-            const statusSnapshot = cli.getFullStatus();
-            const branchInfo = cli.findFileBranch(relativePath, statusSnapshot);
-            if (branchInfo.inBranch) {
-              if (branchInfo.unassignedCliId && branchInfo.branchCliId) {
-                if (cli.hasMultiBranchHunks(relativePath, statusSnapshot)) {
-                  log.warn("rub-skip-multi-branch", {
-                    file: relativePath
-                  });
-                } else {
-                  log.info("rub-check", {
-                    file: relativePath,
-                    multiBranch: false,
-                    source: branchInfo.unassignedCliId,
-                    dest: branchInfo.branchCliId
-                  });
-                  const rubOk = cli.butRub(branchInfo.unassignedCliId, branchInfo.branchCliId);
-                  if (rubOk) {
-                    log.info("rub-ok", {
-                      source: branchInfo.unassignedCliId,
-                      dest: branchInfo.branchCliId,
-                      file: relativePath
-                    });
-                  } else {
-                    log.error("rub-failed", {
-                      source: branchInfo.unassignedCliId,
-                      dest: branchInfo.branchCliId,
-                      file: relativePath
-                    });
-                  }
-                }
-              } else {
-                log.info("after-edit-already-assigned", {
-                  file: relativePath,
-                  sessionID: input.sessionID,
-                  branch: branchInfo.branchName
-                });
-              }
-              return;
-            }
-          } else {
+          const conversationId = cacheHit ? cached.conversationId : await toUUID(branchSeed);
+          if (cacheHit) {
             log.info("assignment-cache-hit", {
               file: relativePath,
-              branchCliId: cached.branchCliId,
+              conversationId,
               ageMs: Date.now() - cached.timestamp
             });
           }
-          const branchSeed = config.branch_target ?? state.resolveSessionRoot(input.sessionID);
-          const conversationId = cacheHit ? cached.conversationId : await toUUID(branchSeed);
           log.info("after-edit", {
             file: relativePath,
             sessionID: input.sessionID,
+            rootSessionID,
             conversationId
           });
           try {
@@ -1344,14 +1512,15 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
               hook_event_name: "afterFileEdit",
               workspace_roots: [cwd]
             });
-            assignmentCache.set(relativePath, {
-              branchCliId: conversationId,
+            assignmentCache.set(cacheKey, {
               conversationId,
+              rootSessionID,
               timestamp: Date.now()
             });
           } catch (err) {
             log.error("cursor-after-edit-error", {
               file: relativePath,
+              conversationId,
               error: err instanceof Error ? err.message : String(err)
             });
           }
@@ -1360,7 +1529,6 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
             editedFilesPerConversation.set(conversationId, new Set);
           }
           editedFilesPerConversation.get(conversationId).add(relativePath);
-          const rootSessionID = state.resolveSessionRoot(input.sessionID);
           const existingOwner = branchOwnership.get(conversationId);
           if (existingOwner && existingOwner.rootSessionID !== rootSessionID) {
             log.error("branch-collision", {

package/dist/plugin.d.ts

@@ -17,5 +17,7 @@
  */
 import type { Plugin } from "@opencode-ai/plugin";
 import type { GitButlerPluginConfig } from "./config.js";
+export declare function toUUID(input: string): Promise<string>;
+export declare function sessionCacheKey(rootSessionID: string, filePath: string): string;
 export declare function createGitButlerPlugin(config?: GitButlerPluginConfig): Plugin;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAUzD,wBAAgB,qBAAqB,CACnC,MAAM,GAAE,qBAA6C,GACpD,MAAM,CA+nBR"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAUzD,wBAAsB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa3D;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE/E;AAED,wBAAgB,qBAAqB,CACnC,MAAM,GAAE,qBAA6C,GACpD,MAAM,CAskBR"}

package/dist/reword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reword.d.ts","sourceRoot":"","sources":["../src/reword.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reword.d.ts","sourceRoot":"","sources":["../src/reword.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gitbutler",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "description": "OpenCode plugin for GitButler integration",
   "main": "dist/index.js",