chore(setup): minimize verify diff

This commit is contained in:
glifocat
2026-04-24 11:49:04 +02:00
parent 4fc2c4275c
commit 9fd694c763

View File

@@ -16,7 +16,12 @@ import { readEnvFile } from '../src/env.js';
import { log } from '../src/log.js'; import { log } from '../src/log.js';
import { pingCliAgent, type PingResult } from './lib/agent-ping.js'; import { pingCliAgent, type PingResult } from './lib/agent-ping.js';
import { getLaunchdLabel, getSystemdUnit } from '../src/install-slug.js'; import { getLaunchdLabel, getSystemdUnit } from '../src/install-slug.js';
import { getPlatform, getServiceManager, hasSystemd, isRoot } from './platform.js'; import {
getPlatform,
getServiceManager,
hasSystemd,
isRoot,
} from './platform.js';
import { emitStatus } from './status.js'; import { emitStatus } from './status.js';
export async function run(_args: string[]): Promise<void> { export async function run(_args: string[]): Promise<void> {
@@ -33,7 +38,11 @@ export async function run(_args: string[]): Promise<void> {
// a sibling checkout (common for developers with multiple clones), this // a sibling checkout (common for developers with multiple clones), this
// repo's `data/cli.sock` won't exist — AGENT_PING would return a // repo's `data/cli.sock` won't exist — AGENT_PING would return a
// misleading `socket_error`. Surface the mismatch directly instead. // misleading `socket_error`. Surface the mismatch directly instead.
let service: 'not_found' | 'stopped' | 'running' | 'running_other_checkout' = 'not_found'; let service:
| 'not_found'
| 'stopped'
| 'running'
| 'running_other_checkout' = 'not_found';
let runningFromPath: string | null = null; let runningFromPath: string | null = null;
const mgr = getServiceManager(); const mgr = getServiceManager();
@@ -65,7 +74,10 @@ export async function run(_args: string[]): Promise<void> {
execSync(`${prefix} is-active ${systemdUnit}`, { stdio: 'ignore' }); execSync(`${prefix} is-active ${systemdUnit}`, { stdio: 'ignore' });
service = 'running'; service = 'running';
try { try {
const pidStr = execSync(`${prefix} show ${systemdUnit} -p MainPID --value`, { encoding: 'utf-8' }).trim(); const pidStr = execSync(
`${prefix} show ${systemdUnit} -p MainPID --value`,
{ encoding: 'utf-8' },
).trim();
const pid = Number(pidStr); const pid = Number(pidStr);
if (Number.isInteger(pid) && pid > 0) { if (Number.isInteger(pid) && pid > 0) {
runningFromPath = resolveBinaryScript(pid); runningFromPath = resolveBinaryScript(pid);
@@ -103,7 +115,11 @@ export async function run(_args: string[]): Promise<void> {
} }
} }
if (service === 'running' && runningFromPath && !isPathInside(runningFromPath, projectRoot)) { if (
service === 'running' &&
runningFromPath &&
!isPathInside(runningFromPath, projectRoot)
) {
service = 'running_other_checkout'; service = 'running_other_checkout';
} }
@@ -194,7 +210,11 @@ export async function run(_args: string[]): Promise<void> {
// 6. Check mount allowlist // 6. Check mount allowlist
let mountAllowlist = 'missing'; let mountAllowlist = 'missing';
if (fs.existsSync(path.join(homeDir, '.config', 'nanoclaw', 'mount-allowlist.json'))) { if (
fs.existsSync(
path.join(homeDir, '.config', 'nanoclaw', 'mount-allowlist.json'),
)
) {
mountAllowlist = 'configured'; mountAllowlist = 'configured';
} }