@openrig/cli 0.6.12 → 0.6.13

package/daemon/dist/startup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AA4F/D,OAAO,EAAkB,KAAK,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AA8CjG,OAAO,EAA0B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAoCnE,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;yFAEqF;IACrF,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACrC,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,UAAU,YAAY;IACpB,GAAG,EAAE,IAAI,CAAC;IACV,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IAErE,gBAAgB,EAAE,OAAO,gCAAgC,EAAE,gBAAgB,CAAC;IAE5E,eAAe,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CACxC;AA+CD,oFAAoF;AACpF,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,KAAK,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcxB;AAED,gGAAgG;AAChG,wBAAsB,YAAY,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAsvE9E"}
+{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AA6F/D,OAAO,EAAkB,KAAK,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AA8CjG,OAAO,EAA0B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAoCnE,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;yFAEqF;IACrF,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACrC,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,UAAU,YAAY;IACpB,GAAG,EAAE,IAAI,CAAC;IACV,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IAErE,gBAAgB,EAAE,OAAO,gCAAgC,EAAE,gBAAgB,CAAC;IAE5E,eAAe,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CACxC;AA+CD,oFAAoF;AACpF,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,KAAK,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcxB;AAED,gGAAgG;AAChG,wBAAsB,YAAY,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAurE9E"}

package/daemon/dist/startup.js

@@ -1,3 +1,4 @@
+import { makeWatchdogDeliver, occurrenceAttempted, priorDigestAttempt } from "./domain/watchdog-delivery.js";
 import { fileURLToPath } from "node:url";
 import { discoverTailscaleSelfNames } from "./middleware/browser-boundary.js";
 import { configureShadowCapture } from "./domain/shadow-capture.js";
@@ -40,6 +41,7 @@ import { codexDaemonSupportProbe } from "./domain/codex-daemon-support.js";
 import { codexNetworkDefaultReader } from "./domain/codex-network-default.js";
 import { codexUsageReader } from "./domain/provider/codex-usage-reader.js";
 import { CodexUsageWindows } from "./domain/provider/codex-usage-windows.js";
+import { ProviderAccountReadingsStore } from "./domain/provider/provider-account-readings.js";
 import { claudeAuthStatusReader } from "./domain/provider/claude-auth-status-reader.js";
 import { ClaudeUsageWindows, latestClaudeWindowSamples } from "./domain/provider/claude-usage-windows.js";
 import { prepareCodexTeamWorkspace } from "./domain/codex-team-workspace.js";
@@ -113,7 +115,7 @@ import { wireViewEventBridge } from "./domain/view-event-bridge.js";
 import { WatchdogJobsRepository } from "./domain/watchdog-jobs-repository.js";
 import { WatchdogAutoRegistration } from "./domain/watchdog-auto-registration.js";
 import { WatchdogHistoryLog } from "./domain/watchdog-history-log.js";
-import { formatWatchdogDeliveryMessage, WatchdogPolicyEngine, } from "./domain/watchdog-policy-engine.js";
+import { WatchdogPolicyEngine, } from "./domain/watchdog-policy-engine.js";
 import { WatchdogScheduler } from "./domain/watchdog-scheduler.js";
 import { ContinuityPolicyMaterializer, createContinuityCutoverBaton, findClaudeTranscriptByToken, recordManagedWidthReceipt, } from "./domain/continuity-policy-materializer.js";
 import { WorkflowRuntime } from "./domain/workflow-runtime.js";
@@ -1088,6 +1090,27 @@ export async function createDaemon(opts) {
         // generation) so a frozen pre-handover sample can't drive the threshold. null = UNKNOWN (inert).
         resolveOccupantBootAt: (nodeId) => sessionRegistry.currentOccupantTenure(nodeId)?.bootAt ?? null,
     });
