contribute-now 0.8.0-dev.7db6dea → 0.8.0-dev.7eaa951

package/README.md

@@ -88,7 +88,8 @@ cn setup          # short alias — even shorter than git!
 
 - **[Git](https://git-scm.com/)** — required
 - **[GitHub CLI](https://cli.github.com)** (`gh`) — recommended; required for PR creation, role detection, and merge status checks
-- **[GitHub Copilot](https://github.com/features/copilot)** — optional; enables AI features
+- **[GitHub Copilot](https://github.com/features/copilot)** — optional; one of the supported AI providers
+- **[Ollama Cloud](https://ollama.com)** or **[OpenRouter](https://openrouter.ai)** API key — optional; alternative AI providers
 
 ---
 
@@ -106,7 +107,7 @@ Steps:
 1. Choose **workflow mode** — Clean Flow, GitHub Flow, or Git Flow
 2. Choose **commit convention** — Clean Commit, Conventional Commits, or None
 3. Choose whether **AI features** should be enabled for this repo
-4. If using **Ollama Cloud**, pick from the available models returned by your API key, or enter one manually
+4. If using **Ollama Cloud** or **OpenRouter**, enter your API key; pick from the available models returned by your key, or enter one manually
 5. Detect remotes and auto-detect your **role** (maintainer or contributor)
 6. Confirm branch and remote names
 7. Write `.git/contribute-now/config.json` (or update `.contributerc.json` if that legacy file is still the active source)
@@ -127,7 +128,7 @@ cn config --json
 cn config --edit
 ```
 
-Use `--edit` to update workflow settings, branch names, commit convention, AI provider details, the stored Ollama Cloud API key, and to choose from the currently available Ollama Cloud models. Ollama Cloud uses the built-in default host and does not ask for a custom host URL.
+Use `--edit` to update workflow settings, branch names, commit convention, AI provider details, stored API keys (Ollama Cloud or OpenRouter), and to choose from the currently available models for the selected provider.
 
 ---
 
@@ -306,7 +307,7 @@ cn validate "added stuff"                   # exit 1
 
 ## AI Features
 
-All AI features are powered by **GitHub Copilot** via `@github/copilot-sdk` and are entirely **optional** — every command has a manual fallback.
+All AI features are **optional** — every command has a manual fallback. Three providers are supported: **GitHub Copilot**, **Ollama Cloud**, and **OpenRouter**.
 
 | Command | AI Feature | Fallback |
 |---------|------------|----------|
@@ -316,7 +317,17 @@ All AI features are powered by **GitHub Copilot** via `@github/copilot-sdk` and
 | `update` | Conflict resolution guidance | Standard git instructions |
 | `submit` | Generate PR title and body | `gh pr create --fill` or manual |
 
-Pass `--no-ai` to any command to skip AI entirely. Use `--model <name>` to select a specific Copilot model (e.g., `gpt-4.1`, `claude-sonnet-4`).
+Pass `--no-ai` to any command to skip AI entirely. Use `--model <name>` to select a specific model (e.g., `gpt-4.1`, `claude-sonnet-4`).
+
+### AI Providers
+
+| Provider | Auth | How it works |
+|----------|------|--------------|
+| **GitHub Copilot** *(default)* | `gh auth login` | Uses your existing GitHub/Copilot auth via the `@github/copilot-sdk` |
+| **Ollama Cloud** | API key (stored in local secrets) | OpenAI-compatible API; model list fetched from your key on setup |
+| **OpenRouter** | API key (stored in local secrets) | Unified API that routes to many model providers (OpenAI, Anthropic, Google, etc.) |
+
+Select your provider during `cn setup` or change it later with `cn config --edit`. API keys for Ollama Cloud and OpenRouter are stored as plain JSON in `~/.contribute-now/secrets/store.json` with file permissions restricted to the current user (mode 0600) — never in the plain config file.
 
 ---
 

package/dist/cli.js

@@ -7206,7 +7206,7 @@ function configExists(cwd = process.cwd()) {
 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"];
+var VALID_AI_PROVIDERS = ["copilot", "ollama-cloud", "openrouter"];
 function isAIEnabled(config, cliNoAI = false) {
   return config.aiEnabled !== false && !cliNoAI;
 }
@@ -10624,6 +10624,7 @@ 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()) {
   return resolve4(baseDir, CONTRIBUTE_NOW_SECRETS_DIRNAME, CONTRIBUTE_NOW_SECRETS_STORE_DIRNAME);
 }
@@ -10689,6 +10690,36 @@ async function deleteOllamaCloudApiKey(baseDir = homedir()) {
   writeSecretsStore(nextStore, baseDir);
   return true;
 }
+async function hasOpenRouterApiKey(baseDir = homedir()) {
+  return typeof readSecretsStore(baseDir)?.[OPENROUTER_API_KEY] === "string";
+}
+async function getOpenRouterApiKey(baseDir = homedir()) {
+  return readSecretsStore(baseDir)?.[OPENROUTER_API_KEY] ?? null;
+}
+async function setOpenRouterApiKey(value, baseDir = homedir()) {
+  const existingStore = readSecretsStore(baseDir) ?? {};
+  writeSecretsStore({
+    ...existingStore,
+    [OPENROUTER_API_KEY]: value
+  }, baseDir);
+}
+async function deleteOpenRouterApiKey(baseDir = homedir()) {
+  const existingStore = readSecretsStore(baseDir);
+  if (!existingStore || !(OPENROUTER_API_KEY in existingStore)) {
+    return false;
+  }
+  const nextStore = { ...existingStore };
+  delete nextStore[OPENROUTER_API_KEY];
+  if (Object.keys(nextStore).length === 0) {
+    try {
+      rmSync(getSecretsFilePath(baseDir), { force: true });
+      rmSync(getSecretsStorePath(baseDir), { recursive: true, force: true });
+    } catch {}
+    return true;
+  }
+  writeSecretsStore(nextStore, baseDir);
+  return true;
+}
 
 // src/utils/copilot.ts
 var CONVENTIONAL_COMMIT_SYSTEM_PROMPT = `Git commit message generator. Format: <type>[!][(<scope>)]: <description>
@@ -10756,6 +10787,8 @@ Rules: title concise present tense, describes the PR theme not individual commit
 var CONFLICT_RESOLUTION_SYSTEM_PROMPT = `Git merge conflict advisor. Explain each side, suggest resolution strategy. Never auto-resolve \u2014 guidance only. Be concise and actionable.`;
 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 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));
@@ -10763,7 +10796,9 @@ function prioritizeOllamaCloudModels(models, preferredModel = DEFAULT_OLLAMA_CLO
 }
 function extractOllamaCloudModelIds(payload) {
   const records = typeof payload === "object" && payload !== null ? Array.isArray(payload.data) ? payload.data : Array.isArray(payload.models) ? payload.models : [] : [];
-  return [...new Set(records.map(getOllamaCloudModelId).filter(Boolean))].sort((left, right) => left.localeCompare(right));
+  return [
+    ...new Set(records.map(getOllamaCloudModelId).filter((id) => id !== null))
+  ].sort((left, right) => left.localeCompare(right));
 }
 function getOllamaCloudModelId(record) {
   if (typeof record !== "object" || record === null) {
@@ -10792,6 +10827,40 @@ function normalizeOllamaCloudHost(host) {
   const trimmed = (host?.trim() || DEFAULT_OLLAMA_CLOUD_HOST).replace(/\/+$/, "");
   return trimmed.endsWith("/v1") ? trimmed : `${trimmed}/v1`;
 }
+function extractOpenRouterModelIds(payload) {
+  const records = typeof payload === "object" && payload !== null ? Array.isArray(payload.data) ? payload.data : [] : [];
+  return [
+    ...new Set(records.map(getOpenRouterModelId).filter((id) => id !== null))
+  ].sort((left, right) => left.localeCompare(right));
+}
+function getOpenRouterModelId(record) {
+  if (typeof record !== "object" || record === null) {
+    return null;
+  }
+  const candidate = typeof record.id === "string" ? record.id : null;
+  const normalized = candidate?.trim();
+  return normalized ? normalized : null;
+}
+async function fetchOpenRouterModels(apiKey) {
+  const response = await fetch(`${DEFAULT_OPENROUTER_HOST}/models`, {
+    headers: {
+      Accept: "application/json",
+      Authorization: `Bearer ${apiKey}`
+    }
+  });
+  if (!response.ok) {
+    if (response.status === 401 || response.status === 403) {
+      throw new Error("OpenRouter authentication failed");
+    }
+    throw new Error(`OpenRouter model lookup failed (${response.status} ${response.statusText})`);
+  }
+  return extractOpenRouterModelIds(await response.json());
+}
+function prioritizeOpenRouterModels(models, preferredModel = DEFAULT_OPENROUTER_MODEL) {
+  const uniqueModels = [...new Set(models.map((model) => model.trim()).filter(Boolean))];
+  const sortedModels = [...uniqueModels].sort((left, right) => left.localeCompare(right));
+  return sortedModels.includes(preferredModel) ? [preferredModel, ...sortedModels.filter((model) => model !== preferredModel)] : sortedModels;
+}
 function resolveAIConfig(config) {
   const resolvedConfig = config ?? readConfig();
   const provider = resolvedConfig?.aiProvider ?? "copilot";
@@ -10803,6 +10872,14 @@ function resolveAIConfig(config) {
       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"
@@ -10996,6 +11073,28 @@ async function checkCopilotAvailable2() {
       return `Could not reach Ollama Cloud API: ${msg}`;
     }
   }
+  if (aiConfig.provider === "openrouter") {
+    if (!await hasOpenRouterApiKey()) {
+      return "OpenRouter API key not found. Run `cn setup` to save it.";
+    }
+    try {
+      const apiKey = await getOpenRouterApiKey();
+      if (!apiKey) {
+        return "OpenRouter API key not found. Run `cn setup` to save it.";
+      }
+      await fetchOpenRouterModels(apiKey);
+      return null;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg === "OpenRouter authentication failed") {
+        return "OpenRouter authentication failed. Update your saved API key with `cn setup`.";
+      }
+      if (msg.startsWith("OpenRouter model lookup failed")) {
+        return msg.replace("model lookup", "health check");
+      }
+      return `Could not reach OpenRouter API: ${msg}`;
+    }
+  }
   try {
     const client = await getManagedClient();
     try {
@@ -11097,11 +11196,54 @@ async function callOllamaCloud(systemMessage, userMessage, model, timeoutMs = CO
     clearTimeout(timer);
   }
 }
+async function callOpenRouter(systemMessage, userMessage, model, timeoutMs = COPILOT_TIMEOUT_MS) {
+  const aiConfig = resolveAIConfig();
+  const apiKey = await getOpenRouterApiKey();
+  if (!apiKey) {
+    throw new Error("OpenRouter API key is not configured");
+  }
+  const controller = new AbortController;
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(`${DEFAULT_OPENROUTER_HOST}/chat/completions`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+        "Content-Type": "application/json",
+        "HTTP-Referer": "https://github.com/warengonzaga/contribute-now",
+        "X-Title": "contribute-now"
+      },
+      body: JSON.stringify({
+        model: model?.trim() || aiConfig.model || DEFAULT_OPENROUTER_MODEL,
+        messages: [
+          { role: "system", content: systemMessage },
+          { role: "user", content: userMessage }
+        ],
+        stream: false
+      }),
+      signal: controller.signal
+    });
+    if (!response.ok) {
+      const body = await response.text();
+      if (response.status === 401 || response.status === 403) {
+        throw new Error("OpenRouter authentication failed");
+      }
+      throw new Error(`OpenRouter request failed (${response.status} ${response.statusText}): ${body.slice(0, 200)}`);
+    }
+    const data = await response.json();
+    return data.choices?.[0]?.message?.content?.trim() || null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
 async function callAI(systemMessage, userMessage, model, timeoutMs = COPILOT_TIMEOUT_MS) {
   const aiConfig = resolveAIConfig();
   if (aiConfig.provider === "ollama-cloud") {
     return callOllamaCloud(systemMessage, userMessage, model, timeoutMs);
   }
+  if (aiConfig.provider === "openrouter") {
+    return callOpenRouter(systemMessage, userMessage, model, timeoutMs);
+  }
   return callCopilot(systemMessage, userMessage, model, timeoutMs);
 }
 function getCommitSystemPrompt(convention) {
@@ -11992,116 +12134,8 @@ ${import_picocolors8.default.bold("Stale branches (remote deleted, likely squash
   }
 });
 
-// src/commands/discard.ts
-var import_picocolors9 = __toESM(require_picocolors(), 1);
-var discard_default = defineCommand({
-  meta: {
-    name: "discard",
-    description: "Discard the current feature branch and return to the base branch"
-  },
-  args: {
-    force: {
-      type: "boolean",
-      alias: "f",
-      description: "Skip confirmation and discard immediately",
-      default: false
-    }
-  },
-  async run({ args }) {
-    if (!await isGitRepo()) {
-      error("Not inside a git repository.");
-      process.exit(1);
-    }
-    await assertCleanGitState("discarding a branch");
-    const config = readConfig();
-    if (!config) {
-      error("No repo config found. Run `cn setup` first.");
-      process.exit(1);
-    }
-    const currentBranch = await getCurrentBranch();
-    const baseBranch = getBaseBranch(config);
-    await projectHeading("discard", "\uD83D\uDDD1\uFE0F");
-    if (isBranchProtected(currentBranch, config)) {
-      error(`${import_picocolors9.default.bold(currentBranch)} is a protected branch and cannot be discarded.`);
-      info(`Switch to a feature branch first, then run ${import_picocolors9.default.bold("cn discard")}.`);
-      process.exit(1);
-    }
-    if (currentBranch === baseBranch) {
-      info(`You are already on ${import_picocolors9.default.bold(baseBranch)}.`);
-      process.exit(0);
-    }
-    const { origin } = config;
-    const localWork = await hasLocalWork(origin, currentBranch);
-    const hasWork = localWork.uncommitted || localWork.unpushedCommits > 0;
-    if (hasWork) {
-      if (localWork.uncommitted) {
-        warn("You have uncommitted changes in your working tree.");
-      }
-      if (localWork.unpushedCommits > 0) {
-        warn(`You have ${import_picocolors9.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on this branch.`);
-      }
-      warn("Discarding this branch will permanently lose that work.");
-      const SAVE_FIRST = "Save my changes first (cn save), then discard";
-      const DISCARD_ANYWAY = "Discard anyway \u2014 I do not need this work";
-      const CANCEL = "Keep the branch, take me back";
-      const action = await selectPrompt("This branch has unsaved work. What would you like to do?", [SAVE_FIRST, DISCARD_ANYWAY, CANCEL]);
-      if (action === CANCEL) {
-        info("Discard cancelled. Your branch is untouched.");
-        process.exit(0);
-      }
-      if (action === SAVE_FIRST) {
-        if (!localWork.uncommitted) {
-          info("No uncommitted changes to stash \u2014 unpushed commits will still be lost.");
-          const confirm = await confirmPrompt("Continue discarding the branch?");
-          if (!confirm) {
-            info("Discard cancelled.");
-            process.exit(0);
-          }
-        } else {
-          const stashResult = await stashChanges(`work-in-progress on ${currentBranch}`);
-          if (stashResult.exitCode !== 0) {
-            error(`Failed to save changes: ${stashResult.stderr}`);
-            process.exit(1);
-          }
-          success(`Changes saved. Use ${import_picocolors9.default.bold("cn save --restore")} to bring them back.`);
-        }
-      }
-    } else if (!args.force) {
-      const confirmed = await confirmPrompt(`Discard ${import_picocolors9.default.bold(currentBranch)} and return to ${import_picocolors9.default.bold(baseBranch)}?`);
-      if (!confirmed) {
-        info("Discard cancelled.");
-        process.exit(0);
-      }
-    }
-    const upstreamRef = await getUpstreamRef();
-    let deleteRemote = false;
-    if (upstreamRef) {
-      deleteRemote = await confirmPrompt(`Also delete the remote branch ${import_picocolors9.default.bold(upstreamRef)}?`);
-    }
-    const checkoutResult = await checkoutBranch(baseBranch);
-    if (checkoutResult.exitCode !== 0) {
-      error(`Failed to switch to ${import_picocolors9.default.bold(baseBranch)}: ${checkoutResult.stderr}`);
-      process.exit(1);
-    }
-    const deleteResult = await forceDeleteBranch(currentBranch);
-    if (deleteResult.exitCode !== 0) {
-      error(`Failed to delete branch ${import_picocolors9.default.bold(currentBranch)}: ${deleteResult.stderr}`);
-      process.exit(1);
-    }
-    success(`Discarded ${import_picocolors9.default.bold(currentBranch)} and switched back to ${import_picocolors9.default.bold(baseBranch)}`);
-    if (deleteRemote) {
-      const remoteDeleteResult = await deleteRemoteBranch(origin, currentBranch);
-      if (remoteDeleteResult.exitCode !== 0) {
-        warn(`Could not delete remote branch: ${remoteDeleteResult.stderr.trim()}`);
-      } else {
-        success(`Deleted remote branch ${import_picocolors9.default.bold(`${origin}/${currentBranch}`)}`);
-      }
-    }
-  }
-});
-
 // src/commands/commit.ts
-var import_picocolors10 = __toESM(require_picocolors(), 1);
+var import_picocolors9 = __toESM(require_picocolors(), 1);
 
 // src/utils/convention.ts
 var CLEAN_COMMIT_PATTERN = /^(\uD83D\uDCE6|\uD83D\uDD27|\uD83D\uDDD1\uFE0F?|\uD83D\uDD12|\u2699\uFE0F?|\u2615|\uD83E\uDDEA|\uD83D\uDCD6|\uD83D\uDE80) (new|update|remove|security|setup|chore|test|docs|release)(!?)( \([a-zA-Z0-9][a-zA-Z0-9-]*\))?: .{1,72}$/u;
@@ -12208,9 +12242,9 @@ var commit_default = defineCommand({
         process.exit(1);
       }
       console.log(`
-${import_picocolors10.default.bold("Changed files:")}`);
+${import_picocolors9.default.bold("Changed files:")}`);
       for (const f3 of changedFiles) {
-        console.log(`  ${import_picocolors10.default.dim("\u2022")} ${f3}`);
+        console.log(`  ${import_picocolors9.default.dim("\u2022")} ${f3}`);
       }
       const stageAction = await selectPrompt("No staged changes. How would you like to stage?", [
         "Stage all changes",
@@ -12252,8 +12286,8 @@ ${import_picocolors10.default.bold("Changed files:")}`);
       const dirs = new Set(stagedFiles.map((f3) => f3.split("/")[0]));
       if (dirs.size > 1) {
         console.log();
-        warn(`You're staging ${import_picocolors10.default.bold(String(stagedFiles.length))} files across ${import_picocolors10.default.bold(String(dirs.size))} directories in a single commit.`);
-        info(import_picocolors10.default.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
+        warn(`You're staging ${import_picocolors9.default.bold(String(stagedFiles.length))} files across ${import_picocolors9.default.bold(String(dirs.size))} directories in a single commit.`);
+        info(import_picocolors9.default.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
         const choice = await selectPrompt("How would you like to proceed?", [
           "Continue as single commit",
           "Switch to group mode (AI splits into atomic commits)",
@@ -12284,7 +12318,7 @@ ${import_picocolors10.default.bold("Changed files:")}`);
         if (commitMessage) {
           spinner.success("AI commit message generated.");
           console.log(`
-  ${import_picocolors10.default.dim("AI suggestion:")} ${import_picocolors10.default.bold(import_picocolors10.default.cyan(commitMessage))}`);
+  ${import_picocolors9.default.dim("AI suggestion:")} ${import_picocolors9.default.bold(import_picocolors9.default.cyan(commitMessage))}`);
         } else {
           spinner.fail("AI did not return a commit message.");
           warn("Falling back to manual entry.");
@@ -12312,7 +12346,7 @@ ${import_picocolors10.default.bold("Changed files:")}`);
         if (regen) {
           spinner.success("Commit message regenerated.");
           console.log(`
-  ${import_picocolors10.default.dim("AI suggestion:")} ${import_picocolors10.default.bold(import_picocolors10.default.cyan(regen))}`);
+  ${import_picocolors9.default.dim("AI suggestion:")} ${import_picocolors9.default.bold(import_picocolors9.default.cyan(regen))}`);
           const ok = await confirmPrompt("Use this message?");
           finalMessage = ok ? regen : await inputPrompt("Enter commit message manually");
         } else {
@@ -12327,7 +12361,7 @@ ${import_picocolors10.default.bold("Changed files:")}`);
       if (convention2 !== "none") {
         console.log();
         for (const hint of CONVENTION_FORMAT_HINTS[convention2]) {
-          console.log(import_picocolors10.default.dim(hint));
+          console.log(import_picocolors9.default.dim(hint));
         }
         console.log();
       }
@@ -12351,7 +12385,7 @@ ${import_picocolors10.default.bold("Changed files:")}`);
       error(`Failed to commit: ${result.stderr}`);
       process.exit(1);
     }
-    success(`Committed: ${import_picocolors10.default.bold(finalMessage)}`);
+    success(`Committed: ${import_picocolors9.default.bold(finalMessage)}`);
   }
 });
 async function runGroupCommit(model, config) {
@@ -12368,9 +12402,9 @@ async function runGroupCommit(model, config) {
     process.exit(1);
   }
   console.log(`
-${import_picocolors10.default.bold("Changed files:")}`);
+${import_picocolors9.default.bold("Changed files:")}`);
   for (const f3 of changedFiles) {
-    console.log(`  ${import_picocolors10.default.dim("\u2022")} ${f3}`);
+    console.log(`  ${import_picocolors9.default.dim("\u2022")} ${f3}`);
   }
   const spinner = createSpinner(changedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD ? `Asking AI to group ${changedFiles.length} file(s) into logical commits (using optimized batching)...` : `Asking AI to group ${changedFiles.length} file(s) into logical commits...`, {
     tips: LOADING_TIPS
@@ -12416,13 +12450,13 @@ ${import_picocolors10.default.bold("Changed files:")}`);
   let commitAll = false;
   while (!proceedToCommit) {
     console.log(`
-${import_picocolors10.default.bold(`AI suggested ${validGroups.length} commit group(s):`)}
+${import_picocolors9.default.bold(`AI suggested ${validGroups.length} commit group(s):`)}
 `);
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const g3 = validGroups[i2];
-      console.log(`  ${import_picocolors10.default.cyan(`Group ${i2 + 1}:`)} ${import_picocolors10.default.bold(g3.message)}`);
+      console.log(`  ${import_picocolors9.default.cyan(`Group ${i2 + 1}:`)} ${import_picocolors9.default.bold(g3.message)}`);
       for (const f3 of g3.files) {
-        console.log(`    ${import_picocolors10.default.dim("\u2022")} ${f3}`);
+        console.log(`    ${import_picocolors9.default.dim("\u2022")} ${f3}`);
       }
       console.log();
     }
@@ -12488,16 +12522,16 @@ ${import_picocolors10.default.bold(`AI suggested ${validGroups.length} commit gr
         continue;
       }
       committed++;
-      success(`Committed group ${i2 + 1}: ${import_picocolors10.default.bold(group.message)}`);
+      success(`Committed group ${i2 + 1}: ${import_picocolors9.default.bold(group.message)}`);
     }
   } else {
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const group = validGroups[i2];
-      console.log(import_picocolors10.default.bold(`
+      console.log(import_picocolors9.default.bold(`
 \u2500\u2500 Group ${i2 + 1}/${validGroups.length} \u2500\u2500`));
-      console.log(`  ${import_picocolors10.default.cyan(group.message)}`);
+      console.log(`  ${import_picocolors9.default.cyan(group.message)}`);
       for (const f3 of group.files) {
-        console.log(`  ${import_picocolors10.default.dim("\u2022")} ${f3}`);
+        console.log(`  ${import_picocolors9.default.dim("\u2022")} ${f3}`);
       }
       let message = group.message;
       let actionDone = false;
@@ -12521,7 +12555,7 @@ ${import_picocolors10.default.bold(`AI suggested ${validGroups.length} commit gr
           if (newMsg) {
             message = newMsg;
             group.message = newMsg;
-            regenSpinner.success(`New message: ${import_picocolors10.default.bold(message)}`);
+            regenSpinner.success(`New message: ${import_picocolors9.default.bold(message)}`);
           } else {
             regenSpinner.fail("AI could not generate a new message. Keeping current one.");
           }
@@ -12584,7 +12618,7 @@ ${import_picocolors10.default.bold(`AI suggested ${validGroups.length} commit gr
           continue;
         }
         committed++;
-        success(`Committed group ${i2 + 1}: ${import_picocolors10.default.bold(message)}`);
+        success(`Committed group ${i2 + 1}: ${import_picocolors9.default.bold(message)}`);
         actionDone = true;
       }
     }
@@ -12599,7 +12633,7 @@ ${import_picocolors10.default.bold(`AI suggested ${validGroups.length} commit gr
 }
 
 // src/commands/config.ts
-var import_picocolors11 = __toESM(require_picocolors(), 1);
+var import_picocolors10 = __toESM(require_picocolors(), 1);
 var WORKFLOW_OPTIONS = [
   { value: "clean-flow", label: WORKFLOW_DESCRIPTIONS["clean-flow"] },
   { value: "github-flow", label: WORKFLOW_DESCRIPTIONS["github-flow"] },
@@ -12616,7 +12650,8 @@ var CONVENTION_OPTIONS = [
 ];
 var AI_PROVIDER_OPTIONS = [
   { value: "copilot", label: "GitHub Copilot" },
-  { value: "ollama-cloud", label: "Ollama Cloud" }
+  { value: "ollama-cloud", label: "Ollama Cloud" },
+  { value: "openrouter", label: "OpenRouter" }
 ];
 function parseBranchPrefixesInput(input, fallback) {
   const values = input.split(",").map((value) => value.trim()).filter(Boolean);
@@ -12650,6 +12685,10 @@ function finalizeEditedConfig(current, draft) {
     next.aiModel = (draft.aiModel?.trim() || DEFAULT_OLLAMA_CLOUD_MODEL).trim();
     return next;
   }
+  if (next.aiProvider === "openrouter") {
+    next.aiModel = (draft.aiModel?.trim() || DEFAULT_OPENROUTER_MODEL).trim();
+    return next;
+  }
   delete next.aiModel;
   return next;
 }
@@ -12657,6 +12696,8 @@ function buildConfigSnapshot(config, meta) {
   const aiConfig = resolveAIConfig(config);
   const aiEnabled = isAIEnabled(config);
   const usingOllamaCloud = aiEnabled && aiConfig.provider === "ollama-cloud";
+  const usingOpenRouter = aiEnabled && aiConfig.provider === "openrouter";
+  const needsSecretInfo = usingOllamaCloud || usingOpenRouter;
   return {
     source: meta.source,
     location: meta.location,
@@ -12677,7 +12718,8 @@ function buildConfigSnapshot(config, meta) {
       providerLabel: aiEnabled ? aiConfig.providerLabel : null,
       model: aiEnabled ? aiConfig.model ?? null : null,
       ollamaCloudApiKeyPresent: usingOllamaCloud ? meta.hasOllamaCloudApiKey : null,
-      secretsPath: usingOllamaCloud ? meta.secretsPath : null
+      openrouterApiKeyPresent: usingOpenRouter ? meta.hasOpenRouterApiKey : null,
+      secretsPath: needsSecretInfo ? meta.secretsPath : null
     }
   };
 }
@@ -12714,6 +12756,36 @@ async function promptForOllamaCloudModelSelection(apiKey, fallbackModel) {
   }
   return inputPrompt("Ollama Cloud model", fallbackModel);
 }
+async function promptForOpenRouterModelSelection(apiKey, fallbackModel) {
+  if (apiKey) {
+    try {
+      info("Fetching available OpenRouter models...");
+      const models = prioritizeOpenRouterModels(await fetchOpenRouterModels(apiKey));
+      if (models.length > 0) {
+        const manualChoice = "Enter model manually";
+        const choices = models.map((model) => ({
+          value: model,
+          label: model === DEFAULT_OPENROUTER_MODEL ? `${model} (default)` : model
+        }));
+        const selected = await selectPrompt("OpenRouter model", [
+          ...choices.map((choice) => choice.label),
+          manualChoice
+        ]);
+        if (selected !== manualChoice) {
+          return choices.find((choice) => choice.label === selected)?.value ?? fallbackModel;
+        }
+      } else {
+        warn("OpenRouter returned no available models. Enter the model name manually.");
+      }
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      warn(`Could not fetch OpenRouter models: ${message}`);
+    }
+  } else {
+    warn("No OpenRouter API key is available yet, so the model list cannot be fetched.");
+  }
+  return inputPrompt("OpenRouter model", fallbackModel);
+}
 async function selectCurrentValue(message, options, current) {
   const choices = options.map((option) => ({
     value: option.value,
@@ -12728,7 +12800,7 @@ async function selectBooleanValue(message, current, trueLabel, falseLabel) {
     { value: "false", label: falseLabel }
   ], current ? "true" : "false").then((value) => value === "true");
 }
-async function promptForConfigEdits(current, hasExistingOllamaApiKey) {
+async function promptForConfigEdits(current, hasExistingOllamaApiKey, hasExistingOpenRouterApiKey) {
   const workflow = await selectCurrentValue("Workflow mode", WORKFLOW_OPTIONS, current.workflow);
   const role = await selectCurrentValue("Your role in this clone", ROLE_OPTIONS, current.role);
   const mainBranch = await inputPrompt("Main branch name", current.mainBranch);
@@ -12749,6 +12821,8 @@ async function promptForConfigEdits(current, hasExistingOllamaApiKey) {
   let aiModel;
   let ollamaApiKeyAction = "keep";
   let ollamaApiKey;
+  let openrouterApiKeyAction = "keep";
+  let openrouterApiKey;
   if (aiEnabled) {
     const currentProvider = current.aiProvider ?? "copilot";
     aiProvider = await selectCurrentValue("AI provider", AI_PROVIDER_OPTIONS, currentProvider);
@@ -12780,16 +12854,72 @@ async function promptForConfigEdits(current, hasExistingOllamaApiKey) {
       }
       const modelLookupApiKey = ollamaApiKeyAction === "set" ? ollamaApiKey ?? null : ollamaApiKeyAction === "keep" ? await getOllamaCloudApiKey() : null;
       aiModel = await promptForOllamaCloudModelSelection(modelLookupApiKey, current.aiProvider === "ollama-cloud" ? current.aiModel ?? DEFAULT_OLLAMA_CLOUD_MODEL : DEFAULT_OLLAMA_CLOUD_MODEL);
-    } else if (hasExistingOllamaApiKey) {
-      const shouldDeleteStoredKey = await confirmPrompt("Delete the stored Ollama Cloud API key from the local secrets store?");
+      if (hasExistingOpenRouterApiKey) {
+        const shouldDeleteOpenRouterKey = await confirmPrompt("Delete the stored OpenRouter API key from the local secrets store?");
+        if (shouldDeleteOpenRouterKey) {
+          openrouterApiKeyAction = "delete";
+        }
+      }
+    } else if (aiProvider === "openrouter") {
+      if (hasExistingOpenRouterApiKey) {
+        const apiKeyChoice = await selectPrompt("OpenRouter API key", [
+          "Keep existing stored key",
+          "Replace stored key",
+          "Delete stored key"
+        ]);
+        if (apiKeyChoice === "Replace stored key") {
+          openrouterApiKey = (await passwordPrompt("Enter the new OpenRouter API key")).trim();
+          if (!openrouterApiKey) {
+            throw new Error("OpenRouter API key cannot be empty when replacing the stored key.");
+          }
+          openrouterApiKeyAction = "set";
+        } else if (apiKeyChoice === "Delete stored key") {
+          openrouterApiKeyAction = "delete";
+        }
+      } else {
+        const addApiKey = await confirmPrompt("No OpenRouter API key is stored. Add one now?");
+        if (addApiKey) {
+          openrouterApiKey = (await passwordPrompt("Enter your OpenRouter API key")).trim();
+          if (!openrouterApiKey) {
+            throw new Error("OpenRouter API key cannot be empty when enabling OpenRouter.");
+          }
+          openrouterApiKeyAction = "set";
+        }
+      }
+      const modelLookupApiKey = openrouterApiKeyAction === "set" ? openrouterApiKey ?? null : openrouterApiKeyAction === "keep" ? await getOpenRouterApiKey() : null;
+      aiModel = await promptForOpenRouterModelSelection(modelLookupApiKey, current.aiProvider === "openrouter" ? current.aiModel ?? DEFAULT_OPENROUTER_MODEL : DEFAULT_OPENROUTER_MODEL);
+      if (hasExistingOllamaApiKey) {
+        const shouldDeleteStoredKey = await confirmPrompt("Delete the stored Ollama Cloud API key from the local secrets store?");
+        if (shouldDeleteStoredKey) {
+          ollamaApiKeyAction = "delete";
+        }
+      }
+    } else {
+      if (hasExistingOllamaApiKey) {
+        const shouldDeleteStoredKey = await confirmPrompt("Delete the stored Ollama Cloud API key from the local secrets store?");
+        if (shouldDeleteStoredKey) {
+          ollamaApiKeyAction = "delete";
+        }
+      }
+      if (hasExistingOpenRouterApiKey) {
+        const shouldDeleteOpenRouterKey = await confirmPrompt("Delete the stored OpenRouter API key from the local secrets store?");
+        if (shouldDeleteOpenRouterKey) {
+          openrouterApiKeyAction = "delete";
+        }
+      }
+    }
+  } else {
+    if (hasExistingOllamaApiKey) {
+      const shouldDeleteStoredKey = await confirmPrompt("AI is disabled. Delete the stored Ollama Cloud API key from the local secrets store?");
       if (shouldDeleteStoredKey) {
         ollamaApiKeyAction = "delete";
       }
     }
-  } else if (hasExistingOllamaApiKey) {
-    const shouldDeleteStoredKey = await confirmPrompt("AI is disabled. Delete the stored Ollama Cloud API key from the local secrets store?");
-    if (shouldDeleteStoredKey) {
-      ollamaApiKeyAction = "delete";
+    if (hasExistingOpenRouterApiKey) {
+      const shouldDeleteOpenRouterKey = await confirmPrompt("AI is disabled. Delete the stored OpenRouter API key from the local secrets store?");
+      if (shouldDeleteOpenRouterKey) {
+        openrouterApiKeyAction = "delete";
+      }
     }
   }
   return {
@@ -12808,17 +12938,17 @@ async function promptForConfigEdits(current, hasExistingOllamaApiKey) {
       showTips
     }),
     ollamaApiKeyAction,
-    ollamaApiKey
+    ollamaApiKey,
+    openrouterApiKeyAction,
+    openrouterApiKey
   };
 }
-async function applyOllamaApiKeyEdit(result) {
+async function applyApiKeyEdits(result) {
   if (result.ollamaApiKeyAction === "set" && result.ollamaApiKey) {
     await setOllamaCloudApiKey(result.ollamaApiKey);
     success("Stored Ollama Cloud API key in the local secrets store.");
-    info(`Secrets path: ${import_picocolors11.default.bold(getSecretsStorePath())}`);
-    return;
-  }
-  if (result.ollamaApiKeyAction === "delete") {
+    info(`Secrets path: ${import_picocolors10.default.bold(getSecretsStorePath())}`);
+  } else if (result.ollamaApiKeyAction === "delete") {
     const deleted = await deleteOllamaCloudApiKey();
     if (deleted) {
       success("Deleted stored Ollama Cloud API key.");
@@ -12826,31 +12956,49 @@ async function applyOllamaApiKeyEdit(result) {
       info("No stored Ollama Cloud API key was found to delete.");
     }
   }
+  if (result.openrouterApiKeyAction === "set" && result.openrouterApiKey) {
+    await setOpenRouterApiKey(result.openrouterApiKey);
+    success("Stored OpenRouter API key in the local secrets store.");
+    info(`Secrets path: ${import_picocolors10.default.bold(getSecretsStorePath())}`);
+  } else if (result.openrouterApiKeyAction === "delete") {
+    const deleted = await deleteOpenRouterApiKey();
+    if (deleted) {
+      success("Deleted stored OpenRouter API key.");
+    } else {
+      info("No stored OpenRouter API key was found to delete.");
+    }
+  }
 }
 function printConfigSummary(snapshot) {
-  info(`Config source: ${import_picocolors11.default.bold(snapshot.source)}`);
-  info(`Config path: ${import_picocolors11.default.bold(snapshot.location)}`);
-  info(`Workflow: ${import_picocolors11.default.bold(snapshot.workflowLabel)}`);
-  info(`Convention: ${import_picocolors11.default.bold(snapshot.commitConventionLabel)}`);
-  info(`Role: ${import_picocolors11.default.bold(snapshot.role)}`);
+  info(`Config source: ${import_picocolors10.default.bold(snapshot.source)}`);
+  info(`Config path: ${import_picocolors10.default.bold(snapshot.location)}`);
+  info(`Workflow: ${import_picocolors10.default.bold(snapshot.workflowLabel)}`);
+  info(`Convention: ${import_picocolors10.default.bold(snapshot.commitConventionLabel)}`);
+  info(`Role: ${import_picocolors10.default.bold(snapshot.role)}`);
   if (snapshot.devBranch) {
-    info(`Main: ${import_picocolors11.default.bold(snapshot.mainBranch)} | Dev: ${import_picocolors11.default.bold(snapshot.devBranch)}`);
+    info(`Main: ${import_picocolors10.default.bold(snapshot.mainBranch)} | Dev: ${import_picocolors10.default.bold(snapshot.devBranch)}`);
   } else {
-    info(`Main: ${import_picocolors11.default.bold(snapshot.mainBranch)}`);
+    info(`Main: ${import_picocolors10.default.bold(snapshot.mainBranch)}`);
   }
-  info(`Origin: ${import_picocolors11.default.bold(snapshot.origin)} | Upstream: ${import_picocolors11.default.bold(snapshot.upstream)}`);
-  info(`Branch prefixes: ${import_picocolors11.default.bold(snapshot.branchPrefixes.join(", "))}`);
-  info(`Guides: ${import_picocolors11.default.bold(snapshot.showTips ? "shown" : "hidden")}`);
-  info(`AI: ${import_picocolors11.default.bold(snapshot.ai.enabled ? "enabled" : "disabled")}`);
+  info(`Origin: ${import_picocolors10.default.bold(snapshot.origin)} | Upstream: ${import_picocolors10.default.bold(snapshot.upstream)}`);
+  info(`Branch prefixes: ${import_picocolors10.default.bold(snapshot.branchPrefixes.join(", "))}`);
+  info(`Guides: ${import_picocolors10.default.bold(snapshot.showTips ? "shown" : "hidden")}`);
+  info(`AI: ${import_picocolors10.default.bold(snapshot.ai.enabled ? "enabled" : "disabled")}`);
   if (snapshot.ai.enabled && snapshot.ai.providerLabel) {
-    info(`AI provider: ${import_picocolors11.default.bold(snapshot.ai.providerLabel)}`);
+    info(`AI provider: ${import_picocolors10.default.bold(snapshot.ai.providerLabel)}`);
     if (snapshot.ai.model) {
-      info(`AI model: ${import_picocolors11.default.bold(snapshot.ai.model)}`);
+      info(`AI model: ${import_picocolors10.default.bold(snapshot.ai.model)}`);
     }
     if (snapshot.ai.provider === "ollama-cloud") {
-      info(`Ollama Cloud API key: ${import_picocolors11.default.bold(snapshot.ai.ollamaCloudApiKeyPresent ? "stored" : "missing")}`);
+      info(`Ollama Cloud API key: ${import_picocolors10.default.bold(snapshot.ai.ollamaCloudApiKeyPresent ? "stored" : "missing")}`);
+      if (snapshot.ai.secretsPath) {
+        info(`Secrets path: ${import_picocolors10.default.bold(snapshot.ai.secretsPath)}`);
+      }
+    }
+    if (snapshot.ai.provider === "openrouter") {
+      info(`OpenRouter API key: ${import_picocolors10.default.bold(snapshot.ai.openrouterApiKeyPresent ? "stored" : "missing")}`);
       if (snapshot.ai.secretsPath) {
-        info(`Secrets path: ${import_picocolors11.default.bold(snapshot.ai.secretsPath)}`);
+        info(`Secrets path: ${import_picocolors10.default.bold(snapshot.ai.secretsPath)}`);
       }
     }
   }
@@ -12898,14 +13046,15 @@ var config_default = defineCommand({
     }
     if (args.edit) {
       try {
-        const editResult = await promptForConfigEdits(config, await hasOllamaCloudApiKey());
+        const editResult = await promptForConfigEdits(config, await hasOllamaCloudApiKey(), await hasOpenRouterApiKey());
         writeConfig(editResult.config);
-        await applyOllamaApiKeyEdit(editResult);
+        await applyApiKeyEdits(editResult);
         success("Updated repo config.");
         printConfigSummary(buildConfigSnapshot(editResult.config, {
           source,
           location: getConfigLocationLabel(),
           hasOllamaCloudApiKey: await hasOllamaCloudApiKey(),
+          hasOpenRouterApiKey: await hasOpenRouterApiKey(),
           secretsPath: getSecretsStorePath()
         }));
         return;
@@ -12918,6 +13067,7 @@ var config_default = defineCommand({
       source,
       location: getConfigLocationLabel(),
       hasOllamaCloudApiKey: await hasOllamaCloudApiKey(),
+      hasOpenRouterApiKey: await hasOpenRouterApiKey(),
       secretsPath: getSecretsStorePath()
     });
     if (args.json) {
@@ -12926,18 +13076,126 @@ var config_default = defineCommand({
     }
     printConfigSummary(snapshot);
     console.log();
-    console.log(`  ${import_picocolors11.default.dim("Run `cn config --edit` to update these settings.")}`);
+    console.log(`  ${import_picocolors10.default.dim("Run `cn config --edit` to update these settings.")}`);
     console.log();
   }
 });
 
+// src/commands/discard.ts
+var import_picocolors11 = __toESM(require_picocolors(), 1);
+var discard_default = defineCommand({
+  meta: {
+    name: "discard",
+    description: "Discard the current feature branch and return to the base branch"
+  },
+  args: {
+    force: {
+      type: "boolean",
+      alias: "f",
+      description: "Skip confirmation and discard immediately",
+      default: false
+    }
+  },
+  async run({ args }) {
+    if (!await isGitRepo()) {
+      error("Not inside a git repository.");
+      process.exit(1);
+    }
+    await assertCleanGitState("discarding a branch");
+    const config = readConfig();
+    if (!config) {
+      error("No repo config found. Run `cn setup` first.");
+      process.exit(1);
+    }
+    const currentBranch = await getCurrentBranch();
+    const baseBranch = getBaseBranch(config);
+    await projectHeading("discard", "\uD83D\uDDD1\uFE0F");
+    if (isBranchProtected(currentBranch, config)) {
+      error(`${import_picocolors11.default.bold(currentBranch)} is a protected branch and cannot be discarded.`);
+      info(`Switch to a feature branch first, then run ${import_picocolors11.default.bold("cn discard")}.`);
+      process.exit(1);
+    }
+    if (currentBranch === baseBranch) {
+      info(`You are already on ${import_picocolors11.default.bold(baseBranch)}.`);
+      process.exit(0);
+    }
+    const { origin } = config;
+    const localWork = await hasLocalWork(origin, currentBranch);
+    const hasWork = localWork.uncommitted || localWork.unpushedCommits > 0;
+    if (hasWork) {
+      if (localWork.uncommitted) {
+        warn("You have uncommitted changes in your working tree.");
+      }
+      if (localWork.unpushedCommits > 0) {
+        warn(`You have ${import_picocolors11.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on this branch.`);
+      }
+      warn("Discarding this branch will permanently lose that work.");
+      const SAVE_FIRST = "Save my changes first (cn save), then discard";
+      const DISCARD_ANYWAY = "Discard anyway \u2014 I do not need this work";
+      const CANCEL = "Keep the branch, take me back";
+      const action = await selectPrompt("This branch has unsaved work. What would you like to do?", [SAVE_FIRST, DISCARD_ANYWAY, CANCEL]);
+      if (action === CANCEL) {
+        info("Discard cancelled. Your branch is untouched.");
+        process.exit(0);
+      }
+      if (action === SAVE_FIRST) {
+        if (!localWork.uncommitted) {
+          info("No uncommitted changes to stash \u2014 unpushed commits will still be lost.");
+          const confirm = await confirmPrompt("Continue discarding the branch?");
+          if (!confirm) {
+            info("Discard cancelled.");
+            process.exit(0);
+          }
+        } else {
+          const stashResult = await stashChanges(`work-in-progress on ${currentBranch}`);
+          if (stashResult.exitCode !== 0) {
+            error(`Failed to save changes: ${stashResult.stderr}`);
+            process.exit(1);
+          }
+          success(`Changes saved. Use ${import_picocolors11.default.bold("cn save --restore")} to bring them back.`);
+        }
+      }
+    } else if (!args.force) {
+      const confirmed = await confirmPrompt(`Discard ${import_picocolors11.default.bold(currentBranch)} and return to ${import_picocolors11.default.bold(baseBranch)}?`);
+      if (!confirmed) {
+        info("Discard cancelled.");
+        process.exit(0);
+      }
+    }
+    const upstreamRef = await getUpstreamRef();
+    let deleteRemote = false;
+    if (upstreamRef) {
+      deleteRemote = await confirmPrompt(`Also delete the remote branch ${import_picocolors11.default.bold(upstreamRef)}?`);
+    }
+    const checkoutResult = await checkoutBranch(baseBranch);
+    if (checkoutResult.exitCode !== 0) {
+      error(`Failed to switch to ${import_picocolors11.default.bold(baseBranch)}: ${checkoutResult.stderr}`);
+      process.exit(1);
+    }
+    const deleteResult = await forceDeleteBranch(currentBranch);
+    if (deleteResult.exitCode !== 0) {
+      error(`Failed to delete branch ${import_picocolors11.default.bold(currentBranch)}: ${deleteResult.stderr}`);
+      process.exit(1);
+    }
+    success(`Discarded ${import_picocolors11.default.bold(currentBranch)} and switched back to ${import_picocolors11.default.bold(baseBranch)}`);
+    if (deleteRemote) {
+      const remoteDeleteResult = await deleteRemoteBranch(origin, currentBranch);
+      if (remoteDeleteResult.exitCode !== 0) {
+        warn(`Could not delete remote branch: ${remoteDeleteResult.stderr.trim()}`);
+      } else {
+        success(`Deleted remote branch ${import_picocolors11.default.bold(`${origin}/${currentBranch}`)}`);
+      }
+    }
+  }
+});
+
 // src/commands/doctor.ts
 import { execFile as execFileCb3 } from "child_process";
 var import_picocolors12 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.8.0-dev.7db6dea",
+  version: "0.8.0-dev.7eaa951",
   description: "Developer CLI that automates git workflows \u2014 branching, syncing, committing, and PRs \u2014 with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -13190,6 +13448,15 @@ async function configSection() {
         detail: hasSecretsStore() ? "stored in the local secrets store" : "run `cn setup` to save it"
       });
     }
+    if (aiConfig.provider === "openrouter") {
+      const hasApiKey = await hasOpenRouterApiKey();
+      checks.push({
+        label: hasApiKey ? "OpenRouter API key present" : "OpenRouter API key missing",
+        ok: true,
+        warning: !hasApiKey,
+        detail: hasSecretsStore() ? "stored in the local secrets store" : "run `cn setup` to save it"
+      });
+    }
   }
   if (hasDevBranch(config.workflow)) {
     checks.push({
@@ -14121,6 +14388,32 @@ async function promptForOllamaCloudModel(apiKey, host = DEFAULT_OLLAMA_CLOUD_HOS
   }
   return inputPrompt(`Ollama Cloud model (default: ${DEFAULT_OLLAMA_CLOUD_MODEL} \u2014 press Enter to keep)`, DEFAULT_OLLAMA_CLOUD_MODEL);
 }
+async function promptForOpenRouterModel(apiKey) {
+  try {
+    info("Fetching available OpenRouter models...");
+    const models = prioritizeOpenRouterModels(await fetchOpenRouterModels(apiKey));
+    if (models.length > 0) {
+      const manualChoice = "Enter model manually";
+      const choices = models.map((model) => ({
+        value: model,
+        label: model === DEFAULT_OPENROUTER_MODEL ? `${model} (default)` : model
+      }));
+      const selected = await selectPrompt("Which OpenRouter model should this clone use?", [
+        ...choices.map((choice) => choice.label),
+        manualChoice
+      ]);
+      if (selected !== manualChoice) {
+        return choices.find((choice) => choice.label === selected)?.value ?? DEFAULT_OPENROUTER_MODEL;
+      }
+    } else {
+      warn("OpenRouter returned no available models. Enter the model name manually.");
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    warn(`Could not fetch OpenRouter models: ${message}`);
+  }
+  return inputPrompt(`OpenRouter model (default: ${DEFAULT_OPENROUTER_MODEL} \u2014 press Enter to keep)`, DEFAULT_OPENROUTER_MODEL);
+}
 var setup_default = defineCommand({
   meta: {
     name: "setup",
@@ -14172,9 +14465,16 @@ var setup_default = defineCommand({
     if (enableAI) {
       const providerChoice = await selectPrompt("Which AI provider should this clone use?", [
         "GitHub Copilot \u2014 use your existing GitHub/Copilot auth",
-        "Ollama Cloud \u2014 use an API key stored in the local secrets store"
+        "Ollama Cloud \u2014 use an API key stored in the local secrets store",
+        "OpenRouter \u2014 use an API key stored in the local secrets store"
       ]);
-      aiProvider = providerChoice.startsWith("Ollama Cloud") ? "ollama-cloud" : "copilot";
+      if (providerChoice.startsWith("Ollama Cloud")) {
+        aiProvider = "ollama-cloud";
+      } else if (providerChoice.startsWith("OpenRouter")) {
+        aiProvider = "openrouter";
+      } else {
+        aiProvider = "copilot";
+      }
       if (aiProvider === "ollama-cloud") {
         const apiKey = (await passwordPrompt("Enter your Ollama Cloud API key")).trim();
         if (!apiKey) {
@@ -14191,6 +14491,22 @@ var setup_default = defineCommand({
           error(`Failed to store Ollama Cloud API key: ${message}`);
           process.exit(1);
         }
+      } else if (aiProvider === "openrouter") {
+        const apiKey = (await passwordPrompt("Enter your OpenRouter API key")).trim();
+        if (!apiKey) {
+          error("OpenRouter API key is required when OpenRouter is selected.");
+          process.exit(1);
+        }
+        aiModel = await promptForOpenRouterModel(apiKey);
+        try {
+          await setOpenRouterApiKey(apiKey);
+          success("Stored OpenRouter API key in the local secrets store.");
+          info(`Secrets path: ${import_picocolors16.default.bold(getSecretsStorePath())}`);
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          error(`Failed to store OpenRouter API key: ${message}`);
+          process.exit(1);
+        }
       }
     }
     const showTips = await confirmPrompt("Show beginner quick guides and loading tips in command output?");

package/package.json

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