npm - @vocoder/cli - Versions diffs - 0.14.0 → 0.14.1 - Mend

@vocoder/cli 0.14.0 → 0.14.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/bin.mjs +473 -471
package/dist/bin.mjs.map +1 -1
package/dist/{chunk-T4BLNDJ3.mjs → chunk-LLEMSC3X.mjs} +1 -2
package/dist/{chunk-T4BLNDJ3.mjs.map → chunk-LLEMSC3X.mjs.map} +1 -1
package/dist/lib.d.mts +0 -1
package/dist/lib.mjs +1 -1
package/package.json +3 -3

package/dist/bin.mjs CHANGED Viewed

@@ -13,7 +13,7 @@ import {
   readAuthData,
   verifyStoredAuth,
   writeAuthData
-} from "./chunk-T4BLNDJ3.mjs";
+} from "./chunk-LLEMSC3X.mjs";
 // src/bin.ts
 import { Command } from "commander";
@@ -64,311 +64,29 @@ export default defineConfig({
   }
 }
-// src/utils/github-connect.ts
-import { spawn } from "child_process";
-import * as p from "@clack/prompts";
-import chalk from "chalk";
-// src/utils/local-server.ts
-import { createServer } from "http";
-import { URL as URL2 } from "url";
-function startCallbackServer() {
-  return new Promise((resolve2, reject) => {
-    let settled = false;
-    let callbackResolve = null;
-    let callbackReject = null;
-    const callbackPromise = new Promise((res, rej) => {
-      callbackResolve = res;
-      callbackReject = rej;
-    });
-    const server = createServer((req, res) => {
-      if (!req.url) {
-        res.writeHead(400);
-        res.end();
-        return;
-      }
-      let pathname;
-      let params;
-      try {
-        const parsed = new URL2(req.url, "http://localhost");
-        pathname = parsed.pathname;
-        params = Object.fromEntries(parsed.searchParams.entries());
-      } catch {
-        res.writeHead(400);
-        res.end("Bad request");
-        return;
-      }
-      if (pathname !== "/callback") {
-        res.writeHead(404);
-        res.end("Not found");
-        return;
-      }
-      res.writeHead(200, { "Content-Type": "text/html" });
-      res.end(
-        '<!DOCTYPE html><html><head><title>Authenticated</title></head><body style="font-family:sans-serif;text-align:center;padding:3rem;"><h2>Authenticated</h2><p>Return to your terminal to continue. You can close this tab.</p></body></html>'
-      );
-      if (callbackResolve) {
-        callbackResolve(params);
-        callbackResolve = null;
-      }
-      setImmediate(() => server.close());
-    });
-    server.on("error", (err) => {
-      if (!settled) {
-        settled = true;
-        if (callbackReject) callbackReject(err);
-        reject(err);
-      }
-    });
-    server.listen(0, "127.0.0.1", () => {
-      if (settled) return;
-      settled = true;
-      const port = server.address().port;
-      resolve2({
-        port,
-        waitForCallback: () => callbackPromise,
-        close: () => server.close()
-      });
-    });
-  });
-}
-// src/utils/github-connect.ts
-async function tryOpenBrowser(url) {
-  if (!process.stdout.isTTY || process.env.CI === "true") {
-    return false;
-  }
-  const platform = process.platform;
-  let command;
-  let args;
-  if (platform === "darwin") {
-    command = "open";
-    args = [url];
-  } else if (platform === "win32") {
-    command = "rundll32";
-    args = ["url.dll,FileProtocolHandler", url];
-  } else {
-    command = "xdg-open";
-    args = [url];
-  }
-  return new Promise((resolve2) => {
-    try {
-      const child = spawn(command, args, {
-        detached: true,
-        stdio: "ignore",
-        windowsHide: true
-      });
-      let settled = false;
-      child.once("spawn", () => {
-        if (settled) return;
-        settled = true;
-        child.unref();
-        resolve2(true);
-      });
-      child.once("error", () => {
-        if (settled) return;
-        settled = true;
-        resolve2(false);
-      });
-      setTimeout(() => {
-        if (settled) return;
-        settled = true;
-        resolve2(false);
-      }, 300);
-    } catch {
-      resolve2(false);
-    }
-  });
-}
-async function runGitHubInstallFlow(params) {
-  let server = null;
-  try {
-    server = await startCallbackServer();
-  } catch {
-  }
-  const { installUrl } = await params.api.startCliGitHubInstall(
-    params.userToken,
-    {
-      organizationId: params.organizationId,
-      callbackPort: server?.port
-    }
-  );
-  p.log.info("Opening GitHub to install the Vocoder App...");
-  p.note(installUrl, "Install URL");
-  if (process.stdin.isTTY && process.stdout.isTTY && process.env.CI !== "true") {
-    const shouldOpen = params.yes ? true : await p.confirm({ message: "Open in your browser?" });
-    if (p.isCancel(shouldOpen)) {
-      server?.close();
-      return null;
-    }
-    if (shouldOpen) {
-      const opened = await tryOpenBrowser(installUrl);
-      if (!opened) {
-        p.log.info(
-          "Could not open a browser automatically. Use the URL above."
-        );
-      }
-    }
-  }
-  const connectSpinner = p.spinner();
-  connectSpinner.start("Waiting for GitHub App installation...");
-  if (server) {
-    try {
-      const params_timeout = 15 * 60 * 1e3;
-      const callbackParams = await Promise.race([
-        server.waitForCallback(),
-        new Promise(
-          (resolve2) => setTimeout(() => resolve2(null), params_timeout)
-        )
-      ]);
-      server.close();
-      if (!callbackParams) {
-        connectSpinner.stop("GitHub App installation timed out");
-        p.log.error(
-          "The installation flow timed out. Run `vocoder init` again."
-        );
-        return null;
-      }
-      if (callbackParams.error) {
-        connectSpinner.stop("GitHub App installation failed");
-        p.log.error(callbackParams.error);
-        return null;
-      }
-      const { organizationId, connectionLabel, workspace_created } = callbackParams;
-      if (!organizationId || !connectionLabel) {
-        connectSpinner.stop("GitHub App installation incomplete");
-        p.log.error("Missing organization or connection data from callback.");
-        return null;
-      }
-      connectSpinner.stop(
-        `Connected to GitHub as ${chalk.bold(connectionLabel)}`
-      );
-      const orgName = workspace_created ? connectionLabel : organizationId;
-      return {
-        organizationId,
-        organizationName: orgName,
-        connectionLabel
-      };
-    } catch {
-      server.close();
-      connectSpinner.stop("GitHub App installation failed");
-      return null;
-    }
-  }
-  connectSpinner.stop("Could not detect GitHub App installation automatically");
-  p.log.warn(
-    "Complete the installation in your browser, then run `vocoder init` again."
-  );
-  return null;
-}
-async function runGitHubDiscoveryFlow(params) {
-  let server = null;
-  try {
-    server = await startCallbackServer();
-  } catch {
-  }
-  const { oauthUrl } = await params.api.startCliGitHubOAuth(params.userToken, {
-    organizationId: params.organizationId,
-    callbackPort: server?.port
-  });
-  p.log.info("Opening GitHub to authorize your account...");
-  p.note("Complete authorization in your browser.");
-  if (process.stdin.isTTY && process.stdout.isTTY && process.env.CI !== "true") {
-    const shouldOpen = params.yes ? true : await p.confirm({ message: "Open in your browser?" });
-    if (p.isCancel(shouldOpen)) {
-      server?.close();
-      return null;
-    }
-    if (shouldOpen) {
-      const opened = await tryOpenBrowser(oauthUrl);
-      if (!opened) {
-        p.log.info(`Could not open browser automatically. Visit: ${oauthUrl}`);
-      }
-    }
-  }
-  const oauthSpinner = p.spinner();
-  oauthSpinner.start("Waiting for GitHub authorization...");
-  if (server) {
-    try {
-      const timeoutMs = 10 * 60 * 1e3;
-      const callbackParams = await Promise.race([
-        server.waitForCallback(),
-        new Promise(
-          (resolve2) => setTimeout(() => resolve2(null), timeoutMs)
-        )
-      ]);
-      server.close();
-      if (!callbackParams) {
-        oauthSpinner.stop("GitHub authorization timed out");
-        return null;
-      }
-      if (callbackParams.error) {
-        oauthSpinner.stop("GitHub authorization failed");
-        p.log.error(callbackParams.error);
-        return null;
-      }
-    } catch {
-      server.close();
-      oauthSpinner.stop("GitHub authorization failed");
-      return null;
-    }
-  }
-  oauthSpinner.stop("GitHub account authorized");
-  const discoveryResult = await params.api.getCliGitHubDiscovery(
-    params.userToken
-  );
-  return discoveryResult.installations;
-}
-async function selectGitHubInstallation(installations, canInstallNew) {
-  const options = installations.map((inst) => ({
-    value: String(inst.installationId),
-    label: inst.accountLogin,
-    hint: [
-      inst.accountType === "Organization" ? "organization" : "personal",
-      inst.conflictLabel ? `connected to ${inst.conflictLabel}` : "",
-      inst.isSuspended ? "suspended" : ""
-    ].filter(Boolean).join(" \xB7 ") || void 0
-  }));
-  if (canInstallNew) {
-    options.push({
-      value: "install_new",
-      label: `Install on a new account ${chalk.dim("(creates a new personal workspace)")}`
-    });
-  }
-  const selected = await p.select({
-    message: "Select a GitHub installation",
-    options
-  });
-  if (p.isCancel(selected)) return null;
-  if (selected === "install_new") return "install_new";
-  return Number(selected);
-}
-// src/utils/project-create.ts
-import * as p3 from "@clack/prompts";
-import chalk3 from "chalk";
-// src/utils/branch-select.ts
-import { execSync } from "child_process";
-import { isCancel as isCancel2, Prompt } from "@clack/core";
 // src/utils/theme.ts
