@openrig/cli 0.0.1 → 0.1.1

package/daemon/dist/domain/profile-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile-resolver.d.ts","sourceRoot":"","sources":["../../src/domain/profile-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAC8B,iBAAiB,EACzD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EACnD,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EACjF,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKhF,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,aAAa,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,YAAY,GAAG,eAAe,CAAC;CAChG;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,YAAY,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACnC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,eAAe,CAAC,EAAE,YAAY,CAAC;CAChC;AAED,MAAM,MAAM,gBAAgB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,GACxC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAwBpC;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,gBAAgB,CAqE1E"}

package/daemon/dist/domain/profile-resolver.js

@@ -0,0 +1,201 @@
+import { resolveStartup } from "./startup-resolver.js";
+// -- Constants --
+const RESOURCE_CATEGORIES = ["skills", "guidance", "subagents", "hooks", "runtimeResources"];
+const YAML_CATEGORY_MAP = {
+    skills: "skills",
+    guidance: "guidance",
+    subagents: "subagents",
+    hooks: "hooks",
+    runtime_resources: "runtimeResources",
+    runtimeResources: "runtimeResources",
+};
+const RESTORE_POLICY_LEVEL = {
+    resume_if_possible: 0,
+    relaunch_fresh: 1,
+    checkpoint_only: 2,
+};
+// -- Public API --
+/**
+ * Resolve effective node configuration from agent spec, profile, and rig context.
+ * @param ctx - resolution context with all inputs
+ * @returns resolved config or errors
+ */
+export function resolveNodeConfig(ctx) {
+    const errors = [];
+    const { baseSpec, importedSpecs, profileName, member, pod, rig } = ctx;
+    const spec = baseSpec.spec;
+    // 1. Validate profile exists
+    const profile = spec.profiles[profileName];
+    if (!profile) {
+        return { ok: false, errors: [`Profile "${profileName}" not found in spec "${spec.name}". Available: ${Object.keys(spec.profiles).join(", ") || "(none)"}`] };
+    }
+    // 2. Build combined resource pool
+    const pool = buildResourcePool(baseSpec, importedSpecs);
+    // 3. Resolve profile uses against pool
+    const selectedResult = resolveProfileUses(profile, pool, spec.name, errors);
+    if (errors.length > 0) {
+        return { ok: false, errors };
+    }
+    // 4. Resolve runtime (member authoritative)
+    const runtime = member.runtime
+        ?? profile.preferences?.runtime
+        ?? spec.defaults?.runtime
+        ?? "claude-code";
+    // 5. Resolve model (member overrides)
+    const model = member.model
+        ?? profile.preferences?.model
+        ?? spec.defaults?.model;
+    // 6. Resolve cwd (member authoritative, required)
+    const cwd = member.cwd;
+    // 7. Resolve restorePolicy with narrowing
+    const restorePolicyResult = resolveRestorePolicy(spec, profile, member);
+    if (!restorePolicyResult.ok) {
+        return { ok: false, errors: [restorePolicyResult.error] };
+    }
+    // 8. Resolve lifecycle
+    const lifecycle = profile.lifecycle ?? spec.defaults?.lifecycle;
+    // 9. Resolve startup layering
+    const startup = resolveStartup({
+        specStartup: spec.startup,
+        profileStartup: profile.startup,
+        rigCultureFile: rig.cultureFile,
+        rigStartup: rig.startup,
+        podStartup: pod.startup,
+        memberStartup: member.startup,
+        operatorStartup: ctx.operatorStartup,
+    });
+    return {
+        ok: true,
+        config: {
+            runtime,
+            model,
+            cwd,
+            restorePolicy: restorePolicyResult.policy,
+            lifecycle,
+            selectedResources: selectedResult,
+            startup,
+            resolvedSpecName: spec.name,
+            resolvedSpecVersion: spec.version,
+            resolvedSpecHash: baseSpec.hash,
+        },
+    };
+}
+function buildResourcePool(base, imports) {
+    const pool = {
+        skills: new Map(),
+        guidance: new Map(),
+        subagents: new Map(),
+        hooks: new Map(),
+        runtimeResources: new Map(),
+    };
+    // Base spec resources (unqualified id)
+    for (const cat of RESOURCE_CATEGORIES) {
+        const resources = base.spec.resources[cat];
+        for (const r of resources) {
+            const entries = pool[cat].get(r.id) ?? [];
+            entries.push({ effectiveId: r.id, sourceSpec: base.spec.name, sourcePath: base.sourcePath, resource: r });
+            pool[cat].set(r.id, entries);
+        }
+    }
+    // Imported spec resources (qualified id only)
+    // Per proposal: "base resources keep the unqualified local id" and
+    // "colliding imported resources remain addressable only by qualified id"
+    for (const imp of imports) {
+        for (const cat of RESOURCE_CATEGORIES) {
+            const resources = imp.spec.resources[cat];
+            for (const r of resources) {
+                const qualifiedId = `${imp.spec.name}:${r.id}`;
+                // Index under qualified id only
+                const qualEntries = pool[cat].get(qualifiedId) ?? [];
+                qualEntries.push({ effectiveId: qualifiedId, sourceSpec: imp.spec.name, sourcePath: imp.sourcePath, resource: r });
+                pool[cat].set(qualifiedId, qualEntries);
+                // If no base resource with this id exists, also index under unqualified id
+                // so a single import's resource can be referenced without qualification.
+                // If a base resource exists, the base owns the unqualified id (no collision).
+                // If multiple imports share the same unqualified id (no base), it's ambiguous.
+                if (!pool[cat].has(r.id)) {
+                    pool[cat].set(r.id, [{ effectiveId: qualifiedId, sourceSpec: imp.spec.name, sourcePath: imp.sourcePath, resource: r }]);
+                }
+                else {
+                    const existing = pool[cat].get(r.id);
+                    // Only add for ambiguity if the existing entry is NOT from the base spec
+                    const hasBase = existing.some((e) => e.sourceSpec === base.spec.name);
+                    if (!hasBase) {
+                        existing.push({ effectiveId: qualifiedId, sourceSpec: imp.spec.name, sourcePath: imp.sourcePath, resource: r });
+                    }
+                    // If base owns it, imported version is only reachable via qualified id — no unqualified indexing
+                }
+            }
+        }
+    }
+    return pool;
+}
+function resolveProfileUses(profile, pool, baseSpecName, errors) {
+    const result = {
+        skills: [],
+        guidance: [],
+        subagents: [],
+        hooks: [],
+        runtimeResources: [],
+    };
+    const usesMap = {
+        skills: profile.uses.skills,
+        guidance: profile.uses.guidance,
+        subagents: profile.uses.subagents,
+        hooks: profile.uses.hooks,
+        runtimeResources: profile.uses.runtimeResources,
+    };
+    for (const cat of RESOURCE_CATEGORIES) {
+        const refs = usesMap[cat] ?? [];
+        for (const ref of refs) {
+            const entries = pool[cat].get(ref);
+            if (!entries || entries.length === 0) {
+                errors.push(`Profile uses ${cat}: "${ref}" not found in resource pool`);
+                continue;
+            }
+            if (entries.length > 1) {
+                // Ambiguous unqualified reference
+                const sources = entries.map((e) => e.sourceSpec).join(", ");
+                errors.push(`Profile uses ${cat}: "${ref}" is ambiguous (declared in: ${sources}). Use a qualified id like "specname:${ref}"`);
+                continue;
+            }
+            result[cat].push({
+                effectiveId: entries[0].effectiveId,
+                sourceSpec: entries[0].sourceSpec,
+                sourcePath: entries[0].sourcePath,
+                resource: entries[0].resource,
+            });
+        }
+    }
+    return errors.length > 0 ? null : result;
+}
+// -- Restore policy narrowing --
+function resolveRestorePolicy(spec, profile, member) {
+    let current = spec.defaults?.lifecycle?.restorePolicy ?? "resume_if_possible";
+    let currentLevel = RESTORE_POLICY_LEVEL[current] ?? 0;
+    // Profile narrows
+    if (profile.lifecycle?.restorePolicy) {
+        const profileLevel = RESTORE_POLICY_LEVEL[profile.lifecycle.restorePolicy];
+        if (profileLevel === undefined) {
+            return { ok: false, error: `Invalid restorePolicy in profile: "${profile.lifecycle.restorePolicy}"` };
+        }
+        if (profileLevel < currentLevel) {
+            return { ok: false, error: `Profile restorePolicy "${profile.lifecycle.restorePolicy}" broadens "${current}" — only narrowing is allowed` };
+        }
+        current = profile.lifecycle.restorePolicy;
+        currentLevel = profileLevel;
+    }
+    // Member narrows
+    if (member.restorePolicy) {
+        const memberLevel = RESTORE_POLICY_LEVEL[member.restorePolicy];
+        if (memberLevel === undefined) {
+            return { ok: false, error: `Invalid restorePolicy on member: "${member.restorePolicy}"` };
+        }
+        if (memberLevel < currentLevel) {
+            return { ok: false, error: `Member restorePolicy "${member.restorePolicy}" broadens "${current}" — only narrowing is allowed` };
+        }
+        current = member.restorePolicy;
+    }
+    return { ok: true, policy: current };
+}
+//# sourceMappingURL=profile-resolver.js.map

