@goodandready/dsh-remote-workspace 0.3.13 → 0.3.15

package/CHANGELOG.md

@@ -0,0 +1,132 @@
+# Changelog
+
+## 0.3.15
+
+### Security & Hardening
+- **Shell command injection prevention (#90)**: Validated service action against allowlist and strictly shell-quoted service name, journal lines, and unit arguments in `remote_service`.
+- **Environment variable key validation (#96)**: Added strict regex validation (`^[A-Za-z_][A-Za-z0-9_]*$`) for environment variable keys across routes and services to prevent shell/env injection.
+- **ProxyCommand and bastion safety (#97)**: Validated ProxyCommand template tokens and shell-quoted `%h` / `%p` substitutions to eliminate command injection through SSH proxy configurations.
+- **Buffer caps against memory exhaustion (#99)**: Implemented maximum buffer size caps on exec stream accumulation and file read buffers with early truncation and clean teardown to prevent OOM.
+- **Cross-origin and loopback enforcement (#110)**: Strengthened `isTrustedSettingsRequest` by rejecting untrusted origins and foreign hosts across all settings endpoints.
+
+### Stability & Reliability
+- **Config volatile unwrap (#89)**: Unwrapped incoming volatile boxes in plugin `apply()` entry point, preventing empty profiles and state loss on config reload.
+- **AlertService profile lifecycle (#92)**: Integrated profile resolver and full lifecycle management into `AlertService` to properly start, update, and stop alert polling.
+- **3-way mirror sync conflict resolution (#91)**: Added 3-way hash-based conflict detection comparing local, remote, and baseline states to prevent silent overwrites.
+- **Remote filesystem path containment (#93)**: Confined all `remote_fs` operations strictly to workspace root with path traversal blocking.
+- **Route path traversal defense (#94)**: Added strict path normalization and root containment checks across all HTTP filesystem routes.
+- **SSH config include safety (#95)**: Restricted `Include` directives in SSH config parser to user directory boundaries to prevent arbitrary file reading.
+- **Cache invalidation on write (#98)**: Ensured cache invalidation across file writes, deletes, and remote sync operations.
+- **Terminal session lifecycle (#100)**: Hardened terminal cleanup and session tracking to prevent dangling sockets and connection leaks.
+- **Honest vault permissions status (#102, #107)**: Resolved `$DSH_HOME` path correctly and reported honest owner-only file permissions (0600) instead of misleading encryption labels.
+- **Secret masking in remote env tool (#103)**: Masked sensitive environment values (`••••••••`) during bulk reads while permitting targeted retrieval by specific key.
+- **Clean module exports (#104)**: Cleaned up unused and circular exports across services.
+- **Tool render shape contract (#105)**: Conformed tool render output strictly to `[{ type: "text", text }]` shape per DSH framework contract.
+- **Supply chain protection in updater (#106)**: Preserved pnpm `minimumReleaseAge` supply chain guard during plugin auto-updates.
+- **Canonical theme tokens in UI (#108)**: Replaced non-canonical theme variables in client UI with standard DSH design tokens and proper fallbacks.
+- **Dead import elimination (#109)**: Removed unreferenced imports and dead variables across codebase.
+- **Preflight cleanups (#116)**: Annotated stream and process cleanup catch statements to ensure clean preflight verification.
+
+## 0.3.12
+
+### Fixed
+- **Peer gate on DSH 0.2.0-rc.1** (#58): DSH skips a profile bundle whose `peerDependencies` exclude the running version, so this plugin was absent from the profile with no error in the UI. Every `@deepseek-ai/dsh-*` peer now names both the 0.1.7-rc.2 and 0.2.0-rc.1 lines, because semver does not admit a prerelease of the next minor into a range that does not name it.
+
+Notable changes to `@goodandready/dsh-remote-workspace`.
+
+## 0.3.11
+
+### Fixed & Enhanced
+- **DSH 0.2.0-rc.1 volatile Config and configForms support**: Patched Schemastery prototype with volatile markers for Config leaves to prevent persistence race conditions; migrated client to configForms.whileServed(['dsh-remote-workspace'], ...) with backwards-compatible fallback. (Refs: #76)
+- **Env and Diagnose routes signature fix**: Corrected /env/view and /env/save endpoints to call nvService.readEnv(profile, targetPath) and 
+emoteFs.writeFile; updated /diagnose route to correctly supply the profile object. (Refs: #77)
+- **PTY terminal session idle reaper**: Added background idle session sweeper to sweep abandoned PTY sessions and terminate dedicated SSH connections after 10 minutes with zero subscribers. (Refs: #78)
+- **Tunnel socket cleanup and telemetry guard**: Added mutual stream/socket destruction on error or close and guarded single cleanup invocation to prevent telemetry counter drift. (Refs: #79)
+- **Tar sync process and stream error handlers**: Added error listeners to local tar processes and streams in TarSyncService to prevent unhandled exceptions and dangling child processes. (Refs: #80)
+- **Shell argument sanitization**: Hardened remote command invocations by strictly POSIX-quoting paths and coercing numeric parameters (ports, tail line limits) to integers. (Refs: #81)
+- **Binary file integrity in mirror sync pull**: Switched remote file pulls to read raw binary buffers instead of utf-8 strings, eliminating checksum mismatch and binary corruption. (Refs: #82)
+- **Filesystem watcher error handling and push lock**: Added error listener to s.watch against ENOSPC / OS errors and per-profile concurrency lock preventing overlapping pushes. (Refs: #83)
+- **Poll gate and host projection leakage guard**: Wired tab visibility poll gate into client to pause background polling when tab is hidden; added verification tests for secret masking in host projections. (Refs: #84)
+
+## 0.3.10
+
+### Security & Fixed
+- **Session-aware connection authentication**: all API routes are guarded by `authorizeRequest()` using DSH `connection.requestRejection(req)`, failing closed (503) if connection is unavailable and rejecting non-loopback clients with forged Origin/Sec-Fetch headers (403/401) before calling sensitive services. (Refs: #72)
+- **Bounded body reader**: `readBody()` checks `Content-Length` upfront, enforces a 5 MiB ceiling, and immediately stops accumulating chunks and removes listeners upon cap violation with HTTP 413, preventing memory exhaustion and OOM. (Refs: #73)
+- **Timer lifecycle cleanup**: `clearInterval(idleTimer)` added to plugin `dispose` cleanup, preventing lingering background interval timers on plugin reload. (Refs: #74)
+
+## 0.3.9
+
+### Added
+- **ProxyCommand and ProxyJump**: a profile can dial through an OpenSSH proxy command or a chain of bastions. The first jump uses the connection pool. Later jumps use their own connections and close when the target closes.
+- **SSH agent and keyboard sign-in**: authentication can use an agent socket, Pageant, or `SSH_AUTH_SOCK`. A keyboard-interactive prompt appears on the settings card and expires after 60 seconds.
+- **SSH config import**: importing `~/.ssh/config` follows `Include` and reports skipped wildcard, Match, duplicate, and missing-include blocks.
+- **Host groups and cluster commands**: hosts can be grouped by environment or tag and tested together. `remote_cluster` runs one command across the hosts that match an environment, tags, and aliases, with up to 8 workers by default.
+- **Compact host table**: `remote_hosts` gives the model a markdown table. Passwords, keys, and proxy commands are omitted.
+- **Idle sessions**: a pooled SSH connection closes after 30 minutes without use. A tunnel or a running command keeps its connection.
+- **Command reconnect**: a command that loses the connection before any output is tried up to three times. Output that already started, a command timeout, and `idempotent: false` are not retried.
+- **Dedicated terminal**: each terminal opens its own SSH connection and closes it with the session.
+- **Terminal font**: `terminalFontFamily` changes the terminal face. Characters that could alter the stylesheet are rejected.
+- **Quieter polling**: the settings card waits while the browser tab is hidden and does not overlap status requests.
+- **Browser file transfer**: a file can be uploaded or downloaded with byte progress and cancel. The limit is 512MB. An upload replaces the remote file only after the temporary upload finishes.
+- **Center workspace**: a sidebar button opens hosts, terminal, files, containers, tunnels, and cluster in the center column. Leaving for chat hides the column and keeps the terminal buffer.
+
+## 0.3.8
+
+### Fixed
+- **Connection test payload**: the Test button posts the profile fields, so the route receives `host` and can open SSH. (Refs: #52)
+- **Loopback-only plugin update**: `POST` update accepts a loopback same-origin request with the update header. A private-network address alone is not trusted. (Refs: #53)
+- **Design contract stays internal**: `docs/design/DESIGN.md` is no longer included in the npm package or the public GitHub tree. (Refs: #54)
+- **Visible action errors**: save, delete, activation, directory browse, and tunnel stop show the server error in an alert. (Refs: #55)
+- **Connection badge**: the card header reads `/dsh-remote-workspace/state` and no longer shows a permanent Ready label. (Refs: #56)
+- **Shared chevron**: the header uses `IconChevronDownOutline14` when the primitives package provides it. (Refs: #57)
+- **Settings modules**: profile, sync, and tunnel cards are separate client modules. (Refs: #58)
+- **Tarball ignore**: `.gitignore` matches `*.tgz` without surrounding spaces. (Refs: #59)
+- **Localized plugin-list label**: the list title comes from the English and Chinese dictionaries. (Refs: #60)
+- **Updater version**: the row shows the installed version from the status response, or "Version unknown". It no longer prints a hardcoded `0.3.1`. (Refs: #61)
+
+## 0.3.7
+
+### Fixed
+- **Clean npm pack output**: Suppressed compilation progress to stderr in `scripts/build-client.mjs`, ensuring `npm pack --dry-run --json` parses cleanly without JSON syntax errors. (Refs: #28)
+- **File browsing API contract**: Resolved `remoteFs.list` method mismatch in `/browse` endpoint to use `remoteFs.listDir`, added backwards-compatible `RemoteFsService.prototype.list` alias, returned both `entries` and `items` along with `currentPath`, and supported inline draft profiles from settings modals. (Refs: #24)
+- **Terminal session argument passing**: Fixed `POST /terminal/create` to pass `{ cols, rows }` options object to `createTerminalSession`, added positional parameter fallback in `SshService`, and added active profile fallback. (Refs: #29)
+- **Shell metacharacter sanitization in tar sync**: Implemented POSIX `shellQuote` escaping in `TarSyncService` for all `remoteDir` paths, preventing command injection in `tar` and `mkdir` execution, with non-empty input validation. (Refs: #26)
+- **Binary data integrity in mirror sync**: Handled file synchronizations with raw `Buffer` streams instead of forced `utf8` strings, preventing binary corruption of assets (images, archives, compiled artifacts), and added `.dsh-sync-snapshot.json` to default ignore list. (Refs: #27)
+- **Performance in mirror sync push**: Deduplicated redundant sequential `mkdir -p` SSH executions during `push` operations via parent directory tracking Set. (Refs: #30)
+- **CSRF loopback protection**: Eliminated loopback bypass in `isTrustedSettingsRequest` by rejecting requests where `Sec-Fetch-Site !== 'same-origin'`, and validating `Origin` against request `Host`. (Refs: #25)
+- **Authorization token validation**: Enforced strict comparison of incoming Bearer and cookie tokens against configured server auth token (`DSH_AUTH_TOKEN` / `DSH_TOKEN`), rejecting arbitrary tokens and substrings from untrusted sources. (Refs: #32)
+- **GET endpoints source authorization & credential masking**: Enforced `isTrustedSettingsRequest` across 5 sensitive read endpoints (`/state`, `/health`, `/docker/list`, `/terminal/stream`, `/tunnels/telemetry`), and added fallback credential masking (`••••••••`) when vault service is not configured. (Refs: #31)
+
+## 0.3.6
+
+### Fixed
+- **Object-root JSON Schema for all remote tools**: Wrapped all 9 tool registrations (`remote_exec`, `remote_fs`, `remote_sync`, `remote_tunnel`, `remote_docker`, `remote_service`, `remote_transfer`, `remote_diagnose`, `remote_env`) with canonical `defineTool()` from `@deepseek-ai/dsh-tools`. Parameters are now compiled into standard JSON Schema objects with root `type: "object"`, preventing rejection by OpenAI-compatible LLM providers (`schema must be a JSON Schema of 'type: "object"', got 'type: null'`). Output schema standardized with `additionalProperties: true`. (Refs: #33)
+
+## 0.3.5
+
+### Fixed
+- **Settings reachable again on the plugin's own page**: the current DSH core
+  (0.1.6-alpha.2) renders a plugin's configuration page only for entries registered
+  in the plugin-list seat `plugins.item`. The view-aware card is now registered there
+  (`id: 'dsh-remote-workspace'`, order 60, static label); the row seat and the legacy
+  `settings.plugin.item` card stay as fallbacks. Sources edited in `src/client/entry.js`,
+  `lib/client.js` regenerated.
+
+## 0.3.4
+
+### Fixed
+- **Settings reachable again**: the card registered into `settings.plugin.item`, a
+  slot the current DSH core (0.1.6-alpha.2) no longer renders, so the plugin's
+  settings were unreachable. The surface now registers into the Plugins page row
+  seat `plugins.row.config` first, keyed
+  `@goodandready/dsh-remote-workspace#dsh-remote-workspace`
+  (`rowConfigKey(package, rowId)`): the plugin's row gains a configure control whose
+  page is the settings form (`view: 'page'`, open and without our card chrome — the
+  host page draws the title, icon, crumb and padding) plus a one-line state for
+  `view: 'summary'`. The legacy seat stays registered as a fallback for older cores.
+- The change lives in `src/client/*` and the build prefix; `lib/client.js` is
+  regenerated by `npm run build:client` (also run by `npm test`).
+
+### Added
+- This changelog.

package/lib/alert-service.js

@@ -4,10 +4,11 @@ export class AlertService {
    * @param {import('./health-service.js').HealthService} healthService
    * @param {import('./docker-service.js').DockerService} dockerService
    */
-  constructor(ctx, healthService, dockerService) {
+  constructor(ctx, healthService, dockerService, profileResolver = null) {
     this.ctx = ctx;
     this.healthService = healthService;
     this.dockerService = dockerService;
+    this.profileResolver = typeof profileResolver === 'function' ? profileResolver : null;
     /** @type {NodeJS.Timeout|null} */
     this.timer = null;
     /** @type {Array<any>} */
@@ -16,11 +17,21 @@ export class AlertService {
     this.enabled = false;
   }
 
-  start(intervalMs = 300000) {
+  setProfileResolver(fn) {
+    this.profileResolver = typeof fn === 'function' ? fn : null;
+  }
+
+  start(intervalMs = 300000, profileResolver = null) {
     this.stop();
+    if (typeof profileResolver === 'function') {
+      this.profileResolver = profileResolver;
+    }
     this.checkIntervalMs = intervalMs;
     this.enabled = true;
-    this.timer = setInterval(() => this.check(), this.checkIntervalMs);
+    this.timer = setInterval(() => {
+      this.check().catch(() => {});
+    }, this.checkIntervalMs);
+    this.timer?.unref?.();
   }
 
   stop() {
@@ -34,8 +45,10 @@ export class AlertService {
   /**
    * Run single alert check across active profile
    */
-  async check(profile) {
-    if (!profile) return [];
+  async check(profile = null) {
+    const target = profile || (typeof this.profileResolver === 'function' ? this.profileResolver() : null);
+    if (!target) return [];
+    profile = target;
 
     const alerts = [];
     try {

package/lib/client.js

@@ -34,23 +34,23 @@ window.__ModuleLoader__.load({
 .drw-grid-4{display:grid;grid-template-columns:repeat(auto-fit, minmax(190px, 1fr));gap:10px}
 
 .drw-badge{font-size:11px;padding:3px 9px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);display:inline-flex;align-items:center;gap:5px;font-weight:500;font-family:monospace}
-.drw-badge-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:var(--dsw-alias-state-success-bg, var(--dsw-alias-bg-layer-2))}
-.drw-badge-warn{border-color:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);background:var(--dsw-alias-state-warning-bg, var(--dsw-alias-bg-layer-2))}
-.drw-badge-err{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:var(--dsw-alias-state-error-bg, var(--dsw-alias-bg-layer-2))}
+.drw-badge-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:var(--dsw-alias-state-success-secondary, var(--dsw-alias-bg-layer-2))}
+.drw-badge-warn{border-color:var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);background:var(--dsw-alias-state-warn-secondary, var(--dsw-alias-bg-layer-2))}
+.drw-badge-err{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:var(--dsw-alias-state-error-secondary, var(--dsw-alias-bg-layer-2))}
 
 .drw-input{height:34px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 10px;font-size:13px;width:100%;box-sizing:border-box}
-.drw-input:focus{outline:none;border-color:var(--dsw-alias-state-brand-primary)}
+.drw-input:focus{outline:none;border-color:var(--dsw-alias-brand-primary, var(--dsw-alias-border-brand))}
 .drw-label{font-size:12px;font-weight:500;color:var(--dsw-alias-label-secondary);margin-bottom:2px}
 .drw-hint{font-size:11px;color:var(--dsw-alias-label-dimmed, var(--dsw-alias-label-secondary));line-height:1.3}
 .drw-field{display:flex;flex-direction:column;gap:3px;flex:1;min-width:180px}
 
 .drw-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:6px 12px;font-size:13px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-weight:500;display:inline-flex;align-items:center;justify-content:center;gap:6px;transition:all .15s ease}
-.drw-btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-4, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}
+.drw-btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}
 .drw-btn:disabled{opacity:0.6;cursor:not-allowed}
 .drw-btn-primary{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3);border-color:transparent}
 .drw-btn-primary:hover:not(:disabled){opacity:0.9}
-.drw-btn-danger{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-border, var(--dsw-alias-border-l2))}
-.drw-btn-danger:hover:not(:disabled){background:var(--dsw-alias-state-error-bg, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-state-error-border, var(--dsw-alias-border-l2))}
+.drw-btn-danger{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-secondary, var(--dsw-alias-border-l2))}
+.drw-btn-danger:hover:not(:disabled){background:var(--dsw-alias-state-error-secondary, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-state-error-secondary, var(--dsw-alias-border-l2))}
 
 .drw-segmented{display:inline-flex;border-radius:8px;padding:2px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);gap:2px}
 .drw-segmented-item{appearance:none;border:none;background:none;cursor:pointer;padding:5px 12px;font-size:12px;font-weight:500;border-radius:6px;color:var(--dsw-alias-label-secondary);transition:all .15s ease}
@@ -73,14 +73,14 @@ window.__ModuleLoader__.load({
 
 .drw-tabs{display:flex;gap:6px;border-bottom:1px solid var(--dsw-alias-border-l2);padding-bottom:10px;margin-bottom:14px;overflow-x:auto}
 .drw-tab-btn{appearance:none;border:1px solid transparent;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary);padding:6px 14px;border-radius:8px;font-size:13px;font-weight:600;cursor:pointer;display:inline-flex;align-items:center;gap:6px;transition:all .15s ease}
-.drw-tab-btn:hover{background:var(--dsw-alias-bg-layer-4);color:var(--dsw-alias-label-primary)}
-.drw-tab-btn.active{background:var(--dsw-alias-bg-layer-4);border-color:var(--dsw-alias-state-brand-primary);color:var(--dsw-alias-state-brand-primary)}
+.drw-tab-btn:hover{background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary)}
+.drw-tab-btn.active{background:var(--dsw-alias-bg-layer-3);border-color:var(--dsw-alias-brand-primary, var(--dsw-alias-border-brand));color:var(--dsw-alias-brand-primary)}
 
 .drw-term-window{background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:10px;display:flex;flex-direction:column;height:340px;overflow:hidden;box-shadow:0 4px 14px var(--dsw-alias-border-l1)}
 .drw-term-header{background:var(--dsw-alias-bg-layer-2);padding:6px 12px;display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid var(--dsw-alias-border-l2);font-size:12px;color:var(--dsw-alias-label-secondary);font-family:var(--drw-terminal-font,monospace)}
 .drw-term-body{flex:1;padding:10px 12px;overflow-y:auto;font-family:var(--drw-terminal-font,ui-monospace,SFMono-Regular,Consolas,monospace);font-size:12.5px;line-height:1.45;color:var(--dsw-alias-label-primary);white-space:pre-wrap;word-break:break-all}
 .drw-term-footer{display:flex;background:var(--dsw-alias-bg-layer-2);border-top:1px solid var(--dsw-alias-border-l2);padding:6px}
-.drw-term-input{flex:1;background:transparent;border:none;color:var(--dsw-alias-link-primary, var(--dsw-alias-label-primary));font-family:var(--drw-terminal-font,monospace);font-size:13px;padding:4px 8px;outline:none}
+.drw-term-input{flex:1;background:transparent;border:none;color:var(--dsw-alias-link, var(--dsw-alias-label-primary));font-family:var(--drw-terminal-font,monospace);font-size:13px;padding:4px 8px;outline:none}
 
 .drw-explorer-box{border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-2);padding:12px;display:flex;flex-direction:column;gap:10px}
 .drw-explorer-nav{display:flex;align-items:center;gap:8px;font-family:monospace;font-size:12px;background:var(--dsw-alias-bg-layer-1);padding:6px 10px;border-radius:6px;border:1px solid var(--dsw-alias-border-l2)}
@@ -89,7 +89,7 @@ window.__ModuleLoader__.load({
 .drw-file-row:hover{background:var(--dsw-alias-bg-layer-3)}
 .drw-file-meta{display:flex;align-items:center;gap:12px;color:var(--dsw-alias-label-secondary);font-size:11.5px}
 
-.drw-modal-overlay{position:fixed;inset:0;background:var(--dsw-alias-mask, var(--dsw-alias-bg-layer-1));z-index:9999;display:flex;align-items:center;justify-content:center;padding:20px}
+.drw-modal-overlay{position:fixed;inset:0;background:var(--dsw-alias-bg-mask-1, var(--dsw-alias-bg-layer-1));z-index:9999;display:flex;align-items:center;justify-content:center;padding:20px}
 .drw-modal-dialog{background:var(--dsw-alias-bg-layer-3);border:1px solid var(--dsw-alias-border-l2);border-radius:12px;width:100%;max-width:800px;max-height:85vh;display:flex;flex-direction:column;overflow:hidden;box-shadow:0 12px 32px var(--dsw-alias-border-l1)}
 .drw-modal-hdr{padding:12px 16px;border-bottom:1px solid var(--dsw-alias-border-l2);display:flex;align-items:center;justify-content:space-between;font-weight:600}
 .drw-modal-body{flex:1;padding:12px 16px;overflow-y:auto}
@@ -105,8 +105,8 @@ window.__ModuleLoader__.load({
 .drw-env-table{width:100%;border-collapse:collapse}
 .drw-env-row{display:grid;grid-template-columns:220px 1fr 90px;gap:8px;padding:6px 0;align-items:center;border-bottom:1px solid var(--dsw-alias-border-l2)}
 .drw-alert-badge{padding:4px 8px;border-radius:6px;font-size:11px;font-family:monospace;display:flex;align-items:center;gap:6px}
-.drw-alert-critical{background:var(--dsw-alias-state-error-bg, var(--dsw-alias-bg-layer-2));color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-border, var(--dsw-alias-border-l2))}
-.drw-alert-warning{background:var(--dsw-alias-state-warning-bg, var(--dsw-alias-bg-layer-2));color:var(--dsw-alias-state-warning-primary);border:1px solid var(--dsw-alias-state-warning-border, var(--dsw-alias-border-l2))}
+.drw-alert-critical{background:var(--dsw-alias-state-error-secondary, var(--dsw-alias-bg-layer-2));color:var(--dsw-alias-state-error-primary);border:1px solid var(--dsw-alias-state-error-secondary, var(--dsw-alias-border-l2))}
+.drw-alert-warning{background:var(--dsw-alias-state-warn-secondary, var(--dsw-alias-bg-layer-2));color:var(--dsw-alias-state-warn-primary);border:1px solid var(--dsw-alias-state-warn-secondary, var(--dsw-alias-border-l2))}
 
 
 .drw-ws{min-height:100%;box-sizing:border-box;color:var(--dsw-alias-label-primary)}
@@ -1029,7 +1029,7 @@ html[data-drw-active] [data-pane=conversation] > *:not([data-drw-view]),html[dat
             ? React.createElement(
                 'form',
                 { className: 'drw-term-footer', onSubmit: sendCommand },
-                React.createElement('span', { style: { color: 'var(--dsw-alias-link-primary)', padding: '4px 6px', fontFamily: 'inherit' } }, '$'),
+                React.createElement('span', { style: { color: 'var(--dsw-alias-link, var(--dsw-alias-label-primary))', padding: '4px 6px', fontFamily: 'inherit' } }, '$'),
                 React.createElement('input', {
                   className: 'drw-term-input',
                   type: 'text',
@@ -1249,7 +1249,7 @@ html[data-drw-active] [data-pane=conversation] > *:not([data-drw-view]),html[dat
             '⬆️ Up'
           ),
           React.createElement('span', { style: { color: 'var(--dsw-alias-label-secondary)' } }, 'Path:'),
-          React.createElement('span', { style: { fontWeight: 600, color: 'var(--dsw-alias-state-brand-primary)' } }, currentPath)
+          React.createElement('span', { style: { fontWeight: 600, color: 'var(--dsw-alias-brand-primary, var(--dsw-alias-label-primary))' } }, currentPath)
         ),
         React.createElement(
           'div',
@@ -2839,10 +2839,10 @@ function shouldPoll({ hidden = false, inFlight = false } = {}) {
             null,
             React.createElement('span', { style: { fontWeight: 500 } }, (updateStatus?.currentVersion ? 'v' + updateStatus.currentVersion : t('versionUnknown'))),
             updateStatus?.updateAvailable
-              ? React.createElement('span', { style: { marginLeft: '8px', color: 'var(--dsw-alias-state-warning-text)' } }, '→ v' + updateStatus.latestVersion)
+              ? React.createElement('span', { style: { marginLeft: '8px', color: 'var(--dsw-alias-state-warn-primary, #f59e0b)' } }, '→ v' + updateStatus.latestVersion)
               : null,
             msg
-              ? React.createElement('div', { style: { fontSize: '11px', marginTop: '3px', color: msg.ok ? 'var(--dsw-alias-state-success-text)' : 'var(--dsw-alias-state-error-text)' } }, msg.text)
+              ? React.createElement('div', { style: { fontSize: '11px', marginTop: '3px', color: msg.ok ? 'var(--dsw-alias-state-success-primary, #22c55e)' : 'var(--dsw-alias-state-error-primary, #ef4444)' } }, msg.text)
               : null
           )
         ),

package/lib/env-service.js

@@ -73,7 +73,12 @@ export class EnvService {
    * Set or update variable in remote .env file atomically
    */
   async setEnvVar(profile, filePath, key, value) {
-    if (!key || typeof key !== 'string') throw new Error('Key must be non-empty string');
+    const VALID_KEY_REGEX = /^[A-Za-z_][A-Za-z0-9_]*$/;
+    if (!key || typeof key !== 'string' || !VALID_KEY_REGEX.test(key.trim())) {
+      throw new Error(`Invalid environment variable key: "${key}". Key must match /^[A-Za-z_][A-Za-z0-9_]*$/ and contain no newlines or delimiters.`);
+    }
+    const cleanKey = key.trim();
+    const strVal = String(value ?? '');
 
     let currentContent = '';
     try {
@@ -86,14 +91,19 @@ export class EnvService {
     let updated = false;
     const newLines = [];
 
+    const formatValue = (v) => {
+      if (v.includes(' ') || v.includes('\n') || v.includes('"') || v.includes('=')) {
+        return `"${v.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\r/g, '\\r').replace(/\n/g, '\\n')}"`;
+      }
+      return v;
+    };
+
     for (const line of lines) {
       const trimmed = line.trim();
       if (!trimmed.startsWith('#') && trimmed.includes('=')) {
         const k = trimmed.slice(0, trimmed.indexOf('=')).trim();
-        if (k === key) {
-          // Quote if contains spaces or special symbols
-          const formattedVal = (value.includes(' ') || value.includes('\n')) ? `"${value}"` : value;
-          newLines.push(`${key}=${formattedVal}`);
+        if (k === cleanKey) {
+          newLines.push(`${cleanKey}=${formatValue(strVal)}`);
           updated = true;
           continue;
         }
@@ -102,11 +112,10 @@ export class EnvService {
     }
 
     if (!updated) {
-      const formattedVal = (value.includes(' ') || value.includes('\n')) ? `"${value}"` : value;
       if (newLines.length > 0 && newLines[newLines.length - 1].trim() !== '') {
         newLines.push('');
       }
-      newLines.push(`${key}=${formattedVal}`);
+      newLines.push(`${cleanKey}=${formatValue(strVal)}`);
     }
 
     const finalContent = newLines.join('\n');
@@ -115,7 +124,7 @@ export class EnvService {
     return {
       ok: true,
       filePath,
-      key,
+      key: cleanKey,
       updated
     };
   }

package/lib/file-transfer.js

@@ -1,12 +1,5 @@
 const MAX_BYTES = 512 * 1024 * 1024;
 
-export function transferPercent(loaded, total) {
-  const done = Number(loaded) || 0;
-  const size = Number(total) || 0;
-  if (size <= 0) return 0;
-  return Math.max(0, Math.min(100, Math.round((done / size) * 100)));
-}
-
 export function attachmentName(filePath) {
   const base = String(filePath || '').split('/').filter(Boolean).pop() || 'download';
   const clean = base.replace(/[\r\n"\\]/g, '');

package/lib/host-projection.js

@@ -36,7 +36,3 @@ export function renderHostTable(profiles) {
   return [header, ...lines].join('\n');
 }
 
-export function hostProjectionLeaks(value) {
-  const text = typeof value === 'string' ? value : JSON.stringify(value);
-  return SECRET.some((key) => text.includes(key));
-}

package/lib/index.js

@@ -71,7 +71,7 @@ export const Config = z.object({
 });
 
 export function apply(ctx, config = {}) {
-  const cfg = config || {};
+  const cfg = plainConfig(config || {});
   let settingsApi = null;
   let currentConfig = {
     profiles: Array.isArray(cfg.profiles) ? cfg.profiles : [],
@@ -91,6 +91,11 @@ export function apply(ctx, config = {}) {
   const dockerService = new DockerService(sshService);
   const healthService = new HealthService(sshService);
   const watcherService = new WatcherService();
+  watcherService.setOnSync(({ profileId, syncRes }) => {
+    if (ctx && typeof ctx.emit === 'function') {
+      ctx.emit('remote-workspace/sync', { profileId, syncRes });
+    }
+  });
   const tarSyncService = new TarSyncService(sshService);
   const diagnoseService = new DiagnoseService(sshService);
   const envService = new EnvService(remoteFs);
@@ -117,7 +122,7 @@ export function apply(ctx, config = {}) {
   const persistConfig = async (actionLabel) => {
     if (settingsApi?.replace) {
       try {
-        await settingsApi.replace(Config(currentConfig));
+        await settingsApi.replace(plainConfig(Config(currentConfig)));
       } catch (err) {
         if (ctx.logger?.warn) {
           ctx.logger.warn(`[dsh-remote-workspace] Failed to persist config after ${actionLabel}: ${err.message}`);
@@ -143,6 +148,13 @@ export function apply(ctx, config = {}) {
       return p ? vaultService.hydrateProfile(p) : undefined;
     },
     isAutoSyncEnabled() { return Boolean(currentConfig.autoSyncActive); },
+    isAlertMonitoringEnabled() { return Boolean(currentConfig.alertMonitoringActive); },
+    async setAlertMonitoringEnabled(enabled) {
+      currentConfig.alertMonitoringActive = Boolean(enabled);
+      if (enabled) alertService.start();
+      else alertService.stop();
+      await persistConfig('update');
+    },
     getTerminalFont() { return currentConfig.terminalFontFamily || ''; },
     async setTerminalFont(fontFamily) {
       currentConfig.terminalFontFamily = normalizeTerminalFont(fontFamily);
@@ -237,12 +249,19 @@ export function apply(ctx, config = {}) {
     }
   };
 
+  alertService.setProfileResolver(() => store.getActiveProfile());
+
   // If autoSync was enabled on restart, resume watcher for active profile
   if (currentConfig.autoSyncActive && currentConfig.activeProfileId) {
     const active = store.getActiveProfile();
     if (active) watcherService.start(active, mirrorSync);
   }
 
+  // If alert monitoring was enabled on restart, start alertService
+  if (currentConfig.alertMonitoringActive) {
+    alertService.start();
+  }
+
 
 
   // Register settings namespace if settings service is available
@@ -258,7 +277,11 @@ export function apply(ctx, config = {}) {
         if (Array.isArray(snap.profiles)) currentConfig.profiles = snap.profiles;
         if (snap.activeProfileId !== undefined) currentConfig.activeProfileId = snap.activeProfileId;
         if (snap.autoSyncActive !== undefined) currentConfig.autoSyncActive = snap.autoSyncActive;
-        if (snap.alertMonitoringActive !== undefined) currentConfig.alertMonitoringActive = snap.alertMonitoringActive;
+        if (snap.alertMonitoringActive !== undefined) {
+          currentConfig.alertMonitoringActive = snap.alertMonitoringActive;
+          if (snap.alertMonitoringActive) alertService.start();
+          else alertService.stop();
+        }
       }
     } else if (typeof settingsService.configure === 'function') {
       try {

package/lib/mirror-sync-service.js

@@ -211,6 +211,26 @@ export class MirrorSyncService {
         continue; // Unchanged locally
       }
 
+      // 3-way conflict detection: if not forcing, check if remote was modified independently
+      if (!force && baseHash) {
+        let remoteContent = null;
+        let remoteHash = null;
+        try {
+          remoteContent = await this.remoteFs.readFile(profile, remoteFull, null);
+          remoteHash = this.computeHash(remoteContent);
+        } catch (_) {
+          // File does not exist remotely, safe to push
+        }
+
+        if (remoteHash && remoteHash !== baseHash && remoteHash !== localHash) {
+          conflicts.push({
+            path: rel,
+            reason: 'Modified on both remote and local'
+          });
+          continue; // Do not overwrite without force
+        }
+      }
+
       if (!dryRun) {
         const parent = path.posix.dirname(remoteFull);
         if (!createdDirs.has(parent)) {
@@ -233,7 +253,7 @@ export class MirrorSyncService {
     }
 
     return {
-      success: true,
+      success: conflicts.length === 0,
       pushed,
       conflicts,
       dryRun

package/lib/proxy-command.js

@@ -3,20 +3,52 @@ import { Duplex } from 'node:stream';
 
 const TOKEN = /%[%hprn]/g;
 
+/**
+ * Validate that a ProxyCommand template does not contain dangerous shell chaining or redirection metacharacters.
+ * @param {string} template
+ */
+export function validateProxyCommandTemplate(template) {
+  if (!template || typeof template !== 'string') return;
+  const trimmed = template.trim();
+  if (!trimmed) return;
+  if (/[\n\r;&|`$><]/.test(trimmed)) {
+    const err = new Error('ProxyCommand must not contain shell chaining or interpolation metacharacters (;, &, |, `, $, >, <, newlines)');
+    err.statusCode = 400;
+    throw err;
+  }
+}
+
+/**
+ * Shell-quote a token value for safe interpolation into ProxyCommand.
+ * @param {any} arg
+ */
+export function shellQuoteToken(arg) {
+  if (arg === '' || arg === undefined || arg === null) return "''";
+  const str = String(arg);
+  if (/^[A-Za-z0-9_.:-]+$/.test(str)) {
+    return str;
+  }
+  return `'${str.replace(/'/g, "'\\''")}'`;
+}
+
 /**
  * Expand OpenSSH ProxyCommand tokens. %% stays a literal percent.
  * @param {string} template
  * @param {{ host?: string, port?: number|string, user?: string, alias?: string }} tokens
  */
 export function expandProxyCommand(template, tokens = {}) {
+  if (!template || typeof template !== 'string') return '';
+  validateProxyCommandTemplate(template);
+
+  const safePort = String(parseInt(tokens.port, 10) || (tokens.port ? String(tokens.port).replace(/\D/g, '') : '22'));
   const map = {
-    '%h': String(tokens.host ?? ''),
-    '%p': String(tokens.port ?? ''),
-    '%r': String(tokens.user ?? ''),
-    '%n': String(tokens.alias ?? ''),
+    '%h': shellQuoteToken(tokens.host),
+    '%p': safePort,
+    '%r': shellQuoteToken(tokens.user),
+    '%n': shellQuoteToken(tokens.alias),
     '%%': '%'
   };
-  return String(template ?? '').replace(TOKEN, (token) => (token in map ? map[token] : token));
+  return String(template).replace(TOKEN, (token) => (token in map ? map[token] : token));
 }
 
 /**
@@ -25,6 +57,13 @@ export function expandProxyCommand(template, tokens = {}) {
  * @param {string} command
  */
 export function openProxyCommand(command) {
+  if (!command || typeof command !== 'string' || !command.trim()) {
+    throw new Error('ProxyCommand must be a non-empty string');
+  }
+  if (/[\n\r]/.test(command)) {
+    throw new Error('ProxyCommand must not contain newlines');
+  }
+
   const windows = process.platform === 'win32';
   const shell = windows ? (process.env.ComSpec || 'cmd.exe') : (process.env.SHELL || '/bin/sh');
   const args = windows ? ['/d', '/s', '/c', command] : ['-c', command];

package/lib/remote-fs-service.js

@@ -25,11 +25,22 @@ export class RemoteFsService {
       this.cache.clear();
       return;
     }
-    const prefix = subPath ? `${profileId}:` : `${profileId}:`;
+    const prefix = `${profileId}:`;
     for (const key of this.cache.keys()) {
       if (key.startsWith(prefix)) {
-        if (!subPath || key.includes(subPath)) {
+        if (!subPath) {
           this.cache.delete(key);
+        } else {
+          const secondColon = key.indexOf(':', prefix.length);
+          if (secondColon !== -1) {
+            const cachedPath = key.slice(secondColon + 1);
+            const normSub = path.posix.normalize(subPath);
+            const normCached = path.posix.normalize(cachedPath);
+            const subPrefix = normSub.endsWith('/') ? normSub : normSub + '/';
+            if (normCached === normSub || normCached.startsWith(subPrefix)) {
+              this.cache.delete(key);
+            }
+          }
         }
       }
     }
@@ -100,17 +111,34 @@ export class RemoteFsService {
   /**
    * Read file content with buffer/string conversion
    */
-  async readFile(profile, remotePath, encoding = 'utf8') {
+  async readFile(profile, remotePath, encoding = 'utf8', maxBytes = 20 * 1024 * 1024) {
     const sftp = await this.sshService.getSftp(profile);
     return new Promise((resolve, reject) => {
       const chunks = [];
+      let totalBytes = 0;
+      let destroyed = false;
       const stream = sftp.createReadStream(remotePath);
-      stream.on('data', (chunk) => chunks.push(chunk));
+      stream.on('data', (chunk) => {
+        if (destroyed) return;
+        totalBytes += chunk.length;
+        if (totalBytes > maxBytes) {
+          destroyed = true;
+          try { stream.destroy(); } catch (_err) { /* ignore best-effort stream cleanup */ }
+          const err = new Error(`ERR_FILE_TOO_LARGE: File size exceeds maximum allowed buffer of ${maxBytes / (1024 * 1024)}MB: ${remotePath}`);
+          err.code = 'ERR_FILE_TOO_LARGE';
+          return reject(err);
+        }
+        chunks.push(chunk);
+      });
       stream.on('end', () => {
+        if (destroyed) return;
         const buf = Buffer.concat(chunks);
         resolve(encoding ? buf.toString(encoding) : buf);
       });
-      stream.on('error', (err) => reject(err));
+      stream.on('error', (err) => {
+        if (destroyed) return;
+        reject(err);
+      });
     });
   }
 

package/lib/routes/docker.js

@@ -1,4 +1,4 @@
-import { writeJson, readBody, isTrustedSettingsRequest, authorizeRequest } from './helpers.js';
+import { writeJson, readBody, authorizeRequest } from './helpers.js';
 
 export function registerDockerRoutes(sctx, webServer, { dockerService, healthService, store }) {
   // 21. GET /dsh-remote-workspace/health