@zhiman_innies/innies-codex 0.122.57 → 0.122.58

package/bin/innies-config.js

@@ -563,12 +563,15 @@ function normalizeManagedProviderBlocks(contents) {
   return updated;
 }
 
-// Pin the dashscope block's `env_key` to DASHSCOPE_API_KEY. The block
-// is the user-facing alias for the builtin `bailian` provider; the
-// factory at codex-rs/model-provider-info/src/lib.rs reads
-// `DASHSCOPE_API_KEY` (and only that name) from the environment, so
-// anything else here is a typo / legacy name. Auto-correct with a
-// console warning instead of failing the whole normalize run.
+// Pin the dashscope block's `env_key` to DASHSCOPE_API_KEY, and its
+// `name` to "bailian" (the builtin factory id). The block is the
+// user-facing alias for the builtin `bailian` provider; the factory
+// at codex-rs/model-provider-info/src/lib.rs reads `DASHSCOPE_API_KEY`
+// (and only that name) from the environment and the block's `name`
+// field must equal `BAILIAN_PROVIDER_ID = "bailian"` so the
+// anti-silent-fallback guard in `to_api_provider` recognizes the
+// merged provider. Auto-correct legacy / typo'd values with a console
+// warning instead of failing the whole normalize run.
 function enforceDashscopeEnvKey(contents) {
   const lines = contents.split(/\r?\n/);
   let inDashscope = false;
@@ -582,6 +585,36 @@ function enforceDashscopeEnvKey(contents) {
       continue;
     }
     if (inDashscope) {
+      // N1 (2026-06-14): migrate legacy `name = "DashScope"` →
+      // `name = "bailian"`. The block key (`dashscope`) is the
+      // user-facing alias and is unchanged; only the inner `name`
+      // field is canonicalized to match `BAILIAN_PROVIDER_ID`. A
+      // mismatched name (e.g. "DashScope") silently falls through
+      // the anti-silent-fallback guard because
+      // `to_api_provider` lowercases `self.name` and checks
+      // `name_lc == "bailian"` / `"dashscope"` / starts_with("zhiman"),
+      // so "DashScope" lowercases to "dashscope" which IS matched —
+      // but the user-facing error message names the wrong canonical
+      // env var (DASHSCOPE_BASE_URL vs ZHIMAN_BASE_URL) and the
+      // operator gets confused. Pin to "bailian" for a clean merge.
+      const nameMatch = line.match(/^(\s*)name\s*=\s*"([^"]+)"(\s*)(#.*)?$/);
+      if (nameMatch) {
+        const [, indent, value, , comment] = nameMatch;
+        if (value !== "bailian") {
+          console.warn(
+            `[innies-config] ${DASHSCOPE_PROVIDER_HEADER} name="${value}" ` +
+              `is not the canonical "bailian" — auto-correcting ` +
+              `(legacy template default; the Rust factory's ` +
+              `BAILIAN_PROVIDER_ID is "bailian", and a mismatched ` +
+              `name yields a misleading DASHSCOPE_BASE_URL / ` +
+              `ZHIMAN_BASE_URL error from the anti-silent-fallback guard).`
+          );
+          const tail = comment ? ` ${comment}` : "";
+          updated.push(`${indent}name = "bailian"${tail}`);
+          rewrote = true;
+          continue;
+        }
+      }
       const m = line.match(/^(\s*)env_key\s*=\s*"?([^"\s#]+)"?(\s*)(#.*)?$/);
       if (m) {
         const [, indent, value, , comment] = m;
@@ -740,6 +773,19 @@ function defaultDashscopeProviderBlock() {
   // it commented and set DASHSCOPE_API_KEY as a regular env var, both
   // paths converge.
   //
+  // N1 (2026-06-14): the block's `name` field MUST be "bailian" (the
+  // builtin factory's `BAILIAN_PROVIDER_ID`), not "DashScope". A
+  // mismatch silently falls through the anti-silent-fallback guard
+  // in `codex-rs/model-provider-info/src/lib.rs::to_api_provider`
+  // (the `is_non_openai_builtin && base_url.contains("api.openai.com")`
+  // check uses `self.name.to_ascii_lowercase()`, which catches "dashscope"
+  // but emits a misleading error for an unknown "DashScope" name) and
+  // the request 401s at api.openai.com with the user's OPENAI_API_KEY.
+  // Pin to "bailian" so the merge layer and the factory's
+  // `create_bailian_provider` recognize the block as the public-cloud
+  // DashScope alias. The block *key* (`dashscope`) is the user-facing
+  // alias and stays the same — only the *name* field is canonicalized.
+  //
   // DashScope-specific note: the top-level `enable_thinking` flag is
   // the canonical thinking toggle (NOT the nested `chat_template_kwargs`
   // form, which DashScope rejects with HTTP 400). Use
@@ -747,7 +793,7 @@ function defaultDashscopeProviderBlock() {
   // `model_reasoning_effort` at the root.
   return [
     DASHSCOPE_PROVIDER_HEADER,
-    'name = "DashScope"',
+    'name = "bailian"',
     `# base_url = "https://dashscope.aliyuncs.com/compatible-mode/v1"   # FILL IN: DashScope OpenAI-compatible endpoint`,
     `# env_key  = "DASHSCOPE_API_KEY"                                   # FILL IN: name of the env var holding your DashScope API key`,
     `wire_api = "${DEFAULT_PROVIDER_WIRE_API}"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhiman_innies/innies-codex",
-  "version": "0.122.57",
+  "version": "0.122.58",
   "license": "Apache-2.0",
   "bin": {
     "innies": "bin/innies.js"
@@ -21,11 +21,5 @@
   "packageManager": "pnpm@10.29.3+sha512.498e1fb4cca5aa06c1dcf2611e6fafc50972ffe7189998c409e90de74566444298ffe43e6cd2acdc775ba1aa7cc5e092a8b7054c811ba8c5770f84693d33d2dc",
   "scripts": {
     "postinstall": "node bin/innies-init.js"
-  },
-  "optionalDependencies": {
-    "@zhiman_innies/innies-codex-darwin-x64": "0.122.57-darwin-x64",
-    "@zhiman_innies/innies-codex-darwin-arm64": "0.122.57-darwin-arm64",
-    "@zhiman_innies/innies-codex-win32-x64": "0.122.57-win32-x64",
-    "@zhiman_innies/innies-codex-win32-arm64": "0.122.57-win32-arm64"
   }
-}
+}