package/daemon/dist/domain/profile-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile-resolver.js","sourceRoot":"","sources":["../../src/domain/profile-resolver.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/projection-planner.d.ts

@@ -0,0 +1,54 @@
+import type { StartupBlock } from "./types.js";
+import type { ResolvedNodeConfig } from "./profile-resolver.js";
+import type { ResourceCollision } from "./agent-resolver.js";
+export type ProjectionClassification = "safe_projection" | "managed_merge" | "hash_conflict" | "no_op";
+export interface ProjectionEntry {
+    category: "skill" | "guidance" | "subagent" | "hook" | "runtime_resource";
+    effectiveId: string;
+    sourceSpec: string;
+    sourcePath: string;
+    resourcePath: string;
+    absolutePath: string;
+    classification: ProjectionClassification;
+    conflictDetail?: {
+        reason: string;
+        existingHash?: string;
+        sourceHash?: string;
+    };
+    mergeStrategy?: "managed_block" | "append";
+    target?: string;
+}
+export interface ProjectionPlan {
+    runtime: string;
+    cwd: string;
+    entries: ProjectionEntry[];
+    startup: StartupBlock;
+    conflicts: ProjectionEntry[];
+    noOps: ProjectionEntry[];
+    diagnostics: string[];
+}
+export interface ProjectionFsOps {
+    readFile(path: string): string;
+    exists(path: string): boolean;
+}
+export interface ProjectionInput {
+    config: ResolvedNodeConfig;
+    collisions: ResourceCollision[];
+    fsOps: ProjectionFsOps;
+    /** Optional: resolve target path for conflict detection. If absent, all entries are safe_projection. */
+    resolveTargetPath?: (category: string, effectiveId: string, cwd: string) => string | null;
+}
+export type PlanResult = {
+    ok: true;
+    plan: ProjectionPlan;
+} | {
+    ok: false;
+    errors: string[];
+};
+/**
+ * Plan the effective runtime projection for one resolved node.
+ * @param input - resolved config, collision diagnostics, and filesystem ops
+ * @returns projection plan or errors
+ */
+export declare function planProjection(input: ProjectionInput): PlanResult;
+//# sourceMappingURL=projection-planner.d.ts.map

