@adhdev/daemon-core 0.9.82-rc.45 → 0.9.82-rc.450

package/src/boot/daemon-lifecycle.ts

@@ -37,6 +37,10 @@ import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 import type { IdeProviderInstance } from '../providers/ide-provider-instance.js';
 import { createDefaultGitCommandServices } from '../git/git-commands.js';
 import { setupMeshEventForwarding } from '../mesh/mesh-events.js';
+import { setupMeshReconcileLoop } from '../mesh/mesh-reconcile-loop.js';
+import { loadMeshCoordinatorRegistry } from '../mesh/coordinator-registry.js';
+import { applyProcessHardening } from './process-hardening.js';
+import { installProviderProcessShim } from '../providers/sdk/v1/sandbox/require-whitelist.js';
 
 // ─── Init Config ───
 
@@ -60,6 +64,7 @@ export interface DaemonInitConfig {
 
     /** Router transport-specific callbacks */
     onStatusChange?: () => void;
+    onMeshStateChange?: (meshId: string) => void;
     onPostChatCommand?: () => void;
     sessionHostControl?: SessionHostControlPlane | null;
     getCdpLogFn?: (ideType: string) => (msg: string) => void;
@@ -88,6 +93,8 @@ export interface DaemonInitConfig {
     dispatchMeshCommand?: (daemonId: string, command: string, args: Record<string, unknown>) => Promise<any>;
     /** Returns selected-coordinator mesh peer telemetry for a target daemon when available. */
     getMeshPeerConnectionStatus?: (daemonId: string) => Record<string, unknown> | null;
+    /** Cloud-only: P2P dashboard metadata sync after the core forwarder handles a mesh event. */
+    onMeshCoordinatorEventForwarded?: (payload: Record<string, unknown>) => void;
 }
 
 // ─── Result ───
@@ -106,6 +113,31 @@ export interface DaemonComponents {
     detectedIdes: { value: IDEInfo[] };
     refreshProviderAvailability: (providerType?: string) => Promise<void>;
     dispatchMeshCommand?: (daemonId: string, command: string, args: Record<string, unknown>) => Promise<any>;
+    // Cloud-only: live selected-coordinator mesh peer telemetry for a target daemon.
+    // Lets the remote task-dispatch path (mesh-events-coordinator deliverTaskToSession)
+    // tell a still-opening DataChannel ("cold") apart from an open one ("warm") so a
+    // cold-open handshake is charged to the connect budget, not the response budget.
+    // Injected by daemon-cloud; absent on standalone (no P2P mesh), where the remote
+    // dispatch path is unused.
+    getMeshPeerConnectionStatus?: (daemonId: string) => Record<string, unknown> | null;
+    // Cloud-only hook: after the single core forwarder handles a mesh coordinator event, cloud
+    // uses this to keep its P2P dashboard view in sync (mesh-owned session metadata + flush
+    // subscriptions). Injected by daemon-cloud; absent/no-op on standalone. Replaces cloud's
+    // former separate instanceManager.onEvent listener so the event path stays single-listener.
+    onMeshCoordinatorEventForwarded?: (payload: Record<string, unknown>) => void;
+    // Periodic queue → live-coordinator reconcile loop handle. Set during
+    // initDaemonComponents, stopped during shutdownDaemonComponents. Drives the
+    // single-model (queue + polling) delivery: drains the pending-events queue
+    // on a fixed interval and injects into live CLI coordinators when idle.
+    meshReconcileLoop?: { stop(): void };
+    // Canonical status/daemon identity (e.g. `standalone_<machineId>` /
+    // `daemon_<machineId>`). This is the SAME id the MCP layer stamps as a
+    // worker's meshCoordinatorDaemonId (ctx.localDaemonId, sourced from
+    // getStatus().status.instanceId), so the reconcile loop MUST drain with it —
+    // draining with bare loadConfig().machineId never matches a unicast event
+    // stamped with the prefixed status id. Absent → reconcile falls back to
+    // machineId only.
+    statusInstanceId?: string;
 }
 
 export interface DaemonDevSupportOptions {
@@ -129,8 +161,16 @@ export interface DaemonDevSupportOptions {
  *   8. Start instance ticking
  */
 export async function initDaemonComponents(config: DaemonInitConfig): Promise<DaemonComponents> {
+    // 0. Process-level hardening (must run before any provider script is loaded).
+    //    Freezes built-in prototypes (Object/Array/Function/String/Number/Boolean/Promise)
+    //    and shadows process.exit/kill/abort/binding/dlopen so provider-script callers
+    //    throw instead of killing the daemon. See ./process-hardening.ts for details.
+    applyProcessHardening();
+    installProviderProcessShim();
+
     // 1. Global log interceptor
     installGlobalInterceptor();
+    loadMeshCoordinatorRegistry();
 
     // 2. ProviderLoader (provider source mode from config.json)
     const appConfig = loadConfig();
@@ -142,16 +182,11 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
         userDir: appConfig.providerDir,
     });
 
-    // If no upstream providers exist, fetch them first (blocking — critical for new users)
-    if (!disableUpstream && !providerLoader.hasUpstream()) {
-        LOG.info('Provider', 'No upstream providers found — downloading from GitHub...');
-        try {
-            await providerLoader.fetchLatest();
-        } catch (e: any) {
-            LOG.warn('Provider', `⚠ Failed to fetch providers: ${e?.message}`);
-        }
-    }
-
+    // Boot-time auto-sync is intentionally disabled. The user picks which
+    // providers to install via the dashboard onboarding / Providers tab; the
+    // daemon ships empty and only contains what the user explicitly installs.
+    // Manual sync is still available via the install / check_provider_updates
+    // commands (and the REST endpoint at /api/v1/providers/updates).
     providerLoader.loadAll();
     providerLoader.registerToDetector();
 
@@ -304,11 +339,13 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
         },
         onIdeConnected: () => poller?.start(),
         onStatusChange: config.onStatusChange,
+        onMeshStateChange: config.onMeshStateChange,
         onPostChatCommand: config.onPostChatCommand,
         sessionHostControl: config.sessionHostControl,
         statusInstanceId: config.statusInstanceId,
         statusVersion: config.statusVersion,
         getMeshPeerConnectionStatus: config.getMeshPeerConnectionStatus,
+        dispatchMeshCommand: config.dispatchMeshCommand,
         getCdpLogFn: config.getCdpLogFn || ((ideType: string) => LOG.forComponent(`CDP:${ideType}`).asLogFn()),
     });
 
