runsignal 0.1.5 → 0.1.7

package/bin/runsignal.js

@@ -3,6 +3,7 @@
 import {Command} from 'commander';
 import {spawn, execSync} from 'node:child_process';
 import {promises as fs} from 'node:fs';
+import {existsSync} from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import {
@@ -17,6 +18,20 @@ const DEFAULT_APP_URL = process.env.RUNSIGNAL_APP_URL || 'https://runsignal.dev'
 const CONFIG_DIR = path.join(os.homedir(), '.runsignal');
 const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
 
+function extractErrorDetail(code, marker) {
+  const index = code.indexOf(marker);
+  if (index === -1) {
+    return '';
+  }
+
+  const detail = code.slice(index + marker.length).trim();
+  if (!detail) {
+    return '';
+  }
+
+  return detail.slice(0, 180);
+}
+
 function toUserMessage(errorCode) {
   const code = String(errorCode || '');
   if (code.includes('not_logged_in')) return 'You are not logged in. Run: runsignal login';
@@ -31,8 +46,13 @@ function toUserMessage(errorCode) {
   if (code.includes('login_timeout')) return 'Login timed out. Retry runsignal login and validate quickly.';
   if (code.includes('login_poll_failed'))
     return 'Login polling failed. Check APP URL and server availability.';
-  if (code.includes('send_event_failed'))
+  if (code.includes('send_event_failed')) {
+    const detail = extractErrorDetail(code, 'send_event_failed:');
+    if (detail) {
+      return `Event send failed (${detail}). Check machine key, network and server logs.`;
+    }
     return 'Event send failed. Check machine key, network and server logs.';
+  }
   if (code.includes('status_failed')) return 'Status check failed. Verify event id and machine ownership.';
   if (code.includes('event_type_invalid'))
     return 'Invalid event type. Use approval_required, task_completed, error, quota_warning, question.';
@@ -100,6 +120,39 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function tryOpenBrowser(url) {
+  if (!url) return false;
+
+  try {
+    if (process.platform === 'win32') {
+      const child = spawn('cmd', ['/c', 'start', '', url], {
+        detached: true,
+        stdio: 'ignore'
+      });
+      child.unref();
+      return true;
+    }
+
+    if (process.platform === 'darwin') {
+      const child = spawn('open', [url], {
+        detached: true,
+        stdio: 'ignore'
+      });
+      child.unref();
+      return true;
+    }
+
+    const child = spawn('xdg-open', [url], {
+      detached: true,
+      stdio: 'ignore'
+    });
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 const HOOK_START = '# >>> RunSignal hooks start >>>';
 const HOOK_END = '# <<< RunSignal hooks end <<<';
 
@@ -122,43 +175,44 @@ function buildHookBlock(shellKind) {
     return `${HOOK_START}
 function RunSignal-Resolve-NativeCommand {
   param([string]$Name)
-  $cmd = Get-Command $Name -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1
-  if (-not $cmd) { return $null }
-  return $cmd.Source
+  $candidates = @(Get-Command $Name -CommandType Application -ErrorAction SilentlyContinue)
+  if (-not $candidates -or $candidates.Count -eq 0) { return $null }
+  $preferred = $candidates | Where-Object { $_.Source -match '\\.exe$' } | Select-Object -First 1
+  if ($preferred) { return $preferred.Source }
+  $launcher = $candidates | Where-Object { $_.Source -match '\\.(cmd|bat)$' } | Select-Object -First 1
+  if ($launcher) { return $launcher.Source }
+  $secondary = $candidates | Where-Object { $_.Source -match '\\.[A-Za-z0-9]+$' } | Select-Object -First 1
+  if ($secondary) { return $secondary.Source }
+  return $candidates[0].Source
 }
 function claude {
   $native = RunSignal-Resolve-NativeCommand "claude"
   if (-not $native) {
-    $home = [Environment]::GetFolderPath("UserProfile")
-    $fallback = Join-Path $home ".local\\bin\\claude.exe"
+    $userHome = [Environment]::GetFolderPath("UserProfile")
+    $fallback = Join-Path $userHome ".local\\bin\\claude.exe"
     if (Test-Path $fallback) { $native = $fallback }
   }
   if (-not $native) { Write-Error "RunSignal hook: native claude executable not found. Add your native installer path to PATH (example: %USERPROFILE%\\.local\\bin)."; return }
-  if ($args.Count -eq 0) { & $native; return }
   runsignal wrap -- $native @args
 }
 function codex {
   $native = RunSignal-Resolve-NativeCommand "codex"
   if (-not $native) { Write-Error "RunSignal hook: native codex executable not found."; return }
-  if ($args.Count -eq 0) { & $native; return }
   runsignal wrap -- $native @args
 }
 function cursor {
   $native = RunSignal-Resolve-NativeCommand "cursor"
   if (-not $native) { Write-Error "RunSignal hook: native cursor executable not found."; return }
-  if ($args.Count -eq 0) { & $native; return }
   runsignal wrap -- $native @args
 }
 function gemini {
   $native = RunSignal-Resolve-NativeCommand "gemini"
   if (-not $native) { Write-Error "RunSignal hook: native gemini executable not found."; return }
-  if ($args.Count -eq 0) { & $native; return }
   runsignal wrap -- $native @args
 }
 function aider {
   $native = RunSignal-Resolve-NativeCommand "aider"
   if (-not $native) { Write-Error "RunSignal hook: native aider executable not found."; return }
-  if ($args.Count -eq 0) { & $native; return }
   runsignal wrap -- $native @args
 }
 ${HOOK_END}
@@ -183,35 +237,30 @@ claude() {
   local native
   native="$(runsignal_resolve_native claude)"
   if [ -z "$native" ]; then echo "RunSignal hook: native claude executable not found." >&2; return 127; fi
-  if [ "$#" -eq 0 ]; then "$native"; return $?; fi
   runsignal wrap -- "$native" "$@"
 }
 codex() {
   local native
   native="$(runsignal_resolve_native codex)"
   if [ -z "$native" ]; then echo "RunSignal hook: native codex executable not found." >&2; return 127; fi
-  if [ "$#" -eq 0 ]; then "$native"; return $?; fi
   runsignal wrap -- "$native" "$@"
 }
 cursor() {
   local native
   native="$(runsignal_resolve_native cursor)"
   if [ -z "$native" ]; then echo "RunSignal hook: native cursor executable not found." >&2; return 127; fi
-  if [ "$#" -eq 0 ]; then "$native"; return $?; fi
   runsignal wrap -- "$native" "$@"
 }
 gemini() {
   local native
   native="$(runsignal_resolve_native gemini)"
   if [ -z "$native" ]; then echo "RunSignal hook: native gemini executable not found." >&2; return 127; fi
-  if [ "$#" -eq 0 ]; then "$native"; return $?; fi
   runsignal wrap -- "$native" "$@"
 }
 aider() {
   local native
   native="$(runsignal_resolve_native aider)"
   if [ -z "$native" ]; then echo "RunSignal hook: native aider executable not found." >&2; return 127; fi
-  if [ "$#" -eq 0 ]; then "$native"; return $?; fi
   runsignal wrap -- "$native" "$@"
 }
 ${HOOK_END}
@@ -435,6 +484,35 @@ function quoteForShell(arg) {
   return `"${escaped}"`;
 }
 
+function stripWrappingQuotes(value) {
+  const raw = String(value || '').trim();
+  if ((raw.startsWith('"') && raw.endsWith('"')) || (raw.startsWith("'") && raw.endsWith("'"))) {
+    return raw.slice(1, -1);
+  }
+  return raw;
+}
+
+function isWindowsScriptLauncher(filePath) {
+  if (process.platform !== 'win32') return false;
+  const ext = path.extname(String(filePath || '')).toLowerCase();
+  return ext === '.cmd' || ext === '.bat' || ext === '.ps1';
+}
+
+function normalizeWindowsExecutablePath(filePath) {
+  const raw = String(filePath || '');
+  if (process.platform !== 'win32') return raw;
+  if (!raw) return raw;
+  const ext = path.extname(raw).toLowerCase();
+  if (ext) return raw;
+  const exe = `${raw}.exe`;
+  if (existsSync(exe)) return exe;
+  const cmd = `${raw}.cmd`;
+  if (existsSync(cmd)) return cmd;
+  const bat = `${raw}.bat`;
+  if (existsSync(bat)) return bat;
+  return raw;
+}
+
 async function runLogin(options) {
   const config = await readConfig();
   const baseUrl = String(options.appUrl || config.app_url || DEFAULT_APP_URL).replace(/\/$/, '');
@@ -453,7 +531,13 @@ async function runLogin(options) {
     throw new Error('login_payload_invalid');
   }
 
-  console.log(`Open ${verificationUrl} and enter code: ${userCode}`);
+  const verificationUrlWithCode = `${verificationUrl}?code=${encodeURIComponent(String(userCode))}`;
+  const opened = tryOpenBrowser(verificationUrlWithCode);
+  if (opened) {
+    console.log('Browser opened.');
+  } else {
+    console.log(`Open ${verificationUrlWithCode} and enter code: ${userCode}`);
+  }
 
   let accessToken = null;
   const deadline = Date.now() + 10 * 60 * 1000;
@@ -578,7 +662,7 @@ async function runWrap(commandParts) {
   }
 
   const repo = getRepoFromGit();
-  const branch = getBranchFromGit();
+  const branch = getBranchFromGit() || undefined;
   const machineName = config.machine_name || getMachineName();
   const agentLabel = inferAgentLabel(commandParts);
 
@@ -593,13 +677,75 @@ async function runWrap(commandParts) {
     commandParts.length === 1
       ? String(commandParts[0])
       : commandParts.map((part) => quoteForShell(part)).join(' ');
+  const singleCommand = String(commandParts[0] || '');
+  const singleExecutable = normalizeWindowsExecutablePath(stripWrappingQuotes(singleCommand));
   const interactivePassthrough =
-    commandParts.length === 1 && !/[\s"'`]/.test(String(commandParts[0]));
-  const child = spawn(commandString, {
-    stdio: interactivePassthrough ? 'inherit' : ['inherit', 'pipe', 'pipe'],
-    shell: true,
-    env: process.env
-  });
+    commandParts.length === 1 && (existsSync(singleExecutable) || !/\s/.test(singleExecutable));
+  const child = interactivePassthrough
+    ? isWindowsScriptLauncher(singleExecutable)
+      ? spawn(singleExecutable, [], {
+          stdio: 'inherit',
+          shell: true,
+          env: process.env
+        })
+      : spawn(singleExecutable, [], {
+          stdio: 'inherit',
+          shell: false,
+          env: process.env
+        })
+    : spawn(commandString, {
+        stdio: ['inherit', 'pipe', 'pipe'],
+        shell: true,
+        env: process.env
+      });
+
+  const startedAt = Date.now();
+  const sessionTarget = interactivePassthrough ? singleExecutable : commandString;
+  try {
+    await sendEvent({
+      apiFetch,
+      baseUrl,
+      machineApiKey,
+      event: {
+        message: `Session started: ${sessionTarget}`,
+        event_type: 'session_started',
+        repo,
+        branch,
+        severity: 'info',
+        context,
+        agent: agentLabel
+      }
+    });
+  } catch {
+    // non-blocking
+  }
+
+  let heartbeatInterval = null;
+  if (interactivePassthrough) {
+    const heartbeatMin = Number.parseInt(String(process.env.RUNSIGNAL_HEARTBEAT_MIN ?? '0'), 10);
+    if (Number.isFinite(heartbeatMin) && heartbeatMin > 0) {
+      heartbeatInterval = setInterval(() => {
+        const elapsedMin = Math.max(1, Math.floor((Date.now() - startedAt) / 60_000));
+        sendEvent({
+          apiFetch,
+          baseUrl,
+          machineApiKey,
+          event: {
+            message: `Session running (${elapsedMin} min): ${singleExecutable}`,
+            event_type: 'session_running',
+            repo,
+            branch,
+            severity: 'info',
+            context,
+            agent: agentLabel
+          }
+        }).catch(() => {
+          // non-blocking
+        });
+      }, heartbeatMin * 60_000);
+      heartbeatInterval.unref?.();
+    }
+  }
 
   let sawApproval = false;
   let sawQuestion = false;
@@ -699,32 +845,38 @@ async function runWrap(commandParts) {
   }
 
   const exitCode = await new Promise((resolve) => {
+    child.on('error', () => resolve(1));
     child.on('close', (code) => resolve(code ?? 1));
   });
+  if (heartbeatInterval) {
+    clearInterval(heartbeatInterval);
+  }
   await Promise.allSettled(Array.from(pendingTasks));
 
-  const completionMessage =
-    exitCode === 0
-      ? `Wrapped command completed: ${commandParts.join(' ')}`
-      : `Wrapped command failed (code ${exitCode}): ${lastInterestingLine || commandParts.join(' ')}`;
+  if (!interactivePassthrough || exitCode !== 0) {
+    const completionMessage =
+      exitCode === 0
+        ? `Wrapped command completed: ${commandParts.join(' ')}`
+        : `Wrapped command failed (code ${exitCode}): ${lastInterestingLine || commandParts.join(' ')}`;
 
-  try {
-    await sendEvent({
-      apiFetch,
-      baseUrl,
-      machineApiKey,
-      event: {
-        message: completionMessage.slice(0, 1000),
-        event_type: exitCode === 0 ? 'task_completed' : 'error',
-        repo,
-        branch,
-        severity: exitCode === 0 ? 'info' : 'critical',
-        context,
-        agent: agentLabel
-      }
-    });
-  } catch {
-    // no-op
+    try {
+      await sendEvent({
+        apiFetch,
+        baseUrl,
+        machineApiKey,
+        event: {
+          message: completionMessage.slice(0, 1000),
+          event_type: exitCode === 0 ? 'task_completed' : 'error',
+          repo,
+          branch,
+          severity: exitCode === 0 ? 'info' : 'critical',
+          context,
+          agent: agentLabel
+        }
+      });
+    } catch {
+      // no-op
+    }
   }
 
   // Avoid hard process exit on Windows: let Node close handles cleanly.
@@ -742,7 +894,7 @@ async function runTest() {
   }
 
   const repo = getRepoFromGit();
-  const branch = getBranchFromGit();
+  const branch = getBranchFromGit() || undefined;
 
   const result = await sendEvent({
     apiFetch,
@@ -774,7 +926,9 @@ function normalizeEventType(value) {
     raw === 'task_completed' ||
     raw === 'error' ||
     raw === 'quota_warning' ||
-    raw === 'question'
+    raw === 'question' ||
+    raw === 'session_started' ||
+    raw === 'session_running'
   ) {
     return raw;
   }
@@ -811,7 +965,8 @@ async function runSend(options) {
   }
 
   const repo = options.repo ? String(options.repo).trim() : getRepoFromGit();
-  const branch = options.branch ? String(options.branch).trim() : getBranchFromGit();
+  const branchRaw = options.branch ? String(options.branch).trim() : getBranchFromGit();
+  const branch = branchRaw || undefined;
   const agent = options.agent ? String(options.agent).trim() : 'manual-cli';
 
   const result = await sendEvent({
@@ -944,7 +1099,7 @@ async function runSetup(options) {
 
 const program = new Command();
 
-program.name('runsignal').description('RunSignal CLI').version('0.1.5');
+program.name('runsignal').description('RunSignal CLI').version('0.1.6');
 
 program
   .command('setup')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runsignal",
-   "version": "0.1.5",
+   "version": "0.1.7",
   "description": "RunSignal CLI for wrapping AI agent runs and handling approvals",
   "type": "module",
   "license": "MIT",