From daafd0be043353ded0690031db754f3e623dd98d Mon Sep 17 00:00:00 2001 From: abraxas914 Date: Thu, 9 Jul 2026 15:02:49 +0800 Subject: [PATCH 01/80] ci: add desktop-release-package workflow for fork CI Co-Authored-By: Claude Opus 4.6 --- .github/workflows/desktop-release-package.yml | 706 ++++++++++++++++++ 1 file changed, 706 insertions(+) create mode 100644 .github/workflows/desktop-release-package.yml diff --git a/.github/workflows/desktop-release-package.yml b/.github/workflows/desktop-release-package.yml new file mode 100644 index 000000000..6156ef56f --- /dev/null +++ b/.github/workflows/desktop-release-package.yml @@ -0,0 +1,706 @@ +name: Build Desktop Portable Packages + +# Triggers: +# - workflow_dispatch -> build CI artifacts for testing (choose a target platform) +# - push tag desktop-portable-* -> build all three platforms and publish them +# together into ONE GitHub Release (tag = the pushed tag) +# Plain pushes to branches do NOT build (avoids 3 heavy Rust builds per commit). +"on": + push: + tags: + - "desktop-portable-*" + workflow_dispatch: + inputs: + target: + description: "Which platform(s) to build (artifacts only; release happens on tag push)" + required: false + default: "all" + type: choice + options: + - "all" + - "windows" + - "linux" + - "macos" + +permissions: + contents: write + +jobs: + # ---------------------------------------------------------------------------- + build-windows: + name: Windows portable + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event.inputs.target == 'all' || github.event.inputs.target == 'windows' }} + runs-on: windows-latest + steps: + - name: Checkout repository + uses: actions/checkout@v5 + + - name: Set up Node.js + uses: actions/setup-node@v5 + with: + node-version: 20 + + - name: Set up Rust + uses: dtolnay/rust-toolchain@stable + + - name: Cache Rust build + uses: Swatinem/rust-cache@v2 + with: + workspaces: frontends/desktop/src-tauri -> target + + - name: Install desktop dependencies + working-directory: frontends/desktop + run: npm install + + - name: Build Windows desktop exe + working-directory: frontends/desktop + run: npm run tauri build -- --bundles nsis + + - name: Assemble self-contained portable bundle + shell: bash + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + set -euo pipefail + + EXE_SRC="$(find frontends/desktop/src-tauri/target/release -maxdepth 1 -type f -name 'ga-desktop.exe' | head -n 1)" + [[ -n "$EXE_SRC" ]] || { echo "ga-desktop.exe not found" >&2; exit 1; } + + PKG="artifacts/windows/GenericAgent-Desktop-Windows-Portable" + RUNTIME="$PKG/runtime" + mkdir -p "$RUNTIME" + + # exe at the top level, named GenericAgent (typical portable form) + cp "$EXE_SRC" "$PKG/GenericAgent.exe" + cp frontends/desktop/packaging/scripts/windows/install_windows.ps1 "$RUNTIME/install_windows.ps1" + # Uninstaller: double-click entry at top level, worker script under runtime/. + cp frontends/desktop/packaging/scripts/windows/uninstall.bat "$PKG/uninstall.bat" + cp frontends/desktop/packaging/scripts/windows/uninstall_windows.ps1 "$RUNTIME/uninstall_windows.ps1" + + # Embedded Python (python-build-standalone, windows x86_64, 3.12 install_only). + # browser_download_url is URL-encoded ('+' -> '%2B'); match loosely with '.*'. + PBS_URL="$(curl -fsSL -H "Authorization: Bearer $GH_TOKEN" https://api.github.com/repos/astral-sh/python-build-standalone/releases/latest \ + | grep -o '"browser_download_url": *"[^"]*"' \ + | grep 'cpython-3\.12\.[0-9].*x86_64-pc-windows-msvc-install_only\.tar\.gz' \ + | head -1 | sed -E 's/.*"(https[^"]+)"/\1/')" + [[ -n "$PBS_URL" ]] || { echo "Could not resolve python-build-standalone download URL" >&2; exit 1; } + echo "Python build-standalone: $PBS_URL" + curl -fsSL -o /tmp/pbs.tar.gz "$PBS_URL" + tar -xzf /tmp/pbs.tar.gz -C "$RUNTIME" # extracts a 'python/' dir (python.exe at top) + PY="$RUNTIME/python/python.exe" + "$PY" --version + + # Offline wheels (native win_amd64 wheels for the embedded python) + mkdir -p "$RUNTIME/wheels" + "$PY" -m pip download --dest "$RUNTIME/wheels" \ + "requests>=2.28" "beautifulsoup4>=4.12" "bottle>=0.12" "simple-websocket-server>=0.4" "aiohttp>=3.9" psutil \ + fastapi uvicorn websockets pydantic setuptools wheel + + # Runtime source (project root minus heavy/dev/build dirs) + mkdir -p "$RUNTIME/app" + tar \ + --exclude='./.git' --exclude='./.github' \ + --exclude='./frontends/desktop/src-tauri' \ + --exclude='./frontends/desktop/node_modules' \ + --exclude='./frontends/desktop/packaging' --exclude='./docs' \ + --exclude='./assets/demo' --exclude='./assets/images' \ + --exclude='./assets/GenericAgent_Technical_Report.pdf' \ + --exclude='./artifacts' \ + --exclude='*/node_modules' --exclude='*/target' \ + --exclude='*/.venv' --exclude='./.venv' \ + --exclude='*/__pycache__' --exclude='*.pyc' \ + -cf - . | tar -xf - -C "$RUNTIME/app" + test -f "$RUNTIME/app/agentmain.py" + test -f "$RUNTIME/app/frontends/desktop_bridge.py" + test -f "$RUNTIME/app/frontends/desktop/static/index.html" + + # Drop python debug symbols (.pdb) to slim the package (~80MB) + find "$RUNTIME/python" -name '*.pdb' -delete 2>/dev/null || true + + cat > "$PKG/readme.txt" <<'EOF' + ================ 中文 ================ + GenericAgent Desktop — Windows 便携版（自包含） + + 无需安装 Python、无需联网装依赖、无需源码仓库——全部已内置。 + + 前置条件 + - Windows 10/11 x64 + - Microsoft Edge WebView2 运行时（Win11 一般自带；缺失时首次运行会提示安装） + + 使用 + 1. 解压到任意目录（路径建议不含特殊字符）。 + 2. 双击 GenericAgent.exe。 + 3. 首次启动会自动离线准备运行环境（建虚拟环境、装依赖），界面显示进度，完成后进入主界面。 + 4. 之后启动直接秒进。 + + 说明 + - 想真正对话，仍需在程序里配置模型 / API Key。 + - 首次准备完成后不要移动本文件夹；若已移动，删除 runtime\app\.venv 后重新启动即可重建。 + - runtime\ 是内置运行环境与源码，正常使用无需改动。 + + ================ English ================ + GenericAgent Desktop — Windows Portable (self-contained) + + No Python install, no internet for dependencies, no source checkout — everything is bundled. + + Requirements + - Windows 10/11 x64 + - Microsoft Edge WebView2 runtime (usually preinstalled on Win11; you are prompted if missing) + + Usage + 1. Extract anywhere (a path without special characters is recommended). + 2. Double-click GenericAgent.exe. + 3. The first launch prepares the runtime offline (creates a venv, installs deps) with a + progress UI, then opens the main window. + 4. Subsequent launches start instantly. + + Notes + - To actually chat, configure a model / API key inside the app. + - Do not move this folder after the first setup; if you did, delete runtime\app\.venv and relaunch to rebuild. + - runtime\ holds the bundled runtime and source; no need to touch it. + EOF + sed -i 's/^ //' "$PKG/readme.txt" + + echo "Package tree (top levels):" + find "$PKG" -maxdepth 2 -printf '%y %p\n' | sort | head -40 + + - name: Zip portable package + shell: pwsh + run: | + New-Item -ItemType Directory -Force -Path artifacts/windows/out | Out-Null + Compress-Archive -Path artifacts/windows/GenericAgent-Desktop-Windows-Portable ` + -DestinationPath artifacts/windows/out/GenericAgent-Desktop-Windows-Portable.zip -Force + $h = Get-FileHash artifacts/windows/out/GenericAgent-Desktop-Windows-Portable.zip -Algorithm SHA256 + "{0} GenericAgent-Desktop-Windows-Portable.zip" -f $h.Hash.ToLowerInvariant() | + Set-Content -Encoding ASCII artifacts/windows/out/SHA256SUMS-windows.txt + Get-ChildItem artifacts/windows/out | Format-Table Name, Length + + - name: Upload workflow artifact + uses: actions/upload-artifact@v7 + with: + name: GenericAgent-Desktop-Windows-Portable-${{ github.run_number }} + path: | + artifacts/windows/out/GenericAgent-Desktop-Windows-Portable.zip + artifacts/windows/out/SHA256SUMS-windows.txt + if-no-files-found: error + + - name: Publish into unified Release (tag push only) + if: ${{ startsWith(github.ref, 'refs/tags/') }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: bash + run: | + set -euo pipefail + TAG_NAME="${{ github.ref_name }}" + TITLE="GenericAgent Desktop ${TAG_NAME}" + cat > "${RUNNER_TEMP:-/tmp}/ga_notes.md" <<'EOF' + GenericAgent Desktop 桌面版 / Desktop + + 无需自行安装 Python、无需联网安装依赖、无需源码；首次启动会自动准备内置运行环境。 + No separate Python install, no internet for dependencies, no source checkout required; the bundled runtime is prepared on first launch. + + ## 安装方法 / Installation + - Windows: 下载 `GenericAgent-Desktop-Windows-Portable.zip`，解压后双击 `GenericAgent.exe` 启动。卸载时先退出应用，再双击包内 `uninstall.bat`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Windows-Portable.zip`, extract it, then double-click `GenericAgent.exe`. To uninstall, quit the app, double-click `uninstall.bat`, then delete the extracted folder. + - Linux: 下载 `GenericAgent-Desktop-Linux-Portable.tar.gz`，解压后执行 `chmod +x GenericAgent.AppImage`，再运行 `./GenericAgent.AppImage`。卸载时先退出应用，再运行 `./uninstall.sh`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Linux-Portable.tar.gz`, extract it, run `chmod +x GenericAgent.AppImage`, then launch `./GenericAgent.AppImage`. To uninstall, quit the app, run `./uninstall.sh`, then delete the extracted folder. + - macOS: 下载 `GenericAgent-Desktop-macOS.dmg`，双击打开 DMG，把 `GenericAgent.app` 拖入 `Applications`，之后在“应用程序 / Applications”中启动。若出现“无法验证开发者”等提示，先双击 DMG 内的 `open_anyway.command`，再启动。卸载时先退出应用，再从 Applications 删除 `GenericAgent.app`。 + Download `GenericAgent-Desktop-macOS.dmg`, open it, drag `GenericAgent.app` to `Applications`, then launch it from Applications. If macOS says the developer cannot be verified, double-click `open_anyway.command` inside the DMG first, then launch again. To uninstall, quit the app, then delete `GenericAgent.app` from Applications. + + ## 首次启动 / First launch + 首次启动会自动离线准备运行环境（安装依赖），有进度条，完成后进入主界面；之后启动会更快。 + The first launch prepares the runtime offline (installs deps) with a progress bar, then opens the main window; later launches are faster. + + ## 说明 / Notes + - 想真正对话需在程序内配置模型 / API Key。Configure a model / API key in-app to start chatting. + - Windows/Linux 为便携包，可整体移动到任意目录后继续使用。Windows/Linux packages are portable and can be moved as a whole folder. + - Windows/Linux 包内附 `readme.txt`（中英）。Windows/Linux packages include a bilingual `readme.txt`. + EOF + # Create the shared release if it does not exist yet (another OS job may win the race). + # Race-safe: the 3 OS jobs share ONE release. Retry create until the release + # actually exists (a simultaneous create from another job can fail), so the + # upload below never races a not-yet-created release. + for _ in $(seq 1 15); do + gh release view "$TAG_NAME" >/dev/null 2>&1 && break + gh release create "$TAG_NAME" --target "${{ github.sha }}" --title "$TITLE" --notes-file "${RUNNER_TEMP:-/tmp}/ga_notes.md" --prerelease 2>/dev/null || true + sleep 3 + done + gh release upload "$TAG_NAME" artifacts/windows/out/* --clobber + + # ---------------------------------------------------------------------------- + build-linux: + name: Linux portable + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event.inputs.target == 'all' || github.event.inputs.target == 'linux' }} + runs-on: ubuntu-24.04 + steps: + - name: Checkout repository + uses: actions/checkout@v5 + + - name: Set up Node.js + uses: actions/setup-node@v5 + with: + node-version: 20 + + - name: Set up Rust + uses: dtolnay/rust-toolchain@stable + + - name: Cache Rust build + uses: Swatinem/rust-cache@v2 + with: + workspaces: frontends/desktop/src-tauri -> target + + - name: Install Tauri Linux dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + libwebkit2gtk-4.1-dev \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + patchelf + + - name: Install desktop dependencies + working-directory: frontends/desktop + run: npm install + + - name: Build Linux AppImage + working-directory: frontends/desktop + run: npm run tauri build -- --bundles appimage + + - name: Assemble self-contained portable bundle + shell: bash + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + set -euo pipefail + APPIMAGE_SRC="$(find frontends/desktop/src-tauri/target/release/bundle/appimage -maxdepth 1 -type f -name '*.AppImage' | head -n 1)" + [[ -n "$APPIMAGE_SRC" ]] || { echo "No AppImage found" >&2; exit 1; } + + PKG="artifacts/linux/GenericAgent-Desktop-Linux-Portable" + RUNTIME="$PKG/runtime" + mkdir -p "$RUNTIME" + + # Stable internal name so the generated .desktop Exec= never changes on upgrades. + cp "$APPIMAGE_SRC" "$PKG/GenericAgent.AppImage" + chmod +x "$PKG/GenericAgent.AppImage" + # Icon for the generated .desktop launcher (Icon= needs a real image file on Linux). + cp frontends/desktop/src-tauri/icons/icon.png "$PKG/GenericAgent.png" + cp frontends/desktop/packaging/scripts/linux/install_linux.sh "$RUNTIME/install_linux.sh" + chmod +x "$RUNTIME/install_linux.sh" + # Uninstaller: top-level entry next to the AppImage. + cp frontends/desktop/packaging/scripts/linux/uninstall.sh "$PKG/uninstall.sh" + chmod +x "$PKG/uninstall.sh" + + # Embedded Python (python-build-standalone, linux x86_64, 3.12 install_only). + PBS_URL="$(curl -fsSL -H "Authorization: Bearer $GH_TOKEN" https://api.github.com/repos/astral-sh/python-build-standalone/releases/latest \ + | grep -o '"browser_download_url": *"[^"]*"' \ + | grep 'cpython-3\.12\.[0-9].*x86_64-unknown-linux-gnu-install_only\.tar\.gz' \ + | head -1 | sed -E 's/.*"(https[^"]+)"/\1/')" + [[ -n "$PBS_URL" ]] || { echo "Could not resolve python-build-standalone download URL" >&2; exit 1; } + echo "Python build-standalone: $PBS_URL" + curl -fsSL -o /tmp/pbs.tar.gz "$PBS_URL" + tar -xzf /tmp/pbs.tar.gz -C "$RUNTIME" # extracts a 'python/' dir + PY="$RUNTIME/python/bin/python3" + "$PY" --version + + # Offline wheels (native linux wheels for the embedded python) + mkdir -p "$RUNTIME/wheels" + "$PY" -m pip download --dest "$RUNTIME/wheels" \ + "requests>=2.28" "beautifulsoup4>=4.12" "bottle>=0.12" "simple-websocket-server>=0.4" "aiohttp>=3.9" psutil \ + fastapi uvicorn websockets pydantic setuptools wheel + + # Runtime source (project root minus heavy/dev/build dirs) + mkdir -p "$RUNTIME/app" + tar \ + --exclude='./.git' --exclude='./.github' \ + --exclude='./frontends/desktop/src-tauri' \ + --exclude='./frontends/desktop/node_modules' \ + --exclude='./frontends/desktop/packaging' --exclude='./docs' \ + --exclude='./assets/demo' --exclude='./assets/images' \ + --exclude='./assets/GenericAgent_Technical_Report.pdf' \ + --exclude='./artifacts' \ + --exclude='*/node_modules' --exclude='*/target' \ + --exclude='*/.venv' --exclude='./.venv' \ + --exclude='*/__pycache__' --exclude='*.pyc' \ + -cf - . | tar -xf - -C "$RUNTIME/app" + test -f "$RUNTIME/app/agentmain.py" + test -f "$RUNTIME/app/frontends/desktop_bridge.py" + test -f "$RUNTIME/app/frontends/desktop/static/index.html" + + # Drop python debug/cache bits to slim the package + find "$RUNTIME/python" -name '__pycache__' -type d -prune -exec rm -rf {} + 2>/dev/null || true + + cat > "$PKG/readme.txt" <<'EOF' + ================ 中文 ================ + GenericAgent Desktop — Linux 便携版（自包含） + + 无需安装 Python、无需联网装依赖、无需源码仓库——全部已内置。 + + 前置条件 + - Linux x86_64（glibc，常见发行版即可） + - 桌面环境 + FUSE（运行 AppImage 所需；多数发行版自带） + + 使用 + 1. 解压到任意目录（路径建议不含特殊字符）。 + 2. 给 AppImage 执行权限并运行： + chmod +x GenericAgent.AppImage + ./GenericAgent.AppImage + 3. 首次启动会自动离线准备运行环境（建虚拟环境、装依赖），界面显示进度，完成后进入主界面。 + 4. 之后启动直接秒进。 + + 说明 + - 想真正对话，仍需在程序里配置模型 / API Key。 + - 首次准备完成后不要移动本文件夹；若已移动，删除 runtime/app/.venv 后重新启动即可重建。 + - runtime/ 是内置运行环境与源码，正常使用无需改动。 + + ================ English ================ + GenericAgent Desktop — Linux Portable (self-contained) + + No Python install, no internet for dependencies, no source checkout — everything is bundled. + + Requirements + - Linux x86_64 (glibc; common distributions work) + - A desktop environment + FUSE (required to run the AppImage; preinstalled on most distros) + + Usage + 1. Extract anywhere (a path without special characters is recommended). + 2. Make the AppImage executable and run it: + chmod +x GenericAgent.AppImage + ./GenericAgent.AppImage + 3. The first launch prepares the runtime offline (creates a venv, installs deps) with a + progress UI, then opens the main window. + 4. Subsequent launches start instantly. + + Notes + - To actually chat, configure a model / API key inside the app. + - Do not move this folder after the first setup; if you did, delete runtime/app/.venv and relaunch to rebuild. + - runtime/ holds the bundled runtime and source; no need to touch it. + EOF + sed -i 's/^ //' "$PKG/readme.txt" + + mkdir -p artifacts/linux/out + tar -C artifacts/linux -czf artifacts/linux/out/GenericAgent-Desktop-Linux-Portable.tar.gz GenericAgent-Desktop-Linux-Portable + ( cd artifacts/linux/out && sha256sum GenericAgent-Desktop-Linux-Portable.tar.gz > SHA256SUMS-linux.txt ) + + tar -tzf artifacts/linux/out/GenericAgent-Desktop-Linux-Portable.tar.gz > /tmp/pkglist.txt + echo "Package contents (first 40 of $(wc -l < /tmp/pkglist.txt) entries):" + head -40 /tmp/pkglist.txt + ls -lh artifacts/linux/out + + - name: Upload workflow artifact + uses: actions/upload-artifact@v7 + with: + name: GenericAgent-Desktop-Linux-Portable-${{ github.run_number }} + path: | + artifacts/linux/out/GenericAgent-Desktop-Linux-Portable.tar.gz + artifacts/linux/out/SHA256SUMS-linux.txt + if-no-files-found: error + + - name: Publish into unified Release (tag push only) + if: ${{ startsWith(github.ref, 'refs/tags/') }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: bash + run: | + set -euo pipefail + TAG_NAME="${{ github.ref_name }}" + TITLE="GenericAgent Desktop ${TAG_NAME}" + cat > "${RUNNER_TEMP:-/tmp}/ga_notes.md" <<'EOF' + GenericAgent Desktop 桌面版 / Desktop + + 无需自行安装 Python、无需联网安装依赖、无需源码；首次启动会自动准备内置运行环境。 + No separate Python install, no internet for dependencies, no source checkout required; the bundled runtime is prepared on first launch. + + ## 安装方法 / Installation + - Windows: 下载 `GenericAgent-Desktop-Windows-Portable.zip`，解压后双击 `GenericAgent.exe` 启动。卸载时先退出应用，再双击包内 `uninstall.bat`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Windows-Portable.zip`, extract it, then double-click `GenericAgent.exe`. To uninstall, quit the app, double-click `uninstall.bat`, then delete the extracted folder. + - Linux: 下载 `GenericAgent-Desktop-Linux-Portable.tar.gz`，解压后执行 `chmod +x GenericAgent.AppImage`，再运行 `./GenericAgent.AppImage`。卸载时先退出应用，再运行 `./uninstall.sh`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Linux-Portable.tar.gz`, extract it, run `chmod +x GenericAgent.AppImage`, then launch `./GenericAgent.AppImage`. To uninstall, quit the app, run `./uninstall.sh`, then delete the extracted folder. + - macOS: 下载 `GenericAgent-Desktop-macOS.dmg`，双击打开 DMG，把 `GenericAgent.app` 拖入 `Applications`，之后在“应用程序 / Applications”中启动。若出现“无法验证开发者”等提示，先双击 DMG 内的 `open_anyway.command`，再启动。卸载时先退出应用，再从 Applications 删除 `GenericAgent.app`。 + Download `GenericAgent-Desktop-macOS.dmg`, open it, drag `GenericAgent.app` to `Applications`, then launch it from Applications. If macOS says the developer cannot be verified, double-click `open_anyway.command` inside the DMG first, then launch again. To uninstall, quit the app, then delete `GenericAgent.app` from Applications. + + ## 首次启动 / First launch + 首次启动会自动离线准备运行环境（安装依赖），有进度条，完成后进入主界面；之后启动会更快。 + The first launch prepares the runtime offline (installs deps) with a progress bar, then opens the main window; later launches are faster. + + ## 说明 / Notes + - 想真正对话需在程序内配置模型 / API Key。Configure a model / API key in-app to start chatting. + - Windows/Linux 为便携包，可整体移动到任意目录后继续使用。Windows/Linux packages are portable and can be moved as a whole folder. + - Windows/Linux 包内附 `readme.txt`（中英）。Windows/Linux packages include a bilingual `readme.txt`. + EOF + # Race-safe: the 3 OS jobs share ONE release. Retry create until the release + # actually exists (a simultaneous create from another job can fail), so the + # upload below never races a not-yet-created release. + for _ in $(seq 1 15); do + gh release view "$TAG_NAME" >/dev/null 2>&1 && break + gh release create "$TAG_NAME" --target "${{ github.sha }}" --title "$TITLE" --notes-file "${RUNNER_TEMP:-/tmp}/ga_notes.md" --prerelease 2>/dev/null || true + sleep 3 + done + gh release upload "$TAG_NAME" artifacts/linux/out/* --clobber + + # ---------------------------------------------------------------------------- + build-macos: + name: macOS DMG + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event.inputs.target == 'all' || github.event.inputs.target == 'macos' }} + runs-on: macos-latest + steps: + - name: Checkout repository + uses: actions/checkout@v5 + + - name: Set up Node.js + uses: actions/setup-node@v5 + with: + node-version: 20 + + - name: Set up Rust + uses: dtolnay/rust-toolchain@stable + + - name: Cache Rust build + uses: Swatinem/rust-cache@v2 + with: + workspaces: frontends/desktop/src-tauri -> target + + - name: Install desktop dependencies + working-directory: frontends/desktop + run: npm install + + - name: Build macOS .app + working-directory: frontends/desktop + run: npm run tauri build -- --bundles app + + - name: Assemble self-contained portable bundle and DMG app + shell: bash + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + set -euo pipefail + APP_SRC="$(find frontends/desktop/src-tauri/target/release/bundle/macos -maxdepth 1 -name '*.app' -type d | head -n 1)" + [[ -n "$APP_SRC" ]] || { echo "No .app found" >&2; exit 1; } + + # Build one runtime/ tree, then reuse it for both macOS deliverables: + # 1) Portable zip: GenericAgent.app + runtime/ + helper scripts. + # 2) Standard DMG: GenericAgent.app with runtime embedded in Contents/Resources/runtime. + RUNTIME_SRC="artifacts/macos/runtime-src" + mkdir -p "$RUNTIME_SRC" + cp frontends/desktop/packaging/scripts/macos/install_macos.sh "$RUNTIME_SRC/install_macos.sh" + chmod +x "$RUNTIME_SRC/install_macos.sh" + + # Embedded Python (python-build-standalone, macOS, 3.12 install_only; aarch64 preferred). + PBS_URL="$(python3 - <<'PY' + import json, os, urllib.request + api='https://api.github.com/repos/astral-sh/python-build-standalone/releases/latest' + req=urllib.request.Request(api) + token=os.environ.get('GH_TOKEN') + if token: + req.add_header('Authorization', 'Bearer ' + token) + data=json.load(urllib.request.urlopen(req, timeout=60)) + assets=data.get('assets', []) + for arch in ('aarch64-apple-darwin', 'x86_64-apple-darwin'): + for a in assets: + name=a.get('name','') + if 'cpython-3.12' in name and arch in name and name.endswith('install_only.tar.gz') and 'stripped' not in name: + print(a['browser_download_url']); raise SystemExit + raise SystemExit('No suitable python-build-standalone macOS asset found') + PY + )" + echo "Python build-standalone: $PBS_URL" + curl -L --fail --retry 3 -o /tmp/pbs-macos.tar.gz "$PBS_URL" + tar -xzf /tmp/pbs-macos.tar.gz -C "$RUNTIME_SRC" # extracts a 'python/' dir + PY="$RUNTIME_SRC/python/bin/python3" + "$PY" --version + + # Offline wheels + mkdir -p "$RUNTIME_SRC/wheels" + "$PY" -m pip download --dest "$RUNTIME_SRC/wheels" \ + "requests>=2.28" "beautifulsoup4>=4.12" "bottle>=0.12" "simple-websocket-server>=0.4" "aiohttp>=3.9" psutil \ + fastapi uvicorn websockets pydantic setuptools wheel + + # Runtime source (project root minus heavy/dev/build dirs) — bsdtar exclude syntax. + mkdir -p "$RUNTIME_SRC/app" + tar \ + --exclude='.git' --exclude='.github' \ + --exclude='frontends/desktop/src-tauri' \ + --exclude='frontends/desktop/node_modules' \ + --exclude='frontends/desktop/packaging' --exclude='docs' \ + --exclude='assets/demo' --exclude='assets/images' \ + --exclude='assets/GenericAgent_Technical_Report.pdf' \ + --exclude='artifacts' \ + --exclude='*/node_modules' --exclude='*/target' \ + --exclude='*/.venv' --exclude='.venv' \ + --exclude='*/__pycache__' --exclude='*.pyc' \ + -cf - . | tar -xf - -C "$RUNTIME_SRC/app" + test -f "$RUNTIME_SRC/app/agentmain.py" + test -f "$RUNTIME_SRC/app/frontends/desktop_bridge.py" + test -f "$RUNTIME_SRC/app/frontends/desktop/static/index.html" + + PORTABLE="artifacts/macos/GenericAgent-Desktop-macOS-Portable" + DMG_STAGE="artifacts/macos/dmg-stage" + DMG_APP="$DMG_STAGE/GenericAgent.app" + mkdir -p "$PORTABLE" "$DMG_STAGE" + + # Portable zip: keep the existing release shape and helper scripts. + ditto "$APP_SRC" "$PORTABLE/GenericAgent.app" + ditto "$RUNTIME_SRC" "$PORTABLE/runtime" + cp frontends/desktop/packaging/scripts/macos/uninstall.command "$PORTABLE/uninstall.command" + chmod +x "$PORTABLE/uninstall.command" + cat > "$PORTABLE/Start GenericAgent.command" <<'EOF' + #!/bin/bash + DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + xattr -cr "$DIR/GenericAgent.app" 2>/dev/null || true + open "$DIR/GenericAgent.app" + EOF + chmod +x "$PORTABLE/Start GenericAgent.command" + + cat > "$PORTABLE/readme.txt" <<'EOF' + ================ 中文 ================ + GenericAgent Desktop — macOS 便携版（自包含） + + 无需安装 Python、无需联网装依赖、无需源码仓库——全部已内置。 + + 使用 + 推荐：双击 “Start GenericAgent.command” 启动。也可直接双击 GenericAgent.app。 + 请保持目录结构不变：GenericAgent.app 与 runtime/ 必须在同一目录下。 + + 卸载 + 双击 uninstall.command，或退出程序后删除整个便携文件夹。 + + ================ English ================ + GenericAgent Desktop — macOS Portable (self-contained) + + No Python install, no internet for dependencies, no source checkout — everything is bundled. + + Usage + Recommended: double-click "Start GenericAgent.command". You can also double-click GenericAgent.app. + Keep the folder layout intact: GenericAgent.app and runtime/ must stay in the same directory. + + Uninstall + Double-click uninstall.command, or quit the app and delete the whole portable folder. + EOF + sed -i '' 's/^ //' "$PORTABLE/readme.txt" + + codesign --force --deep --sign - "$PORTABLE/GenericAgent.app" + codesign --verify --deep --strict "$PORTABLE/GenericAgent.app" || true + + # Standard DMG: GenericAgent.app + Applications alias + first-launch helper/guide. + ditto "$APP_SRC" "$DMG_APP" + mkdir -p "$DMG_APP/Contents/Resources" + ditto "$RUNTIME_SRC" "$DMG_APP/Contents/Resources/runtime" + codesign --force --deep --sign - "$DMG_APP" + codesign --verify --deep --strict "$DMG_APP" || true + ln -s /Applications "$DMG_STAGE/Applications" + + cat > "$DMG_STAGE/open_anyway.command" <<'EOF' + #!/bin/bash + set -e + DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + TARGET="/Applications/GenericAgent.app" + if [[ ! -d "$TARGET" ]]; then + TARGET="$DIR/GenericAgent.app" + fi + xattr -cr "$TARGET" 2>/dev/null || true + osascript -e 'display dialog "GenericAgent 已处理完成。请将 GenericAgent.app 拖入 Applications 后，从 Applications 中启动；如果已经安装，可以直接重新打开。" buttons {"OK"} default button "OK"' >/dev/null 2>&1 || true + EOF + chmod +x "$DMG_STAGE/open_anyway.command" + + cat > "$DMG_STAGE/readme.txt" <<'EOF' + ================ 中文 ================ + GenericAgent Desktop — macOS DMG 安装版 + + 安装 + 1. 双击打开 GenericAgent-Desktop-macOS.dmg。 + 2. 将 GenericAgent.app 拖入 Applications。 + 3. 打开“应用程序 / Applications”，双击 GenericAgent.app 启动。 + + 若出现“无法验证开发者”“Apple 无法检查其是否包含恶意软件”或无法打开： + 1. 回到 DMG 窗口。 + 2. 双击“open_anyway.command”。 + 3. 再从 Applications 中打开 GenericAgent.app。 + 也可以右键 GenericAgent.app，选择“打开”。 + + 卸载 + 先退出 GenericAgent，再从 Applications 删除 GenericAgent.app。 + + ================ English ================ + GenericAgent Desktop — macOS DMG installer + + Installation + 1. Open GenericAgent-Desktop-macOS.dmg. + 2. Drag GenericAgent.app to Applications. + 3. Open Applications and launch GenericAgent.app. + + If macOS says the developer cannot be verified, Apple cannot check it for malicious software, or the app cannot be opened: + 1. Go back to the DMG window. + 2. Double-click "open_anyway.command". + 3. Launch GenericAgent.app from Applications again. + You can also right-click GenericAgent.app and choose Open. + + Uninstall + Quit GenericAgent, then delete GenericAgent.app from Applications. + EOF + sed -i '' 's/^ //' "$DMG_STAGE/readme.txt" + + mkdir -p artifacts/macos/out + hdiutil create \ + -volname "GenericAgent Desktop" \ + -srcfolder "$DMG_STAGE" \ + -ov \ + -format UDZO \ + "artifacts/macos/out/GenericAgent-Desktop-macOS.dmg" + + # Hide ghost files (.VolumeIcon.icns, .background, .fseventsd) from Finder + bash frontends/desktop/scripts/post-dmg.sh "artifacts/macos/out/GenericAgent-Desktop-macOS.dmg" + + shasum -a 256 "artifacts/macos/out/GenericAgent-Desktop-macOS.dmg" \ + > "artifacts/macos/out/GenericAgent-Desktop-macOS.dmg.sha256" + + echo "DMG stage tree:" + find "$DMG_STAGE" -maxdepth 2 -print | sort + + - name: Upload workflow artifact + uses: actions/upload-artifact@v7 + with: + name: GenericAgent-Desktop-macOS-DMG-${{ github.run_number }} + path: artifacts/macos/out/* + if-no-files-found: error + + - name: Publish into unified Release (tag push only) + if: ${{ startsWith(github.ref, 'refs/tags/') }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: bash + run: | + set -euo pipefail + TAG_NAME="${{ github.ref_name }}" + TITLE="GenericAgent Desktop ${TAG_NAME}" + cat > "${RUNNER_TEMP:-/tmp}/ga_notes.md" <<'EOF' + GenericAgent Desktop 桌面版 / Desktop + + 无需自行安装 Python、无需联网安装依赖、无需源码；首次启动会自动准备内置运行环境。 + No separate Python install, no internet for dependencies, no source checkout required; the bundled runtime is prepared on first launch. + + ## 安装方法 / Installation + - Windows: 下载 `GenericAgent-Desktop-Windows-Portable.zip`，解压后双击 `GenericAgent.exe` 启动。卸载时先退出应用，再双击包内 `uninstall.bat`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Windows-Portable.zip`, extract it, then double-click `GenericAgent.exe`. To uninstall, quit the app, double-click `uninstall.bat`, then delete the extracted folder. + - Linux: 下载 `GenericAgent-Desktop-Linux-Portable.tar.gz`，解压后执行 `chmod +x GenericAgent.AppImage`，再运行 `./GenericAgent.AppImage`。卸载时先退出应用，再运行 `./uninstall.sh`，最后删除整个解压目录。 + Download `GenericAgent-Desktop-Linux-Portable.tar.gz`, extract it, run `chmod +x GenericAgent.AppImage`, then launch `./GenericAgent.AppImage`. To uninstall, quit the app, run `./uninstall.sh`, then delete the extracted folder. + - macOS: 下载 `GenericAgent-Desktop-macOS.dmg`，双击打开 DMG，把 `GenericAgent.app` 拖入 `Applications`，之后在“应用程序 / Applications”中启动。若出现“无法验证开发者”等提示，先双击 DMG 内的 `open_anyway.command`，再启动。卸载时先退出应用，再从 Applications 删除 `GenericAgent.app`。 + Download `GenericAgent-Desktop-macOS.dmg`, open it, drag `GenericAgent.app` to `Applications`, then launch it from Applications. If macOS says the developer cannot be verified, double-click `open_anyway.command` inside the DMG first, then launch again. To uninstall, quit the app, then delete `GenericAgent.app` from Applications. + + ## 首次启动 / First launch + 首次启动会自动离线准备运行环境（安装依赖），有进度条，完成后进入主界面；之后启动会更快。 + The first launch prepares the runtime offline (installs deps) with a progress bar, then opens the main window; later launches are faster. + + ## 说明 / Notes + - 想真正对话需在程序内配置模型 / API Key。Configure a model / API key in-app to start chatting. + - Windows/Linux 为便携包，可整体移动到任意目录后继续使用。Windows/Linux packages are portable and can be moved as a whole folder. + - Windows/Linux 包内附 `readme.txt`（中英）。Windows/Linux packages include a bilingual `readme.txt`. + EOF + # Race-safe: the 3 OS jobs share ONE release. Retry create until the release + # actually exists (a simultaneous create from another job can fail), so the + # upload below never races a not-yet-created release. + for _ in $(seq 1 15); do + gh release view "$TAG_NAME" >/dev/null 2>&1 && break + gh release create "$TAG_NAME" --target "${{ github.sha }}" --title "$TITLE" --notes-file "${RUNNER_TEMP:-/tmp}/ga_notes.md" --prerelease 2>/dev/null || true + sleep 3 + done + gh release upload "$TAG_NAME" artifacts/macos/out/* --clobber From aab807f1492e1ba145bb75734171331ae41e78e5 Mon Sep 17 00:00:00 2001 From: abraxas914 Date: Thu, 9 Jul 2026 00:36:57 +0800 Subject: [PATCH 02/80] =?UTF-8?q?feat(bridge):=20full=20desktop=20bridge?= =?UTF-8?q?=20rewrite=20=E2=80=94=20session=20persistence,=20image/file=20?= =?UTF-8?q?injection,=20streaming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Major rewrite of desktop_bridge.py for the React desktop frontend: - Per-session file persistence (individual JSON files, O(1) write) - submit_prompt: file path injection into agent_prompt for file_read access - _patch_chat_for_images: monkey-patch backend.ask for base64 image injection - Vision MIME whitelist (png/jpeg/gif/webp); SVG falls back to path reference - Thread-safe run_agent_turn with sess.id scoping (no cross-thread sid leak) - Ring buffer self-log capture (bridge_print → deque(maxlen=500)) - turn_segs streaming: per-turn structured output for frontend rendering - Model profile CRUD: /model-profiles endpoints - Session model binding (llm_no per session) - Service lifecycle management via /services/* endpoints - Bridge exit endpoint with graceful shutdown - WebSocket hub for real-time state sync - plan_state.py: plan mode path utilities for desktop sessions Co-Authored-By: Claude Opus 4.6 --- .gitignore | 7 + frontends/desktop_bridge.py | 675 ++++++++++++++++++++++++++++++------ frontends/plan_state.py | 95 +++-- 3 files changed, 643 insertions(+), 134 deletions(-) diff --git a/.gitignore b/.gitignore index 47a6807f7..cb96d590c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,13 @@ tasks/ *.zip *.exe +spec/ + +# Node / Frontend build +node_modules/ +*.local +.vite/ + memory/* !memory/memory_management_sop.md diff --git a/frontends/desktop_bridge.py b/frontends/desktop_bridge.py index 2ff937aa3..68ee9de21 100644 --- a/frontends/desktop_bridge.py +++ b/frontends/desktop_bridge.py @@ -36,7 +36,7 @@ """ from __future__ import annotations -import asyncio, atexit, contextlib, importlib, json, os, re, subprocess, sys +import asyncio, atexit, contextlib, copy, importlib, json, os, re, shutil, subprocess, sys from collections import Counter, deque import threading, time, traceback, uuid from dataclasses import dataclass, field @@ -46,6 +46,23 @@ APP_DIR = Path(__file__).resolve().parent +# ─── Bridge self-log ring buffer ─── +import datetime as _dt, io as _io + +_bridge_log: deque = deque(maxlen=500) + + +def bridge_print(*args, **kwargs): + """Print to stderr AND capture into bridge ring buffer (timestamped).""" + kwargs.pop("file", None) + buf = _io.StringIO() + print(*args, file=buf, **kwargs) + text = buf.getvalue().rstrip("\n") + ts = _dt.datetime.now().strftime("%H:%M:%S") + for line in text.split("\n"): + _bridge_log.append(f"[{ts}] {line}") + print(*args, file=sys.stderr, **kwargs) + def find_default_ga_root() -> Path: candidates = [ @@ -70,6 +87,24 @@ def strip_final_info_marker(text: Any) -> str: return _FINAL_INFO_RE.sub('', str(text or '')) +def normalize_final_turn_segs(full: str, outputs: Any) -> Optional[List[str]]: + if not outputs or not isinstance(outputs, (list, tuple)): + return None + segs = [strip_final_info_marker(s) for s in outputs] + full_text = strip_final_info_marker(full) + if not segs: + return None + joined = "".join(segs) + if full_text.strip() == joined.strip(): + return segs + if joined and full_text.startswith(joined): + suffix = full_text[len(joined):] + if suffix.strip(): + segs[-1] = segs[-1] + suffix + return segs + return None + + for _s in (sys.stdout, sys.stderr): with contextlib.suppress(Exception): _s.reconfigure(encoding="utf-8", errors="replace") @@ -99,6 +134,9 @@ class Session: plan_scan_baseline: int = 0 plan_path: str = "" llm_history: Optional[List[dict]] = None + # 该会话绑定的模型下标(mykey.py 配置块顺序,== agent.llmclients 下标)。 + # None = 未绑定,发消息时回退到全局默认 ui.llmNo,保持旧会话平滑迁移。 + llm_no: Optional[int] = None def _load_plan_baseline(item: dict, msgs: list) -> int: @@ -110,14 +148,14 @@ def _load_plan_baseline(item: dict, msgs: list) -> int: def _sanitize_desktop_plan_path(session_id: str, plan_path: str) -> str: - """Desktop: drop shared plan_demo paths so sessions do not read the same file.""" + """Keep only real plan-mode paths; never invent a placeholder path on load.""" import plan_state p = (plan_path or "").strip() if not p: return "" - if plan_state.is_session_scoped_plan_path(p, session_id): - return p - return plan_state.default_session_plan_path(session_id) + if plan_state.is_plan_mode_path(p): + return p.lstrip("./\\") + return "" class AgentManager: @@ -127,6 +165,8 @@ def __init__(self): self.config: Dict[str, Any] = {} self.sessions: Dict[str, Session] = {} self.active_session_id: Optional[str] = None + self._sessions_dir = Path(self.ga_root) / "temp" / "desktop_sessions" + # Legacy monolithic store; migrated into _sessions_dir on first load, then retired. self._sessions_file = Path(self.ga_root) / "temp" / "desktop_sessions.json" self._load_sessions() @@ -134,54 +174,160 @@ def __init__(self): def mykey_path(self) -> str: return str(Path(self.ga_root) / "mykey.py") - def _persist(self): + def _session_dict(self, s: "Session") -> dict: + llm_hist = None + if s.agent and hasattr(s.agent, 'llmclient'): + try: llm_hist = s.agent.llmclient.backend.history + except Exception: pass + if llm_hist is None: + llm_hist = s.llm_history + return {"id": s.id, "title": s.title, "cwd": s.cwd, + "created_at": s.created_at, "updated_at": s.updated_at, + "messages": s.messages, "msg_seq": s.msg_seq, + "pinned": s.pinned, "untitled": s.untitled, + "plan_scan_baseline": s.plan_scan_baseline, + "plan_path": s.plan_path or "", + "llm_no": s.llm_no, + "llm_history": llm_hist} + + def _session_file(self, sid: str) -> Path: + return self._sessions_dir / f"{sid}.json" + + def _persist_session(self, s: "Session"): + """Write a single session file. Cost is O(one session), independent of how many + sessions exist — this is the fix for the monolithic-file scaling problem.""" try: - self._sessions_file.parent.mkdir(parents=True, exist_ok=True) - arr = [] + self._sessions_dir.mkdir(parents=True, exist_ok=True) with self.lock: - for s in self.sessions.values(): - llm_hist = None - if s.agent and hasattr(s.agent, 'llmclient'): - try: llm_hist = s.agent.llmclient.backend.history - except Exception: pass - if llm_hist is None: - llm_hist = s.llm_history - arr.append({"id": s.id, "title": s.title, "cwd": s.cwd, - "created_at": s.created_at, "updated_at": s.updated_at, - "messages": s.messages, "msg_seq": s.msg_seq, - "pinned": s.pinned, "untitled": s.untitled, - "plan_scan_baseline": s.plan_scan_baseline, - "plan_path": s.plan_path or "", - "llm_history": llm_hist}) - self._sessions_file.write_text(json.dumps(arr, ensure_ascii=False, default=str), encoding="utf-8") + data = self._session_dict(s) + data["messages"] = copy.deepcopy(data["messages"]) + if data.get("llm_history"): + data["llm_history"] = copy.deepcopy(data["llm_history"]) + tmp = self._sessions_dir / f"{s.id}.json.tmp" + tmp.write_text(json.dumps(data, ensure_ascii=False, default=str), encoding="utf-8") + os.replace(tmp, self._session_file(s.id)) + except Exception as e: + bridge_print(f"[bridge] persist session {s.id} failed: {e}") + + def _delete_session_file(self, sid: str): + try: + f = self._session_file(sid) + if f.exists(): + f.unlink() except Exception as e: - print(f"[bridge] persist sessions failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] delete session file {sid} failed: {e}") + + def _persist(self): + """Write every session (one file each). Used for bulk ops (import) / full flush.""" + with self.lock: + sessions = list(self.sessions.values()) + for s in sessions: + self._persist_session(s) + + def _session_from_item(self, item: dict) -> "Session": + msgs = item.get("messages", []) + return Session(id=item["id"], title=item.get("title", "New chat"), + cwd=item.get("cwd", self.ga_root), + created_at=item.get("created_at", time.time()), + updated_at=item.get("updated_at", time.time()), + messages=msgs, + msg_seq=item.get("msg_seq", 0), + pinned=item.get("pinned", False), + untitled=item.get("untitled", True), + plan_scan_baseline=_load_plan_baseline(item, msgs), + plan_path=_sanitize_desktop_plan_path(item["id"], item.get("plan_path") or ""), + status="idle", agent=None, + llm_history=item.get("llm_history"), + llm_no=item.get("llm_no")) def _load_sessions(self): + # New format: one file per session under temp/desktop_sessions/. try: - if not self._sessions_file.exists(): - return - arr = json.loads(self._sessions_file.read_text(encoding="utf-8")) - for item in arr: - msgs = item.get("messages", []) - sess = Session(id=item["id"], title=item.get("title", "New chat"), - cwd=item.get("cwd", self.ga_root), - created_at=item.get("created_at", time.time()), - updated_at=item.get("updated_at", time.time()), - messages=msgs, - msg_seq=item.get("msg_seq", 0), - pinned=item.get("pinned", False), - untitled=item.get("untitled", True), - plan_scan_baseline=_load_plan_baseline(item, msgs), - plan_path=_sanitize_desktop_plan_path( - item["id"], item.get("plan_path") or ""), - status="idle", agent=None, - llm_history=item.get("llm_history")) - self.sessions[sess.id] = sess - if self.sessions: - self.active_session_id = max(self.sessions.values(), key=lambda s: s.updated_at).id + if self._sessions_dir.is_dir(): + for f in self._sessions_dir.glob("*.json"): + try: + item = json.loads(f.read_text(encoding="utf-8")) + sess = self._session_from_item(item) + self.sessions[sess.id] = sess + except Exception as e: + bridge_print(f"[bridge] load session {f.name} failed: {e}") except Exception as e: - print(f"[bridge] load sessions failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] load sessions dir failed: {e}") + + # One-time migration from the legacy monolithic desktop_sessions.json. + try: + if self._sessions_file.exists(): + arr = json.loads(self._sessions_file.read_text(encoding="utf-8")) + for item in arr: + if not isinstance(item, dict) or item.get("id") in self.sessions: + continue + try: + sess = self._session_from_item(item) + self.sessions[sess.id] = sess + self._persist_session(sess) + except Exception as e: + bridge_print(f"[bridge] migrate session failed: {e}") + # Retire the legacy file so we do not migrate again next launch. + with contextlib.suppress(Exception): + self._sessions_file.rename( + self._sessions_file.parent / (self._sessions_file.name + ".migrated")) + except Exception as e: + bridge_print(f"[bridge] migrate sessions failed: {e}") + + if self.sessions: + self.active_session_id = max(self.sessions.values(), key=lambda s: s.updated_at).id + + def import_sessions(self, source_dir: str) -> dict: + """把 source 的桌面会话合并进当前列表(按 id 去重)。 + + 兼容两种源格式:新版 temp/desktop_sessions/.json,以及旧版单文件 + temp/desktop_sessions.json(含已退休的 .migrated)。只落盘新增的会话。 + """ + src = Path(source_dir).expanduser().resolve() + items: List[dict] = [] + found = False + + # New per-session format. + src_dir = src / "temp" / "desktop_sessions" + if src_dir.is_dir(): + for f in src_dir.glob("*.json"): + try: + items.append(json.loads(f.read_text(encoding="utf-8"))) + found = True + except Exception: + continue + + # Legacy monolithic format (live or already retired). + for legacy in (src / "temp" / "desktop_sessions.json", + src / "temp" / "desktop_sessions.json.migrated"): + if legacy.is_file(): + found = True + try: + arr = json.loads(legacy.read_text(encoding="utf-8")) + if isinstance(arr, list): + items.extend(x for x in arr if isinstance(x, dict)) + except Exception: + continue + + if not found: + return {"sessionsAdded": 0, "sessionsSkipped": 0, "sessionsFileFound": False} + + added = 0 + skipped = 0 + new_sessions: List["Session"] = [] + with self.lock: + for item in items: + sid = item.get("id") + if not sid or sid in self.sessions: + skipped += 1 + continue + sess = self._session_from_item(item) + self.sessions[sid] = sess + new_sessions.append(sess) + added += 1 + for sess in new_sessions: + self._persist_session(sess) + return {"sessionsAdded": added, "sessionsSkipped": skipped, "sessionsFileFound": True} def _mykey_file(self) -> Path: p = Path(self.ga_root) / "mykey.py" @@ -323,7 +469,7 @@ def _reload_live_agents(self) -> None: llmcore._mykey_mtime = None # 让本次 reload_mykeys() 视为“已变更”，触发真正重建 fn() except Exception as e: - print(f"[bridge] reload live agent failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] reload live agent failed: {e}") def add_model_profile(self, data: dict) -> dict: cfg = self._build_cfg(data) @@ -416,22 +562,24 @@ def list_model_profiles(self): try: keys, mk = self._mykey_vars() except Exception as e: - print(f"get model profiles failed: {e}", file=sys.stderr) + bridge_print(f"get model profiles failed: {e}") return [] - active = self.config.get("llmNo", 0) - # collect all mixin members for inMixin check - all_mixin_members: set = set() + # A profile can be referenced by any mixin channel, not only the first one. + # Keep each mixin row's own members for display, but mark native profiles as + # inMixin when they appear in any mixin. + all_mixin_members: set[str] = set() for k in keys: + cfg = mk.get(k) if isinstance(mk.get(k), dict) else {} if "mixin" in k: - c = mk.get(k) if isinstance(mk.get(k), dict) else {} - all_mixin_members.update(str(m) for m in (c.get("llm_nos") or [])) + all_mixin_members.update(str(m) for m in (cfg.get("llm_nos") or [])) + active = self.config.get("llmNo", 0) out = [] for i, k in enumerate(keys): cfg = mk.get(k) if isinstance(mk.get(k), dict) else {} if "mixin" in k: - mems = [str(m) for m in (cfg.get("llm_nos") or [])] + members = [str(m) for m in (cfg.get("llm_nos") or [])] out.append({"id": i, "varName": k, "kind": "mixin", "name": "", - "members": mems, "active": i == active}) + "members": members, "active": i == active}) else: name = self._base_display_name(k, cfg) out.append({"id": i, "varName": k, "kind": "native", "name": name, @@ -503,18 +651,20 @@ def reorder_mixin(self, members: list) -> dict: @staticmethod def _live_model(sess: Session) -> Optional[dict]: - """该会话 agent 当前真正在用的模型（渠道组会随故障转移变化）。 - agent 还没建（没跑过 turn）时返回 None，前端回退到静态显示。""" + """该会话 agent 当前真正在用的模型(渠道组会随故障转移变化)。 + agent 还没建(没跑过 turn)时返回静态绑定信息,前端据 llmNo 回显选择器。 + llmNo: agent 存活取 agent.llm_no(权威运行态),否则取 sess.llm_no(可能 None)。""" ag = getattr(sess, "agent", None) if ag is None: - return None + return {"current": None, "isMixin": False, "llmNo": sess.llm_no} try: back = ag.llmclient.backend + live_no = getattr(ag, "llm_no", sess.llm_no) if "Mixin" in type(back).__name__: - return {"current": back.current_name, "isMixin": True} - return {"current": back.name, "isMixin": False} + return {"current": back.current_name, "isMixin": True, "llmNo": live_no} + return {"current": back.name, "isMixin": False, "llmNo": live_no} except Exception: - return None + return {"current": None, "isMixin": False, "llmNo": sess.llm_no} def snapshot(self, sess: Session, include_messages: bool = True) -> dict: out = { @@ -544,17 +694,17 @@ def add_message(self, sess: Session, role: str, content: str, **extra) -> dict: sess.updated_at = time.time() if role == "user" and content.strip() and sess.title == "New chat": sess.title = content.strip().replace("\n", " ")[:40] - self._persist() + self._persist_session(sess) return msg def create_session(self, cwd: Optional[str] = None) -> Session: sid = "sess-" + uuid.uuid4().hex[:12] - sess = Session(id=sid, cwd=str(cwd or self.ga_root)) + sess = Session(id=sid, cwd=str(cwd or self.ga_root), llm_no=_global_default_llm_no()) with self.lock: self.sessions[sid] = sess self.active_session_id = sid emit_session_state(sess, "created") - self._persist() + self._persist_session(sess) return sess def get_session(self, sid: str) -> Session: @@ -575,14 +725,18 @@ def delete_session(self, sid: str) -> dict: with contextlib.suppress(Exception): sess.agent.abort() emit_session_state(sess, "closed") - self._persist() + self._delete_session_file(sid) _purge_session_uploads(sid) return {"ok": True, "sessionId": sid} - def submit_prompt(self, sid: str, prompt: Any, images: Optional[list] = None, llm_no: Optional[int] = None, display: Optional[str] = None, files_meta: Optional[list] = None, image_metas: Optional[list] = None) -> dict: + def submit_prompt(self, sid: str, prompt: Any, images: Optional[list] = None, display: Optional[str] = None, files_meta: Optional[list] = None, image_metas: Optional[list] = None) -> dict: prompt, image_ids = normalize_prompt(prompt, images) - if llm_no is not None: - self.config["llmNo"] = int(llm_no) + # Build agent_prompt with file paths prepended (agent sees paths, UI sees clean text) + agent_prompt = prompt + if files_meta: + paths = [m["path"] for m in files_meta if m.get("path")] + if paths: + agent_prompt = " ".join(paths) + "\n" + prompt with self.lock: sess = self.sessions.get(sid) if not sess: @@ -599,31 +753,70 @@ def submit_prompt(self, sid: str, prompt: Any, images: Optional[list] = None, ll if image_metas: extra["images"] = image_metas user_msg = self.add_message(sess, "user", prompt, **extra) - import plan_state - if plan_state.is_plan_preset_prompt(prompt): - plan_state.bind_plan_session(sess, prompt) - self._persist() sess.status = "running" sess.cancel_requested = False sess.last_error = "" sess.partial = {"id": sess.msg_seq + 1, "role": "assistant", "content": "", "ts": time.time(), "partial": True, - "curr_turn": 0, "turn_segs": []} # turn_segs[i]=第i轮全文(权威结构化,前端按轮渲染);content保留双轨兜底 - t = threading.Thread(target=self.run_agent_turn, args=(sess, prompt, None, llm_no), daemon=True, name=f"Turn-{sid}") + "curr_turn": 0, "turn_segs": []} # turn_segs[i]=第i轮全文(权威结构化,前端按轮渲染);content保留双轮兜底 + image_paths = [m["path"] for m in (image_metas or []) if m.get("path")] + t = threading.Thread(target=self.run_agent_turn, args=(sess, agent_prompt, image_paths or None), daemon=True, name=f"Turn-{sid}") sess.thread = t t.start() seq = sess.msg_seq emit_session_state(sess, "running") return {"ok": True, "sessionId": sid, "accepted": True, "userMessageId": user_msg["id"], "seq": seq} - def run_agent_turn(self, sess: Session, prompt: str, images: Optional[list] = None, llm_no: Optional[int] = None): + @staticmethod + def _patch_chat_for_images(client, image_paths): + """Monkey-patch backend.ask to inject base64 image blocks on the first LLM call.""" + import base64 as b64, mimetypes + try: + from llmcore import NativeToolClient + except ImportError: + return + if not isinstance(client, NativeToolClient): + return + backend = client.backend + original_ask = backend.ask + + _VISION_MIMES = {'image/png', 'image/jpeg', 'image/gif', 'image/webp'} + + def patched_ask(msg): + try: + del backend.ask + except AttributeError: + backend.ask = original_ask + if isinstance(msg, dict) and isinstance(msg.get("content"), list): + for p in image_paths: + try: + mime = mimetypes.guess_type(p)[0] or 'image/png' + if mime not in _VISION_MIMES: + # Unsupported image format (e.g. SVG) — inject as text path reference + msg["content"].append({"type": "text", "text": f"[attached file: {p}]"}) + continue + with open(p, 'rb') as f: + raw = f.read() + data = b64.b64encode(raw).decode() + msg["content"].append({"type": "image", "source": {"type": "base64", "media_type": mime, "data": data}}) + except Exception: + pass + resp = yield from original_ask(msg) + return resp + + backend.ask = patched_ask + + def run_agent_turn(self, sess: Session, prompt: str, images: Optional[list] = None): try: if sess.agent is None: sess.agent = self.make_agent(sess) agent = sess.agent - no = self.config.get("llmNo") if llm_no is None else llm_no + # 模型取会话绑定 sess.llm_no,未绑定回退全局默认。切换走 set_session_model。 + no = sess.llm_no if sess.llm_no is not None else _global_default_llm_no() if no is not None and hasattr(agent, "next_llm"): with contextlib.suppress(Exception): agent.next_llm(int(no)) + if images: + self._patch_chat_for_images(agent.llmclient, images) full = "" done_outputs = None # done时agent给的全量轮文本(turn_resps.copy()) if hasattr(agent, "put_task"): @@ -658,11 +851,14 @@ def run_agent_turn(self, sess: Session, prompt: str, images: Optional[list] = No _segs[_idx] = str(_outs[-1]) if len(_outs) >= 2 and _idx >= 1: _segs[_idx - 1] = str(_outs[-2]) + # Push partial to frontend via WS for real-time streaming + hub.emit({"type": "partial-update", "sessionId": sess.id, + "content": sess.partial["content"], + "turn_segs": list(_segs), "curr_turn": _idx}) if "done" in item: full = strip_final_info_marker(item.get("done") or "") - done_outputs = item.get("outputs") # done时=turn_resps.copy()全量轮 + done_outputs = normalize_final_turn_segs(full, item.get("outputs")) # done时=turn_resps.copy()全量轮 if done_outputs: - done_outputs = [strip_final_info_marker(s) for s in done_outputs] with self.lock: if sess.partial is not None: sess.partial["content"] = full @@ -692,12 +888,10 @@ def run_agent_turn(self, sess: Session, prompt: str, images: Optional[list] = No with self.lock: sess.partial = None full = strip_final_info_marker(full) - if done_outputs: - done_outputs = [strip_final_info_marker(s) for s in done_outputs] import plan_state plan_state.sync_plan_path_from_text(sess, full, sess.cwd or self.ga_root) # 轨道2: 落库时带结构化全量轮(权威turn_segs),前端按轮渲染;content保留兜底 - _final_segs = [str(s) for s in done_outputs] if done_outputs else None + _final_segs = normalize_final_turn_segs(full, done_outputs) if _final_segs: self.add_message(sess, "assistant", full, turn_segs=_final_segs) else: @@ -714,6 +908,7 @@ def run_agent_turn(self, sess: Session, prompt: str, images: Optional[list] = No sess.status = "error" sess.last_error = str(e) self.add_message(sess, "error", str(e)) + bridge_print(f"[turn] error: {e}") print(tb, file=sys.stderr) emit_session_state(sess, "error") @@ -777,11 +972,16 @@ def restore_context(self, sid: str) -> dict: if sess.agent is not None: return {"ok": True, "sessionId": sid, "restored": False, "reason": "agent already alive"} agent = self.make_agent(sess) + # 恢复 agent 时按会话绑定 seed 模型(未绑定则全局默认),保持显示/使用一致。 + no = sess.llm_no if sess.llm_no is not None else _global_default_llm_no() + if no is not None and hasattr(agent, "next_llm"): + with contextlib.suppress(Exception): + agent.next_llm(int(no)) if sess.llm_history: try: agent.llmclient.backend.history = sess.llm_history except Exception as e: - print(f"[bridge] restore llm_history failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] restore llm_history failed: {e}") else: history = [] for m in sess.messages: @@ -795,12 +995,27 @@ def restore_context(self, sid: str) -> dict: try: agent.llmclient.backend.history = history except Exception as e: - print(f"[bridge] inject history failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] inject history failed: {e}") with self.lock: sess.agent = agent sess.status = "idle" return {"ok": True, "sessionId": sid, "restored": True, "messageCount": len(sess.llm_history or sess.messages)} + def set_session_model(self, sid: str, llm_no: int) -> dict: + """前端申请切换某会话的模型(唯一入口)。写 sess.llm_no(权威)并持久化; + agent 存活时立即 next_llm 让运行态跟上。返回该会话的运行态模型快照。""" + with self.lock: + sess = self.sessions.get(sid) + if not sess: + raise web.HTTPNotFound(text=json.dumps({"error": f"session not found: {sid}"}, ensure_ascii=False), content_type="application/json") + sess.llm_no = int(llm_no) + if sess.agent is not None and hasattr(sess.agent, "next_llm"): + with contextlib.suppress(Exception): + sess.agent.next_llm(int(llm_no)) + sess.updated_at = time.time() + self._persist_session(sess) + return {"ok": True, "sessionId": sid, "llmNo": sess.llm_no, "model": self._live_model(sess)} + import base64 @@ -913,10 +1128,21 @@ def discover_extra_services(ga_root: Path) -> List[dict]: out.append({ "id": "frontends/conductor.py", "cmd": [sys.executable, "frontends/conductor.py", "--no-browser"], + "port": 8900, }) return out +def _port_alive(port: Optional[int]) -> bool: + """Check if something is listening on localhost:port.""" + if not port: + return False + import socket + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: + s.settimeout(0.3) + return s.connect_ex(("127.0.0.1", port)) == 0 + + def _mem_mb(pid: Optional[int]) -> Optional[int]: if not pid: return None @@ -957,6 +1183,23 @@ def _cpu_pct(pid: Optional[int]) -> Optional[float]: return None +_ERROR_PATTERNS: list[tuple[re.Pattern, str, str]] = [ + (re.compile(r"errno 48|address already in use", re.I), "transient", "err.portBusy"), + (re.compile(r"Exception in thread conductor", re.I), "fatal", "err.conductorCrash"), + (re.compile(r"ModuleNotFoundError|ImportError", re.I), "fatal", "err.missingModule"), + (re.compile(r"ConnectionRefusedError|Connection refused", re.I), "warning", "err.connRefused"), + (re.compile(r"TimeoutError|timed out", re.I), "warning", "err.timeout"), +] + + +def _classify_log_error(line: str) -> tuple[str, str] | None: + """Classify a log line by severity. Returns (severity, i18n_key) or None.""" + for pattern, severity, key in _ERROR_PATTERNS: + if pattern.search(line): + return (severity, key) + return None + + class ServiceManager: """hub.pyw ServiceManager + HTTP/WS glue.""" @@ -978,7 +1221,34 @@ def _is_configured(self, sid: str) -> bool: mykeys = _load_mykeys(self.ga_root) return all(str(mykeys.get(k) or "").strip() for k in keys) + def _scan_errors(self, sid: str, n: int = 20) -> dict: + """Scan last N buffer lines, classify by severity. + Returns {"fatal": (line, key) | None, "warning": (line, key) | None}. + Transient errors (e.g. port-busy retry) are discarded. + """ + buf = self.buffers.get(sid) + if not buf: + return {"fatal": None, "warning": None} + lines = [ln.strip() for ln in list(buf)[-n:] if ln.strip()] + if not lines: + return {"fatal": None, "warning": None} + result: dict = {"fatal": None, "warning": None} + for line in lines: + classified = _classify_log_error(line) + if classified is None: + continue + severity, key = classified + if severity == "fatal": + result["fatal"] = (line[:300], key) + elif severity == "warning": + result["warning"] = (line[:300], key) + return result + def _log_tail(self, sid: str, n: int = 3) -> str: + """Legacy: return last fatal error line for lastError field.""" + scan = self._scan_errors(sid, n=20) + if scan["fatal"]: + return scan["fatal"][0] buf = self.buffers.get(sid) if not buf: return "" @@ -990,20 +1260,45 @@ def _state(self, sid: str, *, err: str = "") -> dict: running = proc is not None and proc.poll() is None status = "running" if running else "offline" last_error = err + error_key = "" + last_warning = "" + warning_key = "" + scan = self._scan_errors(sid) + catalog_port = self._catalog.get(sid, {}).get("port") if proc is not None and proc.poll() is not None: if sid in self._stopping: status, last_error = "offline", "" + elif _port_alive(catalog_port): + status, running = "running", True else: status = "error" - last_error = err or self._log_tail(sid) or f"exit code {proc.returncode}" + if scan["fatal"]: + last_error = scan["fatal"][0] + error_key = scan["fatal"][1] + elif err: + last_error = err + else: + last_error = f"exit code {proc.returncode}" + elif not running and not err and _port_alive(catalog_port): + status, running = "running", True + elif running: + if scan["warning"]: + last_warning = scan["warning"][0] + warning_key = scan["warning"][1] elif err: status, running = "error", False + last_error = err + if scan["fatal"]: + error_key = scan["fatal"][1] return { "id": sid, "status": status, "running": running, "pid": proc.pid if running else None, "lastError": last_error, + "errorKey": error_key, + "lastWarning": last_warning, + "warningKey": warning_key, } def list_state(self) -> List[dict]: @@ -1093,13 +1388,44 @@ def autostart_extras(self) -> None: tag = "ok" if res.get("ok") else f"fail: {res.get('error')}" except Exception as e: tag = f"exception {type(e).__name__}: {e}" - print(f"[autostart] {sid}: {tag}", file=sys.stderr) + bridge_print(f"[autostart] {sid}: {tag}") def stop_all_extras(self) -> None: for sid in sorted(set(self._catalog) - set(self._im_catalog)): with contextlib.suppress(Exception): self.stop_service(sid) + def _extra_is_broken(self, sid: str) -> bool: + """判断一个 extra 是否「已经坏掉、需要重启才能恢复」: + - 进程异常退出(非用户主动停)→ 坏(覆盖 scheduler 那种进程级崩溃); + - 进程还活着,但捕获日志里出现 `Exception in thread conductor-agent` + → 内部 agent 线程已崩死,uvicorn 还在跑但再也处理不了任务 → 坏。 + 健康运行中的进程返回 False:它会在下个任务靠自身 mtime 热重载读到新 mykey, + 不该被打断。每次 start_service 都会换新缓冲,故缓冲里的崩溃签名只反映当前进程。""" + proc = self.procs.get(sid) + if proc is None: + return False # 没起过 / 用户主动停掉 → 不复活 + if proc.poll() is not None: + return sid not in self._stopping # 意外退出 = 坏 + buf = self.buffers.get(sid) + return bool(buf) and any("Exception in thread conductor-agent" in ln for ln in buf) + + def restart_broken_extras(self) -> None: + """mykey 被整体重写(导入密钥/编辑渠道配置)后,只重启「已经坏掉」的 + conductor/scheduler。健康运行中的进程不动——它们会在下个任务靠自身 mtime + 热重载新 key,强行重启反而会打断正在跑的任务。""" + for sid in sorted(set(self._catalog) - set(self._im_catalog)): + if not self._extra_is_broken(sid): + continue + with contextlib.suppress(Exception): + self.stop_service(sid) + try: + res = self.start_service(sid) + tag = "ok" if res.get("ok") else f"fail: {res.get('error')}" + except Exception as e: + tag = f"exception {type(e).__name__}: {e}" + bridge_print(f"[restart-broken] {sid}: {tag}") + def stop_service(self, sid: str) -> dict: if sid not in self._catalog: raise KeyError(sid) @@ -1116,7 +1442,11 @@ def stop_service(self, sid: str) -> dict: def read_logs(self, sid: str, tail: int = 200) -> dict: if sid == BRIDGE_ID: - return {"ok": True, "lines": [f"GenericAgent bridge pid={os.getpid()}"]} + tail = max(1, min(int(tail or 200), 2000)) + lines = list(_bridge_log)[-tail:] + if not lines: + lines = [f"GenericAgent bridge pid={os.getpid()}"] + return {"ok": True, "lines": lines} if sid not in self._catalog: raise KeyError(sid) tail = max(1, min(int(tail or 200), 2000)) @@ -1137,6 +1467,9 @@ def _bridge_shutdown_services() -> None: def emit_session_state(sess: Session, state_name: str): + if state_name != "created": + title = (sess.title or sess.id)[:20] + bridge_print(f"[session] {title}: {state_name}") hub.emit({ "type": "session-state", "sessionId": sess.id, @@ -1228,14 +1561,37 @@ async def status_handler(request): _UI_KEYS = ("lang", "theme", "appearance", "plain", "llmNo", "fontSize") -def _desktop_ui() -> dict: +def _settings_doc() -> dict: try: - ui = json.loads(_SETTINGS.read_text(encoding="utf-8")).get("ui") - return dict(ui) if isinstance(ui, dict) else {} + doc = json.loads(_SETTINGS.read_text(encoding="utf-8")) if _SETTINGS.is_file() else {} + return doc if isinstance(doc, dict) else {} except Exception: return {} +def _write_settings_doc(doc: dict) -> None: + _SETTINGS.write_text(json.dumps(doc, ensure_ascii=False, indent=2), encoding="utf-8") + + +def _desktop_ui() -> dict: + ui = _settings_doc().get("ui") + return dict(ui) if isinstance(ui, dict) else {} + + +def _conductor_settings() -> dict: + conductor = _settings_doc().get("conductor") + return dict(conductor) if isinstance(conductor, dict) else {} + + +def _global_default_llm_no() -> int: + """全局默认模型下标。会话未绑定(sess.llm_no is None)时回退到它。""" + no = _desktop_ui().get("llmNo") + try: + return int(no) if no is not None else 0 + except (TypeError, ValueError): + return 0 + + async def get_config_handler(request): profiles = manager.list_model_profiles() active = next((p["id"] for p in profiles if p.get("active")), manager.config.get("llmNo", 0)) @@ -1243,6 +1599,7 @@ async def get_config_handler(request): if "llmNo" not in cfg: cfg["llmNo"] = active cfg.update(_desktop_ui()) + cfg["conductor"] = _conductor_settings() return json_ok({"gaRoot": manager.ga_root, "mykeyPath": manager.mykey_path, "config": cfg}) @@ -1253,15 +1610,13 @@ async def save_config_handler(request): patch = {k: cfg[k] for k in _UI_KEYS if k in cfg} if patch: try: - doc = json.loads(_SETTINGS.read_text(encoding="utf-8")) if _SETTINGS.is_file() else {} - if not isinstance(doc, dict): - doc = {} + doc = _settings_doc() ui = doc["ui"] if isinstance(doc.get("ui"), dict) else {} ui.update(patch) doc["ui"] = ui - _SETTINGS.write_text(json.dumps(doc, ensure_ascii=False, indent=2), encoding="utf-8") + _write_settings_doc(doc) except Exception as e: - print(f"[bridge] save ui prefs failed: {e}", file=sys.stderr) + bridge_print(f"[bridge] save ui prefs failed: {e}") manager.config.update(cfg) return json_ok({"ok": True, "gaRoot": manager.ga_root, "mykeyPath": manager.mykey_path, "config": manager.config}) @@ -1350,7 +1705,7 @@ async def patch_session_handler(request): if "plan_scan_baseline" in data: sess.plan_scan_baseline = int(data["plan_scan_baseline"]) sess.updated_at = time.time() - manager._persist() + manager._persist_session(sess) return json_ok({"ok": True, "session": manager.snapshot(sess, include_messages=False)}) @@ -1362,10 +1717,9 @@ async def prompt_handler(request): display = data.get("display") files_meta = data.get("files") or [] # 非图片附件 [{name, path}] image_metas = data.get("imageMetas") or [] # 图片附件 [{name, path}]（不含 dataUrl） - llm_no = data.get("llmNo") - if llm_no is not None: - llm_no = int(llm_no) - return json_ok(manager.submit_prompt(sid, prompt, images, llm_no=llm_no, display=display, + # 模型不再随 prompt 携带:切换模型走 POST /session/{sid}/model 这一唯一入口, + # 发消息只使用会话已绑定的 sess.llm_no(未绑定则回退全局默认)。 + return json_ok(manager.submit_prompt(sid, prompt, images, display=display, files_meta=files_meta, image_metas=image_metas)) @@ -1386,6 +1740,18 @@ async def restore_handler(request): return json_ok(manager.restore_context(sid)) +async def session_model_handler(request): + sid = request.match_info["sid"] + data = await read_json(request) + no = data.get("llmNo", data.get("llm_no")) + if no is None: + return json_ok({"ok": False, "error": "missing llmNo"}, status=400) + try: + return json_ok(manager.set_session_model(sid, int(no))) + except (TypeError, ValueError): + return json_ok({"ok": False, "error": "invalid llmNo"}, status=400) + + async def plan_handler(request): sid = request.match_info["sid"] return json_ok(manager.plan_snapshot(sid)) @@ -1639,9 +2005,114 @@ async def mykey_save_handler(request): profiles = manager._save_mykey_text(str(content)) except Exception as e: return json_ok({"ok": False, "error": str(e)}, status=400) + # 导入/整体重写 mykey 后,只有「已崩坏」的 conductor/scheduler 才重启(死了才救); + # 健康运行中的进程不打断,它们会在下个任务靠自身 mtime 热重载读到新 key。 + services.restart_broken_extras() return json_ok({"ok": True, "path": str(manager._mykey_file()), "profiles": profiles}) +def _import_memory_from(source_dir: str, ga_root: str) -> dict: + """把 source_dir 的 memory/ 与 temp/model_responses/ 导入到 ga_root。 + + memory/: 先整体备份现有 ga_root/memory 到 temp/memory_import_backup_/,再覆盖同名文件、补齐新文件。 + temp/model_responses/: 文件名带 pid/logid 天然唯一,只拷目标端不存在的,已存在的跳过。 + """ + src = Path(source_dir).expanduser().resolve() + dst_root = Path(ga_root).resolve() + if not src.is_dir(): + raise ValueError(f"source is not a directory: {src}") + if src == dst_root: + raise ValueError("source is the same as current GA root") + + src_mem = src / "memory" + src_resp = src / "temp" / "model_responses" + if not src_mem.is_dir() and not src_resp.is_dir(): + raise ValueError("not a GA directory (no memory/ or temp/model_responses/)") + + memory_copied = 0 + responses_copied = 0 + responses_skipped = 0 + backup_dir = "" + + # --- memory/: 备份后覆盖 --- + if src_mem.is_dir(): + dst_mem = dst_root / "memory" + if dst_mem.is_dir() and any(dst_mem.iterdir()): + ts = time.strftime("%Y%m%d_%H%M%S") + backup_root = dst_root / "temp" / f"memory_import_backup_{ts}" + backup_root.mkdir(parents=True, exist_ok=True) + shutil.copytree(dst_mem, backup_root / "memory") + backup_dir = str(backup_root) + dst_mem.mkdir(parents=True, exist_ok=True) + for item in src_mem.rglob("*"): + rel = item.relative_to(src_mem) + target = dst_mem / rel + if item.is_dir(): + target.mkdir(parents=True, exist_ok=True) + else: + target.parent.mkdir(parents=True, exist_ok=True) + shutil.copy2(item, target) + memory_copied += 1 + + # --- temp/model_responses/: 补齐缺失 --- + if src_resp.is_dir(): + dst_resp = dst_root / "temp" / "model_responses" + dst_resp.mkdir(parents=True, exist_ok=True) + for item in src_resp.rglob("*"): + if item.is_dir(): + continue + rel = item.relative_to(src_resp) + target = dst_resp / rel + if target.exists(): + responses_skipped += 1 + continue + target.parent.mkdir(parents=True, exist_ok=True) + shutil.copy2(item, target) + responses_copied += 1 + + return { + "ok": True, + "memoryCopied": memory_copied, + "responsesCopied": responses_copied, + "responsesSkipped": responses_skipped, + "backupDir": backup_dir, + } + + +async def memory_import_handler(request): + data = await read_json(request) + source_dir = (data.get("sourceDir") or "").strip() + if not source_dir: + return json_ok({"ok": False, "error": "missing_sourceDir"}, status=400) + try: + result = _import_memory_from(source_dir, manager.ga_root) + result.update(manager.import_sessions(source_dir)) + except Exception as e: + return json_ok({"ok": False, "error": str(e)}, status=400) + return json_ok(result) + + +async def conductor_model_get_handler(request): + return json_ok({"model": _conductor_settings()}) + + +async def conductor_model_save_handler(request): + data = await read_json(request) + try: + llm_no = int(data.get("llmNo")) + except (TypeError, ValueError): + return json_ok({"ok": False, "error": "invalid_llmNo"}, status=400) + try: + doc = _settings_doc() + conductor = doc["conductor"] if isinstance(doc.get("conductor"), dict) else {} + conductor["llmNo"] = llm_no + doc["conductor"] = conductor + _write_settings_doc(doc) + except Exception as e: + return json_ok({"ok": False, "error": str(e)}, status=500) + return json_ok({"ok": True, "model": conductor}) + + async def service_start_handler(request): body = await read_json(request) sid = body.get("id") or request.query.get("id") @@ -1781,6 +2252,7 @@ def create_app(): app.router.add_get("/session/{sid}/plan", plan_handler) app.router.add_post("/session/{sid}/cancel", cancel_handler) app.router.add_post("/session/{sid}/restore", restore_handler) + app.router.add_post("/session/{sid}/model", session_model_handler) app.router.add_post("/path/open", path_open_handler) app.router.add_post("/upload", upload_handler) app.router.add_delete("/upload", upload_delete_handler) @@ -1794,6 +2266,9 @@ def create_app(): app.router.add_get("/services/panel", service_panel_handler) app.router.add_get("/services/mykey", mykey_get_handler) app.router.add_post("/services/mykey", mykey_save_handler) + app.router.add_post("/memory/import", memory_import_handler) + app.router.add_get("/services/conductor/model", conductor_model_get_handler) + app.router.add_post("/services/conductor/model", conductor_model_save_handler) app.router.add_post("/services/stop-extras", stop_extras_handler) app.router.add_post("/services/start-extras", start_extras_handler) app.router.add_get("/services/identity", identity_handler) @@ -1826,5 +2301,5 @@ async def on_shutdown(app): if __name__ == "__main__": host = os.environ.get("BRIDGE_HOST", "127.0.0.1") port = int(os.environ.get("BRIDGE_PORT", "14168")) - print(f"GenericAgent Web2 bridge: http://{host}:{port} ws://{host}:{port}/ws", file=sys.stderr) + bridge_print(f"GenericAgent Web2 bridge: http://{host}:{port} ws://{host}:{port}/ws") web.run_app(create_app(), host=host, port=port, print=None) diff --git a/frontends/plan_state.py b/frontends/plan_state.py index bab87ee98..6b75e8fa6 100644 --- a/frontends/plan_state.py +++ b/frontends/plan_state.py @@ -200,14 +200,20 @@ def _msg_content(m) -> str: return c if isinstance(c, str) else "" +def _msg_role(m) -> str: + if isinstance(m, dict): return str(m.get("role") or "") + return str(getattr(m, "role", "") or "") + + def plan_path_mention_in_messages(messages, start_idx: int = 0) -> Optional[str]: + """Latest assistant/tool `enter_plan_mode(...)` path; plain chat text is not a signal.""" for m in reversed(_slice(messages, start_idx)): + if _msg_role(m) == "user": + continue text = _msg_content(m) if not text: continue if "enter_plan_mode" in text and (hit := _ENTER_PLAN_RE.search(text)): return hit.group(1).strip().strip("\"'") - if "plan.md" in text and (hits := _PATH_RE.findall(text)): - return hits[-1].strip().strip("\"'") return None @@ -222,6 +228,8 @@ def _resolve_stashed_at(p: str, root: str) -> Optional[str]: def _find_path_at(messages, start_idx: int, root: str) -> Optional[str]: for m in reversed(_slice(messages, start_idx)): + if _msg_role(m) == "user": + continue text = _msg_content(m) if not text or "plan.md" not in text: continue for hit in reversed(_PATH_RE.findall(text)): @@ -229,32 +237,45 @@ def _find_path_at(messages, start_idx: int, root: str) -> Optional[str]: return None -def default_session_plan_path(session_id: str) -> str: - sid = (session_id or "sess").replace("/", "_") - return f"temp/plan_{sid}/plan.md" +def _store_plan_path(path: str, root: str) -> str: + p = (path or "").strip() + if not p: + return "" + if os.path.isabs(p) and root: + for base in (os.path.join(root, "temp"), root): + try: + rel = os.path.relpath(p, base) + except ValueError: + continue + if rel and not rel.startswith(".."): + return rel.replace("\\", "/") + return p.replace("\\", "/").lstrip("./") -def is_session_scoped_plan_path(path: str, session_id: str) -> bool: - """Desktop: only bind/adopt paths under this session's plan_{id}/ tree.""" - if not path: - return False - sid = (session_id or "sess").replace("/", "_") - norm = path.replace("\\", "/").lstrip("./") - return f"plan_{sid}/" in norm or norm.endswith(f"plan_{sid}/plan.md") +def is_plan_mode_path(path: str) -> bool: + norm = (path or "").replace("\\", "/").lstrip("./") + return re.fullmatch(r"(?:temp/)?plan_[A-Za-z0-9_\-]+/plan\.md", norm) is not None -def is_plan_preset_prompt(prompt: str) -> bool: - p = (prompt or "").lower() - return "plan_sop" in p or "plan 模式" in p or "plan mode" in p - - -def bind_plan_session(sess: Any, prompt: str = "", path: Optional[str] = None) -> str: - """Bind plan card to this session only (avoids sharing plan_demo/ across sessions).""" - rel = (path or "").strip() or default_session_plan_path(getattr(sess, "id", "") or "") - sess.plan_path = rel - msgs = list(getattr(sess, "messages", []) or []) - sess.plan_scan_baseline = len(msgs) - return rel +def ensure_agent_plan_mode(sess: Any, root: str) -> None: + agent = getattr(sess, "agent", None) + bound = (getattr(sess, "plan_path", "") or "").strip() + if not agent or not bound or _stashed_plan_path(agent): + return + if not _resolve_stashed_at(bound, root): + return + for src in (getattr(agent, "handler", None), agent): + if not src: + continue + enter = getattr(src, "enter_plan_mode", None) + if callable(enter): + enter(bound) + return + for src in (getattr(agent, "handler", None), agent): + working = getattr(src, "working", None) + if isinstance(working, dict): + working["in_plan_mode"] = bound + return def sync_plan_path_from_text(sess: Any, text: str, root: str) -> None: @@ -267,23 +288,20 @@ def sync_plan_path_from_text(sess: Any, text: str, root: str) -> None: raw = m.group(1).strip().strip("\"'") if not raw: return - sess.plan_path = raw.lstrip("./") + sess.plan_path = _store_plan_path(raw, root) def session_plan_active(sess: Any, agent, messages, start_idx: int, root: str) -> bool: """Desktop: active when this session has a bound plan_path (not global plan_*/ scan).""" bound = (getattr(sess, "plan_path", None) or "").strip() - if not bound: - return False if _stashed_plan_path(agent): return True + if not bound: + return False if _resolve_stashed_at(bound, root): return True if getattr(sess, "status", "") == "running": return True - # Plan preset bound this session — keep placeholder until plan.md appears or path changes - if is_session_scoped_plan_path(bound, getattr(sess, "id", "")): - return True return False @@ -315,15 +333,24 @@ def desktop_plan_payload_from_session(sess: Any, ga_root: str = "") -> dict: partial = getattr(sess, "partial", None) if isinstance(partial, dict) and isinstance(partial.get("content"), str): sync_plan_path_from_text(sess, partial["content"], root) - sid = getattr(sess, "id", "") or "" + live_path = _stashed_plan_path(agent) + if live_path and not (getattr(sess, "plan_path", None) or "").strip(): + sess.plan_path = _store_plan_path(live_path, root) + if not getattr(sess, "plan_scan_baseline", 0): + sess.plan_scan_baseline = len(raw) if not (getattr(sess, "plan_path", None) or "").strip(): mentioned = plan_path_mention_in_messages(raw, base) - if mentioned and is_session_scoped_plan_path(mentioned, sid): - sess.plan_path = mentioned.lstrip("./") + if mentioned: + sess.plan_path = _store_plan_path(mentioned, root) else: - return {"active": False} + found = _find_path_at(raw, base, root) + if found: + sess.plan_path = _store_plan_path(found, root) + else: + return {"active": False} if not session_plan_active(sess, agent, raw, base, root): return {"active": False} + ensure_agent_plan_mode(sess, root) bound = getattr(sess, "plan_path", "") or "" path = _desktop_resolve_plan_file(sess, bound, root, agent, raw, base) items = [] From 02655f6383528d51b13d3a9d16ac02bfd31f911c Mon Sep 17 00:00:00 2001 From: abraxas914 Date: Thu, 9 Jul 2026 00:37:09 +0800 Subject: [PATCH 03/80] feat(conductor): enhanced service orchestration with error feedback and lifecycle hooks - Improved error classification and productized error messages - Graceful start/stop with proper signal handling - Bridge-visible status transitions for frontend service panel Co-Authored-By: Claude Opus 4.6 --- frontends/conductor.py | 64 +++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/frontends/conductor.py b/frontends/conductor.py index 092744e56..9ec04b55c 100644 --- a/frontends/conductor.py +++ b/frontends/conductor.py @@ -1,7 +1,7 @@ import os, sys, re, time, json, uuid, queue, asyncio, threading from dataclasses import dataclass, field from typing import Dict, Any, Optional, List -from contextlib import asynccontextmanager +from contextlib import asynccontextmanager, suppress from fastapi import FastAPI, WebSocket, WebSocketDisconnect from fastapi.responses import FileResponse, PlainTextResponse, JSONResponse @@ -18,28 +18,60 @@ HTML_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "conductor.html") -def _desktop_llm_no() -> Optional[int]: - """Read the model index the user picked in the desktop UI. - Persisted by the bridge at ~/.ga_desktop_settings.json under ui.llmNo. - Returns None when unavailable, so callers keep the agent's default model.""" +def _settings_doc() -> dict: try: from pathlib import Path doc = json.loads((Path.home() / ".ga_desktop_settings.json").read_text(encoding="utf-8")) - no = (doc.get("ui") or {}).get("llmNo") - return int(no) if no is not None else None + return doc if isinstance(doc, dict) else {} except Exception: - return None + return {} -def _apply_desktop_model(agent: "GenericAgent") -> None: - """Switch a freshly built agent to the desktop-selected model (if any).""" - no = _desktop_llm_no() - if no is None: +def _conductor_llm_no() -> Optional[int]: + """Read the model index bound to the conductor session. + Falls back to the legacy desktop default ui.llmNo for existing installs.""" + doc = _settings_doc() + for section in (doc.get("conductor"), doc.get("ui")): + if isinstance(section, dict) and section.get("llmNo") is not None: + try: + return int(section.get("llmNo")) + except (TypeError, ValueError): + pass + return None + + +def _client_usable(agent: "GenericAgent") -> bool: + return hasattr(getattr(agent, "llmclient", None), "backend") + + +def _fallback_usable_model(agent: "GenericAgent") -> None: + for i, client in enumerate(getattr(agent, "llmclients", []) or []): + if not hasattr(client, "backend"): + continue + agent.llm_no = i + agent.llmclient = client + with suppress(Exception): + agent.llmclient.last_tools = '' return - try: - agent.next_llm(int(no)) - except Exception as e: - print(f"[conductor] failed to apply desktop model #{no}: {e}", file=sys.stderr) + + +def _apply_desktop_model(agent: "GenericAgent") -> None: + """Make the conductor's session reflect the current desktop config before a task: + switch to its bound model if one is set, otherwise still refresh sessions from + mykey so live key/model edits (e.g. importing keys) take effect without a restart. + next_llm() already reloads internally; the no-bound-model branch must reload too, + or a conductor started on an empty/stale mykey would never pick up imported keys.""" + no = _conductor_llm_no() + if no is not None: + try: + agent.next_llm(int(no)) + except Exception as e: + print(f"[conductor] failed to apply conductor model #{no}: {e}", file=sys.stderr) + else: + agent.load_llm_sessions() # mtime-guarded; rebuilds only when mykey changed + if not _client_usable(agent): + print("[conductor] selected model is unavailable; falling back to first usable model", file=sys.stderr) + _fallback_usable_model(agent) @asynccontextmanager From f20b528c9272d2b7379ddcb15cdda3eeb04c8d9a Mon Sep 17 00:00:00 2001 From: abraxas914 Date: Thu, 9 Jul 2026 00:37:58 +0800 Subject: [PATCH 04/80] =?UTF-8?q?feat(desktop):=20React=20frontend=20scaff?= =?UTF-8?q?old=20=E2=80=94=20Vite,=20stores,=20hooks,=20layout,=20routing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Complete React + TypeScript desktop frontend built on Vite: - App shell: layout system (TopBar, LeftPanel, RightPanel, Resizer) - State management: Zustand stores (bridge connection, services, UI state) - Bridge HTTP/WS client with auto-reconnect and offline detection - Plan mode UI (PlanCard, QuickPlan components) - Session CRUD (new/delete/rename/pin/drag-sort) - Font, appearance, and log modal infrastructure - Dev tooling: vitest config, tsconfig, ESLint - Asset pipeline: provider logos, channel icons, app icons - Loading screen with i18n-aware progress messages - Documentation: adaptation notes, white-screen debug, gap analysis Co-Authored-By: Claude Opus 4.6 --- .../desktop/HANDOFF-white-screen-debug.md | 83 ++ frontends/desktop/docs/ADAPTATION-NOTES.md | 100 ++ .../desktop/docs/THREAD-BLEED-DIAGNOSTIC.md | 352 +++++++ frontends/desktop/docs/WHITE-SCREEN-FIX.md | 45 + .../docs/hermes-reference/GAP-ANALYSIS.md | 192 ++++ .../docs/hermes-reference/HANDOFF-SPEC.md | 316 ++++++ .../desktop/docs/hermes-reference/README.md | 32 + .../docs/hermes-reference/SOURCE-REFERENCE.md | 290 ++++++ frontends/desktop/index.html | 31 + frontends/desktop/loading.html | 21 + frontends/desktop/package.json | 41 +- .../desktop/public/assets/fonts/README.md | 34 + .../public/assets/fonts/azonix-wordmark.woff2 | Bin 0 -> 6848 bytes .../desktop/public/assets/fonts/fonts.css | 21 + .../assets/fonts/jetbrains-mono-latin.woff2 | Bin 0 -> 31340 bytes .../public/assets/fonts/lexend-latin.woff2 | Bin 0 -> 39692 bytes .../public/assets/fonts/noto-sans-latin.woff2 | Bin 0 -> 35856 bytes frontends/desktop/public/assets/ga-logo.svg | 58 ++ frontends/desktop/public/fallback.html | 132 +++ frontends/desktop/public/loading-legacy.html | 56 + frontends/desktop/public/loading.html | 56 + frontends/desktop/public/phosphor-icons.js | 101 ++ frontends/desktop/public/styles.css | 1 + frontends/desktop/public/vendor/marked.min.js | 6 + .../desktop/scripts/assert-dist-built.mjs | 112 ++ frontends/desktop/spec/FRONTEND_REFACTOR.md | 102 ++ frontends/desktop/src/App.tsx | 27 + .../src/__tests__/agent-protocol.test.ts | 207 ++++ .../src/__tests__/attachment-strip.test.tsx | 86 ++ .../src/__tests__/bridge/bridge-api.test.ts | 192 ++++ .../__tests__/bridge/bridge-detection.test.ts | 132 +++ .../__tests__/bridge/connection-state.test.ts | 181 ++++ .../src/__tests__/bridge/ws-protocol.test.ts | 254 +++++ .../desktop/src/__tests__/file-attach.test.ts | 80 ++ .../desktop/src/__tests__/format.test.ts | 39 + .../desktop/src/__tests__/primary-cta.test.ts | 28 + .../desktop/src/__tests__/rich-editor.test.ts | 106 ++ .../desktop/src/__tests__/safe-math.test.ts | 83 ++ .../desktop/src/__tests__/skills.test.ts | 59 ++ .../src/assets/generic-agent-black.svg | 1 + .../src/assets/generic-agent-white.svg | 1 + .../src/components/collab/CollabPage.tsx | 56 + .../src/components/collab/CollabWelcome.tsx | 61 ++ .../src/components/collab/WorkerCard.tsx | 63 ++ .../src/components/collab/WorkerDrawer.tsx | 32 + .../src/components/collab/WorkerPanel.tsx | 52 + .../desktop/src/components/collab/collab.css | 747 ++++++++++++++ .../src/components/layout/AppLayout.tsx | 40 + .../src/components/layout/BridgeMenuPanel.tsx | 166 +++ .../components/layout/ConductorMenuPanel.tsx | 135 +++ .../src/components/layout/LiveDuration.tsx | 24 + .../src/components/layout/MainArea.tsx | 43 + .../src/components/layout/Statusbar.tsx | 145 +++ .../components/layout/TitlebarControls.tsx | 36 + .../desktop/src/components/layout/layout.css | 934 +++++++++++++++++ .../components/services/MykeyConfigModal.tsx | 77 ++ .../src/components/services/ServicesPage.tsx | 32 + .../src/components/services/StatusPanel.tsx | 308 ++++++ .../desktop/src/components/services/index.ts | 1 + .../src/components/services/services.css | 136 +++ frontends/desktop/src/data/provider-icons.ts | 74 ++ frontends/desktop/src/global.css | 129 +++ .../src/hooks/useBridgeEverConnected.ts | 12 + .../desktop/src/hooks/useBridgeFailCount.ts | 10 + .../desktop/src/hooks/useBridgeStatus.ts | 15 + .../desktop/src/hooks/useEnterAnimation.ts | 28 + .../desktop/src/hooks/useSmoothReveal.ts | 78 ++ .../desktop/src/hooks/useStickToBottom.ts | 113 +++ frontends/desktop/src/hooks/useToolTimer.ts | 64 ++ frontends/desktop/src/lib/error-summary.ts | 27 + frontends/desktop/src/lib/icons.tsx | 45 + frontends/desktop/src/lib/parse-diff.ts | 53 + frontends/desktop/src/lib/prism-setup.ts | 97 ++ frontends/desktop/src/loading.tsx | 13 + frontends/desktop/src/loading/App.tsx | 42 + frontends/desktop/src/loading/Loading.tsx | 10 + frontends/desktop/src/loading/Progress.tsx | 33 + frontends/desktop/src/loading/Ready.tsx | 22 + frontends/desktop/src/loading/Setup.tsx | 72 ++ frontends/desktop/src/loading/bootstrap.css | 242 +++++ frontends/desktop/src/loading/events.ts | 137 +++ frontends/desktop/src/loading/store.ts | 73 ++ frontends/desktop/src/main.tsx | 54 + frontends/desktop/src/services/bridge.ts | 212 ++++ frontends/desktop/src/services/chat.ts | 240 +++++ frontends/desktop/src/services/constants.ts | 4 + frontends/desktop/src/services/legacy.ts | 40 + .../desktop/src/services/services-api.ts | 81 ++ frontends/desktop/src/services/ws.ts | 122 +++ frontends/desktop/src/stores/app.ts | 29 + .../desktop/src/stores/bridgeActivity.ts | 61 ++ frontends/desktop/src/stores/chat.ts | 339 +++++++ frontends/desktop/src/stores/services.ts | 145 +++ frontends/desktop/src/utils/format.ts | 11 + frontends/desktop/src/vite-env.d.ts | 6 + frontends/desktop/static/app.js | 953 +++++++++--------- frontends/desktop/static/fallback.html | 40 +- frontends/desktop/static/index.html | 28 +- frontends/desktop/static/loading.html | 24 +- frontends/desktop/static/phosphor-icons.js | 2 +- frontends/desktop/static/styles.css | 368 +++++-- .../testing/bug-002-icon-fouc-flash.md | 115 +++ .../insights/001-fouc-css-loading-timing.md | 109 ++ .../testing/test-plan-image-pipeline.md | 80 ++ .../desktop/testing/test_image_pipeline.py | 181 ++++ frontends/desktop/tests/bridge-log-verify.sh | 124 +++ .../desktop/tests/bridge-offline-ui-verify.sh | 109 ++ .../tests/bridge-restart-button-verify.sh | 99 ++ .../tests/service-display-names-verify.sh | 91 ++ frontends/desktop/tsconfig.json | 21 + frontends/desktop/vite.config.ts | 105 ++ 111 files changed, 11300 insertions(+), 628 deletions(-) create mode 100644 frontends/desktop/HANDOFF-white-screen-debug.md create mode 100644 frontends/desktop/docs/ADAPTATION-NOTES.md create mode 100644 frontends/desktop/docs/THREAD-BLEED-DIAGNOSTIC.md create mode 100644 frontends/desktop/docs/WHITE-SCREEN-FIX.md create mode 100644 frontends/desktop/docs/hermes-reference/GAP-ANALYSIS.md create mode 100644 frontends/desktop/docs/hermes-reference/HANDOFF-SPEC.md create mode 100644 frontends/desktop/docs/hermes-reference/README.md create mode 100644 frontends/desktop/docs/hermes-reference/SOURCE-REFERENCE.md create mode 100644 frontends/desktop/index.html create mode 100644 frontends/desktop/loading.html create mode 100644 frontends/desktop/public/assets/fonts/README.md create mode 100644 frontends/desktop/public/assets/fonts/azonix-wordmark.woff2 create mode 100644 frontends/desktop/public/assets/fonts/fonts.css create mode 100644 frontends/desktop/public/assets/fonts/jetbrains-mono-latin.woff2 create mode 100644 frontends/desktop/public/assets/fonts/lexend-latin.woff2 create mode 100644 frontends/desktop/public/assets/fonts/noto-sans-latin.woff2 create mode 100644 frontends/desktop/public/assets/ga-logo.svg create mode 100644 frontends/desktop/public/fallback.html create mode 100644 frontends/desktop/public/loading-legacy.html create mode 100644 frontends/desktop/public/loading.html create mode 100644 frontends/desktop/public/phosphor-icons.js create mode 120000 frontends/desktop/public/styles.css create mode 100644 frontends/desktop/public/vendor/marked.min.js create mode 100644 frontends/desktop/scripts/assert-dist-built.mjs create mode 100644 frontends/desktop/spec/FRONTEND_REFACTOR.md create mode 100644 frontends/desktop/src/App.tsx create mode 100644 frontends/desktop/src/__tests__/agent-protocol.test.ts create mode 100644 frontends/desktop/src/__tests__/attachment-strip.test.tsx create mode 100644 frontends/desktop/src/__tests__/bridge/bridge-api.test.ts create mode 100644 frontends/desktop/src/__tests__/bridge/bridge-detection.test.ts create mode 100644 frontends/desktop/src/__tests__/bridge/connection-state.test.ts create mode 100644 frontends/desktop/src/__tests__/bridge/ws-protocol.test.ts create mode 100644 frontends/desktop/src/__tests__/file-attach.test.ts create mode 100644 frontends/desktop/src/__tests__/format.test.ts create mode 100644 frontends/desktop/src/__tests__/primary-cta.test.ts create mode 100644 frontends/desktop/src/__tests__/rich-editor.test.ts create mode 100644 frontends/desktop/src/__tests__/safe-math.test.ts create mode 100644 frontends/desktop/src/__tests__/skills.test.ts create mode 100644 frontends/desktop/src/assets/generic-agent-black.svg create mode 100644 frontends/desktop/src/assets/generic-agent-white.svg create mode 100644 frontends/desktop/src/components/collab/CollabPage.tsx create mode 100644 frontends/desktop/src/components/collab/CollabWelcome.tsx create mode 100644 frontends/desktop/src/components/collab/WorkerCard.tsx create mode 100644 frontends/desktop/src/components/collab/WorkerDrawer.tsx create mode 100644 frontends/desktop/src/components/collab/WorkerPanel.tsx create mode 100644 frontends/desktop/src/components/collab/collab.css create mode 100644 frontends/desktop/src/components/layout/AppLayout.tsx create mode 100644 frontends/desktop/src/components/layout/BridgeMenuPanel.tsx create mode 100644 frontends/desktop/src/components/layout/ConductorMenuPanel.tsx create mode 100644 frontends/desktop/src/components/layout/LiveDuration.tsx create mode 100644 frontends/desktop/src/components/layout/MainArea.tsx create mode 100644 frontends/desktop/src/components/layout/Statusbar.tsx create mode 100644 frontends/desktop/src/components/layout/TitlebarControls.tsx create mode 100644 frontends/desktop/src/components/layout/layout.css create mode 100644 frontends/desktop/src/components/services/MykeyConfigModal.tsx create mode 100644 frontends/desktop/src/components/services/ServicesPage.tsx create mode 100644 frontends/desktop/src/components/services/StatusPanel.tsx create mode 100644 frontends/desktop/src/components/services/index.ts create mode 100644 frontends/desktop/src/components/services/services.css create mode 100644 frontends/desktop/src/data/provider-icons.ts create mode 100644 frontends/desktop/src/global.css create mode 100644 frontends/desktop/src/hooks/useBridgeEverConnected.ts create mode 100644 frontends/desktop/src/hooks/useBridgeFailCount.ts create mode 100644 frontends/desktop/src/hooks/useBridgeStatus.ts create mode 100644 frontends/desktop/src/hooks/useEnterAnimation.ts create mode 100644 frontends/desktop/src/hooks/useSmoothReveal.ts create mode 100644 frontends/desktop/src/hooks/useStickToBottom.ts create mode 100644 frontends/desktop/src/hooks/useToolTimer.ts create mode 100644 frontends/desktop/src/lib/error-summary.ts create mode 100644 frontends/desktop/src/lib/icons.tsx create mode 100644 frontends/desktop/src/lib/parse-diff.ts create mode 100644 frontends/desktop/src/lib/prism-setup.ts create mode 100644 frontends/desktop/src/loading.tsx create mode 100644 frontends/desktop/src/loading/App.tsx create mode 100644 frontends/desktop/src/loading/Loading.tsx create mode 100644 frontends/desktop/src/loading/Progress.tsx create mode 100644 frontends/desktop/src/loading/Ready.tsx create mode 100644 frontends/desktop/src/loading/Setup.tsx create mode 100644 frontends/desktop/src/loading/bootstrap.css create mode 100644 frontends/desktop/src/loading/events.ts create mode 100644 frontends/desktop/src/loading/store.ts create mode 100644 frontends/desktop/src/main.tsx create mode 100644 frontends/desktop/src/services/bridge.ts create mode 100644 frontends/desktop/src/services/chat.ts create mode 100644 frontends/desktop/src/services/constants.ts create mode 100644 frontends/desktop/src/services/legacy.ts create mode 100644 frontends/desktop/src/services/services-api.ts create mode 100644 frontends/desktop/src/services/ws.ts create mode 100644 frontends/desktop/src/stores/app.ts create mode 100644 frontends/desktop/src/stores/bridgeActivity.ts create mode 100644 frontends/desktop/src/stores/chat.ts create mode 100644 frontends/desktop/src/stores/services.ts create mode 100644 frontends/desktop/src/utils/format.ts create mode 100644 frontends/desktop/src/vite-env.d.ts create mode 100644 frontends/desktop/testing/bug-002-icon-fouc-flash.md create mode 100644 frontends/desktop/testing/insights/001-fouc-css-loading-timing.md create mode 100644 frontends/desktop/testing/test-plan-image-pipeline.md create mode 100644 frontends/desktop/testing/test_image_pipeline.py create mode 100755 frontends/desktop/tests/bridge-log-verify.sh create mode 100644 frontends/desktop/tests/bridge-offline-ui-verify.sh create mode 100644 frontends/desktop/tests/bridge-restart-button-verify.sh create mode 100644 frontends/desktop/tests/service-display-names-verify.sh create mode 100644 frontends/desktop/tsconfig.json create mode 100644 frontends/desktop/vite.config.ts diff --git a/frontends/desktop/HANDOFF-white-screen-debug.md b/frontends/desktop/HANDOFF-white-screen-debug.md new file mode 100644 index 000000000..1d9897175 --- /dev/null +++ b/frontends/desktop/HANDOFF-white-screen-debug.md @@ -0,0 +1,83 @@ +# Handoff: 白屏排查 — React Track (localhost:5176) + +## 症状 + +- `http://127.0.0.1:5176/` 打开白屏 +- HTML 正常返回（`
` + ` + + +
+ + + diff --git a/frontends/desktop/loading.html b/frontends/desktop/loading.html new file mode 100644 index 000000000..97d524d31 --- /dev/null +++ b/frontends/desktop/loading.html @@ -0,0 +1,21 @@ + + + + +GenericAgent + + + +
+ +
+ + + diff --git a/frontends/desktop/package.json b/frontends/desktop/package.json index 24e549dc1..ba528c144 100644 --- a/frontends/desktop/package.json +++ b/frontends/desktop/package.json @@ -1,10 +1,47 @@ { - "name": "genericagent-web2", + "name": "genericagent-desktop", + "private": true, "version": "0.1.0", + "type": "module", "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview", + "test": "vitest run", + "test:bridge": "vitest run src/__tests__/bridge/", + "test:stress": "vitest run src/__tests__/stress/", + "test:bundle": "node scripts/assert-dist-built.mjs", + "test:packaging": "node scripts/test-packaging.mjs", + "test:all": "vitest run && node scripts/assert-dist-built.mjs", "tauri": "tauri" }, + "dependencies": { + "@douyinfe/semi-icons": "^2.71.1", + "@douyinfe/semi-ui": "^2.71.1", + "@lobehub/icons": "^5.10.1", + "@types/prismjs": "^1.26.6", + "@vscode/codicons": "^0.0.45", + "katex": "^0.17.0", + "prismjs": "^1.30.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "react-markdown": "^10.1.0", + "rehype-katex": "^7.0.1", + "remark-gfm": "^4.0.1", + "remark-math": "^6.0.0", + "zustand": "^5.0.14" + }, "devDependencies": { - "@tauri-apps/cli": "^2" + "@tauri-apps/cli": "^2", + "@testing-library/dom": "^10.4.1", + "@testing-library/jest-dom": "^6.9.1", + "@testing-library/react": "^16.3.2", + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", + "@vitejs/plugin-react": "^4.3.4", + "happy-dom": "^20.10.6", + "typescript": "^5.6.3", + "vite": "^6.0.5", + "vitest": "^4.1.9" } } diff --git a/frontends/desktop/public/assets/fonts/README.md b/frontends/desktop/public/assets/fonts/README.md new file mode 100644 index 000000000..f8e5a57e8 --- /dev/null +++ b/frontends/desktop/public/assets/fonts/README.md @@ -0,0 +1,34 @@ +# Desktop Font Assets + +These font files are the offline Latin bundle for the vanilla desktop shell. + +## Files + +- `azonix-wordmark.woff2` + - Role: brand wordmark only + - Source: converted on 2026-05-25 from the local owner-installed file at `~/Library/Fonts/azonix/Azonix.otf` + - License: owner-provided / verify before external redistribution + - Note: this repo currently treats Azonix as a project-local brand asset + +- `lexend-latin.woff2` + - Role: English titles and navigation + - Source: Google Fonts CSS2 API, specimen page + - Downloaded: 2026-05-25 + - License: SIL Open Font License 1.1 + +- `noto-sans-latin.woff2` + - Role: English body copy and default Latin UI text + - Source: Google Fonts CSS2 API, specimen page + - Downloaded: 2026-05-25 + - License: SIL Open Font License 1.1 + +- `jetbrains-mono-latin.woff2` + - Role: config/value dense controls and numeric surfaces + - Source: Google Fonts CSS2 API, specimen page + - Downloaded: 2026-05-25 + - License: SIL Open Font License 1.1 + +## Notes + +- Only Latin subsets are bundled here. Chinese UI text continues to use the existing system fallback stack. +- Runtime does not fetch fonts from a CDN. `frontends/desktop/static/assets/fonts/fonts.css` is the only font entrypoint for the vanilla shell. diff --git a/frontends/desktop/public/assets/fonts/azonix-wordmark.woff2 b/frontends/desktop/public/assets/fonts/azonix-wordmark.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..947bfbebca88ae495253f19f8b679b6929e55dd3 GIT binary patch literal 6848 zcmV;x8b9TCPew9NR8&s@02;sm3;+NC052>602*=t0RR9100000000000000000000 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∓Jw5)|1+k+LPLo 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 literal 0 HcmV?d00001 diff --git a/frontends/desktop/public/assets/fonts/noto-sans-latin.woff2 b/frontends/desktop/public/assets/fonts/noto-sans-latin.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..e082930455df9ca4195fa8274dbb1a9c1546d640 GIT binary patch literal 35856 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 literal 0 HcmV?d00001 diff --git a/frontends/desktop/public/assets/ga-logo.svg b/frontends/desktop/public/assets/ga-logo.svg new file mode 100644 index 000000000..a4d456c14 --- /dev/null +++ b/frontends/desktop/public/assets/ga-logo.svg @@ -0,0 +1,58 @@ + + GenericAgent + + + diff --git a/frontends/desktop/public/fallback.html b/frontends/desktop/public/fallback.html new file mode 100644 index 000000000..c53f3c4eb --- /dev/null +++ b/frontends/desktop/public/fallback.html @@ -0,0 +1,132 @@ + + + + +GenericAgent — Setup + + + +

