@jsonstudio/llms 0.6.1449 → 0.6.1643

package/dist/conversion/compat/antigravity-session-signature.js

@@ -1,11 +1,85 @@
 import { createHash } from 'node:crypto';
-export const DUMMY_THOUGHT_SIGNATURE = 'skip_thought_signature_validator';
-// Antigravity-Manager alignment: Node proxy uses 2 hours TTL.
-const SIGNATURE_TTL_MS = 2 * 60 * 60 * 1000;
+import fs from 'node:fs';
+import path from 'node:path';
+const DUMMY_THOUGHT_SIGNATURE_SENTINEL = 'skip_thought_signature_validator';
+// Antigravity-Manager alignment:
+// - session_id has no time limit (continuity across long conversations / restarts)
+// - signature cache is bounded by size, not by time
+// Time-based expiry is disabled when SIGNATURE_TTL_MS <= 0.
+const SIGNATURE_TTL_MS = 0;
+// Still "touch" active sessions to refresh persisted timestamps / LRU ordering,
+// but avoid excessive disk churn.
+const SIGNATURE_TOUCH_INTERVAL_MS = 5 * 60 * 1000;
 const MIN_SIGNATURE_LENGTH = 50;
 const SESSION_CACHE_LIMIT = 1000;
+// Keep rewind guard finite to avoid reusing stale signatures after a rewind.
+const REWIND_BLOCK_MS = 2 * 60 * 60 * 1000;
+const GLOBAL_PERSISTENCE_KEY = '__LLMSWITCH_ANTIGRAVITY_SESSION_SIGNATURE_PERSISTENCE__';
+function getPersistenceState() {
+    const g = globalThis;
+    const existing = g[GLOBAL_PERSISTENCE_KEY];
+    if (existing && typeof existing === 'object') {
+        return existing;
+    }
+    return null;
+}
+function setPersistenceState(state) {
+    const g = globalThis;
+    if (!state) {
+        delete g[GLOBAL_PERSISTENCE_KEY];
+        return;
+    }
+    g[GLOBAL_PERSISTENCE_KEY] = state;
+}
+export function configureAntigravitySessionSignaturePersistence(input) {
+    if (!input) {
+        const prior = getPersistenceState();
+        if (prior?.flushTimer) {
+            clearTimeout(prior.flushTimer);
+        }
+        setPersistenceState(null);
+        return;
+    }
+    const stateDir = typeof input.stateDir === 'string' ? input.stateDir.trim() : '';
+    if (!stateDir) {
+        setPersistenceState(null);
+        return;
+    }
+    const fileName = typeof input.fileName === 'string' && input.fileName.trim() ? input.fileName.trim() : 'antigravity-session-signatures.json';
+    const prior = getPersistenceState();
+    if (prior?.flushTimer) {
+        clearTimeout(prior.flushTimer);
+    }
+    setPersistenceState({
+        config: { stateDir, fileName },
+        loadedMtimeMs: null,
+        loadedOnce: false,
+        flushTimer: null
+    });
+    // Ensure we hydrate immediately so a short-lived process (or a server restart)
+    // never flushes an empty in-memory cache over an existing persisted file.
+    try {
+        hydrateSignaturesFromDiskIfNeeded(true);
+    }
+    catch {
+        // best-effort only
+    }
+}
+export function flushAntigravitySessionSignaturePersistenceSync() {
+    const state = getPersistenceState();
+    if (!state) {
+        return;
+    }
+    if (state.flushTimer) {
+        clearTimeout(state.flushTimer);
+        state.flushTimer = null;
+    }
+    flushPersistedSignaturesSync(state);
+}
 const GLOBAL_SIGNATURE_CACHE_KEY = '__LLMSWITCH_ANTIGRAVITY_SESSION_SIGNATURE_CACHE__';
 const GLOBAL_REQUEST_SESSION_CACHE_KEY = '__LLMSWITCH_ANTIGRAVITY_REQUEST_SESSION_ID_CACHE__';
