@vibeframe/cli 0.89.0 → 0.90.0

package/dist/index.js

@@ -25690,32 +25690,81 @@ var init_schema = __esm({
 import { resolve as resolve4 } from "node:path";
 import { homedir } from "node:os";
 import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, access as access2 } from "node:fs/promises";
-async function loadConfig() {
+function getProjectConfigDir(cwd = process.cwd()) {
+  return resolve4(cwd, ".vibeframe");
+}
+function getProjectConfigPath(cwd = process.cwd()) {
+  return resolve4(getProjectConfigDir(cwd), "config.yaml");
+}
+function getConfigPath(scope, cwd) {
+  return scope === "project" ? getProjectConfigPath(cwd) : USER_CONFIG_PATH;
+}
+function getConfigDir(scope, cwd) {
+  return scope === "project" ? getProjectConfigDir(cwd) : USER_CONFIG_DIR;
+}
+async function fileExists(path2) {
   try {
-    await access2(CONFIG_PATH);
-    const content = await readFile2(CONFIG_PATH, "utf-8");
-    const config2 = (0, import_yaml.parse)(content);
-    const defaults = createDefaultConfig();
-    return {
-      ...defaults,
-      ...config2,
-      llm: { ...defaults.llm, ...config2.llm },
-      providers: { ...defaults.providers, ...config2.providers },
-      defaults: { ...defaults.defaults, ...config2.defaults },
-      repl: { ...defaults.repl, ...config2.repl }
-    };
+    await access2(path2);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function getActiveScope(cwd) {
+  return await fileExists(getProjectConfigPath(cwd)) ? "project" : "user";
+}
+function applyDefaults(parsed) {
+  const defaults = createDefaultConfig();
+  return {
+    ...defaults,
+    ...parsed,
+    llm: { ...defaults.llm, ...parsed.llm },
+    providers: { ...defaults.providers, ...parsed.providers },
+    defaults: { ...defaults.defaults, ...parsed.defaults },
+    repl: { ...defaults.repl, ...parsed.repl }
+  };
+}
+async function readConfigFile(path2) {
+  if (!await fileExists(path2)) return null;
+  try {
+    const content = await readFile2(path2, "utf-8");
+    const parsed = (0, import_yaml.parse)(content);
+    return applyDefaults(parsed);
   } catch {
     return null;
   }
 }
-async function saveConfig(config2) {
-  await mkdir2(CONFIG_DIR, { recursive: true });
-  const content = (0, import_yaml.stringify)(config2, {
-    indent: 2,
-    lineWidth: 0
-    // Don't wrap lines
-  });
-  await writeFile2(CONFIG_PATH, content, "utf-8");
+async function loadConfig(options = {}) {
+  const { scope, cwd, merge } = options;
+  if (merge) {
+    const user = await readConfigFile(USER_CONFIG_PATH);
+    const project2 = await readConfigFile(getProjectConfigPath(cwd));
+    if (!user && !project2) return null;
+    if (!user) return project2;
+    if (!project2) return user;
+    return {
+      ...user,
+      ...project2,
+      llm: { ...user.llm, ...project2.llm },
+      providers: { ...user.providers, ...project2.providers },
+      defaults: { ...user.defaults, ...project2.defaults },
+      repl: { ...user.repl, ...project2.repl }
+    };
+  }
+  if (scope) {
+    return readConfigFile(getConfigPath(scope, cwd));
+  }
+  const project = await readConfigFile(getProjectConfigPath(cwd));
+  if (project) return project;
+  return readConfigFile(USER_CONFIG_PATH);
+}
+async function saveConfig(config2, options = {}) {
+  const scope = options.scope ?? "user";
+  const dir = getConfigDir(scope, options.cwd);
+  const path2 = getConfigPath(scope, options.cwd);
+  await mkdir2(dir, { recursive: true });
+  const content = (0, import_yaml.stringify)(config2, { indent: 2, lineWidth: 0 });
+  await writeFile2(path2, content, "utf-8");
 }
 async function isConfigured() {
   const config2 = await loadConfig();
@@ -25737,20 +25786,19 @@ async function getApiKeyFromConfig(providerKey) {
     return config2.providers[providerKey];
   }
   const envVar = PROVIDER_ENV_VARS[providerKey];
-  if (envVar) {
-    return process.env[envVar];
-  }
+  if (envVar) return process.env[envVar];
   return void 0;
 }
-var import_yaml, CONFIG_DIR, CONFIG_PATH;
+var import_yaml, USER_CONFIG_DIR, USER_CONFIG_PATH, CONFIG_PATH;
 var init_config = __esm({
   "src/config/index.ts"() {
     "use strict";
     import_yaml = __toESM(require_dist(), 1);
     init_schema();
     init_schema();
-    CONFIG_DIR = resolve4(homedir(), ".vibeframe");
-    CONFIG_PATH = resolve4(CONFIG_DIR, "config.yaml");
+    USER_CONFIG_DIR = resolve4(homedir(), ".vibeframe");
+    USER_CONFIG_PATH = resolve4(USER_CONFIG_DIR, "config.yaml");
+    CONFIG_PATH = USER_CONFIG_PATH;
   }
 });
 
@@ -26277,9 +26325,8 @@ vibe scene lint --json    # structured output for agent loops
 `;
 }
 function buildSceneGitignore() {
-  return `# VibeFrame caches
-.vibeframe/cache/
-.vibeframe/checkpoints/
+  return `# VibeFrame \u2014 caches, checkpoints, and project-scope config.yaml (may contain API keys)
+.vibeframe/
 
 # Render outputs
 renders/*.mp4
@@ -62845,7 +62892,7 @@ init_source();
 // package.json
 var package_default = {
   name: "@vibeframe/cli",
-  version: "0.89.0",
+  version: "0.90.0",
   description: "VibeFrame CLI - natural language video editing from the terminal",
   private: false,
   license: "MIT",
@@ -69840,13 +69887,34 @@ var VALID_LLM_PROVIDERS = [
   "xai",
   "openrouter"
 ];
-var setupCommand = new Command("setup").description("Configure VibeFrame (LLM provider, API keys)").option("--reset", "Reset configuration to defaults").option("--full", "Run full setup with all optional providers").option("--show", "Show current configuration (for debugging)").option("-v, --verbose", "With --show: include unset providers + Resolution order + Defaults block").option("--claude-code", "Show Claude Code integration guide").option("-y, --yes", "Non-interactive: write config without prompting (CI / devcontainer)").option("--provider <id>", "Set the Agent LLM provider (claude | openai | gemini | xai | openrouter | ollama)").option("--import-env", "Promote API keys from .env / shell env into config.yaml").option("--test", "After save, live-test each configured key (exits 7 if any FAIL)").addHelpText(
+var VALID_SCOPES = ["user", "project"];
+function parseScope(raw) {
+  const v = String(raw ?? "user");
+  if (!VALID_SCOPES.includes(v)) {
+    exitWithError(generalError(
+      `Invalid --scope: ${v}`,
+      `Must be one of: ${VALID_SCOPES.join(", ")}`
+    ));
+  }
+  return v;
+}
+var setupCommand = new Command("setup").description("Configure VibeFrame (LLM provider, API keys)").option("--reset", "Reset configuration to defaults").option("--full", "Run full setup with all optional providers").option("--show", "Show current configuration (for debugging)").option("-v, --verbose", "With --show: include unset providers + Resolution order + Defaults block").option("--claude-code", "Show Claude Code integration guide").option("-y, --yes", "Non-interactive: write config without prompting (CI / devcontainer)").option("--provider <id>", "Set the Agent LLM provider (claude | openai | gemini | xai | openrouter | ollama)").option("--import-env", "Promote API keys from .env / shell env into config.yaml").option("--test", "After save, live-test each configured key (exits 7 if any FAIL)").option(
+  "--scope <scope>",
+  "Where to save: 'user' (~/.vibeframe/config.yaml, shared) or 'project' (./.vibeframe/config.yaml, gitignored, this project only)",
+  "user"
+).addHelpText(
   "after",
   `
 Non-interactive examples (no TTY required):
   vibe setup --yes --provider claude --import-env         Bootstrap CI / devcontainer
   vibe setup --yes --import-env --test                    Persist .env keys + verify each one
   vibe setup --yes --provider openai                      Just switch the agent provider
+  vibe setup --scope project --yes --import-env           Project-only setup (./.vibeframe/config.yaml)
+
+Scopes:
+  user    (default) ~/.vibeframe/config.yaml \u2014 shared across every project
+  project ./.vibeframe/config.yaml \u2014 gitignored, isolates keys/defaults to this directory
+          When a project config exists at the cwd, it is used and the user file is ignored.
 
 Exit codes (non-interactive):
   0  success                7  --test verification failed (one or more keys returned non-2xx)
@@ -69861,11 +69929,12 @@ Exit codes (non-interactive):
     await showConfig({ verbose: Boolean(options.verbose) });
     return;
   }
+  const scope = parseScope(options.scope);
   if (options.reset) {
     const config2 = createDefaultConfig();
-    await saveConfig(config2);
+    await saveConfig(config2, { scope });
     console.log(source_default.green("\u2713 Configuration reset to defaults"));
-    console.log(source_default.dim(`  Saved to: ${CONFIG_PATH}`));
+    console.log(source_default.dim(`  Saved to: ${getConfigPath(scope)}`));
     return;
   }
   const wantsNonInteractive = Boolean(options.yes) || !hasTTY() && (options.provider || options.importEnv);
@@ -69873,7 +69942,8 @@ Exit codes (non-interactive):
     await runNonInteractiveSetup({
       provider: options.provider,
       importEnv: Boolean(options.importEnv),
-      test: Boolean(options.test)
+      test: Boolean(options.test),
+      scope
     });
     return;
   }
@@ -69884,7 +69954,7 @@ Exit codes (non-interactive):
     ));
   }
   try {
-    await runSetupWizard(options.full);
+    await runSetupWizard(options.full, scope);
     closeTTYStream();
     process.exit(0);
   } catch (err) {
@@ -69930,7 +70000,8 @@ var AI_FEATURES = [
   }
 ];
 async function runNonInteractiveSetup(opts) {
-  let config2 = await loadConfig();
+  const scope = opts.scope ?? "user";
+  let config2 = await loadConfig({ scope });
   if (!config2) {
     config2 = createDefaultConfig();
   }
@@ -69967,9 +70038,9 @@ async function runNonInteractiveSetup(opts) {
       changes.push(`imported ${importedCount} key${importedCount === 1 ? "" : "s"} from env`);
     }
   }