-import chalk2 from "chalk";
+import chalk from "chalk";
 var ORANGE = "#FC5206";
 var PINK = "#D51977";
 var BLUE = "#2450A9";
 var noColor = process.env.NO_COLOR === "1" || process.env.FORCE_COLOR === "0";
-var hex = (color) => (s) => noColor ? s : chalk2.hex(color)(s);
-var dim = (s) => noColor ? s : chalk2.dim(s);
-var bld = (s) => noColor ? s : chalk2.bold(s);
-var grn = (s) => noColor ? s : chalk2.green(s);
-var ylw = (s) => noColor ? s : chalk2.yellow(s);
-var red = (s) => noColor ? s : chalk2.red(s);
+var hex = (color) => (s) => noColor ? s : chalk.hex(color)(s);
+var dim = (s) => noColor ? s : chalk.dim(s);
+var bld = (s) => noColor ? s : chalk.bold(s);
+var grn = (s) => noColor ? s : chalk.green(s);
+var ylw = (s) => noColor ? s : chalk.yellow(s);
+var red = (s) => noColor ? s : chalk.red(s);
 var highlight = hex(PINK);
 var info = hex(BLUE);
 var active = hex(ORANGE);
+// src/utils/project-create.ts
+import * as p2 from "@clack/prompts";
+import chalk2 from "chalk";
 // src/utils/branch-select.ts
