@xopcai/xopc 0.0.247 → 0.0.249

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -1,6 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { runContextConsolidation } from "../../user-context/consolidation.js";
+import { parseMaintenanceInstruction } from "../../memory-maintenance/schedule.js";
+import { runMemoryMaintenance } from "../../memory-maintenance/service.js";
+import "../../memory-maintenance/index.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { persistInboundAttachments } from "../../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, clearPendingTranscriptUserMessage, hydrateUserTurnForLlm, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
@@ -48,15 +50,19 @@ var AgentOrchestrator = class {
 		log.debug({ sessionKey }, "Processing message through agent orchestrator");
 		await this.sessionHydrator.workspace(sessionKey);
 		if (typeof msg.content === "string" && (sessionKey.startsWith("cron:") || sessionKey.includes(":cron:") || sessionKey.includes(":automation:") || context.channel === "cron" || context.channel === "automation")) {
-			if (msg.content.includes("__xopc_user_context_consolidation__")) {
+			const maintenanceJob = parseMaintenanceInstruction(msg.content);
+			if (maintenanceJob) {
 				const cfg = this.getConfig?.();
 				if (!cfg) {
-					log.warn({ sessionKey }, "User context review skipped: config unavailable");
+					log.warn({ sessionKey }, "Memory maintenance skipped: config unavailable");
 					return;
 				}
-				await runContextConsolidation({
-					config: cfg,
-					triggerKind: "schedule"
+				const maintenance = cfg.userContext.userModel.maintenance;
+				runMemoryMaintenance({
+					jobType: maintenanceJob,
+					limit: maintenance.limit,
+					staleRetentionDays: maintenance.staleRetentionDays,
+					evidenceThreshold: maintenance.evidenceThreshold
 				});
 				return;
 			}
@@ -108,21 +114,7 @@ var AgentOrchestrator = class {
 					clearPendingTranscriptUserMessage(sessionKey, userMessage);
 				}
 			})();
-			const understandingReview = await this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory, turnId);
-			if (understandingReview?.createdRecords.length) {
-				const captured = understandingReview.createdRecords.filter((record) => record.status === "active");
-				const candidates = understandingReview.createdRecords.filter((record) => record.status === "candidate");
-				if (captured.length) this.onEmbeddedStreamEvent?.(sessionKey, {
-					type: "memory_captured",
-					runId: turnId,
-					records: captured
-				});
-				if (candidates.length) this.onEmbeddedStreamEvent?.(sessionKey, {
-					type: "memory_candidate",
-					runId: turnId,
-					records: candidates
-				});
-			}
+			await this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory, turnId);
 			this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);
 			if (turnResult.ok) {
 				this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);

package/dist/src/agent/prompt/sections/memory-skills.js

