opencode-repos 0.3.0 → 0.3.2

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
@@ -347,9 +348,12 @@ async function ensureRepoAvailable(
     const repoPath = join(cacheDir, owner, repo)
     const url = buildGitUrl(owner, repo, useHttps)
 
+    let actualBranch = branch
     try {
       await withManifestLock(async () => {
-        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()
         const updatedManifest = await loadManifest()
@@ -359,7 +363,7 @@ async function ensureRepoAvailable(
           clonedAt: now,
           lastAccessed: now,
           lastUpdated: now,
-          currentBranch: branch,
+          currentBranch: actualBranch,
           shallow: true,
         }
         await saveManifest(updatedManifest)
@@ -371,7 +375,7 @@ async function ensureRepoAvailable(
 
     return {
       repoPath,
-      branch,
+      branch: actualBranch,
       type: "cached",
     }
   }
@@ -955,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 () => {
@@ -988,8 +993,11 @@ When user mentions another project or asks about external code:
               } catch {}
             }
 
+            let actualBranch = branch
             try {
-              await cloneRepo(url, destPath, { branch })
+              const cloneOptions = explicitBranch ? { branch: explicitBranch } : {}
+              const cloneResult = await cloneRepo(url, destPath, cloneOptions)
+              actualBranch = cloneResult.branch
             } catch (error) {
               const message =
                 error instanceof Error ? error.message : String(error)
@@ -1003,7 +1011,7 @@ When user mentions another project or asks about external code:
               clonedAt: now,
               lastAccessed: now,
               lastUpdated: now,
-              currentBranch: branch,
+              currentBranch: actualBranch,
               shallow: true,
             }
             manifest.repos[repoKey] = entry
@@ -1012,7 +1020,7 @@ When user mentions another project or asks about external code:
 
             return {
               path: destPath,
-              branch,
+              branch: actualBranch,
               status: "cloned" as const,
               alreadyExists: false,
             }
@@ -1838,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
@@ -1858,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}`,
@@ -1926,7 +1936,8 @@ Failed to parse \`${repo}\`: ${message}`
                     cacheDir,
                     useHttps,
                     autoSyncOnExplore,
-                    autoSyncIntervalHours
+                    autoSyncIntervalHours,
+                    target.explicitBranch
                   )
 
                   await requestExternalDirectoryAccess(
@@ -2063,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,
@@ -2095,7 +2107,8 @@ Be more specific or pass an explicit list with \`repos\`.
                 cacheDir,
                 useHttps,
                 autoSyncOnExplore,
-                autoSyncIntervalHours
+                autoSyncIntervalHours,
+                target.explicitBranch
               )
 
               await requestExternalDirectoryAccess(
@@ -2177,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.0",
-	"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.2",
+  "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/__tests__/git.test.ts

@@ -8,6 +8,7 @@ import {
   cloneRepo,
   updateRepo,
   getRepoInfo,
+  getRemoteDefaultBranch,
 } from "../git"
 
 describe("parseRepoSpec", () => {
@@ -90,6 +91,22 @@ describe("buildGitUrl", () => {
   })
 })
 
+describe("getRemoteDefaultBranch", () => {
+  test("returns default branch for a public repo", async () => {
+    const branch = await getRemoteDefaultBranch(
+      "https://github.com/octocat/Hello-World.git"
+    )
+    expect(branch).toBe("master")
+  })
+
+  test("returns null for nonexistent repo", async () => {
+    const branch = await getRemoteDefaultBranch(
+      "https://github.com/nonexistent-user-12345/nonexistent-repo-67890.git"
+    )
+    expect(branch).toBeNull()
+  })
+})
+
 describe("git operations (integration)", () => {
   const testDir = join(tmpdir(), `opencode-repos-test-${Date.now()}`)
   const repoPath = join(testDir, "test-repo")
@@ -102,13 +119,14 @@ describe("git operations (integration)", () => {
     await rm(testDir, { recursive: true, force: true })
   })
 
-  test("cloneRepo clones a public repository", async () => {
-    await cloneRepo(
+  test("cloneRepo clones a public repository and returns branch", async () => {
+    const result = await cloneRepo(
       "https://github.com/octocat/Hello-World.git",
       repoPath,
       { branch: "master" }
     )
 
+    expect(result.branch).toBe("master")
     const exists = await Bun.file(join(repoPath, ".git/config")).exists()
     expect(exists).toBe(true)
   })
@@ -143,4 +161,17 @@ describe("git operations (integration)", () => {
       expect(exists).toBe(false)
     }
   })
+
+  test("cloneRepo falls back to actual default branch when main does not exist", async () => {
+    const fallbackPath = join(testDir, "fallback-repo")
+
+    const result = await cloneRepo(
+      "https://github.com/octocat/Hello-World.git",
+      fallbackPath
+    )
+
+    expect(result.branch).toBe("master")
+    const exists = await Bun.file(join(fallbackPath, ".git/config")).exists()
+    expect(exists).toBe(true)
+  })
 })

package/src/git.ts

@@ -58,20 +58,47 @@ export function buildGitUrl(owner: string, repo: string, useHttps: boolean = fal
   return `git@github.com:${owner}/${repo}.git`
 }
 
+export async function getRemoteDefaultBranch(url: string): Promise<string | null> {
+  try {
+    const output = await $`git ls-remote --symref ${url} HEAD`.text()
+    const match = output.match(/ref: refs\/heads\/(\S+)\s+HEAD/)
+    return match?.[1] ?? null
+  } catch {
+    return null
+  }
+}
+
 export async function cloneRepo(
   url: string,
   destPath: string,
   options: CloneOptions = {}
-): Promise<void> {
-  const branch = options.branch || "main"
+): Promise<{ branch: string }> {
+  const requestedBranch = options.branch || "main"
 
   try {
-    await $`git clone --depth=1 --branch ${branch} --config core.hooksPath=/dev/null ${url} ${destPath}`.quiet()
-  } catch (error) {
+    await $`git clone --depth=1 --branch ${requestedBranch} --config core.hooksPath=/dev/null ${url} ${destPath}`.quiet()
+    return { branch: requestedBranch }
+  } catch (firstError) {
     try {
       await rm(destPath, { recursive: true, force: true })
     } catch {}
-    throw error
+
+    if (!options.branch) {
+      const defaultBranch = await getRemoteDefaultBranch(url)
+      if (defaultBranch && defaultBranch !== requestedBranch) {
+        try {
+          await $`git clone --depth=1 --branch ${defaultBranch} --config core.hooksPath=/dev/null ${url} ${destPath}`.quiet()
+          return { branch: defaultBranch }
+        } catch (secondError) {
+          try {
+            await rm(destPath, { recursive: true, force: true })
+          } catch {}
+          throw secondError
+        }
+      }
+    }
+
+    throw firstError
   }
 }
 

package/.sisyphus/boulder.json

@@ -1,8 +0,0 @@
-{
-  "active_plan": "/Users/liamvinberg/personal/projects/opencode-repos/.sisyphus/plans/opencode-repos.md",
-  "started_at": "2026-01-20T14:19:14.152Z",
-  "session_ids": [
-    "ses_42439dcabffexjguXrkWPjNecT"
-  ],
-  "plan_name": "opencode-repos"
-}

package/.sisyphus/notepads/opencode-repos/decisions.md

@@ -1,15 +0,0 @@
-# Decisions - opencode-repos
-
-## Task 0: Project Setup
-
-### Placeholder Test File
-**Decision**: Created `src/__tests__/setup.test.ts` with a trivial passing test.
-**Rationale**: `bun test` exits with code 1 when no tests found, which would fail verification. A placeholder ensures clean test runs during development.
-
-### tsconfig.json Pattern
-**Decision**: Followed opencode-tmux tsconfig exactly rather than bun init default.
-**Rationale**: Consistency with existing plugin ecosystem. The tmux pattern is proven to work with OpenCode plugin system.
-
-### Directory Structure
-**Decision**: Using `src/` directory for modules rather than flat structure.
-**Rationale**: Plan specifies src/ directory. Allows separation of implementation from root-level plugin entry point.