@zhiman_innies/innies-codex 0.122.23 → 0.122.25

package/assets/innies-catalog.json

@@ -21,25 +21,7 @@
       "slug": "qwen35_35b",
       "display_name": "qwen35_35b",
       "description": "Zhiman private Qwen 35B model.",
-      "default_reasoning_level": "medium",
-      "supported_reasoning_levels": [
-        {
-          "effort": "low",
-          "description": "Fast responses with lighter reasoning"
-        },
-        {
-          "effort": "medium",
-          "description": "Balances speed and reasoning depth for everyday tasks"
-        },
-        {
-          "effort": "high",
-          "description": "Greater reasoning depth for complex problems"
-        },
-        {
-          "effort": "xhigh",
-          "description": "Extra high reasoning depth for complex problems"
-        }
-      ],
+      "supported_reasoning_levels": [],
       "shell_type": "shell_command",
       "visibility": "list",
       "minimal_client_version": "0.98.0",
@@ -92,25 +74,7 @@
       "slug": "qwen3.6-plus",
       "display_name": "qwen3.6-plus",
       "description": "DashScope Qwen 3.6 Plus model.",
-      "default_reasoning_level": "medium",
-      "supported_reasoning_levels": [
-        {
-          "effort": "low",
-          "description": "Fast responses with lighter reasoning"
-        },
-        {
-          "effort": "medium",
-          "description": "Balances speed and reasoning depth for everyday tasks"
-        },
-        {
-          "effort": "high",
-          "description": "Greater reasoning depth for complex problems"
-        },
-        {
-          "effort": "xhigh",
-          "description": "Extra high reasoning depth for complex problems"
-        }
-      ],
+      "supported_reasoning_levels": [],
       "shell_type": "shell_command",
       "visibility": "list",
       "minimal_client_version": "0.98.0",

package/bin/innies-config.js

@@ -8,6 +8,7 @@ const __dirname = path.dirname(__filename);
 const DEFAULT_MODEL = "qwen35_35b";
 const DEFAULT_PROVIDER = "zhiman_35b";
 const DASHSCOPE_MODEL = "qwen3.6-plus";
+const QWEN_MODELS = new Set([DEFAULT_MODEL, DASHSCOPE_MODEL]);
 const LEGACY_MODELS = new Set(["qwen-plus", "qwen-plus-latest"]);
 const DEFAULT_HOME_DIR = ".inniescoder";
 const DEFAULT_CATALOG_FILENAME = "catalog.json";
@@ -33,7 +34,6 @@ const ROOT_MANAGED_SETTINGS = Object.freeze([
   ["model_catalog_json", null],
   ["model_reasoning_effort", null],
 ]);
-const ROOT_CATALOG_ONLY_SETTINGS = Object.freeze([["model_catalog_json", null]]);
 const LEGACY_MANAGED_GPT_MODEL = "gpt-5.5";
 const LEGACY_MANAGED_GPT_PROVIDER = "openai";
 const LEGACY_MANAGED_GPT_REASONING = "high";
@@ -135,14 +135,19 @@ function shouldReplaceLegacyCatalog(catalog) {
     return true;
   }
 
