opencode-gitbutler 0.1.7 → 0.1.8

package/dist/index.js

@@ -1282,6 +1282,21 @@ 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;
@@ -1371,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;
@@ -1482,80 +1485,22 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
         const relativePath = cli.toRelativePath(filePath);
         try {
           const rootSessionID = state.resolveSessionRoot(input.sessionID);
-          const cached = assignmentCache.get(relativePath);
-          const cacheHit = cached && Date.now() - cached.timestamp < ASSIGNMENT_CACHE_TTL_MS && cached.rootSessionID === rootSessionID;
-          if (!cacheHit) {
-            const statusSnapshot = cli.getFullStatus();
-            if (!statusSnapshot) {
-              log.warn("after-edit-skip-no-status", {
-                file: relativePath,
-                sessionID: input.sessionID
-              });
-              return;
-            }
-            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,
-                    confidence: branchInfo.confidence
-                  });
-                } else {
-                  log.info("rub-check", {
-                    file: relativePath,
-                    multiBranch: false,
-                    source: branchInfo.unassignedCliId,
-                    dest: branchInfo.branchCliId,
-                    confidence: branchInfo.confidence
-                  });
-                  const rubOk = cli.butRub(branchInfo.unassignedCliId, branchInfo.branchCliId);
-                  if (rubOk) {
-                    log.info("rub-ok", {
-                      source: branchInfo.unassignedCliId,
-                      dest: branchInfo.branchCliId,
-                      file: relativePath,
-                      confidence: branchInfo.confidence
-                    });
-                  } else {
-                    log.error("rub-failed", {
-                      source: branchInfo.unassignedCliId,
-                      dest: branchInfo.branchCliId,
-                      file: relativePath,
-                      confidence: branchInfo.confidence
-                    });
-                  }
-                }
-              } else if (!branchInfo.branchCliId) {
-                log.warn("after-edit-ambiguous-assignment", {
-                  file: relativePath,
-                  sessionID: input.sessionID,
-                  confidence: branchInfo.confidence
-                });
-              } else {
-                log.info("after-edit-already-assigned", {
-                  file: relativePath,
-                  sessionID: input.sessionID,
-                  branch: branchInfo.branchName ?? branchInfo.branchCliId,
-                  branchCliId: branchInfo.branchCliId,
-                  confidence: branchInfo.confidence ?? "high"
-                });
-              }
-              return;
-            }
-          } else {
+          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;
+          const conversationId = cacheHit ? cached.conversationId : await toUUID(branchSeed);
+          if (cacheHit) {
             log.info("assignment-cache-hit", {
               file: relativePath,
-              conversationId: cached.conversationId,
-              rootSessionID: cached.rootSessionID,
+              conversationId,
               ageMs: Date.now() - cached.timestamp
             });
           }
-          const branchSeed = config.branch_target ?? rootSessionID;
-          const conversationId = cacheHit ? cached.conversationId : await toUUID(branchSeed);
           log.info("after-edit", {
             file: relativePath,
             sessionID: input.sessionID,
+            rootSessionID,
             conversationId
           });
           try {
@@ -1567,7 +1512,7 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
               hook_event_name: "afterFileEdit",
               workspace_roots: [cwd]
             });
-            assignmentCache.set(relativePath, {
+            assignmentCache.set(cacheKey, {
               conversationId,
               rootSessionID,
               timestamp: Date.now()
@@ -1575,6 +1520,7 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
           } catch (err) {
             log.error("cursor-after-edit-error", {
               file: relativePath,
+              conversationId,
               error: err instanceof Error ? err.message : String(err)
             });
           }

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,CA2pBR"}
+{"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/package.json

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