@openrig/cli 0.6.4 → 0.6.5

package/daemon/dist/domain/claude-compaction-enforcer.d.ts

@@ -24,15 +24,13 @@ import type { SettingsStore } from "./user-settings/settings-store.js";
  *   restart resets the window which is the safer-failure direction
  *   (might re-compact once on restart in rare cases, won't lock out
  *   forever).
- * - Send-failure graceful-degrade: returns { triggered: false } with a
- *   reason; does not throw. The dedup timestamp is only set on
- *   successful send, so a transient send failure can retry on the next
- *   polling tick.
+ * - Definite pre-write prep failures retry at most three times. Uncertain
+ *   delivery never replays. Unfinished preparation stops visibly until an
+ *   explicit retry; it cannot arm a delayed compact after its deadline.
  * - Pre-compact prep: the first threshold crossing sends a normal
  *   user-channel prompt asking Claude to load the restore skill and
- *   write a mental-model restore map. The next eligible high-usage tick
- *   sends /compact. This gives unattended seats a chance to create the
- *   breadcrumb map before Claude's native compaction boundary.
+ *   write an attempt-bound restore map. Existing polls send /compact only after
+ *   atomic publication of that completed artifact, within the preparation deadline.
  * - Post-compact restore: after a successful auto-compact, the enforcer
  *   first sends a turn-boundary handshake once context usage drops below
  *   threshold, then sends the restore prompt on a later polling tick.
@@ -42,6 +40,7 @@ import type { SettingsStore } from "./user-settings/settings-store.js";
 export declare const DEDUP_WINDOW_MS_DEFAULT = 60000;
 export declare const POST_COMPACT_RESTORE_COOLDOWN_MS_DEFAULT: number;
 export declare const MANUAL_PREP_WAIT_MS_DEFAULT = 120000;
