@vocoder/cli 0.1.8 → 0.1.10

package/dist/bin.mjs

@@ -348,6 +348,10 @@ function parsePayload(raw) {
   if (raw.length === 0) {
     return null;
   }
+  const trimmed = raw.trimStart();
+  if (trimmed.startsWith("<!DOCTYPE") || trimmed.startsWith("<html")) {
+    return { message: "Unexpected response from server (received HTML). Check your network connection or try again." };
+  }
   try {
     return JSON.parse(raw);
   } catch {
@@ -659,8 +663,10 @@ var VocoderAPI = class {
     }
   }
   // ── Workspaces ────────────────────────────────────────────────────────────────
-  async listWorkspaces(userToken) {
-    const response = await fetch(`${this.apiUrl}/api/cli/workspaces`, {
+  async listWorkspaces(userToken, params) {
+    const url = new URL(`${this.apiUrl}/api/cli/workspaces`);
+    if (params?.repo) url.searchParams.set("repo", params.repo);
+    const response = await fetch(url.toString(), {
       headers: { Authorization: `Bearer ${userToken}` }
     });
     const payload = await readPayload(response);
@@ -673,6 +679,23 @@ var VocoderAPI = class {
     }
     return payload;
   }
+  async listProjects(userToken, organizationId) {
+    const url = new URL(`${this.apiUrl}/api/cli/projects`);
+    url.searchParams.set("organizationId", organizationId);
+    const response = await fetch(url.toString(), {
+      headers: { Authorization: `Bearer ${userToken}` }
+    });
+    const payload = await readPayload(response);
+    if (!response.ok) {
+      throw new VocoderAPIError({
+        message: extractErrorMessage(payload, `Failed to list projects (${response.status})`),
+        status: response.status,
+        payload
+      });
+    }
+    const result = payload;
+    return result.projects;
+  }
   // ── CLI GitHub endpoints ──────────────────────────────────────────────────────
   async startCliGitHubInstall(userToken, params) {
     const response = await fetch(`${this.apiUrl}/api/cli/github/install/start`, {
@@ -1926,105 +1949,219 @@ async function init(options = {}) {
         selectedWorkspaceName = claimResult.organizationName;
         p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
       } else {
-        const workspaceData = await api.listWorkspaces(userToken);
-        if (workspaceData.workspaces.length === 1 && !workspaceData.canCreateWorkspace) {
-          const ws = workspaceData.workspaces[0];
+        const workspaceData = await api.listWorkspaces(userToken, {
+          repo: identity?.repoCanonical
+        });
+        const repoCanonical = identity?.repoCanonical ?? null;
+        const covering = repoCanonical ? workspaceData.workspaces.filter((w) => w.coversRepo === true) : [];
+        const connected = workspaceData.workspaces.filter((w) => w.hasGitHubConnection);
+        if (repoCanonical && covering.length === 1) {
+          const ws = covering[0];
           selectedWorkspaceId = ws.id;
           selectedWorkspaceName = ws.name;
           p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
-        } else {
-          const workspaceResult = await selectWorkspace(workspaceData);
-          if (workspaceResult.action === "cancelled") {
+        } else if (repoCanonical && covering.length > 1) {
+          const choice = await p5.select({
+            message: "Select workspace for this repo",
+            options: covering.map((w) => ({
+              value: w.id,
+              label: `${w.name}  ${chalk6.dim(`(${w.projectCount} project${w.projectCount !== 1 ? "s" : ""})`)}`
+            }))
+          });
+          if (p5.isCancel(choice)) {
+            p5.cancel("Setup cancelled.");
+            return 1;
+          }
+          const ws = covering.find((w) => w.id === choice);
+          selectedWorkspaceId = ws.id;
+          selectedWorkspaceName = ws.name;
+          p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
+        } else if (repoCanonical && covering.length === 0 && connected.length > 0) {
+          const shortRepo = repoCanonical.split(":")[1] ?? repoCanonical;
+          p5.log.warn(
+            `${chalk6.bold(shortRepo)} isn't accessible from your Vocoder installation.
+  Grant access to this repository or install on the account that owns it.`
+          );
+          const fixOptions = [];
+          for (const ws of connected) {
+            if (ws.installationConfigureUrl) {
+              fixOptions.push({
+                value: `grant:${ws.id}`,
+                label: `Configure ${chalk6.bold(ws.connectionLabel ?? ws.name)}'s GitHub App installation`
+              });
+            }
+          }
+          fixOptions.push({
+            value: "install_new",
+            label: "Install on a different GitHub account"
+          });
+          fixOptions.push({ value: "cancel", label: "Cancel" });
+          const fix = await p5.select({
+            message: "How would you like to fix this?",
+            options: fixOptions
+          });
+          if (p5.isCancel(fix) || fix === "cancel") {
             p5.cancel("Setup cancelled.");
             return 1;
           }
-          if (workspaceResult.action === "use") {
-            selectedWorkspaceId = workspaceResult.workspace.id;
-            selectedWorkspaceName = workspaceResult.workspace.name;
+          if (fix.startsWith("grant:")) {
+            const ws = connected.find((w) => `grant:${w.id}` === fix);
+            await tryOpenBrowser2(ws.installationConfigureUrl);
+            p5.cancel(
+              `Grant access to ${chalk6.bold(shortRepo)} in your browser,
+  then re-run ${chalk6.bold("vocoder init")}.`
+            );
+            return 1;
+          }
+          const connectResult = await runGitHubInstallFlow({ api, userToken, yes: options.yes });
+          if (!connectResult) {
+            p5.log.error("GitHub App installation did not complete. Run `vocoder init` again.");
+            return 1;
+          }
+          selectedWorkspaceId = connectResult.organizationId;
+          selectedWorkspaceName = connectResult.organizationName;
+          p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
+        } else {
+          if (workspaceData.workspaces.length === 1 && !workspaceData.canCreateWorkspace) {
+            const ws = workspaceData.workspaces[0];
+            selectedWorkspaceId = ws.id;
+            selectedWorkspaceName = ws.name;
             p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
           } else {
-            const connectChoice = await p5.select({
-              message: "Connect your new workspace to GitHub",
-              options: [
-                { value: "install", label: "Install the Vocoder GitHub App" },
-                { value: "link", label: "Link an existing installation" }
-              ]
-            });
-            if (p5.isCancel(connectChoice)) {
+            const workspaceResult = await selectWorkspace(workspaceData);
+            if (workspaceResult.action === "cancelled") {
               p5.cancel("Setup cancelled.");
               return 1;
             }
-            if (connectChoice === "install") {
-              const connectResult = await runGitHubInstallFlow({
-                api,
-                userToken,
-                yes: options.yes
-              });
-              if (!connectResult) {
-                p5.log.error("GitHub App installation did not complete. Run `vocoder init` again.");
-                return 1;
-              }
-              selectedWorkspaceId = connectResult.organizationId;
-              selectedWorkspaceName = connectResult.organizationName;
+            if (workspaceResult.action === "use") {
+              selectedWorkspaceId = workspaceResult.workspace.id;
+              selectedWorkspaceName = workspaceResult.workspace.name;
               p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
             } else {
-              const installations = await runGitHubDiscoveryFlow({
-                api,
-                userToken,
-                yes: options.yes
+              const connectChoice = await p5.select({
+                message: "Connect your new workspace to GitHub",
+                options: [
+                  { value: "install", label: "Install the Vocoder GitHub App" },
+                  { value: "link", label: "Link an existing installation" }
+                ]
               });
-              if (!installations) return 1;
-              if (installations.length === 0) {
-                p5.log.warn("No GitHub installations found. Install the Vocoder GitHub App first.");
-                const installNow = await p5.confirm({ message: "Open GitHub to install the App?" });
-                if (p5.isCancel(installNow) || !installNow) return 1;
-                const connectResult = await runGitHubInstallFlow({
-                  api,
-                  userToken,
-                  yes: options.yes
-                });
-                if (!connectResult) return 1;
+              if (p5.isCancel(connectChoice)) {
+                p5.cancel("Setup cancelled.");
+                return 1;
+              }
+              if (connectChoice === "install") {
+                const connectResult = await runGitHubInstallFlow({ api, userToken, yes: options.yes });
+                if (!connectResult) {
+                  p5.log.error("GitHub App installation did not complete. Run `vocoder init` again.");
+                  return 1;
+                }
                 selectedWorkspaceId = connectResult.organizationId;
                 selectedWorkspaceName = connectResult.organizationName;
+                p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
               } else {
-                const selectedInstallationId = await selectGitHubInstallation(
-                  installations.map((inst) => ({
-                    installationId: inst.installationId,
-                    accountLogin: inst.accountLogin,
-                    accountType: inst.accountType,
-                    isSuspended: inst.isSuspended,
-                    conflictLabel: inst.conflictLabel
-                  })),
-                  true
-                );
-                if (selectedInstallationId === null) {
-                  p5.cancel("Setup cancelled.");
-                  return 1;
-                }
-                if (selectedInstallationId === "install_new") {
-                  const connectResult = await runGitHubInstallFlow({
-                    api,
-                    userToken,
-                    yes: options.yes
-                  });
+                const installations = await runGitHubDiscoveryFlow({ api, userToken, yes: options.yes });
+                if (!installations) return 1;
+                if (installations.length === 0) {
+                  p5.log.warn("No GitHub installations found. Install the Vocoder GitHub App first.");
+                  const installNow = await p5.confirm({ message: "Open GitHub to install the App?" });
+                  if (p5.isCancel(installNow) || !installNow) return 1;
+                  const connectResult = await runGitHubInstallFlow({ api, userToken, yes: options.yes });
                   if (!connectResult) return 1;
                   selectedWorkspaceId = connectResult.organizationId;
                   selectedWorkspaceName = connectResult.organizationName;
                 } else {
-                  const claimResult = await api.claimCliGitHubInstallation(userToken, {
-                    installationId: String(selectedInstallationId),
-                    organizationId: null
-                  });
-                  selectedWorkspaceId = claimResult.organizationId;
-                  selectedWorkspaceName = claimResult.organizationName;
+                  const selectedInstallationId = await selectGitHubInstallation(
+                    installations.map((inst) => ({
+                      installationId: inst.installationId,
+                      accountLogin: inst.accountLogin,
+                      accountType: inst.accountType,
+                      isSuspended: inst.isSuspended,
+                      conflictLabel: inst.conflictLabel
+                    })),
+                    true
+                  );
+                  if (selectedInstallationId === null) {
+                    p5.cancel("Setup cancelled.");
+                    return 1;
+                  }
+                  if (selectedInstallationId === "install_new") {
+                    const connectResult = await runGitHubInstallFlow({ api, userToken, yes: options.yes });
+                    if (!connectResult) return 1;
+                    selectedWorkspaceId = connectResult.organizationId;
+                    selectedWorkspaceName = connectResult.organizationName;
+                  } else {
+                    const claimResult = await api.claimCliGitHubInstallation(userToken, {
+                      installationId: String(selectedInstallationId),
+                      organizationId: null
+                    });
+                    selectedWorkspaceId = claimResult.organizationId;
+                    selectedWorkspaceName = claimResult.organizationName;
+                  }
                 }
+                p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
               }
-              p5.log.success(`Workspace: ${chalk6.bold(selectedWorkspaceName)}`);
             }
           }
         }
       }
     }
+    try {
+      const wsCheck = await api.listWorkspaces(userToken);
+      const ws = wsCheck.workspaces.find((w) => w.id === selectedWorkspaceId);
+      if (ws && ws.maxProjects !== -1 && ws.projectCount >= ws.maxProjects) {
+        p5.log.warn(
+          `Project limit reached \u2014 ${ws.projectCount}/${ws.maxProjects} on your ${chalk6.bold(ws.planId)} plan.`
+        );
+        const limitAction = await p5.select({
+          message: "What would you like to do?",
+          options: [
+            { value: "upgrade", label: "Upgrade plan" },
+            { value: "existing", label: "Use an existing project in this workspace" },
+            { value: "cancel", label: "Cancel" }
+          ]
+        });
+        if (p5.isCancel(limitAction) || limitAction === "cancel") {
+          p5.cancel("Setup cancelled.");
+          return 1;
+        }
+        if (limitAction === "upgrade") {
+          await tryOpenBrowser2(`${apiUrl}/dashboard/billing`);
+          p5.cancel("Upgrade your plan in the browser, then re-run `vocoder init`.");
+          return 1;
+        }
+        const existingProjects = await api.listProjects(userToken, selectedWorkspaceId);
+        if (existingProjects.length === 0) {
+          p5.log.error("No projects found in this workspace.");
+          return 1;
+        }
+        const chosenId = await p5.select({
+          message: "Select a project",
+          options: existingProjects.map((proj) => ({
+            value: proj.id,
+            label: proj.name,
+            hint: `${proj.sourceLocale} \u2192 ${proj.targetLocales.join(", ")}`
+          }))
+        });
+        if (p5.isCancel(chosenId)) {
+          p5.cancel("Setup cancelled.");
+          return 1;
+        }
+        const chosen = existingProjects.find((proj) => proj.id === chosenId);
+        runScaffold({
+          projectName: chosen.name,
+          organizationName: selectedWorkspaceName,
+          sourceLocale: chosen.sourceLocale,
+          translationTriggers: chosen.translationTriggers
+        });
+        p5.log.info(
+          `Get your project API key at:
+  ${apiUrl}/dashboard/projects/${chosen.id}/settings`
+        );
+        p5.outro("You're all set.");
+        return 0;
+      }
+    } catch {
+    }
     const projectResult = await runProjectCreate({
       api,
       userToken,