diff --git a/Cargo.lock b/Cargo.lock index 52aac7dd..148d11e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11927,7 +11927,6 @@ dependencies = [ "vibeface-delivery", "vibeface-protocol", "vibeface-secure", - "vibeface-secure-ffi", "zeroize", ] diff --git a/apps/app/src/lib/markdown-performance.ts b/apps/app/src/lib/markdown-performance.ts deleted file mode 100644 index d6f18634..00000000 --- a/apps/app/src/lib/markdown-performance.ts +++ /dev/null @@ -1,94 +0,0 @@ -/** Synthetic Node main-loop probe, not browser frame-rate evidence. Run with node --experimental-strip-types. */ -import assert from "node:assert/strict" -import { createHash } from "node:crypto" -import { MarkdownScheduler, type MarkdownResult } from "./markdown-scheduler.ts" -import { renderMarkdown } from "./markdown.ts" -import { createNodeMarkdownWorker } from "./markdown-worker-test-adapter.ts" - -const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) -const block = (index: number) => `\n\n## Section ${index}\n\n` + "A **streamed** paragraph with [a safe link](https://example.com) and `inline code`.\n".repeat(12) - + "\n| key | value |\n|---|---|\n|a|b|\n\n```ts\n" + Array.from({ length: 20 }, (_, line) => `const v${line} = ""`).join("\n") + "\n```\n" -const snapshots: string[] = [] -let text = "" -for (let index = 0; index < 96; index++) { - text += block(index) - snapshots.push(text) -} - -async function measure(run: () => Promise) { - const gaps: number[] = [] - let previous = performance.now() - const heartbeat = setInterval(() => { - const now = performance.now() - gaps.push(Math.max(0, now - previous - 2)) - previous = now - }, 2) - const started = performance.now() - try { - const html = await run() - await delay(5) - const elapsedMs = performance.now() - started - gaps.sort((a, b) => a - b) - return { - html, - measurement: { - elapsedMs, heartbeatSamples: gaps.length, - maxHeartbeatDelayMs: gaps.at(-1) ?? 0, - p95HeartbeatDelayMs: gaps[Math.floor(gaps.length * 0.95)] ?? 0, - }, - } - } finally { clearInterval(heartbeat) } -} - -// Warm the actual parser before comparing execution paths. -renderMarkdown(snapshots[0] ?? "") -const baseline = await measure(async () => { - let html = "" - for (const snapshot of snapshots) { - await delay(2) - html = renderMarkdown(snapshot) - } - return html -}) - -let parses = 0 -let deliver: (result: MarkdownResult) => void = () => {} -const scheduler = new MarkdownScheduler(() => { - const worker = createNodeMarkdownWorker() - const post = worker.postMessage - worker.postMessage = (request) => { parses++; post(request) } - return worker -}) -const message = scheduler.connect((result) => deliver(result)) -try { - await new Promise((resolve, reject) => { - deliver = (result) => result.kind === "rendered" ? resolve() : reject(new Error(result.kind)) - message.update("warm up", false) - }) - parses = 0 - const updated = await measure(async () => { - let final: (html: string) => void = () => {} - let fail: (error: Error) => void = () => {} - const finished = new Promise((resolve, reject) => { final = resolve; fail = reject }) - deliver = (result) => { - if (result.kind !== "rendered") return fail(new Error(result.kind)) - if (result.text === text) final(result.html) - } - for (const snapshot of snapshots) { - await delay(2) - message.update(snapshot, true) - } - message.update(text, false) - return finished - }) - assert.equal(updated.html, baseline.html) - assert.equal(updated.html, renderMarkdown(text)) - process.stdout.write(JSON.stringify({ - scope: "Synthetic Node worker_threads main-loop responsiveness; no browser FPS claim", - node: process.version, updates: snapshots.length, finalCharacters: text.length, - outputMatchesBaselineAndParser: true, - outputSha256: createHash("sha256").update(updated.html).digest("hex"), - baseline: { parses: snapshots.length, ...baseline.measurement }, - worker: { parses, ...updated.measurement }, - }, null, 2) + "\n") -} finally { message.dispose() } diff --git a/apps/cli/src/desktop_node.rs b/apps/cli/src/desktop_node.rs index 871174a7..f4717146 100644 --- a/apps/cli/src/desktop_node.rs +++ b/apps/cli/src/desktop_node.rs @@ -1,5 +1,5 @@ //! App-private durable Node provisioning. This command is intentionally hidden from the public -//! CLI surface; the Electron main process is its only caller. +//! CLI surface; the native desktop host is its only caller. use anyhow::{Context, Result, ensure}; use clap::{Args, Subcommand}; use semver::Version; @@ -52,7 +52,7 @@ fn public_failure(error: anyhow::Error) -> anyhow::Error { #[derive(Args)] pub struct DesktopNode { - /// Absolute Electron profile directory trusted by the App. + /// Absolute desktop profile directory trusted by the App. #[arg(long, value_parser = absolute_path)] profile_dir: PathBuf, /// Existing Node identity to preserve. Required for every mutation. @@ -175,26 +175,6 @@ fn canonical_profile(path: &Path) -> Result { Ok(profile) } -/// Runs before Chromium and preferences use the App-owned directory, without creating a Node. -pub(crate) fn prepare_profile(path: &Path) -> Result<()> { - ensure!(path.is_absolute(), "Desktop profile path must be absolute"); - match fs::symlink_metadata(path) { - Ok(metadata) => ensure!( - metadata.is_dir() && !metadata.file_type().is_symlink(), - "Desktop profile must be a real directory" - ), - Err(error) if error.kind() == io::ErrorKind::NotFound => fs::create_dir_all(path)?, - Err(error) => return Err(error.into()), - } - ensure!( - privatefs::owner_of(path)? == privatefs::current_account()?, - "Desktop profile belongs to another account" - ); - privatefs::restrict_dir(path)?; - canonical_profile(path)?; - Ok(()) -} - fn data_dir(profile: &Path) -> Result { let data = profile.join("node"); let canonical = @@ -1312,38 +1292,21 @@ mod tests { } #[test] - fn profile_preparation_is_private_idempotent_and_creates_no_node() { + fn canonical_profile_rejects_a_non_private_directory() { let root = temp("profile-permissions"); let profile = root.join("Desktop 数据"); fs::create_dir(&profile).unwrap(); - fs::write( - profile.join("preferences.json"), - b"keep existing preferences", - ) - .unwrap(); #[cfg(unix)] { use std::os::unix::fs::PermissionsExt as _; fs::set_permissions(&profile, fs::Permissions::from_mode(0o755)).unwrap(); assert!(canonical_profile(&profile).is_err()); } - for _ in 0..2 { - prepare_profile(&profile).unwrap(); - assert!(privatefs::is_private(&profile).unwrap()); - assert_eq!( - fs::read(profile.join("preferences.json")).unwrap(), - b"keep existing preferences" - ); - assert!(!profile.join("node").exists()); - } - let fresh = root.join("fresh"); - prepare_profile(&fresh).unwrap(); - assert!(privatefs::is_private(&fresh).unwrap()); - assert!(fs::read_dir(&fresh).unwrap().next().is_none()); - let file = root.join("not-a-profile"); - fs::write(&file, b"preserve").unwrap(); - assert!(prepare_profile(&file).is_err()); - assert_eq!(fs::read(file).unwrap(), b"preserve"); + privatefs::restrict_dir(&profile).unwrap(); + assert_eq!( + canonical_profile(&profile).unwrap(), + fs::canonicalize(&profile).unwrap() + ); fs::remove_dir_all(root).unwrap(); } diff --git a/apps/cli/src/main.rs b/apps/cli/src/main.rs index 00db59a5..9efd38f2 100644 --- a/apps/cli/src/main.rs +++ b/apps/cli/src/main.rs @@ -104,12 +104,6 @@ enum Action { /// Internal Desktop managed Node provisioning interface. #[command(hide = true)] DesktopNode(crate::desktop_node::DesktopNode), - /// Prepare only the Electron profile's current-user filesystem permissions. - #[command(hide = true)] - DesktopProfile { - #[arg(long)] - profile_dir: PathBuf, - }, /// Call a local tool with JSON arguments. Tool { /// Tool name. @@ -881,11 +875,6 @@ async fn main() -> Result<()> { Some(Action::Service(options)) => crate::service::run(options).await, Some(Action::Update(options)) => crate::update::run(options).await, Some(Action::DesktopNode(options)) => crate::desktop_node::run(options).await, - Some(Action::DesktopProfile { profile_dir }) => { - crate::desktop_node::prepare_profile(&profile_dir)?; - println!("{}", json!({"ok": true})); - Ok(()) - } } } diff --git a/apps/core/Cargo.toml b/apps/core/Cargo.toml index e2dbf0ef..027c2787 100644 --- a/apps/core/Cargo.toml +++ b/apps/core/Cargo.toml @@ -48,7 +48,6 @@ vibeface-protocol.workspace = true vibeface-bridge.workspace = true vibeface-control.workspace = true vibeface-secure = { path = "../../crates/secure" } -vibeface-secure-ffi = { path = "../../crates/secure-ffi" } vibeface-delivery = { path = "../../crates/delivery" } zeroize = { version = "1", features = ["derive"] } diff --git a/apps/core/src/desktop_client_bridge.rs b/apps/core/src/desktop_client_bridge.rs deleted file mode 100644 index 5803a9c9..00000000 --- a/apps/core/src/desktop_client_bridge.rs +++ /dev/null @@ -1,348 +0,0 @@ -//! A client-only stdio adapter for Desktop's existing iroh/Noise transport. -//! This runs before config, identity, storage, logging, or Node startup. - -use anyhow::{Context, Result, bail, ensure}; -use base64::{Engine as _, engine::general_purpose::STANDARD}; -use serde::{Deserialize, Serialize}; -use std::{net::SocketAddr, sync::Arc}; -use tokio::{ - io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader}, - sync::mpsc, -}; -use vibeface_secure_ffi::lan::{LanFrame, LanStream, MAX_FRAME_BYTES, lan_connect}; - -const MAX_ADDRESSES: usize = 16; -const MAX_TIMEOUT_MS: u32 = 30_000; -const MAX_LINE_BYTES: usize = MAX_FRAME_BYTES * 4 / 3 + 4096; - -#[derive(Deserialize)] -#[serde(deny_unknown_fields)] -struct OpenRequest { - #[serde(rename = "type")] - kind: String, - device_id: String, - addrs: Vec, - timeout_ms: u32, -} - -#[derive(Deserialize)] -#[serde(tag = "type", rename_all = "snake_case", deny_unknown_fields)] -enum Command { - Send { data: String }, - Close {}, -} - -#[derive(Serialize)] -#[serde(tag = "type", rename_all = "snake_case")] -enum Output<'a> { - Opened, - Sent, - Frame { text: bool, data: String }, - Closed, - Error { message: &'a str }, -} - -enum ReadEvent { - Frame(LanFrame), - Closed, - Error, -} - -async fn read_bounded_line( - reader: &mut BufReader, -) -> Result>> { - let mut line = Vec::new(); - loop { - let available = reader.fill_buf().await?; - if available.is_empty() { - return if line.is_empty() { - Ok(None) - } else { - Ok(Some(line)) - }; - } - let newline = available.iter().position(|byte| *byte == b'\n'); - let count = newline.map_or(available.len(), |index| index + 1); - ensure!( - line.len().saturating_add(count) <= MAX_LINE_BYTES, - "bridge message exceeds its size limit" - ); - line.extend_from_slice(&available[..count]); - reader.consume(count); - if newline.is_some() { - line.pop(); - return Ok(Some(line)); - } - } -} - -async fn write_output(writer: &mut W, value: Output<'_>) -> Result<()> { - let mut bytes = serde_json::to_vec(&value)?; - ensure!( - bytes.len() <= MAX_LINE_BYTES, - "bridge response exceeds its size limit" - ); - bytes.push(b'\n'); - writer.write_all(&bytes).await?; - writer.flush().await?; - Ok(()) -} - -fn numeric_addresses(addresses: Vec) -> Result> { - ensure!( - !addresses.is_empty() && addresses.len() <= MAX_ADDRESSES, - "invalid LAN address count" - ); - let mut unique = Vec::with_capacity(addresses.len()); - for address in addresses { - let socket: SocketAddr = address - .parse() - .context("LAN address must be numeric IP:port")?; - ensure!(socket.port() != 0, "LAN port is invalid"); - let canonical = socket.to_string(); - if !unique.contains(&canonical) { - unique.push(canonical); - } - } - ensure!(!unique.is_empty(), "no valid LAN address"); - Ok(unique) -} - -async fn receive(stream: Arc, tx: mpsc::Sender) { - loop { - match stream.clone().recv().await { - Ok(Some(frame)) => { - if tx.send(ReadEvent::Frame(frame)).await.is_err() { - return; - } - } - Ok(None) => { - let _ = tx.send(ReadEvent::Closed).await; - return; - } - Err(_) => { - let _ = tx.send(ReadEvent::Error).await; - return; - } - } - } -} - -pub async fn run() -> Result<()> { - let stdin = tokio::io::stdin(); - let stdout = tokio::io::stdout(); - run_io(stdin, stdout).await -} - -async fn run_io( - input: R, - mut output: W, -) -> Result<()> { - let mut input = BufReader::new(input); - let Some(line) = read_bounded_line(&mut input).await? else { - bail!("missing LAN open request") - }; - let open: OpenRequest = serde_json::from_slice(&line).context("invalid LAN open request")?; - ensure!( - open.kind == "open", - "first bridge request must open a stream" - ); - ensure!( - open.timeout_ms > 0 && open.timeout_ms <= MAX_TIMEOUT_MS, - "invalid LAN timeout" - ); - ensure!( - open.device_id.len() == 64 - && open - .device_id - .bytes() - .all(|byte| byte.is_ascii_hexdigit() && !byte.is_ascii_uppercase()), - "invalid Node identity" - ); - let addrs = numeric_addresses(open.addrs)?; - let stream = lan_connect(open.device_id, addrs, open.timeout_ms) - .await - .map_err(|_| anyhow::anyhow!("LAN connection failed"))?; - write_output(&mut output, Output::Opened).await?; - - let (tx, mut events) = mpsc::channel(16); - tokio::spawn(receive(stream.clone(), tx)); - loop { - tokio::select! { - line = read_bounded_line(&mut input) => { - let Some(line) = line? else { stream.close(); return Ok(()) }; - let command: Command = serde_json::from_slice(&line).context("invalid LAN bridge command")?; - match command { - Command::Send { data } => { - ensure!(data.len() <= MAX_FRAME_BYTES * 4 / 3 + 4, "LAN frame exceeds its size limit"); - let frame = STANDARD.decode(data).context("invalid LAN frame encoding")?; - ensure!(frame.len() <= MAX_FRAME_BYTES, "LAN frame exceeds its size limit"); - stream.send(frame).map_err(|_| anyhow::anyhow!("LAN stream is closed or full"))?; - write_output(&mut output, Output::Sent).await?; - } - Command::Close {} => { - stream.close(); - write_output(&mut output, Output::Closed).await?; - return Ok(()); - } - } - } - event = events.recv() => { - match event { - Some(ReadEvent::Frame(frame)) => write_output(&mut output, Output::Frame { text: frame.text, data: STANDARD.encode(frame.data) }).await?, - Some(ReadEvent::Closed) => { write_output(&mut output, Output::Closed).await?; stream.close(); return Ok(()) } - Some(ReadEvent::Error) | None => { write_output(&mut output, Output::Error { message: "LAN stream failed" }).await?; stream.close(); return Ok(()) } - } - } - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - use iroh::{Endpoint, RelayMode, SecretKey, endpoint::presets}; - use tokio::io::duplex; - use vibeface_secure::Identity; - - const ALPN: &[u8] = b"vibeface/client/1"; - - async fn read_wire_frame(recv: &mut iroh::endpoint::RecvStream) -> Result> { - let mut header = [0; 5]; - recv.read_exact(&mut header).await?; - let length = u32::from_be_bytes(header[1..5].try_into()?) as usize; - ensure!(length <= MAX_FRAME_BYTES, "fixture frame exceeds limit"); - let mut bytes = vec![0; length]; - recv.read_exact(&mut bytes).await?; - ensure!(header[0] == 0, "fixture expected a binary frame"); - Ok(bytes) - } - - fn wire_frame(bytes: &[u8]) -> Vec { - let mut framed = Vec::with_capacity(5 + bytes.len()); - framed.push(0); - framed.extend_from_slice(&(bytes.len() as u32).to_be_bytes()); - framed.extend_from_slice(bytes); - framed - } - - async fn response_line( - reader: &mut BufReader, - ) -> Result { - let line = read_bounded_line(reader) - .await? - .context("bridge response missing")?; - Ok(serde_json::from_slice(&line)?) - } - - #[test] - fn numeric_addresses_are_bounded_and_deduplicated() { - assert_eq!( - numeric_addresses(vec!["127.0.0.1:1".into(), "127.0.0.1:1".into()]).unwrap(), - ["127.0.0.1:1"] - ); - assert!(numeric_addresses(vec!["node.local:1".into()]).is_err()); - assert!( - numeric_addresses( - (0..MAX_ADDRESSES + 1) - .map(|port| format!("127.0.0.1:{}", port + 1)) - .collect() - ) - .is_err() - ); - } - - #[tokio::test] - async fn bridge_refuses_non_open_input_before_network_setup() { - let (input, mut writer) = duplex(256); - writer.write_all(b"{\"type\":\"close\"}\n").await.unwrap(); - drop(writer); - assert!(run_io(input, tokio::io::sink()).await.is_err()); - } - - #[tokio::test] - async fn stdio_bridge_preserves_lan_frame_bytes_and_closes_on_close_command() -> Result<()> { - let node = Identity::generate()?; - let seed: [u8; 32] = hex::decode(node.secret_hex())? - .try_into() - .map_err(|_| anyhow::anyhow!("invalid identity seed"))?; - let endpoint = Endpoint::builder(presets::Minimal) - .secret_key(SecretKey::from_bytes(&seed)) - .alpns(vec![ALPN.to_vec()]) - .relay_mode(RelayMode::Disabled) - .clear_ip_transports() - .bind_addr((std::net::Ipv4Addr::LOCALHOST, 0))? - .bind() - .await?; - let address = endpoint.bound_sockets()[0].to_string(); - let node_id = node.device_id(); - let expected = vec![0, 1, 2, 0x7f, 0x80, 0xfe, 0xff]; - let serving = tokio::spawn({ - let endpoint = endpoint.clone(); - let expected = expected.clone(); - async move { - let connection = endpoint - .accept() - .await - .context("fixture connection missing")? - .await?; - let (mut send, mut recv) = connection.accept_bi().await?; - let input = read_wire_frame(&mut recv).await?; - anyhow::ensure!(input == expected, "bridge changed outbound LAN frame"); - send.write_all(&wire_frame(&expected)).await?; - connection.closed().await; - anyhow::Ok(()) - } - }); - - let (bridge_input, mut input_writer) = duplex(MAX_LINE_BYTES * 2); - let (mut output_reader, bridge_output) = duplex(MAX_LINE_BYTES * 2); - let bridge = tokio::spawn(run_io(bridge_input, bridge_output)); - let mut output = BufReader::new(&mut output_reader); - input_writer - .write_all( - serde_json::to_string(&serde_json::json!({ - "type": "open", "device_id": node_id, "addrs": [address], "timeout_ms": 5000 - }))? - .as_bytes(), - ) - .await?; - input_writer.write_all(b"\n").await?; - anyhow::ensure!(response_line(&mut output).await?["type"] == "opened"); - input_writer - .write_all( - serde_json::to_string(&serde_json::json!({ - "type": "send", "data": STANDARD.encode(&expected) - }))? - .as_bytes(), - ) - .await?; - input_writer.write_all(b"\n").await?; - let mut acknowledged = false; - let mut echoed = false; - for _ in 0..2 { - let message = response_line(&mut output).await?; - match message["type"].as_str() { - Some("sent") => acknowledged = true, - Some("frame") => { - let data = - STANDARD.decode(message["data"].as_str().context("frame data missing")?)?; - anyhow::ensure!(data == expected, "bridge changed inbound LAN frame"); - echoed = true; - } - other => bail!("unexpected bridge reply: {other:?}"), - } - } - anyhow::ensure!( - acknowledged && echoed, - "bridge did not send and return the LAN frame" - ); - input_writer.write_all(b"{\"type\":\"close\"}\n").await?; - anyhow::ensure!(response_line(&mut output).await?["type"] == "closed"); - drop(input_writer); - bridge.await??; - serving.await??; - endpoint.close().await; - Ok(()) - } -} diff --git a/apps/core/src/main.rs b/apps/core/src/main.rs index b756df02..8bd520d2 100644 --- a/apps/core/src/main.rs +++ b/apps/core/src/main.rs @@ -1,4 +1,3 @@ -mod desktop_client_bridge; mod desktop_parent; use anyhow::{Context, Result, bail}; @@ -32,17 +31,11 @@ struct CoreArgs { /// Stop this owned Core when its desktop or Windows CLI parent's private stdin closes. #[arg(long, hide = true, conflicts_with = "control")] desktop_parent_stdin: bool, - /// Open one bounded client-only LAN stream over the existing iroh protocol. - #[arg(long, hide = true, conflicts_with_all = ["control", "desktop_parent_stdin"])] - desktop_client_bridge: bool, } #[tokio::main] async fn main() -> Result<()> { let args = CoreArgs::parse(); - if args.desktop_client_bridge { - return desktop_client_bridge::run().await; - } if args.control { let mut input = Vec::new(); std::io::stdin() diff --git a/packages/docs/design/gpui-desktop.md b/packages/docs/design/gpui-desktop.md index b72a3002..e9b98c96 100644 --- a/packages/docs/design/gpui-desktop.md +++ b/packages/docs/design/gpui-desktop.md @@ -1,13 +1,13 @@ # 原生 GPUI 桌面迁移 -本设计将 macOS、Windows 和 Linux 桌面改为 GPUI 原生界面,移除 Electron、preload、Chromium 和桌面 WebView。Web 与 Mobile 继续作为独立客户端存在。本文规定目标与验收范围,不代表这些步骤已经完成。 +本设计是当前 macOS、Windows 和 Linux 桌面的归属说明:原生 GPUI 界面,没有 Electron、preload、Chromium 或桌面 WebView。Web 与 Mobile 继续作为独立客户端存在。下文的功能表是验收范围,不是未完成的迁移步骤。 ## 模块归属 桌面进程内运行 GPUI 界面和独立 Rust 个人网络客户端。客户端连接本人网络中的 Node,也能管理可选的本机 Core。纯控制端启动、扫描和选择节点都不初始化或启动 Node。 - `apps/desktop` 拥有原生窗口、输入、时间线、业务页面、通知、激活和本机进程管理。 -- `crates/client` 复用并接替 `crates/control/src/client.rs` 的密钥封存、目录验证、加入、恢复和签名规则,增加有界连接调度、订阅、业务读取和耐久 outbox。CLI 的对应调用者同时迁移,不保留旧实现或别名。 +- `crates/client` 拥有密钥封存、目录验证、加入、恢复、签名、有界连接调度、订阅、业务读取和耐久 outbox。CLI 的对应调用者同时使用这一套,不保留旧实现或别名。 - `crates/protocol` 只承接 Core 已有的纯 wire 类型。存储、调度和 Provider 保留在 Core,不能为了复用 DTO 链入整个 Core。 - `crates/control` 继续负责验证过的本机维护控制;服务与受管更新复用 CLI 的现有能力。 - `crates/secure` 继续拥有签名、Noise、成员治理和恢复规则。原生客户端直接使用 Rust 实现。 diff --git a/packages/docs/state-machines.md b/packages/docs/state-machines.md index 1e95b7fc..cca67458 100644 --- a/packages/docs/state-machines.md +++ b/packages/docs/state-machines.md @@ -26,7 +26,7 @@ description: 定位执行、输入、连接和恢复的状态模型与安全边 | 原生密码学适配 | `packages/secure-native`、`crates/secure-ffi` | 握手失败关闭,完成时消费原握手。接收、关闭与运行时重建需核对句柄归属。 | | 系统服务 | `scripts/install-node-service.sh`、`scripts/install-node-service.ps1` | 服务管理器已加载或受理启动不等于 Core 健康。停止须确认进程与数据锁均已释放。 | | 官网主题 | `apps/www/src/components/theme-toggle.tsx` | hydration、偏好与解析后的颜色分别处理。持久化由主题 provider 管理。 | -| 桌面进程 | `apps/desktop/src/main/lifecycle.ts`、`session.ts` | 已连接的外部服务不归当前窗口所有。退出未确认时保留所有权屏障。 | +| 桌面进程 | `apps/desktop/src/host/lifecycle.rs`、`apps/desktop/src/host/mod.rs` | 已连接的外部服务不归当前窗口所有。退出未确认时保留所有权屏障。 | | 本机更新 | `apps/cli/src/update`、`apps/core/src/maintenance.rs` | 未确认更新保留日志和执行屏障。恢复运行程序不回滚业务数据。 | ## 加入任务的所有权 diff --git a/scripts/ci-runner-load.sh b/scripts/ci-runner-load.sh deleted file mode 100755 index 92965af0..00000000 --- a/scripts/ci-runner-load.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# Samples hosted runner load every 10 seconds. Prints only resource counters and process names. -set -u -if [[ "$(uname -s)" == Linux ]]; then - cgroup_path="$(awk -F: '$1 == "0" { print $3 }' /proc/self/cgroup)" - cgroup_root="/sys/fs/cgroup$cgroup_path" - printf 'cpus=%s cgroup=%s\n' "$(getconf _NPROCESSORS_ONLN)" "$cgroup_path" - while :; do - awk -v at="$(date -u +%H:%M:%S)" ' - /^(MemTotal|MemAvailable|SwapTotal|SwapFree):/ { value[$1] = $2 } - END { printf "%s total_mib=%d available_mib=%d swap_total_mib=%d swap_free_mib=%d", at, - value["MemTotal:"] / 1024, value["MemAvailable:"] / 1024, - value["SwapTotal:"] / 1024, value["SwapFree:"] / 1024 }' /proc/meminfo - ps -Ao rss=,comm= | sort -rn | head -5 | awk '{ rss = $1; $1 = ""; printf " |%s rss_mib=%d", $0, rss / 1024 }' - echo - if [[ -r /proc/pressure/memory ]]; then - awk '{ printf "memory_psi_%s %s %s\n", $1, $2, $5 }' /proc/pressure/memory - fi - if [[ -r "$cgroup_root/memory.events" ]]; then - awk '{ printf "cgroup_memory_%s=%s\n", $1, $2 }' "$cgroup_root/memory.events" - fi - sleep 10 - done -fi -printf 'cpus=%s memory_mib=%s\n' "$(sysctl -n hw.ncpu)" "$(( $(sysctl -n hw.memsize) / 1048576 ))" -page=$(sysctl -n hw.pagesize) -while :; do - vm_stat | awk -v page="$page" -v at="$(date -u +%H:%M:%S)" -v load="$(sysctl -n vm.loadavg | awk '{print $2}')" ' - /Pages free/ { free = $3 } - /Pages occupied by compressor/ { compressed = $5 } - /^Swapouts/ { swapouts = $2 } - END { printf "%s load=%s free_mib=%d compressed_mib=%d swapouts=%d", at, load, free * page / 1048576, compressed * page / 1048576, swapouts }' - ps -Ao pcpu=,ucomm= | sort -rn | head -3 | awk '{ cpu = $1; $1 = ""; printf " |%s %s%%", $0, cpu }' - echo - sleep 10 -done diff --git a/scripts/private-control.d.mts b/scripts/private-control.d.mts deleted file mode 100644 index 0f050221..00000000 --- a/scripts/private-control.d.mts +++ /dev/null @@ -1,22 +0,0 @@ -export function resolveBoundedPath(root: string, candidate: string): string; - -export function ensurePrivateDirectory( - directory: string, - options?: { root?: string }, -): Promise; - -export function verifyPrivateControlFile( - filename: string, - options?: { root?: string; maxBytes?: number }, -): Promise; - -export function readPrivateControlJson( - filename: string, - options?: { root?: string; maxBytes?: number }, -): Promise; - -export function writePrivateControlFile( - filename: string, - content: string, - options?: { root?: string; maxBytes?: number }, -): Promise;