From 5742e0ba1e0f48aa46e52ffd6df20b4538d7a49e Mon Sep 17 00:00:00 2001
From: Rat <261020116+Rat0323@users.noreply.github.com>
Date: Fri, 31 Jul 2026 12:06:26 +0800
Subject: [PATCH 1/2] Fix provider-specific goals feature overrides

---
 Cargo.lock                                    |   1 +
 apps/codex-plus-manager/src-tauri/Cargo.toml  |   1 +
 .../src-tauri/src/commands.rs                 |  53 +++++++-
 apps/codex-plus-manager/src/App.tsx           | 117 ++++++++----------
 .../src/goals-config.test.ts                  |  64 ++++++++++
 apps/codex-plus-manager/src/goals-config.ts   |  97 +++++++++++++++
 apps/codex-plus-manager/src/i18n-en.ts        |   1 +
 crates/codex-plus-core/src/relay_config.rs    |  38 ++++++
 8 files changed, 309 insertions(+), 63 deletions(-)
 create mode 100644 apps/codex-plus-manager/src/goals-config.test.ts
 create mode 100644 apps/codex-plus-manager/src/goals-config.ts

diff --git a/Cargo.lock b/Cargo.lock
index c7bc80953..441ca5803 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -492,6 +492,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-dialog",
  "tempfile",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
diff --git a/apps/codex-plus-manager/src-tauri/Cargo.toml b/apps/codex-plus-manager/src-tauri/Cargo.toml
index df31990d5..206648b33 100644
--- a/apps/codex-plus-manager/src-tauri/Cargo.toml
+++ b/apps/codex-plus-manager/src-tauri/Cargo.toml
@@ -23,6 +23,7 @@ serde.workspace = true
 serde_json.workspace = true
 tauri = { version = "2", features = ["protocol-asset", "custom-protocol", "tray-icon"] }
 tauri-plugin-dialog = "2"
+toml_edit.workspace = true
 
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
diff --git a/apps/codex-plus-manager/src-tauri/src/commands.rs b/apps/codex-plus-manager/src-tauri/src/commands.rs
index fa76094e1..09121c4c1 100644
--- a/apps/codex-plus-manager/src-tauri/src/commands.rs
+++ b/apps/codex-plus-manager/src-tauri/src/commands.rs
@@ -1627,6 +1627,7 @@ fn normalize_settings_before_save(mut settings: BackendSettings) -> BackendSetti
             if !profile.use_common_config || profile.config_contents.trim().is_empty() {
                 continue;
             }
+            let goals_override = relay_config_goals_value(&profile.config_contents);
             match codex_plus_core::relay_config::strip_common_config_from_config(
                 &profile.config_contents,
                 &common_config,
@@ -1640,6 +1641,10 @@ fn normalize_settings_before_save(mut settings: BackendSettings) -> BackendSetti
                         strip_common_config_text_fallback(&profile.config_contents, &common_config);
                 }
             }
+            if let Some(enabled) = goals_override {
+                profile.config_contents =
+                    relay_config_set_goals_override(&profile.config_contents, enabled);
+            }
         }
     }
     settings.provider_sync_saved_providers =
@@ -1653,6 +1658,30 @@ fn normalize_settings_before_save(mut settings: BackendSettings) -> BackendSetti
     settings
 }
 
+fn relay_config_goals_value(config: &str) -> Option<bool> {
+    let doc = config.parse::<toml_edit::DocumentMut>().ok()?;
+    doc.get("features")?
+        .as_table_like()?
+        .get("goals")?
+        .as_bool()
+}
+
+fn relay_config_set_goals_override(config: &str, enabled: bool) -> String {
+    let Ok(mut doc) = config.parse::<toml_edit::DocumentMut>() else {
+        return config.to_string();
+    };
+    if !doc.as_table().contains_key("features")
+        || doc
+            .get("features")
+            .and_then(toml_edit::Item::as_table_like)
+            .is_none()
+    {
+        doc["features"] = toml_edit::table();
+    }
+    doc["features"]["goals"] = toml_edit::value(enabled);
+    codex_plus_core::relay_config::normalize_config_text(&doc.to_string())
+}
+
 fn normalize_provider_sync_provider_list(values: Vec<String>) -> Vec<String> {
     let mut seen = std::collections::HashSet::new();
     let mut result = Vec::new();
@@ -5144,10 +5173,32 @@ enabled = true
 
         assert!(config.contains("model = \"gpt-5\""));
         assert!(!config.contains("model_reasoning_effort"));
-        assert!(!config.contains("[features]"));
+        // `goals` is an explicit per-profile override and must survive
+        // normalization even when it matches the common configuration.
+        assert!(config.contains("[features]"));
+        assert!(config.contains("goals = true"));
         assert!(!config.contains("[plugins.\"superpowers@openai-curated\"]"));
     }
 