@@ -1,43 +1,32 @@
 //#region src/agent/prompt/sections/memory-skills.ts
 function buildMemorySection(params) {
 	if (params.includeMemorySection === false) return "";
-	if (!(params.availableTools.has("memory_search") || params.availableTools.has("memory_get") || params.availableTools.has("session_recall") || params.availableTools.has("session_search")) && !params.hasProfileMemory) return "";
-	const citationsMode = params.citationsMode ?? "on";
-	const citationInstruction = citationsMode === "off" ? "Citations are disabled: do not mention file paths or line numbers in replies." : citationsMode === "source-only" ? "Citations: mention the memory record id when it helps." : "Citations: include the memory record id when it helps the user verify recalled context.";
-	const toolLines = [];
-	if (params.availableTools.has("memory_search")) toolLines.push("1. Run `memory_search` to search workspace and connected-source memory records");
-	if (params.availableTools.has("session_search")) toolLines.push(`${toolLines.length + 1}. For **other chat sessions** / cross-session history, use \`session_search\` with keywords (or omit \`query\` to list recent sessions)`);
-	if (params.availableTools.has("session_recall")) toolLines.push(`${toolLines.length + 1}. When the current session summary lacks an exact fact, path, ID, date, decision, or tool result, use session_recall to search its authoritative raw transcript`);
-	if (params.availableTools.has("memory_get")) toolLines.push(`${toolLines.length + 1}. Use \`memory_get\` only for record ids returned by \`memory_search\``);
-	toolLines.push(`${toolLines.length + 1}. If low confidence after search, say you checked`);
-	return [
-		"## Memory Recall",
-		"",
-		citationInstruction,
-		"",
-		"Relevant user understanding is selected separately and injected above.",
-		"",
-		"Before answering anything about prior work, decisions, dates, people, preferences, or todos:",
-		...toolLines,
-		"",
-		"### Memory Sources",
-		"",
-		"- **Current session:** use `session_recall` for exact raw turns, including history older than compaction.",
-		"- **Other sessions:** use `session_search` for cross-session history.",
-		"- **Workspace memory:** cite only record ids returned by `memory_search` / `memory_get`.",
-		"",
-		"### Writing to Memory",
-		"",
-		"- **Declarative vs procedural:** user preferences belong to structured user understanding; reusable task procedures belong to skills.",
-		"- Explicit \"remember this\" statements are captured as durable structured understanding after the turn.",
-		"- Do not invent, cite, or promise memory record ids that were not returned by a memory tool.",
-		"- **Text > Brain**"
-	].join("\n");
+	const names = params.availableTools;
+	if (![
+		"user_context_search",
+		"user_context_get",
+		"knowledge_search",
+		"knowledge_get",
+		"session_recall",
+		"session_search"
+	].some((name) => names.has(name)) && !params.hasProfileMemory) return "";
+	const lines = [
+		"## Context and memory",
+		"",
+		"Relevant user facts, goals, priorities, collaboration rules, and task knowledge are selected for each turn.",
+		"When exact or additional context is needed:"
+	];
+	if (names.has("user_context_search")) lines.push("- Use `user_context_search` for user identity, preferences, routines, and current state.");
+	if (names.has("knowledge_search")) lines.push("- Use `knowledge_search` for project facts, decisions, lessons, commitments, and open questions.");
+	if (names.has("session_recall")) lines.push("- Use `session_recall` for exact raw content from the current session.");
+	if (names.has("session_search")) lines.push("- Use `session_search` for other conversations.");
+	if (names.has("knowledge_write")) lines.push("- Use `knowledge_write` for reusable task knowledge; it is stored as a reviewable candidate with provenance.");
+	lines.push("", "User facts are declarative. Reusable procedures belong in skills.", "Do not infer importance from confidence: confidence measures truth likelihood; importance measures execution value.");
+	return lines.join("\n");
 }
 function buildExternalMemorySection(text) {
-	const t = text?.trim();
-	if (!t) return "";
-	return `## External memory provider\n\n${t}`;
+	const value = text?.trim();
+	return value ? `## External knowledge provider\n\n${value}` : "";
 }
 function buildSkillsSection(hasSkillTools) {
 	if (!hasSkillTools) return "";
@@ -50,7 +39,7 @@ function buildSkillsSection(hasSkillTools) {
 		"Constraints: never load more than one skill up front; only load after selecting.",
 		"- When a skill drives external API writes, assume rate limits: prefer fewer larger writes, avoid tight one-item loops, serialize bursts when possible, and respect 429/Retry-After.",
 		"",
-		"**Division of labor with memory:** Skills = **procedural** workflows; structured memory = **declarative** facts and preferences."
+		"**Division of labor:** Skills contain procedures; user context and knowledge contain declarative facts."
 	].join("\n");
 }
 //#endregion

package/dist/src/agent/prompt/sections/tooling.js

