Glance: the phone's glance page runs its cards' taps and in-card chat

Cargo.toml

@@ -110,7 +110,12 @@ octosense-app-hub = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub"
 # and App Hub and Rinx no longer need the same App Hub commit.
 octosense-app-contract = "1"
 # --- octos: ONE source for every octos crate (octos-org/octos main at the
-# merge of octos#2656, low fixes for host-owned app peers; after #2655, the
+# merge of octos#2675, hydrate rows that name a tool row's call and tool;
+# after #2672, the accepted client_commands echoed on session/open, #2671
+# and #2669, docs, #2665, undeclared secrets kept from strict skills, #2664,
+# octos's own dev profile, and #2261, a credential store that keeps
+# credentials on a failed save; before that #2656, low fixes for host-owned
+# app peers; #2655, the
 # unknown-outcome interlock kept across a kernel restart, #2653, a bound
 # workspace swapped for a symlink no longer re-roots the session, #2648, a
 # host session's exact tool list; #2649,
@@ -120,12 +125,12 @@ octosense-app-contract = "1"
 # keeps its peer/input, and #2645, Bing News's Chinese results).
 # Move octos-core, octos-cli and octos-research together; the Android kernel
 # artifact (liboctos.so) is built from this same revision.
-octos-core = { git = "https://github.com/octos-org/octos.git", rev = "ae230ce04d57f3c29cf6c2518e5956a86c07d788" }
-octos-cli = { git = "https://github.com/octos-org/octos.git", rev = "ae230ce04d57f3c29cf6c2518e5956a86c07d788", default-features = false }
+octos-core = { git = "https://github.com/octos-org/octos.git", rev = "056173e85b150e387805fc307fe231064ac1ed35" }
+octos-cli = { git = "https://github.com/octos-org/octos.git", rev = "056173e85b150e387805fc307fe231064ac1ed35", default-features = false }
 # The research engine (the metasearch, the SSRF-safe polite reader and the
 # toolbox scope) for the toolbox's `octos-engine` feature. Same source and
 # revision as above.
-octos-research = { git = "https://github.com/octos-org/octos.git", rev = "ae230ce04d57f3c29cf6c2518e5956a86c07d788", default-features = false }
+octos-research = { git = "https://github.com/octos-org/octos.git", rev = "056173e85b150e387805fc307fe231064ac1ed35", default-features = false }
 # --- AppCard's inline renderers.
 streaming-markdown-kit = { git = "https://github.com/Project-Robius-China/streaming-markdown-kit.git", branch = "main" }
 makepad-diagram-kit = { git = "https://github.com/Project-Robius-China/makepad-diagram-kit.git", branch = "main" }

README.md

@@ -261,7 +261,7 @@ The limits are 6 publishes per minute and 4 cards per app. The shell keeps 32 ca
 
 | Surface | What happens |
 | --- | --- |
-| Desktop panel | A new card opens the glance panel unless a card window is already open. The bar’s bell or F9 also opens the panel. A press on a card outside its own controls opens it in the card window. The hovered card shows its open and dismiss actions, and a card that just came wears an accent mark for a few seconds. A card that does not fit whole peeks in at the end of the list. Opened with F9 (or a press in it), the panel has the keyboard: the arrows move a focus ring from card to card, Return opens the card, Delete dismisses it and Esc closes the panel. |
+| Desktop panel | A new card opens the glance panel unless a card window is already open. The bar’s bell or F9 also opens the panel. A press on a card outside its own controls opens it in the card window. The hovered card shows its open and dismiss actions, and a card that just came wears an accent mark for a few seconds. A card that does not fit whole peeks in at the end of the list. A card taller than its tile scrolls inside it with the wheel; a card with an in-card chat stays at its newest rows, so its field and the latest exchange stay in view. Opened with F9 (or a press in it), the panel has the keyboard: the arrows move a focus ring from card to card, Return opens the card, Delete dismisses it and Esc closes the panel. |
 | Desktop notification | A card published with `notify` also posts a toast with the app’s icon and name, the card’s title and its `summary` (else the card’s own). Selecting the toast opens the card in its own window. At most three toasts show at once; a “+N more” chip under them shows the rest. While the panel is open, toasts stack to its left. |
 | Desktop dismissal | The hovered card shows a dismiss button: `glance::dismiss` removes the card as if the app had withdrawn it. Clear all dismisses every card. A dismissal can be undone from the toast that reports it, or with ⌘Z while the panel has the keyboard. The panel has a separate close button. |
 | Phone | `notify` posts a shade notification. Selecting it opens the glance page. |

