code-abyss 1.7.4 → 1.7.5

package/README.md

@@ -214,7 +214,7 @@ multi_agent = true
 ### 兼容性说明
 
 - 模板已对齐新版 Codex 配置风格：`[tools].web_search` 与 `[features].multi_agent`
-- 若你本地已有旧配置，安装器不会强制覆盖已有 `~/.codex/config.toml`
+- 若你本地已有旧配置，安装器不会强制覆盖；会自动做三件事：补齐缺失默认项、清理 removed feature、将 deprecated `web_search_*` 迁移为 `[tools].web_search`
 - 建议在升级后执行一次 `codex --help` / 启动自检，确认无 deprecation warning
 
 ---

package/bin/adapters/codex.js

@@ -3,6 +3,213 @@
 const fs = require('fs');
 const path = require('path');
 
+const CODEX_DEFAULTS = {
+  sandboxMode: 'danger-full-access',
+  featureFlag: 'multi_agent',
+};
+
+const LEGACY_FEATURES = {
+  removed: [
+    'search_tool',
+    'request_rule',
+    'experimental_windows_sandbox',
+    'elevated_windows_sandbox',
+    'remote_models',
+    'collaboration_modes',
+    'steer',
+  ],
+  deprecated: [
+    'web_search_request',
+    'web_search_cached',
+  ],
+};
+
+function escapeRegExp(input) {
+  return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function hasTopLevelKey(content, key) {
+  const re = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=`, 'm');
+  return re.test(content);
+}
+
+function hasSection(content, sectionName) {
+  const re = new RegExp(`^\\s*\\[${escapeRegExp(sectionName)}\\]\\s*$`, 'm');
+  return re.test(content);
+}
+
+function hasKeyInSection(content, sectionName, key) {
+  const lines = content.split(/\r?\n/);
+  const sectionRe = new RegExp(`^\\s*\\[${escapeRegExp(sectionName)}\\]\\s*$`);
+  const anySectionRe = /^\s*\[[^\]]+\]\s*$/;
+  const keyRe = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=`);
+  let inSection = false;
+
+  for (const line of lines) {
+    if (sectionRe.test(line)) {
+      inSection = true;
+      continue;
+    }
+    if (inSection && anySectionRe.test(line)) {
+      return false;
+    }
+    if (inSection && keyRe.test(line)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function appendLine(content, line, eol) {
+  if (!content) return `${line}${eol}`;
+  const normalized = content.endsWith('\n') ? content : `${content}${eol}`;
+  return `${normalized}${line}${eol}`;
+}
+
+function insertLineAfterSectionHeader(content, sectionName, line, eol) {
+  const lines = content.split(/\r?\n/);
+  const sectionRe = new RegExp(`^\\s*\\[${escapeRegExp(sectionName)}\\]\\s*$`);
+  const idx = lines.findIndex((l) => sectionRe.test(l));
+  if (idx === -1) return appendLine(content, line, eol);
+  lines.splice(idx + 1, 0, line);
+  return lines.join(eol);
+}
+
+function ensureKeyInSection(content, sectionName, key, valueLiteral, eol) {
+  let merged = content;
+  let added = false;
+
+  if (!hasSection(merged, sectionName)) {
+    merged = appendLine(merged, `[${sectionName}]`, eol);
+    merged = appendLine(merged, `${key} = ${valueLiteral}`, eol);
+    added = true;
+  } else if (!hasKeyInSection(merged, sectionName, key)) {
+    merged = insertLineAfterSectionHeader(merged, sectionName, `${key} = ${valueLiteral}`, eol);
+    added = true;
+  }
+
+  return { merged, added };
+}
+
+function parseTomlBooleanAssignment(line) {
+  const m = line.match(/=\s*(true|false)\b/i);
+  if (!m) return null;
+  return m[1].toLowerCase() === 'true';
+}
+
+function removeFeatureFlagsFromFeaturesSection(content, featureNames) {
+  const eol = content.includes('\r\n') ? '\r\n' : '\n';
+  const lines = content.split(/\r?\n/);
+  const sectionRe = /^\s*\[features\]\s*$/;
+  const anySectionRe = /^\s*\[[^\]]+\]\s*$/;
+  const assignRe = /^\s*([A-Za-z0-9_.-]+)\s*=/;
+  const featureSet = new Set(featureNames);
+  const removedEntries = [];
+
+  let inFeatures = false;
+  const kept = [];
+
+  for (const line of lines) {
+    if (sectionRe.test(line)) {
+      inFeatures = true;
+      kept.push(line);
+      continue;
+    }
+    if (inFeatures && anySectionRe.test(line)) {
+      inFeatures = false;
+      kept.push(line);
+      continue;
+    }
+    if (inFeatures) {
+      const m = line.match(assignRe);
+      if (m && featureSet.has(m[1])) {
+        removedEntries.push({ key: m[1], enabled: parseTomlBooleanAssignment(line) });
+        continue;
+      }
+    }
+    kept.push(line);
+  }
+
+  return { merged: kept.join(eol), removedEntries };
+}
+
+function uniq(values) {
+  return [...new Set(values)];
+}
+
+function cleanupLegacyCodexConfig(content) {
+  const eol = content.includes('\r\n') ? '\r\n' : '\n';
+  const toRemove = [...LEGACY_FEATURES.removed, ...LEGACY_FEATURES.deprecated];
+  const { merged: pruned, removedEntries } = removeFeatureFlagsFromFeaturesSection(content, toRemove);
+  let merged = pruned;
+  const removed = uniq(removedEntries.map((x) => x.key));
+  const migrated = [];
+
+  const deprecatedRemoved = removedEntries.filter((x) => LEGACY_FEATURES.deprecated.includes(x.key));
+  if (deprecatedRemoved.length > 0) {
+    const shouldEnableWebSearch = deprecatedRemoved.some((x) => x.enabled !== false);
+    const { merged: withTools, added } = ensureKeyInSection(
+      merged,
+      'tools',
+      'web_search',
+      shouldEnableWebSearch ? 'true' : 'false',
+      eol
+    );
+    merged = withTools;
+    if (added) migrated.push(`tools.web_search=${shouldEnableWebSearch ? 'true' : 'false'}`);
+  }
+
+  return { merged, removed, migrated };
+}
+
+function mergeCodexConfigDefaults(content) {
+  const eol = content.includes('\r\n') ? '\r\n' : '\n';
+  let merged = content;
+  const added = [];
+
+  if (!hasTopLevelKey(merged, 'sandbox_mode')) {
+    merged = appendLine(merged, `sandbox_mode = "${CODEX_DEFAULTS.sandboxMode}"`, eol);
+    added.push('sandbox_mode');
+  }
+
+  if (!hasSection(merged, 'features')) {
+    merged = appendLine(merged, '[features]', eol);
+    merged = appendLine(merged, `${CODEX_DEFAULTS.featureFlag} = true`, eol);
+    added.push('features.multi_agent');
+  } else if (!hasKeyInSection(merged, 'features', CODEX_DEFAULTS.featureFlag)) {
+    merged = insertLineAfterSectionHeader(merged, 'features', `${CODEX_DEFAULTS.featureFlag} = true`, eol);
+    added.push('features.multi_agent');
+  }
+
+  return { merged, added };
+}
+
+function patchCodexConfig(cfgPath) {
+  const raw = fs.readFileSync(cfgPath, 'utf8');
+  const { merged: cleaned, removed, migrated } = cleanupLegacyCodexConfig(raw);
+  const { merged, added } = mergeCodexConfigDefaults(cleaned);
+  if (merged !== raw) fs.writeFileSync(cfgPath, merged);
+  return { added, removed, migrated };
+}
+
+function patchCodexConfigDefaults(cfgPath) {
+  return patchCodexConfig(cfgPath).added;
+}
+
+function patchAndReportCodexDefaults({ cfgPath, ok, warn }) {
+  try {
+    const { added, removed, migrated } = patchCodexConfig(cfgPath);
+    const changes = [];
+    if (added.length > 0) changes.push(`补全默认项: ${added.join(', ')}`);
+    if (removed.length > 0) changes.push(`清理过时项: ${removed.join(', ')}`);
+    if (migrated.length > 0) changes.push(`迁移配置: ${migrated.join(', ')}`);
+    if (changes.length > 0) ok(`config.toml 已存在，${changes.join('；')}`);
+    else ok('config.toml 已存在');
+  } catch (e) {
+    warn(`config.toml 读取失败，跳过补全: ${e.message}`);
+  }
+}
+
 function detectCodexAuth({
   HOME,
   env = process.env,
@@ -68,7 +275,7 @@ async function postCodex({
         warn('请编辑 base_url 和 model');
       }
     } else {
-      ok('config.toml 已存在');
+      patchAndReportCodexDefaults({ cfgPath, ok, warn });
     }
     return;
   }
@@ -85,13 +292,16 @@ async function postCodex({
       }
     }
   } else {
-    ok('config.toml 已存在');
+    patchAndReportCodexDefaults({ cfgPath, ok, warn });
   }
 }
 
 module.exports = {
+  cleanupLegacyCodexConfig,
+  mergeCodexConfigDefaults,
+  patchCodexConfig,
+  patchCodexConfigDefaults,
   detectCodexAuth,
   getCodexCoreFiles,
   postCodex,
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-abyss",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "邪修红尘仙·宿命深渊 - 一键为 Claude Code / Codex CLI 注入邪修人格与安全工程知识体系",
   "keywords": [
     "claude",