-  const qwenModel = catalog.models.find((model) => model?.slug === DEFAULT_MODEL);
-  if (
-    qwenModel &&
-    (qwenModel.apply_patch_tool_type !== "function" ||
+  for (const qwenModel of catalog.models.filter((model) =>
+    QWEN_MODELS.has(model?.slug),
+  )) {
+    if (
+      qwenModel.apply_patch_tool_type !== "function" ||
       qwenModel.supports_reasoning_summaries !== false ||
-      qwenModel.support_verbosity !== false)
-  ) {
-    return true;
+      qwenModel.support_verbosity !== false ||
+      Object.prototype.hasOwnProperty.call(qwenModel, "default_reasoning_level") ||
+      !Array.isArray(qwenModel.supported_reasoning_levels) ||
+      qwenModel.supported_reasoning_levels.length !== 0
+    ) {
+      return true;
+    }
   }
 
   if (!slugs.includes(DEFAULT_MODEL)) {
@@ -154,7 +159,7 @@ function shouldReplaceLegacyCatalog(catalog) {
 
 function ensureInniesConfig(configPath, catalogPath, state) {
   if (!fs.existsSync(configPath)) {
-    fs.writeFileSync(configPath, defaultInniesConfig(catalogPath, managedDefaultFromAuth(null)));
+    fs.writeFileSync(configPath, defaultInniesConfig(catalogPath, managedDefaultModel()));
     return defaultInniesState();
   }
 
@@ -183,15 +188,13 @@ function defaultInniesConfig(catalogPath, managedDefault) {
 
 function normalizeInniesConfig(contents, catalogPath, state) {
   if (contents.trim() === "") {
-    return defaultInniesConfig(catalogPath, managedDefaultFromAuth(null));
+    return defaultInniesConfig(catalogPath, managedDefaultModel());
   }
 
   const isUserSelected =
     state.model_selection_state === MODEL_SELECTION_STATES.USER_SELECTED;
-  const managedDefault = isUserSelected ? null : managedDefaultFromAuth(contents);
-  const managedSettings = managedDefault
-    ? ROOT_MANAGED_SETTINGS
-    : ROOT_CATALOG_ONLY_SETTINGS;
+  const managedDefault = isUserSelected ? null : managedDefaultModel();
+  const managedSettings = ROOT_MANAGED_SETTINGS;
   const unmanagedContents = stripManagedRootSettings(contents, managedSettings).trim();
   const managedLines = isUserSelected
     ? preservedUserManagedLines(contents, catalogPath)
@@ -222,7 +225,6 @@ function managedDefaultLines(catalogPath, managedDefault) {
     `model_provider = ${JSON.stringify(managedDefault.provider)}`,
     `model = ${JSON.stringify(managedDefault.model)}`,
     `model_catalog_json = ${JSON.stringify(catalogPath)}`,
-    'model_reasoning_effort = "none"',
   ];
 }
 
@@ -233,13 +235,22 @@ function catalogOnlyManagedLines(catalogPath) {
 function preservedUserManagedLines(contents, catalogPath) {
   const preservedModelProvider = readRootSetting(contents, "model_provider");
   const preservedModel = readRootSetting(contents, "model");
-  const preservedEffort = readRootSetting(contents, "model_reasoning_effort");
+  const preservedModelValue = extractRootSettingValue(contents, "model");
+  const preservedProviderValue = extractRootSettingValue(contents, "model_provider");
+  const preservesQwenModel =
+    (preservedModelValue === DEFAULT_MODEL &&
+      (preservedProviderValue == null || preservedProviderValue === DEFAULT_PROVIDER)) ||
+    (preservedModelValue === DASHSCOPE_MODEL &&
+      (preservedProviderValue == null || preservedProviderValue === "dashscope"));
+  const preservedEffort = preservesQwenModel
+    ? null
+    : readRootSetting(contents, "model_reasoning_effort");
 
   return [
     preservedModelProvider ?? 'model_provider = "openai"',
     preservedModel ?? 'model = "gpt-5.5"',
     `model_catalog_json = ${JSON.stringify(catalogPath)}`,
-    preservedEffort ?? 'model_reasoning_effort = "high"',
+    ...(preservedEffort ? [preservedEffort] : []),
   ];
 }
 
@@ -318,77 +329,33 @@ function extractRootSettingValue(contents, key) {
 }
 
 function stripManagedRootSettings(contents, managedSettings = ROOT_MANAGED_SETTINGS) {
-  let stripped = contents;
-  for (const [key] of managedSettings) {
-    const settingPattern = new RegExp(`^\\s*${key}\\s*=.*(?:\\r?\\n)?`, "gm");
-    stripped = stripped.replace(settingPattern, "");
-  }
-
-  return stripped.replace(/\n{3,}/g, "\n\n");
-}
-
-function managedDefaultFromAuth(contents) {
-  if (hasZhiman35bAuth(contents)) {
-    return {
-      provider: DEFAULT_PROVIDER,
-      model: DEFAULT_MODEL,
-    };
-  }
-  if (hasDashscopeAuth(contents ?? "")) {
-    return {
-      provider: "dashscope",
-      model: DASHSCOPE_MODEL,
-    };
-  }
-  return null;
-}
-
-function hasZhiman35bApiKey() {
-  return (process.env.ZHIMAN_35B_API_KEY ?? "").trim() !== "";
-}
-
-function hasZhiman35bAuth(contents) {
-  return hasZhiman35bApiKey() || zhiman35bProviderBlock(contents ?? "").some((line) =>
-    /^\s*experimental_bearer_token\s*=\s*"[^"]+"\s*$/.test(line),
-  );
-}
-
-function hasDashscopeApiKey() {
-  return (process.env.DASHSCOPE_API_KEY ?? "").trim() !== "";
-}
-
-function hasDashscopeAuth(contents) {
-  return hasDashscopeApiKey() || dashscopeProviderBlock(contents).some((line) =>
-    /^\s*experimental_bearer_token\s*=\s*"[^"]+"\s*$/.test(line),
-  );
-}
-
-function zhiman35bProviderBlock(contents) {
-  return providerBlock(contents, ZHIMAN_35B_PROVIDER_HEADER);
-}
-
-function dashscopeProviderBlock(contents) {
-  return providerBlock(contents, DASHSCOPE_PROVIDER_HEADER);
-}
-
-function providerBlock(contents, providerHeader) {
+  const managedKeys = new Set(managedSettings.map(([key]) => key));
   const lines = contents.split(/\r?\n/);
-  const providerLines = [];
-  let inProviderBlock = false;
+  const keptLines = [];
+  let inRootTable = true;
 
   for (const line of lines) {
     const trimmed = line.trim();
-    const isSectionHeader = /^\[[^\]]+\]$/.test(trimmed);
-    if (isSectionHeader) {
-      inProviderBlock = trimmed === providerHeader;
-      continue;
+    if (/^\[[^\]]+\]$/.test(trimmed)) {
+      inRootTable = false;
     }
-    if (inProviderBlock) {
-      providerLines.push(line);
+
+    const rootSetting = line.match(/^\s*([A-Za-z0-9_]+)\s*=/);
+    if (inRootTable && rootSetting && managedKeys.has(rootSetting[1])) {
+      continue;
     }
+
+    keptLines.push(line);
   }
 
-  return providerLines;
+  return keptLines.join("\n").replace(/\n{3,}/g, "\n\n");
+}
+
+function managedDefaultModel() {
+  return {
+    provider: DEFAULT_PROVIDER,
+    model: DEFAULT_MODEL,
+  };
 }
 
 function normalizeManagedProviderBlocks(contents) {

package/bin/innies.js

@@ -6,6 +6,18 @@ import { ensureInniesHomeDefaults, resolveInniesHome } from "./innies-config.js"
 
 const INNIES_HOME_ENV_VAR = "INNIES_HOME";
 
+function isVersionRequest(args) {
+  return args.length === 1 && (args[0] === "--version" || args[0] === "-V");
+}
+
+if (isVersionRequest(process.argv.slice(2))) {
+  const packageJson = JSON.parse(
+    fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"),
+  );
+  console.log(`innies-cli ${packageJson.version}`);
+  process.exit(0);
+}
+
 const codexHome = resolveInniesHome();
 process.env[INNIES_HOME_ENV_VAR] = codexHome;
 process.env.CODEX_HOME = codexHome;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhiman_innies/innies-codex",
-  "version": "0.122.23",
+  "version": "0.122.25",
   "license": "Apache-2.0",
   "bin": {
     "innies": "bin/innies.js"
@@ -23,7 +23,7 @@
     "postinstall": "node bin/innies-init.js"
   },
   "optionalDependencies": {
-    "@zhiman_innies/innies-codex-darwin-x64": "0.122.23-darwin-x64",
-    "@zhiman_innies/innies-codex-darwin-arm64": "0.122.23-darwin-arm64"
+    "@zhiman_innies/innies-codex-darwin-x64": "0.122.25-darwin-x64",
+    "@zhiman_innies/innies-codex-darwin-arm64": "0.122.25-darwin-arm64"
   }
 }