+    // Shared, read-only current-occupant record path: reporting does not depend on a pin or transport.
+    const { CurrentModelReader } = await import("./domain/model-divergence/current-model-reader.js");
+    const { ProcessCensus: ModelProcessCensus } = await import("./domain/process-census.js");
+    const { CodexThreadIdResolver: ModelThreadResolver } = await import("./domain/codex-thread-id.js");
+    const modelCensus = new ModelProcessCensus();
+    const modelThreads = new ModelThreadResolver({ defaultHome: daemonHome, codexHome: configuredCodexHome });
+    const currentModelReader = new CurrentModelReader({
+        sessions: sessionRegistry, identities: new SeatIdentityStore(db), context: contextUsageStore,
+        census: modelCensus,
+        readAllPaneProcesses: () => tmuxAdapter.readAllPaneProcesses(),
+        native: {
+            getPanePid: async (target) => tmuxAdapter.getPanePid ? tmuxAdapter.getPanePid(target) : null,
+            listProcesses: () => modelCensus.list(),
+            readThreadIdByPid: (pid, identity) => identity === undefined
+                ? modelThreads.resolveUngatedLegacy(pid) : modelThreads.resolve(pid, identity),
+        },
+        codexRollout: (threadId, sessionName, reporting) => reporting
+            ? contextUsageStore.readCodexTranscriptPath(threadId)
+            : contextUsageStore.readCodexAndNormalize({ threadId, sessionName }).transcriptPath,
+        piRunner: (sessionName) => piAdapter.readRunnerSidecar(sessionName),
+    });
     const { HealthProjectionService, LiveContextHealthSource } = await import("./domain/health-detectors.js");
     const healthSettingsStore = new ContextPackSettingsStore();
     const contextHealthSource = new LiveContextHealthSource({
@@ -1225,7 +1248,8 @@ export async function createDaemon(opts) {
             // samples (usage_samples), read on every view.
             usageWindows: {
                 enabled: () => new ContextPackSettingsStore().resolveOne("provider.usage_windows").value === true,
-                windows: new CodexUsageWindows({ read: codexUsageReader({ launchPath: process.env.PATH, home: daemonHome, codexHome }) }),
+                windows: new CodexUsageWindows({ read: codexUsageReader({ launchPath: process.env.PATH, home: daemonHome, codexHome }),
+                    store: new ProviderAccountReadingsStore(db) }),
                 claude: new ClaudeUsageWindows({
                     readIdentity: claudeAuthStatusReader({ launchPath: process.env.PATH, home: daemonHome, claudeConfigDir: process.env.CLAUDE_CONFIG_DIR }),
                     listSamples: () => latestClaudeWindowSamples(db),
@@ -1379,6 +1403,7 @@ export async function createDaemon(opts) {
         seatAttentionReconciler,
         activityHookToken: resolvedActivityHookToken,
         contextUsageStore,
+        currentModelReader,
         healthProjection,
         healthDiagnosis,
         healthPolicy,
@@ -1963,31 +1988,12 @@ export async function createDaemon(opts) {
             jobsRepo: watchdogJobsRepoInstance,
             historyLog: watchdogHistoryLogInstance,
             eventBus,
-            deliver: async ({ targetSession, message, continuityAction }, source) => {
-                let continuityActionCompleted = false;
-                try {
-                    if (continuityAction) {
-                        await createContinuityCutoverBaton(continuityAction, queueRepoInstance);
-                        continuityActionCompleted = true;
-                    }
-                    const deliveryId = `guard-watchdog-${source.occurrenceId ?? source.jobId}`;
-                    const previous = outboxHandlerInstance.getById(deliveryId);
-                    const payload = previous?.guardBinding ? previous.body : formatWatchdogDeliveryMessage(source, message);
-                    const result = await sessionTransport.send(targetSession, payload, { deliveryId, actorSession: "watchdog@system", auditPointer: source.jobId });
-                    if (result.outcome === "retained")
-                        return { status: "retained", outboxIds: result.outboxIds, continuityActionCompleted };
-                    return result.ok
-                        ? { status: "ok", continuityActionCompleted }
-                        : { status: "failed", error: result.error, continuityActionCompleted };
-                }
-                catch (err) {
-                    return {
-                        status: "failed",
-                        error: err instanceof Error ? err.message : String(err),
-                        continuityActionCompleted,
-                    };
-                }
-            },
+            deliver: makeWatchdogDeliver({
+                sessionTransport,
+                outbox: outboxHandlerInstance,
+                db,
+                createContinuityAction: (action) => createContinuityCutoverBaton(action, queueRepoInstance).then(() => { }),
+            }),
             // (i-c) fire-time target-generation gate: resolve the target's LIVE occupant-generation (P12
             // occupant_tenures) so a generation-bound wake is refused once the target has handed over.
             // UNKNOWN (null) fails open → deliver. A drop of this line disables the gate silently (gen-bound
@@ -1998,6 +2004,10 @@ export async function createDaemon(opts) {
             onWakeAttempt: ({ jobId, deliveryStatus }) => {
                 queueRepoInstance.recordWatchdogWakeAttempt(jobId, deliveryStatus);
             },
+            // Due parked-row reminders for one seat in one scheduler pass go as one message.
+            resolveDigestEntry: ({ jobId, message }) => queueRepoInstance.parkReminderDigestEntry(jobId, message),
+            priorDigestAttempt: (occurrenceId) => priorDigestAttempt(outboxHandlerInstance, occurrenceId),
+            occurrenceAttempted: (occurrenceId) => occurrenceAttempted(outboxHandlerInstance, occurrenceId),
             // PL-004 Phase D: register workflow-keepalive policy alongside
             // Phase C's three built-in policies. workflow-keepalive reads
             // SQLite workflow_instances directly via the new Phase D tables
@@ -2172,30 +2182,9 @@ export async function createDaemon(opts) {
         // (no daemon-side cross-host send seam exists yet — the deferral names that, never silence).
         {
             const { ModelDivergenceMonitor } = await import("./domain/model-divergence/model-divergence-monitor.js");
-            const { readClaudeEffectiveModel, readCodexEffectiveModel } = await import("./domain/model-divergence/effective-model-readers.js");
-            const { readCurrentPiOccupantModel, resolveIdentityVerifiedClaudeRecord, resolveLiveCodexThreadId } = await import("./domain/model-divergence/current-generation-record.js");
-            const { defaultListProcesses } = await import("./domain/resume-metadata-refresher.js");
-            const { readCodexThreadIdFromCandidateHomes, defaultResolveHomeDirByPid } = await import("./domain/codex-thread-id.js");
-            const nodeOs = await import("node:os");
-            const nodeFs = await import("node:fs");
-            const seatIdentityStore = new SeatIdentityStore(db);
-            // OPR.0.5.3.10 — ONE shared census + ONE PID-home resolver for the whole
-            // divergence surface: no more `ps -Ao` per seat per poll, no more `ps eww`
-            // per pid (default-home-first + bounded PID cache).
-            const { ProcessCensus } = await import("./domain/process-census.js");
-            const { CodexThreadIdResolver } = await import("./domain/codex-thread-id.js");
-            const divergenceCensus = new ProcessCensus();
-            const codexThreadIdResolver = new CodexThreadIdResolver({ defaultHome: nodeOs.homedir(), codexHome: configuredCodexHome });
-            const currentGenDeps = {
-                getPanePid: async (sessionTarget) => tmuxAdapter.getPanePid ? tmuxAdapter.getPanePid(sessionTarget) : null,
-                listProcesses: () => divergenceCensus.list(),
-                // S10 follow-on: identity REQUIRED on resolve(); the identity-less case routes EXPLICITLY
-                // through the named ungated escape hatch — never a silent fallback (r1 owed item 3).
-                readThreadIdByPid: (pid, identity) => identity === undefined ? codexThreadIdResolver.resolveUngatedLegacy(pid) : codexThreadIdResolver.resolve(pid, identity),
-            };
             const OVERSIGHT_SEAT = "watch-lead@oversight";
             const modelDivergenceMonitor = new ModelDivergenceMonitor({
-                processCensus: divergenceCensus,
+                processCensus: modelCensus,
                 listPinnedSeats: () => {
                     const rows = db.prepare(`
             SELECT n.id AS nodeId, r.id AS rigId, r.name AS rigName, n.runtime AS runtime, n.model AS pinnedModel,
@@ -2209,70 +2198,7 @@ export async function createDaemon(opts) {
                         .filter((row) => row.sessionName !== null)
                         .map((row) => ({ ...row, generation: sessionRegistry.currentOccupantGenerationForSession(row.sessionName) }));
                 },
-                // D-a / OPR.0.5.9.13 — the CURRENT GENERATION's record through the canonical binding and
-                // verified pane identity, never a name, registry token, or transcript recency lookup. A
-                // retained predecessor may keep writing under the canonical launch-time name forever.
-                // Every missing or ambiguous identity join is an explicit no-answer.
-                readEffectiveModel: async (seat, cycle) => {
-                    // OPR.0.5.3.10 mini-req 1 — the poll-scoped census (one ps per pass) when the
-                    // monitor threads it; the shared coalescing census otherwise.
-                    const genDeps = cycle ? { ...currentGenDeps, listProcesses: cycle.listProcesses } : currentGenDeps;
-                    if (seat.runtime === "codex") {
-                        const live = await resolveLiveCodexThreadId(seat.sessionName, genDeps);
-                        if (!live.ok)
-                            return { ok: false, reason: live.reason };
-                        const rollout = contextUsageStore.readCodexAndNormalize({ threadId: live.id, sessionName: seat.sessionName }).transcriptPath;
-                        if (!rollout)
-                            return { ok: false, reason: `live thread ${live.id.slice(0, 8)}… has no readable rollout` };
-                        const model = readCodexEffectiveModel(rollout);
-                        return model ? { ok: true, model } : { ok: false, reason: `no model signal in the bounded read of ${rollout}` };
-                    }
-                    if (seat.runtime === "claude-code") {
-                        const tenure = sessionRegistry.currentOccupantTenure(seat.nodeId);
-                        const sidecar = contextUsageStore.readSidecar(seat.sessionName);
-                        const binding = sessionRegistry.getBindingForNode(seat.nodeId);
-                        const selection = await resolveIdentityVerifiedClaudeRecord({
-                            sessionName: seat.sessionName,
-                            generation: seat.generation,
-                            occupantBootAt: tenure?.bootAt ?? null,
-                            binding: binding ? { tmuxSession: binding.tmuxSession, tmuxPane: binding.tmuxPane } : null,
-                            identity: seatIdentityStore.getForNode(seat.nodeId),
-                            sidecar: sidecar.ok ? sidecar.data : null,
-                        }, genDeps, (path) => {
-                            try {
-                                return nodeFs.statSync(path).isFile();
-                            }
-                            catch {
-                                return false;
-                            }
-                        });
-                        if (!selection.ok)
-                            return { ok: false, reason: selection.reason };
-                        const model = readClaudeEffectiveModel(selection.path);
-                        return model
-                            ? { ok: true, model }
-                            : { ok: false, reason: `no assistant turn yet in the current occupant record ${selection.path} (selected from ${selection.source})` };
-                    }
-                    if (seat.runtime === "pi") {
-                        const binding = sessionRegistry.getBindingForNode(seat.nodeId);
-                        return readCurrentPiOccupantModel({
-                            sessionName: seat.sessionName,
-                            pinnedModel: seat.pinnedModel,
-                            generation: seat.generation,
-                            occupantBootAt: sessionRegistry.currentOccupantTenure(seat.nodeId)?.bootAt ?? null,
-                            binding: binding ? { tmuxSession: binding.tmuxSession, tmuxPane: binding.tmuxPane } : null,
-                            runner: piAdapter.readRunnerSidecar(seat.sessionName),
-                        }, genDeps, (path) => {
-                            try {
-                                return nodeFs.realpathSync(path);
-                            }
-                            catch {
-                                return null;
-                            }
-                        });
-                    }
-                    return { ok: false, reason: `runtime ${seat.runtime ?? "unknown"} has no effective-model reader yet` };
-                },
+                readEffectiveModel: (seat, cycle) => currentModelReader.readEffectiveModel(seat, cycle),
                 sendToSession: async (target, message, deliveryId) => {
                     try {
                         const previous = deliveryId ? outboxHandlerInstance.getById(deliveryId) : null;