instar 1.2.67 → 1.2.68

package/dist/core/PostUpdateMigrator.d.ts

@@ -104,6 +104,18 @@ export declare class PostUpdateMigrator {
      */
     private migrateBootWrapperAbiCheck;
     private migrateStaleLifelineSignal;
+    /**
+     * Threadline Phase 1 keystone (THREADLINE-CONVERSATION-KEYSTONE-SPEC, Migration
+     * parity): fold the legacy thread-resume-map.json + context-thread-map.json
+     * into the unified conversations.json so in-flight conversations survive the
+     * update with their turn/binding context. Idempotent (skips a threadId already
+     * present in conversations.json — never clobbers runtime-written rows),
+     * atomic (tmp + rename), and field-preserving (sessionUuid, agentIdentity,
+     * pinned, lifecycle incl. failed/archived, cross-machine fields). Reconciliation
+     * rule: the resume entry is authoritative for session binding; the contextId
+     * index is attached from the context map (distinct fields, no conflict).
+     */
+    private migrateThreadlineConversationStore;
     private migrateBootWrapperToCjs;
     private migrateConversationalCatalogPlaybookManifest;
     private migrateWorktreeConvention;

package/dist/core/PostUpdateMigrator.d.ts.map

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

package/dist/core/PostUpdateMigrator.js

@@ -156,6 +156,7 @@ export class PostUpdateMigrator {
         this.migrateBootWrapperToCjs(result);
         this.migrateBootWrapperAbiCheck(result);
         this.migrateStaleLifelineSignal(result);
+        this.migrateThreadlineConversationStore(result);
         return result;
     }
     /**
@@ -289,6 +290,143 @@ export class PostUpdateMigrator {
             result.errors.push(`stale-lifeline-signal: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
+    /**
+     * Threadline Phase 1 keystone (THREADLINE-CONVERSATION-KEYSTONE-SPEC, Migration
+     * parity): fold the legacy thread-resume-map.json + context-thread-map.json
+     * into the unified conversations.json so in-flight conversations survive the
+     * update with their turn/binding context. Idempotent (skips a threadId already
+     * present in conversations.json — never clobbers runtime-written rows),
+     * atomic (tmp + rename), and field-preserving (sessionUuid, agentIdentity,
+     * pinned, lifecycle incl. failed/archived, cross-machine fields). Reconciliation
+     * rule: the resume entry is authoritative for session binding; the contextId
+     * index is attached from the context map (distinct fields, no conflict).
+     */
+    migrateThreadlineConversationStore(result) {
+        const dir = path.join(this.config.stateDir, 'threadline');
+        const resumePath = path.join(dir, 'thread-resume-map.json');
+        const ctxPath = path.join(dir, 'context-thread-map.json');
+        const convPath = path.join(dir, 'conversations.json');
+        if (!fs.existsSync(resumePath) && !fs.existsSync(ctxPath)) {
+            result.skipped.push('threadline-conversations: no legacy stores to fold');
+            return;
+        }
+        // Load existing unified store (idempotency — never overwrite live rows).
+        let store;
+        try {
+            if (fs.existsSync(convPath)) {
+                const parsed = JSON.parse(fs.readFileSync(convPath, 'utf-8'));
+                store = (parsed && parsed.version === 1 && parsed.conversations)
+                    ? parsed
+                    : { version: 1, conversations: {}, lastModified: new Date().toISOString() };
+            }
+            else {
+                store = { version: 1, conversations: {}, lastModified: new Date().toISOString() };
+            }
+        }
+        catch {
+            store = { version: 1, conversations: {}, lastModified: new Date().toISOString() };
+        }
+        const now = new Date().toISOString();
+        let folded = 0;
+        // 1) Fold ThreadResumeMap entries (authoritative for session binding).
+        try {
+            if (fs.existsSync(resumePath)) {
+                const resumeMap = JSON.parse(fs.readFileSync(resumePath, 'utf-8'));
+                for (const [threadId, e] of Object.entries(resumeMap)) {
+                    if (!threadId || typeof e !== 'object' || e === null)
+                        continue;
+                    if (store.conversations[threadId])
+                        continue; // idempotent — keep live row
+                    const remoteAgent = typeof e.remoteAgent === 'string' ? e.remoteAgent : undefined;
+                    store.conversations[threadId] = {
+                        threadId,
+                        version: 0,
+                        participants: { peers: remoteAgent ? [remoteAgent] : [] },
+                        remoteAgent,
+                        state: typeof e.state === 'string' ? e.state : 'idle',
+                        resolvedAt: e.resolvedAt,
+                        sessionUuid: typeof e.uuid === 'string' ? e.uuid : undefined,
+                        boundSessionName: typeof e.sessionName === 'string' ? e.sessionName : undefined,
+                        boundTopicId: typeof e.originTopicId === 'number' ? e.originTopicId : undefined,
+                        originSessionName: typeof e.originSessionName === 'string' ? e.originSessionName : undefined,
+                        spawnMode: e.spawnMode,
+                        subject: typeof e.subject === 'string' ? e.subject : undefined,
+                        pinned: e.pinned === true,
+                        messageCount: typeof e.messageCount === 'number' ? e.messageCount : 0,
+                        machineOrigin: e.machineOrigin,
+                        migratedTo: e.migratedTo,
+                        turnCount: 0,
+                        createdAt: typeof e.createdAt === 'string' ? e.createdAt : now,
+                        savedAt: now,
+                        lastActivityAt: typeof e.lastAccessedAt === 'string' ? e.lastAccessedAt : now,
+                    };
+                    folded++;
+                }
+            }
+        }
+        catch (err) {
+            result.errors.push(`threadline-conversations resume fold: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        // 2) Attach ContextThreadMap identity bindings (reconciliation: resume entry
+        //    is authoritative for session binding; contextId index rebuilt from here).
+        try {
+            if (fs.existsSync(ctxPath)) {
+                const ctxFile = JSON.parse(fs.readFileSync(ctxPath, 'utf-8'));
+                const mappings = Array.isArray(ctxFile.mappings) ? ctxFile.mappings : [];
+                for (const m of mappings) {
+                    const threadId = typeof m.threadId === 'string' ? m.threadId : undefined;
+                    if (!threadId)
+                        continue;
+                    const existing = store.conversations[threadId];
+                    if (existing) {
+                        if (existing.contextId === undefined && typeof m.contextId === 'string')
+                            existing.contextId = m.contextId;
+                        if (existing.agentIdentity === undefined && typeof m.agentIdentity === 'string')
+                            existing.agentIdentity = m.agentIdentity;
+                    }
+                    else {
+                        // Context-only thread (no resume entry) — create a minimal row so the
+                        // identity binding (hijack guard) is not lost.
+                        store.conversations[threadId] = {
+                            threadId, version: 0, participants: { peers: [] },
+                            state: 'idle', pinned: false, messageCount: 0, turnCount: 0,
+                            contextId: typeof m.contextId === 'string' ? m.contextId : undefined,
+                            agentIdentity: typeof m.agentIdentity === 'string' ? m.agentIdentity : undefined,
+                            createdAt: typeof m.createdAt === 'string' ? m.createdAt : now,
+                            savedAt: now,
+                            lastActivityAt: typeof m.lastAccessedAt === 'string' ? m.lastAccessedAt : now,
+                        };
+                        folded++;
+                    }
+                }
+            }
+        }
+        catch (err) {
+            result.errors.push(`threadline-conversations context fold: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        if (folded === 0) {
+            result.skipped.push('threadline-conversations: nothing new to fold (already migrated)');
+            return;
+        }
+        // Atomic write (backup + tmp + rename).
+        try {
+            store.lastModified = now;
+            fs.mkdirSync(dir, { recursive: true });
+            if (fs.existsSync(convPath)) {
+                try {
+                    fs.copyFileSync(convPath, `${convPath}.bak`);
+                }
+                catch { /* best-effort backup */ }
+            }
+            const tmp = `${convPath}.migrate-${process.pid}-${Date.now()}.tmp`;
+            fs.writeFileSync(tmp, JSON.stringify(store, null, 2) + '\n');
+            fs.renameSync(tmp, convPath);
+            result.upgraded.push(`threadline-conversations: folded ${folded} legacy thread(s) into conversations.json`);
+        }
+        catch (err) {
+            result.errors.push(`threadline-conversations write: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
     migrateBootWrapperToCjs(result) {
         if (process.platform !== 'darwin') {
             result.skipped.push('boot-wrapper .cjs: non-darwin, no plist to migrate');