README.zh-CN.md

@@ -261,7 +261,7 @@ sequenceDiagram
 
 | 界面 | 行为 |
 | --- | --- |
-| 桌面面板 | 新卡片会打开 glance 面板，除非已有卡片窗口打开。顶栏铃铛或 F9 也可以打开面板。点击卡片上自身控件以外的地方，会在卡片窗口中打开它。鼠标悬停的卡片会显示打开和移除操作，刚到的卡片旁会有几秒钟的强调色标记。放不下的那张卡片会在列表末尾露出一部分。用 F9（或在面板里点击）打开时，面板接管键盘：方向键在卡片之间移动焦点环，Return 打开卡片，Delete 移除卡片，Esc 关闭面板。 |
+| 桌面面板 | 新卡片会打开 glance 面板，除非已有卡片窗口打开。顶栏铃铛或 F9 也可以打开面板。点击卡片上自身控件以外的地方，会在卡片窗口中打开它。鼠标悬停的卡片会显示打开和移除操作，刚到的卡片旁会有几秒钟的强调色标记。放不下的那张卡片会在列表末尾露出一部分。卡片在面板里有高度上限，更高的卡片可以用滚轮在原处滚动；带卡内对话的卡片停在最新的消息处，输入框和最近一轮对话始终可见。用 F9（或在面板里点击）打开时，面板接管键盘：方向键在卡片之间移动焦点环，Return 打开卡片，Delete 移除卡片，Esc 关闭面板。 |
 | 桌面通知 | 以 `notify` 发布的卡片还会弹出 toast，显示应用的图标和名称、卡片标题及其 `summary`（没有时用卡片自带的摘要）。点击 toast 会在独立窗口中打开卡片。同时最多显示三条 toast，其余的由下方的“+N more”标签展开。面板打开时，toast 叠放在面板左侧。 |
 | 桌面关闭操作 | 鼠标悬停的卡片会显示移除按钮：`glance::dismiss` 会移除卡片，效果如同应用撤回了它。“Clear all”会移除所有卡片。移除的卡片可以在报告这次移除的 toast 上撤销（Undo），面板接管键盘时也可以按 ⌘Z 撤销。面板本身另有关闭按钮。 |
 | 手机 | `notify` 在通知栏发出通知，点击后打开 glance 页面。 |

crates/kernel/src/kernel.rs

@@ -60,6 +60,9 @@ struct Io {
     /// host-managed server stops when it reaches EOF, which also happens
     /// when this process dies, so a crashed shell leaves no kernel behind.
     lifeline: Option<tokio::process::ChildStdin>,
+    /// The task copying the child's stderr into the [`Tail`]; it ends at
+    /// the end of the pipe, after the kernel's last line.
+    stderr: Option<tokio::task::JoinHandle<()>>,
 }
 
 /// Keeps the last lines the kernel wrote to stderr, to say why it exited.
@@ -116,7 +119,7 @@ fn start(launch: &Launch, network: &Network, log: &LogSink, tail: &Tail) -> Resu
                 return Err("the kernel's stdin/stdout are not piped".into());
             };
             // The kernel logs to stderr; it never carries protocol frames.
-            if let Some(stderr) = child.stderr.take() {
+            let stderr = child.stderr.take().map(|stderr| {
                 let log = log.clone();
                 let tail = tail.clone();
                 tokio::spawn(async move {
@@ -126,14 +129,14 @@ fn start(launch: &Launch, network: &Network, log: &LogSink, tail: &Tail) -> Resu
                         (log)(&format!("octos: {line}"));
                         tail.push(line);
                     }
-                });
-            }
+                })
+            });
             let lines = BufReader::new(Box::pin(stdout) as Pin<Box<dyn AsyncRead + Send>>).lines();
             Ok(if shared {
                 // Frames go over the WebSocket once it is up (`prepare_network`).
-                Io { writer: Box::pin(tokio::io::sink()), lines, running: Running::Child(child), lifeline: Some(stdin) }
+                Io { writer: Box::pin(tokio::io::sink()), lines, running: Running::Child(child), lifeline: Some(stdin), stderr }
             } else {
-                Io { writer: Box::pin(stdin), lines, running: Running::Child(child), lifeline: None }
+                Io { writer: Box::pin(stdin), lines, running: Running::Child(child), lifeline: None, stderr }
             })
         }
         #[cfg(target_env = "ohos")]
