Merge branch 'main-0716' into main

Integrate the codex-acp elicitation bridge (Plan-mode request_user_input and
generic MCP forms routed to the native ask and permission cards), the
codex-acp 1.1.7 pin, standalone goal capsules, and grok exit-plan approval.

Grok's exit_plan_mode and codex's elicitation/create requests register as
side-by-side ACP handlers; the connection context exposes both
answerPlanApproval and goalControl; the folded task-duration outcome renders
as a body-less "Completed" chip.

Author: xintaofei

src-tauri/Cargo.toml

@@ -100,7 +100,7 @@ toml_edit = "0.19"
 serde_yaml = "0.9"
 notify = "6"
 base64 = "0.22"
-agent-client-protocol-schema = { version = "0.11", features = ["unstable_session_usage", "unstable_session_fork", "unstable_session_resume"] }
+agent-client-protocol-schema = { version = "0.11", features = ["unstable_session_usage", "unstable_session_fork", "unstable_session_resume", "unstable_elicitation"] }
 kill_tree = { version = "0.2", features = ["tokio"] }
 which = "7"
 keyring = { version = "3", features = ["apple-native", "windows-native", "sync-secret-service"], optional = true }

src-tauri/src/acp/codex_goal.rs

@@ -248,6 +248,36 @@ mod tests {
         assert_eq!(input["objective"], "Fix the login bug");
     }
 
+    #[test]
+    fn preserves_v114_slimmed_snapshot_fields() {
+        // codex-acp v1.1.4 (#293) slimmed the goal snapshot: it dropped
+        // `tokensUsed` and added `createdAt` / `controlMethod` (alongside the
+        // existing `tokenBudget` / `timeUsedSeconds`). `goal_marker` clones the
+        // object through, so the new fields survive onto the card output and the
+        // absent `tokensUsed` is simply not present — `GoalCard` reads it as null
+        // and hides that stat, so no display breaks.
+        let goal = json!({
+            "objective": "  Ship the release  ",
+            "status": "active",
+            "tokenBudget": 200000,
+            "timeUsedSeconds": 42,
+            "createdAt": "2026-07-16T10:00:00Z",
+            "controlMethod": "_codex/session/goal_control",
+        });
+        let m = goal_marker(&goal).expect("goal marker");
+        assert_eq!(m.tool_name, "create_goal");
+        let out: Value = serde_json::from_str(&m.output_json).unwrap();
+        let g = &out["goal"];
+        assert_eq!(g["objective"], "Ship the release"); // trimmed
+        assert_eq!(g["status"], "active");
+        assert_eq!(g["tokenBudget"], 200000);
+        assert_eq!(g["timeUsedSeconds"], 42);
+        assert_eq!(g["createdAt"], "2026-07-16T10:00:00Z");
+        assert_eq!(g["controlMethod"], "_codex/session/goal_control");
+        // Slimmed snapshot carries no tokensUsed → the card hides that stat.
+        assert!(g.get("tokensUsed").is_none());
+    }
+
     #[test]
     fn goal_tool_call_id_is_occurrence_unique() {
         // Occurrence-addressed so two runs sharing an objective never collide.

src-tauri/src/acp/connection.rs

@@ -1859,6 +1859,7 @@ mod tests {
                         description: String::new(),
                     },
                 ],
+                is_secret: false,
             }],
         })
     }

src-tauri/src/acp/delegation/listener.rs

@@ -10,7 +10,9 @@ use sea_orm::{
     TransactionTrait,
 };
 
-use crate::acp::connection::{spawn_agent_connection, AgentConnection, ConnectionCommand};
+use crate::acp::connection::{
+    spawn_agent_connection, AgentConnection, ConnectionCommand, GoalControlAction,
+};
 use crate::acp::error::AcpError;
 use crate::acp::feedback::{
     bounded_feedback_batch, FeedbackItem, FeedbackStatus, PendingFeedback,
@@ -1179,6 +1181,27 @@ impl ConnectionManager {
             .map_err(|_| AcpError::ProcessExited)
     }
 
+    /// Pause or clear the session's active Codex goal via the connection loop
+    /// (codex-acp #293). Looked up by connectionId; the loop sources the
+    /// sessionId from the live session, so callers only supply the action.
+    pub async fn goal_control(
+        &self,
+        conn_id: &str,
+        action: GoalControlAction,
+    ) -> Result<(), AcpError> {
+        let cmd_tx = {
+            let connections = self.connections.lock().await;
+            let conn = connections
+                .get(conn_id)
+                .ok_or_else(|| AcpError::ConnectionNotFound(conn_id.into()))?;
+            conn.cmd_tx.clone()
+        };
+        cmd_tx
+            .send(ConnectionCommand::GoalControl { action })
+            .await
+            .map_err(|_| AcpError::ProcessExited)
+    }
+
     pub async fn cancel(&self, db: &DatabaseConnection, conn_id: &str) -> Result<(), AcpError> {
         let (cmd_tx, state_arc, emitter) = {
             let connections = self.connections.lock().await;
@@ -5595,6 +5618,7 @@ mod tests {
                     description: String::new(),
                 },
             ],
+            is_secret: false,
         }]
     }