@cydm/happy-elves 0.1.0-beta.78 → 0.1.0-beta.79

package/apps/cli/dist/commands/daemon.js

@@ -2,7 +2,7 @@ import { createHash, timingSafeEqual } from "node:crypto";
 import os from "node:os";
 import path from "node:path";
 import { daemonLifecycleRequestIdV1Schema, } from "../../../../packages/shared/dist/index.js";
-import { assertLocalDaemonRuntimeMatchesConfig, assertLocalDaemonVerified, assertNoPendingEnrollmentAuthority, canonicalRelayUrl, cliErrorFromFetch, CliError, compactText, ControllerClient, configDir, configPath, daemonPidPath, deriveOrchestration, diagnoseInstallation, emitDoctorResult, ensureDaemonRunning, idleSessionStatuses, localDaemonStatus, ok, parsePairingClaimResponse, randomId, readConfig, readDaemonConfig, readDaemonProjectionBaseline, readLocalAuditLog, readRelayJson, redactedDaemonConfig, requirePositional, requireRelayUrl, requireString, showMachine, startDaemonTimeoutMs, stopLocalDaemon, stopSpawnedDaemon, throwRelayHttpError, waitForDaemonReadiness, waitForDaemonSelfReadiness, wantsJson, withAccountConfigTransaction } from "./lib/index.js";
+import { assertLocalDaemonRuntimeMatchesConfig, assertLocalDaemonVerified, assertNoPendingEnrollmentAuthority, canonicalRelayUrl, cliErrorFromFetch, CliError, compactText, ControllerClient, configDir, configPath, daemonPidPath, deriveOrchestration, diagnoseInstallation, emitDoctorResult, ensureDaemonRunning, idleSessionStatuses, localDaemonStatus, ok, parsePairingClaimResponse, randomId, readConfig, readDaemonConfig, readDaemonProjectionBaseline, readLocalAuditLog, readRelayJson, redactedDaemonConfig, requirePositional, requireRelayUrl, requireString, restartDaemonForBootstrap, showMachine, startDaemonTimeoutMs, stopLocalDaemon, stopSpawnedDaemon, throwRelayHttpError, waitForDaemonReadiness, waitForDaemonSelfReadiness, wantsJson, withAccountConfigTransaction } from "./lib/index.js";
 function positiveLimit(flags, fallback) {
     const value = flags.limit;
     if (value === undefined)
@@ -324,12 +324,11 @@ export async function handleDaemon({ domain, action, flags }) {
             const baseline = client
                 ? await readDaemonProjectionBaseline(client, config.machineId, { timeoutMs: startDaemonTimeoutMs })
                 : undefined;
-            const daemon = await ensureDaemonRunning(config);
-            const readiness = await waitForLocalDaemonReadiness(client, config, baseline, daemon, daemon.started);
+            const daemon = await restartDaemonForBootstrap(config);
+            const readiness = await waitForLocalDaemonReadiness(client, config, baseline, daemon, true);
             return {
                 ...readiness.local,
                 started: daemon.started,
-                ...(daemon.autostartNeedsAttention ? { needsAttention: daemon.autostartNeedsAttention } : {}),
                 machineId: readiness.machine?.id ?? config.machineId,
                 relayAuthenticated: readiness.relayAuthenticated,
                 ...(readiness.relayAuthenticated === "verified" ? { online: true } : {}),
@@ -519,8 +518,6 @@ function writeHumanDaemonStartOutput(data) {
     if (data.relayAuthenticated === "unverified") {
         console.log("Local daemon identity is ready; relay authentication was not verified because this host has no matching Device credential.");
     }
-    if (data.needsAttention)
-        console.log(`Automatic startup needs attention: ${data.needsAttention}`);
     console.log("This command manages only the paired background daemon; it does not open a browser page.");
     console.log("For setup or browser onboarding, run: happy-elves start");
 }

package/apps/cli/dist/commands/lib/bootstrap-daemon.d.ts

@@ -10,7 +10,6 @@ export declare function ensureDaemonRunning(expectedConfig: DaemonConfig, cwd?:
     startedPid?: number;
     startedHandle?: SpawnedDaemonHandle;
     committedConfigMayBeInUse?: boolean;
-    autostartNeedsAttention?: string;
 }>;
 type BootstrapDaemonRestartOptions = {
     readStatus?: typeof localDaemonStatus;
@@ -27,7 +26,8 @@ type BootstrapDaemonRestartOptions = {
  * always loads the currently installed package before the browser opens.
  *
  * The lower-level `ensureDaemonRunning()` deliberately remains idempotent for
- * `happy-elves daemon start`, enrollment rollback, and service recovery.
+ * enrollment rollback and internal recovery flows. Public `start` commands
+ * use this explicit restart boundary so they load the installed package.
  */
 export declare function restartDaemonForBootstrap(expectedConfig: DaemonConfig, cwd?: string, options?: BootstrapDaemonRestartOptions): Promise<Awaited<ReturnType<typeof ensureDaemonRunning>> & {
     restarted: boolean;

package/apps/cli/dist/commands/lib/bootstrap-daemon.js

@@ -3,7 +3,7 @@ import { daemonRuntimeConfigFingerprint } from "../../../../../packages/shared/d
 import { CliError } from "../../errors.js";
 import { startDaemonTimeoutMs } from "./paths.js";
 import { readDaemonConfig } from "./config.js";
-import { assertLocalDaemonRuntimeMatchesConfig, assertLocalDaemonVerified, inspectLocalDaemonRuntime, ensureRunningDaemonAutostart, localDaemonStatus, readLocalDaemonPidIdentity, spawnDaemonStartTracked, stopLocalDaemon, stopSpawnedDaemon, } from "./local-daemon.js";
+import { assertLocalDaemonRuntimeMatchesConfig, assertLocalDaemonVerified, inspectLocalDaemonRuntime, localDaemonStatus, readLocalDaemonPidIdentity, spawnDaemonStartTracked, stopLocalDaemon, stopSpawnedDaemon, } from "./local-daemon.js";
 const committedConfigMayBeInUseErrors = new WeakSet();
 export function startFailureMayUseCommittedConfig(error) {
     return Boolean(error && typeof error === "object" && committedConfigMayBeInUseErrors.has(error));
@@ -34,26 +34,16 @@ export async function ensureDaemonRunning(expectedConfig, cwd = process.cwd()) {
         const owner = await readLocalDaemonPidIdentity();
         if (!owner.record)
             throw new CliError("Verified daemon owner identity is missing.", "DAEMON_PID_INVALID");
-        const autostart = await ensureRunningDaemonAutostart();
-        const confirmedOwner = await readLocalDaemonPidIdentity();
-        if (!confirmedOwner.record ||
-            confirmedOwner.record.pid !== owner.record.pid ||
-            confirmedOwner.record.instanceNonce !== owner.record.instanceNonce) {
-            throw committedConfigInUseError("The verified daemon owner changed while automatic startup was being inspected. No replacement process was started.");
-        }
         return {
             local: current,
             instanceGeneration: owner.record.instanceNonce,
             started: false,
             committedConfigMayBeInUse: true,
-            ...(autostart.state === "needs-attention"
-                ? { autostartNeedsAttention: autostart.message }
-                : {}),
         };
     }
     const handle = await spawnDaemonStartTracked([], cwd, daemonRuntimeConfigFingerprint(expectedConfig));
-    let startedPid = handle.pid || undefined;
-    if (handle.kind === "child" && !startedPid)
+    const startedPid = handle.pid || undefined;
+    if (!startedPid)
         throw new CliError("Daemon failed to start.", "DAEMON_START_FAILED");
     try {
         const spawnResult = await handle.spawnResult;
@@ -76,28 +66,16 @@ export async function ensureDaemonRunning(expectedConfig, cwd = process.cwd()) {
             }
             if (local.running) {
                 const owner = await readLocalDaemonPidIdentity();
-                const ownOwner = owner.record?.instanceNonce === handle.instanceNonce &&
-                    (handle.kind === "service" || owner.record.pid === handle.pid);
-                if (ownOwner && owner.record && handle.kind === "service") {
-                    handle.pid = owner.record.pid;
-                    handle.observedOwner = {
-                        pid: owner.record.pid,
-                        instanceNonce: owner.record.instanceNonce,
-                        startedAt: owner.record.startedAt,
-                    };
-                    startedPid = owner.record.pid;
-                }
+                const ownOwner = owner.record?.instanceNonce === handle.instanceNonce && owner.record.pid === handle.pid;
                 const runtime = await inspectLocalDaemonRuntime(expectedConfig);
                 if (!ownOwner) {
                     competingOwnerObserved = true;
                     if (runtime.state === "match") {
-                        if (handle.kind === "child") {
-                            try {
-                                await stopSpawnedDaemon(handle);
-                            }
-                            catch (cleanupError) {
-                                throw markCommittedConfigMayBeInUse(new CliError(`A matching daemon became owner, but this start attempt could not settle its own child: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`, "DAEMON_START_CLEANUP_FAILED"));
-                            }
+                        try {
+                            await stopSpawnedDaemon(handle);
+                        }
+                        catch (cleanupError) {
+                            throw markCommittedConfigMayBeInUse(new CliError(`A matching daemon became owner, but this start attempt could not settle its own child: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`, "DAEMON_START_CLEANUP_FAILED"));
                         }
                         const confirmedLocal = await localDaemonStatus();
                         try {
@@ -158,7 +136,7 @@ export async function ensureDaemonRunning(expectedConfig, cwd = process.cwd()) {
                 // A missing or stale marker is a bounded startup window. The daemon
                 // publishes its owner-bound marker atomically immediately after PID v2.
             }
-            if (handle.kind === "child" && !competingOwnerPending &&
+            if (!competingOwnerPending &&
                 (handle.child.exitCode !== null || handle.child.signalCode !== null)) {
                 throw new CliError("Daemon exited during startup.", "DAEMON_START_FAILED");
             }
@@ -189,7 +167,8 @@ export async function ensureDaemonRunning(expectedConfig, cwd = process.cwd()) {
  * always loads the currently installed package before the browser opens.
  *
  * The lower-level `ensureDaemonRunning()` deliberately remains idempotent for
- * `happy-elves daemon start`, enrollment rollback, and service recovery.
+ * enrollment rollback and internal recovery flows. Public `start` commands
+ * use this explicit restart boundary so they load the installed package.
  */
 export async function restartDaemonForBootstrap(expectedConfig, cwd = process.cwd(), options = {}) {
     const readStatus = options.readStatus ?? localDaemonStatus;

package/apps/cli/dist/commands/lib/bootstrap.js

@@ -290,7 +290,7 @@ export async function startBootstrap(flags) {
         return;
     }
     const { daemonBefore, controllerState, daemonState, daemon, machine, invite, daemonProcessNeedsAttention } = prepared;
-    const daemonNeedsAttention = daemonProcessNeedsAttention ?? daemon.autostartNeedsAttention;
+    const daemonNeedsAttention = daemonProcessNeedsAttention;
     await reconcileSatisfiedDeviceRecoveryPending(daemonState.config, controllerState.config);
     const data = {
         relayUrl: controllerState.config.relayUrl,

package/apps/cli/dist/commands/lib/doctor.js

@@ -5,7 +5,7 @@ import { daemonRuntimeConfigFingerprint, parseDaemonRuntimeIdentity, } from "../
 import { CliError } from "../../errors.js";
 import { CliExit } from "./cli-exit.js";
 import { canonicalRelayUrl, redactedControllerConfig, redactedDaemonConfig, requireRelayUrl, withAccountConfigTransaction, } from "./config.js";
-import { localDaemonAutostartStatus, localDaemonStatus, readLocalDaemonPidIdentity, } from "./local-daemon.js";
+import { localDaemonStatus, readLocalDaemonPidIdentity, } from "./local-daemon.js";
 import { ok, wantsJson, writeError } from "./json.js";
 import { configDir, configPath, daemonRuntimeIdentityPath } from "./paths.js";
 import { relayHealth } from "./relay-http.js";
@@ -50,29 +50,6 @@ export async function diagnoseInstallation(mode = "controller", requestedRelay)
     });
     const runtimeIdentity = await inspectRuntimeIdentity(local.running, daemon);
     checks.push(runtimeIdentity.check);
-    try {
-        const autostart = await localDaemonAutostartStatus();
-        const needsRepair = autostart.state === "needs-attention";
-        checks.push({
-            name: "daemon-automatic-startup",
-            ok: !needsRepair,
-            message: autostart.state === "running"
-                ? "Running"
-                : autostart.state === "installed"
-                    ? "Installed"
-                    : autostart.state === "unsupported"
-                        ? "Unsupported for this installation"
-                        : "Needs repair",
-            details: autostart,
-        });
-    }
-    catch (error) {
-        checks.push({
-            name: "daemon-automatic-startup",
-            ok: false,
-            message: diagnosticMessage(error),
-        });
-    }
     const configInvalid = controllerState === "invalid" || daemonState === "invalid";
     const controllerRecoveryRequired = Boolean(daemon) &&
         (controllerState === "missing" || controllerState === "recovery" || daemonState === "recovery" || splitBrain);
@@ -325,8 +302,6 @@ function firstFailureCode(checks) {
         return "CONFIG_MISSING_OR_INVALID";
     if (failed.name === "daemon-process")
         return "DAEMON_NOT_RUNNING";
-    if (failed.name === "daemon-automatic-startup")
-        return "DAEMON_AUTOSTART_REPAIR_REQUIRED";
     return "DOCTOR_ISSUES_FOUND";
 }
 function doctorFailureMessage(code) {
@@ -345,9 +320,6 @@ function doctorFailureMessage(code) {
     if (code === "CONFIG_INVALID") {
         return "A controller or daemon configuration file is malformed or unsafe. No credential was replaced; inspect the named failed check before attempting recovery.";
     }
-    if (code === "DAEMON_AUTOSTART_REPAIR_REQUIRED") {
-        return "This Daemon is usable now, but automatic startup needs repair. Open Settings > Daemons and choose Repair automatic startup.";
-    }
     return "Happy Elves doctor found issues. No configuration or process state was changed.";
 }
 function doctorRecoveryGuidance(code) {
@@ -381,9 +353,6 @@ function doctorRecoveryGuidance(code) {
     if (code === "CONFIG_INVALID") {
         return "Inspect the controller-config and daemon-config checks above. Preserve the files before using an explicit recovery command; start will not overwrite them.";
     }
-    if (code === "DAEMON_AUTOSTART_REPAIR_REQUIRED") {
-        return "Open Settings > Daemons and choose Repair automatic startup. Happy Elves will only repair its fixed user-level service.";
-    }
     return "Review the failed checks above before changing credentials or restarting the daemon.";
 }
 function diagnosticMessage(error) {

package/apps/cli/dist/commands/lib/local-daemon.d.ts

@@ -1,6 +1,5 @@
 import { type ChildProcess } from "node:child_process";
 import { isDaemonProcessAlive, type DaemonPidIdentity, type DaemonRuntimeIdentityV1 } from "../../../../../packages/shared/dist/node/daemon-process.js";
-import { inspectDaemonAutostartProjection, uninstallOwnedDaemonService, type DaemonServiceSpec } from "../../../../../packages/daemon-service/dist/index.js";
 import type { DaemonConfig } from "./types.js";
 type LocalDaemonState = "stopped" | "running" | "unverified";
 export type LocalDaemonStatus = {
@@ -28,26 +27,12 @@ type SpawnedChildDaemonHandle = {
         signal: NodeJS.Signals | null;
     }>;
 };
-type SpawnedManagedDaemonHandle = {
-    kind: "service";
+type DaemonOwnerFence = {
     pid: number;
     instanceNonce: string;
-    service: DaemonServiceSpec;
-    installedFresh: boolean;
-    spawnResult: Promise<{
-        spawned: true;
-    } | {
-        spawned: false;
-        error: Error;
-    }>;
-    observedOwner?: {
-        pid: number;
-        instanceNonce: string;
-        startedAt: number;
-    };
+    startedAt: number;
 };
-type DaemonOwnerFence = NonNullable<SpawnedManagedDaemonHandle["observedOwner"]>;
-export type SpawnedDaemonHandle = SpawnedChildDaemonHandle | SpawnedManagedDaemonHandle;
+export type SpawnedDaemonHandle = SpawnedChildDaemonHandle;
 export type LocalDaemonRuntimeInspection = {
     state: "match";
     identity: DaemonRuntimeIdentityV1;
@@ -65,30 +50,17 @@ export type LocalDaemonRuntimeInspection = {
 export declare const isPidAlive: typeof isDaemonProcessAlive;
 export declare function readLocalDaemonPidIdentity(): Promise<DaemonPidIdentity>;
 export declare function localDaemonStatus(): Promise<LocalDaemonStatus>;
-export declare function localDaemonAutostartStatus(): Promise<import("../../../../../packages/daemon-service/dist/index.js").DaemonAutostartProjection>;
-export type RunningDaemonAutostartResult = {
-    state: "installed";
-} | {
-    state: "unsupported";
-} | {
-    state: "needs-attention";
-    code: string;
-    message: string;
-};
-/**
- * Inspect automatic startup without starting, stopping, registering, or
- * replacing anything while a healthy Daemon owns the lifetime lease. In
- * particular, registering a launchd RunAtLoad job here would briefly launch a
- * second child and could arm KeepAlive retries. Missing/repairable service
- * state is therefore projected for the next controlled restart or UI Repair.
- */
-export declare function ensureRunningDaemonAutostart(options?: {
-    inspectAutostart?: typeof inspectDaemonAutostartProjection;
-}): Promise<RunningDaemonAutostartResult>;
 export declare function inspectLocalDaemonRuntime(config: DaemonConfig): Promise<LocalDaemonRuntimeInspection>;
 export declare function assertLocalDaemonRuntimeMatchesConfig(config: DaemonConfig): Promise<void>;
 export declare function assertLocalDaemonVerified(status: LocalDaemonStatus): void;
-export declare function spawnDaemonStartTracked(args: string[], cwd?: string, expectedConfigFingerprint?: string): Promise<SpawnedDaemonHandle>;
+export declare function spawnDaemonStartTracked(args: string[], cwd?: string, _expectedConfigFingerprint?: string): Promise<SpawnedDaemonHandle>;
+/**
+ * A direct replacement is deliberately a child of the invoking CLI rather
+ * than a launchd/systemd/Task process. Preserve the caller's complete
+ * provider environment (notably Homebrew's PATH) and override only the
+ * isolated Happy Elves home it is authorized to own.
+ */
+export declare function directDaemonChildEnvironment(parentEnvironment?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 /**
  * Stop only the exact child created by the current `start` attempt. A PID-file
  * owner that appeared concurrently is never signalled or removed.
@@ -96,7 +68,6 @@ export declare function spawnDaemonStartTracked(args: string[], cwd?: string, ex
 export declare function stopSpawnedDaemon(handle: SpawnedDaemonHandle, timeoutMs?: number, options?: {
     readIdentity?: typeof readLocalDaemonPidIdentity;
     stopLocal?: typeof stopLocalDaemon;
-    uninstallService?: typeof uninstallOwnedDaemonService;
 }): Promise<void>;
 export declare function stopLocalDaemon(timeoutMs?: number, expectedOwner?: DaemonOwnerFence): Promise<LocalDaemonStatus & {
     stopped: boolean;