opencode-gitbutler 0.1.7 → 0.1.9

package/README.md

@@ -16,8 +16,9 @@ This plugin bridges the gap by bringing GitButler's virtual branch power directl
 - Zero-config setup. Just add it to your plugins and go.
 - Works with GitButler virtual branches to avoid worktree overhead.
 - Impersonates Cursor for full GitButler CLI compatibility.
-- Unique multi-agent session mapping.
-- Hunk-level rub guard to skip multi-stack files.
+- Session-first routing: every edit/write is assigned via `but cursor after-edit`.
+- Unique multi-agent session mapping so subagents stay on the parent branch.
+- Hunk-level rub guard in post-stop recovery to avoid unsafe auto-moves.
 
 ## Installation
 
@@ -46,11 +47,29 @@ See [GitButler installation docs](https://docs.gitbutler.com/installation) for o
 ### 3. Restart OpenCode
 
 The plugin automatically:
+- Routes every `edit`/`write` through GitButler's `after-edit`
 - Creates and renames branches based on your prompts
-- Generates commit messages using Claude Haiku
-- Injects workspace state into agent context via `SKILL.md`
+- Rewords commit messages using Claude Haiku (with deterministic fallback)
+- Injects workspace state notifications into agent context
 - Checks for updates on session creation
 
+## How Branch Assignment Works
+
+This plugin uses a session-first flow. In practice:
+
+1. On every `edit`/`write`, the plugin resolves your **root session** (parent session for subagents).
+2. It derives a deterministic `conversation_id` from that root session (or from `branch_target`, when configured).
+3. It always calls `but cursor after-edit` with that `conversation_id` and file path.
+4. On idle/stop, it calls `but cursor stop` for that same `conversation_id`.
+5. In post-stop processing, it may:
+   - sweep edited files and `but rub` unassigned changes when attribution is safe,
+   - reword commit message,
+   - rename default `ge-branch-*` names,
+   - sync OpenCode session title,
+   - clean empty default branches.
+
+This avoids cross-session branch pollution and keeps subagent edits attached to the parent session branch.
+
 ## Configuration
 
 Create `.opencode/gitbutler.json` in your workspace root to override defaults:
@@ -77,7 +96,23 @@ Create `.opencode/gitbutler.json` in your workspace root to override defaults:
   "auto_update": true,
 
   // Regex pattern for default branch detection
-  "default_branch_pattern": "^ge-branch-\\d+$"
+  "default_branch_pattern": "^ge-branch-\\d+$",
+
+  // Milliseconds before file lock is considered stale
+  "stale_lock_ms": 300000,
+
+  // Max age of pending notifications before expiry
+  "notification_max_age_ms": 300000,
+
+  // Enable branch inference heuristics in post-stop sweep
+  "inference_enabled": true,
+
+  // Optional: force all sessions onto one branch seed
+  "branch_target": "",
+
+  // Reserved (currently no-op)
+  "edit_debounce_ms": 200,
+  "gc_on_session_start": false
 }
 ```
 
@@ -93,6 +128,12 @@ Create `.opencode/gitbutler.json` in your workspace root to override defaults:
 | `branch_slug_max_length` | number | `50` | Max auto-generated branch name length |
 | `auto_update` | boolean | `true` | Check npm for newer versions |
 | `default_branch_pattern` | string | `"^ge-branch-\\d+$"` | Regex for default branch detection |
+| `stale_lock_ms` | number | `300000` | Lock age threshold before stale cleanup |
+| `notification_max_age_ms` | number | `300000` | Expiry window for queued state notifications |
+| `inference_enabled` | boolean | `true` | Enable branch inference in post-stop sweep |
+| `branch_target` | string | unset | Force all sessions to one branch seed (disables per-session isolation) |
+| `edit_debounce_ms` | number | `200` | Reserved, currently no-op |
+| `gc_on_session_start` | boolean | `false` | Reserved, currently no-op |
 
 All fields are optional. Missing fields use defaults.
 
@@ -105,7 +146,7 @@ How this plugin compares to GitButler's built-in Cursor and Claude Code integrat
 | Post-edit hook | `after-edit` | PostToolUse | `tool.execute.after` | Equal |
 | Stop/idle hook | `stop` | Stop | `session.idle` | Equal |
 | Branch creation | `get_or_create_session` | `get_or_create_session` | via `conversation_id` | Equal |
-| Auto-assign to existing branch | — | — | `but rub` via `findFileBranch()` | **Better** |
+| Auto-assign to existing branch | Internal | Internal | Session-first `after-edit` + safe post-stop `but rub` sweep | **Better** |
 | Branch auto-rename (LLM) | From Cursor DB | From transcript | `but reword` + user prompt | Equal |
 | Auto-commit on stop | `handle_changes()` | `handle_changes()` | via `but cursor stop` | Equal |
 | Commit message (LLM) | OpenAI gpt-4-mini | OpenAI gpt-4-mini | Claude Haiku via OpenCode SDK | Equal |
@@ -118,6 +159,13 @@ How this plugin compares to GitButler's built-in Cursor and Claude Code integrat
 
 For the full architecture breakdown, gap analysis, and known issues, see [`docs/gitbutler-integration.md`](docs/gitbutler-integration.md).
 
+## Known Operational Limits
+
+- The plugin only performs GitButler actions in workspace mode (`gitbutler/workspace` branch).
+- If `branch_target` is set, all sessions intentionally share one branch seed.
+- `edit_debounce_ms` and `gc_on_session_start` are reserved config fields and are currently no-op.
+- GitButler CLI still has upstream edge cases around unapply/pull after squash-merge with deleted remote branches (see linked issues in `docs/gitbutler-integration.md`).
+
 ## Troubleshooting
 
 ### GitButler CLI not found
@@ -139,6 +187,15 @@ If `.opencode/gitbutler.json` is missing, the plugin uses all defaults. No error
 
 Enable `log_enabled: true` in config to write detailed logs to `.opencode/plugin/debug.log`. Useful for diagnosing branch creation, commit message generation, and state injection issues.
 
+### Wrong branch assignment
+
+If changes still appear on an unexpected branch:
+
+1. Ensure `branch_target` is not set in `.opencode/gitbutler.json`.
+2. Check `.opencode/plugin/session-map.json` and confirm subagent sessions resolve to the expected parent.
+3. Inspect `.opencode/plugin/debug.log` for `after-edit`, `session-stop`, and `branch-collision` events.
+4. Run `but status --json -f` and verify where the file is currently assigned.
+
 ### LLM timeout
 
 If commit message generation times out, increase `llm_timeout_ms` in config:

package/dist/index.js

@@ -101,9 +101,89 @@ async function loadConfig(cwd) {
 }
 
 // src/logger.ts
-import { appendFile } from "fs/promises";
+import {
+  appendFile,
+  mkdir,
+  rename,
+  rm,
+  stat
+} from "fs/promises";
+import { dirname } from "path";
 var LOG_PATH_SUFFIX = ".opencode/plugin/debug.log";
-function createLogger(logEnabled, cwd) {
+var DEFAULT_MAX_FILE_BYTES = 5 * 1024 * 1024;
+function createLogger(logEnabled, cwd, options = {}) {
+  const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
+  const logPath = `${cwd}/${LOG_PATH_SUFFIX}`;
+  const logDir = dirname(logPath);
+  const rotatedPath = `${logPath}.1`;
+  const warned = new Set;
+  let writeQueue = Promise.resolve();
+  function toErrorMessage(err) {
+    if (err instanceof Error)
+      return err.message;
+    return String(err);
+  }
+  function warnOnce(key, message, err) {
+    if (warned.has(key))
+      return;
+    warned.add(key);
+    const suffix = err ? `: ${toErrorMessage(err)}` : "";
+    console.warn(`[opencode-gitbutler] ${message}${suffix}`);
+  }
+  function getErrCode(err) {
+    if (typeof err === "object" && err !== null && "code" in err && typeof err.code === "string") {
+      return err.code;
+    }
+    return;
+  }
+  async function ensureLogDirectory() {
+    try {
+      await mkdir(logDir, { recursive: true });
+      return true;
+    } catch (err) {
+      warnOnce("mkdir", `Logger failed to create log directory at ${logDir}`, err);
+      return false;
+    }
+  }
+  async function rotateIfNeeded() {
+    if (maxFileBytes <= 0)
+      return;
+    let fileSize = 0;
+    try {
+      const fileInfo = await stat(logPath);
+      fileSize = fileInfo.size;
+    } catch (err) {
+      if (getErrCode(err) === "ENOENT")
+        return;
+      warnOnce("rotate-stat", `Logger failed to read log file size at ${logPath}`, err);
+      return;
+    }
+    if (fileSize < maxFileBytes)
+      return;
+    try {
+      await rm(rotatedPath, { force: true });
+      await rename(logPath, rotatedPath);
+    } catch (err) {
+      if (getErrCode(err) === "ENOENT")
+        return;
+      warnOnce("rotate", `Logger failed to rotate log file at ${logPath}`, err);
+    }
+  }
+  function enqueue(line) {
+    writeQueue = writeQueue.then(async () => {
+      const ready = await ensureLogDirectory();
+      if (!ready)
+        return;
+      await rotateIfNeeded();
+      try {
+        await appendFile(logPath, line);
+      } catch (err) {
+        warnOnce("write", `Logger failed to append to ${logPath}`, err);
+      }
+    }).catch((err) => {
+      warnOnce("pipeline", "Logger pipeline failure", err);
+    });
+  }
   function write(level, cat, data = {}) {
     if (!logEnabled)
       return;
@@ -113,13 +193,14 @@ function createLogger(logEnabled, cwd) {
       cat,
       ...data
     };
-    appendFile(`${cwd}/${LOG_PATH_SUFFIX}`, JSON.stringify(entry) + `
-`).catch(() => {});
+    enqueue(JSON.stringify(entry) + `
+`);
   }
   return {
     info: (cat, data) => write("info", cat, data ?? {}),
     warn: (cat, data) => write("warn", cat, data ?? {}),
-    error: (cat, data) => write("error", cat, data ?? {})
+    error: (cat, data) => write("error", cat, data ?? {}),
+    flush: () => writeQueue
   };
 }
 
@@ -823,6 +904,9 @@ function classifyRewordFailure(stderr) {
     return "not-workspace";
   return "unknown";
 }
+function rewordTrackingKey(branchCliId, commitId) {
+  return `${branchCliId}\x00${commitId}`;
+}
 function createRewordManager(deps) {
   const {
     cwd,
@@ -1136,11 +1220,12 @@ function createRewordManager(deps) {
           continue;
         if (branch.commits.length === 0)
           continue;
-        if (rewordedBranches.has(branch.cliId))
-          continue;
         const commit = branch.commits[0];
         if (!commit)
           continue;
+        const trackingKey = rewordTrackingKey(branch.cliId, commit.commitId);
+        if (rewordedBranches.has(trackingKey))
+          continue;
         try {
           const VALID_CONVENTIONAL = /^(feat|fix|refactor|test|docs|style|perf|chore|ci|build)(\(.+?\))?:\s/;
           const DEFAULT_PLACEHOLDERS = [
@@ -1156,7 +1241,7 @@ function createRewordManager(deps) {
               commit: commit.cliId,
               existingMessage: existingMsg
             });
-            rewordedBranches.add(branch.cliId);
+            rewordedBranches.add(trackingKey);
             rewordCount++;
           } else {
             const llmMessage = await generateLLMCommitMessage(commit.commitId, prompt);
@@ -1181,7 +1266,7 @@ function createRewordManager(deps) {
               failCount++;
               continue;
             }
-            rewordedBranches.add(branch.cliId);
+            rewordedBranches.add(trackingKey);
             savePluginState(conversationsWithEdits, rewordedBranches, branchOwnership).catch(() => {});
             addNotification(sessionID, `Commit on branch \`${branch.name}\` reworded to: "${commitMsg}"`);
             log.info("reword", {
@@ -1242,6 +1327,25 @@ function createRewordManager(deps) {
         }))
       });
     }
