agent-relay 2.0.36 → 2.1.0

package/dist/src/cli/index.js

@@ -19,7 +19,8 @@ import { RelayClient } from '@agent-relay/sdk';
 import { RelayPtyOrchestrator, getTmuxPath } from '@agent-relay/wrapper';
 import { AgentSpawner, readWorkersMetadata, getWorkerLogsDir, selectShadowCli, ensureMcpPermissions } from '@agent-relay/bridge';
 import { generateAgentName, checkForUpdatesInBackground, checkForUpdates } from '@agent-relay/utils';
-import { getShadowForAgent } from '@agent-relay/config';
+import { getShadowForAgent, getProjectPaths, loadRuntimeConfig } from '@agent-relay/config';
+import { createStorageAdapter } from '@agent-relay/storage/adapter';
 import { initTelemetry, track, enableTelemetry, disableTelemetry, getStatus, isDisabledByEnv, } from '@agent-relay/telemetry';
 import { installMcpConfig } from '@agent-relay/mcp';
 import fs from 'node:fs';
@@ -392,6 +393,7 @@ program
     .description('Start daemon (use --dashboard to enable web dashboard)')
     .option('--dashboard', 'Enable web dashboard (disabled by default)')
     .option('--port <port>', 'Dashboard port (requires --dashboard)', DEFAULT_DASHBOARD_PORT)
+    .option('--storage <type>', 'Storage type: jsonl (default), sqlite, sqlite-batched, memory', 'jsonl')
     .option('--spawn', 'Force spawn all agents from teams.json')
     .option('--no-spawn', 'Do not auto-spawn agents (just start daemon)')
     .option('--watch', 'Auto-restart daemon on crash (supervisor mode)')
