@xopcai/xopc 0.0.224 → 0.0.225

package/dist/src/gateway/service.js

@@ -45,11 +45,17 @@ import { MessageBus, MessageBusShutdownError } from "../infra/bus/queue.js";
 import "../infra/bus/index.js";
 import { AgentService } from "../agent/service.js";
 import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
-import { getWorkspacePath } from "../config/workspace-path-helpers.js";
-import "../config/index.js";
 import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
 import { registerClarifyBridge } from "./clarify-runtime.js";
 import { ChannelManager } from "../channels/manager.js";
+import { getWorkspacePath } from "../config/workspace-path-helpers.js";
+import "../config/index.js";
+import { ManagedComposioEventPoller } from "../connectors/composio-managed-events.js";
+import { startConnectedKnowledgeCoordinator } from "../knowledge/coordinator.js";
+import "../knowledge/index.js";
+import { startConnectorLearningCoordinator } from "../connectors/learning-coordinator.js";
+import { ConnectedSourceChangePublisher } from "../connectors/source-change-publisher.js";
+import { startConnectorSupervisor } from "../connectors/supervisor.js";
 import { DiscussionService } from "../discussions/service.js";
 import { DiscussionOrganizer } from "../discussions/organizer.js";
 import { DiscussionLiveWorker } from "../discussions/live-worker.js";
@@ -58,12 +64,6 @@ import { DiscussionSealer } from "../discussions/sealer.js";
 import "../discussions/index.js";
 import { EndpointToolRuntime } from "../endpoint-tools/runtime.js";
 import "../endpoint-tools/index.js";
-import { ManagedComposioEventPoller } from "../connectors/composio-managed-events.js";
-import { startConnectedKnowledgeCoordinator } from "../knowledge/coordinator.js";
-import "../knowledge/index.js";
-import { startConnectorLearningCoordinator } from "../connectors/learning-coordinator.js";
-import { ConnectedSourceChangePublisher } from "../connectors/source-change-publisher.js";
-import { startConnectorSupervisor } from "../connectors/supervisor.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
 import { prepareAutomationAgentSession } from "./automation-agent-session.js";
 import { reconcileDreamingAutomations } from "./dreaming-automation-reconciler.js";

package/dist/src/heartbeat/index.js

@@ -1,6 +1,6 @@
 import { DEFAULT_ACK_MAX_CHARS, HEARTBEAT_OK, NO_REPLY, shouldSilence, stripHeartbeatToken } from "./tokens.js";
+import { appendCronEventLines } from "./event-prompt.js";
 import { isWithinActiveHours } from "./active-hours.js";
 import { isHeartbeatContentEmpty } from "./content-check.js";
-import { appendCronEventLines } from "./event-prompt.js";
 import { createHeartbeatWake } from "./wake.js";
 export { DEFAULT_ACK_MAX_CHARS, HEARTBEAT_OK, NO_REPLY, appendCronEventLines, createHeartbeatWake, isHeartbeatContentEmpty, isWithinActiveHours, shouldSilence, stripHeartbeatToken };

package/dist/src/infra/update-restart.js

@@ -2,8 +2,8 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveConfigPath } from "../config/paths.js";
 import { init_loader, loadConfig } from "../config/loader.js";
-import { isRestartEnabled } from "../config/commands.flags.js";
 import { resolveGatewayService } from "../daemon/service.js";