+const GLOBAL_PINNED_ALIAS_BY_SESSION_KEY = '__LLMSWITCH_ANTIGRAVITY_PINNED_ALIAS_BY_SESSION__';
+const GLOBAL_PINNED_SESSION_BY_ALIAS_KEY = '__LLMSWITCH_ANTIGRAVITY_PINNED_SESSION_BY_ALIAS__';
 function getGlobalSignatureCache() {
     const g = globalThis;
     const existing = g[GLOBAL_SIGNATURE_CACHE_KEY];
@@ -28,9 +102,152 @@ function getGlobalRequestSessionCache() {
     return created;
 }
 const requestSessionIds = getGlobalRequestSessionCache();
+const GLOBAL_REWIND_BLOCK_CACHE_KEY = '__LLMSWITCH_ANTIGRAVITY_SIGNATURE_REWIND_BLOCK_CACHE__';
+function getGlobalRewindBlockCache() {
+    const g = globalThis;
+    const existing = g[GLOBAL_REWIND_BLOCK_CACHE_KEY];
+    if (existing instanceof Map) {
+        return existing;
+    }
+    const created = new Map();
+    g[GLOBAL_REWIND_BLOCK_CACHE_KEY] = created;
+    return created;
+}
+const rewindBlocks = getGlobalRewindBlockCache();
+const GLOBAL_LATEST_SIGNATURE_BY_ALIAS_KEY = '__LLMSWITCH_ANTIGRAVITY_LATEST_SIGNATURE_BY_ALIAS__';
+// Antigravity-Manager alignment: global thoughtSignature store (v2).
+// - Shared across all Antigravity/GeminiCLI accounts for the SAME derived sessionId.
+// - Still keyed by sessionId to avoid cross-session leakage.
+export const ANTIGRAVITY_GLOBAL_ALIAS_KEY = 'antigravity.global';
+function normalizeAliasKey(value) {
+    if (typeof value !== 'string') {
+        return 'antigravity.unknown';
+    }
+    const trimmed = value.trim();
+    if (!trimmed.length) {
+        return 'antigravity.unknown';
+    }
+    const lowered = trimmed.toLowerCase();
+    if (lowered === 'antigravity') {
+        return 'antigravity.unknown';
+    }
+    return lowered;
+}
+function normalizeSessionId(value) {
+    if (typeof value !== 'string') {
+        return '';
+    }
+    return value.trim();
+}
+function buildSignatureCacheKey(aliasKey, sessionId) {
+    const alias = normalizeAliasKey(aliasKey);
+    const sid = normalizeSessionId(sessionId);
+    if (!sid) {
+        return '';
+    }
+    return `${alias}|${sid}`;
+}
+function getLatestSignatureMap() {
+    const g = globalThis;
+    const existing = g[GLOBAL_LATEST_SIGNATURE_BY_ALIAS_KEY];
+    if (existing instanceof Map) {
+        return existing;
+    }
+    const created = new Map();
+    g[GLOBAL_LATEST_SIGNATURE_BY_ALIAS_KEY] = created;
+    return created;
+}
+const latestSignaturesByAlias = getLatestSignatureMap();
+function getPinnedAliasBySessionMap() {
+    const g = globalThis;
+    const existing = g[GLOBAL_PINNED_ALIAS_BY_SESSION_KEY];
+    if (existing instanceof Map) {
+        return existing;
+    }
+    const created = new Map();
+    g[GLOBAL_PINNED_ALIAS_BY_SESSION_KEY] = created;
+    return created;
+}
+function getPinnedSessionByAliasMap() {
+    const g = globalThis;
+    const existing = g[GLOBAL_PINNED_SESSION_BY_ALIAS_KEY];
+    if (existing instanceof Map) {
+        return existing;
+    }
+    const created = new Map();
+    g[GLOBAL_PINNED_SESSION_BY_ALIAS_KEY] = created;
+    return created;
+}
+const pinnedAliasBySession = getPinnedAliasBySessionMap();
+const pinnedSessionByAlias = getPinnedSessionByAliasMap();
+export function getAntigravityThoughtSignatureSentinel() {
+    return DUMMY_THOUGHT_SIGNATURE_SENTINEL;
+}
+function shouldAllowAliasLatestFallback(aliasKey) {
+    const normalized = normalizeAliasKey(aliasKey);
+    // Never fall back when alias is unknown: avoids cross-alias mixing and enforces isolation.
+    return normalized !== 'antigravity.unknown';
+}
+function getLatestSignatureEntry(aliasKey) {
+    const key = normalizeAliasKey(aliasKey);
+    const existing = latestSignaturesByAlias.get(key);
+    if (existing && typeof existing === 'object') {
+        const signature = typeof existing.signature === 'string' ? existing.signature : '';
+        const messageCount = typeof existing.messageCount === 'number' ? existing.messageCount : 1;
+        const timestamp = typeof existing.timestamp === 'number' ? existing.timestamp : 0;
+        const sessionId = typeof existing.sessionId === 'string'
+            ? String(existing.sessionId)
+            : '';
+        if (signature && timestamp > 0) {
+            return { signature, messageCount, timestamp, ...(sessionId.trim().length ? { sessionId: sessionId.trim() } : {}) };
+        }
+    }
+    return null;
+}
+function setLatestSignatureEntry(aliasKey, entry) {
+    const key = normalizeAliasKey(aliasKey);
+    if (!entry) {
+        latestSignaturesByAlias.delete(key);
+        return;
+    }
+    latestSignaturesByAlias.set(key, entry);
+}
 function nowMs() {
     return Date.now();
 }
+function isTimeExpiryEnabled() {
+    return typeof SIGNATURE_TTL_MS === 'number' && Number.isFinite(SIGNATURE_TTL_MS) && SIGNATURE_TTL_MS > 0;
+}
+export function getAntigravityLatestSignatureSessionIdForAlias(aliasKeyInput, options) {
+    const allowHydrate = options?.hydrate !== false;
+    const aliasKey = normalizeAliasKey(aliasKeyInput);
+    if (!shouldAllowAliasLatestFallback(aliasKey)) {
+        return undefined;
+    }
+    if (allowHydrate) {
+        hydrateSignaturesFromDiskIfNeeded(true);
+    }
+    const latest = getLatestSignatureEntry(aliasKey);
+    if (!latest) {
+        return undefined;
+    }
+    if (isTimeExpiryEnabled()) {
+        const ts = nowMs();
+        if (ts - latest.timestamp > SIGNATURE_TTL_MS) {
+            return undefined;
+        }
+    }
+    const sessionId = typeof latest.sessionId === 'string' ? latest.sessionId.trim() : '';
+    return sessionId || undefined;
+}
+function extractSessionIdFromCacheKey(key) {
+    if (typeof key !== 'string' || !key)
+        return '';
+    const idx = key.indexOf('|');
+    if (idx < 0)
+        return '';
+    return key.slice(idx + 1).trim();
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -63,18 +280,74 @@ function sha256Hex(value) {
     return createHash('sha256').update(value).digest('hex');
 }
 function isExpired(entry, ts) {
+    if (!isTimeExpiryEnabled()) {
+        return false;
+    }
+    return ts - entry.timestamp > SIGNATURE_TTL_MS;
+}
+function isPinnedExpired(entry, ts) {
+    if (!isTimeExpiryEnabled()) {
+        return false;
+    }
     return ts - entry.timestamp > SIGNATURE_TTL_MS;
 }
 function isRequestSessionExpired(entry, ts) {
+    if (!isTimeExpiryEnabled()) {
+        return false;
+    }
     return ts - entry.timestamp > SIGNATURE_TTL_MS;
 }
+function touchSessionSignature(aliasKey, cacheKey, entry, ts) {
+    if (ts - entry.timestamp < SIGNATURE_TOUCH_INTERVAL_MS) {
+        return;
+    }
+    sessionSignatures.set(cacheKey, { signature: entry.signature, messageCount: entry.messageCount, timestamp: ts });
+    const latest = getLatestSignatureEntry(aliasKey);
+    if (!latest || ts >= latest.timestamp) {
+        const sessionId = extractSessionIdFromCacheKey(cacheKey);
+        setLatestSignatureEntry(aliasKey, {
+            signature: entry.signature,
+            messageCount: entry.messageCount,
+            timestamp: ts,
+            ...(sessionId ? { sessionId } : {})
+        });
+    }
+    schedulePersistenceFlush();
+}
 function pruneExpired() {
+    if (!isTimeExpiryEnabled()) {
+        return;
+    }
     const ts = nowMs();
     for (const [key, entry] of sessionSignatures.entries()) {
         if (isExpired(entry, ts)) {
             sessionSignatures.delete(key);
         }
     }
+    for (const [sessionId, entry] of pinnedAliasBySession.entries()) {
+        if (isPinnedExpired(entry, ts)) {
+            pinnedAliasBySession.delete(sessionId);
+            const aliasKey = typeof entry.aliasKey === 'string' ? entry.aliasKey : '';
+            if (aliasKey) {
+                const backref = pinnedSessionByAlias.get(aliasKey);
+                if (backref?.sessionId === sessionId) {
+                    pinnedSessionByAlias.delete(aliasKey);
+                }
+            }
+        }
+    }
+    for (const [aliasKey, entry] of pinnedSessionByAlias.entries()) {
+        if (isPinnedExpired(entry, ts)) {
+            pinnedSessionByAlias.delete(aliasKey);
+            const sid = typeof entry.sessionId === 'string' ? entry.sessionId : '';
+            if (sid) {
+                const backref = pinnedAliasBySession.get(sid);
+                if (backref?.aliasKey === aliasKey) {
+                    pinnedAliasBySession.delete(sid);
+                }
+            }
+        }
+    }
 }
 function ensureCacheLimit() {
     if (sessionSignatures.size <= SESSION_CACHE_LIMIT) {
@@ -94,14 +367,308 @@ function ensureCacheLimit() {
         }
     }
 }
-export function cacheAntigravityRequestSessionId(requestId, sessionId) {
+function resolvePersistFilePath(config) {
+    return path.join(config.stateDir, config.fileName);
+}
+function isValidPersistedEntry(value) {
+    if (!isRecord(value))
+        return false;
+    const sig = typeof value.signature === 'string' ? value.signature.trim() : '';
+    if (!sig || sig.length < MIN_SIGNATURE_LENGTH)
+        return false;
+    if (sig === DUMMY_THOUGHT_SIGNATURE_SENTINEL)
+        return false;
+    const messageCount = typeof value.messageCount === 'number' && Number.isFinite(value.messageCount) && value.messageCount > 0
+        ? Math.floor(value.messageCount)
+        : 1;
+    const timestamp = typeof value.timestamp === 'number' && Number.isFinite(value.timestamp) && value.timestamp > 0
+        ? Math.floor(value.timestamp)
+        : 0;
+    if (!timestamp)
+        return false;
+    value.signature = sig;
+    value.messageCount = messageCount;
+    value.timestamp = timestamp;
+    return true;
+}
+function hydrateSignaturesFromDiskIfNeeded(force = false) {
+    const state = getPersistenceState();
+    if (!state) {
+        return;
+    }
+    const filePath = resolvePersistFilePath(state.config);
+    let stat = null;
+    try {
+        stat = fs.statSync(filePath);
+    }
+    catch {
+        state.loadedOnce = true;
+        state.loadedMtimeMs = null;
+        return;
+    }
+    const mtimeMs = typeof stat.mtimeMs === 'number' && Number.isFinite(stat.mtimeMs) ? stat.mtimeMs : stat.mtime.getTime();
+    if (!force && state.loadedOnce && state.loadedMtimeMs === mtimeMs) {
+        return;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch {
+        state.loadedOnce = true;
+        state.loadedMtimeMs = mtimeMs;
+        return;
+    }
+    const latestRaw = isRecord(parsed) ? parsed.latest : undefined;
+    const latestPersisted = isValidPersistedEntry(latestRaw)
+        ? { ...latestRaw }
+        : null;
+    const latestByAliasRaw = isRecord(parsed) ? parsed.latestByAlias : undefined;
+    const latestByAlias = isRecord(latestByAliasRaw) ? latestByAliasRaw : undefined;
+    const sessionsRaw = isRecord(parsed) ? parsed.sessions : undefined;
+    const sessions = isRecord(sessionsRaw) ? sessionsRaw : undefined;
+    if (!sessions) {
+        state.loadedOnce = true;
+        state.loadedMtimeMs = mtimeMs;
+        return;
+    }
+    const tsNow = nowMs();
+    const pinnedBySessionRaw = isRecord(parsed) ? parsed.pinnedBySession : undefined;
+    const pinnedBySession = isRecord(pinnedBySessionRaw) ? pinnedBySessionRaw : undefined;
+    if (pinnedBySession) {
+        for (const [sessionIdRaw, entryRaw] of Object.entries(pinnedBySession)) {
+            const sessionId = typeof sessionIdRaw === 'string' ? sessionIdRaw.trim() : '';
+            if (!sessionId)
+                continue;
+            if (!isRecord(entryRaw))
+                continue;
+            const aliasKeyRaw = entryRaw.aliasKey;
+            const aliasKey = typeof aliasKeyRaw === 'string' ? aliasKeyRaw.trim() : '';
+            const timestampRaw = entryRaw.timestamp;
+            const timestamp = typeof timestampRaw === 'number' && Number.isFinite(timestampRaw) ? Math.floor(timestampRaw) : 0;
+            if (!aliasKey || !timestamp)
+                continue;
+            if (isPinnedExpired({ timestamp }, tsNow))
+                continue;
+            const normalizedAlias = normalizeAliasKey(aliasKey);
+            const existing = pinnedAliasBySession.get(sessionId);
+            if (existing && !isPinnedExpired(existing, tsNow) && existing.timestamp >= timestamp) {
+                continue;
+            }
+            pinnedAliasBySession.set(sessionId, { aliasKey: normalizedAlias, timestamp });
+        }
+    }
+    const pinnedByAliasRaw = isRecord(parsed) ? parsed.pinnedByAlias : undefined;
+    const pinnedByAlias = isRecord(pinnedByAliasRaw) ? pinnedByAliasRaw : undefined;
+    if (pinnedByAlias) {
+        for (const [aliasKeyRaw, entryRaw] of Object.entries(pinnedByAlias)) {
+            const aliasKey = typeof aliasKeyRaw === 'string' ? aliasKeyRaw.trim() : '';
+            if (!aliasKey)
+                continue;
+            if (!isRecord(entryRaw))
+                continue;
+            const sessionIdRaw = entryRaw.sessionId;
+            const sessionId = typeof sessionIdRaw === 'string' ? sessionIdRaw.trim() : '';
+            const timestampRaw = entryRaw.timestamp;
+            const timestamp = typeof timestampRaw === 'number' && Number.isFinite(timestampRaw) ? Math.floor(timestampRaw) : 0;
+            if (!sessionId || !timestamp)
+                continue;
+            if (isPinnedExpired({ timestamp }, tsNow))
+                continue;
+            const normalizedAlias = normalizeAliasKey(aliasKey);
+            const existing = pinnedSessionByAlias.get(normalizedAlias);
+            if (existing && !isPinnedExpired(existing, tsNow) && existing.timestamp >= timestamp) {
+                continue;
+            }
+            pinnedSessionByAlias.set(normalizedAlias, { sessionId, timestamp });
+        }
+    }
+    for (const [persistedKey, entry] of Object.entries(sessions)) {
+        if (typeof persistedKey !== 'string' || !persistedKey.trim())
+            continue;
+        if (!isValidPersistedEntry(entry))
+            continue;
+        if (isExpired(entry, tsNow))
+            continue;
+        const keyTrimmed = persistedKey.trim();
+        const isScopedKey = keyTrimmed.includes('|');
+        const normalizedKeys = isScopedKey
+            ? [keyTrimmed]
+            : [
+                // Legacy v1 persistence stored signatures keyed only by sid-*.
+                // Treat them as session-global so they can be used for any alias (v2 global store).
+                buildSignatureCacheKey(ANTIGRAVITY_GLOBAL_ALIAS_KEY, keyTrimmed),
+                buildSignatureCacheKey('antigravity.unknown', keyTrimmed)
+            ].filter(Boolean);
+        for (const normalizedKey of normalizedKeys) {
+            if (!normalizedKey)
+                continue;
+            const existing = sessionSignatures.get(normalizedKey);
+            if (existing && !isExpired(existing, tsNow) && existing.timestamp >= entry.timestamp) {
+                continue;
+            }
+            sessionSignatures.set(normalizedKey, entry);
+        }
+    }
+    latestSignaturesByAlias.clear();
+    if (latestByAlias) {
+        for (const [aliasKeyRaw, entryRaw] of Object.entries(latestByAlias)) {
+            if (typeof aliasKeyRaw !== 'string' || !aliasKeyRaw.trim())
+                continue;
+            if (!isValidPersistedEntry(entryRaw))
+                continue;
+            if (isExpired(entryRaw, tsNow))
+                continue;
+            const sessionIdCandidate = isRecord(entryRaw) && typeof entryRaw.sessionId === 'string'
+                ? String(entryRaw.sessionId).trim()
+                : '';
+            setLatestSignatureEntry(aliasKeyRaw, {
+                signature: entryRaw.signature,
+                messageCount: entryRaw.messageCount,
+                timestamp: entryRaw.timestamp,
+                ...(sessionIdCandidate ? { sessionId: sessionIdCandidate } : {})
+            });
+        }
+    }
+    // Legacy v1 persistence ("latest" without alias) is kept only under "unknown" to avoid cross-alias mixing.
+    if (latestSignaturesByAlias.size === 0 && latestPersisted && !isExpired(latestPersisted, tsNow)) {
+        setLatestSignatureEntry('antigravity.unknown', {
+            signature: latestPersisted.signature,
+            messageCount: latestPersisted.messageCount,
+            timestamp: latestPersisted.timestamp
+        });
+    }
+    // Recompute per-alias latest values from session cache as a final best-effort pass.
+    for (const [key, entry] of sessionSignatures.entries()) {
+        if (isExpired(entry, tsNow))
+            continue;
+        const alias = key.split('|')[0] ?? 'unknown';
+        const existing = getLatestSignatureEntry(alias);
+        if (!existing || entry.timestamp > existing.timestamp) {
+            const sessionId = extractSessionIdFromCacheKey(key);
+            setLatestSignatureEntry(alias, {
+                signature: entry.signature,
+                messageCount: entry.messageCount,
+                timestamp: entry.timestamp,
+                ...(sessionId ? { sessionId } : {})
+            });
+        }
+    }
+    ensureCacheLimit();
+    state.loadedOnce = true;
+    state.loadedMtimeMs = mtimeMs;
+}
+function flushPersistedSignaturesSync(state) {
+    const filePath = resolvePersistFilePath(state.config);
+    // Avoid wiping existing persisted signatures when this process hasn't cached anything yet.
+    // Always re-hydrate before writing.
+    hydrateSignaturesFromDiskIfNeeded(true);
+    const tsNow = nowMs();
+    pruneExpired();
+    ensureCacheLimit();
+    const sessions = {};
+    for (const [sid, entry] of sessionSignatures.entries()) {
+        if (isExpired(entry, tsNow))
+            continue;
+        if (!entry.signature || entry.signature.trim().length < MIN_SIGNATURE_LENGTH)
+            continue;
+        if (entry.signature.trim() === DUMMY_THOUGHT_SIGNATURE_SENTINEL)
+            continue;
+        sessions[sid] = entry;
+    }
+    const latestByAliasPersist = {};
+    for (const [aliasKey, entry] of latestSignaturesByAlias.entries()) {
+        if (!entry.signature || entry.signature.trim().length < MIN_SIGNATURE_LENGTH)
+            continue;
+        if (entry.signature.trim() === DUMMY_THOUGHT_SIGNATURE_SENTINEL)
+            continue;
+        latestByAliasPersist[aliasKey] = entry;
+    }
+    const pinnedBySessionPersist = {};
+    for (const [sessionId, entry] of pinnedAliasBySession.entries()) {
+        const sid = typeof sessionId === 'string' ? sessionId.trim() : '';
+        if (!sid)
+            continue;
+        const aliasKey = typeof entry?.aliasKey === 'string' ? entry.aliasKey.trim() : '';
+        const timestamp = typeof entry?.timestamp === 'number' && Number.isFinite(entry.timestamp) ? Math.floor(entry.timestamp) : 0;
+        if (!aliasKey || !timestamp)
+            continue;
+        if (isPinnedExpired({ timestamp }, tsNow))
+            continue;
+        pinnedBySessionPersist[sid] = { aliasKey, timestamp };
+    }
+    const pinnedByAliasPersist = {};
+    for (const [aliasKey, entry] of pinnedSessionByAlias.entries()) {
+        const a = typeof aliasKey === 'string' ? aliasKey.trim() : '';
+        if (!a)
+            continue;
+        const sessionId = typeof entry?.sessionId === 'string' ? entry.sessionId.trim() : '';
+        const timestamp = typeof entry?.timestamp === 'number' && Number.isFinite(entry.timestamp) ? Math.floor(entry.timestamp) : 0;
+        if (!sessionId || !timestamp)
+            continue;
+        if (isPinnedExpired({ timestamp }, tsNow))
+            continue;
+        pinnedByAliasPersist[a] = { sessionId, timestamp };
+    }
+    try {
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+        const tmpPath = `${filePath}.tmp.${process.pid}.${tsNow}`;
+        fs.writeFileSync(tmpPath, JSON.stringify({
+            version: 3,
+            updatedAt: tsNow,
+            sessions,
+            ...(Object.keys(latestByAliasPersist).length ? { latestByAlias: latestByAliasPersist } : {}),
+            ...(Object.keys(pinnedBySessionPersist).length ? { pinnedBySession: pinnedBySessionPersist } : {}),
+            ...(Object.keys(pinnedByAliasPersist).length ? { pinnedByAlias: pinnedByAliasPersist } : {})
+        }, null, 2), 'utf8');
+        fs.renameSync(tmpPath, filePath);
+        try {
+            const stat = fs.statSync(filePath);
+            const mtimeMs = typeof stat.mtimeMs === 'number' && Number.isFinite(stat.mtimeMs) ? stat.mtimeMs : stat.mtime.getTime();
+            state.loadedOnce = true;
+            state.loadedMtimeMs = mtimeMs;
+        }
+        catch {
+            // ignore
+        }
+    }
+    catch {
+        // best-effort persistence: must not affect runtime
+    }
+}
+function schedulePersistenceFlush() {
+    const state = getPersistenceState();
+    if (!state) {
+        return;
+    }
+    if (state.flushTimer) {
+        return;
+    }
+    state.flushTimer = setTimeout(() => {
+        state.flushTimer = null;
+        flushPersistedSignaturesSync(state);
+    }, 250);
+    state.flushTimer.unref?.();
+}
+export function cacheAntigravityRequestSessionId(requestId, a, b) {
+    if (typeof b === 'string') {
+        cacheAntigravityRequestSessionMeta(requestId, { aliasKey: a, sessionId: b });
+        return;
+    }
+    cacheAntigravityRequestSessionMeta(requestId, { sessionId: a });
+}
+export function cacheAntigravityRequestSessionMeta(requestId, meta) {
     const rid = typeof requestId === 'string' ? requestId.trim() : '';
-    const sid = typeof sessionId === 'string' ? sessionId.trim() : '';
+    const sid = typeof meta?.sessionId === 'string' ? meta.sessionId.trim() : '';
     if (!rid || !sid) {
         return;
     }
+    const aliasKey = normalizeAliasKey(meta?.aliasKey);
+    const messageCount = typeof meta?.messageCount === 'number' && Number.isFinite(meta.messageCount) && meta.messageCount > 0
+        ? Math.floor(meta.messageCount)
+        : 1;
     const ts = nowMs();
-    requestSessionIds.set(rid, { sessionId: sid, timestamp: ts });
+    requestSessionIds.set(rid, { aliasKey, sessionId: sid, messageCount, timestamp: ts });
     if (requestSessionIds.size <= SESSION_CACHE_LIMIT) {
         return;
     }
@@ -116,6 +683,10 @@ export function cacheAntigravityRequestSessionId(requestId, sessionId) {
     }
 }
 export function getAntigravityRequestSessionId(requestId) {
+    const meta = getAntigravityRequestSessionMeta(requestId);
+    return meta?.sessionId;
+}
+export function getAntigravityRequestSessionMeta(requestId) {
     const rid = typeof requestId === 'string' ? requestId.trim() : '';
     if (!rid) {
         return undefined;
@@ -129,7 +700,7 @@ export function getAntigravityRequestSessionId(requestId) {
         requestSessionIds.delete(rid);
         return undefined;
     }
-    return entry.sessionId;
+    return { aliasKey: entry.aliasKey, sessionId: entry.sessionId, messageCount: entry.messageCount };
 }
 function findGeminiContentsNode(payload) {
     if (!isRecord(payload)) {
@@ -176,7 +747,9 @@ export function extractAntigravityGeminiSessionId(payload) {
             }
         }
         const combined = texts.join(' ').trim();
-        if (combined.length > 10 && !combined.includes('<system-reminder>')) {
+        // Antigravity-Manager alignment: always derive a stable session_id from the FIRST user message text,
+        // even if the prompt is short (avoid JSON fallback instability across tool loops / followups).
+        if (combined.length > 0) {
             seed = combined;
             break;
         }
@@ -187,14 +760,23 @@ export function extractAntigravityGeminiSessionId(payload) {
     const hash = sha256Hex(seed);
     return `sid-${hash.slice(0, 16)}`;
 }
-export function cacheAntigravitySessionSignature(sessionId, signature, messageCount = 1) {
-    if (typeof sessionId !== 'string' || !sessionId.trim()) {
+export function cacheAntigravitySessionSignature(a, b, c, d = 1) {
+    const isNewSignature = typeof c === 'string';
+    const aliasKey = isNewSignature ? a : 'antigravity.unknown';
+    const sessionId = isNewSignature ? b : a;
+    const signature = isNewSignature ? c : b;
+    const messageCount = typeof c === 'number' ? c : typeof d === 'number' ? d : 1;
+    const key = buildSignatureCacheKey(aliasKey, sessionId);
+    if (!key) {
         return;
     }
-    if (typeof signature !== 'string' || signature.length < MIN_SIGNATURE_LENGTH) {
+    if (typeof signature !== 'string') {
+        return;
+    }
+    const trimmedSignature = signature.trim();
+    if (trimmedSignature.length < MIN_SIGNATURE_LENGTH || trimmedSignature === DUMMY_THOUGHT_SIGNATURE_SENTINEL) {
         return;
     }
-    const key = sessionId.trim();
     const ts = nowMs();
     const existing = sessionSignatures.get(key);
     let shouldStore = false;
@@ -217,29 +799,259 @@ export function cacheAntigravitySessionSignature(sessionId, signature, messageCo
     if (!shouldStore) {
         return;
     }
-    sessionSignatures.set(key, { signature, messageCount, timestamp: ts });
+    sessionSignatures.set(key, { signature: trimmedSignature, messageCount, timestamp: ts });
+    rewindBlocks.delete(key);
+    const latest = getLatestSignatureEntry(aliasKey);
+    if (!latest || ts >= latest.timestamp) {
+        setLatestSignatureEntry(aliasKey, { signature: trimmedSignature, messageCount, timestamp: ts, sessionId });
+    }
+    maybePinAntigravitySessionToAlias(aliasKey, sessionId, ts);
     ensureCacheLimit();
+    schedulePersistenceFlush();
+}
+function maybePinAntigravitySessionToAlias(aliasKeyInput, sessionIdInput, ts) {
+    const aliasKey = normalizeAliasKey(aliasKeyInput);
+    const sessionId = normalizeSessionId(sessionIdInput);
+    if (!sessionId) {
+        return;
+    }
+    if (aliasKey === 'antigravity.unknown' || aliasKey === ANTIGRAVITY_GLOBAL_ALIAS_KEY) {
+        return;
+    }
+    const existing = pinnedAliasBySession.get(sessionId);
+    if (existing && !isPinnedExpired(existing, ts)) {
+        if (existing.aliasKey === aliasKey && ts - existing.timestamp >= SIGNATURE_TOUCH_INTERVAL_MS) {
+            pinnedAliasBySession.set(sessionId, { aliasKey, timestamp: ts });
+            pinnedSessionByAlias.set(aliasKey, { sessionId, timestamp: ts });
+            schedulePersistenceFlush();
+        }
+        return;
+    }
+    const existingForAlias = pinnedSessionByAlias.get(aliasKey);
+    if (existingForAlias && !isPinnedExpired(existingForAlias, ts) && existingForAlias.sessionId !== sessionId) {
+        return;
+    }
+    pinnedAliasBySession.set(sessionId, { aliasKey, timestamp: ts });
+    pinnedSessionByAlias.set(aliasKey, { sessionId, timestamp: ts });
+    schedulePersistenceFlush();
 }
-export function getAntigravitySessionSignature(sessionId) {
-    if (typeof sessionId !== 'string' || !sessionId.trim()) {
+export function lookupAntigravityPinnedAliasForSessionId(sessionIdInput, options) {
+    const sessionId = normalizeSessionId(sessionIdInput);
+    if (!sessionId) {
         return undefined;
     }
-    const key = sessionId.trim();
-    const entry = sessionSignatures.get(key);
+    const allowHydrate = options?.hydrate !== false;
+    if (allowHydrate) {
+        hydrateSignaturesFromDiskIfNeeded(true);
+    }
+    const entry = pinnedAliasBySession.get(sessionId);
     if (!entry) {
         return undefined;
     }
     const ts = nowMs();
-    if (isExpired(entry, ts)) {
-        sessionSignatures.delete(key);
+    if (isPinnedExpired(entry, ts)) {
+        pinnedAliasBySession.delete(sessionId);
         return undefined;
     }
-    return entry.signature;
+    if (ts - entry.timestamp >= SIGNATURE_TOUCH_INTERVAL_MS) {
+        pinnedAliasBySession.set(sessionId, { aliasKey: entry.aliasKey, timestamp: ts });
+        pinnedSessionByAlias.set(entry.aliasKey, { sessionId, timestamp: ts });
+        schedulePersistenceFlush();
+    }
+    return entry.aliasKey;
+}
+export function unpinAntigravitySessionAliasForSessionId(sessionIdInput) {
+    const sessionId = normalizeSessionId(sessionIdInput);
+    if (!sessionId) {
+        return;
+    }
+    hydrateSignaturesFromDiskIfNeeded(true);
+    const existing = pinnedAliasBySession.get(sessionId);
+    if (!existing) {
+        return;
+    }
+    pinnedAliasBySession.delete(sessionId);
+    const aliasKey = typeof existing.aliasKey === 'string' ? existing.aliasKey : '';
+    if (aliasKey) {
+        const backref = pinnedSessionByAlias.get(aliasKey);
+        if (backref?.sessionId === sessionId) {
+            pinnedSessionByAlias.delete(aliasKey);
+        }
+    }
+    schedulePersistenceFlush();
+}
+export function getAntigravitySessionSignature(a, b) {
+    return getAntigravitySessionSignatureEntry(a, b)?.signature;
+}
+export function lookupAntigravitySessionSignatureEntry(aliasKeyInput, sessionIdInput, options) {
+    const allowHydrate = options?.hydrate !== false;
+    const aliasKey = normalizeAliasKey(aliasKeyInput);
+    const sessionId = normalizeSessionId(sessionIdInput);
+    const cacheKey = buildSignatureCacheKey(aliasKey, sessionId);
+    if (!cacheKey) {
+        return { aliasKey, sessionId, cacheKey, source: 'miss' };
+    }
+    let entry = sessionSignatures.get(cacheKey);
+    if (!entry && allowHydrate) {
+        hydrateSignaturesFromDiskIfNeeded(true);
+        entry = sessionSignatures.get(cacheKey);
+    }
+    if (entry) {
+        const ts = nowMs();
+        if (isExpired(entry, ts)) {
+            sessionSignatures.delete(cacheKey);
+            return { aliasKey, sessionId, cacheKey, source: 'expired' };
+        }
+        touchSessionSignature(aliasKey, cacheKey, entry, ts);
+        return {
+            aliasKey,
+            sessionId,
+            cacheKey,
+            source: 'session_cache',
+            signature: entry.signature,
+            messageCount: entry.messageCount,
+            sourceSessionId: sessionId,
+            sourceTimestamp: entry.timestamp
+        };
+    }
+    if (!shouldAllowAliasLatestFallback(aliasKey)) {
+        return { aliasKey, sessionId, cacheKey, source: 'blocked_unknown_alias' };
+    }
+    const ts = nowMs();
+    const rewind = rewindBlocks.get(cacheKey);
+    if (rewind && ts < rewind.until) {
+        return { aliasKey, sessionId, cacheKey, source: 'blocked_rewind' };
+    }
+    // Antigravity-Manager alignment: do NOT reuse signatures across sessions.
+    // If we miss the session cache, the caller must omit thoughtSignature and wait for upstream to provide a real one.
+    // (Persistence is still used to restore the same session across restarts, not to "heal" unrelated sessions.)
+    if (allowHydrate) {
+        hydrateSignaturesFromDiskIfNeeded(true);
+        const hydrated = sessionSignatures.get(cacheKey);
+        if (hydrated && !isExpired(hydrated, ts)) {
+            touchSessionSignature(aliasKey, cacheKey, hydrated, ts);
+            return {
+                aliasKey,
+                sessionId,
+                cacheKey,
+                source: 'session_cache',
+                signature: hydrated.signature,
+                messageCount: hydrated.messageCount,
+                sourceSessionId: sessionId,
+                sourceTimestamp: hydrated.timestamp
+            };
+        }
+    }
+    return { aliasKey, sessionId, cacheKey, source: 'miss' };
+}
+export function getAntigravitySessionSignatureEntry(a, b, c) {
+    const hasAlias = typeof b === 'string';
+    const options = (hasAlias ? c : b);
+    const aliasKey = normalizeAliasKey(hasAlias ? a : 'antigravity.unknown');
+    const sessionId = hasAlias ? b : a;
+    const lookup = lookupAntigravitySessionSignatureEntry(aliasKey, sessionId, options);
+    if (lookup.signature && typeof lookup.messageCount === 'number') {
+        return { signature: lookup.signature, messageCount: lookup.messageCount };
+    }
+    return undefined;
+}
+export function clearAntigravitySessionSignature(a, b) {
+    const hasAlias = typeof b === 'string';
+    const aliasKey = hasAlias ? a : 'antigravity.unknown';
+    const sessionId = hasAlias ? b : a;
+    const key = buildSignatureCacheKey(aliasKey, sessionId);
+    if (!key) {
+        return;
+    }
+    sessionSignatures.delete(key);
+    // Keep latest-by-alias coherent so leasing doesn't keep pointing at a cleared signature.
+    if (hasAlias) {
+        const latest = getLatestSignatureEntry(aliasKey);
+        if (latest?.sessionId && latest.sessionId.trim() === normalizeSessionId(sessionId)) {
+            setLatestSignatureEntry(aliasKey, null);
+        }
+    }
+    schedulePersistenceFlush();
+}
+export function markAntigravitySessionSignatureRewind(aliasKey, sessionId, messageCount = 1) {
+    const key = buildSignatureCacheKey(aliasKey, sessionId);
+    if (!key) {
+        return;
+    }
+    const ts = nowMs();
+    const mc = typeof messageCount === 'number' && Number.isFinite(messageCount) && messageCount > 0 ? Math.floor(messageCount) : 1;
+    rewindBlocks.set(key, { timestamp: ts, until: ts + REWIND_BLOCK_MS, messageCount: mc });
+    // Best-effort bound on memory usage.
+    if (rewindBlocks.size > SESSION_CACHE_LIMIT) {
+        const entries = Array.from(rewindBlocks.entries()).sort((a, b) => a[1].timestamp - b[1].timestamp);
+        const overflow = rewindBlocks.size - SESSION_CACHE_LIMIT;
+        for (let i = 0; i < overflow; i++) {
+            const k = entries[i]?.[0];
+            if (k)
+                rewindBlocks.delete(k);
+        }
+    }
+}
+/**
+ * Clear thoughtSignature caches + pins for a specific (aliasKey, sessionId).
+ *
+ * Used for "Invalid signature / Corrupted thought signature / thinking.signature" style upstream errors,
+ * where keeping a persisted signature would cause repeated 400s after restart.
+ */
+export function invalidateAntigravitySessionSignature(aliasKeyInput, sessionIdInput) {
+    const aliasKey = normalizeAliasKey(aliasKeyInput);
+    const sessionId = normalizeSessionId(sessionIdInput);
+    if (!sessionId) {
+        return;
+    }
+    hydrateSignaturesFromDiskIfNeeded(true);
+    const keys = [
+        buildSignatureCacheKey(aliasKey, sessionId),
+        buildSignatureCacheKey(ANTIGRAVITY_GLOBAL_ALIAS_KEY, sessionId)
+    ].filter((k) => typeof k === 'string' && k.trim().length > 0);
+    keys.forEach((k) => sessionSignatures.delete(k));
+    const latest = getLatestSignatureEntry(aliasKey);
+    if (latest?.sessionId && latest.sessionId.trim() === sessionId) {
+        setLatestSignatureEntry(aliasKey, null);
+    }
+    const globalLatest = getLatestSignatureEntry(ANTIGRAVITY_GLOBAL_ALIAS_KEY);
+    if (globalLatest?.sessionId && globalLatest.sessionId.trim() === sessionId) {
+        setLatestSignatureEntry(ANTIGRAVITY_GLOBAL_ALIAS_KEY, null);
+    }
+    // Release any pins so routing can rotate away from a broken tool loop.
+    const pinnedAlias = pinnedAliasBySession.get(sessionId);
+    if (pinnedAlias) {
+        pinnedAliasBySession.delete(sessionId);
+        if (typeof pinnedAlias.aliasKey === 'string' && pinnedAlias.aliasKey.trim()) {
+            const backref = pinnedSessionByAlias.get(pinnedAlias.aliasKey);
+            if (backref?.sessionId === sessionId) {
+                pinnedSessionByAlias.delete(pinnedAlias.aliasKey);
+            }
+        }
+    }
+    const pinnedSession = pinnedSessionByAlias.get(aliasKey);
+    if (pinnedSession?.sessionId === sessionId) {
+        pinnedSessionByAlias.delete(aliasKey);
+    }
+    schedulePersistenceFlush();
+}
+export function resetAntigravitySessionSignatureCachesForTests() {
+    sessionSignatures.clear();
+    requestSessionIds.clear();
+    latestSignaturesByAlias.clear();
+    pinnedAliasBySession.clear();
+    pinnedSessionByAlias.clear();
+    rewindBlocks.clear();
+    const persistence = getPersistenceState();
+    if (persistence) {
+        persistence.loadedOnce = false;
+        persistence.loadedMtimeMs = null;
+    }
 }
 export function shouldTreatAsMissingThoughtSignature(value) {
     if (typeof value !== 'string') {
         return true;
     }
     const trimmed = value.trim();
-    return trimmed.length === 0 || trimmed === DUMMY_THOUGHT_SIGNATURE;
+    return trimmed.length === 0 || trimmed === DUMMY_THOUGHT_SIGNATURE_SENTINEL;
 }