@denisvieiradev/gitwise-core 1.3.0 → 1.3.2

package/dist/index.js

@@ -7,7 +7,7 @@ var __export = (target, all) => {
 // package.json
 var package_default = {
   name: "@denisvieiradev/gitwise-core",
-  version: "1.3.0",
+  version: "1.3.2",
   description: "Shared logic for gitwise: non-interactive commit/review/pr/release commands, LLM providers, git/github primitives, prompt templates.",
   type: "module",
   main: "./dist/index.js",
@@ -946,7 +946,19 @@ var CliSubprocessProvider = class {
 ${req.userMessage}` : req.userMessage;
     const large = Buffer.byteLength(prompt, "utf8") > LARGE_PROMPT_THRESHOLD;
     const args = this.spec.buildArgs({ prompt, systemPrompt: req.systemPrompt, modelId, large });
-    const stdout = await this.spawnCli(args, large ? prompt : "");
+    let stdout;
+    try {
+      stdout = await this.spawnCli(args, large ? prompt : "");
+    } catch (error2) {
+      const fallback = this.spec.modelCompatibilityFallback;
+      if (!fallback?.shouldRetry(error2)) throw error2;
+      debug("Retrying CLI provider with its compatibility model", {
+        rejectedModel: modelId,
+        tier: req.tier
+      });
+      const fallbackArgs = fallback.buildArgs({ prompt, systemPrompt: req.systemPrompt, large });
+      stdout = await this.spawnCli(fallbackArgs, large ? prompt : "");
+    }
     const parsed = this.spec.parseOutput(stdout);
     return {
       content: parsed.content,
@@ -1132,6 +1144,7 @@ var COMMON_CODEX_PATHS = [
 function resolveCodexBinary(customPath) {
   return resolveCliBinary("codex", COMMON_CODEX_PATHS, customPath);
 }
+var CODEX_COMPATIBILITY_FALLBACK_MODEL = "gpt-5.6-sol";
 function parseEvents(stdout) {
   const events = [];
   for (const line of stdout.split("\n")) {
@@ -1144,6 +1157,19 @@ function parseEvents(stdout) {
   }
   return events;
 }
+function buildCodexArgs(prompt, modelId, large) {
+  const args = [
+    "exec",
+    "--json",
+    "--ephemeral",
+    "--skip-git-repo-check",
+    "--sandbox",
+    "read-only"
+  ];
+  if (modelId) args.push("--model", modelId);
+  args.push("--", large ? "-" : prompt);
+  return args;
+}
 var codexSpec = {
   toolName: "Codex CLI",
   installHint: "Install it (`npm install -g @openai/codex`) or re-run `gw provider` to choose another provider.",
@@ -1153,18 +1179,18 @@ var codexSpec = {
   timeoutMs: 3e5,
   resolveBinary: resolveCodexBinary,
   buildArgs({ prompt, modelId, large }) {
-    return [
-      "exec",
-      "--json",
-      "--ephemeral",
-      "--skip-git-repo-check",
-      "--sandbox",
-      "read-only",
-      "--model",
-      modelId,
-      "--",
-      large ? "-" : prompt
-    ];
+    return buildCodexArgs(prompt, modelId, large);
+  },
+  modelCompatibilityFallback: {
+    shouldRetry(error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      return /model\b.*(?:is not supported when using Codex with a ChatGPT account|requires a newer version of Codex)/i.test(
+        message
+      );
+    },
+    buildArgs({ prompt, large }) {
+      return buildCodexArgs(prompt, CODEX_COMPATIBILITY_FALLBACK_MODEL, large);
+    }
   },
   parseOutput(stdout) {
     let content;
@@ -1223,6 +1249,19 @@ var copilotSpec = {
   buildArgs({ prompt, modelId, large }) {
     return [...large ? [] : [`--prompt=${prompt}`], "--no-ask-user", "--silent", "--model", modelId];
   },
+  modelCompatibilityFallback: {
+    shouldRetry(error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      return /Model ".+" from --model flag is not available/i.test(message);
+    },
+    buildArgs({ prompt, large }) {
+      return [
+        ...large ? [] : ["--prompt=" + prompt],
+        "--no-ask-user",
+        "--silent"
+      ];
+    }
+  },
   parseOutput(stdout) {
     const content = stdout.trim();
     if (!content) throw new Error("Copilot CLI returned an empty response");
@@ -1289,7 +1328,7 @@ var DEFAULT_USER_CONFIG = {
     api: { ...CLAUDE_MODELS },
     "claude-code": { ...CLAUDE_MODELS },
     codex: {
-      fast: "gpt-6-luna",
+      fast: "gpt-6-sol",
       balanced: "gpt-6-sol",
       powerful: "gpt-6-astra"
     },
@@ -1321,6 +1360,24 @@ var PROVIDER_KINDS = ["api", "claude-code", "codex", "copilot", "kiro"];
 // src/config/user.ts
 var GITWISE_DIR = ".gitwise";
 var USER_CONFIG_FILE = "config.json";
+var PREVIOUS_CODEX_FAST_DEFAULT = "gpt-6-luna";
+function migrateCodexFastDefault(config) {
+  if (config.models.codex.fast !== PREVIOUS_CODEX_FAST_DEFAULT) return config;
+  return {
+    ...config,
+    models: {
+      ...config.models,
+      codex: { ...config.models.codex, fast: DEFAULT_USER_CONFIG.models.codex.fast }
+    }
+  };
+}
+async function persistConfigMigration(configPath, config) {
+  try {
+    await writeJSON(configPath, config);
+  } catch (err) {
+    debug("Could not persist migrated config; using it in memory", { path: configPath, error: String(err) });
+  }
+}
 function getUserConfigPath(homeDir) {
   return join2(homeDir ?? os6.homedir(), GITWISE_DIR, USER_CONFIG_FILE);
 }
@@ -1353,16 +1410,18 @@ async function readUserConfig(homeDir) {
   const raw = await readJSON(configPath);
   if (isLegacyFlatModels(raw.models)) {
     const migratedModels = migrateFlatModels(raw.models, raw.provider);
-    const merged = mergeWithDefaults({ ...raw, models: migratedModels });
+    const merged2 = migrateCodexFastDefault(mergeWithDefaults({ ...raw, models: migratedModels }));
     debug("Migrated legacy flat models config to per-provider shape", { path: configPath });
-    try {
-      await writeJSON(configPath, merged);
-    } catch (err) {
-      debug("Could not persist migrated config; using it in memory", { path: configPath, error: String(err) });
-    }
-    return merged;
+    await persistConfigMigration(configPath, merged2);
+    return merged2;
+  }
+  const merged = mergeWithDefaults(raw);
+  const migrated = migrateCodexFastDefault(merged);
+  if (migrated !== merged) {
+    debug("Updated unsupported Codex fast default model", { path: configPath });
+    await persistConfigMigration(configPath, migrated);
   }
-  return mergeWithDefaults(raw);
+  return migrated;
 }
 async function writeUserConfig(partial, homeDir) {
   const configPath = getUserConfigPath(homeDir);