daycare-cli 2026.2.7 → 2026.2.9

package/dist/engine/agents/agent.js

@@ -2,49 +2,50 @@ import path from "node:path";
 import { createId } from "@paralleldrive/cuid2";
 import { getLogger } from "../../log.js";
 import { listActiveInferenceProviders } from "../../providers/catalog.js";
+import { tagExtractAll } from "../../util/tagExtract.js";
 import { cuid2Is } from "../../utils/cuid2Is.js";
-import { agentSystemPrompt } from "./ops/agentSystemPrompt.js";
-import { agentPromptFilesEnsure } from "./ops/agentPromptFilesEnsure.js";
-import { agentPromptPathsResolve } from "./ops/agentPromptPathsResolve.js";
-import { messageBuildUser } from "../messages/messageBuildUser.js";
-import { messageFormatIncoming } from "../messages/messageFormatIncoming.js";
-import { messageBuildSystemText } from "../messages/messageBuildSystemText.js";
+import { channelMessageBuild, channelSignalDataParse } from "../channels/channelMessageBuild.js";
+import { Files } from "../files/files.js";
 import { messageBuildSystemSilentText } from "../messages/messageBuildSystemSilentText.js";
+import { messageBuildSystemText } from "../messages/messageBuildSystemText.js";
+import { messageBuildUser } from "../messages/messageBuildUser.js";
 import { messageExtractText } from "../messages/messageExtractText.js";
-import { contextCompact } from "./ops/contextCompact.js";
-import { contextCompactionStatus } from "./ops/contextCompactionStatus.js";
-import { contextEstimateTokens } from "./ops/contextEstimateTokens.js";
-import { messageContextReset } from "./ops/messageContextReset.js";
-import { permissionClone } from "../permissions/permissionClone.js";
-import { permissionEnsureDefaultFile } from "../permissions/permissionEnsureDefaultFile.js";
-import { permissionMergeDefault } from "../permissions/permissionMergeDefault.js";
+import { messageFormatIncoming } from "../messages/messageFormatIncoming.js";
+import { executablePromptExpand } from "../modules/executablePrompts/executablePromptExpand.js";
+import { RLM_TOOL_NAME } from "../modules/rlm/rlmConstants.js";
+import { rlmErrorTextBuild } from "../modules/rlm/rlmErrorTextBuild.js";
+import { rlmHistoryCompleteErrorRecordBuild } from "../modules/rlm/rlmHistoryCompleteErrorRecordBuild.js";
+import { rlmNoToolsModeIs } from "../modules/rlm/rlmNoToolsModeIs.js";
+import { rlmRestore } from "../modules/rlm/rlmRestore.js";
+import { rlmResultTextBuild } from "../modules/rlm/rlmResultTextBuild.js";
+import { rlmToolDescriptionBuild } from "../modules/rlm/rlmToolDescriptionBuild.js";
+import { rlmToolResultBuild } from "../modules/rlm/rlmToolResultBuild.js";
+import { toolListContextBuild } from "../modules/tools/toolListContextBuild.js";
+import { permissionBuildUser } from "../permissions/permissionBuildUser.js";
 import { permissionTagsApply } from "../permissions/permissionTagsApply.js";
+import { signalMessageBuild } from "../signals/signalMessageBuild.js";
 import { Skills } from "../skills/skills.js";
-import { toolListContextBuild } from "../modules/tools/toolListContextBuild.js";
+import { userHomeEnsure } from "../users/userHomeEnsure.js";
+import { Context } from "./context.js";
 import { agentDescriptorIsCron } from "./ops/agentDescriptorIsCron.js";
 import { agentDescriptorIsHeartbeat } from "./ops/agentDescriptorIsHeartbeat.js";
 import { agentDescriptorTargetResolve } from "./ops/agentDescriptorTargetResolve.js";
-import { agentLoopRun } from "./ops/agentLoopRun.js";
-import { agentHistoryAppend } from "./ops/agentHistoryAppend.js";
-import { agentHistoryLoad } from "./ops/agentHistoryLoad.js";
-import { agentStateWrite } from "./ops/agentStateWrite.js";
 import { agentDescriptorWrite } from "./ops/agentDescriptorWrite.js";
-import { agentSystemPromptWrite } from "./ops/agentSystemPromptWrite.js";
+import { agentHistoryAppend } from "./ops/agentHistoryAppend.js";
 import { agentHistoryContext } from "./ops/agentHistoryContext.js";