+

⚙️ Setup Required

+

The backend could not start. Please configure the paths below.

+

后端启动失败，请配置以下路径。

+ + +
+ +
+

+ e.g. C:/Python312/python.exe / ~/miniconda3/envs/myenv/bin/python +

+ + +
+ +
+

+ The folder containing frontends/desktop_bridge.py +

+ + +
+
+ + + + + diff --git a/frontends/desktop/public/loading-legacy.html b/frontends/desktop/public/loading-legacy.html new file mode 100644 index 000000000..f02eddb34 --- /dev/null +++ b/frontends/desktop/public/loading-legacy.html @@ -0,0 +1,56 @@ + + + + +GenericAgent + + + + +
+ +
正在启动 GenericAgent…
+
+
+ + diff --git a/frontends/desktop/public/loading.html b/frontends/desktop/public/loading.html new file mode 100644 index 000000000..f02eddb34 --- /dev/null +++ b/frontends/desktop/public/loading.html @@ -0,0 +1,56 @@ + + + + +GenericAgent + + + + +
+ +
正在启动 GenericAgent…
+
+
+ + diff --git a/frontends/desktop/public/phosphor-icons.js b/frontends/desktop/public/phosphor-icons.js new file mode 100644 index 000000000..101df095b --- /dev/null +++ b/frontends/desktop/public/phosphor-icons.js @@ -0,0 +1,101 @@ +(() => { + const PATHS = { + chatTeardropText: + 'M172,112a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h68A8,8,0,0,1,172,112Zm-8,24H96a8,8,0,0,0,0,16h68a8,8,0,0,0,0-16Zm68-12A100.11,100.11,0,0,1,132,224H48a16,16,0,0,1-16-16V124a100,100,0,0,1,200,0Zm-16,0a84,84,0,0,0-168,0v84h84A84.09,84.09,0,0,0,216,124Z', + broadcast: + 'M128,88a40,40,0,1,0,40,40A40,40,0,0,0,128,88Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,152Zm73.71,7.14a80,80,0,0,1-14.08,22.2,8,8,0,0,1-11.92-10.67,63.95,63.95,0,0,0,0-85.33,8,8,0,1,1,11.92-10.67,80.08,80.08,0,0,1,14.08,84.47ZM69,103.09a64,64,0,0,0,11.26,67.58,8,8,0,0,1-11.92,10.67,79.93,79.93,0,0,1,0-106.67A8,8,0,1,1,80.29,85.34,63.77,63.77,0,0,0,69,103.09ZM248,128a119.58,119.58,0,0,1-34.29,84,8,8,0,1,1-11.42-11.2,103.9,103.9,0,0,0,0-145.56A8,8,0,1,1,213.71,44,119.58,119.58,0,0,1,248,128ZM53.71,200.78A8,8,0,1,1,42.29,212a119.87,119.87,0,0,1,0-168,8,8,0,1,1,11.42,11.2,103.9,103.9,0,0,0,0,145.56Z', + chartBar: + 'M224,200h-8V40a8,8,0,0,0-8-8H152a8,8,0,0,0-8,8V80H96a8,8,0,0,0-8,8v40H48a8,8,0,0,0-8,8v64H32a8,8,0,0,0,0,16H224a8,8,0,0,0,0-16ZM160,48h40V200H160ZM104,96h40V200H104ZM56,144H88v56H56Z', + usersThree: + 'M244.8,150.4a8,8,0,0,1-11.2-1.6A51.6,51.6,0,0,0,192,128a8,8,0,0,1-7.37-4.89,8,8,0,0,1,0-6.22A8,8,0,0,1,192,112a24,24,0,1,0-23.24-30,8,8,0,1,1-15.5-4A40,40,0,1,1,219,117.51a67.94,67.94,0,0,1,27.43,21.68A8,8,0,0,1,244.8,150.4ZM190.92,212a8,8,0,1,1-13.84,8,57,57,0,0,0-98.16,0,8,8,0,1,1-13.84-8,72.06,72.06,0,0,1,33.74-29.92,48,48,0,1,1,58.36,0A72.06,72.06,0,0,1,190.92,212ZM128,176a32,32,0,1,0-32-32A32,32,0,0,0,128,176ZM72,120a8,8,0,0,0-8-8A24,24,0,1,1,87.24,82a8,8,0,1,0,15.5-4A40,40,0,1,0,37,117.51,67.94,67.94,0,0,0,9.6,139.19a8,8,0,1,0,12.8,9.61A51.6,51.6,0,0,1,64,128,8,8,0,0,0,72,120Z', + coins: + 'M184,89.57V84c0-25.08-37.83-44-88-44S8,58.92,8,84v40c0,20.89,26.25,37.49,64,42.46V172c0,25.08,37.83,44,88,44s88-18.92,88-44V132C248,111.3,222.58,94.68,184,89.57ZM232,132c0,13.22-30.79,28-72,28-3.73,0-7.43-.13-11.08-.37C170.49,151.77,184,139,184,124V105.74C213.87,110.19,232,122.27,232,132ZM72,150.25V126.46A183.74,183.74,0,0,0,96,128a183.74,183.74,0,0,0,24-1.54v23.79A163,163,0,0,1,96,152,163,163,0,0,1,72,150.25Zm96-40.32V124c0,8.39-12.41,17.4-32,22.87V123.5C148.91,120.37,159.84,115.71,168,109.93ZM96,56c41.21,0,72,14.78,72,28s-30.79,28-72,28S24,97.22,24,84,54.79,56,96,56ZM24,124V109.93c8.16,5.78,19.09,10.44,32,13.57v23.37C36.41,141.4,24,132.39,24,124Zm64,48v-4.17c2.63.1,5.29.17,8,.17,3.88,0,7.67-.13,11.39-.35A121.92,121.92,0,0,0,120,171.41v23.46C100.41,189.4,88,180.39,88,172Zm48,26.25V174.4a179.48,179.48,0,0,0,24,1.6,183.74,183.74,0,0,0,24-1.54v23.79a165.45,165.45,0,0,1-48,0Zm64-3.38V171.5c12.91-3.13,23.84-7.79,32-13.57V172C232,180.39,219.59,189.4,200,194.87Z', + sidebarSimple: + 'M216,40H40A16,16,0,0,0,24,56V200a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A16,16,0,0,0,216,40ZM40,56H80V200H40ZM216,200H96V56H216V200Z', + pencilSimple: + 'M227.31,73.37,182.63,28.68a16,16,0,0,0-22.63,0L36.69,152A15.86,15.86,0,0,0,32,163.31V208a16,16,0,0,0,16,16H92.69A15.86,15.86,0,0,0,104,219.31L227.31,96a16,16,0,0,0,0-22.63ZM92.69,208H48V163.31l88-88L180.69,120ZM192,108.68,147.31,64l24-24L216,84.68Z', + magnifyingGlass: + 'M229.66,218.34l-50.07-50.06a88.11,88.11,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.32ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z', + books: + 'M231.65,194.55,198.46,36.75a16,16,0,0,0-19-12.39L132.65,34.42a16.08,16.08,0,0,0-12.3,19l33.19,157.8A16,16,0,0,0,169.16,224a16.25,16.25,0,0,0,3.38-.36l46.81-10.06A16.09,16.09,0,0,0,231.65,194.55ZM136,50.15c0-.06,0-.09,0-.09l46.8-10,3.33,15.87L139.33,66Zm6.62,31.47,46.82-10.05,3.34,15.9L146,97.53Zm6.64,31.57,46.82-10.06,13.3,63.24-46.82,10.06ZM216,197.94l-46.8,10-3.33-15.87L212.67,182,216,197.85C216,197.91,216,197.94,216,197.94ZM104,32H56A16,16,0,0,0,40,48V208a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V48A16,16,0,0,0,104,32ZM56,48h48V64H56Zm0,32h48v96H56Zm48,128H56V192h48v16Z', + gridFour: + 'M200,40H56A16,16,0,0,0,40,56V200a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V56A16,16,0,0,0,200,40Zm0,80H136V56h64ZM120,56v64H56V56ZM56,136h64v64H56Zm144,64H136V136h64v64Z', + robot: + 'M200,48H136V16a8,8,0,0,0-16,0V48H56A32,32,0,0,0,24,80V192a32,32,0,0,0,32,32H200a32,32,0,0,0,32-32V80A32,32,0,0,0,200,48Zm16,144a16,16,0,0,1-16,16H56a16,16,0,0,1-16-16V80A16,16,0,0,1,56,64H200a16,16,0,0,1,16,16Zm-52-56H92a28,28,0,0,0,0,56h72a28,28,0,0,0,0-56Zm-24,16v24H116V152ZM80,164a12,12,0,0,1,12-12h8v24H92A12,12,0,0,1,80,164Zm84,12h-8V152h8a12,12,0,0,1,0,24ZM72,108a12,12,0,1,1,12,12A12,12,0,0,1,72,108Zm88,0a12,12,0,1,1,12,12A12,12,0,0,1,160,108Z', + dotsThree: + 'M140,128a12,12,0,1,1-12-12A12,12,0,0,1,140,128Zm56-12a12,12,0,1,0,12,12A12,12,0,0,0,196,116ZM60,116a12,12,0,1,0,12,12A12,12,0,0,0,60,116Z', + folderSimplePlus: + 'M216,72H130.67L102.93,51.2a16.12,16.12,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V200a16,16,0,0,0,16,16H216.89A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72Zm0,128H40V64H93.33L123.2,86.4A8,8,0,0,0,128,88h88Zm-56-56a8,8,0,0,1-8,8H136v16a8,8,0,0,1-16,0V152H104a8,8,0,0,1,0-16h16V120a8,8,0,0,1,16,0v16h16A8,8,0,0,1,160,144Z', + folderSimple: + 'M216,72H130.67L102.93,51.2a16.12,16.12,0,0,0-9.6-3.2H40A16,16,0,0,0,24,64V200a16,16,0,0,0,16,16H216.89A15.13,15.13,0,0,0,232,200.89V88A16,16,0,0,0,216,72Zm0,128H40V64H93.33L123.2,86.4A8,8,0,0,0,128,88h88Z', + bracketsCurly: + 'M43.18,128a29.78,29.78,0,0,1,8,10.26c4.8,9.9,4.8,22,4.8,33.74,0,24.31,1,36,24,36a8,8,0,0,1,0,16c-17.48,0-29.32-6.14-35.2-18.26-4.8-9.9-4.8-22-4.8-33.74,0-24.31-1-36-24-36a8,8,0,0,1,0-16c23,0,24-11.69,24-36,0-11.72,0-23.84,4.8-33.74C50.68,38.14,62.52,32,80,32a8,8,0,0,1,0,16C57,48,56,59.69,56,84c0,11.72,0,23.84-4.8,33.74A29.78,29.78,0,0,1,43.18,128ZM240,120c-23,0-24-11.69-24-36,0-11.72,0-23.84-4.8-33.74C205.32,38.14,193.48,32,176,32a8,8,0,0,0,0,16c23,0,24,11.69,24,36,0,11.72,0,23.84,4.8,33.74a29.78,29.78,0,0,0,8,10.26,29.78,29.78,0,0,0-8,10.26c-4.8,9.9-4.8,22-4.8,33.74,0,24.31-1,36-24,36a8,8,0,0,0,0,16c17.48,0,29.32-6.14,35.2-18.26,4.8-9.9,4.8-22,4.8-33.74,0-24.31,1-36,24-36a8,8,0,0,0,0-16Z', + gear: + 'M128,80a48,48,0,1,0,48,48A48.05,48.05,0,0,0,128,80Zm0,80a32,32,0,1,1,32-32A32,32,0,0,1,128,160Zm88-29.84q.06-2.16,0-4.32l14.92-18.64a8,8,0,0,0,1.48-7.06,107.21,107.21,0,0,0-10.88-26.25,8,8,0,0,0-6-3.93l-23.72-2.64q-1.48-1.56-3-3L186,40.54a8,8,0,0,0-3.94-6,107.71,107.71,0,0,0-26.25-10.87,8,8,0,0,0-7.06,1.49L130.16,40Q128,40,125.84,40L107.2,25.11a8,8,0,0,0-7.06-1.48A107.6,107.6,0,0,0,73.89,34.51a8,8,0,0,0-3.93,6L67.32,64.27q-1.56,1.49-3,3L40.54,70a8,8,0,0,0-6,3.94,107.71,107.71,0,0,0-10.87,26.25,8,8,0,0,0,1.49,7.06L40,125.84Q40,128,40,130.16L25.11,148.8a8,8,0,0,0-1.48,7.06,107.21,107.21,0,0,0,10.88,26.25,8,8,0,0,0,6,3.93l23.72,2.64q1.49,1.56,3,3L70,215.46a8,8,0,0,0,3.94,6,107.71,107.71,0,0,0,26.25,10.87,8,8,0,0,0,7.06-1.49L125.84,216q2.16.06,4.32,0l18.64,14.92a8,8,0,0,0,7.06,1.48,107.21,107.21,0,0,0,26.25-10.88,8,8,0,0,0,3.93-6l2.64-23.72q1.56-1.48,3-3L215.46,186a8,8,0,0,0,6-3.94,107.71,107.71,0,0,0,10.87-26.25,8,8,0,0,0-1.49-7.06Zm-16.1-6.5a73.93,73.93,0,0,1,0,8.68,8,8,0,0,0,1.74,5.48l14.19,17.73a91.57,91.57,0,0,1-6.23,15L187,173.11a8,8,0,0,0-5.1,2.64,74.11,74.11,0,0,1-6.14,6.14,8,8,0,0,0-2.64,5.1l-2.51,22.58a91.32,91.32,0,0,1-15,6.23l-17.74-14.19a8,8,0,0,0-5-1.75h-.48a73.93,73.93,0,0,1-8.68,0,8,8,0,0,0-5.48,1.74L100.45,215.8a91.57,91.57,0,0,1-15-6.23L82.89,187a8,8,0,0,0-2.64-5.1,74.11,74.11,0,0,1-6.14-6.14,8,8,0,0,0-5.1-2.64L46.43,170.6a91.32,91.32,0,0,1-6.23-15l14.19-17.74a8,8,0,0,0,1.74-5.48,73.93,73.93,0,0,1,0-8.68,8,8,0,0,0-1.74-5.48L40.2,100.45a91.57,91.57,0,0,1,6.23-15L69,82.89a8,8,0,0,0,5.1-2.64,74.11,74.11,0,0,1,6.14-6.14A8,8,0,0,0,82.89,69L85.4,46.43a91.32,91.32,0,0,1,15-6.23l17.74,14.19a8,8,0,0,0,5.48,1.74,73.93,73.93,0,0,1,8.68,0,8,8,0,0,0,5.48-1.74L155.55,40.2a91.57,91.57,0,0,1,15,6.23L173.11,69a8,8,0,0,0,2.64,5.1,74.11,74.11,0,0,1,6.14,6.14,8,8,0,0,0,5.1,2.64l22.58,2.51a91.32,91.32,0,0,1,6.23,15l-14.19,17.74A8,8,0,0,0,199.87,123.66Z', + caretLeft: + 'M165.66,202.34a8,8,0,0,1-11.32,11.32l-80-80a8,8,0,0,1,0-11.32l80-80a8,8,0,0,1,11.32,11.32L91.31,128Z', + caretDown: + 'M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,53.66,90.34L128,164.69l74.34-74.35a8,8,0,0,1,11.32,11.32Z', + caretRight: + 'M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z', + paperPlaneTilt: + 'M227.32,28.68a16,16,0,0,0-15.66-4.08l-.15,0L19.57,82.84a16,16,0,0,0-2.49,29.8L102,154l41.3,84.87A15.86,15.86,0,0,0,157.74,248q.69,0,1.38-.06a15.88,15.88,0,0,0,14-11.51l58.2-191.94c0-.05,0-.1,0-.15A16,16,0,0,0,227.32,28.68ZM157.83,231.85l-.05.14,0-.07-40.06-82.3,48-48a8,8,0,0,0-11.31-11.31l-48,48L24.08,98.25l-.07,0,.14,0L216,40Z', + paperclip: + 'M209.66,122.34a8,8,0,0,1,0,11.32l-82.05,82a56,56,0,0,1-79.2-79.21L147.67,35.73a40,40,0,1,1,56.61,56.55L105,193A24,24,0,1,1,71,159L154.3,74.38A8,8,0,1,1,165.7,85.6L82.39,170.31a8,8,0,1,0,11.27,11.36L192.93,81A24,24,0,1,0,159,47L59.76,147.68a40,40,0,1,0,56.53,56.62l82.06-82A8,8,0,0,1,209.66,122.34Z', + lightning: + 'M215.79,118.17a8,8,0,0,0-5-5.66L153.18,90.9l14.66-73.33a8,8,0,0,0-13.69-7l-112,120a8,8,0,0,0,3,13l57.63,21.61L88.16,238.43a8,8,0,0,0,13.69,7l112-120A8,8,0,0,0,215.79,118.17ZM109.37,214l10.47-52.38a8,8,0,0,0-5-9.06L62,132.71l84.62-90.66L136.16,94.43a8,8,0,0,0,5,9.06l52.8,19.8Z', + pushPinSimple: + 'M216,168h-9.29L185.54,48H192a8,8,0,0,0,0-16H64a8,8,0,0,0,0,16h6.46L49.29,168H40a8,8,0,0,0,0,16h80v56a8,8,0,0,0,16,0V184h80a8,8,0,0,0,0-16ZM86.71,48h82.58l21.17,120H65.54Z', + trash: + 'M216,48H176V40a24,24,0,0,0-24-24H104A24,24,0,0,0,80,40v8H40a8,8,0,0,0,0,16h8V208a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V64h8a8,8,0,0,0,0-16ZM96,40a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96Zm96,168H64V64H192ZM112,104v64a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm48,0v64a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Z', + x: + 'M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z', + dotsThreeVertical: + 'M140,128a12,12,0,1,1-12-12A12,12,0,0,1,140,128Zm0-56a12,12,0,1,1-12-12A12,12,0,0,1,140,72Zm0,112a12,12,0,1,1-12-12A12,12,0,0,1,140,184Z', + plus: + 'M224,128a8,8,0,0,1-8,8H136v80a8,8,0,0,1-16,0V136H40a8,8,0,0,1,0-16h80V40a8,8,0,0,1,16,0v80h80A8,8,0,0,1,224,128Z', + copy: + 'M216,32H88a8,8,0,0,0-8,8V80H40a8,8,0,0,0-8,8V216a8,8,0,0,0,8,8H168a8,8,0,0,0,8-8V176h40a8,8,0,0,0,8-8V40A8,8,0,0,0,216,32ZM160,208H48V96H160Zm48-48H176V88a8,8,0,0,0-8-8H96V48H208Z', + check: + 'M229.66,77.66l-128,128a8,8,0,0,1-11.32,0l-56-56a8,8,0,0,1,11.32-11.32L96,188.69,218.34,66.34a8,8,0,0,1,11.32,11.32Z', + crosshair: + 'M232,120h-8.34A96.14,96.14,0,0,0,136,32.34V24a8,8,0,0,0-16,0v8.34A96.14,96.14,0,0,0,32.34,120H24a8,8,0,0,0,0,16h8.34A96.14,96.14,0,0,0,120,223.66V232a8,8,0,0,0,16,0v-8.34A96.14,96.14,0,0,0,223.66,136H232a8,8,0,0,0,0-16Zm-96,87.6V200a8,8,0,0,0-16,0v7.6A80.15,80.15,0,0,1,48.4,136H56a8,8,0,0,0,0-16H48.4A80.15,80.15,0,0,1,120,48.4V56a8,8,0,0,0,16,0V48.4A80.15,80.15,0,0,1,207.6,120H200a8,8,0,0,0,0,16h7.6A80.15,80.15,0,0,1,136,207.6ZM128,88a40,40,0,1,0,40,40A40,40,0,0,0,128,88Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,152Z', + compass: + 'M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216ZM172.42,72.84l-64,32a8.05,8.05,0,0,0-3.58,3.58l-32,64A8,8,0,0,0,80,184a8.1,8.1,0,0,0,3.58-.84l64-32a8.05,8.05,0,0,0,3.58-3.58l32-64a8,8,0,0,0-10.74-10.74ZM138,138,97.89,158.11,118,118l40.15-20.07Z', + listChecks: + 'M224,128a8,8,0,0,1-8,8H128a8,8,0,0,1,0-16h88A8,8,0,0,1,224,128ZM128,72h88a8,8,0,0,0,0-16H128a8,8,0,0,0,0,16Zm88,112H128a8,8,0,0,0,0,16h88a8,8,0,0,0,0-16ZM82.34,42.34,56,68.69,45.66,58.34A8,8,0,0,0,34.34,69.66l16,16a8,8,0,0,0,11.32,0l32-32A8,8,0,0,0,82.34,42.34Zm0,64L56,132.69,45.66,122.34a8,8,0,0,0-11.32,11.32l16,16a8,8,0,0,0,11.32,0l32-32a8,8,0,0,0-11.32-11.32Zm0,64L56,196.69,45.66,186.34a8,8,0,0,0-11.32,11.32l16,16a8,8,0,0,0,11.32,0l32-32a8,8,0,0,0-11.32-11.32Z', + star: + 'M239.18,97.26A16.38,16.38,0,0,0,224.92,86l-59-4.76L143.14,26.15a16.36,16.36,0,0,0-30.27,0L90.11,81.23,31.08,86a16.46,16.46,0,0,0-9.37,28.86l45,38.83L53,211.75a16.38,16.38,0,0,0,24.5,17.82L128,198.49l50.53,31.08A16.4,16.4,0,0,0,203,211.75l-13.76-58.07,45-38.83A16.43,16.43,0,0,0,239.18,97.26Zm-15.34,5.47-48.7,42a8,8,0,0,0-2.56,7.91l14.88,62.8a.37.37,0,0,1-.17.48c-.18.14-.23.11-.38,0l-54.72-33.65a8,8,0,0,0-8.38,0L69.09,215.94c-.15.09-.19.12-.38,0a.37.37,0,0,1-.17-.48l14.88-62.8a8,8,0,0,0-2.56-7.91l-48.7-42c-.12-.1-.23-.19-.13-.5s.18-.27.33-.29l63.92-5.16A8,8,0,0,0,103,91.86l24.62-59.61c.08-.17.11-.25.35-.25s.27.08.35.25L153,91.86a8,8,0,0,0,6.75,4.92l63.92,5.16c.15,0,.24,0,.33.29S224,102.63,223.84,102.73Z', + fileText: + 'M213.66,82.34l-56-56A8,8,0,0,0,152,24H56A16,16,0,0,0,40,40V216a16,16,0,0,0,16,16H200a16,16,0,0,0,16-16V88A8,8,0,0,0,213.66,82.34ZM160,51.31,188.69,80H160ZM200,216H56V40h88V88a8,8,0,0,0,8,8h48V216Zm-32-80a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,136Zm0,32a8,8,0,0,1-8,8H96a8,8,0,0,1,0-16h64A8,8,0,0,1,168,168Z', + gitFork: + 'M224,64a32,32,0,1,0-40,31v17a8,8,0,0,1-8,8H80a8,8,0,0,1-8-8V95a32,32,0,1,0-16,0v17a24,24,0,0,0,24,24h40v25a32,32,0,1,0,16,0V136h40a24,24,0,0,0,24-24V95A32.06,32.06,0,0,0,224,64ZM48,64A16,16,0,1,1,64,80,16,16,0,0,1,48,64Zm96,128a16,16,0,1,1-16-16A16,16,0,0,1,144,192ZM192,80a16,16,0,1,1,16-16A16,16,0,0,1,192,80Z', + hexagon: + 'M223.68,66.15,135.68,18h0a15.88,15.88,0,0,0-15.36,0l-88,48.17a16,16,0,0,0-8.32,14v95.64a16,16,0,0,0,8.32,14l88,48.17a15.88,15.88,0,0,0,15.36,0l88-48.17a16,16,0,0,0,8.32-14V80.18A16,16,0,0,0,223.68,66.15ZM216,175.82,128,224,40,175.82V80.18L128,32h0l88,48.17Z', + }; + + function gaIcon(name, className = '') { + const d = PATHS[name]; + if (!d) return ''; + const cls = className ? ` class="${className}"` : ''; + return `/i,startPreScriptTag:/^<(pre|code|kbd|script)(\s|>)/i,endPreScriptTag:/^<\/(pre|code|kbd|script)(\s|>)/i,startAngleBracket:/^$/,pedanticHrefTitle:/^([^'"]*[^\s])\s+(['"])(.*)\2/,unicodeAlphaNumeric:/[\p{L}\p{N}]/u,escapeTest:/[&<>"']/,escapeReplace:/[&<>"']/g,escapeTestNoEncode:/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/,escapeReplaceNoEncode:/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/g,unescapeTest:/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,caret:/(^|[^\[])\^/g,percentDecode:/%25/g,findPipe:/\|/g,splitPipe:/ \|/,slashPipe:/\\\|/g,carriageReturn:/\r\n|\r/g,spaceLine:/^ +$/gm,notSpaceStart:/^\S*/,endingNewline:/\n$/,listItemRegex:e=>new RegExp(`^( {0,3}${e})((?:[\t ][^\\n]*)?(?:\\n|$))`),nextBulletRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`),hrRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`),fencesBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}(?:\`\`\`|~~~)`),headingBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}#`),htmlBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}<(?:[a-z].*>|!--)`,"i")},l=/^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,o=/(?:[*+-]|\d{1,9}[.)])/,a=/^(?!bull |blockCode|fences|blockquote|heading|html|table)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html|table))+?)\n {0,3}(=+|-+) *(?:\n+|$)/,c=r(a).replace(/bull/g,o).replace(/blockCode/g,/(?: {4}| {0,3}\t)/).replace(/fences/g,/ {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g,/ {0,3}>/).replace(/heading/g,/ {0,3}#{1,6}/).replace(/html/g,/ {0,3}<[^\n>]+>\n/).replace(/\|table/g,"").getRegex(),h=r(a).replace(/bull/g,o).replace(/blockCode/g,/(?: {4}| {0,3}\t)/).replace(/fences/g,/ {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g,/ {0,3}>/).replace(/heading/g,/ {0,3}#{1,6}/).replace(/html/g,/ {0,3}<[^\n>]+>\n/).replace(/table/g,/ {0,3}\|?(?:[:\- ]*\|)+[\:\- ]*\n/).getRegex(),p=/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,u=/(?!\s*\])(?:\\.|[^\[\]\\])+/,g=r(/^ {0,3}\[(label)\]: *(?:\n[ \t]*)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n[ \t]*)?| *\n[ \t]*)(title))? *(?:\n+|$)/).replace("label",u).replace("title",/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/).getRegex(),k=r(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/).replace(/bull/g,o).getRegex(),d="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",f=/|$))/,x=r("^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|\\n*|$)|\\n*|$)|)[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$))","i").replace("comment",f).replace("tag",d).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),b=r(p).replace("hr",l).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("|table","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex(),w={blockquote:r(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/).replace("paragraph",b).getRegex(),code:/^((?: {4}| {0,3}\t)[^\n]+(?:\n(?:[ \t]*(?:\n|$))*)?)+/,def:g,fences:/^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/,heading:/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,hr:l,html:x,lheading:c,list:k,newline:/^(?:[ \t]*(?:\n|$))+/,paragraph:b,table:s,text:/^[^\n]+/},m=r("^ *([^\\n ].*)\\n {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)").replace("hr",l).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("blockquote"," {0,3}>").replace("code","(?: {4}| {0,3}\t)[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex(),y={...w,lheading:h,table:m,paragraph:r(p).replace("hr",l).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("table",m).replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex()},$={...w,html:r("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",f).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:s,lheading:/^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,paragraph:r(p).replace("hr",l).replace("heading"," *#{1,6} *[^\n]").replace("lheading",c).replace("|table","").replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").replace("|tag","").getRegex()},R=/^( {2,}|\\)\n(?!\s*$)/,S=/[\p{P}\p{S}]/u,T=/[\s\p{P}\p{S}]/u,z=/[^\s\p{P}\p{S}]/u,A=r(/^((?![*_])punctSpace)/,"u").replace(/punctSpace/g,T).getRegex(),_=/(?!~)[\p{P}\p{S}]/u,P=/^(?:\*+(?:((?!\*)punct)|[^\s*]))|^_+(?:((?!_)punct)|([^\s_]))/,I=r(P,"u").replace(/punct/g,S).getRegex(),L=r(P,"u").replace(/punct/g,_).getRegex(),B="^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)|[^*]+(?=[^*])|(?!\\*)punct(\\*+)(?=[\\s]|$)|notPunctSpace(\\*+)(?!\\*)(?=punctSpace|$)|(?!\\*)punctSpace(\\*+)(?=notPunctSpace)|[\\s](\\*+)(?!\\*)(?=punct)|(?!\\*)punct(\\*+)(?!\\*)(?=punct)|notPunctSpace(\\*+)(?=notPunctSpace)",C=r(B,"gu").replace(/notPunctSpace/g,z).replace(/punctSpace/g,T).replace(/punct/g,S).getRegex(),q=r(B,"gu").replace(/notPunctSpace/g,/(?:[^\s\p{P}\p{S}]|~)/u).replace(/punctSpace/g,/(?!~)[\s\p{P}\p{S}]/u).replace(/punct/g,_).getRegex(),E=r("^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)|[^_]+(?=[^_])|(?!_)punct(_+)(?=[\\s]|$)|notPunctSpace(_+)(?!_)(?=punctSpace|$)|(?!_)punctSpace(_+)(?=notPunctSpace)|[\\s](_+)(?!_)(?=punct)|(?!_)punct(_+)(?!_)(?=punct)","gu").replace(/notPunctSpace/g,z).replace(/punctSpace/g,T).replace(/punct/g,S).getRegex(),Z=r(/\\(punct)/,"gu").replace(/punct/g,S).getRegex(),v=r(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/).replace("scheme",/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/).replace("email",/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/).getRegex(),D=r(f).replace("(?:--\x3e|$)","--\x3e").getRegex(),M=r("^comment|^|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^|^").replace("comment",D).replace("attribute",/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/).getRegex(),O=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,Q=r(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/).replace("label",O).replace("href",/<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/).replace("title",/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/).getRegex(),j=r(/^!?\[(label)\]\[(ref)\]/).replace("label",O).replace("ref",u).getRegex(),N=r(/^!?\[(ref)\](?:\[\])?/).replace("ref",u).getRegex(),G={_backpedal:s,anyPunctuation:Z,autolink:v,blockSkip:/\[[^[\]]*?\]\((?:\\.|[^\\\(\)]|\((?:\\.|[^\\\(\)])*\))*\)|`[^`]*?`|<[^<>]*?>/g,br:R,code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,del:s,emStrongLDelim:I,emStrongRDelimAst:C,emStrongRDelimUnd:E,escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,link:Q,nolink:N,punctuation:A,reflink:j,reflinkSearch:r("reflink|nolink(?!\\()","g").replace("reflink",j).replace("nolink",N).getRegex(),tag:M,text:/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\":">",'"':""","'":"'"},V=e=>K[e];function W(e,t){if(t){if(i.escapeTest.test(e))return e.replace(i.escapeReplace,V)}else if(i.escapeTestNoEncode.test(e))return e.replace(i.escapeReplaceNoEncode,V);return e}function Y(e){try{e=encodeURI(e).replace(i.percentDecode,"%")}catch{return null}return e}function ee(e,t){const n=e.replace(i.findPipe,((e,t,n)=>{let s=!1,r=t;for(;--r>=0&&"\\"===n[r];)s=!s;return s?"|":" |"})).split(i.splitPipe);let s=0;if(n[0].trim()||n.shift(),n.length>0&&!n.at(-1)?.trim()&&n.pop(),t)if(n.length>t)n.splice(t);else for(;n.length0)return{type:"space",raw:t[0]}}code(e){const t=this.rules.block.code.exec(e);if(t){const e=t[0].replace(this.rules.other.codeRemoveIndent,"");return{type:"code",raw:t[0],codeBlockStyle:"indented",text:this.options.pedantic?e:te(e,"\n")}}}fences(e){const t=this.rules.block.fences.exec(e);if(t){const e=t[0],n=function(e,t,n){const s=e.match(n.other.indentCodeCompensation);if(null===s)return t;const r=s[1];return t.split("\n").map((e=>{const t=e.match(n.other.beginningSpace);if(null===t)return e;const[s]=t;return s.length>=r.length?e.slice(r.length):e})).join("\n")}(e,t[3]||"",this.rules);return{type:"code",raw:e,lang:t[2]?t[2].trim().replace(this.rules.inline.anyPunctuation,"$1"):t[2],text:n}}}heading(e){const t=this.rules.block.heading.exec(e);if(t){let e=t[2].trim();if(this.rules.other.endingHash.test(e)){const t=te(e,"#");this.options.pedantic?e=t.trim():t&&!this.rules.other.endingSpaceChar.test(t)||(e=t.trim())}return{type:"heading",raw:t[0],depth:t[1].length,text:e,tokens:this.lexer.inline(e)}}}hr(e){const t=this.rules.block.hr.exec(e);if(t)return{type:"hr",raw:te(t[0],"\n")}}blockquote(e){const t=this.rules.block.blockquote.exec(e);if(t){let e=te(t[0],"\n").split("\n"),n="",s="";const r=[];for(;e.length>0;){let t=!1;const i=[];let l;for(l=0;l1,r={type:"list",raw:"",ordered:s,start:s?+n.slice(0,-1):"",loose:!1,items:[]};n=s?`\\d{1,9}\\${n.slice(-1)}`:`\\${n}`,this.options.pedantic&&(n=s?n:"[*+-]");const i=this.rules.other.listItemRegex(n);let l=!1;for(;e;){let n=!1,s="",o="";if(!(t=i.exec(e)))break;if(this.rules.block.hr.test(e))break;s=t[0],e=e.substring(s.length);let a=t[2].split("\n",1)[0].replace(this.rules.other.listReplaceTabs,(e=>" ".repeat(3*e.length))),c=e.split("\n",1)[0],h=!a.trim(),p=0;if(this.options.pedantic?(p=2,o=a.trimStart()):h?p=t[1].length+1:(p=t[2].search(this.rules.other.nonSpaceChar),p=p>4?1:p,o=a.slice(p),p+=t[1].length),h&&this.rules.other.blankLine.test(c)&&(s+=c+"\n",e=e.substring(c.length+1),n=!0),!n){const t=this.rules.other.nextBulletRegex(p),n=this.rules.other.hrRegex(p),r=this.rules.other.fencesBeginRegex(p),i=this.rules.other.headingBeginRegex(p),l=this.rules.other.htmlBeginRegex(p);for(;e;){const u=e.split("\n",1)[0];let g;if(c=u,this.options.pedantic?(c=c.replace(this.rules.other.listReplaceNesting," "),g=c):g=c.replace(this.rules.other.tabCharGlobal," "),r.test(c))break;if(i.test(c))break;if(l.test(c))break;if(t.test(c))break;if(n.test(c))break;if(g.search(this.rules.other.nonSpaceChar)>=p||!c.trim())o+="\n"+g.slice(p);else{if(h)break;if(a.replace(this.rules.other.tabCharGlobal," ").search(this.rules.other.nonSpaceChar)>=4)break;if(r.test(a))break;if(i.test(a))break;if(n.test(a))break;o+="\n"+c}h||c.trim()||(h=!0),s+=u+"\n",e=e.substring(u.length+1),a=g.slice(p)}}r.loose||(l?r.loose=!0:this.rules.other.doubleBlankLine.test(s)&&(l=!0));let u,g=null;this.options.gfm&&(g=this.rules.other.listIsTask.exec(o),g&&(u="[ ] "!==g[0],o=o.replace(this.rules.other.listReplaceTask,""))),r.items.push({type:"list_item",raw:s,task:!!g,checked:u,loose:!1,text:o,tokens:[]}),r.raw+=s}const o=r.items.at(-1);if(!o)return;o.raw=o.raw.trimEnd(),o.text=o.text.trimEnd(),r.raw=r.raw.trimEnd();for(let e=0;e"space"===e.type)),n=t.length>0&&t.some((e=>this.rules.other.anyLine.test(e.raw)));r.loose=n}if(r.loose)for(let e=0;e({text:e,tokens:this.lexer.inline(e),header:!1,align:i.align[t]}))));return i}}lheading(e){const t=this.rules.block.lheading.exec(e);if(t)return{type:"heading",raw:t[0],depth:"="===t[2].charAt(0)?1:2,text:t[1],tokens:this.lexer.inline(t[1])}}paragraph(e){const t=this.rules.block.paragraph.exec(e);if(t){const e="\n"===t[1].charAt(t[1].length-1)?t[1].slice(0,-1):t[1];return{type:"paragraph",raw:t[0],text:e,tokens:this.lexer.inline(e)}}}text(e){const t=this.rules.block.text.exec(e);if(t)return{type:"text",raw:t[0],text:t[0],tokens:this.lexer.inline(t[0])}}escape(e){const t=this.rules.inline.escape.exec(e);if(t)return{type:"escape",raw:t[0],text:t[1]}}tag(e){const t=this.rules.inline.tag.exec(e);if(t)return!this.lexer.state.inLink&&this.rules.other.startATag.test(t[0])?this.lexer.state.inLink=!0:this.lexer.state.inLink&&this.rules.other.endATag.test(t[0])&&(this.lexer.state.inLink=!1),!this.lexer.state.inRawBlock&&this.rules.other.startPreScriptTag.test(t[0])?this.lexer.state.inRawBlock=!0:this.lexer.state.inRawBlock&&this.rules.other.endPreScriptTag.test(t[0])&&(this.lexer.state.inRawBlock=!1),{type:"html",raw:t[0],inLink:this.lexer.state.inLink,inRawBlock:this.lexer.state.inRawBlock,block:!1,text:t[0]}}link(e){const t=this.rules.inline.link.exec(e);if(t){const e=t[2].trim();if(!this.options.pedantic&&this.rules.other.startAngleBracket.test(e)){if(!this.rules.other.endAngleBracket.test(e))return;const t=te(e.slice(0,-1),"\\");if((e.length-t.length)%2==0)return}else{const e=function(e,t){if(-1===e.indexOf(t[1]))return-1;let n=0;for(let s=0;s-1){const n=(0===t[0].indexOf("!")?5:4)+t[1].length+e;t[2]=t[2].substring(0,e),t[0]=t[0].substring(0,n).trim(),t[3]=""}}let n=t[2],s="";if(this.options.pedantic){const e=this.rules.other.pedanticHrefTitle.exec(n);e&&(n=e[1],s=e[3])}else s=t[3]?t[3].slice(1,-1):"";return n=n.trim(),this.rules.other.startAngleBracket.test(n)&&(n=this.options.pedantic&&!this.rules.other.endAngleBracket.test(e)?n.slice(1):n.slice(1,-1)),ne(t,{href:n?n.replace(this.rules.inline.anyPunctuation,"$1"):n,title:s?s.replace(this.rules.inline.anyPunctuation,"$1"):s},t[0],this.lexer,this.rules)}}reflink(e,t){let n;if((n=this.rules.inline.reflink.exec(e))||(n=this.rules.inline.nolink.exec(e))){const e=t[(n[2]||n[1]).replace(this.rules.other.multipleSpaceGlobal," ").toLowerCase()];if(!e){const e=n[0].charAt(0);return{type:"text",raw:e,text:e}}return ne(n,e,n[0],this.lexer,this.rules)}}emStrong(e,t,n=""){let s=this.rules.inline.emStrongLDelim.exec(e);if(!s)return;if(s[3]&&n.match(this.rules.other.unicodeAlphaNumeric))return;if(!(s[1]||s[2]||"")||!n||this.rules.inline.punctuation.exec(n)){const n=[...s[0]].length-1;let r,i,l=n,o=0;const a="*"===s[0][0]?this.rules.inline.emStrongRDelimAst:this.rules.inline.emStrongRDelimUnd;for(a.lastIndex=0,t=t.slice(-1*e.length+n);null!=(s=a.exec(t));){if(r=s[1]||s[2]||s[3]||s[4]||s[5]||s[6],!r)continue;if(i=[...r].length,s[3]||s[4]){l+=i;continue}if((s[5]||s[6])&&n%3&&!((n+i)%3)){o+=i;continue}if(l-=i,l>0)continue;i=Math.min(i,i+l+o);const t=[...s[0]][0].length,a=e.slice(0,n+s.index+t+i);if(Math.min(n,i)%2){const e=a.slice(1,-1);return{type:"em",raw:a,text:e,tokens:this.lexer.inlineTokens(e)}}const c=a.slice(2,-2);return{type:"strong",raw:a,text:c,tokens:this.lexer.inlineTokens(c)}}}}codespan(e){const t=this.rules.inline.code.exec(e);if(t){let e=t[2].replace(this.rules.other.newLineCharGlobal," ");const n=this.rules.other.nonSpaceChar.test(e),s=this.rules.other.startingSpaceChar.test(e)&&this.rules.other.endingSpaceChar.test(e);return n&&s&&(e=e.substring(1,e.length-1)),{type:"codespan",raw:t[0],text:e}}}br(e){const t=this.rules.inline.br.exec(e);if(t)return{type:"br",raw:t[0]}}del(e){const t=this.rules.inline.del.exec(e);if(t)return{type:"del",raw:t[0],text:t[2],tokens:this.lexer.inlineTokens(t[2])}}autolink(e){const t=this.rules.inline.autolink.exec(e);if(t){let e,n;return"@"===t[2]?(e=t[1],n="mailto:"+e):(e=t[1],n=e),{type:"link",raw:t[0],text:e,href:n,tokens:[{type:"text",raw:e,text:e}]}}}url(e){let t;if(t=this.rules.inline.url.exec(e)){let e,n;if("@"===t[2])e=t[0],n="mailto:"+e;else{let s;do{s=t[0],t[0]=this.rules.inline._backpedal.exec(t[0])?.[0]??""}while(s!==t[0]);e=t[0],n="www."===t[1]?"http://"+t[0]:t[0]}return{type:"link",raw:t[0],text:e,href:n,tokens:[{type:"text",raw:e,text:e}]}}}inlineText(e){const t=this.rules.inline.text.exec(e);if(t){const e=this.lexer.state.inRawBlock;return{type:"text",raw:t[0],text:t[0],escaped:e}}}}class re{tokens;options;state;tokenizer;inlineQueue;constructor(t){this.tokens=[],this.tokens.links=Object.create(null),this.options=t||e.defaults,this.options.tokenizer=this.options.tokenizer||new se,this.tokenizer=this.options.tokenizer,this.tokenizer.options=this.options,this.tokenizer.lexer=this,this.inlineQueue=[],this.state={inLink:!1,inRawBlock:!1,top:!0};const n={other:i,block:U.normal,inline:J.normal};this.options.pedantic?(n.block=U.pedantic,n.inline=J.pedantic):this.options.gfm&&(n.block=U.gfm,this.options.breaks?n.inline=J.breaks:n.inline=J.gfm),this.tokenizer.rules=n}static get rules(){return{block:U,inline:J}}static lex(e,t){return new re(t).lex(e)}static lexInline(e,t){return new re(t).inlineTokens(e)}lex(e){e=e.replace(i.carriageReturn,"\n"),this.blockTokens(e,this.tokens);for(let e=0;e!!(s=n.call({lexer:this},e,t))&&(e=e.substring(s.raw.length),t.push(s),!0))))continue;if(s=this.tokenizer.space(e)){e=e.substring(s.raw.length);const n=t.at(-1);1===s.raw.length&&void 0!==n?n.raw+="\n":t.push(s);continue}if(s=this.tokenizer.code(e)){e=e.substring(s.raw.length);const n=t.at(-1);"paragraph"===n?.type||"text"===n?.type?(n.raw+="\n"+s.raw,n.text+="\n"+s.text,this.inlineQueue.at(-1).src=n.text):t.push(s);continue}if(s=this.tokenizer.fences(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.heading(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.hr(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.blockquote(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.list(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.html(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.def(e)){e=e.substring(s.raw.length);const n=t.at(-1);"paragraph"===n?.type||"text"===n?.type?(n.raw+="\n"+s.raw,n.text+="\n"+s.raw,this.inlineQueue.at(-1).src=n.text):this.tokens.links[s.tag]||(this.tokens.links[s.tag]={href:s.href,title:s.title});continue}if(s=this.tokenizer.table(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.lheading(e)){e=e.substring(s.raw.length),t.push(s);continue}let r=e;if(this.options.extensions?.startBlock){let t=1/0;const n=e.slice(1);let s;this.options.extensions.startBlock.forEach((e=>{s=e.call({lexer:this},n),"number"==typeof s&&s>=0&&(t=Math.min(t,s))})),t<1/0&&t>=0&&(r=e.substring(0,t+1))}if(this.state.top&&(s=this.tokenizer.paragraph(r))){const i=t.at(-1);n&&"paragraph"===i?.type?(i.raw+="\n"+s.raw,i.text+="\n"+s.text,this.inlineQueue.pop(),this.inlineQueue.at(-1).src=i.text):t.push(s),n=r.length!==e.length,e=e.substring(s.raw.length)}else if(s=this.tokenizer.text(e)){e=e.substring(s.raw.length);const n=t.at(-1);"text"===n?.type?(n.raw+="\n"+s.raw,n.text+="\n"+s.text,this.inlineQueue.pop(),this.inlineQueue.at(-1).src=n.text):t.push(s)}else if(e){const t="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(t);break}throw new Error(t)}}return this.state.top=!0,t}inline(e,t=[]){return this.inlineQueue.push({src:e,tokens:t}),t}inlineTokens(e,t=[]){let n=e,s=null;if(this.tokens.links){const e=Object.keys(this.tokens.links);if(e.length>0)for(;null!=(s=this.tokenizer.rules.inline.reflinkSearch.exec(n));)e.includes(s[0].slice(s[0].lastIndexOf("[")+1,-1))&&(n=n.slice(0,s.index)+"["+"a".repeat(s[0].length-2)+"]"+n.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex))}for(;null!=(s=this.tokenizer.rules.inline.blockSkip.exec(n));)n=n.slice(0,s.index)+"["+"a".repeat(s[0].length-2)+"]"+n.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);for(;null!=(s=this.tokenizer.rules.inline.anyPunctuation.exec(n));)n=n.slice(0,s.index)+"++"+n.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);let r=!1,i="";for(;e;){let s;if(r||(i=""),r=!1,this.options.extensions?.inline?.some((n=>!!(s=n.call({lexer:this},e,t))&&(e=e.substring(s.raw.length),t.push(s),!0))))continue;if(s=this.tokenizer.escape(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.tag(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.link(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.reflink(e,this.tokens.links)){e=e.substring(s.raw.length);const n=t.at(-1);"text"===s.type&&"text"===n?.type?(n.raw+=s.raw,n.text+=s.text):t.push(s);continue}if(s=this.tokenizer.emStrong(e,n,i)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.codespan(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.br(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.del(e)){e=e.substring(s.raw.length),t.push(s);continue}if(s=this.tokenizer.autolink(e)){e=e.substring(s.raw.length),t.push(s);continue}if(!this.state.inLink&&(s=this.tokenizer.url(e))){e=e.substring(s.raw.length),t.push(s);continue}let l=e;if(this.options.extensions?.startInline){let t=1/0;const n=e.slice(1);let s;this.options.extensions.startInline.forEach((e=>{s=e.call({lexer:this},n),"number"==typeof s&&s>=0&&(t=Math.min(t,s))})),t<1/0&&t>=0&&(l=e.substring(0,t+1))}if(s=this.tokenizer.inlineText(l)){e=e.substring(s.raw.length),"_"!==s.raw.slice(-1)&&(i=s.raw.slice(-1)),r=!0;const n=t.at(-1);"text"===n?.type?(n.raw+=s.raw,n.text+=s.text):t.push(s)}else if(e){const t="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(t);break}throw new Error(t)}}return t}}class ie{options;parser;constructor(t){this.options=t||e.defaults}space(e){return""}code({text:e,lang:t,escaped:n}){const s=(t||"").match(i.notSpaceStart)?.[0],r=e.replace(i.endingNewline,"")+"\n";return s?'
'+(n?r:W(r,!0))+"
\n":"
"+(n?r:W(r,!0))+"
\n"}blockquote({tokens:e}){return`
\n${this.parser.parse(e)}
\n`}html({text:e}){return e}heading({tokens:e,depth:t}){return`${this.parser.parseInline(e)}\n`}hr(e){return"
\n"}list(e){const t=e.ordered,n=e.start;let s="";for(let t=0;t\n"+s+"\n"}listitem(e){let t="";if(e.task){const n=this.checkbox({checked:!!e.checked});e.loose?"paragraph"===e.tokens[0]?.type?(e.tokens[0].text=n+" "+e.tokens[0].text,e.tokens[0].tokens&&e.tokens[0].tokens.length>0&&"text"===e.tokens[0].tokens[0].type&&(e.tokens[0].tokens[0].text=n+" "+W(e.tokens[0].tokens[0].text),e.tokens[0].tokens[0].escaped=!0)):e.tokens.unshift({type:"text",raw:n+" ",text:n+" ",escaped:!0}):t+=n+" "}return t+=this.parser.parse(e.tokens,!!e.loose),`
  • ${t}
    • \n`}checkbox({checked:e}){return"'}paragraph({tokens:e}){return`

    ${this.parser.parseInline(e)}

    \n`}table(e){let t="",n="";for(let t=0;t${s}`),"\n\n"+t+"\n"+s+"
    \n"}tablerow({text:e}){return`\n${e}\n`}tablecell(e){const t=this.parser.parseInline(e.tokens),n=e.header?"th":"td";return(e.align?`<${n} align="${e.align}">`:`<${n}>`)+t+`\n`}strong({tokens:e}){return`${this.parser.parseInline(e)}`}em({tokens:e}){return`${this.parser.parseInline(e)}`}codespan({text:e}){return`${W(e,!0)}`}br(e){return"
    "}del({tokens:e}){return`${this.parser.parseInline(e)}`}link({href:e,title:t,tokens:n}){const s=this.parser.parseInline(n),r=Y(e);if(null===r)return s;let i='    ",i}image({href:e,title:t,text:n}){const s=Y(e);if(null===s)return W(n);let r=`${n}{const r=e[s].flat(1/0);n=n.concat(this.walkTokens(r,t))})):e.tokens&&(n=n.concat(this.walkTokens(e.tokens,t)))}}return n}use(...e){const t=this.defaults.extensions||{renderers:{},childTokens:{}};return e.forEach((e=>{const n={...e};if(n.async=this.defaults.async||n.async||!1,e.extensions&&(e.extensions.forEach((e=>{if(!e.name)throw new Error("extension name required");if("renderer"in e){const n=t.renderers[e.name];t.renderers[e.name]=n?function(...t){let s=e.renderer.apply(this,t);return!1===s&&(s=n.apply(this,t)),s}:e.renderer}if("tokenizer"in e){if(!e.level||"block"!==e.level&&"inline"!==e.level)throw new Error("extension level must be 'block' or 'inline'");const n=t[e.level];n?n.unshift(e.tokenizer):t[e.level]=[e.tokenizer],e.start&&("block"===e.level?t.startBlock?t.startBlock.push(e.start):t.startBlock=[e.start]:"inline"===e.level&&(t.startInline?t.startInline.push(e.start):t.startInline=[e.start]))}"childTokens"in e&&e.childTokens&&(t.childTokens[e.name]=e.childTokens)})),n.extensions=t),e.renderer){const t=this.defaults.renderer||new ie(this.defaults);for(const n in e.renderer){if(!(n in t))throw new Error(`renderer '${n}' does not exist`);if(["options","parser"].includes(n))continue;const s=n,r=e.renderer[s],i=t[s];t[s]=(...e)=>{let n=r.apply(t,e);return!1===n&&(n=i.apply(t,e)),n||""}}n.renderer=t}if(e.tokenizer){const t=this.defaults.tokenizer||new se(this.defaults);for(const n in e.tokenizer){if(!(n in t))throw new Error(`tokenizer '${n}' does not exist`);if(["options","rules","lexer"].includes(n))continue;const s=n,r=e.tokenizer[s],i=t[s];t[s]=(...e)=>{let n=r.apply(t,e);return!1===n&&(n=i.apply(t,e)),n}}n.tokenizer=t}if(e.hooks){const t=this.defaults.hooks||new ae;for(const n in e.hooks){if(!(n in t))throw new Error(`hook '${n}' does not exist`);if(["options","block"].includes(n))continue;const s=n,r=e.hooks[s],i=t[s];ae.passThroughHooks.has(n)?t[s]=e=>{if(this.defaults.async)return Promise.resolve(r.call(t,e)).then((e=>i.call(t,e)));const n=r.call(t,e);return i.call(t,n)}:t[s]=(...e)=>{let n=r.apply(t,e);return!1===n&&(n=i.apply(t,e)),n}}n.hooks=t}if(e.walkTokens){const t=this.defaults.walkTokens,s=e.walkTokens;n.walkTokens=function(e){let n=[];return n.push(s.call(this,e)),t&&(n=n.concat(t.call(this,e))),n}}this.defaults={...this.defaults,...n}})),this}setOptions(e){return this.defaults={...this.defaults,...e},this}lexer(e,t){return re.lex(e,t??this.defaults)}parser(e,t){return oe.parse(e,t??this.defaults)}parseMarkdown(e){return(t,n)=>{const s={...n},r={...this.defaults,...s},i=this.onError(!!r.silent,!!r.async);if(!0===this.defaults.async&&!1===s.async)return i(new Error("marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise."));if(null==t)return i(new Error("marked(): input parameter is undefined or null"));if("string"!=typeof t)return i(new Error("marked(): input parameter is of type "+Object.prototype.toString.call(t)+", string expected"));r.hooks&&(r.hooks.options=r,r.hooks.block=e);const l=r.hooks?r.hooks.provideLexer():e?re.lex:re.lexInline,o=r.hooks?r.hooks.provideParser():e?oe.parse:oe.parseInline;if(r.async)return Promise.resolve(r.hooks?r.hooks.preprocess(t):t).then((e=>l(e,r))).then((e=>r.hooks?r.hooks.processAllTokens(e):e)).then((e=>r.walkTokens?Promise.all(this.walkTokens(e,r.walkTokens)).then((()=>e)):e)).then((e=>o(e,r))).then((e=>r.hooks?r.hooks.postprocess(e):e)).catch(i);try{r.hooks&&(t=r.hooks.preprocess(t));let e=l(t,r);r.hooks&&(e=r.hooks.processAllTokens(e)),r.walkTokens&&this.walkTokens(e,r.walkTokens);let n=o(e,r);return r.hooks&&(n=r.hooks.postprocess(n)),n}catch(e){return i(e)}}}onError(e,t){return n=>{if(n.message+="\nPlease report this to https://github.com/markedjs/marked.",e){const e="

    An error occurred:

    "+W(n.message+"",!0)+"
    ";return t?Promise.resolve(e):e}if(t)return Promise.reject(n);throw n}}}const he=new ce;function pe(e,t){return he.parse(e,t)}pe.options=pe.setOptions=function(e){return he.setOptions(e),pe.defaults=he.defaults,n(pe.defaults),pe},pe.getDefaults=t,pe.defaults=e.defaults,pe.use=function(...e){return he.use(...e),pe.defaults=he.defaults,n(pe.defaults),pe},pe.walkTokens=function(e,t){return he.walkTokens(e,t)},pe.parseInline=he.parseInline,pe.Parser=oe,pe.parser=oe.parse,pe.Renderer=ie,pe.TextRenderer=le,pe.Lexer=re,pe.lexer=re.lex,pe.Tokenizer=se,pe.Hooks=ae,pe.parse=pe;const ue=pe.options,ge=pe.setOptions,ke=pe.use,de=pe.walkTokens,fe=pe.parseInline,xe=pe,be=oe.parse,we=re.lex;e.Hooks=ae,e.Lexer=re,e.Marked=ce,e.Parser=oe,e.Renderer=ie,e.TextRenderer=le,e.Tokenizer=se,e.getDefaults=t,e.lexer=we,e.marked=pe,e.options=ue,e.parse=xe,e.parseInline=fe,e.parser=be,e.setOptions=ge,e.use=ke,e.walkTokens=de})); diff --git a/frontends/desktop/scripts/assert-dist-built.mjs b/frontends/desktop/scripts/assert-dist-built.mjs new file mode 100644 index 000000000..9c887a72d --- /dev/null +++ b/frontends/desktop/scripts/assert-dist-built.mjs @@ -0,0 +1,112 @@ +#!/usr/bin/env node +/** + * assert-dist-built.mjs — Build artifact integrity check. + * + * Verifies that `vite build` produced a usable renderer payload. + * Inspired by Hermes Desktop's `scripts/assert-dist-built.test.cjs`. + * + * Usage: + * node scripts/assert-dist-built.mjs [dist-dir] + * + * Exit codes: + * 0 = all checks pass + * 1 = one or more checks failed + */ +import fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const DEFAULT_DIST = path.resolve(__dirname, '..', 'dist'); +const CHUNK_WARN_SIZE = 2 * 1024 * 1024; // 2 MB + +/** + * @param {string} distDir + * @returns {{ ok: boolean, error?: string, warnings?: string[] }} + */ +export function checkDistBuilt(distDir) { + const warnings = []; + + // 1. dist/ exists + if (!fs.existsSync(distDir)) { + return { ok: false, error: `no dist directory at ${distDir}` }; + } + + // 2. index.html exists and non-empty + const indexPath = path.join(distDir, 'index.html'); + if (!fs.existsSync(indexPath)) { + return { ok: false, error: 'index.html is missing from dist/' }; + } + const indexContent = fs.readFileSync(indexPath, 'utf8'); + if (indexContent.trim().length === 0) { + return { ok: false, error: 'index.html is empty' }; + } + + // 3. loading.html exists (Tauri cold-start splash) + const loadingPath = path.join(distDir, 'loading.html'); + if (!fs.existsSync(loadingPath)) { + return { ok: false, error: 'loading.html is missing from dist/ (required for Tauri cold start)' }; + } + + // 4. assets/ contains at least one JS bundle + const assetsDir = path.join(distDir, 'assets'); + if (!fs.existsSync(assetsDir)) { + return { ok: false, error: 'assets/ directory is missing from dist/' }; + } + const assetFiles = fs.readdirSync(assetsDir); + const jsFiles = assetFiles.filter((f) => f.endsWith('.js')); + if (jsFiles.length === 0) { + return { ok: false, error: 'no built JS bundle found in dist/assets/' }; + } + + // 5. No oversized chunks + for (const jsFile of jsFiles) { + const size = fs.statSync(path.join(assetsDir, jsFile)).size; + if (size > CHUNK_WARN_SIZE) { + warnings.push(`chunk ${jsFile} is ${(size / 1024 / 1024).toFixed(1)}MB (> 2MB threshold)`); + } + } + + // 6. CSS files exist (app has styles) + const cssFiles = assetFiles.filter((f) => f.endsWith('.css')); + if (cssFiles.length === 0) { + warnings.push('no CSS files in dist/assets/ — UI may appear unstyled'); + } + + const result = { ok: true }; + if (warnings.length > 0) result.warnings = warnings; + return result; +} + +// CLI entrypoint +if (process.argv[1] && path.resolve(process.argv[1]) === path.resolve(fileURLToPath(import.meta.url))) { + const distDir = process.argv[2] || DEFAULT_DIST; + console.log(`\n Checking dist: ${distDir}\n`); + + const result = checkDistBuilt(distDir); + + if (!result.ok) { + console.error(` ✗ FAIL: ${result.error}\n`); + process.exit(1); + } + + if (result.warnings?.length) { + for (const w of result.warnings) { + console.warn(` ⚠ WARNING: ${w}`); + } + console.log(''); + } + + const assetsDir = path.join(distDir, 'assets'); + const assetFiles = fs.readdirSync(assetsDir); + const jsFiles = assetFiles.filter((f) => f.endsWith('.js')); + const cssFiles = assetFiles.filter((f) => f.endsWith('.css')); + const totalSize = assetFiles.reduce((sum, f) => sum + fs.statSync(path.join(assetsDir, f)).size, 0); + + console.log(` ✓ dist/index.html present`); + console.log(` ✓ dist/loading.html present`); + console.log(` ✓ ${jsFiles.length} JS bundle(s), ${cssFiles.length} CSS file(s)`); + console.log(` ✓ Total assets size: ${(totalSize / 1024).toFixed(0)} KB`); + console.log(`\n PASS\n`); + process.exit(0); +} diff --git a/frontends/desktop/spec/FRONTEND_REFACTOR.md b/frontends/desktop/spec/FRONTEND_REFACTOR.md new file mode 100644 index 000000000..c3e4eb3e5 --- /dev/null +++ b/frontends/desktop/spec/FRONTEND_REFACTOR.md @@ -0,0 +1,102 @@ +# Frontend Refactor — Phase 1 完成记录 + +> Decision Record: Settings React Island 迁移 + Semi Design 引入 + FOUC 防御 + +## 已完成工作 + +### Phase 0: 脚手架 (已 commit) +- Vite 6 + React 18 + TypeScript 构建体系 +- `static/app.js` 通过 ES module side-effect import 纳入 Vite 模块图 +- `public/` 目录存放非打包资源（fonts, vendor libs） +- Tauri v2 配置指向 Vite dev/build 产出 + +### Phase 1: Settings React Island +第一个 React Island——Settings 弹窗，从 vanilla DOM 迁移为 React + Semi Design 组件。 + +**架构：** +``` +app.js (openSettings → dispatch 'ga:open-settings') + ↓ CustomEvent +SettingsModal.tsx (监听事件 → 打开 Modal) + ↓ Zustand store +各 Section 组件 (读/写 store → 调 bridge/legacy service) + ↓ +bridge.ts (window.ga.* → HTTP API) | legacy.ts (window.gaLegacy.*) +``` + +**组件库选择：Semi Design（@douyinfe/semi-ui）** +- 最初选用 TDesign，后切换为 Semi Design +- 理由：Semi 按需加载更优（不需要全局 CSS import）、字节生态更熟悉、Bundle 更小 +- 产出对比：TDesign 全量引入 622KB → Semi 按需 564KB（gzip 178KB） + +**迁移的功能区块：** +1. 外观切换（light/dark RadioGroup） +2. 字体大小（Slider 10-20px） +3. 语言切换（zh/en RadioGroup） +4. 模型管理（列表 + 添加/编辑/删除 Modal） +5. 功能区（导入/导出 mykey、服务管理跳转） + +**简化决策：** +- 去掉 plain mode（简洁模式）——使用率极低，增加代码复杂度 +- 去掉语言国旗 SVG——视觉噪音，文字已足够 + +### FOUC 三层防御 +1. `` in `` — 同步阻塞渲染 +2. `public/styles.css` → symlink to `../static/styles.css` — 保证 dev/prod 一致 +3. `` + `setTimeout` 移除 — 抑制首次 paint 的 transition + +### Dev Mock +`services/bridge.ts` 在 bridge 不可用时返回 mock 数据，允许纯前端开发（无需启动 Python bridge）。 + +## 技术栈 + +| 层 | 选择 | +|----|------| +| 构建 | Vite 6 | +| UI 框架 | React 18 | +| 组件库 | Semi Design 2.x (@douyinfe/semi-ui) | +| 状态管理 | Zustand 5 | +| 类型 | TypeScript 5.6 | +| 测试 | Vitest + Testing Library (待补) | + +## 文件结构 + +``` +frontends/desktop/ +├── src/ +│ ├── main.tsx # 入口：import CSS/app.js → mount React +│ ├── components/settings/ +│ │ ├── SettingsModal.tsx # Semi Modal 壳 +│ │ ├── AppearanceSection.tsx # 外观 RadioGroup +│ │ ├── FontSizeSection.tsx # 字体 Slider +│ │ ├── LanguageSection.tsx # 语言 RadioGroup +│ │ ├── ModelSection.tsx # 模型列表 + CRUD +│ │ ├── AddModelModal.tsx # 添加/编辑模型表单 +│ │ ├── FeatureSection.tsx # mykey 导入导出 + 服务管理 +│ │ └── settings.css # Settings 专用样式 +│ ├── services/ +│ │ ├── bridge.ts # window.ga.* 封装 + dev mock +│ │ └── legacy.ts # window.gaLegacy.* 过渡桥接 +│ └── stores/ +│ └── settings.ts # Zustand store +├── static/ +│ ├── app.js # 6200行老代码（暴露 gaLegacy, openSettings 改事件派发） +│ └── styles.css # 全局样式 +├── public/ +│ ├── styles.css → ../static/styles.css # symlink for FOUC prevention +│ ├── vendor/marked.min.js +│ ├── phosphor-icons.js +│ └── assets/fonts/ +├── index.html # Vite 入口 HTML +├── vite.config.ts +├── tsconfig.json +└── package.json +``` + +## 下一步 (Phase 2) + +- Chat 页消息渲染迁移为 React 组件 +- 直接 fetch bridge HTTP API 替代 window.ga.* 间接调用 +- 添加 Vitest 单元测试 +- Semi Design 主题定制（暗色模式 token 对齐） +- Bundle 优化（manualChunks 拆分 app.js 和 Semi） diff --git a/frontends/desktop/src/App.tsx b/frontends/desktop/src/App.tsx new file mode 100644 index 000000000..88381b58f --- /dev/null +++ b/frontends/desktop/src/App.tsx @@ -0,0 +1,27 @@ +import { useEffect } from 'react'; +import { LocaleProvider } from '@douyinfe/semi-ui'; +import zh_CN from '@douyinfe/semi-ui/lib/es/locale/source/zh_CN'; +import en_US from '@douyinfe/semi-ui/lib/es/locale/source/en_US'; +import { useSettingsStore } from './stores/settings'; +import { AppLayout } from './components/layout/AppLayout'; +import { NotificationStack } from './components/layout/NotificationStack'; +import { SettingsModal } from './components/settings/SettingsModal'; + +const SEMI_LOCALES = { zh: zh_CN, en: en_US }; + +export function App() { + const lang = useSettingsStore((s) => s.lang); + const loadFromBridge = useSettingsStore((s) => s.loadFromBridge); + + useEffect(() => { + loadFromBridge(); + }, [loadFromBridge]); + + return ( + + + + + + ); +} diff --git a/frontends/desktop/src/__tests__/agent-protocol.test.ts b/frontends/desktop/src/__tests__/agent-protocol.test.ts new file mode 100644 index 000000000..e1c56b607 --- /dev/null +++ b/frontends/desktop/src/__tests__/agent-protocol.test.ts @@ -0,0 +1,207 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; +import { + parseToolCallBlock, + foldAgentProtocolBlocks, + parseAgentContent, + stripTurnMarker, +} from '../components/chat/agentProtocol'; + +describe('stripTurnMarker', () => { + it('removes bold turn marker', () => { + expect(stripTurnMarker('**LLM Running (Turn 3) ...**\nHello')).toBe('Hello'); + }); + + it('removes plain turn marker', () => { + expect(stripTurnMarker('LLM Running (Turn 1) ...\nWorld')).toBe('World'); + }); + + it('leaves normal text untouched', () => { + expect(stripTurnMarker('just some text')).toBe('just some text'); + }); + + it('handles empty string', () => { + expect(stripTurnMarker('')).toBe(''); + }); +}); + +describe('parseToolCallBlock', () => { + it('parses a complete tool call block', () => { + const lines = [ + '🛠️ Tool: `file_read`', + '```text', + 'path: /tmp/hello.txt', + '```', + 'some other content', + ]; + const result = parseToolCallBlock(lines, 0); + expect(result).not.toBeNull(); + expect(result!.name).toBe('file_read'); + expect(result!.body).toBe('path: /tmp/hello.txt'); + expect(result!.nextLine).toBe(4); + }); + + it('returns null for non-tool lines', () => { + const lines = ['Hello world', '```text', 'foo', '```']; + expect(parseToolCallBlock(lines, 0)).toBeNull(); + }); + + it('returns null when no opening fence', () => { + const lines = ['🛠️ Tool: `code_run`', 'not a fence']; + expect(parseToolCallBlock(lines, 0)).toBeNull(); + }); + + it('handles multi-line tool body', () => { + const lines = [ + '🛠️ Tool: `code_run`', + '```text', + 'line 1', + 'line 2', + 'line 3', + '```', + ]; + const result = parseToolCallBlock(lines, 0); + expect(result).not.toBeNull(); + expect(result!.body).toBe('line 1\nline 2\nline 3'); + expect(result!.nextLine).toBe(6); + }); +}); + +describe('foldAgentProtocolBlocks', () => { + it('folds tool and result blocks with callbacks', () => { + const input = [ + 'Before tool', + '🛠️ Tool: `file_read`', + '```text', + '/tmp/test.txt', + '```', + '`````', + 'File content here', + '`````', + 'After result', + ].join('\n'); + + const tools: string[] = []; + const results: string[] = []; + foldAgentProtocolBlocks(input, { + onTool(name, body) { + tools.push(`${name}:${body}`); + return '[TOOL]'; + }, + onResult(body) { + results.push(body); + return '[RESULT]'; + }, + }); + + expect(tools).toEqual(['file_read:/tmp/test.txt']); + expect(results).toEqual(['File content here']); + }); + + it('passes through text with no protocol blocks', () => { + const input = 'Hello world\nNo tools here'; + const output = foldAgentProtocolBlocks(input, { + onTool: () => '[T]', + onResult: () => '[R]', + }); + expect(output).toBe(input); + }); +}); + +describe('parseAgentContent', () => { + it('parses plain prose', () => { + const segments = parseAgentContent('Hello world'); + expect(segments).toHaveLength(1); + expect(segments[0].type).toBe('prose'); + expect(segments[0].content).toBe('Hello world'); + }); + + it('extracts thinking blocks', () => { + const raw = 'I need to think\nHere is my answer'; + const segments = parseAgentContent(raw); + const thinking = segments.find((s) => s.type === 'thinking'); + const prose = segments.find((s) => s.type === 'prose'); + expect(thinking).toBeDefined(); + expect(thinking!.content).toBe('I need to think'); + expect(prose).toBeDefined(); + expect(prose!.content).toBe('Here is my answer'); + }); + + it('extracts summary blocks', () => { + const raw = 'Text before\nTask complete\nText after'; + const segments = parseAgentContent(raw); + const summary = segments.find((s) => s.type === 'summary'); + expect(summary).toBeDefined(); + expect(summary!.content).toBe('Task complete'); + }); + + it('parses tool call blocks', () => { + const raw = [ + 'Let me read the file.', + '🛠️ Tool: `file_read`', + '```text', + '/tmp/data.csv', + '```', + '`````', + 'col1,col2', + '`````', + 'The file contains data.', + ].join('\n'); + + const segments = parseAgentContent(raw); + const tool = segments.find((s) => s.type === 'tool'); + const result = segments.find((s) => s.type === 'result'); + expect(tool).toBeDefined(); + expect(tool!.label).toBe('file_read'); + expect(tool!.content).toBe('/tmp/data.csv'); + expect(result).toBeDefined(); + expect(result!.content).toBe('col1,col2'); + }); + + it('handles ask_user tool as approval segment', () => { + const raw = [ + '🛠️ Tool: `ask_user`', + '```text', + 'Do you want to proceed?', + 'candidates:', + '- Yes', + '- No', + '```', + ].join('\n'); + + const segments = parseAgentContent(raw); + const approval = segments.find((s) => s.type === 'approval'); + expect(approval).toBeDefined(); + expect(approval!.content).toContain('proceed'); + expect(approval!.candidates).toEqual(['Yes', 'No']); + }); + + it('strips turn marker before parsing', () => { + const raw = '**LLM Running (Turn 2) ...**\nHello from turn 2'; + const segments = parseAgentContent(raw); + expect(segments).toHaveLength(1); + expect(segments[0].content).toBe('Hello from turn 2'); + }); + + it('handles empty content', () => { + const segments = parseAgentContent(''); + expect(segments).toHaveLength(0); + }); + + it('handles multiple thinking blocks', () => { + const raw = 'First thought\nAction\nSecond thought\nResult'; + const segments = parseAgentContent(raw); + const thinkings = segments.filter((s) => s.type === 'thinking'); + expect(thinkings).toHaveLength(2); + expect(thinkings[0].content).toBe('First thought'); + expect(thinkings[1].content).toBe('Second thought'); + }); + + it('handles function_calls XML blocks', () => { + const raw = 'Text\nval\nAfter'; + const segments = parseAgentContent(raw); + const tool = segments.find((s) => s.type === 'tool'); + expect(tool).toBeDefined(); + expect(tool!.label).toBe('function_call'); + }); +}); diff --git a/frontends/desktop/src/__tests__/attachment-strip.test.tsx b/frontends/desktop/src/__tests__/attachment-strip.test.tsx new file mode 100644 index 000000000..e4b298318 --- /dev/null +++ b/frontends/desktop/src/__tests__/attachment-strip.test.tsx @@ -0,0 +1,86 @@ +// @vitest-environment happy-dom +import React from 'react'; +import { describe, it, expect, vi } from 'vitest'; +import { render, screen, fireEvent } from '@testing-library/react'; +import { AttachmentStrip, type AttachmentFile } from '../components/chat/Composer/AttachmentStrip'; + +function file(overrides: Partial = {}): AttachmentFile { + return { + id: 'file-1', + name: 'notes.txt', + size: 1536, + type: 'file', + status: 'ready', + ...overrides, + }; +} + +describe('AttachmentStrip', () => { + it('returns no visible content when there are no attachments', () => { + const { container } = render(); + expect(container.firstChild).toBeNull(); + }); + + it('renders an uploading file with spinner and no remove button', () => { + const { container } = render( + , + ); + + expect(screen.getByText('notes.txt')).not.toBeNull(); + expect(screen.getByText('1.5 KB')).not.toBeNull(); + expect(container.querySelector('[data-slot="attachment-spinner"]')).not.toBeNull(); + expect(screen.queryByRole('button', { name: 'Remove' })).toBeNull(); + }); + + it('renders an error file with retry badge, error text, and removable control', () => { + const onRemove = vi.fn(); + const onRetry = vi.fn(); + const { container } = render( + , + ); + + expect(screen.getByText('notes.txt')).not.toBeNull(); + expect(screen.getByText('upload failed')).not.toBeNull(); + + const retry = screen.getByTitle('upload failed'); + fireEvent.click(retry); + expect(onRetry).toHaveBeenCalledWith('file-1'); + + const remove = screen.getByRole('button', { name: 'Remove' }); + fireEvent.click(remove); + expect(onRemove).toHaveBeenCalledWith('file-1'); + + expect(container.querySelector('[data-slot="attachment-file-size"]')).toBeNull(); + }); + + it('renders a URL attachment using the hostname as label', () => { + render( + , + ); + + expect(screen.getByText('docs.nousresearch.com')).not.toBeNull(); + }); + + it('renders an image thumbnail and remove control when ready', () => { + render( + , + ); + + const image = screen.getByAltText('diagram.png') as HTMLImageElement; + expect(image.getAttribute('src')).toBe('data:image/png;base64,AAAA'); + expect(screen.getByRole('button', { name: 'Remove' })).not.toBeNull(); + }); +}); diff --git a/frontends/desktop/src/__tests__/bridge/bridge-api.test.ts b/frontends/desktop/src/__tests__/bridge/bridge-api.test.ts new file mode 100644 index 000000000..518a57a08 --- /dev/null +++ b/frontends/desktop/src/__tests__/bridge/bridge-api.test.ts @@ -0,0 +1,192 @@ +// @vitest-environment node +/** + * Bridge API contract tests. + * Tests the request building and response parsing logic of services/bridge.ts + * without requiring a live bridge process. + */ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +const BRIDGE_BASE = 'http://127.0.0.1:14168'; + +describe('bridge API contract', () => { + let mockFetch: ReturnType; + + beforeEach(() => { + mockFetch = vi.fn(); + vi.stubGlobal('fetch', mockFetch); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + async function devFetch(path: string, opts?: RequestInit): Promise { + const res = await fetch(`${BRIDGE_BASE}${path}`, { + headers: { 'Content-Type': 'application/json' }, + ...opts, + }); + if (!(res as Response).ok) throw new Error(`${(res as Response).status}`); + return (res as Response).json(); + } + + describe('GET /status', () => { + it('parses valid status response', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ status: 'running', version: '0.1.0', uptime: 123 }), + }); + + const result = await devFetch('/status'); + expect(result).toEqual({ status: 'running', version: '0.1.0', uptime: 123 }); + expect(mockFetch).toHaveBeenCalledWith( + `${BRIDGE_BASE}/status`, + expect.objectContaining({ headers: { 'Content-Type': 'application/json' } }), + ); + }); + + it('throws on non-2xx response', async () => { + mockFetch.mockResolvedValue({ ok: false, status: 503, statusText: 'Service Unavailable' }); + await expect(devFetch('/status')).rejects.toThrow('503'); + }); + + it('throws on network error', async () => { + mockFetch.mockRejectedValue(new Error('ECONNREFUSED')); + await expect(devFetch('/status')).rejects.toThrow('ECONNREFUSED'); + }); + }); + + describe('POST /session/new', () => { + it('creates a session and returns session id', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ session: { id: 'abc-123', title: 'New Session' } }), + }); + + const result = await devFetch('/session/new', { method: 'POST', body: '{}' }) as { session: { id: string } }; + expect(result.session.id).toBe('abc-123'); + }); + }); + + describe('POST /session/:id/prompt', () => { + it('sends message payload correctly', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ status: 'running' }), + }); + + const body = JSON.stringify({ message: 'hello', images: [], files: [] }); + await devFetch('/session/test-session/prompt', { method: 'POST', body }); + + expect(mockFetch).toHaveBeenCalledWith( + `${BRIDGE_BASE}/session/test-session/prompt`, + expect.objectContaining({ + method: 'POST', + body, + }), + ); + }); + + it('handles empty message gracefully', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ status: 'idle' }), + }); + + const result = await devFetch('/session/s1/prompt', { + method: 'POST', + body: JSON.stringify({ message: '', images: [], files: [] }), + }); + expect(result).toEqual({ status: 'idle' }); + }); + }); + + describe('GET /services/list', () => { + it('parses service list with multiple services', async () => { + const services = [ + { id: 'bridge', name: 'Desktop Bridge', status: 'running' }, + { id: 'agent', name: 'GenericAgent', status: 'stopped' }, + ]; + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ services }), + }); + + const result = await devFetch('/services/list') as { services: unknown[] }; + expect(result.services.length).toBe(2); + }); + + it('handles empty service list', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ services: [] }), + }); + + const result = await devFetch('/services/list') as { services: unknown[] }; + expect(result.services).toEqual([]); + }); + }); + + describe('GET /services/logs', () => { + it('parses log response with lines array', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ lines: ['[12:00:00] Start', '[12:00:01] Ready'] }), + }); + + const result = await devFetch('/services/logs?id=__bridge__&tail=200') as { lines: string[] }; + expect(result.lines.length).toBe(2); + }); + }); + + describe('model profiles CRUD', () => { + it('GET /model-profiles returns profiles array', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ + profiles: [{ id: 1, name: 'GPT-4', model: 'gpt-4', apibase: 'https://api.openai.com', protocol: 'oai', stream: true }], + }), + }); + + const result = await devFetch('/model-profiles') as { profiles: unknown[] }; + expect(result.profiles.length).toBe(1); + }); + + it('POST /model-profiles adds a profile', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ + profiles: [ + { id: 1, name: 'GPT-4', model: 'gpt-4', apibase: 'https://api.openai.com', protocol: 'oai', stream: true }, + { id: 2, name: 'New', model: 'new-model', apibase: 'https://new.api', protocol: 'oai', stream: false }, + ], + }), + }); + + const result = await devFetch('/model-profiles', { + method: 'POST', + body: JSON.stringify({ name: 'New', model: 'new-model', apibase: 'https://new.api', protocol: 'oai', stream: false }), + }) as { profiles: unknown[] }; + expect(result.profiles.length).toBe(2); + }); + + it('DELETE /model-profiles/:id removes a profile', async () => { + mockFetch.mockResolvedValue({ + ok: true, + status: 200, + json: () => Promise.resolve({ profiles: [] }), + }); + + const result = await devFetch('/model-profiles/1', { method: 'DELETE' }) as { profiles: unknown[] }; + expect(result.profiles).toEqual([]); + }); + }); +}); diff --git a/frontends/desktop/src/__tests__/bridge/bridge-detection.test.ts b/frontends/desktop/src/__tests__/bridge/bridge-detection.test.ts new file mode 100644 index 000000000..765327475 --- /dev/null +++ b/frontends/desktop/src/__tests__/bridge/bridge-detection.test.ts @@ -0,0 +1,132 @@ +// @vitest-environment node +/** + * Bridge detection and health-check logic tests. + * Tests the port probe, timeout, and retry behavior that determines + * whether the bridge process is available. + */ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +const BRIDGE_BASE = 'http://127.0.0.1:14168'; +const PROBE_TIMEOUT_MS = 3000; +const MAX_RETRIES = 5; +const RETRY_INTERVAL_MS = 1000; + +interface ProbeResult { + reachable: boolean; + latencyMs?: number; + error?: string; +} + +async function probeBridge(fetchFn: typeof fetch): Promise { + const start = performance.now(); + try { + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS); + const res = await fetchFn(`${BRIDGE_BASE}/status`, { signal: controller.signal }); + clearTimeout(timer); + if (!res.ok) return { reachable: false, error: `HTTP ${res.status}` }; + return { reachable: true, latencyMs: performance.now() - start }; + } catch (e) { + return { reachable: false, error: (e as Error).message }; + } +} + +async function waitForBridge(fetchFn: typeof fetch, maxRetries = MAX_RETRIES): Promise<{ connected: boolean; attempts: number }> { + for (let attempt = 1; attempt <= maxRetries; attempt++) { + const result = await probeBridge(fetchFn); + if (result.reachable) return { connected: true, attempts: attempt }; + if (attempt < maxRetries) { + await new Promise((r) => setTimeout(r, RETRY_INTERVAL_MS)); + } + } + return { connected: false, attempts: maxRetries }; +} + +describe('bridge detection', () => { + beforeEach(() => { + vi.useFakeTimers(); + }); + + afterEach(() => { + vi.useRealTimers(); + }); + + describe('probeBridge', () => { + it('returns reachable=true with latency on success', async () => { + const mockFetch = vi.fn().mockResolvedValue({ ok: true, status: 200 }); + const result = await probeBridge(mockFetch as unknown as typeof fetch); + expect(result.reachable).toBe(true); + expect(result.latencyMs).toBeGreaterThanOrEqual(0); + }); + + it('returns reachable=false on HTTP error', async () => { + const mockFetch = vi.fn().mockResolvedValue({ ok: false, status: 503 }); + const result = await probeBridge(mockFetch as unknown as typeof fetch); + expect(result.reachable).toBe(false); + expect(result.error).toBe('HTTP 503'); + }); + + it('returns reachable=false on network error', async () => { + const mockFetch = vi.fn().mockRejectedValue(new Error('ECONNREFUSED')); + const result = await probeBridge(mockFetch as unknown as typeof fetch); + expect(result.reachable).toBe(false); + expect(result.error).toBe('ECONNREFUSED'); + }); + + it('returns reachable=false on abort (timeout)', async () => { + const mockFetch = vi.fn().mockRejectedValue(new DOMException('Aborted', 'AbortError')); + const result = await probeBridge(mockFetch as unknown as typeof fetch); + expect(result.reachable).toBe(false); + expect(result.error).toContain('Aborted'); + }); + }); + + describe('waitForBridge retry logic', () => { + it('succeeds on first attempt', async () => { + const mockFetch = vi.fn().mockResolvedValue({ ok: true, status: 200 }); + const promise = waitForBridge(mockFetch as unknown as typeof fetch); + const result = await promise; + expect(result).toEqual({ connected: true, attempts: 1 }); + }); + + it('retries and succeeds on third attempt', async () => { + let callCount = 0; + const mockFetch = vi.fn().mockImplementation(() => { + callCount++; + if (callCount < 3) return Promise.reject(new Error('ECONNREFUSED')); + return Promise.resolve({ ok: true, status: 200 }); + }); + + const promise = waitForBridge(mockFetch as unknown as typeof fetch); + await vi.advanceTimersByTimeAsync(RETRY_INTERVAL_MS); + await vi.advanceTimersByTimeAsync(RETRY_INTERVAL_MS); + const result = await promise; + expect(result).toEqual({ connected: true, attempts: 3 }); + }); + + it('gives up after MAX_RETRIES', async () => { + const mockFetch = vi.fn().mockRejectedValue(new Error('ECONNREFUSED')); + const promise = waitForBridge(mockFetch as unknown as typeof fetch, 3); + await vi.advanceTimersByTimeAsync(RETRY_INTERVAL_MS * 3); + const result = await promise; + expect(result).toEqual({ connected: false, attempts: 3 }); + }); + + it('does not retry after success', async () => { + const mockFetch = vi.fn().mockResolvedValue({ ok: true, status: 200 }); + await waitForBridge(mockFetch as unknown as typeof fetch, 5); + expect(mockFetch).toHaveBeenCalledTimes(1); + }); + }); + + describe('URL construction', () => { + it('probe targets /status endpoint', async () => { + const mockFetch = vi.fn().mockResolvedValue({ ok: true, status: 200 }); + await probeBridge(mockFetch as unknown as typeof fetch); + expect(mockFetch).toHaveBeenCalledWith( + 'http://127.0.0.1:14168/status', + expect.objectContaining({ signal: expect.any(AbortSignal) }), + ); + }); + }); +}); diff --git a/frontends/desktop/src/__tests__/bridge/connection-state.test.ts b/frontends/desktop/src/__tests__/bridge/connection-state.test.ts new file mode 100644 index 000000000..d48b5a826 --- /dev/null +++ b/frontends/desktop/src/__tests__/bridge/connection-state.test.ts @@ -0,0 +1,181 @@ +// @vitest-environment node +/** + * Bridge connection state machine tests. + * Tests the bridgeActivity store and status tracking logic. + */ +import { describe, it, expect } from 'vitest'; + +const LOG_VISIBLE = 40; + +function createBridgeActivity() { + let logs: string[] = []; + const listeners = new Set<() => void>(); + + function pushLog(line: string) { + logs = [...logs.slice(-(LOG_VISIBLE - 1)), line]; + listeners.forEach((cb) => cb()); + } + + function handleSessionState(evt: { sessionId?: string; status?: string }) { + if (!evt.sessionId || !evt.status) return; + const label = evt.status === 'running' + ? 'Turn started' + : evt.status === 'idle' + ? 'Turn complete' + : evt.status === 'error' + ? 'Turn error' + : `Session ${evt.status}`; + pushLog(label); + } + + function handleServiceChanged(evt: { service?: { id?: string; name?: string; status?: string } }) { + if (!evt.service) return; + const label = evt.service.name ?? evt.service.id ?? 'service'; + const status = evt.service.status ?? 'unknown'; + pushLog(`${label}: ${status}`); + } + + function handleTokenChanged(evt: { session_id?: string; total_output?: number }) { + if (!evt.session_id || !evt.total_output) return; + pushLog(`Token update: +${evt.total_output} output`); + } + + return { + get logs() { return logs; }, + pushLog, + handleSessionState, + handleServiceChanged, + handleTokenChanged, + onActivityChange(cb: () => void) { + listeners.add(cb); + return () => { listeners.delete(cb); }; + }, + }; +} + +describe('bridge activity / connection state', () => { + describe('log buffer management', () => { + it('caps at LOG_VISIBLE entries', () => { + const activity = createBridgeActivity(); + for (let i = 0; i < 60; i++) { + activity.pushLog(`line-${i}`); + } + expect(activity.logs.length).toBe(LOG_VISIBLE); + expect(activity.logs[0]).toBe('line-20'); + expect(activity.logs[39]).toBe('line-59'); + }); + + it('notifies listeners on new log entry', () => { + const activity = createBridgeActivity(); + let notified = 0; + activity.onActivityChange(() => notified++); + activity.pushLog('test'); + activity.pushLog('test2'); + expect(notified).toBe(2); + }); + + it('unsubscribe stops notifications', () => { + const activity = createBridgeActivity(); + let notified = 0; + const unsub = activity.onActivityChange(() => notified++); + activity.pushLog('a'); + unsub(); + activity.pushLog('b'); + expect(notified).toBe(1); + }); + }); + + describe('session-state event routing', () => { + it('maps running → "Turn started"', () => { + const activity = createBridgeActivity(); + activity.handleSessionState({ sessionId: 's1', status: 'running' }); + expect(activity.logs).toContain('Turn started'); + }); + + it('maps idle → "Turn complete"', () => { + const activity = createBridgeActivity(); + activity.handleSessionState({ sessionId: 's1', status: 'idle' }); + expect(activity.logs).toContain('Turn complete'); + }); + + it('maps error → "Turn error"', () => { + const activity = createBridgeActivity(); + activity.handleSessionState({ sessionId: 's1', status: 'error' }); + expect(activity.logs).toContain('Turn error'); + }); + + it('maps unknown status to "Session "', () => { + const activity = createBridgeActivity(); + activity.handleSessionState({ sessionId: 's1', status: 'cancelled' }); + expect(activity.logs).toContain('Session cancelled'); + }); + + it('ignores events without sessionId or status', () => { + const activity = createBridgeActivity(); + activity.handleSessionState({}); + activity.handleSessionState({ sessionId: 's1' }); + activity.handleSessionState({ status: 'running' }); + expect(activity.logs.length).toBe(0); + }); + }); + + describe('service.changed event routing', () => { + it('logs service name + status', () => { + const activity = createBridgeActivity(); + activity.handleServiceChanged({ service: { id: 'agent', name: 'GenericAgent', status: 'running' } }); + expect(activity.logs[0]).toBe('GenericAgent: running'); + }); + + it('falls back to id when name is missing', () => { + const activity = createBridgeActivity(); + activity.handleServiceChanged({ service: { id: 'bridge', status: 'stopped' } }); + expect(activity.logs[0]).toBe('bridge: stopped'); + }); + + it('falls back to "service" when both missing', () => { + const activity = createBridgeActivity(); + activity.handleServiceChanged({ service: { status: 'error' } }); + expect(activity.logs[0]).toBe('service: error'); + }); + + it('ignores null service', () => { + const activity = createBridgeActivity(); + activity.handleServiceChanged({}); + expect(activity.logs.length).toBe(0); + }); + }); + + describe('token.changed event routing', () => { + it('logs token update with output count', () => { + const activity = createBridgeActivity(); + activity.handleTokenChanged({ session_id: 's1', total_output: 500 }); + expect(activity.logs[0]).toBe('Token update: +500 output'); + }); + + it('ignores events without session_id or total_output', () => { + const activity = createBridgeActivity(); + activity.handleTokenChanged({}); + activity.handleTokenChanged({ session_id: 's1' }); + activity.handleTokenChanged({ total_output: 100 }); + expect(activity.logs.length).toBe(0); + }); + + it('ignores zero total_output', () => { + const activity = createBridgeActivity(); + activity.handleTokenChanged({ session_id: 's1', total_output: 0 }); + expect(activity.logs.length).toBe(0); + }); + }); + + describe('high-throughput scenario', () => { + it('handles rapid interleaved events without data loss', () => { + const activity = createBridgeActivity(); + for (let i = 0; i < 100; i++) { + activity.handleSessionState({ sessionId: `s${i}`, status: i % 2 === 0 ? 'running' : 'idle' }); + activity.handleServiceChanged({ service: { id: `svc-${i}`, status: 'running' } }); + activity.handleTokenChanged({ session_id: `s${i}`, total_output: i * 10 }); + } + expect(activity.logs.length).toBe(LOG_VISIBLE); + }); + }); +}); diff --git a/frontends/desktop/src/__tests__/bridge/ws-protocol.test.ts b/frontends/desktop/src/__tests__/bridge/ws-protocol.test.ts new file mode 100644 index 000000000..18b6be4da --- /dev/null +++ b/frontends/desktop/src/__tests__/bridge/ws-protocol.test.ts @@ -0,0 +1,254 @@ +// @vitest-environment node +/** + * WebSocket protocol tests. + * Tests message format parsing, streaming chunk assembly, and reconnection timing + * extracted from services/ws.ts logic. + */ +import { describe, it, expect } from 'vitest'; + +type BridgeStatus = 'ready' | 'connecting' | 'offline'; +type WsHandler = (payload: unknown) => void; + +const RECONNECT_BASE_MS = 1000; +const RECONNECT_MAX_MS = 30000; + +function createWsManager() { + let currentStatus: BridgeStatus = 'offline'; + let reconnectAttempt = 0; + let failCount = 0; + let everConnected = false; + const listeners = new Map>(); + const statusListeners = new Set<(s: BridgeStatus) => void>(); + + function setStatus(s: BridgeStatus) { + if (s === currentStatus) return; + currentStatus = s; + if (s === 'ready') { + failCount = 0; + everConnected = true; + } + statusListeners.forEach((fn) => fn(s)); + } + + function getReconnectDelay(): number { + return Math.min(RECONNECT_BASE_MS * 2 ** reconnectAttempt, RECONNECT_MAX_MS); + } + + function simulateReconnectAttempt() { + reconnectAttempt++; + failCount++; + return getReconnectDelay(); + } + + function simulateOpen() { + reconnectAttempt = 0; + setStatus('ready'); + } + + function simulateClose() { + setStatus('connecting'); + } + + function dispatch(type: string, data: unknown) { + const handlers = listeners.get(type); + if (handlers) handlers.forEach((fn) => fn(data)); + } + + function subscribe(type: string, handler: WsHandler) { + if (!listeners.has(type)) listeners.set(type, new Set()); + listeners.get(type)!.add(handler); + return () => { listeners.get(type)?.delete(handler); }; + } + + function onStatusChange(fn: (s: BridgeStatus) => void) { + statusListeners.add(fn); + return () => { statusListeners.delete(fn); }; + } + + return { + get status() { return currentStatus; }, + get failCount() { return failCount; }, + get reconnectAttempt() { return reconnectAttempt; }, + get everConnected() { return everConnected; }, + setStatus, + getReconnectDelay, + simulateReconnectAttempt, + simulateOpen, + simulateClose, + dispatch, + subscribe, + onStatusChange, + }; +} + +describe('WebSocket protocol', () => { + describe('reconnection backoff', () => { + it('starts at base delay and doubles', () => { + const mgr = createWsManager(); + expect(mgr.getReconnectDelay()).toBe(1000); + mgr.simulateReconnectAttempt(); + expect(mgr.getReconnectDelay()).toBe(2000); + mgr.simulateReconnectAttempt(); + expect(mgr.getReconnectDelay()).toBe(4000); + }); + + it('caps at RECONNECT_MAX_MS', () => { + const mgr = createWsManager(); + for (let i = 0; i < 20; i++) mgr.simulateReconnectAttempt(); + expect(mgr.getReconnectDelay()).toBe(RECONNECT_MAX_MS); + }); + + it('resets attempt counter on successful connect', () => { + const mgr = createWsManager(); + mgr.simulateReconnectAttempt(); + mgr.simulateReconnectAttempt(); + mgr.simulateReconnectAttempt(); + expect(mgr.reconnectAttempt).toBe(3); + mgr.simulateOpen(); + expect(mgr.status).toBe('ready'); + }); + }); + + describe('status transitions', () => { + it('offline → connecting → ready on first connect', () => { + const mgr = createWsManager(); + const transitions: BridgeStatus[] = []; + mgr.onStatusChange((s) => transitions.push(s)); + + mgr.setStatus('connecting'); + mgr.simulateOpen(); + + expect(transitions).toEqual(['connecting', 'ready']); + }); + + it('ready → connecting on socket close', () => { + const mgr = createWsManager(); + mgr.setStatus('connecting'); + mgr.simulateOpen(); + + const transitions: BridgeStatus[] = []; + mgr.onStatusChange((s) => transitions.push(s)); + mgr.simulateClose(); + + expect(transitions).toEqual(['connecting']); + }); + + it('does not emit duplicate status', () => { + const mgr = createWsManager(); + const transitions: BridgeStatus[] = []; + mgr.onStatusChange((s) => transitions.push(s)); + + mgr.setStatus('connecting'); + mgr.setStatus('connecting'); + mgr.setStatus('connecting'); + + expect(transitions).toEqual(['connecting']); + }); + + it('everConnected becomes true on first ready', () => { + const mgr = createWsManager(); + expect(mgr.everConnected).toBe(false); + mgr.setStatus('connecting'); + expect(mgr.everConnected).toBe(false); + mgr.simulateOpen(); + expect(mgr.everConnected).toBe(true); + }); + + it('failCount resets on successful connect', () => { + const mgr = createWsManager(); + mgr.simulateReconnectAttempt(); + mgr.simulateReconnectAttempt(); + expect(mgr.failCount).toBe(2); + mgr.simulateOpen(); + expect(mgr.failCount).toBe(0); + }); + }); + + describe('message dispatch', () => { + it('routes messages to correct handler by type', () => { + const mgr = createWsManager(); + const received: unknown[] = []; + mgr.subscribe('session-state', (d) => received.push(d)); + + mgr.dispatch('session-state', { sessionId: 's1', status: 'running' }); + mgr.dispatch('token.changed', { session_id: 's1', total_output: 100 }); + + expect(received).toEqual([{ sessionId: 's1', status: 'running' }]); + }); + + it('supports multiple handlers per type', () => { + const mgr = createWsManager(); + const a: unknown[] = []; + const b: unknown[] = []; + mgr.subscribe('partial-update', (d) => a.push(d)); + mgr.subscribe('partial-update', (d) => b.push(d)); + + mgr.dispatch('partial-update', { content: 'hello' }); + expect(a.length).toBe(1); + expect(b.length).toBe(1); + }); + + it('unsubscribe removes only that handler', () => { + const mgr = createWsManager(); + const received: unknown[] = []; + const unsub = mgr.subscribe('test', (d) => received.push(d)); + mgr.subscribe('test', () => {}); + + unsub(); + mgr.dispatch('test', { x: 1 }); + expect(received).toEqual([]); + }); + + it('handles unknown type silently', () => { + const mgr = createWsManager(); + expect(() => mgr.dispatch('nonexistent', {})).not.toThrow(); + }); + }); + + describe('message format parsing', () => { + it('parses partial-update with content and turn_segs', () => { + const payload = { type: 'partial-update', sessionId: 's1', content: 'Hello world', turn_segs: ['Hello', ' world'] }; + expect(payload.content).toBe('Hello world'); + expect(payload.turn_segs?.length).toBe(2); + }); + + it('parses session-state change', () => { + const payload = { type: 'session-state', sessionId: 's1', status: 'running' }; + expect(payload.sessionId).toBe('s1'); + expect(payload.status).toBe('running'); + }); + + it('parses service.changed event', () => { + const payload = { type: 'service.changed', service: { id: 'agent', name: 'GenericAgent', status: 'running' } }; + expect(payload.service.status).toBe('running'); + }); + + it('handles malformed JSON gracefully', () => { + const parseMessage = (data: string) => { + try { return JSON.parse(data); } catch { return null; } + }; + expect(parseMessage('not json')).toBeNull(); + expect(parseMessage('{"type":"test"}')).toEqual({ type: 'test' }); + }); + }); + + describe('streaming chunk assembly', () => { + it('assembles incremental partial updates', () => { + const chunks = ['Hel', 'Hello', 'Hello wor', 'Hello world']; + let current = ''; + for (const chunk of chunks) { + current = chunk; + } + expect(current).toBe('Hello world'); + }); + + it('handles rapid partial updates without loss', () => { + const updates: string[] = []; + for (let i = 0; i < 100; i++) { + updates.push('x'.repeat(i + 1)); + } + const final = updates[updates.length - 1]; + expect(final.length).toBe(100); + }); + }); +}); diff --git a/frontends/desktop/src/__tests__/file-attach.test.ts b/frontends/desktop/src/__tests__/file-attach.test.ts new file mode 100644 index 000000000..5280518b3 --- /dev/null +++ b/frontends/desktop/src/__tests__/file-attach.test.ts @@ -0,0 +1,80 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; + +// We test normalizeMessage by importing the module's internals. +// Since normalizeMessage is not exported, we replicate its logic here for unit testing. +// This mirrors the implementation in services/chat.ts. + +type MessageStatus = 'completed' | 'in_progress' | 'failed'; + +interface Message { + id: string; + role: 'user' | 'assistant' | 'system'; + content: string; + status: MessageStatus; + createdAt?: number; + ts?: number; + turn_segs?: string[]; + images?: { name: string; path: string }[]; + files?: { name: string; path: string; size?: number }[]; +} + +function normalizeMessage(msg: Record, status: MessageStatus = 'completed'): Message { + const m: Message = { + id: String(msg.id), + role: msg.role as Message['role'], + content: (msg.content as string) || '', + status: (msg.status as MessageStatus) ?? status, + createdAt: (msg.createdAt as number) ?? (msg.ts as number), + }; + if (Array.isArray(msg.turn_segs)) { + m.turn_segs = msg.turn_segs as string[]; + } + if (Array.isArray(msg.images) && msg.images.length > 0) { + m.images = msg.images as { name: string; path: string }[]; + } + if (Array.isArray(msg.files) && msg.files.length > 0) { + m.files = msg.files as { name: string; path: string; size?: number }[]; + } + return m; +} + +describe('normalizeMessage — files field', () => { + it('extracts files from raw message', () => { + const raw = { + id: 1, + role: 'user', + content: 'hello', + ts: 1000, + files: [{ name: 'data.csv', path: '/tmp/data.csv', size: 1024 }], + }; + const msg = normalizeMessage(raw); + expect(msg.files).toEqual([{ name: 'data.csv', path: '/tmp/data.csv', size: 1024 }]); + }); + + it('handles missing files gracefully', () => { + const raw = { id: 2, role: 'user', content: 'hi', ts: 2000 }; + const msg = normalizeMessage(raw); + expect(msg.files).toBeUndefined(); + }); + + it('handles empty files array', () => { + const raw = { id: 3, role: 'user', content: 'hey', ts: 3000, files: [] }; + const msg = normalizeMessage(raw); + expect(msg.files).toBeUndefined(); + }); + + it('preserves images alongside files', () => { + const raw = { + id: 4, + role: 'user', + content: 'both', + ts: 4000, + images: [{ name: 'pic.png', path: '/tmp/pic.png' }], + files: [{ name: 'doc.pdf', path: '/tmp/doc.pdf', size: 5000 }], + }; + const msg = normalizeMessage(raw); + expect(msg.images).toHaveLength(1); + expect(msg.files).toHaveLength(1); + }); +}); diff --git a/frontends/desktop/src/__tests__/format.test.ts b/frontends/desktop/src/__tests__/format.test.ts new file mode 100644 index 000000000..507573a65 --- /dev/null +++ b/frontends/desktop/src/__tests__/format.test.ts @@ -0,0 +1,39 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; +import { formatNumber, formatTokenCount } from '../utils/format'; + +describe('formatNumber', () => { + it('returns plain number below 1000', () => { + expect(formatNumber(0)).toBe('0'); + expect(formatNumber(999)).toBe('999'); + expect(formatNumber(42)).toBe('42'); + }); + + it('formats thousands as K', () => { + expect(formatNumber(1000)).toBe('1.0K'); + expect(formatNumber(1500)).toBe('1.5K'); + expect(formatNumber(999999)).toBe('1000.0K'); + }); + + it('formats millions as M', () => { + expect(formatNumber(1000000)).toBe('1.0M'); + expect(formatNumber(2500000)).toBe('2.5M'); + }); +}); + +describe('formatTokenCount', () => { + it('returns plain number below 1000', () => { + expect(formatTokenCount(0)).toBe('0'); + expect(formatTokenCount(500)).toBe('500'); + }); + + it('formats thousands as K with 1 decimal', () => { + expect(formatTokenCount(1000)).toBe('1.0K'); + expect(formatTokenCount(12345)).toBe('12.3K'); + }); + + it('formats millions as M with 2 decimals', () => { + expect(formatTokenCount(1000000)).toBe('1.00M'); + expect(formatTokenCount(1234567)).toBe('1.23M'); + }); +}); diff --git a/frontends/desktop/src/__tests__/primary-cta.test.ts b/frontends/desktop/src/__tests__/primary-cta.test.ts new file mode 100644 index 000000000..978c0c457 --- /dev/null +++ b/frontends/desktop/src/__tests__/primary-cta.test.ts @@ -0,0 +1,28 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; +import { computeCTAState } from '../components/chat/Composer/PrimaryCTA'; + +describe('computeCTAState', () => { + it('returns send when idle + has content', () => { + expect(computeCTAState(false, true)).toBe('send'); + }); + + it('returns disabled when idle + no content', () => { + expect(computeCTAState(false, false)).toBe('disabled'); + }); + + it('returns stop when generating + no content', () => { + expect(computeCTAState(true, false)).toBe('stop'); + }); + + it('returns queue when generating + has content', () => { + expect(computeCTAState(true, true)).toBe('queue'); + }); + + it('returns disabled when pending uploads regardless of other state', () => { + expect(computeCTAState(false, true, true)).toBe('disabled'); + expect(computeCTAState(true, true, true)).toBe('disabled'); + expect(computeCTAState(true, false, true)).toBe('disabled'); + expect(computeCTAState(false, false, true)).toBe('disabled'); + }); +}); diff --git a/frontends/desktop/src/__tests__/rich-editor.test.ts b/frontends/desktop/src/__tests__/rich-editor.test.ts new file mode 100644 index 000000000..45439b052 --- /dev/null +++ b/frontends/desktop/src/__tests__/rich-editor.test.ts @@ -0,0 +1,106 @@ +// @vitest-environment happy-dom +import { describe, it, expect, beforeEach } from 'vitest'; +import { composerPlainText, normalizeComposerDom } from '../components/chat/Composer/rich-editor'; + +describe('composerPlainText', () => { + let el: HTMLDivElement; + + beforeEach(() => { + el = document.createElement('div'); + }); + + it('extracts plain text from text nodes', () => { + el.textContent = 'Hello world'; + expect(composerPlainText(el)).toBe('Hello world'); + }); + + it('extracts data-ref-text from skill chips', () => { + const chip = document.createElement('span'); + chip.className = 'skill-chip'; + chip.contentEditable = 'false'; + chip.dataset.refText = 'Enter Plan mode: full prompt here'; + chip.textContent = '/plan'; + el.appendChild(chip); + expect(composerPlainText(el)).toBe('Enter Plan mode: full prompt here'); + }); + + it('handles BR as newline', () => { + el.appendChild(document.createTextNode('Line 1')); + el.appendChild(document.createElement('br')); + el.appendChild(document.createTextNode('Line 2')); + expect(composerPlainText(el)).toBe('Line 1\nLine 2'); + }); + + it('handles mixed content: text + chip + text', () => { + el.appendChild(document.createTextNode('Before ')); + const chip = document.createElement('span'); + chip.dataset.refText = '@file:`/tmp/x.ts`'; + chip.textContent = '@x.ts'; + el.appendChild(chip); + el.appendChild(document.createTextNode(' after')); + expect(composerPlainText(el)).toBe('Before @file:`/tmp/x.ts` after'); + }); + + it('handles nested div content with newline separator', () => { + const div = document.createElement('div'); + div.textContent = 'Inside div'; + el.appendChild(document.createTextNode('First')); + el.appendChild(div); + expect(composerPlainText(el)).toBe('First\nInside div'); + }); + + it('returns empty string for empty element', () => { + expect(composerPlainText(el)).toBe(''); + }); +}); + +describe('normalizeComposerDom', () => { + let el: HTMLDivElement; + + beforeEach(() => { + el = document.createElement('div'); + }); + + it('unwraps browser-inserted DIVs', () => { + const div = document.createElement('div'); + div.textContent = 'Wrapped content'; + el.appendChild(div); + normalizeComposerDom(el); + // After normalization: BR + text node, no div + expect(el.querySelector('div')).toBeNull(); + expect(el.textContent).toContain('Wrapped content'); + }); + + it('unwraps P tags', () => { + const p = document.createElement('p'); + p.textContent = 'Paragraph'; + el.appendChild(p); + normalizeComposerDom(el); + expect(el.querySelector('p')).toBeNull(); + expect(el.textContent).toContain('Paragraph'); + }); + + it('preserves ref-chip spans', () => { + const chip = document.createElement('span'); + chip.dataset.refText = 'prompt text'; + chip.textContent = '/skill'; + el.appendChild(chip); + normalizeComposerDom(el); + expect(el.querySelector('[data-ref-text]')).not.toBeNull(); + }); + + it('preserves BR elements', () => { + el.appendChild(document.createElement('br')); + normalizeComposerDom(el); + expect(el.querySelector('br')).not.toBeNull(); + }); + + it('merges adjacent text nodes via normalize()', () => { + el.appendChild(document.createTextNode('A')); + el.appendChild(document.createTextNode('B')); + expect(el.childNodes.length).toBe(2); + normalizeComposerDom(el); + expect(el.childNodes.length).toBe(1); + expect(el.textContent).toBe('AB'); + }); +}); diff --git a/frontends/desktop/src/__tests__/safe-math.test.ts b/frontends/desktop/src/__tests__/safe-math.test.ts new file mode 100644 index 000000000..78376f97d --- /dev/null +++ b/frontends/desktop/src/__tests__/safe-math.test.ts @@ -0,0 +1,83 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; +import katex from 'katex'; + +/** + * Tests for SafeMathBlock rendering logic. + * We test the katex.renderToString behavior directly since the project + * does not have @testing-library/dom installed for full RTL rendering. + * This validates the three-tier fallback strategy used in SafeMathBlock. + */ +describe('SafeMathBlock logic', () => { + it('renders valid LaTeX without throwing (tier 1 - strict)', () => { + const html = katex.renderToString('x^2 + y^2 = z^2', { + displayMode: true, + throwOnError: true, + }); + expect(html).toContain('katex'); + }); + + it('throws on invalid command in strict mode', () => { + expect(() => { + katex.renderToString('\\badcommand{x}', { + displayMode: true, + throwOnError: true, + }); + }).toThrow(); + }); + + it('does not throw on invalid command in lenient mode (tier 2)', () => { + const html = katex.renderToString('\\badcommand{x}', { + displayMode: true, + throwOnError: false, + strict: 'ignore', + }); + expect(html).toContain('katex'); + }); + + it('renders empty expression without throwing', () => { + const html = katex.renderToString('', { + displayMode: true, + throwOnError: false, + strict: 'ignore', + }); + expect(html).toContain('katex'); + }); + + it('renders complex valid LaTeX', () => { + const html = katex.renderToString('\\frac{1}{n} \\sum_{i=1}^{n} x_i', { + displayMode: true, + throwOnError: true, + }); + expect(html).toContain('katex'); + expect(html).toContain('frac'); + }); + + it('simulates full fallback chain', () => { + const expr = '\\badcommand{x}'; + let result: string; + + // Tier 1: strict — should throw + try { + result = katex.renderToString(expr, { + displayMode: true, + throwOnError: true, + }); + } catch { + // Tier 2: lenient — should succeed + try { + result = katex.renderToString(expr, { + displayMode: true, + throwOnError: false, + strict: 'ignore', + }); + } catch { + // Tier 3: raw fallback + result = expr; + } + } + + // Should have gotten lenient result (tier 2) + expect(result!).toContain('katex'); + }); +}); diff --git a/frontends/desktop/src/__tests__/skills.test.ts b/frontends/desktop/src/__tests__/skills.test.ts new file mode 100644 index 000000000..d18f1a65e --- /dev/null +++ b/frontends/desktop/src/__tests__/skills.test.ts @@ -0,0 +1,59 @@ +// @vitest-environment node +import { describe, it, expect } from 'vitest'; +import { BUILTIN_SKILLS, matchSkillPrefix } from '../components/chat/Composer/skills'; + +describe('BUILTIN_SKILLS', () => { + it('has unique ids', () => { + const ids = BUILTIN_SKILLS.map((s) => s.id); + expect(new Set(ids).size).toBe(ids.length); + }); + + it('all skills have non-empty prompts', () => { + for (const skill of BUILTIN_SKILLS) { + expect(skill.prompt.length).toBeGreaterThan(10); + } + }); + + it('all skills have bilingual descriptions', () => { + for (const skill of BUILTIN_SKILLS) { + expect(skill.desc.zh).toBeTruthy(); + expect(skill.desc.en).toBeTruthy(); + } + }); +}); + +describe('matchSkillPrefix', () => { + it('matches plan skill prompt', () => { + const planSkill = BUILTIN_SKILLS.find((s) => s.id === 'plan')!; + const result = matchSkillPrefix(planSkill.prompt + ' build a chat app'); + expect(result).not.toBeNull(); + expect(result!.id).toBe('plan'); + expect(result!.rest).toBe('build a chat app'); + }); + + it('matches goal skill prompt with no rest', () => { + const goalSkill = BUILTIN_SKILLS.find((s) => s.id === 'goal')!; + const result = matchSkillPrefix(goalSkill.prompt); + expect(result).not.toBeNull(); + expect(result!.id).toBe('goal'); + expect(result!.rest).toBe(''); + }); + + it('returns null for non-matching content', () => { + expect(matchSkillPrefix('Hello world')).toBeNull(); + expect(matchSkillPrefix('')).toBeNull(); + }); + + it('returns null for partial prefix match', () => { + const planSkill = BUILTIN_SKILLS.find((s) => s.id === 'plan')!; + expect(matchSkillPrefix(planSkill.prompt.slice(0, 10))).toBeNull(); + }); + + it('matches all built-in skills by their own prompt', () => { + for (const skill of BUILTIN_SKILLS) { + const result = matchSkillPrefix(skill.prompt + ' extra text'); + expect(result, `failed for skill "${skill.id}"`).not.toBeNull(); + expect(result!.id).toBe(skill.id); + } + }); +}); diff --git a/frontends/desktop/src/assets/generic-agent-black.svg b/frontends/desktop/src/assets/generic-agent-black.svg new file mode 100644 index 000000000..0f5890473 --- /dev/null +++ b/frontends/desktop/src/assets/generic-agent-black.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontends/desktop/src/assets/generic-agent-white.svg b/frontends/desktop/src/assets/generic-agent-white.svg new file mode 100644 index 000000000..1c4fcc055 --- /dev/null +++ b/frontends/desktop/src/assets/generic-agent-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontends/desktop/src/components/collab/CollabPage.tsx b/frontends/desktop/src/components/collab/CollabPage.tsx new file mode 100644 index 000000000..3e3dc2ee5 --- /dev/null +++ b/frontends/desktop/src/components/collab/CollabPage.tsx @@ -0,0 +1,56 @@ +import { useEffect, useState, useCallback } from 'react'; +import { useConductorStore } from '../../stores/conductor'; +import { CollabMessageList } from './CollabMessageList'; +import { CollabComposer } from './CollabComposer'; +import { CollabWelcome } from './CollabWelcome'; +import { WorkerRail } from './WorkerRail'; +import { WorkerPanel } from './WorkerPanel'; +import { useI18n } from '../../i18n'; +import './collab.css'; + +export function CollabPage() { + const { t } = useI18n(); + const connectionStatus = useConductorStore((s) => s.connectionStatus); + const messages = useConductorStore((s) => s.messages); + const connect = useConductorStore((s) => s.connect); + const sendMessage = useConductorStore((s) => s.sendMessage); + const [panelOpen, setPanelOpen] = useState(true); + + useEffect(() => { + connect(); + }, [connect]); + + const handleChipClick = useCallback((text: string) => { + sendMessage(text); + }, [sendMessage]); + + if (connectionStatus === 'offline') { + return ( +
    +
    +
    ⚡
    +

    {t('collab.offlineTitle')}

    +

    {t('collab.offlineSub')}

    + +
    +
    + ); + } + + const isEmpty = connectionStatus === 'ready' && messages.length === 0; + + return ( +
    +
    + setPanelOpen((o) => !o)} /> +
    + {isEmpty ? : } + +
    +
    + {panelOpen && setPanelOpen(false)} />} +
    + ); +} diff --git a/frontends/desktop/src/components/collab/CollabWelcome.tsx b/frontends/desktop/src/components/collab/CollabWelcome.tsx new file mode 100644 index 000000000..d5996db59 --- /dev/null +++ b/frontends/desktop/src/components/collab/CollabWelcome.tsx @@ -0,0 +1,61 @@ +import { useI18n } from '../../i18n'; +import { Codicon } from '../../lib/icons'; + +const STEPS = [ + { key: '1', icon: 'comment' }, + { key: '2', icon: 'symbol-misc' }, + { key: '3', icon: 'graph' }, + { key: '4', icon: 'edit' }, +] as const; + +const CHIPS = [ + 'collab.chipProgress', + 'collab.chipPause', + 'collab.chipSummary', +] as const; + +interface Props { + onChipClick: (text: string) => void; +} + +export function CollabWelcome({ onChipClick }: Props) { + const { t } = useI18n(); + + return ( +
    +

    {t('collab.guideTitle')}

    +

    {t('collab.guideWhen')}

    + +
    + {STEPS.map((step) => ( +
    + + + + + + {t(`collab.guideStep${step.key}t`)} + + + {t(`collab.guideStep${step.key}d`)} + + +
    + ))} +
    + +
    + {CHIPS.map((key) => ( + + ))} +
    +
    + ); +} diff --git a/frontends/desktop/src/components/collab/WorkerCard.tsx b/frontends/desktop/src/components/collab/WorkerCard.tsx new file mode 100644 index 000000000..2e5a3591c --- /dev/null +++ b/frontends/desktop/src/components/collab/WorkerCard.tsx @@ -0,0 +1,63 @@ +import { useCallback } from 'react'; +import type { Worker } from '../../stores/conductor'; +import { useConductorStore } from '../../stores/conductor'; + +function relTime(ts?: number): string { + if (!ts) return ''; + const ms = ts > 1e12 ? ts : ts * 1000; + const sec = Math.max(0, Math.floor((Date.now() - ms) / 1000)); + if (sec < 10) return 'just now'; + if (sec < 60) return `${sec}s ago`; + const min = Math.floor(sec / 60); + if (min < 60) return `${min}m ago`; + const hr = Math.floor(min / 60); + return hr < 24 ? `${hr}h ago` : `${Math.floor(hr / 24)}d ago`; +} + +function StatusGlyph({ status }: { status: Worker['status'] }) { + switch (status) { + case 'running': + return ; + case 'reported': + return ✓; + case 'paused': + return ⏸; + case 'failed': + return !; + case 'terminated': + return ×; + } +} + +interface Props { + worker: Worker; + onClick: (w: Worker) => void; +} + +export function WorkerCard({ worker, onClick }: Props) { + const killWorker = useConductorStore((s) => s.killWorker); + + const handleContextMenu = useCallback((e: React.MouseEvent) => { + e.preventDefault(); + if (confirm(`Kill agent "${worker.title}"?`)) { + killWorker(worker.id); + } + }, [worker, killWorker]); + + return ( +
    onClick(worker)} + onContextMenu={handleContextMenu} + > +
    + + {worker.status} + {worker.updatedAt && {relTime(worker.updatedAt)}} +
    +
    {worker.title}
    +
    {worker.summary}
    +
    + ); +} diff --git a/frontends/desktop/src/components/collab/WorkerDrawer.tsx b/frontends/desktop/src/components/collab/WorkerDrawer.tsx new file mode 100644 index 000000000..18737300a --- /dev/null +++ b/frontends/desktop/src/components/collab/WorkerDrawer.tsx @@ -0,0 +1,32 @@ +import type { Worker } from '../../stores/conductor'; +import { MarkdownPart } from '../chat/Thread/parts/MarkdownPart'; + +interface Props { + worker: Worker; + onClose: () => void; +} + +export function WorkerDrawer({ worker, onClose }: Props) { + return ( +
    +
    + +
    + ); +} diff --git a/frontends/desktop/src/components/collab/WorkerPanel.tsx b/frontends/desktop/src/components/collab/WorkerPanel.tsx new file mode 100644 index 000000000..ebcad82e0 --- /dev/null +++ b/frontends/desktop/src/components/collab/WorkerPanel.tsx @@ -0,0 +1,52 @@ +import { useState, useCallback } from 'react'; +import { useConductorStore, type Worker } from '../../stores/conductor'; +import { Codicon } from '../../lib/icons'; +import { WorkerCard } from './WorkerCard'; +import { WorkerDrawer } from './WorkerDrawer'; + +interface Props { + onCollapse: () => void; +} + +export function WorkerPanel({ onCollapse }: Props) { + const workers = useConductorStore((s) => s.workers); + const [selectedWorker, setSelectedWorker] = useState(null); + + const handleCardClick = useCallback((w: Worker) => { + setSelectedWorker(w); + }, []); + + const handleCloseDrawer = useCallback(() => { + setSelectedWorker(null); + }, []); + + return ( + <> +
    +
    + Agents + {workers.length} + +
    + {workers.length > 0 ? ( +
    + {workers.map((w) => ( + + ))} +
    + ) : ( +
    No agents yet
    + )} +
    + {selectedWorker && ( + + )} + + ); +} diff --git a/frontends/desktop/src/components/collab/collab.css b/frontends/desktop/src/components/collab/collab.css new file mode 100644 index 000000000..28ece799b --- /dev/null +++ b/frontends/desktop/src/components/collab/collab.css @@ -0,0 +1,747 @@ +/* ═══════════════════════════════════════════════ + Collab / Conductor Page + ═══════════════════════════════════════════════ */ + +/* Page layout */ +.collab-page { + display: flex; + width: 100%; + height: 100%; + overflow: hidden; +} + +.collab-main { + flex: 1; + display: flex; + flex-direction: column; + min-width: 0; + position: relative; +} + +.collab-chat-area { + flex: 1; + position: relative; + min-height: 0; + overflow: hidden; +} + +/* ═══ Offline state ═══ */ +.collab-offline { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100%; + gap: 0.5rem; + color: var(--semi-color-text-2, #4e5969); +} + +.collab-offline-icon { + font-size: 2rem; + opacity: 0.5; +} + +.collab-offline h3 { + margin: 0; + font-size: 1rem; + font-weight: 600; + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-offline p { + margin: 0; + font-size: 0.8125rem; +} + +.collab-retry-btn { + margin-top: 0.75rem; + padding: 0.375rem 1rem; + border: 1px solid var(--semi-color-border, #e0e0e0); + border-radius: 0.375rem; + background: var(--semi-color-bg-0, #fff); + color: var(--semi-color-text-0, #1c1f23); + font-size: 0.8125rem; + cursor: pointer; + transition: background 0.12s; +} + +.collab-retry-btn:hover { + background: var(--semi-color-fill-0, #f5f5f5); +} + +/* ═══ Connecting state ═══ */ +.collab-connecting { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + gap: 0.5rem; + font-size: 0.8125rem; + color: var(--semi-color-text-2, #4e5969); + position: absolute; + inset: 0; +} + +.collab-connecting-dot { + width: 8px; + height: 8px; + border-radius: 50%; + background: var(--semi-color-primary, #3370ff); + animation: statusPulse 1.2s ease-in-out infinite; +} + +/* ═══ Empty state ═══ */ +.collab-empty { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + color: var(--semi-color-text-3, #8f959e); + font-size: 0.8125rem; + position: absolute; + inset: 0; +} + +/* ═══ Welcome Guide (empty state) ═══ */ +.collab-welcome { + position: absolute; + inset: 0; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding: 2rem 0; + gap: 1rem; +} + +.collab-welcome-title { + font-size: 1.125rem; + font-weight: 600; + color: var(--semi-color-text-0, #1c1f23); + margin: 0; +} + +.collab-welcome-sub { + font-size: 0.8125rem; + color: var(--semi-color-text-2, #4e5969); + line-height: 1.5; + margin: 0; +} + +.collab-welcome-steps { + display: flex; + flex-direction: column; + gap: 0.75rem; + width: 100%; + margin-top: 0.5rem; +} + +.collab-welcome-step { + display: flex; + align-items: flex-start; + gap: 0.625rem; +} + +.collab-welcome-step-icon { + display: flex; + align-items: center; + justify-content: center; + width: 1.75rem; + height: 1.75rem; + border-radius: 0.375rem; + background: var(--semi-color-fill-0, #f5f5f5); + color: var(--semi-color-text-1, #1c1f23); + flex-shrink: 0; +} + +.collab-welcome-step-text { + display: flex; + flex-direction: column; + gap: 0.125rem; + padding-top: 0.1875rem; +} + +.collab-welcome-step-label { + font-size: 0.8125rem; + font-weight: 600; + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-welcome-step-desc { + font-size: 0.75rem; + color: var(--semi-color-text-2, #4e5969); + line-height: 1.4; +} + +.collab-welcome-chips { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; + margin-top: 0.5rem; +} + +.collab-welcome-chip { + display: inline-flex; + align-items: center; + padding: 0.375rem 0.625rem; + border: 1px solid var(--semi-color-border, #e0e0e0); + border-radius: 6px; + background: none; + color: var(--ui-text-secondary, #4e5969); + font-size: 0.8125rem; + font-weight: 500; + line-height: 1; + cursor: pointer; + user-select: none; + transition: background 0.15s, box-shadow 0.15s; +} + +.collab-welcome-chip:hover { + background: color-mix(in srgb, var(--semi-color-primary, #3370ff) 4%, transparent); + box-shadow: 0 1px 4px color-mix(in srgb, var(--semi-color-primary, #3370ff) 12%, transparent); +} + +.collab-welcome-chip:active { + background: color-mix(in srgb, var(--semi-color-primary, #3370ff) 8%, transparent); +} + +/* Empty-state layout override — replicate .chat-view-root[data-empty] pattern exactly */ +[data-slot="collab-page"][data-empty] .collab-chat-area { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + overflow: visible; +} + +[data-slot="collab-page"][data-empty] .collab-welcome { + position: relative; + inset: unset; + width: min(var(--composer-width, 48.75rem), calc(100% - 2rem)); +} + +[data-slot="collab-page"][data-empty] .collab-composer-wrap { + position: relative; + width: min(var(--composer-width, 48.75rem), calc(100% - 2rem)); +} + +[data-slot="collab-page"][data-empty] [data-slot="composer-root"] { + position: relative; + bottom: auto; + left: auto; + transform: none; + width: 100%; +} + +[data-slot="collab-page"][data-empty] [data-slot="composer-root"]::before { + display: none; +} + +[data-slot="collab-page"][data-empty] [data-slot="composer-surface"] { + border-color: var(--semi-color-primary) !important; + box-shadow: + 0 0 20px 0 color-mix(in srgb, var(--semi-color-primary) 12%, transparent), + 0 0 50px -4px color-mix(in srgb, var(--semi-color-primary) 8%, transparent) !important; +} + +/* ═══ Messages area ═══ */ +[data-slot="collab-messages"] { + position: absolute; + inset: 0; + overflow-y: auto; + padding: 1rem; + padding-bottom: calc(var(--composer-measured-height, 62px) + 1rem); +} + +.collab-messages-scroll { + display: flex; + flex-direction: column; + gap: 0.75rem; + max-width: 48rem; + margin: 0 auto; +} + +/* Message bubbles */ +.collab-msg { + display: flex; +} + +.collab-msg--user { + justify-content: flex-end; +} + +.collab-msg--conductor, +.collab-msg--system { + justify-content: flex-start; +} + +.collab-bubble { + max-width: 80%; + min-width: min(24rem, 100%); + padding: 0.5rem 0.75rem; + border-radius: 0.75rem; + font-size: 0.8125rem; + line-height: 1.5; +} + +.collab-bubble--user { + background: hsl(222 93% 91%); + color: #000; + border-bottom-right-radius: 0.25rem; + min-width: unset; + word-break: break-word; + white-space: pre-wrap; +} + +.collab-bubble--conductor { + background: var(--semi-color-fill-0, #f5f5f5); + color: var(--semi-color-text-0, #1c1f23); + border-bottom-left-radius: 0.25rem; + width: 80%; + max-width: none; + min-width: unset; +} + +.collab-bubble--conductor [data-slot="aui_markdown-part"] p, +.collab-bubble--conductor [data-slot="aui_markdown-part"] li { + overflow-wrap: anywhere; +} + +.collab-bubble--system { + background: transparent; + color: var(--semi-color-text-2, #4e5969); + font-size: 0.75rem; + font-style: italic; +} + +.collab-msg-text { + white-space: pre-wrap; +} + +.collab-msg-images { + display: flex; + gap: 0.375rem; + margin-bottom: 0.375rem; +} + +.collab-msg-img { + max-width: 160px; + max-height: 120px; + border-radius: 0.375rem; + object-fit: cover; +} + +.collab-msg-files { + display: flex; + flex-wrap: wrap; + gap: 0.25rem; + margin-bottom: 0.25rem; +} + +.collab-msg-file-chip { + padding: 0.125rem 0.375rem; + border-radius: 0.25rem; + background: rgba(0, 0, 0, 0.06); + font-size: 0.6875rem; + font-family: monospace; +} + +/* Thinking indicator (replaces crude 3-dot bouncer) */ +.collab-thinking-bar { + display: inline-flex; + align-items: center; + gap: 0.375rem; + padding: 0.375rem 0.75rem; + border-radius: 1rem; + background: var(--semi-color-fill-0, #f5f5f5); + font-size: 0.75rem; + color: var(--semi-color-text-2, #4e5969); +} + +.collab-thinking-dot { + width: 6px; + height: 6px; + border-radius: 50%; + background: var(--semi-color-primary, #3370ff); + animation: statusPulse 1.2s ease-in-out infinite; +} + +.collab-thinking-label { + font-weight: 500; +} + +.collab-thinking-time { + color: var(--semi-color-text-3, #8f959e); + font-variant-numeric: tabular-nums; +} + +@keyframes statusPulse { + 0%, 100% { opacity: 1; transform: scale(1); } + 50% { opacity: 0.4; transform: scale(0.85); } +} + +/* Typing indicator (legacy, kept for fallback) */ +.collab-typing-dots { + display: inline-flex; + gap: 3px; + align-items: center; + height: 1.2em; +} + +.collab-typing-dots i { + display: block; + width: 5px; + height: 5px; + border-radius: 50%; + background: var(--semi-color-text-3, #8f959e); + animation: typingBounce 1.2s ease-in-out infinite; +} + +.collab-typing-dots i:nth-child(2) { animation-delay: 0.15s; } +.collab-typing-dots i:nth-child(3) { animation-delay: 0.3s; } + +@keyframes typingBounce { + 0%, 60%, 100% { transform: translateY(0); opacity: 0.4; } + 30% { transform: translateY(-3px); opacity: 1; } +} + +/* ═══ Composer wrapper — inherits absolute positioning from Composer root ═══ */ +.collab-composer-wrap[data-disabled] { + pointer-events: none; + opacity: 0.5; +} + +/* ═══ Worker Rail ═══ */ +.collab-rail { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.5rem 1rem; + border-bottom: 1px solid var(--semi-color-border, #e0e0e0); + flex-shrink: 0; + height: 2.5rem; + box-sizing: border-box; +} + +.ga-body-collapsed .collab-rail { + padding-left: 3rem; +} + +.collab-rail-badge { + display: inline-flex; + align-items: center; + gap: 0.25rem; + padding: 0.2rem 0.5rem; + border-radius: 1rem; + font-size: 0.6875rem; + user-select: none; +} + +.collab-rail-badge--running { + background: color-mix(in srgb, var(--semi-color-primary, #3370ff) 10%, transparent); + color: var(--semi-color-primary, #3370ff); +} + +.collab-rail-badge--done { + background: color-mix(in srgb, #10b981 10%, transparent); + color: #059669; +} + +.collab-rail-badge--issue { + background: color-mix(in srgb, #ef4444 10%, transparent); + color: #dc2626; +} + +.collab-rail-dot { + width: 6px; + height: 6px; + border-radius: 50%; +} + +.collab-rail-dot--running { + background: var(--semi-color-primary, #3370ff); + animation: statusPulse 1.2s ease-in-out infinite; +} + +.collab-rail-dot--done { background: #10b981; } +.collab-rail-dot--issue { background: #ef4444; } + +.collab-rail-n { + font-weight: 600; +} + +.collab-rail-label { + color: inherit; + opacity: 0.8; +} + +/* ═══ Worker Panel (right side) ═══ */ +.collab-worker-panel { + width: 16rem; + flex-shrink: 0; + border-left: 1px solid var(--semi-color-border, #e0e0e0); + display: flex; + flex-direction: column; + overflow: hidden; + transition: width 0.2s ease; +} + +.collab-rail-panel-toggle { + margin-left: auto; + width: 1.5rem; + height: 1.5rem; + border: none; + border-radius: 0.25rem; + background: transparent; + color: var(--semi-color-text-2, #4e5969); + display: grid; + place-items: center; + cursor: pointer; + flex-shrink: 0; + transition: background 0.12s, color 0.12s; +} + +.collab-rail-panel-toggle:hover { + background: var(--semi-color-fill-0, #f5f5f5); + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-worker-panel-head { + display: flex; + align-items: center; + gap: 0.375rem; + padding: 0.5rem 0.5rem; + border-bottom: 1px solid var(--semi-color-border, #e0e0e0); + height: 2.5rem; + box-sizing: border-box; +} + +.collab-panel-collapse-btn { + margin-left: auto; + width: 1.5rem; + height: 1.5rem; + border: none; + border-radius: 0.25rem; + background: transparent; + color: var(--semi-color-text-2, #4e5969); + display: grid; + place-items: center; + cursor: pointer; + flex-shrink: 0; + transition: background 0.12s, color 0.12s; +} + +.collab-panel-collapse-btn:hover { + background: var(--semi-color-fill-0, #f5f5f5); + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-worker-empty { + padding: 1rem; + text-align: center; + font-size: 0.75rem; + color: var(--semi-color-text-3, #8f959e); +} + +.collab-worker-panel-title { + font-size: 0.75rem; + font-weight: 600; + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-worker-panel-count { + font-size: 0.625rem; + font-weight: 600; + padding: 0.1rem 0.35rem; + border-radius: 0.75rem; + background: var(--semi-color-fill-0, #f5f5f5); + color: var(--semi-color-text-2, #4e5969); +} + +.collab-worker-list { + flex: 1; + overflow-y: auto; + padding: 0.375rem; + display: flex; + flex-direction: column; + gap: 0.375rem; +} + +/* ═══ Worker Card ═══ */ +.collab-card { + padding: 0.5rem 0.625rem; + border-radius: 0.5rem; + border: 1px solid color-mix(in srgb, var(--semi-color-border, #e0e0e0) 60%, transparent); + cursor: pointer; + transition: background 0.12s, border-color 0.12s; +} + +.collab-card:hover { + background: var(--semi-color-fill-0, #f5f5f5); + border-color: var(--semi-color-border, #e0e0e0); +} + +.collab-card-status { + display: flex; + align-items: center; + gap: 0.25rem; + font-size: 0.625rem; + color: var(--semi-color-text-3, #8f959e); + margin-bottom: 0.25rem; +} + +.collab-card-glyph { + display: inline-flex; + align-items: center; + justify-content: center; + width: 0.875rem; + height: 0.875rem; + font-size: 0.5625rem; + font-weight: 700; + border-radius: 50%; +} + +.collab-card-glyph--running { + width: 6px; + height: 6px; + background: var(--semi-color-primary, #3370ff); + animation: statusPulse 1.2s ease-in-out infinite; +} + +.collab-card-glyph--done { color: #10b981; } +.collab-card-glyph--paused { color: var(--semi-color-text-3, #8f959e); font-size: 0.5rem; } +.collab-card-glyph--failed { color: #ef4444; } +.collab-card-glyph--terminated { color: var(--semi-color-text-3, #8f959e); } + +.collab-card-status-text { + text-transform: capitalize; +} + +.collab-card-time { + margin-left: auto; + font-size: 0.5625rem; + color: var(--semi-color-text-3, #8f959e); +} + +.collab-card-title { + font-size: 0.75rem; + font-weight: 500; + color: var(--semi-color-text-0, #1c1f23); + margin-bottom: 0.125rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.collab-card-summary { + font-size: 0.6875rem; + color: var(--semi-color-text-2, #4e5969); + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +/* ═══ Worker Drawer ═══ */ +.collab-drawer-wrap { + position: fixed; + inset: 0; + z-index: 200; + display: flex; + justify-content: flex-end; +} + +.collab-drawer-backdrop { + position: absolute; + inset: 0; + background: rgba(0, 0, 0, 0.3); + animation: fadeIn 0.15s ease-out; +} + +@keyframes fadeIn { + from { opacity: 0; } + to { opacity: 1; } +} + +.collab-drawer { + position: relative; + width: min(28rem, 80vw); + height: 100%; + background: var(--semi-color-bg-0, #fff); + box-shadow: -4px 0 24px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + animation: slideInRight 0.2s ease-out; +} + +@keyframes slideInRight { + from { transform: translateX(100%); } + to { transform: translateX(0); } +} + +.collab-drawer-head { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.75rem 1rem; + border-bottom: 1px solid var(--semi-color-border, #e0e0e0); + flex-shrink: 0; +} + +.collab-drawer-title { + font-size: 0.875rem; + font-weight: 600; + color: var(--semi-color-text-0, #1c1f23); +} + +.collab-drawer-close { + width: 1.5rem; + height: 1.5rem; + border: none; + border-radius: 0.25rem; + background: transparent; + color: var(--semi-color-text-2, #4e5969); + display: grid; + place-items: center; + cursor: pointer; + transition: background 0.1s; +} + +.collab-drawer-close:hover { + background: var(--semi-color-fill-0, #f5f5f5); +} + +.collab-drawer-body { + flex: 1; + overflow-y: auto; + padding: 1rem; + font-size: 0.8125rem; + line-height: 1.6; +} + +.collab-drawer-empty { + color: var(--semi-color-text-3, #8f959e); + font-style: italic; +} + +/* ═══ Dark mode overrides ═══ */ +:root[data-theme="dark"] .collab-bubble--user, +[data-appearance="dark"] .collab-bubble--user { + background: hsl(222 40% 28%); + color: #fff; +} + +:root[data-theme="dark"] .collab-bubble--conductor, +[data-appearance="dark"] .collab-bubble--conductor { + background: var(--semi-color-fill-1, #2a2a2a); +} + +:root[data-theme="dark"] .collab-drawer, +[data-appearance="dark"] .collab-drawer { + background: var(--semi-color-bg-1, #1c1c1e); +} + +:root[data-theme="dark"] .collab-drawer-backdrop, +[data-appearance="dark"] .collab-drawer-backdrop { + background: rgba(0, 0, 0, 0.5); +} diff --git a/frontends/desktop/src/components/layout/AppLayout.tsx b/frontends/desktop/src/components/layout/AppLayout.tsx new file mode 100644 index 000000000..1dbe6271a --- /dev/null +++ b/frontends/desktop/src/components/layout/AppLayout.tsx @@ -0,0 +1,40 @@ +import { ResizeGroup, ResizeItem, ResizeHandler } from '@douyinfe/semi-ui'; +import { LeftSidebar } from './LeftSidebar'; +import { MainArea } from './MainArea'; +import { Statusbar } from './Statusbar'; +import { TitlebarControls } from './TitlebarControls'; +import { useAppStore } from '../../stores/app'; +import './layout.css'; + +export function AppLayout() { + const sidebarCollapsed = useAppStore((s) => s.sidebarCollapsed); + + return ( +
    + +
    + {sidebarCollapsed ? ( +
    + +
    + ) : ( + + + + + + + + + + )} +
    + +
    + ); +} diff --git a/frontends/desktop/src/components/layout/BridgeMenuPanel.tsx b/frontends/desktop/src/components/layout/BridgeMenuPanel.tsx new file mode 100644 index 000000000..1ebc4da16 --- /dev/null +++ b/frontends/desktop/src/components/layout/BridgeMenuPanel.tsx @@ -0,0 +1,166 @@ +import { useRef, useEffect, useState } from 'react'; +import { useBridgeStatus } from '../../hooks/useBridgeStatus'; +import { useConductorStore } from '../../stores/conductor'; +import { useAppStore } from '../../stores/app'; +import { useI18n } from '../../i18n'; +import { getBridgeActivity, onBridgeActivityChange } from '../../stores/bridgeActivity'; + +type StatusTone = 'good' | 'warn' | 'bad' | 'muted'; + +function StatusDot({ tone }: { tone: StatusTone }) { + const colors: Record = { + good: 'var(--ui-accent, #0053fd)', + warn: '#f59e0b', + bad: '#cf2d56', + muted: 'color-mix(in srgb, var(--ui-text-tertiary) 40%, transparent)', + }; + return ( +
    ; +} diff --git a/frontends/desktop/src/components/layout/Statusbar.tsx b/frontends/desktop/src/components/layout/Statusbar.tsx new file mode 100644 index 000000000..71b7d7f77 --- /dev/null +++ b/frontends/desktop/src/components/layout/Statusbar.tsx @@ -0,0 +1,145 @@ +import { useState, useCallback, type ReactNode } from 'react'; +import { useChatStore } from '../../stores/chat'; +import { useConductorStore } from '../../stores/conductor'; +import { useI18n } from '../../i18n'; +import { useBridgeStatus } from '../../hooks/useBridgeStatus'; +import { LiveDuration } from './LiveDuration'; +import { BridgeMenuPanel } from './BridgeMenuPanel'; +import { ConductorMenuPanel } from './ConductorMenuPanel'; + +type Variant = 'action' | 'text' | 'menu' | 'link'; + +interface StatusItemProps { + variant?: Variant; + icon?: ReactNode; + label: string; + detail?: ReactNode; + disabled?: boolean; + onClick?: () => void; + href?: string; +} + +function StatusItem({ variant = 'text', icon, label, detail, disabled, onClick, href }: StatusItemProps) { + const cls = `ga-statusbar-item ${variant}${disabled ? ' disabled' : ''}`; + + const content = ( + <> + {icon && {icon}} + {label} + {detail && {detail}} + + ); + + if (variant === 'link' && href) { + return {content}; + } + + if (variant === 'action' || variant === 'menu') { + return ; + } + + return {content}; +} + +type DotStatus = 'ready' | 'connecting' | 'offline' | 'error' | 'degraded'; + +function DotIcon({ status }: { status: DotStatus }) { + const colorMap: Record = { + ready: 'var(--ui-accent)', + connecting: 'var(--semi-color-warning, #f59e0b)', + degraded: 'var(--semi-color-warning, #f59e0b)', + offline: 'var(--ui-text-quaternary)', + error: 'var(--ui-text-quaternary)', + }; + const pulse = status === 'connecting'; + + return ( + + + + ); +} + +function SpinnerIcon() { + return ( + + + + ); +} + +export function Statusbar() { + const { t } = useI18n(); + const chatStatus = useChatStore((s) => s.status); + const turnStartedAt = useChatStore((s) => s.turnStartedAt); + const [panelOpen, setPanelOpen] = useState(false); + const [conductorPanelOpen, setConductorPanelOpen] = useState(false); + + const bridgeStatus = useBridgeStatus(); + const conductorStatus = useConductorStore((s) => s.connectionStatus); + + const togglePanel = useCallback(() => { setPanelOpen((v) => !v); setConductorPanelOpen(false); }, []); + const closePanel = useCallback(() => setPanelOpen(false), []); + const toggleConductorPanel = useCallback(() => { setConductorPanelOpen((v) => !v); setPanelOpen(false); }, []); + const closeConductorPanel = useCallback(() => setConductorPanelOpen(false), []); + + // Bridge dot: sole source of truth is WS channel health — NOT service-level errors. + const bridgeDot: DotStatus = bridgeStatus === 'ready' ? 'ready' + : bridgeStatus === 'connecting' ? 'connecting' + : 'offline'; + const bridgeDetail = bridgeStatus === 'ready' ? undefined + : bridgeStatus === 'connecting' ? t('bridge.connecting') : t('bridge.offline'); + + // Conductor dot: sole source of truth is conductor WS connection state. + const conductorDot: DotStatus = conductorStatus === 'ready' ? 'ready' + : conductorStatus === 'error' ? 'error' + : conductorStatus === 'connecting' ? 'connecting' + : 'offline'; + const conductorDetail = conductorStatus === 'ready' ? undefined + : conductorStatus === 'connecting' ? t('bridge.connecting') + : conductorStatus === 'error' ? t('bridge.inferenceError') + : t('bridge.offline'); + + return ( +
    +
    +
    + } + label="Bridge" + detail={bridgeDetail} + onClick={togglePanel} + /> + {panelOpen && } +
    +
    + } + label="Conductor" + detail={conductorDetail} + onClick={toggleConductorPanel} + /> + {conductorPanelOpen && } +
    +
    +
    + {chatStatus === 'running' && turnStartedAt && ( + } + label="Turn" + detail={} + /> + )} + +
    +
    + ); +} diff --git a/frontends/desktop/src/components/layout/TitlebarControls.tsx b/frontends/desktop/src/components/layout/TitlebarControls.tsx new file mode 100644 index 000000000..af41859d9 --- /dev/null +++ b/frontends/desktop/src/components/layout/TitlebarControls.tsx @@ -0,0 +1,36 @@ +import { useEffect } from 'react'; +import { Codicon } from '../../lib/icons'; +import { useAppStore } from '../../stores/app'; + +export function TitlebarControls() { + const sidebarCollapsed = useAppStore((s) => s.sidebarCollapsed); + const toggleSidebar = useAppStore((s) => s.toggleSidebar); + + useEffect(() => { + function handleKeyDown(e: KeyboardEvent) { + if ((e.metaKey || e.ctrlKey) && e.key === 'b') { + e.preventDefault(); + toggleSidebar(); + } + } + window.addEventListener('keydown', handleKeyDown); + return () => window.removeEventListener('keydown', handleKeyDown); + }, [toggleSidebar]); + + return ( +
    + +
    + ); +} diff --git a/frontends/desktop/src/components/layout/layout.css b/frontends/desktop/src/components/layout/layout.css new file mode 100644 index 000000000..02223455b --- /dev/null +++ b/frontends/desktop/src/components/layout/layout.css @@ -0,0 +1,934 @@ +.ga-app-layout { + width: 100vw; + height: 100vh; + overflow: hidden; + display: flex; + flex-direction: column; +} + +/* Drag region — allows window dragging from the top bar area (macOS overlay only) */ +:root[data-platform="macos"] .ga-app-layout::before { + content: ''; + position: fixed; + top: 0; + left: 0; + right: 0; + height: 38px; + -webkit-app-region: drag; + z-index: 50; +} + +/* Titlebar controls — positioned after macOS traffic lights */ +.ga-titlebar-controls { + position: fixed; + top: 8px; + left: 12px; + z-index: 100; + display: flex; + align-items: center; + gap: 2px; +} + +:root[data-platform="macos"] .ga-titlebar-controls { + left: 72px; +} + +.ga-titlebar-btn { + display: flex; + align-items: center; + justify-content: center; + width: 28px; + height: 28px; + border: none; + border-radius: 6px; + background: none; + color: var(--ui-text-tertiary); + cursor: pointer; + transition: color 0.1s, background 0.1s; + -webkit-app-region: no-drag; +} + +.ga-titlebar-btn:hover { + background: var(--ui-control-hover-background); + color: var(--foreground); +} + +.ga-app-body { + flex: 1; + min-height: 0; + overflow: hidden; +} + +.ga-app-body .semi-resizable-group { + height: 100%; +} + +.ga-body-collapsed { + height: 100%; + display: flex; + flex-direction: column; + background: var(--background); +} + +/* Sidebar */ +.ga-sidebar-item { + display: flex; + flex-direction: column; + border-right: 1px solid var(--semi-color-border); + background: var(--ui-sidebar-surface-background); +} + +.ga-left-sidebar { + display: flex; + flex-direction: column; + height: 100%; + padding: 36px 0 0; +} + +:root[data-platform="macos"] .ga-left-sidebar { + padding-top: 36px; +} + +.ga-sidebar-brand { + flex-shrink: 0; + padding: 8px 10px 12px; + display: flex; + flex-direction: column; + gap: 2px; +} + +.ga-brand-title { + font-size: 13px; + font-weight: 600; + color: var(--semi-color-text-0); +} + +.ga-brand-sub { + font-size: 10px; + color: var(--semi-color-text-2); +} + +/* Nav Rail — ported from Hermes nav-rail.tsx */ +.ga-nav-rail { + flex-shrink: 0; + display: flex; + flex-direction: column; + gap: 1px; + padding: 0 10px; +} + +.ga-nav-btn { + display: flex; + align-items: center; + width: 100%; + gap: 8px; + height: 28px; + padding: 0 8px; + border: 1px solid transparent; + border-radius: 6px; + background: none; + color: var(--ui-text-secondary); + font-size: 0.8125rem; + font-weight: 500; + line-height: 1; + text-align: left; + cursor: pointer; + transition: color 0.1s ease-out, background 0.1s ease-out; + -webkit-app-region: no-drag; +} + +.ga-nav-label { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.ga-nav-icon { + flex-shrink: 0; + color: var(--ui-icon-nav); +} + +.ga-nav-btn:hover { + background: var(--ui-control-hover-background); + color: var(--foreground); + transition: none; +} + +.ga-nav-btn:hover .ga-nav-icon { + color: var(--ui-icon-nav-active); +} + +.ga-nav-btn.active { + background: var(--ui-control-active-background); + border-color: var(--ui-stroke-tertiary); + color: var(--foreground); + box-shadow: none; +} + +.ga-nav-btn.active .ga-nav-icon { + color: var(--ui-icon-nav-active); +} + +/* Sidebar Search */ +.ga-sidebar-search { + flex-shrink: 0; + padding: 4px 10px; +} + +.ga-sidebar-search .semi-input-wrapper { + border-radius: 6px; + border-color: transparent; + background: var(--ui-control-hover-background); + height: 24px; + font-size: 0.75rem; +} + +.ga-sidebar-search .semi-input-wrapper:hover { + border-color: transparent; + background: var(--ui-row-hover-background); +} + +.ga-sidebar-search .semi-input-wrapper-focus { + border-color: var(--ui-accent); + background: transparent; +} + +.ga-sidebar-search .semi-input { + font-size: 0.75rem; +} + +.ga-sidebar-search .semi-input-prefix { + opacity: 0.5; +} + +/* Session Section */ +.ga-session-section { + flex: 1; + min-height: 0; + overflow-y: auto; + padding: 4px 10px; + display: flex; + flex-direction: column; + gap: 1px; +} + +.ga-session-section::-webkit-scrollbar { width: 4px; } +.ga-session-section::-webkit-scrollbar-track { margin: 8px 0; } +.ga-session-section::-webkit-scrollbar-thumb { + background: transparent; + border-radius: 2px; +} +.ga-session-section:hover::-webkit-scrollbar-thumb { + background: var(--semi-color-fill-2); +} +.ga-session-section:hover::-webkit-scrollbar-thumb:hover { + background: var(--semi-color-fill-1); +} + +.ga-session-empty { + flex: 1; + display: flex; + align-items: center; + justify-content: center; + color: var(--semi-color-text-3); + font-size: 12px; +} + +.ga-session-list { + display: flex; + flex-direction: column; + gap: 1px; +} + +.ga-session-item { + position: relative; + display: flex; + align-items: center; + width: 100%; + min-height: 26px; + padding: 0; + border: none; + border-radius: 6px; + background: none; + cursor: pointer; + text-align: left; + transition: background 0.1s ease-out; +} + +.ga-session-item:hover { + background: var(--ui-row-hover-background); +} + +.ga-session-item.active { + background: var(--ui-row-active-background); +} + +.ga-session-content { + display: flex; + align-items: center; + gap: 6px; + padding: 2px 8px; + min-width: 0; + flex: 1; + transition: padding-right 0.1s ease-out; +} + +.ga-session-item:hover .ga-session-content { + padding-right: 48px; +} + +.ga-status-dot { + width: 4px; + height: 4px; + border-radius: 50%; + background: var(--ui-text-quaternary); + flex-shrink: 0; +} + +.ga-status-dot.working { + width: 6px; + height: 6px; + background: var(--ui-accent); + position: relative; +} + +.ga-status-dot.working::after { + content: ''; + position: absolute; + inset: 0; + border-radius: 50%; + background: var(--ui-accent); + animation: ga-ping 1.5s cubic-bezier(0, 0, 0.2, 1) infinite; +} + +@keyframes ga-ping { + 75%, 100% { transform: scale(2); opacity: 0; } +} + +.ga-session-title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 0.8125rem; + color: var(--ui-text-secondary); + line-height: 1.4; +} + +.ga-session-item:hover .ga-session-title { + color: var(--foreground); +} + +.ga-session-item.active .ga-session-title { + color: var(--foreground); +} + +.ga-session-age { + position: absolute; + right: 24px; + top: 50%; + transform: translateY(-50%); + font-size: 0.625rem; + color: var(--ui-text-tertiary); + opacity: 0; + transition: opacity 0.15s; + pointer-events: none; +} + +.ga-session-item:hover .ga-session-age { + opacity: 1; +} + +.ga-session-actions { + position: absolute; + right: 4px; + top: 50%; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: center; + opacity: 0; + transition: opacity 0.1s; +} + +.ga-session-item:hover .ga-session-actions, +.ga-session-actions.menu-open { + opacity: 1; +} + +.ga-session-actions-btn { + display: flex; + align-items: center; + justify-content: center; + width: 18px; + height: 18px; + border: none; + border-radius: 3px; + background: none; + color: var(--ui-text-tertiary); + cursor: pointer; + transition: color 0.1s, background 0.1s; +} + +.ga-session-actions-btn:hover { + background: var(--ui-control-active-background); + color: var(--foreground); +} + +/* Inline rename input */ +.ga-session-rename-input { + flex: 1; + min-width: 0; + height: 20px; + padding: 0 4px; + border: 1px solid var(--ui-accent); + border-radius: 4px; + background: var(--semi-color-bg-0); + color: var(--foreground); + font-size: 0.8125rem; + font-family: inherit; + outline: none; +} + +/* Pin icon for pinned sessions */ +.ga-session-pin-icon { + position: absolute; + right: 8px; + top: 50%; + transform: translateY(-50%); + display: flex; + align-items: center; + color: var(--ui-text-quaternary); + opacity: 1; + transition: opacity 0.1s; + pointer-events: none; +} + +.ga-session-item:hover .ga-session-pin-icon { + opacity: 0; +} + +/* Session Actions Dropdown Menu */ +.ga-session-menu.semi-dropdown-menu { + min-width: 140px; + padding: 4px; +} + +.ga-session-menu .semi-dropdown-item { + display: flex; + align-items: center; + gap: 8px; + height: 28px; + padding: 0 8px; + border-radius: 4px; + font-size: 0.8125rem; + font-weight: 400; + color: var(--ui-text-secondary); +} + +.ga-session-menu .semi-dropdown-item:hover { + background: var(--ui-control-hover-background); + color: var(--foreground); +} + +.ga-session-menu .semi-dropdown-item-danger { + color: var(--semi-color-danger); +} + +.ga-session-menu .semi-dropdown-item-danger:hover { + color: var(--semi-color-danger); + background: var(--ui-control-hover-background); +} + +/* Section Header */ +.ga-section-header { + display: flex; + align-items: center; + gap: 4px; + padding: 6px 8px 4px; + border: none; + background: none; + cursor: pointer; + width: 100%; +} + +.ga-section-dot { + width: 8px; + height: 8px; + border-radius: 1px; + background: var(--theme-primary); + flex-shrink: 0; +} + +.ga-section-label { + font-size: 0.64rem; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.16em; + color: var(--theme-primary); + line-height: 1; +} + +.ga-section-count { + font-size: 0.6875rem; + font-weight: 500; + color: var(--ui-text-quaternary); + line-height: 1; +} + +.ga-section-chevron { + color: var(--ui-text-tertiary); + opacity: 0; + transition: opacity 0.15s, transform 0.15s; + display: flex; + align-items: center; +} + +.ga-section-header:hover .ga-section-chevron { + opacity: 1; +} + +.ga-section-chevron.open { + transform: rotate(90deg); +} + +.ga-section-action { + margin-left: auto; + display: flex; + align-items: center; + justify-content: center; + width: 18px; + height: 18px; + border: none; + border-radius: 4px; + background: none; + color: var(--ui-text-tertiary); + cursor: pointer; + opacity: 0; + transition: opacity 0.15s, background 0.1s; +} + +.ga-section-header:hover .ga-section-action { + opacity: 1; +} + +.ga-section-action:hover { + background: var(--ui-control-hover-background); + color: var(--foreground); +} + +/* Sidebar Footer */ +.ga-sidebar-footer { + flex-shrink: 0; + padding: 2px 10px 2px; + border-top: 1px solid transparent; + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 0; +} + +.ga-settings-btn { + display: flex; + align-items: center; + gap: 8px; + border: none; + background: none; + color: var(--semi-color-text-1); + cursor: pointer; + padding: 6px 4px; + border-radius: 4px; + font-size: 12px; +} + +.ga-settings-btn:hover { + background: var(--semi-color-fill-0); +} + +.ga-footer-ver { + font-size: 11px; + color: var(--semi-color-text-3); +} + +/* Main area */ +.ga-main-item { + display: flex; + flex-direction: column; + min-height: 0; + background: var(--background); +} + +.ga-main-area { + flex: 1; + min-height: 0; + display: flex; + align-items: center; + justify-content: center; + padding: 24px; +} + +.ga-main-area.ga-main-chat { + padding: 0; + align-items: stretch; +} + +.ga-main-area.ga-main-full { + padding: 0; + align-items: stretch; + justify-content: stretch; +} + +.ga-main-placeholder { + text-align: center; + color: var(--semi-color-text-2); +} + +.ga-main-placeholder h2 { + margin: 0 0 8px; + font-size: 20px; + color: var(--semi-color-text-0); +} + +.ga-main-placeholder p { + margin: 4px 0; + font-size: 14px; +} + +.ga-placeholder-hint { + margin-top: 16px !important; + font-size: 12px !important; + color: var(--semi-color-text-3) !important; + font-style: italic; +} + +/* Resize handlers */ +.ga-app-body .semi-resizable-handler { + width: 2px; + background: transparent; + transition: background 0.15s; +} + +.ga-app-body .semi-resizable-handler:hover { + background: var(--semi-color-primary); +} + +.ga-app-body .semi-resizable-handler .semi-icon { + display: none; +} + +/* Statusbar — ported from Hermes statusbar.tsx */ +.ga-statusbar { + height: 20px; + display: flex; + justify-content: space-between; + align-items: stretch; + gap: 8px; + border-top: 1px solid var(--ui-stroke-tertiary); + background: var(--ui-sidebar-surface-background); + padding: 0 4px; + color: var(--ui-text-tertiary); + flex-shrink: 0; + -webkit-app-region: no-drag; +} + +.ga-statusbar-group { + display: flex; + min-width: 0; + align-items: stretch; + gap: 2px; +} + +.ga-statusbar-item { + display: inline-flex; + align-items: center; + height: 100%; + gap: 4px; + padding: 0 6px; + font-size: 0.6875rem; + color: inherit; + border: none; + border-radius: 0; + background: none; + text-decoration: none; + cursor: default; + transition: color 0.1s, background 0.1s; +} + +.ga-statusbar-item.action, +.ga-statusbar-item.menu, +.ga-statusbar-item.link { + cursor: pointer; +} + +.ga-statusbar-item.action:hover, +.ga-statusbar-item.menu:hover, +.ga-statusbar-item.link:hover { + color: var(--foreground); + background: var(--chrome-action-hover); +} + +.ga-statusbar-item.disabled { + opacity: 0.45; + cursor: default; +} + +.ga-statusbar-item.disabled:hover { + color: inherit; + background: none; +} + +.ga-statusbar-label { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.ga-statusbar-detail { + color: var(--ui-text-quaternary); +} + +.ga-statusbar-icon { + display: flex; + align-items: center; + flex-shrink: 0; +} + +.ga-statusbar-spinner { + animation: ga-spin 1s linear infinite; +} + +@keyframes ga-spin { + to { transform: rotate(360deg); } +} + +.ga-statusbar-dot--pulse { + animation: ga-dot-pulse 1.2s ease-in-out infinite; +} + +@keyframes ga-dot-pulse { + 0%, 100% { opacity: 1; } + 50% { opacity: 0.35; } +} + +/* ═══ Bridge Menu Panel (popover from statusbar) ═══ */ + +.ga-statusbar-menu-anchor { + position: relative; +} + +.ga-bridge-panel { + position: absolute; + bottom: calc(100% + 6px); + left: 0; + min-width: 20rem; + background: var(--semi-color-bg-0, #fff); + border: 1px solid var(--ui-stroke-secondary); + border-radius: 0.5rem; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); + backdrop-filter: blur(12px) saturate(1.08); + z-index: 200; + animation: ga-panel-slide-up 0.12s ease-out; + font-size: 0.875rem; +} + +@keyframes ga-panel-slide-up { + from { opacity: 0; transform: translateY(4px); } + to { opacity: 1; transform: translateY(0); } +} + +/* Header: two status rows + action buttons */ +.ga-bridge-panel-header { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.75rem; + padding: 0.375rem 0.625rem; +} + +.ga-bridge-panel-status-rows { + display: flex; + flex-direction: column; + gap: 0.25rem; + min-width: 0; + font-size: 0.7rem; + line-height: 1; +} + +.ga-bridge-panel-row { + display: flex; + align-items: center; + gap: 0.375rem; +} + +.ga-bridge-panel-row--primary { + font-weight: 500; + color: var(--foreground); +} + +.ga-bridge-panel-row--secondary { + color: var(--ui-text-tertiary); +} + +/* Action buttons in header */ +.ga-bridge-panel-actions { + display: flex; + align-items: center; + gap: 2px; + flex-shrink: 0; +} + +.ga-bridge-panel-action-btn { + width: 1.5rem; + height: 1.5rem; + border: none; + border-radius: 4px; + background: transparent; + color: var(--ui-text-tertiary); + display: grid; + place-items: center; + cursor: pointer; + transition: background 0.1s, color 0.1s; +} + +.ga-bridge-panel-action-btn:hover { + background: var(--chrome-action-hover); + color: var(--foreground); +} + +/* Sections */ +.ga-bridge-panel-section { + border-top: 1px solid color-mix(in srgb, var(--semi-color-border, #e0e0e0) 50%, transparent); + padding: 0.375rem 0.625rem; +} + +.ga-panel-section-label { + font-size: 0.62rem; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.14em; + color: color-mix(in srgb, var(--ui-text-tertiary) 80%, transparent); + margin-bottom: 0.25rem; + user-select: none; +} + +/* Services list */ +.ga-bridge-panel-list { + list-style: none; + display: flex; + flex-direction: column; + gap: 0.25rem; + margin-top: 0.375rem; +} + +.ga-bridge-panel-list-item { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.5rem; + font-size: 0.75rem; +} + +.ga-bridge-panel-svc-name { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-transform: capitalize; + color: var(--foreground); +} + +.ga-bridge-panel-svc-state { + display: flex; + align-items: center; + gap: 0.375rem; + font-size: 0.66rem; + color: var(--ui-text-tertiary); + flex-shrink: 0; +} + +.ga-bridge-panel-svc-err { + color: #ef4444; + font-weight: 700; + font-size: 0.625rem; +} + +/* Section header row (label + action link) */ +.ga-bridge-panel-section-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.5rem; +} + +.ga-bridge-panel-link-btn { + border: none; + background: none; + color: var(--ui-text-tertiary); + font-size: 0.625rem; + font-weight: 500; + cursor: pointer; + padding: 0; + white-space: nowrap; + transition: color 0.1s; +} + +.ga-bridge-panel-link-btn:hover { + color: var(--foreground); +} + +/* Log tail view */ +.ga-bridge-panel-log { + margin-top: 0.25rem; + max-height: 8rem; + overflow-y: auto; + font-family: var(--font-mono); + font-size: 0.6875rem; + line-height: 1.45; + white-space: pre-wrap; + word-break: break-all; + color: var(--ui-text-tertiary); + scrollbar-width: thin; + user-select: text; +} + +.ga-bridge-panel-log-empty { + margin-top: 0.25rem; + font-size: 0.6875rem; + color: var(--ui-text-quaternary); + font-style: italic; +} + +/* Conductor panel — worker stat badges */ +.ga-conductor-panel-stats { + display: flex; + align-items: center; + gap: 0.25rem; + flex-shrink: 0; +} + +.ga-conductor-stat { + display: inline-flex; + align-items: center; + justify-content: center; + min-width: 1rem; + height: 1rem; + padding: 0 0.25rem; + border-radius: 0.5rem; + font-size: 0.6rem; + font-weight: 700; + line-height: 1; +} + +.ga-conductor-stat--run { + background: color-mix(in srgb, var(--ui-accent, #0053fd) 12%, transparent); + color: var(--ui-accent, #0053fd); +} + +.ga-conductor-stat--done { + background: color-mix(in srgb, #10b981 12%, transparent); + color: #059669; +} + +.ga-conductor-stat--fail { + background: color-mix(in srgb, #ef4444 12%, transparent); + color: #dc2626; +} diff --git a/frontends/desktop/src/components/services/MykeyConfigModal.tsx b/frontends/desktop/src/components/services/MykeyConfigModal.tsx new file mode 100644 index 000000000..df9712289 --- /dev/null +++ b/frontends/desktop/src/components/services/MykeyConfigModal.tsx @@ -0,0 +1,77 @@ +import { useEffect, useState } from 'react'; +import { Modal, TextArea, Button, Spin } from '@douyinfe/semi-ui'; +import { useI18n } from '../../i18n'; +import { useServicesStore } from '../../stores/services'; +import { showError, showSuccess } from '../../utils/toast'; +import '../settings/settings.css'; + +interface Props { + visible: boolean; + onClose: () => void; +} + +export function MykeyConfigModal({ visible, onClose }: Props) { + const { t } = useI18n(); + const fetchMykey = useServicesStore((s) => s.fetchMykey); + const saveMykey = useServicesStore((s) => s.saveMykey); + const mykeyContent = useServicesStore((s) => s.mykeyContent); + const mykeyLoading = useServicesStore((s) => s.mykeyLoading); + + const [draft, setDraft] = useState(''); + const [saving, setSaving] = useState(false); + + useEffect(() => { + if (visible) { + fetchMykey(); + } + }, [visible, fetchMykey]); + + useEffect(() => { + setDraft(mykeyContent); + }, [mykeyContent]); + + const handleSave = async () => { + setSaving(true); + const ok = await saveMykey(draft); + setSaving(false); + if (ok) { + showSuccess(t('sys.configSaved')); + onClose(); + } else { + showError(t('err.mykeyExport')); + } + }; + + return ( + + + +
    + } + > + {mykeyLoading ? ( +
    + +
    + ) : ( +