@bivy/bivy 0.18.5-staging.6 → 0.18.5-staging.7

package/dist/github-repos.js

@@ -0,0 +1,57 @@
+/** User credentials (configured token or gh login) can reach repos outside the Apps. */
+export async function listGithubUserRepos(token, fetchImpl = fetch) {
+    const repos = [];
+    for (let page = 1;; page++) {
+        const response = await fetchImpl(`https://api.github.com/user/repos?sort=updated&per_page=100&affiliation=owner,collaborator,organization_member&page=${page}`, {
+            headers: { authorization: `Bearer ${token}`, accept: "application/vnd.github+json", "user-agent": "bivy" },
+        });
+        if (!response.ok)
+            throw new Error(`GitHub responded ${response.status} while listing user repositories`);
+        const batch = await response.json();
+        if (!Array.isArray(batch))
+            throw new Error("GitHub returned an invalid repository listing");
+        for (const repo of batch) {
+            if (typeof repo?.full_name !== "string" || !repo.full_name)
+                continue;
+            repos.push({
+                slug: repo.full_name,
+                description: typeof repo.description === "string" ? repo.description : "",
+                private: Boolean(repo.private),
+                pushedAt: typeof repo.pushed_at === "string" ? repo.pushed_at : undefined,
+                defaultBranch: typeof repo.default_branch === "string" ? repo.default_branch : undefined,
+            });
+        }
+        if (batch.length < 100)
+            return repos;
+    }
+}
+/** Query both sources independently; a failed credential must not hide usable repos. */
+export async function discoverGithubRepos(sources) {
+    const results = await Promise.allSettled([sources.appRepos(), sources.userRepos()]);
+    const repos = new Map();
+    const errors = [];
+    let authed = false;
+    for (const [index, result] of results.entries()) {
+        if (result.status === "rejected") {
+            errors.push(`${index === 0 ? "GitHub App" : "GitHub user"}: ${result.reason instanceof Error ? result.reason.message : String(result.reason)}`);
+            continue;
+        }
+        if (result.value === undefined)
+            continue;
+        authed = true;
+        for (const repo of result.value) {
+            const key = repo.slug.toLowerCase();
+            if (!repos.has(key))
+                repos.set(key, repo);
+        }
+    }
+    const listing = {
+        authed,
+        repos: [...repos.values()].sort((a, b) => (b.pushedAt ?? "").localeCompare(a.pushedAt ?? "") || a.slug.localeCompare(b.slug)),
+    };
+    if (errors.length)
+        listing.error = errors.join("; ");
+    else if (!authed)
+        listing.reason = await sources.ghInstalled() ? "gh-unauthed" : "no-token";
+    return listing;
+}

package/dist/server.js

@@ -144,6 +144,7 @@ import { SecretVault, resolveSecret } from "./secrets.js";
 import { deviceFlowClientId, requestDeviceCode, pollAccessTokenOnce, REPO_CONNECT_SCOPE } from "./github-device-auth.js";
 import { InstallationTokenCache, createAppJwt, resolveInstallationId } from "./github-app-auth.js";
 import { listGithubAppRepos } from "./github-app-repos.js";
+import { discoverGithubRepos, listGithubUserRepos } from "./github-repos.js";
 import { loadGitHubAppConfigs, orderAppsForOwner, listGitHubApps, removeGitHubApp, upsertGitHubApp, privateKeyIdFor, } from "./github-apps.js";
 import { buildAppManifest, convertManifest, renderManifestForm } from "./github-app-manifest.js";
 import { encryptGithubAppEnvelope, decryptGithubAppEnvelope, readLocalGithubAppVaultKey, writeLocalGithubAppVaultKey, forgetLocalGithubAppVaultKey, mintLocalGithubAppVaultKey, } from "./github-app-vault.js";
@@ -10492,46 +10493,25 @@ async function createControlPlaneHook(kind = "github") {
         throw new Error(data?.error || `Could not create Bivy webhook (${res.status})`);
     return data;
 }
-// List the GitHub repos the node can reach with its own token (for picking a
-// git workspace). Uses local App installations when available, otherwise the
-// token stored on this machine (env or `gh`). Returns `authed: false` with
-// an empty list when there's no token so the UI falls back to manual owner/repo.
+// Combine local App access with the configured user token or gh login, matching
+// the credentials available to clone/fetch. Cache only complete, successful lists.
 async function listAccessibleRepos() {
     if (reposCache && Date.now() - reposCache.at < REPO_LIST_TTL_MS)
         return reposCache.val;
-    try {
-        const apps = await ensureGitHubApps();
-        if (apps.length) {
-            const val = { authed: true, repos: await listGithubAppRepos(apps) };
-            reposCache = { at: Date.now(), val };
-            return val;
-        }
-        const token = await resolveGitHubToken();
-        if (!token)
-            return { authed: false, repos: [], reason: (await ghCliInstalled()) ? "gh-unauthed" : "no-token" };
-        const ghRes = await fetch("https://api.github.com/user/repos?sort=updated&per_page=100&affiliation=owner,collaborator,organization_member", {
-            headers: { authorization: `Bearer ${token}`, accept: "application/vnd.github+json", "user-agent": "bivy" },
-        });
-        if (!ghRes.ok)
-            return { authed: true, repos: [], error: `GitHub responded ${ghRes.status}` };
-        const raw = (await ghRes.json().catch(() => []));
-        const repos = (Array.isArray(raw) ? raw : []).map((r) => ({
-            slug: String(r.full_name ?? ""),
-            description: typeof r.description === "string" ? r.description : "",
-            private: Boolean(r.private),
-            pushedAt: typeof r.pushed_at === "string" ? r.pushed_at : undefined,
-            // GitHub already hands us each repo's default branch here, so the branch
-            // picker can label "Default branch (main)" instantly from the cached repo
-            // list — no separate /repos/{owner}/{repo} round trip when it opens.
-            defaultBranch: typeof r.default_branch === "string" ? r.default_branch : undefined,
-        })).filter((r) => r.slug);
-        const val = { authed: true, repos };
+    const val = await discoverGithubRepos({
+        appRepos: async () => {
+            const apps = await ensureGitHubApps();
+            return apps.length ? listGithubAppRepos(apps) : undefined;
+        },
+        userRepos: async () => {
+            const token = await resolveGitHubToken();
+            return token ? listGithubUserRepos(token) : undefined;
+        },
+        ghInstalled: ghCliInstalled,
+    });
+    if (val.authed && !val.error)
         reposCache = { at: Date.now(), val };
-        return val;
-    }
-    catch (error) {
-        return { authed: false, repos: [], error: error instanceof Error ? error.message : String(error) };
-    }
+    return val;
 }
 let pendingGithubConnect = null;
 async function startGithubConnect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.18.5-staging.6",
+  "version": "0.18.5-staging.7",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",