@@ -399,7 +401,6 @@ program
     .action(async (options) => {
     // If --watch is specified, run in supervisor mode
     if (options.watch) {
-        const { spawn } = await import('node:child_process');
         const maxRestarts = parseInt(options.maxRestarts, 10) || 5;
         const restartWindow = 60_000; // 60 seconds
         const restartTimes = [];
@@ -413,12 +414,14 @@ program
                 if (options.port)
                     args.push('--port', options.port);
             }
+            if (options.storage)
+                args.push('--storage', options.storage);
             if (options.spawn === true)
                 args.push('--spawn');
             if (options.spawn === false)
                 args.push('--no-spawn');
             console.log(`[supervisor] Starting daemon...`);
-            child = spawn(process.execPath, [process.argv[1], ...args], {
+            child = spawnProcess(process.execPath, [process.argv[1], ...args], {
                 stdio: 'inherit',
                 env: { ...process.env, AGENT_RELAY_SUPERVISED: '1' },
             });
@@ -458,7 +461,6 @@ program
     }
     const { ensureProjectDir } = await import('@agent-relay/config');
     const { loadTeamsConfig } = await import('@agent-relay/config');
-    const { AgentSpawner } = await import('@agent-relay/bridge');
     const paths = ensureProjectDir();
     const socketPath = paths.socketPath;
     const dbPath = paths.dbPath;
@@ -476,10 +478,14 @@ program
     if (teamsConfig) {
         console.log(`Team: ${teamsConfig.team} (${teamsConfig.agents.length} agents defined)`);
     }
+    // Determine storage type from CLI option (defaults to 'jsonl')
+    const storageType = options.storage || 'jsonl';
+    console.log(`Storage: ${storageType}`);
     const daemon = new Daemon({
         socketPath,
         pidFilePath,
         storagePath: dbPath,
+        storageConfig: { type: storageType },
         teamDir: paths.teamDir,
         // Enable protocol-based spawning via SPAWN/RELEASE messages
         spawnManager: {
@@ -553,6 +559,8 @@ program
                     dataDir: paths.dataDir,
                     teamDir: paths.teamDir,
                     projectRoot: paths.projectRoot,
+                    // Use the same database as the daemon for message persistence
+                    dbPath: paths.dbPath,
                     enableSpawner: true,
                     onMarkSpawning: (name) => daemon.markSpawning(name),
                     onClearSpawning: (name) => daemon.clearSpawning(name),
@@ -683,7 +691,6 @@ program
     .command('down')
     .description('Stop daemon')
     .action(async () => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const pidPath = pidFilePathForSocket(paths.socketPath);
     if (!fs.existsSync(pidPath)) {
@@ -708,8 +715,6 @@ const MEGA_SYSTEM_PROMPT = [
 ].join(' ');
 // Helper function for starting Dashboard coordinator with a specific provider
 async function startDashboardCoordinator(operator) {
-    const { spawn } = await import('node:child_process');
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     console.log(`Starting Dashboard with ${operator}...`);
     console.log(`Project: ${paths.projectRoot}`);
@@ -755,7 +760,7 @@ async function startDashboardCoordinator(operator) {
     }
     else {
         console.log('Starting daemon...');
-        const daemonProc = spawn(process.execPath, [process.argv[1], 'up', '--dashboard'], {
+        const daemonProc = spawnProcess(process.execPath, [process.argv[1], 'up', '--dashboard'], {
             stdio: 'ignore',
             detached: true,
         });
@@ -788,7 +793,7 @@ async function startDashboardCoordinator(operator) {
         : ['prpm', 'install', '@agent-relay/agent-relay-snippet'];
     try {
         await new Promise((resolve, reject) => {
-            const prpmProc = spawn('npx', prpmArgs, {
+            const prpmProc = spawnProcess('npx', prpmArgs, {
                 stdio: 'inherit',
             });
             prpmProc.on('close', (code) => {
@@ -821,7 +826,7 @@ async function startDashboardCoordinator(operator) {
     }
     // Use '--' to separate agent-relay options from the command + its args
     // Format: agent-relay create-agent -n Dashboard --skip-instructions --dashboard-port <port> -- claude --append-system-prompt "..."
-    const agentProc = spawn(process.execPath, [process.argv[1], 'create-agent', '-n', 'Dashboard', '--skip-instructions', '--dashboard-port', String(dashboardPort), '--', operator, ...cliArgs], { stdio: 'inherit' });
+    const agentProc = spawnProcess(process.execPath, [process.argv[1], 'create-agent', '-n', 'Dashboard', '--skip-instructions', '--dashboard-port', String(dashboardPort), '--', operator, ...cliArgs], { stdio: 'inherit' });
     // Forward signals to agent process
     process.on('SIGINT', () => {
         agentProc.kill('SIGINT');
@@ -852,7 +857,6 @@ program
     .command('status')
     .description('Check daemon status')
     .action(async () => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const relaySessions = await discoverRelaySessions();
     if (!fs.existsSync(paths.socketPath)) {
@@ -906,7 +910,6 @@ program
     .option('--remote', 'Include agents from other linked machines (requires cloud link)')
     .option('--json', 'Output as JSON')
     .action(async (options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const os = await import('node:os');
     const paths = getProjectPaths();
     const agentsPath = path.join(paths.teamDir, 'agents.json');
@@ -1065,7 +1068,6 @@ program
     .option('--all', 'Include internal/CLI agents')
     .option('--json', 'Output as JSON')
     .action(async (options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const agentsPath = path.join(paths.teamDir, 'agents.json');
     const allAgents = loadAgents(agentsPath);
@@ -1097,11 +1099,13 @@ program
     .command('read')
     .description('Read full message by ID (for truncated messages)')
     .argument('<id>', 'Message ID')
-    .action(async (messageId) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
-    const { createStorageAdapter } = await import('@agent-relay/storage/adapter');
+    .option('--storage <type>', 'Storage type override (jsonl, sqlite, memory)')
+    .action(async (messageId, options) => {
     const paths = getProjectPaths();
-    const adapter = await createStorageAdapter(paths.dbPath);
+    // Use runtime config to match daemon's storage type, CLI option overrides
+    const runtimeConfig = loadRuntimeConfig();
+    const storageType = options.storage ?? runtimeConfig?.storageType;
+    const adapter = await createStorageAdapter(paths.dbPath, storageType ? { type: storageType } : undefined);
     if (!adapter.getMessageById) {
         console.error('Storage does not support message lookup');
         process.exit(1);
@@ -1130,11 +1134,13 @@ program
     .option('-t, --to <agent>', 'Filter by recipient')
     .option('--since <time>', 'Since time (e.g., "1h", "2024-01-01")')
     .option('--json', 'Output as JSON')
+    .option('--storage <type>', 'Storage type override (jsonl, sqlite, memory)')
     .action(async (options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
-    const { createStorageAdapter } = await import('@agent-relay/storage/adapter');
     const paths = getProjectPaths();
-    const adapter = await createStorageAdapter(paths.dbPath);
+    // Use runtime config to match daemon's storage type, CLI option overrides
+    const runtimeConfig = loadRuntimeConfig();
+    const storageType = options.storage ?? runtimeConfig?.storageType;
+    const adapter = await createStorageAdapter(paths.dbPath, storageType ? { type: storageType } : undefined);
     const limit = Number.parseInt(options.limit ?? '50', 10) || 50;
     const sinceTs = parseSince(options.since);
     try {
@@ -1252,9 +1258,6 @@ program
     .action(async (projectPaths, options) => {
     const { resolveProjects, validateDaemons, getAgentOutboxTemplate } = await import('@agent-relay/config');
     const { MultiProjectClient } = await import('@agent-relay/bridge');
-    const { getProjectPaths } = await import('@agent-relay/config');
-    const fs = await import('node:fs');
-    const pathModule = await import('node:path');
     // Resolve projects from args or config
     const projects = resolveProjects(projectPaths, options.cli);
     if (projects.length === 0) {
@@ -1292,12 +1295,12 @@ program
         if (!fs.existsSync(projectPaths.dataDir)) {
             fs.mkdirSync(projectPaths.dataDir, { recursive: true });
         }
-        return pathModule.join(projectPaths.dataDir, 'bridge-state.json');
+        return path.join(projectPaths.dataDir, 'bridge-state.json');
     });
     const bridgeState = {
         projects: valid.map(p => ({
             id: p.id,
-            name: pathModule.basename(p.path),
+            name: path.basename(p.path),
             path: p.path,
             connected: false,
             lead: { name: p.leadName, connected: false },
@@ -1506,7 +1509,6 @@ Start by greeting the project leads and asking for status updates.`;
         process.exit(0);
     });
     // Start a simple REPL for sending messages
-    const readline = await import('node:readline');
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
@@ -1555,7 +1557,6 @@ program
     .option('--dry-run', 'Show what would be cleaned without actually doing it')
     .option('--force', 'Kill all relay sessions regardless of connection status')
     .action(async (options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const agentsPath = path.join(paths.teamDir, 'agents.json');
     // Get all relay tmux sessions
@@ -1770,7 +1771,6 @@ program
     .option('-n, --lines <n>', 'Number of lines to show', '50')
     .option('-f, --follow', 'Follow output (like tail -f)')
     .action(async (name, options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const logsDir = getWorkerLogsDir(paths.projectRoot);
     const logFile = path.join(logsDir, `${name}.log`);
@@ -1784,8 +1784,7 @@ program
         console.log(`Following logs for ${name} (Ctrl+C to stop)...`);
         console.log('─'.repeat(50));
         // Use tail -f approach
-        const { spawn } = await import('child_process');
-        const child = spawn('tail', ['-f', logFile], {
+        const child = spawnProcess('tail', ['-f', logFile], {
             stdio: ['ignore', 'inherit', 'inherit'],
         });
         process.on('SIGINT', () => {
@@ -1879,7 +1878,6 @@ program
     };
     // Try daemon socket first (preferred path)
     try {
-        const { getProjectPaths } = await import('@agent-relay/config');
         const paths = getProjectPaths();
         // TODO: Re-enable daemon-based spawning when client.spawn() is implemented
         // See: docs/SDK-MIGRATION-PLAN.md for planned implementation
@@ -1934,7 +1932,6 @@ program
     const port = options.port || DEFAULT_DASHBOARD_PORT;
     // Try daemon socket first (preferred path)
     try {
-        const { getProjectPaths } = await import('@agent-relay/config');
         const paths = getProjectPaths();
         const client = new RelayClient({
             socketPath: paths.socketPath,
@@ -1988,7 +1985,6 @@ program
     .argument('<name>', 'Agent name')
     .option('--force', 'Skip graceful shutdown, kill immediately')
     .action(async (name, options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     const workers = readWorkersMetadata(paths.projectRoot);
     const worker = workers.find(w => w.name === name);
@@ -2049,7 +2045,6 @@ cloudCommand
     .action(async (options) => {
     const os = await import('node:os');
     const crypto = await import('node:crypto');
-    const readline = await import('node:readline');
     const cloudUrl = options.cloudUrl;
     const machineName = options.name || os.hostname();
     // Generate machine ID
@@ -2210,7 +2205,6 @@ cloudCommand
     console.log(`  Linked: ${new Date(config.linkedAt).toLocaleString()}`);
     console.log('');
     // Check if daemon is running and connected
-    const { getProjectPaths } = await import('@agent-relay/config');
     const paths = getProjectPaths();
     if (fs.existsSync(paths.socketPath)) {
         console.log('  Daemon: Running');
@@ -2295,12 +2289,10 @@ program
     .argument('[args...]', 'Arguments to pass to trail CLI')
     .allowUnknownOption()
     .action(async (args) => {
-    const { spawn } = await import('node:child_process');
-    const { getProjectPaths } = await import('@agent-relay/config');
     const { getPrimaryTrajectoriesDir, ensureTrajectoriesDir } = await import('@agent-relay/config/trajectory-config');
     const paths = getProjectPaths();
     // Check if trail is available
-    const trailCheck = spawn('which', ['trail'], { stdio: 'pipe' });
+    const trailCheck = spawnProcess('which', ['trail'], { stdio: 'pipe' });
     const trailExists = await new Promise((resolve) => {
         trailCheck.on('close', (code) => resolve(code === 0));
         trailCheck.on('error', () => resolve(false));
@@ -2324,7 +2316,7 @@ program
     const trajectoriesDir = getPrimaryTrajectoriesDir(paths.projectRoot);
     ensureTrajectoriesDir(paths.projectRoot);
     // Spawn trail with the provided arguments
-    const trailProc = spawn('trail', args, {
+    const trailProc = spawnProcess('trail', args, {
         cwd: paths.projectRoot,
         stdio: 'inherit',
         env: {
@@ -2758,7 +2750,6 @@ program
     .option('--output-dir <dir>', 'Directory for profile output', './profiles')
     .option('--expose-gc', 'Expose garbage collector for manual GC')
     .action(async (commandParts, options) => {
-    const { getProjectPaths } = await import('@agent-relay/config');
     if (!commandParts || commandParts.length === 0) {
         console.error('No command specified');
         process.exit(1);
@@ -3097,9 +3088,6 @@ program
 });
 // init - First-time setup wizard for Agent Relay
 async function runInit(options) {
-    const readline = await import('node:readline');
-    const { existsSync } = await import('node:fs');
-    const { spawn } = await import('node:child_process');
     // Helper to prompt user
     const prompt = async (question, defaultYes = true) => {
         if (options.yes)
@@ -3138,26 +3126,25 @@ async function runInit(options) {
     // Step 2: Check daemon status
     let daemonRunning = false;
     const socketPath = process.env.RELAY_SOCKET;
-    if (socketPath && existsSync(socketPath)) {
+    if (socketPath && fs.existsSync(socketPath)) {
         daemonRunning = true;
     }
     else {
         // Check default locations
         const { homedir } = await import('node:os');
-        const { join } = await import('node:path');
         const platform = process.platform;
         let dataDir;
         if (platform === 'darwin') {
-            dataDir = join(homedir(), 'Library', 'Application Support', 'agent-relay');
+            dataDir = path.join(homedir(), 'Library', 'Application Support', 'agent-relay');
         }
         else if (platform === 'win32') {
-            dataDir = join(process.env.APPDATA || homedir(), 'agent-relay');
+            dataDir = path.join(process.env.APPDATA || homedir(), 'agent-relay');
         }
         else {
-            dataDir = join(process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share'), 'agent-relay');
+            dataDir = path.join(process.env.XDG_DATA_HOME || path.join(homedir(), '.local', 'share'), 'agent-relay');
         }
-        const defaultSocket = join(dataDir, 'projects', 'default', 'daemon.sock');
-        if (existsSync(defaultSocket)) {
+        const defaultSocket = path.join(dataDir, 'projects', 'default', 'daemon.sock');
+        if (fs.existsSync(defaultSocket)) {
             daemonRunning = true;
         }
     }
@@ -3220,7 +3207,7 @@ async function runInit(options) {
             console.log('');
             console.log('  Starting daemon...');
             // Start daemon in background
-            const daemonProcess = spawn(process.execPath, [process.argv[1], 'up', '--background'], {
+            const daemonProcess = spawnProcess(process.execPath, [process.argv[1], 'up', '--background'], {
                 detached: true,
                 stdio: 'ignore',
             });