Merge pull request #358 from AgentWorkforce/publish-edits

khaliqgant · web-flow · commit 821a695dd306 · 2026-02-02T13:41:13.000+01:00
dashboard binary logic
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -165,10 +165,13 @@ jobs:
       - name: Build standalone binary
         run: |
           mkdir -p release-binaries
+          # Exclude native modules - bun runtime has built-in bun:sqlite
           bun build \
             --compile \
             --minify \
             --target=${{ matrix.target }} \
+            --external=better-sqlite3 \
+            --external=ssh2 \
             --define="process.env.AGENT_RELAY_VERSION=\"${{ steps.version.outputs.version }}\"" \
             ./dist/src/cli/index.js \
             --outfile release-binaries/${{ matrix.binary_name }}
diff --git a/install.sh b/install.sh
@@ -107,6 +107,89 @@ download_relay_pty() {
     fi
 }
 
+# Download standalone dashboard-server binary
+download_dashboard_binary() {
+    if [ "${AGENT_RELAY_NO_DASHBOARD}" = "true" ]; then
+        info "Skipping dashboard installation (AGENT_RELAY_NO_DASHBOARD=true)"
+        return 0
+    fi
+
+    step "Downloading dashboard-server binary..."
+
+    local binary_name="relay-dashboard-server-${PLATFORM}"
+    local compressed_url="https://github.com/$REPO_DASHBOARD/releases/latest/download/${binary_name}.gz"
+    local uncompressed_url="https://github.com/$REPO_DASHBOARD/releases/latest/download/${binary_name}"
+    local target_path="$BIN_DIR/relay-dashboard-server"
+    local temp_file="/tmp/dashboard-download-$$"
+
+    mkdir -p "$BIN_DIR"
+
+    # Setup cleanup trap for temp files
+    trap 'rm -f "${temp_file}.gz" "${temp_file}"' EXIT
+
+    # Try compressed binary first (faster download)
+    if has_command gunzip; then
+        info "Trying compressed dashboard binary..."
+
+        if curl -fsSL "$compressed_url" -o "${temp_file}.gz" 2>/dev/null; then
+            # Check if we got a valid gzip file
+            local is_gzip=false
+            if has_command file; then
+                file "${temp_file}.gz" 2>/dev/null | grep -q "gzip" && is_gzip=true
+            else
+                head -c 2 "${temp_file}.gz" 2>/dev/null | od -An -tx1 | grep -q "1f 8b" && is_gzip=true
+            fi
+
+            if [ "$is_gzip" = true ]; then
+                if gunzip -c "${temp_file}.gz" > "$target_path" 2>/dev/null; then
+                    rm -f "${temp_file}.gz"
+                    chmod +x "$target_path"
+
+                    if "$target_path" --version &>/dev/null; then
+                        success "Downloaded standalone dashboard-server binary"
+                        trap - EXIT
+                        return 0
+                    else
+                        warn "Dashboard binary failed verification, trying uncompressed..."
+                        rm -f "$target_path"
+                    fi
+                else
+                    rm -f "${temp_file}.gz" "$target_path"
+                fi
+            else
+                rm -f "${temp_file}.gz"
+            fi
+        fi
+    fi
+
+    # Fall back to uncompressed binary
+    info "Trying uncompressed dashboard binary..."
+
+    if curl -fsSL "$uncompressed_url" -o "$target_path" 2>/dev/null; then
+        local file_size
+        file_size=$(stat -f%z "$target_path" 2>/dev/null || stat -c%s "$target_path" 2>/dev/null || echo "0")
+
+        if [ "$file_size" -gt 1000000 ]; then
+            chmod +x "$target_path"
+
+            if "$target_path" --version &>/dev/null; then
+                success "Downloaded standalone dashboard-server binary"
+                trap - EXIT
+                return 0
+            else
+                warn "Dashboard binary failed verification"
+                rm -f "$target_path"
+            fi
+        else
+            rm -f "$target_path"
+        fi
+    fi
+
+    trap - EXIT
+    info "No standalone dashboard binary available for $PLATFORM"
+    return 1
+}
+
 # Check if a command exists
 has_command() {
     command -v "$1" &> /dev/null
@@ -286,8 +369,11 @@ Or use nvm: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/instal
 
     # Install dashboard if not skipped
     if [ "${AGENT_RELAY_NO_DASHBOARD}" != "true" ]; then
-        info "Installing dashboard..."
-        npm install -g @agent-relay/dashboard-server 2>/dev/null || true
+        # Try binary first, fall back to npm
+        if ! download_dashboard_binary; then
+            info "Installing dashboard via npm..."
+            npm install -g @agent-relay/dashboard-server 2>/dev/null || true
+        fi
     fi
 
     success "Installed via npm"
@@ -419,6 +505,8 @@ main() {
     if download_standalone_binary; then
         # Also download relay-pty binary if available
         download_relay_pty || true
+        # Download dashboard-server binary if available
+        download_dashboard_binary || true
         verify_installation && print_usage && exit 0
     fi
 
diff --git a/src/cli/commands/doctor.test.ts b/src/cli/commands/doctor.test.ts
@@ -6,8 +6,6 @@ import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
 let tempRoot: string;
 let dataDir: string;
 let storageConfig: { type?: string; path?: string };
-let betterAvailable = true;
-let nodeAvailable = true;
 let mockStore: Map<string, string>;
 
 // Store availability in an object to ensure closure works correctly across module resets
@@ -152,8 +150,6 @@ beforeEach(() => {
     path: path.join(dataDir, 'messages.sqlite'),
   };
   mockStore = new Map<string, string>();
-  betterAvailable = true;
-  nodeAvailable = true;
   mockAvailability.betterAvailable = true;
   mockAvailability.nodeAvailable = true;
   process.env.AGENT_RELAY_DOCTOR_NODE_VERSION = '22.1.0';
@@ -202,8 +198,6 @@ describe('doctor diagnostics', () => {
   });
 
   it('fails gracefully when no SQLite drivers are available', async () => {
-    betterAvailable = false;
-    nodeAvailable = false;
     mockAvailability.betterAvailable = false;
     mockAvailability.nodeAvailable = false;
     process.env.AGENT_RELAY_DOCTOR_NODE_SQLITE_AVAILABLE = '0';
diff --git a/src/cli/commands/doctor.ts b/src/cli/commands/doctor.ts
@@ -104,7 +104,7 @@ async function checkBetterSqlite3(): Promise<CheckResult> {
       ok: true,
       message: `Available (v${version})`,
     };
-  } catch (err: any) {
+  } catch {
     return {
       name: 'better-sqlite3',
       ok: false,
@@ -152,7 +152,7 @@ async function checkNodeSqlite(): Promise<CheckResult> {
       ok: true,
       message: `Available (Node ${nodeVersion.raw})`,
     };
-  } catch (err: any) {
+  } catch {
     return {
       name: 'node:sqlite',
       ok: false,
@@ -267,7 +267,7 @@ async function checkDbPermissions(
       ok: true,
       message: `${displayPath} (${mode}${sizeDisplay})`,
     };
-  } catch (err) {
+  } catch {
     return {
       name: 'Database file',
       ok: false,
@@ -368,7 +368,7 @@ async function checkWriteTest(
       ok: true,
       message: 'OK',
     };
-  } catch (err: any) {
+  } catch {
     db?.close?.();
     return {
       name: 'Write test',
@@ -434,7 +434,7 @@ async function checkReadTest(
       ok: true,
       message: 'OK',
     };
-  } catch (err: any) {
+  } catch {
     db?.close?.();
     return {
       name: 'Read test',
diff --git a/src/cli/index.test.ts b/src/cli/index.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeAll, afterAll, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import path from 'node:path';
diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -26,7 +26,6 @@ import { createStorageAdapter } from '@agent-relay/storage/adapter';
 import {
   initTelemetry,
   track,
-  isTelemetryEnabled,
   enableTelemetry,
   disableTelemetry,
   getStatus,
@@ -37,12 +36,53 @@ import fs from 'node:fs';
 import path from 'node:path';
 import readline from 'node:readline';
 import { promisify } from 'node:util';
-import { exec, spawn as spawnProcess } from 'node:child_process';
+import { exec, execSync, spawn as spawnProcess } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 
 
 /**
- * Start dashboard via npx (downloads and runs if not installed).
+ * Find the dashboard binary if installed as standalone.
+ * Checks PATH and common installation locations.
+ */
+function findDashboardBinary(): string | null {
+  const binaryName = 'relay-dashboard-server';
+  const homeDir = process.env.HOME || process.env.USERPROFILE || '';
+
+  // Common locations to check
+  const searchPaths = [
+    // In PATH (using which/where)
+    binaryName,
+    // Common installation directories
+    path.join(homeDir, '.local', 'bin', binaryName),
+    path.join(homeDir, '.agent-relay', 'bin', binaryName),
+    '/usr/local/bin/' + binaryName,
+  ];
+
+  for (const searchPath of searchPaths) {
+    try {
+      // For absolute paths, check if file exists and is executable
+      if (path.isAbsolute(searchPath)) {
+        if (fs.existsSync(searchPath)) {
+          fs.accessSync(searchPath, fs.constants.X_OK);
+          return searchPath;
+        }
+      } else {
+        // For relative paths (just binary name), check if it's in PATH
+        const result = execSync(`which ${searchPath} 2>/dev/null || where ${searchPath} 2>nul`, { encoding: 'utf8' }).trim();
+        if (result) {
+          return result.split('\n')[0]; // Take first result
+        }
+      }
+    } catch {
+      // Continue to next path
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Start dashboard (prefers standalone binary, falls back to npx).
  * Returns the spawned child process, port, and a promise that resolves when ready.
  */
 function startDashboardViaNpx(options: {
@@ -51,23 +91,34 @@ function startDashboardViaNpx(options: {
   teamDir: string;
   projectRoot: string;
 }): { process: ReturnType<typeof spawnProcess>; port: number; ready: Promise<void> } {
-  console.log('Starting dashboard via npx (this may take a moment on first run)...');
+  const dashboardBinary = findDashboardBinary();
 
-  const dashboardProcess = spawnProcess('npx', [
-    '--yes',
-    '@agent-relay/dashboard-server',
+  let dashboardProcess: ReturnType<typeof spawnProcess>;
+  const args = [
     '--integrated',
     '--port', String(options.port),
     '--data-dir', options.dataDir,
     '--team-dir', options.teamDir,
     '--project-root', options.projectRoot,
-  ], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-    env: {
-      ...process.env,
-      // Pass any additional env vars needed
-    },
-  });
+  ];
+
+  if (dashboardBinary) {
+    console.log(`Starting dashboard using binary: ${dashboardBinary}`);
+    dashboardProcess = spawnProcess(dashboardBinary, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env },
+    });
+  } else {
+    console.log('Starting dashboard via npx (this may take a moment on first run)...');
+    dashboardProcess = spawnProcess('npx', [
+      '--yes',
+      '@agent-relay/dashboard-server',
+      ...args,
+    ], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env },
+    });
+  }
 
   // Promise that resolves when dashboard is ready (or after timeout)
   let resolveReady: () => void;
@@ -2349,13 +2400,13 @@ program
 
     // Try daemon socket first (preferred path)
     try {
-        const paths = getProjectPaths();
+        const _paths = getProjectPaths();
 
       // TODO: Re-enable daemon-based spawning when client.spawn() is implemented
       // See: docs/SDK-MIGRATION-PLAN.md for planned implementation
       // For now, fall through to HTTP API
       throw new Error('Daemon-based spawn not yet implemented');
-    } catch (daemonErr) {
+    } catch {
       // Fall through to HTTP API
       // console.log('Daemon not available, trying HTTP API...');
     }
@@ -2404,10 +2455,10 @@ program
 
     // Try daemon socket first (preferred path)
     try {
-        const paths = getProjectPaths();
+        const _paths = getProjectPaths();
 
-      const client = new RelayClient({
-        socketPath: paths.socketPath,
+      const _client = new RelayClient({
+        socketPath: _paths.socketPath,
         agentName: '__cli_releaser__',
         quiet: true,
         reconnect: false,
@@ -2420,7 +2471,7 @@ program
       // See: docs/SDK-MIGRATION-PLAN.md for planned implementation
       // For now, fall through to HTTP API
       throw new Error('Daemon-based release not yet implemented');
-    } catch (daemonErr) {
+    } catch {
       // Fall through to HTTP API
       // console.log('Daemon not available, trying HTTP API...');
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { describe, it, expect, beforeAll, afterAll, vi, beforeEach, afterEach } from 'vitest';`
	`1`	`+import { describe, it, expect, beforeAll, afterAll } from 'vitest';`
`2`	`2`	`import { exec } from 'node:child_process';`
`3`	`3`	`import { promisify } from 'node:util';`
`4`	`4`	`import path from 'node:path';`