@caupulican/pi-adaptative 0.80.55 → 0.80.58

package/dist/core/agent-session.js

@@ -31,6 +31,8 @@ import { createCoreDiagnosticsToolDefinitions } from "./extensions/builtin.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { disposeExtensionEventSubscriptions } from "./extensions/loader.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
+import { MemoryManager } from "./memory/memory-manager.js";
+import { FileStoreProvider } from "./memory/providers/file-store.js";
 import { compactToolResultDetailsForRetention } from "./message-retention.js";
 import { resolveProfileModelSettings } from "./model-resolver.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
@@ -57,6 +59,8 @@ export function parseSkillBlock(text) {
         userMessage: match[4]?.trim() || undefined,
     };
 }
+/** customType for spawned-usage roll-up entries (Cost Aggregation, Model A). */
+export const SPAWNED_USAGE_CUSTOM_TYPE = "spawned_usage";
 // ============================================================================
 // Constants
 // ============================================================================
@@ -112,6 +116,11 @@ export class AgentSession {
     _toolProfileFilter;
     _isExplicitModel;
     _isExplicitThinking;
+    /** Plug-and-play memory subsystem. Recreated on each (re)initialize so reload is safe. */
+    _memoryManager = new MemoryManager();
+    _isChildSession;
+    /** Memory providers registered by extensions via pi.registerMemoryProvider, applied on (re)init. */
+    _pendingMemoryProviders = [];
     _baseToolsOverride;
     _sessionStartEvent;
     _extensionUIContext;
@@ -150,6 +159,7 @@ export class AgentSession {
             : undefined;
         this._isExplicitModel = config.isExplicitModel ?? false;
         this._isExplicitThinking = config.isExplicitThinking ?? false;
+        this._isChildSession = config.isChildSession ?? process.env.PI_CHILD_SESSION === "1";
         this._baseToolsOverride = config.baseToolsOverride;
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         // Always subscribe to agent events for internal handling
@@ -651,6 +661,9 @@ export class AgentSession {
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
+        // Best-effort memory cleanup (release locks/handles). Write-side onSessionEnd is wired on a
+        // true session-end hook (P3); file-store shutdown is a no-op.
+        void this._memoryManager.shutdownAll().catch(() => { });
         cleanupSessionResources(this.sessionId);
     }
     // =========================================================================
@@ -867,6 +880,8 @@ export class AgentSession {
         const appendSystemPromptParts = [
             this._buildSelfModificationPrompt(),
             this._buildAutonomyPrompt(),
+            // Memory subsystem: static, frozen-per-session block (e.g. file-store MEMORY.md/USER.md).
+            this._memoryManager.buildSystemPromptBlock() || undefined,
             ...loaderAppendSystemPrompt,
         ].filter((part) => Boolean(part));
         const appendSystemPrompt = appendSystemPromptParts.length > 0 ? appendSystemPromptParts.join("\n\n") : undefined;
@@ -1938,6 +1953,8 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         await this._extensionRunner.emit(this._sessionStartEvent);
         await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
+        // Initialize the memory subsystem after extensions have had a chance to register providers.
+        await this._initializeMemory();
     }
     async extendResourcesFromExtensions(reason) {
         if (!this._extensionRunner.hasHandlers("resources_discover")) {
@@ -2066,6 +2083,10 @@ export class AgentSession {
             getThinkingLevel: () => this.thinkingLevel,
             setThinkingLevel: (level) => this.setThinkingLevel(level),
             getExternalResourceRoots: () => this.settingsManager.getEffectiveExternalResourceRoots(),
+            registerMemoryProvider: (provider) => this.registerMemoryProvider(provider),
+            reportSpawnedUsage: (usage, opts) => {
+                this.addSpawnedUsage(usage, opts);
+            },
         }, {
             getModel: () => this.model,
             isIdle: () => !this.isStreaming,
@@ -2163,6 +2184,47 @@ export class AgentSession {
             this.setThinkingLevel(profileSettings.thinkingLevel);
         }
     }
+    /**
+     * (Re)build the memory subsystem: a fresh MemoryManager (reload-safe), register the bundled
+     * file-store + any extension-contributed providers, initialize, then surface the memory tools and
+     * the frozen system-prompt block. Best-effort: never throws into the session lifecycle.
+     */
+    async _initializeMemory() {
+        try {
+            // Release the previous generation's providers (locks/handles) before recreating, so a
+            // reload does not orphan the old MemoryManager. No-op on first init / for file-store.
+            await this._memoryManager.shutdownAll().catch(() => { });
+            const manager = new MemoryManager();
+            manager.registerProvider(new FileStoreProvider());
+            for (const provider of this._pendingMemoryProviders) {
+                try {
+                    manager.registerProvider(provider);
+                }
+                catch {
+                    // Duplicate name or reserved-tool collision — skip this provider, keep the rest.
+                }
+            }
+            this._memoryManager = manager;
+            await manager.initializeAll(this.sessionManager.getSessionId(), {
+                agentDir: this._agentDir,
+                cwd: this._cwd,
+                isChildSession: this._isChildSession,
+            });
+            // Surface memory tools + the frozen memory block now that providers are initialized.
+            // _refreshToolRegistry() ends in setActiveToolsByName(), which rebuilds AND assigns the
+            // system prompt (including the memory block), so no explicit _rebuildSystemPrompt is needed.
+            this._refreshToolRegistry();
+        }
+        catch (error) {
+            console.error("Memory subsystem init failed:", error instanceof Error ? error.message : String(error));
+        }
+    }
+    /** Register a memory provider contributed by an extension; applied on the next memory (re)init. */
+    registerMemoryProvider(provider) {
+        if (!this._pendingMemoryProviders.some((p) => p.name === provider.name)) {
+            this._pendingMemoryProviders.push(provider);
+        }
+    }
     _refreshToolRegistry(options) {
         const previousRegistryNames = new Set(this._toolRegistry.keys());
         const previousActiveToolNames = this.getActiveToolNames();
@@ -2190,6 +2252,11 @@ export class AgentSession {
                 definition,
                 sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" }),
             })),
+            // Memory subsystem provider tools (e.g. file-store's `memory` tool).
+            ...this._memoryManager.getToolDefinitions().map((definition) => ({
+                definition,
+                sourceInfo: createSyntheticSourceInfo(`<memory:${definition.name}>`, { source: "sdk" }),
+            })),
         ].filter((tool) => isAllowedTool(tool.definition.name));
         const definitionRegistry = new Map(Array.from(this._baseToolDefinitions.entries())
             .filter(([name]) => isAllowedTool(name))
@@ -2381,6 +2448,8 @@ export class AgentSession {
             });
             try {
                 this._doctorReloadRuntime();
+                // Reload starts memory providers fresh; loaded extensions re-register below.
+                this._pendingMemoryProviders = [];
                 const hasBindings = this._extensionUIContext ||
                     this._extensionCommandContextActions ||
                     this._extensionShutdownHandler ||
@@ -2400,6 +2469,8 @@ export class AgentSession {
             await emitSessionShutdownEvent(previousRunner, { type: "session_shutdown", reason: "reload" });
             previousRunner.invalidate();
             this._resourceLoader.commitReload?.();
+            // Re-derive the memory subsystem from the reloaded settings/providers.
+            await this._initializeMemory();
         }
         catch (error) {
             if (newRunner && newRunner !== previousRunner) {
@@ -3023,6 +3094,116 @@ export class AgentSession {
             contextUsage: this.getContextUsage(),
         };
     }
+    /**
+     * Cumulative usage (full breakdown) for this session's entire spawn subtree: its own
+     * assistant messages PLUS every `spawned_usage` report it has rolled up. Single source of
+     * truth for "how much did this session and everything it spawned spend" — used by print-mode
+     * to emit a child's total so a spawner can roll it up via {@link addSpawnedUsage}.
+     *
+     * Including the `spawned_usage` reports is what keeps the single-hop invariant intact: a child
+     * that itself spawned grandchildren must report own + sub-usage in one number, or the parent
+     * silently under-counts the grandchildren.
+     */
+    getCumulativeUsage() {
+        let input = 0;
+        let output = 0;
+        let cacheRead = 0;
+        let cacheWrite = 0;
+        let totalTokens = 0;
+        let costInput = 0;
+        let costOutput = 0;
+        let costCacheRead = 0;
+        let costCacheWrite = 0;
+        let costTotal = 0;
+        const add = (usage) => {
+            input += usage.input;
+            output += usage.output;
+            cacheRead += usage.cacheRead;
+            cacheWrite += usage.cacheWrite;
+            totalTokens += usage.totalTokens;
+            costInput += usage.cost.input;
+            costOutput += usage.cost.output;
+            costCacheRead += usage.cost.cacheRead;
+            costCacheWrite += usage.cost.cacheWrite;
+            costTotal += usage.cost.total;
+        };
+        for (const message of this.state.messages) {
+            if (message.role !== "assistant")
+                continue;
+            const usage = message.usage;
+            if (!usage)
+                continue;
+            add(usage);
+        }
+        // Roll up usage this session attributed to its own spawned children (single-hop).
+        for (const entry of this.sessionManager.getEntries()) {
+            if (entry.type !== "custom" || entry.customType !== SPAWNED_USAGE_CUSTOM_TYPE)
+                continue;
+            const data = entry.data;
+            if (data?.usage)
+                add(data.usage);
+        }
+        return {
+            input,
+            output,
+            cacheRead,
+            cacheWrite,
+            totalTokens,
+            cost: {
+                input: costInput,
+                output: costOutput,
+                cacheRead: costCacheRead,
+                cacheWrite: costCacheWrite,
+                total: costTotal,
+            },
+        };
+    }
+    /**
+     * Record usage spent by a spawned/subagent session so the footer can roll it into the
+     * displayed cost. Persisted as a `CustomEntry` (`customType: "spawned_usage"`, Model A) so
+     * it survives reload and is reconstructed exactly like main usage; a new/forked session
+     * starts fresh because it owns a new log file.
+     *
+     * Idempotent on `opts.reportId`: a re-report (retry, duplicate `agent_end`) with a
+     * previously-seen id is ignored, so cost cannot be double-counted. Honors the single-hop
+     * invariant documented on {@link SpawnedUsageReport}.
+     *
+     * @returns the id of the appended entry, or `undefined` if the report was a duplicate.
+     */
+    addSpawnedUsage(usage, opts) {
+        const reportId = opts?.reportId;
+        if (reportId) {
+            for (const entry of this.sessionManager.getEntries()) {
+                if (entry.type === "custom" &&
+                    entry.customType === SPAWNED_USAGE_CUSTOM_TYPE &&
+                    entry.data?.reportId === reportId) {
+                    return undefined;
+                }
+            }
+        }
+        const report = {
+            usage,
+            label: opts?.label,
+            sourceSessionId: opts?.sourceSessionId,
+            reportId,
+        };
+        return this.sessionManager.appendCustomEntry(SPAWNED_USAGE_CUSTOM_TYPE, report);
+    }
+    /** Aggregate all recorded spawned-usage reports (see {@link addSpawnedUsage}). */
+    getSpawnedUsage() {
+        let cost = 0;
+        let reports = 0;
+        for (const entry of this.sessionManager.getEntries()) {
+            if (entry.type !== "custom" || entry.customType !== SPAWNED_USAGE_CUSTOM_TYPE)
+                continue;
+            const data = entry.data;
+            if (!data?.usage)
+                continue;
+            cost += data.usage.cost.total;
+            reports += 1;
+        }
+        return { cost, reports };
+    }
     getContextUsage() {
         const model = this.model;
         if (!model)