@zhiman_innies/innies-codex 0.122.18 → 0.122.21

package/bin/innies.js

@@ -13,13 +13,26 @@ const DEFAULT_HOME_DIR = ".inniescoder";
 const INNIES_HOME_ENV_VAR = "INNIES_HOME";
 const DEFAULT_CATALOG_FILENAME = "catalog.json";
 const DEFAULT_CONFIG_FILENAME = "config.toml";
+const DEFAULT_STATE_FILENAME = "innies-state.json";
 const DASHSCOPE_PROVIDER_HEADER = "[model_providers.dashscope]";
+const RESERVED_PROVIDER_HEADERS = Object.freeze([
+  "[model_providers.openai]",
+  "[model_providers.ollama]",
+  "[model_providers.lmstudio]",
+]);
+const MODEL_SELECTION_STATES = Object.freeze({
+  MANAGED_DEFAULT: "managed_default",
+  USER_SELECTED: "user_selected",
+});
 const ROOT_MANAGED_SETTINGS = Object.freeze([
   ['model_provider', 'model_provider = "dashscope"'],
   ["model", `model = "${DEFAULT_MODEL}"`],
   ["model_catalog_json", null],
   ['model_reasoning_effort', 'model_reasoning_effort = "none"'],
 ]);
+const LEGACY_MANAGED_GPT_MODEL = "gpt-5.5";
+const LEGACY_MANAGED_GPT_PROVIDER = "openai";
+const LEGACY_MANAGED_GPT_REASONING = "high";
 
 const codexHome = resolveInniesHome();
 process.env[INNIES_HOME_ENV_VAR] = codexHome;
