@xopcai/xopc 0.0.248 → 0.0.250

package/dist/gateway/static/root/index.html

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260713-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260713-1" />
     <title>XOPC — Keep what matters moving.</title>
-    <script type="module" crossorigin src="/assets/index-D5TQQpeb.js"></script>
+    <script type="module" crossorigin src="/assets/index-BcaF-dgQ.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -25,13 +25,13 @@
     <link rel="modulepreload" crossorigin href="/assets/download-Dk-ZjtO6.js">
     <link rel="modulepreload" crossorigin href="/assets/plus-Q2yW6OE7.js">
     <link rel="modulepreload" crossorigin href="/assets/x-B_N4OPjy.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-CHNYp8EQ.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-BJFLQY8O.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-Cf5hpZE6.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-CF4erhjB.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-BHS7bo06.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-CV4pDOtG.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/markdown-view-DTF9v1gg.js">
+    <link rel="modulepreload" crossorigin href="/assets/markdown-view-CQvzsE24.js">
     <link rel="modulepreload" crossorigin href="/assets/dist-DLmwHyAh.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-swr-BIWyz7Rc.js">
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
@@ -40,39 +40,23 @@
     <link rel="modulepreload" crossorigin href="/assets/settings-shell-layer-context-DCp6ykjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/popover-select-C-Hj-nXR.js">
     <link rel="modulepreload" crossorigin href="/assets/circle-check-C23XjkUj.js">
-    <link rel="modulepreload" crossorigin href="/assets/cloud-C4-yfnnk.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-Dv6d4Dvw.js">
-    <link rel="modulepreload" crossorigin href="/assets/ellipsis-0k4rZLoy.js">
     <link rel="modulepreload" crossorigin href="/assets/external-link-DjqjBmc3.js">
-    <link rel="modulepreload" crossorigin href="/assets/eye-off-DEAzt3g1.js">
-    <link rel="modulepreload" crossorigin href="/assets/eye-CABVeTq0.js">
-    <link rel="modulepreload" crossorigin href="/assets/folder-open-CyzJ19I9.js">
     <link rel="modulepreload" crossorigin href="/assets/globe-DSSGFWFn.js">
-    <link rel="modulepreload" crossorigin href="/assets/link-2-D_ZKYUW7.js">
     <link rel="modulepreload" crossorigin href="/assets/loader-circle-CifKLtgG.js">
-    <link rel="modulepreload" crossorigin href="/assets/message-square-plus-XP0tGdlV.js">
-    <link rel="modulepreload" crossorigin href="/assets/minimize-2-DtOGrlpo.js">
-    <link rel="modulepreload" crossorigin href="/assets/pencil-DmIY3Oa-.js">
-    <link rel="modulepreload" crossorigin href="/assets/rotate-cw-LIg3Am9S.js">
-    <link rel="modulepreload" crossorigin href="/assets/search-DA7gz22f.js">
     <link rel="modulepreload" crossorigin href="/assets/middleware-Pd0e8Igk.js">
-    <link rel="modulepreload" crossorigin href="/assets/files-D6vf3S30.js">
+    <link rel="modulepreload" crossorigin href="/assets/files-BArWTfr7.js">
     <link rel="modulepreload" crossorigin href="/assets/tool-activity-R8V9l6nk.js">
     <link rel="modulepreload" crossorigin href="/assets/button-CtTvuElV.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CzBzglzQ.js">
-    <link rel="modulepreload" crossorigin href="/assets/registry-api-CIsNlSBi.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CR7Xg8As.js">
+    <link rel="modulepreload" crossorigin href="/assets/registry-api-BsRBlji7.js">
     <link rel="modulepreload" crossorigin href="/assets/config-reload-event-Bjh2zoKp.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-DXuXtU1w.js">
-    <link rel="modulepreload" crossorigin href="/assets/models-hub-cache-nCfkBN8M.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-CMNbl0FZ.js">
     <link rel="modulepreload" crossorigin href="/assets/electron-env-DH5wF8X8.js">
-    <link rel="modulepreload" crossorigin href="/assets/oauth-api-8lP_qJpq.js">
-    <link rel="modulepreload" crossorigin href="/assets/form-field-width-DJw_jULe.js">
-    <link rel="modulepreload" crossorigin href="/assets/interaction-BmQogeqz.js">
-    <link rel="modulepreload" crossorigin href="/assets/is-masked-secret-DOkL5b_X.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-etpmyV7S.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-O597U8q_.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-DfBjTSo9.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-BOgkc_9D.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-view-Y68dCxuc.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DReBaaTX.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DAryGvZ7.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.248";
+var version = "0.0.250";
 //#endregion
 export { version };

