diff --git a/CHANGELOG.md b/CHANGELOG.md index 4051750..49fecb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ - **`lib/foreign` F0/F1**:`invoke` 结构化记录(`ok`/`code`/`stdout`/`stderr`/`ms`/`timed_out`/`truncated`/`result`);`run`/`run_lang` 新增 `env`/`cwd`/`timeout`/`args`/`max_output`;15 个语言预设;`probe`/`register`/`unset`/`load_config`;`.marqdo/foreign.toml`。 - **`lib/foreign` F2**:JSON 进 / JSON 出 `call`;并行 `run_many` / `call_many`(有序、单项隔离、并发上限);`invoke` 的 `input` / `output` / `result` / `result_error`。 - **`lib/foreign` F3/F3.5**:Python / Node 持久会话 `session_open` / `session_eval` / `session_close` / `session_list`;状态桥 `session_set` / `session_get` / `session_names`;会话超时即杀、崩溃隔离、drop 清理。 -- **Notebook D1/D2**:`内核表` / `会话表` 文档原生语法;`DocumentSession`(cell index / 命名内核 / journal / value store);view Notebook 工具栏(Run All / Restart & Run All / Step / State)、状态徽标、内核下拉、Push/Pull 状态表单;`POST /api/session/*`。 +- **Notebook D1/D2**:`内核表` / `会话表` 文档原生语法;`DocumentSession`(cell index / 命名内核 / journal / value store);view Notebook 工具栏(Run All / Restart & Run All / Step / State / Journal / Reload)、状态徽标、内核下拉、Push/Pull 状态表单;`POST /api/session/*`。 +- **Notebook D3(部分)**:`reload` 重新解析并保留内核,源码变更的 cell 标为 `dirty`;Journal/Reload 按钮;状态桥 Push/Pull。 - **安全与健壮性**:所有外联入口检查 `exec` 能力;有界 stdout/stderr 读取与截断标记;stdin 写线程;Unix 进程组 / Windows `taskkill /T` 超时清理;shell-like argv 切分。 ### Fixed diff --git a/doc/design/notebook-session.md b/doc/design/notebook-session.md index 66c8d41..d65dfdf 100644 --- a/doc/design/notebook-session.md +++ b/doc/design/notebook-session.md @@ -33,13 +33,14 @@ | 同内核共享 / 跨内核隔离 | ✅ | Node 金样例 + 单测 | | `run_cell` / `step` / `run_all(restart)` | ✅ | `DocumentSession` | | `restart_kernel` / `assign_kernel` | ✅ | 同上 | +| `kernel/interrupt` | 待做 | — | | 状态桥 `push` / `pull` / `state_list` | ✅ | `DocumentSession` + `foreign_session` | -| journal(记录 + API) | ✅(UI 面板待补) | `DocumentSession::journal_json` | +| journal(记录 + API + Journal 按钮) | ✅ | `DocumentSession::journal_json` · view | | view 工具栏 / 状态徽标 / 内核下拉 / 状态表单 | ✅ | `src/view/html.rs` | -| `POST /api/session/*` | ✅ | `src/view/notebook_api.rs` | +| `POST /api/session/*` | ✅(含 `reload`) | `src/view/notebook_api.rs` | | cell step | ✅ | 同上 | | Marqdo statement step | 复用 `marqdo debug`;view 集成待做 | `src/debug` | -| dirty/stale 自动检测 | 部分(assign → dirty;reload 待做) | `src/notebook/mod.rs` | +| dirty/stale 自动检测 | 部分(reload → dirty;assign → dirty;stale 传播待做) | `src/notebook/mod.rs` | | writeback 集成 | 待做 | `writeback` | | replay / 持久化 | 待做 | — | | Python 会话 | ✅(本机无 python,CI/用户机条件测试) | `src/host/foreign_session.rs` | @@ -418,7 +419,7 @@ Kernel: [分析 ▾] Status: ready [Restart] [Interrupt] | POST | `/api/session/state/pull` | kernel 变量 → value store | | POST | `/api/session/statement/step` | Marqdo 语句单步(复用 debug) | | POST | `/api/session/writeback` | 显式写回 cell 输出 | -| GET | `/api/session/journal` | 执行日志 | +| POST | `/api/session/journal` | 执行日志 | | GET | `/api/session` | 当前会话摘要 | 响应统一:`{ok, session, ...}`;错误 `{ok:false, error, code?}`。 diff --git a/src/notebook/mod.rs b/src/notebook/mod.rs index 81bb118..48458ed 100644 --- a/src/notebook/mod.rs +++ b/src/notebook/mod.rs @@ -370,6 +370,53 @@ impl DocumentSession { }) } + /// Re-read the document, preserving kernels/state/journal. Changed cells become dirty. + pub fn reload(&mut self, root: &Path) -> Result<(), String> { + let mut fresh = Self::open(&self.path, root)?; + let old: HashMap = self + .cells + .iter() + .cloned() + .map(|c| (c.name.clone(), c)) + .collect(); + for c in &mut fresh.cells { + if let Some(o) = old.get(&c.name) { + c.runs = o.runs; + c.last_ms = o.last_ms; + c.last_ok = o.last_ok; + c.last_error = o.last_error.clone(); + c.status = if o.source_hash != c.source_hash || o.kernel != c.kernel { + CellStatus::Dirty + } else if o.status == CellStatus::Running { + CellStatus::Dirty + } else { + o.status + }; + } + } + fresh.host = std::mem::replace(&mut self.host, HostContext::default()); + fresh.kernel_sessions = std::mem::take(&mut self.kernel_sessions); + fresh.value_store = std::mem::take(&mut self.value_store); + fresh.journal = std::mem::take(&mut self.journal); + fresh.seq = self.seq; + fresh.cursor = self.cursor.min(fresh.order.len()); + fresh.opened_ms = self.opened_ms; + let known: HashSet = fresh.kernels.iter().map(|k| k.name.clone()).collect(); + let orphans: Vec = fresh + .kernel_sessions + .keys() + .filter(|k| !known.contains(*k)) + .cloned() + .collect(); + for k in orphans { + if let Some(id) = fresh.kernel_sessions.remove(&k) { + let _ = foreign_session::close(&mut fresh.host, &Value::Text(id)); + } + } + *self = fresh; + Ok(()) + } + pub fn title(&self) -> String { self.path .file_stem() @@ -916,4 +963,33 @@ console.log(typeof shared === "undefined" ? "isolated" : "leaked"); s.close(); let _ = std::fs::remove_file(&path); } + + #[test] + fn reload_marks_changed_cell_dirty() { + if !node_available() { + return; + } + let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); + let path = root.join(format!( + "target/notebook-reload-{}-{}.mq.md", + std::process::id(), + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .map(|d| d.as_nanos()) + .unwrap_or(0) + )); + let src = "# main\n\n`a` =\n```node\nconsole.log(1);\n```\n"; + std::fs::write(&path, src).unwrap(); + let mut s = DocumentSession::open(&path, &root).unwrap(); + let r = s.run_cell("a", None).unwrap(); + assert_eq!(field(&r, "ok"), Some(Value::Bool(true))); + assert_eq!(s.cells[0].status, CellStatus::Clean); + let src2 = "# main\n\n`a` =\n```node\nconsole.log(2);\n```\n"; + std::fs::write(&path, src2).unwrap(); + s.reload(&root).unwrap(); + assert_eq!(s.cells[0].status, CellStatus::Dirty); + assert!(s.cells[0].source.contains("console.log(2)")); + s.close(); + let _ = std::fs::remove_file(&path); + } } diff --git a/src/view/html.rs b/src/view/html.rs index 15672d6..febe2ad 100644 --- a/src/view/html.rs +++ b/src/view/html.rs @@ -2842,6 +2842,8 @@ fn notebook_ui() -> &'static str { + + opening…