docs: update meta files for relative-units rule session
Add session entries to progress logs, update CLAUDE.md files with rule 18 reference and rem units, archive multi-machine progress entries, update CHANGELOG/TODO/v3-task_plan with CSS units decision.
This commit is contained in:
Hibryda
parent
906e967aa0
commit
3ecc4f02d1
8 changed files with 128 additions and 99 deletions
|
|
@ -178,3 +178,96 @@ Architecture decision: Initially used `claude` CLI with `--output-format stream-
|
|||
|
||||
#### TAURI_SIGNING_PRIVATE_KEY
|
||||
- [x] Set via `gh secret set` on DexterFromLab/BTerminal GitHub repo
|
||||
|
||||
### Session: 2026-03-06 (continued) — Multi-Machine Architecture Design
|
||||
|
||||
#### Multi-Machine Support Architecture
|
||||
- [x] Designed full multi-machine architecture in docs/multi-machine.md (303 lines)
|
||||
- [x] Three-layer model: BTerminal (controller) + bterminal-relay (remote binary) + unified frontend
|
||||
- [x] WebSocket NDJSON protocol: RelayCommand/RelayEvent envelope wrapping existing sidecar format
|
||||
- [x] Authentication: pre-shared token + TLS, rate limiting, lockout
|
||||
- [x] Autonomous relay model: agents keep running when controller disconnects
|
||||
- [x] Reconnection with exponential backoff (1s-30s), state_sync on reconnect
|
||||
- [x] 4-phase implementation plan: A (extract bterminal-core crate), B (relay binary), C (RemoteManager), D (frontend)
|
||||
- [x] Updated TODO.md and docs/task_plan.md to reference the design
|
||||
|
||||
### Session: 2026-03-06 (continued) — Multi-Machine Implementation (Phases A-D)
|
||||
|
||||
#### Phase A: bterminal-core crate extraction
|
||||
- [x] Created Cargo workspace at v2/ level (v2/Cargo.toml, workspace members: src-tauri, bterminal-core, bterminal-relay)
|
||||
- [x] Extracted PtyManager into v2/bterminal-core/src/pty.rs
|
||||
- [x] Extracted SidecarManager into v2/bterminal-core/src/sidecar.rs
|
||||
- [x] Created EventSink trait (v2/bterminal-core/src/event.rs) to abstract event emission
|
||||
- [x] TauriEventSink (v2/src-tauri/src/event_sink.rs) implements EventSink for Tauri AppHandle
|
||||
- [x] src-tauri/src/pty.rs and sidecar.rs now thin re-export wrappers
|
||||
- [x] Cargo.lock moved from src-tauri/ to workspace root (v2/)
|
||||
|
||||
#### Phase B: bterminal-relay binary
|
||||
- [x] New Rust binary at v2/bterminal-relay/ with WebSocket server (tokio-tungstenite)
|
||||
- [x] Token auth via Authorization: Bearer header on WebSocket upgrade
|
||||
- [x] CLI flags: --port (default 9750), --token (required), --insecure (allow ws://)
|
||||
- [x] Routes RelayCommand types (pty_create/write/resize/close, agent_query/stop, sidecar_restart, ping)
|
||||
- [x] Forwards RelayEvent types (pty_data/exit, sidecar_message/exited, error, pong, ready)
|
||||
- [x] Rate limiting: 10 failed auth attempts triggers 5-minute lockout
|
||||
- [x] Per-connection isolated PtyManager + SidecarManager instances
|
||||
|
||||
#### Phase C: RemoteManager in controller
|
||||
- [x] New v2/src-tauri/src/remote.rs module — RemoteManager struct
|
||||
- [x] WebSocket client connections to relay instances (tokio-tungstenite)
|
||||
- [x] RemoteMachine struct: id, label, url, token, status (Connected/Connecting/Disconnected/Error)
|
||||
- [x] Machine lifecycle: add_machine, remove_machine, connect, disconnect
|
||||
- [x] 12 new Tauri commands: remote_add_machine, remote_remove_machine, remote_connect, remote_disconnect, remote_list_machines, remote_pty_spawn/write/resize/kill, remote_agent_query/stop, remote_sidecar_restart
|
||||
- [x] Heartbeat ping every 15s to detect stale connections
|
||||
|
||||
#### Phase D: Frontend integration
|
||||
- [x] v2/src/lib/adapters/remote-bridge.ts — IPC adapter for machine management + remote events
|
||||
- [x] v2/src/lib/stores/machines.svelte.ts — Svelte 5 store for remote machine state
|
||||
- [x] Layout store: added remoteMachineId?: string to Pane interface
|
||||
- [x] agent-bridge.ts: routes to remote_agent_query/stop when pane has remoteMachineId
|
||||
- [x] pty-bridge.ts: routes to remote_pty_spawn/write/resize/kill when pane has remoteMachineId
|
||||
- [x] SettingsDialog: new "Remote Machines" section (add/remove/connect/disconnect UI)
|
||||
- [x] SessionList sidebar: auto-groups remote panes by machine label
|
||||
|
||||
#### Verification
|
||||
- cargo check --workspace: clean (0 errors)
|
||||
- vitest: 114/114 tests passing
|
||||
- svelte-check: clean (0 errors)
|
||||
|
||||
#### New dependencies added
|
||||
- bterminal-core: serde, serde_json, log, portable-pty, uuid (extracted from src-tauri)
|
||||
- bterminal-relay: tokio, tokio-tungstenite, clap, env_logger, futures-util
|
||||
- src-tauri: tokio-tungstenite, tokio, futures-util, uuid (added for RemoteManager)
|
||||
|
||||
### Session: 2026-03-06 (continued) — Relay Hardening & Reconnection
|
||||
|
||||
#### Relay Command Response Propagation
|
||||
- [x] Shared event channel between EventSink and command response sender (sink_tx clone in bterminal-relay)
|
||||
- [x] send_error() helper function: all command failures now emit RelayEvent with commandId + error message instead of just logging
|
||||
- [x] ping command: now sends pong response via event channel (was a no-op)
|
||||
- [x] pty_create: returns pty_created event with session ID and commandId for correlation
|
||||
- [x] All error paths (pty_write, pty_resize, pty_close, agent_query, agent_stop, sidecar_restart) use send_error()
|
||||
|
||||
#### RemoteManager Reconnection
|
||||
- [x] Exponential backoff reconnection in remote.rs: spawns async tokio task on disconnect
|
||||
- [x] Backoff schedule: 1s, 2s, 4s, 8s, 16s, 30s (capped)
|
||||
- [x] attempt_tcp_probe() function: TCP-only connect probe (5s timeout, default port 9750) — avoids allocating per-connection resources on relay
|
||||
- [x] Emits remote-machine-reconnecting (with backoffSecs) and remote-machine-reconnect-ready Tauri events
|
||||
- [x] Cancellation: stops if machine removed (not in HashMap) or manually reconnected (status != disconnected)
|
||||
- [x] Fixed scoping: disconnection cleanup uses inner block to release mutex before emitting event
|
||||
|
||||
#### RemoteManager PTY Creation Confirmation
|
||||
- [x] Handles pty_created event type from relay: emits remote-pty-created Tauri event with machineId, ptyId, commandId
|
||||
|
||||
### Session: 2026-03-06 (continued) — Reconnection Hardening
|
||||
|
||||
#### TCP Probe Refactor
|
||||
- [x] Replaced attempt_ws_connect() with attempt_tcp_probe() in remote.rs: TCP-only connect (no WS upgrade), 5s timeout, default port 9750
|
||||
- [x] Avoids allocating per-connection resources (PtyManager, SidecarManager) on the relay during reconnection probes
|
||||
- [x] Probe no longer needs auth token — only checks TCP reachability
|
||||
|
||||
#### Frontend Reconnection Listeners
|
||||
- [x] Added onRemoteMachineReconnecting() listener in remote-bridge.ts: receives machineId + backoffSecs
|
||||
- [x] Added onRemoteMachineReconnectReady() listener in remote-bridge.ts: receives machineId when probe succeeds
|
||||
- [x] machines.svelte.ts: reconnecting handler sets machine status to 'reconnecting', shows toast with backoff duration
|
||||
- [x] machines.svelte.ts: reconnect-ready handler auto-calls connectMachine() to re-establish full WebSocket connection
|
||||
- [x] Updated docs/multi-machine.md to reflect TCP probe and frontend listener changes
|
||||
|
|
|
|||
102
docs/progress.md
102
docs/progress.md
|
|
@ -1,99 +1,6 @@
|
|||
# BTerminal v2 — Progress Log
|
||||
|
||||
> Earlier sessions (2026-03-05 to 2026-03-06 early): see [progress-archive.md](progress-archive.md)
|
||||
|
||||
### Session: 2026-03-06 (continued) — Multi-Machine Architecture Design
|
||||
|
||||
#### Multi-Machine Support Architecture
|
||||
- [x] Designed full multi-machine architecture in docs/multi-machine.md (303 lines)
|
||||
- [x] Three-layer model: BTerminal (controller) + bterminal-relay (remote binary) + unified frontend
|
||||
- [x] WebSocket NDJSON protocol: RelayCommand/RelayEvent envelope wrapping existing sidecar format
|
||||
- [x] Authentication: pre-shared token + TLS, rate limiting, lockout
|
||||
- [x] Autonomous relay model: agents keep running when controller disconnects
|
||||
- [x] Reconnection with exponential backoff (1s-30s), state_sync on reconnect
|
||||
- [x] 4-phase implementation plan: A (extract bterminal-core crate), B (relay binary), C (RemoteManager), D (frontend)
|
||||
- [x] Updated TODO.md and docs/task_plan.md to reference the design
|
||||
|
||||
### Session: 2026-03-06 (continued) — Multi-Machine Implementation (Phases A-D)
|
||||
|
||||
#### Phase A: bterminal-core crate extraction
|
||||
- [x] Created Cargo workspace at v2/ level (v2/Cargo.toml, workspace members: src-tauri, bterminal-core, bterminal-relay)
|
||||
- [x] Extracted PtyManager into v2/bterminal-core/src/pty.rs
|
||||
- [x] Extracted SidecarManager into v2/bterminal-core/src/sidecar.rs
|
||||
- [x] Created EventSink trait (v2/bterminal-core/src/event.rs) to abstract event emission
|
||||
- [x] TauriEventSink (v2/src-tauri/src/event_sink.rs) implements EventSink for Tauri AppHandle
|
||||
- [x] src-tauri/src/pty.rs and sidecar.rs now thin re-export wrappers
|
||||
- [x] Cargo.lock moved from src-tauri/ to workspace root (v2/)
|
||||
|
||||
#### Phase B: bterminal-relay binary
|
||||
- [x] New Rust binary at v2/bterminal-relay/ with WebSocket server (tokio-tungstenite)
|
||||
- [x] Token auth via Authorization: Bearer header on WebSocket upgrade
|
||||
- [x] CLI flags: --port (default 9750), --token (required), --insecure (allow ws://)
|
||||
- [x] Routes RelayCommand types (pty_create/write/resize/close, agent_query/stop, sidecar_restart, ping)
|
||||
- [x] Forwards RelayEvent types (pty_data/exit, sidecar_message/exited, error, pong, ready)
|
||||
- [x] Rate limiting: 10 failed auth attempts triggers 5-minute lockout
|
||||
- [x] Per-connection isolated PtyManager + SidecarManager instances
|
||||
|
||||
#### Phase C: RemoteManager in controller
|
||||
- [x] New v2/src-tauri/src/remote.rs module — RemoteManager struct
|
||||
- [x] WebSocket client connections to relay instances (tokio-tungstenite)
|
||||
- [x] RemoteMachine struct: id, label, url, token, status (Connected/Connecting/Disconnected/Error)
|
||||
- [x] Machine lifecycle: add_machine, remove_machine, connect, disconnect
|
||||
- [x] 12 new Tauri commands: remote_add_machine, remote_remove_machine, remote_connect, remote_disconnect, remote_list_machines, remote_pty_spawn/write/resize/kill, remote_agent_query/stop, remote_sidecar_restart
|
||||
- [x] Heartbeat ping every 15s to detect stale connections
|
||||
|
||||
#### Phase D: Frontend integration
|
||||
- [x] v2/src/lib/adapters/remote-bridge.ts — IPC adapter for machine management + remote events
|
||||
- [x] v2/src/lib/stores/machines.svelte.ts — Svelte 5 store for remote machine state
|
||||
- [x] Layout store: added remoteMachineId?: string to Pane interface
|
||||
- [x] agent-bridge.ts: routes to remote_agent_query/stop when pane has remoteMachineId
|
||||
- [x] pty-bridge.ts: routes to remote_pty_spawn/write/resize/kill when pane has remoteMachineId
|
||||
- [x] SettingsDialog: new "Remote Machines" section (add/remove/connect/disconnect UI)
|
||||
- [x] SessionList sidebar: auto-groups remote panes by machine label
|
||||
|
||||
#### Verification
|
||||
- cargo check --workspace: clean (0 errors)
|
||||
- vitest: 114/114 tests passing
|
||||
- svelte-check: clean (0 errors)
|
||||
|
||||
#### New dependencies added
|
||||
- bterminal-core: serde, serde_json, log, portable-pty, uuid (extracted from src-tauri)
|
||||
- bterminal-relay: tokio, tokio-tungstenite, clap, env_logger, futures-util
|
||||
- src-tauri: tokio-tungstenite, tokio, futures-util, uuid (added for RemoteManager)
|
||||
|
||||
### Session: 2026-03-06 (continued) — Relay Hardening & Reconnection
|
||||
|
||||
#### Relay Command Response Propagation
|
||||
- [x] Shared event channel between EventSink and command response sender (sink_tx clone in bterminal-relay)
|
||||
- [x] send_error() helper function: all command failures now emit RelayEvent with commandId + error message instead of just logging
|
||||
- [x] ping command: now sends pong response via event channel (was a no-op)
|
||||
- [x] pty_create: returns pty_created event with session ID and commandId for correlation
|
||||
- [x] All error paths (pty_write, pty_resize, pty_close, agent_query, agent_stop, sidecar_restart) use send_error()
|
||||
|
||||
#### RemoteManager Reconnection
|
||||
- [x] Exponential backoff reconnection in remote.rs: spawns async tokio task on disconnect
|
||||
- [x] Backoff schedule: 1s, 2s, 4s, 8s, 16s, 30s (capped)
|
||||
- [x] attempt_tcp_probe() function: TCP-only connect probe (5s timeout, default port 9750) — avoids allocating per-connection resources on relay
|
||||
- [x] Emits remote-machine-reconnecting (with backoffSecs) and remote-machine-reconnect-ready Tauri events
|
||||
- [x] Cancellation: stops if machine removed (not in HashMap) or manually reconnected (status != disconnected)
|
||||
- [x] Fixed scoping: disconnection cleanup uses inner block to release mutex before emitting event
|
||||
|
||||
#### RemoteManager PTY Creation Confirmation
|
||||
- [x] Handles pty_created event type from relay: emits remote-pty-created Tauri event with machineId, ptyId, commandId
|
||||
|
||||
### Session: 2026-03-06 (continued) — Reconnection Hardening
|
||||
|
||||
#### TCP Probe Refactor
|
||||
- [x] Replaced attempt_ws_connect() with attempt_tcp_probe() in remote.rs: TCP-only connect (no WS upgrade), 5s timeout, default port 9750
|
||||
- [x] Avoids allocating per-connection resources (PtyManager, SidecarManager) on the relay during reconnection probes
|
||||
- [x] Probe no longer needs auth token — only checks TCP reachability
|
||||
|
||||
#### Frontend Reconnection Listeners
|
||||
- [x] Added onRemoteMachineReconnecting() listener in remote-bridge.ts: receives machineId + backoffSecs
|
||||
- [x] Added onRemoteMachineReconnectReady() listener in remote-bridge.ts: receives machineId when probe succeeds
|
||||
- [x] machines.svelte.ts: reconnecting handler sets machine status to 'reconnecting', shows toast with backoff duration
|
||||
- [x] machines.svelte.ts: reconnect-ready handler auto-calls connectMachine() to re-establish full WebSocket connection
|
||||
- [x] Updated docs/multi-machine.md to reflect TCP probe and frontend listener changes
|
||||
> Earlier sessions (2026-03-05 to 2026-03-06 multi-machine): see [progress-archive.md](progress-archive.md)
|
||||
|
||||
### Session: 2026-03-06 (continued) — Sidecar Env Var Bug Fix
|
||||
|
||||
|
|
@ -298,8 +205,15 @@
|
|||
- [x] Added --term-font-family and --term-font-size CSS vars to catppuccin.css
|
||||
- [x] Updated initTheme() to restore 4 font settings instead of 2
|
||||
|
||||
### Session: 2026-03-08 — CSS Relative Units Rule
|
||||
- [x] Created `.claude/rules/18-relative-units.md` — enforces rem/em for layout CSS (px only for icons/borders)
|
||||
- [x] Converted GlobalTabBar.svelte styles from px to rem (rail width, button size, gap, padding, border-radius)
|
||||
- [x] Converted App.svelte sidebar header styles from px to rem (padding, close button, border-radius)
|
||||
- [x] Changed GlobalTabBar rail-btn color from --ctp-overlay1 to --ctp-subtext0
|
||||
|
||||
### Next Steps
|
||||
- [ ] Real-world relay testing (2 machines)
|
||||
- [ ] TLS/certificate pinning for relay connections
|
||||
- [ ] E2E testing with Playwright/WebDriver (when display server available)
|
||||
- [ ] Test agent teams with CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1
|
||||
- [ ] Convert remaining components from px to rem per rule 18
|
||||
|
|
|
|||
|
|
@ -271,3 +271,16 @@ All editor themes map to the same `--ctp-*` CSS custom property names (26 vars).
|
|||
|
||||
#### Verification
|
||||
- No test changes needed — UI/CSS-only changes, no logic changes
|
||||
|
||||
### Session: 2026-03-08 — CSS Relative Units Rule
|
||||
|
||||
#### New Rule: 18-relative-units.md
|
||||
- [x] Created `.claude/rules/18-relative-units.md` enforcing rem/em for layout CSS
|
||||
- [x] Pixels allowed only for icon sizes, borders/outlines, box shadows
|
||||
- [x] Exception: --ui-font-size/--term-font-size CSS vars store px (xterm.js API requirement)
|
||||
- [x] Added rule #18 to `.claude/CLAUDE.md` rule index
|
||||
|
||||
#### CSS Conversions
|
||||
- [x] GlobalTabBar.svelte: rail width 36px -> 2.75rem, button 28px -> 2rem, gap 2px -> 0.25rem, padding 6px 4px -> 0.5rem 0.375rem, border-radius 4px -> 0.375rem
|
||||
- [x] App.svelte: sidebar header padding 8px 12px -> 0.5rem 0.75rem, close button 22px -> 1.375rem, border-radius 4px -> 0.25rem
|
||||
- [x] Also changed GlobalTabBar rail-btn color from --ctp-overlay1 to --ctp-subtext0 for better contrast
|
||||
|
|
|
|||
|
|
@ -326,7 +326,8 @@ All 10 phases complete. Detailed checklists in [v3-progress.md](v3-progress.md).
|
|||
| xterm budget: 4 active, unlimited suspended | WebKit2GTK OOM at ~5 instances. Serialize scrollback to text buffer, destroy xterm, recreate on focus. PTY stays alive. | 2026-03-07 |
|
||||
| Flexbox + scroll-snap over CSS Grid | Allows horizontal scroll on narrow screens. Scroll-snap gives clean project-to-project scrolling. | 2026-03-07 |
|
||||
| Team panel: inline >2560px, overlay <2560px | Adapts to available space. Collapsed when no subagents running. | 2026-03-07 |
|
||||
| VSCode-style left sidebar (replaces top tab bar + settings drawer) | Vertical icon rail (36px, 4 SVG icons) + expandable drawer panel (28em, max 50%) + always-visible workspace. Settings is a regular tab, not special drawer. ProjectGrid always visible. Ctrl+B toggles sidebar. | 2026-03-08 |
|
||||
| VSCode-style left sidebar (replaces top tab bar + settings drawer) | Vertical icon rail (2.75rem, 4 SVG icons) + expandable drawer panel (28em, max 50%) + always-visible workspace. Settings is a regular tab, not special drawer. ProjectGrid always visible. Ctrl+B toggles sidebar. | 2026-03-08 |
|
||||
| CSS relative units (rule 18) | Use rem/em for all layout CSS. Pixels only for icon sizes, borders, box shadows. Exception: --ui-font-size/--term-font-size store px for xterm.js API. | 2026-03-08 |
|
||||
| Project accent colors from Catppuccin palette | Visual distinction: blue/green/mauve/peach/pink per slot 1-5. Applied to border + header tint. | 2026-03-07 |
|
||||
| Remote machines deferred to v3.1 | Elevate to project level (project.remote_machine_id) but don't implement in MVP. | 2026-03-07 |
|
||||
| Keyboard shortcut layers: App > Workspace > Terminal | Prevents conflicts. Terminal captures raw keys only when focused. App layer uses Ctrl+K/G. | 2026-03-07 |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue