@xopcai/xopc 0.0.217 → 0.0.219

package/dist/src/storage/sqlite/migrations/runner.js

@@ -12,7 +12,7 @@ const log = createLogger("Sqlite:Migrations");
 /** Baseline schema version applied from schema.sql on first open. */
 const XOPC_DB_BASELINE_SCHEMA_VERSION = 11;
 /** Latest schema version this release supports (increment when adding migrations). */
-const XOPC_DB_SCHEMA_VERSION = 125;
+const XOPC_DB_SCHEMA_VERSION = 132;
 const MODULE_DIR = dirname(fileURLToPath(import.meta.url));
 function backupBeforeTaskCutover(db, databasePath) {
 	db.exec("PRAGMA wal_checkpoint(FULL)");
@@ -57,7 +57,7 @@ function applySingleMigration(db, migration) {
 * Each step runs in its own transaction and updates schema_meta on success.
 */
 function applyPendingMigrations(db, options = {}) {
-	const targetVersion = options.targetVersion ?? 125;
+	const targetVersion = options.targetVersion ?? 132;
 	let currentVersion = readSchemaVersion(db);
 	if (currentVersion > targetVersion) throw new DatabaseSchemaTooNewError(currentVersion, targetVersion);
 	if (currentVersion >= targetVersion) return currentVersion;
@@ -94,7 +94,7 @@ function applyPendingMigrations(db, options = {}) {
 }
 /** Inspect schema version without mutating the database. */
 function inspectSchemaMigrationStatus(db, options = {}) {
-	const appVersion = options.targetVersion ?? 125;
+	const appVersion = options.targetVersion ?? 132;
 	const dbVersion = readSchemaVersion(db);
 	if (dbVersion > appVersion) return {
 		dbVersion,

package/dist/src/storage/sqlite/migrations/runner.ts

@@ -19,7 +19,7 @@ const log = createLogger('Sqlite:Migrations');
 export const XOPC_DB_BASELINE_SCHEMA_VERSION = 11;
 
 /** Latest schema version this release supports (increment when adding migrations). */
-export const XOPC_DB_SCHEMA_VERSION = 125;
+export const XOPC_DB_SCHEMA_VERSION = 132;
 
 const MODULE_DIR = dirname(fileURLToPath(import.meta.url));
 

package/dist/src/storage/sqlite/schema.js

@@ -32,7 +32,7 @@ function ensureXopcDatabaseSchema(db, options = {}) {
 		currentVersion = 11;
 	}
 	applyPendingMigrations(db, {
-		targetVersion: 125,
+		targetVersion: 132,
 		databasePath: options.databasePath
 	});
 }

package/dist/src/storage/sqlite/session-input-repository.d.ts

@@ -1,4 +1,5 @@
 import { type TurnOrigin } from '@xopcai/endpoint-tools-protocol';
+import type { AgentSourceContext, SourceContextRefSummary } from '../../agent/source-context/types.js';
 export type SessionInputDelivery = 'next' | 'steer';
 export type SessionInputStatus = 'queued' | 'running' | 'injecting' | 'completed' | 'cancelled' | 'failed' | 'interrupted';
 export type SessionInput = {
@@ -10,6 +11,8 @@ export type SessionInput = {
     status: SessionInputStatus;
     content: string;
     attachments?: unknown[];
+    contextRefs?: SourceContextRefSummary[];
+    contextSnapshots?: AgentSourceContext[];
     thinking?: string;
     origin: TurnOrigin;
     position: number;
@@ -29,6 +32,7 @@ export type SessionInputState = {
 };
 export declare function getSessionInputState(sessionKey: string): SessionInputState;
 export declare function findSessionInput(sessionKey: string, clientMessageId: string): SessionInput | undefined;
+export declare function getSessionInputById(sessionKey: string, id: string): SessionInput | undefined;
 export declare function insertSessionInput(input: {
     id: string;
     sessionKey: string;
@@ -38,6 +42,8 @@ export declare function insertSessionInput(input: {
     status: 'queued' | 'injecting';
     content: string;
     attachments?: unknown[];
+    contextRefs?: SourceContextRefSummary[];
+    contextSnapshots?: AgentSourceContext[];
     thinking?: string;
     origin: TurnOrigin;
     targetRunId?: string;
@@ -55,6 +61,8 @@ export declare function mutateQueuedSessionInput(input: {
     version: number;
     content?: string;
     attachments?: unknown[];
+    contextRefs?: SourceContextRefSummary[];
+    contextSnapshots?: AgentSourceContext[];
     thinking?: string;
     position?: number;
 }): boolean;

package/dist/src/storage/sqlite/session-input-repository.js

@@ -11,6 +11,8 @@ function mapInput(row) {
 		status: row.status,
 		content: row.content,
 		attachments: row.attachments_json ? JSON.parse(row.attachments_json) : void 0,
+		contextRefs: row.context_refs_json ? JSON.parse(row.context_refs_json) : void 0,
+		contextSnapshots: row.context_snapshots_json ? JSON.parse(row.context_snapshots_json) : void 0,
 		thinking: row.thinking ?? void 0,
 		position: row.position,
 		origin: turnOriginSchema.parse(JSON.parse(row.origin_json)),
@@ -23,7 +25,8 @@ function mapInput(row) {
 	};
 }
 const SELECT_INPUTS = `SELECT id, session_key, client_message_id, requested_delivery,
-  effective_delivery, status, content, attachments_json, thinking, origin_json, position,
+  effective_delivery, status, content, attachments_json, context_refs_json, context_snapshots_json,
+  thinking, origin_json, position,
   target_run_id, run_id, version, error, created_at_ms, updated_at_ms
   FROM session_inputs`;
 function ensureRuntime(db, sessionKey) {
@@ -47,13 +50,20 @@ function getSessionInputState(sessionKey) {
 		revision: runtime?.revision ?? 0,
 		activeRunId: runtime?.active_run_id ?? void 0,
 		activeInputId: runtime?.active_input_id ?? void 0,
-		inputs: rows.map(mapInput)
+		inputs: rows.map((row) => {
+			const { contextSnapshots: _contextSnapshots, ...input } = mapInput(row);
+			return input;
+		})
 	};
 }
 function findSessionInput(sessionKey, clientMessageId) {
 	const row = getSqliteDatabase().prepare(`${SELECT_INPUTS} WHERE session_key = ? AND client_message_id = ?`).get(sessionKey, clientMessageId);
 	return row ? mapInput(row) : void 0;
 }
+function getSessionInputById(sessionKey, id) {
+	const row = getSqliteDatabase().prepare(`${SELECT_INPUTS} WHERE session_key = ? AND id = ?`).get(sessionKey, id);
+	return row ? mapInput(row) : void 0;
+}
 function insertSessionInput(input) {
 	return runSqliteWriteTransaction((db) => {
 		const existing = db.prepare(`${SELECT_INPUTS} WHERE session_key = ? AND client_message_id = ?`).get(input.sessionKey, input.clientMessageId);
@@ -63,8 +73,9 @@ function insertSessionInput(input) {
       WHERE session_key = ? AND status IN ('queued','running','injecting','interrupted')`).get(input.sessionKey);
 		db.prepare(`INSERT INTO session_inputs(id, session_key, client_message_id,
       requested_delivery, effective_delivery, status, content, attachments_json,
-      thinking, origin_json, position, target_run_id, version, created_at_ms, updated_at_ms)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`).run(input.id, input.sessionKey, input.clientMessageId, input.requestedDelivery, input.effectiveDelivery, input.status, input.content, input.attachments ? JSON.stringify(input.attachments) : null, input.thinking ?? null, JSON.stringify(input.origin), max.value + 1, input.targetRunId ?? null, now, now);
+      context_refs_json, context_snapshots_json, thinking, origin_json, position,
+      target_run_id, version, created_at_ms, updated_at_ms)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`).run(input.id, input.sessionKey, input.clientMessageId, input.requestedDelivery, input.effectiveDelivery, input.status, input.content, input.attachments ? JSON.stringify(input.attachments) : null, input.contextRefs ? JSON.stringify(input.contextRefs) : null, input.contextSnapshots ? JSON.stringify(input.contextSnapshots) : null, input.thinking ?? null, JSON.stringify(input.origin), max.value + 1, input.targetRunId ?? null, now, now);
 		bumpRevision(db, input.sessionKey);
 		return mapInput(db.prepare(`${SELECT_INPUTS} WHERE id = ?`).get(input.id));
 	});
@@ -119,8 +130,9 @@ function mutateQueuedSessionInput(input) {
 			ordered.splice(Math.max(0, Math.min(input.position, ordered.length)), 0, row);
 			const stmt = db.prepare(`UPDATE session_inputs SET position = ?, version = version + 1, updated_at_ms = ? WHERE id = ?`);
 			ordered.forEach((item, index) => stmt.run(index + 1, now, item.id));
-		} else db.prepare(`UPDATE session_inputs SET content = ?, attachments_json = ?, thinking = ?, version = version + 1,
-        updated_at_ms = ? WHERE id = ?`).run(input.content ?? row.content, input.attachments ? JSON.stringify(input.attachments) : row.attachments_json, input.thinking ?? row.thinking, now, input.id);
+		} else db.prepare(`UPDATE session_inputs SET content = ?, attachments_json = ?, context_refs_json = ?,
+        context_snapshots_json = ?, thinking = ?, version = version + 1,
+        updated_at_ms = ? WHERE id = ?`).run(input.content ?? row.content, input.attachments ? JSON.stringify(input.attachments) : row.attachments_json, input.contextRefs ? JSON.stringify(input.contextRefs) : row.context_refs_json, input.contextSnapshots ? JSON.stringify(input.contextSnapshots) : row.context_snapshots_json, input.thinking ?? row.thinking, now, input.id);
 		bumpRevision(db, input.sessionKey);
 		return true;
 	});
@@ -146,4 +158,4 @@ function recoverSessionInputState() {
 	});
 }
 //#endregion
-export { cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, finishSessionInputRun, getSessionInputState, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus };
+export { cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, finishSessionInputRun, getSessionInputById, getSessionInputState, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus };

package/dist/src/storage/sqlite/session-turn-replace-repository.d.ts

@@ -1,11 +1,14 @@
 import type { AgentMessage } from '@earendil-works/pi-agent-core';
 import type { TurnOrigin } from '@xopcai/endpoint-tools-protocol';
+import type { AgentSourceContext, SourceContextRefSummary } from '../../agent/source-context/types.js';
 export type ReplaceLatestSessionTurnInput = {
     sessionKey: string;
     targetTurnId: string;
     clientMessageId: string;
     content: string;
     attachments?: unknown[];
+    contextRefs?: SourceContextRefSummary[];
+    contextSnapshots?: AgentSourceContext[];
     thinking?: string;
     origin: TurnOrigin;
 };

package/dist/src/storage/sqlite/session-turn-replace-repository.js

@@ -93,8 +93,9 @@ function replaceLatestSessionTurnAndQueueInput(input) {
 		const inputId = randomUUID();
 		db.prepare(`INSERT INTO session_inputs(id, session_key, client_message_id,
        requested_delivery, effective_delivery, status, content, attachments_json,
-       thinking, origin_json, position, target_run_id, version, created_at_ms, updated_at_ms)
-       VALUES (?, ?, ?, 'next', 'next', 'queued', ?, ?, ?, ?, ?, NULL, 1, ?, ?)`).run(inputId, input.sessionKey, input.clientMessageId, input.content, input.attachments ? JSON.stringify(input.attachments) : null, input.thinking ?? null, JSON.stringify(input.origin), maxPosition.value + 1, now, now);
+       context_refs_json, context_snapshots_json, thinking, origin_json, position,
+       target_run_id, version, created_at_ms, updated_at_ms)
+       VALUES (?, ?, ?, 'next', 'next', 'queued', ?, ?, ?, ?, ?, ?, ?, NULL, 1, ?, ?)`).run(inputId, input.sessionKey, input.clientMessageId, input.content, input.attachments ? JSON.stringify(input.attachments) : null, input.contextRefs ? JSON.stringify(input.contextRefs) : null, input.contextSnapshots ? JSON.stringify(input.contextSnapshots) : null, input.thinking ?? null, JSON.stringify(input.origin), maxPosition.value + 1, now, now);
 		db.prepare(`UPDATE session_input_runtime SET revision = revision + 1, updated_at_ms = ?
        WHERE session_key = ?`).run(now, input.sessionKey);
 		return {

package/dist/src/storage/sqlite/transcript-repository.js

@@ -33,20 +33,46 @@ function isUserMessageRow(row) {
 	const classified = classifyStoredRow(row);
 	return classified.entryKind === "message" && classified.role === "user";
 }
+function withSessionInputContextMetadata(db, sessionKey, row) {
+	if (!isUserMessageRow(row)) return row;
+	const message = row;
+	const turnId = typeof message.turnId === "string" ? message.turnId.trim() : "";
+	if (!turnId) return row;
+	const metadata = message.metadata && typeof message.metadata === "object" && !Array.isArray(message.metadata) ? message.metadata : {};
+	if (Array.isArray(metadata.sourceContexts) && metadata.sourceContexts.length > 0) return row;
+	const input = db.prepare(`SELECT context_refs_json FROM session_inputs
+     WHERE session_key = ? AND run_id = ? AND context_refs_json IS NOT NULL
+     LIMIT 1`).get(sessionKey, turnId);
+	if (!input) return row;
+	try {
+		const sourceContexts = JSON.parse(input.context_refs_json);
+		if (!Array.isArray(sourceContexts) || sourceContexts.length === 0) return row;
+		return {
+			...message,
+			metadata: {
+				...metadata,
+				sourceContexts
+			}
+		};
+	} catch {
+		return row;
+	}
+}
 function appendTranscriptEntry(sessionKey, row, opts) {
 	if (isRuntimeOnlyTranscriptMessage(row)) throw new Error("Runtime-only messages cannot be persisted in a session transcript");
 	return runSqliteWriteTransaction((db) => {
 		const sessionId = opts?.sessionId ?? readCurrentSessionId(db, sessionKey);
 		if (!sessionId) throw new Error(`Session not found: ${sessionKey}`);
+		const persistedRow = withSessionInputContextMetadata(db, sessionKey, row);
 		const inserted = insertEntry(db, {
 			sessionId,
 			sessionKey,
-			row
+			row: persistedRow
 		});
-		if (classifyStoredRow(row).entryKind === "message") {
+		if (classifyStoredRow(persistedRow).entryKind === "message") {
 			const tokenDelta = opts?.tokenDelta ?? 0;
 			const now = Date.now();
-			const hiddenUpdate = isUserMessageRow(row) ? `hidden_from_session_list = 0,` : "";
+			const hiddenUpdate = isUserMessageRow(persistedRow) ? `hidden_from_session_list = 0,` : "";
 			db.prepare(`UPDATE sessions SET
           message_count = message_count + 1,
           estimated_tokens = estimated_tokens + ?,

package/dist/src/storage/sqlite/user-context-repository.d.ts

@@ -25,6 +25,7 @@ export declare function setUnderstandingStatus(id: string, status: Understanding
     explicitness: UserUnderstanding['explicitness'];
     confidence: number;
 }): UserUnderstanding;
+export declare function closeUnderstandingValidity(id: string, validTo?: number): UserUnderstanding;
 export declare function rejectUnderstanding(id: string, reason: string): UserUnderstanding;
 export declare function deleteUnderstanding(id: string): boolean;
 export declare function isUnderstandingSuppressed(canonicalKey: string, scope: UserContextScope, principalId?: string): boolean;
@@ -34,7 +35,9 @@ export declare function listCollaborationRules(principalId?: string): Collaborat
 export declare function reviseCollaborationRule(id: string, statement: string): CollaborationRule;
 export declare function setCollaborationRuleStatus(id: string, status: CollaborationRule['status']): CollaborationRule;
 export declare function deleteCollaborationRule(id: string): boolean;
-export declare function createContextEvidence(input: Omit<ContextEvidence, 'id' | 'createdAt'>, principalId?: string): ContextEvidence;
+export declare function createContextEvidence(input: Omit<ContextEvidence, 'id' | 'ingestedAt' | 'createdAt'> & {
+    ingestedAt?: number;
+}, principalId?: string): ContextEvidence;
 export declare function linkUnderstandingEvidence(versionId: string, evidenceId: string, relation: 'supports' | 'contradicts' | 'supersedes', confidence: number): void;
 export declare function listUnderstandingEvidence(understandingId: string, relation?: 'supports' | 'contradicts' | 'supersedes'): ContextEvidence[];
 export declare function recordContextRun(input: {

package/dist/src/storage/sqlite/user-context-repository.js

@@ -2,8 +2,31 @@ import { getSqliteDatabase, runSqliteWriteTransaction } from "./transaction.js";
 import { USER_CONTEXT_PRINCIPAL_ID } from "../../user-context/domain.js";
 import { retrievalQueryAuditValue } from "../../retrieval/audit.js";
 import { buildFts5SearchQuery, fts5RankToScore } from "./fts.js";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 //#region src/storage/sqlite/user-context-repository.ts
+function evidenceFromRow(row) {
+	return {
+		id: row.evidence_id,
+		sourceType: row.source_type,
+		...row.source_instance_id ? { sourceInstanceId: row.source_instance_id } : {},
+		sourceRef: row.source_ref,
+		...row.source_run_id ? { sourceRunId: row.source_run_id } : {},
+		...row.source_item_id ? { sourceItemId: row.source_item_id } : {},
+		...row.session_id ? { sessionId: row.session_id } : {},
+		...row.turn_id ? { turnId: row.turn_id } : {},
+		...row.message_id ? { messageId: row.message_id } : {},
+		...row.content_hash ? { contentHash: row.content_hash } : {},
+		...row.retention_policy ? { retentionPolicy: row.retention_policy } : {},
+		...row.processing_policy ? { processingPolicy: row.processing_policy } : {},
+		...row.extractor_id ? { extractorId: row.extractor_id } : {},
+		...row.extractor_version ? { extractorVersion: row.extractor_version } : {},
+		...row.redacted_excerpt ? { redactedExcerpt: row.redacted_excerpt } : {},
+		trustLevel: row.trust_level,
+		observedAt: row.observed_at,
+		ingestedAt: row.ingested_at ?? row.created_at,
+		createdAt: row.created_at
+	};
+}
 const UNDERSTANDING_SELECT = `
   SELECT u.*, v.statement, v.payload_json
   FROM user_understandings u
@@ -182,6 +205,16 @@ function setUnderstandingStatus(id, status, confirmation) {
         confidence = COALESCE(?, confidence),
         updated_at = ?
     WHERE understanding_id = ?`).run(status, confirmation?.explicitness ?? null, confirmation?.confidence ?? null, now, id);
+	const assertionStatus = status === "active" ? "active" : status === "archived" ? "closed" : status === "rejected" ? "rejected" : "candidate";
+	getSqliteDatabase().prepare(`UPDATE context_temporal_assertions
+    SET status = ?, updated_at = ? WHERE object_type = 'understanding' AND object_id = ?`).run(assertionStatus, now, id);
+	const result = getUnderstanding(id);
+	if (!result) throw new Error(`User understanding not found: ${id}`);
+	return result;
+}
+function closeUnderstandingValidity(id, validTo = Date.now()) {
+	getSqliteDatabase().prepare(`UPDATE user_understandings SET valid_to = ?, updated_at = ?
+    WHERE understanding_id = ?`).run(validTo, validTo, id);
 	const result = getUnderstanding(id);
 	if (!result) throw new Error(`User understanding not found: ${id}`);
 	return result;
@@ -263,25 +296,36 @@ function createContextEvidence(input, principalId = USER_CONTEXT_PRINCIPAL_ID) {
 	const existing = getSqliteDatabase().prepare(`SELECT * FROM context_evidence
     WHERE principal_id = ? AND source_type = ?
       AND COALESCE(source_instance_id, '') = COALESCE(?, '') AND source_ref = ?`).get(principalId, input.sourceType, input.sourceInstanceId ?? null, input.sourceRef);
-	if (existing) return {
-		id: existing.evidence_id,
-		sourceType: existing.source_type,
-		...existing.source_instance_id ? { sourceInstanceId: existing.source_instance_id } : {},
-		sourceRef: existing.source_ref,
-		...existing.redacted_excerpt ? { redactedExcerpt: existing.redacted_excerpt } : {},
-		trustLevel: existing.trust_level,
-		observedAt: existing.observed_at,
-		createdAt: existing.created_at
-	};
+	const derivedHash = input.contentHash ?? (input.redactedExcerpt ? createHash("sha256").update(input.redactedExcerpt).digest("hex") : void 0);
+	if (existing) {
+		getSqliteDatabase().prepare(`UPDATE context_evidence SET
+      source_run_id = COALESCE(source_run_id, ?), source_item_id = COALESCE(source_item_id, ?),
+      session_id = COALESCE(session_id, ?), turn_id = COALESCE(turn_id, ?),
+      message_id = COALESCE(message_id, ?), content_hash = COALESCE(content_hash, ?),
+      retention_policy = COALESCE(retention_policy, ?),
+      processing_policy = CASE
+        WHEN processing_policy = 'local_only' OR ? = 'local_only' THEN 'local_only'
+        ELSE COALESCE(processing_policy, ?)
+      END,
+      extractor_id = COALESCE(extractor_id, ?), extractor_version = COALESCE(extractor_version, ?),
+      ingested_at = COALESCE(ingested_at, ?)
+      WHERE evidence_id = ?`).run(input.sourceRunId ?? null, input.sourceItemId ?? null, input.sessionId ?? null, input.turnId ?? null, input.messageId ?? null, derivedHash ?? null, input.retentionPolicy ?? null, input.processingPolicy ?? null, input.processingPolicy ?? null, input.extractorId ?? null, input.extractorVersion ?? null, input.ingestedAt ?? Date.now(), existing.evidence_id);
+		return evidenceFromRow(getSqliteDatabase().prepare("SELECT * FROM context_evidence WHERE evidence_id = ?").get(existing.evidence_id));
+	}
+	const createdAt = Date.now();
 	const evidence = {
 		...input,
 		id: randomUUID(),
-		createdAt: Date.now()
+		...derivedHash ? { contentHash: derivedHash } : {},
+		ingestedAt: input.ingestedAt ?? createdAt,
+		createdAt
 	};
 	getSqliteDatabase().prepare(`INSERT INTO context_evidence (
-    evidence_id, principal_id, source_type, source_instance_id, source_ref,
-    redacted_excerpt, trust_level, observed_at, created_at
-  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(evidence.id, principalId, evidence.sourceType, evidence.sourceInstanceId ?? null, evidence.sourceRef, evidence.redactedExcerpt ?? null, evidence.trustLevel, evidence.observedAt, evidence.createdAt);
+    evidence_id, principal_id, source_type, source_instance_id, source_ref, source_run_id,
+    source_item_id, session_id, turn_id, message_id, content_hash, retention_policy,
+    processing_policy, extractor_id, extractor_version, redacted_excerpt, trust_level,
+    observed_at, ingested_at, created_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(evidence.id, principalId, evidence.sourceType, evidence.sourceInstanceId ?? null, evidence.sourceRef, evidence.sourceRunId ?? null, evidence.sourceItemId ?? null, evidence.sessionId ?? null, evidence.turnId ?? null, evidence.messageId ?? null, evidence.contentHash ?? null, evidence.retentionPolicy ?? null, evidence.processingPolicy ?? null, evidence.extractorId ?? null, evidence.extractorVersion ?? null, evidence.redactedExcerpt ?? null, evidence.trustLevel, evidence.observedAt, evidence.ingestedAt, evidence.createdAt);
 	return evidence;
 }
 function linkUnderstandingEvidence(versionId, evidenceId, relation, confidence) {
@@ -295,16 +339,7 @@ function listUnderstandingEvidence(understandingId, relation) {
     JOIN understanding_evidence_links l ON l.evidence_id = e.evidence_id
     JOIN user_understanding_versions v ON v.version_id = l.version_id
     WHERE v.understanding_id = ? AND (? IS NULL OR l.relation = ?)
-    ORDER BY e.observed_at DESC`).all(understandingId, relation ?? null, relation ?? null).map((row) => ({
-		id: row.evidence_id,
-		sourceType: row.source_type,
-		...row.source_instance_id ? { sourceInstanceId: row.source_instance_id } : {},
-		sourceRef: row.source_ref,
-		...row.redacted_excerpt ? { redactedExcerpt: row.redacted_excerpt } : {},
-		trustLevel: row.trust_level,
-		observedAt: row.observed_at,
-		createdAt: row.created_at
-	}));
+    ORDER BY e.observed_at DESC`).all(understandingId, relation ?? null, relation ?? null).map(evidenceFromRow);
 }
 function recordContextRun(input) {
 	const auditedQuery = retrievalQueryAuditValue(input.query);
@@ -320,9 +355,9 @@ function recordContextRun(input) {
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(runId, input.principalId ?? "local-owner", input.turnId, input.sessionKey, auditedQuery, input.budget, input.durationMs, Date.now());
 		const insert = db.prepare(`INSERT INTO context_run_items (
       context_run_id, object_type, object_id, version_id, decision, reason, content_snapshot,
-      source_label, rank, score, injected_chars
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
-		for (const item of input.items) insert.run(runId, item.objectType, item.objectId, item.versionId ?? null, item.decision, item.reason, item.content, item.sourceLabel, item.rank ?? null, item.score ?? null, item.injectedChars);
+      source_label, origin, rank, score, injected_chars
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+		for (const item of input.items) insert.run(runId, item.objectType, item.objectId, item.versionId ?? null, item.decision, item.reason, item.content, item.sourceLabel, item.origin, item.rank ?? null, item.score ?? null, item.injectedChars);
 	});
 	return runId;
 }
@@ -341,6 +376,7 @@ function getTurnPersonalization(turnId) {
 			reason: row.reason,
 			content: row.content_snapshot,
 			sourceLabel: row.source_label,
+			origin: row.origin,
 			...row.rank === null ? {} : { rank: row.rank },
 			...row.score === null ? {} : { score: row.score },
 			injectedChars: row.injected_chars
@@ -406,4 +442,4 @@ function decideContextConsent(id, decision) {
 	return Number(result.changes) > 0;
 }
 //#endregion
-export { consumeContextConsent, createCollaborationRule, createContextEvidence, createUnderstanding, decideContextConsent, deleteCollaborationRule, deleteUnderstanding, ensureContextConsent, getCollaborationRule, getTurnPersonalization, getUnderstanding, getUserProfile, hasContextConsent, isUnderstandingSuppressed, linkUnderstandingEvidence, listCollaborationRules, listUnderstandingEvidence, listUnderstandings, recordContextFeedback, recordContextRun, rejectUnderstanding, reviseCollaborationRule, reviseUnderstanding, searchActiveUnderstandings, setCollaborationRuleStatus, setUnderstandingStatus, updateUserProfile };
+export { closeUnderstandingValidity, consumeContextConsent, createCollaborationRule, createContextEvidence, createUnderstanding, decideContextConsent, deleteCollaborationRule, deleteUnderstanding, ensureContextConsent, getCollaborationRule, getTurnPersonalization, getUnderstanding, getUserProfile, hasContextConsent, isUnderstandingSuppressed, linkUnderstandingEvidence, listCollaborationRules, listUnderstandingEvidence, listUnderstandings, recordContextFeedback, recordContextRun, rejectUnderstanding, reviseCollaborationRule, reviseUnderstanding, searchActiveUnderstandings, setCollaborationRuleStatus, setUnderstandingStatus, updateUserProfile };

package/dist/src/tasks/index.d.ts

@@ -16,6 +16,7 @@ export * from './task-context-repository.js';
 export * from './task-conversation-repository.js';
 export * from './task-handoff-service.js';
 export * from './task-dependency-service.js';
+export * from './task-deletion-service.js';
 export * from './task-read-model-projector.js';
 export * from './task-outbox-dispatcher.js';
 export * from './task-run-dispatcher.js';

package/dist/src/tasks/index.js

@@ -18,7 +18,8 @@ import { ProjectMonitoringService, decideProactiveDisposition, isInQuietHours, n
 import { ProjectOperatingViewService, summarizeProjectOperatingView } from "./project-operating-view-service.js";
 import { TaskValueMetricsService } from "./task-value-metrics-service.js";
 import { TaskHandoffService } from "./task-handoff-service.js";
+import { TaskDeletionService } from "./task-deletion-service.js";
 import { TaskOutboxDispatcher } from "./task-outbox-dispatcher.js";
 import { TaskRunDispatcher } from "./task-run-dispatcher.js";
 import { TaskSignalService } from "./task-signal-service.js";
-export { AttentionGovernor, HomeQueryService, ModelTaskContractPlanner, ProjectMonitoringService, ProjectOperatingViewService, TaskApplicationService, TaskContextRepository, TaskConversationConflictError, TaskConversationRepository, TaskDependencyError, TaskDependencyService, TaskHandoffService, TaskOutboxDispatcher, TaskReadModelProjector, TaskRepository, TaskRunCoordinator, TaskRunDispatcher, TaskRunRepository, TaskSignalService, TaskValueMetricsService, TaskWorkflowCoordinator, assembleTaskContext, buildHomeWorkbench, buildTaskExecutionDirective, decideProactiveDisposition, decisionFromTask, defineTaskContract, enqueueTaskChanged, enqueueTaskChangedEvent, getTaskContextManifest, getTaskExecutionBrief, isInQuietHours, nextQuietHoursEnd, parseTaskContractResponse, proactiveDispositionReason, resolveExecutionContext, summarizeProjectOperatingView };
+export { AttentionGovernor, HomeQueryService, ModelTaskContractPlanner, ProjectMonitoringService, ProjectOperatingViewService, TaskApplicationService, TaskContextRepository, TaskConversationConflictError, TaskConversationRepository, TaskDeletionService, TaskDependencyError, TaskDependencyService, TaskHandoffService, TaskOutboxDispatcher, TaskReadModelProjector, TaskRepository, TaskRunCoordinator, TaskRunDispatcher, TaskRunRepository, TaskSignalService, TaskValueMetricsService, TaskWorkflowCoordinator, assembleTaskContext, buildHomeWorkbench, buildTaskExecutionDirective, decideProactiveDisposition, decisionFromTask, defineTaskContract, enqueueTaskChanged, enqueueTaskChangedEvent, getTaskContextManifest, getTaskExecutionBrief, isInQuietHours, nextQuietHoursEnd, parseTaskContractResponse, proactiveDispositionReason, resolveExecutionContext, summarizeProjectOperatingView };

package/dist/src/tasks/task-deletion-service.d.ts

@@ -0,0 +1,21 @@
+import type { Task, TaskRun } from '@xopcai/gateway-contract';
+import { TaskRepository } from './task-repository.js';
+import { TaskRunRepository } from './task-run-repository.js';
+export type TaskDeletionInspection = {
+    ok: true;
+    task: Task;
+} | {
+    ok: false;
+    reason: 'not_found';
+} | {
+    ok: false;
+    reason: 'active_run';
+    run: TaskRun;
+};
+export declare class TaskDeletionService {
+    private readonly tasks;
+    private readonly runs;
+    constructor(tasks?: TaskRepository, runs?: TaskRunRepository);
+    inspect(taskId: string): TaskDeletionInspection;
+    delete(taskId: string): TaskDeletionInspection;
+}

package/dist/src/tasks/task-deletion-service.js

@@ -0,0 +1,35 @@
+import { TaskRepository } from "./task-repository.js";
+import { TaskRunRepository } from "./task-run-repository.js";
+//#region src/tasks/task-deletion-service.ts
+var TaskDeletionService = class {
+	constructor(tasks = new TaskRepository(), runs = new TaskRunRepository()) {
+		this.tasks = tasks;
+		this.runs = runs;
+	}
+	inspect(taskId) {
+		const task = this.tasks.get(taskId);
+		if (!task) return {
+			ok: false,
+			reason: "not_found"
+		};
+		const run = this.runs.getActiveRoot(taskId);
+		return run ? {
+			ok: false,
+			reason: "active_run",
+			run
+		} : {
+			ok: true,
+			task
+		};
+	}
+	delete(taskId) {
+		const inspection = this.inspect(taskId);
+		if (!inspection.ok) return inspection;
+		return this.tasks.delete(taskId) ? inspection : {
+			ok: false,
+			reason: "not_found"
+		};
+	}
+};
+//#endregion
+export { TaskDeletionService };

package/dist/src/tasks/task-repository.js

@@ -187,7 +187,28 @@ var TaskRepository = class {
 		});
 	}
 	delete(taskId) {
-		return getSqliteDatabase().prepare("DELETE FROM tasks WHERE task_id = ?").run(taskId).changes > 0;
+		return runSqliteWriteTransaction((db) => {
+			const task = db.prepare("SELECT project_id FROM tasks WHERE task_id = ?").get(taskId);
+			if (!task) return false;
+			const runIds = db.prepare("SELECT run_id FROM task_runs WHERE task_id = ?").all(taskId).map((row) => row.run_id);
+			db.prepare(`DELETE FROM context_edges WHERE owner_kind = 'task' AND owner_id = ?`).run(taskId);
+			db.prepare(`DELETE FROM command_deduplication WHERE subject_kind = 'task' AND subject_id = ?`).run(taskId);
+			db.prepare(`DELETE FROM domain_outbox WHERE subject_kind = 'task' AND subject_id = ?`).run(taskId);
+			const deleted = db.prepare("DELETE FROM tasks WHERE task_id = ?").run(taskId).changes > 0;
+			db.prepare(`DELETE FROM context_snapshots WHERE owner_kind = 'task' AND owner_id = ?`).run(taskId);
+			if (runIds.length > 0) db.prepare(`DELETE FROM context_snapshots
+           WHERE owner_kind = 'task_run' AND owner_id IN (SELECT value FROM json_each(?))`).run(JSON.stringify(runIds));
+			const deletedAt = Date.now();
+			db.prepare(`INSERT INTO domain_outbox (
+          event_id, event_type, subject_kind, subject_id, correlation_id,
+          payload_json, created_at
+        ) VALUES (?, 'task.deleted.v1', 'task', ?, ?, ?, ?)`).run(randomUUID(), taskId, randomUUID(), JSON.stringify({
+				taskId,
+				...task.project_id ? { projectId: task.project_id } : {},
+				deletedAt
+			}), deletedAt);
+			return deleted;
+		});
 	}
 	insertContract(db, contract) {
 		db.prepare(`INSERT INTO task_contracts (

package/dist/src/tui/backends/embedded-backend.js

@@ -15,7 +15,6 @@ import { inferSuggestedProjectDefaultAgentId } from "../../projects/project-agen
 import "../../projects/index.js";
 import { setTuiDefaultAgentConfig } from "../../commands/agents.config.js";
 import { evictEmbeddedSessionRunner } from "../../agent/embedded/session-runner.js";
-import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { buildSessionTimeline } from "../../session/transcript-outline.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
 import { SessionIndex } from "../../session/manager.js";
@@ -24,6 +23,7 @@ import { parseModelRef } from "../../agent/models/selection.js";
 import { buildReviewContext, resolveGitRoot } from "../../review/review-git.js";
 import { MessageBus, MessageBusShutdownError } from "../../infra/bus/queue.js";
 import "../../infra/bus/index.js";
+import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
 import "../../config/index.js";
 import { buildWorkflowChildTools } from "../../agent/workflow/workflow-child-tools.js";
@@ -579,7 +579,8 @@ var EmbeddedBackend = class {
 				contextWindow: usage.contextWindow,
 				contextUsagePercent: usage.usagePercent,
 				effectiveWorkspacePath: cfg.effectiveWorkspacePath,
-				workingDirectoryLocked: cfg.workingDirectoryLocked
+				workingDirectoryLocked: cfg.workingDirectoryLocked,
+				projectId: getSessionMetadata(sessionKey)?.projectId
 			};
 		} catch (err) {
 			const errorMessage = err instanceof Error ? err.message : String(err);
@@ -609,6 +610,7 @@ var EmbeddedBackend = class {
 	}
 	async patchSession(sessionKey, patch) {
 		const agent = await this.ensureAgent();
+		const hasProjectPatch = Object.prototype.hasOwnProperty.call(patch, "projectId");
 		const projectId = typeof patch.projectId === "string" ? patch.projectId.trim() : "";
 		const result = await agent.sessionConfig.patch(sessionKey, {
 			model: typeof patch.model === "string" ? patch.model : void 0,
@@ -622,7 +624,7 @@ var EmbeddedBackend = class {
 			await this.sessionIndexReady;
 			await this.sessionIndex?.getStore().resolveTranscriptPath(sessionKey);
 			new ProjectService().attachSession(sessionKey, projectId);
-		}
+		} else if (hasProjectPatch && patch.projectId === null) new ProjectService().detachSession(sessionKey);
 		const hiddenFromSessionList = typeof patch.hiddenFromSessionList === "boolean" ? patch.hiddenFromSessionList : void 0;
 		const customData = patch.customData && typeof patch.customData === "object" && !Array.isArray(patch.customData) ? patch.customData : void 0;
 		if (hiddenFromSessionList !== void 0 || customData !== void 0) {

package/dist/src/tui/backends/gateway-realtime-backend.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
 import { parseModelRef } from "../../agent/models/selection.js";
+import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { gatewayCredentialAuthorization } from "../../gateway/credential.js";
 import { RealtimeClient } from "../../../packages/realtime-client/src/index.js";
 import { buildTuiTranscriptTree, transcriptTreeEntryIdToRowNumber } from "../tui-transcript-tree.js";
@@ -422,6 +422,7 @@ var GatewayRealtimeBackend = class {
 				if (session) {
 					if (session.name) out.displayName = session.name;
 					if (session.estimatedTokens != null) out.totalTokens = session.estimatedTokens;
+					if (session.projectId?.trim()) out.projectId = session.projectId.trim();
 				}
 			}
 			if (agentCfgRes.ok) {
@@ -645,12 +646,13 @@ var GatewayRealtimeBackend = class {
 		});
 		const json = await res.json().catch(() => ({}));
 		if (!res.ok || json.ok === false) throw new Error(json.error ?? `Session config patch failed (${res.status})`);
+		const hasProjectPatch = Object.prototype.hasOwnProperty.call(patch, "projectId");
 		const projectId = typeof patch.projectId === "string" ? patch.projectId.trim() : "";
 		const hiddenFromSessionList = typeof patch.hiddenFromSessionList === "boolean" ? patch.hiddenFromSessionList : void 0;
 		const customData = patch.customData && typeof patch.customData === "object" && !Array.isArray(patch.customData) ? patch.customData : void 0;
-		if (projectId || hiddenFromSessionList !== void 0 || customData !== void 0) {
+		if (hasProjectPatch || hiddenFromSessionList !== void 0 || customData !== void 0) {
 			const metadataPatch = {
-				...projectId ? { projectId } : {},
+				...hasProjectPatch ? { projectId: projectId || null } : {},
 				...hiddenFromSessionList !== void 0 ? { hiddenFromSessionList } : {},
 				...customData ? { customData } : {}
 			};

package/dist/src/tui/chat-history.js

@@ -1,3 +1,4 @@
+import { stripRuntimeContextFromUserMessage } from "../session/user-message-display.js";
 import { createAssistantMessageFromText } from "./components/assistant-message.js";
 //#region src/tui/chat-history.ts
 function historyMessageKey(message, index) {
@@ -77,7 +78,7 @@ function appendHistoryToChatLog(chatLog, messages, toolsExpanded, showThinking =
 			return;
 		}
 		if (hm.role === "user") {
-			chatLog.addUser(historyContentText(hm.content), {
+			chatLog.addUser(stripRuntimeContextFromUserMessage(historyContentText(hm.content)), {
 				displayIndex,
 				historyIndex,
 				role: "user"

package/dist/src/tui/tui-agent-events.js

@@ -1,4 +1,5 @@
 import { formatAgentRunErrorForDisplay } from "../agent/client-error-format.js";
+import { stripRuntimeContextFromUserContent } from "../session/user-message-display.js";
 import { createAssistantMessageFromText } from "./components/assistant-message.js";
 import { markRunEvent, markRunIdleAfterCompletion } from "./tui-run-state.js";
 //#region src/tui/tui-agent-events.ts
@@ -175,12 +176,13 @@ function dispatchAgentEvent(event, data, state, chatLog, tui, setActivityStatus,
 			break;
 		case "user_message": {
 			const message = p.message;
-			chatLog.addUser(Array.isArray(message?.content) || typeof message?.content === "string" ? message.content : []);
+			const content = Array.isArray(message?.content) || typeof message?.content === "string" ? stripRuntimeContextFromUserContent(message.content) : [];
+			chatLog.addUser(content);
 			tui.requestRender();
 			break;
 		}
 		case "user_transcript":
-			chatLog.addUser(String(p.text ?? ""));
+			chatLog.addUser(stripRuntimeContextFromUserContent(String(p.text ?? "")));
 			tui.requestRender();
 			break;
 		case "assistant_message_start": {