instar 1.2.74 → 1.2.76

package/dist/threadline/ThreadResumeMap.d.ts

@@ -1,164 +1,97 @@
 /**
- * ThreadResumeMap — Persistent mapping from thread IDs to Claude session UUIDs.
+ * ThreadResumeMap — persistent mapping from thread IDs to Claude/Codex session
+ * UUIDs, for `--resume`.
  *
- * Analogous to TopicResumeMap but for inter-agent conversation threads.
- * When a thread's session is killed idle, the Claude session UUID is persisted
- * so it can be resumed (--resume UUID) when the next message arrives on that thread.
+ * Phase 2a (THREADLINE-SINGLE-STORE-SPEC.md / CMT-497): this is now a **view over
+ * `ConversationStore`** — the single source of truth. Every method maps the legacy
+ * `ThreadResumeEntry` shape onto a `Conversation` record via the field bridge
+ * below. `save` MERGES (it never clobbers the loop gate's `turnCount`/
+ * `lastInboundHash`/`lastOutboundHash`). The on-disk `thread-resume-map.json` is no
+ * longer written; a one-release dual-read window falls back to it on a miss and
+ * writes through, so threads written by a pre-2a version are not lost.
  *
- * Key differences from TopicResumeMap:
- * - Maps threadId (string UUID) → extended session info
- * - 7-day TTL (vs. 24 hours)
- * - Max 1,000 entries with LRU eviction of non-pinned entries
- * - Resolved threads get a 7-day grace period before removal
- * - Pinned threads are never evicted
- *
- * Storage: {stateDir}/threadline/thread-resume-map.json
+ * Field bridge (ThreadResumeEntry ↔ Conversation):
+ *   uuid↔sessionUuid · sessionName↔boundSessionName · lastAccessedAt↔lastActivityAt
+ *   originTopicId↔boundTopicId · originSessionName↔originSessionName · the rest 1:1.
  */
-/** Thread lifecycle state */
+import { ConversationStore } from './ConversationStore.js';
+/** Thread lifecycle state (legacy subset of ConversationState). */
 export type ThreadState = 'active' | 'idle' | 'resolved' | 'failed' | 'archived';