+export declare const AUTO_PREP_WAIT_MS_DEFAULT: number;
 export declare const POST_COMPACT_SEND_WAIT_MS_DEFAULT = 10000;
 export interface EnforcerInput {
     sessionName: string;
@@ -81,7 +80,18 @@ export type ManualCompactionOutcome = {
     stage: "skipped-or-failed";
     reason: string;
 };
-export type EnforcerSkipReason = "typing_guard_enabled" | "guard_target_unknown" | "guard_target_changed" | "runtime_filter" | "no_usage_data" | "disabled" | "below_threshold" | "already_triggered_above_threshold" | "dedup_window" | "post_restore_cooldown" | "send_failed" | "invalid_policy" | "stale_generation";
+export type EnforcerSkipReason = "typing_guard_enabled" | "guard_target_unknown" | "guard_target_changed" | "runtime_filter" | "no_usage_data" | "disabled" | "below_threshold" | "already_triggered_above_threshold" | "dedup_window" | "post_restore_cooldown" | "send_failed" | "invalid_policy" | "stale_generation" | "preparation_pending" | "preparation_incomplete" | "preparation_stopped" | "occupant_generation_unavailable";
+export interface PreparationState {
+    attemptId: string;
+    occupantGeneration: string | null;
+    mapPath: string;
+    marker: string;
+    mode: "automatic" | "manual";
+    status: "sending" | "waiting" | "stopped" | "compact-sent";
+    delivery: "pending" | "delivered" | "uncertain";
+    deadlineAt: number | null;
+    reason?: string;
+}
 export declare class ClaudeCompactionEnforcer {
     private readonly settingsStore;
     private readonly sessionTransport;
@@ -89,6 +99,8 @@ export declare class ClaudeCompactionEnforcer {
     private readonly postCompactRestoreCooldownMs;
     private readonly openrigHome;
     private readonly manualPrepWaitMs;
+    private readonly now;
+    private readonly sleep;
     private readonly postCompactSendWaitMs;
     private readonly lastAutoCompactAt;
     private readonly postCompactRestoreCooldownUntil;
@@ -104,6 +116,8 @@ export declare class ClaudeCompactionEnforcer {
         openrigHome?: string;
         postCompactRestoreCooldownMs?: number;
         manualPrepWaitMs?: number;
+        now?: () => number;
+        sleep?: (ms: number) => Promise<void>;
         postCompactSendWaitMs?: number;
         resolveOccupantGeneration?: (sessionName: string) => string | null;
         onPostRestoreComplete?: (receipt: {
@@ -129,10 +143,9 @@ export declare class ClaudeCompactionEnforcer {
      * action). Reuse-correct:
      *
      * - SAME prompt builders + SAME configured messages (`resolveClaudeCompactionPolicy`).
-     * - Two-phase / wait-for-idle: phase 1 sends the prep prompt; phase 2 sends
-     *   `/compact` via `SessionTransport.send(..., { waitForIdleMs })`, which blocks
-     *   until the seat is explicitly idle — so `/compact` can NEVER land before the
-     *   restore-map prep turn completes (IMPL-SPEC §2.2 option (a)).
+     * - Wait for this attempt's map, then the existing idle observation, within one
+     *   120-second budget. Neither wait holds the seat input lease. Final writes
+     *   recheck the attempt, policy and occupant; marker presence is not map quality.
      * - Seeds the EXISTING `pendingPostCompactRestore` back-half state machine,
      *   drained by the same ContextMonitor poll loop as an auto-compact — there is
      *   NO second restore path.
@@ -141,8 +154,18 @@ export declare class ClaudeCompactionEnforcer {
      */
     triggerManualCompact(input: EnforcerInput, opts?: {
         operatorInitiated?: boolean;
+        skipMap?: boolean;
     }): Promise<ManualCompactionOutcome>;
     private triggerManualCompactUnchecked;
+    private beginPreparation;
+    private mapReady;
+    private deliverPreparation;
+    private sendPreparedCompact;
+    /** Existing monitor polls and manual waits call this even when context usage is stale. */
+    reconcilePreparations(): void;
+    private stopPreparation;
+    cancelPreparation(session: string): PreparationState | null;
+    getPreparationState(session: string): PreparationState | null;
     /** OPR.0.4.3.14 — read the surfaced manual-trigger state for a seat (AC-3). */
     getManualCompactionState(sessionName: string): ManualCompactionStatus | null;
     /**

package/daemon/dist/domain/claude-compaction-enforcer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-compaction-enforcer.d.ts","sourceRoot":"","sources":["../../src/domain/claude-compaction-enforcer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-compaction-enforcer.d.ts","sourceRoot":"","sources":["../../src/domain/claude-compaction-enforcer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAMvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAC9C,eAAO,MAAM,wCAAwC,QAAc,CAAC;AAKpE,eAAO,MAAM,2BAA2B,SAAU,CAAC;AAEnD,eAAO,MAAM,yBAAyB,QAAc,CAAC;AASrD,eAAO,MAAM,iCAAiC,QAAS,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,MAAM,eAAe,GACvB;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GACnB;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,GAC7B,WAAW,GACX,cAAc,GACd,cAAc,GACd,YAAY,GACZ,mBAAmB,CAAC;AAExB,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB;;kGAE8F;IAC9F,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,MAAM,uBAAuB,GAC/B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAC1C;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAC1B,sBAAsB,GACtB,sBAAsB,GACtB,sBAAsB,GACtB,gBAAgB,GAChB,eAAe,GACf,UAAU,GACV,iBAAiB,GACjB,mCAAmC,GACnC,cAAc,GACd,uBAAuB,GACvB,aAAa,GACb,gBAAgB,GAChB,kBAAkB,GAClB,qBAAqB,GACrB,wBAAwB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AA8LtC,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC7B,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,CAAC;IAC3D,QAAQ,EAAE,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAGrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAA6B;IAC7E,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqB;IAC7D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyC;IAC/E,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA8C;IAGxF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA6C;IAInF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAoC;IAC3E,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAyC;IACpF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAKZ;gBAGzB,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,CAAC,EAAE;QACL,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;QACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,yBAAyB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;QACnE,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE;YAChC,WAAW,EAAE,MAAM,CAAC;YACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;YAClC,yBAAyB,EAAE,MAAM,CAAC;YAClC,yBAAyB,EAAE,MAAM,CAAC;SACnC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAC5B;IAeH;;;;OAIG;IACG,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAaxD,yBAAyB;IAwLvC;;;;;;;;;;;;;;;;;OAiBG;IACG,oBAAoB,CACxB,KAAK,EAAE,aAAa,EACpB,IAAI,GAAE;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAO,GAC5D,OAAO,CAAC,uBAAuB,CAAC;YAMrB,6BAA6B;IAmD3C,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,QAAQ;YAMF,kBAAkB;YA0BlB,mBAAmB;IAoCjC,0FAA0F;IAC1F,qBAAqB,IAAI,IAAI;IAc7B,OAAO,CAAC,eAAe;IAOvB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAK3D,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAQ7D,+EAA+E;IAC/E,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI;IAI5E;;;;;;;OAOG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAW7C,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,mBAAmB;IAK3B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAO3B"}