package/daemon/dist/domain/projection-planner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projection-planner.d.ts","sourceRoot":"","sources":["../../src/domain/projection-planner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,KAAK,EAAE,kBAAkB,EAAwC,MAAM,uBAAuB,CAAC;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAI7D,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,GAAG,eAAe,GAAG,eAAe,GAAG,OAAO,CAAC;AAEvG,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,kBAAkB,CAAC;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,wBAAwB,CAAC;IACzC,cAAc,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChF,aAAa,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,EAAE,eAAe,CAAC;IACvB,wGAAwG;IACxG,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CAC3F;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,GAClC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAcpC;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,CA8FjE"}

package/daemon/dist/domain/projection-planner.js

@@ -0,0 +1,128 @@
+import nodePath from "node:path";
+import { classifyResourceProjection } from "./conflict-detector.js";
+// -- Category mapping --
+const CATEGORY_MAP = {
+    skills: "skill",
+    guidance: "guidance",
+    subagents: "subagent",
+    hooks: "hook",
+    runtimeResources: "runtime_resource",
+};
+// -- Public API --
+/**
+ * Plan the effective runtime projection for one resolved node.
+ * @param input - resolved config, collision diagnostics, and filesystem ops
+ * @returns projection plan or errors
+ */
+export function planProjection(input) {
+    const { config, collisions, fsOps } = input;
+    const errors = [];
+    const diagnostics = [];
+    const entries = [];
+    // Check for import/import ambiguity in selected resources
+    const ambiguityErrors = checkAmbiguity(config.selectedResources, collisions);
+    if (ambiguityErrors.length > 0) {
+        return { ok: false, errors: ambiguityErrors };
+    }
+    // Record collision diagnostics
+    for (const col of collisions) {
+        if (col.sources.length >= 2) {
+            diagnostics.push(`Collision in ${col.category}: "${col.resourceId}" declared by ${col.sources.map((s) => s.specName).join(", ")}`);
+        }
+    }
+    // Plan each resource category
+    for (const [catKey, catSingular] of Object.entries(CATEGORY_MAP)) {
+        const resources = config.selectedResources[catKey];
+        for (const qr of resources) {
+            // Runtime resource filtering
+            if (catKey === "runtimeResources") {
+                const rr = qr.resource;
+                if (rr.runtime !== config.runtime)
+                    continue;
+            }
+            const resourcePath = qr.resource.path;
+            const absolutePath = nodePath.resolve(qr.sourcePath, resourcePath);
+            const entry = {
+                category: catSingular,
+                effectiveId: qr.effectiveId,
+                sourceSpec: qr.sourceSpec,
+                sourcePath: qr.sourcePath,
+                resourcePath,
+                absolutePath,
+                classification: "safe_projection",
+            };
+            // Guidance-specific
+            if (catKey === "guidance") {
+                const g = qr.resource;
+                entry.target = g.target;
+                entry.mergeStrategy = g.merge;
+            }
+            // Classify using hash-based conflict detection
+            if (input.resolveTargetPath) {
+                const targetPath = input.resolveTargetPath(catSingular, qr.effectiveId, config.cwd);
+                if (targetPath) {
+                    entry.classification = classifyResourceProjection(entry.absolutePath, targetPath, catSingular, entry.mergeStrategy, fsOps);
+                    if (entry.classification === "hash_conflict") {
+                        entry.conflictDetail = {
+                            reason: `${catSingular} "${qr.effectiveId}" exists at target with different content`,
+                        };
+                    }
+                }
+            }
+            // Without resolveTargetPath, classification stays safe_projection (deferred to adapter)
+            entries.push(entry);
+        }
+    }
+    // Sort deterministically: by category then effectiveId
+    entries.sort((a, b) => {
+        const catCmp = a.category.localeCompare(b.category);
+        return catCmp !== 0 ? catCmp : a.effectiveId.localeCompare(b.effectiveId);
+    });
+    const conflicts = entries.filter((e) => e.classification === "hash_conflict");
+    const noOps = entries.filter((e) => e.classification === "no_op");
+    return {
+        ok: true,
+        plan: {
+            runtime: config.runtime,
+            cwd: config.cwd,
+            entries,
+            startup: config.startup,
+            conflicts,
+            noOps,
+            diagnostics,
+        },
+    };
+}
+// -- Ambiguity guard --
+function checkAmbiguity(selected, collisions) {
+    const errors = [];
+    // Check each category separately — collisions are category-scoped
+    const categoryEntries = [
+        { category: "skills", resources: selected.skills },
+        { category: "guidance", resources: selected.guidance },
+        { category: "subagents", resources: selected.subagents },
+        { category: "hooks", resources: selected.hooks },
+        { category: "runtimeResources", resources: selected.runtimeResources },
+    ];
+    for (const { category, resources } of categoryEntries) {
+        for (const qr of resources) {
+            // Only check unqualified ids (no colon)
+            if (qr.effectiveId.includes(":"))
+                continue;
+            // Find matching collision IN THE SAME CATEGORY
+            const collision = collisions.find((c) => c.category === category && c.resourceId === qr.effectiveId);
+            if (!collision || collision.sources.length < 2)
+                continue;
+            // Check if base owns the unqualified id
+            const baseOwner = collision.sources.find((s) => s.qualifiedId === collision.resourceId);
+            if (baseOwner)
+                continue; // base owns it — not ambiguous
+            // No base owner — import/import ambiguity
+            errors.push(`Ambiguous resource "${qr.effectiveId}" in selected resources: declared by ${collision.sources.map((s) => s.specName).join(", ")}. Use a qualified id like "${collision.sources[0].qualifiedId}"`);
+        }
+    }
+    return errors;
+}
+// Classification is now handled via classifyResourceProjection from conflict-detector.ts
+// when resolveTargetPath is provided. Without it, entries default to safe_projection.
+//# sourceMappingURL=projection-planner.js.map

