diff --git a/.github/workflows/metrics.yml b/.github/workflows/metrics.yml index 3383733b..68a234e8 100644 --- a/.github/workflows/metrics.yml +++ b/.github/workflows/metrics.yml @@ -77,7 +77,7 @@ jobs: printf "%b" "$DETAILS" > /tmp/commit_details.txt echo "max_lines=${MAX_LINES}" >> "$GITHUB_OUTPUT" - # ── Gate 2: Frontend bundle size ≤ 512 KB (gzip) ── + # ── Gate 2: Frontend bundle size ≤ 350 KB (gzip) ── - name: Check bundle size id: bundle_size run: | @@ -92,7 +92,7 @@ jobs: done GZIP_KB=$(( GZIP_BYTES / 1024 )) - LIMIT_KB=512 + LIMIT_KB=350 if [ "$GZIP_KB" -gt "$LIMIT_KB" ]; then PASS="false" else @@ -156,9 +156,9 @@ jobs: # Extract structured metrics from METRIC: lines RSS_MB=$(echo "$OUTPUT" | grep -oP 'METRIC:rss_mb=\K[0-9.]+' || echo "N/A") VMS_MB=$(echo "$OUTPUT" | grep -oP 'METRIC:vms_mb=\K[0-9.]+' || echo "N/A") - CMD_P50=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_p50_ms=\K[0-9]+' || echo "N/A") - CMD_P95=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_p95_ms=\K[0-9]+' || echo "N/A") - CMD_MAX=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_max_ms=\K[0-9]+' || echo "N/A") + CMD_P50=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_p50_us=\K[0-9]+' || echo "N/A") + CMD_P95=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_p95_us=\K[0-9]+' || echo "N/A") + CMD_MAX=$(echo "$OUTPUT" | grep -oP 'METRIC:cmd_max_us=\K[0-9]+' || echo "N/A") UPTIME=$(echo "$OUTPUT" | grep -oP 'METRIC:uptime_secs=\K[0-9.]+' || echo "N/A") echo "passed=${PASSED}" >> "$GITHUB_OUTPUT" @@ -166,9 +166,9 @@ jobs: echo "exit_code=${EXIT_CODE}" >> "$GITHUB_OUTPUT" echo "rss_mb=${RSS_MB}" >> "$GITHUB_OUTPUT" echo "vms_mb=${VMS_MB}" >> "$GITHUB_OUTPUT" - echo "cmd_p50=${CMD_P50}" >> "$GITHUB_OUTPUT" - echo "cmd_p95=${CMD_P95}" >> "$GITHUB_OUTPUT" - echo "cmd_max=${CMD_MAX}" >> "$GITHUB_OUTPUT" + echo "cmd_p50_us=${CMD_P50}" >> "$GITHUB_OUTPUT" + echo "cmd_p95_us=${CMD_P95}" >> "$GITHUB_OUTPUT" + echo "cmd_max_us=${CMD_MAX}" >> "$GITHUB_OUTPUT" echo "uptime=${UPTIME}" >> "$GITHUB_OUTPUT" if [ "$EXIT_CODE" -ne 0 ]; then @@ -181,30 +181,58 @@ jobs: - name: Check large files id: large_files run: | - MOD_LINES=$(wc -l < src-tauri/src/commands/mod.rs 2>/dev/null || echo 0) - APP_LINES=$(wc -l < src/App.tsx 2>/dev/null || echo 0) + # Auto-scan ALL source files >300 lines and assign targets + # Target = min(current_lines * 0.6, current_lines - 200) rounded to nearest 100, floor 500 + DETAILS="" + OVER_TARGET=0 + TOTAL_LARGE=0 + + # Manually tracked key files with specific targets + declare -A OVERRIDES + OVERRIDES["src-tauri/src/commands/mod.rs"]=300 + OVERRIDES["src/App.tsx"]=500 + OVERRIDES["src-tauri/src/commands/doctor_assistant.rs"]=3000 + OVERRIDES["src-tauri/src/commands/rescue.rs"]=2000 + OVERRIDES["src-tauri/src/commands/profiles.rs"]=1500 + OVERRIDES["src-tauri/src/cli_runner.rs"]=1200 + OVERRIDES["src-tauri/src/commands/credentials.rs"]=1000 + + while IFS= read -r LINE; do + LINES=$(echo "$LINE" | awk '{print $1}') + FILE=$(echo "$LINE" | awk '{print $2}') + [ "$LINES" -le 300 ] 2>/dev/null && continue + + SHORT=$(echo "$FILE" | sed 's|src-tauri/src/||;s|src/||') + + # Use override if available, otherwise auto-calculate + if [ -n "${OVERRIDES[$FILE]+x}" ]; then + TARGET=${OVERRIDES[$FILE]} + else + # Target: 60% of current, rounded to nearest 100, floor 500 + TARGET=$(( (LINES * 60 / 100 + 50) / 100 * 100 )) + [ "$TARGET" -lt 500 ] && TARGET=500 + fi - DETAILS="| \`commands/mod.rs\` | ${MOD_LINES} | ≤ 2000 |" - if [ "$MOD_LINES" -gt 2000 ]; then - DETAILS="${DETAILS} ⚠️ |" - else - DETAILS="${DETAILS} ✅ |" - fi + if [ "$LINES" -gt 500 ]; then + TOTAL_LARGE=$((TOTAL_LARGE + 1)) + fi - DETAILS="${DETAILS}\n| \`App.tsx\` | ${APP_LINES} | ≤ 500 |" - if [ "$APP_LINES" -gt 500 ]; then - DETAILS="${DETAILS} ⚠️ |" - else - DETAILS="${DETAILS} ✅ |" - fi + if [ "$LINES" -gt "$TARGET" ]; then + DETAILS="${DETAILS}| \`${SHORT}\` | ${LINES} | ≤ ${TARGET} | ⚠️ |\n" + OVER_TARGET=$((OVER_TARGET + 1)) + else + DETAILS="${DETAILS}| \`${SHORT}\` | ${LINES} | ≤ ${TARGET} | ✅ |\n" + fi + done < <(find src/ src-tauri/src/ \( -name '*.ts' -o -name '*.tsx' -o -name '*.rs' \) -exec wc -l {} + 2>/dev/null | grep -v total | sort -rn) - LARGE_COUNT=$(find src/ src-tauri/src/ \( -name '*.ts' -o -name '*.tsx' -o -name '*.rs' \) -exec wc -l {} + 2>/dev/null | \ - grep -v total | awk '$1 > 500 {count++} END {print count+0}') + MOD_LINES=$(wc -l < src-tauri/src/commands/mod.rs 2>/dev/null || echo 0) + APP_LINES=$(wc -l < src/App.tsx 2>/dev/null || echo 0) printf "%b" "$DETAILS" > /tmp/large_file_details.txt echo "mod_lines=${MOD_LINES}" >> "$GITHUB_OUTPUT" echo "app_lines=${APP_LINES}" >> "$GITHUB_OUTPUT" - echo "large_count=${LARGE_COUNT}" >> "$GITHUB_OUTPUT" + echo "large_count=${TOTAL_LARGE}" >> "$GITHUB_OUTPUT" + echo "over_target=${OVER_TARGET}" >> "$GITHUB_OUTPUT" # ── Gate 4b: Command perf E2E (local) ── - name: Run command perf E2E @@ -421,20 +449,33 @@ jobs: if [ "${{ steps.bundle_size.outputs.pass }}" = "false" ]; then OVERALL="❌ Some gates failed"; GATE_FAIL=1 fi + if [ "${{ steps.bundle_size.outputs.init_gzip_kb }}" -gt 180 ] 2>/dev/null; then + OVERALL="❌ Some gates failed"; GATE_FAIL=1 + fi if [ "${{ steps.perf_tests.outputs.pass }}" = "false" ]; then OVERALL="❌ Some gates failed"; GATE_FAIL=1 fi + CMD_P50="${{ steps.perf_tests.outputs.cmd_p50_us }}" + if [ "$CMD_P50" != "N/A" ] && [ "$CMD_P50" -gt 1000 ]; then + OVERALL="❌ Some gates failed"; GATE_FAIL=1 + fi if [ "${{ steps.cmd_perf.outputs.pass }}" = "false" ]; then OVERALL="❌ Some gates failed"; GATE_FAIL=1 fi if [ "${{ steps.home_perf.outputs.pass }}" = "false" ]; then OVERALL="❌ Some gates failed"; GATE_FAIL=1 fi + for PROBE_VAL in "${{ steps.home_perf.outputs.status_ms }}" "${{ steps.home_perf.outputs.version_ms }}" "${{ steps.home_perf.outputs.agents_ms }}" "${{ steps.home_perf.outputs.models_ms }}"; do + if [ "$PROBE_VAL" != "N/A" ] && [ "$PROBE_VAL" -gt 200 ] 2>/dev/null; then + OVERALL="❌ Some gates failed"; GATE_FAIL=1 + fi + done if [ "${{ steps.remote_perf.outputs.pass }}" = "false" ]; then OVERALL="❌ Some gates failed"; GATE_FAIL=1 fi BUNDLE_ICON=$( [ "${{ steps.bundle_size.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) + MOCK_LATENCY="${{ env.PERF_MOCK_LATENCY_MS || '50' }}" COMMIT_ICON=$( [ "${{ steps.commit_size.outputs.fail }}" = "0" ] && echo "✅" || echo "❌" ) cat > /tmp/metrics_comment.md << COMMENTEOF @@ -457,18 +498,18 @@ jobs: |--------|-------|-------|--------| | JS bundle (raw) | ${{ steps.bundle_size.outputs.raw_kb }} KB | — | — | | JS bundle (gzip) | ${{ steps.bundle_size.outputs.gzip_kb }} KB | ≤ ${{ steps.bundle_size.outputs.limit_kb }} KB | ${BUNDLE_ICON} | - | JS initial load (gzip) | ${{ steps.bundle_size.outputs.init_gzip_kb }} KB | — | ℹ️ | + | JS initial load (gzip) | ${{ steps.bundle_size.outputs.init_gzip_kb }} KB | ≤ 180 KB | $( [ "${{ steps.bundle_size.outputs.init_gzip_kb }}" -le 180 ] && echo "✅" || echo "❌" ) | ### Perf Metrics E2E $( [ "${{ steps.perf_tests.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) | Metric | Value | Limit | Status | |--------|-------|-------|--------| | Tests | ${{ steps.perf_tests.outputs.passed }} passed, ${{ steps.perf_tests.outputs.failed }} failed | 0 failures | $( [ "${{ steps.perf_tests.outputs.failed }}" = "0" ] && echo "✅" || echo "❌" ) | - | RSS (test process) | ${{ steps.perf_tests.outputs.rss_mb }} MB | ≤ 80 MB | $( echo "${{ steps.perf_tests.outputs.rss_mb }}" | awk '{print ($1 <= 80) ? "✅" : "❌"}' ) | + | RSS (test process) | ${{ steps.perf_tests.outputs.rss_mb }} MB | ≤ 20 MB | $( echo "${{ steps.perf_tests.outputs.rss_mb }}" | awk '{print ($1 <= 80) ? "✅" : "❌"}' ) | | VMS (test process) | ${{ steps.perf_tests.outputs.vms_mb }} MB | — | ℹ️ | - | Command P50 latency | ${{ steps.perf_tests.outputs.cmd_p50 }} ms | — | ℹ️ | - | Command P95 latency | ${{ steps.perf_tests.outputs.cmd_p95 }} ms | ≤ 100 ms | $( echo "${{ steps.perf_tests.outputs.cmd_p95 }}" | awk '{print ($1 <= 100) ? "✅" : "❌"}' ) | - | Command max latency | ${{ steps.perf_tests.outputs.cmd_max }} ms | — | ℹ️ | + | Command P50 latency | ${{ steps.perf_tests.outputs.cmd_p50_us }} µs | ≤ 1000 µs | $( echo "${{ steps.perf_tests.outputs.cmd_p50_us }}" | awk '{print ($1 != "N/A" && $1 <= 1000) ? "✅" : "❌"}' ) | + | Command P95 latency | ${{ steps.perf_tests.outputs.cmd_p95_us }} µs | ≤ 5000 µs | $( echo "${{ steps.perf_tests.outputs.cmd_p95_us }}" | awk '{print ($1 != "N/A" && $1 <= 5000) ? "✅" : "❌"}' ) | + | Command max latency | ${{ steps.perf_tests.outputs.cmd_max_us }} µs | ≤ 50000 µs | $( echo "${{ steps.perf_tests.outputs.cmd_max_us }}" | awk '{print ($1 != "N/A" && $1 <= 50000) ? "✅" : "❌"}' ) | ### Command Perf (local) $( [ "${{ steps.cmd_perf.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) @@ -480,9 +521,9 @@ jobs:
Local command timings - | Command | P50 | P95 | Max | - |---------|-----|-----|-----| - $(cat /tmp/local_cmd_perf.txt 2>/dev/null | awk -F: '{printf "| %s | %s | %s | %s |\n", $2, $4, $5, $6}' | sed 's/p50=//;s/p95=//;s/max=//;s/avg=[0-9]*//;s/count=[0-9]*://' || echo "| N/A | N/A | N/A | N/A |") + | Command | P50 (µs) | P95 (µs) | Max (µs) | + |---------|----------|----------|----------| + $(cat /tmp/local_cmd_perf.txt 2>/dev/null | awk -F: '{printf "| %s | %s | %s | %s |\n", $2, $4, $5, $6}' | sed 's/p50_us=//;s/p95_us=//;s/max_us=//;s/avg_us=[0-9]*//;s/count=[0-9]*://' || echo "| N/A | N/A | N/A | N/A |")
@@ -491,7 +532,7 @@ jobs: | Metric | Value | Status | |--------|-------|--------| | SSH transport | $( [ "${{ steps.remote_perf.outputs.pass }}" = "true" ] && echo "OK" || echo "FAILED" ) | $( [ "${{ steps.remote_perf.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) | - | Command failures | ${{ steps.remote_perf.outputs.cmd_fail_count }}/${{ steps.remote_perf.outputs.total_runs }} runs | $( [ "${{ steps.remote_perf.outputs.cmd_fail_count }}" = "0" ] && echo "✅" || echo "⚠️ expected in Docker" ) | + | Command failures | ${{ steps.remote_perf.outputs.cmd_fail_count }}/${{ steps.remote_perf.outputs.total_runs }} runs | $( [ "${{ steps.remote_perf.outputs.cmd_fail_count }}" = "0" ] && echo "✅" || echo "ℹ️ Docker (no gateway)" ) |
Remote command timings (via Docker SSH) @@ -501,22 +542,23 @@ jobs:
- ### Home Page Render Probes $( [ "${{ steps.home_perf.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) + ### Home Page Render Probes (mock IPC ${MOCK_LATENCY}ms, cache-first render) $( [ "${{ steps.home_perf.outputs.pass }}" = "true" ] && echo "✅" || echo "❌" ) | Probe | Value | Limit | Status | |-------|-------|-------|--------| - | status | ${{ steps.home_perf.outputs.status_ms }} ms | — | ℹ️ | - | version | ${{ steps.home_perf.outputs.version_ms }} ms | — | ℹ️ | - | agents | ${{ steps.home_perf.outputs.agents_ms }} ms | — | ℹ️ | - | models | ${{ steps.home_perf.outputs.models_ms }} ms | — | ℹ️ | - | settled | ${{ steps.home_perf.outputs.settled_ms }} ms | < 5000 ms | $( echo "${{ steps.home_perf.outputs.settled_ms }}" | awk '{print ($1 != "N/A" && $1 < 5000) ? "✅" : "❌"}' ) | + | status | ${{ steps.home_perf.outputs.status_ms }} ms | ≤ 200 ms | $( echo "${{ steps.home_perf.outputs.status_ms }}" | awk '{print ($1 != "N/A" && $1 <= 200) ? "✅" : "❌"}' ) | + | version | ${{ steps.home_perf.outputs.version_ms }} ms | ≤ 200 ms | $( echo "${{ steps.home_perf.outputs.version_ms }}" | awk '{print ($1 != "N/A" && $1 <= 200) ? "✅" : "❌"}' ) | + | agents | ${{ steps.home_perf.outputs.agents_ms }} ms | ≤ 200 ms | $( echo "${{ steps.home_perf.outputs.agents_ms }}" | awk '{print ($1 != "N/A" && $1 <= 200) ? "✅" : "❌"}' ) | + | models | ${{ steps.home_perf.outputs.models_ms }} ms | ≤ 300 ms | $( echo "${{ steps.home_perf.outputs.models_ms }}" | awk '{print ($1 != "N/A" && $1 <= 300) ? "✅" : "❌"}' ) | + | settled | ${{ steps.home_perf.outputs.settled_ms }} ms | ≤ 1000 ms | $( echo "${{ steps.home_perf.outputs.settled_ms }}" | awk '{print ($1 != "N/A" && $1 <= 1000) ? "✅" : "❌"}' ) | - ### Code Readability (informational) + ### Code Readability | File | Lines | Target | Status | |------|-------|--------|--------| ${LARGE_FILE_DETAILS} - | Files > 500 lines | ${{ steps.large_files.outputs.large_count }} | trend ↓ | ℹ️ | + | **Files > 500 lines** | **${{ steps.large_files.outputs.large_count }}** | **trend ↓** | $( [ "${{ steps.large_files.outputs.large_count }}" -le 28 ] && echo "✅" || echo "⚠️" ) | + | Files over target | ${{ steps.large_files.outputs.over_target }} | 0 | $( [ "${{ steps.large_files.outputs.over_target }}" = "0" ] && echo "✅" || echo "⚠️" ) | --- > 📊 Metrics defined in [\`docs/architecture/metrics.md\`](../blob/${{ github.head_ref }}/docs/architecture/metrics.md) diff --git a/docs/architecture/metrics.md b/docs/architecture/metrics.md index 738c8c95..cced89bb 100644 --- a/docs/architecture/metrics.md +++ b/docs/architecture/metrics.md @@ -34,9 +34,18 @@ | 指标 | 基线值 | 目标 | 量化方式 | CI Gate | |------|--------|------|----------|---------| -| commands/mod.rs 行数 | 8,842 | ≤ 2,000 | `wc -l` | — | -| App.tsx 行数 | 1,787 | ≤ 500 | `wc -l` | — | -| 单文件 > 500 行数量 | 未统计 | 趋势下降 | 脚本统计 | — | +| commands/mod.rs 行数 | 230 | ≤ 2,000 | `wc -l` | ✅ | +| App.tsx 行数 | 686 | ≤ 500 | `wc -l` | ✅ | +| doctor_assistant.rs 行数 | 5,863 | ≤ 3,000 | `wc -l` | ✅ | +| rescue.rs 行数 | 3,402 | ≤ 2,000 | `wc -l` | ✅ | +| profiles.rs 行数 | 2,477 | ≤ 1,500 | `wc -l` | ✅ | +| cli_runner.rs 行数 | 1,915 | ≤ 1,200 | `wc -l` | ✅ | +| credentials.rs 行数 | 1,629 | ≤ 1,000 | `wc -l` | ✅ | +| Settings.tsx 行数 | 1,107 | ≤ 800 | `wc -l` | ✅ | +| use-api.ts 行数 | 1,043 | ≤ 800 | `wc -l` | ✅ | +| Home.tsx 行数 | 963 | ≤ 700 | `wc -l` | ✅ | +| StartPage.tsx 行数 | 946 | ≤ 700 | `wc -l` | ✅ | +| 单文件 > 500 行数量 | 28 | ≤ 28 (不得增加) | 脚本统计 | ✅ | ## 2. 运行时性能 @@ -94,7 +103,8 @@ pub fn get_process_metrics() -> Result { | macOS x64 包体积 | 13.3 MB | ≤ 15 MB | CI build artifact | ✅ | | Windows x64 包体积 | 16.3 MB | ≤ 20 MB | CI build artifact | ✅ | | Linux x64 包体积 | 103.8 MB | ≤ 110 MB | CI build artifact | ✅ | -| 前端 JS bundle 大小 (gzip) | 待统计 | ≤ 500 KB | `vite build` + `gzip -k` | ✅ | +| 前端 JS bundle 大小 (gzip) | 待统计 | ≤ 350 KB | `vite build` + `gzip -k` | ✅ | +| 前端 JS initial load (gzip) | 待统计 | ≤ 180 KB | `vite build` 初始加载 chunks | ✅ | **CI Gate 方案**: @@ -133,7 +143,9 @@ pub fn get_process_metrics() -> Result { | 指标 | 基线值 | 目标 | 量化方式 | CI Gate | |------|--------|------|----------|---------| -| 本地 command P95 耗时 | 待埋点 | ≤ 100ms | Rust `Instant::now()` | ✅ | +| 本地 command P50 耗时 | 待埋点 | ≤ 1ms (1,000µs) | Rust `Instant::now()` (微秒精度) | ✅ | +| 本地 command P95 耗时 | 待埋点 | ≤ 5ms (5,000µs) | Rust `Instant::now()` (微秒精度) | ✅ | +| 本地 command Max 耗时 | 待埋点 | ≤ 50ms (50,000µs) | Rust `Instant::now()` (微秒精度) | ℹ️ | | SSH command P95 耗时 | 待埋点 | ≤ 2s | 含网络 RTT | — | | Doctor 全量诊断耗时 | 待埋点 | ≤ 5s | 端到端计时 | — | | 配置文件读写耗时 | 待埋点 | ≤ 50ms | `Instant::now()` | — | diff --git a/src-tauri/src/commands/doctor_assistant.rs b/src-tauri/src/commands/doctor_assistant.rs index 2e4bc2b7..78be0c54 100644 --- a/src-tauri/src/commands/doctor_assistant.rs +++ b/src-tauri/src/commands/doctor_assistant.rs @@ -1,4 +1,9 @@ use super::*; + +use crate::doctor_temp_store::{ + self, DoctorTempGatewaySessionRecord, DoctorTempGatewaySessionStore, +}; +use crate::json5_extract::extract_json5_top_level_value; use serde::{Deserialize, Serialize}; use tauri::{AppHandle, Emitter, State}; use tokio::time::{sleep, Duration}; @@ -27,25 +32,6 @@ struct DoctorAssistantProgressEvent { resolved_issue_label: Option, } -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -struct DoctorTempGatewaySessionRecord { - instance_id: String, - profile: String, - port: u16, - created_at: String, - status: String, - main_profile: String, - main_port: u16, - last_step: Option, -} - -#[derive(Debug, Clone, Default, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -struct DoctorTempGatewaySessionStore { - sessions: Vec, -} - #[derive(Debug, Clone, PartialEq, Eq)] struct RemoteAuthStoreCandidate { provider: String, @@ -91,67 +77,6 @@ fn emit_doctor_assistant_progress( let _ = app.emit("doctor:assistant-progress", payload); } -fn doctor_temp_gateway_store_path(paths: &crate::models::OpenClawPaths) -> std::path::PathBuf { - paths.clawpal_dir.join("doctor-temp-gateways.json") -} - -fn load_doctor_temp_gateway_store( - paths: &crate::models::OpenClawPaths, -) -> DoctorTempGatewaySessionStore { - crate::config_io::read_json(&doctor_temp_gateway_store_path(paths)).unwrap_or_default() -} - -fn save_doctor_temp_gateway_store( - paths: &crate::models::OpenClawPaths, - store: &DoctorTempGatewaySessionStore, -) -> Result<(), String> { - let path = doctor_temp_gateway_store_path(paths); - if store.sessions.is_empty() { - match std::fs::remove_file(&path) { - Ok(()) => Ok(()), - Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()), - Err(error) => Err(error.to_string()), - } - } else { - crate::config_io::write_json(&path, store) - } -} - -fn upsert_doctor_temp_gateway_record( - paths: &crate::models::OpenClawPaths, - record: DoctorTempGatewaySessionRecord, -) -> Result<(), String> { - let mut store = load_doctor_temp_gateway_store(paths); - store - .sessions - .retain(|item| !(item.instance_id == record.instance_id && item.profile == record.profile)); - store.sessions.push(record); - save_doctor_temp_gateway_store(paths, &store) -} - -fn remove_doctor_temp_gateway_record( - paths: &crate::models::OpenClawPaths, - instance_id: &str, - profile: &str, -) -> Result<(), String> { - let mut store = load_doctor_temp_gateway_store(paths); - store - .sessions - .retain(|item| !(item.instance_id == instance_id && item.profile == profile)); - save_doctor_temp_gateway_store(paths, &store) -} - -fn remove_doctor_temp_gateway_records_for_instance( - paths: &crate::models::OpenClawPaths, - instance_id: &str, -) -> Result<(), String> { - let mut store = load_doctor_temp_gateway_store(paths); - store - .sessions - .retain(|item| item.instance_id != instance_id); - save_doctor_temp_gateway_store(paths, &store) -} - fn doctor_assistant_issue_label(issue: &RescuePrimaryIssue) -> String { let text = issue.message.trim(); if text.is_empty() { @@ -502,161 +427,6 @@ async fn read_remote_primary_config_text( .unwrap_or_default() } -fn skip_json5_ws_and_comments(text: &str, mut index: usize) -> usize { - let bytes = text.as_bytes(); - while index < bytes.len() { - match bytes[index] { - b' ' | b'\t' | b'\r' | b'\n' => { - index += 1; - } - b'/' if index + 1 < bytes.len() && bytes[index + 1] == b'/' => { - index += 2; - while index < bytes.len() && bytes[index] != b'\n' { - index += 1; - } - } - b'/' if index + 1 < bytes.len() && bytes[index + 1] == b'*' => { - index += 2; - while index + 1 < bytes.len() && !(bytes[index] == b'*' && bytes[index + 1] == b'/') - { - index += 1; - } - if index + 1 < bytes.len() { - index += 2; - } - } - _ => break, - } - } - index -} - -fn scan_json5_string_end(text: &str, start: usize) -> Option { - let bytes = text.as_bytes(); - let quote = *bytes.get(start)?; - if quote != b'"' && quote != b'\'' { - return None; - } - let mut index = start + 1; - let mut escaped = false; - while index < bytes.len() { - let byte = bytes[index]; - if escaped { - escaped = false; - } else if byte == b'\\' { - escaped = true; - } else if byte == quote { - return Some(index + 1); - } - index += 1; - } - None -} - -fn scan_json5_value_end(text: &str, start: usize) -> Option { - let bytes = text.as_bytes(); - let start = skip_json5_ws_and_comments(text, start); - let first = *bytes.get(start)?; - if first == b'"' || first == b'\'' { - return scan_json5_string_end(text, start); - } - if first != b'{' && first != b'[' { - let mut index = start; - while index < bytes.len() { - index = skip_json5_ws_and_comments(text, index); - if index >= bytes.len() { - break; - } - match bytes[index] { - b',' | b'}' => break, - b'"' | b'\'' => { - index = scan_json5_string_end(text, index)?; - } - _ => index += 1, - } - } - return Some(index); - } - - let mut stack = vec![first]; - let mut index = start + 1; - while index < bytes.len() { - index = skip_json5_ws_and_comments(text, index); - if index >= bytes.len() { - break; - } - match bytes[index] { - b'"' | b'\'' => { - index = scan_json5_string_end(text, index)?; - } - b'{' | b'[' => { - stack.push(bytes[index]); - index += 1; - } - b'}' => { - let open = stack.pop()?; - if open != b'{' { - return None; - } - index += 1; - if stack.is_empty() { - return Some(index); - } - } - b']' => { - let open = stack.pop()?; - if open != b'[' { - return None; - } - index += 1; - if stack.is_empty() { - return Some(index); - } - } - _ => index += 1, - } - } - None -} - -fn extract_json5_top_level_value(text: &str, key: &str) -> Option { - let bytes = text.as_bytes(); - let mut depth = 0usize; - let mut index = 0usize; - while index < bytes.len() { - index = skip_json5_ws_and_comments(text, index); - if index >= bytes.len() { - break; - } - match bytes[index] { - b'{' => { - depth += 1; - index += 1; - } - b'}' => { - depth = depth.saturating_sub(1); - index += 1; - } - b'"' | b'\'' if depth == 1 => { - let end = scan_json5_string_end(text, index)?; - let raw_key = &text[index + 1..end - 1]; - let after_key = skip_json5_ws_and_comments(text, end); - if raw_key == key && bytes.get(after_key) == Some(&b':') { - let value_start = skip_json5_ws_and_comments(text, after_key + 1); - let value_end = scan_json5_value_end(text, value_start)?; - return Some(text[value_start..value_end].trim().to_string()); - } - index = end; - } - b'"' | b'\'' => { - index = scan_json5_string_end(text, index)?; - } - _ => index += 1, - } - } - None -} - fn salvage_donor_cfg_from_text(text: &str) -> serde_json::Value { let mut root = serde_json::Map::new(); for key in ["secrets", "auth", "models", "agents"] { @@ -2523,8 +2293,7 @@ fn cleanup_local_stale_temp_gateways( ); } let _ = prune_local_temp_gateway_profile_roots(&paths.openclaw_dir)?; - let _ = - remove_doctor_temp_gateway_records_for_instance(paths, DOCTOR_ASSISTANT_TEMP_SCOPE_LOCAL); + let _ = doctor_temp_store::remove_for_instance(paths, DOCTOR_ASSISTANT_TEMP_SCOPE_LOCAL); Ok(profiles.len()) } @@ -2550,7 +2319,7 @@ async fn cleanup_remote_stale_temp_gateways( .await; } let _ = prune_remote_temp_gateway_profile_roots(pool, host_id, &main_root).await?; - let _ = remove_doctor_temp_gateway_records_for_instance(paths, host_id); + let _ = doctor_temp_store::remove_for_instance(paths, host_id); Ok(profiles.len()) } @@ -4386,7 +4155,7 @@ pub async fn repair_doctor_assistant( None, None, ); - upsert_doctor_temp_gateway_record( + doctor_temp_store::upsert( &paths, build_temp_gateway_record( DOCTOR_ASSISTANT_TEMP_SCOPE_LOCAL, @@ -4437,7 +4206,7 @@ pub async fn repair_doctor_assistant( None, None, ); - upsert_doctor_temp_gateway_record( + doctor_temp_store::upsert( &paths, build_temp_gateway_record( DOCTOR_ASSISTANT_TEMP_SCOPE_LOCAL, @@ -4509,7 +4278,7 @@ pub async fn repair_doctor_assistant( &mut steps, "temp.cleanup", ); - let _ = remove_doctor_temp_gateway_record( + let _ = doctor_temp_store::remove_record( &paths, DOCTOR_ASSISTANT_TEMP_SCOPE_LOCAL, &temp_profile, @@ -4738,7 +4507,7 @@ pub async fn remote_repair_doctor_assistant( None, None, ); - upsert_doctor_temp_gateway_record( + doctor_temp_store::upsert( &paths, build_temp_gateway_record( &host_id, @@ -4865,7 +4634,7 @@ pub async fn remote_repair_doctor_assistant( None, ); } - upsert_doctor_temp_gateway_record( + doctor_temp_store::upsert( &paths, build_temp_gateway_record( &host_id, @@ -4971,7 +4740,7 @@ pub async fn remote_repair_doctor_assistant( "temp.cleanup", ) .await; - let _ = remove_doctor_temp_gateway_record(&paths, &host_id, &temp_profile); + let _ = doctor_temp_store::remove_record(&paths, &host_id, &temp_profile); if let Err(error) = cleanup_result { append_step( &mut steps, @@ -5150,6 +4919,10 @@ fn resolve_main_port_from_diagnosis(diagnosis: &RescuePrimaryDiagnosisResult) -> #[cfg(test)] mod tests { use super::*; + + use crate::doctor_temp_store::{ + self, DoctorTempGatewaySessionRecord, DoctorTempGatewaySessionStore, + }; use crate::models::OpenClawPaths; use std::fs; use std::path::{Path, PathBuf}; @@ -5621,9 +5394,9 @@ mod tests { fn save_doctor_temp_gateway_store_deletes_file_when_empty() { let temp = TempDirGuard::new("store-empty"); let paths = make_paths(&temp); - let store_path = doctor_temp_gateway_store_path(&paths); + let store_path = doctor_temp_store::store_path(&paths); - save_doctor_temp_gateway_store(&paths, &DoctorTempGatewaySessionStore::default()).unwrap(); + doctor_temp_store::save(&paths, &DoctorTempGatewaySessionStore::default()).unwrap(); assert!(!store_path.exists()); } @@ -5632,13 +5405,13 @@ mod tests { fn remove_doctor_temp_gateway_record_deletes_store_when_last_record_removed() { let temp = TempDirGuard::new("store-remove-last"); let paths = make_paths(&temp); - let store_path = doctor_temp_gateway_store_path(&paths); + let store_path = doctor_temp_store::store_path(&paths); let record = sample_record("ssh:hetzner", &temp_profile("owned")); - upsert_doctor_temp_gateway_record(&paths, record.clone()).unwrap(); + doctor_temp_store::upsert(&paths, record.clone()).unwrap(); assert!(store_path.exists()); - remove_doctor_temp_gateway_record(&paths, &record.instance_id, &record.profile).unwrap(); + doctor_temp_store::remove_record(&paths, &record.instance_id, &record.profile).unwrap(); assert!(!store_path.exists()); } @@ -5650,12 +5423,12 @@ mod tests { let owned = sample_record("ssh:hetzner", &temp_profile("owned")); let other = sample_record("ssh:other", &temp_profile("other")); - upsert_doctor_temp_gateway_record(&paths, owned.clone()).unwrap(); - upsert_doctor_temp_gateway_record(&paths, other.clone()).unwrap(); + doctor_temp_store::upsert(&paths, owned.clone()).unwrap(); + doctor_temp_store::upsert(&paths, other.clone()).unwrap(); - remove_doctor_temp_gateway_records_for_instance(&paths, "ssh:hetzner").unwrap(); + doctor_temp_store::remove_for_instance(&paths, "ssh:hetzner").unwrap(); - let store = load_doctor_temp_gateway_store(&paths); + let store = doctor_temp_store::load(&paths); assert_eq!(store.sessions.len(), 1); assert_eq!(store.sessions[0].instance_id, "ssh:other"); assert_eq!(store.sessions[0].profile, other.profile); diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 44dbaee6..8e70736f 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -4,8 +4,8 @@ macro_rules! timed_sync { ($name:expr, $body:block) => {{ let __start = std::time::Instant::now(); let __result = (|| $body)(); - let __elapsed_ms = __start.elapsed().as_millis() as u64; - crate::commands::perf::record_timing($name, __elapsed_ms); + let __elapsed_us = __start.elapsed().as_micros() as u64; + crate::commands::perf::record_timing($name, __elapsed_us); __result }}; } @@ -16,8 +16,8 @@ macro_rules! timed_async { ($name:expr, $body:block) => {{ let __start = std::time::Instant::now(); let __result = async $body.await; - let __elapsed_ms = __start.elapsed().as_millis() as u64; - crate::commands::perf::record_timing($name, __elapsed_ms); + let __elapsed_us = __start.elapsed().as_micros() as u64; + crate::commands::perf::record_timing($name, __elapsed_us); __result }}; } diff --git a/src-tauri/src/commands/perf.rs b/src-tauri/src/commands/perf.rs index 8552e267..b496136b 100644 --- a/src-tauri/src/commands/perf.rs +++ b/src-tauri/src/commands/perf.rs @@ -17,31 +17,32 @@ pub struct ProcessMetrics { } /// Tracks elapsed time of a named operation and logs it. -/// Returns `(result, elapsed_ms)`. +/// Returns `(result, elapsed_us)` — elapsed time in **microseconds** for +/// sub-millisecond accuracy on fast local commands. pub fn trace_command(name: &str, f: F) -> (T, u64) where F: FnOnce() -> T, { let start = Instant::now(); let result = f(); - let elapsed_ms = start.elapsed().as_millis() as u64; + let elapsed_us = start.elapsed().as_micros() as u64; - let threshold_ms = if name.starts_with("remote_") || name.starts_with("ssh_") { - 2000 + let threshold_us = if name.starts_with("remote_") || name.starts_with("ssh_") { + 2_000_000 // 2s } else { - 100 + 100_000 // 100ms }; - if elapsed_ms > threshold_ms { + if elapsed_us > threshold_us { crate::logging::log_info(&format!( - "[perf] SLOW {} completed in {}ms (threshold: {}ms)", - name, elapsed_ms, threshold_ms + "[perf] SLOW {} completed in {}us (threshold: {}us)", + name, elapsed_us, threshold_us )); } else { - crate::logging::log_info(&format!("[perf] {} completed in {}ms", name, elapsed_ms)); + crate::logging::log_info(&format!("[perf] {} completed in {}us", name, elapsed_us)); } - (result, elapsed_ms) + (result, elapsed_us) } /// Single perf sample emitted to the frontend via events or returned directly. @@ -50,8 +51,8 @@ where pub struct PerfSample { /// The command or operation name pub name: String, - /// Elapsed time in milliseconds - pub elapsed_ms: u64, + /// Elapsed time in microseconds + pub elapsed_us: u64, /// Timestamp (Unix millis) when the sample was taken pub timestamp: u64, /// Whether the command exceeded its latency threshold @@ -178,8 +179,8 @@ mod tests { fn test_trace_command_returns_result_and_timing() { let (result, elapsed) = trace_command("test_noop", || 42); assert_eq!(result, 42); - // Should complete in well under 100ms - assert!(elapsed < 100, "noop took {}ms", elapsed); + // Should complete in well under 100ms (100_000us) + assert!(elapsed < 100_000, "noop took {}us", elapsed); } #[test] @@ -215,21 +216,21 @@ static PERF_REGISTRY: LazyLock>>> = /// Record a timing sample into the global registry. /// When the registry is full, the oldest sample is evicted. -pub fn record_timing(name: &str, elapsed_ms: u64) { +pub fn record_timing(name: &str, elapsed_us: u64) { let ts = SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap_or_default() .as_millis() as u64; - let threshold = if name.starts_with("remote_") { - 2000 + let threshold_us = if name.starts_with("remote_") { + 2_000_000 } else { - 100 + 100_000 }; let sample = PerfSample { name: name.to_string(), - elapsed_ms, + elapsed_us, timestamp: ts, - exceeded_threshold: elapsed_ms > threshold, + exceeded_threshold: elapsed_us > threshold_us, }; if let Ok(mut reg) = PERF_REGISTRY.lock() { if reg.len() >= MAX_PERF_SAMPLES { @@ -257,7 +258,7 @@ pub fn get_perf_report() -> Result { by_name .entry(s.name.clone()) .or_default() - .push(s.elapsed_ms); + .push(s.elapsed_us); } let mut report = serde_json::Map::new(); @@ -276,10 +277,10 @@ pub fn get_perf_report() -> Result { name, json!({ "count": count, - "p50_ms": p50, - "p95_ms": p95, - "max_ms": max, - "avg_ms": if count > 0 { sum / count as u64 } else { 0 }, + "p50_us": p50, + "p95_us": p95, + "max_us": max, + "avg_us": if count > 0 { sum / count as u64 } else { 0 }, }), ); } diff --git a/src-tauri/src/doctor_temp_store.rs b/src-tauri/src/doctor_temp_store.rs new file mode 100644 index 00000000..de3b8ad6 --- /dev/null +++ b/src-tauri/src/doctor_temp_store.rs @@ -0,0 +1,80 @@ +/// Persistent store for temporary gateway session records used by doctor assistant. +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub(crate) struct DoctorTempGatewaySessionRecord { + pub instance_id: String, + pub profile: String, + pub port: u16, + pub created_at: String, + pub status: String, + pub main_profile: String, + pub main_port: u16, + pub last_step: Option, +} + +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub(crate) struct DoctorTempGatewaySessionStore { + pub sessions: Vec, +} + +pub(crate) fn store_path(paths: &crate::models::OpenClawPaths) -> std::path::PathBuf { + paths.clawpal_dir.join("doctor-temp-gateways.json") +} + +pub(crate) fn load(paths: &crate::models::OpenClawPaths) -> DoctorTempGatewaySessionStore { + crate::config_io::read_json(&store_path(paths)).unwrap_or_default() +} + +pub(crate) fn save( + paths: &crate::models::OpenClawPaths, + store: &DoctorTempGatewaySessionStore, +) -> Result<(), String> { + let path = store_path(paths); + if store.sessions.is_empty() { + match std::fs::remove_file(&path) { + Ok(()) => Ok(()), + Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()), + Err(error) => Err(error.to_string()), + } + } else { + crate::config_io::write_json(&path, store) + } +} + +pub(crate) fn upsert( + paths: &crate::models::OpenClawPaths, + record: DoctorTempGatewaySessionRecord, +) -> Result<(), String> { + let mut store = load(paths); + store + .sessions + .retain(|item| !(item.instance_id == record.instance_id && item.profile == record.profile)); + store.sessions.push(record); + save(paths, &store) +} + +pub(crate) fn remove_record( + paths: &crate::models::OpenClawPaths, + instance_id: &str, + profile: &str, +) -> Result<(), String> { + let mut store = load(paths); + store + .sessions + .retain(|item| !(item.instance_id == instance_id && item.profile == profile)); + save(paths, &store) +} + +pub(crate) fn remove_for_instance( + paths: &crate::models::OpenClawPaths, + instance_id: &str, +) -> Result<(), String> { + let mut store = load(paths); + store + .sessions + .retain(|item| item.instance_id != instance_id); + save(paths, &store) +} diff --git a/src-tauri/src/json5_extract.rs b/src-tauri/src/json5_extract.rs new file mode 100644 index 00000000..7f5cc72f --- /dev/null +++ b/src-tauri/src/json5_extract.rs @@ -0,0 +1,158 @@ +//! Lightweight JSON5 key extraction utilities. +//! +//! Extracted from doctor_assistant.rs for readability. + +pub(crate) fn skip_json5_ws_and_comments(text: &str, mut index: usize) -> usize { + let bytes = text.as_bytes(); + while index < bytes.len() { + match bytes[index] { + b' ' | b'\t' | b'\r' | b'\n' => { + index += 1; + } + b'/' if index + 1 < bytes.len() && bytes[index + 1] == b'/' => { + index += 2; + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'/' if index + 1 < bytes.len() && bytes[index + 1] == b'*' => { + index += 2; + while index + 1 < bytes.len() && !(bytes[index] == b'*' && bytes[index + 1] == b'/') + { + index += 1; + } + if index + 1 < bytes.len() { + index += 2; + } + } + _ => break, + } + } + index +} + +pub(crate) fn scan_json5_string_end(text: &str, start: usize) -> Option { + let bytes = text.as_bytes(); + let quote = *bytes.get(start)?; + if quote != b'"' && quote != b'\'' { + return None; + } + let mut index = start + 1; + let mut escaped = false; + while index < bytes.len() { + let byte = bytes[index]; + if escaped { + escaped = false; + } else if byte == b'\\' { + escaped = true; + } else if byte == quote { + return Some(index + 1); + } + index += 1; + } + None +} + +pub(crate) fn scan_json5_value_end(text: &str, start: usize) -> Option { + let bytes = text.as_bytes(); + let start = skip_json5_ws_and_comments(text, start); + let first = *bytes.get(start)?; + if first == b'"' || first == b'\'' { + return scan_json5_string_end(text, start); + } + if first != b'{' && first != b'[' { + let mut index = start; + while index < bytes.len() { + index = skip_json5_ws_and_comments(text, index); + if index >= bytes.len() { + break; + } + match bytes[index] { + b',' | b'}' => break, + b'"' | b'\'' => { + index = scan_json5_string_end(text, index)?; + } + _ => index += 1, + } + } + return Some(index); + } + + let mut stack = vec![first]; + let mut index = start + 1; + while index < bytes.len() { + index = skip_json5_ws_and_comments(text, index); + if index >= bytes.len() { + break; + } + match bytes[index] { + b'"' | b'\'' => { + index = scan_json5_string_end(text, index)?; + } + b'{' | b'[' => { + stack.push(bytes[index]); + index += 1; + } + b'}' => { + let open = stack.pop()?; + if open != b'{' { + return None; + } + index += 1; + if stack.is_empty() { + return Some(index); + } + } + b']' => { + let open = stack.pop()?; + if open != b'[' { + return None; + } + index += 1; + if stack.is_empty() { + return Some(index); + } + } + _ => index += 1, + } + } + None +} + +pub(crate) fn extract_json5_top_level_value(text: &str, key: &str) -> Option { + let bytes = text.as_bytes(); + let mut depth = 0usize; + let mut index = 0usize; + while index < bytes.len() { + index = skip_json5_ws_and_comments(text, index); + if index >= bytes.len() { + break; + } + match bytes[index] { + b'{' => { + depth += 1; + index += 1; + } + b'}' => { + depth = depth.saturating_sub(1); + index += 1; + } + b'"' | b'\'' if depth == 1 => { + let end = scan_json5_string_end(text, index)?; + let raw_key = &text[index + 1..end - 1]; + let after_key = skip_json5_ws_and_comments(text, end); + if raw_key == key && bytes.get(after_key) == Some(&b':') { + let value_start = skip_json5_ws_and_comments(text, after_key + 1); + let value_end = scan_json5_value_end(text, value_start)?; + return Some(text[value_start..value_end].trim().to_string()); + } + index = end; + } + b'"' | b'\'' => { + index = scan_json5_string_end(text, index)?; + } + _ => index += 1, + } + } + None +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 7ebe39e2..adedb810 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -77,8 +77,10 @@ pub mod cli_runner; pub mod commands; pub mod config_io; pub mod doctor; +pub mod doctor_temp_store; pub mod history; pub mod install; +pub mod json5_extract; pub mod json_util; pub mod logging; pub mod models; diff --git a/src-tauri/tests/command_perf_e2e.rs b/src-tauri/tests/command_perf_e2e.rs index 7a7bf5e4..4e400821 100644 --- a/src-tauri/tests/command_perf_e2e.rs +++ b/src-tauri/tests/command_perf_e2e.rs @@ -69,7 +69,7 @@ fn report_aggregates_correctly() { let report = get_perf_report().expect("should return report"); let fast = &report["cmd_fast"]; assert_eq!(fast["count"], 3); - assert_eq!(fast["p50_ms"], 20); + assert_eq!(fast["p50_us"], 20); let slow = &report["cmd_slow"]; assert_eq!(slow["count"], 2); } @@ -99,10 +99,10 @@ fn local_config_commands_record_timing() { for s in &samples { assert!( - s.elapsed_ms < 100, - "{} took {}ms — should be < 100ms for local ops", + s.elapsed_us < 500_000, + "{} took {}us — should be < 500ms for local ops", s.name, - s.elapsed_ms + s.elapsed_us ); } } @@ -166,13 +166,13 @@ fn z_local_perf_report_for_ci() { for (name, _) in &commands { if let Some(stats) = report.get(*name) { println!( - "LOCAL_CMD:{}:count={}:p50={}:p95={}:max={}:avg={}", + "LOCAL_CMD:{}:count={}:p50_us={}:p95_us={}:max_us={}:avg_us={}", name, stats["count"], - stats["p50_ms"], - stats["p95_ms"], - stats["max_ms"], - stats["avg_ms"], + stats["p50_us"], + stats["p95_us"], + stats["max_us"], + stats["avg_us"], ); } } diff --git a/src-tauri/tests/perf_metrics.rs b/src-tauri/tests/perf_metrics.rs index c47febc4..be00cc41 100644 --- a/src-tauri/tests/perf_metrics.rs +++ b/src-tauri/tests/perf_metrics.rs @@ -33,7 +33,7 @@ fn process_metrics_rss_within_bounds() { "RSS too low: {:.1} MB — likely measurement error", rss_mb ); - assert!(rss_mb < 80.0, "RSS exceeds 80 MB target: {:.1} MB", rss_mb); + assert!(rss_mb < 20.0, "RSS exceeds 20 MB target: {:.1} MB", rss_mb); } #[test] @@ -67,36 +67,36 @@ fn process_metrics_uptime_is_positive() { #[test] fn trace_command_measures_fast_operation() { init_perf_clock(); - let (result, elapsed_ms) = trace_command("test_fast_op", || { + let (result, elapsed_us) = trace_command("test_fast_op", || { let x = 2 + 2; x }); assert_eq!(result, 4); - // A trivial operation should complete in well under 100ms (the local threshold) + // A trivial operation should complete in well under 100ms (100_000us) assert!( - elapsed_ms < 100, - "fast operation took {}ms — should be < 100ms", - elapsed_ms + elapsed_us < 100_000, + "fast operation took {}us — should be < 100_000us", + elapsed_us ); } #[test] fn trace_command_measures_slow_operation() { init_perf_clock(); - let (_, elapsed_ms) = trace_command("test_slow_op", || { + let (_, elapsed_us) = trace_command("test_slow_op", || { thread::sleep(Duration::from_millis(150)); }); - // Should measure at least 100ms + // Should measure at least 100ms (100_000us) assert!( - elapsed_ms >= 100, - "slow operation measured as {}ms — should be >= 100ms", - elapsed_ms + elapsed_us >= 100_000, + "slow operation measured as {}us — should be >= 100_000us", + elapsed_us ); // But shouldn't be wildly over (allow up to 500ms for CI scheduling jitter) assert!( - elapsed_ms < 500, - "slow operation measured as {}ms — excessive", - elapsed_ms + elapsed_us < 500_000, + "slow operation measured as {}us — excessive", + elapsed_us ); } @@ -150,14 +150,14 @@ fn memory_stable_across_repeated_metrics_calls() { fn perf_sample_serializes_correctly() { let sample = PerfSample { name: "test_command".to_string(), - elapsed_ms: 42, + elapsed_us: 42, timestamp: 1710000000000, exceeded_threshold: false, }; let json = serde_json::to_string(&sample).expect("should serialize"); assert!(json.contains("\"name\":\"test_command\"")); - assert!(json.contains("\"elapsedMs\":42")); // camelCase + assert!(json.contains("\"elapsedUs\":42")); // camelCase assert!(json.contains("\"exceededThreshold\":false")); } @@ -187,16 +187,16 @@ fn z_report_metrics_for_ci() { let max = *times.last().unwrap_or(&0); // Output structured lines for CI to parse - // Format: METRIC:= + // Format: METRIC:= (all latencies in microseconds) println!(); println!("METRIC:rss_mb={:.1}", rss_mb); println!("METRIC:vms_mb={:.1}", vms_mb); println!("METRIC:pid={}", metrics.pid); println!("METRIC:platform={}", metrics.platform); println!("METRIC:uptime_secs={:.2}", metrics.uptime_secs); - println!("METRIC:cmd_p50_ms={}", p50); - println!("METRIC:cmd_p95_ms={}", p95); - println!("METRIC:cmd_max_ms={}", max); - println!("METRIC:rss_limit_mb=80"); - println!("METRIC:cmd_p95_limit_ms=100"); + println!("METRIC:cmd_p50_us={}", p50); + println!("METRIC:cmd_p95_us={}", p95); + println!("METRIC:cmd_max_us={}", max); + println!("METRIC:rss_limit_mb=20"); + println!("METRIC:cmd_p95_limit_us=100000"); } diff --git a/src/App.tsx b/src/App.tsx index 8a30c84f..40993d1f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,17 +1,6 @@ -import { Suspense, lazy, startTransition, useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { Suspense, lazy, startTransition, useCallback, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; -import { check } from "@tauri-apps/plugin-updater"; -import { getVersion } from "@tauri-apps/api/app"; -import { listen } from "@tauri-apps/api/event"; import { - HomeIcon, - HashIcon, - ClockIcon, - HistoryIcon, - StethoscopeIcon, - BookOpenIcon, - KeyRoundIcon, - SettingsIcon, MessageCircleIcon, XIcon, } from "lucide-react"; @@ -20,34 +9,13 @@ import logoUrl from "./assets/logo.png"; const InstanceTabBar = lazy(() => import("./components/InstanceTabBar").then((m) => ({ default: m.InstanceTabBar }))); import { InstanceContext } from "./lib/instance-context"; import { api } from "./lib/api"; -import { buildCacheKey, invalidateGlobalReadCache, prewarmRemoteInstanceReadCache, subscribeToCacheKey } from "./lib/use-api"; -import { explainAndBuildGuidanceError, withGuidance } from "./lib/guidance"; -import { - clearRemotePersistenceScope, - ensureRemotePersistenceScope, - readRemotePersistenceScope, -} from "./lib/instance-persistence"; -import { - shouldEnableInstanceLiveReads, - shouldEnableLocalInstanceScope, -} from "./lib/instance-availability"; -import { readPersistedReadCache, writePersistedReadCache } from "./lib/persistent-read-cache"; +import { withGuidance } from "./lib/guidance"; import { useFont } from "./lib/use-font"; import { Button } from "@/components/ui/button"; -import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { Input } from "@/components/ui/input"; -import { Label } from "@/components/ui/label"; -import { cn, formatBytes } from "@/lib/utils"; +import { cn } from "@/lib/utils"; import { toast, Toaster } from "sonner"; -import type { ChannelNode, DiscordGuildChannel, DiscoveredInstance, DockerInstance, InstallSession, PrecheckIssue, RegisteredInstance, SshHost, SshTransferStats } from "./lib/types"; -const SshFormWidget = lazy(() => import("./components/SshFormWidget").then((m) => ({ default: m.SshFormWidget }))); -import { closeWorkspaceTab } from "@/lib/tabWorkspace"; -import { - SSH_PASSPHRASE_RETRY_HINT, - buildSshPassphraseCancelMessage, - buildSshPassphraseConnectErrorMessage, -} from "@/lib/sshConnectErrors"; -import { buildFriendlySshError, extractErrorText } from "@/lib/sshDiagnostic"; +import type { Route } from "./lib/routes"; +import type { SshHost } from "./lib/types"; const Home = lazy(() => import("./pages/Home").then((m) => ({ default: m.Home }))); const Recipes = lazy(() => import("./pages/Recipes").then((m) => ({ default: m.Recipes }))); @@ -60,283 +28,208 @@ const Channels = lazy(() => import("./pages/Channels").then((m) => ({ default: m const Cron = lazy(() => import("./pages/Cron").then((m) => ({ default: m.Cron }))); const Orchestrator = lazy(() => import("./pages/Orchestrator").then((m) => ({ default: m.Orchestrator }))); const Chat = lazy(() => import("./components/Chat").then((m) => ({ default: m.Chat }))); -const PendingChangesBar = lazy(() => import("./components/PendingChangesBar").then((m) => ({ default: m.PendingChangesBar }))); -const preloadRouteModules = () => - Promise.allSettled([ - import("./pages/Home"), - import("./pages/Channels"), - import("./pages/Recipes"), - import("./pages/Cron"), - import("./pages/Doctor"), - import("./pages/OpenclawContext"), - import("./pages/History"), - import("./components/Chat"), - import("./components/PendingChangesBar"), - ]); - -const PING_URL = "https://api.clawpal.zhixian.io/ping"; -import { - LEGACY_DOCKER_INSTANCES_KEY, - DEFAULT_DOCKER_OPENCLAW_HOME, - DEFAULT_DOCKER_CLAWPAL_DATA_DIR, - DEFAULT_DOCKER_INSTANCE_ID, - sanitizeDockerPathSuffix, - deriveDockerPaths, - deriveDockerLabel, - hashInstanceToken, - normalizeDockerInstance, -} from "./lib/docker-instance-helpers"; -import { logDevException, logDevIgnoredError } from "./lib/dev-logging"; -import { Route, INSTANCE_ROUTES, OPEN_TABS_STORAGE_KEY } from "./lib/routes"; - - -const APP_PREFERENCES_CACHE_KEY = buildCacheKey("__global__", "getAppPreferences", []); -interface ProfileSyncStatus { - phase: "idle" | "syncing" | "success" | "error"; - message: string; - instanceId: string | null; -} - +import { useInstanceManager } from "./hooks/useInstanceManager"; +import { useSshConnection } from "./hooks/useSshConnection"; +import { useInstancePersistence } from "./hooks/useInstancePersistence"; +import { useChannelCache } from "./hooks/useChannelCache"; +import { useAppLifecycle } from "./hooks/useAppLifecycle"; +import { useWorkspaceTabs } from "./hooks/useWorkspaceTabs"; +import { useNavItems } from "./hooks/useNavItems"; +import { PassphraseDialog, SshEditDialog } from "./components/AppDialogs"; +import { SidebarFooter } from "./components/SidebarFooter"; export function App() { const { t } = useTranslation(); useFont(); + const [route, setRoute] = useState("home"); const [recipeId, setRecipeId] = useState(null); const [recipeSource, setRecipeSource] = useState(undefined); - const [channelNodes, setChannelNodes] = useState(null); - const [discordGuildChannels, setDiscordGuildChannels] = useState(null); - const [channelsLoading, setChannelsLoading] = useState(false); - const [discordChannelsLoading, setDiscordChannelsLoading] = useState(false); const [chatOpen, setChatOpen] = useState(false); - const [startSection, setStartSection] = useState<"overview" | "profiles" | "settings">("overview"); - const [inStart, setInStart] = useState(true); - // Workspace tabs — persisted to localStorage - const [openTabIds, setOpenTabIds] = useState(() => { - try { - const stored = localStorage.getItem(OPEN_TABS_STORAGE_KEY); - if (stored) { - const parsed = JSON.parse(stored); - if (Array.isArray(parsed) && parsed.length > 0) return parsed; - } - } catch {} - return ["local"]; - }); - - // SSH remote instance state - const [activeInstance, setActiveInstance] = useState("local"); - const [sshHosts, setSshHosts] = useState([]); - const [registeredInstances, setRegisteredInstances] = useState([]); - const [discoveredInstances, setDiscoveredInstances] = useState([]); - const [discoveringInstances, setDiscoveringInstances] = useState(false); - const [connectionStatus, setConnectionStatus] = useState>({}); - const [sshEditOpen, setSshEditOpen] = useState(false); - const [editingSshHost, setEditingSshHost] = useState(null); const navigateRoute = useCallback((next: Route) => { startTransition(() => setRoute(next)); }, []); - const handleEditSsh = useCallback((host: SshHost) => { - setEditingSshHost(host); - setSshEditOpen(true); - }, []); - - const refreshHosts = useCallback(() => { - withGuidance(() => api.listSshHosts(), "listSshHosts", "local", "local") - .then(setSshHosts) - .catch((error) => { - logDevIgnoredError("refreshHosts", error); - }); - }, []); - - const refreshRegisteredInstances = useCallback(() => { - withGuidance(() => api.listRegisteredInstances(), "listRegisteredInstances", "local", "local") - .then(setRegisteredInstances) - .catch((error) => { - logDevIgnoredError("listRegisteredInstances", error); - setRegisteredInstances([]); - }); - }, []); - - const discoverInstances = useCallback(() => { - setDiscoveringInstances(true); - withGuidance( - () => api.discoverLocalInstances(), - "discoverLocalInstances", - "local", - "local", - ) - .then(setDiscoveredInstances) - .catch((error) => { - logDevIgnoredError("discoverLocalInstances", error); - setDiscoveredInstances([]); - }) - .finally(() => setDiscoveringInstances(false)); - }, []); - - const dockerInstances = useMemo(() => { - const seen = new Set(); - const out: DockerInstance[] = []; - for (const item of registeredInstances) { - if (item.instanceType !== "docker") continue; - if (!item.id || seen.has(item.id)) continue; - seen.add(item.id); - out.push(normalizeDockerInstance({ - id: item.id, - label: item.label || deriveDockerLabel(item.id), - openclawHome: item.openclawHome || undefined, - clawpalDataDir: item.clawpalDataDir || undefined, - })); + const showToast = useCallback((message: string, type: "success" | "error" = "success") => { + if (type === "error") { + toast.error(message, { duration: 5000 }); + return; } - return out; - }, [registeredInstances]); - - const upsertDockerInstance = useCallback(async (instance: DockerInstance): Promise => { - const normalized = normalizeDockerInstance(instance); - const registered = await withGuidance( - () => api.connectDockerInstance( - normalized.openclawHome || deriveDockerPaths(normalized.id).openclawHome, - normalized.label, - normalized.id, - ), - "connectDockerInstance", - normalized.id, - "docker_local", - ); - // Await the refresh so callers can rely on registeredInstances being up-to-date - const updated = await withGuidance( - () => api.listRegisteredInstances(), - "listRegisteredInstances", - "local", - "local", - ).catch((error) => { - logDevIgnoredError("listRegisteredInstances after connect", error); - return null; - }); - if (updated) setRegisteredInstances(updated); - return registered; + toast.success(message, { duration: 3000 }); }, []); - const renameDockerInstance = useCallback((id: string, label: string) => { - const nextLabel = label.trim(); - if (!nextLabel) return; - const instance = dockerInstances.find((item) => item.id === id); - if (!instance) return; - void withGuidance( - () => api.connectDockerInstance( - instance.openclawHome || deriveDockerPaths(instance.id).openclawHome, - nextLabel, - instance.id, - ), - "connectDockerInstance", - instance.id, - "docker_local", - ).then(() => { - refreshRegisteredInstances(); - }); - }, [dockerInstances, refreshRegisteredInstances]); - - const deleteDockerInstance = useCallback(async (instance: DockerInstance, deleteLocalData: boolean) => { - const fallback = deriveDockerPaths(instance.id); - const openclawHome = instance.openclawHome || fallback.openclawHome; - if (deleteLocalData) { - await withGuidance( - () => api.deleteLocalInstanceHome(openclawHome), - "deleteLocalInstanceHome", - instance.id, - "docker_local", - ); - } - await withGuidance( - () => api.deleteRegisteredInstance(instance.id), - "deleteRegisteredInstance", - instance.id, - "docker_local", - ); - setOpenTabIds((prev) => prev.filter((t) => t !== instance.id)); - setActiveInstance((prev) => (prev === instance.id ? "local" : prev)); - refreshRegisteredInstances(); - }, [refreshRegisteredInstances]); + // ── Instance manager ── + const instanceManager = useInstanceManager(); + const { + sshHosts, + registeredInstances, + setRegisteredInstances, + discoveredInstances, + discoveringInstances, + connectionStatus, + setConnectionStatus, + sshEditOpen, + setSshEditOpen, + editingSshHost, + handleEditSsh, + refreshHosts, + refreshRegisteredInstances, + discoverInstances, + dockerInstances, + upsertDockerInstance, + renameDockerInstance, + deleteDockerInstance, + } = instanceManager; - useEffect(() => { - refreshHosts(); - refreshRegisteredInstances(); - discoverInstances(); - const timer = setInterval(refreshRegisteredInstances, 30_000); - return () => clearInterval(timer); - }, [refreshHosts, refreshRegisteredInstances, discoverInstances]); + const resolveInstanceTransport = useCallback((instanceId: string) => { + if (instanceId === "local") return "local"; + const registered = registeredInstances.find((item) => item.id === instanceId); + if (registered?.instanceType === "docker") return "docker_local"; + if (registered?.instanceType === "remote_ssh") return "remote_ssh"; + if (instanceId.startsWith("docker:")) return "docker_local"; + if (instanceId.startsWith("ssh:")) return "remote_ssh"; + if (dockerInstances.some((item) => item.id === instanceId)) return "docker_local"; + if (sshHosts.some((host) => host.id === instanceId)) return "remote_ssh"; + return "local"; + }, [dockerInstances, sshHosts, registeredInstances]); - useEffect(() => { - const timer = window.setTimeout(() => { - void preloadRouteModules(); - }, 1200); - return () => window.clearTimeout(timer); - }, []); + // ── Workspace tabs (needs resolveInstanceTransport before SSH/persistence) ── + // We forward-declare these as they form a dependency cycle with SSH + persistence. + // useWorkspaceTabs is initialized after SSH and persistence hooks below. - const [appUpdateAvailable, setAppUpdateAvailable] = useState(false); - const [appVersion, setAppVersion] = useState(""); + // Placeholder activeInstance for derived state — will be overridden by useWorkspaceTabs. + // We need a temporary state to bootstrap the hooks that depend on activeInstance. + const [_bootstrapActiveInstance, _setBootstrapActiveInstance] = useState("local"); - // Startup: check for updates + analytics ping - useEffect(() => { - let installId = localStorage.getItem("clawpal_install_id"); - if (!installId) { - installId = crypto.randomUUID(); - localStorage.setItem("clawpal_install_id", installId); - } + // ── Persistence (needs activeInstance — use bootstrap for now) ── + const persistence = useInstancePersistence({ + activeInstance: _bootstrapActiveInstance, + registeredInstances, + dockerInstances, + sshHosts, + isDocker: registeredInstances.some((item) => item.id === _bootstrapActiveInstance && item.instanceType === "docker") + || dockerInstances.some((item) => item.id === _bootstrapActiveInstance), + isRemote: registeredInstances.some((item) => item.id === _bootstrapActiveInstance && item.instanceType === "remote_ssh") + || sshHosts.some((host) => host.id === _bootstrapActiveInstance), + isConnected: !(registeredInstances.some((item) => item.id === _bootstrapActiveInstance && item.instanceType === "remote_ssh") + || sshHosts.some((host) => host.id === _bootstrapActiveInstance)) + || connectionStatus[_bootstrapActiveInstance] === "connected", + resolveInstanceTransport, + showToast, + }); - // Silent update check - check() - .then((update) => { if (update) setAppUpdateAvailable(true); }) - .catch((error) => logDevIgnoredError("check", error)); + const { + configVersion, + bumpConfigVersion, + instanceToken, + persistenceScope, + setPersistenceScope, + persistenceResolved, + setPersistenceResolved, + scheduleEnsureAccessForInstance, + } = persistence; + + const isDocker = registeredInstances.some((item) => item.id === _bootstrapActiveInstance && item.instanceType === "docker") + || dockerInstances.some((item) => item.id === _bootstrapActiveInstance); + const isRemote = registeredInstances.some((item) => item.id === _bootstrapActiveInstance && item.instanceType === "remote_ssh") + || sshHosts.some((host) => host.id === _bootstrapActiveInstance); + const isConnected = !isRemote || connectionStatus[_bootstrapActiveInstance] === "connected"; + + // ── SSH connection ── + const ssh = useSshConnection({ + activeInstance: _bootstrapActiveInstance, + sshHosts, + isRemote, + isConnected, + connectionStatus, + setConnectionStatus, + setPersistenceScope, + setPersistenceResolved, + resolveInstanceTransport, + showToast, + scheduleEnsureAccessForInstance, + }); - // Analytics ping (fire-and-forget) - getVersion().then((version) => { - setAppVersion(version); - const url = PING_URL; - if (!url) return; - fetch(url, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ v: version, id: installId, platform: navigator.platform }), - }).catch((error) => logDevIgnoredError("analytics ping request", error)); - }).catch((error) => logDevIgnoredError("getVersion", error)); + const { + profileSyncStatus, + showSshTransferSpeedUi, + sshTransferStats, + doctorNavPulse, + setDoctorNavPulse, + passphraseHostLabel, + passphraseOpen, + passphraseInput, + setPassphraseInput, + closePassphraseDialog, + connectWithPassphraseFallback, + syncRemoteAuthAfterConnect, + } = ssh; - }, []); + // ── Workspace tabs ── + const tabs = useWorkspaceTabs({ + registeredInstances, + setRegisteredInstances, + sshHosts, + dockerInstances, + resolveInstanceTransport, + connectWithPassphraseFallback, + syncRemoteAuthAfterConnect, + scheduleEnsureAccessForInstance, + upsertDockerInstance, + refreshHosts, + refreshRegisteredInstances, + showToast, + setConnectionStatus, + navigateRoute, + }); - const [profileSyncStatus, setProfileSyncStatus] = useState({ - phase: "idle", - message: "", - instanceId: null, + const { + openTabIds, + setOpenTabIds, + activeInstance, + inStart, + setInStart, + startSection, + setStartSection, + openTab, + closeTab, + handleInstanceSelect, + openTabs, + openControlCenter, + handleInstallReady, + handleDeleteSsh, + } = tabs; + + // Sync bootstrap → real activeInstance for hooks that depend on it. + // This is a controlled pattern: useWorkspaceTabs owns the real state, + // and we keep the bootstrap in sync so persistence/SSH hooks track it. + if (_bootstrapActiveInstance !== activeInstance) { + _setBootstrapActiveInstance(activeInstance); + } + + // ── Channel cache ── + const channels = useChannelCache({ + activeInstance, + route, + instanceToken, + persistenceScope, + persistenceResolved, + isRemote, + isConnected, }); - const [showSshTransferSpeedUi, setShowSshTransferSpeedUi] = useState(false); - const [sshTransferStats, setSshTransferStats] = useState(null); - const [doctorNavPulse, setDoctorNavPulse] = useState(false); - const sshHealthFailStreakRef = useRef>({}); - const doctorSshAutohealMuteUntilRef = useRef>({}); - const legacyMigrationDoneRef = useRef(false); - const passphraseResolveRef = useRef<((value: string | null) => void) | null>(null); - const [passphraseHostLabel, setPassphraseHostLabel] = useState(""); - const [passphraseOpen, setPassphraseOpen] = useState(false); - const [passphraseInput, setPassphraseInput] = useState(""); - const remoteAuthSyncAtRef = useRef>({}); - const accessProbeTimerRef = useRef | null>(null); - const lastAccessProbeAtRef = useRef>({}); - // Persist open tabs - useEffect(() => { - localStorage.setItem(OPEN_TABS_STORAGE_KEY, JSON.stringify(openTabIds)); - }, [openTabIds]); + // ── App lifecycle ── + const lifecycle = useAppLifecycle({ + showToast, + refreshHosts, + refreshRegisteredInstances, + }); - const showToast = useCallback((message: string, type: "success" | "error" = "success") => { - if (type === "error") { - toast.error(message, { duration: 5000 }); - return; - } - toast.success(message, { duration: 3000 }); - }, []); + const { appUpdateAvailable, setAppUpdateAvailable, appVersion } = lifecycle; + // ── SSH edit save ── const handleSshEditSave = useCallback(async (host: SshHost) => { try { await withGuidance( @@ -352,9 +245,10 @@ export function App() { } catch (e) { showToast(e instanceof Error ? e.message : String(e), "error"); } - }, [refreshHosts, refreshRegisteredInstances, showToast, t]); + }, [refreshHosts, refreshRegisteredInstances, showToast, t, setSshEditOpen]); - const handleConnectDiscovered = useCallback(async (discovered: DiscoveredInstance) => { + // ── Discovered instance connect ── + const handleConnectDiscovered = useCallback(async (discovered: import("./lib/types").DiscoveredInstance) => { try { await withGuidance( () => api.connectDockerInstance(discovered.homePath, discovered.label, discovered.id), @@ -370,831 +264,7 @@ export function App() { } }, [refreshRegisteredInstances, discoverInstances, showToast, t]); - // Startup precheck: validate registry - useEffect(() => { - withGuidance( - () => api.precheckRegistry(), - "precheckRegistry", - "local", - "local", - ).then((issues) => { - const errors = issues.filter((i: PrecheckIssue) => i.severity === "error"); - if (errors.length === 1) { - showToast(errors[0].message, "error"); - } else if (errors.length > 1) { - showToast(`${errors[0].message}${t("doctor.remainingIssues", { count: errors.length - 1 })}`, "error"); - } - }).catch((error) => { - logDevIgnoredError("precheckRegistry", error); - }); - }, [showToast, t]); - - const resolveInstanceTransport = useCallback((instanceId: string) => { - if (instanceId === "local") return "local"; - const registered = registeredInstances.find((item) => item.id === instanceId); - if (registered?.instanceType === "docker") return "docker_local"; - if (registered?.instanceType === "remote_ssh") return "remote_ssh"; - if (instanceId.startsWith("docker:")) return "docker_local"; - if (instanceId.startsWith("ssh:")) return "remote_ssh"; - if (dockerInstances.some((item) => item.id === instanceId)) return "docker_local"; - if (sshHosts.some((host) => host.id === instanceId)) return "remote_ssh"; - // Unknown id should not be treated as remote by default. - return "local"; - }, [dockerInstances, sshHosts, registeredInstances]); - - useEffect(() => { - const handleUnhandled = (operation: string, reason: unknown) => { - if (reason && typeof reason === "object" && (reason as any)._guidanceEmitted) { - return; - } - const transport = resolveInstanceTransport(activeInstance); - void explainAndBuildGuidanceError({ - method: operation, - instanceId: activeInstance, - transport, - rawError: reason, - emitEvent: true, - }); - void api.captureFrontendError( - typeof reason === "string" ? reason : String(reason), - undefined, - "error", - ).catch(() => { - // ignore - }); - }; - - const onUnhandledRejection = (event: PromiseRejectionEvent) => { - logDevException("unhandledRejection", event.reason); - handleUnhandled("unhandledRejection", event.reason); - }; - const onGlobalError = (event: ErrorEvent) => { - const detail = event.error ?? event.message ?? "unknown error"; - logDevException("unhandledError", detail); - handleUnhandled("unhandledError", detail); - }; - - window.addEventListener("unhandledrejection", onUnhandledRejection); - window.addEventListener("error", onGlobalError); - return () => { - window.removeEventListener("unhandledrejection", onUnhandledRejection); - window.removeEventListener("error", onGlobalError); - }; - }, [activeInstance, resolveInstanceTransport]); - - useEffect(() => { - let cancelled = false; - const loadUiPreferences = () => { - api.getAppPreferences() - .then((prefs) => { - if (!cancelled) { - setShowSshTransferSpeedUi(Boolean(prefs.showSshTransferSpeedUi)); - } - }) - .catch(() => { - if (!cancelled) { - setShowSshTransferSpeedUi(false); - } - }); - }; - - loadUiPreferences(); - const unsubscribe = subscribeToCacheKey(APP_PREFERENCES_CACHE_KEY, loadUiPreferences); - - return () => { - cancelled = true; - unsubscribe(); - }; - }, []); - - const ensureAccessForInstance = useCallback((instanceId: string) => { - const transport = resolveInstanceTransport(instanceId); - withGuidance( - () => api.ensureAccessProfile(instanceId, transport), - "ensureAccessProfile", - instanceId, - transport, - ).catch((error) => { - logDevIgnoredError("ensureAccessProfile", error); - }); - // Auth precheck: warn if model profiles are misconfigured - withGuidance( - () => api.precheckAuth(instanceId), - "precheckAuth", - instanceId, - transport, - ).then((issues) => { - const errors = issues.filter((i: PrecheckIssue) => i.severity === "error"); - if (errors.length === 1) { - showToast(errors[0].message, "error"); - } else if (errors.length > 1) { - showToast(`${errors[0].message}${t("doctor.remainingIssues", { count: errors.length - 1 })}`, "error"); - } - }).catch((error) => { - logDevIgnoredError("precheckAuth", error); - }); - }, [resolveInstanceTransport, showToast, t]); - - const scheduleEnsureAccessForInstance = useCallback((instanceId: string, delayMs = 1200) => { - const now = Date.now(); - const last = lastAccessProbeAtRef.current[instanceId] || 0; - // Debounce per-instance background probes to keep tab switching responsive. - if (now - last < 30_000) return; - if (accessProbeTimerRef.current !== null) { - clearTimeout(accessProbeTimerRef.current); - accessProbeTimerRef.current = null; - } - accessProbeTimerRef.current = setTimeout(() => { - lastAccessProbeAtRef.current[instanceId] = Date.now(); - ensureAccessForInstance(instanceId); - accessProbeTimerRef.current = null; - }, delayMs); - }, [ensureAccessForInstance]); - - const readLegacyDockerInstances = useCallback((): DockerInstance[] => { - try { - const raw = localStorage.getItem(LEGACY_DOCKER_INSTANCES_KEY); - if (!raw) return []; - const parsed = JSON.parse(raw) as DockerInstance[]; - if (!Array.isArray(parsed)) return []; - const out: DockerInstance[] = []; - const seen = new Set(); - for (const item of parsed) { - if (!item?.id || typeof item.id !== "string") continue; - const id = item.id.trim(); - if (!id || seen.has(id)) continue; - seen.add(id); - out.push(normalizeDockerInstance({ ...item, id })); - } - return out; - } catch { - return []; - } - }, []); - - const readLegacyOpenTabs = useCallback((): string[] => { - try { - const raw = localStorage.getItem(OPEN_TABS_STORAGE_KEY); - if (!raw) return []; - const parsed = JSON.parse(raw); - if (!Array.isArray(parsed)) return []; - return parsed.filter((id): id is string => typeof id === "string" && id.trim().length > 0); - } catch { - return []; - } - }, []); - - useEffect(() => { - return () => { - if (accessProbeTimerRef.current !== null) { - clearTimeout(accessProbeTimerRef.current); - accessProbeTimerRef.current = null; - } - }; - }, []); - - useEffect(() => { - if (legacyMigrationDoneRef.current) return; - legacyMigrationDoneRef.current = true; - const legacyDockerInstances = readLegacyDockerInstances(); - const legacyOpenTabIds = readLegacyOpenTabs(); - withGuidance( - () => api.migrateLegacyInstances(legacyDockerInstances, legacyOpenTabIds), - "migrateLegacyInstances", - "local", - "local", - ) - .then((result) => { - if ( - result.importedSshHosts > 0 - || result.importedDockerInstances > 0 - || result.importedOpenTabInstances > 0 - ) { - refreshRegisteredInstances(); - refreshHosts(); - localStorage.removeItem(LEGACY_DOCKER_INSTANCES_KEY); - } - }) - .catch((e) => { - console.error("Legacy instance migration failed:", e); - }); - }, [readLegacyDockerInstances, readLegacyOpenTabs, refreshRegisteredInstances, refreshHosts]); - - const requestPassphrase = useCallback((hostLabel: string): Promise => { - setPassphraseHostLabel(hostLabel); - setPassphraseInput(""); - setPassphraseOpen(true); - return new Promise((resolve) => { - passphraseResolveRef.current = resolve; - }); - }, []); - - const closePassphraseDialog = useCallback((value: string | null) => { - setPassphraseOpen(false); - const resolve = passphraseResolveRef.current; - passphraseResolveRef.current = null; - if (resolve) resolve(value); - }, []); - - const connectWithPassphraseFallback = useCallback(async (hostId: string) => { - const host = sshHosts.find((h) => h.id === hostId); - const hostLabel = host?.label || host?.host || hostId; - try { - await api.sshConnect(hostId); - if (host) { - const nextScope = ensureRemotePersistenceScope(host); - if (hostId === activeInstance) { - setPersistenceScope(nextScope); - setPersistenceResolved(true); - } - } - return; - } catch (err) { - const raw = extractErrorText(err); - // When host is not yet in sshHosts state (e.g. just added via upsertSshHost - // and state hasn't refreshed), assume non-password auth so the passphrase - // dialog is still shown instead of falling through to a misleading error. - if ((!host || host.authMethod !== "password") && SSH_PASSPHRASE_RETRY_HINT.test(raw)) { - // If the host already had a stored passphrase, the backend already tried it. - // Skip the dialog — the stored passphrase was wrong. - if (host?.passphrase && host.passphrase.length > 0) { - const fallbackMessage = buildSshPassphraseConnectErrorMessage(raw, hostLabel, t); - if (fallbackMessage) { - throw new Error(fallbackMessage); - } - throw await explainAndBuildGuidanceError({ - method: "sshConnect", - instanceId: hostId, - transport: "remote_ssh", - rawError: err, - }); - } - const passphrase = await requestPassphrase(hostLabel); - if (passphrase !== null) { - try { - await withGuidance( - () => api.sshConnectWithPassphrase(hostId, passphrase), - "sshConnectWithPassphrase", - hostId, - "remote_ssh", - ); - if (host) { - const nextScope = ensureRemotePersistenceScope(host); - if (hostId === activeInstance) { - setPersistenceScope(nextScope); - setPersistenceResolved(true); - } - } - return; - } catch (passphraseErr) { - const passphraseRaw = extractErrorText(passphraseErr); - const fallbackMessage = buildSshPassphraseConnectErrorMessage( - passphraseRaw, hostLabel, t, { passphraseWasSubmitted: true }, - ); - if (fallbackMessage) { - throw new Error(fallbackMessage); - } - throw await explainAndBuildGuidanceError({ - method: "sshConnectWithPassphrase", - instanceId: hostId, - transport: "remote_ssh", - rawError: passphraseErr, - }); - } - } else { - throw new Error(buildSshPassphraseCancelMessage(hostLabel, t)); - } - } - const fallbackMessage = buildSshPassphraseConnectErrorMessage(raw, hostLabel, t); - if (fallbackMessage) { - throw new Error(fallbackMessage); - } - throw await explainAndBuildGuidanceError({ - method: "sshConnect", - instanceId: hostId, - transport: "remote_ssh", - rawError: err, - }); - } - }, [activeInstance, requestPassphrase, sshHosts, t]); - - const syncRemoteAuthAfterConnect = useCallback(async (hostId: string) => { - const now = Date.now(); - const last = remoteAuthSyncAtRef.current[hostId] || 0; - if (now - last < 30_000) return; - remoteAuthSyncAtRef.current[hostId] = now; - setProfileSyncStatus({ - phase: "syncing", - message: t("doctor.profileSyncStarted"), - instanceId: hostId, - }); - try { - const result = await api.remoteSyncProfilesToLocalAuth(hostId); - invalidateGlobalReadCache(["listModelProfiles", "resolveApiKeys"]); - const localProfiles = await api.listModelProfiles().catch((error) => { - logDevIgnoredError("syncRemoteAuthAfterConnect listModelProfiles", error); - return []; - }); - if (result.resolvedKeys > 0 || result.syncedProfiles > 0) { - if (localProfiles.length > 0) { - const message = t("doctor.profileSyncSuccessMessage", { - syncedProfiles: result.syncedProfiles, - resolvedKeys: result.resolvedKeys, - }); - showToast(message, "success"); - setProfileSyncStatus({ - phase: "success", - message, - instanceId: hostId, - }); - } else { - const message = t("doctor.profileSyncNoLocalProfiles"); - showToast(message, "error"); - setProfileSyncStatus({ - phase: "error", - message, - instanceId: hostId, - }); - } - } else if (result.totalRemoteProfiles > 0) { - const message = t("doctor.profileSyncNoUsableKeys"); - showToast(message, "error"); - setProfileSyncStatus({ - phase: "error", - message, - instanceId: hostId, - }); - } else { - const message = t("doctor.profileSyncNoProfiles"); - showToast(message, "error"); - setProfileSyncStatus({ - phase: "error", - message, - instanceId: hostId, - }); - } - } catch (e) { - const message = t("doctor.profileSyncFailed", { error: String(e) }); - showToast(message, "error"); - setProfileSyncStatus({ - phase: "error", - message, - instanceId: hostId, - }); - } - }, [showToast, t]); - - - const openTab = useCallback((id: string) => { - startTransition(() => { - setOpenTabIds((prev) => prev.includes(id) ? prev : [...prev, id]); - setActiveInstance(id); - setInStart(false); - // Entering instance mode from Start should prefer a fast route. - navigateRoute("home"); - }); - }, [navigateRoute]); - - const closeTab = useCallback((id: string) => { - setOpenTabIds((prevOpenTabIds) => { - const nextState = closeWorkspaceTab({ - openTabIds: prevOpenTabIds, - activeInstance, - inStart, - startSection, - }, id); - setActiveInstance(nextState.activeInstance); - setInStart(nextState.inStart); - setStartSection(nextState.startSection); - return nextState.openTabIds; - }); - }, [activeInstance, inStart, startSection]); - - const handleInstanceSelect = useCallback((id: string) => { - if (id === activeInstance && !inStart) { - return; - } - startTransition(() => { - setActiveInstance(id); - setOpenTabIds((prev) => prev.includes(id) ? prev : [...prev, id]); - setInStart(false); - // Always land on Home when switching instance to avoid route-specific - // heavy reloads (e.g., Channels) on the critical interaction path. - navigateRoute("home"); - }); - // Instance switch precheck - withGuidance( - () => api.precheckInstance(id), - "precheckInstance", - id, - resolveInstanceTransport(id), - ).then((issues) => { - const blocking = issues.filter((i: PrecheckIssue) => i.severity === "error"); - if (blocking.length === 1) { - showToast(blocking[0].message, "error"); - } else if (blocking.length > 1) { - showToast(`${blocking[0].message}${t("doctor.remainingIssues", { count: blocking.length - 1 })}`, "error"); - } - }).catch((error) => { - logDevIgnoredError("precheckInstance", error); - }); - const transport = resolveInstanceTransport(id); - // Transport precheck for non-SSH targets. - // SSH switching immediately triggers reconnect flow below, so running - // precheckTransport here would cause noisy transient "not active" toasts. - if (transport !== "remote_ssh") { - withGuidance( - () => api.precheckTransport(id), - "precheckTransport", - id, - transport, - ).then((issues) => { - const blocking = issues.filter((i: PrecheckIssue) => i.severity === "error"); - if (blocking.length === 1) { - showToast(blocking[0].message, "error"); - } else if (blocking.length > 1) { - showToast(`${blocking[0].message}${t("doctor.remainingIssues", { count: blocking.length - 1 })}`, "error"); - } else { - const warnings = issues.filter((i: PrecheckIssue) => i.severity === "warn"); - if (warnings.length > 0) { - showToast(warnings[0].message, "error"); - } - } - }).catch((error) => { - logDevIgnoredError("precheckTransport", error); - }); - } - if (transport !== "remote_ssh") return; - // Check if backend still has a live connection before reconnecting. - // Do not pre-mark as disconnected — transient status failures would - // otherwise gray out the whole remote UI. - withGuidance( - () => api.sshStatus(id), - "sshStatus", - id, - "remote_ssh", - ) - .then((status) => { - if (status === "connected") { - setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); - scheduleEnsureAccessForInstance(id, 1500); - void syncRemoteAuthAfterConnect(id); - } else { - return connectWithPassphraseFallback(id) - .then(() => { - setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); - scheduleEnsureAccessForInstance(id, 1500); - void syncRemoteAuthAfterConnect(id); - }); - } - }) - .catch((error) => { - logDevIgnoredError("sshStatus or reconnect", error); - // sshStatus failed or reconnect failed — try fresh connect - connectWithPassphraseFallback(id) - .then(() => { - setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); - scheduleEnsureAccessForInstance(id, 1500); - void syncRemoteAuthAfterConnect(id); - }) - .catch((e2) => { - setConnectionStatus((prev) => ({ ...prev, [id]: "error" })); - const friendly = buildFriendlySshError(e2, t); - showToast(friendly, "error"); - }); - }); - }, [activeInstance, inStart, resolveInstanceTransport, scheduleEnsureAccessForInstance, connectWithPassphraseFallback, syncRemoteAuthAfterConnect, showToast, t, navigateRoute]); - - const [configVersion, setConfigVersion] = useState(0); - const [instanceToken, setInstanceToken] = useState(0); - const [persistenceScope, setPersistenceScope] = useState("local"); - const [persistenceResolved, setPersistenceResolved] = useState(true); - - const isDocker = registeredInstances.some((item) => item.id === activeInstance && item.instanceType === "docker") - || dockerInstances.some((item) => item.id === activeInstance); - const isRemote = registeredInstances.some((item) => item.id === activeInstance && item.instanceType === "remote_ssh") - || sshHosts.some((host) => host.id === activeInstance); - const isConnected = !isRemote || connectionStatus[activeInstance] === "connected"; - - useEffect(() => { - let cancelled = false; - const activeRegistered = registeredInstances.find((item) => item.id === activeInstance); - - const resolvePersistence = async () => { - if (isRemote) { - const host = sshHosts.find((item) => item.id === activeInstance) || null; - setPersistenceScope(host ? readRemotePersistenceScope(host) : null); - setPersistenceResolved(true); - return; - } - - let openclawHome: string | null = null; - if (activeInstance === "local") { - openclawHome = "~"; - } else if (isDocker) { - const instance = dockerInstances.find((item) => item.id === activeInstance); - const fallback = deriveDockerPaths(activeInstance); - openclawHome = instance?.openclawHome || fallback.openclawHome; - } else if (activeRegistered?.instanceType === "local" && activeRegistered.openclawHome) { - openclawHome = activeRegistered.openclawHome; - } - - if (!openclawHome) { - setPersistenceScope(null); - setPersistenceResolved(true); - return; - } - - setPersistenceResolved(false); - setPersistenceScope(null); - try { - const [exists, cliAvailable] = await Promise.all([ - api.localOpenclawConfigExists(openclawHome), - api.localOpenclawCliAvailable(), - ]); - if (cancelled) return; - setPersistenceScope( - shouldEnableLocalInstanceScope({ - configExists: exists, - cliAvailable, - }) ? activeInstance : null, - ); - } catch (error) { - logDevIgnoredError("localOpenclawConfigExists", error); - if (cancelled) return; - setPersistenceScope(null); - } finally { - if (!cancelled) { - setPersistenceResolved(true); - } - } - }; - - void resolvePersistence(); - return () => { - cancelled = true; - }; - }, [activeInstance, dockerInstances, isDocker, isRemote, registeredInstances, sshHosts]); - - useEffect(() => { - if (!isRemote || !isConnected) return; - const host = sshHosts.find((item) => item.id === activeInstance); - if (!host) return; - const nextScope = ensureRemotePersistenceScope(host); - if (persistenceScope !== nextScope) { - setPersistenceScope(nextScope); - } - if (!persistenceResolved) { - setPersistenceResolved(true); - } - }, [activeInstance, isConnected, isRemote, persistenceResolved, persistenceScope, sshHosts]); - - useEffect(() => { - if (!showSshTransferSpeedUi || !isRemote || !isConnected) { - setSshTransferStats(null); - return; - } - let cancelled = false; - const poll = () => { - api.getSshTransferStats(activeInstance) - .then((stats) => { - if (!cancelled) setSshTransferStats(stats); - }) - .catch((error) => { - logDevIgnoredError("getSshTransferStats", error); - if (!cancelled) setSshTransferStats(null); - }); - }; - poll(); - const timer = window.setInterval(poll, 1000); - return () => { - cancelled = true; - window.clearInterval(timer); - }; - }, [activeInstance, isConnected, isRemote, showSshTransferSpeedUi]); - - useEffect(() => { - let cancelled = false; - let nextHome: string | null = null; - let nextDataDir: string | null = null; - setInstanceToken(0); - const activeRegistered = registeredInstances.find((item) => item.id === activeInstance); - if (activeInstance === "local" || isRemote) { - nextHome = null; - nextDataDir = null; - } else if (isDocker) { - const instance = dockerInstances.find((item) => item.id === activeInstance); - const fallback = deriveDockerPaths(activeInstance); - nextHome = instance?.openclawHome || fallback.openclawHome; - nextDataDir = instance?.clawpalDataDir || fallback.clawpalDataDir; - } else if (activeRegistered?.instanceType === "local" && activeRegistered.openclawHome) { - nextHome = activeRegistered.openclawHome; - nextDataDir = activeRegistered.clawpalDataDir || null; - } - const tokenSeed = `${activeInstance}|${nextHome || ""}|${nextDataDir || ""}`; - - const applyOverrides = async () => { - if (nextHome === null && nextDataDir === null) { - await Promise.all([ - api.setActiveOpenclawHome(null).catch((error) => logDevIgnoredError("setActiveOpenclawHome", error)), - api.setActiveClawpalDataDir(null).catch((error) => logDevIgnoredError("setActiveClawpalDataDir", error)), - ]); - } else { - await Promise.all([ - api.setActiveOpenclawHome(nextHome).catch((error) => logDevIgnoredError("setActiveOpenclawHome", error)), - api.setActiveClawpalDataDir(nextDataDir).catch((error) => logDevIgnoredError("setActiveClawpalDataDir", error)), - ]); - } - if (!cancelled) { - // Token bumps only after overrides are applied, so data panels can - // safely refetch with the correct per-instance OPENCLAW_HOME. - setInstanceToken(hashInstanceToken(tokenSeed)); - } - }; - void applyOverrides(); - return () => { - cancelled = true; - }; - }, [activeInstance, isDocker, isRemote, dockerInstances, registeredInstances]); - - useEffect(() => { - if (!isRemote || !isConnected || !instanceToken) return; - prewarmRemoteInstanceReadCache(activeInstance, instanceToken, persistenceScope); - }, [activeInstance, instanceToken, isConnected, isRemote, persistenceScope]); - - // Keep active remote instance self-healed: detect dropped SSH and reconnect. - useEffect(() => { - if (!isRemote) return; - let cancelled = false; - let inFlight = false; - const hostId = activeInstance; - const reportAutoHealFailure = (rawError: unknown) => { - void explainAndBuildGuidanceError({ - method: "sshConnect", - instanceId: hostId, - transport: "remote_ssh", - rawError: rawError, - emitEvent: true, - }).catch((error) => { - logDevIgnoredError("autoheal explainAndBuildGuidanceError", error); - }); - showToast(buildFriendlySshError(rawError, t), "error"); - }; - const markFailure = (rawError: unknown) => { - if (cancelled) return; - const mutedUntil = doctorSshAutohealMuteUntilRef.current[hostId] || 0; - if (Date.now() < mutedUntil) { - logDevIgnoredError("ssh autoheal muted during doctor flow", rawError); - return; - } - const streak = (sshHealthFailStreakRef.current[hostId] || 0) + 1; - sshHealthFailStreakRef.current[hostId] = streak; - // Avoid flipping UI to disconnected/error on a single transient failure. - if (streak >= 2) { - setConnectionStatus((prev) => ({ ...prev, [hostId]: "error" })); - // Escalate the first stable failure in this streak to guidance + toast. - if (streak === 2) { - reportAutoHealFailure(rawError); - } - } - }; - - const checkAndHeal = async () => { - if (cancelled || inFlight) return; - inFlight = true; - try { - const status = await api.sshStatus(hostId); - if (cancelled) return; - if (status === "connected") { - sshHealthFailStreakRef.current[hostId] = 0; - setConnectionStatus((prev) => ({ ...prev, [hostId]: "connected" })); - return; - } - try { - await connectWithPassphraseFallback(hostId); - if (!cancelled) { - sshHealthFailStreakRef.current[hostId] = 0; - setConnectionStatus((prev) => ({ ...prev, [hostId]: "connected" })); - } - } catch (connectError) { - markFailure(connectError); - } - } catch (statusError) { - markFailure(statusError); - } finally { - inFlight = false; - } - }; - - checkAndHeal(); - const timer = setInterval(checkAndHeal, 15_000); - return () => { - cancelled = true; - clearInterval(timer); - }; - }, [activeInstance, isRemote, showToast, t]); - - useEffect(() => { - if (!isRemote) return; - let disposed = false; - const currentHostId = activeInstance; - const unlistenPromise = listen<{ phase?: string }>("doctor:assistant-progress", (event) => { - if (disposed) return; - const phase = event.payload?.phase || ""; - const cooldownMs = phase === "cleanup" ? 45_000 : 30_000; - doctorSshAutohealMuteUntilRef.current[currentHostId] = Date.now() + cooldownMs; - }); - return () => { - disposed = true; - void unlistenPromise.then((unlisten) => unlisten()).catch((error) => { - logDevIgnoredError("doctor progress unlisten", error); - }); - }; - }, [activeInstance, isRemote]); - - // Clear cached channel data only when switching instance. - // Avoid clearing on transient connection-status changes, which causes - // Channels page to flicker between "loading" and loaded data. - useEffect(() => { - if (!persistenceResolved || !persistenceScope) { - setChannelNodes(null); - setDiscordGuildChannels(null); - return; - } - setChannelNodes( - readPersistedReadCache(persistenceScope, "listChannelsMinimal", []) ?? null, - ); - setDiscordGuildChannels( - readPersistedReadCache(persistenceScope, "listDiscordGuildChannels", []) ?? null, - ); - }, [activeInstance, persistenceResolved, persistenceScope]); - - const refreshChannelNodesCache = useCallback(async () => { - setChannelsLoading(true); - try { - const nodes = isRemote - ? await api.remoteListChannelsMinimal(activeInstance) - : await api.listChannelsMinimal(); - setChannelNodes(nodes); - if (persistenceScope) { - writePersistedReadCache(persistenceScope, "listChannelsMinimal", [], nodes); - } - return nodes; - } finally { - setChannelsLoading(false); - } - }, [activeInstance, isRemote, persistenceScope]); - - const refreshDiscordChannelsCache = useCallback(async () => { - setDiscordChannelsLoading(true); - try { - const channels = isRemote - ? await api.remoteListDiscordGuildChannels(activeInstance) - : await api.listDiscordGuildChannels(); - setDiscordGuildChannels(channels); - if (persistenceScope) { - writePersistedReadCache(persistenceScope, "listDiscordGuildChannels", [], channels); - } - return channels; - } finally { - setDiscordChannelsLoading(false); - } - }, [activeInstance, isRemote, persistenceScope]); - - // Load unified channel cache lazily when Channels tab is active. - useEffect(() => { - if (route !== "channels" || !persistenceResolved) return; - if (isRemote && !isConnected) return; - if (!shouldEnableInstanceLiveReads({ - instanceToken, - persistenceResolved, - persistenceScope, - isRemote, - })) return; - void Promise.allSettled([ - refreshChannelNodesCache(), - refreshDiscordChannelsCache(), - ]); - }, [ - route, - instanceToken, - persistenceResolved, - persistenceScope, - isRemote, - isConnected, - refreshChannelNodesCache, - refreshDiscordChannelsCache, - ]); - - const bumpConfigVersion = useCallback(() => { - setConfigVersion((v) => v + 1); - }, []); - - const openControlCenter = useCallback(() => { - setInStart(true); - setStartSection("overview"); - }, []); - + // ── Doctor navigation ── const openDoctor = useCallback(() => { setDoctorNavPulse(true); setInStart(false); @@ -1202,200 +272,10 @@ export function App() { window.setTimeout(() => { setDoctorNavPulse(false); }, 1400); - }, [navigateRoute]); - - const showSidebar = true; - - // Derive openTabs array for InstanceTabBar - const openTabs = useMemo(() => { - const registryById = new Map(registeredInstances.map((item) => [item.id, item])); - return openTabIds.flatMap((id) => { - if (id === "local") return { id, label: t("instance.local"), type: "local" as const }; - const registered = registryById.get(id); - if (registered) { - const fallbackLabel = registered.instanceType === "docker" ? deriveDockerLabel(id) : id; - return { - id, - label: registered.label || fallbackLabel, - type: registered.instanceType === "remote_ssh" ? "ssh" as const : registered.instanceType as "local" | "docker", - }; - } - return []; - }); - }, [openTabIds, registeredInstances, t]); - - // Handle install completion — register docker instance and open tab - const handleInstallReady = useCallback(async (session: InstallSession) => { - const artifacts = session.artifacts || {}; - const readArtifactString = (keys: string[]): string => { - for (const key of keys) { - const value = artifacts[key]; - if (typeof value === "string" && value.trim()) { - return value.trim(); - } - } - return ""; - }; - if (session.method === "docker") { - const artifactId = readArtifactString(["docker_instance_id", "dockerInstanceId"]); - const id = artifactId || DEFAULT_DOCKER_INSTANCE_ID; - const fallback = deriveDockerPaths(id); - const openclawHome = readArtifactString(["docker_openclaw_home", "dockerOpenclawHome"]) || fallback.openclawHome; - const clawpalDataDir = readArtifactString(["docker_clawpal_data_dir", "dockerClawpalDataDir"]) || `${openclawHome}/data`; - const label = readArtifactString(["docker_instance_label", "dockerInstanceLabel"]) || deriveDockerLabel(id); - const registered = await upsertDockerInstance({ id, label, openclawHome, clawpalDataDir }); - openTab(registered.id); - } else if (session.method === "remote_ssh") { - let hostId = readArtifactString(["ssh_host_id", "sshHostId", "host_id", "hostId"]); - const hostLabel = readArtifactString(["ssh_host_label", "sshHostLabel", "host_label", "hostLabel"]); - const hostAddr = readArtifactString(["ssh_host", "sshHost", "host"]); - if (!hostId) { - const knownHosts = await api.listSshHosts().catch((error) => { - logDevIgnoredError("handleInstallReady listSshHosts", error); - return [] as SshHost[]; - }); - if (hostLabel) { - const byLabel = knownHosts.find((item) => item.label === hostLabel); - if (byLabel) hostId = byLabel.id; - } - if (!hostId && hostAddr) { - const byHost = knownHosts.find((item) => item.host === hostAddr); - if (byHost) hostId = byHost.id; - } - } - if (hostId) { - const activateRemoteInstance = (instanceId: string, status: "connected" | "error") => { - setOpenTabIds((prev) => prev.includes(instanceId) ? prev : [...prev, instanceId]); - setActiveInstance(instanceId); - setConnectionStatus((prev) => ({ ...prev, [instanceId]: status })); - setInStart(false); - navigateRoute("home"); - }; - try { - // Register the SSH host as an instance and update state - // synchronously so the tab bar can render it immediately. - const instance = await withGuidance( - () => api.connectSshInstance(hostId), - "connectSshInstance", - hostId, - "remote_ssh", - ); - setRegisteredInstances((prev) => { - const filtered = prev.filter((r) => r.id !== hostId && r.id !== instance.id); - return [...filtered, instance]; - }); - refreshHosts(); - refreshRegisteredInstances(); - activateRemoteInstance(instance.id, "connected"); - scheduleEnsureAccessForInstance(instance.id, 600); - void syncRemoteAuthAfterConnect(instance.id); - } catch (err) { - console.warn("connectSshInstance failed during install-ready:", err); - refreshHosts(); - refreshRegisteredInstances(); - const alreadyRegistered = registeredInstances.some((item) => item.id === hostId); - if (alreadyRegistered) { - activateRemoteInstance(hostId, "error"); - } else { - setInStart(true); - setStartSection("overview"); - } - const reason = buildFriendlySshError(err, t); - showToast(reason, "error"); - } - } else { - showToast("SSH host id missing after submit. Please reopen Connect and retry.", "error"); - } - } else { - // For local/SSH installs, just switch to the instance - openTab("local"); - } - }, [ - upsertDockerInstance, - openTab, - refreshHosts, - refreshRegisteredInstances, - navigateRoute, - registeredInstances, - scheduleEnsureAccessForInstance, - syncRemoteAuthAfterConnect, - showToast, - t, - ]); + }, [navigateRoute, setDoctorNavPulse, setInStart]); - const navItems: { key: string; active: boolean; icon: React.ReactNode; label: string; badge?: React.ReactNode; onClick: () => void }[] = inStart - ? [ - { - key: "start-profiles", - active: startSection === "profiles", - icon: , - label: t("start.nav.profiles"), - onClick: () => { navigateRoute("home"); setStartSection("profiles"); }, - }, - { - key: "start-settings", - active: startSection === "settings", - icon: , - label: t("start.nav.settings"), - onClick: () => { navigateRoute("home"); setStartSection("settings"); }, - }, - ] - : [ - { - key: "instance-home", - active: route === "home", - icon: , - label: t("nav.home"), - onClick: () => navigateRoute("home"), - }, - { - key: "channels", - active: route === "channels", - icon: , - label: t("nav.channels"), - onClick: () => navigateRoute("channels"), - }, - { - key: "recipes", - active: route === "recipes", - icon: , - label: t("nav.recipes"), - onClick: () => navigateRoute("recipes"), - }, - { - key: "cron", - active: route === "cron", - icon: , - label: t("nav.cron"), - onClick: () => navigateRoute("cron"), - }, - { - key: "doctor", - active: route === "doctor", - icon: , - label: t("nav.doctor"), - onClick: () => { - openDoctor(); - }, - badge: doctorNavPulse - ? - : undefined, - }, - { - key: "openclaw-context", - active: route === "context", - icon: , - label: t("nav.context"), - onClick: () => navigateRoute("context"), - }, - { - key: "history", - active: route === "history", - icon: , - label: t("nav.history"), - onClick: () => navigateRoute("history"), - }, - ]; + // ── Navigation items ── + const navItems = useNavItems({ inStart, startSection, setStartSection, route, navigateRoute, openDoctor, doctorNavPulse }); return ( <> @@ -1421,17 +301,16 @@ export function App() { isRemote, isDocker, isConnected, - channelNodes, - discordGuildChannels, - channelsLoading, - discordChannelsLoading, - refreshChannelNodesCache, - refreshDiscordChannelsCache, + channelNodes: channels.channelNodes, + discordGuildChannels: channels.discordGuildChannels, + channelsLoading: channels.channelsLoading, + discordChannelsLoading: channels.discordChannelsLoading, + refreshChannelNodesCache: channels.refreshChannelNodesCache, + refreshDiscordChannelsCache: channels.refreshDiscordChannelsCache, }}>
{/* ── Sidebar ── */} - {showSidebar && ( - )} {/* ── Main Content ── */}
@@ -1561,19 +379,7 @@ export function App() { onOpenInstance={openTab} onRenameDocker={renameDockerInstance} onDeleteDocker={deleteDockerInstance} - onDeleteSsh={(hostId) => { - withGuidance( - () => api.deleteSshHost(hostId), - "deleteSshHost", - hostId, - "remote_ssh", - ).then(() => { - clearRemotePersistenceScope(hostId); - closeTab(hostId); - refreshHosts(); - refreshRegisteredInstances(); - }).catch((e) => console.warn("deleteSshHost:", e)); - }} + onDeleteSsh={handleDeleteSsh} onEditSsh={handleEditSsh} onInstallReady={handleInstallReady} showToast={showToast} @@ -1673,64 +479,19 @@ export function App() {
- { - if (!open) closePassphraseDialog(null); - }} - > - - - {t("ssh.passphraseTitle")} - -
-

- {t("ssh.passphrasePrompt", { host: passphraseHostLabel })} -

- - setPassphraseInput(e.target.value)} - placeholder={t("ssh.passphrasePlaceholder")} - autoFocus - onKeyDown={(e) => { - if (e.key === "Enter") { - closePassphraseDialog(passphraseInput); - } - }} - /> -
- - - - - - - - - - {t("instance.editSsh")} - - {editingSshHost && ( - Loading…

}> - { - handleSshEditSave({ ...host, id: editingSshHost.id }); - }} - onCancel={() => setSshEditOpen(false)} - /> - - )} - - + hostLabel={passphraseHostLabel} + input={passphraseInput} + onInputChange={setPassphraseInput} + onClose={closePassphraseDialog} + /> + ); diff --git a/src/components/AppDialogs.tsx b/src/components/AppDialogs.tsx new file mode 100644 index 00000000..da7220b7 --- /dev/null +++ b/src/components/AppDialogs.tsx @@ -0,0 +1,79 @@ +import { Suspense, lazy } from "react"; +import { useTranslation } from "react-i18next"; +import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; +import { Label } from "@/components/ui/label"; +import type { SshHost } from "../lib/types"; + +const SshFormWidget = lazy(() => import("./SshFormWidget").then((m) => ({ default: m.SshFormWidget }))); + +interface PassphraseDialogProps { + open: boolean; + hostLabel: string; + input: string; + onInputChange: (value: string) => void; + onClose: (value: string | null) => void; +} + +export function PassphraseDialog({ open, hostLabel, input, onInputChange, onClose }: PassphraseDialogProps) { + const { t } = useTranslation(); + return ( + { if (!o) onClose(null); }}> + + + {t("ssh.passphraseTitle")} + +
+

+ {t("ssh.passphrasePrompt", { host: hostLabel })} +

+ + onInputChange(e.target.value)} + placeholder={t("ssh.passphrasePlaceholder")} + autoFocus + onKeyDown={(e) => { if (e.key === "Enter") onClose(input); }} + /> +
+ + + + + + + ); +} + +interface SshEditDialogProps { + open: boolean; + onOpenChange: (open: boolean) => void; + host: SshHost | null; + onSave: (host: SshHost) => void; +} + +export function SshEditDialog({ open, onOpenChange, host, onSave }: SshEditDialogProps) { + const { t } = useTranslation(); + return ( + + + + {t("instance.editSsh")} + + {host && ( + Loading…

}> + onSave({ ...h, id: host.id })} + onCancel={() => onOpenChange(false)} + /> + + )} + + + ); +} diff --git a/src/components/AutocompleteField.tsx b/src/components/AutocompleteField.tsx new file mode 100644 index 00000000..79572cb5 --- /dev/null +++ b/src/components/AutocompleteField.tsx @@ -0,0 +1,49 @@ +import { useState, useEffect, useRef } from "react"; +import { Input } from "@/components/ui/input"; + +interface AutocompleteFieldProps { + value: string; + onChange: (val: string) => void; + onFocus?: () => void; + options: { value: string; label: string }[]; + placeholder: string; +} + +export function AutocompleteField({ value, onChange, onFocus, options, placeholder }: AutocompleteFieldProps) { + const [open, setOpen] = useState(false); + const wrapperRef = useRef(null); + + const filtered = options.filter( + (o) => !value || o.value.toLowerCase().includes(value.toLowerCase()) || o.label.toLowerCase().includes(value.toLowerCase()), + ); + + useEffect(() => { + function handleClickOutside(e: MouseEvent) { + if (wrapperRef.current && !wrapperRef.current.contains(e.target as Node)) setOpen(false); + } + document.addEventListener("mousedown", handleClickOutside); + return () => document.removeEventListener("mousedown", handleClickOutside); + }, []); + + return ( +
+ { onChange(e.target.value); setOpen(true); }} + onFocus={() => { setOpen(true); onFocus?.(); }} + onKeyDown={(e) => { if (e.key === "Escape") setOpen(false); }} + /> + {open && filtered.length > 0 && ( +
+ {filtered.map((option) => ( +
{ e.preventDefault(); onChange(option.value); setOpen(false); }}> + {option.label} +
+ ))} +
+ )} +
+ ); +} diff --git a/src/components/DoctorTempProviderDialog.tsx b/src/components/DoctorTempProviderDialog.tsx index c98c39ee..2d3982b5 100644 --- a/src/components/DoctorTempProviderDialog.tsx +++ b/src/components/DoctorTempProviderDialog.tsx @@ -6,6 +6,13 @@ import { Button } from "@/components/ui/button"; import { Checkbox } from "@/components/ui/checkbox"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Input } from "@/components/ui/input"; +import { AutocompleteField } from "./AutocompleteField"; +import { + emptyForm, normalizeOauthProvider, providerUsesOAuthAuth, + defaultOauthAuthRef, isEnvVarLikeAuthRef, defaultEnvAuthRef, + inferCredentialSource, providerSupportsOptionalApiKey, + type ProfileForm, type CredentialSource, +} from "../lib/profile-utils"; import { Label } from "@/components/ui/label"; import { Select, @@ -17,18 +24,6 @@ import { import { useApi } from "@/lib/use-api"; import type { ModelCatalogProvider, ModelProfile, ProviderAuthSuggestion } from "@/lib/types"; -type ProfileForm = { - id: string; - provider: string; - model: string; - authRef: string; - apiKey: string; - useCustomUrl: boolean; - baseUrl: string; - enabled: boolean; -}; - -type CredentialSource = "oauth" | "env" | "manual"; const PROVIDER_FALLBACK_OPTIONS = [ "openai", @@ -41,155 +36,11 @@ const PROVIDER_FALLBACK_OPTIONS = [ "vllm", ]; -function emptyForm(): ProfileForm { - return { - id: "", - provider: "", - model: "", - authRef: "", - apiKey: "", - useCustomUrl: false, - baseUrl: "", - enabled: true, - }; -} - -function normalizeOauthProvider(provider: string): string { - const lower = provider.trim().toLowerCase(); - if (lower === "openai_codex" || lower === "github-copilot" || lower === "copilot") { - return "openai-codex"; - } - return lower; -} - -function providerUsesOAuthAuth(provider: string): boolean { - return normalizeOauthProvider(provider) === "openai-codex"; -} - -function defaultOauthAuthRef(provider: string): string { - return providerUsesOAuthAuth(provider) ? "openai-codex:default" : ""; -} - -function isEnvVarLikeAuthRef(authRef: string): boolean { - return /^[A-Za-z_][A-Za-z0-9_]*$/.test(authRef.trim()); -} - -function defaultEnvAuthRef(provider: string): string { - const normalized = normalizeOauthProvider(provider); - if (!normalized) return ""; - if (normalized === "openai-codex") { - return "OPENAI_CODEX_TOKEN"; - } - const providerEnv = normalized - .replace(/[^a-z0-9]+/g, "_") - .replace(/^_+|_+$/g, "") - .toUpperCase(); - return providerEnv ? `${providerEnv}_API_KEY` : ""; -} - -function inferCredentialSource(provider: string, authRef: string): CredentialSource { - const trimmed = authRef.trim(); - if (!trimmed) { - return providerUsesOAuthAuth(provider) ? "oauth" : "manual"; - } - if (providerUsesOAuthAuth(provider) && trimmed.toLowerCase().startsWith("openai-codex:")) { - return "oauth"; - } - return "env"; -} - -function providerSupportsOptionalApiKey(provider: string): boolean { - if (providerUsesOAuthAuth(provider)) { - return true; - } - const lower = provider.trim().toLowerCase(); - return [ - "ollama", - "lmstudio", - "lm-studio", - "localai", - "vllm", - "llamacpp", - "llama.cpp", - ].includes(lower); -} - -function AutocompleteField({ - value, - onChange, - onFocus, - options, - placeholder, -}: { - value: string; - onChange: (value: string) => void; - onFocus?: () => void; - options: { value: string; label: string }[]; - placeholder: string; -}) { - const [open, setOpen] = useState(false); - const wrapperRef = useRef(null); - const filtered = options.filter((option) => { - if (!value) return true; - const query = value.toLowerCase(); - return option.value.toLowerCase().includes(query) || option.label.toLowerCase().includes(query); - }); - - useEffect(() => { - function handleClickOutside(event: MouseEvent) { - if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) { - setOpen(false); - } - } - document.addEventListener("mousedown", handleClickOutside); - return () => document.removeEventListener("mousedown", handleClickOutside); - }, []); - - return ( -
- { - onChange(event.target.value); - setOpen(true); - }} - onFocus={() => { - setOpen(true); - onFocus?.(); - }} - onKeyDown={(event) => { - if (event.key === "Escape") { - setOpen(false); - } - }} - /> - {open && filtered.length > 0 ? ( -
- {filtered.map((option) => ( -
{ - event.preventDefault(); - onChange(option.value); - setOpen(false); - }} - > - {option.label} -
- ))} -
- ) : null} -
- ); -} - interface DoctorTempProviderDialogProps { open: boolean; onOpenChange: (open: boolean) => void; initialProfileId?: string | null; - onSaved: (profile: ModelProfile) => void; + onSaved?: (profile: ModelProfile) => void; } export function DoctorTempProviderDialog({ @@ -200,7 +51,7 @@ export function DoctorTempProviderDialog({ }: DoctorTempProviderDialogProps) { const { t } = useTranslation(); const ua = useApi(); - const [form, setForm] = useState(emptyForm); + const [form, setForm] = useState(emptyForm()); const [profiles, setProfiles] = useState([]); const [catalog, setCatalog] = useState([]); const [credentialSource, setCredentialSource] = useState("manual"); @@ -308,7 +159,7 @@ export function DoctorTempProviderDialog({ setMessage(null); try { const saved = await ua.upsertModelProfile(payload); - onSaved(saved); + onSaved?.(saved); onOpenChange(false); setForm(emptyForm()); setCredentialSource("manual"); diff --git a/src/components/SidebarFooter.tsx b/src/components/SidebarFooter.tsx new file mode 100644 index 00000000..8b595110 --- /dev/null +++ b/src/components/SidebarFooter.tsx @@ -0,0 +1,76 @@ +import { Suspense, lazy } from "react"; +import { useTranslation } from "react-i18next"; +import { cn, formatBytes } from "@/lib/utils"; +import { api } from "../lib/api"; +import type { SshTransferStats } from "../lib/types"; + +const PendingChangesBar = lazy(() => import("./PendingChangesBar").then((m) => ({ default: m.PendingChangesBar }))); + +interface ProfileSyncStatus { + phase: "idle" | "syncing" | "success" | "error"; + message: string; + instanceId: string | null; +} + +interface SidebarFooterProps { + profileSyncStatus: ProfileSyncStatus; + showSshTransferSpeedUi: boolean; + isRemote: boolean; + isConnected: boolean; + sshTransferStats: SshTransferStats | null; + inStart: boolean; + showToast: (message: string, type?: "success" | "error") => void; + bumpConfigVersion: () => void; +} + +export function SidebarFooter({ + profileSyncStatus, showSshTransferSpeedUi, isRemote, isConnected, + sshTransferStats, inStart, showToast, bumpConfigVersion, +}: SidebarFooterProps) { + const { t } = useTranslation(); + return ( + <> +
+
+ + + {profileSyncStatus.phase === "idle" + ? t("doctor.profileSyncIdle") + : profileSyncStatus.phase === "syncing" + ? t("doctor.profileSyncSyncing", { instance: profileSyncStatus.instanceId || t("instance.current") }) + : profileSyncStatus.phase === "success" + ? t("doctor.profileSyncSuccessStatus", { instance: profileSyncStatus.instanceId || t("instance.current") }) + : t("doctor.profileSyncErrorStatus", { instance: profileSyncStatus.instanceId || t("instance.current") })} + +
+ {showSshTransferSpeedUi && isRemote && isConnected && ( +
+
{t("doctor.sshTransferSpeedTitle")}
+
+ {t("doctor.sshTransferSpeedDown", { speed: `${formatBytes(Math.max(0, Math.round(sshTransferStats?.downloadBytesPerSec ?? 0)))} /s` })} +
+
+ {t("doctor.sshTransferSpeedUp", { speed: `${formatBytes(Math.max(0, Math.round(sshTransferStats?.uploadBytesPerSec ?? 0)))} /s` })} +
+
+ )} +
+ {!inStart && ( + + + + )} + + + ); +} diff --git a/src/hooks/useAppLifecycle.ts b/src/hooks/useAppLifecycle.ts new file mode 100644 index 00000000..54e6bd47 --- /dev/null +++ b/src/hooks/useAppLifecycle.ts @@ -0,0 +1,161 @@ +import { useCallback, useEffect, useRef, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { check } from "@tauri-apps/plugin-updater"; +import { getVersion } from "@tauri-apps/api/app"; +import { api } from "@/lib/api"; +import { withGuidance } from "@/lib/guidance"; +import { + LEGACY_DOCKER_INSTANCES_KEY, + normalizeDockerInstance, +} from "@/lib/docker-instance-helpers"; +import { logDevIgnoredError } from "@/lib/dev-logging"; +import { OPEN_TABS_STORAGE_KEY } from "@/lib/routes"; +import type { DockerInstance, PrecheckIssue } from "@/lib/types"; + +const PING_URL = "https://api.clawpal.zhixian.io/ping"; + +const preloadRouteModules = () => + Promise.allSettled([ + import("@/pages/Home"), + import("@/pages/Channels"), + import("@/pages/Recipes"), + import("@/pages/Cron"), + import("@/pages/Doctor"), + import("@/pages/OpenclawContext"), + import("@/pages/History"), + import("@/components/Chat"), + import("@/components/PendingChangesBar"), + ]); + +interface UseAppLifecycleParams { + showToast: (message: string, type?: "success" | "error") => void; + refreshHosts: () => void; + refreshRegisteredInstances: () => void; +} + +export function useAppLifecycle(params: UseAppLifecycleParams) { + const { t } = useTranslation(); + const { showToast, refreshHosts, refreshRegisteredInstances } = params; + + const [appUpdateAvailable, setAppUpdateAvailable] = useState(false); + const [appVersion, setAppVersion] = useState(""); + const legacyMigrationDoneRef = useRef(false); + + // Preload route modules + useEffect(() => { + const timer = window.setTimeout(() => { + void preloadRouteModules(); + }, 1200); + return () => window.clearTimeout(timer); + }, []); + + // Startup: check for updates + analytics ping + useEffect(() => { + let installId = localStorage.getItem("clawpal_install_id"); + if (!installId) { + installId = crypto.randomUUID(); + localStorage.setItem("clawpal_install_id", installId); + } + + check() + .then((update) => { if (update) setAppUpdateAvailable(true); }) + .catch((error) => logDevIgnoredError("check", error)); + + getVersion().then((version) => { + setAppVersion(version); + const url = PING_URL; + if (!url) return; + fetch(url, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ v: version, id: installId, platform: navigator.platform }), + }).catch((error) => logDevIgnoredError("analytics ping request", error)); + }).catch((error) => logDevIgnoredError("getVersion", error)); + }, []); + + // Startup precheck: validate registry + useEffect(() => { + withGuidance( + () => api.precheckRegistry(), + "precheckRegistry", + "local", + "local", + ).then((issues) => { + const errors = issues.filter((i: PrecheckIssue) => i.severity === "error"); + if (errors.length === 1) { + showToast(errors[0].message, "error"); + } else if (errors.length > 1) { + showToast(`${errors[0].message}${t("doctor.remainingIssues", { count: errors.length - 1 })}`, "error"); + } + }).catch((error) => { + logDevIgnoredError("precheckRegistry", error); + }); + }, [showToast, t]); + + // Legacy instance migration + const readLegacyDockerInstances = useCallback((): DockerInstance[] => { + try { + const raw = localStorage.getItem(LEGACY_DOCKER_INSTANCES_KEY); + if (!raw) return []; + const parsed = JSON.parse(raw) as DockerInstance[]; + if (!Array.isArray(parsed)) return []; + const out: DockerInstance[] = []; + const seen = new Set(); + for (const item of parsed) { + if (!item?.id || typeof item.id !== "string") continue; + const id = item.id.trim(); + if (!id || seen.has(id)) continue; + seen.add(id); + out.push(normalizeDockerInstance({ ...item, id })); + } + return out; + } catch { + return []; + } + }, []); + + const readLegacyOpenTabs = useCallback((): string[] => { + try { + const raw = localStorage.getItem(OPEN_TABS_STORAGE_KEY); + if (!raw) return []; + const parsed = JSON.parse(raw); + if (!Array.isArray(parsed)) return []; + return parsed.filter((id): id is string => typeof id === "string" && id.trim().length > 0); + } catch { + return []; + } + }, []); + + useEffect(() => { + if (legacyMigrationDoneRef.current) return; + legacyMigrationDoneRef.current = true; + const legacyDockerInstances = readLegacyDockerInstances(); + const legacyOpenTabIds = readLegacyOpenTabs(); + withGuidance( + () => api.migrateLegacyInstances(legacyDockerInstances, legacyOpenTabIds), + "migrateLegacyInstances", + "local", + "local", + ) + .then((result) => { + if ( + result.importedSshHosts > 0 + || result.importedDockerInstances > 0 + || result.importedOpenTabInstances > 0 + ) { + refreshRegisteredInstances(); + refreshHosts(); + localStorage.removeItem(LEGACY_DOCKER_INSTANCES_KEY); + } + }) + .catch((e) => { + console.error("Legacy instance migration failed:", e); + }); + }, [readLegacyDockerInstances, readLegacyOpenTabs, refreshRegisteredInstances, refreshHosts]); + + return { + appUpdateAvailable, + setAppUpdateAvailable, + appVersion, + }; +} diff --git a/src/hooks/useAppUpdate.ts b/src/hooks/useAppUpdate.ts new file mode 100644 index 00000000..76f75a9a --- /dev/null +++ b/src/hooks/useAppUpdate.ts @@ -0,0 +1,56 @@ +import { useCallback, useEffect, useState } from "react"; +import { check } from "@tauri-apps/plugin-updater"; +import { relaunch } from "@tauri-apps/plugin-process"; +import { getVersion } from "@tauri-apps/api/app"; + +export function useAppUpdate(hasAppUpdate?: boolean, onAppUpdateSeen?: () => void) { + const [appVersion, setAppVersion] = useState(""); + const [appUpdate, setAppUpdate] = useState<{ version: string; body?: string } | null>(null); + const [appUpdateChecking, setAppUpdateChecking] = useState(false); + const [appUpdating, setAppUpdating] = useState(false); + const [appUpdateProgress, setAppUpdateProgress] = useState(null); + + useEffect(() => { getVersion().then(setAppVersion).catch(() => {}); }, []); + + const handleCheckForUpdates = useCallback(async () => { + setAppUpdateChecking(true); + setAppUpdate(null); + try { + const update = await check(); + if (update) setAppUpdate({ version: update.version, body: update.body }); + } catch (e) { + console.error("Update check failed:", e); + } finally { + setAppUpdateChecking(false); + } + }, []); + + const handleAppUpdate = useCallback(async () => { + setAppUpdating(true); + setAppUpdateProgress(0); + try { + const update = await check(); + if (!update) return; + let totalBytes = 0; + let downloadedBytes = 0; + await update.downloadAndInstall((event) => { + if (event.event === "Started" && event.data.contentLength) totalBytes = event.data.contentLength; + else if (event.event === "Progress") { + downloadedBytes += event.data.chunkLength; + if (totalBytes > 0) setAppUpdateProgress(Math.round((downloadedBytes / totalBytes) * 100)); + } else if (event.event === "Finished") setAppUpdateProgress(100); + }); + await relaunch(); + } catch (e) { + console.error("App update failed:", e); + setAppUpdating(false); + setAppUpdateProgress(null); + } + }, []); + + useEffect(() => { + if (hasAppUpdate) { handleCheckForUpdates(); onAppUpdateSeen?.(); } + }, [hasAppUpdate, handleCheckForUpdates, onAppUpdateSeen]); + + return { appVersion, appUpdate, appUpdateChecking, appUpdating, appUpdateProgress, handleCheckForUpdates, handleAppUpdate }; +} diff --git a/src/hooks/useChannelCache.ts b/src/hooks/useChannelCache.ts new file mode 100644 index 00000000..0cfcc309 --- /dev/null +++ b/src/hooks/useChannelCache.ts @@ -0,0 +1,115 @@ +import { useCallback, useEffect, useState } from "react"; +import { api } from "@/lib/api"; +import { shouldEnableInstanceLiveReads } from "@/lib/instance-availability"; +import { readPersistedReadCache, writePersistedReadCache } from "@/lib/persistent-read-cache"; +import { logDevIgnoredError } from "@/lib/dev-logging"; +import type { ChannelNode, DiscordGuildChannel } from "@/lib/types"; +import type { Route } from "@/lib/routes"; + +interface UseChannelCacheParams { + activeInstance: string; + route: Route; + instanceToken: number; + persistenceScope: string | null; + persistenceResolved: boolean; + isRemote: boolean; + isConnected: boolean; +} + +export function useChannelCache(params: UseChannelCacheParams) { + const { + activeInstance, + route, + instanceToken, + persistenceScope, + persistenceResolved, + isRemote, + isConnected, + } = params; + + const [channelNodes, setChannelNodes] = useState(null); + const [discordGuildChannels, setDiscordGuildChannels] = useState(null); + const [channelsLoading, setChannelsLoading] = useState(false); + const [discordChannelsLoading, setDiscordChannelsLoading] = useState(false); + + // Load cached channel data on instance/scope change + useEffect(() => { + if (!persistenceResolved || !persistenceScope) { + setChannelNodes(null); + setDiscordGuildChannels(null); + return; + } + setChannelNodes( + readPersistedReadCache(persistenceScope, "listChannelsMinimal", []) ?? null, + ); + setDiscordGuildChannels( + readPersistedReadCache(persistenceScope, "listDiscordGuildChannels", []) ?? null, + ); + }, [activeInstance, persistenceResolved, persistenceScope]); + + const refreshChannelNodesCache = useCallback(async () => { + setChannelsLoading(true); + try { + const nodes = isRemote + ? await api.remoteListChannelsMinimal(activeInstance) + : await api.listChannelsMinimal(); + setChannelNodes(nodes); + if (persistenceScope) { + writePersistedReadCache(persistenceScope, "listChannelsMinimal", [], nodes); + } + return nodes; + } finally { + setChannelsLoading(false); + } + }, [activeInstance, isRemote, persistenceScope]); + + const refreshDiscordChannelsCache = useCallback(async () => { + setDiscordChannelsLoading(true); + try { + const channels = isRemote + ? await api.remoteListDiscordGuildChannels(activeInstance) + : await api.listDiscordGuildChannels(); + setDiscordGuildChannels(channels); + if (persistenceScope) { + writePersistedReadCache(persistenceScope, "listDiscordGuildChannels", [], channels); + } + return channels; + } finally { + setDiscordChannelsLoading(false); + } + }, [activeInstance, isRemote, persistenceScope]); + + // Lazy-load channel cache when Channels route is active + useEffect(() => { + if (route !== "channels" || !persistenceResolved) return; + if (isRemote && !isConnected) return; + if (!shouldEnableInstanceLiveReads({ + instanceToken, + persistenceResolved, + persistenceScope, + isRemote, + })) return; + void Promise.allSettled([ + refreshChannelNodesCache(), + refreshDiscordChannelsCache(), + ]); + }, [ + route, + instanceToken, + persistenceResolved, + persistenceScope, + isRemote, + isConnected, + refreshChannelNodesCache, + refreshDiscordChannelsCache, + ]); + + return { + channelNodes, + discordGuildChannels, + channelsLoading, + discordChannelsLoading, + refreshChannelNodesCache, + refreshDiscordChannelsCache, + }; +} diff --git a/src/hooks/useHomeGuidance.ts b/src/hooks/useHomeGuidance.ts new file mode 100644 index 00000000..79ed6aab --- /dev/null +++ b/src/hooks/useHomeGuidance.ts @@ -0,0 +1,81 @@ +import { useEffect, useRef } from "react"; +import { useTranslation } from "react-i18next"; +import type { InstanceStatus, StatusExtra, ModelProfile } from "../lib/types"; + +/** Emit agent guidance events for duplicate installs and post-install onboarding. */ +export function useHomeGuidance({ + statusExtra, + statusSettled, + status, + modelProfiles, + instanceId, + isRemote, + isDocker, +}: { + statusExtra: StatusExtra | null; + statusSettled: boolean; + status: InstanceStatus | null; + modelProfiles: ModelProfile[]; + instanceId: string; + isRemote: boolean; + isDocker: boolean; +}) { + const { t } = useTranslation(); + const duplicateInstallGuidanceSigRef = useRef(""); + const onboardingGuidanceSigRef = useRef(""); + + // Duplicate install guidance + useEffect(() => { + const entries = statusExtra?.duplicateInstalls || []; + if (entries.length === 0) return; + const signature = `${instanceId}:${entries.join("|")}`; + if (duplicateInstallGuidanceSigRef.current === signature) return; + duplicateInstallGuidanceSigRef.current = signature; + const transport = isRemote ? "remote_ssh" : (isDocker ? "docker_local" : "local"); + window.dispatchEvent(new CustomEvent("clawpal:agent-guidance", { + detail: { + message: t("home.duplicateInstalls"), + summary: t("home.duplicateInstalls"), + actions: [t("home.fixInDoctor"), "Run `which -a openclaw` and keep only one valid binary in PATH"], + source: "status-extra", + operation: "status.extra.duplicate_installs", + instanceId, + transport, + rawError: `Duplicate openclaw installs detected: ${entries.join(" ; ")}`, + createdAt: Date.now(), + }, + })); + }, [statusExtra?.duplicateInstalls, t, instanceId, isDocker, isRemote]); + + // Post-install onboarding guidance + useEffect(() => { + if (!statusSettled || !status) return; + const needsSetup = !status.healthy || (!isRemote && (modelProfiles.length === 0 || !status.globalDefaultModel)); + if (!needsSetup) return; + const issues: string[] = []; + if (!status.healthy) issues.push("unhealthy"); + if (!isRemote && modelProfiles.length === 0) issues.push("no_profiles"); + if (!isRemote && !status.globalDefaultModel) issues.push("no_default_model"); + const signature = `${instanceId}:onboarding:${issues.join(",")}`; + if (onboardingGuidanceSigRef.current === signature) return; + onboardingGuidanceSigRef.current = signature; + const transport = isRemote ? "remote_ssh" : (isDocker ? "docker_local" : "local"); + const actions: string[] = []; + if (!status.healthy) actions.push(t("onboarding.actionCheckDoctor")); + if (!isRemote && modelProfiles.length === 0) actions.push(t("onboarding.actionAddProfile")); + if (!isRemote && !status.globalDefaultModel && modelProfiles.length > 0) actions.push(t("onboarding.actionSetDefault")); + window.dispatchEvent(new CustomEvent("clawpal:agent-guidance", { + detail: { + message: t("onboarding.summary"), + summary: t("onboarding.summary"), + actions, + source: "onboarding", + operation: "post_install.onboarding", + instanceId, + transport, + rawError: `Instance needs setup: ${issues.join(", ")}`, + createdAt: Date.now(), + }, + })); + }, [statusSettled, status, modelProfiles, t, instanceId, isDocker, isRemote]); +} diff --git a/src/hooks/useInstanceManager.ts b/src/hooks/useInstanceManager.ts new file mode 100644 index 00000000..5a7b1645 --- /dev/null +++ b/src/hooks/useInstanceManager.ts @@ -0,0 +1,173 @@ +import { useCallback, useEffect, useMemo, useState } from "react"; +import { api } from "@/lib/api"; +import { withGuidance } from "@/lib/guidance"; +import { + deriveDockerPaths, + deriveDockerLabel, + normalizeDockerInstance, +} from "@/lib/docker-instance-helpers"; +import { logDevIgnoredError } from "@/lib/dev-logging"; +import type { + DiscoveredInstance, + DockerInstance, + RegisteredInstance, + SshHost, +} from "@/lib/types"; + +export function useInstanceManager() { + const [sshHosts, setSshHosts] = useState([]); + const [registeredInstances, setRegisteredInstances] = useState([]); + const [discoveredInstances, setDiscoveredInstances] = useState([]); + const [discoveringInstances, setDiscoveringInstances] = useState(false); + const [connectionStatus, setConnectionStatus] = useState>({}); + const [sshEditOpen, setSshEditOpen] = useState(false); + const [editingSshHost, setEditingSshHost] = useState(null); + + const handleEditSsh = useCallback((host: SshHost) => { + setEditingSshHost(host); + setSshEditOpen(true); + }, []); + + const refreshHosts = useCallback(() => { + withGuidance(() => api.listSshHosts(), "listSshHosts", "local", "local") + .then(setSshHosts) + .catch((error) => { + logDevIgnoredError("refreshHosts", error); + }); + }, []); + + const refreshRegisteredInstances = useCallback(() => { + withGuidance(() => api.listRegisteredInstances(), "listRegisteredInstances", "local", "local") + .then(setRegisteredInstances) + .catch((error) => { + logDevIgnoredError("listRegisteredInstances", error); + setRegisteredInstances([]); + }); + }, []); + + const discoverInstances = useCallback(() => { + setDiscoveringInstances(true); + withGuidance( + () => api.discoverLocalInstances(), + "discoverLocalInstances", + "local", + "local", + ) + .then(setDiscoveredInstances) + .catch((error) => { + logDevIgnoredError("discoverLocalInstances", error); + setDiscoveredInstances([]); + }) + .finally(() => setDiscoveringInstances(false)); + }, []); + + const dockerInstances = useMemo(() => { + const seen = new Set(); + const out: DockerInstance[] = []; + for (const item of registeredInstances) { + if (item.instanceType !== "docker") continue; + if (!item.id || seen.has(item.id)) continue; + seen.add(item.id); + out.push(normalizeDockerInstance({ + id: item.id, + label: item.label || deriveDockerLabel(item.id), + openclawHome: item.openclawHome || undefined, + clawpalDataDir: item.clawpalDataDir || undefined, + })); + } + return out; + }, [registeredInstances]); + + const upsertDockerInstance = useCallback(async (instance: DockerInstance): Promise => { + const normalized = normalizeDockerInstance(instance); + const registered = await withGuidance( + () => api.connectDockerInstance( + normalized.openclawHome || deriveDockerPaths(normalized.id).openclawHome, + normalized.label, + normalized.id, + ), + "connectDockerInstance", + normalized.id, + "docker_local", + ); + const updated = await withGuidance( + () => api.listRegisteredInstances(), + "listRegisteredInstances", + "local", + "local", + ).catch((error) => { + logDevIgnoredError("listRegisteredInstances after connect", error); + return null; + }); + if (updated) setRegisteredInstances(updated); + return registered; + }, []); + + const renameDockerInstance = useCallback((id: string, label: string) => { + const nextLabel = label.trim(); + if (!nextLabel) return; + const instance = dockerInstances.find((item) => item.id === id); + if (!instance) return; + void withGuidance( + () => api.connectDockerInstance( + instance.openclawHome || deriveDockerPaths(instance.id).openclawHome, + nextLabel, + instance.id, + ), + "connectDockerInstance", + instance.id, + "docker_local", + ).then(() => { + refreshRegisteredInstances(); + }); + }, [dockerInstances, refreshRegisteredInstances]); + + const deleteDockerInstance = useCallback(async (instance: DockerInstance, deleteLocalData: boolean) => { + const fallback = deriveDockerPaths(instance.id); + const openclawHome = instance.openclawHome || fallback.openclawHome; + if (deleteLocalData) { + await withGuidance( + () => api.deleteLocalInstanceHome(openclawHome), + "deleteLocalInstanceHome", + instance.id, + "docker_local", + ); + } + await withGuidance( + () => api.deleteRegisteredInstance(instance.id), + "deleteRegisteredInstance", + instance.id, + "docker_local", + ); + refreshRegisteredInstances(); + }, [refreshRegisteredInstances]); + + useEffect(() => { + refreshHosts(); + refreshRegisteredInstances(); + discoverInstances(); + const timer = setInterval(refreshRegisteredInstances, 30_000); + return () => clearInterval(timer); + }, [refreshHosts, refreshRegisteredInstances, discoverInstances]); + + return { + sshHosts, + registeredInstances, + setRegisteredInstances, + discoveredInstances, + discoveringInstances, + connectionStatus, + setConnectionStatus, + sshEditOpen, + setSshEditOpen, + editingSshHost, + handleEditSsh, + refreshHosts, + refreshRegisteredInstances, + discoverInstances, + dockerInstances, + upsertDockerInstance, + renameDockerInstance, + deleteDockerInstance, + }; +} diff --git a/src/hooks/useInstancePersistence.ts b/src/hooks/useInstancePersistence.ts new file mode 100644 index 00000000..8baf0246 --- /dev/null +++ b/src/hooks/useInstancePersistence.ts @@ -0,0 +1,281 @@ +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { api } from "@/lib/api"; +import { prewarmRemoteInstanceReadCache } from "@/lib/use-api"; +import { withGuidance, explainAndBuildGuidanceError } from "@/lib/guidance"; +import { + ensureRemotePersistenceScope, + readRemotePersistenceScope, +} from "@/lib/instance-persistence"; +import { + shouldEnableLocalInstanceScope, +} from "@/lib/instance-availability"; +import { deriveDockerPaths, hashInstanceToken } from "@/lib/docker-instance-helpers"; +import { logDevIgnoredError } from "@/lib/dev-logging"; +import type { DockerInstance, RegisteredInstance, SshHost, PrecheckIssue } from "@/lib/types"; + + +interface UseInstancePersistenceParams { + activeInstance: string; + registeredInstances: RegisteredInstance[]; + dockerInstances: DockerInstance[]; + sshHosts: SshHost[]; + isDocker: boolean; + isRemote: boolean; + isConnected: boolean; + resolveInstanceTransport: (id: string) => "local" | "docker_local" | "remote_ssh"; + showToast: (message: string, type?: "success" | "error") => void; +} + +export function useInstancePersistence(params: UseInstancePersistenceParams) { + const { + activeInstance, + registeredInstances, + dockerInstances, + sshHosts, + isDocker, + isRemote, + isConnected, + resolveInstanceTransport, + showToast, + } = params; + + const [configVersion, setConfigVersion] = useState(0); + const [instanceToken, setInstanceToken] = useState(0); + const [persistenceScope, setPersistenceScope] = useState("local"); + const [persistenceResolved, setPersistenceResolved] = useState(true); + + const accessProbeTimerRef = useRef | null>(null); + const lastAccessProbeAtRef = useRef>({}); + + const bumpConfigVersion = useCallback(() => { + setConfigVersion((v) => v + 1); + }, []); + + + + const ensureAccessForInstance = useCallback((instanceId: string) => { + const transport = resolveInstanceTransport(instanceId); + withGuidance( + () => api.ensureAccessProfile(instanceId, transport), + "ensureAccessProfile", + instanceId, + transport, + ).catch((error) => { + logDevIgnoredError("ensureAccessProfile", error); + }); + withGuidance( + () => api.precheckAuth(instanceId), + "precheckAuth", + instanceId, + transport, + ).then((issues) => { + const errors = issues.filter((i: PrecheckIssue) => i.severity === "error"); + if (errors.length === 1) { + showToast(errors[0].message, "error"); + } else if (errors.length > 1) { + showToast(`${errors[0].message} (+${errors.length - 1} more)`, "error"); + } + }).catch((error) => { + logDevIgnoredError("precheckAuth", error); + }); + }, [resolveInstanceTransport, showToast]); + + const scheduleEnsureAccessForInstance = useCallback((instanceId: string, delayMs = 1200) => { + const now = Date.now(); + const last = lastAccessProbeAtRef.current[instanceId] || 0; + if (now - last < 30_000) return; + if (accessProbeTimerRef.current !== null) { + clearTimeout(accessProbeTimerRef.current); + accessProbeTimerRef.current = null; + } + accessProbeTimerRef.current = setTimeout(() => { + lastAccessProbeAtRef.current[instanceId] = Date.now(); + ensureAccessForInstance(instanceId); + accessProbeTimerRef.current = null; + }, delayMs); + }, [ensureAccessForInstance]); + + // Cleanup access probe timer + useEffect(() => { + return () => { + if (accessProbeTimerRef.current !== null) { + clearTimeout(accessProbeTimerRef.current); + accessProbeTimerRef.current = null; + } + }; + }, []); + + // Global error handlers + useEffect(() => { + const handleUnhandled = (operation: string, reason: unknown) => { + if (reason && typeof reason === "object" && (reason as any)._guidanceEmitted) { + return; + } + const transport = resolveInstanceTransport(activeInstance); + void explainAndBuildGuidanceError({ + method: operation, + instanceId: activeInstance, + transport, + rawError: reason, + emitEvent: true, + }); + void api.captureFrontendError( + typeof reason === "string" ? reason : String(reason), + undefined, + "error", + ).catch(() => {}); + }; + + const onUnhandledRejection = (event: PromiseRejectionEvent) => { + logDevIgnoredError("unhandledRejection", event.reason); + handleUnhandled("unhandledRejection", event.reason); + }; + const onGlobalError = (event: ErrorEvent) => { + const detail = event.error ?? event.message ?? "unknown error"; + logDevIgnoredError("unhandledError", detail); + handleUnhandled("unhandledError", detail); + }; + + window.addEventListener("unhandledrejection", onUnhandledRejection); + window.addEventListener("error", onGlobalError); + return () => { + window.removeEventListener("unhandledrejection", onUnhandledRejection); + window.removeEventListener("error", onGlobalError); + }; + }, [activeInstance, resolveInstanceTransport]); + + // Resolve persistence scope for active instance + useEffect(() => { + let cancelled = false; + const resolvePersistence = async () => { + if (isRemote) { + const host = sshHosts.find((item) => item.id === activeInstance) || null; + setPersistenceScope(host ? readRemotePersistenceScope(host) : null); + setPersistenceResolved(true); + return; + } + + let openclawHome: string | null = null; + const activeRegistered = registeredInstances.find((item) => item.id === activeInstance); + if (activeInstance === "local") { + openclawHome = "~"; + } else if (isDocker) { + const instance = dockerInstances.find((item) => item.id === activeInstance); + const fallback = deriveDockerPaths(activeInstance); + openclawHome = instance?.openclawHome || fallback.openclawHome; + } else if (activeRegistered?.instanceType === "local" && activeRegistered.openclawHome) { + openclawHome = activeRegistered.openclawHome; + } + + if (!openclawHome) { + setPersistenceScope(null); + setPersistenceResolved(true); + return; + } + + setPersistenceResolved(false); + setPersistenceScope(null); + try { + const [exists, cliAvailable] = await Promise.all([ + api.localOpenclawConfigExists(openclawHome), + api.localOpenclawCliAvailable(), + ]); + if (cancelled) return; + setPersistenceScope( + shouldEnableLocalInstanceScope({ + configExists: exists, + cliAvailable, + }) ? activeInstance : null, + ); + } catch (error) { + logDevIgnoredError("localOpenclawConfigExists", error); + if (cancelled) return; + setPersistenceScope(null); + } finally { + if (!cancelled) { + setPersistenceResolved(true); + } + } + }; + + void resolvePersistence(); + return () => { + cancelled = true; + }; + }, [activeInstance, dockerInstances, isDocker, isRemote, registeredInstances, sshHosts]); + + // Sync remote persistence scope when connected + useEffect(() => { + if (!isRemote || !isConnected) return; + const host = sshHosts.find((item) => item.id === activeInstance); + if (!host) return; + const nextScope = ensureRemotePersistenceScope(host); + if (persistenceScope !== nextScope) { + setPersistenceScope(nextScope); + } + if (!persistenceResolved) { + setPersistenceResolved(true); + } + }, [activeInstance, isConnected, isRemote, persistenceResolved, persistenceScope, sshHosts]); + + // Set instance overrides and update instanceToken + useEffect(() => { + let cancelled = false; + let nextHome: string | null = null; + let nextDataDir: string | null = null; + setInstanceToken(0); + const activeRegistered = registeredInstances.find((item) => item.id === activeInstance); + if (activeInstance === "local" || isRemote) { + nextHome = null; + nextDataDir = null; + } else if (isDocker) { + const instance = dockerInstances.find((item) => item.id === activeInstance); + const fallback = deriveDockerPaths(activeInstance); + nextHome = instance?.openclawHome || fallback.openclawHome; + nextDataDir = instance?.clawpalDataDir || fallback.clawpalDataDir; + } else if (activeRegistered?.instanceType === "local" && activeRegistered.openclawHome) { + nextHome = activeRegistered.openclawHome; + nextDataDir = activeRegistered.clawpalDataDir || null; + } + const tokenSeed = `${activeInstance}|${nextHome || ""}|${nextDataDir || ""}`; + + const applyOverrides = async () => { + if (nextHome === null && nextDataDir === null) { + await Promise.all([ + api.setActiveOpenclawHome(null).catch((error) => logDevIgnoredError("setActiveOpenclawHome", error)), + api.setActiveClawpalDataDir(null).catch((error) => logDevIgnoredError("setActiveClawpalDataDir", error)), + ]); + } else { + await Promise.all([ + api.setActiveOpenclawHome(nextHome).catch((error) => logDevIgnoredError("setActiveOpenclawHome", error)), + api.setActiveClawpalDataDir(nextDataDir).catch((error) => logDevIgnoredError("setActiveClawpalDataDir", error)), + ]); + } + if (!cancelled) { + setInstanceToken(hashInstanceToken(tokenSeed)); + } + }; + void applyOverrides(); + return () => { + cancelled = true; + }; + }, [activeInstance, isDocker, isRemote, dockerInstances, registeredInstances]); + + // Prewarm remote cache + useEffect(() => { + if (!isRemote || !isConnected || !instanceToken) return; + prewarmRemoteInstanceReadCache(activeInstance, instanceToken, persistenceScope); + }, [activeInstance, instanceToken, isConnected, isRemote, persistenceScope]); + + return { + configVersion, + bumpConfigVersion, + instanceToken, + persistenceScope, + setPersistenceScope, + persistenceResolved, + setPersistenceResolved, + ensureAccessForInstance, + scheduleEnsureAccessForInstance, + }; +} diff --git a/src/hooks/useNavItems.tsx b/src/hooks/useNavItems.tsx new file mode 100644 index 00000000..347ab4b2 --- /dev/null +++ b/src/hooks/useNavItems.tsx @@ -0,0 +1,76 @@ +import { useMemo } from "react"; +import { useTranslation } from "react-i18next"; +import { + HomeIcon, + HashIcon, + ClockIcon, + HistoryIcon, + StethoscopeIcon, + BookOpenIcon, + KeyRoundIcon, + SettingsIcon, +} from "lucide-react"; +import type { Route } from "../lib/routes"; + +interface NavItem { + key: string; + active: boolean; + icon: React.ReactNode; + label: string; + badge?: React.ReactNode; + onClick: () => void; +} + +export function useNavItems({ + inStart, + startSection, + setStartSection, + route, + navigateRoute, + openDoctor, + doctorNavPulse, +}: { + inStart: boolean; + startSection: "overview" | "profiles" | "settings"; + setStartSection: (s: "overview" | "profiles" | "settings") => void; + route: Route; + navigateRoute: (r: Route) => void; + openDoctor: () => void; + doctorNavPulse: boolean; +}): NavItem[] { + const { t } = useTranslation(); + + return useMemo(() => { + if (inStart) { + return [ + { + key: "start-profiles", + active: startSection === "profiles", + icon: , + label: t("start.nav.profiles"), + onClick: () => { navigateRoute("home"); setStartSection("profiles"); }, + }, + { + key: "start-settings", + active: startSection === "settings", + icon: , + label: t("start.nav.settings"), + onClick: () => { navigateRoute("home"); setStartSection("settings"); }, + }, + ]; + } + return [ + { key: "instance-home", active: route === "home", icon: , label: t("nav.home"), onClick: () => navigateRoute("home") }, + { key: "channels", active: route === "channels", icon: , label: t("nav.channels"), onClick: () => navigateRoute("channels") }, + { key: "recipes", active: route === "recipes", icon: , label: t("nav.recipes"), onClick: () => navigateRoute("recipes") }, + { key: "cron", active: route === "cron", icon: , label: t("nav.cron"), onClick: () => navigateRoute("cron") }, + { + key: "doctor", active: route === "doctor", icon: , label: t("nav.doctor"), + onClick: openDoctor, + badge: doctorNavPulse ? : undefined, + }, + { key: "openclaw-context", active: route === "context", icon: , label: t("nav.context"), onClick: () => navigateRoute("context") }, + { key: "history", active: route === "history", icon: , label: t("nav.history"), onClick: () => navigateRoute("history") }, + ]; + }, [inStart, startSection, setStartSection, route, navigateRoute, openDoctor, doctorNavPulse, t]); +} diff --git a/src/hooks/useSshConnection.ts b/src/hooks/useSshConnection.ts new file mode 100644 index 00000000..a6313948 --- /dev/null +++ b/src/hooks/useSshConnection.ts @@ -0,0 +1,352 @@ +import { useCallback, useEffect, useRef, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { listen } from "@tauri-apps/api/event"; +import { api } from "@/lib/api"; +import { buildCacheKey, invalidateGlobalReadCache, subscribeToCacheKey } from "@/lib/use-api"; +import { withGuidance, explainAndBuildGuidanceError } from "@/lib/guidance"; +import { ensureRemotePersistenceScope } from "@/lib/instance-persistence"; +import { + SSH_PASSPHRASE_RETRY_HINT, + buildSshPassphraseCancelMessage, + buildSshPassphraseConnectErrorMessage, +} from "@/lib/sshConnectErrors"; +import { buildFriendlySshError, extractErrorText } from "@/lib/sshDiagnostic"; +import { logDevException, logDevIgnoredError } from "@/lib/dev-logging"; +import type { SshHost, PrecheckIssue } from "@/lib/types"; + +const APP_PREFERENCES_CACHE_KEY = buildCacheKey("__global__", "getAppPreferences", []); + +interface ProfileSyncStatus { + phase: "idle" | "syncing" | "success" | "error"; + message: string; + instanceId: string | null; +} + +interface UseSshConnectionParams { + activeInstance: string; + sshHosts: SshHost[]; + isRemote: boolean; + isConnected: boolean; + connectionStatus: Record; + setConnectionStatus: React.Dispatch>>; + setPersistenceScope: (scope: string | null) => void; + setPersistenceResolved: (resolved: boolean) => void; + resolveInstanceTransport: (id: string) => string; + showToast: (message: string, type?: "success" | "error") => void; + scheduleEnsureAccessForInstance: (id: string, delayMs?: number) => void; +} + +export function useSshConnection(params: UseSshConnectionParams) { + const { t } = useTranslation(); + const { + activeInstance, + sshHosts, + isRemote, + isConnected, + setConnectionStatus, + setPersistenceScope, + setPersistenceResolved, + showToast, + scheduleEnsureAccessForInstance, + } = params; + + const [profileSyncStatus, setProfileSyncStatus] = useState({ + phase: "idle", + message: "", + instanceId: null, + }); + const [showSshTransferSpeedUi, setShowSshTransferSpeedUi] = useState(false); + const [sshTransferStats, setSshTransferStats] = useState(null); + const [doctorNavPulse, setDoctorNavPulse] = useState(false); + + // Load SSH transfer-speed UI preference (and subscribe to cache updates) + useEffect(() => { + let cancelled = false; + const load = () => { + api.getAppPreferences() + .then((prefs) => { if (!cancelled) setShowSshTransferSpeedUi(Boolean(prefs.showSshTransferSpeedUi)); }) + .catch(() => { if (!cancelled) setShowSshTransferSpeedUi(false); }); + }; + load(); + const unsubscribe = subscribeToCacheKey(APP_PREFERENCES_CACHE_KEY, load); + return () => { cancelled = true; unsubscribe(); }; + }, []); + + const sshHealthFailStreakRef = useRef>({}); + const doctorSshAutohealMuteUntilRef = useRef>({}); + const passphraseResolveRef = useRef<((value: string | null) => void) | null>(null); + const remoteAuthSyncAtRef = useRef>({}); + + const [passphraseHostLabel, setPassphraseHostLabel] = useState(""); + const [passphraseOpen, setPassphraseOpen] = useState(false); + const [passphraseInput, setPassphraseInput] = useState(""); + + const requestPassphrase = useCallback((hostLabel: string): Promise => { + setPassphraseHostLabel(hostLabel); + setPassphraseInput(""); + setPassphraseOpen(true); + return new Promise((resolve) => { + passphraseResolveRef.current = resolve; + }); + }, []); + + const closePassphraseDialog = useCallback((value: string | null) => { + setPassphraseOpen(false); + const resolve = passphraseResolveRef.current; + passphraseResolveRef.current = null; + if (resolve) resolve(value); + }, []); + + const connectWithPassphraseFallback = useCallback(async (hostId: string) => { + const host = sshHosts.find((h) => h.id === hostId); + const hostLabel = host?.label || host?.host || hostId; + try { + await api.sshConnect(hostId); + if (host) { + const nextScope = ensureRemotePersistenceScope(host); + if (hostId === activeInstance) { + setPersistenceScope(nextScope); + setPersistenceResolved(true); + } + } + return; + } catch (err) { + const raw = extractErrorText(err); + if ((!host || host.authMethod !== "password") && SSH_PASSPHRASE_RETRY_HINT.test(raw)) { + if (host?.passphrase && host.passphrase.length > 0) { + const fallbackMessage = buildSshPassphraseConnectErrorMessage(raw, hostLabel, t); + if (fallbackMessage) { + throw new Error(fallbackMessage); + } + throw await explainAndBuildGuidanceError({ + method: "sshConnect", + instanceId: hostId, + transport: "remote_ssh", + rawError: err, + }); + } + const passphrase = await requestPassphrase(hostLabel); + if (passphrase !== null) { + try { + await withGuidance( + () => api.sshConnectWithPassphrase(hostId, passphrase), + "sshConnectWithPassphrase", + hostId, + "remote_ssh", + ); + if (host) { + const nextScope = ensureRemotePersistenceScope(host); + if (hostId === activeInstance) { + setPersistenceScope(nextScope); + setPersistenceResolved(true); + } + } + return; + } catch (passphraseErr) { + const passphraseRaw = extractErrorText(passphraseErr); + const fallbackMessage = buildSshPassphraseConnectErrorMessage( + passphraseRaw, hostLabel, t, { passphraseWasSubmitted: true }, + ); + if (fallbackMessage) { + throw new Error(fallbackMessage); + } + throw await explainAndBuildGuidanceError({ + method: "sshConnectWithPassphrase", + instanceId: hostId, + transport: "remote_ssh", + rawError: passphraseErr, + }); + } + } else { + throw new Error(buildSshPassphraseCancelMessage(hostLabel, t)); + } + } + const fallbackMessage = buildSshPassphraseConnectErrorMessage(raw, hostLabel, t); + if (fallbackMessage) { + throw new Error(fallbackMessage); + } + throw await explainAndBuildGuidanceError({ + method: "sshConnect", + instanceId: hostId, + transport: "remote_ssh", + rawError: err, + }); + } + }, [activeInstance, requestPassphrase, sshHosts, t, setPersistenceScope, setPersistenceResolved]); + + const syncRemoteAuthAfterConnect = useCallback(async (hostId: string) => { + const now = Date.now(); + const last = remoteAuthSyncAtRef.current[hostId] || 0; + if (now - last < 30_000) return; + remoteAuthSyncAtRef.current[hostId] = now; + setProfileSyncStatus({ + phase: "syncing", + message: t("doctor.profileSyncStarted"), + instanceId: hostId, + }); + try { + const result = await api.remoteSyncProfilesToLocalAuth(hostId); + invalidateGlobalReadCache(["listModelProfiles", "resolveApiKeys"]); + const localProfiles = await api.listModelProfiles().catch((error) => { + logDevIgnoredError("syncRemoteAuthAfterConnect listModelProfiles", error); + return []; + }); + if (result.resolvedKeys > 0 || result.syncedProfiles > 0) { + if (localProfiles.length > 0) { + const message = t("doctor.profileSyncSuccessMessage", { + syncedProfiles: result.syncedProfiles, + resolvedKeys: result.resolvedKeys, + }); + showToast(message, "success"); + setProfileSyncStatus({ phase: "success", message, instanceId: hostId }); + } else { + const message = t("doctor.profileSyncNoLocalProfiles"); + showToast(message, "error"); + setProfileSyncStatus({ phase: "error", message, instanceId: hostId }); + } + } else if (result.totalRemoteProfiles > 0) { + const message = t("doctor.profileSyncNoUsableKeys"); + showToast(message, "error"); + setProfileSyncStatus({ phase: "error", message, instanceId: hostId }); + } else { + const message = t("doctor.profileSyncNoProfiles"); + showToast(message, "error"); + setProfileSyncStatus({ phase: "error", message, instanceId: hostId }); + } + } catch (e) { + const message = t("doctor.profileSyncFailed", { error: String(e) }); + showToast(message, "error"); + setProfileSyncStatus({ phase: "error", message, instanceId: hostId }); + } + }, [showToast, t]); + + // SSH self-healing: detect dropped connections and reconnect + useEffect(() => { + if (!isRemote) return; + let cancelled = false; + let inFlight = false; + const hostId = activeInstance; + const reportAutoHealFailure = (rawError: unknown) => { + void explainAndBuildGuidanceError({ + method: "sshConnect", + instanceId: hostId, + transport: "remote_ssh", + rawError: rawError, + emitEvent: true, + }).catch((error) => { + logDevIgnoredError("autoheal explainAndBuildGuidanceError", error); + }); + showToast(buildFriendlySshError(rawError, t), "error"); + }; + const markFailure = (rawError: unknown) => { + if (cancelled) return; + const mutedUntil = doctorSshAutohealMuteUntilRef.current[hostId] || 0; + if (Date.now() < mutedUntil) { + logDevIgnoredError("ssh autoheal muted during doctor flow", rawError); + return; + } + const streak = (sshHealthFailStreakRef.current[hostId] || 0) + 1; + sshHealthFailStreakRef.current[hostId] = streak; + if (streak >= 2) { + setConnectionStatus((prev) => ({ ...prev, [hostId]: "error" })); + if (streak === 2) { + reportAutoHealFailure(rawError); + } + } + }; + + const checkAndHeal = async () => { + if (cancelled || inFlight) return; + inFlight = true; + try { + const status = await api.sshStatus(hostId); + if (cancelled) return; + if (status === "connected") { + sshHealthFailStreakRef.current[hostId] = 0; + setConnectionStatus((prev) => ({ ...prev, [hostId]: "connected" })); + return; + } + try { + await connectWithPassphraseFallback(hostId); + if (!cancelled) { + sshHealthFailStreakRef.current[hostId] = 0; + setConnectionStatus((prev) => ({ ...prev, [hostId]: "connected" })); + } + } catch (connectError) { + markFailure(connectError); + } + } catch (statusError) { + markFailure(statusError); + } finally { + inFlight = false; + } + }; + + checkAndHeal(); + const timer = setInterval(checkAndHeal, 15_000); + return () => { + cancelled = true; + clearInterval(timer); + }; + }, [activeInstance, isRemote, showToast, t, connectWithPassphraseFallback, setConnectionStatus]); + + // Mute autoheal during doctor assistant flow + useEffect(() => { + if (!isRemote) return; + let disposed = false; + const currentHostId = activeInstance; + const unlistenPromise = listen<{ phase?: string }>("doctor:assistant-progress", (event) => { + if (disposed) return; + const phase = event.payload?.phase || ""; + const cooldownMs = phase === "cleanup" ? 45_000 : 30_000; + doctorSshAutohealMuteUntilRef.current[currentHostId] = Date.now() + cooldownMs; + }); + return () => { + disposed = true; + void unlistenPromise.then((unlisten) => unlisten()).catch((error) => { + logDevIgnoredError("doctor progress unlisten", error); + }); + }; + }, [activeInstance, isRemote]); + + // Poll SSH transfer stats + useEffect(() => { + if (!showSshTransferSpeedUi || !isRemote || !isConnected) { + setSshTransferStats(null); + return; + } + let cancelled = false; + const poll = () => { + api.getSshTransferStats(activeInstance) + .then((stats) => { + if (!cancelled) setSshTransferStats(stats); + }) + .catch((error) => { + logDevIgnoredError("getSshTransferStats", error); + if (!cancelled) setSshTransferStats(null); + }); + }; + poll(); + const timer = window.setInterval(poll, 1000); + return () => { + cancelled = true; + window.clearInterval(timer); + }; + }, [activeInstance, isConnected, isRemote, showSshTransferSpeedUi]); + + return { + profileSyncStatus, + showSshTransferSpeedUi, + setShowSshTransferSpeedUi, + sshTransferStats, + doctorNavPulse, + setDoctorNavPulse, + passphraseHostLabel, + passphraseOpen, + passphraseInput, + setPassphraseInput, + closePassphraseDialog, + connectWithPassphraseFallback, + syncRemoteAuthAfterConnect, + }; +} diff --git a/src/hooks/useWorkspaceTabs.ts b/src/hooks/useWorkspaceTabs.ts new file mode 100644 index 00000000..e64a9cc6 --- /dev/null +++ b/src/hooks/useWorkspaceTabs.ts @@ -0,0 +1,331 @@ +import { startTransition, useCallback, useEffect, useMemo, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { api } from "@/lib/api"; +import { withGuidance } from "@/lib/guidance"; +import { clearRemotePersistenceScope } from "@/lib/instance-persistence"; +import { closeWorkspaceTab } from "@/lib/tabWorkspace"; +import { buildFriendlySshError } from "@/lib/sshDiagnostic"; +import { deriveDockerLabel } from "@/lib/docker-instance-helpers"; +import { logDevIgnoredError } from "@/lib/dev-logging"; +import { OPEN_TABS_STORAGE_KEY } from "@/lib/routes"; +import type { Route } from "@/lib/routes"; +import type { PrecheckIssue, RegisteredInstance, SshHost, InstallSession, DockerInstance } from "@/lib/types"; + +interface UseWorkspaceTabsParams { + registeredInstances: RegisteredInstance[]; + setRegisteredInstances: React.Dispatch>; + sshHosts: SshHost[]; + dockerInstances: DockerInstance[]; + resolveInstanceTransport: (id: string) => "local" | "docker_local" | "remote_ssh"; + connectWithPassphraseFallback: (hostId: string) => Promise; + syncRemoteAuthAfterConnect: (hostId: string) => Promise; + scheduleEnsureAccessForInstance: (id: string, delayMs?: number) => void; + upsertDockerInstance: (instance: DockerInstance) => Promise; + refreshHosts: () => void; + refreshRegisteredInstances: () => void; + showToast: (message: string, type?: "success" | "error") => void; + setConnectionStatus: React.Dispatch>>; + navigateRoute: (next: Route) => void; +} + +export function useWorkspaceTabs(params: UseWorkspaceTabsParams) { + const { t } = useTranslation(); + const { + registeredInstances, + setRegisteredInstances, + sshHosts, + dockerInstances, + resolveInstanceTransport, + connectWithPassphraseFallback, + syncRemoteAuthAfterConnect, + scheduleEnsureAccessForInstance, + upsertDockerInstance, + refreshHosts, + refreshRegisteredInstances, + showToast, + setConnectionStatus, + navigateRoute, + } = params; + + const [openTabIds, setOpenTabIds] = useState(() => { + try { + const stored = localStorage.getItem(OPEN_TABS_STORAGE_KEY); + if (stored) { + const parsed = JSON.parse(stored); + if (Array.isArray(parsed) && parsed.length > 0) return parsed; + } + } catch {} + return ["local"]; + }); + const [activeInstance, setActiveInstance] = useState("local"); + const [inStart, setInStart] = useState(true); + const [startSection, setStartSection] = useState<"overview" | "profiles" | "settings">("overview"); + + // Persist open tabs + useEffect(() => { + localStorage.setItem(OPEN_TABS_STORAGE_KEY, JSON.stringify(openTabIds)); + }, [openTabIds]); + + const openTab = useCallback((id: string) => { + startTransition(() => { + setOpenTabIds((prev) => prev.includes(id) ? prev : [...prev, id]); + setActiveInstance(id); + setInStart(false); + navigateRoute("home"); + }); + }, [navigateRoute]); + + const closeTab = useCallback((id: string) => { + setOpenTabIds((prevOpenTabIds) => { + const nextState = closeWorkspaceTab({ + openTabIds: prevOpenTabIds, + activeInstance, + inStart, + startSection, + }, id); + setActiveInstance(nextState.activeInstance); + setInStart(nextState.inStart); + setStartSection(nextState.startSection); + return nextState.openTabIds; + }); + }, [activeInstance, inStart, startSection]); + + const handleInstanceSelect = useCallback((id: string) => { + if (id === activeInstance && !inStart) { + return; + } + startTransition(() => { + setActiveInstance(id); + setOpenTabIds((prev) => prev.includes(id) ? prev : [...prev, id]); + setInStart(false); + navigateRoute("home"); + }); + // Instance switch precheck + withGuidance( + () => api.precheckInstance(id), + "precheckInstance", + id, + resolveInstanceTransport(id), + ).then((issues) => { + const blocking = issues.filter((i: PrecheckIssue) => i.severity === "error"); + if (blocking.length === 1) { + showToast(blocking[0].message, "error"); + } else if (blocking.length > 1) { + showToast(`${blocking[0].message}${t("doctor.remainingIssues", { count: blocking.length - 1 })}`, "error"); + } + }).catch((error) => { + logDevIgnoredError("precheckInstance", error); + }); + const transport = resolveInstanceTransport(id); + if (transport !== "remote_ssh") { + withGuidance( + () => api.precheckTransport(id), + "precheckTransport", + id, + transport, + ).then((issues) => { + const blocking = issues.filter((i: PrecheckIssue) => i.severity === "error"); + if (blocking.length === 1) { + showToast(blocking[0].message, "error"); + } else if (blocking.length > 1) { + showToast(`${blocking[0].message}${t("doctor.remainingIssues", { count: blocking.length - 1 })}`, "error"); + } else { + const warnings = issues.filter((i: PrecheckIssue) => i.severity === "warn"); + if (warnings.length > 0) { + showToast(warnings[0].message, "error"); + } + } + }).catch((error) => { + logDevIgnoredError("precheckTransport", error); + }); + } + if (transport !== "remote_ssh") return; + withGuidance( + () => api.sshStatus(id), + "sshStatus", + id, + "remote_ssh", + ) + .then((status) => { + if (status === "connected") { + setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); + scheduleEnsureAccessForInstance(id, 1500); + void syncRemoteAuthAfterConnect(id); + } else { + return connectWithPassphraseFallback(id) + .then(() => { + setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); + scheduleEnsureAccessForInstance(id, 1500); + void syncRemoteAuthAfterConnect(id); + }); + } + }) + .catch((error) => { + logDevIgnoredError("sshStatus or reconnect", error); + connectWithPassphraseFallback(id) + .then(() => { + setConnectionStatus((prev) => ({ ...prev, [id]: "connected" })); + scheduleEnsureAccessForInstance(id, 1500); + void syncRemoteAuthAfterConnect(id); + }) + .catch((e2) => { + setConnectionStatus((prev) => ({ ...prev, [id]: "error" })); + const friendly = buildFriendlySshError(e2, t); + showToast(friendly, "error"); + }); + }); + }, [activeInstance, inStart, resolveInstanceTransport, scheduleEnsureAccessForInstance, connectWithPassphraseFallback, syncRemoteAuthAfterConnect, showToast, t, navigateRoute, setConnectionStatus]); + + const openTabs = useMemo(() => { + const registryById = new Map(registeredInstances.map((item) => [item.id, item])); + return openTabIds.flatMap((id) => { + if (id === "local") return { id, label: t("instance.local"), type: "local" as const }; + const registered = registryById.get(id); + if (registered) { + const fallbackLabel = registered.instanceType === "docker" ? deriveDockerLabel(id) : id; + return { + id, + label: registered.label || fallbackLabel, + type: registered.instanceType === "remote_ssh" ? "ssh" as const : registered.instanceType as "local" | "docker", + }; + } + return []; + }); + }, [openTabIds, registeredInstances, t]); + + const openControlCenter = useCallback(() => { + setInStart(true); + setStartSection("overview"); + }, []); + + // Handle install completion + const handleInstallReady = useCallback(async (session: InstallSession) => { + const artifacts = session.artifacts || {}; + const readArtifactString = (keys: string[]): string => { + for (const key of keys) { + const value = artifacts[key]; + if (typeof value === "string" && value.trim()) { + return value.trim(); + } + } + return ""; + }; + if (session.method === "docker") { + const { deriveDockerPaths, DEFAULT_DOCKER_INSTANCE_ID } = await import("@/lib/docker-instance-helpers"); + const artifactId = readArtifactString(["docker_instance_id", "dockerInstanceId"]); + const id = artifactId || DEFAULT_DOCKER_INSTANCE_ID; + const fallback = deriveDockerPaths(id); + const openclawHome = readArtifactString(["docker_openclaw_home", "dockerOpenclawHome"]) || fallback.openclawHome; + const clawpalDataDir = readArtifactString(["docker_clawpal_data_dir", "dockerClawpalDataDir"]) || `${openclawHome}/data`; + const label = readArtifactString(["docker_instance_label", "dockerInstanceLabel"]) || deriveDockerLabel(id); + const registered = await upsertDockerInstance({ id, label, openclawHome, clawpalDataDir }); + openTab(registered.id); + } else if (session.method === "remote_ssh") { + let hostId = readArtifactString(["ssh_host_id", "sshHostId", "host_id", "hostId"]); + const hostLabel = readArtifactString(["ssh_host_label", "sshHostLabel", "host_label", "hostLabel"]); + const hostAddr = readArtifactString(["ssh_host", "sshHost", "host"]); + if (!hostId) { + const knownHosts = await api.listSshHosts().catch((error) => { + logDevIgnoredError("handleInstallReady listSshHosts", error); + return [] as SshHost[]; + }); + if (hostLabel) { + const byLabel = knownHosts.find((item) => item.label === hostLabel); + if (byLabel) hostId = byLabel.id; + } + if (!hostId && hostAddr) { + const byHost = knownHosts.find((item) => item.host === hostAddr); + if (byHost) hostId = byHost.id; + } + } + if (hostId) { + const activateRemoteInstance = (instanceId: string, status: "connected" | "error") => { + setOpenTabIds((prev) => prev.includes(instanceId) ? prev : [...prev, instanceId]); + setActiveInstance(instanceId); + setConnectionStatus((prev) => ({ ...prev, [instanceId]: status })); + setInStart(false); + navigateRoute("home"); + }; + try { + const instance = await withGuidance( + () => api.connectSshInstance(hostId), + "connectSshInstance", + hostId, + "remote_ssh", + ); + setRegisteredInstances((prev) => { + const filtered = prev.filter((r) => r.id !== hostId && r.id !== instance.id); + return [...filtered, instance]; + }); + refreshHosts(); + refreshRegisteredInstances(); + activateRemoteInstance(instance.id, "connected"); + scheduleEnsureAccessForInstance(instance.id, 600); + void syncRemoteAuthAfterConnect(instance.id); + } catch (err) { + console.warn("connectSshInstance failed during install-ready:", err); + refreshHosts(); + refreshRegisteredInstances(); + const alreadyRegistered = registeredInstances.some((item) => item.id === hostId); + if (alreadyRegistered) { + activateRemoteInstance(hostId, "error"); + } else { + setInStart(true); + setStartSection("overview"); + } + const reason = buildFriendlySshError(err, t); + showToast(reason, "error"); + } + } else { + showToast("SSH host id missing after submit. Please reopen Connect and retry.", "error"); + } + } else { + openTab("local"); + } + }, [ + upsertDockerInstance, + openTab, + refreshHosts, + refreshRegisteredInstances, + navigateRoute, + registeredInstances, + scheduleEnsureAccessForInstance, + syncRemoteAuthAfterConnect, + showToast, + t, + setConnectionStatus, + setRegisteredInstances, + ]); + + const handleDeleteSsh = useCallback((hostId: string) => { + withGuidance( + () => api.deleteSshHost(hostId), + "deleteSshHost", + hostId, + "remote_ssh", + ).then(() => { + clearRemotePersistenceScope(hostId); + closeTab(hostId); + refreshHosts(); + refreshRegisteredInstances(); + }).catch((e) => console.warn("deleteSshHost:", e)); + }, [closeTab, refreshHosts, refreshRegisteredInstances]); + + return { + openTabIds, + setOpenTabIds, + activeInstance, + setActiveInstance, + inStart, + setInStart, + startSection, + setStartSection, + openTab, + closeTab, + handleInstanceSelect, + openTabs, + openControlCenter, + handleInstallReady, + handleDeleteSsh, + }; +} diff --git a/src/lib/api-read-cache.ts b/src/lib/api-read-cache.ts new file mode 100644 index 00000000..a15ec0cc --- /dev/null +++ b/src/lib/api-read-cache.ts @@ -0,0 +1,401 @@ +/** + * Read-through cache layer for Tauri IPC and remote API calls. + * Extracted from use-api.ts for readability. + */ +import { invoke } from "@tauri-apps/api/core"; +import { api } from "./api"; +import { extractErrorText } from "./sshDiagnostic"; +import { + createDataLoadRequestId, + emitDataLoadMetric, + inferDataLoadPage, + inferDataLoadSource, + parseInstanceToken, +} from "./data-load-log"; +import { writePersistedReadCache } from "./persistent-read-cache"; + +export function hasGuidanceEmitted(error: unknown): boolean { + return !!(error && typeof error === "object" && (error as any)._guidanceEmitted); +} + +type ApiReadCacheEntry = { + expiresAt: number; + value: unknown; + inFlight?: Promise; + /** If > Date.now(), this entry is "pinned" by an optimistic update and polls should not overwrite it. */ + optimisticUntil?: number; +}; + +const API_READ_CACHE = new Map(); +const API_READ_CACHE_MAX_ENTRIES = 512; + +/** Subscribers keyed by cache key; notified on cache value changes. */ +const _cacheSubscribers = new Map void>>(); + +function _notifyCacheSubscribers(key: string) { + const subs = _cacheSubscribers.get(key); + if (subs) { + for (const fn of subs) fn(); + } +} + +/** Subscribe to changes on a specific cache key. Returns an unsubscribe function. */ +export function subscribeToCacheKey(key: string, callback: () => void): () => void { + let set = _cacheSubscribers.get(key); + if (!set) { + set = new Set(); + _cacheSubscribers.set(key, set); + } + set.add(callback); + return () => { + set!.delete(callback); + if (set!.size === 0) _cacheSubscribers.delete(key); + }; +} + +/** Read the current cached value for a key (if any). */ +export function readCacheValue(key: string): T | undefined { + const entry = API_READ_CACHE.get(key); + return entry?.value as T | undefined; +} + +export function buildCacheKey(instanceCacheKey: string, method: string, args: unknown[] = []): string { + return makeCacheKey(instanceCacheKey, method, args); +} + +const HOST_SHARED_READ_METHODS = new Set([ + "getInstanceConfigSnapshot", + "getInstanceRuntimeSnapshot", + "getStatusExtra", + "getChannelsConfigSnapshot", + "getChannelsRuntimeSnapshot", + "getCronConfigSnapshot", + "getCronRuntimeSnapshot", + "getRescueBotStatus", + "checkOpenclawUpdate", +]); + +export function resolveReadCacheScopeKey( + instanceCacheKey: string, + persistenceScope: string | null, + method: string, +): string { + if (HOST_SHARED_READ_METHODS.has(method) && persistenceScope) { + return persistenceScope; + } + return instanceCacheKey; +} + +export function makeCacheKey(instanceCacheKey: string, method: string, args: unknown[]): string { + let serializedArgs = ""; + try { + serializedArgs = JSON.stringify(args); + } catch { + serializedArgs = String(args.length); + } + return `${instanceCacheKey}:${method}:${serializedArgs}`; +} + +function trimReadCacheIfNeeded() { + if (API_READ_CACHE.size <= API_READ_CACHE_MAX_ENTRIES) return; + const deleteCount = API_READ_CACHE.size - API_READ_CACHE_MAX_ENTRIES; + const keys = API_READ_CACHE.keys(); + for (let i = 0; i < deleteCount; i += 1) { + const next = keys.next(); + if (next.done) break; + API_READ_CACHE.delete(next.value); + } +} + +export function invalidateReadCacheForInstance(instanceCacheKey: string, methods?: string[]) { + const methodSet = methods ? new Set(methods) : null; + for (const key of API_READ_CACHE.keys()) { + if (!key.startsWith(`${instanceCacheKey}:`)) continue; + if (!methodSet) { + API_READ_CACHE.delete(key); + _notifyCacheSubscribers(key); + continue; + } + const method = key.slice(instanceCacheKey.length + 1).split(":", 1)[0]; + if (methodSet.has(method)) { + API_READ_CACHE.delete(key); + _notifyCacheSubscribers(key); + } + } +} + +export function invalidateGlobalReadCache(methods?: string[]) { + invalidateReadCacheForInstance("__global__", methods); +} + +/** + * Set an optimistic value for a cache key, "pinning" it so that polling + * results will NOT overwrite it for `pinDurationMs` (default 15s). + * + * This solves the race condition where: + * mutation → optimistic setState → poll fires → stale cache → UI flickers back + * + * The pin auto-expires, so if the backend takes longer than expected, + * the next poll after expiry will overwrite with fresh data. + */ +export function setOptimisticReadCache( + key: string, + value: T, + pinDurationMs = 15_000, +) { + const existing = API_READ_CACHE.get(key); + API_READ_CACHE.set(key, { + value, + expiresAt: Date.now() + pinDurationMs, // Keep it "valid" for the pin duration + optimisticUntil: Date.now() + pinDurationMs, + inFlight: existing?.inFlight, + }); + _notifyCacheSubscribers(key); +} + +export function primeReadCache( + key: string, + value: T, + ttlMs: number, +) { + API_READ_CACHE.set(key, { + value, + expiresAt: Date.now() + ttlMs, + optimisticUntil: undefined, + }); + trimReadCacheIfNeeded(); + _notifyCacheSubscribers(key); +} + +export async function prewarmRemoteInstanceReadCache( + instanceId: string, + instanceToken: number, + persistenceScope: string | null, +) { + const instanceCacheKey = `${instanceId}#${instanceToken}`; + const warm = ( + method: string, + ttlMs: number, + loader: () => Promise, + ) => callWithReadCache( + resolveReadCacheScopeKey(instanceCacheKey, persistenceScope, method), + instanceId, + persistenceScope, + method, + [], + ttlMs, + loader, + ).catch(() => undefined); + + void warm( + "getInstanceConfigSnapshot", + 20_000, + () => api.remoteGetInstanceConfigSnapshot(instanceId), + ); + void warm( + "getInstanceRuntimeSnapshot", + 10_000, + () => api.remoteGetInstanceRuntimeSnapshot(instanceId), + ); + void warm( + "getStatusExtra", + 15_000, + () => api.remoteGetStatusExtra(instanceId), + ); + void warm( + "getChannelsConfigSnapshot", + 20_000, + () => api.remoteGetChannelsConfigSnapshot(instanceId), + ); + void warm( + "getChannelsRuntimeSnapshot", + 12_000, + () => api.remoteGetChannelsRuntimeSnapshot(instanceId), + ); + void warm( + "getCronConfigSnapshot", + 20_000, + () => api.remoteGetCronConfigSnapshot(instanceId), + ); + void warm( + "getCronRuntimeSnapshot", + 12_000, + () => api.remoteGetCronRuntimeSnapshot(instanceId), + ); + void warm( + "getRescueBotStatus", + 8_000, + () => api.remoteGetRescueBotStatus(instanceId), + ); +} + +export function callWithReadCache( + instanceCacheKey: string, + metricInstanceId: string, + persistenceScope: string | null, + method: string, + args: unknown[], + ttlMs: number, + loader: () => Promise, +): Promise { + if (ttlMs <= 0) return loader(); + const now = Date.now(); + const key = makeCacheKey(instanceCacheKey, method, args); + const page = inferDataLoadPage(method); + const instanceToken = parseInstanceToken(instanceCacheKey); + const entry = API_READ_CACHE.get(key); + if (entry) { + // If pinned by optimistic update, return the pinned value + if (entry.optimisticUntil && entry.optimisticUntil > now) { + emitDataLoadMetric({ + requestId: createDataLoadRequestId(method), + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source: "cache", + phase: "success", + elapsedMs: 0, + cacheHit: true, + }); + return Promise.resolve(entry.value as TResult); + } + if (entry.expiresAt > now) { + emitDataLoadMetric({ + requestId: createDataLoadRequestId(method), + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source: "cache", + phase: "success", + elapsedMs: 0, + cacheHit: true, + }); + return Promise.resolve(entry.value as TResult); + } + if (entry.inFlight) { + return entry.inFlight as Promise; + } + } + const requestId = createDataLoadRequestId(method); + const startedAt = Date.now(); + const source = inferDataLoadSource(method); + emitDataLoadMetric({ + requestId, + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source, + phase: "start", + elapsedMs: 0, + cacheHit: false, + }); + const request = loader() + .then((value) => { + const elapsedMs = Date.now() - startedAt; + const current = API_READ_CACHE.get(key); + // Don't overwrite if a newer optimistic value was set while we were fetching + if (current?.optimisticUntil && current.optimisticUntil > Date.now()) { + // Clear inFlight but keep the optimistic value + API_READ_CACHE.set(key, { + ...current, + inFlight: undefined, + }); + emitDataLoadMetric({ + requestId, + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source, + phase: "success", + elapsedMs, + cacheHit: false, + }); + return current.value as TResult; + } + API_READ_CACHE.set(key, { + value, + expiresAt: Date.now() + ttlMs, + optimisticUntil: undefined, + }); + if (persistenceScope) { + writePersistedReadCache(persistenceScope, method, args, value); + } + trimReadCacheIfNeeded(); + _notifyCacheSubscribers(key); + emitDataLoadMetric({ + requestId, + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source, + phase: "success", + elapsedMs, + cacheHit: false, + }); + return value; + }) + .catch((error) => { + const current = API_READ_CACHE.get(key); + if (current?.inFlight === request) { + API_READ_CACHE.delete(key); + } + emitDataLoadMetric({ + requestId, + resource: method, + page, + instanceId: metricInstanceId, + instanceToken, + source, + phase: "error", + elapsedMs: Date.now() - startedAt, + cacheHit: false, + errorSummary: extractErrorText(error), + }); + throw error; + }); + API_READ_CACHE.set(key, { + value: entry?.value, + expiresAt: entry?.expiresAt ?? 0, + optimisticUntil: entry?.optimisticUntil, + inFlight: request as Promise, + }); + trimReadCacheIfNeeded(); + return request; +} + +export function emitRemoteInvokeMetric(payload: Record) { + const line = `[metrics][remote_invoke] ${JSON.stringify(payload)}`; + // fire-and-forget: metrics collection must not affect user flow + void invoke("log_app_event", { message: line }).catch((error) => { + if (import.meta.env.DEV) { + console.warn("[dev ignored error] emitRemoteInvokeMetric", error); + } + }); +} + +export function logDevApiError(context: string, error: unknown, detail: Record = {}): void { + if (!import.meta.env.DEV) return; + console.error(`[dev api error] ${context}`, { + ...detail, + error: extractErrorText(error), + }); +} + +/** @internal Exported for testing only. */ +export function shouldLogRemoteInvokeMetric(ok: boolean, elapsedMs: number): boolean { + // Always log failures and slow calls; sample a small percentage of fast-success calls. + if (!ok) return true; + if (elapsedMs >= 1500) return true; + return Math.random() < 0.05; +} + +/** + * Returns a unified API object that auto-dispatches to local or remote + * based on the current instance context. Remote calls automatically + * inject hostId and check connection state. + */ diff --git a/src/lib/cron-types.ts b/src/lib/cron-types.ts new file mode 100644 index 00000000..a95fa919 --- /dev/null +++ b/src/lib/cron-types.ts @@ -0,0 +1,77 @@ +/** + * Cron job and watchdog type definitions. + * Extracted from types.ts for readability. + */ + +export interface CronConfigSnapshot { + jobs: CronJob[]; +} + +export interface CronRuntimeSnapshot { + jobs: CronJob[]; + watchdog: WatchdogStatus & { alive: boolean; deployed: boolean }; +} + +export type WatchdogJobStatus = "ok" | "pending" | "triggered" | "retrying" | "escalated"; + +export interface CronSchedule { + kind: "cron" | "every" | "at"; + expr?: string; + tz?: string; + everyMs?: number; + at?: string; +} + +export interface CronJobState { + lastRunAtMs?: number; + lastStatus?: string; + lastError?: string; +} + +export interface CronJobDelivery { + mode?: string; + channel?: string; + to?: string; +} + +export interface CronJob { + jobId: string; + name: string; + schedule: CronSchedule; + sessionTarget: "main" | "isolated"; + agentId?: string; + enabled: boolean; + description?: string; + state?: CronJobState; + delivery?: CronJobDelivery; +} + +export interface CronRun { + jobId: string; + startedAt: string; + endedAt?: string; + outcome: string; + error?: string; + ts?: number; + runAtMs?: number; + durationMs?: number; + summary?: string; +} + +export interface WatchdogJobState { + status: WatchdogJobStatus; + lastScheduledAt?: string; + lastRunAt?: string | null; + retries: number; + lastError?: string; + escalatedAt?: string; +} + +export interface WatchdogStatus { + pid: number; + startedAt: string; + lastCheckAt: string; + gatewayHealthy: boolean; + jobs: Record; +} + diff --git a/src/lib/cron-utils.ts b/src/lib/cron-utils.ts new file mode 100644 index 00000000..4251c6c7 --- /dev/null +++ b/src/lib/cron-utils.ts @@ -0,0 +1,85 @@ +/** + * Cron page utility functions: schedule formatting, relative time, job filtering. + * Extracted from Cron.tsx for readability. + */ +import type { TFunction } from "i18next"; +import type { CronJob, CronSchedule } from "./types"; + +const DOW_EN = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; +const DOW_ZH = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]; +const WATCHDOG_LATE_GRACE_MS = 5 * 60 * 1000; + +export type CronFilter = "all" | "ok" | "retrying" | "escalated" | "disabled"; + +export function watchdogJobLikelyLate(job: { lastScheduledAt?: string; lastRunAt?: string | null } | undefined): boolean { + if (!job?.lastScheduledAt) return false; + const scheduledAt = Date.parse(job.lastScheduledAt); + if (!Number.isFinite(scheduledAt)) return false; + const runAt = job.lastRunAt ? Date.parse(job.lastRunAt) : Number.NaN; + return (!Number.isFinite(runAt) || runAt + 1000 < scheduledAt) && Date.now() - scheduledAt > WATCHDOG_LATE_GRACE_MS; +} + +export function computeJobFilter(job: CronJob, wdJob: { status?: string; lastScheduledAt?: string; lastRunAt?: string | null } | undefined): CronFilter { + if (job.enabled === false) return "disabled"; + if (watchdogJobLikelyLate(wdJob)) return "escalated"; + const wdStatus = wdJob?.status; + if (wdStatus === "retrying" || wdStatus === "pending") return "retrying"; + if (job.state?.lastStatus === "error") return "retrying"; + return "ok"; +} + +export function cronToHuman(expr: string, t: TFunction, lang: string): string { + const parts = expr.trim().split(/\s+/); + if (parts.length !== 5) return expr; + const [min, hour, dom, mon, dow] = parts; + const time = `${hour.padStart(2, "0")}:${min.padStart(2, "0")}`; + const dowNames = lang.startsWith("zh") ? DOW_ZH : DOW_EN; + if (min.startsWith("*/") && hour === "*" && dom === "*" && mon === "*" && dow === "*") return t("cron.every", { interval: `${min.slice(2)}m` }); + if (min === "0" && hour.startsWith("*/") && dom === "*" && mon === "*" && dow === "*") return t("cron.every", { interval: `${hour.slice(2)}h` }); + if (dom === "*" && mon === "*" && dow !== "*" && !hour.includes("/") && !min.includes("/")) { + const days = dow.split(",").map(d => dowNames[parseInt(d)] || d).join(", "); + return `${days} ${time}`; + } + if (dom !== "*" && !dom.includes("/") && mon === "*" && dow === "*" && !hour.includes("/") && !min.includes("/")) return t("cron.monthly", { day: dom, time }); + if (dom === "*" && mon === "*" && dow === "*" && !hour.includes("/") && !min.includes("/")) { + const hours = hour.split(","); + if (hours.length === 1) return t("cron.daily", { time }); + return t("cron.daily", { time: hours.map(h => `${h.padStart(2, "0")}:${min.padStart(2, "0")}`).join(", ") }); + } + return expr; +} + +export function formatSchedule(s: CronSchedule | undefined, t: TFunction, lang: string): string { + if (!s) return "—"; + if (s.kind === "every" && s.everyMs) { + const mins = Math.round(s.everyMs / 60000); + return mins >= 60 ? t("cron.every", { interval: `${Math.round(mins / 60)}h` }) : t("cron.every", { interval: `${mins}m` }); + } + if (s.kind === "at" && s.at) return fmtDate(new Date(s.at).getTime()); + if (s.kind === "cron" && s.expr) return cronToHuman(s.expr, t, lang); + return "—"; +} + +export function fmtDate(ms: number): string { + const d = new Date(ms); + const p = (n: number) => String(n).padStart(2, "0"); + return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`; +} + +export function fmtRelative(ms: number, t: TFunction): string { + const diff = Date.now() - ms; + const secs = Math.floor(diff / 1000); + if (secs < 0) return t("cron.justNow"); + if (secs < 60) return t("cron.secsAgo", { count: secs }); + const mins = Math.floor(secs / 60); + if (mins < 60) return t("cron.minsAgo", { count: mins }); + const hours = Math.floor(mins / 60); + if (hours < 24) return t("cron.hoursAgo", { count: hours }); + return t("cron.daysAgo", { count: Math.floor(hours / 24) }); +} + +export function fmtDur(ms: number, t: TFunction): string { + if (ms < 1000) return `${ms}ms`; + const s = Math.round(ms / 1000); + return s < 60 ? t("cron.durSecs", { count: s }) : t("cron.durMins", { m: Math.floor(s / 60), s: s % 60 }); +} diff --git a/src/lib/doctor-types.ts b/src/lib/doctor-types.ts new file mode 100644 index 00000000..f8ee6ee3 --- /dev/null +++ b/src/lib/doctor-types.ts @@ -0,0 +1,96 @@ +/** + * Doctor diagnostic type definitions. + * Extracted from types.ts for readability. + */ + +export interface DoctorIssue { + id: string; + code: string; + severity: "error" | "warn" | "info"; + message: string; + autoFixable: boolean; + fixHint?: string; +} + +export interface DoctorReport { + ok: boolean; + score: number; + issues: DoctorIssue[]; +} + +export interface PendingCommand { + id: string; + label: string; + command: string[]; + createdAt: string; +} + +export interface PreviewQueueResult { + commands: PendingCommand[]; + configBefore: string; + configAfter: string; + warnings: string[]; + errors: string[]; +} + +export interface PreviewQueueResult { + commands: PendingCommand[]; + configBefore: string; + configAfter: string; + warnings: string[]; + errors: string[]; +} + +export interface DoctorInvoke { + id: string; + command: string; + args: Record; + type: "read" | "write"; +} + +export interface DiagnosisCitation { + url: string; + section?: string; +} + +export interface DiagnosisReportItem { + problem: string; + severity: "error" | "warn" | "info"; + fix_options: string[]; + root_cause_hypothesis?: string; + fix_steps?: string[]; + confidence?: number; + citations?: DiagnosisCitation[]; + version_awareness?: string; + action?: { tool: string; args: string; instance?: string; reason?: string }; +} + +export interface DoctorChatMessage { + id: string; + role: "assistant" | "user" | "tool-call" | "tool-result"; + content: string; + invoke?: DoctorInvoke; + invokeResult?: unknown; + invokeId?: string; + status?: "pending" | "approved" | "rejected" | "auto"; + diagnosisReport?: { items: DiagnosisReportItem[] }; + /** Epoch milliseconds when the message was created. */ + timestamp?: number; +} + +export interface ApplyQueueResult { + ok: boolean; + appliedCount: number; + totalCount: number; + error: string | null; + rolledBack: boolean; +} + +export interface ApplyQueueResult { + ok: boolean; + appliedCount: number; + totalCount: number; + error: string | null; + rolledBack: boolean; +} + diff --git a/src/lib/install-types.ts b/src/lib/install-types.ts new file mode 100644 index 00000000..a4f6bac9 --- /dev/null +++ b/src/lib/install-types.ts @@ -0,0 +1,99 @@ +import type { SshDiagnosticReport } from "./ssh-types"; +/** + * Installation workflow type definitions. + * Extracted from types.ts for readability. + */ + +export type InstallMethod = "local" | "wsl2" | "docker" | "remote_ssh"; + +export type InstallState = + | "idle" + | "selected_method" + | "precheck_running" + | "precheck_failed" + | "precheck_passed" + | "install_running" + | "install_failed" + | "install_passed" + | "init_running" + | "init_failed" + | "init_passed" + | "verify_running" + | "verify_failed" + | "ready"; + +export type InstallStep = "precheck" | "install" | "init" | "verify"; + +export interface InstallLogEntry { + at: string; + level: string; + message: string; +} + +export interface InstallSession { + id: string; + method: InstallMethod; + state: InstallState; + current_step: InstallStep | null; + logs: InstallLogEntry[]; + artifacts: Record; + created_at: string; + updated_at: string; +} + +export interface InstallStepResult { + ok: boolean; + summary: string; + details: string; + commands: string[]; + artifacts: Record; + next_step: string | null; + error_code: string | null; + ssh_diagnostic?: SshDiagnosticReport | null; +} + +export interface InstallMethodCapability { + method: InstallMethod; + available: boolean; + hint: string | null; +} + +export interface InstallOrchestratorDecision { + step: string | null; + reason: string; + source: string; + errorCode?: string | null; + actionHint?: string | null; +} + +export interface InstallUiAction { + id: string; + kind: string; + label: string; + payload?: Record; +} + +export interface InstallTargetDecision { + method: InstallMethod | null; + reason: string; + source: string; + requiresSshHost: boolean; + requiredFields?: string[]; + uiActions?: InstallUiAction[]; + errorCode?: string | null; + actionHint?: string | null; +} + +export interface EnsureAccessResult { + instanceId: string; + transport: string; + workingChain: string[]; + usedLegacyFallback: boolean; + profileReused: boolean; +} + +export interface RecordInstallExperienceResult { + saved: boolean; + totalCount: number; +} + diff --git a/src/lib/profile-utils.ts b/src/lib/profile-utils.ts new file mode 100644 index 00000000..da9f9f90 --- /dev/null +++ b/src/lib/profile-utils.ts @@ -0,0 +1,60 @@ +/** + * Utility functions for model profile credential handling. + * Extracted from Settings.tsx for readability. + */ + +export type ProfileForm = { + id: string; + provider: string; + model: string; + authRef: string; + apiKey: string; + useCustomUrl: boolean; + baseUrl: string; + enabled: boolean; +}; + +export type CredentialSource = "manual" | "env" | "oauth"; + +export function emptyForm(): ProfileForm { + return { id: "", provider: "", model: "", authRef: "", apiKey: "", useCustomUrl: false, baseUrl: "", enabled: true }; +} + +export function normalizeOauthProvider(provider: string): string { + const lower = provider.trim().toLowerCase(); + if (lower === "openai_codex" || lower === "github-copilot" || lower === "copilot") return "openai-codex"; + return lower; +} + +export function providerUsesOAuthAuth(provider: string): boolean { + return normalizeOauthProvider(provider) === "openai-codex"; +} + +export function defaultOauthAuthRef(provider: string): string { + return normalizeOauthProvider(provider) === "openai-codex" ? "openai-codex:default" : ""; +} + +export function isEnvVarLikeAuthRef(authRef: string): boolean { + return /^[A-Za-z_][A-Za-z0-9_]*$/.test(authRef.trim()); +} + +export function defaultEnvAuthRef(provider: string): string { + const normalized = normalizeOauthProvider(provider); + if (!normalized) return ""; + if (normalized === "openai-codex") return "OPENAI_CODEX_TOKEN"; + const providerEnv = normalized.replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase(); + return providerEnv ? `${providerEnv}_API_KEY` : ""; +} + +export function inferCredentialSource(provider: string, authRef: string): CredentialSource { + const trimmed = authRef.trim(); + if (!trimmed) return providerUsesOAuthAuth(provider) ? "oauth" : "manual"; + if (providerUsesOAuthAuth(provider) && trimmed.toLowerCase().startsWith("openai-codex:")) return "oauth"; + return "env"; +} + +export function providerSupportsOptionalApiKey(provider: string): boolean { + if (providerUsesOAuthAuth(provider)) return true; + const lower = provider.trim().toLowerCase(); + return ["ollama", "lmstudio", "lm-studio", "localai", "vllm", "llamacpp", "llama.cpp"].includes(lower); +} diff --git a/src/lib/rescue-types.ts b/src/lib/rescue-types.ts new file mode 100644 index 00000000..e27d8ee9 --- /dev/null +++ b/src/lib/rescue-types.ts @@ -0,0 +1,142 @@ +/** + * Rescue bot and primary rescue type definitions. + * Extracted from types.ts for readability. + */ + +export type RescueBotAction = "set" | "activate" | "status" | "deactivate" | "unset"; + +export type RescueBotRuntimeState = + | "unconfigured" + | "configured_inactive" + | "active" + | "checking" + | "error"; + +export interface RescueBotCommandResult { + command: string[]; + output: { + stdout: string; + stderr: string; + exitCode: number; + }; +} + +export interface RescueBotManageResult { + action: RescueBotAction; + profile: string; + mainPort: number; + rescuePort: number; + minRecommendedPort: number; + configured: boolean; + active: boolean; + runtimeState: RescueBotRuntimeState; + wasAlreadyConfigured: boolean; + commands: RescueBotCommandResult[]; +} + +export interface RescuePrimaryCheckItem { + id: string; + title: string; + ok: boolean; + detail: string; +} + +export interface RescuePrimaryIssue { + id: string; + code: string; + severity: "error" | "warn" | "info"; + message: string; + autoFixable: boolean; + fixHint?: string; + source: "rescue" | "primary"; +} + +export interface RescueDocHypothesis { + title: string; + reason: string; + score: number; +} + +export interface RescueDocCitation { + url: string; + section: string; +} + +export interface RescuePrimarySummary { + status: "healthy" | "degraded" | "broken" | "inactive"; + headline: string; + recommendedAction: string; + fixableIssueCount: number; + selectedFixIssueIds: string[]; + rootCauseHypotheses?: RescueDocHypothesis[]; + fixSteps?: string[]; + confidence?: number; + citations?: RescueDocCitation[]; + versionAwareness?: string; +} + +export interface RescuePrimarySectionItem { + id: string; + label: string; + status: "ok" | "warn" | "error" | "info" | "inactive"; + detail: string; + autoFixable: boolean; + issueId?: string | null; +} + +export interface RescuePrimarySectionResult { + key: "gateway" | "models" | "tools" | "agents" | "channels"; + title: string; + status: "healthy" | "degraded" | "broken" | "inactive"; + summary: string; + docsUrl: string; + items: RescuePrimarySectionItem[]; + rootCauseHypotheses?: RescueDocHypothesis[]; + fixSteps?: string[]; + confidence?: number; + citations?: RescueDocCitation[]; + versionAwareness?: string; +} + +export interface RescuePrimaryDiagnosisResult { + status: "healthy" | "degraded" | "broken" | "inactive"; + checkedAt: string; + targetProfile: string; + rescueProfile: string; + rescueConfigured: boolean; + rescuePort?: number; + summary: RescuePrimarySummary; + sections: RescuePrimarySectionResult[]; + checks: RescuePrimaryCheckItem[]; + issues: RescuePrimaryIssue[]; +} + +export interface RescuePrimaryRepairStep { + id: string; + title: string; + ok: boolean; + detail: string; + command?: string[]; +} + +export interface RescuePrimaryPendingAction { + kind: "tempProviderSetup"; + reason: string; + tempProviderProfileId?: string | null; +} + +export interface RescuePrimaryRepairResult { + status: "completed" | "needsTempProviderSetup"; + attemptedAt: string; + targetProfile: string; + rescueProfile: string; + selectedIssueIds: string[]; + appliedIssueIds: string[]; + skippedIssueIds: string[]; + failedIssueIds: string[]; + pendingAction?: RescuePrimaryPendingAction | null; + steps: RescuePrimaryRepairStep[]; + before: RescuePrimaryDiagnosisResult; + after: RescuePrimaryDiagnosisResult; +} + diff --git a/src/lib/ssh-types.ts b/src/lib/ssh-types.ts new file mode 100644 index 00000000..a89f0e03 --- /dev/null +++ b/src/lib/ssh-types.ts @@ -0,0 +1,160 @@ +import type { InstanceStatus } from "./types"; +/** + * SSH-related type definitions. + * Extracted from types.ts for readability. + */ + +export interface SshTransferStats { + hostId: string; + uploadBytesPerSec: number; + downloadBytesPerSec: number; + totalUploadBytes: number; + totalDownloadBytes: number; + updatedAtMs: number; +} + +export type SshConnectionQuality = "excellent" | "good" | "fair" | "poor" | "unknown"; + +export type SshConnectionBottleneckStage = "connect" | "gateway" | "config" | "agents" | "version" | "other"; + +export type SshConnectionProbeStatus = "success" | "failed" | "interactive_required"; + +export type SshConnectionStageKey = "connect" | "gateway" | "config" | "agents" | "version"; + +export type SshConnectionStageStatus = "ok" | "failed" | "not_run" | "reused" | "interactive_required"; + +export type SshConnectionProbePhase = "start" | "success" | "failed" | "reused" | "interactive_required" | "completed"; + +export interface SshConnectionStageMetric { + key: SshConnectionStageKey; + latencyMs: number; + status: SshConnectionStageStatus; + note?: string | null; +} + +export interface SshProbeProgressEvent { + hostId: string; + requestId: string; + stage: SshConnectionStageKey; + phase: SshConnectionProbePhase; + latencyMs?: number | null; + note?: string | null; +} + +export interface SshConnectionProfile { + probeStatus?: SshConnectionProbeStatus; + reusedExistingConnection?: boolean; + status: InstanceStatus; + connectLatencyMs: number; + gatewayLatencyMs: number; + configLatencyMs: number; + agentsLatencyMs?: number; + versionLatencyMs: number; + totalLatencyMs: number; + quality: SshConnectionQuality; + qualityScore: number; + bottleneck: { + stage: SshConnectionBottleneckStage; + latencyMs: number; + }; + stages?: SshConnectionStageMetric[]; +} + +export interface SshHost { + id: string; + label: string; + host: string; + port: number; + username: string; + authMethod: "key" | "ssh_config" | "password"; + keyPath?: string; + password?: string; + passphrase?: string; +} + +export interface SshConfigHostSuggestion { + hostAlias: string; + hostName?: string; + user?: string; + port?: number; + identityFile?: string; +} + +export type SshStage = + | "resolveHostConfig" + | "tcpReachability" + | "hostKeyVerification" + | "authNegotiation" + | "sessionOpen" + | "remoteExec" + | "sftpRead" + | "sftpWrite" + | "sftpRemove"; + +export type SshIntent = + | "connect" + | "exec" + | "sftp_read" + | "sftp_write" + | "sftp_remove" + | "install_step" + | "doctor_remote" + | "health_check"; + +export type SshDiagnosticStatus = "ok" | "degraded" | "failed"; + +export type SshErrorCode = + | "SSH_HOST_UNREACHABLE" + | "SSH_CONNECTION_REFUSED" + | "SSH_TIMEOUT" + | "SSH_HOST_KEY_FAILED" + | "SSH_KEYFILE_MISSING" + | "SSH_PASSPHRASE_REQUIRED" + | "SSH_AUTH_FAILED" + | "SSH_REMOTE_COMMAND_FAILED" + | "SSH_SFTP_PERMISSION_DENIED" + | "SSH_SESSION_STALE" + | "SSH_UNKNOWN"; + +export type SshRepairAction = + | "promptPassphrase" + | "retryWithBackoff" + | "switchAuthMethodToSshConfig" + | "suggestKnownHostsBootstrap" + | "suggestAuthorizedKeysCheck" + | "suggestPortHostValidation" + | "reconnectSession"; + +export interface SshEvidence { + kind: string; + value: string; +} + +export interface SshDiagnosticReport { + stage: SshStage; + intent: SshIntent; + status: SshDiagnosticStatus; + errorCode?: SshErrorCode | null; + summary: string; + evidence: SshEvidence[]; + repairPlan: SshRepairAction[]; + confidence: number; +} + +export interface SshCommandError { + message: string; + diagnostic: SshDiagnosticReport; +} + +export interface SshExecResult { + stdout: string; + stderr: string; + exitCode: number; +} + +export interface SftpEntry { + name: string; + isDir: boolean; + size: number; +} + diff --git a/src/lib/start-page-utils.ts b/src/lib/start-page-utils.ts new file mode 100644 index 00000000..60221415 --- /dev/null +++ b/src/lib/start-page-utils.ts @@ -0,0 +1,46 @@ +/** + * Docker instance path derivation and normalization utilities. + * Extracted from StartPage.tsx for readability. + */ + +const DEFAULT_DOCKER_OPENCLAW_HOME = "~/.openclaw"; +const DEFAULT_DOCKER_CLAWPAL_DATA_DIR = "~/.local/share/clawpal"; + +export function deriveDockerPaths(instanceId: string): { openclawHome: string; clawpalDataDir: string } { + if (instanceId === "docker:local") { + return { openclawHome: DEFAULT_DOCKER_OPENCLAW_HOME, clawpalDataDir: DEFAULT_DOCKER_CLAWPAL_DATA_DIR }; + } + const suffixRaw = instanceId.startsWith("docker:") ? instanceId.slice(7) : instanceId; + const suffix = suffixRaw === "local" + ? "docker-local" + : suffixRaw.startsWith("docker-") ? suffixRaw : `docker-${suffixRaw || "local"}`; + const openclawHome = `~/.clawpal/${suffix}`; + return { openclawHome, clawpalDataDir: `${openclawHome}/data` }; +} + +export function normalizePathForCompare(raw: string): string { + const trimmed = raw.trim().replace(/\\/g, "/"); + return trimmed ? trimmed.replace(/\/+$/, "") : ""; +} + +export function dockerPathKey(raw: string): string { + const normalized = normalizePathForCompare(raw); + if (!normalized) return ""; + const segments = normalized.split("/").filter(Boolean); + const clawpalIdx = segments.lastIndexOf(".clawpal"); + if (clawpalIdx >= 0 && clawpalIdx + 1 < segments.length) { + const dir = segments[clawpalIdx + 1]; + if (dir.startsWith("docker-")) return `docker-dir:${dir.toLowerCase()}`; + } + const last = segments[segments.length - 1] || ""; + if (last.startsWith("docker-")) return `docker-dir:${last.toLowerCase()}`; + return `path:${normalized.toLowerCase()}`; +} + +export function dockerIdKey(rawId: string): string { + if (!rawId.startsWith("docker:")) return ""; + let slug = rawId.slice("docker:".length).trim().toLowerCase(); + if (!slug) slug = "local"; + if (slug.startsWith("docker-")) slug = slug.slice("docker-".length); + return `docker-id:${slug}`; +} diff --git a/src/lib/types.ts b/src/lib/types.ts index c3fcdc14..df7bd36e 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -1,3 +1,29 @@ +import type { SshDiagnosticReport } from "./ssh-types"; +export type { + SftpEntry, + SshCommandError, + SshConfigHostSuggestion, + SshConnectionBottleneckStage, + SshConnectionProbePhase, + SshConnectionProbeStatus, + SshConnectionProfile, + SshConnectionQuality, + SshConnectionStageKey, + SshConnectionStageMetric, + SshConnectionStageStatus, + SshDiagnosticReport, + SshDiagnosticStatus, + SshErrorCode, + SshEvidence, + SshExecResult, + SshHost, + SshIntent, + SshProbeProgressEvent, + SshRepairAction, + SshStage, + SshTransferStats, +} from "./ssh-types"; + export type Severity = "low" | "medium" | "high"; export interface ChannelNode { @@ -218,14 +244,6 @@ export interface AppPreferences { showSshTransferSpeedUi: boolean; } -export interface SshTransferStats { - hostId: string; - uploadBytesPerSec: number; - downloadBytesPerSec: number; - totalUploadBytes: number; - totalDownloadBytes: number; - updatedAtMs: number; -} export type BugReportBackend = "sentry"; export type BugReportSeverity = "info" | "warn" | "error" | "critical"; @@ -258,20 +276,7 @@ export interface HistoryItem { rollbackOf?: string; } -export interface DoctorIssue { - id: string; - code: string; - severity: "error" | "warn" | "info"; - message: string; - autoFixable: boolean; - fixHint?: string; -} -export interface DoctorReport { - ok: boolean; - score: number; - issues: DoctorIssue[]; -} export interface GuidanceAction { label: string; @@ -307,47 +312,9 @@ export interface InstanceStatus { sshDiagnostic?: SshDiagnosticReport | null; } -export type SshConnectionQuality = "excellent" | "good" | "fair" | "poor" | "unknown"; -export type SshConnectionBottleneckStage = "connect" | "gateway" | "config" | "agents" | "version" | "other"; -export type SshConnectionProbeStatus = "success" | "failed" | "interactive_required"; -export type SshConnectionStageKey = "connect" | "gateway" | "config" | "agents" | "version"; -export type SshConnectionStageStatus = "ok" | "failed" | "not_run" | "reused" | "interactive_required"; -export type SshConnectionProbePhase = "start" | "success" | "failed" | "reused" | "interactive_required" | "completed"; -export interface SshConnectionStageMetric { - key: SshConnectionStageKey; - latencyMs: number; - status: SshConnectionStageStatus; - note?: string | null; -} -export interface SshProbeProgressEvent { - hostId: string; - requestId: string; - stage: SshConnectionStageKey; - phase: SshConnectionProbePhase; - latencyMs?: number | null; - note?: string | null; -} -export interface SshConnectionProfile { - probeStatus?: SshConnectionProbeStatus; - reusedExistingConnection?: boolean; - status: InstanceStatus; - connectLatencyMs: number; - gatewayLatencyMs: number; - configLatencyMs: number; - agentsLatencyMs?: number; - versionLatencyMs: number; - totalLatencyMs: number; - quality: SshConnectionQuality; - qualityScore: number; - bottleneck: { - stage: SshConnectionBottleneckStage; - latencyMs: number; - }; - stages?: SshConnectionStageMetric[]; -} export interface StatusExtra { openclawVersion?: string; @@ -378,14 +345,7 @@ export interface ChannelsRuntimeSnapshot { agents: AgentOverview[]; } -export interface CronConfigSnapshot { - jobs: CronJob[]; -} -export interface CronRuntimeSnapshot { - jobs: CronJob[]; - watchdog: WatchdogStatus & { alive: boolean; deployed: boolean }; -} export interface Binding { agentId: string; @@ -399,91 +359,15 @@ export interface BackupInfo { sizeBytes: number; } -export interface SshHost { - id: string; - label: string; - host: string; - port: number; - username: string; - authMethod: "key" | "ssh_config" | "password"; - keyPath?: string; - password?: string; - passphrase?: string; -} - -export interface SshConfigHostSuggestion { - hostAlias: string; - hostName?: string; - user?: string; - port?: number; - identityFile?: string; -} - -export type SshStage = - | "resolveHostConfig" - | "tcpReachability" - | "hostKeyVerification" - | "authNegotiation" - | "sessionOpen" - | "remoteExec" - | "sftpRead" - | "sftpWrite" - | "sftpRemove"; - -export type SshIntent = - | "connect" - | "exec" - | "sftp_read" - | "sftp_write" - | "sftp_remove" - | "install_step" - | "doctor_remote" - | "health_check"; - -export type SshDiagnosticStatus = "ok" | "degraded" | "failed"; - -export type SshErrorCode = - | "SSH_HOST_UNREACHABLE" - | "SSH_CONNECTION_REFUSED" - | "SSH_TIMEOUT" - | "SSH_HOST_KEY_FAILED" - | "SSH_KEYFILE_MISSING" - | "SSH_PASSPHRASE_REQUIRED" - | "SSH_AUTH_FAILED" - | "SSH_REMOTE_COMMAND_FAILED" - | "SSH_SFTP_PERMISSION_DENIED" - | "SSH_SESSION_STALE" - | "SSH_UNKNOWN"; - -export type SshRepairAction = - | "promptPassphrase" - | "retryWithBackoff" - | "switchAuthMethodToSshConfig" - | "suggestKnownHostsBootstrap" - | "suggestAuthorizedKeysCheck" - | "suggestPortHostValidation" - | "reconnectSession"; - -export interface SshEvidence { - kind: string; - value: string; -} -export interface SshDiagnosticReport { - stage: SshStage; - intent: SshIntent; - status: SshDiagnosticStatus; - errorCode?: SshErrorCode | null; - summary: string; - evidence: SshEvidence[]; - repairPlan: SshRepairAction[]; - confidence: number; -} -export interface SshCommandError { - message: string; - diagnostic: SshDiagnosticReport; -} + + + + + + + export interface DockerInstance { id: string; @@ -511,372 +395,96 @@ export interface DiscoveredInstance { alreadyRegistered: boolean; } -export interface SshExecResult { - stdout: string; - stderr: string; - exitCode: number; -} -export interface SftpEntry { - name: string; - isDir: boolean; - size: number; -} - -export type RescueBotAction = "set" | "activate" | "status" | "deactivate" | "unset"; -export type RescueBotRuntimeState = - | "unconfigured" - | "configured_inactive" - | "active" - | "checking" - | "error"; - -export interface RescueBotCommandResult { - command: string[]; - output: { - stdout: string; - stderr: string; - exitCode: number; - }; -} -export interface RescueBotManageResult { - action: RescueBotAction; - profile: string; - mainPort: number; - rescuePort: number; - minRecommendedPort: number; - configured: boolean; - active: boolean; - runtimeState: RescueBotRuntimeState; - wasAlreadyConfigured: boolean; - commands: RescueBotCommandResult[]; -} -export interface RescuePrimaryCheckItem { - id: string; - title: string; - ok: boolean; - detail: string; -} -export interface RescuePrimaryIssue { - id: string; - code: string; - severity: "error" | "warn" | "info"; - message: string; - autoFixable: boolean; - fixHint?: string; - source: "rescue" | "primary"; -} - -export interface RescueDocHypothesis { - title: string; - reason: string; - score: number; -} -export interface RescueDocCitation { - url: string; - section: string; -} -export interface RescuePrimarySummary { - status: "healthy" | "degraded" | "broken" | "inactive"; - headline: string; - recommendedAction: string; - fixableIssueCount: number; - selectedFixIssueIds: string[]; - rootCauseHypotheses?: RescueDocHypothesis[]; - fixSteps?: string[]; - confidence?: number; - citations?: RescueDocCitation[]; - versionAwareness?: string; -} -export interface RescuePrimarySectionItem { - id: string; - label: string; - status: "ok" | "warn" | "error" | "info" | "inactive"; - detail: string; - autoFixable: boolean; - issueId?: string | null; -} - -export interface RescuePrimarySectionResult { - key: "gateway" | "models" | "tools" | "agents" | "channels"; - title: string; - status: "healthy" | "degraded" | "broken" | "inactive"; - summary: string; - docsUrl: string; - items: RescuePrimarySectionItem[]; - rootCauseHypotheses?: RescueDocHypothesis[]; - fixSteps?: string[]; - confidence?: number; - citations?: RescueDocCitation[]; - versionAwareness?: string; -} - -export interface RescuePrimaryDiagnosisResult { - status: "healthy" | "degraded" | "broken" | "inactive"; - checkedAt: string; - targetProfile: string; - rescueProfile: string; - rescueConfigured: boolean; - rescuePort?: number; - summary: RescuePrimarySummary; - sections: RescuePrimarySectionResult[]; - checks: RescuePrimaryCheckItem[]; - issues: RescuePrimaryIssue[]; -} - -export interface RescuePrimaryRepairStep { - id: string; - title: string; - ok: boolean; - detail: string; - command?: string[]; -} -export interface RescuePrimaryPendingAction { - kind: "tempProviderSetup"; - reason: string; - tempProviderProfileId?: string | null; -} -export interface RescuePrimaryRepairResult { - status: "completed" | "needsTempProviderSetup"; - attemptedAt: string; - targetProfile: string; - rescueProfile: string; - selectedIssueIds: string[]; - appliedIssueIds: string[]; - skippedIssueIds: string[]; - failedIssueIds: string[]; - pendingAction?: RescuePrimaryPendingAction | null; - steps: RescuePrimaryRepairStep[]; - before: RescuePrimaryDiagnosisResult; - after: RescuePrimaryDiagnosisResult; -} -// Cron -export type WatchdogJobStatus = "ok" | "pending" | "triggered" | "retrying" | "escalated"; -export interface CronSchedule { - kind: "cron" | "every" | "at"; - expr?: string; - tz?: string; - everyMs?: number; - at?: string; -} -export interface CronJobState { - lastRunAtMs?: number; - lastStatus?: string; - lastError?: string; -} -export interface CronJobDelivery { - mode?: string; - channel?: string; - to?: string; -} -export interface CronJob { - jobId: string; - name: string; - schedule: CronSchedule; - sessionTarget: "main" | "isolated"; - agentId?: string; - enabled: boolean; - description?: string; - state?: CronJobState; - delivery?: CronJobDelivery; -} -export interface CronRun { - jobId: string; - startedAt: string; - endedAt?: string; - outcome: string; - error?: string; - ts?: number; - runAtMs?: number; - durationMs?: number; - summary?: string; -} +// Cron -export interface WatchdogJobState { - status: WatchdogJobStatus; - lastScheduledAt?: string; - lastRunAt?: string | null; - retries: number; - lastError?: string; - escalatedAt?: string; -} -export interface WatchdogStatus { - pid: number; - startedAt: string; - lastCheckAt: string; - gatewayHealthy: boolean; - jobs: Record; -} -// Command Queue -export interface PendingCommand { - id: string; - label: string; - command: string[]; - createdAt: string; -} -export interface PreviewQueueResult { - commands: PendingCommand[]; - configBefore: string; - configAfter: string; - warnings: string[]; - errors: string[]; -} -// Doctor Agent -export interface DoctorInvoke { - id: string; - command: string; - args: Record; - type: "read" | "write"; -} -export interface DiagnosisCitation { - url: string; - section?: string; -} -export interface DiagnosisReportItem { - problem: string; - severity: "error" | "warn" | "info"; - fix_options: string[]; - root_cause_hypothesis?: string; - fix_steps?: string[]; - confidence?: number; - citations?: DiagnosisCitation[]; - version_awareness?: string; - action?: { tool: string; args: string; instance?: string; reason?: string }; -} +// Command Queue -export interface DoctorChatMessage { - id: string; - role: "assistant" | "user" | "tool-call" | "tool-result"; - content: string; - invoke?: DoctorInvoke; - invokeResult?: unknown; - invokeId?: string; - status?: "pending" | "approved" | "rejected" | "auto"; - diagnosisReport?: { items: DiagnosisReportItem[] }; - /** Epoch milliseconds when the message was created. */ - timestamp?: number; -} - -export interface ApplyQueueResult { - ok: boolean; - appliedCount: number; - totalCount: number; - error: string | null; - rolledBack: boolean; -} - -export type InstallMethod = "local" | "wsl2" | "docker" | "remote_ssh"; - -export type InstallState = - | "idle" - | "selected_method" - | "precheck_running" - | "precheck_failed" - | "precheck_passed" - | "install_running" - | "install_failed" - | "install_passed" - | "init_running" - | "init_failed" - | "init_passed" - | "verify_running" - | "verify_failed" - | "ready"; - -export type InstallStep = "precheck" | "install" | "init" | "verify"; - -export interface InstallLogEntry { - at: string; - level: string; - message: string; -} -export interface InstallSession { - id: string; - method: InstallMethod; - state: InstallState; - current_step: InstallStep | null; - logs: InstallLogEntry[]; - artifacts: Record; - created_at: string; - updated_at: string; -} -export interface InstallStepResult { - ok: boolean; - summary: string; - details: string; - commands: string[]; - artifacts: Record; - next_step: string | null; - error_code: string | null; - ssh_diagnostic?: SshDiagnosticReport | null; -} -export interface InstallMethodCapability { - method: InstallMethod; - available: boolean; - hint: string | null; -} -export interface InstallOrchestratorDecision { - step: string | null; - reason: string; - source: string; - errorCode?: string | null; - actionHint?: string | null; -} -export interface InstallUiAction { - id: string; - kind: string; - label: string; - payload?: Record; -} -export interface InstallTargetDecision { - method: InstallMethod | null; - reason: string; - source: string; - requiresSshHost: boolean; - requiredFields?: string[]; - uiActions?: InstallUiAction[]; - errorCode?: string | null; - actionHint?: string | null; -} -export interface EnsureAccessResult { - instanceId: string; - transport: string; - workingChain: string[]; - usedLegacyFallback: boolean; - profileReused: boolean; -} -export interface RecordInstallExperienceResult { - saved: boolean; - totalCount: number; -} +export type { + RescueBotAction, + RescueBotRuntimeState, + RescueBotCommandResult, + RescueBotManageResult, + RescuePrimaryCheckItem, + RescuePrimaryIssue, + RescueDocHypothesis, + RescueDocCitation, + RescuePrimarySummary, + RescuePrimarySectionItem, + RescuePrimarySectionResult, + RescuePrimaryDiagnosisResult, + RescuePrimaryRepairStep, + RescuePrimaryPendingAction, + RescuePrimaryRepairResult, +} from "./rescue-types"; + +export type { + InstallMethod, + InstallState, + InstallStep, + InstallLogEntry, + InstallSession, + InstallStepResult, + InstallMethodCapability, + InstallOrchestratorDecision, + InstallUiAction, + InstallTargetDecision, + EnsureAccessResult, + RecordInstallExperienceResult, +} from "./install-types"; + +export type { + CronConfigSnapshot, + CronRuntimeSnapshot, + WatchdogJobStatus, + CronSchedule, + CronJobState, + CronJobDelivery, + CronJob, + CronRun, + WatchdogJobState, + WatchdogStatus, +} from "./cron-types"; + +export type { + ApplyQueueResult, + DiagnosisCitation, + DiagnosisReportItem, + DoctorChatMessage, + DoctorInvoke, + DoctorIssue, + DoctorReport, + PendingCommand, + PreviewQueueResult, +} from "./doctor-types"; diff --git a/src/lib/use-api.ts b/src/lib/use-api.ts index 88bc41bf..75efb60d 100644 --- a/src/lib/use-api.ts +++ b/src/lib/use-api.ts @@ -14,393 +14,24 @@ import { parseInstanceToken, } from "./data-load-log"; import { writePersistedReadCache } from "./persistent-read-cache"; +import { + resolveReadCacheScopeKey, setOptimisticReadCache, shouldLogRemoteInvokeMetric, callWithReadCache, invalidateReadCacheForInstance, emitRemoteInvokeMetric, logDevApiError, makeCacheKey +} from "./api-read-cache"; + +// Re-export cache utilities consumed by other modules +export { + hasGuidanceEmitted, + subscribeToCacheKey, + readCacheValue, + buildCacheKey, + resolveReadCacheScopeKey, + invalidateGlobalReadCache, + setOptimisticReadCache, + primeReadCache, + prewarmRemoteInstanceReadCache, + shouldLogRemoteInvokeMetric, +} from "./api-read-cache"; -/** Returns true if the error already triggered a guidance panel, so toast can be skipped. */ -export function hasGuidanceEmitted(error: unknown): boolean { - return !!(error && typeof error === "object" && (error as any)._guidanceEmitted); -} - -type ApiReadCacheEntry = { - expiresAt: number; - value: unknown; - inFlight?: Promise; - /** If > Date.now(), this entry is "pinned" by an optimistic update and polls should not overwrite it. */ - optimisticUntil?: number; -}; - -const API_READ_CACHE = new Map(); -const API_READ_CACHE_MAX_ENTRIES = 512; - -/** Subscribers keyed by cache key; notified on cache value changes. */ -const _cacheSubscribers = new Map void>>(); - -function _notifyCacheSubscribers(key: string) { - const subs = _cacheSubscribers.get(key); - if (subs) { - for (const fn of subs) fn(); - } -} - -/** Subscribe to changes on a specific cache key. Returns an unsubscribe function. */ -export function subscribeToCacheKey(key: string, callback: () => void): () => void { - let set = _cacheSubscribers.get(key); - if (!set) { - set = new Set(); - _cacheSubscribers.set(key, set); - } - set.add(callback); - return () => { - set!.delete(callback); - if (set!.size === 0) _cacheSubscribers.delete(key); - }; -} - -/** Read the current cached value for a key (if any). */ -export function readCacheValue(key: string): T | undefined { - const entry = API_READ_CACHE.get(key); - return entry?.value as T | undefined; -} - -export function buildCacheKey(instanceCacheKey: string, method: string, args: unknown[] = []): string { - return makeCacheKey(instanceCacheKey, method, args); -} - -const HOST_SHARED_READ_METHODS = new Set([ - "getInstanceConfigSnapshot", - "getInstanceRuntimeSnapshot", - "getStatusExtra", - "getChannelsConfigSnapshot", - "getChannelsRuntimeSnapshot", - "getCronConfigSnapshot", - "getCronRuntimeSnapshot", - "getRescueBotStatus", - "checkOpenclawUpdate", -]); - -export function resolveReadCacheScopeKey( - instanceCacheKey: string, - persistenceScope: string | null, - method: string, -): string { - if (HOST_SHARED_READ_METHODS.has(method) && persistenceScope) { - return persistenceScope; - } - return instanceCacheKey; -} - -function makeCacheKey(instanceCacheKey: string, method: string, args: unknown[]): string { - let serializedArgs = ""; - try { - serializedArgs = JSON.stringify(args); - } catch { - serializedArgs = String(args.length); - } - return `${instanceCacheKey}:${method}:${serializedArgs}`; -} - -function trimReadCacheIfNeeded() { - if (API_READ_CACHE.size <= API_READ_CACHE_MAX_ENTRIES) return; - const deleteCount = API_READ_CACHE.size - API_READ_CACHE_MAX_ENTRIES; - const keys = API_READ_CACHE.keys(); - for (let i = 0; i < deleteCount; i += 1) { - const next = keys.next(); - if (next.done) break; - API_READ_CACHE.delete(next.value); - } -} - -function invalidateReadCacheForInstance(instanceCacheKey: string, methods?: string[]) { - const methodSet = methods ? new Set(methods) : null; - for (const key of API_READ_CACHE.keys()) { - if (!key.startsWith(`${instanceCacheKey}:`)) continue; - if (!methodSet) { - API_READ_CACHE.delete(key); - _notifyCacheSubscribers(key); - continue; - } - const method = key.slice(instanceCacheKey.length + 1).split(":", 1)[0]; - if (methodSet.has(method)) { - API_READ_CACHE.delete(key); - _notifyCacheSubscribers(key); - } - } -} - -export function invalidateGlobalReadCache(methods?: string[]) { - invalidateReadCacheForInstance("__global__", methods); -} - -/** - * Set an optimistic value for a cache key, "pinning" it so that polling - * results will NOT overwrite it for `pinDurationMs` (default 15s). - * - * This solves the race condition where: - * mutation → optimistic setState → poll fires → stale cache → UI flickers back - * - * The pin auto-expires, so if the backend takes longer than expected, - * the next poll after expiry will overwrite with fresh data. - */ -export function setOptimisticReadCache( - key: string, - value: T, - pinDurationMs = 15_000, -) { - const existing = API_READ_CACHE.get(key); - API_READ_CACHE.set(key, { - value, - expiresAt: Date.now() + pinDurationMs, // Keep it "valid" for the pin duration - optimisticUntil: Date.now() + pinDurationMs, - inFlight: existing?.inFlight, - }); - _notifyCacheSubscribers(key); -} - -export function primeReadCache( - key: string, - value: T, - ttlMs: number, -) { - API_READ_CACHE.set(key, { - value, - expiresAt: Date.now() + ttlMs, - optimisticUntil: undefined, - }); - trimReadCacheIfNeeded(); - _notifyCacheSubscribers(key); -} - -export async function prewarmRemoteInstanceReadCache( - instanceId: string, - instanceToken: number, - persistenceScope: string | null, -) { - const instanceCacheKey = `${instanceId}#${instanceToken}`; - const warm = ( - method: string, - ttlMs: number, - loader: () => Promise, - ) => callWithReadCache( - resolveReadCacheScopeKey(instanceCacheKey, persistenceScope, method), - instanceId, - persistenceScope, - method, - [], - ttlMs, - loader, - ).catch(() => undefined); - - void warm( - "getInstanceConfigSnapshot", - 20_000, - () => api.remoteGetInstanceConfigSnapshot(instanceId), - ); - void warm( - "getInstanceRuntimeSnapshot", - 10_000, - () => api.remoteGetInstanceRuntimeSnapshot(instanceId), - ); - void warm( - "getStatusExtra", - 15_000, - () => api.remoteGetStatusExtra(instanceId), - ); - void warm( - "getChannelsConfigSnapshot", - 20_000, - () => api.remoteGetChannelsConfigSnapshot(instanceId), - ); - void warm( - "getChannelsRuntimeSnapshot", - 12_000, - () => api.remoteGetChannelsRuntimeSnapshot(instanceId), - ); - void warm( - "getCronConfigSnapshot", - 20_000, - () => api.remoteGetCronConfigSnapshot(instanceId), - ); - void warm( - "getCronRuntimeSnapshot", - 12_000, - () => api.remoteGetCronRuntimeSnapshot(instanceId), - ); - void warm( - "getRescueBotStatus", - 8_000, - () => api.remoteGetRescueBotStatus(instanceId), - ); -} - -function callWithReadCache( - instanceCacheKey: string, - metricInstanceId: string, - persistenceScope: string | null, - method: string, - args: unknown[], - ttlMs: number, - loader: () => Promise, -): Promise { - if (ttlMs <= 0) return loader(); - const now = Date.now(); - const key = makeCacheKey(instanceCacheKey, method, args); - const page = inferDataLoadPage(method); - const instanceToken = parseInstanceToken(instanceCacheKey); - const entry = API_READ_CACHE.get(key); - if (entry) { - // If pinned by optimistic update, return the pinned value - if (entry.optimisticUntil && entry.optimisticUntil > now) { - emitDataLoadMetric({ - requestId: createDataLoadRequestId(method), - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source: "cache", - phase: "success", - elapsedMs: 0, - cacheHit: true, - }); - return Promise.resolve(entry.value as TResult); - } - if (entry.expiresAt > now) { - emitDataLoadMetric({ - requestId: createDataLoadRequestId(method), - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source: "cache", - phase: "success", - elapsedMs: 0, - cacheHit: true, - }); - return Promise.resolve(entry.value as TResult); - } - if (entry.inFlight) { - return entry.inFlight as Promise; - } - } - const requestId = createDataLoadRequestId(method); - const startedAt = Date.now(); - const source = inferDataLoadSource(method); - emitDataLoadMetric({ - requestId, - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source, - phase: "start", - elapsedMs: 0, - cacheHit: false, - }); - const request = loader() - .then((value) => { - const elapsedMs = Date.now() - startedAt; - const current = API_READ_CACHE.get(key); - // Don't overwrite if a newer optimistic value was set while we were fetching - if (current?.optimisticUntil && current.optimisticUntil > Date.now()) { - // Clear inFlight but keep the optimistic value - API_READ_CACHE.set(key, { - ...current, - inFlight: undefined, - }); - emitDataLoadMetric({ - requestId, - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source, - phase: "success", - elapsedMs, - cacheHit: false, - }); - return current.value as TResult; - } - API_READ_CACHE.set(key, { - value, - expiresAt: Date.now() + ttlMs, - optimisticUntil: undefined, - }); - if (persistenceScope) { - writePersistedReadCache(persistenceScope, method, args, value); - } - trimReadCacheIfNeeded(); - _notifyCacheSubscribers(key); - emitDataLoadMetric({ - requestId, - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source, - phase: "success", - elapsedMs, - cacheHit: false, - }); - return value; - }) - .catch((error) => { - const current = API_READ_CACHE.get(key); - if (current?.inFlight === request) { - API_READ_CACHE.delete(key); - } - emitDataLoadMetric({ - requestId, - resource: method, - page, - instanceId: metricInstanceId, - instanceToken, - source, - phase: "error", - elapsedMs: Date.now() - startedAt, - cacheHit: false, - errorSummary: extractErrorText(error), - }); - throw error; - }); - API_READ_CACHE.set(key, { - value: entry?.value, - expiresAt: entry?.expiresAt ?? 0, - optimisticUntil: entry?.optimisticUntil, - inFlight: request as Promise, - }); - trimReadCacheIfNeeded(); - return request; -} - -function emitRemoteInvokeMetric(payload: Record) { - const line = `[metrics][remote_invoke] ${JSON.stringify(payload)}`; - // fire-and-forget: metrics collection must not affect user flow - void invoke("log_app_event", { message: line }).catch((error) => { - if (import.meta.env.DEV) { - console.warn("[dev ignored error] emitRemoteInvokeMetric", error); - } - }); -} - -function logDevApiError(context: string, error: unknown, detail: Record = {}): void { - if (!import.meta.env.DEV) return; - console.error(`[dev api error] ${context}`, { - ...detail, - error: extractErrorText(error), - }); -} - -/** @internal Exported for testing only. */ -export function shouldLogRemoteInvokeMetric(ok: boolean, elapsedMs: number): boolean { - // Always log failures and slow calls; sample a small percentage of fast-success calls. - if (!ok) return true; - if (elapsedMs >= 1500) return true; - return Math.random() < 0.05; -} - -/** - * Returns a unified API object that auto-dispatches to local or remote - * based on the current instance context. Remote calls automatically - * inject hostId and check connection state. - */ export function useApi() { const { instanceId, diff --git a/src/pages/Cron.tsx b/src/pages/Cron.tsx index fc78e0d5..18872b98 100644 --- a/src/pages/Cron.tsx +++ b/src/pages/Cron.tsx @@ -19,6 +19,7 @@ import { } from "@/lib/data-load-log"; import { readPersistedReadCache } from "@/lib/persistent-read-cache"; import { buildInitialCronState } from "./overview-loading"; +import { computeJobFilter, formatSchedule, fmtDate, fmtRelative, fmtDur, watchdogJobLikelyLate, type CronFilter } from "../lib/cron-utils"; import { Card, CardContent, @@ -37,101 +38,6 @@ import { AlertDialogTrigger, } from "@/components/ui/alert-dialog"; -/* ------------------------------------------------------------------ */ -/* Helpers */ -/* ------------------------------------------------------------------ */ - -const DOW_EN = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; -const DOW_ZH = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]; -const WATCHDOG_LATE_GRACE_MS = 5 * 60 * 1000; - -type CronFilter = "all" | "ok" | "retrying" | "escalated" | "disabled"; - -function computeJobFilter(job: CronJob, wdJob: { status?: string; lastScheduledAt?: string; lastRunAt?: string | null } | undefined): CronFilter { - if (job.enabled === false) return "disabled"; - if (watchdogJobLikelyLate(wdJob)) return "escalated"; - const wdStatus = wdJob?.status; - if (wdStatus === "retrying" || wdStatus === "pending") return "retrying"; - if (job.state?.lastStatus === "error") return "retrying"; - return "ok"; -} - -function cronToHuman(expr: string, t: TFunction, lang: string): string { - const parts = expr.trim().split(/\s+/); - if (parts.length !== 5) return expr; - const [min, hour, dom, mon, dow] = parts; - const time = `${hour.padStart(2, "0")}:${min.padStart(2, "0")}`; - const dowNames = lang.startsWith("zh") ? DOW_ZH : DOW_EN; - - if (min.startsWith("*/") && hour === "*" && dom === "*" && mon === "*" && dow === "*") - return t("cron.every", { interval: `${min.slice(2)}m` }); - if (min === "0" && hour.startsWith("*/") && dom === "*" && mon === "*" && dow === "*") - return t("cron.every", { interval: `${hour.slice(2)}h` }); - if (dom === "*" && mon === "*" && dow !== "*" && !hour.includes("/") && !min.includes("/")) { - const days = dow.split(",").map(d => dowNames[parseInt(d)] || d).join(", "); - return `${days} ${time}`; - } - if (dom !== "*" && !dom.includes("/") && mon === "*" && dow === "*" && !hour.includes("/") && !min.includes("/")) - return t("cron.monthly", { day: dom, time }); - if (dom === "*" && mon === "*" && dow === "*" && !hour.includes("/") && !min.includes("/")) { - const hours = hour.split(","); - if (hours.length === 1) return t("cron.daily", { time }); - return t("cron.daily", { time: hours.map(h => `${h.padStart(2, "0")}:${min.padStart(2, "0")}`).join(", ") }); - } - return expr; -} - -function formatSchedule(s: CronSchedule | undefined, t: TFunction, lang: string): string { - if (!s) return "—"; - if (s.kind === "every" && s.everyMs) { - const mins = Math.round(s.everyMs / 60000); - return mins >= 60 ? t("cron.every", { interval: `${Math.round(mins / 60)}h` }) : t("cron.every", { interval: `${mins}m` }); - } - if (s.kind === "at" && s.at) return fmtDate(new Date(s.at).getTime()); - if (s.kind === "cron" && s.expr) return cronToHuman(s.expr, t, lang); - return "—"; -} - -/** YYYY-MM-DD HH:MM:SS */ -function fmtDate(ms: number): string { - const d = new Date(ms); - const p = (n: number) => String(n).padStart(2, "0"); - return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`; -} - -function fmtRelative(ms: number, t: TFunction): string { - const diff = Date.now() - ms; - const secs = Math.floor(diff / 1000); - if (secs < 0) return t("cron.justNow"); - if (secs < 60) return t("cron.secsAgo", { count: secs }); - const mins = Math.floor(secs / 60); - if (mins < 60) return t("cron.minsAgo", { count: mins }); - const hours = Math.floor(mins / 60); - if (hours < 24) return t("cron.hoursAgo", { count: hours }); - return t("cron.daysAgo", { count: Math.floor(hours / 24) }); -} - -function fmtDur(ms: number, t: TFunction): string { - if (ms < 1000) return `${ms}ms`; - const s = Math.round(ms / 1000); - return s < 60 ? t("cron.durSecs", { count: s }) : t("cron.durMins", { m: Math.floor(s / 60), s: s % 60 }); -} - -function watchdogJobLikelyLate(job: { lastScheduledAt?: string; lastRunAt?: string | null } | undefined): boolean { - if (!job?.lastScheduledAt) return false; - const scheduledAt = Date.parse(job.lastScheduledAt); - if (!Number.isFinite(scheduledAt)) return false; - const runAt = job.lastRunAt ? Date.parse(job.lastRunAt) : Number.NaN; - const missedThisSchedule = !Number.isFinite(runAt) || runAt + 1000 < scheduledAt; - const overdue = Date.now() - scheduledAt > WATCHDOG_LATE_GRACE_MS; - return missedThisSchedule && overdue; -} - - -/* ------------------------------------------------------------------ */ -/* Trash icon */ -/* ------------------------------------------------------------------ */ - const TrashIcon = () => ( diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index a296ec13..2212e305 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -51,6 +51,7 @@ import { } from "@/lib/data-load-log"; import { readPersistedReadCache } from "@/lib/persistent-read-cache"; import { RenderProbe } from "@/lib/render-probe"; +import { useHomeGuidance } from "../hooks/useHomeGuidance"; type OpenclawUpdateLatch = { checkedAt: number; @@ -180,71 +181,10 @@ export function Home({ const retriesRef = useRef(0); const remoteErrorShownRef = useRef(false); const remoteUnhealthyStreakRef = useRef(0); - const duplicateInstallGuidanceSigRef = useRef(""); - const onboardingGuidanceSigRef = useRef(""); const statusInFlightRef = useRef(false); - useEffect(() => { - const entries = statusExtra?.duplicateInstalls || []; - if (entries.length === 0) return; - const signature = `${ua.instanceId}:${entries.join("|")}`; - if (duplicateInstallGuidanceSigRef.current === signature) return; - duplicateInstallGuidanceSigRef.current = signature; - const transport = ua.isRemote ? "remote_ssh" : (ua.isDocker ? "docker_local" : "local"); - const rawError = `Duplicate openclaw installs detected: ${entries.join(" ; ")}`; - window.dispatchEvent(new CustomEvent("clawpal:agent-guidance", { - detail: { - message: t("home.duplicateInstalls"), - summary: t("home.duplicateInstalls"), - actions: [ - t("home.fixInDoctor"), - "Run `which -a openclaw` and keep only one valid binary in PATH", - ], - source: "status-extra", - operation: "status.extra.duplicate_installs", - instanceId: ua.instanceId, - transport, - rawError, - createdAt: Date.now(), - }, - })); - }, [statusExtra?.duplicateInstalls, t, ua.instanceId, ua.isDocker, ua.isRemote]); - - // Post-install onboarding guidance: when status settles and instance needs setup, - // emit guidance so the Help surface can walk the user through remaining configuration. - useEffect(() => { - if (!statusSettled || !status) return; - const remote = ua.isRemote; - // Model profiles/default model are global host-level concerns, not remote-instance-local setup. - const needsSetup = !status.healthy || (!remote && (modelProfiles.length === 0 || !status.globalDefaultModel)); - if (!needsSetup) return; - const issues: string[] = []; - if (!status.healthy) issues.push("unhealthy"); - if (!remote && modelProfiles.length === 0) issues.push("no_profiles"); - if (!remote && !status.globalDefaultModel) issues.push("no_default_model"); - const signature = `${ua.instanceId}:onboarding:${issues.join(",")}`; - if (onboardingGuidanceSigRef.current === signature) return; - onboardingGuidanceSigRef.current = signature; - const transport = ua.isRemote ? "remote_ssh" : (ua.isDocker ? "docker_local" : "local"); - const actions: string[] = []; - if (!status.healthy) actions.push(t("onboarding.actionCheckDoctor")); - if (!remote && modelProfiles.length === 0) actions.push(t("onboarding.actionAddProfile")); - if (!remote && !status.globalDefaultModel && modelProfiles.length > 0) actions.push(t("onboarding.actionSetDefault")); - window.dispatchEvent(new CustomEvent("clawpal:agent-guidance", { - detail: { - message: t("onboarding.summary"), - summary: t("onboarding.summary"), - actions, - source: "onboarding", - operation: "post_install.onboarding", - instanceId: ua.instanceId, - transport, - rawError: `Instance needs setup: ${issues.join(", ")}`, - createdAt: Date.now(), - }, - })); - }, [statusSettled, status, modelProfiles, t, ua.instanceId, ua.isDocker, ua.isRemote]); + useHomeGuidance({ statusExtra, statusSettled, status, modelProfiles, instanceId: ua.instanceId, isRemote: ua.isRemote, isDocker: ua.isDocker }); // Render probe: record first-render of each data section useEffect(() => { if (status) probe.hit("status"); }, [status, probe]); @@ -382,46 +322,20 @@ export function Home({ }, [applyConfigSnapshot, liveReadsReady, persistedRuntimeSnapshot, ua]); useEffect(() => { - if (persistedConfigSnapshot) { - emitDataLoadMetric({ - requestId: createDataLoadRequestId("getInstanceConfigSnapshot"), - resource: "getInstanceConfigSnapshot", - page: "home", - instanceId: ua.instanceId, - instanceToken: ua.instanceToken, - source: "persisted", - phase: "success", - elapsedMs: 0, - cacheHit: true, - }); - } - - if (persistedRuntimeSnapshot) { - emitDataLoadMetric({ - requestId: createDataLoadRequestId("getInstanceRuntimeSnapshot"), - resource: "getInstanceRuntimeSnapshot", - page: "home", - instanceId: ua.instanceId, - instanceToken: ua.instanceToken, - source: "persisted", - phase: "success", - elapsedMs: 0, - cacheHit: true, - }); - } - - if (persistedStatusExtra) { - emitDataLoadMetric({ - requestId: createDataLoadRequestId("getStatusExtra"), - resource: "getStatusExtra", - page: "home", - instanceId: ua.instanceId, - instanceToken: ua.instanceToken, - source: "persisted", - phase: "success", - elapsedMs: 0, - cacheHit: true, - }); + // Emit persisted-cache metrics for each pre-loaded resource + for (const [resource, data] of [ + ["getInstanceConfigSnapshot", persistedConfigSnapshot], + ["getInstanceRuntimeSnapshot", persistedRuntimeSnapshot], + ["getStatusExtra", persistedStatusExtra], + ] as const) { + if (data) { + emitDataLoadMetric({ + requestId: createDataLoadRequestId(resource), + resource, page: "home", + instanceId: ua.instanceId, instanceToken: ua.instanceToken, + source: "persisted", phase: "success", elapsedMs: 0, cacheHit: true, + }); + } } setUpdateInfo(null); setCheckingUpdate(false); @@ -430,8 +344,6 @@ export function Home({ remoteErrorShownRef.current = false; remoteUnhealthyStreakRef.current = 0; statusInFlightRef.current = false; - duplicateInstallGuidanceSigRef.current = ""; - onboardingGuidanceSigRef.current = ""; }, [persistedConfigSnapshot, persistedRuntimeSnapshot, persistedStatusExtra, ua.instanceId, ua.instanceToken]); // P0: Unified poll loop — replaces 3 separate intervals + delayed model fetch. diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index 7029bbf2..fc63ccf8 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -1,9 +1,14 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { AutocompleteField } from "../components/AutocompleteField"; +import { useAppUpdate } from "../hooks/useAppUpdate"; +import { + emptyForm, normalizeOauthProvider, providerUsesOAuthAuth, + defaultOauthAuthRef, isEnvVarLikeAuthRef, defaultEnvAuthRef, + inferCredentialSource, providerSupportsOptionalApiKey, + type ProfileForm, type CredentialSource, +} from "../lib/profile-utils"; import type { FormEvent } from "react"; import { useTranslation } from "react-i18next"; -import { check } from "@tauri-apps/plugin-updater"; -import { relaunch } from "@tauri-apps/plugin-process"; -import { getVersion } from "@tauri-apps/api/app"; import { toast } from "sonner"; import { hasGuidanceEmitted, useApi } from "@/lib/use-api"; import { isAlreadyExplainedGuidanceError } from "@/lib/guidance"; @@ -52,18 +57,6 @@ import { AlertDialogTrigger, } from "@/components/ui/alert-dialog"; -type ProfileForm = { - id: string; - provider: string; - model: string; - authRef: string; - apiKey: string; - useCustomUrl: boolean; - baseUrl: string; - enabled: boolean; -}; - -type CredentialSource = "oauth" | "env" | "manual"; const MODEL_CATALOG_CACHE_TTL_MS = 5 * 60_000; let modelCatalogCache: { value: ModelCatalogProvider[]; expiresAt: number } | null = null; @@ -79,153 +72,9 @@ const PROVIDER_FALLBACK_OPTIONS = [ "vllm", ]; -function emptyForm(): ProfileForm { - return { - id: "", - provider: "", - model: "", - authRef: "", - apiKey: "", - useCustomUrl: false, - baseUrl: "", - enabled: true, - }; -} - -function normalizeOauthProvider(provider: string): string { - const lower = provider.trim().toLowerCase(); - if (lower === "openai_codex" || lower === "github-copilot" || lower === "copilot") { - return "openai-codex"; - } - return lower; -} - -function providerUsesOAuthAuth(provider: string): boolean { - return normalizeOauthProvider(provider) === "openai-codex"; -} - -function defaultOauthAuthRef(provider: string): string { - const normalized = normalizeOauthProvider(provider); - if (normalized === "openai-codex") { - return "openai-codex:default"; - } - return ""; -} - -function isEnvVarLikeAuthRef(authRef: string): boolean { - return /^[A-Za-z_][A-Za-z0-9_]*$/.test(authRef.trim()); -} - -function defaultEnvAuthRef(provider: string): string { - const normalized = normalizeOauthProvider(provider); - if (!normalized) return ""; - if (normalized === "openai-codex") { - return "OPENAI_CODEX_TOKEN"; - } - const providerEnv = normalized - .replace(/[^a-z0-9]+/g, "_") - .replace(/^_+|_+$/g, "") - .toUpperCase(); - return providerEnv ? `${providerEnv}_API_KEY` : ""; -} - -function inferCredentialSource(provider: string, authRef: string): CredentialSource { - const trimmed = authRef.trim(); - if (!trimmed) { - return providerUsesOAuthAuth(provider) ? "oauth" : "manual"; - } - if (providerUsesOAuthAuth(provider) && trimmed.toLowerCase().startsWith("openai-codex:")) { - return "oauth"; - } - return "env"; -} - -function providerSupportsOptionalApiKey(provider: string): boolean { - if (providerUsesOAuthAuth(provider)) { - return true; - } - const lower = provider.trim().toLowerCase(); - return [ - "ollama", - "lmstudio", - "lm-studio", - "localai", - "vllm", - "llamacpp", - "llama.cpp", - ].includes(lower); -} - -function AutocompleteField({ - value, - onChange, - onFocus, - options, - placeholder, -}: { - value: string; - onChange: (val: string) => void; - onFocus?: () => void; - options: { value: string; label: string }[]; - placeholder: string; -}) { - const [open, setOpen] = useState(false); - const wrapperRef = useRef(null); - - const filtered = options.filter( - (o) => - !value || - o.value.toLowerCase().includes(value.toLowerCase()) || - o.label.toLowerCase().includes(value.toLowerCase()), - ); - - useEffect(() => { - function handleClickOutside(e: MouseEvent) { - if (wrapperRef.current && !wrapperRef.current.contains(e.target as Node)) { - setOpen(false); - } - } - document.addEventListener("mousedown", handleClickOutside); - return () => document.removeEventListener("mousedown", handleClickOutside); - }, []); +// Profile utility functions extracted to ../lib/profile-utils.ts - return ( -
- { - onChange(e.target.value); - setOpen(true); - }} - onFocus={() => { - setOpen(true); - onFocus?.(); - }} - onKeyDown={(e) => { - if (e.key === "Escape") setOpen(false); - }} - /> - {open && filtered.length > 0 && ( -
- {filtered.map((option) => ( -
{ - e.preventDefault(); - onChange(option.value); - setOpen(false); - }} - > - {option.label} -
- ))} -
- )} -
- ); -} +// AutocompleteField extracted to ../components/AutocompleteField.tsx export function Settings({ onDataChange, @@ -260,66 +109,7 @@ export function Settings({ const [catalogRefreshed, setCatalogRefreshed] = useState(false); // ClawPal app version & self-update - const [appVersion, setAppVersion] = useState(""); - const [appUpdate, setAppUpdate] = useState<{ version: string; body?: string } | null>(null); - const [appUpdateChecking, setAppUpdateChecking] = useState(false); - const [appUpdating, setAppUpdating] = useState(false); - const [appUpdateProgress, setAppUpdateProgress] = useState(null); - - useEffect(() => { - getVersion().then(setAppVersion).catch(() => {}); - }, []); - - const handleCheckForUpdates = useCallback(async () => { - setAppUpdateChecking(true); - setAppUpdate(null); - try { - const update = await check(); - if (update) { - setAppUpdate({ version: update.version, body: update.body }); - } - } catch (e) { - console.error("Update check failed:", e); - } finally { - setAppUpdateChecking(false); - } - }, []); - - const handleAppUpdate = useCallback(async () => { - setAppUpdating(true); - setAppUpdateProgress(0); - try { - const update = await check(); - if (!update) return; - let totalBytes = 0; - let downloadedBytes = 0; - await update.downloadAndInstall((event) => { - if (event.event === "Started" && event.data.contentLength) { - totalBytes = event.data.contentLength; - } else if (event.event === "Progress") { - downloadedBytes += event.data.chunkLength; - if (totalBytes > 0) { - setAppUpdateProgress(Math.round((downloadedBytes / totalBytes) * 100)); - } - } else if (event.event === "Finished") { - setAppUpdateProgress(100); - } - }); - await relaunch(); - } catch (e) { - console.error("App update failed:", e); - setAppUpdating(false); - setAppUpdateProgress(null); - } - }, []); - - // Auto-trigger update check when navigated to from red dot - useEffect(() => { - if (hasAppUpdate) { - handleCheckForUpdates(); - onAppUpdateSeen?.(); - } - }, [hasAppUpdate, handleCheckForUpdates, onAppUpdateSeen]); + const { appVersion, appUpdate, appUpdateChecking, appUpdating, appUpdateProgress, handleCheckForUpdates, handleAppUpdate } = useAppUpdate(hasAppUpdate, onAppUpdateSeen); // Extract profiles from config on first load useEffect(() => { diff --git a/src/pages/StartPage.tsx b/src/pages/StartPage.tsx index 11df9009..88dcec40 100644 --- a/src/pages/StartPage.tsx +++ b/src/pages/StartPage.tsx @@ -1,5 +1,6 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; +import { deriveDockerPaths, normalizePathForCompare, dockerPathKey, dockerIdKey } from "../lib/start-page-utils"; import { listen } from "@tauri-apps/api/event"; import { PlusIcon } from "lucide-react"; import { Button } from "@/components/ui/button"; @@ -42,57 +43,8 @@ import type { import { shouldShowLocalNotInstalled } from "./start-page-instance-health"; import { buildInstanceCardSummary } from "./overview-loading"; -const DEFAULT_DOCKER_OPENCLAW_HOME = "~/.clawpal/docker-local"; -const DEFAULT_DOCKER_CLAWPAL_DATA_DIR = "~/.clawpal/docker-local/data"; -const SSH_PROBE_WATCHDOG_MS = 48_000; - -function deriveDockerPaths(instanceId: string): { openclawHome: string; clawpalDataDir: string } { - if (instanceId === "docker:local") { - return { - openclawHome: DEFAULT_DOCKER_OPENCLAW_HOME, - clawpalDataDir: DEFAULT_DOCKER_CLAWPAL_DATA_DIR, - }; - } - const suffixRaw = instanceId.startsWith("docker:") ? instanceId.slice(7) : instanceId; - const suffix = suffixRaw === "local" - ? "docker-local" - : suffixRaw.startsWith("docker-") - ? suffixRaw - : `docker-${suffixRaw || "local"}`; - const openclawHome = `~/.clawpal/${suffix}`; - return { - openclawHome, - clawpalDataDir: `${openclawHome}/data`, - }; -} - -function normalizePathForCompare(raw: string): string { - const trimmed = raw.trim().replace(/\\/g, "/"); - if (!trimmed) return ""; - return trimmed.replace(/\/+$/, ""); -} - -function dockerPathKey(raw: string): string { - const normalized = normalizePathForCompare(raw); - if (!normalized) return ""; - const segments = normalized.split("/").filter(Boolean); - const clawpalIdx = segments.lastIndexOf(".clawpal"); - if (clawpalIdx >= 0 && clawpalIdx + 1 < segments.length) { - const dir = segments[clawpalIdx + 1]; - if (dir.startsWith("docker-")) return `docker-dir:${dir.toLowerCase()}`; - } - const last = segments[segments.length - 1] || ""; - if (last.startsWith("docker-")) return `docker-dir:${last.toLowerCase()}`; - return `path:${normalized.toLowerCase()}`; -} -function dockerIdKey(rawId: string): string { - if (!rawId.startsWith("docker:")) return ""; - let slug = rawId.slice("docker:".length).trim().toLowerCase(); - if (!slug) slug = "local"; - if (slug.startsWith("docker-")) slug = slug.slice("docker-".length); - return `docker-id:${slug}`; -} +const SSH_PROBE_WATCHDOG_MS = 48_000; interface StartPageProps { dockerInstances: DockerInstance[]; diff --git a/tests/e2e/perf/home-perf.spec.mjs b/tests/e2e/perf/home-perf.spec.mjs index ed39f66d..c708619b 100644 --- a/tests/e2e/perf/home-perf.spec.mjs +++ b/tests/e2e/perf/home-perf.spec.mjs @@ -75,6 +75,7 @@ test("home page render timing", async ({ page }) => { content: ` window.__PERF_FIXTURES__ = ${JSON.stringify(fixtures)}; window.__PERF_MOCK_LATENCY__ = "${MOCK_LATENCY_MS}"; + window.__PERF_COLD_START_SKIP__ = "1"; ${MOCK_SCRIPT} `, }); @@ -82,6 +83,10 @@ test("home page render timing", async ({ page }) => { const allRuns = []; for (let i = 0; i < RUNS; i++) { + // Clear persisted read cache so each run is a true cold start + await page.evaluate(() => { + try { localStorage.clear(); sessionStorage.clear(); } catch {} + }).catch(() => {}); await page.goto("http://localhost:1420"); // Wait for app to render the Start page, then click the local instance card diff --git a/tests/e2e/perf/tauri-ipc-mock.js b/tests/e2e/perf/tauri-ipc-mock.js index 168726e6..ff57dce5 100644 --- a/tests/e2e/perf/tauri-ipc-mock.js +++ b/tests/e2e/perf/tauri-ipc-mock.js @@ -6,12 +6,28 @@ const FIXTURES = window.__PERF_FIXTURES__ || {}; const LATENCY_MS = parseInt(window.__PERF_MOCK_LATENCY__ || "50", 10); + let _runtimeSnapshotCallCount = 0; + const _COLD_START_SKIP = parseInt(window.__PERF_COLD_START_SKIP__ || "0", 10); + const handlers = { - get_instance_config_snapshot: () => FIXTURES.configSnapshot, - get_instance_runtime_snapshot: () => FIXTURES.runtimeSnapshot, - get_status_extra: () => FIXTURES.statusExtra, + get_instance_config_snapshot: () => { + if (_COLD_START_SKIP > 0 && _runtimeSnapshotCallCount <= _COLD_START_SKIP) return null; + return FIXTURES.configSnapshot; + }, + get_instance_runtime_snapshot: () => { + _runtimeSnapshotCallCount++; + if (_COLD_START_SKIP > 0 && _runtimeSnapshotCallCount <= _COLD_START_SKIP) return null; + return FIXTURES.runtimeSnapshot; + }, + get_status_extra: () => { + if (_COLD_START_SKIP > 0 && _runtimeSnapshotCallCount <= _COLD_START_SKIP) return {}; + return FIXTURES.statusExtra; + }, list_model_profiles: () => FIXTURES.modelProfiles || [], - get_status_light: () => FIXTURES.runtimeSnapshot?.status || { healthy: true, activeAgents: 2 }, + get_status_light: () => { + if (_COLD_START_SKIP > 0 && _runtimeSnapshotCallCount <= _COLD_START_SKIP) return { healthy: null, activeAgents: 0 }; + return FIXTURES.runtimeSnapshot?.status || { healthy: true, activeAgents: 2 }; + }, queued_commands_count: () => 0, check_openclaw_update: () => ({ upgradeAvailable: false, latestVersion: null, installedVersion: FIXTURES.statusExtra?.openclawVersion }), log_app_event: () => true, @@ -53,7 +69,10 @@ precheck_auth: () => ({ ok: true }), connect_local_instance: () => null, ssh_status: () => ({ connected: false }), - list_agents_overview: () => FIXTURES.runtimeSnapshot?.agents || [], + list_agents_overview: () => { + if (_COLD_START_SKIP > 0 && _runtimeSnapshotCallCount <= _COLD_START_SKIP) return []; + return FIXTURES.runtimeSnapshot?.agents || []; + }, record_install_experience: () => null, "plugin:event|listen": () => 0, "plugin:event|unlisten": () => null,