Merge pull request #453 from quangdang46/sync-upstream-20260622

Sync upstream master (v0.31.2) — 118 commits with extracted module preservation

Author: quangdang46

.gitignore

@@ -20,9 +20,17 @@ ios_simulator_screenshot.png
 session-ses_*.md
 target-ttest/
 target-tttest*
+target-tttest*/
 libjcode_base.rlib
 .DS_Store
 .fastembed_cache/
 
 # bv (beads viewer) local config and caches
 .bv/
+
+# Stray experiment/debug artifacts at the repo root. Real assets live under
+# assets/, docs/, ios/, and tests/ and are committed explicitly.
+/*.log
+/*.avif
+/*.mp4
+/*.png

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jcode"
-version = "0.29.0"
+version = "0.31.2"
 description = "Possibly the greatest coding agent ever built — blazing-fast TUI, multi-model, swarm coordination, 30+ tools"
 edition = "2024"
 autobins = false
@@ -81,8 +81,6 @@ members = [
     "crates/jcode-terminal-image",
     "crates/jcode-telemetry-core",
     "crates/jcode-tui-workspace",
-    "crates/jcode-mobile-core",
-    "crates/jcode-mobile-sim",
     "crates/jcode-best-of-n",
     "crates/jcode-desktop",
     "crates/jcode-hooks",
@@ -317,6 +315,7 @@ jcode-experiment-flags = { path = "crates/jcode-experiment-flags" }
 flate2 = "1"
 tar = "0.4"
 tempfile = "3"
+agentgrep = { git = "https://github.com/1jehuang/agentgrep.git", tag = "v0.1.3" }
 qrcode = { version = "0.14.1", default-features = false }
 aws-config = "1.8.16"
 aws-credential-types = "1.2.14"
@@ -360,6 +359,38 @@ windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_System_
 
 [target.'cfg(target_os = "macos")'.dependencies]
 global-hotkey = "0.7"
+objc2 = "0.6"
+block2 = "0.6"
+objc2-foundation = { version = "0.3", features = [
+    "NSString",
+    "NSThread",
+    "NSRunLoop",
+    "NSDate",
+    "NSTimer",
+    "NSUserDefaults",
+    "NSValue",
+    "NSAttributedString",
+    "NSDictionary",
+    "block2",
+] }
+objc2-app-kit = { version = "0.3", features = [
+    "NSApplication",
+    "NSResponder",
+    "NSStatusBar",
+    "NSStatusItem",
+    "NSStatusBarButton",
+    "NSButton",
+    "NSCell",
+    "NSColor",
+    "NSControl",
+    "NSFont",
+    "NSFontDescriptor",
+    "NSImage",
+    "NSAttributedString",
+    "NSMenu",
+    "NSMenuItem",
+    "NSRunningApplication",
+] }
 
 [profile.release]
 opt-level = 1

README.md

@@ -849,7 +849,6 @@ mempalace) so the base build stays lean.
 - [Memory Architecture](docs/MEMORY_ARCHITECTURE.md)
 - [Swarm Architecture](docs/SWARM_ARCHITECTURE.md)
 - [Server Architecture](docs/SERVER_ARCHITECTURE.md)
-- [iOS Client Notes](docs/IOS_CLIENT.md)
 - [Safety System](docs/SAFETY_SYSTEM.md)
 - [Windows Notes](docs/WINDOWS.md)
 - [Wrappers and Shell Integration](docs/WRAPPERS.md)

codemagic.yaml

@@ -144,6 +144,7 @@ flate2 = "1"
 tar = "0.4"
 tempfile = "3"
 hashline = { git = "https://github.com/quangdang46/hashline.git", rev = "1780f4b81333047323058041d3d0e64abce0c9ad", }
+agentgrep = { git = "https://github.com/1jehuang/agentgrep.git", tag = "v0.1.3" }
 qrcode = { version = "0.14.1", default-features = false }
 # DCP integration (dynamic context pruning)
 dynamic_context_pruning = { git = "https://github.com/quangdang46/dynamic_context_pruning", branch = "main", package = "dynamic_context_pruning", optional = true }

crates/jcode-app-core/Cargo.toml

@@ -1033,8 +1033,8 @@ impl Agent {
             transcript.push('\n');
         }
 
-        if !crate::memory::memory_sidecar_enabled() {
-            logging::info("Memory extraction skipped: memory sidecar disabled");
+        if !crate::memory::memory_llm_judge_available() {
+            logging::info("Memory extraction skipped: LLM judge unavailable");
             return 0;
         }
 

crates/jcode-app-core/src/agent/turn_execution.rs

@@ -10,6 +10,9 @@ impl Agent {
     pub(super) async fn run_turn(&mut self, print_output: bool) -> Result<String> {
         self.set_log_context();
         crate::session_metrics::record_turn(&self.session.id);
+        // Mark this session as actively streaming for presence UIs (e.g. the
+        // macOS menu bar indicator). Cleared automatically on every exit path.
+        let _streaming_guard = crate::session::StreamingGuard::new(self.session.id.clone());
         let mut final_text = String::new();
         let trace = trace_enabled();
         let mut context_limit_retries = 0u32;

crates/jcode-app-core/src/agent/turn_loops.rs

@@ -81,6 +81,9 @@ impl Agent {
         event_tx: mpsc::UnboundedSender<ServerEvent>,
     ) -> Result<()> {
         self.set_log_context();
+        // Mark this session as actively streaming for presence UIs (e.g. the
+        // macOS menu bar indicator). Cleared automatically on every exit path.
+        let _streaming_guard = crate::session::StreamingGuard::new(self.session.id.clone());
         let trace = trace_enabled();
         let mut context_limit_retries = 0u32;
         let mut incomplete_continuations = 0u32;
@@ -190,6 +193,14 @@ impl Agent {
                 &messages_with_memory
             };
             let provider = Arc::clone(&self.provider);
+            // Capture the model id the request was issued with. A provider may
+            // transparently switch models mid-request (e.g. Anthropic's retired
+            // `claude-fable-5` falls back to `claude-opus-4-8`). When that
+            // happens the provider mutates its own model state, but the session
+            // and clients still believe they are on the originally requested
+            // model. Compare against this after the stream so we can emit a
+            // `ModelChanged` and resync the UI/context-limit.
+            let model_at_request_start = provider.model().to_string();
             let resume_session_id = self.provider_session_id.clone();
             self.last_status_detail = None;
             let _ = event_tx.send(kv_cache_request_event(
@@ -897,6 +908,34 @@ impl Agent {
                 cache_creation_input_tokens: usage_cache_creation,
             };
 
+            // Detect a transparent mid-request model switch (e.g. Anthropic's
+            // retired `claude-fable-5` falling back to `claude-opus-4-8`). The
+            // provider mutates its own model state during the stream, so the
+            // session and clients would otherwise keep showing the originally
+            // requested model with a stale context-limit. Resync the session and
+            // notify clients with a `ModelChanged` so the header, picker, and
+            // context budget all reflect the model that actually served.
+            let model_after_stream = self.provider.model();
+            if model_after_stream != model_at_request_start {
+                let provider_name = self.provider.display_name();
+                logging::warn(&format!(
+                    "Provider switched model mid-request: '{}' -> '{}' (resyncing session/UI)",
+                    model_at_request_start, model_after_stream
+                ));
+                self.session.model = Some(model_after_stream.clone());
+                self.provider_runtime_state
+                    .apply(crate::provider::ProviderStateEvent::RuntimeModelObserved {
+                        model: model_after_stream.clone(),
+                    });
+                self.persist_session_best_effort("model fallback");
+                let _ = event_tx.send(ServerEvent::ModelChanged {
+                    id: 0,
+                    model: model_after_stream,
+                    provider_name: Some(provider_name),
+                    error: None,
+                });
+            }
+
             let had_tool_calls_before = !tool_calls.is_empty();
             self.recover_text_wrapped_tool_call(&mut text_content, &mut tool_calls);
 

crates/jcode-app-core/src/agent/turn_streaming_mpsc.rs

@@ -216,6 +216,102 @@ async fn run_turn_streaming_mpsc_emits_keepalive_while_provider_is_quiet() {
     task.await.unwrap().unwrap();
 }
 
+/// Provider that transparently switches its model mid-stream, mimicking the
+/// Anthropic retired-model fallback (`claude-fable-5` -> `claude-opus-4-8`).
+struct MidStreamModelSwitchProvider {
+    model: std::sync::Mutex<String>,
+    switch_to: String,
+}
+
+#[async_trait]
+impl Provider for MidStreamModelSwitchProvider {
+    async fn complete(
+        &self,
+        _messages: &[Message],
+        _tools: &[ToolDefinition],
+        _system: &str,
+        _resume_session_id: Option<&str>,
+    ) -> Result<EventStream> {
+        // Emulate the provider switching its own model state during the request.
+        *self.model.lock().unwrap() = self.switch_to.clone();
+        let (tx, rx) = tokio_mpsc::channel::<Result<StreamEvent>>(8);
+        tokio::spawn(async move {
+            let _ = tx
+                .send(Ok(StreamEvent::TextDelta("hello".to_string())))
+                .await;
+            let _ = tx
+                .send(Ok(StreamEvent::MessageEnd {
+                    stop_reason: Some("end_turn".to_string()),
+                }))
+                .await;
+        });
+        Ok(Box::pin(ReceiverStream::new(rx)))
+    }
+
+    fn name(&self) -> &str {
+        "claude"
+    }
+
+    fn model(&self) -> String {
+        self.model.lock().unwrap().clone()
+    }
+
+    fn fork(&self) -> Arc<dyn Provider> {
+        Arc::new(Self {
+            model: std::sync::Mutex::new(self.model.lock().unwrap().clone()),
+            switch_to: self.switch_to.clone(),
+        })
+    }
+}
+
+#[tokio::test]
+async fn run_turn_streaming_mpsc_emits_model_changed_on_midstream_switch() {
+    let _guard = crate::storage::lock_test_env();
+    let provider: Arc<dyn Provider> = Arc::new(MidStreamModelSwitchProvider {
+        model: std::sync::Mutex::new("claude-fable-5".to_string()),
+        switch_to: "claude-opus-4-8".to_string(),
+    });
+    let registry = Registry::new(provider.clone()).await;
+    let mut agent = Agent::new(provider, registry);
+    agent.add_message(
+        Role::User,
+        vec![ContentBlock::Text {
+            text: "test".to_string(),
+            cache_control: None,
+        }],
+    );
+
+    let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
+    let task = tokio::spawn(async move { agent.run_turn_streaming_mpsc(tx).await });
+
+    let mut switched_model = None;
+    let deadline = Instant::now() + Duration::from_secs(20);
+    while Instant::now() < deadline {
+        match tokio::time::timeout(Duration::from_secs(1), rx.recv()).await {
+            Ok(Some(ServerEvent::ModelChanged { model, error, .. })) => {
+                assert!(error.is_none(), "unexpected model-change error: {error:?}");
+                switched_model = Some(model);
+                break;
+            }
+            Ok(Some(_)) => {}
+            Ok(None) => break,
+            Err(_) => {
+                if task.is_finished() {
+                    break;
+                }
+            }
+        }
+    }
+
+    task.await.unwrap().unwrap();
+    assert_eq!(
+        switched_model.as_deref(),
+        Some("claude-opus-4-8"),
+        "expected a ModelChanged event resyncing to the served model"
+    );
+}
+
+
 #[tokio::test]
 async fn messages_for_provider_replays_persisted_native_compaction_in_auto_mode() {
     let provider: Arc<dyn Provider> = Arc::new(NativeAutoCompactionProvider);