+import { isRestartEnabled } from "../config/commands.flags.js";
 import { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from "./restart.js";
 import { findVerifiedGatewayListenerPidsOnPortSync, signalVerifiedGatewayPidSync } from "./gateway-processes.js";
 import { refreshGatewayServiceAfterUpdate } from "./update-service-refresh.js";

package/dist/src/knowledge/connected-knowledge-pipeline.js

@@ -87,7 +87,14 @@ var ConnectedKnowledgePipeline = class {
 					expiresAt: existing.expiresAt,
 					canonicalKey: existing.canonicalKey,
 					supersedesRecordId: existing.supersedesRecordId,
-					conflictGroupId: existing.conflictGroupId
+					conflictGroupId: existing.conflictGroupId,
+					originClass: existing.provenance.originClass,
+					sessionKind: existing.provenance.sessionKind,
+					observedAt: existing.provenance.observedAt,
+					sourceSessionId: existing.provenance.sourceSessionId,
+					sourceTurnId: existing.provenance.sourceTurnId,
+					supersedesKey: existing.provenance.supersedesKey,
+					derivedFromRecalledContext: existing.provenance.derivedFromRecalledContext
 				});
 				completeKnowledgeSourceItemSynthesis({
 					itemId: item.id,
@@ -141,7 +148,11 @@ var ConnectedKnowledgePipeline = class {
 					confidence: .78,
 					observedAt: item.occurredAt ?? item.sourceUpdatedAt
 				}],
-				validFrom: item.occurredAt ?? item.sourceUpdatedAt
+				validFrom: item.occurredAt ?? item.sourceUpdatedAt,
+				originClass: "untrusted",
+				sessionKind: "background",
+				observedAt: item.occurredAt ?? item.sourceUpdatedAt ?? item.updatedAt,
+				derivedFromRecalledContext: false
 			});
 			attachMemoryEvidence({
 				recordId: record.id,
@@ -238,7 +249,14 @@ var ConnectedKnowledgePipeline = class {
 				validTo: (/* @__PURE__ */ new Date()).toISOString(),
 				reviewAfter: existing.reviewAfter,
 				expiresAt: existing.expiresAt,
-				canonicalKey: existing.canonicalKey
+				canonicalKey: existing.canonicalKey,
+				originClass: existing.provenance.originClass,
+				sessionKind: existing.provenance.sessionKind,
+				observedAt: existing.provenance.observedAt,
+				sourceSessionId: existing.provenance.sourceSessionId,
+				sourceTurnId: existing.provenance.sourceTurnId,
+				supersedesKey: existing.provenance.supersedesKey,
+				derivedFromRecalledContext: existing.provenance.derivedFromRecalledContext
 			});
 			return false;
 		}
@@ -282,7 +300,11 @@ var ConnectedKnowledgePipeline = class {
 				confidence: .72,
 				observedAt: item.occurredAt ?? item.sourceUpdatedAt
 			})),