+import { agentHistoryLoad } from "./ops/agentHistoryLoad.js";
 import { agentHistoryPendingRlmResolve } from "./ops/agentHistoryPendingRlmResolve.js";
 import { agentHistoryPendingToolResults } from "./ops/agentHistoryPendingToolResults.js";
-import { rlmErrorTextBuild } from "../modules/rlm/rlmErrorTextBuild.js";
-import { rlmHistoryCompleteErrorRecordBuild } from "../modules/rlm/rlmHistoryCompleteErrorRecordBuild.js";
-import { RLM_TOOL_NAME } from "../modules/rlm/rlmConstants.js";
-import { rlmNoToolsModeIs } from "../modules/rlm/rlmNoToolsModeIs.js";
-import { rlmToolDescriptionBuild } from "../modules/rlm/rlmToolDescriptionBuild.js";
-import { rlmRestore } from "../modules/rlm/rlmRestore.js";
-import { rlmResultTextBuild } from "../modules/rlm/rlmResultTextBuild.js";
-import { rlmToolResultBuild } from "../modules/rlm/rlmToolResultBuild.js";
-import { signalMessageBuild } from "../signals/signalMessageBuild.js";
-import { channelMessageBuild, channelSignalDataParse } from "../channels/channelMessageBuild.js";
-import { sessionDbCreate } from "../../storage/sessionDbCreate.js";
-import { AgentContext } from "./agentContext.js";
+import { agentLoopRun } from "./ops/agentLoopRun.js";
+import { agentPromptFilesEnsure } from "./ops/agentPromptFilesEnsure.js";
+import { agentPromptPathsResolve } from "./ops/agentPromptPathsResolve.js";
+import { agentStateWrite } from "./ops/agentStateWrite.js";
+import { agentSystemPrompt } from "./ops/agentSystemPrompt.js";
+import { agentSystemPromptWrite } from "./ops/agentSystemPromptWrite.js";
+import { contextCompact } from "./ops/contextCompact.js";
+import { contextCompactionStatus } from "./ops/contextCompactionStatus.js";
+import { contextEstimateTokens } from "./ops/contextEstimateTokens.js";
+import { messageContextReset } from "./ops/messageContextReset.js";
 const logger = getLogger("engine.agent");
 export class Agent {
     id;
@@ -57,43 +58,52 @@ export class Agent {
     processing = false;
     started = false;
     inferenceAbortController = null;
-    constructor(id, userId, descriptor, state, inbox, agentSystem) {
+    userHome;
+    files;
+    constructor(id, userId, descriptor, state, inbox, agentSystem, userHome) {
+        if (!userHome) {
+            throw new Error("Agent user home is required.");
+        }
         this.id = id;
         this.userId = userId;
         this.descriptor = descriptor;
         this.state = state;
         this.inbox = inbox;
         this.agentSystem = agentSystem;
+        this.userHome = userHome;
+        this.files = new Files(this.userHome.home);
     }
     /**
      * Creates a new agent and persists descriptor + state + initial session row.
      * Expects: agentId is a cuid2 value; descriptor is validated.
      */
-    static async create(agentId, descriptor, userId, inbox, agentSystem) {
+    static async create(agentId, descriptor, userId, inbox, agentSystem, userHome) {
         if (!cuid2Is(agentId)) {
             throw new Error("Agent id must be a cuid2 value.");
         }
+        await userHomeEnsure(userHome);
         const now = Date.now();
+        const basePermissions = permissionBuildUser(userHome);
         const state = {
             context: { messages: [] },
             activeSessionId: null,
             inferenceSessionId: createId(),
-            permissions: permissionClone(agentSystem.config.current.defaultPermissions),
+            permissions: basePermissions,
             tokens: null,
             stats: {},
             createdAt: now,
             updatedAt: now,
             state: "active"
         };
-        const agent = new Agent(agentId, userId, descriptor, state, inbox, agentSystem);
-        await agentDescriptorWrite(agentSystem.config.current, agentId, descriptor, userId);
-        await agentStateWrite(agentSystem.config.current, agentId, state);
-        state.activeSessionId = await sessionDbCreate(agentSystem.config.current, {
+        const agent = new Agent(agentId, userId, descriptor, state, inbox, agentSystem, userHome);
+        await agentDescriptorWrite(agentSystem.storage, agentId, descriptor, userId, basePermissions);
+        await agentStateWrite(agentSystem.storage, agentId, state);
+        state.activeSessionId = await agentSystem.storage.sessions.create({
             agentId,
             inferenceSessionId: state.inferenceSessionId,
             createdAt: now
         });
-        await agentStateWrite(agentSystem.config.current, agentId, state);
+        await agentStateWrite(agentSystem.storage, agentId, state);
         agent.agentSystem.eventBus.emit("agent.created", {
             agentId,
             source: "agent",
@@ -105,8 +115,8 @@ export class Agent {
      * Rehydrates an agent from persisted descriptor + state.
      * Expects: state and descriptor already validated.
      */
-    static restore(agentId, userId, descriptor, state, inbox, agentSystem) {
-        return new Agent(agentId, userId, descriptor, state, inbox, agentSystem);
+    static restore(agentId, userId, descriptor, state, inbox, agentSystem, userHome) {
+        return new Agent(agentId, userId, descriptor, state, inbox, agentSystem, userHome);
     }
     start() {
         if (this.started) {
@@ -252,7 +262,7 @@ export class Agent {
         logger.debug(`start: handleMessage start agentId=${this.id} source=${source} textLength=${entry.message.text?.length ?? 0} fileCount=${entry.message.files?.length ?? 0}`);
         this.state.updatedAt = receivedAt;
         const rawText = entry.message.rawText ?? entry.message.text ?? "";
-        const files = toFileReferences(entry.message.files ?? []);
+        const files = await this.messageFilesNormalize(entry.message.files ?? []);
         let compactionAt = null;
         let pendingUserRecord = {
             type: "user_message",
@@ -268,14 +278,13 @@ export class Agent {
         const configSkillsRoot = path.join(this.agentSystem.config.current.configDir, "skills");
         const skills = new Skills({
             configRoot: configSkillsRoot,
-            pluginManager
+            pluginManager,
+            userRoot: this.userHome.skills
         });
         const agentKind = this.resolveAgentKind();
         const allowCronTools = agentDescriptorIsCron(this.descriptor);
-        const defaultPermissions = this.agentSystem.config.current.defaultPermissions;
         if (agentDescriptorIsHeartbeat(this.descriptor)) {
-            this.state.permissions = permissionMergeDefault(this.state.permissions, defaultPermissions);
-            permissionEnsureDefaultFile(this.state.permissions, defaultPermissions);
+            this.state.permissions = permissionBuildUser(this.userHome);
         }
         const permissionTags = [...(entry.context.permissionTags ?? [])];
         if (permissionTags.length > 0) {
@@ -287,22 +296,21 @@ export class Agent {
             }
         }
         const toolResolver = item.toolResolverOverride ?? this.agentSystem.toolResolver;
-        const providerSettings = providerId
-            ? providers.find((provider) => provider.id === providerId)
-            : providers[0];
+        const providerSettings = providerId ? providers.find((provider) => provider.id === providerId) : providers[0];
         const availableTools = toolResolver.listTools();
         const noToolsModeEnabled = rlmNoToolsModeIs(this.agentSystem.config.current.features);
         const rlmToolDescription = this.agentSystem.config.current.features.rlm && !noToolsModeEnabled
             ? await rlmToolDescriptionBuild(availableTools)
             : undefined;
-        await agentPromptFilesEnsure(agentPromptPathsResolve(this.agentSystem.config.current.dataDir));
+        await agentPromptFilesEnsure(agentPromptPathsResolve(this.userHome));
         logger.debug(`event: handleMessage building system prompt agentId=${this.id}`);
         const systemPrompt = await agentSystemPrompt({
             provider: providerSettings?.id,
             model: providerSettings?.model,
             permissions: this.state.permissions,
             descriptor: this.descriptor,
-            agentSystem: this.agentSystem
+            agentSystem: this.agentSystem,
+            userHome: this.userHome
         });
         try {
             const wrote = await agentSystemPromptWrite(this.agentSystem.config.current, this.id, systemPrompt);
@@ -313,7 +321,7 @@ export class Agent {
         catch (error) {
             logger.warn({ agentId: this.id, error }, "error: Failed to write system prompt snapshot");
         }
-        const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
+        const history = await agentHistoryLoad(this.agentSystem.storage, this.id);
         const contextTools = await this.listContextTools(toolResolver, source, {
             agentKind,
             allowCronTools,
@@ -353,9 +361,7 @@ export class Agent {
                     }
                 });
                 const summaryMessage = compacted.messages?.[0];
-                const summaryText = summaryMessage
-                    ? messageExtractText(summaryMessage)?.trim() ?? ""
-                    : "";
+                const summaryText = summaryMessage ? (messageExtractText(summaryMessage)?.trim() ?? "") : "";
                 if (summaryText) {
                     compactionAt = await this.applyCompactionSummary(summaryText);
                 }
@@ -386,11 +392,11 @@ export class Agent {
             if (compactionAt !== null) {
                 pendingUserRecord = { ...pendingUserRecord, at: compactionAt + 1 };
             }
-            await agentHistoryAppend(this.agentSystem.config.current, this.id, pendingUserRecord);
+            await agentHistoryAppend(this.agentSystem.storage, this.id, pendingUserRecord);
         }
-        const agentContext = this.state.context;
+        const ctx = this.state.context;
         const contextForRun = {
-            ...agentContext,
+            ...ctx,
             tools: contextTools,
             systemPrompt
         };
@@ -400,9 +406,7 @@ export class Agent {
         logger.debug(`event: handleMessage building user message agentId=${this.id}`);
         const userMessage = await messageBuildUser(entry);
         contextForRun.messages.push(userMessage);
-        const providersForAgent = providerId
-            ? providers.filter((provider) => provider.id === providerId)
-            : [];
+        const providersForAgent = providerId ? providers.filter((provider) => provider.id === providerId) : [];
         logger.debug(`event: handleMessage invoking inference loop agentId=${this.id}`);
         const inferenceAbortController = new AbortController();
         this.inferenceAbortController = inferenceAbortController;
@@ -417,7 +421,7 @@ export class Agent {
                     connectorRegistry: this.agentSystem.connectorRegistry,
                     inferenceRouter: this.agentSystem.inferenceRouter,
                     toolResolver,
-                    fileStore: this.agentSystem.fileStore,
+                    fileStore: this.files.downloads,
                     authStore: this.agentSystem.authStore,
                     eventBus: this.agentSystem.eventBus,
                     assistant: this.agentSystem.config.current.settings.assistant ?? null,
@@ -428,7 +432,7 @@ export class Agent {
                     verbose: this.agentSystem.config.current.verbose,
                     logger,
                     abortSignal: inferenceAbortController.signal,
-                    appendHistoryRecord: (record) => agentHistoryAppend(this.agentSystem.config.current, this.id, record),
+                    appendHistoryRecord: (record) => agentHistoryAppend(this.agentSystem.storage, this.id, record),
                     notifySubagentFailure: (reason, error) => this.notifySubagentFailure(reason, error)
                 });
             }
@@ -470,16 +474,47 @@ export class Agent {
         }
         this.state.context = { messages: contextForRun.messages };
         this.state.updatedAt = Date.now();
-        await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+        await agentStateWrite(this.agentSystem.storage, this.id, this.state);
         return result.responseText ?? null;
     }
     async handleSystemMessage(item) {
+        let systemText = item.text;
+        if (item.execute) {
+            if (!this.agentSystem.config.current.features.rlm) {
+                logger.debug({ agentId: this.id, origin: item.origin ?? "system" }, "skip: Executable system message skipped because RLM is disabled");
+            }
+            else {
+                const startedAt = Date.now();
+                const runPythonTagCount = tagExtractAll(systemText, "run_python").length;
+                const expandResult = await executablePromptExpand(systemText, {
+                    ...this.rlmRestoreContextBuild(item.origin ?? "system"),
+                    messageContext: item.context ?? {}
+                }, this.agentSystem.toolResolver);
+                if (expandResult.skipTurn) {
+                    logger.info({
+                        agentId: this.id,
+                        origin: item.origin ?? "system",
+                        durationMs: Date.now() - startedAt
+                    }, "event: Executable system message skipped via skip()");
+                    return null;
+                }
+                systemText = expandResult.expanded;
+                const errorTagCount = tagExtractAll(systemText, "exec_error").length;
+                logger.info({
+                    agentId: this.id,
+                    origin: item.origin ?? "system",
+                    runPythonTagCount,
+                    errorTagCount,
+                    durationMs: Date.now() - startedAt
+                }, "event: Executable system message expanded");
+            }
+        }
         const text = item.silent
-            ? messageBuildSystemSilentText(item.text, item.origin)
-            : messageBuildSystemText(item.text, item.origin);
+            ? messageBuildSystemSilentText(systemText, item.origin)
+            : messageBuildSystemText(systemText, item.origin);
         if (item.silent) {
             const receivedAt = Date.now();
-            await agentHistoryAppend(this.agentSystem.config.current, this.id, {
+            await agentHistoryAppend(this.agentSystem.storage, this.id, {
                 type: "user_message",
                 at: receivedAt,
                 text,
@@ -499,7 +534,7 @@ export class Agent {
             }
             this.state.context.messages.push(userMessage);
             this.state.updatedAt = receivedAt;
-            await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+            await agentStateWrite(this.agentSystem.storage, this.id, this.state);
             return null;
         }
         const messageItem = {
@@ -513,9 +548,8 @@ export class Agent {
         const isInternalSignal = item.subscriptionPattern.startsWith("internal.");
         const subscription = isInternalSignal
             ? null
-            : this.agentSystem.signals.subscriptionGet({
-                userId: this.userId,
-                agentId: this.id,
+            : await this.agentSystem.signals.subscriptionGet({
+                ctx: { userId: this.userId, agentId: this.id },
                 pattern: item.subscriptionPattern
             });
         if (!isInternalSignal && !subscription) {
@@ -546,7 +580,7 @@ export class Agent {
             this.state.context = { messages: [] };
         }
         this.state.inferenceSessionId = createId();
-        this.state.activeSessionId = await sessionDbCreate(this.agentSystem.config.current, {
+        this.state.activeSessionId = await this.agentSystem.storage.sessions.create({
             agentId: this.id,
             inferenceSessionId: this.state.inferenceSessionId,
             createdAt: now,
@@ -554,7 +588,7 @@ export class Agent {
         });
         this.state.tokens = null;
         this.state.updatedAt = now;
-        await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+        await agentStateWrite(this.agentSystem.storage, this.id, this.state);
         this.agentSystem.eventBus.emit("agent.reset", {
             agentId: this.id,
             context: item.context ?? {}
@@ -607,7 +641,7 @@ export class Agent {
      */
     async handleEmergencyReset(entry, source) {
         // Estimate token usage before resetting context
-        const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
+        const history = await agentHistoryLoad(this.agentSystem.storage, this.id);
         const estimatedTokens = contextEstimateTokens(history);
         const reset = {
             type: "reset",
@@ -638,13 +672,13 @@ export class Agent {
     }
     async handleRestore(_item) {
         await this.completePendingToolCalls("session_crashed");
-        const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
+        const history = await agentHistoryLoad(this.agentSystem.storage, this.id);
         const historyMessages = await this.buildHistoryContext(history);
         this.state.context = {
             messages: historyMessages
         };
         this.state.updatedAt = Date.now();
-        await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+        await agentStateWrite(this.agentSystem.storage, this.id, this.state);
         this.agentSystem.eventBus.emit("agent.restored", { agentId: this.id });
         return true;
     }
@@ -675,15 +709,13 @@ export class Agent {
                 }
             });
             const summaryMessage = compacted.messages?.[0];
-            const summaryText = summaryMessage
-                ? messageExtractText(summaryMessage)?.trim() ?? ""
-                : "";
+            const summaryText = summaryMessage ? (messageExtractText(summaryMessage)?.trim() ?? "") : "";
             if (!summaryText) {
                 return { ok: false, reason: "empty_summary" };
             }
             const compactionAt = await this.applyCompactionSummary(summaryText);
             this.state.updatedAt = compactionAt;
-            await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+            await agentStateWrite(this.agentSystem.storage, this.id, this.state);
             return { ok: true };
         }
         catch (error) {
@@ -723,21 +755,19 @@ export class Agent {
      * Expects: called before rebuilding context or starting a new inference loop.
      */
     async completePendingToolCalls(reason) {
-        const records = await agentHistoryLoad(this.agentSystem.config.current, this.id);
+        const records = await agentHistoryLoad(this.agentSystem.storage, this.id);
         const pendingRlm = reason === "session_crashed" ? agentHistoryPendingRlmResolve(records) : null;
         const pendingRlmToolCallId = pendingRlm?.start.toolCallId ?? null;
-        const completionRecords = agentHistoryPendingToolResults(records, reason, Date.now()).filter((record) => !(pendingRlmToolCallId &&
-            record.type === "tool_result" &&
-            record.toolCallId === pendingRlmToolCallId));
+        const completionRecords = agentHistoryPendingToolResults(records, reason, Date.now()).filter((record) => !(pendingRlmToolCallId && record.type === "tool_result" && record.toolCallId === pendingRlmToolCallId));
         let completedToolCalls = 0;
         for (const record of completionRecords) {
-            await agentHistoryAppend(this.agentSystem.config.current, this.id, record);
+            await agentHistoryAppend(this.agentSystem.storage, this.id, record);
             records.push(record);
             completedToolCalls += 1;
         }
         if (pendingRlm) {
             const appendRecord = async (record) => {
-                await agentHistoryAppend(this.agentSystem.config.current, this.id, record);
+                await agentHistoryAppend(this.agentSystem.storage, this.id, record);
                 records.push(record);
             };
             const toolCall = pendingRlm.start.toolCallId;
@@ -794,13 +824,13 @@ export class Agent {
             completedToolCalls += 1;
         }
         if (completedToolCalls > 0) {
-            const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
+            const history = await agentHistoryLoad(this.agentSystem.storage, this.id);
             const historyMessages = await this.buildHistoryContext(history);
             this.state.context = {
                 messages: historyMessages
             };
             this.state.updatedAt = Date.now();
-            await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
+            await agentStateWrite(this.agentSystem.storage, this.id, this.state);
             logger.warn({
                 agentId: this.id,
                 reason,
@@ -811,13 +841,13 @@ export class Agent {
     rlmRestoreContextBuild(source) {
         return {
             connectorRegistry: this.agentSystem.connectorRegistry,
-            fileStore: this.agentSystem.fileStore,
+            fileStore: this.files.downloads,
             auth: this.agentSystem.authStore,
             logger,
             assistant: this.agentSystem.config.current.settings.assistant ?? null,
             permissions: this.state.permissions,
             agent: this,
-            agentContext: new AgentContext(this.id, this.userId),
+            ctx: new Context(this.id, this.userId),
             source,
             messageContext: {},
             agentSystem: this.agentSystem,
@@ -868,6 +898,23 @@ export class Agent {
         const task = tasks.find((entry) => entry.taskUid === descriptor.id) ?? null;
         return task?.id ?? null;
     }
+    async messageFilesNormalize(files) {
+        const copied = toFileReferences(files);
+        if (copied.length === 0) {
+            return copied;
+        }
+        const relocated = [];
+        for (const file of copied) {
+            try {
+                relocated.push(await fileStoreCopyIfNeeded(this.files.downloads, this.userHome.downloads, file));
+            }
+            catch (error) {
+                logger.warn({ agentId: this.id, filePath: file.path, error }, "warn: Failed to route file to user home");
+                relocated.push(file);
+            }
+        }
+        return relocated;
+    }
     async listContextTools(toolResolver, source, options) {
         const tools = toolResolver.listTools();
         const noToolsModeEnabled = rlmNoToolsModeIs(this.agentSystem.config.current.features);
@@ -937,15 +984,15 @@ export class Agent {
             ]
         };
         this.state.inferenceSessionId = createId();
-        this.state.activeSessionId = await sessionDbCreate(this.agentSystem.config.current, {
+        this.state.activeSessionId = await this.agentSystem.storage.sessions.create({
             agentId: this.id,
             inferenceSessionId: this.state.inferenceSessionId,
             createdAt: compactionAt,
             resetMessage
         });
         this.state.tokens = null;
-        await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
-        await agentHistoryAppend(this.agentSystem.config.current, this.id, {
+        await agentStateWrite(this.agentSystem.storage, this.id, this.state);
+        await agentHistoryAppend(this.agentSystem.storage, this.id, {
             type: "user_message",
             at: compactionAt,
             text: summaryWithContinue,
@@ -957,6 +1004,25 @@ export class Agent {
 function isChannelSignalType(type) {
     return type.startsWith("channel.") && type.endsWith(":message");
 }
+async function fileStoreCopyIfNeeded(fileStore, targetDir, file) {
+    const resolvedPath = path.resolve(file.path);
+    const normalizedTarget = path.resolve(targetDir);
+    if (resolvedPath === normalizedTarget || resolvedPath.startsWith(`${normalizedTarget}${path.sep}`)) {
+        return file;
+    }
+    const stored = await fileStore.saveFromPath({
+        name: file.name,
+        mimeType: file.mimeType,
+        path: resolvedPath
+    });
+    return {
+        id: stored.id,
+        name: stored.name,
+        path: stored.path,
+        mimeType: stored.mimeType,
+        size: stored.size
+    };
+}
 function toFileReferences(files) {
     return files.map((file) => ({
         id: file.id,