wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename daemon to runner throughout codebase

Browse Source
This commit is contained in:
weishu
2026-01-19 11:12:48 +08:00
parent ccdcb3d75d
commit 0228146b99
53 changed files with 812 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/ui/doctor.ts
+39 -39
View File
@@ -2,15 +2,15 @@
* Doctor command implementation
*
* Provides comprehensive diagnostics and troubleshooting information
* for hapi CLI including configuration, daemon status, logs, and links
* for hapi CLI including configuration, runner status, logs, and links
*/
import chalk from 'chalk'
import { configuration } from '@/configuration'
import { readSettings } from '@/persistence'
import { checkIfDaemonRunningAndCleanupStaleState } from '@/daemon/controlClient'
import { findRunawayHappyProcesses, findAllHappyProcesses } from '@/daemon/doctor'
import { readDaemonState } from '@/persistence'
import { checkIfRunnerRunningAndCleanupStaleState } from '@/runner/controlClient'
import { findRunawayHappyProcesses, findAllHappyProcesses } from '@/runner/doctor'
import { readRunnerState } from '@/persistence'
import { existsSync, readdirSync, statSync } from 'node:fs'
import { readFile } from 'node:fs/promises'
import { join } from 'node:path'
@@ -66,13 +66,13 @@ function getLogFiles(logDir: string): { file: string, path: string, modified: Da
}
/**
* Run doctor command specifically for daemon diagnostics
* Run doctor command specifically for runner diagnostics
*/
export async function runDoctorDaemon(): Promise<void> {
return runDoctorCommand('daemon');
export async function runDoctorRunner(): Promise<void> {
return runDoctorCommand('runner');
}
export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void> {
export async function runDoctorCommand(filter?: 'all' | 'runner'): Promise<void> {
// Default to 'all' if no filter specified
if (!filter) {
filter = 'all';
@@ -80,7 +80,7 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
console.log(chalk.bold.cyan('\n🩺 hapi CLI Doctor\n'));
// For 'all' filter, show everything. For 'daemon', only show daemon-related info
// For 'all' filter, show everything. For 'runner', only show runner-related info
if (filter === 'all') {
// Version and basic info
console.log(chalk.bold('📋 Basic Information'));
@@ -89,8 +89,8 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
console.log(`Node.js Version: ${chalk.green(process.version)}`);
console.log('');
// Daemon spawn diagnostics
console.log(chalk.bold('🔧 Daemon Spawn Diagnostics'));
// Runner spawn diagnostics
console.log(chalk.bold('🔧 Runner Spawn Diagnostics'));
const projectRoot = projectPath();
const cliEntrypoint = join(projectRoot, 'src', 'index.ts');
@@ -149,14 +149,14 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
}
// Daemon status - shown for both 'all' and 'daemon' filters
console.log(chalk.bold('\n🤖 Daemon Status'));
// Runner status - shown for both 'all' and 'runner' filters
console.log(chalk.bold('\n🤖 Runner Status'));
try {
const isRunning = await checkIfDaemonRunningAndCleanupStaleState();
const state = await readDaemonState();
const isRunning = await checkIfRunnerRunningAndCleanupStaleState();
const state = await readRunnerState();
if (isRunning && state) {
console.log(chalk.green('✓ Daemon is running'));
console.log(chalk.green('✓ Runner is running'));
console.log(` PID: ${state.pid}`);
console.log(` Started: ${new Date(state.startTime).toLocaleString()}`);
console.log(` CLI Version: ${state.startedWithCliVersion}`);
@@ -164,15 +164,15 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
console.log(` HTTP Port: ${state.httpPort}`);
}
} else if (state && !isRunning) {
console.log(chalk.yellow('⚠️ Daemon state exists but process not running (stale)'));
console.log(chalk.yellow('⚠️ Runner state exists but process not running (stale)'));
} else {
console.log(chalk.red('❌ Daemon is not running'));
console.log(chalk.red('❌ Runner is not running'));
}
// Show daemon state file
// Show runner state file
if (state) {
console.log(chalk.bold('\n📄 Daemon State:'));
console.log(chalk.blue(`Location: ${configuration.daemonStateFile}`));
console.log(chalk.bold('\n📄 Runner State:'));
console.log(chalk.blue(`Location: ${configuration.runnerStateFile}`));
console.log(chalk.gray(JSON.stringify(state, null, 2)));
}
@@ -192,12 +192,12 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
Object.entries(grouped).forEach(([type, processes]) => {
const typeLabels: Record<string, string> = {
'current': '📍 Current Process',
'daemon': '🤖 Daemon',
'daemon-version-check': '🔍 Daemon Version Check (stuck)',
'daemon-spawned-session': '🔗 Daemon-Spawned Sessions',
'runner': '🤖 Runner',
'runner-version-check': '🔍 Runner Version Check (stuck)',
'runner-spawned-session': '🔗 Runner-Spawned Sessions',
'user-session': '👤 User Sessions',
'dev-daemon': '🛠️ Dev Daemon',
'dev-daemon-version-check': '🛠️ Dev Daemon Version Check (stuck)',
'dev-runner': '🛠️ Dev Runner',
'dev-runner-version-check': '🛠️ Dev Runner Version Check (stuck)',
'dev-session': '🛠️ Dev Sessions',
'dev-doctor': '🛠️ Dev Doctor',
'dev-related': '🛠️ Dev Related',
@@ -209,7 +209,7 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
processes.forEach(({ pid, command }) => {
const color = type === 'current' ? chalk.green :
type.startsWith('dev') ? chalk.cyan :
type.includes('daemon') ? chalk.blue : chalk.gray;
type.includes('runner') ? chalk.blue : chalk.gray;
console.log(` ${color(`PID ${pid}`)}: ${chalk.gray(command)}`);
});
});
@@ -222,7 +222,7 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
console.log(chalk.gray('To clean up runaway processes: hapi doctor clean'));
}
} catch (error) {
console.log(chalk.red('❌ Error checking daemon status'));
console.log(chalk.red('❌ Error checking runner status'));
}
// Log files - only show for 'all' filter
@@ -233,9 +233,9 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
const allLogs = getLogFiles(configuration.logsDir);
if (allLogs.length > 0) {
// Separate daemon and regular logs
const daemonLogs = allLogs.filter(({ file }) => file.includes('daemon'));
const regularLogs = allLogs.filter(({ file }) => !file.includes('daemon'));
// Separate runner and regular logs
const runnerLogs = allLogs.filter(({ file }) => file.includes('runner'));
const regularLogs = allLogs.filter(({ file }) => !file.includes('runner'));
// Show regular logs (max 10)
if (regularLogs.length > 0) {
@@ -250,19 +250,19 @@ export async function runDoctorCommand(filter?: 'all' | 'daemon'): Promise<void>
}
}
// Show daemon logs (max 5)
if (daemonLogs.length > 0) {
console.log(chalk.blue('\nDaemon Logs:'));
const daemonLogsToShow = daemonLogs.slice(0, 5);
daemonLogsToShow.forEach(({ file, path, modified }) => {
// Show runner logs (max 5)
if (runnerLogs.length > 0) {
console.log(chalk.blue('\nRunner Logs:'));
const runnerLogsToShow = runnerLogs.slice(0, 5);
runnerLogsToShow.forEach(({ file, path, modified }) => {
console.log(` ${chalk.green(file)} - ${modified.toLocaleString()}`);
console.log(chalk.gray(` ${path}`));
});
if (daemonLogs.length > 5) {
console.log(chalk.gray(` ... and ${daemonLogs.length - 5} more daemon log files`));
if (runnerLogs.length > 5) {
console.log(chalk.gray(` ... and ${runnerLogs.length - 5} more runner log files`));
}
} else {
console.log(chalk.yellow('\nNo daemon log files found'));
console.log(chalk.yellow('\nNo runner log files found'));
}
} else {
console.log(chalk.yellow('No log files found'));
cli/src/ui/logger.ts
+15 -15
View File
@@ -10,7 +10,7 @@ import { appendFileSync } from 'fs'
import { configuration } from '@/configuration'
import { existsSync, readdirSync, statSync } from 'node:fs'
import { join, basename } from 'node:path'
import { readDaemonState } from '@/persistence'
import { readRunnerState } from '@/persistence'
/**
* Consistent date/time formatting functions
@@ -40,7 +40,7 @@ function createTimestampForLogEntry(date: Date = new Date()): string {
function getSessionLogPath(): string {
const timestamp = createTimestampForFilename()
const filename = configuration.isDaemonProcess ? `${timestamp}-daemon.log` : `${timestamp}.log`
const filename = configuration.isRunnerProcess ? `${timestamp}-runner.log` : `${timestamp}.log`
return join(configuration.logsDir, filename)
}
@@ -243,10 +243,10 @@ export type LogFileInfo = {
};
/**
* List daemon log files in descending modification time order.
* List runner log files in descending modification time order.
* Returns up to `limit` entries; empty array if none.
*/
export async function listDaemonLogFiles(limit: number = 50): Promise<LogFileInfo[]> {
export async function listRunnerLogFiles(limit: number = 50): Promise<LogFileInfo[]> {
try {
const logsDir = configuration.logsDir;
if (!existsSync(logsDir)) {
@@ -254,7 +254,7 @@ export async function listDaemonLogFiles(limit: number = 50): Promise<LogFileInf
}
const logs = readdirSync(logsDir)
.filter(file => file.endsWith('-daemon.log'))
.filter(file => file.endsWith('-runner.log'))
.map(file => {
const fullPath = join(logsDir, file);
const stats = statSync(fullPath);
@@ -262,19 +262,19 @@ export async function listDaemonLogFiles(limit: number = 50): Promise<LogFileInf
})
.sort((a, b) => b.modified.getTime() - a.modified.getTime());
// Prefer the path persisted by the daemon if present (return 0th element if present)
// Prefer the path persisted by the runner if present (return 0th element if present)
try {
const state = await readDaemonState();
const state = await readRunnerState();
if (!state) {
return logs;
}
if (state.daemonLogPath && existsSync(state.daemonLogPath)) {
const stats = statSync(state.daemonLogPath);
if (state.runnerLogPath && existsSync(state.runnerLogPath)) {
const stats = statSync(state.runnerLogPath);
const persisted: LogFileInfo = {
file: basename(state.daemonLogPath),
path: state.daemonLogPath,
file: basename(state.runnerLogPath),
path: state.runnerLogPath,
modified: stats.mtime
};
const idx = logs.findIndex(l => l.path === persisted.path);
@@ -286,7 +286,7 @@ export async function listDaemonLogFiles(limit: number = 50): Promise<LogFileInf
}
}
} catch {
// Ignore errors reading daemon state; fall back to directory listing
// Ignore errors reading runner state; fall back to directory listing
}
return logs.slice(0, Math.max(0, limit));
@@ -296,9 +296,9 @@ export async function listDaemonLogFiles(limit: number = 50): Promise<LogFileInf
}
/**
* Get the most recent daemon log file, or null if none exist.
* Get the most recent runner log file, or null if none exist.
*/
export async function getLatestDaemonLog(): Promise<LogFileInfo | null> {
const [latest] = await listDaemonLogFiles(1);
export async function getLatestRunnerLog(): Promise<LogFileInfo | null> {
const [latest] = await listRunnerLogFiles(1);
return latest || null;
}