@vibes.diy/api-svc 14.3.164 → 14.3.166

package/public/github-repos.js

@@ -0,0 +1,170 @@
+import { exception2Result, Result } from "@adviser/cement";
+import { and, eq, inArray, ne, or } from "drizzle-orm/sql/expressions";
+import { appExists, claimGithubConsent, consentUsedPage, GITHUB_REPO_PICK_PROVIDER, githubConsentUnspent, mayBindVibe, notProvisionedPage, notYourVibePage, ownsHandle, sessionTokenFrom, sqlFor, stateSecret, verifyGithubRepoPickState, } from "./github-setup.js";
+import { flowRedirect, htmlPage } from "./github-templates.js";
+import { GITHUB_REPO_MAX_VIBES } from "./github-webhook.js";
+function pickUsedPage() {
+    return htmlPage("Choice already saved", "That page has already saved a choice of repositories. Open the app and press its Connect button again to change it.", 403);
+}
+function pickExpiredPage() {
+    return htmlPage("Link expired", "That choice of repositories is no longer valid. Open the app and press its Connect button again.", 400);
+}
+async function claimPick(sql, pick, nowMs) {
+    const t = sql.tables.connectionApprovals;
+    const claimed = await sql.db
+        .update(t)
+        .set({ consumedAt: new Date(nowMs).toISOString() })
+        .where(and(eq(t.id, pick.id), eq(t.consumedAt, ""), eq(t.userId, pick.userId), eq(t.provider, GITHUB_REPO_PICK_PROVIDER), eq(t.ownerHandle, pick.owner), eq(t.appSlug, pick.slug)))
+        .returning({ id: t.id });
+    return claimed.length > 0;
+}
+async function bindOne(input) {
+    const { sql, pick, repoFullName, accountLogin, now } = input;
+    const t = sql.tables.githubRepoRoutes;
+    const rApplied = await exception2Result(() => sql.db
+        .insert(t)
+        .values({
+        installationId: pick.installationId,
+        repoFullName,
+        ownerHandle: pick.owner,
+        appSlug: pick.slug,
+        accountLogin,
+        installedByUserId: pick.userId,
+        created: now,
+        updated: now,
+        removedAt: "",
+    })
+        .onConflictDoUpdate({
+        target: [t.installationId, t.repoFullName, t.ownerHandle, t.appSlug],
+        set: { accountLogin, installedByUserId: pick.userId, updated: now, removedAt: "" },
+        setWhere: or(eq(t.installedByUserId, pick.userId), ne(t.removedAt, "")),
+    })
+        .returning({ repoFullName: t.repoFullName }));
+    if (rApplied.isErr())
+        return Result.Err(rApplied.Err());
+    return Result.Ok(rApplied.Ok().length > 0 ? "bound" : "held-here");
+}
+async function inChunks(items, fn) {
+    const out = [];
+    for (let i = 0; i < items.length; i = i + IN_ARRAY_CHUNK) {
+        out.push(...(await fn(items.slice(i, i + IN_ARRAY_CHUNK))));
+    }
+    return out;
+}
+const IN_ARRAY_CHUNK = 50;
+async function otherVibesFed(input) {
+    const t = input.sql.tables.githubRepoRoutes;
+    const rows = await input.sql.db
+        .select({ ownerHandle: t.ownerHandle, appSlug: t.appSlug })
+        .from(t)
+        .where(and(eq(t.installationId, input.pick.installationId), eq(t.repoFullName, input.repoFullName), eq(t.removedAt, "")))
+        .limit(GITHUB_REPO_MAX_VIBES + 1);
+    return rows.filter((r) => r.ownerHandle !== input.pick.owner || r.appSlug !== input.pick.slug).length;
+}
+export async function handleGithubRepos(request, env, deps) {
+    const signingKey = stateSecret(env);
+    if (signingKey === undefined)
+        return notProvisionedPage();
+    const rForm = await exception2Result(() => request.formData());
+    if (rForm.isErr())
+        return pickExpiredPage();
+    const form = rForm.Ok();
+    const rawState = form.get("state");
+    const nowMs = deps.nowMs ?? Date.now();
+    const pick = typeof rawState === "string" ? await verifyGithubRepoPickState(signingKey, rawState, nowMs) : undefined;
+    if (pick === undefined)
+        return pickExpiredPage();
+    const token = sessionTokenFrom(request);
+    const sessionUserId = token === undefined ? undefined : await deps.verifySessionToken(token);
+    if (sessionUserId !== undefined && sessionUserId !== pick.userId) {
+        console.error(`[github-repos] pick state for clerk user ${pick.userId} presented by ${sessionUserId}; refusing`);
+        return pickExpiredPage();
+    }
+    const userId = pick.userId;
+    const sql = sqlFor(env, deps);
+    const isOwner = await ownsHandle(sql, userId, pick.owner);
+    if (isOwner === false) {
+        if (pick.consentId === undefined ||
+            (await mayBindVibe(sql, { userId, owner: pick.owner, slug: pick.slug }, deps.githubDecl)) === false) {
+            return notYourVibePage();
+        }
+        if ((await githubConsentUnspent(sql, { id: pick.consentId, userId, owner: pick.owner, slug: pick.slug })) === false) {
+            return consentUsedPage();
+        }
+    }
+    if ((await appExists(sql, pick.owner, pick.slug)) === false) {
+        return htmlPage("Vibe not found", "That vibe does not exist. Publish it first, then connect the repository.", 404);
+    }
+    const offered = new Map(pick.repos.map((r) => [r.fullName, r]));
+    const ticked = new Set();
+    for (const value of form.getAll("repo")) {
+        if (typeof value !== "string")
+            continue;
+        const name = value.toLowerCase();
+        if (offered.has(name))
+            ticked.add(name);
+    }
+    const t = sql.tables.githubRepoRoutes;
+    const offeredNames = [...offered.keys()];
+    const removable = (await inChunks(offeredNames, (names) => sql.db
+        .select({ repoFullName: t.repoFullName, installedByUserId: t.installedByUserId })
+        .from(t)
+        .where(and(eq(t.installationId, pick.installationId), eq(t.ownerHandle, pick.owner), eq(t.appSlug, pick.slug), eq(t.removedAt, ""), inArray(t.repoFullName, [...names])))))
+        .filter((row) => ticked.has(row.repoFullName) === false && (isOwner || row.installedByUserId === userId))
+        .map((row) => row.repoFullName);
+    if (ticked.size === 0 && removable.length === 0) {
+        return htmlPage("No repositories chosen", "Tick at least one repository for this vibe, then save. Go back to choose.", 400);
+    }
+    if ((await claimPick(sql, pick, nowMs)) === false)
+        return pickUsedPage();
+    if (pick.consentId !== undefined &&
+        isOwner === false &&
+        (await claimGithubConsent(sql, { id: pick.consentId, userId, owner: pick.owner, slug: pick.slug, nowMs })) === false) {
+        return consentUsedPage();
+    }
+    const now = new Date(nowMs).toISOString();
+    await inChunks(removable, async (names) => {
+        await sql.db
+            .delete(t)
+            .where(and(eq(t.installationId, pick.installationId), eq(t.ownerHandle, pick.owner), eq(t.appSlug, pick.slug), eq(t.removedAt, ""), inArray(t.repoFullName, [...names]), ...(isOwner ? [] : [eq(t.installedByUserId, userId)])));
+        return [];
+    });
+    let bound = 0;
+    let heldHere = 0;
+    let atCapacity = 0;
+    for (const name of ticked) {
+        const repo = offered.get(name);
+        if (repo === undefined)
+            continue;
+        if ((await otherVibesFed({ sql, pick, repoFullName: name })) >= GITHUB_REPO_MAX_VIBES) {
+            atCapacity = atCapacity + 1;
+            console.warn(`[github-repos] installation ${pick.installationId} repo ${name} already feeds ${GITHUB_REPO_MAX_VIBES} vibes; ` +
+                `not adding ${pick.owner}/${pick.slug} (clerk user ${userId})`);
+            continue;
+        }
+        const rOutcome = await bindOne({ sql, pick, repoFullName: name, accountLogin: repo.accountLogin, now });
+        if (rOutcome.isErr()) {
+            console.error(`[github-repos] bind of ${name} to ${pick.owner}/${pick.slug} failed:`, rOutcome.Err().message);
+            return htmlPage("Not saved", "We could not save your choice of repositories. Open the app and press its Connect button again.", 500);
+        }
+        switch (rOutcome.Ok()) {
+            case "bound":
+                bound = bound + 1;
+                break;
+            case "held-here":
+                heldHere = heldHere + 1;
+                console.warn(`[github-repos] installation ${pick.installationId} repo ${name} is connected to ${pick.owner}/${pick.slug} by ` +
+                    `another clerk user; leaving it theirs (clerk user ${userId} asked)`);
+                break;
+        }
+    }
+    if (atCapacity > 0) {
+        return htmlPage("That repository is popular", `One repository can feed up to ${GITHUB_REPO_MAX_VIBES} vibes, and one you chose already feeds ${GITHUB_REPO_MAX_VIBES} vibes, so ` +
+            "it was not added here. The rest of your choice is saved.", 409);
+    }
+    if (ticked.size > 0 && bound === 0 && heldHere > 0 && removable.length === 0) {
+        return htmlPage("Already connected", "Those repositories are already connected to this vibe by someone else, so they stay theirs.", 409);
+    }
+    return flowRedirect(`/vibe/${pick.owner}/${pick.slug}`);
+}
+//# sourceMappingURL=github-repos.js.map

