@zhivex-ai/core 1.30.0 → 1.30.2

package/dist/agent-store/memory.js

@@ -1,6 +1,6 @@
 import { normalizeAgentRunState } from "../agent-state.js";
 import { ConflictError, ValidationError } from "../errors.js";
-import { scopedKey, resolveScope, cloneState, assertLeaseOwner, assertExpectedRevision, nextStoredState, scopePrefix, listStates, validateLeaseOptions, cloneJournalEntry, assertJournalRevision, nextJournalEntry, defaultMemoryKey, defaultMemoryMessages } from "./shared.js";
+import { scopedKey, matchesScope, journalKey as canonicalJournalKey, resolveScope, cloneState, assertLeaseOwner, assertExpectedRevision, nextStoredState, listStates, validateLeaseOptions, cloneJournalEntry, assertJournalRevision, nextJournalEntry, defaultMemoryKey, defaultMemoryMessages } from "./shared.js";
 const cloneMessages = (messages) => JSON.parse(JSON.stringify(messages));
 export const createInMemoryAgentRunStore = (options = {}) => {
     const states = new Map();
@@ -10,7 +10,7 @@ export const createInMemoryAgentRunStore = (options = {}) => {
     const journal = new Map();
     const runKey = (runId, scope) => scopedKey(resolveScope(options.scope, scope), runId);
     const idempotencyKey = (key, scope) => scopedKey(resolveScope(options.scope, scope), key);
-    const journalKey = (runId, toolCallId, scope) => `${runKey(runId, scope)}:${toolCallId}`;
+    const journalKey = (runId, toolCallId, scope) => canonicalJournalKey(resolveScope(options.scope, scope), runId, toolCallId);
     const removeParentIndex = (state) => {
         if (!state?.parentRunId) {
             return;
@@ -68,15 +68,17 @@ export const createInMemoryAgentRunStore = (options = {}) => {
             const current = states.get(runKey(state.runId, scope));
             assertExpectedRevision(current, saveOptions?.expectedRevision);
             const normalized = nextStoredState(state, saveOptions);
-            removeParentIndex(current);
-            states.set(runKey(normalized.runId, scope), cloneState({ ...normalized, ...(scope ? { scope } : {}) }));
             if (normalized.idempotencyKey) {
                 const owner = idempotencyKeys.get(idempotencyKey(normalized.idempotencyKey, scope));
                 if (owner && owner !== runKey(normalized.runId, scope)) {
                     throw new ConflictError("AgentRunState idempotency key conflict.");
                 }
-                idempotencyKeys.set(idempotencyKey(normalized.idempotencyKey, scope), runKey(normalized.runId, scope));
             }
+            const stored = cloneState({ ...normalized, ...(scope ? { scope } : {}) });
+            removeParentIndex(current);
+            states.set(runKey(normalized.runId, scope), stored);
+            if (normalized.idempotencyKey)
+                idempotencyKeys.set(idempotencyKey(normalized.idempotencyKey, scope), runKey(normalized.runId, scope));
             if (normalized.parentRunId) {
                 const parentKey = scopedKey(scope, normalized.parentRunId);
                 const children = parentRunIds.get(parentKey) ?? new Set();
@@ -93,18 +95,18 @@ export const createInMemoryAgentRunStore = (options = {}) => {
             removeParentIndex(state);
             states.delete(key);
             leases.delete(key);
-            for (const journalEntryKey of journal.keys()) {
-                if (journalEntryKey.startsWith(`${key}:`))
+            for (const [journalEntryKey, entry] of journal) {
+                if (entry.runId === runId && matchesScope(entry.scope, resolveScope(options.scope, scope)))
                     journal.delete(journalEntryKey);
             }
         },
         list(listOptions, scope) {
-            const prefix = scopePrefix(resolveScope(options.scope, scope));
-            return listStates([...states.entries()].filter(([key]) => key.startsWith(prefix)).map(([, state]) => state), listOptions);
+            const targetScope = resolveScope(options.scope, scope);
+            return listStates([...states.values()].filter(state => !targetScope || matchesScope(state.scope, targetScope)), listOptions);
         },
         deleteExpired(retention, scope) {
-            const prefix = scopePrefix(resolveScope(options.scope, scope));
-            const candidates = listStates([...states.entries()].filter(([key]) => key.startsWith(prefix)).map(([, state]) => state), {
+            const targetScope = resolveScope(options.scope, scope);
+            const candidates = listStates([...states.values()].filter(state => !targetScope || matchesScope(state.scope, targetScope)), {
                 statuses: retention.statuses,
                 updatedBefore: retention.before,
                 limit: retention.limit ?? 1_000
@@ -151,10 +153,9 @@ export const createInMemoryAgentRunStore = (options = {}) => {
             return this.loadToolCall?.(runId, toolCallId, scope);
         },
         listToolCalls(runId, scope) {
-            const prefix = `${runKey(runId, scope)}:`;
-            return [...journal.entries()]
-                .filter(([key]) => key.startsWith(prefix))
-                .map(([, entry]) => cloneJournalEntry(entry))
+            return [...journal.values()]
+                .filter(entry => entry.runId === runId && matchesScope(entry.scope, resolveScope(options.scope, scope)))
+                .map(entry => cloneJournalEntry(entry))
                 .sort((left, right) => left.updatedAt - right.updatedAt || left.toolCallId.localeCompare(right.toolCallId));
         },
         saveToolCall(entry, journalOptions) {
@@ -165,7 +166,7 @@ export const createInMemoryAgentRunStore = (options = {}) => {
             const key = journalKey(entry.runId, entry.toolCallId, scope);
             const current = journal.get(key);
             assertJournalRevision(current, journalOptions?.expectedRevision);
-            const next = nextJournalEntry(entry, journalOptions);
+            const next = nextJournalEntry({ ...entry, ...(scope ? { scope } : {}) }, journalOptions);
             journal.set(key, next);
             return cloneJournalEntry(next);
         },
@@ -188,7 +189,7 @@ export const createInMemoryAgentMemoryStore = (options = {}) => {
     const memories = new Map(Object.entries(options.initialMessages ?? {}).map(([key, messages]) => [key, cloneMessages(messages)]));
     return {
         load(context) {
-            return cloneMessages(memories.get(keyFor(context)) ?? (context.agentId ? options.initialMessages?.[context.agentId] : undefined) ?? []);
+            return cloneMessages(memories.get(keyFor(context)) ?? (!context.scope ? options.initialMessages?.[context.runId] : undefined) ?? (context.agentId ? options.initialMessages?.[context.agentId] : undefined) ?? []);
         },
         save(context) {
             memories.set(keyFor(context), cloneMessages(selectMessages(context.state)));

package/dist/agent-store/memory.js.map

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

package/dist/agent-store/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/agent-store/postgres.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,gBAAgB,EAGhB,aAAa,EAIb,+BAA+B,EAC/B,4BAA4B,EAE7B,MAAM,aAAa,CAAC;AA+DrB,eAAO,MAAM,2BAA2B,YAAa,4BAA4B,KAAG,aAuWnF,CAAC;AAEF,eAAO,MAAM,8BAA8B,YAAa,+BAA+B,KAAG,gBAoCzF,CAAC"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/agent-store/postgres.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,gBAAgB,EAGhB,aAAa,EAIb,+BAA+B,EAC/B,4BAA4B,EAE7B,MAAM,aAAa,CAAC;AAsErB,eAAO,MAAM,2BAA2B,YAAa,4BAA4B,KAAG,aAscnF,CAAC;AAEF,eAAO,MAAM,8BAA8B,YAAa,+BAA+B,KAAG,gBAmDzF,CAAC"}

package/dist/agent-store/postgres.js

@@ -1,7 +1,7 @@
 import { normalizeAgentRunState } from "../agent-state.js";
 import { ConflictError, ValidationError } from "../errors.js";
 import { assertPostgresClient } from "../postgres-client.js";
-import { validateIdentifier, scopedKey, resolveScope, getRecordField, nextStoredState, scopePrefix, listStates, validateLeaseOptions, cloneJournalEntry, nextJournalEntry, defaultMemoryKey, defaultMemoryMessages } from "./shared.js";
+import { validateIdentifier, scopedKey, legacyScopedKey, matchesRun, matchesScope, resolveScope, getRecordField, nextStoredState, listStates, parseAgentRunListOptions, validateLeaseOptions, cloneJournalEntry, nextJournalEntry, defaultMemoryKey, legacyDefaultMemoryKey, encodeAgentMemory, decodeAgentMemory, LEGACY_MEMORY_MIGRATION_MESSAGE, defaultMemoryMessages } from "./shared.js";
 const isConcurrentPostgresTableCreationConflict = (error) => {
     if (!error || typeof error !== "object")
         return false;
@@ -90,8 +90,39 @@ export const createPostgresAgentRunStore = (options) => {
     updated_at_ms BIGINT NOT NULL,
     PRIMARY KEY (run_key, tool_call_id)
   )`;
+    // Use persisted logical timestamps, not the database write timestamp. These
+    // expressions also apply to legacy rows without changing their physical keys.
+    const sortTimeSql = "COALESCE((state_json->>'updatedAt')::double precision, (state_json->>'startedAt')::double precision, 0)";
+    const updatedTimeSql = "COALESCE((state_json->>'updatedAt')::double precision, 0)";
+    const tenantSql = "(state_json #>> '{scope,tenantId}')";
+    const userSql = "(state_json #>> '{scope,userId}')";
+    const namespaceSql = "(state_json #>> '{scope,namespace}')";
+    // Scope strings are unbounded. Hash index entries so valid long identifiers
+    // cannot exceed PostgreSQL's B-tree tuple limit; raw predicates below still
+    // establish exact identity even if two values ever share a digest.
+    const scopeHashSql = (expression) => `md5(${expression})`;
+    // JS string ordering compares UTF-16 code units. PostgreSQL's C collation
+    // compares UTF-8 bytes instead, so supplementary characters need surrogate
+    // pairs in this sort key to preserve existing cursors exactly.
+    const runIdSortSql = `(SELECT string_agg(
+    CASE WHEN ascii(character) <= 65535 THEN lpad(to_hex(ascii(character)), 4, '0')
+      ELSE lpad(to_hex(55296 + (ascii(character) - 65536) / 1024), 4, '0')
+        || lpad(to_hex(56320 + (ascii(character) - 65536) % 1024), 4, '0') END,
+    '' ORDER BY position)
+    FROM regexp_split_to_table(state_json->>'runId', '') WITH ORDINALITY AS units(character, position)) COLLATE "C"`;
+    // Recreate scopedKey from logical JSON identity, including legacy rows. Build
+    // compact JSON explicitly: json[b]_build_array textual output adds spaces.
+    const scopeTupleSql = `CASE WHEN state_json->'scope' IS NULL THEN 'null' ELSE
+    '[' || COALESCE((state_json #> '{scope,namespace}')::text, 'null') || ','
+      || (state_json #> '{scope,tenantId}')::text || ','
+      || COALESCE((state_json #> '{scope,userId}')::text, 'null') || ']' END`;
+    const scopedSortSql = `('agent-run:v2:' || encode(sha256(convert_to(
+    '[' || to_json((${scopeTupleSql})::text)::text || ',' || (state_json->'runId')::text || ']',
+    'UTF8')), 'hex')) COLLATE "C"`;
     const createIndexesSql = `
     CREATE INDEX IF NOT EXISTS ${tableName}_updated_idx ON ${tableName} (updated_at_ms DESC, run_id);
+    CREATE INDEX IF NOT EXISTS ${tableName}_scope_hash_page_idx ON ${tableName} ((${scopeHashSql(tenantSql)}), (${scopeHashSql(userSql)}), (${scopeHashSql(namespaceSql)}), (${sortTimeSql}) DESC);
+    CREATE INDEX IF NOT EXISTS ${tableName}_logical_time_idx ON ${tableName} ((${sortTimeSql}) DESC);
     CREATE INDEX IF NOT EXISTS ${parentTableName}_parent_idx ON ${parentTableName} (parent_run_id, updated_at_ms DESC);
     CREATE INDEX IF NOT EXISTS ${leaseTableName}_expiry_idx ON ${leaseTableName} (expires_at_ms);
     CREATE INDEX IF NOT EXISTS ${journalTableName}_run_idx ON ${journalTableName} (run_key, updated_at_ms, tool_call_id)
@@ -104,53 +135,79 @@ export const createPostgresAgentRunStore = (options) => {
         await ensurePostgresTable(options.client, journalTableName, createJournalSql);
         await ensurePostgresTable(options.client, `${tableName}:indexes`, createIndexesSql);
     };
+    const physicalKey = async (runId, scope) => {
+        const targetScope = resolveScope(options.scope, scope);
+        const canonical = dbKey(runId, scope);
+        for (const key of [canonical, legacyScopedKey(targetScope, runId)]) {
+            const result = await options.client.query(`SELECT state_json FROM ${tableName} WHERE run_id = $1`, [key]);
+            const state = getRecordField(result.rows[0], ["state_json", "stateJson"]);
+            if (state && matchesRun(state, runId, targetScope))
+                return key;
+            if (state && key === canonical)
+                throw new ConflictError("Canonical agent key is occupied by a different legacy identity; migrate that identity before writing.");
+        }
+        return canonical;
+    };
+    const findByIdempotencyKey = async (idempotencyKey, scope) => {
+        const targetScope = resolveScope(options.scope, scope);
+        for (const key of [dbKey(idempotencyKey, scope), legacyScopedKey(targetScope, idempotencyKey)]) {
+            const result = await options.client.query(`SELECT runs.state_json FROM ${tableName} runs INNER JOIN ${idempotencyTableName} keys ON keys.run_id = runs.run_id WHERE keys.idempotency_key = $1`, [key]);
+            const state = getRecordField(result.rows[0], ["state_json", "stateJson"]);
+            if (state && state.idempotencyKey === idempotencyKey && matchesScope(state.scope, targetScope))
+                return normalizeAgentRunState(state);
+            if (state && key === dbKey(idempotencyKey, scope))
+                throw new ConflictError("Canonical idempotency key is occupied by a different legacy identity; migrate that index before writing.");
+        }
+        return undefined;
+    };
     return {
         async load(runId, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`SELECT state_json FROM ${tableName} WHERE run_id = $1`, [dbKey(runId, scope)]);
+            const result = await options.client.query(`SELECT state_json FROM ${tableName} WHERE run_id = $1`, [await physicalKey(runId, scope)]);
             const state = result.rows[0] ? (getRecordField(result.rows[0], ["state_json", "stateJson"]) ?? undefined) : undefined;
-            return state ? normalizeAgentRunState(state) : undefined;
+            return state && matchesRun(state, runId, resolveScope(options.scope, scope)) ? normalizeAgentRunState(state) : undefined;
         },
         async findByIdempotencyKey(idempotencyKey, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`SELECT runs.state_json
-         FROM ${tableName} runs
-         INNER JOIN ${idempotencyTableName} keys ON keys.run_id = runs.run_id
-         WHERE keys.idempotency_key = $1`, [dbKey(idempotencyKey, scope)]);
-            const state = result.rows[0] ? (getRecordField(result.rows[0], ["state_json", "stateJson"]) ?? undefined) : undefined;
-            return state ? normalizeAgentRunState(state) : undefined;
+            return findByIdempotencyKey(idempotencyKey, scope);
         },
         async findByParentRunId(parentRunId, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`SELECT runs.state_json
-         FROM ${tableName} runs
-         INNER JOIN ${parentTableName} parents ON parents.run_id = runs.run_id
-         WHERE parents.parent_run_id = $1`, [dbKey(parentRunId, scope)]);
-            return result.rows.flatMap((row) => {
-                const state = getRecordField(row, ["state_json", "stateJson"]) ?? undefined;
-                return state ? [normalizeAgentRunState(state)] : [];
-            });
+            const targetScope = resolveScope(options.scope, scope);
+            const states = new Map();
+            for (const key of [dbKey(parentRunId, scope), legacyScopedKey(targetScope, parentRunId)]) {
+                const result = await options.client.query(`SELECT runs.state_json FROM ${tableName} runs INNER JOIN ${parentTableName} parents ON parents.run_id = runs.run_id WHERE parents.parent_run_id = $1`, [key]);
+                for (const row of result.rows) {
+                    const state = getRecordField(row, ["state_json", "stateJson"]);
+                    if (state && state.parentRunId === parentRunId && matchesScope(state.scope, targetScope))
+                        states.set(state.runId, normalizeAgentRunState(state));
+                }
+            }
+            return [...states.values()];
         },
         async claimIdempotencyKey(state) {
             await ensureAllTables();
             const scope = resolveScope(options.scope, state.scope);
+            const existingOwner = await findByIdempotencyKey(state.idempotencyKey, scope);
+            if (existingOwner)
+                return { claimed: false, state: existingOwner };
             const normalized = normalizeAgentRunState({ ...state, ...(scope ? { scope } : {}) });
             const updatedAt = Date.now();
             await options.client.query(`INSERT INTO ${tableName} (run_id, state_json, updated_at_ms)
          VALUES ($1, $2::jsonb, $3)
-         ON CONFLICT(run_id) DO NOTHING`, [dbKey(normalized.runId, scope), normalized, updatedAt]);
+         ON CONFLICT(run_id) DO NOTHING`, [await physicalKey(normalized.runId, scope), normalized, updatedAt]);
             const claim = await options.client.query(`INSERT INTO ${idempotencyTableName} (idempotency_key, run_id, updated_at_ms)
          VALUES ($1, $2, $3)
          ON CONFLICT(idempotency_key) DO NOTHING
-         RETURNING run_id`, [dbKey(state.idempotencyKey, scope), dbKey(normalized.runId, scope), updatedAt]);
+         RETURNING run_id`, [dbKey(state.idempotencyKey, scope), await physicalKey(normalized.runId, scope), updatedAt]);
             const claimedRunId = getRecordField(claim.rows[0], ["run_id", "runId"]);
-            if (claimedRunId === dbKey(normalized.runId, scope)) {
+            if (claimedRunId === await physicalKey(normalized.runId, scope)) {
                 if (normalized.parentRunId) {
                     await options.client.query(`INSERT INTO ${parentTableName} (run_id, parent_run_id, updated_at_ms)
              VALUES ($1, $2, $3)
              ON CONFLICT(run_id) DO UPDATE SET
                parent_run_id = EXCLUDED.parent_run_id,
-               updated_at_ms = EXCLUDED.updated_at_ms`, [dbKey(normalized.runId, scope), dbKey(normalized.parentRunId, scope), updatedAt]);
+               updated_at_ms = EXCLUDED.updated_at_ms`, [await physicalKey(normalized.runId, scope), dbKey(normalized.parentRunId, scope), updatedAt]);
                 }
                 return { claimed: true, state: normalized };
             }
@@ -161,11 +218,11 @@ export const createPostgresAgentRunStore = (options) => {
             const existingState = existing.rows[0]
                 ? getRecordField(existing.rows[0], ["state_json", "stateJson"])
                 : undefined;
-            if (!existingState) {
-                throw new ConflictError("AgentRunState idempotency claim could not be loaded.");
+            if (!existingState || existingState.idempotencyKey !== state.idempotencyKey || !matchesScope(existingState.scope, scope)) {
+                throw new ConflictError("AgentRunState idempotency claim could not be loaded with the expected identity.");
             }
             if (existingState.runId !== normalized.runId) {
-                await options.client.query(`DELETE FROM ${tableName} WHERE run_id = $1`, [dbKey(normalized.runId, scope)]);
+                await options.client.query(`DELETE FROM ${tableName} WHERE run_id = $1`, [await physicalKey(normalized.runId, scope)]);
             }
             return { claimed: false, state: normalizeAgentRunState(existingState) };
         },
@@ -176,9 +233,12 @@ export const createPostgresAgentRunStore = (options) => {
             const stored = { ...normalized, ...(scope ? { scope } : {}) };
             const updatedAt = Date.now();
             if (normalized.idempotencyKey) {
+                const existingOwner = await findByIdempotencyKey(normalized.idempotencyKey, scope);
+                if (existingOwner && existingOwner.runId !== normalized.runId)
+                    throw new ConflictError("AgentRunState idempotency key conflict.");
                 const owner = await options.client.query(`SELECT run_id FROM ${idempotencyTableName} WHERE idempotency_key = $1`, [dbKey(normalized.idempotencyKey, scope)]);
                 const ownerRunId = getRecordField(owner.rows[0], ["run_id", "runId"]);
-                if (typeof ownerRunId === "string" && ownerRunId !== dbKey(normalized.runId, scope)) {
+                if (typeof ownerRunId === "string" && ownerRunId !== await physicalKey(normalized.runId, scope)) {
                     throw new ConflictError("AgentRunState idempotency key conflict.");
                 }
             }
@@ -187,7 +247,7 @@ export const createPostgresAgentRunStore = (options) => {
            VALUES ($1, $2::jsonb, $3)
            ON CONFLICT(run_id) DO UPDATE SET
              state_json = EXCLUDED.state_json,
-             updated_at_ms = EXCLUDED.updated_at_ms`, [dbKey(normalized.runId, scope), stored, updatedAt]);
+             updated_at_ms = EXCLUDED.updated_at_ms`, [await physicalKey(normalized.runId, scope), stored, updatedAt]);
             }
             else {
                 const saved = await options.client.query(`INSERT INTO ${tableName} (run_id, state_json, updated_at_ms)
@@ -196,28 +256,28 @@ export const createPostgresAgentRunStore = (options) => {
              state_json = EXCLUDED.state_json,
              updated_at_ms = EXCLUDED.updated_at_ms
            WHERE COALESCE((${tableName}.state_json->>'revision')::bigint, 0) = $4
-           RETURNING run_id`, [dbKey(normalized.runId, scope), stored, updatedAt, saveOptions.expectedRevision]);
-                if (getRecordField(saved.rows[0], ["run_id", "runId"]) !== dbKey(normalized.runId, scope)) {
+           RETURNING run_id`, [await physicalKey(normalized.runId, scope), stored, updatedAt, saveOptions.expectedRevision]);
+                if (getRecordField(saved.rows[0], ["run_id", "runId"]) !== await physicalKey(normalized.runId, scope)) {
                     throw new ConflictError("AgentRunState revision conflict.");
                 }
             }
             if (normalized.idempotencyKey) {
                 await options.client.query(`INSERT INTO ${idempotencyTableName} (idempotency_key, run_id, updated_at_ms)
            VALUES ($1, $2, $3)
-           ON CONFLICT(idempotency_key) DO NOTHING`, [dbKey(normalized.idempotencyKey, scope), dbKey(normalized.runId, scope), updatedAt]);
+           ON CONFLICT(idempotency_key) DO NOTHING`, [dbKey(normalized.idempotencyKey, scope), await physicalKey(normalized.runId, scope), updatedAt]);
             }
-            await options.client.query(`DELETE FROM ${parentTableName} WHERE run_id = $1`, [dbKey(normalized.runId, scope)]);
+            await options.client.query(`DELETE FROM ${parentTableName} WHERE run_id = $1`, [await physicalKey(normalized.runId, scope)]);
             if (normalized.parentRunId) {
                 await options.client.query(`INSERT INTO ${parentTableName} (run_id, parent_run_id, updated_at_ms)
            VALUES ($1, $2, $3)
            ON CONFLICT(run_id) DO UPDATE SET
              parent_run_id = EXCLUDED.parent_run_id,
-             updated_at_ms = EXCLUDED.updated_at_ms`, [dbKey(normalized.runId, scope), dbKey(normalized.parentRunId, scope), updatedAt]);
+             updated_at_ms = EXCLUDED.updated_at_ms`, [await physicalKey(normalized.runId, scope), dbKey(normalized.parentRunId, scope), updatedAt]);
             }
         },
         async delete(runId, scope) {
             await ensureAllTables();
-            const key = dbKey(runId, scope);
+            const key = await physicalKey(runId, scope);
             await options.client.query(`WITH deleted_run AS (
            DELETE FROM ${tableName} WHERE run_id = $1 RETURNING run_id
          ), deleted_idempotency AS (
@@ -229,14 +289,63 @@ export const createPostgresAgentRunStore = (options) => {
          )
          DELETE FROM ${journalTableName} WHERE run_key = $1`, [key]);
         },
-        async list(listOptions, scope) {
+        async list(listOptions = {}, scope) {
+            const targetScope = resolveScope(options.scope, scope);
+            const { limit, cursor } = parseAgentRunListOptions(listOptions);
+            const parameters = [];
+            const bind = (value) => { parameters.push(value); return `$${parameters.length}`; };
+            const predicates = [];
+            if (targetScope) {
+                for (const [expression, value] of [
+                    [tenantSql, targetScope.tenantId],
+                    [userSql, targetScope.userId],
+                    [namespaceSql, targetScope.namespace]
+                ]) {
+                    if (value === undefined) {
+                        predicates.push(`${scopeHashSql(expression)} IS NULL`, `${expression} IS NULL`);
+                    }
+                    else {
+                        const parameter = `${bind(value)}::text`;
+                        predicates.push(`${scopeHashSql(expression)} = ${scopeHashSql(parameter)}`, `${expression} = ${parameter}`);
+                    }
+                }
+            }
+            if (listOptions.agentId !== undefined)
+                predicates.push(`state_json->>'agentId' = ${bind(listOptions.agentId)}::text`);
+            if (listOptions.parentRunId !== undefined)
+                predicates.push(`state_json->>'parentRunId' = ${bind(listOptions.parentRunId)}::text`);
+            if (listOptions.statuses?.length)
+                predicates.push(`state_json->>'status' = ANY(${bind(listOptions.statuses)}::text[])`);
+            if (listOptions.updatedAfter !== undefined)
+                predicates.push(`${updatedTimeSql} > ${bind(listOptions.updatedAfter)}::double precision`);
+            if (listOptions.updatedBefore !== undefined)
+                predicates.push(`${updatedTimeSql} < ${bind(listOptions.updatedBefore)}::double precision`);
+            let cursorPredicate = "";
+            if (cursor) {
+                const utf16RunId = Array.from({ length: cursor[1].length }, (_, index) => cursor[1].charCodeAt(index).toString(16).padStart(4, "0")).join("");
+                const time = bind(cursor[0]);
+                const id = bind(utf16RunId);
+                cursorPredicate = cursor[2] === undefined
+                    ? `WHERE (sort_time, run_id_sort) < (${time}::double precision, ${id}::text COLLATE "C")`
+                    : `WHERE (sort_time, run_id_sort, scope_sort) < (${time}::double precision, ${id}::text COLLATE "C", ${bind(cursor[2])}::text COLLATE "C")`;
+            }
+            const query = `WITH candidates AS (
+        SELECT state_json, ${sortTimeSql} AS sort_time,
+          ${runIdSortSql} AS run_id_sort, ${scopedSortSql} AS scope_sort
+        FROM ${tableName}
+        ${predicates.length ? `WHERE ${predicates.join(" AND ")}` : ""}
+      )
+      SELECT state_json FROM candidates ${cursorPredicate}
+      ORDER BY sort_time DESC, run_id_sort DESC, scope_sort DESC
+      LIMIT ${bind(limit + 1)}::integer`;
             await ensureAllTables();
-            const prefix = scopePrefix(resolveScope(options.scope, scope));
-            const result = await options.client.query(`SELECT state_json FROM ${tableName} WHERE run_id >= $1 AND run_id < $2`, [prefix, `${prefix}\uffff`]);
+            const result = await options.client.query(query, parameters);
             const states = result.rows.flatMap((row) => {
                 const state = getRecordField(row, ["state_json", "stateJson"]);
-                return state ? [normalizeAgentRunState(state)] : [];
+                return state && (!targetScope || matchesScope(state.scope, targetScope)) ? [normalizeAgentRunState(state)] : [];
             });
+            // At most limit + 1 matching states cross the connection. Shared projection
+            // preserves exactly the same cursor format as memory, file and SQLite.
             return listStates(states, listOptions);
         },
         async deleteExpired(retention, scope) {
@@ -249,7 +358,7 @@ export const createPostgresAgentRunStore = (options) => {
             validateLeaseOptions(leaseOptions);
             await ensureAllTables();
             const now = leaseOptions.now ?? Date.now();
-            const key = dbKey(runId, scope);
+            const key = await physicalKey(runId, scope);
             const expiresAt = now + leaseOptions.ttlMs;
             const result = await options.client.query(`INSERT INTO ${leaseTableName} (run_key, run_id, owner_id, expires_at_ms)
          SELECT $1, $2, $3, $4
@@ -270,20 +379,22 @@ export const createPostgresAgentRunStore = (options) => {
             const result = await options.client.query(`UPDATE ${leaseTableName}
          SET expires_at_ms = $3
          WHERE run_key = $1 AND owner_id = $2 AND expires_at_ms > $4
-         RETURNING owner_id`, [dbKey(runId, scope), leaseOptions.ownerId, expiresAt, now]);
+         RETURNING owner_id`, [await physicalKey(runId, scope), leaseOptions.ownerId, expiresAt, now]);
             return getRecordField(result.rows[0], ["owner_id", "ownerId"]) === leaseOptions.ownerId
                 ? { runId, ownerId: leaseOptions.ownerId, expiresAt }
                 : undefined;
         },
         async releaseLease(runId, ownerId, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`DELETE FROM ${leaseTableName} WHERE run_key = $1 AND owner_id = $2 RETURNING owner_id`, [dbKey(runId, scope), ownerId]);
+            const result = await options.client.query(`DELETE FROM ${leaseTableName} WHERE run_key = $1 AND owner_id = $2 RETURNING owner_id`, [await physicalKey(runId, scope), ownerId]);
             return getRecordField(result.rows[0], ["owner_id", "ownerId"]) === ownerId;
         },
         async loadToolCall(runId, toolCallId, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`SELECT entry_json FROM ${journalTableName} WHERE run_key = $1 AND tool_call_id = $2`, [dbKey(runId, scope), toolCallId]);
+            const result = await options.client.query(`SELECT entry_json FROM ${journalTableName} WHERE run_key = $1 AND tool_call_id = $2`, [await physicalKey(runId, scope), toolCallId]);
             const entry = getRecordField(result.rows[0], ["entry_json", "entryJson"]);
+            if (entry && typeof entry === "object" && (!matchesRun(entry, runId, resolveScope(options.scope, scope)) || entry.toolCallId !== toolCallId))
+                throw new ConflictError("Persisted journal identity cannot be verified; reconcile or migrate before executing the tool.");
             return entry && typeof entry === "object" ? cloneJournalEntry(entry) : undefined;
         },
         async loadToolExecution(runId, toolCallId, scope) {
@@ -291,16 +402,20 @@ export const createPostgresAgentRunStore = (options) => {
         },
         async listToolCalls(runId, scope) {
             await ensureAllTables();
-            const result = await options.client.query(`SELECT entry_json FROM ${journalTableName} WHERE run_key = $1 ORDER BY updated_at_ms, tool_call_id`, [dbKey(runId, scope)]);
+            const result = await options.client.query(`SELECT entry_json FROM ${journalTableName} WHERE run_key = $1 ORDER BY updated_at_ms, tool_call_id`, [await physicalKey(runId, scope)]);
             return result.rows.flatMap((row) => {
                 const entry = getRecordField(row, ["entry_json", "entryJson"]);
+                if (entry && typeof entry === "object" && !matchesRun(entry, runId, resolveScope(options.scope, scope)))
+                    throw new ConflictError("Persisted journal identity cannot be verified; reconcile or migrate before continuing.");
                 return entry && typeof entry === "object" ? [cloneJournalEntry(entry)] : [];
             });
         },
         async saveToolCall(entry, journalOptions) {
             await ensureAllTables();
-            const next = nextJournalEntry(entry, journalOptions);
-            const key = dbKey(entry.runId, entry.scope);
+            await this.loadToolCall?.(entry.runId, entry.toolCallId, entry.scope);
+            const scope = resolveScope(options.scope, entry.scope);
+            const next = nextJournalEntry({ ...entry, ...(scope ? { scope } : {}) }, journalOptions);
+            const key = await physicalKey(entry.runId, entry.scope);
             const result = journalOptions?.expectedRevision === undefined
                 ? await options.client.query(`INSERT INTO ${journalTableName} (run_key, tool_call_id, entry_json, revision, updated_at_ms)
            VALUES ($1, $2, $3::jsonb, $4, $5)
@@ -322,12 +437,13 @@ export const createPostgresAgentRunStore = (options) => {
         },
         async claimToolExecution(entry) {
             await ensureAllTables();
-            const next = nextJournalEntry({ ...entry, status: "running", revision: 0 });
+            const scope = resolveScope(options.scope, entry.scope);
+            const next = nextJournalEntry({ ...entry, ...(scope ? { scope } : {}), status: "running", revision: 0 });
             const result = await options.client.query(`INSERT INTO ${journalTableName} (run_key, tool_call_id, entry_json, revision, updated_at_ms)
          SELECT $1, $2, $3::jsonb, 0, $4
          WHERE EXISTS (SELECT 1 FROM ${tableName} WHERE run_id = $1)
          ON CONFLICT(run_key, tool_call_id) DO NOTHING
-         RETURNING entry_json`, [dbKey(entry.runId, entry.scope), entry.toolCallId, next, next.updatedAt]);
+         RETURNING entry_json`, [await physicalKey(entry.runId, entry.scope), entry.toolCallId, next, next.updatedAt]);
             const claimed = getRecordField(result.rows[0], ["entry_json", "entryJson"]);
             if (claimed && typeof claimed === "object")
                 return { claimed: true, entry: next };
@@ -345,6 +461,9 @@ export const createPostgresAgentMemoryStore = (options) => {
     assertPostgresClient(options.client);
     const tableName = validateIdentifier(options.tableName ?? "zhivex_agent_memory", "tableName");
     const keyFor = (context) => (options.key ?? defaultMemoryKey)({ ...context, scope: resolveScope(options.scope, context.scope) });
+    const memoryContext = (context) => ({ ...context, scope: resolveScope(options.scope, context.scope) });
+    const encode = (context, messages) => options.key ? messages : encodeAgentMemory(memoryContext(context), messages);
+    const decode = (context, value) => options.key ? value : decodeAgentMemory(memoryContext(context), value);
     const selectMessages = options.selectMessages ?? defaultMemoryMessages;
     const createSql = `
     CREATE TABLE IF NOT EXISTS ${tableName} (
@@ -353,21 +472,36 @@ export const createPostgresAgentMemoryStore = (options) => {
       updated_at_ms BIGINT NOT NULL
     )
   `;
+    const assertMemoryIdentity = async (context) => {
+        if (options.key)
+            return;
+        const canonical = await options.client.query(`SELECT messages_json FROM ${tableName} WHERE memory_key = $1`, [keyFor(context)]);
+        if (canonical.rows.length) {
+            decode(context, getRecordField(canonical.rows[0], ["messages_json", "messagesJson"]));
+            return;
+        }
+        const legacy = legacyDefaultMemoryKey({ ...context, scope: resolveScope(options.scope, context.scope) });
+        const previous = await options.client.query(`SELECT messages_json FROM ${tableName} WHERE memory_key = $1`, [legacy]);
+        if (previous.rows.length)
+            throw new ValidationError(LEGACY_MEMORY_MIGRATION_MESSAGE);
+    };
     return {
         async load(context) {
             await ensurePostgresTable(options.client, tableName, createSql);
+            await assertMemoryIdentity(context);
             const result = await options.client.query(`SELECT messages_json FROM ${tableName} WHERE memory_key = $1`, [keyFor(context)]);
             return result.rows[0]
-                ? (getRecordField(result.rows[0], ["messages_json", "messagesJson"]) ?? [])
+                ? decode(context, getRecordField(result.rows[0], ["messages_json", "messagesJson"]))
                 : [];
         },
         async save(context) {
             await ensurePostgresTable(options.client, tableName, createSql);
+            await assertMemoryIdentity(context);
             await options.client.query(`INSERT INTO ${tableName} (memory_key, messages_json, updated_at_ms)
          VALUES ($1, $2::jsonb, $3)
          ON CONFLICT(memory_key) DO UPDATE SET
            messages_json = EXCLUDED.messages_json,
-           updated_at_ms = EXCLUDED.updated_at_ms`, [keyFor(context), selectMessages(context.state), Date.now()]);
+           updated_at_ms = EXCLUDED.updated_at_ms`, [keyFor(context), encode(context, selectMessages(context.state)), Date.now()]);
         }
     };
 };