package/daemon/dist/domain/projection-planner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projection-planner.js","sourceRoot":"","sources":["../../src/domain/projection-planner.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/ps-projection.d.ts

@@ -0,0 +1,22 @@
+import type Database from "better-sqlite3";
+export interface PsEntry {
+    rigId: string;
+    name: string;
+    nodeCount: number;
+    runningCount: number;
+    status: "running" | "partial" | "stopped";
+    uptime: string | null;
+    latestSnapshot: string | null;
+}
+/**
+ * Projects rig/run summary for `rig ps`.
+ * Aggregates across all rigs: node counts, running counts, status, uptime, snapshot age.
+ */
+export declare class PsProjectionService {
+    readonly db: Database.Database;
+    constructor(deps: {
+        db: Database.Database;
+    });
+    getEntries(): PsEntry[];
+}
+//# sourceMappingURL=ps-projection.d.ts.map

package/daemon/dist/domain/ps-projection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ps-projection.d.ts","sourceRoot":"","sources":["../../src/domain/ps-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;gBAEnB,IAAI,EAAE;QAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAA;KAAE;IAI3C,UAAU,IAAI,OAAO,EAAE;CA8CxB"}

package/daemon/dist/domain/ps-projection.js

@@ -0,0 +1,65 @@
+/**
+ * Projects rig/run summary for `rig ps`.
+ * Aggregates across all rigs: node counts, running counts, status, uptime, snapshot age.
+ */
+export class PsProjectionService {
+    db;
+    constructor(deps) {
+        this.db = deps.db;
+    }
+    getEntries() {
+        const rows = this.db.prepare(`
+      SELECT
+        r.id as rig_id,
+        r.name,
+        (SELECT COUNT(*) FROM nodes n WHERE n.rig_id = r.id) as node_count,
+        (SELECT COUNT(*) FROM nodes n WHERE n.rig_id = r.id AND
+          (SELECT status FROM sessions s WHERE s.node_id = n.id ORDER BY s.created_at DESC, s.id DESC LIMIT 1) = 'running'
+        ) as running_count,
+        (SELECT MIN(s.created_at) FROM sessions s
+          JOIN nodes n ON n.id = s.node_id
+          WHERE n.rig_id = r.id AND s.status = 'running'
+          AND s.id = (SELECT s2.id FROM sessions s2 WHERE s2.node_id = s.node_id ORDER BY s2.created_at DESC, s2.id DESC LIMIT 1)
+        ) as earliest_running_at,
+        (SELECT snap.created_at FROM snapshots snap WHERE snap.rig_id = r.id ORDER BY snap.created_at DESC, snap.id DESC LIMIT 1) as latest_snapshot_at
+      FROM rigs r
+      ORDER BY r.name
+    `).all();
+        const now = Date.now();
+        return rows.map((r) => {
+            const status = r.node_count === 0 ? "stopped"
+                : r.running_count === r.node_count ? "running"
+                    : r.running_count > 0 ? "partial"
+                        : "stopped";
+            return {
+                rigId: r.rig_id,
+                name: r.name,
+                nodeCount: r.node_count,
+                runningCount: r.running_count,
+                status,
+                uptime: r.earliest_running_at ? formatDuration(now - new Date(r.earliest_running_at + "Z").getTime()) : null,
+                latestSnapshot: r.latest_snapshot_at ? formatAge(now - new Date(r.latest_snapshot_at + "Z").getTime()) : null,
+            };
+        });
+    }
+}
+function formatDuration(ms) {
+    const seconds = Math.floor(ms / 1000);
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m`;
+    const hours = Math.floor(minutes / 60);
+    const remainMinutes = minutes % 60;
+    if (hours < 24)
+        return `${hours}h ${remainMinutes}m`;
+    const days = Math.floor(hours / 24);
+    const remainHours = hours % 24;
+    return `${days}d ${remainHours}h`;
+}
+function formatAge(ms) {
+    const dur = formatDuration(ms);
+    return `${dur} ago`;
+}
+//# sourceMappingURL=ps-projection.js.map

package/daemon/dist/domain/ps-projection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ps-projection.js","sourceRoot":"","sources":["../../src/domain/ps-projection.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,MAAM,OAAO,mBAAmB;IACrB,EAAE,CAAoB;IAE/B,YAAY,IAA+B;QACzC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IACpB,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;KAgB5B,CAAC,CAAC,GAAG,EAOJ,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,MAAM,GACV,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9B,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;oBAC9C,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;wBACjC,CAAC,CAAC,SAAS,CAAC;YAEd,OAAO;gBACL,KAAK,EAAE,CAAC,CAAC,MAAM;gBACf,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,YAAY,EAAE,CAAC,CAAC,aAAa;gBAC7B,MAAM;gBACN,MAAM,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAmB,GAAG,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC5G,cAAc,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,kBAAkB,GAAG,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;aAC9G,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,cAAc,CAAC,EAAU;IAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,GAAG,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,GAAG,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,OAAO,GAAG,EAAE,CAAC;IACnC,IAAI,KAAK,GAAG,EAAE;QAAE,OAAO,GAAG,KAAK,KAAK,aAAa,GAAG,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,KAAK,GAAG,EAAE,CAAC;IAC/B,OAAO,GAAG,IAAI,KAAK,WAAW,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,SAAS,CAAC,EAAU;IAC3B,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/B,OAAO,GAAG,GAAG,MAAM,CAAC;AACtB,CAAC"}

package/daemon/dist/domain/reconciler.d.ts

@@ -0,0 +1,28 @@
+import type Database from "better-sqlite3";
+import type { SessionRegistry } from "./session-registry.js";
+import type { EventBus } from "./event-bus.js";
+import type { TmuxAdapter } from "../adapters/tmux.js";
+export interface ReconcileResult {
+    checked: number;
+    detached: number;
+    errors: {
+        sessionId: string;
+        error: string;
+    }[];
+}
+interface ReconcilerDeps {
+    db: Database.Database;
+    sessionRegistry: SessionRegistry;
+    eventBus: EventBus;
+    tmuxAdapter: TmuxAdapter;
+}
+export declare class Reconciler {
+    private db;
+    private sessionRegistry;
+    private eventBus;
+    private tmuxAdapter;
+    constructor(deps: ReconcilerDeps);
+    reconcile(rigId: string): Promise<ReconcileResult>;
+}
+export {};
+//# sourceMappingURL=reconciler.d.ts.map

package/daemon/dist/domain/reconciler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["../../src/domain/reconciler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChD;AAED,UAAU,cAAc;IACtB,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAID,qBAAa,UAAU;IACrB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,WAAW,CAAc;gBAErB,IAAI,EAAE,cAAc;IAc1B,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAiDzD"}

package/daemon/dist/domain/reconciler.js

@@ -0,0 +1,66 @@
+const SKIP_STATUSES = new Set(["detached", "exited"]);
+export class Reconciler {
+    db;
+    sessionRegistry;
+    eventBus;
+    tmuxAdapter;
+    constructor(deps) {
+        if (deps.db !== deps.sessionRegistry.db) {
+            throw new Error("Reconciler: sessionRegistry must share the same db handle");
+        }
+        if (deps.db !== deps.eventBus.db) {
+            throw new Error("Reconciler: eventBus must share the same db handle");
+        }
+        this.db = deps.db;
+        this.sessionRegistry = deps.sessionRegistry;
+        this.eventBus = deps.eventBus;
+        this.tmuxAdapter = deps.tmuxAdapter;
+    }
+    async reconcile(rigId) {
+        const sessions = this.sessionRegistry.getSessionsForRig(rigId);
+        let checked = 0;
+        let detached = 0;
+        const errors = [];
+        for (const session of sessions) {
+            if (SKIP_STATUSES.has(session.status)) {
+                continue;
+            }
+            let alive;
+            try {
+                alive = await this.tmuxAdapter.hasSession(session.sessionName);
+                checked++;
+            }
+            catch (err) {
+                errors.push({
+                    sessionId: session.id,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+                continue;
+            }
+            if (!alive) {
+                try {
+                    const txn = this.db.transaction(() => {
+                        this.sessionRegistry.markDetached(session.id);
+                        return this.eventBus.persistWithinTransaction({
+                            type: "session.detached",
+                            rigId,
+                            nodeId: session.nodeId,
+                            sessionName: session.sessionName,
+                        });
+                    });
+                    const persistedEvent = txn();
+                    this.eventBus.notifySubscribers(persistedEvent);
+                    detached++;
+                }
+                catch (err) {
+                    errors.push({
+                        sessionId: session.id,
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                }
+            }
+        }
+        return { checked, detached, errors };
+    }
+}
+//# sourceMappingURL=reconciler.js.map

package/daemon/dist/domain/reconciler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["../../src/domain/reconciler.ts"],"names":[],"mappings":"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"}