@@ -15,8 +15,11 @@ const CORE_TOOL_ORDER = [
 	"send_message",
 	"send_media",
 	"publish_artifacts",
-	"memory_search",
-	"memory_get",
+	"user_context_search",
+	"user_context_get",
+	"knowledge_search",
+	"knowledge_get",
+	"knowledge_write",
 	"session_recall",
 	"session_search",
 	"session_status",
@@ -52,8 +55,11 @@ const CORE_TOOL_SUMMARIES = {
 	send_message: "Send messages to the current conversation or an explicit configured channel",
 	send_media: "Send media attachments to the current channel",
 	publish_artifacts: "Publish final generated files as durable chat deliverables",
-	memory_search: "Semantic search over indexed memory sources",
-	memory_get: "Read specific lines from memory sources returned by search",
+	user_context_search: "Search typed user facts, preferences, routines, and current state",
+	user_context_get: "Read one typed user assertion with its scope and authority",
+	knowledge_search: "Search scoped project, workspace, and session knowledge",
+	knowledge_get: "Read one knowledge item returned by search",
+	knowledge_write: "Store a scoped knowledge candidate with provenance",
 	session_recall: "Search exact raw turns in the current session, including compacted history",
 	session_search: "Search other chat sessions or list recent sessions",
 	session_status: "Show session usage/time/model state",

package/dist/src/agent/prompt/service-prompt-builder.js

@@ -1,13 +1,14 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
-import { getUserProfile } from "../../storage/sqlite/user-context-repository.js";
 import { buildInteractionStatePrompt } from "../../user-context/interaction-state.js";
 import { getInteractionState } from "../../storage/sqlite/interaction-state-repository.js";
 import { DEFAULT_USER_TRUST_LEVEL } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import "../../storage/sqlite/index.js";
 import { appendStablePromptSection } from "./cache-boundary.js";
+import { getUserTimezone } from "../../user-model/repository.js";
+import "../../user-model/index.js";
 import { resolveSystemPromptBuildParams } from "./system-prompt-params.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { resolveResponseLanguageForSession } from "./response-language.js";
@@ -31,7 +32,7 @@ var SystemPromptBuilder = class {
 		const interactionState = isXopcDatabaseOpen() && options.sessionKey ? getInteractionState(options.sessionKey) : void 0;
 		const interactionPrompt = interactionState ? buildInteractionStatePrompt(interactionState) : "";
 		const heartbeatEnabled = this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false;
-		const userTimezone = isXopcDatabaseOpen() ? getUserProfile().timezone || void 0 : void 0;
+		const userTimezone = isXopcDatabaseOpen() ? getUserTimezone() : void 0;
 		const ttsMerged = mergeTtsConfigFromAppConfig(this.config.messages?.tts);
 		const reg = options.registeredToolNames ?? [];
 		const ttsSystemHint = buildTtsSystemPromptHint({
@@ -110,7 +111,7 @@ var SystemPromptBuilder = class {
 			workspaceDir: ws,
 			sessionKey: options?.sessionKey,
 			toolNames: options?.registeredToolNames,
-			userTimezone: isXopcDatabaseOpen() ? getUserProfile().timezone || void 0 : void 0,
+			userTimezone: isXopcDatabaseOpen() ? getUserTimezone() : void 0,
 			externalMemoryInstructions: options?.externalMemoryInstructions,
 			heartbeatEnabled: this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false
 		});

package/dist/src/agent/service/direct-turn-helpers.js

@@ -1,7 +1,8 @@
+import { getConnectionResumeInput } from "../../storage/sqlite/connection-wait-repository.js";
 import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
 import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
 import { buildTaskExecutionDirective } from "../../tasks/task-context-assembler.js";
-import { prependAgentContext } from "../../user-context/planner.js";
+import { prependAgentContext } from "../context/prepend.js";
 import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { parseSlashCommand } from "../../chat-commands/command-parse.js";
@@ -85,15 +86,11 @@ async function tryRunSlashCommand(deps, ctx, content, options) {
 */
 async function runDirectAgentTurn(deps, input) {
 	const turnId = input.runId ?? crypto.randomUUID();
+	const isConnectionResume = Boolean(getConnectionResumeInput(input.sessionKey, turnId));
 	const userPlain = extractAgentUserPlainText(input.userMessage);
 	const userContext = await deps.agentManager.prepareUserTurnContext(input.userMessage, input.sessionKey, turnId);
 	const sourceContexts = input.sourceContexts ?? [];
 	const userMessageForModel = prependAgentContext(injectSourceContextsIntoUserMessage(userContext.modelMessage, sourceContexts), buildTaskExecutionDirective(input.sessionKey));
-	if (userContext.consentRequests.length > 0) input.onEvent?.({
-		type: "memory_consent_required",
-		runId: turnId,
-		requests: userContext.consentRequests
-	});
 	const modelRef = deps.modelManager.getModelForSession(input.sessionKey);
 	const llmTurn = await hydrateUserTurnForLlm({
 		message: input.userMessage,
@@ -114,25 +111,11 @@ async function runDirectAgentTurn(deps, input) {
 		getConfig: () => deps.config,
 		abortSignal: input.abortSignal,
 		deadlineAtMs: input.deadlineAtMs,
-		beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),
+		beforeTurn: isConnectionResume ? void 0 : () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),
 		onEvent: input.onEvent
 	});
-	const understandingReview = await deps.agentManager.afterAgentTurn(input.sessionKey, userPlain, turnId);
-	if (understandingReview?.createdRecords.length) {
-		const captured = understandingReview.createdRecords.filter((record) => record.status === "active");
-		const candidates = understandingReview.createdRecords.filter((record) => record.status === "candidate");
-		if (captured.length) input.onEvent?.({
-			type: "memory_captured",
-			runId: turnId,
-			records: captured
-		});
-		if (candidates.length) input.onEvent?.({
-			type: "memory_candidate",
-			runId: turnId,
-			records: candidates
-		});
-	}
-	deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);
+	if (!isConnectionResume) await deps.agentManager.afterAgentTurn(input.sessionKey, userPlain, turnId);
+	if (!isConnectionResume && result.stopReason !== "connection_required") deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);
 	return result;
 }
 //#endregion

package/dist/src/agent/service/process-direct-one-shot.js

@@ -31,15 +31,19 @@ async function runProcessDirect(deps, input) {
 		}, turnBody, { skipResetCommands: resetTriggeredAtInit });
 		if (slash.matched) {
 			const trimmed = slash.aggregatedText.trim();
-			if (trimmed) await deps.sessionStore.appendTranscriptMessage(input.sessionKey, {
-				role: "assistant",
-				content: isReviewOutput(slash.metadata?.review) ? [slash.metadata.review] : [{
-					type: "text",
-					text: trimmed
-				}],
-				timestamp: Date.now(),
-				...slash.metadata && Object.keys(slash.metadata).length > 0 ? { metadata: slash.metadata } : {}
-			});
+			if (trimmed) {
+				await deps.sessionStore.appendTranscriptMessage(input.sessionKey, {
+					role: "assistant",
+					content: isReviewOutput(slash.metadata?.review) ? [slash.metadata.review] : [{
+						type: "text",
+						text: trimmed
+					}],
+					timestamp: Date.now(),
+					...slash.metadata && Object.keys(slash.metadata).length > 0 ? { metadata: slash.metadata } : {}
+				});
+				if (input.origin.type === "system" && input.origin.source === "automation") await deps.sessionStore.updateMetadata(input.sessionKey, { hiddenFromSessionList: false });
+				deps.onTurnComplete?.(input.sessionKey, trimmed);
+			}
 			return slash.aggregatedText ?? "";
 		}
 		const skillTurn = deps.agentManager.prepareSkillTurn(input.sessionKey, turnBody);
@@ -70,7 +74,8 @@ async function runProcessDirect(deps, input) {
 				clearPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);
 			}
 		})();
