contribute-now 0.8.0-dev.0a7f557 → 0.8.0-dev.703cd39

package/dist/cli.js

@@ -7291,10 +7291,13 @@ import {
   statSync,
   writeFileSync
 } from "fs";
+import { homedir } from "os";
 import { dirname, join, resolve } from "path";
 var CONFIG_FILENAME = ".contributerc.json";
 var LOCAL_CONFIG_DIRNAME = "contribute-now";
 var LOCAL_CONFIG_FILENAME = "config.json";
+var GLOBAL_CONFIG_DIRNAME = ".contribute-now";
+var GLOBAL_CONFIG_FILENAME = "config.json";
 function findRepoRoot(cwd = process.cwd()) {
   let current = resolve(cwd);
   while (true) {
@@ -7384,13 +7387,44 @@ function parseConfigFile(path) {
       aiHost: _aiHost,
       ...config
     } = parsed;
-    return {
+    const normalizedConfig = {
       ...config,
-      aiEnabled: parsed.aiEnabled !== false,
       aiProvider: parsed.aiProvider,
       aiModel: parsed.aiModel?.trim() || undefined,
       showTips: parsed.showTips !== false
     };
+    if (typeof parsed.aiEnabled === "boolean") {
+      normalizedConfig.aiEnabled = parsed.aiEnabled;
+    }
+    return normalizedConfig;
+  } catch {
+    return null;
+  }
+}
+function parseGlobalConfigFile(path) {
+  try {
+    const raw = readFileSync(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null) {
+      return null;
+    }
+    if (parsed.aiProvider !== undefined && (typeof parsed.aiProvider !== "string" || !VALID_AI_PROVIDERS.includes(parsed.aiProvider))) {
+      console.error(`Invalid aiProvider "${String(parsed.aiProvider)}" in ${GLOBAL_CONFIG_FILENAME}. Valid: ${VALID_AI_PROVIDERS.join(", ")}`);
+      return null;
+    }
+    if (parsed.aiModel !== undefined && (typeof parsed.aiModel !== "string" || !parsed.aiModel.trim())) {
+      console.error(`Invalid ${GLOBAL_CONFIG_FILENAME}: aiModel must be a non-empty string.`);
+      return null;
+    }
+    if (parsed.aiEnabled !== undefined && typeof parsed.aiEnabled !== "boolean") {
+      console.error(`Invalid ${GLOBAL_CONFIG_FILENAME}: aiEnabled must be a boolean when set.`);
+      return null;
+    }
+    return {
+      aiEnabled: parsed.aiEnabled,
+      aiProvider: parsed.aiProvider,
+      aiModel: parsed.aiModel?.trim() || undefined
+    };
   } catch {
     return null;
   }
@@ -7405,6 +7439,9 @@ function getConfigPath(cwd = process.cwd()) {
 function getLegacyConfigPath(cwd = process.cwd()) {
   return join(findRepoRoot(cwd) ?? cwd, CONFIG_FILENAME);
 }
+function getGlobalConfigPath(baseDir = homedir()) {
+  return join(baseDir, GLOBAL_CONFIG_DIRNAME, GLOBAL_CONFIG_FILENAME);
+}
 function getLocalConfigPath(cwd = process.cwd()) {
   const gitDir = resolveGitDir(cwd);
   if (!gitDir) {
@@ -7439,12 +7476,25 @@ function getConfigLocationLabel(cwd = process.cwd()) {
 function configExists(cwd = process.cwd()) {
   return getConfigSource(cwd) !== null;
 }
+function globalConfigExists(baseDir = homedir()) {
+  return existsSync(getGlobalConfigPath(baseDir));
+}
 var VALID_WORKFLOWS = ["clean-flow", "github-flow", "git-flow"];
 var VALID_ROLES = ["maintainer", "contributor"];
 var VALID_CONVENTIONS = ["conventional", "clean-commit", "none"];
 var VALID_AI_PROVIDERS = ["copilot", "ollama-cloud", "openrouter"];
-function isAIEnabled(config, cliNoAI = false) {
-  return config.aiEnabled !== false && !cliNoAI;
+function isAIEnabled(config, cliNoAI = false, globalConfig) {
+  if (cliNoAI) {
+    return false;
+  }
+  if (typeof config.aiEnabled === "boolean") {
+    return config.aiEnabled;
+  }
+  const resolvedGlobalConfig = globalConfig === undefined ? readGlobalConfig() : globalConfig;
+  if (typeof resolvedGlobalConfig?.aiEnabled === "boolean") {
+    return resolvedGlobalConfig.aiEnabled;
+  }
+  return true;
 }
 function shouldShowTips(config) {
   return config?.showTips !== false;
@@ -7458,6 +7508,13 @@ function readConfig(cwd = process.cwd()) {
     return null;
   return parseConfigFile(path);
 }
+function readGlobalConfig(baseDir = homedir()) {
+  const path = getGlobalConfigPath(baseDir);
+  if (!existsSync(path)) {
+    return null;
+  }
+  return parseGlobalConfigFile(path);
+}
 function writeConfig(config, cwd = process.cwd()) {
   const path = getConfigPath(cwd);
   const { aiHost: _aiHost, ...storedConfig } = config;
@@ -7465,6 +7522,15 @@ function writeConfig(config, cwd = process.cwd()) {
   writeFileSync(path, `${JSON.stringify(storedConfig, null, 2)}
 `, "utf-8");
 }
+function writeGlobalConfig(config, baseDir = homedir()) {
+  const path = getGlobalConfigPath(baseDir);
+  mkdirSync(dirname(path), { recursive: true, mode: 448 });
+  writeFileSync(path, `${JSON.stringify(config, null, 2)}
+`, {
+    encoding: "utf-8",
+    mode: 384
+  });
+}
 function isGitignored(cwd = process.cwd()) {
   const gitignorePath = join(cwd, ".gitignore");
   if (!existsSync(gitignorePath))
@@ -10873,19 +10939,19 @@ init_dist();
 
 // src/utils/secrets.ts
 import { chmodSync, existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync4, rmSync, writeFileSync as writeFileSync4 } from "fs";
-import { homedir } from "os";
+import { homedir as homedir2 } from "os";
 import { join as join5, resolve as resolve4 } from "path";
 var CONTRIBUTE_NOW_SECRETS_DIRNAME = ".contribute-now";
 var CONTRIBUTE_NOW_SECRETS_STORE_DIRNAME = "secrets";
 var OLLAMA_CLOUD_API_KEY = "ollama.cloud.apiKey";
 var OPENROUTER_API_KEY = "openrouter.apiKey";
-function getSecretsStorePath(baseDir = homedir()) {
+function getSecretsStorePath(baseDir = homedir2()) {
   return resolve4(baseDir, CONTRIBUTE_NOW_SECRETS_DIRNAME, CONTRIBUTE_NOW_SECRETS_STORE_DIRNAME);
 }
-function getSecretsFilePath(baseDir = homedir()) {
+function getSecretsFilePath(baseDir = homedir2()) {
   return join5(getSecretsStorePath(baseDir), "store.json");
 }
-function readSecretsStore(baseDir = homedir()) {
+function readSecretsStore(baseDir = homedir2()) {
   const filePath = getSecretsFilePath(baseDir);
   if (!existsSync5(filePath)) {
     return null;
@@ -10897,7 +10963,7 @@ function readSecretsStore(baseDir = homedir()) {
     return null;
   }
 }
-function writeSecretsStore(store, baseDir = homedir()) {
+function writeSecretsStore(store, baseDir = homedir2()) {
   const storePath = getSecretsStorePath(baseDir);
   const filePath = getSecretsFilePath(baseDir);
   mkdirSync4(storePath, { recursive: true, mode: 448 });
@@ -10911,23 +10977,23 @@ function writeSecretsStore(store, baseDir = homedir()) {
     chmodSync(filePath, 384);
   } catch {}
 }
-function hasSecretsStore(baseDir = homedir()) {
+function hasSecretsStore(baseDir = homedir2()) {
   return existsSync5(getSecretsFilePath(baseDir));
 }
-async function hasOllamaCloudApiKey(baseDir = homedir()) {
+async function hasOllamaCloudApiKey(baseDir = homedir2()) {
   return typeof readSecretsStore(baseDir)?.[OLLAMA_CLOUD_API_KEY] === "string";
 }
-async function getOllamaCloudApiKey(baseDir = homedir()) {
+async function getOllamaCloudApiKey(baseDir = homedir2()) {
   return readSecretsStore(baseDir)?.[OLLAMA_CLOUD_API_KEY] ?? null;
 }
-async function setOllamaCloudApiKey(value, baseDir = homedir()) {
+async function setOllamaCloudApiKey(value, baseDir = homedir2()) {
   const existingStore = readSecretsStore(baseDir) ?? {};
   writeSecretsStore({
     ...existingStore,
     [OLLAMA_CLOUD_API_KEY]: value
   }, baseDir);
 }
-async function deleteOllamaCloudApiKey(baseDir = homedir()) {
+async function deleteOllamaCloudApiKey(baseDir = homedir2()) {
   const existingStore = readSecretsStore(baseDir);
   if (!existingStore || !(OLLAMA_CLOUD_API_KEY in existingStore)) {
     return false;
@@ -10944,20 +11010,20 @@ async function deleteOllamaCloudApiKey(baseDir = homedir()) {
   writeSecretsStore(nextStore, baseDir);
   return true;
 }
-async function hasOpenRouterApiKey(baseDir = homedir()) {
+async function hasOpenRouterApiKey(baseDir = homedir2()) {
   return typeof readSecretsStore(baseDir)?.[OPENROUTER_API_KEY] === "string";
 }
-async function getOpenRouterApiKey(baseDir = homedir()) {
+async function getOpenRouterApiKey(baseDir = homedir2()) {
   return readSecretsStore(baseDir)?.[OPENROUTER_API_KEY] ?? null;
 }
-async function setOpenRouterApiKey(value, baseDir = homedir()) {
+async function setOpenRouterApiKey(value, baseDir = homedir2()) {
   const existingStore = readSecretsStore(baseDir) ?? {};
   writeSecretsStore({
     ...existingStore,
     [OPENROUTER_API_KEY]: value
   }, baseDir);
 }
-async function deleteOpenRouterApiKey(baseDir = homedir()) {
+async function deleteOpenRouterApiKey(baseDir = homedir2()) {
   const existingStore = readSecretsStore(baseDir);
   if (!existingStore || !(OPENROUTER_API_KEY in existingStore)) {
     return false;
@@ -11043,6 +11109,31 @@ var DEFAULT_OLLAMA_CLOUD_MODEL = "gpt-oss:120b";
 var DEFAULT_OLLAMA_CLOUD_HOST = "https://ollama.com/v1";
 var DEFAULT_OPENROUTER_MODEL = "openai/gpt-4o-mini";
 var DEFAULT_OPENROUTER_HOST = "https://openrouter.ai/api/v1";
+function resolveAIConfigFromSources(repoConfig, globalConfig) {
+  const provider = repoConfig?.aiProvider ?? globalConfig?.aiProvider ?? "copilot";
+  const useGlobalModel = !repoConfig?.aiModel && globalConfig?.aiProvider === provider;
+  const globalModel = useGlobalModel ? globalConfig?.aiModel?.trim() : undefined;
+  if (provider === "ollama-cloud") {
+    return {
+      provider,
+      providerLabel: "Ollama Cloud",
+      model: repoConfig?.aiModel?.trim() || globalModel || DEFAULT_OLLAMA_CLOUD_MODEL,
+      host: DEFAULT_OLLAMA_CLOUD_HOST
+    };
+  }
+  if (provider === "openrouter") {
+    return {
+      provider,
+      providerLabel: "OpenRouter",
+      model: repoConfig?.aiModel?.trim() || globalModel || DEFAULT_OPENROUTER_MODEL,
+      host: DEFAULT_OPENROUTER_HOST
+    };
+  }
+  return {
+    provider: "copilot",
+    providerLabel: "GitHub Copilot"
+  };
+}
 function prioritizeOllamaCloudModels(models, preferredModel = DEFAULT_OLLAMA_CLOUD_MODEL) {
   const uniqueModels = [...new Set(models.map((model) => model.trim()).filter(Boolean))];
   const sortedModels = [...uniqueModels].sort((left, right) => left.localeCompare(right));
@@ -11116,28 +11207,9 @@ function prioritizeOpenRouterModels(models, preferredModel = DEFAULT_OPENROUTER_
   return sortedModels.includes(preferredModel) ? [preferredModel, ...sortedModels.filter((model) => model !== preferredModel)] : sortedModels;
 }
 function resolveAIConfig(config) {
-  const resolvedConfig = config ?? readConfig();
-  const provider = resolvedConfig?.aiProvider ?? "copilot";
-  if (provider === "ollama-cloud") {
-    return {
-      provider,
-      providerLabel: "Ollama Cloud",
-      model: resolvedConfig?.aiModel?.trim() || DEFAULT_OLLAMA_CLOUD_MODEL,
-      host: DEFAULT_OLLAMA_CLOUD_HOST
-    };
-  }
-  if (provider === "openrouter") {
-    return {
-      provider,
-      providerLabel: "OpenRouter",
-      model: resolvedConfig?.aiModel?.trim() || DEFAULT_OPENROUTER_MODEL,
-      host: DEFAULT_OPENROUTER_HOST
-    };
-  }
-  return {
-    provider: "copilot",
-    providerLabel: "GitHub Copilot"
-  };
+  const repoConfig = config ?? readConfig();
+  const globalConfig = readGlobalConfig();
+  return resolveAIConfigFromSources(repoConfig, globalConfig);
 }
 function suppressSubprocessWarnings() {
   process.env.NODE_NO_WARNINGS = "1";
@@ -12840,6 +12912,62 @@ function buildConfigSnapshot(config, meta) {
     }
   };
 }
+function normalizeGlobalConfig(config) {
+  const normalized = {
+    aiEnabled: config.aiEnabled !== false
+  };
+  if (normalized.aiEnabled) {
+    normalized.aiProvider = config.aiProvider ?? "copilot";
+    if (normalized.aiProvider === "ollama-cloud") {
+      normalized.aiModel = (config.aiModel?.trim() || DEFAULT_OLLAMA_CLOUD_MODEL).trim();
+    } else if (normalized.aiProvider === "openrouter") {
+      normalized.aiModel = (config.aiModel?.trim() || DEFAULT_OPENROUTER_MODEL).trim();
+    }
+  }
+  return normalized;
+}
+function buildGlobalConfigSnapshot(config) {
+  const normalized = normalizeGlobalConfig(config);
+  const aiProvider = normalized.aiProvider ?? "copilot";
+  const aiEnabled = normalized.aiEnabled !== false;
+  const providerLabel = aiProvider === "ollama-cloud" ? "Ollama Cloud" : aiProvider === "openrouter" ? "OpenRouter" : "GitHub Copilot";
+  return {
+    location: getGlobalConfigPath(),
+    exists: globalConfigExists(),
+    ai: {
+      enabled: aiEnabled,
+      provider: aiProvider,
+      providerLabel,
+      model: aiEnabled ? normalized.aiModel ?? null : null
+    }
+  };
+}
+async function promptForGlobalConfigEdits(current) {
+  const normalized = normalizeGlobalConfig(current);
+  const aiEnabled = await selectBooleanValue("Global AI default", normalized.aiEnabled !== false, "Enabled", "Disabled");
+  if (!aiEnabled) {
+    return {
+      config: {
+        aiEnabled: false
+      }
+    };
+  }
+  const currentProvider = normalized.aiProvider ?? "copilot";
+  const aiProvider = await selectCurrentValue("Global AI provider", AI_PROVIDER_OPTIONS, currentProvider);
+  let aiModel;
+  if (aiProvider === "ollama-cloud") {
+    aiModel = await inputPrompt("Global Ollama Cloud model", normalized.aiModel ?? DEFAULT_OLLAMA_CLOUD_MODEL);
+  } else if (aiProvider === "openrouter") {
+    aiModel = await inputPrompt("Global OpenRouter model", normalized.aiModel ?? DEFAULT_OPENROUTER_MODEL);
+  }
+  return {
+    config: {
+      aiEnabled: true,
+      aiProvider,
+      aiModel: aiModel?.trim() || undefined
+    }
+  };
+}
 function defaultDevBranchForWorkflow(workflow) {
   return workflow === "git-flow" ? "develop" : "dev";
 }
@@ -13120,12 +13248,26 @@ function printConfigSummary(snapshot) {
     }
   }
 }
+function printGlobalConfigSummary(snapshot) {
+  info(`Global config path: ${import_picocolors10.default.bold(snapshot.location)}`);
+  info(`Global defaults file: ${import_picocolors10.default.bold(snapshot.exists ? "present" : "missing (using built-ins)")}`);
+  info(`AI default: ${import_picocolors10.default.bold(snapshot.ai.enabled ? "enabled" : "disabled")}`);
+  info(`AI provider: ${import_picocolors10.default.bold(snapshot.ai.providerLabel)}`);
+  if (snapshot.ai.model) {
+    info(`AI model: ${import_picocolors10.default.bold(snapshot.ai.model)}`);
+  }
+}
 var config_default = defineCommand({
   meta: {
     name: "config",
     description: "Inspect or edit the repo config without rerunning setup"
   },
   args: {
+    global: {
+      type: "boolean",
+      description: "Read or edit global defaults instead of repo config",
+      default: false
+    },
     json: {
       type: "boolean",
       description: "Print the active repo config as JSON with metadata",
@@ -13138,15 +13280,44 @@ var config_default = defineCommand({
     }
   },
   async run({ args }) {
-    if (!await isGitRepo()) {
-      error("Not inside a git repository.");
-      process.exit(1);
-    }
     if (args.json && args.edit) {
       error("Use either --json or --edit, not both at the same time.");
       process.exit(1);
     }
     await projectHeading("config", "\u2699\uFE0F");
+    if (args.global) {
+      const currentGlobal = readGlobalConfig() ?? {};
+      if (args.edit) {
+        try {
+          const editResult = await promptForGlobalConfigEdits(currentGlobal);
+          writeGlobalConfig(normalizeGlobalConfig(editResult.config));
+          success("Updated global defaults.");
+          const snapshot3 = buildGlobalConfigSnapshot(readGlobalConfig() ?? {});
+          printGlobalConfigSummary(snapshot3);
+          if (args.json) {
+            console.log(JSON.stringify(snapshot3, null, 2));
+          }
+          return;
+        } catch (err) {
+          error(err instanceof Error ? err.message : String(err));
+          process.exit(1);
+        }
+      }
+      const snapshot2 = buildGlobalConfigSnapshot(currentGlobal);
+      if (args.json) {
+        console.log(JSON.stringify(snapshot2, null, 2));
+        return;
+      }
+      printGlobalConfigSummary(snapshot2);
+      console.log();
+      console.log(`  ${import_picocolors10.default.dim("Run `cn config --global --edit` to update global defaults.")}`);
+      console.log();
+      return;
+    }
+    if (!await isGitRepo()) {
+      error("Not inside a git repository.");
+      process.exit(1);
+    }
     if (!configExists()) {
       error("No repo config found. Run `cn setup` first.");
       process.exit(1);
@@ -13312,7 +13483,7 @@ var import_picocolors12 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.8.0-dev.0a7f557",
+  version: "0.8.0-dev.703cd39",
   description: "Developer CLI that automates git workflows \u2014 branching, syncing, committing, and PRs \u2014 with multi-workflow and commit convention support.",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.8.0-dev.0a7f557",
+  "version": "0.8.0-dev.703cd39",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {