@sonde/agent 0.2.5 → 0.2.6

package/src/index.ts

@@ -1,13 +1,24 @@
 #!/usr/bin/env node
 
+import { spawn } from 'node:child_process';
 import os from 'node:os';
-import { handlePacksCommand } from './cli/packs.js';
+import { packRegistry } from '@sonde/packs';
+import { buildEnabledPacks, handlePacksCommand } from './cli/packs.js';
 import { checkForUpdate, performUpdate } from './cli/update.js';
-import { type AgentConfig, getConfigPath, loadConfig, saveConfig } from './config.js';
+import {
+  type AgentConfig,
+  getConfigPath,
+  loadConfig,
+  removePidFile,
+  saveConfig,
+  stopRunningAgent,
+  writePidFile,
+} from './config.js';
 import { AgentConnection, type ConnectionEvents, enrollWithHub } from './runtime/connection.js';
 import { ProbeExecutor } from './runtime/executor.js';
 import { checkNotRoot } from './runtime/privilege.js';
 import { buildPatterns } from './runtime/scrubber.js';
+import { createSystemChecker, scanForSoftware } from './system/scanner.js';
 import { VERSION } from './version.js';
 
 const args = process.argv.slice(2);
@@ -25,6 +36,8 @@ function printUsage(): void {
   console.log('  install   Interactive guided setup (enroll + scan + packs)');
   console.log('  enroll    Enroll this agent with a hub');
   console.log('  start     Start the agent (TUI by default, --headless for daemon)');
+  console.log('  stop      Stop the background agent');
+  console.log('  restart   Restart the agent in background');
   console.log('  status    Show agent status');
   console.log('  packs     Manage packs (list, scan, install, uninstall)');
   console.log('  update    Check for and install agent updates');
@@ -61,7 +74,10 @@ function createRuntime(events: ConnectionEvents): Runtime {
     process.exit(1);
   }
 
-  const executor = new ProbeExecutor(undefined, undefined, buildPatterns(config.scrubPatterns));
+  const enabledPacks = buildEnabledPacks(
+    packRegistry, config.disabledPacks ?? [],
+  );
+  const executor = new ProbeExecutor(enabledPacks, undefined, buildPatterns(config.scrubPatterns));
   const connection = new AgentConnection(config, executor, events);
 
   return { config, executor, connection };
@@ -120,6 +136,20 @@ async function cmdEnroll(): Promise<void> {
   config.enrollmentToken = undefined;
   saveConfig(config);
 
+  // Auto-detect packs
+  const manifests = [...packRegistry.values()].map((p) => p.manifest);
+  const checker = createSystemChecker();
+  const scanResults = scanForSoftware(manifests, checker);
+  const detectedNames = scanResults
+    .filter((r) => r.detected)
+    .map((r) => r.packName);
+  const allNames = manifests.map((m) => m.name);
+  const enabledNames = ['system', ...detectedNames.filter((n) => n !== 'system')];
+  const disabledNames = allNames.filter((n) => !enabledNames.includes(n));
+
+  config.disabledPacks = disabledNames;
+  saveConfig(config);
+
   console.log('Agent enrolled successfully.');
   console.log(`  Hub:      ${hubUrl}`);
   console.log(`  Name:     ${agentName}`);
@@ -129,6 +159,14 @@ async function cmdEnroll(): Promise<void> {
     console.log('  mTLS:     Client certificate issued and saved');
   }
   console.log('');
+  console.log('Pack detection:');
+  for (const name of enabledNames) {
+    console.log(`  ✓ ${name}`);
+  }
+  for (const name of disabledNames) {
+    console.log(`  ✗ ${name} (not detected)`);
+  }
+  console.log('');
   console.log('Run "sonde start" to connect.');
 }
 
@@ -160,23 +198,66 @@ function cmdStart(): void {
   console.log('');
 
   connection.start();
+  writePidFile(process.pid);
   process.stdin.unref();
 
   const shutdown = () => {
     console.log('\nShutting down...');
     connection.stop();
+    removePidFile();
     process.exit(0);
   };
   process.on('SIGINT', shutdown);
   process.on('SIGTERM', shutdown);
 }
 
+function spawnBackgroundAgent(): number {
+  const child = spawn(process.execPath, [process.argv[1]!, 'start', '--headless'], {
+    detached: true,
+    stdio: 'ignore',
+  });
+  child.unref();
+  return child.pid!;
+}
+
 async function cmdManager(): Promise<void> {
+  stopRunningAgent();
+
+  let detached = false;
   const { render } = await import('ink');
   const { createElement } = await import('react');
   const { ManagerApp } = await import('./tui/manager/ManagerApp.js');
-  const { waitUntilExit } = render(createElement(ManagerApp, { createRuntime }));
+
+  const onDetach = () => {
+    detached = true;
+    spawnBackgroundAgent();
+  };
+
+  const { waitUntilExit } = render(
+    createElement(ManagerApp, { createRuntime, onDetach }),
+  );
   await waitUntilExit();
+
+  if (detached) {
+    console.log('Agent detached to background.');
+    console.log('  sonde stop     — stop the background agent');
+    console.log('  sonde start    — reattach the TUI');
+    console.log('  sonde restart  — restart in background');
+  }
+}
+
+function cmdStop(): void {
+  if (stopRunningAgent()) {
+    console.log('Agent stopped.');
+  } else {
+    console.log('No running agent found.');
+  }
+}
+
+function cmdRestart(): void {
+  stopRunningAgent();
+  const pid = spawnBackgroundAgent();
+  console.log(`Agent restarted in background (PID: ${pid}).`);
 }
 
 function cmdStatus(): void {
@@ -187,7 +268,7 @@ function cmdStatus(): void {
     return;
   }
 
-  console.log('Sonde Agent Status');
+  console.log(`Sonde Agent v${VERSION}`);
   console.log(`  Name:     ${config.agentName}`);
   console.log(`  Hub:      ${config.hubUrl}`);
   console.log(`  Agent ID: ${config.agentId ?? '(not yet assigned)'}`);
@@ -246,6 +327,12 @@ switch (command) {
       });
     }
     break;