@@ -325,7 +362,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
     // 10. Start instance ticking
     instanceManager.startTicking(config.tickIntervalMs ?? 5_000);
 
-    const components = {
+    const components: DaemonComponents = {
         providerLoader,
         instanceManager,
         cliManager,
@@ -339,10 +376,22 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
         detectedIdes: detectedIdesRef,
         refreshProviderAvailability,
         dispatchMeshCommand: config.dispatchMeshCommand,
+        getMeshPeerConnectionStatus: config.getMeshPeerConnectionStatus,
+        onMeshCoordinatorEventForwarded: config.onMeshCoordinatorEventForwarded,
+        statusInstanceId: config.statusInstanceId,
     };
 
-    // 11. Setup Mesh Event Forwarding
+    // 11. Setup Mesh Event Forwarding (queue persistence) + periodic reconcile loop.
+    // injectMeshSystemMessage now ONLY persists events to the pending-events queue;
+    // the reconcile loop drains that queue on a fixed interval and injects into live
+    // CLI coordinators when idle (and, in cloud mode, pulls remote worker daemons'
+    // queues over P2P). This is the single-model (queue + polling) replacement for the
+    // old spontaneous-forward push paths.
     setupMeshEventForwarding(components);
+    components.meshReconcileLoop = setupMeshReconcileLoop(components);
+
+    // 12. Resume any refine jobs that were interrupted by a previous daemon restart.
+    setImmediate(() => void router.resumePendingRefineJobsOnStartup());
 
     return components;
 }
@@ -384,11 +433,13 @@ export async function shutdownDaemonComponents(components: DaemonComponents): Pr
     const {
         poller, cdpInitializer, agentStreamManager,
         cliManager, instanceManager, cdpManagers,
+        meshReconcileLoop,
     } = components;
 
     // 1. Stop timers
     poller.stop();
     cdpInitializer.stop();
