feat(notify): user-notify 桌面通知与点击深链

src-tauri/Cargo.toml

@@ -18,6 +18,7 @@ tauri-plugin-opener = "2"
 tauri-plugin-dialog = "2"
 tauri-plugin-updater = "2"
 tauri-plugin-notification = "2"
+user-notify = "0.4.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"

src-tauri/capabilities/default.json

@@ -15,6 +15,9 @@
     },
     "dialog:default",
     "notification:default",
+    "core:window:allow-set-badge-count",
+    "core:window:allow-request-user-attention",
+    "core:window:allow-is-focused",
     "updater:default",
     "mcp-bridge:default",
     "process:default"

src-tauri/src/ask.rs

@@ -1302,6 +1302,9 @@ pub struct Ask {
     pub thread_title: String,
     #[serde(default)]
     pub dir_name: String,
+    /// Owning workspace id, filled when listed (pending_asks).
+    #[serde(default)]
+    pub workspace_id: Option<i32>,
     /// The canonical, EXACT action identity (full command / full path set /
     /// full args) set by the engine's ask-creation call — distinct from
     /// `summary`, which may truncate for display. Used ONLY for Always-grant
@@ -1688,6 +1691,7 @@ impl AskRegistry {
             ts: now(),
             thread_title: String::new(),
             dir_name: String::new(),
+            workspace_id: None,
             action_key: action_key.to_string(),
         };
         g.open.push(ask.clone());

src-tauri/src/commands.rs

@@ -1971,6 +1971,7 @@ pub async fn pending_asks(
     for a in &mut open {
         if let Ok(Some(t)) = repo::get_thread(&db, a.thread).await {
             a.thread_title = t.title;
+            a.workspace_id = Some(t.workspace_id);
         }
         if let Ok(id) = a.dir.parse::<i32>() {
             if let Ok(Some(d)) = repo::get_direction(&db, id).await {
@@ -2369,27 +2370,37 @@ pub async fn workspace_needs_counts(
     let open_asks = asks.open();
     let mut out = Vec::new();
     for w in repo::list_workspaces(&db).await.map_err(e)? {
-        let threads: Vec<_> = repo::list_threads(&db, w.id)
+        let all_threads = repo::list_threads(&db, w.id)
             .await
-            .map_err(e)?
+            .map_err(e)?;
+        let workspace_tids: HashSet<i32> = all_threads.iter().map(|t| t.id).collect();
+        let threads: Vec<_> = all_threads
             .into_iter()
             .filter(|t| t.kind != "curator") // hidden curator chat isn't a board issue
             .collect();
-        let tids: HashSet<i32> = threads.iter().map(|t| t.id).collect();
         let mut count: u32 = 0;
         for t in &threads {
-            // Excludes self-clearing NOTICEs (e.g. the stall hint) — they carry
-            // no action, so they must not inflate the "needs you" count that
-            // flags other workspaces (issue #105).
+            // Questions still come from open_answerable_ask_count (issue #105).
+            // Action-required notices are not answerable, but they leave a durable
+            // Retry control in Needs-you, so the dock badge and workspace switcher
+            // should count them. Self-clearing notices stay out.
             count += bus.open_answerable_ask_count(t.id) as u32;
+            count += bus
+                .open_asks(t.id)
+                .iter()
+                .filter(|a| a.kind == crate::bus::AskKind::NoticeActionRequired)
+                .count() as u32;
             count += crate::planner::pending_writes(&db, t.id)
                 .await
                 .map_err(e)?
                 .len() as u32;
         }
         count += open_asks
             .iter()
-            .filter(|a| tids.contains(&a.thread))
+            // Permission asks are global and the hidden curator thread is not
+            // part of `threads` above, but its asks still belong to this
+            // workspace and appear in Needs-you.
+            .filter(|a| workspace_tids.contains(&a.thread))
             .count() as u32;
         out.push((w.id, count));
     }

src-tauri/src/im/outbound.rs

@@ -221,6 +221,7 @@ mod tests {
             ts: 0,
             thread_title: "登录超时修复".into(),
             dir_name: "backend".into(),
+            workspace_id: None,
             action_key: "claude:npm test".into(),
         }
     }

src-tauri/src/lead_chat/commands.rs

@@ -52,6 +52,7 @@ fn push_model_arg(extra: &mut Vec<String>, model: Option<&str>) {
 #[derive(serde::Serialize, Clone)]
 pub struct SessionInfo {
     pub session_id: i32,
+    pub thread_id: i32,
     pub repo: String,
     pub worktree: String,
     pub branch: String,
@@ -1086,6 +1087,9 @@ pub struct LiveWorkerSlot {
     /// The worker's OWN thread (from EngineInner.thread_id) — adoption must not
     /// assume the active thread.
     pub thread_id: i32,
+    /// Owning workspace of the worker's thread, so the frontend can deep-link
+    /// adopted/revived workers even before that workspace is visited.
+    pub workspace_id: Option<i32>,
     pub busy: bool,
     pub queue: Vec<engine::QueuedItem>,
 }
@@ -1119,9 +1123,15 @@ async fn build_worker_slots(db: &Db, snaps: Vec<WorkerSnapshot>) -> Vec<LiveWork
             continue;
         };
         let command = crate::tool_command::effective(sess.command.as_deref(), &sess.tool);
+        let workspace_id = repo::get_thread(db, s.thread_id)
+            .await
+            .ok()
+            .flatten()
+            .map(|t| t.workspace_id);
         out.push(LiveWorkerSlot {
             info: SessionInfo {
                 session_id: sess.id,
+                thread_id: s.thread_id,
                 repo: wt.path.clone(),
                 worktree: wt.path,
                 branch: wt.branch,
@@ -1133,6 +1143,7 @@ async fn build_worker_slots(db: &Db, snaps: Vec<WorkerSnapshot>) -> Vec<LiveWork
             direction_id: sess.direction_id,
             repo_id: sess.repo_id,
             thread_id: s.thread_id,
+            workspace_id,
             busy: s.busy,
             queue: s.queue,
         });
@@ -1560,6 +1571,7 @@ pub(crate) async fn chat_open_worker_impl(
     let command = crate::tool_command::effective(sess.command.as_deref(), &session_tool);
     Ok(SessionInfo {
         session_id: sess.id,
+        thread_id: dir.thread_id,
         repo: wt.path.clone(),
         worktree: wt.path,
         branch: wt.branch,

src-tauri/src/lib.rs

@@ -59,6 +59,7 @@ mod power;
 /// 派生并发上限都挂靠此接口(单一口径 `is_ours`,计数==孤儿判定)。
 pub mod proc_registry;
 mod process_quota;
+mod os_notify;
 pub mod profile;
 /// issue #112 本地资源仪表盘:只读聚合 proc_registry / process_quota /
 /// session_gate 已有的采样,不新增采样、不碰任何安全网写路径。
@@ -235,6 +236,9 @@ pub fn run() {
             host::automerge::spawn_pr_automerge_watch(app.handle().clone());
             power::spawn_sweep(app.handle().clone());
             process_quota::spawn_monitor(app.handle().clone());
+            if let Err(err) = os_notify::init(app.handle()) {
+                eprintln!("[weft] os_notify init: {err}");
+            }
             gc::spawn_periodic(app.handle().clone());
             skills::spawn_periodic(app.handle().clone());
             im::spawn(app.handle().clone());
@@ -311,6 +315,12 @@ pub fn run() {
             commands::set_guardrails,
             process_quota::process_quota_status,
             resource_dashboard::resource_dashboard_snapshot,
+            os_notify::os_notify_permission,
+            os_notify::os_notify_request_permission,
+            os_notify::os_notify_send,
+            os_notify::os_notify_take_pending_open,
+            os_notify::os_notify_ack_open,
+            os_notify::os_notify_restore_pending_open,
             commands::session_for,
             commands::session_meta,
             commands::effective_config,