+  case 'stop':
+    cmdStop();
+    break;
+  case 'restart':
+    cmdRestart();
+    break;
   case 'status':
     cmdStatus();
     break;

package/src/tui/installer/StepComplete.tsx

@@ -1,7 +1,9 @@
+import { packRegistry } from '@sonde/packs';
 import type { PackManifest } from '@sonde/shared';
 import { Box, Text, useApp, useInput } from 'ink';
 import Spinner from 'ink-spinner';
 import { useEffect, useState } from 'react';
+import { buildEnabledPacks } from '../../cli/packs.js';
 import { type AgentConfig, saveConfig } from '../../config.js';
 import { enrollWithHub } from '../../runtime/connection.js';
 import { ProbeExecutor } from '../../runtime/executor.js';
@@ -19,14 +21,23 @@ export function StepComplete({ hubConfig, selectedPacks }: StepCompleteProps): J
   const [error, setError] = useState('');
 
   useEffect(() => {
+    const selectedNames = new Set(selectedPacks.map((p) => p.name));
+    const disabledPacks = [...packRegistry.keys()]
+      .filter((name) => !selectedNames.has(name));
     const config: AgentConfig = {
       hubUrl: hubConfig.hubUrl,
       apiKey: hubConfig.apiKey,
       agentName: hubConfig.agentName,
+      disabledPacks: disabledPacks.length > 0
+        ? disabledPacks
+        : undefined,
     };
     saveConfig(config);
 
-    const executor = new ProbeExecutor();
+    const enabledPacks = buildEnabledPacks(
+      packRegistry, disabledPacks,
+    );
+    const executor = new ProbeExecutor(enabledPacks);
 
     enrollWithHub(config, executor)
       .then(({ agentId: id, apiKey: mintedKey }) => {

package/src/tui/manager/ManagerApp.tsx

@@ -26,11 +26,12 @@ interface Runtime {
 
 interface ManagerAppProps {
   createRuntime: (events: ConnectionEvents) => Runtime;
+  onDetach?: () => void;
 }
 
 const MAX_ACTIVITY = 50;
 
-export function ManagerApp({ createRuntime }: ManagerAppProps): JSX.Element {
+export function ManagerApp({ createRuntime, onDetach }: ManagerAppProps): JSX.Element {
   const { exit } = useApp();
   const [view, setView] = useState<View>('status');
   const [connected, setConnected] = useState(false);
@@ -91,6 +92,7 @@ export function ManagerApp({ createRuntime }: ManagerAppProps): JSX.Element {
         break;
       case 'q':
         runtimeRef.current?.connection.stop();
+        onDetach?.();
         exit();
         break;
     }
@@ -150,7 +152,7 @@ export function ManagerApp({ createRuntime }: ManagerAppProps): JSX.Element {
           a:audit
         </Text>
         <Text> </Text>
-        <Text color="gray">q:quit</Text>
+        <Text color="gray">q:detach</Text>
       </Box>
     </Box>
   );