-  await saveConfig(config2);
-  console.log(source_default.green("\u2713 Setup complete (non-interactive)"));
-  console.log(source_default.dim(`  Config: ${CONFIG_PATH}`));
+  await saveConfig(config2, { scope });
+  console.log(source_default.green(`\u2713 Setup complete (non-interactive, ${scope} scope)`));
+  console.log(source_default.dim(`  Config: ${getConfigPath(scope)}`));
   if (changes.length > 0) {
     for (const c of changes) {
       console.log(source_default.dim(`  ${c}`));
@@ -70012,20 +70083,21 @@ async function runNonInteractiveSetup(opts) {
     }
   }
 }
-async function runSetupWizard(fullSetup = false) {
+async function runSetupWizard(fullSetup = false, scope = "user") {
   console.log();
-  console.log(source_default.bold.magenta("VibeFrame Setup") + source_default.dim(" \u2014 user scope"));
+  const scopeLabel = scope === "project" ? source_default.dim(` \u2014 project scope (${getConfigPath("project")})`) : source_default.dim(" \u2014 user scope");
+  console.log(source_default.bold.magenta("VibeFrame Setup") + scopeLabel);
   console.log(source_default.dim("\u2500".repeat(40)));
   console.log();
   const hosts = detectedAgentHosts();
   console.log(source_default.dim(`Agent hosts: ${summariseAgentHosts(hosts)}`));
   console.log();
-  let config2 = await loadConfig();
+  let config2 = await loadConfig({ scope });
   if (!config2) {
     config2 = createDefaultConfig();
   }
   if (fullSetup) {
-    await runCustomSetup(config2);
+    await runCustomSetup(config2, scope);
     return;
   }
   console.log(source_default.dim("1. Goal"));
@@ -70040,12 +70112,12 @@ async function runSetupWizard(fullSetup = false) {
   const topIndex = await promptSelect(source_default.cyan("  Select [1-4]: "), topLabels, 0);
   console.log();
   if (topIndex === 0) {
-    await saveConfig(config2);
-    await showComplete(config2, "vibe edit silence-cut video.mp4 -o clean.mp4");
+    await saveConfig(config2, { scope });
+    await showComplete(config2, "vibe edit silence-cut video.mp4 -o clean.mp4", [], scope);
     return;
   }
   if (topIndex === 3) {
-    await runCustomSetup(config2);
+    await runCustomSetup(config2, scope);
     return;
   }
   if (topIndex === 2) {
@@ -70061,8 +70133,8 @@ async function runSetupWizard(fullSetup = false) {
     console.log(source_default.dim("  Saved locally, never shared. Press Enter to skip."));
     console.log();
     await collectKeys(config2, pipelineKeys);
-    await saveConfig(config2);
-    await showComplete(config2, "vibe build my-story/   # see CONTRIBUTING.md for STORYBOARD.md format");
+    await saveConfig(config2, { scope });
+    await showComplete(config2, "vibe build my-story/   # see CONTRIBUTING.md for STORYBOARD.md format", [], scope);
     return;
   }
   console.log(source_default.dim("2. Features"));
@@ -70083,8 +70155,8 @@ async function runSetupWizard(fullSetup = false) {
   if (selectedFeatures.length === 0) {
     console.log(source_default.dim("  No features selected. You can re-run setup anytime."));
     console.log();
-    await saveConfig(config2);
-    await showComplete(config2, "vibe --help", []);
+    await saveConfig(config2, { scope });
+    await showComplete(config2, "vibe --help", [], scope);
     return;
   }
   console.log(source_default.dim("3. API keys"));
@@ -70136,8 +70208,8 @@ async function runSetupWizard(fullSetup = false) {
     }
     console.log();
   }
-  await saveConfig(config2);
-  await showComplete(config2, selectedFeatures[0].tryCommand, selectedFeatures);
+  await saveConfig(config2, { scope });
+  await showComplete(config2, selectedFeatures[0].tryCommand, selectedFeatures, scope);
 }
 async function collectKeys(config2, keys) {
   loadEnv();
@@ -70173,7 +70245,7 @@ async function collectKeys(config2, keys) {
   }
   console.log();
 }
-async function runCustomSetup(config2) {
+async function runCustomSetup(config2, scope = "user") {
   console.log(source_default.bold("1. Agent LLM Provider") + source_default.dim(" (for vibe agent)"));
   console.log(source_default.dim("   Only needed if you use the interactive Agent mode."));
   console.log();
@@ -70243,14 +70315,15 @@ async function runCustomSetup(config2) {
     }
   }
   console.log();
-  await saveConfig(config2);
-  await showComplete(config2, "vibe doctor");
+  await saveConfig(config2, { scope });
+  await showComplete(config2, "vibe doctor", [], scope);
 }
-async function showComplete(config2, defaultTryCommand, features = []) {
+async function showComplete(config2, defaultTryCommand, features = [], scope = "user") {
   console.log(source_default.dim("\u2500".repeat(40)));
   console.log(source_default.green.bold("\u2713 Setup complete!"));
   console.log();
-  console.log(source_default.dim(`  Config: ${CONFIG_PATH}`));
+  const scopeNote = scope === "project" ? source_default.dim(" (project scope)") : source_default.dim(" (user scope)");
+  console.log(source_default.dim(`  Config: ${getConfigPath(scope)}${scopeNote}`));
   console.log();
   const primaryTry = features.length > 1 ? features[0].tryCommand : defaultTryCommand;
   if (features.length > 1) {
@@ -70340,13 +70413,22 @@ async function showConfig(opts = { verbose: false }) {
     hasCwdEnv = true;
   } catch {
   }
+  const activeScope = await getActiveScope();
+  const userPath = USER_CONFIG_PATH;
+  const projectPath = getConfigPath("project");
+  const userExists = await loadConfig({ scope: "user" }) !== null;
+  const projectExists = await loadConfig({ scope: "project" }) !== null;
   console.log();
   console.log(source_default.bold.magenta("VibeFrame Configuration"));
   console.log(source_default.dim("\u2500".repeat(40)));
   console.log();
-  console.log(source_default.dim(`Config file: ${CONFIG_PATH}`));
+  const userMark = activeScope === "user" && userExists ? source_default.cyan("\u2190 active") : userExists ? source_default.dim("(present)") : source_default.dim("(missing)");
+  const projectMark = activeScope === "project" ? source_default.cyan("\u2190 active") : projectExists ? source_default.dim("(present)") : source_default.dim("(missing)");
+  console.log(source_default.dim(`Scopes:`));
+  console.log(source_default.dim(`  user     ${userPath} ${userMark}`));
+  console.log(source_default.dim(`  project  ${projectPath} ${projectMark}`));
   if (hasCwdEnv) {
-    console.log(source_default.dim(`Project .env: ${cwdEnvPath}`));
+    console.log(source_default.dim(`  .env     ${cwdEnvPath} ${source_default.dim("(env vars override config)")}`));
   }
   console.log();
   const config2 = await loadConfig();
@@ -70414,9 +70496,9 @@ async function showConfig(opts = { verbose: false }) {
     }
     console.log(source_default.bold("Resolution order:"));
     console.log(source_default.dim("  1. --api-key CLI option"));
-    console.log(source_default.dim(`  2. ${CONFIG_PATH}`));
-    console.log(source_default.dim("  3. .env in current directory"));
-    console.log(source_default.dim("  4. Shell environment variables"));
+    console.log(source_default.dim(`  2. Active config scope: ${activeScope === "project" ? projectPath : userPath}`));
+    console.log(source_default.dim(`     (project takes priority when present at cwd; user is ignored in that case)`));
+    console.log(source_default.dim("  3. .env / shell environment variables (process.env)"));
     console.log();
   }
 }
@@ -71551,6 +71633,9 @@ async function runDiagnostics() {
     exists: existsSync36(resolve50(cwd, rel))
   }));
   const projectInitialized = projectFiles.some((f) => f.exists);
+  const projectConfigPath = getProjectConfigPath(cwd);
+  const projectConfigExists = existsSync36(projectConfigPath);
+  const activeScope = await getActiveScope(cwd);
   const hosts = detectAgentHosts();
   const detectedNames = hosts.filter((h) => h.detected).map((h) => h.label);
   const recommendedMode = resolveSceneBuildMode({});
@@ -71573,8 +71658,15 @@ async function runDiagnostics() {
       ...Object.keys(optionalTools).length > 0 ? { optionalTools } : {}
     },
     scope: {
+      activeScope,
       user: { configured: configExists, configPath: CONFIG_PATH },
-      project: { cwd, initialized: projectInitialized, files: projectFiles },
+      project: {
+        cwd,
+        initialized: projectInitialized,
+        files: projectFiles,
+        configPath: projectConfigPath,
+        configFileExists: projectConfigExists
+      },
       agentHosts: { detected: detectedNames, summary: summariseAgentHosts(hosts) },
       sceneComposer: {
         recommendedMode,
@@ -71647,16 +71739,30 @@ function printReport(results, opts = { verbose: false }) {
   }
   console.log();
   console.log(source_default.bold("  Scope"));
+  const userActive = results.scope.activeScope === "user" && results.scope.user.configured;
+  const projectActive = results.scope.activeScope === "project";
+  const activeMark = source_default.cyan(" \u2190 active");
   if (results.scope.user.configured) {
-    console.log(`    User       ${source_default.green("OK")}       ${source_default.dim(results.scope.user.configPath)}`);
+    console.log(
+      `    Cfg(user)  ${source_default.green("OK")}       ${source_default.dim(results.scope.user.configPath)}${userActive ? activeMark : ""}`
+    );
   } else {
-    console.log(`    User       ${source_default.yellow("NOT SET")}  ${source_default.dim("Run: vibe setup")}`);
+    console.log(`    Cfg(user)  ${source_default.yellow("NOT SET")}  ${source_default.dim("Run: vibe setup")}`);
+  }
+  if (results.scope.project.configFileExists) {
+    console.log(
+      `    Cfg(proj)  ${source_default.green("OK")}       ${source_default.dim(results.scope.project.configPath)}${projectActive ? activeMark : ""}`
+    );
+  } else {
+    console.log(
+      `    Cfg(proj)  ${source_default.dim("none")}     ${source_default.dim(`Run: vibe setup --scope project  (cwd: ${results.scope.project.cwd})`)}`
+    );
   }
   if (results.scope.project.initialized) {
     const present = results.scope.project.files.filter((f) => f.exists).map((f) => f.path);
-    console.log(`    Project    ${source_default.green("OK")}       ${source_default.dim(present.join(", "))}`);
+    console.log(`    Init       ${source_default.green("OK")}       ${source_default.dim(present.join(", "))}`);
   } else {
-    console.log(`    Project    ${source_default.yellow("NOT INIT")} ${source_default.dim(`Run: vibe init  (cwd: ${results.scope.project.cwd})`)}`);
+    console.log(`    Init       ${source_default.yellow("NOT INIT")} ${source_default.dim(`Run: vibe init  (cwd: ${results.scope.project.cwd})`)}`);
   }
   console.log(`    Agents     ${source_default.dim(results.scope.agentHosts.summary)}`);
   if (verbose) {
@@ -71812,8 +71918,9 @@ async function runLiveKeyTests(results) {
   console.log();
 }
 function pickNextStep(results, hasMissingProviders) {
-  if (!results.scope.user.configured) {
-    return "Next: run 'vibe setup' to configure your user scope (API keys + LLM provider).";
+  const anyConfigured = results.scope.user.configured || results.scope.project.configFileExists;
+  if (!anyConfigured) {
+    return "Next: run 'vibe setup' (or 'vibe setup --scope project' to keep config inside the project) to configure API keys + LLM provider.";
   }
   if (!results.scope.project.initialized) {
     return "Next: run 'vibe init' in your project directory to scaffold AGENTS.md / CLAUDE.md / .env.example.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeframe/cli",
-  "version": "0.89.0",
+  "version": "0.90.0",
   "description": "VibeFrame CLI - natural language video editing from the terminal",
   "private": false,
   "license": "MIT",
@@ -183,8 +183,8 @@
     "tsx": "^4.21.0",
     "typescript": "^5.3.3",
     "vitest": "^1.2.2",
-    "@vibeframe/ai-providers": "0.89.0",
-    "@vibeframe/core": "0.89.0"
+    "@vibeframe/ai-providers": "0.90.0",
+    "@vibeframe/core": "0.90.0"
   },
   "engines": {
     "node": ">=20"