+    if (candidateBranches.length === 1) {
+      const branch = candidateBranches[0];
+      const syncedBranchName = latestBranchName ?? branch.name;
+      const current = branchOwnership.get(conversationId);
+      const branchChanged = !current || current.rootSessionID !== rootSessionID || current.branchName !== syncedBranchName;
+      if (branchChanged) {
+        branchOwnership.set(conversationId, {
+          rootSessionID,
+          branchName: syncedBranchName,
+          firstSeen: current?.firstSeen ?? Date.now()
+        });
+        savePluginState(conversationsWithEdits, rewordedBranches, branchOwnership).catch(() => {});
+        log.info("branch-ownership-updated", {
+          conversationId,
+          rootSessionID,
+          branchName: syncedBranchName
+        });
+      }
+    }
     if (shouldSetTitle) {
       const singleBranch = candidateBranches[0];
       const titleToSet = latestBranchName ?? singleBranch.name;
@@ -1282,6 +1386,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;
@@ -1298,9 +1417,25 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
     const persistedState = await state.loadPluginState();
     const conversationsWithEdits = new Set(persistedState.conversationsWithEdits);
     const rewordedBranches = new Set(persistedState.rewordedBranches);
+    const MAX_TRACKED_REWORD_KEYS = 2000;
+    while (rewordedBranches.size > MAX_TRACKED_REWORD_KEYS) {
+      const oldest = rewordedBranches.values().next().value;
+      if (!oldest)
+        break;
+      rewordedBranches.delete(oldest);
+    }
     for (const [convId, ownership] of Object.entries(persistedState.branchOwnership ?? {})) {
       branchOwnership.set(convId, ownership);
     }
+    async function persistPluginState() {
+      while (rewordedBranches.size > MAX_TRACKED_REWORD_KEYS) {
+        const oldest = rewordedBranches.values().next().value;
+        if (!oldest)
+          break;
+        rewordedBranches.delete(oldest);
+      }
+      await state.savePluginState(conversationsWithEdits, rewordedBranches, branchOwnership);
+    }
     log.info("state-loaded", {
       conversations: conversationsWithEdits.size,
       reworded: rewordedBranches.size,
@@ -1354,7 +1489,9 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
       rewordedBranches,
       branchOwnership,
       editedFilesPerConversation,
-      savePluginState: state.savePluginState,
+      savePluginState: async () => {
+        await persistPluginState();
+      },
       internalSessionIds,
       reapStaleLocks,
       client
@@ -1371,18 +1508,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 +1607,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 +1634,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 +1642,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)
             });
           }
