@vocoder/cli 0.12.0 → 0.12.1

package/README.md

@@ -100,13 +100,13 @@ When running `vocoder init` from a subdirectory of a git repository, the CLI aut
 
 **Stored credentials:**
 
-After first sign-in, the CLI stores credentials at `~/.config/vocoder/auth.json` (mode `0600`). Tokens do not expire. Use `vocoder logout` to revoke.
+After first sign-in, the CLI stores credentials at `~/.vocoder/auth.json` (mode `0600`). Tokens do not expire. Use `vocoder logout` to revoke.
 
 **Token resolution:**
 
 | Command | Source |
 |---|---|
-| `vocoder init` | `VOCODER_AUTH_TOKEN` env var → `~/.config/vocoder/auth.json` |
+| `vocoder init` | `VOCODER_AUTH_TOKEN` env var → `~/.vocoder/auth.json` |
 | `vocoder sync` | `VOCODER_API_KEY` env var → `.env` file |
 | MCP tools | `VOCODER_API_KEY` env var |
 
@@ -274,7 +274,7 @@ Git repository is auto-detected from the current directory's git remote. Use `--
 
 ### `vocoder logout`
 
-Revoke the stored credentials and clear `~/.config/vocoder/auth.json`.
+Revoke the stored credentials and clear `~/.vocoder/auth.json`.
 
 ```bash
 vocoder logout

package/dist/bin.mjs

@@ -13,7 +13,7 @@ import {
   readAuthData,
   verifyStoredAuth,
   writeAuthData
-} from "./chunk-XUCVAFBG.mjs";
+} from "./chunk-SR6SDGUI.mjs";
 
 // src/bin.ts
 import { Command } from "commander";
@@ -41,17 +41,21 @@ function writeVocoderConfig(options) {
   const {
     targetBranches = ["main"],
     useTypeScript = true,
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    appDir
   } = options;
   if (findExistingConfig(cwd)) return null;
   const ext = useTypeScript ? "ts" : "js";
   const configPath = join(cwd, `vocoder.config.${ext}`);
   const branchesStr = targetBranches.map((b) => `'${b}'`).join(", ");
+  const defaultIncludes = ["**/*.{tsx,jsx,ts,js}"];
+  const includes = appDir ? defaultIncludes.map((p14) => `${appDir}/${p14}`) : defaultIncludes;
+  const includesStr = includes.map((p14) => `'${p14}'`).join(", ");
   const content = `import { defineConfig } from '@vocoder/config'
 
 export default defineConfig({
   targetBranches: [${branchesStr}],
-  include: ['**/*.{tsx,jsx,ts,js}'],
+  include: [${includesStr}],
   exclude: [
     '**/node_modules/**',
     '**/.next/**',
@@ -878,25 +882,9 @@ async function runProjectCreate(params) {
     return null;
   }
   const languageOptions = buildLanguageOptions(sourceLocales);
-  let appDir;
-  if (params.defaultAppDir) {
-    appDir = params.defaultAppDir;
+  const appDir = params.defaultAppDir ?? "";
+  if (appDir) {
     p3.log.success(`App directory: ${chalk4.bold(appDir)}`);
-  } else {
-    const rawScope = await p3.text({
-      message: "App directory (leave blank for the entire repo)",
-      placeholder: "e.g. apps/web, packages/frontend",
-      initialValue: "",
-      validate(value) {
-        const v = value.trim();
-        if (!v) return;
-        if (v.startsWith("/"))
-          return "Use a relative path, not an absolute path";
-        if (v.includes("..")) return 'Path must not contain ".."';
-      }
-    });
-    if (p3.isCancel(rawScope)) return null;
-    appDir = (rawScope ?? "").trim();
   }
   const sourceLocale = await searchSelectLocale(
     languageOptions,
@@ -969,7 +957,7 @@ async function runProjectCreate(params) {
     return null;
   }
 }
-async function runProjectAppCreate(params) {
+async function runAppCreate(params) {
   const { api, userToken, projectId, projectName, repoCanonical } = params;
   const existingScopes = new Set(params.existingApps.map((a) => a.appDir));
   let sourceLocales;
@@ -982,35 +970,13 @@ async function runProjectAppCreate(params) {
     return null;
   }
   const languageOptions = buildLanguageOptions(sourceLocales);
-  let appDir;
-  if (params.defaultAppDir && !existingScopes.has(params.defaultAppDir)) {
-    appDir = params.defaultAppDir;
+  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: ${chalk4.bold(appDir)}`);
-  } else {
-    if (params.existingApps.length > 0) {
-      const configuredList = params.existingApps.map((a) => chalk4.dim(a.appDir || "(entire repo)")).join(", ");
-      p3.log.info(`Already configured: ${configuredList}`);
-    }
-    const hasWholeRepoApp = existingScopes.has("");
-    const rawScope = await p3.text({
-      message: "App directory for this new app",
-      placeholder: "e.g. apps/backend",
-      initialValue: params.defaultAppDir ?? "",
-      validate(value) {
-        const v = value.trim();
-        if (!v && hasWholeRepoApp)
-          return "This project already covers the entire repo.";
-        if (!v)
-          return "App directory is required when other apps already exist.";
-        if (v.startsWith("/"))
-          return "Use a relative path, not an absolute path.";
-        if (v.includes("..")) return 'Path must not contain "..".';
-        if (existingScopes.has(v))
-          return `"${v}" is already configured. Choose a different directory.`;
-      }
-    });
-    if (p3.isCancel(rawScope)) return null;
-    appDir = (rawScope ?? "").trim();
   }
   const sourceLocale = await searchSelectLocale(
     languageOptions,
@@ -1062,7 +1028,7 @@ async function runProjectAppCreate(params) {
   }
   const targetBranches = appPushBranches;
   try {
-    const result = await api.createProjectApp(userToken, {
+    const result = await api.createApp(userToken, {
       projectId,
       appDir,
       sourceLocale,
@@ -1302,7 +1268,7 @@ function printPlanLimitMessage(apiUrl, message) {
   p5.log.info(`Manage subscription: ${getSubscriptionSettingsUrl(apiUrl)}`);
 }
 function runScaffold(params) {
-  const { sourceLocale, targetBranches } = params;
+  const { sourceLocale, targetBranches, appDir } = params;
   const detection = detectLocalEcosystem();
   const useTypeScript = detection.isTypeScript;
   if (detection.ecosystem) {
@@ -1345,7 +1311,8 @@ function runScaffold(params) {
     framework: detection.framework,
     ecosystem: detection.ecosystem,
     sourceLocale,
-    targetBranches
+    targetBranches,
+    appDir
   });
   const steps = [];
   if (snippets.pluginStep) {
@@ -1378,7 +1345,7 @@ function runScaffold(params) {
     printCodeBlock(step.code);
     if (i < steps.length - 1) p5.log.message("");
   }
-  const written = writeVocoderConfig({ targetBranches, useTypeScript });
+  const written = writeVocoderConfig({ targetBranches, useTypeScript, appDir });
   if (written) {
     p5.log.success(`Created ${chalk6.cyan(written)}`);
   } else if (!findExistingConfig(process.cwd())) {
@@ -1476,8 +1443,9 @@ async function runAuthFlow(api, options, reauth = false, repoCanonical) {
           return null;
         }
         if (!shouldOpen) {
-          p5.note(browserUrl, "Sign In");
-          p5.log.info("Open the URL above manually in your browser to continue.");
+          server?.close();
+          p5.cancel("Setup cancelled.");
+          return null;
         } else {
           const opened = await tryOpenBrowser2(browserUrl);
           if (!opened) {
@@ -1966,7 +1934,7 @@ async function init(options = {}) {
         `${chalk6.bold(repoProjectName)} is already set up for this repo.
   Configured apps: ${existingAppsForRepo.map((a) => chalk6.cyan(a.appDir || "(entire repo)")).join(", ")}`
       );
-      const appResult = await runProjectAppCreate({
+      const appResult = await runAppCreate({
         api,
         userToken,
         projectId: repoProjectId,
@@ -1982,7 +1950,8 @@ async function init(options = {}) {
       }
       runScaffold({
         sourceLocale: appResult.sourceLocale,
-        targetBranches: appResult.targetBranches
+        targetBranches: appResult.targetBranches,
+        appDir: identity?.repoAppDir
       });
       p5.outro("You're all set.");
       return 0;
@@ -2039,7 +2008,7 @@ async function init(options = {}) {
           return 1;
         }
         const chosen = existingProjects.find((proj) => proj.id === chosenId);
-        const appResult = await runProjectAppCreate({
+        const appResult = await runAppCreate({
           api,
           userToken,
           projectId: chosen.id,
@@ -2055,7 +2024,8 @@ async function init(options = {}) {
         }
         runScaffold({
           sourceLocale: appResult.sourceLocale,
-          targetBranches: appResult.targetBranches
+          targetBranches: appResult.targetBranches,
+          appDir: identity?.repoAppDir
         });
         p5.outro("You're all set.");
         return 0;
@@ -2090,7 +2060,8 @@ Translations won't run automatically until you grant access.
     }
     runScaffold({
       sourceLocale: projectResult.sourceLocale,
-      targetBranches: projectResult.targetBranches
+      targetBranches: projectResult.targetBranches,
+      appDir: identity?.repoAppDir
     });
     printApiKey(projectResult.apiKey);
     p5.outro("You're all set.");
@@ -2405,8 +2376,8 @@ function buildTranslationData(params) {
   const hashKeyed = {};
   for (const [locale, localeMap] of Object.entries(params.translations)) {
     hashKeyed[locale] = {};
-    for (const [text2, translation] of Object.entries(localeMap)) {
-      const hash = textToHash.get(text2);
+    for (const [text, translation] of Object.entries(localeMap)) {
+      const hash = textToHash.get(text);
       if (hash) hashKeyed[locale][hash] = translation;
     }
   }
@@ -2733,7 +2704,7 @@ async function sync(options = {}) {
         requestedMaxWaitMs: waitTimeoutMs,
         clientRunId: randomUUID(),
         force: options.force,
-        // Sync appIndustry from vocoder.config.ts to ProjectApp on every push
+        // Sync appIndustry from vocoder.config.ts to App on every push
         ...config.appIndustry ? { appIndustry: config.appIndustry } : {}
       },
       repoIdentity ? { ...repoIdentity, commitSha } : { commitSha }