+    #[test]
+    fn normalize_settings_before_save_preserves_explicit_false_goals_override() {
+        let settings = BackendSettings {
+            relay_common_config_contents: "[features]\ngoals = true\nfast_mode = true\n"
+                .to_string(),
+            relay_profiles: vec![RelayProfile {
+                use_common_config: true,
+                config_contents: "model = \"gpt-5\"\n[features]\ngoals = false\n".to_string(),
+                ..RelayProfile::default()
+            }],
+            ..BackendSettings::default()
+        };
+
+        let normalized = normalize_settings_before_save(settings);
+        let config = &normalized.relay_profiles[0].config_contents;
+        assert!(config.contains("goals = false"));
+        assert!(!config.contains("fast_mode = true"));
+    }
+
     #[test]
     fn normalize_settings_before_save_repairs_invalid_profile_common_duplication() {
         let settings = BackendSettings {
diff --git a/apps/codex-plus-manager/src/App.tsx b/apps/codex-plus-manager/src/App.tsx
index b41a66b31..3c820d1da 100644
--- a/apps/codex-plus-manager/src/App.tsx
+++ b/apps/codex-plus-manager/src/App.tsx
@@ -73,6 +73,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
+import { codexGoalsFeatureState, setCodexGoalsFeatureInConfig } from "./goals-config";
 import { isGitHubRepositoryHomepage } from "./github-repository";
 import {
   mergeModelWindowRows,
@@ -5663,6 +5664,11 @@ function RelayProfileEditor({
   }
 
   const showApiFields = profile.relayMode !== "official" || profile.officialMixApiKey;
+  const goalsFeatureState = codexGoalsFeatureState(
+    profile.configContents,
+    form.relayCommonConfigContents,
+    profile.useCommonConfig,
+  );
   const sub2apiBaseUrl = profile.upstreamBaseUrl.trim() || profile.baseUrl.trim();
   const canFetchSub2ApiRate = profile.sub2apiEnabled && Boolean(sub2apiBaseUrl && profile.apiKey.trim());
   const updateDraft = (patch: Partial<RelayProfile>) => {
@@ -5760,7 +5766,7 @@ function RelayProfileEditor({
         <Field className="relay-field-goals" label={t("Codex 目标")}>
           <label className="inline-check">
             <input
-              checked={configHasCodexGoalsFeature(profile.configContents)}
+              checked={goalsFeatureState.enabled}
               onChange={(event) =>
                 updateDraft({
                   configContents: setCodexGoalsFeatureInConfig(profile.configContents, event.currentTarget.checked),
@@ -5770,6 +5776,9 @@ function RelayProfileEditor({
             />
             <span>{t("启用目标功能")}</span>
           </label>
+          {goalsFeatureState.inherited ? (
+            <p className="field-hint">{t("当前继承公共配置；修改后将为该供应商保存独立设置。")}</p>
+          ) : null}
         </Field>
         <div className="relay-advanced-toggle">
           <Button
@@ -7422,76 +7431,60 @@ function filterContextEntriesBySelection(entries: CodexContextEntries, selection
   };
 }
 
-function configHasCodexGoalsFeature(configContents: string): boolean {
-  let inFeatures = false;
-  for (const line of configContents.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (/^\[features\]$/.test(trimmed)) {
-      inFeatures = true;
-      continue;
-    }
-    if (inFeatures && /^\[[^\]]+\]$/.test(trimmed)) {
-      inFeatures = false;
-    }
-    if (inFeatures && /^goals\s*=\s*true\b/.test(trimmed)) {
-      return true;
-    }
-  }
-  return false;
+function effectiveRelayConfigPreview(profile: RelayProfile, settings: BackendSettings, contextProfile = profile): string {
+  const entries = contextEntriesForProfile(settings, contextProfile);
+  const isolatedConfig = stripContextEntriesFromConfig(profile.configContents, entries);
+  const configWithLimits = applyContextLimitPreview(isolatedConfig, profile);
+  const profileAndCommon = mergeFeaturesTableForPreview(configWithLimits, settings.relayCommonConfigContents || "");
+  return joinTomlSectionsRootFirst([profileAndCommon, selectedContextConfigToml(entries)]);
 }
 
-function setCodexGoalsFeatureInConfig(configContents: string, enabled: boolean): string {
-  const lines = configContents.split(/\r?\n/);
-  const next: string[] = [];
-  let inFeatures = false;
-  let sawFeatures = false;
-  let featuresHasGoals = false;
+function mergeFeaturesTableForPreview(profileConfig: string, commonConfig: string): string {
+  const profile = splitFeaturesTable(profileConfig);
+  const common = splitFeaturesTable(commonConfig);
+  if (!profile.body && !common.body) return joinTomlSectionsRootFirst([profileConfig, commonConfig]);
 
-  const maybeInsertGoals = () => {
-    if (enabled && sawFeatures && !featuresHasGoals) {
-      next.push("goals = true");
-      featuresHasGoals = true;
-    }
-  };
+  const profileKeys = new Set(tomlAssignmentKeys(profile.body));
+  const commonBody = common.body
+    .split(/\r?\n/)
+    .filter((line) => {
+      const key = tomlAssignmentKey(line);
+      return !key || !profileKeys.has(key);
+    })
+    .join("\n");
+  const mergedFeatures = ["[features]", commonBody, profile.body]
+    .filter((part) => part.trim())
+    .join("\n");
+  return joinTomlSectionsRootFirst([
+    profile.without,
+    common.without,
+    mergedFeatures,
+  ]);
+}
 
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (/^\[features\]$/.test(trimmed)) {
-      if (inFeatures) maybeInsertGoals();
-      inFeatures = true;
-      sawFeatures = true;
-      featuresHasGoals = false;
-      next.push(line);
-      continue;
-    }
-    if (inFeatures && /^\[[^\]]+\]$/.test(trimmed)) {
-      maybeInsertGoals();
-      inFeatures = false;
-    }
-    if (inFeatures && /^goals\s*=/.test(trimmed)) {
-      if (enabled && !featuresHasGoals) {
-        next.push("goals = true");
-        featuresHasGoals = true;
-      }
-      continue;
+function splitFeaturesTable(contents: string): { without: string; body: string } {
+  const lines = contents.trim().split(/\r?\n/);
+  const start = lines.findIndex((line) => line.trim() === "[features]");
+  if (start < 0) return { without: contents, body: "" };
+  let end = lines.length;
+  for (let index = start + 1; index < lines.length; index += 1) {
+    if (/^\s*\[[^\]]+\]\s*$/.test(lines[index])) {
+      end = index;
+      break;
     }
-    next.push(line);
-  }
-
-  if (inFeatures) maybeInsertGoals();
-  if (enabled && !sawFeatures) {
-    const trimmed = ensureTrailingNewline(next.join("\n").trimEnd());
-    return joinTomlSections([trimmed, "[features]\ngoals = true"]);
   }
+  return {
+    without: [...lines.slice(0, start), ...lines.slice(end)].join("\n"),
+    body: lines.slice(start + 1, end).join("\n"),
+  };
+}
 
-  return ensureTrailingNewline(next.join("\n").trimEnd());
+function tomlAssignmentKey(line: string): string | undefined {
+  return /^\s*([A-Za-z0-9_-]+)\s*=/.exec(line)?.[1];
 }
 
-function effectiveRelayConfigPreview(profile: RelayProfile, settings: BackendSettings, contextProfile = profile): string {
-  const entries = contextEntriesForProfile(settings, contextProfile);
-  const isolatedConfig = stripContextEntriesFromConfig(profile.configContents, entries);
-  const configWithLimits = applyContextLimitPreview(isolatedConfig, profile);
-  return joinTomlSectionsRootFirst([configWithLimits, settings.relayCommonConfigContents || "", selectedContextConfigToml(entries)]);
+function tomlAssignmentKeys(contents: string): string[] {
+  return contents.split(/\r?\n/).map(tomlAssignmentKey).filter((key): key is string => Boolean(key));
 }
 
 function selectedContextConfigToml(entries: CodexContextEntries): string {
diff --git a/apps/codex-plus-manager/src/goals-config.test.ts b/apps/codex-plus-manager/src/goals-config.test.ts
new file mode 100644
index 000000000..28542f536
--- /dev/null
+++ b/apps/codex-plus-manager/src/goals-config.test.ts
@@ -0,0 +1,64 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  codexGoalsFeatureState,
+  codexGoalsFeatureValue,
+  setCodexGoalsFeatureInConfig,
+} from "./goals-config.ts";
+
+test("reads explicit goals values only from the features table", () => {
+  assert.equal(codexGoalsFeatureValue("[features]\ngoals = true\n"), true);
+  assert.equal(codexGoalsFeatureValue("[features]\ngoals = false\n"), false);
+  assert.equal(codexGoalsFeatureValue("[features.other]\ngoals = true\n"), undefined);
+});
+
+test("uses an explicit common goals value when the profile has no override", () => {
+  assert.deepEqual(
+    codexGoalsFeatureState("", "[features]\ngoals = true\n", true),
+    { enabled: true, inherited: true },
+  );
+  assert.deepEqual(
+    codexGoalsFeatureState("", "[features]\ngoals = false\n", true),
+    { enabled: false, inherited: true },
+  );
+});
+
+test("profile goals value overrides common config", () => {
+  assert.deepEqual(
+    codexGoalsFeatureState("[features]\ngoals = false\n", "[features]\ngoals = true\n", true),
+    { enabled: false, inherited: false },
+  );
+  assert.deepEqual(
+    codexGoalsFeatureState("[features]\ngoals = true\n", "[features]\ngoals = false\n", true),
+    { enabled: true, inherited: false },
+  );
+});
+
+test("uses the profile value when common config has no goals value", () => {
+  assert.deepEqual(
+    codexGoalsFeatureState("[features]\ngoals = true\n", "[features]\nfast_mode = true\n", true),
+    { enabled: true, inherited: false },
+  );
+});
+
+test("ignores common goals when common config is disabled", () => {
+  assert.deepEqual(
+    codexGoalsFeatureState("", "[features]\ngoals = true\n", false),
+    { enabled: false, inherited: false },
+  );
+});
+
+test("writes explicit true and false overrides without changing unrelated feature values", () => {
+  const enabled = setCodexGoalsFeatureInConfig("[features]\nfast_mode = true\n", true);
+  assert.equal(codexGoalsFeatureValue(enabled), true);
+  assert.match(enabled, /fast_mode = true/);
+
+  const disabled = setCodexGoalsFeatureInConfig(enabled, false);
+  assert.equal(disabled, "[features]\ngoals = false\nfast_mode = true\n");
+  assert.equal(codexGoalsFeatureValue(disabled), false);
+});
+
+test("creates a features table for an explicit false override", () => {
+  assert.equal(setCodexGoalsFeatureInConfig('model = "gpt-5"\n', false), 'model = "gpt-5"\n\n[features]\ngoals = false\n');
+});
diff --git a/apps/codex-plus-manager/src/goals-config.ts b/apps/codex-plus-manager/src/goals-config.ts
new file mode 100644
index 000000000..b60728fdb
--- /dev/null
+++ b/apps/codex-plus-manager/src/goals-config.ts
@@ -0,0 +1,97 @@
+export type CodexGoalsFeatureState = {
+  enabled: boolean;
+  inherited: boolean;
+};
+
+export function codexGoalsFeatureValue(configContents: string): boolean | undefined {
+  let inFeatures = false;
+  for (const line of configContents.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (/^\[features\]$/.test(trimmed)) {
+      inFeatures = true;
+      continue;
+    }
+    if (inFeatures && /^\[[^\]]+\]$/.test(trimmed)) {
+      inFeatures = false;
+    }
+    if (inFeatures) {
+      const match = /^goals\s*=\s*(true|false)\b/.exec(trimmed);
+      if (match) return match[1] === "true";
+    }
+  }
+  return undefined;
+}
+
+export function codexGoalsFeatureState(
+  profileConfigContents: string,
+  commonConfigContents: string,
+  useCommonConfig: boolean,
+): CodexGoalsFeatureState {
+  const profileValue = codexGoalsFeatureValue(profileConfigContents);
+  if (profileValue !== undefined) {
+    return { enabled: profileValue, inherited: false };
+  }
+  const commonValue = useCommonConfig ? codexGoalsFeatureValue(commonConfigContents) : undefined;
+  if (commonValue !== undefined) {
+    return { enabled: commonValue, inherited: true };
+  }
+  return { enabled: false, inherited: false };
+}
+
+export function setCodexGoalsFeatureInConfig(configContents: string, enabled: boolean): string {
+  const lines = configContents.split(/\r?\n/);
+  const next: string[] = [];
+  let inFeatures = false;
+  let sawFeatures = false;
+  let featuresHasGoals = false;
+  let featuresHeaderIndex = -1;
+
+  const maybeInsertGoals = () => {
+    if (sawFeatures && !featuresHasGoals) {
+      next.splice(featuresHeaderIndex + 1, 0, `goals = ${enabled ? "true" : "false"}`);
+      featuresHasGoals = true;
+    }
+  };
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (/^\[features\]$/.test(trimmed)) {
+      if (inFeatures) maybeInsertGoals();
+      inFeatures = true;
+      sawFeatures = true;
+      featuresHasGoals = false;
+      next.push(line);
+      featuresHeaderIndex = next.length - 1;
+      continue;
+    }
+    if (inFeatures && /^\[[^\]]+\]$/.test(trimmed)) {
+      maybeInsertGoals();
+      inFeatures = false;
+    }
+    if (inFeatures && /^goals\s*=/.test(trimmed)) {
+      if (!featuresHasGoals) {
+        next.push(`goals = ${enabled ? "true" : "false"}`);
+        featuresHasGoals = true;
+      }
+      continue;
+    }
+    next.push(line);
+  }
+
+  if (inFeatures) maybeInsertGoals();
+  if (!sawFeatures) {
+    const trimmed = ensureTrailingNewline(next.join("\n").trimEnd());
+    return joinTomlSections([trimmed, `[features]\ngoals = ${enabled ? "true" : "false"}`]);
+  }
+
+  return ensureTrailingNewline(next.join("\n").trimEnd());
+}
+
+function ensureTrailingNewline(value: string): string {
+  return value.endsWith("\n") ? value : `${value}\n`;
+}
+
+function joinTomlSections(sections: string[]): string {
+  const normalized = sections.map((section) => section.trim()).filter(Boolean);
+  return normalized.length ? `${normalized.join("\n\n")}\n` : "";
+}
diff --git a/apps/codex-plus-manager/src/i18n-en.ts b/apps/codex-plus-manager/src/i18n-en.ts
index 4199b9e91..2afe2d483 100644
--- a/apps/codex-plus-manager/src/i18n-en.ts
+++ b/apps/codex-plus-manager/src/i18n-en.ts
@@ -370,6 +370,7 @@ export const EN_PLAIN: Record<string, string> = {
   "启用供应商配置切换": "Enable provider configuration switching",
   "启用此扩展项": "Enable this entry",
   "启用目标功能": "Enable goals feature",
+  "当前继承公共配置；修改后将为该供应商保存独立设置。": "Currently inherited from the common configuration; changing it saves a provider-specific override.",
   "图片": "Image",
   "图片覆盖层": "Image overlay",
   "在会话列表悬停显示删除按钮，并支持撤销。": "Show a delete button on hover in the session list, with undo support.",
diff --git a/crates/codex-plus-core/src/relay_config.rs b/crates/codex-plus-core/src/relay_config.rs
index 77409d0b1..f22dba566 100644
--- a/crates/codex-plus-core/src/relay_config.rs
+++ b/crates/codex-plus-core/src/relay_config.rs
@@ -832,8 +832,16 @@ pub fn merge_common_config_into_config(
     }
 
     let mut target_doc = parse_toml_document(config_text)?;
+    let profile_goals_override = target_doc
+        .get("features")
+        .and_then(Item::as_table_like)
+        .and_then(|features| features.get("goals"))
+        .and_then(Item::as_bool);
     let source_doc = parse_toml_document(trimmed)?;
     merge_toml_table_like(target_doc.as_table_mut(), source_doc.as_table());
+    if let Some(enabled) = profile_goals_override {
+        table_mut_or_insert(&mut target_doc, "features")?["goals"] = toml_edit::value(enabled);
+    }
     Ok(normalize_optional_toml(target_doc))
 }
 
@@ -2679,6 +2687,36 @@ fn account_label_from_jwt(token: &str) -> Option<String> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn merge_common_config_preserves_explicit_profile_goals_override() {
+        let disabled = merge_common_config_into_config(
+            "[features]\ngoals = false\n",
+            "[features]\ngoals = true\nfast_mode = true\n",
+        )
+        .unwrap();
+        let disabled_doc = disabled.parse::<DocumentMut>().unwrap();
+        assert_eq!(disabled_doc["features"]["goals"].as_bool(), Some(false));
+        assert_eq!(disabled_doc["features"]["fast_mode"].as_bool(), Some(true));
+
+        let enabled = merge_common_config_into_config(
+            "[features]\ngoals = true\n",
+            "[features]\ngoals = false\nfast_mode = true\n",
+        )
+        .unwrap();
+        let enabled_doc = enabled.parse::<DocumentMut>().unwrap();
+        assert_eq!(enabled_doc["features"]["goals"].as_bool(), Some(true));
+        assert_eq!(enabled_doc["features"]["fast_mode"].as_bool(), Some(true));
+    }
+
+    #[test]
+    fn merge_common_config_uses_common_goals_without_profile_override() {
+        let merged =
+            merge_common_config_into_config("model = \"gpt-5\"\n", "[features]\ngoals = true\n")
+                .unwrap();
+        let doc = merged.parse::<DocumentMut>().unwrap();
+        assert_eq!(doc["features"]["goals"].as_bool(), Some(true));
+    }
+
     #[test]
     fn backfill_relay_profile_from_home_with_common_restores_template_provider_id() {
         let temp = tempfile::tempdir().unwrap();

From 0c6df97a6b2bafdf9fef64b7a663aad6eae3acf3 Mon Sep 17 00:00:00 2001
From: Rat <261020116+Rat0323@users.noreply.github.com>
Date: Fri, 31 Jul 2026 13:10:20 +0800
Subject: [PATCH 2/2] Preserve byte-exact theme asset line endings

---
 .gitattributes | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 561487b9d..b068cace9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,13 @@
 assets/inject/upstream/snow-skin/*.js text eol=lf
 assets/inject/upstream/snow-skin/*.css text eol=lf
 
+# Keep all byte-exact theme assets identical on Windows checkouts.
+assets/inject/upstream/*/windows/*.js text eol=lf
+assets/inject/upstream/*/windows/*.css text eol=lf
+assets/inject/upstream/*/*.js text eol=lf
+assets/inject/upstream/*/*.css text eol=lf
+assets/inject/upstream/skin-packs/packs/*/theme.json text eol=lf
+
 # Keep byte-exact macOS theme assets identical on every checkout platform.
 assets/inject/upstream/*/macos/*.js text eol=lf
 assets/inject/upstream/*/macos/*.css text eol=lf