@@ -1598,7 +1666,7 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
               firstSeen: Date.now()
             });
           }
-          state.savePluginState(conversationsWithEdits, rewordedBranches, branchOwnership).catch(() => {});
+          persistPluginState().catch(() => {});
         } finally {
           const releasedLock = fileLocks.get(relativePath);
           fileLocks.delete(relativePath);
@@ -1658,7 +1726,21 @@ function createGitButlerPlugin(config = { ...DEFAULT_CONFIG }) {
               error: err instanceof Error ? err.message : String(err)
             });
           }
-          await reword.postStopProcessing(props?.sessionID, conversationId, stopFailed);
+          let postStopSucceeded = false;
+          try {
+            await reword.postStopProcessing(props?.sessionID, conversationId, stopFailed);
+            postStopSucceeded = true;
+          } catch (err) {
+            log.error("post-stop-error", {
+              conversationId,
+              error: err instanceof Error ? err.message : String(err)
+            });
+          }
+          if (!stopFailed && postStopSucceeded) {
+            conversationsWithEdits.delete(conversationId);
+            editedFilesPerConversation.delete(conversationId);
+            persistPluginState().catch(() => {});
+          }
           assignmentCache.clear();
           cachedStatus = null;
         } finally {
@@ -1720,7 +1802,7 @@ ${branchList}`);
             }
           }
           if (rewordedBranches.size > 0) {
-            contextParts.push(`Reworded branches (commit messages updated): ${rewordedBranches.size} branches`);
+            contextParts.push(`Tracked reworded commits: ${rewordedBranches.size}`);
           }
           if (conversationsWithEdits.has(conversationId)) {
             contextParts.push(`This session has active edits tracked in GitButler (conversation: ${conversationId.slice(0, 8)})`);

package/dist/logger.d.ts

@@ -1,8 +1,12 @@
 export type LogLevel = "info" | "warn" | "error";
+export type LoggerOptions = {
+    maxFileBytes?: number;
+};
 export type Logger = {
     info: (cat: string, data?: Record<string, unknown>) => void;
     warn: (cat: string, data?: Record<string, unknown>) => void;
     error: (cat: string, data?: Record<string, unknown>) => void;
+    flush?: () => Promise<void>;
 };
 /**
  * Structured NDJSON logger with explicit levels.
@@ -17,5 +21,5 @@ export type Logger = {
  *   jq 'select(.cat == "cursor-ok")'
  *   grep '"cat":"llm-' debug.log | jq .
  */
-export declare function createLogger(logEnabled: boolean, cwd: string): Logger;
+export declare function createLogger(logEnabled: boolean, cwd: string, options?: LoggerOptions): Logger;
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC5D,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC5D,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC9D,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAwBrE"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,aAAa,GAAG;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC5D,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC5D,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC7D,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,UAAU,EAAE,OAAO,EACnB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,aAAkB,GAC1B,MAAM,CA0HR"}

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,CAumBR"}

package/dist/reword.d.ts

@@ -100,5 +100,6 @@ export type RewordManager = {
     postStopProcessing: (sessionID: string | undefined, conversationId: string, stopFailed?: boolean) => Promise<void>;
 };
 export declare function classifyRewordFailure(stderr: string): string;
+export declare function rewordTrackingKey(branchCliId: string, commitId: string): string;
 export declare function createRewordManager(deps: RewordDeps): RewordManager;
 //# sourceMappingURL=reword.d.ts.map

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.7",
+  "version": "0.1.9",
   "type": "module",
   "description": "OpenCode plugin for GitButler integration",
   "main": "dist/index.js",