From 99bbe512f882af64067e268314d42ec5e4003702 Mon Sep 17 00:00:00 2001
From: Yuimi-chaya <Yuimi-chaya@users.noreply.github.com>
Date: Tue, 7 Jul 2026 02:22:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20goal=20resume=20guard=20/=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=AE=E6=A0=87=E7=BB=AD=E8=B7=91=E4=BF=9D?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

中文说明:

新增可选的目标续跑保护开关。开启后，Codex++ 会在检测到 Codex goal 上下文的 Responses 请求中追加轻量保护提示，要求恢复时优先当前 active goal 和 checkpoint 文件，避免压缩后把旧手动引导或旧目标结果当成新任务。

保护提示会要求读取 .codexpp-goal-state.md 或 GOAL_STATE.md，并在长任务中按小批次或阶段及时更新 checkpoint，减少中断、压缩或隔天恢复时重复执行旧步骤。

本提交同时补齐管理器设置、英文 i18n、设置保存/合并，以及目标检测和去重单测。另同步上游 rustfmt 对 cdp_bridge.rs 的一处格式化，保证 cargo fmt --check 可通过。

English Summary:

Add an optional goal resume guard. When enabled, Codex++ appends a lightweight guard instruction to Responses requests that contain Codex goal context, so resumed work prefers the current active goal and checkpoint files instead of replaying stale manual steering or old goal results.

The guard asks Codex to read .codexpp-goal-state.md or GOAL_STATE.md and to update checkpoints after meaningful small batches or completed stages during long-running goals, reducing duplicated work after compaction, interruption, or later resume.

This commit also wires the manager setting, English i18n, settings persistence/merge behavior, goal-context detection, de-duplication tests, and one upstream rustfmt-only cdp_bridge.rs formatting sync needed for cargo fmt --check.
---
 apps/codex-plus-manager/src/App.tsx          |  18 +-
 apps/codex-plus-manager/src/i18n-en.ts       |   3 +
 crates/codex-plus-core/src/protocol_proxy.rs | 167 ++++++++++++++++++-
 crates/codex-plus-core/src/settings.rs       |   7 +
 crates/codex-plus-core/tests/cdp_bridge.rs   |   4 +-
 tools/i18n-keys.json                         |   2 +
 6 files changed, 198 insertions(+), 3 deletions(-)

