[pull] main from xintaofei:main

package.json

@@ -37,6 +37,13 @@
     "@tauri-apps/plugin-process": "^2.3.1",
     "@tauri-apps/plugin-updater": "^2.10.0",
     "@tauri-apps/plugin-window-state": "~2.4.1",
+    "@tiptap/core": "3.26.0",
+    "@tiptap/extension-placeholder": "3.26.0",
+    "@tiptap/markdown": "3.26.0",
+    "@tiptap/pm": "3.26.0",
+    "@tiptap/react": "3.26.0",
+    "@tiptap/starter-kit": "3.26.0",
+    "@tiptap/suggestion": "3.26.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-ligatures": "^0.10.0",
     "@xterm/addon-web-links": "^0.12.0",

src-tauri/src/acp/connection.rs

@@ -976,6 +976,11 @@ pub struct DelegationInjection {
     /// of the three is on, and the companion's `--features` lists `ask` to expose
     /// the `ask_user_question` tool.
     pub ask: crate::acp::question::QuestionRuntimeConfig,
+    /// Hot-swappable "is get-session-info enabled?" flag. Read at injection time
+    /// alongside the other three so `codeg-mcp` is injected when ANY of the four
+    /// is on, and the companion's `--features` lists `sessions` to expose the
+    /// `get_session_info` tool. No teardown handle (the lookup is stateless).
+    pub sessions: crate::acp::session_info::SessionInfoRuntimeConfig,
     /// Question registry handle for the teardown cascade. The `run_connection`
     /// cleanup guard calls `cancel_questions_by_parent` through this so a pending
     /// `ask_user_question` is reclaimed synchronously on disconnect, mirroring
@@ -1064,16 +1069,17 @@ fn is_executable_file(path: &Path) -> bool {
 /// delegate tool silently. Skipping leaves the agent fully functional minus
 /// `delegate_to_agent`, which is the right degradation when codeg-mcp didn't
 /// make it into the install.
-/// The `--features` value for a companion launch given the three feature flags,
+/// The `--features` value for a companion launch given the four feature flags,
 /// or `None` when none is enabled (the companion isn't injected at all).
 /// Pulled out as a pure function so the inject/skip decision is unit-testable
 /// without a real binary on disk or a live broker.
 fn companion_features_arg(
     delegation_enabled: bool,
     feedback_enabled: bool,
     ask_enabled: bool,
+    sessions_enabled: bool,
 ) -> Option<String> {
-    if !delegation_enabled && !feedback_enabled && !ask_enabled {
+    if !delegation_enabled && !feedback_enabled && !ask_enabled && !sessions_enabled {
         return None;
     }
     let mut features: Vec<&str> = Vec::new();
@@ -1086,6 +1092,9 @@ fn companion_features_arg(
     if ask_enabled {
         features.push("ask");
     }
+    if sessions_enabled {
+        features.push("sessions");
+    }
     Some(features.join(","))
 }
 
@@ -1110,15 +1119,20 @@ async fn inject_codeg_mcp(
     let delegation_enabled = injection.broker.config_snapshot().await.enabled;
     let feedback_enabled = injection.feedback.is_enabled().await;
     let ask_enabled = injection.ask.is_enabled().await;
+    let sessions_enabled = injection.sessions.is_enabled().await;
     // `None` (no feature enabled) short-circuits the whole injection.
-    let features_arg =
-        companion_features_arg(delegation_enabled, feedback_enabled, ask_enabled)?;
+    let features_arg = companion_features_arg(
+        delegation_enabled,
+        feedback_enabled,
+        ask_enabled,
+        sessions_enabled,
+    )?;
     let Some(binary_path) = locate_codeg_mcp_binary() else {
         eprintln!(
             "[delegation][WARN] codeg-mcp companion binary not found (checked CODEG_MCP_BIN, \
              exe sibling, and PATH); skipping delegate_to_agent / check_user_feedback / \
-             ask_user_question tool injection for connection {parent_connection_id}. Reinstall \
-             codeg or set CODEG_MCP_BIN to fix."
+             ask_user_question / get_session_info tool injection for connection \
+             {parent_connection_id}. Reinstall codeg or set CODEG_MCP_BIN to fix."
         );
         return None;
     };
@@ -1147,7 +1161,7 @@ async fn inject_codeg_mcp(
         // (any platform).
         "--parent-pid".to_string(),
         std::process::id().to_string(),
-        // Tool groups to expose this launch (delegation and/or feedback).
+        // Tool groups to expose this launch (delegation / feedback / ask / sessions).
         "--features".to_string(),
         features_arg,
     ]);
@@ -4581,6 +4595,7 @@ mod tests {
             socket_path: std::path::PathBuf::from("/tmp/codeg-mcp.sock"),
             feedback: crate::acp::feedback::FeedbackRuntimeConfig::new(),
             ask: crate::acp::question::QuestionRuntimeConfig::new(),
+            sessions: crate::acp::session_info::SessionInfoRuntimeConfig::new(),
             questions: Arc::new(NoQuestions)
                 as Arc<dyn crate::acp::question::SessionQuestionAccess>,
         };
@@ -4617,27 +4632,32 @@ mod tests {
     #[test]
     fn companion_features_arg_inject_skip_decision() {
         // All off → no companion at all.
-        assert_eq!(companion_features_arg(false, false, false), None);
+        assert_eq!(companion_features_arg(false, false, false, false), None);
         // Delegation only.
         assert_eq!(
-            companion_features_arg(true, false, false),
+            companion_features_arg(true, false, false, false),
             Some("delegation".to_string())
         );
         // Feedback only — the decoupling: companion injected for feedback even
         // when delegation is off.
         assert_eq!(
-            companion_features_arg(false, true, false),
+            companion_features_arg(false, true, false, false),
             Some("feedback".to_string())
         );
         // Ask only — likewise injects the companion on its own.
         assert_eq!(
-            companion_features_arg(false, false, true),
+            companion_features_arg(false, false, true, false),
             Some("ask".to_string())
         );
+        // Sessions only — likewise injects the companion on its own.
+        assert_eq!(
+            companion_features_arg(false, false, false, true),
+            Some("sessions".to_string())
+        );
         // All on → comma-joined, in declaration order.
         assert_eq!(
-            companion_features_arg(true, true, true),
-            Some("delegation,feedback,ask".to_string())
+            companion_features_arg(true, true, true, true),
+            Some("delegation,feedback,ask,sessions".to_string())
         );
     }
 }