-/** A single thread resume mapping entry */
+/** A single thread resume mapping entry. */
 export interface ThreadResumeEntry {
-    /** Claude session UUID */
     uuid: string;
-    /** tmux session name */
     sessionName: string;
-    /** When thread was created */
     createdAt: string;
-    /** When this mapping was last saved */
     savedAt: string;
-    /** When thread was last accessed */
     lastAccessedAt: string;
-    /** The other agent in this conversation */
     remoteAgent: string;
-    /** Thread subject */
     subject: string;
-    /** Thread lifecycle state */
     state: ThreadState;
-    /** When thread was resolved (only set if state === 'resolved') */
     resolvedAt?: string;
-    /** Pinned threads are never evicted */
     pinned: boolean;
-    /** Total messages in thread */
     messageCount: number;
-    /** Machine that owns this thread (for cross-machine sync) */
     machineOrigin?: string;
-    /** If migrated to another machine, which one */
     migratedTo?: string;
-    /** Spawn mode: interactive (default) or pipe */
     spawnMode?: 'interactive' | 'pipe';
-    /**
-     * Thread↔Topic linkage (THREAD-TOPIC-LINKAGE-SPEC.md).
-     * If this thread was initiated by a topic-bound session, the Telegram topic
-     * that owns it. Set on outbound send; used by inbound dispatch to route the
-     * reply back to the originating topic session instead of a sibling worker.
-     */
     originTopicId?: number;
-    /**
-     * Session name of the originating topic at send time. Fast-path cache so the
-     * inbound dispatcher doesn't have to query CommitmentTracker on every reply.
-     * The source of truth for "what topic owns this thread" is the commitment
-     * record with `verificationMethod: 'threadline-reply'`.
-     */
     originSessionName?: string;
 }
 export declare class ThreadResumeMap {
-    private filePath;
+    private store;
+    private legacyPath;
     private projectDir;
     private tmuxPath;
-    constructor(stateDir: string, projectDir: string, tmuxPath?: string);
-    /**
-     * Save or update a thread resume mapping.
-     * Triggers pruning if the map exceeds MAX_ENTRIES.
-     */
-    save(threadId: string, entry: ThreadResumeEntry): void;
+    constructor(stateDir: string, projectDir: string, tmuxPath?: string, store?: ConversationStore);
     /**
-     * Look up a thread resume entry. Returns null if not found,
-     * expired, or the JSONL file no longer exists.
+     * Look up a thread resume entry. Returns null if not found, expired, or the
+     * session JSONL no longer exists. Dual-read: on a ConversationStore miss, fall
+     * back to the legacy file and write through (one-release transition window).
      */
     get(threadId: string): ThreadResumeEntry | null;
-    /**
-     * Remove a thread entry.
-     */
+    /** Save or update a thread resume mapping (MERGES — preserves gate turn state). */
+    save(threadId: string, entry: ThreadResumeEntry): void;
+    /** Remove a thread entry (cross-process safe via ConversationStore). */
     remove(threadId: string): void;
-    /**
-     * Mark a thread as resolved — sets state to 'resolved' and records resolvedAt.
-     * Resolved threads get a grace period before being removed by prune().
-     */
+    /** Mark a thread resolved (grace period before removal). */
     resolve(threadId: string): void;
-    /**
-     * Mark entries from a specific machine as migrated (Phase 4: cross-machine sync).
-     * Called during failover when this machine takes over from another.
-     * The migrated entries can be used to resume threads with --resume UUID.
-     */
-    migrateFrom(sourceMachine: string, targetMachine: string): {
-        migrated: number;
-        skipped: number;
-    };
-    /**
-     * Get entries that were migrated to this machine (for resume capability).
-     */
-    getMigratedEntries(targetMachine: string): Array<{
-        threadId: string;
-        entry: ThreadResumeEntry;
-    }>;
-    /**
-     * Pin a thread — pinned threads are never evicted by LRU or TTL.
-     */
+    /** Pin — never evicted. */
     pin(threadId: string): void;
-    /**
-     * Unpin a thread — allows normal TTL and LRU eviction.
-     */
+    /** Unpin — allow normal TTL/LRU eviction. */
     unpin(threadId: string): void;
-    /**
-     * Find all threads with a specific remote agent.
-     * Returns entries that are not expired.
-     */
+    /** Find all (non-expired) threads with a specific remote agent. */
     getByRemoteAgent(agentName: string): Array<{
         threadId: string;
         entry: ThreadResumeEntry;
     }>;
-    /**
-     * List all active or idle threads (not resolved, failed, or archived).
-     */
+    /** List all active or idle threads. */
     listActive(): Array<{
         threadId: string;
         entry: ThreadResumeEntry;
     }>;
-    /**
-     * Prune expired entries, resolved entries past grace period,
-     * and LRU overflow entries. Called automatically on save, but
-     * can be called manually for maintenance.
-     */
+    /** Cross-machine failover: demote a source machine's active threads to idle. */
+    migrateFrom(sourceMachine: string, targetMachine: string): {
+        migrated: number;
+        skipped: number;
+    };
+    /** Get entries migrated to this machine (for resume capability). */
+    getMigratedEntries(targetMachine: string): Array<{
+        threadId: string;
+        entry: ThreadResumeEntry;
+    }>;
+    /** Total stored entries (for monitoring). */
+    size(): number;
+    /** Prune expired / resolved-past-grace / LRU overflow. */
     prune(): void;
     /**
-     * Proactive resume heartbeat: scan all active thread-linked tmux sessions
-     * and update the thread→UUID mapping. Should be called periodically.
-     *
-     * This ensures that even if a session crashes unexpectedly, we already have
-     * its UUID on file for --resume.
+     * Proactive resume heartbeat: scan active thread-linked tmux sessions and
+     * update the thread→UUID mapping so a crash leaves the UUID on file.
      */
     refreshResumeMappings(threadSessions: Map<string, string>): void;
-    /**
-     * Get the total number of entries in the map (for monitoring).
-     */
-    size(): number;
-    private load;
-    private persist;
-    /**
-     * Check if an entry is expired based on its state and age.
-     * - Active/idle: expire after MAX_AGE_MS from lastAccessedAt
-     * - Resolved: expire after RESOLVED_GRACE_MS from resolvedAt
-     * - Failed/archived: expire after MAX_AGE_MS from savedAt
-     */
+    /** Dual-read: read a single entry from the frozen legacy file, if present + fresh. */
+    private readLegacyEntry;
     private isExpired;
-    /**
-     * Prune a map in-place: remove expired entries, resolved-past-grace entries,
-     * and LRU overflow (non-pinned) entries.
-     */
-    private pruneMap;
-    /**
-     * Check if a JSONL file exists for the given UUID.
-     */
-    private jsonlExists;
+    /** Check if a JSONL file exists for the given session UUID. (protected so
+     *  tests can bypass the filesystem check via a subclass.) */
+    protected jsonlExists(uuid: string): boolean;
 }
 //# sourceMappingURL=ThreadResumeMap.d.ts.map

package/dist/threadline/ThreadResumeMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadResumeMap.d.ts","sourceRoot":"","sources":["../../src/threadline/ThreadResumeMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ThreadResumeMap.d.ts","sourceRoot":"","sources":["../../src/threadline/ThreadResumeMap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH,OAAO,EAAE,iBAAiB,EAAqB,MAAM,wBAAwB,CAAC;AAI9E,mEAAmE;AACnE,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEjF,4CAA4C;AAC5C,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,WAAW,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAqED,qBAAa,eAAe;IAC1B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,iBAAiB;IAO9F;;;;OAIG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAgB/C,mFAAmF;IACnF,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAItD,wEAAwE;IACxE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI9B,4DAA4D;IAC5D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAS/B,2BAA2B;IAC3B,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK3B,6CAA6C;IAC7C,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK7B,mEAAmE;IACnE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iBAAiB,CAAA;KAAE,CAAC;IAK1F,uCAAuC;IACvC,UAAU,IAAI,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iBAAiB,CAAA;KAAE,CAAC;IAMnE,gFAAgF;IAChF,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAoBhG,oEAAoE;IACpE,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iBAAiB,CAAA;KAAE,CAAC;IAMhG,6CAA6C;IAC7C,IAAI,IAAI,MAAM;IAId,0DAA0D;IAC1D,KAAK,IAAI,IAAI;IAIb;;;OAGG;IACH,qBAAqB,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IA6ChE,sFAAsF;IACtF,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,SAAS;IASjB;iEAC6D;IAC7D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAa7C"}