+import { execSync } from "child_process";
+import { isCancel, Prompt } from "@clack/core";
 var S_BAR = "\u2502";
 var S_BAR_END = "\u2514";
 var S_ACTIVE = "\u25C6";
@@ -630,13 +348,13 @@ ${symbol(this.state)}  ${message}
     }
   });
   const result = await prompt.prompt();
-  if (isCancel2(result)) return null;
+  if (isCancel(result)) return null;
   return result;
 }
 // src/utils/locale-search.ts
-import { isCancel as isCancel3, Prompt as Prompt2 } from "@clack/core";
-import * as p2 from "@clack/prompts";
+import { isCancel as isCancel2, Prompt as Prompt2 } from "@clack/core";
+import * as p from "@clack/prompts";
 var S_BAR2 = "\u2502";
 var S_BAR_END2 = "\u2514";
 var S_ACTIVE2 = "\u25C6";
@@ -811,7 +529,7 @@ ${symbol2(this.state)}  ${message}
     }
   });
   const result = await prompt.prompt();
-  if (isCancel3(result)) return null;
+  if (isCancel2(result)) return null;
   return result;
 }
 async function searchSelectLocale(options, message, initialValue) {
@@ -833,218 +551,498 @@ async function searchMultiSelectLocales(options, message, initialValues) {
   if (result === null) return null;
   const picks = result;
   if (picks.length === 0) {
+    p.log.warn(
+      "At least one target language is required. Please select at least one."
+    );
+    return searchMultiSelectLocales(options, message, initialValues);
+  }
+  return picks;
+}
+// src/utils/project-create.ts
+function buildLocaleOptions(locales) {
+  return locales.map((l) => ({
+    bcp47: l.code,
+    label: `${l.name} \u2014 ${l.code}`
+  }));
+}
+function buildLanguageOptions(locales) {
+  const byFamily = /* @__PURE__ */ new Map();
+  for (const l of locales) {
+    const family = l.code.split("-")[0].toLowerCase();
+    const opt = { bcp47: l.code, label: `${l.name} \u2014 ${l.code}` };
+    const existing = byFamily.get(family);
+    if (!existing || l.code.length < existing.bcp47.length) {
+      byFamily.set(family, opt);
+    }
+  }
+  return Array.from(byFamily.values());
+}
+async function runProjectCreate(params) {
+  const { api, userToken, organizationId, repoCanonical } = params;
+  const projectName = (params.defaultName ?? "my-project").trim();
+  p2.log.success(`Project: ${chalk2.bold(projectName)}`);
+  let sourceLocales;
+  try {
+    ({ sourceLocales } = await api.listLocales(userToken));
+  } catch {
+    p2.log.error(
+      "Failed to fetch supported locales. Check your connection and try again."
+    );
+    return null;
+  }
+  const languageOptions = buildLanguageOptions(sourceLocales);
+  const appDir = params.defaultAppDir ?? "";
+  if (appDir) {
+    p2.log.success(`App directory: ${chalk2.bold(appDir)}`);
+  }
+  const sourceLocale = await searchSelectLocale(
+    languageOptions,
+    "Source language (the language your code is written in)",
+    params.defaultSourceLocale ?? "en"
+  );
+  if (sourceLocale === null) return null;
+  let compatibleTargets;
+  try {
+    compatibleTargets = await api.listCompatibleLocales(userToken, sourceLocale);
+  } catch {
+    p2.log.error(
+      "Failed to fetch compatible target locales. Check your connection and try again."
+    );
+    return null;
+  }
+  const localeOptions = buildLocaleOptions(compatibleTargets);
+  const targetOptions = localeOptions.filter(
+    (opt) => opt.bcp47 !== sourceLocale
+  );
+  const targetLocales = await searchMultiSelectLocales(
+    targetOptions,
+    "Target languages (languages to translate into)"
+  );
+  if (targetLocales === null) return null;
+  if (targetLocales.length === 0) {
     p2.log.warn(
-      "At least one target language is required. Please select at least one."
+      "No target languages selected \u2014 you can add them later from the dashboard."
     );
-    return searchMultiSelectLocales(options, message, initialValues);
   }
-  return picks;
-}
-// src/utils/project-create.ts
-function buildLocaleOptions(locales) {
-  return locales.map((l) => ({
-    bcp47: l.code,
-    label: `${l.name} \u2014 ${l.code}`
-  }));
-}
-function buildLanguageOptions(locales) {
-  const byFamily = /* @__PURE__ */ new Map();
-  for (const l of locales) {
-    const family = l.code.split("-")[0].toLowerCase();
-    const opt = { bcp47: l.code, label: `${l.name} \u2014 ${l.code}` };
-    const existing = byFamily.get(family);
-    if (!existing || l.code.length < existing.bcp47.length) {
-      byFamily.set(family, opt);
+  const detected = detectGitBranches();
+  const initialBranches = params.defaultBranches?.length ? params.defaultBranches : [detected.defaultBranch];
+  let pushBranches = [];
+  {
+    let initial = initialBranches;
+    while (pushBranches.length === 0) {
+      const result = await filterableBranchSelect({
+        message: "Which branches should trigger translations?",
+        branches: detected.branches,
+        defaultBranch: detected.defaultBranch,
+        initialValues: initial
+      });
+      if (result === null) return null;
+      if (result.length === 0) {
+        p2.log.warn(
+          "At least one branch is required. Please select at least one."
+        );
+        initial = [detected.defaultBranch];
+      } else {
+        pushBranches = result;
+      }
     }
   }
-  return Array.from(byFamily.values());
+  const targetBranches = pushBranches;
+  try {
+    const result = await api.createProject(userToken, {
+      organizationId,
+      name: projectName,
+      sourceLocale,
+      targetLocales,
+      targetBranches,
+      appDirs: appDir ? [appDir] : [],
+      repoCanonical
+    });
+    p2.log.success(`Project ${chalk2.bold(result.projectName)} created!`);
+    return result;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : "Unknown error";
+    p2.log.error(`Failed to create project: ${message}`);
+    return null;
+  }
 }
-async function runProjectCreate(params) {
-  const { api, userToken, organizationId, repoCanonical } = params;
-  const projectName = (params.defaultName ?? "my-project").trim();
-  p3.log.success(`Project: ${chalk3.bold(projectName)}`);
+async function runAppCreate(params) {
+  const { api, userToken, projectId, projectName, repoCanonical } = params;
+  const existingScopes = new Set(params.existingApps.map((a) => a.appDir));
   let sourceLocales;
   try {
     ({ sourceLocales } = await api.listLocales(userToken));
   } catch {
-    p3.log.error(
+    p2.log.error(
       "Failed to fetch supported locales. Check your connection and try again."
     );
     return null;
   }
   const languageOptions = buildLanguageOptions(sourceLocales);
   const appDir = params.defaultAppDir ?? "";
+  if (existingScopes.has(appDir)) {
+    p2.log.error(`App directory "${appDir}" is already configured for this project.`);
+    return null;
+  }
   if (appDir) {
-    p3.log.success(`App directory: ${chalk3.bold(appDir)}`);
+    p2.log.success(`App directory: ${chalk2.bold(appDir)}`);
   }
   const sourceLocale = await searchSelectLocale(
     languageOptions,
-    "Source language (the language your code is written in)",
-    params.defaultSourceLocale ?? "en"
+    "Source language",
+    "en"
   );
   if (sourceLocale === null) return null;
   let compatibleTargets;
   try {
-    compatibleTargets = await api.listCompatibleLocales(userToken, sourceLocale);
+    compatibleTargets = await api.listCompatibleLocales(userToken, sourceLocale);
+  } catch {
+    p2.log.error(
+      "Failed to fetch compatible target locales. Check your connection and try again."
+    );
+    return null;
+  }
+  const targetOptions = buildLocaleOptions(compatibleTargets).filter(
+    (opt) => opt.bcp47 !== sourceLocale
+  );
+  const targetLocales = await searchMultiSelectLocales(
+    targetOptions,
+    "Target languages"
+  );
+  if (targetLocales === null) return null;
+  if (targetLocales.length === 0) {
+    p2.log.warn(
+      "No target languages selected \u2014 you can add them later from the dashboard."
+    );
+  }
+  const detectedApp = detectGitBranches();
+  let appPushBranches = [];
+  {
+    let initial = [detectedApp.defaultBranch];
+    while (appPushBranches.length === 0) {
+      const result = await filterableBranchSelect({
+        message: "Which branches should trigger translations?",
+        branches: detectedApp.branches,
+        defaultBranch: detectedApp.defaultBranch,
+        initialValues: initial
+      });
+      if (result === null) return null;
+      if (result.length === 0) {
+        p2.log.warn("At least one branch is required.");
+        initial = [detectedApp.defaultBranch];
+      } else {
+        appPushBranches = result;
+      }
+    }
+  }
+  const targetBranches = appPushBranches;
+  try {
+    const result = await api.createProject(userToken, {
+      projectId,
+      appDir,
+      sourceLocale,
+      targetLocales,
+      targetBranches,
+      repoCanonical: repoCanonical ?? ""
+    });
+    p2.log.success(
+      `App ${chalk2.bold(appDir)} added to ${chalk2.bold(projectName)}!`
+    );
+    return {
+      projectId: result.projectId,
+      projectName: result.projectName,
+      apiKey: result.apiKey,
+      appDir: result.appDir,
+      sourceLocale,
+      targetLocales,
+      targetBranches
+    };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : "Unknown error";
+    p2.log.error(`Failed to add app: ${message}`);
+    return null;
+  }
+}
+// src/utils/github-connect.ts
+import { spawn } from "child_process";
+import * as p3 from "@clack/prompts";
+import chalk3 from "chalk";
+// src/utils/local-server.ts
+import { createServer } from "http";
+import { URL as URL2 } from "url";
+function startCallbackServer() {
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    let callbackResolve = null;
+    let callbackReject = null;
+    const callbackPromise = new Promise((res, rej) => {
+      callbackResolve = res;
+      callbackReject = rej;
+    });
+    const server = createServer((req, res) => {
+      if (!req.url) {
+        res.writeHead(400);
+        res.end();
+        return;
+      }
+      let pathname;
+      let params;
+      try {
+        const parsed = new URL2(req.url, "http://localhost");
+        pathname = parsed.pathname;
+        params = Object.fromEntries(parsed.searchParams.entries());
+      } catch {
+        res.writeHead(400);
+        res.end("Bad request");
+        return;
+      }
+      if (pathname !== "/callback") {
+        res.writeHead(404);
+        res.end("Not found");
+        return;
+      }
+      res.writeHead(200, { "Content-Type": "text/html" });
+      res.end(
+        '<!DOCTYPE html><html><head><title>Authenticated</title></head><body style="font-family:sans-serif;text-align:center;padding:3rem;"><h2>Authenticated</h2><p>Return to your terminal to continue. You can close this tab.</p></body></html>'
+      );
+      if (callbackResolve) {
+        callbackResolve(params);
+        callbackResolve = null;
+      }
+      setImmediate(() => server.close());
+    });
+    server.on("error", (err) => {
+      if (!settled) {
+        settled = true;
+        if (callbackReject) callbackReject(err);
+        reject(err);
+      }
+    });
+    server.listen(0, "127.0.0.1", () => {
+      if (settled) return;
+      settled = true;
+      const port = server.address().port;
+      resolve2({
+        port,
+        waitForCallback: () => callbackPromise,
+        close: () => server.close()
+      });
+    });
+  });
+}
+// src/utils/github-connect.ts
+async function tryOpenBrowser(url) {
+  if (!process.stdout.isTTY || process.env.CI === "true") {
+    return false;
+  }
+  const platform = process.platform;
+  let command;
+  let args;
+  if (platform === "darwin") {
+    command = "open";
+    args = [url];
+  } else if (platform === "win32") {
+    command = "rundll32";
+    args = ["url.dll,FileProtocolHandler", url];
+  } else {
+    command = "xdg-open";
+    args = [url];
+  }
+  return new Promise((resolve2) => {
+    try {
+      const child = spawn(command, args, {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: true
+      });
+      let settled = false;
+      child.once("spawn", () => {
+        if (settled) return;
+        settled = true;
+        child.unref();
+        resolve2(true);
+      });
+      child.once("error", () => {
+        if (settled) return;
+        settled = true;
+        resolve2(false);
+      });
+      setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        resolve2(false);
+      }, 300);
+    } catch {
+      resolve2(false);
+    }
+  });
+}
+async function runGitHubInstallFlow(params) {
+  let server = null;
+  try {
+    server = await startCallbackServer();
   } catch {
-    p3.log.error(
-      "Failed to fetch compatible target locales. Check your connection and try again."
-    );
-    return null;
   }
-  const localeOptions = buildLocaleOptions(compatibleTargets);
-  const targetOptions = localeOptions.filter(
-    (opt) => opt.bcp47 !== sourceLocale
-  );
-  const targetLocales = await searchMultiSelectLocales(
-    targetOptions,
-    "Target languages (languages to translate into)"
+  const { installUrl } = await params.api.startCliGitHubInstall(
+    params.userToken,
+    {
+      organizationId: params.organizationId,
+      callbackPort: server?.port
+    }
   );
-  if (targetLocales === null) return null;
-  if (targetLocales.length === 0) {
-    p3.log.warn(
-      "No target languages selected \u2014 you can add them later from the dashboard."
-    );
-  }
-  const detected = detectGitBranches();
-  const initialBranches = params.defaultBranches?.length ? params.defaultBranches : [detected.defaultBranch];
-  let pushBranches = [];
-  {
-    let initial = initialBranches;
-    while (pushBranches.length === 0) {
-      const result = await filterableBranchSelect({
-        message: "Which branches should trigger translations?",
-        branches: detected.branches,
-        defaultBranch: detected.defaultBranch,
-        initialValues: initial
-      });
-      if (result === null) return null;
-      if (result.length === 0) {
-        p3.log.warn(
-          "At least one branch is required. Please select at least one."
+  p3.log.info("Opening GitHub to install the Vocoder App...");
+  p3.note(installUrl, "Install URL");
+  if (process.stdin.isTTY && process.stdout.isTTY && process.env.CI !== "true") {
+    const shouldOpen = params.yes ? true : await p3.confirm({ message: "Open in your browser?" });
+    if (p3.isCancel(shouldOpen)) {
+      server?.close();
+      return null;
+    }
+    if (shouldOpen) {
+      const opened = await tryOpenBrowser(installUrl);
+      if (!opened) {
+        p3.log.info(
+          "Could not open a browser automatically. Use the URL above."
         );
-        initial = [detected.defaultBranch];
-      } else {
-        pushBranches = result;
       }
     }
   }
-  const targetBranches = pushBranches;
-  try {
-    const result = await api.createProject(userToken, {
-      organizationId,
-      name: projectName,
-      sourceLocale,
-      targetLocales,
-      targetBranches,
-      appDirs: appDir ? [appDir] : [],
-      repoCanonical
-    });
-    p3.log.success(`Project ${chalk3.bold(result.projectName)} created!`);
-    return result;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Unknown error";
-    p3.log.error(`Failed to create project: ${message}`);
-    return null;
-  }
-}
-async function runAppCreate(params) {
-  const { api, userToken, projectId, projectName, repoCanonical } = params;
-  const existingScopes = new Set(params.existingApps.map((a) => a.appDir));
-  let sourceLocales;
-  try {
-    ({ sourceLocales } = await api.listLocales(userToken));
-  } catch {
-    p3.log.error(
-      "Failed to fetch supported locales. Check your connection and try again."
-    );
-    return null;
-  }
-  const languageOptions = buildLanguageOptions(sourceLocales);
-  const appDir = params.defaultAppDir ?? "";
-  if (existingScopes.has(appDir)) {
-    p3.log.error(`App directory "${appDir}" is already configured for this project.`);
-    return null;
-  }
-  if (appDir) {
-    p3.log.success(`App directory: ${chalk3.bold(appDir)}`);
+  const connectSpinner = p3.spinner();
+  connectSpinner.start("Waiting for GitHub App installation...");
+  if (server) {
+    try {
+      const params_timeout = 15 * 60 * 1e3;
+      const callbackParams = await Promise.race([
+        server.waitForCallback(),
+        new Promise(
+          (resolve2) => setTimeout(() => resolve2(null), params_timeout)
+        )
+      ]);
+      server.close();
+      if (!callbackParams) {
+        connectSpinner.stop("GitHub App installation timed out");
+        p3.log.error(
+          "The installation flow timed out. Run `vocoder init` again."
+        );
+        return null;
+      }
+      if (callbackParams.error) {
+        connectSpinner.stop("GitHub App installation failed");
+        p3.log.error(callbackParams.error);
+        return null;
+      }
+      const { organizationId, connectionLabel, workspace_created } = callbackParams;
+      if (!organizationId || !connectionLabel) {
+        connectSpinner.stop("GitHub App installation incomplete");
+        p3.log.error("Missing organization or connection data from callback.");
+        return null;
+      }
+      connectSpinner.stop(
+        `Connected to GitHub as ${chalk3.bold(connectionLabel)}`
+      );
+      const orgName = workspace_created ? connectionLabel : organizationId;
+      return {
+        organizationId,
+        organizationName: orgName,
+        connectionLabel
+      };
+    } catch {
+      server.close();
+      connectSpinner.stop("GitHub App installation failed");
+      return null;
+    }
   }
-  const sourceLocale = await searchSelectLocale(
-    languageOptions,
-    "Source language",
-    "en"
+  connectSpinner.stop("Could not detect GitHub App installation automatically");
+  p3.log.warn(
+    "Complete the installation in your browser, then run `vocoder init` again."
   );
-  if (sourceLocale === null) return null;
-  let compatibleTargets;
+  return null;
+}
+async function runGitHubDiscoveryFlow(params) {
+  let server = null;
   try {
-    compatibleTargets = await api.listCompatibleLocales(userToken, sourceLocale);
+    server = await startCallbackServer();
   } catch {
-    p3.log.error(
-      "Failed to fetch compatible target locales. Check your connection and try again."
-    );
-    return null;
   }
-  const targetOptions = buildLocaleOptions(compatibleTargets).filter(
-    (opt) => opt.bcp47 !== sourceLocale
-  );
-  const targetLocales = await searchMultiSelectLocales(
-    targetOptions,
-    "Target languages"
-  );
-  if (targetLocales === null) return null;
-  if (targetLocales.length === 0) {
-    p3.log.warn(
-      "No target languages selected \u2014 you can add them later from the dashboard."
-    );
+  const { oauthUrl } = await params.api.startCliGitHubOAuth(params.userToken, {
+    organizationId: params.organizationId,
+    callbackPort: server?.port
+  });
+  p3.log.info("Opening GitHub to authorize your account...");
+  p3.note("Complete authorization in your browser.");
+  if (process.stdin.isTTY && process.stdout.isTTY && process.env.CI !== "true") {
+    const shouldOpen = params.yes ? true : await p3.confirm({ message: "Open in your browser?" });
+    if (p3.isCancel(shouldOpen)) {
+      server?.close();
+      return null;
+    }
+    if (shouldOpen) {
+      const opened = await tryOpenBrowser(oauthUrl);
+      if (!opened) {
+        p3.log.info(`Could not open browser automatically. Visit: ${oauthUrl}`);
+      }
+    }
   }
-  const detectedApp = detectGitBranches();
-  let appPushBranches = [];
-  {
-    let initial = [detectedApp.defaultBranch];
-    while (appPushBranches.length === 0) {
-      const result = await filterableBranchSelect({
-        message: "Which branches should trigger translations?",
-        branches: detectedApp.branches,
-        defaultBranch: detectedApp.defaultBranch,
-        initialValues: initial
-      });
-      if (result === null) return null;
-      if (result.length === 0) {
-        p3.log.warn("At least one branch is required.");
-        initial = [detectedApp.defaultBranch];
-      } else {
-        appPushBranches = result;
+  const oauthSpinner = p3.spinner();
+  oauthSpinner.start("Waiting for GitHub authorization...");
+  if (server) {
+    try {
+      const timeoutMs = 10 * 60 * 1e3;
+      const callbackParams = await Promise.race([
+        server.waitForCallback(),
+        new Promise(
+          (resolve2) => setTimeout(() => resolve2(null), timeoutMs)
+        )
+      ]);
+      server.close();
+      if (!callbackParams) {
+        oauthSpinner.stop("GitHub authorization timed out");
+        return null;
+      }
+      if (callbackParams.error) {
+        oauthSpinner.stop("GitHub authorization failed");
+        p3.log.error(callbackParams.error);
+        return null;
       }
+    } catch {
+      server.close();
+      oauthSpinner.stop("GitHub authorization failed");
+      return null;
     }
   }
-  const targetBranches = appPushBranches;
-  try {
-    const result = await api.createProject(userToken, {
-      projectId,
-      appDir,
-      sourceLocale,
-      targetLocales,
-      targetBranches,
-      repoCanonical: repoCanonical ?? ""
+  oauthSpinner.stop("GitHub account authorized");
+  const discoveryResult = await params.api.getCliGitHubDiscovery(
+    params.userToken
+  );
+  return discoveryResult.installations;
+}
+async function selectGitHubInstallation(installations, canInstallNew) {
+  const options = installations.map((inst) => ({
+    value: String(inst.installationId),
+    label: inst.accountLogin,
+    hint: [
+      inst.accountType === "Organization" ? "organization" : "personal",
+      inst.conflictLabel ? `connected to ${inst.conflictLabel}` : "",
+      inst.isSuspended ? "suspended" : ""
+    ].filter(Boolean).join(" \xB7 ") || void 0
+  }));
+  if (canInstallNew) {
+    options.push({
+      value: "install_new",
+      label: `Install on a new account ${chalk3.dim("(creates a new personal workspace)")}`
     });
-    p3.log.success(
-      `App ${chalk3.bold(appDir)} added to ${chalk3.bold(projectName)}!`
-    );
-    return {
-      projectId: result.projectId,
-      projectName: result.projectName,
-      apiKey: result.apiKey,
-      appDir: result.appDir,
-      sourceLocale,
-      targetLocales,
-      targetBranches
-    };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Unknown error";
-    p3.log.error(`Failed to add app: ${message}`);
-    return null;
   }
+  const selected = await p3.select({
+    message: "Select a GitHub installation",
+    options
+  });
+  if (p3.isCancel(selected)) return null;
+  if (selected === "install_new") return "install_new";
+  return Number(selected);
 }
 // src/commands/init.ts
@@ -1418,6 +1416,7 @@ async function runAuthFlow(api, options, reauth = false, repoCanonical) {
   const session = await api.startCliAuthSession(server?.port, repoCanonical);
   const browserUrl = reauth ? session.verificationUrl : session.installUrl ?? session.verificationUrl;
   const expiresAt = new Date(session.expiresAt).getTime();
+  p5.log.info(browserUrl);
   if (options.ci) {
     process.stdout.write(`VOCODER_AUTH_URL: ${browserUrl}
 `);
@@ -2171,6 +2170,9 @@ function matchBranchPattern(branch, pattern) {
 import * as p6 from "@clack/prompts";
 import { config as loadEnv2 } from "dotenv";
 loadEnv2();
+function extractShortCodeFromApiKey(apiKey) {
+  return apiKey.slice(4, 14);
+}
 function validateLocalConfig(config) {
   if (!config.apiKey || config.apiKey.length === 0) {
     throw new Error("VOCODER_API_KEY is required. Set it in your .env file.");
@@ -2682,7 +2684,7 @@ async function sync(options = {}) {
         `Deduped ${extractedStrings.length} extracted entries into ${stringEntries.length} unique source strings`
       );
     }
-    const fingerprint = computeFingerprint(config.shortCode, sourceStrings);
+    const fingerprint = computeFingerprint(extractShortCodeFromApiKey(localConfig.apiKey), sourceStrings);
     if (!options.force) {
       const cacheFile = getCacheFilePath(projectRoot, fingerprint);
       if (existsSync3(cacheFile)) {