@dyyz1993/pi-coding-agent 0.70.2 → 0.70.4

package/dist/core/agent-session.js

@@ -1656,6 +1656,7 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         await this._extensionRunner.emit(this._sessionStartEvent);
         await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
+        await this._initMcpServers();
     }
     async extendResourcesFromExtensions(reason) {
         if (!this._extensionRunner.hasHandlers("resources_discover")) {
@@ -1697,6 +1698,48 @@ export class AgentSession {
         const name = base.replace(/\.(ts|js)$/, "");
         return `extension:${name}`;
     }
+    _mcpManager;
+    _createMcpToolDef;
+    async _initMcpServers() {
+        const settings = this.settingsManager.getProjectSettings();
+        const servers = settings?.mcp?.servers;
+        if (!servers || Object.keys(servers).length === 0)
+            return;
+        const { McpManager } = await import("./mcp/mcp-manager.js");
+        const { createMcpToolDefinition } = await import("./mcp/tool-converter.js");
+        this._createMcpToolDef = createMcpToolDefinition;
+        const mcpOptions = settings?.mcp?.options;
+        const manager = new McpManager({
+            ...mcpOptions,
+            onConnectionChange: () => {
+                this._syncMcpTools();
+            },
+        });
+        this._mcpManager = manager;
+        try {
+            await manager.connectAll(servers);
+            this._syncMcpTools();
+        }
+        catch (e) {
+            console.error("[mcp] Failed to initialize:", e);
+        }
+        this.sessionSignal.addEventListener("abort", () => {
+            this._mcpManager?.dispose().catch(() => { });
+            this._mcpManager = undefined;
+        });
+    }
+    _syncMcpTools() {
+        this._customTools = this._customTools.filter((t) => !t.name.startsWith("mcp__"));
+        if (!this._createMcpToolDef || !this._mcpManager)
+            return;
+        const tools = this._mcpManager.getAllTools();
+        for (const tool of tools) {
+            this._customTools.push(this._createMcpToolDef(tool, this._mcpManager));
+        }
+        if (tools.length > 0) {
+            this._refreshToolRegistry();
+        }
+    }
     _applyExtensionBindings(runner) {
         runner.setUIContext(this._extensionUIContext);
         runner.bindCommandContext(this._extensionCommandContextActions);
@@ -2757,15 +2800,10 @@ export class AgentSession {
         const contextWindow = model.contextWindow ?? 0;
         if (contextWindow <= 0)
             return undefined;
-        // After compaction, the last assistant usage reflects pre-compaction context size.
-        // We can only trust usage from an assistant that responded after the latest compaction.
-        // If no such assistant exists, context token count is unknown until the next LLM response.
         const branchEntries = this.sessionManager.getBranch();
         const latestCompaction = getLatestCompactionEntry(branchEntries);
         if (latestCompaction) {
-            // Check if there's a valid assistant usage after the compaction boundary
             const compactionIndex = branchEntries.lastIndexOf(latestCompaction);
-            let hasPostCompactionUsage = false;
             for (let i = branchEntries.length - 1; i > compactionIndex; i--) {
                 const entry = branchEntries[i];
                 if (entry.type === "message" && entry.message.role === "assistant") {
@@ -2773,18 +2811,16 @@ export class AgentSession {
                     if (assistant.stopReason !== "aborted" && assistant.stopReason !== "error") {
                         const contextTokens = calculateContextTokens(assistant.usage);
                         if (contextTokens > 0) {
-                            hasPostCompactionUsage = true;
+                            const percent = (contextTokens / contextWindow) * 100;
+                            return { tokens: contextTokens, contextWindow, percent };
                         }
-                        break;
                     }
+                    break;
                 }
             }
-            if (!hasPostCompactionUsage) {
-                return { tokens: null, contextWindow, percent: null };
-            }
         }
         const estimate = estimateContextTokens(this.messages);
-        const percent = (estimate.tokens / contextWindow) * 100;
+        const percent = contextWindow > 0 ? (estimate.tokens / contextWindow) * 100 : 0;
         return {
             tokens: estimate.tokens,
             contextWindow,