opencode-repos 0.3.1 → 0.3.3

package/index.ts

@@ -333,7 +333,8 @@ async function ensureRepoAvailable(
   cacheDir: string,
   useHttps: boolean,
   autoSyncOnExplore: boolean,
-  autoSyncIntervalHours: number
+  autoSyncIntervalHours: number,
+  explicitBranch?: string
 ): Promise<{
   repoPath: string
   branch: string
@@ -350,7 +351,8 @@ async function ensureRepoAvailable(
     let actualBranch = branch
     try {
       await withManifestLock(async () => {
-        const cloneResult = await cloneRepo(url, repoPath, { branch })
+        const cloneOptions = explicitBranch ? { branch: explicitBranch } : {}
+        const cloneResult = await cloneRepo(url, repoPath, cloneOptions)
         actualBranch = cloneResult.branch
 
         const now = new Date().toISOString()
@@ -957,7 +959,8 @@ When user mentions another project or asks about external code:
         },
         async execute(args) {
           const spec = parseRepoSpec(args.repo)
-          const branch = spec.branch || defaultBranch
+          const explicitBranch = spec.branch
+          const branch = explicitBranch || defaultBranch
           const repoKey = `${spec.owner}/${spec.repo}`
 
           const result = await withManifestLock(async () => {
@@ -992,7 +995,8 @@ When user mentions another project or asks about external code:
 
             let actualBranch = branch
             try {
-              const cloneResult = await cloneRepo(url, destPath, { branch })
+              const cloneOptions = explicitBranch ? { branch: explicitBranch } : {}
+              const cloneResult = await cloneRepo(url, destPath, cloneOptions)
               actualBranch = cloneResult.branch
             } catch (error) {
               const message =
@@ -1842,6 +1846,7 @@ Provide either \`query\` or a non-empty \`repos\` list.`
           const targets: Array<{
             repoKey: string
             branch: string
+            explicitBranch?: string
             source?: RepoSource
             remote?: string
             path?: string
@@ -1862,6 +1867,7 @@ Provide either \`query\` or a non-empty \`repos\` list.`
                 targets.push({
                   repoKey: `${spec.owner}/${spec.repo}`,
                   branch: spec.branch || defaultBranch,
+                  explicitBranch: spec.branch ?? undefined,
                 })
                 debugInfo.selectedTargets.push({
                   repoKey: `${spec.owner}/${spec.repo}`,
@@ -1930,7 +1936,8 @@ Failed to parse \`${repo}\`: ${message}`
                     cacheDir,
                     useHttps,
                     autoSyncOnExplore,
-                    autoSyncIntervalHours
+                    autoSyncIntervalHours,
+                    target.explicitBranch
                   )
 
                   await requestExternalDirectoryAccess(
@@ -2067,6 +2074,7 @@ Be more specific or pass an explicit list with \`repos\`.
             targets.push({
               repoKey: selected.key,
               branch,
+              explicitBranch: branchOverride ?? undefined,
               source: selected.source,
               remote: selected.remote,
               path: selected.path,
@@ -2099,7 +2107,8 @@ Be more specific or pass an explicit list with \`repos\`.
                 cacheDir,
                 useHttps,
                 autoSyncOnExplore,
-                autoSyncIntervalHours
+                autoSyncIntervalHours,
+                target.explicitBranch
               )
 
               await requestExternalDirectoryAccess(
@@ -2181,7 +2190,8 @@ Be more specific or pass an explicit list with \`repos\`.
               cacheDir,
               useHttps,
               autoSyncOnExplore,
-              autoSyncIntervalHours
+              autoSyncIntervalHours,
+              spec.branch ?? undefined
             )
             repoPath = resolved.repoPath
             await requestExternalDirectoryAccess(ctx as PermissionContext, repoPath)

package/package.json

@@ -1,29 +1,29 @@
 {
-	"name": "opencode-repos",
-	"version": "0.3.1",
-	"description": "Repository cache, registry, and cross-codebase intelligence for OpenCode agents",
-	"main": "index.ts",
-	"type": "module",
-	"keywords": [
-		"opencode",
-		"opencode-plugin",
-		"repos",
-		"repository",
-		"cache",
-		"codebase"
-	],
-	"author": "Liam Vinberg",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/liamjv1/opencode-repos"
-	},
-	"peerDependencies": {
-		"@opencode-ai/plugin": "*"
-	},
-	"devDependencies": {
-		"@opencode-ai/plugin": "^1.1.25",
-		"@types/bun": "^1.2.0",
-		"typescript": "^5.0.0"
-	}
+  "name": "opencode-repos",
+  "version": "0.3.3",
+  "description": "Repository cache, registry, and cross-codebase intelligence for OpenCode agents",
+  "main": "index.ts",
+  "type": "module",
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "repos",
+    "repository",
+    "cache",
+    "codebase"
+  ],
+  "author": "Liam Vinberg",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/liamjv1/opencode-repos"
+  },
+  "peerDependencies": {
+    "@opencode-ai/plugin": "*"
+  },
+  "devDependencies": {
+    "@opencode-ai/plugin": "^1.1.25",
+    "@types/bun": "^1.2.0",
+    "typescript": "^5.0.0"
+  }
 }

package/src/manifest.ts

@@ -1,6 +1,6 @@
 import { homedir } from "node:os"
 import { join } from "node:path"
-import { mkdir, rename, unlink, stat } from "node:fs/promises"
+import { mkdir, rename, unlink, stat, open } from "node:fs/promises"
 
 export interface RepoEntry {
   type: "cached" | "local"
@@ -27,7 +27,7 @@ let cacheDir = join(homedir(), ".cache", "opencode-repos")
 let manifestPath = join(cacheDir, "manifest.json")
 let manifestTmpPath = join(cacheDir, "manifest.json.tmp")
 let lockPath = join(cacheDir, "manifest.lock")
-const LOCK_STALE_MS = 5 * 60 * 1000
+const LOCK_STALE_MS = 30_000
 
 function createEmptyManifest(): Manifest {
   return {
@@ -72,31 +72,33 @@ async function isLockStale(): Promise<boolean> {
 }
 
 async function acquireLock(): Promise<void> {
-  const maxAttempts = 50
-  const retryDelayMs = 100
+  const maxAttempts = 150
+  const retryDelayMs = 200
+
+  await mkdir(cacheDir, { recursive: true })
 
   for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const lockFile = Bun.file(lockPath)
-    const exists = await lockFile.exists()
-
-    if (exists) {
-      if (await isLockStale()) {
-        await unlink(lockPath).catch(() => {})
-      } else {
-        await Bun.sleep(retryDelayMs)
-        continue
+    try {
+      const fd = await open(lockPath, "wx")
+      await fd.write(String(process.pid))
+      await fd.close()
+      return
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code
+      if (code !== "EEXIST") {
+        throw error
       }
     }
 
-    try {
-      await mkdir(cacheDir, { recursive: true })
-      await Bun.write(lockPath, String(Date.now()))
-      return
-    } catch {
-      await Bun.sleep(retryDelayMs)
+    if (await isLockStale()) {
+      await unlink(lockPath).catch(() => {})
+      continue
     }
+
+    await Bun.sleep(retryDelayMs)
   }
 
+  await unlink(lockPath).catch(() => {})
   throw new Error("Failed to acquire manifest lock after maximum attempts")
 }