@xopcai/xopc 0.0.145 → 0.0.147

package/dist/src/storage/sqlite/memory-records-repository.d.ts

@@ -3,7 +3,8 @@ export interface UpsertMemoryRecordInput {
     id?: string;
     providerId: string;
     kind: MemoryKind;
-    agentId: string;
+    userId?: string;
+    sourceAgentId: string;
     workspaceId?: string;
     sessionKey?: string;
     projectId?: string;
@@ -29,7 +30,8 @@ export interface UpsertMemoryRecordInput {
 }
 export interface ListMemoryRecordsOptions {
     providerId?: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     workspaceId?: string;
     projectId?: string;
     /** Include unscoped records plus records visible to this session. */
@@ -48,7 +50,8 @@ export interface ListMemoryRecordsOptions {
 }
 export interface SearchMemoryRecordsOptions {
     query: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     workspaceId?: string;
     projectId?: string;
     /** Include unscoped records plus records visible to this session. */
@@ -68,7 +71,8 @@ export interface SearchMemoryRecordsOptions {
 export interface AppendMemorySignalInput {
     signal: MemorySignal;
     providerId?: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     workspaceId?: string;
     sessionKey?: string;
     nowMs?: number;
@@ -78,7 +82,8 @@ export interface MemorySignalRowPayload {
     source: string;
     recordId?: string;
     providerId?: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     workspaceId?: string;
     sessionKey?: string;
     score?: number;
@@ -101,6 +106,7 @@ export interface AppendMemoryTraceEventInput {
     turnId?: string;
     phase: 'search' | 'read' | 'write' | 'update' | 'delete' | 'sync' | 'inject' | 'test' | 'understanding' | 'remediation';
     providerId: string;
+    sourceAgentId?: string;
     request?: unknown;
     resultCount?: number;
     selectedRecordIds?: string[];
@@ -162,7 +168,6 @@ export interface MemoryRecallFeedbackSummary {
     lastFeedbackAt?: string;
 }
 export interface UserUnderstandingQualityMetrics {
-    agentId?: string;
     windowDays: number;
     since: string;
     attempts: {
@@ -204,14 +209,17 @@ export interface UserUnderstandingQualityMetrics {
 }
 export declare function upsertMemoryRecord(input: UpsertMemoryRecordInput): MemoryRecord;
 export declare function getMemoryRecord(recordId: string): MemoryRecord | null;
+export declare function hasUnresolvedMemoryConflict(conflictGroupId: string): boolean;
 export declare function listMemoryRecords(options?: ListMemoryRecordsOptions): MemoryRecord[];
 export declare function searchMemoryRecords(options: SearchMemoryRecordsOptions): MemorySearchResult[];
 export declare function deleteMemoryRecord(recordId: string): boolean;
+export declare function markMemoryRecordsConflicted(recordIds: string[], conflictGroupId: string): number;
 export declare function appendMemorySignal(input: AppendMemorySignalInput): string;
 export declare function listMemorySignals(options?: {
     recordId?: string;
     providerId?: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     workspaceId?: string;
     limit?: number;
 }): MemorySignalRowPayload[];
@@ -220,7 +228,8 @@ export declare function setMemoryProviderState(providerId: string, scopeKey: str
 export declare function appendMemoryTraceEvent(input: AppendMemoryTraceEventInput): string;
 export declare function listMemoryTraceEvents(options?: {
     providerId?: string;
-    agentId?: string;
+    userId?: string;
+    sourceAgentId?: string;
     sessionKey?: string;
     phase?: string;
     limit?: number;
@@ -231,12 +240,11 @@ export declare function setLatestMemoryInjectFeedback(input: SetLatestMemoryInje
 export declare function summarizeMemoryRecallFeedback(options?: {
     recordId?: string;
     providerId?: string;
-    agentId?: string;
+    sourceAgentId?: string;
     sessionKey?: string;
     limit?: number;
 }): MemoryRecallFeedbackSummary[];
 export declare function summarizeUserUnderstandingQuality(options?: {
-    agentId?: string;
     windowDays?: number;
     agingCandidateDays?: number;
     nowMs?: number;

package/dist/src/storage/sqlite/memory-records-repository.js

@@ -1,5 +1,6 @@
 import { getSqliteDatabase, runSqliteWriteTransaction } from "./transaction.js";
 import { buildFts5SearchQuery, fts5RankToScore, memoryLexicalSimilarity } from "./fts.js";
+import { LOCAL_USER_ID } from "../../user-context/owner.js";
 import { randomUUID } from "node:crypto";
 //#region src/storage/sqlite/memory-records-repository.ts
 const USER_UNDERSTANDING_REMEDIATION_POLICY = {
@@ -96,11 +97,12 @@ function rowToRecord(row) {
 		status: row.status,
 		...row.canonical_key ? { canonicalKey: row.canonical_key } : {},
 		scope: {
-			agentId: row.agent_id,
+			userId: row.user_id,
 			...row.workspace_id ? { workspaceId: row.workspace_id } : {},
 			...row.session_key ? { sessionKey: row.session_key } : {},
 			...row.project_id ? { projectId: row.project_id } : {}
 		},
+		provenance: { sourceAgentId: row.source_agent_id },
 		content: row.content,
 		source: parseSource(row.source_json),
 		...row.confidence != null ? { confidence: row.confidence } : {},
@@ -125,8 +127,8 @@ function upsertMemoryRecordFts(db, row) {
 	db.prepare(`DELETE FROM memory_records_fts WHERE record_id = ?`).run(row.id);
 	if (!row.content.trim()) return;
 	db.prepare(`INSERT INTO memory_records_fts (
-      content, record_id, provider_id, kind, agent_id, workspace_id
-    ) VALUES (?, ?, ?, ?, ?, ?)`).run(row.content, row.id, row.providerId, row.kind, row.agentId, row.workspaceId ?? null);
+      content, record_id, provider_id, kind, user_id, source_agent_id, workspace_id
+    ) VALUES (?, ?, ?, ?, ?, ?, ?)`).run(row.content, row.id, row.providerId, row.kind, row.userId ?? "local-owner", row.sourceAgentId, row.workspaceId ?? null);
 }
 function upsertMemoryRecord(input) {
 	const id = input.id ?? randomUUID();
@@ -147,16 +149,17 @@ function upsertMemoryRecord(input) {
 	};
 	runSqliteWriteTransaction((db) => {
 		db.prepare(`INSERT INTO memory_records (
-        record_id, provider_id, kind, agent_id, workspace_id, session_key, project_id,
+        record_id, provider_id, kind, user_id, source_agent_id, workspace_id, session_key, project_id,
         content, source_json, confidence, tags_json, status, sensitivity,
         evidence_json, canonical_key, explicitness, durability, importance,
         disclosure_policy, valid_from, valid_to, review_after, expires_at,
         supersedes_record_id, conflict_group_id, created_at, updated_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(record_id) DO UPDATE SET
         provider_id = excluded.provider_id,
         kind = excluded.kind,
-        agent_id = excluded.agent_id,
+        user_id = excluded.user_id,
+        source_agent_id = excluded.source_agent_id,
         workspace_id = excluded.workspace_id,
         session_key = excluded.session_key,
         project_id = excluded.project_id,
@@ -178,7 +181,7 @@ function upsertMemoryRecord(input) {
         expires_at = excluded.expires_at,
         supersedes_record_id = excluded.supersedes_record_id,
         conflict_group_id = excluded.conflict_group_id,
-        updated_at = excluded.updated_at`).run(id, input.providerId, input.kind, input.agentId, input.workspaceId ?? null, input.sessionKey ?? null, input.projectId ?? null, input.content, JSON.stringify(source), input.confidence ?? null, JSON.stringify(input.tags ?? []), status, sensitivity, JSON.stringify(input.evidence ?? []), input.canonicalKey ?? null, explicitness, durability, importance, disclosurePolicy, validFrom, validTo, reviewAfter, expiresAt, input.supersedesRecordId ?? null, input.conflictGroupId ?? null, now, now);
+        updated_at = excluded.updated_at`).run(id, input.providerId, input.kind, input.userId ?? "local-owner", input.sourceAgentId, input.workspaceId ?? null, input.sessionKey ?? null, input.projectId ?? null, input.content, JSON.stringify(source), input.confidence ?? null, JSON.stringify(input.tags ?? []), status, sensitivity, JSON.stringify(input.evidence ?? []), input.canonicalKey ?? null, explicitness, durability, importance, disclosurePolicy, validFrom, validTo, reviewAfter, expiresAt, input.supersedesRecordId ?? null, input.conflictGroupId ?? null, now, now);
 		upsertMemoryRecordFts(db, {
 			...input,
 			id
@@ -206,11 +209,12 @@ function upsertMemoryRecord(input) {
 		status,
 		...input.canonicalKey ? { canonicalKey: input.canonicalKey } : {},
 		scope: {
-			agentId: input.agentId,
+			userId: input.userId ?? "local-owner",
 			...input.workspaceId ? { workspaceId: input.workspaceId } : {},
 			...input.sessionKey ? { sessionKey: input.sessionKey } : {},
 			...input.projectId ? { projectId: input.projectId } : {}
 		},
+		provenance: { sourceAgentId: input.sourceAgentId },
 		content: input.content,
 		source,
 		...input.confidence != null ? { confidence: input.confidence } : {},
@@ -235,6 +239,16 @@ function getMemoryRecord(recordId) {
 	const row = getSqliteDatabase().prepare(`SELECT * FROM memory_records WHERE record_id = ?`).get(recordId);
 	return row ? rowToRecord(row) : null;
 }
+function hasUnresolvedMemoryConflict(conflictGroupId) {
+	if (!conflictGroupId.trim()) return false;
+	const row = getSqliteDatabase().prepare(`
+    SELECT COUNT(*) AS count
+    FROM memory_records
+    WHERE conflict_group_id = ?
+      AND status IN ('active', 'candidate', 'needs_review', 'stale')
+  `).get(conflictGroupId);
+	return Number(row.count) > 1;
+}
 function listMemoryRecords(options = {}) {
 	const where = [];
 	const params = [];
@@ -242,9 +256,13 @@ function listMemoryRecords(options = {}) {
 		where.push("provider_id = ?");
 		params.push(options.providerId);
 	}
-	if (options.agentId) {
-		where.push("agent_id = ?");
-		params.push(options.agentId);
+	if (options.userId) {
+		where.push("user_id = ?");
+		params.push(options.userId);
+	}
+	if (options.sourceAgentId) {
+		where.push("source_agent_id = ?");
+		params.push(options.sourceAgentId);
 	}
 	if (options.workspaceId) {
 		where.push("workspace_id = ?");
@@ -286,9 +304,13 @@ function searchMemoryRecords(options) {
 	if (!query) return [];
 	const filters = ["memory_records_fts MATCH ?"];
 	const params = [query];
-	if (options.agentId) {
-		filters.push("f.agent_id = ?");
-		params.push(options.agentId);
+	if (options.userId) {
+		filters.push("f.user_id = ?");
+		params.push(options.userId);
+	}
+	if (options.sourceAgentId) {
+		filters.push("f.source_agent_id = ?");
+		params.push(options.sourceAgentId);
 	}
 	if (options.workspaceId) {
 		filters.push("f.workspace_id = ?");
@@ -329,7 +351,8 @@ function searchMemoryRecords(options) {
        LIMIT ?`).all(...params, maxResults * 3);
 	if (rows.length === 0) return listMemoryRecords({
 		providerId: options.providerId,
-		agentId: options.agentId,
+		userId: options.userId,
+		sourceAgentId: options.sourceAgentId,
 		workspaceId: options.workspaceId,
 		projectId: options.projectId,
 		visibleToSessionKey: options.visibleToSessionKey,
@@ -375,14 +398,29 @@ function deleteMemoryRecord(recordId) {
 		return db.prepare(`DELETE FROM memory_records WHERE record_id = ?`).run(recordId).changes > 0;
 	});
 }
+function markMemoryRecordsConflicted(recordIds, conflictGroupId) {
+	const ids = [...new Set(recordIds.filter(Boolean))];
+	if (!ids.length || !conflictGroupId.trim()) return 0;
+	return runSqliteWriteTransaction((db) => {
+		const now = Date.now();
+		const update = db.prepare(`
+      UPDATE memory_records
+      SET conflict_group_id = ?, status = 'needs_review', review_after = ?, updated_at = ?
+      WHERE record_id = ? AND status IN ('active', 'candidate', 'needs_review', 'stale')
+    `);
+		let changed = 0;
+		for (const id of ids) changed += Number(update.run(conflictGroupId, now, now, id).changes);
+		return changed;
+	});
+}
 function appendMemorySignal(input) {
 	const id = randomUUID();
 	const now = input.nowMs ?? Date.now();
 	runSqliteWriteTransaction((db) => {
 		db.prepare(`INSERT INTO memory_signals (
-        signal_id, source, record_id, provider_id, agent_id, workspace_id,
+        signal_id, source, record_id, provider_id, user_id, source_agent_id, workspace_id,
         session_key, score, content, metadata_json, created_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.signal.source, input.signal.recordId ?? null, input.providerId ?? null, input.agentId ?? null, input.workspaceId ?? null, input.sessionKey ?? null, input.signal.score ?? null, input.signal.content ?? null, JSON.stringify(input.signal.metadata ?? {}), now);
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.signal.source, input.signal.recordId ?? null, input.providerId ?? null, input.userId ?? "local-owner", input.sourceAgentId ?? null, input.workspaceId ?? null, input.sessionKey ?? null, input.signal.score ?? null, input.signal.content ?? null, JSON.stringify(input.signal.metadata ?? {}), now);
 		if (input.signal.recordId) db.prepare(`UPDATE memory_records
          SET recall_count = recall_count + 1, last_recalled_at = ?, updated_at = MAX(updated_at, ?)
          WHERE record_id = ?`).run(now, now, input.signal.recordId);
@@ -400,9 +438,13 @@ function listMemorySignals(options = {}) {
 		where.push("provider_id = ?");
 		params.push(options.providerId);
 	}
-	if (options.agentId) {
-		where.push("agent_id = ?");
-		params.push(options.agentId);
+	if (options.userId) {
+		where.push("user_id = ?");
+		params.push(options.userId);
+	}
+	if (options.sourceAgentId) {
+		where.push("source_agent_id = ?");
+		params.push(options.sourceAgentId);
 	}
 	if (options.workspaceId) {
 		where.push("workspace_id = ?");
@@ -425,7 +467,8 @@ function listMemorySignals(options = {}) {
 			source: row.source,
 			...row.record_id ? { recordId: row.record_id } : {},
 			...row.provider_id ? { providerId: row.provider_id } : {},
-			...row.agent_id ? { agentId: row.agent_id } : {},
+			userId: row.user_id,
+			...row.source_agent_id ? { sourceAgentId: row.source_agent_id } : {},
 			...row.workspace_id ? { workspaceId: row.workspace_id } : {},
 			...row.session_key ? { sessionKey: row.session_key } : {},
 			...row.score != null ? { score: row.score } : {},
@@ -461,8 +504,9 @@ function appendMemoryTraceEvent(input) {
 	runSqliteWriteTransaction((db) => {
 		db.prepare(`INSERT INTO memory_trace_events (
         trace_id, session_key, turn_id, phase, provider_id, request_json,
-        result_count, selected_record_ids_json, skipped_reason, error, feedback_json, duration_ms, created_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.sessionKey ?? null, input.turnId ?? null, input.phase, input.providerId, JSON.stringify(input.request ?? {}), input.resultCount ?? null, JSON.stringify(input.selectedRecordIds ?? []), input.skippedReason ?? null, input.error ?? null, JSON.stringify(feedback ?? {}), Math.max(0, Math.floor(input.durationMs ?? 0)), now);
+        result_count, selected_record_ids_json, skipped_reason, error, feedback_json, duration_ms, created_at,
+        user_id, source_agent_id
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.sessionKey ?? null, input.turnId ?? null, input.phase, input.providerId, JSON.stringify(input.request ?? {}), input.resultCount ?? null, JSON.stringify(input.selectedRecordIds ?? []), input.skippedReason ?? null, input.error ?? null, JSON.stringify(feedback ?? {}), Math.max(0, Math.floor(input.durationMs ?? 0)), now, LOCAL_USER_ID, input.sourceAgentId ?? null);
 	});
 	return id;
 }
@@ -473,9 +517,11 @@ function listMemoryTraceEvents(options = {}) {
 		where.push("provider_id = ?");
 		params.push(options.providerId);
 	}
-	if (options.agentId) {
-		where.push("session_key LIKE ?");
-		params.push(`agent:${options.agentId}:%`);
+	where.push("user_id = ?");
+	params.push(options.userId ?? "local-owner");
+	if (options.sourceAgentId) {
+		where.push("source_agent_id = ?");
+		params.push(options.sourceAgentId);
 	}
 	if (options.sessionKey) {
 		where.push("session_key = ?");
@@ -597,9 +643,11 @@ function summarizeMemoryRecallFeedback(options = {}) {
 		where.push("provider_id = ?");
 		params.push(options.providerId);
 	}
-	if (options.agentId) {
-		where.push("session_key LIKE ?");
-		params.push(`agent:${options.agentId}:%`);
+	where.push("user_id = ?");
+	params.push(LOCAL_USER_ID);
+	if (options.sourceAgentId) {
+		where.push("source_agent_id = ?");
+		params.push(options.sourceAgentId);
 	}
 	if (options.sessionKey) {
 		where.push("session_key = ?");
@@ -656,11 +704,10 @@ function summarizeUserUnderstandingQuality(options = {}) {
 	const sinceMs = nowMs - windowDays * 24 * 60 * 60 * 1e3;
 	const agingCutoffMs = nowMs - Math.max(1, Math.min(windowDays, Math.floor(options.agingCandidateDays ?? 7))) * 24 * 60 * 60 * 1e3;
 	const db = getSqliteDatabase();
-	const agentWhere = options.agentId ? "AND agent_id = ?" : "";
 	const recordRows = db.prepare(`SELECT record_id, status, explicitness, confidence, created_at, updated_at
      FROM memory_records
      WHERE tags_json LIKE '%"user-understanding"%'
-       ${agentWhere}`).all(...options.agentId ? [options.agentId] : []);
+       AND user_id = ?`).all(LOCAL_USER_ID);
 	const records = {
 		total: recordRows.length,
 		candidate: 0,
@@ -711,7 +758,6 @@ function summarizeUserUnderstandingQuality(options = {}) {
 		const parsed = parseJsonValue(row.request_json, {});
 		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) continue;
 		const request = parsed;
-		if (options.agentId && request.agentId !== options.agentId) continue;
 		attempts.total += 1;
 		if (request.source === "turn") attempts.turn += 1;
 		if (request.source === "background") attempts.background += 1;
@@ -747,7 +793,6 @@ function summarizeUserUnderstandingQuality(options = {}) {
 	const acceptedDecisions = recentDecisions.filter((row) => row.status === "active").length;
 	const decisionTotal = recentDecisions.length;
 	return {
-		...options.agentId ? { agentId: options.agentId } : {},
 		windowDays,
 		since: new Date(sinceMs).toISOString(),
 		attempts,
@@ -768,6 +813,6 @@ function parseJsonValue(json, fallback) {
 	}
 }
 //#endregion
-export { USER_UNDERSTANDING_REMEDIATION_POLICY, appendMemorySignal, appendMemoryTraceEvent, deleteMemoryRecord, findLatestMemoryInjectTrace, getMemoryProviderState, getMemoryRecord, listMemoryRecords, listMemorySignals, listMemoryTraceEvents, searchMemoryRecords, setLatestMemoryInjectFeedback, setMemoryProviderState, setMemoryTraceFeedback, summarizeMemoryRecallFeedback, summarizeUserUnderstandingQuality, upsertMemoryRecord };
+export { USER_UNDERSTANDING_REMEDIATION_POLICY, appendMemorySignal, appendMemoryTraceEvent, deleteMemoryRecord, findLatestMemoryInjectTrace, getMemoryProviderState, getMemoryRecord, hasUnresolvedMemoryConflict, listMemoryRecords, listMemorySignals, listMemoryTraceEvents, markMemoryRecordsConflicted, searchMemoryRecords, setLatestMemoryInjectFeedback, setMemoryProviderState, setMemoryTraceFeedback, summarizeMemoryRecallFeedback, summarizeUserUnderstandingQuality, upsertMemoryRecord };
 
 //# sourceMappingURL=memory-records-repository.js.map