diff --git a/apps/codex-plus-manager/src/App.tsx b/apps/codex-plus-manager/src/App.tsx
index 0d9ac577e..391d9f190 100644
--- a/apps/codex-plus-manager/src/App.tsx
+++ b/apps/codex-plus-manager/src/App.tsx
@@ -171,6 +171,7 @@ type BackendSettings = {
   codexAppImageOverlayPath: string;
   codexAppImageOverlayOpacity: number;
   codexGoalsEnabled: boolean;
+  codexAppGoalResumeGuard: boolean;
   launchMode: LaunchMode;
   relayBaseUrl: string;
   relayApiKey: string;
@@ -691,6 +692,7 @@ const defaultSettings: BackendSettings = {
   codexAppImageOverlayPath: "",
   codexAppImageOverlayOpacity: 35,
   codexGoalsEnabled: false,
+  codexAppGoalResumeGuard: false,
   launchMode: "patch",
   relayBaseUrl: "",
   relayApiKey: "",
@@ -3916,7 +3918,7 @@ function RelayProfileDetail({
           </Button>
         </Toolbar>
       </div>
-        <RelayProfileEditor profile={draft} form={form} isNew={isNew} onProfileChange={setDraft} onSwitch={switchDraft} actions={actions} modelWindowRows={modelWindowRows} setModelWindowRows={setModelWindowRows} />
+        <RelayProfileEditor profile={draft} form={form} isNew={isNew} onFormChange={onFormChange} onProfileChange={setDraft} onSwitch={switchDraft} actions={actions} modelWindowRows={modelWindowRows} setModelWindowRows={setModelWindowRows} />
       {isAggregateRelayProfile(draft) ? null : (
       <RelayFileEditors
         contextProfile={profile}
@@ -3966,6 +3968,7 @@ function RelayProfileEditor({
   profile,
   form,
   isNew = false,
+  onFormChange,
   onProfileChange,
   onSwitch,
   actions,
@@ -3975,6 +3978,7 @@ function RelayProfileEditor({
   profile: RelayProfile;
   form: BackendSettings;
   isNew?: boolean;
+  onFormChange: (value: BackendSettings) => void;
   onProfileChange: (value: RelayProfile) => void;
   onSwitch: () => void;
   actions: Actions;
@@ -4095,6 +4099,17 @@ function RelayProfileEditor({
             />
             <span>{t("启用目标功能")}</span>
           </label>
+          <label className="inline-check">
+            <input
+              checked={form.codexAppGoalResumeGuard}
+              onChange={(event) => onFormChange({ ...form, codexAppGoalResumeGuard: event.currentTarget.checked })}
+              type="checkbox"
+            />
+            <span>{t("启用目标续跑保护")}</span>
+          </label>
+          <p className="field-hint">
+            {t("检测到目标上下文时，Codex++ 会在中转请求中追加续跑保护提示，减少压缩后重做旧任务。")}
+          </p>
         </Field>
         <div className="relay-advanced-toggle">
           <Button
@@ -5960,6 +5975,7 @@ function normalizeSettings(settings: BackendSettings): BackendSettings {
     ...settings,
     relayProfilesEnabled: settings.relayProfilesEnabled !== false,
     computerUseGuardEnabled: settings.computerUseGuardEnabled === true,
+    codexAppGoalResumeGuard: settings.codexAppGoalResumeGuard === true,
     codexAppImageOverlayOpacity: clampNumber(settings.codexAppImageOverlayOpacity || 35, 1, 100),
     codexAppStepwiseMaxItems: clampNumber(settings.codexAppStepwiseMaxItems ?? 6, 0, 6),
     codexAppStepwiseMaxInputChars: clampNumber(settings.codexAppStepwiseMaxInputChars || 6000, 1000, 24000),
diff --git a/apps/codex-plus-manager/src/i18n-en.ts b/apps/codex-plus-manager/src/i18n-en.ts
index 70af45e24..b979969cc 100644
--- a/apps/codex-plus-manager/src/i18n-en.ts
+++ b/apps/codex-plus-manager/src/i18n-en.ts
@@ -220,6 +220,9 @@ export const EN_PLAIN: Record<string, string> = {
   "启用供应商配置切换": "Enable provider configuration switching",
   "启用此扩展项": "Enable this entry",
   "启用目标功能": "Enable goals feature",
+  "启用目标续跑保护": "Enable goal resume guard",
+  "检测到目标上下文时，Codex++ 会在中转请求中追加续跑保护提示，减少压缩后重做旧任务。":
+    "When goal context is detected, Codex++ appends a resume guard prompt to relay requests to reduce redoing old tasks after compaction.",
   "图片": "Image",
   "图片覆盖层": "Image overlay",
   "在会话列表悬停显示删除按钮，并支持撤销。": "Show a delete button on hover in the session list, with undo support.",
diff --git a/crates/codex-plus-core/src/protocol_proxy.rs b/crates/codex-plus-core/src/protocol_proxy.rs
index 94178394a..a824c7ea1 100644
--- a/crates/codex-plus-core/src/protocol_proxy.rs
+++ b/crates/codex-plus-core/src/protocol_proxy.rs
@@ -18,6 +18,18 @@ const UPSTREAM_HEADER_TIMEOUT: Duration = Duration::from_secs(30);
 const UPSTREAM_STREAM_HEADER_TIMEOUT: Duration = Duration::from_secs(120);
 const THINK_OPEN_TAG: &str = "<think>";
 const THINK_CLOSE_TAG: &str = "</think>";
+const GOAL_RESUME_GUARD_MARKER: &str = "Codex++ Goal Resume Guard";
+const GOAL_RESUME_GUARD_INSTRUCTION: &str = concat!(
+    "Codex++ Goal Resume Guard:\n",
+    "When continuing an active Codex goal after compaction or resume, do not replay older manual ",
+    "steer messages as a fresh task. Treat the newest active goal checkpoint as authoritative. ",
+    "If the workspace contains .codexpp-goal-state.md or GOAL_STATE.md, read it before acting ",
+    "and follow its objective, completed, current_next_step, blockers, do_not_redo, and ",
+    "last_completed_turn_id fields. For long-running goals, update the checkpoint file after ",
+    "each meaningful small batch or completed stage before continuing, so a later resume has ",
+    "the latest progress. If no checkpoint file exists, continue from the newest goal context ",
+    "and avoid redoing completed work unless the user explicitly asks."
+);
 const EXTRA_CHAT_PASSTHROUGH_FIELDS: &[&str] = &[
     "frequency_penalty",
     "logit_bias",
@@ -497,7 +509,10 @@ async fn open_responses_proxy_request_with_settings_and_user_agent(
     settings: crate::settings::BackendSettings,
     original_user_agent: Option<&str>,
 ) -> anyhow::Result<UpstreamProxyResponse> {
-    let request_json: Value = serde_json::from_str(body)?;
+    let mut request_json: Value = serde_json::from_str(body)?;
+    if settings.codex_app_goal_resume_guard {
+        request_json = apply_goal_resume_guard_to_request(request_json);
+    }
     let is_stream = request_json
         .get("stream")
         .and_then(Value::as_bool)
@@ -789,6 +804,88 @@ fn conversation_id_from_responses_request(body: &Value) -> Option<String> {
     None
 }
 
+fn apply_goal_resume_guard_to_request(mut request_json: Value) -> Value {
+    if !request_has_goal_context(&request_json)
+        || value_contains_text(&request_json, GOAL_RESUME_GUARD_MARKER)
+    {
+        return request_json;
+    }
+
+    let Some(object) = request_json.as_object_mut() else {
+        return request_json;
+    };
+    append_goal_resume_guard_instruction(object);
+    request_json
+}
+
+fn append_goal_resume_guard_instruction(object: &mut serde_json::Map<String, Value>) {
+    match object.get_mut("instructions") {
+        Some(Value::String(text)) => {
+            if !text.trim().is_empty() {
+                text.push_str("\n\n");
+            }
+            text.push_str(GOAL_RESUME_GUARD_INSTRUCTION);
+        }
+        Some(Value::Array(parts)) => {
+            parts.push(json!({
+                "type": "input_text",
+                "text": GOAL_RESUME_GUARD_INSTRUCTION
+            }));
+        }
+        Some(other) => {
+            let existing = instruction_text(other);
+            let next = if existing.trim().is_empty() {
+                GOAL_RESUME_GUARD_INSTRUCTION.to_string()
+            } else {
+                format!("{existing}\n\n{GOAL_RESUME_GUARD_INSTRUCTION}")
+            };
+            object.insert("instructions".to_string(), Value::String(next));
+        }
+        None => {
+            object.insert(
+                "instructions".to_string(),
+                Value::String(GOAL_RESUME_GUARD_INSTRUCTION.to_string()),
+            );
+        }
+    }
+}
+
+fn request_has_goal_context(value: &Value) -> bool {
+    match value {
+        Value::Object(object) => {
+            let source = object.get("source").and_then(Value::as_str).unwrap_or("");
+            let kind = object.get("type").and_then(Value::as_str).unwrap_or("");
+            if source.eq_ignore_ascii_case("goal")
+                || kind.eq_ignore_ascii_case("thread_goal")
+                || kind.eq_ignore_ascii_case("goal")
+            {
+                return true;
+            }
+            object.values().any(request_has_goal_context)
+        }
+        Value::Array(items) => items.iter().any(request_has_goal_context),
+        Value::String(text) => text_mentions_goal_context(text),
+        _ => false,
+    }
+}
+
+fn text_mentions_goal_context(text: &str) -> bool {
+    let lower = text.to_ascii_lowercase();
+    (lower.contains("codex_internal_context") && lower.contains("source") && lower.contains("goal"))
+        || lower.contains("thread_goal_updated")
+}
+
+fn value_contains_text(value: &Value, needle: &str) -> bool {
+    match value {
+        Value::String(text) => text.contains(needle),
+        Value::Array(items) => items.iter().any(|item| value_contains_text(item, needle)),
+        Value::Object(object) => object
+            .values()
+            .any(|item| value_contains_text(item, needle)),
+        _ => false,
+    }
+}
+
 fn effective_user_agent(configured_user_agent: &str, original_user_agent: Option<&str>) -> String {
     let configured_user_agent = configured_user_agent.trim();
     if !configured_user_agent.is_empty() {
@@ -3953,3 +4050,71 @@ fn is_openai_o_series(model: &str) -> bool {
             .get(1)
             .is_some_and(|byte| byte.is_ascii_digit())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn goal_resume_guard_appends_to_goal_context_request() {
+        let guarded = apply_goal_resume_guard_to_request(json!({
+            "model": "gpt-5.5",
+            "instructions": "Base instructions.",
+            "input": [{
+                "type": "codex_internal_context",
+                "source": "goal",
+                "text": "Continue the active goal."
+            }]
+        }));
+
+        let instructions = guarded["instructions"].as_str().unwrap();
+        assert!(instructions.contains("Base instructions."));
+        assert!(instructions.contains(GOAL_RESUME_GUARD_MARKER));
+        assert!(instructions.contains(".codexpp-goal-state.md"));
+        assert!(instructions.contains("update the checkpoint file"));
+
+        let chat = responses_to_chat_completions(guarded).unwrap();
+        assert!(
+            chat["messages"][0]["content"]
+                .as_str()
+                .unwrap()
+                .contains(GOAL_RESUME_GUARD_MARKER)
+        );
+    }
+
+    #[test]
+    fn goal_resume_guard_leaves_regular_request_unchanged() {
+        let original = json!({
+            "model": "gpt-5.5",
+            "input": "hello"
+        });
+        let guarded = apply_goal_resume_guard_to_request(original.clone());
+
+        assert_eq!(guarded, original);
+    }
+
+    #[test]
+    fn goal_resume_guard_does_not_duplicate_existing_marker() {
+        let guarded = apply_goal_resume_guard_to_request(json!({
+            "model": "gpt-5.5",
+            "instructions": GOAL_RESUME_GUARD_INSTRUCTION,
+            "input": [{
+                "type": "codex_internal_context",
+                "source": "goal",
+                "text": "Continue the active goal."
+            }]
+        }));
+
+        assert_eq!(
+            guarded["instructions"].as_str().unwrap(),
+            GOAL_RESUME_GUARD_INSTRUCTION
+        );
+    }
+
+    #[test]
+    fn goal_resume_guard_instruction_mentions_incremental_checkpoint_updates() {
+        assert!(GOAL_RESUME_GUARD_INSTRUCTION.contains("long-running goals"));
+        assert!(GOAL_RESUME_GUARD_INSTRUCTION.contains("each meaningful small batch"));
+        assert!(GOAL_RESUME_GUARD_INSTRUCTION.contains("latest progress"));
+    }
+}
diff --git a/crates/codex-plus-core/src/settings.rs b/crates/codex-plus-core/src/settings.rs
index e017edc4c..344a02ca1 100644
--- a/crates/codex-plus-core/src/settings.rs
+++ b/crates/codex-plus-core/src/settings.rs
@@ -291,6 +291,8 @@ pub struct BackendSettings {
     pub codex_app_image_overlay_opacity: u8,
     #[serde(rename = "codexGoalsEnabled", default)]
     pub codex_goals_enabled: bool,
+    #[serde(rename = "codexAppGoalResumeGuard", default)]
+    pub codex_app_goal_resume_guard: bool,
     #[serde(rename = "launchMode", default)]
     pub launch_mode: LaunchMode,
     #[serde(rename = "relayBaseUrl", default = "default_relay_base_url")]
@@ -359,6 +361,7 @@ impl Default for BackendSettings {
             codex_app_image_overlay_path: String::new(),
             codex_app_image_overlay_opacity: default_image_overlay_opacity(),
             codex_goals_enabled: false,
+            codex_app_goal_resume_guard: false,
             launch_mode: LaunchMode::Patch,
             relay_base_url: default_relay_base_url(),
             relay_api_key: String::new(),
@@ -870,6 +873,7 @@ fn merge_known_setting_fields(target: &mut Map<String, Value>, source: &Map<Stri
     if let Some(value) = source.get("codexGoalsEnabled").and_then(Value::as_bool) {
         target.insert("codexGoalsEnabled".to_string(), Value::Bool(value));
     }
+    merge_bool_setting(target, source, "codexAppGoalResumeGuard");
     if let Some(value) = source.get("launchMode").and_then(Value::as_str) {
         if matches!(value, "patch" | "relay") {
             target.insert("launchMode".to_string(), Value::String(value.to_string()));
@@ -1187,6 +1191,7 @@ mod tests {
         assert!(!settings.codex_app_thread_id_badge);
         assert!(settings.codex_app_force_chinese_locale);
         assert!(!settings.codex_goals_enabled);
+        assert!(!settings.codex_app_goal_resume_guard);
         assert!(settings.codex_app_path.is_empty());
         assert!(settings.codex_extra_args.is_empty());
         assert_eq!(
@@ -1737,6 +1742,7 @@ experimental_bearer_token = "sk-existing""#
             "codexAppNativeMenuLocalization": false,
             "codexAppServiceTierControls": true,
             "codexGoalsEnabled": true,
+            "codexAppGoalResumeGuard": true,
             "relayBaseUrl": "https://relay.example.test/v1",
             "relayApiKey": "sk-relay",
             "codexExtraArgs": ["--force_high_performance_gpu", "", "  ", " --enable-gpu "],
@@ -1753,6 +1759,7 @@ experimental_bearer_token = "sk-existing""#
         assert!(!updated.codex_app_native_menu_localization);
         assert!(updated.codex_app_service_tier_controls);
         assert!(updated.codex_goals_enabled);
+        assert!(updated.codex_app_goal_resume_guard);
         assert_eq!(updated.relay_base_url, "https://relay.example.test/v1");
         assert_eq!(updated.relay_api_key, "sk-relay");
         assert_eq!(
diff --git a/crates/codex-plus-core/tests/cdp_bridge.rs b/crates/codex-plus-core/tests/cdp_bridge.rs
index 66a732003..635e1ec92 100644
--- a/crates/codex-plus-core/tests/cdp_bridge.rs
+++ b/crates/codex-plus-core/tests/cdp_bridge.rs
@@ -195,7 +195,9 @@ fn stepwise_refreshes_suggestions_for_virtualized_assistant_bubbles() {
     assert!(script.contains("candidates.push(...assistantBubbleCandidates())"));
     assert!(script.contains("function latestMessageByDocumentOrder("));
     assert!(script.contains("function clearPromptsForNewAssistant("));
-    assert!(script.contains("if (state.prompts.length || state.currentHash) clearPromptsForNewAssistant(hash);"));
+    assert!(script.contains(
+        "if (state.prompts.length || state.currentHash) clearPromptsForNewAssistant(hash);"
+    ));
     assert!(script.contains("function setScanStatus("));
     assert!(script.contains("setScanStatus(\"not-ready\""));
     assert!(script.contains("setScanStatus(\"no-assistant-message\""));
diff --git a/tools/i18n-keys.json b/tools/i18n-keys.json
index 71dee9f69..2c50996e2 100644
--- a/tools/i18n-keys.json
+++ b/tools/i18n-keys.json
@@ -180,6 +180,8 @@
     "启用供应商配置切换",
     "启用此扩展项",
     "启用目标功能",
+    "启用目标续跑保护",
+    "检测到目标上下文时，Codex++ 会在中转请求中追加续跑保护提示，减少压缩后重做旧任务。",
     "图片",
     "图片覆盖层",
     "在会话列表悬停显示删除按钮，并支持撤销。",