-			validFrom: `${day}T00:00:00.000Z`
+			validFrom: `${day}T00:00:00.000Z`,
+			originClass: "untrusted",
+			sessionKind: "background",
+			observedAt: items.map((item) => item.occurredAt ?? item.sourceUpdatedAt ?? item.updatedAt).sort().at(-1),
+			derivedFromRecalledContext: false
 		});
 		deleteMemoryEvidenceForRecord(summary.id, "derived_from");
 		for (const item of items) attachMemoryEvidence({

package/dist/src/session/store.js

@@ -4,6 +4,7 @@ import { init_logger } from "../utils/logger.js";
 import { requireXopcDatabase } from "../storage/sqlite/connection.js";
 import { buildSessionContextForLlm, buildSessionDisplayMessages, isRuntimeOnlyTranscriptMessage, isTranscriptCompactionEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray } from "./session-context-for-llm.js";
 import "./types.js";
+import { init_agent_session_key, resolveAgentIdFromSessionKey } from "../routing/agent-session-key.js";
 import { estimateTokensFromMessages } from "../storage/sqlite/row-mappers.js";
 import { deleteSessionRecord, ensureSessionRecord, findSessionKeyBySessionId, getGlobalSessionStats, getSessionMetadata, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord } from "../storage/sqlite/session-repository.js";
 import { appendCompactionBoundaryIfUnchanged, appendTranscriptEntry, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "../storage/sqlite/transcript-repository.js";
@@ -12,12 +13,14 @@ import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.
 import { readPostCompactionContext } from "../agent/reply/post-compaction-context.js";
 import { SessionCompactor } from "../agent/memory/compaction.js";
 import { resolveCompactionPolicy } from "../agent/memory/compaction-policy.js";
+import { promoteCompactionLedger } from "../agent/memory/compaction-promotion.js";
 import { SlidingWindow } from "../agent/memory/window.js";
 import { isAppendOnlyLlmTranscriptMessage } from "./transcript-stats.js";
 import { transcriptRowsToClientHistory } from "./client-history.js";
 import { computeTranscriptUserRoundDeleteRange } from "./user-round-delete.js";
 //#region src/session/store.ts
 init_paths_state();
+init_agent_session_key();
 init_logger();
 const log = createLogger("SessionStore");
 const INDEX_VERSION = "1.0";
@@ -455,6 +458,30 @@ var SessionStore = class {
 				tokensBefore: result.tokensBefore,
 				tokensAfter: result.tokensAfter
 			})) throw new Error(`Session changed while compaction was running: ${key}`);
+			try {
+				const metadata = getSessionMetadata(key);
+				const promoted = promoteCompactionLedger({
+					sessionKey: key,
+					sessionId: expectedSnapshot.sessionId,
+					sourceAgentId: resolveAgentIdFromSessionKey(key),
+					workspaceId: this.resolveWorkspaceCwd(key),
+					projectId: metadata?.projectId,
+					handover: result.handover,
+					audit: result.audit,
+					sourceEntries: expectedSnapshot.entries
+				});
+				log.info({
+					sessionKey: key,
+					episodicCount: promoted.episodicRecordIds.length,
+					durableCount: promoted.durableRecordIds.length,
+					rejectedCount: promoted.rejectedRecordIds.length
+				}, "Compaction ledger memory promotion completed");
+			} catch (err) {
+				log.warn({
+					err,
+					sessionKey: key
+				}, "Compaction ledger memory promotion failed");
+			}
 			log.info({
 				key,
 				tokensBefore: result.tokensBefore,

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

@@ -1,4 +1,4 @@
-import type { MemoryDisclosurePolicy, MemoryDurability, MemoryExplicitness, MemoryKind, MemoryRecord, MemorySensitivity, MemorySearchResult, MemorySignal, MemoryStatus } from '../../agent/memory/types.js';
+import type { MemoryDisclosurePolicy, MemoryDurability, MemoryExplicitness, MemoryKind, MemoryOriginClass, MemoryRecord, MemorySessionKind, MemorySensitivity, MemorySearchResult, MemorySignal, MemoryStatus } from '../../agent/memory/types.js';
 export interface UpsertMemoryRecordInput {
     id?: string;
     providerId: string;
@@ -26,6 +26,13 @@ export interface UpsertMemoryRecordInput {
     expiresAt?: string;
     supersedesRecordId?: string;
     conflictGroupId?: string;
+    originClass?: MemoryOriginClass;
+    sessionKind?: MemorySessionKind;
+    observedAt?: string;
+    sourceSessionId?: string;
+    sourceTurnId?: string;
+    supersedesKey?: string;
+    derivedFromRecalledContext?: boolean;
     nowMs?: number;
 }
 export interface ListMemoryRecordsOptions {
@@ -73,6 +80,7 @@ export interface SearchMemoryRecordsOptions {
     statuses?: MemoryStatus[];
     maxResults?: number;
     minScore?: number;
+    trustedOnly?: boolean;
 }
 export interface AppendMemorySignalInput {
     signal: MemorySignal;

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

@@ -86,7 +86,16 @@ function rowToRecord(row, evidence = []) {
 			...row.session_key ? { sessionKey: row.session_key } : {},
 			...row.project_id ? { projectId: row.project_id } : {}
 		},
-		provenance: { sourceAgentId: row.source_agent_id },
+		provenance: {
+			sourceAgentId: row.source_agent_id,
+			originClass: row.origin_class,
+			sessionKind: row.session_kind,
+			observedAt: new Date(row.observed_at).toISOString(),
+			...row.source_session_id ? { sourceSessionId: row.source_session_id } : {},
+			...row.source_turn_id ? { sourceTurnId: row.source_turn_id } : {},
+			...row.supersedes_key ? { supersedesKey: row.supersedes_key } : {},
+			derivedFromRecalledContext: row.derived_from_recalled_context === 1
+		},
 		content: row.content,
 		source: parseSource(row.source_json),
 		...row.confidence != null ? { confidence: row.confidence } : {},
@@ -131,6 +140,9 @@ function upsertMemoryRecord(input) {
 	const validTo = parseOptionalTimestamp(input.validTo);
 	const reviewAfter = parseOptionalTimestamp(input.reviewAfter);
 	const expiresAt = parseOptionalTimestamp(input.expiresAt);
+	const observedAt = parseOptionalTimestamp(input.observedAt) ?? now;
+	const originClass = input.originClass ?? "untrusted";
+	const sessionKind = input.sessionKind ?? "unknown";
 	const source = {
 		...input.source ?? {},
 		provider: input.source?.provider ?? input.providerId
@@ -141,8 +153,10 @@ function upsertMemoryRecord(input) {
         content, source_json, confidence, tags_json, status, sensitivity,
         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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        supersedes_record_id, conflict_group_id,
+        origin_class, session_kind, observed_at, source_session_id, source_turn_id,
+        supersedes_key, derived_from_recalled_context, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(record_id) DO UPDATE SET
         provider_id = excluded.provider_id,
         kind = excluded.kind,
@@ -168,7 +182,14 @@ 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.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, input.canonicalKey ?? null, explicitness, durability, importance, disclosurePolicy, validFrom, validTo, reviewAfter, expiresAt, input.supersedesRecordId ?? null, input.conflictGroupId ?? null, now, now);
+        origin_class = excluded.origin_class,
+        session_kind = excluded.session_kind,
+        observed_at = excluded.observed_at,
+        source_session_id = excluded.source_session_id,
+        source_turn_id = excluded.source_turn_id,
+        supersedes_key = excluded.supersedes_key,
+        derived_from_recalled_context = excluded.derived_from_recalled_context,
+        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, input.canonicalKey ?? null, explicitness, durability, importance, disclosurePolicy, validFrom, validTo, reviewAfter, expiresAt, input.supersedesRecordId ?? null, input.conflictGroupId ?? null, originClass, sessionKind, observedAt, input.sourceSessionId ?? null, input.sourceTurnId ?? null, input.supersedesKey ?? null, input.derivedFromRecalledContext ? 1 : 0, now, now);
 		upsertMemoryRecordFts(db, {
 			...input,
 			id
@@ -204,7 +225,16 @@ function upsertMemoryRecord(input) {
 			...input.sessionKey ? { sessionKey: input.sessionKey } : {},
 			...input.projectId ? { projectId: input.projectId } : {}
 		},
-		provenance: { sourceAgentId: input.sourceAgentId },
+		provenance: {
+			sourceAgentId: input.sourceAgentId,
+			originClass,
+			sessionKind,
+			observedAt: new Date(observedAt).toISOString(),
+			...input.sourceSessionId ? { sourceSessionId: input.sourceSessionId } : {},
+			...input.sourceTurnId ? { sourceTurnId: input.sourceTurnId } : {},
+			...input.supersedesKey ? { supersedesKey: input.supersedesKey } : {},
+			derivedFromRecalledContext: input.derivedFromRecalledContext ?? false
+		},
 		content: input.content,
 		source,
 		...input.confidence != null ? { confidence: input.confidence } : {},
@@ -339,6 +369,10 @@ function searchMemoryRecords(options) {
 		filters.push(`f.kind IN (${options.kinds.map(() => "?").join(", ")})`);
 		params.push(...options.kinds);
 	}
+	if (options.trustedOnly) {
+		filters.push(`r.origin_class IN ('owner', 'agent')`);
+		filters.push("r.derived_from_recalled_context = 0");
+	}
 	const statuses = options.statuses && options.statuses.length > 0 ? options.statuses : ["active"];
 	filters.push(`r.status IN (${statuses.map(() => "?").join(", ")})`);
 	params.push(...statuses);
@@ -366,7 +400,7 @@ function searchMemoryRecords(options) {
 		visibleToWorkspaceId: options.visibleToWorkspaceId,
 		unscopedWorkspaceOnly: options.unscopedWorkspaceOnly,
 		limit: 500
-	}).filter((record) => statuses.includes(record.status ?? "active") && (!options.kinds?.length || options.kinds.includes(record.kind)));
+	}).filter((record) => statuses.includes(record.status ?? "active") && (!options.kinds?.length || options.kinds.includes(record.kind))).filter((record) => !options.trustedOnly || (record.provenance.originClass === "owner" || record.provenance.originClass === "agent") && !record.provenance.derivedFromRecalledContext);
 	const candidateById = new Map(candidateRecords.map((record) => [record.id, record]));
 	const missingRows = rows.filter((row) => !candidateById.has(row.record_id));
 	const missingEvidence = listMemoryEvidenceForRecords(missingRows.map((row) => row.record_id));

package/dist/src/storage/sqlite/migrations/134_memory_provenance.sql

@@ -0,0 +1,18 @@
+ALTER TABLE memory_records ADD COLUMN origin_class TEXT NOT NULL DEFAULT 'untrusted'
+  CHECK (origin_class IN ('owner', 'agent', 'untrusted', 'system'));
+ALTER TABLE memory_records ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'unknown'
+  CHECK (session_kind IN ('interactive', 'group', 'automation', 'workflow', 'subagent', 'background', 'unknown'));
+ALTER TABLE memory_records ADD COLUMN observed_at INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE memory_records ADD COLUMN source_session_id TEXT;
+ALTER TABLE memory_records ADD COLUMN source_turn_id TEXT;
+ALTER TABLE memory_records ADD COLUMN supersedes_key TEXT;
+ALTER TABLE memory_records ADD COLUMN derived_from_recalled_context INTEGER NOT NULL DEFAULT 0
+  CHECK (derived_from_recalled_context IN (0, 1));
+
+UPDATE memory_records
+SET observed_at = CASE WHEN observed_at = 0 THEN created_at ELSE observed_at END;
+
+CREATE INDEX idx_memory_records_trusted_scope_updated
+  ON memory_records(origin_class, derived_from_recalled_context, status, workspace_id, updated_at DESC);
+CREATE INDEX idx_memory_records_source_turn
+  ON memory_records(source_session_id, source_turn_id);

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

@@ -3,7 +3,7 @@ import type { ApplyMigrationsOptions } from './types.js';
 /** Baseline schema version applied from schema.sql on first open. */
 export declare const XOPC_DB_BASELINE_SCHEMA_VERSION = 11;
 /** Latest schema version this release supports (increment when adding migrations). */
-export declare const XOPC_DB_SCHEMA_VERSION = 133;
+export declare const XOPC_DB_SCHEMA_VERSION = 134;
 export declare function resolveMigrationsDir(override?: string): string;
 /**
  * Apply sequential SQL migrations from (currentVersion + 1) through targetVersion.

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 = 133;
+const XOPC_DB_SCHEMA_VERSION = 134;
 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 ?? 133;
+	const targetVersion = options.targetVersion ?? 134;
 	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 ?? 133;
+	const appVersion = options.targetVersion ?? 134;
 	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 = 133;
+export const XOPC_DB_SCHEMA_VERSION = 134;
 
 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: 133,
+		targetVersion: 134,
 		databasePath: options.databasePath
 	});
 }

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

@@ -23,9 +23,9 @@ 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 { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { buildWorkflowChildTools } from "../../agent/workflow/workflow-child-tools.js";
 import { WorkflowRunService } from "../../workflows/service/workflow-run-service.js";
 import { WorkflowSessionBridge } from "../../workflows/service/workflow-session-bridge.js";

package/dist/src/user-context/planner.js

@@ -160,6 +160,8 @@ var UserContextPlanner = class {
 			rejected: [],
 			consentRequests: [],
 			estimatedTokens: 0,
+			contextChars: 0,
+			contextItemCount: 0,
 			allocation: params.allocation
 		};
 		const started = Date.now();
@@ -174,7 +176,8 @@ var UserContextPlanner = class {
 		const queryProfile = buildRetrievalQueryProfile(query, scopeInput);
 		const selfReview = queryProfile.selfReview;
 		const maxResults = requestedMaxResults ?? (selfReview ? SELF_REVIEW_MAX_RESULTS : DEFAULT_MAX_RESULTS);
-		const maxChars = requestedMaxChars ?? (selfReview ? SELF_REVIEW_MAX_CONTEXT_CHARS : DEFAULT_MAX_CONTEXT_CHARS);
+		const budgetChars = requestedMaxChars ?? (selfReview ? SELF_REVIEW_MAX_CONTEXT_CHARS : DEFAULT_MAX_CONTEXT_CHARS);
+		const maxChars = Math.max(0, budgetChars - 2);
 		const projects = new ProjectStore();
 		const excluded = new Set(params.excludedRecordIds ?? []);
 		const rejected = [];
@@ -464,7 +467,7 @@ var UserContextPlanner = class {
 			turnId: params.turnId,
 			sessionKey: params.sessionKey,
 			query,
-			budget: maxChars,
+			budget: budgetChars,
 			durationMs: Date.now() - started,
 			items: traceItems
 		});
@@ -474,7 +477,9 @@ var UserContextPlanner = class {
 			items,
 			rejected,
 			consentRequests,
-			estimatedTokens: Math.ceil(block.length / 4),
+			estimatedTokens: Math.ceil((block.length + (block ? 2 : 0)) / 4),
+			contextChars: block.length + (block ? 2 : 0),
+			contextItemCount: traceItems.filter((item) => item.decision === "selected").length,
 			allocation: params.allocation
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xopcai/xopc",
-  "version": "0.0.224",
+  "version": "0.0.225",
   "description": "Local-first personal AI assistant with reviewable user understanding, durable tasks, workflows, automations, and local or cloud models.",
   "type": "module",
   "main": "dist/src/index.js",
@@ -157,8 +157,8 @@
     "vitepress": "^1.6.4",
     "vitest": "4.1.5",
     "vue": "^3.5.35",
-    "@xopcai/gateway-contract": "0.0.0",
     "@xopcai/endpoint-tools-protocol": "0.0.0",
+    "@xopcai/gateway-contract": "0.0.0",
     "@xopcai/realtime-protocol": "0.0.0",
     "@xopcai/realtime-client": "0.0.0"
   },

package/dist/gateway/static/root/assets/channels-status-swr-DMxB7slL.js

@@ -1 +0,0 @@
-import{r as e}from"./locale-store-CPylQjH9.js";import{n as t}from"./channel-recipient-api-krezGsKc.js";function n(){return e(`/api/channels/status`)}var r=t;export{r as n,n as t};