@@ -31,9 +44,15 @@ ensureInniesHomeDefaults(codexHome);
 await import("./codex.js");
 
 function ensureInniesHomeDefaults(homeDir) {
+  const state = loadInniesState(homeDir);
   const catalogPath = path.join(homeDir, DEFAULT_CATALOG_FILENAME);
   ensureInniesCatalog(catalogPath);
-  ensureInniesConfig(path.join(homeDir, DEFAULT_CONFIG_FILENAME), catalogPath);
+  const nextState = ensureInniesConfig(
+    path.join(homeDir, DEFAULT_CONFIG_FILENAME),
+    catalogPath,
+    state,
+  );
+  writeInniesState(homeDir, nextState);
 }
 
 function defaultCatalogAssetPath() {
@@ -48,6 +67,39 @@ function writeJsonFile(filePath, value) {
   fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`);
 }
 
+function stateFilePath(homeDir) {
+  return path.join(homeDir, DEFAULT_STATE_FILENAME);
+}
+
+function defaultInniesState() {
+  return {
+    model_selection_state: MODEL_SELECTION_STATES.MANAGED_DEFAULT,
+  };
+}
+
+function loadInniesState(homeDir) {
+  const filePath = stateFilePath(homeDir);
+  if (!fs.existsSync(filePath)) {
+    return defaultInniesState();
+  }
+
+  try {
+    const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    if (
+      parsed &&
+      Object.values(MODEL_SELECTION_STATES).includes(parsed.model_selection_state)
+    ) {
+      return parsed;
+    }
+  } catch {}
+
+  return defaultInniesState();
+}
+
+function writeInniesState(homeDir, state) {
+  writeJsonFile(stateFilePath(homeDir), state);
+}
+
 function ensureInniesCatalog(catalogPath) {
   const defaultCatalog = loadDefaultCatalog();
   if (!fs.existsSync(catalogPath)) {
@@ -81,23 +133,25 @@ function shouldReplaceLegacyCatalog(catalog) {
   }
 
   if (slugs.length === 1 && slugs[0] === DEFAULT_MODEL) {
-    return false;
+    return true;
   }
 
   return slugs.some((slug) => LEGACY_MODELS.has(slug));
 }
 
-function ensureInniesConfig(configPath, catalogPath) {
+function ensureInniesConfig(configPath, catalogPath, state) {
   if (!fs.existsSync(configPath)) {
     fs.writeFileSync(configPath, defaultInniesConfig(catalogPath));
-    return;
+    return defaultInniesState();
   }
 
   const existing = fs.readFileSync(configPath, "utf8");
-  const updated = normalizeInniesConfig(existing, catalogPath);
+  const nextState = determineModelSelectionState(existing, state);
+  const updated = normalizeInniesConfig(existing, catalogPath, nextState);
   if (updated !== existing) {
     fs.writeFileSync(configPath, updated);
   }
+  return nextState;
 }
 
 function defaultInniesConfig(catalogPath) {
@@ -117,22 +171,21 @@ function defaultInniesConfig(catalogPath) {
 }
 
 function resolveInniesHome() {
-  return process.env[INNIES_HOME_ENV_VAR] || path.join(os.homedir(), DEFAULT_HOME_DIR);
+  return path.join(os.homedir(), DEFAULT_HOME_DIR);
 }
 
-function normalizeInniesConfig(contents, catalogPath) {
+function normalizeInniesConfig(contents, catalogPath, state) {
   if (contents.trim() === "") {
     return defaultInniesConfig(catalogPath);
   }
 
-  const managedSettings = ROOT_MANAGED_SETTINGS.map(([key, line]) => [
-    key,
-    key === "model_catalog_json"
-      ? `model_catalog_json = ${JSON.stringify(catalogPath)}`
-      : line,
-  ]);
+  const isUserSelected =
+    state.model_selection_state === MODEL_SELECTION_STATES.USER_SELECTED;
   const unmanagedContents = stripManagedRootSettings(contents).trim();
-  let updated = `${managedSettings.map(([, line]) => line).join("\n")}\n`;
+  const managedLines = isUserSelected
+    ? preservedUserManagedLines(contents, catalogPath)
+    : managedDefaultLines(catalogPath);
+  let updated = `${managedLines.join("\n")}\n`;
 
   if (unmanagedContents !== "") {
     updated = `${updated}\n${unmanagedContents}\n`;
@@ -140,6 +193,7 @@ function normalizeInniesConfig(contents, catalogPath) {
     updated = `${updated}\n`;
   }
 
+  updated = stripReservedProviderBlocks(updated);
   if (!updated.includes(DASHSCOPE_PROVIDER_HEADER)) {
     updated = `${updated.trimEnd()}\n\n${defaultDashscopeProviderBlock()}\n`;
   }
@@ -147,6 +201,93 @@ function normalizeInniesConfig(contents, catalogPath) {
   return updated;
 }
 
+function managedDefaultLines(catalogPath) {
+  return ROOT_MANAGED_SETTINGS.map(([key, line]) =>
+    key === "model_catalog_json"
+      ? `model_catalog_json = ${JSON.stringify(catalogPath)}`
+      : line,
+  );
+}
+
+function preservedUserManagedLines(contents, catalogPath) {
+  const preservedModelProvider = readRootSetting(contents, "model_provider");
+  const preservedModel = readRootSetting(contents, "model");
+  const preservedEffort = 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"',
+  ];
+}
+
+function readRootSetting(contents, key) {
+  const settingPattern = new RegExp(`^\\s*${key}\\s*=.*$`, "m");
+  return contents.match(settingPattern)?.[0] ?? null;
+}
+
+function stripReservedProviderBlocks(contents) {
+  const lines = contents.split(/\r?\n/);
+  const keptLines = [];
+  let skippingReservedBlock = false;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    const isSectionHeader = /^\[[^\]]+\]$/.test(trimmed);
+    if (isSectionHeader) {
+      skippingReservedBlock = RESERVED_PROVIDER_HEADERS.includes(trimmed);
+    }
+    if (!skippingReservedBlock) {
+      keptLines.push(line);
+    }
+  }
+
+  return keptLines.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
+}
+
+function determineModelSelectionState(contents, previousState) {
+  const currentModel = extractRootSettingValue(contents, "model");
+  const currentProvider = extractRootSettingValue(contents, "model_provider");
+  if (currentModel == null && currentProvider == null) {
+    return previousState;
+  }
+
+  if (
+    currentModel === DEFAULT_MODEL &&
+    (currentProvider == null || currentProvider === "dashscope")
+  ) {
+    return previousState;
+  }
+
+  if (
+    previousState.model_selection_state === MODEL_SELECTION_STATES.MANAGED_DEFAULT &&
+    currentModel === LEGACY_MANAGED_GPT_MODEL &&
+    currentProvider === LEGACY_MANAGED_GPT_PROVIDER &&
+    extractRootSettingValue(contents, "model_reasoning_effort") ===
+      LEGACY_MANAGED_GPT_REASONING
+  ) {
+    return previousState;
+  }
+
+  if (
+    currentModel != null &&
+    !LEGACY_MODELS.has(currentModel) &&
+    (currentModel !== DEFAULT_MODEL || currentProvider !== "dashscope")
+  ) {
+    return {
+      model_selection_state: MODEL_SELECTION_STATES.USER_SELECTED,
+    };
+  }
+
+  return previousState;
+}
+
+function extractRootSettingValue(contents, key) {
+  const match = contents.match(new RegExp(`^\\s*${key}\\s*=\\s*\"([^\"]*)\"`, "m"));
+  return match?.[1] ?? null;
+}
+
 function stripManagedRootSettings(contents) {
   let stripped = contents;
   for (const [key] of ROOT_MANAGED_SETTINGS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhiman_innies/innies-codex",
-  "version": "0.122.18",
+  "version": "0.122.21",
   "license": "Apache-2.0",
   "bin": {
     "innies": "bin/innies.js"
@@ -20,7 +20,7 @@
   },
   "packageManager": "pnpm@10.29.3+sha512.498e1fb4cca5aa06c1dcf2611e6fafc50972ffe7189998c409e90de74566444298ffe43e6cd2acdc775ba1aa7cc5e092a8b7054c811ba8c5770f84693d33d2dc",
   "optionalDependencies": {
-    "@zhiman_innies/innies-codex-darwin-x64": "0.122.18-darwin-x64",
-    "@zhiman_innies/innies-codex-darwin-arm64": "0.122.18-darwin-arm64"
+    "@zhiman_innies/innies-codex-darwin-x64": "0.122.21-darwin-x64",
+    "@zhiman_innies/innies-codex-darwin-arm64": "0.122.21-darwin-arm64"
   }
 }