package/dist/packages/gateway-contract/src/user-message-display.js

@@ -6,6 +6,14 @@ const USER_CONTEXT_TAGS = [
 	"collaboration-contract",
 	"user-context"
 ];
+const LEGACY_EXECUTION_CONTEXT_HEADINGS = [
+	"Collaboration rules:",
+	"Relevant user facts:",
+	"Active goals:",
+	"Current priorities:",
+	"Relevant knowledge:"
+];
+const EMBEDDED_TIMESTAMP_PREFIX_RE = /(?:^|\r?\n)(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}[^\]]*\]\s*)/u;
 function stripLeadingTaggedBlock(text, tag) {
 	const opening = `<${tag}>`;
 	if (!text.startsWith(opening)) return null;
@@ -23,6 +31,15 @@ function stripSourceContextsEnvelope(text) {
 	const withoutContexts = text.replace(/^\s*<source_contexts>[\s\S]*?<\/source_contexts>\s*/u, "").trimStart();
 	return withoutContexts.match(/^<user_message>\r?\n([\s\S]*)\r?\n<\/user_message>\s*$/u)?.[1] ?? withoutContexts;
 }
+/** Remove execution context persisted before it gained a structured envelope. */
+function stripLegacyExecutionContext(text) {
+	const trimmed = text.trimStart();
+	if (!LEGACY_EXECUTION_CONTEXT_HEADINGS.some((heading) => trimmed.startsWith(heading))) return text;
+	const timestamp = trimmed.match(EMBEDDED_TIMESTAMP_PREFIX_RE);
+	if (!timestamp || timestamp.index === void 0) return text;
+	const timestampStart = timestamp.index + timestamp[0].length - timestamp[1].length;
+	return trimmed.slice(timestampStart);
+}
 /**
 * Restore a model-facing user message to its client-facing text.
 * Generated profile/memory blocks require the runtime timestamp anchor, which
@@ -49,6 +66,7 @@ function stripRuntimeUserMessageEnvelope(text) {
 		removedUserContext = true;
 	}
 	if (removedUserContext && !ENVELOPE_TIMESTAMP_PREFIX_RE.test(remaining)) remaining = beforeUserContext;
+	remaining = stripLegacyExecutionContext(remaining);
 	return remaining.replace(ENVELOPE_TIMESTAMP_PREFIX_RE, "");
 }
 //#endregion

package/dist/src/agent/agent-instance-gateway.d.ts

@@ -44,9 +44,9 @@ export interface AgentInstanceGateway {
     /** Last assistant text from the in-memory agent (empty when no agent / no assistant yet). */
     getLastAssistantContent(sessionKey: string): string | null;
     /** Build the bounded, policy-filtered context used for this model turn. */
-    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<import('./memory/context/types.js').UserContextPlan>;
-    /** Post-turn: sync external memory providers, queue next prefetch. */
-    afterAgentTurn(sessionKey: string, userPlainText: string, turnId: string): Promise<import('./memory/understanding/types.js').UnderstandingReviewResult | undefined>;
+    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<import('./context/coordinator.js').ExecutionContextPlan>;
+    /** Post-turn: capture durable structured user context according to policy. */
+    afterAgentTurn(sessionKey: string, userPlainText: string, turnId: string): Promise<import('../user-model/capture/index.js').UserModelCaptureResult | undefined>;
     /** Bump the per-session "turns since memory review" counter. */
     beginBackgroundReviewUserTurn(sessionKey: string): void;
     /** Fire-and-forget review (memory + skill nudges) once the main turn finishes. */

package/dist/src/agent/agent-manager.d.ts

@@ -22,7 +22,7 @@ import type { SessionContext } from './session/session-context.js';
 import type { Skill, SkillDiagnostic, SkillMarkdownPreviewPayload, SkillRuntimeStatus } from './skills/types.js';
 import { type SkillHubLockEntry } from './skills/hub-lock.js';
 import type { MemoryManager } from './memory/manager.js';
-import type { UserContextPlan } from './memory/context/types.js';
+import { type ExecutionContextPlan } from './context/coordinator.js';
 import { type AgentTurnPolicy } from './orchestration/agent-turn-policy.js';
 export interface SkillCatalogEntry {
     directoryId: string;
@@ -128,6 +128,8 @@ export interface AgentInstance {
     /** Capability packs activated by explicit skills or UI entry points in this session. */
     activeCapabilities: Map<string, AgentCapabilitySessionState>;
     activeProjectContext?: string;
+    interactionStateVersion?: number;
+    userContextAccessVersion: string;
     /** Declared env var names from skill_view; exec_command reads values from process.env at spawn time. */
     skillEnvPassthroughKeys: Set<string>;
 }
@@ -151,7 +153,7 @@ export declare class AgentManager implements AgentInstanceGateway {
     private credentialCache;
     private credentialResolver;
     private workspaceRuntimes;
-    private userContext;
+    private executionContext;
     private backgroundReview;
     private skillFilesystemWatcher;
     private skillDiskRefreshInProgress;
@@ -196,21 +198,15 @@ export declare class AgentManager implements AgentInstanceGateway {
     getMemoryManager(): MemoryManager;
     getMemoryManagerForSession(sessionKey: string): MemoryManager;
     /** Build the bounded, policy-filtered context used for this model turn. */
-    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<UserContextPlan>;
-    /**
-     * After a completed turn: sync external providers and queue next-turn prefetch.
-     * Delegates to {@link UserContextCoordinator}.
-     */
-    afterAgentTurn(sessionKey: string, userPlainText: string, turnId: string): Promise<import('./memory/understanding/types.js').UnderstandingReviewResult | undefined>;
+    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<ExecutionContextPlan>;
+    /** Capture durable structured user context after a completed turn. */
+    afterAgentTurn(sessionKey: string, userPlainText: string, turnId: string): Promise<import('../user-model/capture/index.js').UserModelCaptureResult | undefined>;
     /**
      * Call once per user turn before the main embedded agent turn.
      * Delegates to {@link BackgroundReviewCoordinator}.
      */
     beginBackgroundReviewUserTurn(sessionKey: string): void;
-    /**
-     * After a successful main turn (after memory sync via `afterAgentTurn`), may run a quiet follow-up for memory/skills.
-     * Delegates to {@link BackgroundReviewCoordinator}.
-     */
+    /** After a successful main turn, may run a quiet follow-up for context review and skills. */
     scheduleBackgroundReviewAfterUserTurn(sessionKey: string): void;
     /**
      * Expand `/skill:name` user text into the full skill block for the current turn (WebChat, channels).
@@ -288,12 +284,16 @@ export declare class AgentManager implements AgentInstanceGateway {
     refreshCredentials(): Promise<void>;
     private resolveApiKeyWithCache;
     private composeDynamicProjectContext;
+    private buildExecutionScopeContext;
+    private getInteractionStateVersion;
+    private getUserContextAccessVersion;
+    private buildExternalMemoryInstructions;
     getCapabilityCatalogForSession(sessionKey?: string): AgentCapabilityCatalogEntry[];
     private createAgentForProfile;
     private buildAgentTurnPolicy;
     private resolveToolPolicy;
     private requestToolConfirmation;
-    private refreshActiveProjectContextIfChanged;
+    private refreshDynamicContextIfChanged;
     /**
      * Set model for a specific session
      */

package/dist/src/agent/agent-manager.js

@@ -1,8 +1,9 @@
 import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
+import { getInteractionState } from "../storage/sqlite/interaction-state-repository.js";
 import { getSessionMetadata } from "../storage/sqlite/session-repository.js";
-import { getSessionConfig } from "../storage/sqlite/config-repository.js";
 import "../storage/sqlite/index.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
@@ -30,15 +31,17 @@ import { loadSkillsLock } from "./skills/hub-lock.js";
 import { isUnderManagedSkillsDir } from "./skills/managed-store.js";
 import { evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
+import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
 import { createAgentCapabilitySessionState, resolveAgentCapabilityCatalog } from "./capabilities/registry.js";
 import "./capabilities/index.js";
 import { sortToolsForPromptCache } from "./tools/cache-stability.js";
 import { AgentToolsFactory } from "./tools/factory.js";
 import "./mcp/bundle-mcp-tools.js";
 import { isMemorySubsystemEnabled } from "./memory/memory-config.js";
-import { UserContextCoordinator } from "./memory/user-context-coordinator.js";
+import { evaluateToolGate } from "./context/execution-context.js";
+import { ExecutionContextCoordinator } from "./context/coordinator.js";
 import { WorkspaceRuntimeRegistry } from "./workspace-runtime/registry.js";
-import { runTurnUnderstandingReview } from "./background-review/run-background-review.js";
+import { runTurnUserModelCapture } from "./background-review/run-background-review.js";
 import { BackgroundReviewCoordinator } from "./background-review/coordinator.js";
 import { maybeRequestChannelExecApproval } from "../channels/exec-approval-runtime.js";
 import { SkillFilesystemWatcher } from "./skills/filesystem-watcher.js";
@@ -105,7 +108,7 @@ var AgentManager = class {
 	credentialCache = /* @__PURE__ */ new Map();
 	credentialResolver;
 	workspaceRuntimes;
-	userContext;
+	executionContext;
 	backgroundReview;
 	skillFilesystemWatcher;
 	skillDiskRefreshInProgress = false;
@@ -130,13 +133,11 @@ var AgentManager = class {
 				this.skillFilesystemWatcher.watchWorkspace(resolvedPath);
 			}
 		});
-		this.userContext = new UserContextCoordinator({
+		this.executionContext = new ExecutionContextCoordinator({
 			getConfig: () => this.config.config,
-			isEnabledForSession: (sessionKey) => this.isUserContextEnabledForSession(sessionKey),
+			getAccessForSession: (sessionKey) => resolveUserContextSessionAccess(this.config.config, sessionKey),
 			getWorkspaceIdForSession: (sk) => this.getResolvedWorkspaceForSession(sk),
-			getProjectIdForSession: (sk) => getSessionMetadata(sk)?.projectId,
-			getMemoryManagerForSession: (sk) => this.getMemoryManagerForSession(sk),
-			getLastAssistantContent: (sk) => this.getLastAssistantContent(sk)
+			getProjectIdForSession: (sk) => getSessionMetadata(sk)?.projectId
 		});
 		this.backgroundReview = new BackgroundReviewCoordinator({ getConfig: () => this.mergedConfig() });
 		this.toolsFactory = new AgentToolsFactory(this.buildToolsFactoryDeps());
@@ -151,8 +152,7 @@ var AgentManager = class {
 		});
 	}
 	isUserContextEnabledForSession(sessionKey) {
-		const mode = getSessionConfig(sessionKey)?.userContextMode;
-		return Boolean(this.config.config?.userContext.enabled && this.config.config.userContext.understanding.enabled && (mode === void 0 || mode === "enabled"));
+		return resolveUserContextSessionAccess(this.config.config, sessionKey).userModel;
 	}
 	computeBaseWorkspacePath() {
 		const cfg = this.config.config;
@@ -289,25 +289,21 @@ var AgentManager = class {
 	}
 	/** Build the bounded, policy-filtered context used for this model turn. */
 	prepareUserTurnContext(userMessage, sessionKey, turnId) {
-		return this.userContext.prepare(userMessage, sessionKey, turnId);
+		return this.executionContext.prepare(userMessage, sessionKey, turnId);
 	}
-	/**
-	* After a completed turn: sync external providers and queue next-turn prefetch.
-	* Delegates to {@link UserContextCoordinator}.
-	*/
+	/** Capture durable structured user context after a completed turn. */
 	async afterAgentTurn(sessionKey, userPlainText, turnId) {
-		await this.userContext.afterTurn(sessionKey, userPlainText);
 		if (!this.isUserContextEnabledForSession(sessionKey)) return void 0;
 		const parsed = parseSessionKey(sessionKey);
 		if (parsed && parsed.peerKind !== "direct") return void 0;
 		const instance = this.agents.get(sessionKey);
 		if (!instance) return void 0;
-		return runTurnUnderstandingReview({
+		return runTurnUserModelCapture({
 			sessionKey,
 			turnId,
 			userText: userPlainText,
 			mainAgent: instance.agent,
-			memoryManager: this.getMemoryManagerForSession(sessionKey),
+			workspaceId: this.getResolvedWorkspaceForSession(sessionKey),
 			getConfig: () => this.mergedConfig()
 		});
 	}
@@ -319,10 +315,7 @@ var AgentManager = class {
 		if (!this.agents.get(sessionKey) || !this.isUserContextEnabledForSession(sessionKey)) return;
 		this.backgroundReview.beginUserTurn(sessionKey);
 	}
-	/**
-	* After a successful main turn (after memory sync via `afterAgentTurn`), may run a quiet follow-up for memory/skills.
-	* Delegates to {@link BackgroundReviewCoordinator}.
-	*/
+	/** After a successful main turn, may run a quiet follow-up for context review and skills. */
 	scheduleBackgroundReviewAfterUserTurn(sessionKey) {
 		const inst = this.agents.get(sessionKey);
 		if (!inst || !this.isUserContextEnabledForSession(sessionKey)) return;
@@ -330,7 +323,7 @@ var AgentManager = class {
 			sessionKey,
 			agent: inst.agent,
 			lastAssistantText: this.getLastAssistantContent(sessionKey),
-			workspaceRuntime: this.getWorkspaceRuntimeForSession(sessionKey)
+			workspaceId: this.getResolvedWorkspaceForSession(sessionKey)
 		});
 	}
 	/**
@@ -406,7 +399,7 @@ var AgentManager = class {
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
 		const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 		return rt.systemPromptBuilder.build(contextFiles, {
-			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+			externalMemoryInstructions: this.buildExternalMemoryInstructions(instance.sessionKey, rt),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 			customInstructions: instance.effectiveProfile.customInstructions,
@@ -612,9 +605,9 @@ var AgentManager = class {
 			const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(instance.sessionKey);
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 			const contextFiles = this.resolveContextFilesForSession(instance.sessionKey, instance.effectiveProfile);
-			instance.activeProjectContext = buildExecutionScopeContextForPrompt(instance.sessionKey);
+			instance.activeProjectContext = this.buildExecutionScopeContext(instance.sessionKey);
 			const newPrompt = rt.systemPromptBuilder.build(contextFiles, {
-				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+				externalMemoryInstructions: this.buildExternalMemoryInstructions(instance.sessionKey, rt),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 				customInstructions: instance.effectiveProfile.customInstructions,
@@ -687,9 +680,9 @@ var AgentManager = class {
 			const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(instance.sessionKey);
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 			const contextFiles = this.resolveContextFilesForSession(instance.sessionKey, instance.effectiveProfile);
-			instance.activeProjectContext = buildExecutionScopeContextForPrompt(instance.sessionKey);
+			instance.activeProjectContext = this.buildExecutionScopeContext(instance.sessionKey);
 			const newPrompt = rt.systemPromptBuilder.rebuild(contextFiles, {
-				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+				externalMemoryInstructions: this.buildExternalMemoryInstructions(instance.sessionKey, rt),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 				customInstructions: instance.effectiveProfile.customInstructions,
@@ -714,7 +707,7 @@ var AgentManager = class {
 		const existing = this.agents.get(sessionKey);
 		if (existing) if (existing.resolvedWorkspacePath !== targetPath) this.removeAgent(sessionKey);
 		else {
-			this.refreshActiveProjectContextIfChanged(existing);
+			this.refreshDynamicContextIfChanged(existing);
 			existing.lastUsedAt = Date.now();
 			log.debug({ sessionKey }, "Reusing existing agent instance");
 			return existing.agent;
@@ -730,7 +723,7 @@ var AgentManager = class {
 			err,
 			sessionKey
 		}, "memory initializeAll failed"));
-		const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
+		const activeProjectContext = this.buildExecutionScopeContext(sessionKey);
 		const profileModelRef = profile.primaryModelRef?.trim() || this.defaultModel;
 		const modelManager = this.config.getModelManager?.();
 		const initialModelRef = modelManager?.resolveInitialModelForSession(sessionKey, profileModelRef, profile.fallbacks) ?? profileModelRef;
@@ -752,6 +745,8 @@ var AgentManager = class {
 			registeredToolNames,
 			activeCapabilities: /* @__PURE__ */ new Map(),
 			activeProjectContext,
+			interactionStateVersion: this.getInteractionStateVersion(sessionKey),
+			userContextAccessVersion: this.getUserContextAccessVersion(sessionKey),
 			skillEnvPassthroughKeys: /* @__PURE__ */ new Set()
 		});
 		log.debug({
@@ -792,7 +787,7 @@ var AgentManager = class {
 			instance.agent.abort();
 			evictEmbeddedSessionRunner(sessionKey, "agent_removed");
 			this.agents.delete(sessionKey);
-			this.userContext.forgetSession(sessionKey);
+			this.executionContext.forgetSession(sessionKey);
 			clearBootstrapSnapshot(sessionKey);
 			this.config.getModelManager?.().clearSessionProfileDefault(sessionKey);
 			log.info({
@@ -829,9 +824,9 @@ var AgentManager = class {
 		const contextFiles = this.resolveContextFilesForSession(sessionKey, instance.effectiveProfile);
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
 		const thinkingLevel = this.config.thinkingLevel ?? "medium";
-		const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
+		const activeProjectContext = this.buildExecutionScopeContext(sessionKey);
 		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
-			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+			externalMemoryInstructions: this.buildExternalMemoryInstructions(sessionKey, rt),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 			customInstructions: instance.effectiveProfile.customInstructions,
@@ -872,7 +867,7 @@ var AgentManager = class {
 		for (const instance of this.agents.values()) instance.agent.abort();
 		this.agents.clear();
 		this.runtimeListeners.clear();
-		this.userContext.clear();
+		this.executionContext.clear();
 		this.sessionWorkspaceOverrides.clear();
 		this.workspaceRuntimes.clearAll();
 		log.debug("All agent instances disposed");
@@ -907,6 +902,22 @@ var AgentManager = class {
 	composeDynamicProjectContext(...sections) {
 		return sections.map((section) => section?.trim()).filter((section) => Boolean(section)).join("\n\n") || void 0;
 	}
+	buildExecutionScopeContext(sessionKey) {
+		const access = resolveUserContextSessionAccess(this.config.config, sessionKey);
+		return buildExecutionScopeContextForPrompt(sessionKey, {
+			includeKnowledge: access.knowledge,
+			knowledgeSources: access.knowledgeSources
+		});
+	}
+	getInteractionStateVersion(sessionKey) {
+		return isXopcDatabaseOpen() ? getInteractionState(sessionKey)?.updatedAt : void 0;
+	}
+	getUserContextAccessVersion(sessionKey) {
+		return JSON.stringify(resolveUserContextSessionAccess(this.config.config, sessionKey));
+	}
+	buildExternalMemoryInstructions(sessionKey, rt) {
+		return resolveUserContextSessionAccess(this.config.config, sessionKey).knowledge ? rt.memoryManager.buildExternalSystemPrompt() : "";
+	}
 	getCapabilityCatalogForSession(sessionKey) {
 		const inst = sessionKey?.trim() ? this.agents.get(sessionKey.trim()) : void 0;
 		return this.resolveCapabilityCatalogForInstance(inst);
@@ -919,6 +930,7 @@ var AgentManager = class {
 			workspace: resolvedWorkspacePath,
 			profileMarkdownRoot: resolveAgentProfileDir(this.config.config, profile.agentId),
 			agentId: profile.agentId,
+			sessionKey,
 			disabledTools: profile.tools.denied,
 			getPrimaryModel: () => agent?.state.model ?? model,
 			getMemoryManager: () => rt.memoryManager,
@@ -930,7 +942,7 @@ var AgentManager = class {
 		agent = new Agent({
 			initialState: {
 				systemPrompt: rt.systemPromptBuilder.build(contextFiles, {
-					externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+					externalMemoryInstructions: this.buildExternalMemoryInstructions(sessionKey, rt),
 					workspaceOverride: resolvedWorkspacePath,
 					profileMarkdownPathRoot: resolveAgentProfileDir(this.config.config, profile.agentId),
 					customInstructions: profile.customInstructions,
@@ -976,6 +988,23 @@ var AgentManager = class {
 			},
 			authorizeToolCall: async ({ toolCall, args }) => {
 				const toolName = toolCall.name;
+				const operation = {
+					message: "external_send",
+					send_media: "external_send",
+					exec_command: "command_execute",
+					write_file: "filesystem_write",
+					apply_patch: "filesystem_write",
+					xopc_tool_execute: "external_tool"
+				}[toolName] ?? toolName;
+				const executionGate = this.executionContext.getCurrent(sessionKey);
+				if (executionGate) {
+					const decision = evaluateToolGate(executionGate, operation);
+					if (!decision.allowed) return {
+						block: true,
+						terminate: true,
+						reason: decision.reason ?? "Blocked by collaboration rule."
+					};
+				}
 				const policy = this.resolveToolPolicy(profile, toolName, args);
 				const detail = JSON.stringify(args ?? {});
 				if (policy?.mode === "ask") {
@@ -1039,14 +1068,17 @@ var AgentManager = class {
 		const request = this.config.gatewayClarify?.requestClarification;
 		if (!request) return false;
 		return await request(sessionKey, {
+			kind: "approval",
 			question: `Allow ${toolName} to run once?\n${detail.slice(0, 500)}`,
 			choices: ["Allow once", "Deny"],
 			default: "Deny"
 		}).catch(() => "Deny") === "Allow once";
 	}
-	refreshActiveProjectContextIfChanged(instance) {
-		const nextProjectContext = buildExecutionScopeContextForPrompt(instance.sessionKey);
-		if (nextProjectContext === instance.activeProjectContext) return;
+	refreshDynamicContextIfChanged(instance) {
+		const nextProjectContext = this.buildExecutionScopeContext(instance.sessionKey);
+		const interactionStateVersion = this.getInteractionStateVersion(instance.sessionKey);
+		const userContextAccessVersion = this.getUserContextAccessVersion(instance.sessionKey);
+		if (nextProjectContext === instance.activeProjectContext && interactionStateVersion === instance.interactionStateVersion && userContextAccessVersion === instance.userContextAccessVersion) return;
 		const cfg = this.config.config;
 		const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(instance.sessionKey);
 		const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
@@ -1054,7 +1086,7 @@ var AgentManager = class {
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
 		const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
-			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+			externalMemoryInstructions: this.buildExternalMemoryInstructions(instance.sessionKey, rt),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 			customInstructions: instance.effectiveProfile.customInstructions,
@@ -1067,6 +1099,8 @@ var AgentManager = class {
 			activeProjectContext: nextProjectContext
 		});
 		instance.activeProjectContext = nextProjectContext;
+		instance.interactionStateVersion = interactionStateVersion;
+		instance.userContextAccessVersion = userContextAccessVersion;
 		log.debug({ sessionKey: instance.sessionKey }, "Dynamic agent context changed; system prompt refreshed");
 	}
 	/**
@@ -1090,9 +1124,9 @@ var AgentManager = class {
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 			const contextFiles = this.resolveContextFilesForSession(sessionKey, instance.effectiveProfile);
 			const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
-			const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
+			const activeProjectContext = this.buildExecutionScopeContext(sessionKey);
 			instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
-				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
+				externalMemoryInstructions: this.buildExternalMemoryInstructions(sessionKey, rt),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
 				customInstructions: instance.effectiveProfile.customInstructions,

package/dist/src/agent/background-review/coordinator.d.ts

@@ -10,7 +10,6 @@
  */
 import type { Agent } from '@earendil-works/pi-agent-core';
 import type { Config } from '../../config/schema.js';
-import type { WorkspaceRuntime } from '../workspace-runtime/registry.js';
 export interface BackgroundReviewCoordinatorOptions {
     /** Effective config snapshot used to look up review-cadence settings. */
     getConfig: () => Config | undefined;
@@ -20,7 +19,7 @@ export interface ScheduleReviewContext {
     agent: Agent;
     /** Last assistant text — review is skipped when empty. */
     lastAssistantText: string | null;
-    workspaceRuntime: WorkspaceRuntime;
+    workspaceId: string;
 }
 export declare class BackgroundReviewCoordinator {
     private readonly opts;
@@ -34,7 +33,7 @@ export declare class BackgroundReviewCoordinator {
     /**
      * Fire-and-forget review after the main user turn. Decides whether to run a
      * understanding sweep based on the counter state + last assistant text,
-     * and delegates the actual review to {@link runBackgroundReviewTurn}.
+     * and delegates the actual review to {@link runBackgroundUserModelReview}.
      */
     scheduleAfterUserTurn(ctx: ScheduleReviewContext): void;
     /** Tear down state for a session (called by `AgentManager.removeAgent`). */
@@ -42,6 +41,5 @@ export declare class BackgroundReviewCoordinator {
     /** Clear every counter (`AgentManager.dispose` / hot reload). */
     clear(): void;
     private ensureState;
-    private resolveReviewInterval;
     private runReviewIfNeeded;
 }

package/dist/src/agent/background-review/coordinator.js

@@ -1,11 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { summarizeUserUnderstandingQuality } from "../../storage/sqlite/user-context-quality-repository.js";
-import "../../storage/sqlite/index.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
-import { resolveAdaptiveUnderstandingCadence } from "../memory/understanding/quality.js";
 import { resolveBackgroundReviewSettings } from "./settings.js";
-import { runBackgroundReviewTurn } from "./run-background-review.js";
+import { runBackgroundUserModelReview } from "./run-background-review.js";
 //#region src/agent/background-review/coordinator.ts
 init_logger();
 const log = createLogger("BackgroundReviewCoordinator");
@@ -23,7 +20,7 @@ var BackgroundReviewCoordinator = class {
 		const cfg = resolveBackgroundReviewSettings(this.opts.getConfig());
 		if (!cfg.enabled) return;
 		const state = this.ensureState(sessionKey);
-		const intervalTurns = this.resolveReviewInterval(cfg, state);
+		const intervalTurns = cfg.reviewIntervalTurns;
 		state.turnsSinceReview += 1;
 		if (state.turnsSinceReview >= intervalTurns) {
 			state.pendingReview = true;
@@ -33,7 +30,7 @@ var BackgroundReviewCoordinator = class {
 	/**
 	* Fire-and-forget review after the main user turn. Decides whether to run a
 	* understanding sweep based on the counter state + last assistant text,
-	* and delegates the actual review to {@link runBackgroundReviewTurn}.
+	* and delegates the actual review to {@link runBackgroundUserModelReview}.
 	*/
 	scheduleAfterUserTurn(ctx) {
 		this.runReviewIfNeeded(ctx).catch((err) => {
@@ -61,28 +58,6 @@ var BackgroundReviewCoordinator = class {
 		this.states.set(sessionKey, state);
 		return state;
 	}
-	resolveReviewInterval(settings, state) {
-		if (!settings.adaptiveCadence) return settings.reviewIntervalTurns;
-		const now = Date.now();
-		if (state.adaptiveIntervalTurns != null && (state.adaptiveIntervalExpiresAt ?? 0) > now) return state.adaptiveIntervalTurns;
-		try {
-			const metrics = summarizeUserUnderstandingQuality({
-				windowDays: 30,
-				nowMs: now
-			});
-			const decision = resolveAdaptiveUnderstandingCadence(settings.reviewIntervalTurns, metrics);
-			state.adaptiveIntervalTurns = decision.effectiveIntervalTurns;
-			state.adaptiveIntervalExpiresAt = now + 5 * 6e4;
-			if (decision.slowed) log.debug({
-				baseIntervalTurns: decision.baseIntervalTurns,
-				effectiveIntervalTurns: decision.effectiveIntervalTurns,
-				reasons: decision.reasons
-			}, "User-understanding review cadence slowed by quality signals");
-			return decision.effectiveIntervalTurns;
-		} catch {
-			return settings.reviewIntervalTurns;
-		}
-	}
 	async runReviewIfNeeded(ctx) {
 		const state = this.states.get(ctx.sessionKey);
 		if (!state) return;
@@ -93,11 +68,11 @@ var BackgroundReviewCoordinator = class {
 		const shouldReview = state.pendingReview;
 		state.pendingReview = false;
 		if (!shouldReview) return;
-		await runBackgroundReviewTurn({
+		await runBackgroundUserModelReview({
 			sessionKey: ctx.sessionKey,
 			mainAgent: ctx.agent,
 			settings,
-			memoryManager: ctx.workspaceRuntime.memoryManager,
+			workspaceId: ctx.workspaceId,
 			getConfig: () => this.opts.getConfig()
 		});
 	}

package/dist/src/agent/background-review/prompts.d.ts

@@ -1,6 +1,8 @@
-export declare const UNDERSTANDING_INTERPRETER_SYSTEM_PROMPT = "You are xopc's user-understanding interpreter. You do not chat with the user and cannot write storage. Distinguish memory commands, memory questions, corrections, forgetting, durable user assertions, and ordinary task requests. Return strict JSON only. Never treat assistant text as evidence of a fact about the user.";
-export declare function buildUnderstandingInterpreterPrompt(options: {
+export declare const USER_MODEL_INTERPRETER_SYSTEM_PROMPT = "You are xopc's user-model interpreter. You do not chat with the user and cannot write storage. Distinguish explicit memory commands, corrections, forgetting, durable user assertions, durable goals, collaboration rules, and ordinary task requests. Return strict JSON only. Assistant text is never evidence about the user.";
+export declare function buildUserModelInterpreterPrompt(options: {
     mode: 'turn' | 'transcript';
+    evidenceTimestamp: string;
+    timezone: string;
     availableTargets?: Array<{
         id: string;
         statement: string;