-		if (result.lastAssistantText) deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);
+		deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);
+		if (!result.ok) throw new Error(result.errorMessage ?? "Agent turn failed");
 		return result.lastAssistantText ?? "";
 	} finally {
 		deps.endDirectRequestContext();

package/dist/src/agent/service/process-direct-streaming.js

@@ -1,3 +1,4 @@
+import { getConnectionResumeInput } from "../../storage/sqlite/connection-wait-repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
@@ -124,6 +125,7 @@ function pushAssistantReceipt(queue, text, runId, metadata) {
 }
 async function* runProcessDirectStreaming(deps, input) {
 	const sessionKey = input.sessionKey ?? "agent:main:main";
+	const isConnectionResume = Boolean(input.runId && getConnectionResumeInput(sessionKey, input.runId));
 	const { channel, chatId } = await deps.resolveSessionEndpoint(sessionKey);
 	const context = deps.initDirectStreamingSession(sessionKey, channel, chatId, input.origin);
 	const queue = new AsyncQueue({
@@ -275,7 +277,7 @@ async function* runProcessDirectStreaming(deps, input) {
 					if (sourceContext && !sourceContexts.some((context) => context.kind === sourceContext.kind && context.sourceId === sourceContext.sourceId)) sourceContexts.push(sourceContext);
 				}
 			}
-			if (channel === "webchat") {
+			if (channel === "webchat" && !isConnectionResume) {
 				pushVisible({
 					type: "user_message",
 					timestamp: userMessage.timestamp ?? Date.now(),
@@ -286,7 +288,7 @@ async function* runProcessDirectStreaming(deps, input) {
 				if (textForAgent.trim()) deps.enqueueProvisionalSessionTitle?.(sessionKey, textForAgent);
 			}
 			const pendingUserMessage = turnSourceContexts.length > 0 ? injectSourceContextsIntoUserMessage(userMessage, turnSourceContexts) : userMessage;
-			setPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
+			if (!isConnectionResume) setPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
 			try {
 				const result = await deps.agentManager.withSkillCapabilities(sessionKey, skillTurn.activatedCapabilityNames, () => runDirectAgentTurn({
 					sessionStore: deps.sessionStore,
@@ -313,7 +315,7 @@ async function* runProcessDirectStreaming(deps, input) {
 					content: formatStreamError(result.errorMessage)
 				});
 			} finally {
-				clearPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
+				if (!isConnectionResume) clearPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
 			}
 		} catch (err) {
 			if (err instanceof AsyncQueueOverflowError) {

package/dist/src/agent/service.js

@@ -1,6 +1,5 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { getUserProfile } from "../storage/sqlite/user-context-repository.js";
 import { parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
@@ -10,10 +9,13 @@ import { init_providers, resolveModel } from "../providers/index.js";
 import { extractTextContent } from "./context/workspace.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
+import { runWithEmbeddedExecutionSession } from "./embedded/execution-context.js";
 import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
 import { removeSkillsLockEntry } from "./skills/hub-lock.js";
 import { installSkillFromZip } from "./skills/managed-store.js";
 import { pullSkillFromSource } from "./skills/hub-pull.js";
+import { getUserTimezone } from "../user-model/repository.js";
+import "../user-model/index.js";
 import { resolveAgentTurnTimeoutMs } from "./orchestration/run-agent-turn-with-timeout.js";
 import { onSessionTranscriptUpdate } from "../session/transcript-events.js";
 import { persistInboundAttachments } from "../channels/attachments/inbound-persist.js";
@@ -43,7 +45,6 @@ import { ContextMiddleware } from "./middleware/context.js";
 import "./middleware/index.js";
 import { LifecycleManager } from "./lifecycle/manager.js";
 import "./lifecycle/index.js";
-import { runWithEmbeddedExecutionSession } from "./embedded/execution-context.js";
 import { MessageRouter } from "./messaging/message-router.js";
 import { CommandHandler } from "./messaging/command-handler.js";
 import { StreamManager } from "./messaging/stream-manager.js";
@@ -801,7 +802,7 @@ var AgentService = class {
 	resolveUserTimezoneForSession(sessionKey) {
 		try {
 			if (!this.effectiveAppConfig()) return void 0;
-			return getUserProfile().timezone || void 0;
+			return getUserTimezone();
 		} catch {
 			return;
 		}

package/dist/src/agent/tasks/task-judge-service.js

@@ -1,11 +1,11 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { TaskRunRepository } from "../../tasks/task-run-repository.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { getApiKey, init_providers, resolveModel } from "../../providers/index.js";
 import { TaskRepository } from "../../tasks/task-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { TaskRunRepository } from "../../tasks/task-run-repository.js";
 import { readWorkspaceRevision } from "../coding/workspace-revision.js";
 import { completeWithResolvedCredentials } from "../../providers/model-call.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";

package/dist/src/agent/tools/clarify-tool.d.ts

@@ -1,5 +1,6 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 export type ClarifyRequestPayload = {
+    kind?: 'approval';
     question: string;
     choices?: string[];
     default?: string;

package/dist/src/agent/tools/delegate-tool.js

@@ -26,8 +26,11 @@ const DELEGATE_BLOCKED_TOOLS = new Set([
 	"send_media",
 	"todo",
 	"session_search",
-	"memory_search",
-	"memory_get",
+	"user_context_search",
+	"user_context_get",
+	"knowledge_search",
+	"knowledge_get",
+	"knowledge_write",
 	"automation",
 	"skills_list",
 	"skill_view",

package/dist/src/agent/tools/factory.js

@@ -6,6 +6,7 @@ import { getSessionTaskPlan, setSessionTaskPlan } from "../../storage/sqlite/ses
 import "../../storage/sqlite/index.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
+import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
 import { wrapToolsWithProtection } from "./executor.js";
 import { EXTERNAL_TOOL_NAMES } from "../external-tools/gateway-tools.js";
 import { buildRuntimeEnvironment } from "../../runtime-tools/environment.js";
@@ -17,7 +18,8 @@ import { createListDirTool } from "./list-dir.js";
 import { createPublishArtifactsTool } from "./publish-artifacts.js";
 import { createExecCommandTool } from "./exec-command.js";
 import { createApplyPatchTool } from "./apply-patch.js";
-import { createMemoryGetTool, createMemorySearchTool } from "./memory-tool.js";
+import { createUserContextGetTool, createUserContextSearchTool } from "./user-context-tool.js";
+import { createKnowledgeGetTool, createKnowledgeSearchTool, createKnowledgeWriteTool } from "./knowledge-memory-tool.js";
 import { createSessionSearchTool } from "./session-search-tool.js";
 import { createSessionRecallTool } from "./session-recall-tool.js";
 import { createGrepTool } from "./grep.js";
@@ -31,7 +33,7 @@ import { createCreateShareTool, isShareToolAvailable } from "./create-share-tool
 import { createTodoTool } from "./todo-tool.js";
 import { createUpdatePlanTool } from "./update-plan-tool.js";
 import { createSessionStatusTool } from "./session-status-tool.js";
-import { createDreamingTool } from "./dreaming-tool.js";
+import { createMemoryMaintenanceTool } from "./memory-maintenance-tool.js";
 import { createClarifyTool } from "./clarify-tool.js";
 import { BrowserManager } from "../../browser/manager.js";
 import { resolveBrowserBackendFromConfig } from "../../browser/backend-from-config.js";
@@ -196,6 +198,7 @@ var AgentToolsFactory = class AgentToolsFactory {
 			agentId: options?.agentId ?? (cfg ? resolveDefaultAgentId(cfg) : "main")
 		});
 		const agentId = options?.agentId;
+		const resolvedAgentId = agentId ?? (cfg ? resolveDefaultAgentId(cfg) : "main");
 		const getCommandIsolation = () => {
 			const config = this.deps.getConfig?.();
 			return config ? resolveEffectiveAgentConfigForSession(config, this.deps.getCurrentContext()?.sessionKey ?? `agent:${agentId ?? "main"}:internal`).config.runtime.commandIsolation : void 0;
@@ -221,11 +224,13 @@ var AgentToolsFactory = class AgentToolsFactory {
 		const find = createFindTool(workspace);
 		return filterToolsByDisabledSet([
 			createSessionStatusTool(),
-			createDreamingTool({ getConfig: () => this.deps.getConfig?.() }),
+			createMemoryMaintenanceTool({ getConfig: () => this.deps.getConfig?.() }),
 			createToolManualTool(),
 			createClarifyTool({ resolveAskUser: () => {
 				const req = this.deps.gatewayClarify?.requestClarification;
 				if (!req) return null;
+				const executionSession = getEmbeddedExecutionSession();
+				if (executionSession) return (r) => req(executionSession, r);
 				const ctx = this.deps.getCurrentContext();
 				if (!ctx?.sessionKey) return null;
 				if (!CLARIFY_SUPPORTED_CHANNELS.has(ctx.channel)) return null;
@@ -306,21 +311,31 @@ var AgentToolsFactory = class AgentToolsFactory {
 				workspace,
 				getConfig: () => this.deps.getConfig?.()
 			})] : [],
-			...getMemMgr ? [createMemorySearchTool({
-				getMemoryManager: () => getMemMgr(),
-				getScope: () => ({
-					...options?.agentId ? { agentId: options.agentId } : {},
-					workspaceId: workspace,
-					...this.deps.getCurrentContext?.()?.sessionKey ? { sessionKey: this.deps.getCurrentContext().sessionKey } : {}
-				})
-			}), createMemoryGetTool({
-				getMemoryManager: () => getMemMgr(),
-				getScope: () => ({
-					...options?.agentId ? { agentId: options.agentId } : {},
-					workspaceId: workspace,
-					...this.deps.getCurrentContext?.()?.sessionKey ? { sessionKey: this.deps.getCurrentContext().sessionKey } : {}
-				})
-			})] : [],
+			createUserContextSearchTool({
+				agentId: resolvedAgentId,
+				workspaceId: workspace,
+				getSessionId: () => this.deps.getCurrentContext?.()?.sessionKey
+			}),
+			createUserContextGetTool({
+				agentId: resolvedAgentId,
+				workspaceId: workspace,
+				getSessionId: () => this.deps.getCurrentContext?.()?.sessionKey
+			}),
+			createKnowledgeSearchTool({
+				agentId: resolvedAgentId,
+				workspaceId: workspace,
+				getSessionId: () => this.deps.getCurrentContext?.()?.sessionKey
+			}),
+			createKnowledgeGetTool({
+				agentId: resolvedAgentId,
+				workspaceId: workspace,
+				getSessionId: () => this.deps.getCurrentContext?.()?.sessionKey
+			}),
+			createKnowledgeWriteTool({
+				agentId: resolvedAgentId,
+				workspaceId: workspace,
+				getSessionId: () => this.deps.getCurrentContext?.()?.sessionKey
+			}),
 			...this.deps.getSessionStore ? [createSessionRecallTool({
 				getSessionStore: this.deps.getSessionStore,
 				getCurrentSessionKey: () => this.deps.getCurrentContext()?.sessionKey
@@ -386,7 +401,9 @@ var AgentToolsFactory = class AgentToolsFactory {
 						disabledTools: new Set([
 							EXTERNAL_TOOL_NAMES.search,
 							EXTERNAL_TOOL_NAMES.describe,
-							EXTERNAL_TOOL_NAMES.execute
+							EXTERNAL_TOOL_NAMES.execute,
+							EXTERNAL_TOOL_NAMES.requireConnection,
+							EXTERNAL_TOOL_NAMES.updateConnectionObjective
 						])
 					});
 				}

package/dist/src/agent/tools/index.d.ts

@@ -5,7 +5,8 @@ export { createWriteFileTool, writeFileTool } from './write.js';
 export { createListDirTool, listDirTool } from './list-dir.js';
 export { createExecCommandTool, type ExecCommandDetails, type ExecCommandUpdateDetails, } from './exec-command.js';
 export { createApplyPatchTool, type AppliedPatchChange, type ApplyPatchDetails, } from './apply-patch.js';
-export { createMemorySearchTool, createMemoryGetTool, type MemoryToolOptions, } from './memory-tool.js';
+export { createUserContextSearchTool, createUserContextGetTool, type UserContextToolOptions, } from './user-context-tool.js';
+export { createKnowledgeSearchTool, createKnowledgeGetTool, createKnowledgeWriteTool, type KnowledgeToolOptions, } from './knowledge-memory-tool.js';
 export { createSessionSearchTool } from './session-search-tool.js';
 export { createSessionRecallTool, type SessionRecallToolDeps } from './session-recall-tool.js';
 export { grepTool, createGrepTool, type GrepToolInput, type GrepToolDetails, } from './grep.js';
@@ -20,7 +21,7 @@ export { createCreateShareTool, isShareToolAvailable, type CreateShareToolDeps,
 export { createTodoTool, TodoStore, type TodoItem, type TodoStatus } from './todo-tool.js';
 export { createUpdatePlanTool, type TurnPlanDetails, type TurnPlanStatus, type TurnPlanStep, } from './update-plan-tool.js';
 export { createSessionStatusTool } from './session-status-tool.js';
-export { createDreamingTool, type DreamingToolDeps } from './dreaming-tool.js';
+export { createMemoryMaintenanceTool, type MemoryMaintenanceToolDeps } from './memory-maintenance-tool.js';
 export { createClarifyTool, type ClarifyRequestPayload, type GatewayClarifyRequestFn, } from './clarify-tool.js';
 export { BrowserManager, assertBrowserUrlAllowed } from '../../browser/index.js';
 export { createDelegateTool, DEFAULT_DELEGATE_TOOLS, DELEGATE_BLOCKED_TOOLS, } from './delegate-tool.js';

package/dist/src/agent/tools/index.js

@@ -8,7 +8,8 @@ import { createPublishArtifactsTool } from "./publish-artifacts.js";
 import { createExecCommandTool } from "./exec-command.js";
 import { fuzzyFindText, generateDiffString, normalizeForFuzzyMatch, normalizeToLF, restoreLineEndings, stripBom } from "./edit-diff.js";
 import { createApplyPatchTool } from "./apply-patch.js";
-import { createMemoryGetTool, createMemorySearchTool } from "./memory-tool.js";
+import { createUserContextGetTool, createUserContextSearchTool } from "./user-context-tool.js";
+import { createKnowledgeGetTool, createKnowledgeSearchTool, createKnowledgeWriteTool } from "./knowledge-memory-tool.js";
 import { createSessionSearchTool } from "./session-search-tool.js";
 import { createSessionRecallTool } from "./session-recall-tool.js";
 import { createGrepTool, grepTool } from "./grep.js";
@@ -22,7 +23,7 @@ import { createCreateShareTool, isShareToolAvailable } from "./create-share-tool
 import { TodoStore, createTodoTool } from "./todo-tool.js";
 import { createUpdatePlanTool } from "./update-plan-tool.js";
 import { createSessionStatusTool } from "./session-status-tool.js";
-import { createDreamingTool } from "./dreaming-tool.js";
+import { createMemoryMaintenanceTool } from "./memory-maintenance-tool.js";
 import { createClarifyTool } from "./clarify-tool.js";
 import { BrowserManager } from "../../browser/manager.js";
 import { assertBrowserUrlAllowed } from "../../browser/url-policy.js";
@@ -42,4 +43,4 @@ import { createDesktopPetTool } from "./desktop-pet-tool.js";
 import { createManagedJobTool } from "./managed-job-tool.js";
 import { createImageTool } from "./image-tool.js";
 import { createImageGenerateTool, resolveImageGenerationModelConfigForTool } from "./image-generate-tool.js";
-export { BrowserManager, DEFAULT_DELEGATE_TOOLS, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, DEFAULT_TOOL_METADATA, DEFAULT_WEB_EXTRACT_MAX_LENGTH, DELEGATE_BLOCKED_TOOLS, GREP_MAX_LINE_LENGTH, MAX_RAW_HTML_CHARS_FOR_WEB_EXTRACT, TodoStore, ToolConcurrencyController, assertBrowserUrlAllowed, createApplyPatchTool, createAutomationTool, createBrowserRecipeTool, createClarifyTool, createCreateShareTool, createDelegateTool, createDesktopPetTool, createDreamingTool, createExecCommandTool, createFindTool, createGrepTool, createImageGenerateTool, createImageTool, createListDirTool, createManagedJobTool, createMemoryGetTool, createMemorySearchTool, createMessageTool, createPublishArtifactsTool, createReadFileTool, createReadMediaTool, createSendMediaTool, createSessionRecallTool, createSessionSearchTool, createSessionStatusTool, createSkillInstallTool, createSkillManageTool, createSkillViewTool, createSkillsListTool, createSkillsMarketplaceSearchTool, createTodoTool, createToolManualTool, createUpdatePlanTool, createWebExtractTool, createWebFetchTool, createWebSearchTool, createWorkflowTool, createWriteFileTool, createXopcUseTool, findTool, formatSize, fuzzyFindText, generateDiffString, getToolMetadata, grepTool, isShareToolAvailable, listDirTool, normalizeForFuzzyMatch, normalizeToLF, resolveImageGenerationModelConfigForTool, resolveImageModelConfigForTool, resolveToolLockMode, restoreLineEndings, stripBom, stripHtmlBoilerplate, truncateHead, truncateLine, truncateTail, writeFileTool };
+export { BrowserManager, DEFAULT_DELEGATE_TOOLS, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, DEFAULT_TOOL_METADATA, DEFAULT_WEB_EXTRACT_MAX_LENGTH, DELEGATE_BLOCKED_TOOLS, GREP_MAX_LINE_LENGTH, MAX_RAW_HTML_CHARS_FOR_WEB_EXTRACT, TodoStore, ToolConcurrencyController, assertBrowserUrlAllowed, createApplyPatchTool, createAutomationTool, createBrowserRecipeTool, createClarifyTool, createCreateShareTool, createDelegateTool, createDesktopPetTool, createExecCommandTool, createFindTool, createGrepTool, createImageGenerateTool, createImageTool, createKnowledgeGetTool, createKnowledgeSearchTool, createKnowledgeWriteTool, createListDirTool, createManagedJobTool, createMemoryMaintenanceTool, createMessageTool, createPublishArtifactsTool, createReadFileTool, createReadMediaTool, createSendMediaTool, createSessionRecallTool, createSessionSearchTool, createSessionStatusTool, createSkillInstallTool, createSkillManageTool, createSkillViewTool, createSkillsListTool, createSkillsMarketplaceSearchTool, createTodoTool, createToolManualTool, createUpdatePlanTool, createUserContextGetTool, createUserContextSearchTool, createWebExtractTool, createWebFetchTool, createWebSearchTool, createWorkflowTool, createWriteFileTool, createXopcUseTool, findTool, formatSize, fuzzyFindText, generateDiffString, getToolMetadata, grepTool, isShareToolAvailable, listDirTool, normalizeForFuzzyMatch, normalizeToLF, resolveImageGenerationModelConfigForTool, resolveImageModelConfigForTool, resolveToolLockMode, restoreLineEndings, stripBom, stripHtmlBoilerplate, truncateHead, truncateLine, truncateTail, writeFileTool };

package/dist/src/agent/tools/knowledge-memory-tool.d.ts

@@ -0,0 +1,9 @@
+import type { AgentTool } from '@earendil-works/pi-agent-core';
+export interface KnowledgeToolOptions {
+    agentId: string;
+    workspaceId: string;
+    getSessionId: () => string | undefined;
+}
+export declare function createKnowledgeSearchTool(options: KnowledgeToolOptions): AgentTool;
+export declare function createKnowledgeGetTool(options: KnowledgeToolOptions): AgentTool;
+export declare function createKnowledgeWriteTool(options: KnowledgeToolOptions): AgentTool;