@@ -153,6 +156,7 @@ fn start(launch: &Launch, network: &Network, log: &LogSink, tail: &Tail) -> Resu
                 lines: BufReader::new(Box::pin(reader) as Pin<Box<dyn AsyncRead + Send>>).lines(),
                 running: Running::Embedded(task),
                 lifeline: None,
+                stderr: None,
             })
         }
         #[cfg(not(target_env = "ohos"))]
@@ -266,7 +270,7 @@ async fn exited(running: &mut Running) -> String {
 async fn stop(io: Io) {
     // Closing stdin stops either kind of child: the stdio pipe drains owned
     // turns on EOF; a host-managed server drains its connections and exits.
-    let Io { writer, lines, mut running, lifeline } = io;
+    let Io { writer, lines, mut running, lifeline, .. } = io;
     let grace = if lifeline.is_some() { SHARED_GRACE } else { STDIO_GRACE };
     drop(writer);
     drop(lines);
@@ -401,16 +405,18 @@ pub(crate) async fn supervise(
                                 }
                             }
                         }
-                        Ok(None) => break CloseReason::Exited(with_tail("the kernel closed its output", &tail)),
+                        Ok(None) => break CloseReason::Exited("the kernel closed its output".into()),
                         Err(e) => break CloseReason::Exited(format!("reading from the kernel failed: {e}")),
                     },
-                    why = exited(&mut io.running) => break CloseReason::Exited(with_tail(&why, &tail)),
+                    why = exited(&mut io.running) => break CloseReason::Exited(why),
                 }
             }};
             (log)(&format!("octos-core: stopping kernel {generation}: {reason}"));
+            let stderr = io.stderr.take();
             stop(io).await;
             match reason {
-                CloseReason::Failed(why) => CloseReason::Failed(with_tail(&why, &tail)),
+                CloseReason::Failed(why) => CloseReason::Failed(last_words(&why, stderr, &tail).await),
+                CloseReason::Exited(why) => CloseReason::Exited(last_words(&why, stderr, &tail).await),
                 other => other,
             }
         }
@@ -464,6 +470,24 @@ fn tool_list_reply(text: &str) -> Option<String> {
     })
 }
 
+/// How long a stopped kernel's stderr may take to reach its end. The pipe
+/// closes with the kernel; only a process it started that inherited the
+/// pipe can hold it open longer.
+const LAST_WORDS_GRACE: Duration = Duration::from_secs(2);
+
+/// `why` with the kernel's last words (the [`Tail`]), once `stderr`, the
+/// task reading them, has reached the end of the pipe. That task runs
+/// beside the supervisor, so lines the kernel wrote just before its stdout
+/// closed or it exited can still be on their way to the tail: read at once,
+/// the reason said "the kernel closed its output: fake kernel up" without
+/// the "asked to exit" the kernel wrote last.
+async fn last_words(why: &str, stderr: Option<tokio::task::JoinHandle<()>>, tail: &Tail) -> String {
+    if let Some(reader) = stderr {
+        let _ = tokio::time::timeout(LAST_WORDS_GRACE, reader).await;
+    }
+    with_tail(why, tail)
+}
+
 fn with_tail(why: &str, tail: &Tail) -> String {
     let tail = tail.text();
     if tail.is_empty() {

crates/kernel/tests/core.rs

@@ -238,7 +238,9 @@ async fn a_kernel_that_dies_closes_its_connections_with_its_last_words() {
     call(&mut a, "1", "session/list", json!({})).await;
     a.send(json!({"jsonrpc": "2.0", "method": "test/exit", "params": {}}).to_string()).unwrap();
     match next(&mut a).await {
-        Err(CloseReason::Exited(why)) => assert!(why.contains("asked to exit") || why.contains("exit"), "{why}"),
+        // The line it wrote to stderr last, whichever end the core saw
+        // first: its output closing or its exit status.
+        Err(CloseReason::Exited(why)) => assert!(why.contains("asked to exit"), "{why}"),
         other => panic!("expected Exited, got {other:?}"),
     }
     for _ in 0..100 {