+    try { meshReconcileLoop?.stop(); } catch { /* noop */ }
 
     // 2. Dispose agent stream
     try {

package/src/boot/process-hardening.ts

@@ -0,0 +1,89 @@
+/**
+ * Process-level hardening — boot-time mitigations against provider scripts.
+ *
+ * Provider scripts run in-process (see providers/sdk/v1/sandbox/README-design.ts).
+ * The require() whitelist (sandbox/require-whitelist.ts) blocks the obvious
+ * attack surfaces (no `child_process.exec`, no `fs.writeFile`, no `net`, etc.)
+ * but a malicious or buggy script can still:
+ *
+ *   1. Pollute Object.prototype to influence the daemon's downstream consumers
+ *      (e.g. `Object.prototype.toString = () => '...'` makes every untagged
+ *      object stringify to that value across the whole process).
+ *   2. Mutate Array/Function/String prototypes for similar effect.
+ *   3. Call `process.exit()` / `process.kill()` to kill the daemon.
+ *
+ * Sandbox isolation (isolated-vm) is the proper fix but has a real perf cost
+ * and a real marshalling-complexity cost. As a cheaper layer we just freeze
+ * the built-in prototypes at boot, which is irreversible and catches every
+ * prototype-pollution variant for the lifetime of the process.
+ *
+ * `applyProcessHardening()` is idempotent — calling it twice is a no-op the
+ * second time. The function intentionally swallows any "cannot redefine
+ * property" errors that would arise if some upstream code already froze
+ * the same prototype: the post-condition (prototype is frozen) is satisfied
+ * either way.
+ *
+ * Trade-offs:
+ *   - Read-only access to prototype methods (`Object.prototype.hasOwnProperty.call`,
+ *     `Array.prototype.slice.call`, etc.) is unaffected — only writes throw.
+ *   - Some older npm libraries patch Array.prototype or Function.prototype at
+ *     import time. If a daemon-core dep does this, the import will throw. The
+ *     daemon-core vitest suite is the canonical regression check for this.
+ *   - We deliberately do NOT freeze RegExp.prototype, Error.prototype, Map/Set
+ *     prototypes, or Date.prototype because at least one of those tends to be
+ *     mutated by mainstream test/runtime libs and the value of freezing them
+ *     is low (no useful prototype-pollution attack surface).
+ */
+
+let _hardened = false;
+
+/** Prototypes that get frozen at boot. */
+const HARDENED_PROTOS: Array<{ name: string; proto: object }> = [
+    { name: 'Object', proto: Object.prototype },
+    { name: 'Array', proto: Array.prototype },
+    { name: 'Function', proto: Function.prototype },
+    { name: 'String', proto: String.prototype },
+    { name: 'Number', proto: Number.prototype },
+    { name: 'Boolean', proto: Boolean.prototype },
+    { name: 'Promise', proto: Promise.prototype },
+];
+
+/**
+ * Freeze the canonical built-in prototypes so provider scripts (and anything
+ * else running in this process) cannot mutate them. Idempotent.
+ *
+ * Returns the list of prototype names that were newly frozen — primarily for
+ * tests / observability. Already-frozen prototypes are not re-reported.
+ */
+export function applyProcessHardening(): string[] {
+    if (_hardened) return [];
+    _hardened = true;
+
+    const newlyFrozen: string[] = [];
+    for (const entry of HARDENED_PROTOS) {
+        if (Object.isFrozen(entry.proto)) continue;
+        try {
+            Object.freeze(entry.proto);
+            newlyFrozen.push(entry.name);
+        } catch {
+            // Some host/runtime combinations refuse to freeze a built-in
+            // prototype (e.g. it has a non-configurable accessor). We treat
+            // this as best-effort — log nothing here (logger not guaranteed
+            // to be initialized this early) and move on. Subsequent reads
+            // of `Object.isFrozen(proto)` will reveal the gap.
+        }
+    }
+    return newlyFrozen;
+}
+
+/** For tests only — clears the internal "already hardened" flag. The
+ *  prototypes themselves cannot be un-frozen, so this is mostly useful for
+ *  testing the idempotency guard. */
+export function _resetProcessHardeningForTest(): void {
+    _hardened = false;
+}
+
+/** For tests only — peek at the hardened state. */
+export function _isProcessHardened(): boolean {
+    return _hardened;
+}

package/src/build-info.ts

@@ -0,0 +1,73 @@
+/**
+ * Daemon build stamp — single runtime source for "which commit is this running
+ * daemon built from?".
+ *
+ * The values are injected at BUILD time via tsup `define` (esbuild global
+ * replacement). Every build config that bundles daemon-core into a shippable
+ * daemon (daemon-core's own dist, daemon-standalone, daemon-cloud) replaces
+ * these `__DAEMON_BUILD_*` identifiers with the literal git commit/version that
+ * was current when the bundle was produced. See:
+ *   - oss/packages/daemon-core/tsup.config.ts      (standalone consumes this dist)
+ *   - packages/daemon-cloud/tsup.config.ts         (re-bundles daemon-core from source)
+ *
+ * If a bundle is produced WITHOUT the define (e.g. running src directly through
+ * tsx in dev, or a build env without git), the identifiers stay undefined and
+ * we fall back to `"unknown"` — never a ReferenceError, never a build failure.
+ *
+ * IMPORTANT (live-reflection caveat): a fresh local `daemon-core dist` rebuild +
+ * daemon restart is NOT enough to make a *cloud* daemon report a new commit —
+ * daemon-cloud ships its own re-bundle of daemon-core, so the build stamp only
+ * advances after the cloud daemon is rebuilt/redeployed and restarted. This is
+ * precisely the gap `mesh_status`'s `staleDaemonBuild` warning exists to surface.
+ */
+
+// These are replaced at build time by tsup `define`. `typeof` guards keep this
+// safe when the define is absent (the identifiers are simply not declared).
+declare const __DAEMON_BUILD_COMMIT__: string | undefined;
+declare const __DAEMON_BUILD_COMMIT_SHORT__: string | undefined;
+declare const __DAEMON_BUILD_VERSION__: string | undefined;
+declare const __DAEMON_BUILD_AT__: string | undefined;
+
+export interface DaemonBuildInfo {
+    /** Full 40-char git commit the daemon bundle was built from, or 'unknown'. */
+    commit: string;
+    /** Short (7-char) form of the same commit, or 'unknown'. */
+    commitShort: string;
+    /** package.json version baked in at build time, or 'unknown'. */
+    version: string;
+    /** ISO build timestamp if the build config injected one. */
+    builtAt?: string;
+}
+
+function readInjected(value: string | undefined): string | undefined {
+    if (typeof value !== 'string') return undefined;
+    const trimmed = value.trim();
+    if (!trimmed || trimmed === 'unknown') return undefined;
+    return trimmed;
+}
+
+let cached: DaemonBuildInfo | undefined;
+
+/**
+ * Resolve the build stamp baked into the running daemon bundle. Pure read of
+ * build-time constants — no I/O, safe to call from any runtime path. Cached.
+ */
+export function getDaemonBuildInfo(): DaemonBuildInfo {
+    if (cached) return cached;
+
+    const commit =
+        readInjected(typeof __DAEMON_BUILD_COMMIT__ !== 'undefined' ? __DAEMON_BUILD_COMMIT__ : undefined)
+        ?? 'unknown';
+    const commitShort =
+        readInjected(typeof __DAEMON_BUILD_COMMIT_SHORT__ !== 'undefined' ? __DAEMON_BUILD_COMMIT_SHORT__ : undefined)
+        ?? (commit !== 'unknown' ? commit.slice(0, 7) : 'unknown');
+    const version =
+        readInjected(typeof __DAEMON_BUILD_VERSION__ !== 'undefined' ? __DAEMON_BUILD_VERSION__ : undefined)
+        // Fall back to the runtime-injected package version env used elsewhere.
+        ?? readInjected(typeof process !== 'undefined' ? process.env?.ADHDEV_PKG_VERSION : undefined)
+        ?? 'unknown';
+    const builtAt = readInjected(typeof __DAEMON_BUILD_AT__ !== 'undefined' ? __DAEMON_BUILD_AT__ : undefined);
+
+    cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
+    return cached;
+}