package/public/github-repos.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"github-repos.js","sourceRoot":"","sources":["../../jsr/public/github-repos.ts"],"names":[],"mappings":"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"}

package/public/github-setup.d.ts

@@ -80,7 +80,20 @@ export declare function recordGithubConsent(sql: GithubSetupSql, input: {
     readonly slug: string;
     readonly nowMs: number;
 }): Promise<string>;
+interface ConsentRowKey {
+    readonly id: string;
+    readonly userId: string;
+    readonly owner: string;
+    readonly slug: string;
+}
+export declare function githubConsentUnspent(sql: GithubSetupSql, key: ConsentRowKey): Promise<boolean>;
+export declare function claimGithubConsent(sql: GithubSetupSql, key: ConsentRowKey & {
+    readonly nowMs: number;
+}): Promise<boolean>;
+export declare function notYourVibePage(): Response;
 export declare const GITHUB_SETUP_PATH = "/github/setup";
+export declare function notProvisionedPage(): Response;
+export declare function consentUsedPage(): Response;
 export type GithubAuthorizeUrl = {
     readonly ok: true;
     readonly url: string;
@@ -100,3 +113,23 @@ export type GithubOAuthReady = {
 export declare function githubOAuthReady(env: CFEnv): GithubOAuthReady;
 export declare function githubAuthorizeUrl(env: CFEnv, state: SetupOAuthState): Promise<GithubAuthorizeUrl>;
 export declare function installUrlFor(htmlUrl: string, state: string): string;
+export declare const GITHUB_REPOS_PATH = "/github/repos";
+export declare const GITHUB_REPO_PICK_STATE_PREFIX = "r1.";
+export declare const GITHUB_REPO_PICK_STATE_TTL_MS: number;
+export declare const GITHUB_REPO_PICK_PROVIDER = "github-app-repos";
+export interface PickedRepo {
+    readonly fullName: string;
+    readonly accountLogin: string;
+}
+export interface GithubRepoPickState {
+    readonly id: string;
+    readonly owner: string;
+    readonly slug: string;
+    readonly installationId: string;
+    readonly userId: string;
+    readonly repos: readonly PickedRepo[];
+    readonly consentId?: string;
+    readonly exp: number;
+}
+export declare function signGithubRepoPickState(secret: string, state: GithubRepoPickState): Promise<string>;
+export declare function verifyGithubRepoPickState(secret: string, signed: string, nowMs: number): Promise<GithubRepoPickState | undefined>;

package/public/github-setup.js

@@ -1,6 +1,6 @@
 import { exception2Result, BuildURI, TxtEnDecoderSingleton, URI } from "@adviser/cement";
 import { cfDrizzle, createVibesApiTables, toDBFlavour } from "@vibes.diy/api-sql";
-import { and, eq, ne, or } from "drizzle-orm/sql/expressions";
+import { and, eq } from "drizzle-orm/sql/expressions";
 import { getAppHtmlUrl, getInstallationToken, listUserInstallationRepos, nextGithubPageUrl } from "../intern/github-app-auth.js";
 import { timingSafeEqualString } from "./github-webhook.js";
 import { isConnectState } from "./connections-oauth.js";
@@ -296,12 +296,12 @@ function consentRowMatches(sql, key) {
     const t = sql.tables.connectionApprovals;
     return and(eq(t.id, key.id), eq(t.consumedAt, ""), eq(t.userId, key.userId), eq(t.provider, GITHUB_BIND_CONSENT_PROVIDER), eq(t.ownerHandle, key.owner), eq(t.appSlug, key.slug));
 }
-async function githubConsentUnspent(sql, key) {
+export async function githubConsentUnspent(sql, key) {
     const t = sql.tables.connectionApprovals;
     const rows = await sql.db.select({ id: t.id }).from(t).where(consentRowMatches(sql, key)).limit(1);
     return rows.length > 0;
 }
-async function claimGithubConsent(sql, key) {
+export async function claimGithubConsent(sql, key) {
     const t = sql.tables.connectionApprovals;
     const claimed = await sql.db
         .update(t)
@@ -310,7 +310,7 @@ async function claimGithubConsent(sql, key) {
         .returning({ id: t.id });
     return claimed.length > 0;
 }
-function notYourVibePage() {
+export function notYourVibePage() {
     return htmlPage("Not your vibe", "You can only connect a repository to a vibe you own.", 403);
 }
 async function admitPhaseOne(input) {
@@ -337,7 +337,7 @@ async function admitPhaseOne(input) {
         return {
             ok: false,
             refusal: htmlPage("Consent not confirmed", "This install did not come from a consent you confirmed on vibes.diy, or that consent has expired. Open the " +
-                "app and use its Connect GitHub link again.", 403),
+                "app and press its Connect button again.", 403),
         };
     }
     if (!(await githubConsentUnspent(sql, { id: consent.id, userId, owner: consent.owner, slug: consent.slug }))) {
@@ -349,15 +349,15 @@ async function admitPhaseOne(input) {
     return { ok: true, owner: consent.owner, slug: consent.slug, consentId: consent.id };
 }
 export const GITHUB_SETUP_PATH = "/github/setup";
-function notProvisionedPage() {
+export function notProvisionedPage() {
     return htmlPage("Not available", "The GitHub connection is not fully provisioned on this environment: connecting a repository needs a GitHub " +
         "authorization step that is not configured yet, so nothing has been connected.", 503);
 }
 function notYourInstallationPage() {
     return htmlPage("Not your installation", "That GitHub installation is not one your GitHub account can access.", 403);
 }
-function consentUsedPage() {
-    return htmlPage("Consent already used", "That consent has already connected a repository. Open the app and use its Connect GitHub link again.", 403);
+export function consentUsedPage() {
+    return htmlPage("Consent already used", "That consent has already connected a repository. Open the app and press its Connect button again.", 403);
 }
 export function githubOAuthReady(env) {
     const signingKey = stateSecret(env);
@@ -400,7 +400,7 @@ async function phaseOneStartOAuth(input) {
         return htmlPage("Invalid link", "This install link is malformed. Start the connection again from your vibe's settings.", 400);
     }
     if (state === "" && uri.getParam("setup_action") === "update") {
-        return htmlPage("Saved on GitHub", "GitHub saved your changes to the app's repositories. Open your vibe and press Connect GitHub again to bring them in.", 200);
+        return htmlPage("Saved on GitHub", "GitHub saved your repository choices. Open your vibe and press its Connect button again to bring them in.", 200);
     }
     const admitted = await admitPhaseOne({ env, deps, state, userId, nowMs });
     if (admitted.ok === false)
@@ -459,19 +459,22 @@ async function phaseTwoBind(input) {
     if (!(await appExists(sql, ownerHandle, appSlug))) {
         return htmlPage("Vibe not found", "That vibe does not exist. Publish it first, then connect the repository.", 404);
     }
-    const bindable = {
-        env,
-        deps,
-        sql,
-        userId,
-        ownerHandle,
-        appSlug,
-        userToken,
-        nowMs,
-        claimConsent: isOwner || consent === undefined ? undefined : consent.id,
-    };
-    if (installationId !== undefined)
-        return bindInstallation({ ...bindable, installationId });
+    if (installationId !== undefined) {
+        return offerRepositories({
+            env,
+            deps,
+            sql,
+            userId,
+            ownerHandle,
+            appSlug,
+            userToken,
+            nowMs,
+            signingKey,
+            isOwner,
+            installationId,
+            consentId: isOwner || consent === undefined ? undefined : consent.id,
+        });
+    }
     return chooseOrInstall({
         env,
         deps,
@@ -527,7 +530,76 @@ async function chooseOrInstall(input) {
     const vibe = `${owner}/${slug}`;
     return templatePage(deps.templates, { name: "github-install-pick.html", status: 200 }, { vibe, choices, installUrl, vibeHref: `/vibe/${vibe}` });
 }
-async function bindInstallation(input) {
+export const GITHUB_REPOS_PATH = "/github/repos";
+export const GITHUB_REPO_PICK_STATE_PREFIX = "r1.";
+export const GITHUB_REPO_PICK_STATE_TTL_MS = 10 * 60 * 1000;
+export const GITHUB_REPO_PICK_PROVIDER = "github-app-repos";
+export async function signGithubRepoPickState(secret, state) {
+    const blob = b64urlEncode(TxtEnDecoderSingleton().encode(JSON.stringify(state)));
+    const message = `${GITHUB_REPO_PICK_STATE_PREFIX}${blob}`;
+    return `${message}.${await hmacHex(secret, message)}`;
+}
+function pickedReposFrom(raw) {
+    if (!Array.isArray(raw))
+        return undefined;
+    const out = [];
+    for (const item of raw) {
+        if (typeof item !== "object" || item === null)
+            return undefined;
+        const repo = item;
+        if (typeof repo.fullName !== "string" || repo.fullName === "" || typeof repo.accountLogin !== "string")
+            return undefined;
+        out.push({ fullName: repo.fullName, accountLogin: repo.accountLogin });
+    }
+    return out;
+}
+export async function verifyGithubRepoPickState(secret, signed, nowMs) {
+    if (!signed.startsWith(GITHUB_REPO_PICK_STATE_PREFIX))
+        return undefined;
+    const dot = signed.lastIndexOf(".");
+    if (dot <= GITHUB_REPO_PICK_STATE_PREFIX.length)
+        return undefined;
+    const message = signed.slice(0, dot);
+    const provided = signed.slice(dot + 1);
+    const expected = await hmacHex(secret, message);
+    if (!timingSafeEqualString(provided, expected))
+        return undefined;
+    const json = b64urlDecode(message.slice(GITHUB_REPO_PICK_STATE_PREFIX.length));
+    if (json === undefined)
+        return undefined;
+    const rParsed = exception2Result(() => JSON.parse(json));
+    if (rParsed.isErr())
+        return undefined;
+    const parsed = rParsed.Ok();
+    if (typeof parsed.owner !== "string" || typeof parsed.slug !== "string")
+        return undefined;
+    if (typeof parsed.id !== "string" || parsed.id === "")
+        return undefined;
+    if (typeof parsed.userId !== "string" || parsed.userId === "")
+        return undefined;
+    if (typeof parsed.installationId !== "string" || parsed.installationId === "")
+        return undefined;
+    if (typeof parsed.exp !== "number" || nowMs >= parsed.exp)
+        return undefined;
+    if (parsed.consentId !== undefined && (typeof parsed.consentId !== "string" || parsed.consentId === ""))
+        return undefined;
+    const repos = pickedReposFrom(parsed.repos);
+    if (repos === undefined)
+        return undefined;
+    if (!GITHUB_SETUP_STATE_RE.test(`${parsed.owner}/${parsed.slug}`))
+        return undefined;
+    return {
+        id: parsed.id,
+        owner: parsed.owner,
+        slug: parsed.slug,
+        installationId: parsed.installationId,
+        userId: parsed.userId,
+        repos,
+        exp: parsed.exp,
+        ...(parsed.consentId === undefined ? {} : { consentId: parsed.consentId }),
+    };
+}
+async function offerRepositories(input) {
     const { env, deps, sql, userId, ownerHandle, appSlug, userToken, nowMs, installationId } = input;
     const rToken = await getInstallationToken({
         installationId,
@@ -551,55 +623,73 @@ async function bindInstallation(input) {
             "organization owner to grant you access, or install the app on a repository you own.", 403);
     }
     if (repos.length > GITHUB_SETUP_MAX_REPOS) {
-        return htmlPage("Too many repositories", `That installation covers ${repos.length} repositories, more than the ${GITHUB_SETUP_MAX_REPOS} a single connection ` +
-            "can bind, so nothing has been connected. In GitHub, change the app's repository access to select fewer " +
+        return htmlPage("Too many repositories", `That installation covers ${repos.length} repositories, more than the ${GITHUB_SETUP_MAX_REPOS} one connection ` +
+            "can list, so nothing has been connected. In GitHub, change the app's repository access to select fewer " +
             "repositories and run the connection again.", 400);
     }
-    if (input.claimConsent !== undefined &&
-        (await claimGithubConsent(sql, { id: input.claimConsent, userId, owner: ownerHandle, slug: appSlug, nowMs })) === false) {
-        return consentUsedPage();
+    const writable = repos.filter((r) => r.canWrite);
+    if (writable.length === 0) {
+        return htmlPage("No repositories to connect", "Connecting a repository needs write access to it on GitHub, and your account can only read the repositories " +
+            "in that installation. Ask a maintainer for write access, or connect a repository you maintain.", 403);
+    }
+    if (deps.templates === undefined) {
+        return htmlPage("Not available", "This page could not be shown right now. Try again in a moment.", 503);
+    }
+    const rItem = await deps.templates("github-repo-pick-item.html");
+    if (rItem.isErr()) {
+        console.error("[github-setup] template github-repo-pick-item.html unreadable:", rItem.Err().message);
+        return htmlPage("Not available", "This page could not be shown right now. Try again in a moment.", 503);
     }
     const t = sql.tables.githubRepoRoutes;
-    const heldBy = new Map();
+    const here = new Map();
     for (const row of await sql.db
         .select({ repoFullName: t.repoFullName, installedByUserId: t.installedByUserId })
         .from(t)
-        .where(and(eq(t.installationId, installationId), eq(t.removedAt, "")))) {
-        heldBy.set(row.repoFullName, row.installedByUserId);
-    }
-    const now = new Date().toISOString();
-    const bound = [];
-    for (const repo of repos) {
-        const applied = await sql.db
-            .insert(t)
-            .values({
-            installationId,
-            repoFullName: repo.fullName,
-            ownerHandle,
-            appSlug,
-            accountLogin: repo.accountLogin,
-            installedByUserId: userId,
-            created: now,
-            updated: now,
-            removedAt: "",
-        })
-            .onConflictDoUpdate({
-            target: [t.installationId, t.repoFullName],
-            set: { ownerHandle, appSlug, installedByUserId: userId, updated: now, removedAt: "" },
-            setWhere: or(eq(t.installedByUserId, userId), ne(t.removedAt, "")),
-        })
-            .returning({ repoFullName: t.repoFullName });
-        if (applied.length === 0) {
-            console.warn(`[github-setup] installation ${installationId} repo ${repo.fullName} is already connected by clerk user ` +
-                `${heldBy.get(repo.fullName) ?? "unknown"}; refusing to rebind it for clerk user ${userId}`);
-            continue;
-        }
-        bound.push(repo.fullName);
-    }
-    if (bound.length === 0) {
-        return htmlPage("Already connected", "Those repositories are already connected to another vibe. Whoever connected them has to disconnect them first.", 409);
+        .where(and(eq(t.installationId, installationId), eq(t.ownerHandle, ownerHandle), eq(t.appSlug, appSlug), eq(t.removedAt, "")))) {
+        here.set(row.repoFullName, row.installedByUserId);
     }
-    return flowRedirect(`/vibe/${ownerHandle}/${appSlug}`);
+    const id = crypto.randomUUID();
+    await sql.db.insert(sql.tables.connectionApprovals).values({
+        id,
+        userId,
+        provider: GITHUB_REPO_PICK_PROVIDER,
+        ownerHandle,
+        appSlug,
+        created: new Date(nowMs).toISOString(),
+        consumedAt: "",
+    });
+    const state = await signGithubRepoPickState(input.signingKey, {
+        id,
+        owner: ownerHandle,
+        slug: appSlug,
+        installationId,
+        userId,
+        repos: writable.map((r) => ({ fullName: r.fullName, accountLogin: r.accountLogin })),
+        ...(input.consentId === undefined ? {} : { consentId: input.consentId }),
+        exp: nowMs + GITHUB_REPO_PICK_STATE_TTL_MS,
+    });
+    const rows = fillFragments(rItem.Ok(), repos.map((repo) => {
+        const binder = here.get(repo.fullName);
+        const lockedForMe = binder !== undefined && binder !== userId && input.isOwner === false;
+        const note = (() => {
+            switch (true) {
+                case repo.canWrite === false:
+                    return "needs write access on GitHub to connect";
+                case binder !== undefined && binder !== userId:
+                    return "connected here by someone else";
+                default:
+                    return "";
+            }
+        })();
+        return {
+            repo: repo.fullName,
+            checked: binder === undefined ? "" : "checked",
+            disabled: lockedForMe || repo.canWrite === false ? "disabled" : "",
+            note,
+        };
+    }));
+    const vibe = `${ownerHandle}/${appSlug}`;
+    return templatePage(deps.templates, { name: "github-repo-pick.html", status: 200 }, { vibe, rows, state, action: GITHUB_REPOS_PATH, vibeHref: `/vibe/${vibe}` });
 }
 async function phaseConnect(input) {
     return runConnectCallback({