borderless-agent 0.0.1-alpha.3 → 0.0.1-alpha.5

package/dist/agentBuilder.d.ts

@@ -46,6 +46,16 @@ export declare class AgentBuilder {
     setMaxToolRounds(max: number): this;
     /** Set approval callback for mutating tools. */
     setApprovalCallback(cb: (toolName: string, args: Record<string, any>) => Promise<boolean> | boolean): this;
+    /**
+     * Set callback for human-in-the-loop interaction.
+     * When the agent needs clarification or input from the user mid-task,
+     * it calls the `ask_user` tool which invokes this callback.
+     */
+    setHumanInputCallback(cb: (question: string) => Promise<string> | string): this;
+    /** Add an MCP server to connect to when the agent is built. */
+    addMCPServer(config: import('./mcpClient').MCPServerConfig): this;
+    /** Add multiple MCP servers at once. */
+    addMCPServers(configs: import('./mcpClient').MCPServerConfig[]): this;
     /** Configure the execution sandbox (file guards, command filtering, resource limits). */
     setSandbox(config: SandboxConfig): this;
     /** Validate config and build the agent instance. */

package/dist/agentBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentBuilder.d.ts","sourceRoot":"","sources":["../src/agentBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EACH,cAAc,EACd,eAAe,EAEf,SAAS,EACT,aAAa,EAChB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,YAAY;IACrB,OAAO,CAAC,OAAO,CAQb;IAIF,uEAAuE;IACvE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAK/B,sDAAsD;IACtD,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;IAO3C,iDAAiD;IACjD,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOrC,sCAAsC;IACtC,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAMnC,+CAA+C;IAC/C,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI;IAMvC,gFAAgF;IAChF,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO9C,0BAA0B;IAC1B,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAMtC,mCAAmC;IACnC,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI;IAQ1C,iCAAiC;IACjC,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOvC,qDAAqD;IACrD,YAAY,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK1C,6CAA6C;IAC7C,eAAe,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK7C,qEAAqE;IACrE,aAAa,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK3C,+CAA+C;IAC/C,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKnC,gDAAgD;IAChD,mBAAmB,CACf,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,GAChF,IAAI;IAOP,yFAAyF;IACzF,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOvC,oDAAoD;IACpD,KAAK,IAAI,aAAa;CAmBzB"}
+{"version":3,"file":"agentBuilder.d.ts","sourceRoot":"","sources":["../src/agentBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EACH,cAAc,EACd,eAAe,EAEf,SAAS,EACT,aAAa,EAChB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,YAAY;IACrB,OAAO,CAAC,OAAO,CAQb;IAIF,uEAAuE;IACvE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAK/B,sDAAsD;IACtD,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;IAO3C,iDAAiD;IACjD,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOrC,sCAAsC;IACtC,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAMnC,+CAA+C;IAC/C,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI;IAMvC,gFAAgF;IAChF,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO9C,0BAA0B;IAC1B,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAMtC,mCAAmC;IACnC,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI;IAQ1C,iCAAiC;IACjC,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOvC,qDAAqD;IACrD,YAAY,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK1C,6CAA6C;IAC7C,eAAe,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK7C,qEAAqE;IACrE,aAAa,CAAC,MAAM,GAAE,OAAc,GAAG,IAAI;IAK3C,+CAA+C;IAC/C,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKnC,gDAAgD;IAChD,mBAAmB,CACf,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,GAChF,IAAI;IAKP;;;;OAIG;IACH,qBAAqB,CACjB,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,GACnD,IAAI;IAOP,+DAA+D;IAC/D,YAAY,CAAC,MAAM,EAAE,OAAO,aAAa,EAAE,eAAe,GAAG,IAAI;IAMjE,wCAAwC;IACxC,aAAa,CAAC,OAAO,EAAE,OAAO,aAAa,EAAE,eAAe,EAAE,GAAG,IAAI;IAQrE,yFAAyF;IACzF,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAOvC,oDAAoD;IACpD,KAAK,IAAI,aAAa;CAmBzB"}

package/dist/agentBuilder.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * agentBuilder.ts — Fluent builder for creating portable agent instances.
  *
@@ -13,11 +12,9 @@
  *   .build();
  * ```
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentBuilder = void 0;
-const llmProtocol_1 = require("./llmProtocol");
-const agentInstance_1 = require("./agentInstance");
-class AgentBuilder {
+import { OpenAIProvider } from './llmProtocol';
+import { AgentInstance } from './agentInstance';
+export class AgentBuilder {
     _config = {
         includeBuiltinTools: true,
         enableMemory: false,
@@ -107,6 +104,28 @@ class AgentBuilder {
         this._config.approvalCallback = cb;
         return this;
     }
+    /**
+     * Set callback for human-in-the-loop interaction.
+     * When the agent needs clarification or input from the user mid-task,
+     * it calls the `ask_user` tool which invokes this callback.
+     */
+    setHumanInputCallback(cb) {
+        this._config.humanInputCallback = cb;
+        return this;
+    }
+    // ---- MCP ----
+    /** Add an MCP server to connect to when the agent is built. */
+    addMCPServer(config) {
+        this._config.mcpServers = this._config.mcpServers ?? [];
+        this._config.mcpServers.push(config);
+        return this;
+    }
+    /** Add multiple MCP servers at once. */
+    addMCPServers(configs) {
+        this._config.mcpServers = this._config.mcpServers ?? [];
+        this._config.mcpServers.push(...configs);
+        return this;
+    }
     // ---- Sandbox ----
     /** Configure the execution sandbox (file guards, command filtering, resource limits). */
     setSandbox(config) {
@@ -122,15 +141,14 @@ class AgentBuilder {
             if (!cfg?.apiKey) {
                 throw new Error('AgentBuilder: must call .setLLM({ apiKey }) or .setLLMProvider() before .build()');
             }
-            this._config.llm = new llmProtocol_1.OpenAIProvider({
+            this._config.llm = new OpenAIProvider({
                 apiKey: cfg.apiKey,
                 model: cfg.model ?? 'gpt-4o',
                 baseUrl: cfg.baseUrl,
                 timeout: cfg.timeout ?? 120,
             });
         }
-        return new agentInstance_1.AgentInstance({ ...this._config });
+        return new AgentInstance({ ...this._config });
     }
 }
-exports.AgentBuilder = AgentBuilder;
 //# sourceMappingURL=agentBuilder.js.map

package/dist/agentBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentBuilder.js","sourceRoot":"","sources":["../src/agentBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentBuilder.js","sourceRoot":"","sources":["../src/agentBuilder.ts"],"names":[],"mappings":"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"}

package/dist/agentInstance.d.ts

@@ -19,8 +19,18 @@ export declare class AgentInstance {
     private _streamingEnabled;
     private _contextEnabled;
     private _approvalCallback?;
+    private _humanInputCallback?;
     private _sandbox;
+    private _mcpManager;
+    private _mcpConfigs;
+    private _mcpInitialized;
+    private _mcpInitPromise;
     constructor(config: AgentConfig);
+    /**
+     * Initialize MCP server connections. Called lazily on first chat/stream,
+     * or can be called explicitly for eager initialization.
+     */
+    initMCP(): Promise<void>;
     /** Send a single message (no session, stateless). */
     chat(message: string, history?: Record<string, any>[]): Promise<ChatResult>;
     /** Stream a single message (no session, stateless). */
@@ -44,10 +54,17 @@ export declare class AgentInstance {
      * until self-evaluation meets the quality threshold or max iterations.
      */
     runTask(config: AutonomousTaskConfig): Promise<AutonomousTaskResult>;
+    /**
+     * Gracefully shut down MCP server connections.
+     * Call this when the agent is no longer needed to release resources.
+     */
+    close(): Promise<void>;
     private _wrapSession;
+    private _buildAskUserTool;
     private _executeTool;
     private _buildSystemForTurn;
     private _runLoop;
     private _runLoopStream;
+    private _llmCallWithRetry;
 }
 //# sourceMappingURL=agentInstance.d.ts.map

package/dist/agentInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentInstance.d.ts","sourceRoot":"","sources":["../src/agentInstance.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACH,WAAW,EACX,cAAc,EAEd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AA+MnE,qBAAa,aAAa;IACtB,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,iBAAiB,CAAC,CAGM;IAChC,OAAO,CAAC,QAAQ,CAAU;gBAEd,MAAM,EAAE,WAAW;IA2D/B,qDAAqD;IAC/C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAMjF,uDAAuD;IAChD,MAAM,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAChC,cAAc,CAAC,WAAW,CAAC;IAK9B,wEAAwE;IAClE,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;IAK5C,gDAAgD;IAC1C,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAMrE,8BAA8B;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvC,oCAAoC;IAC9B,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IAI1E,uCAAuC;IACvC,IAAI,GAAG,IAAI,WAAW,CAErB;IAED,wCAAwC;IACxC,IAAI,KAAK,IAAI,cAAc,EAAE,CAE5B;IAED;;;;;OAKG;IACG,OAAO,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAO1E,OAAO,CAAC,YAAY;YAgCN,YAAY;YAqCZ,mBAAmB;YAenB,QAAQ;YAwGP,cAAc;CAiHhC"}
+{"version":3,"file":"agentInstance.d.ts","sourceRoot":"","sources":["../src/agentInstance.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACH,WAAW,EACX,cAAc,EAEd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAgNnE,qBAAa,aAAa;IACtB,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,iBAAiB,CAAC,CAGM;IAChC,OAAO,CAAC,mBAAmB,CAAC,CAAiD;IAC7E,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAA8B;gBAEzC,MAAM,EAAE,WAAW;IAgE/B;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC9B,qDAAqD;IAC/C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAMjF,uDAAuD;IAChD,MAAM,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAChC,cAAc,CAAC,WAAW,CAAC;IAK9B,wEAAwE;IAClE,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC;IAK5C,gDAAgD;IAC1C,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAMrE,8BAA8B;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvC,oCAAoC;IAC9B,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IAI1E,uCAAuC;IACvC,IAAI,GAAG,IAAI,WAAW,CAErB;IAED,wCAAwC;IACxC,IAAI,KAAK,IAAI,cAAc,EAAE,CAE5B;IAED;;;;;OAKG;IACG,OAAO,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAK1E;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,YAAY;IAoCpB,OAAO,CAAC,iBAAiB;YAiCX,YAAY;YA8CZ,mBAAmB;YAmBnB,QAAQ;YAgIP,cAAc;YAmJf,iBAAiB;CAwBlC"}

package/dist/agentInstance.js

@@ -1,18 +1,16 @@
-"use strict";
 /**
  * agentInstance.ts — Runtime agent returned by AgentBuilder.build().
  *
  * Provides: chat(), stream(), createSession(), restoreSession().
  * All internal modules are wired through dependency injection — no globals.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentInstance = void 0;
-const autonomousLoop_1 = require("./autonomousLoop");
-const sessionCore_1 = require("./sessionCore");
-const contextCore_1 = require("./contextCore");
-const memoryCore_1 = require("./memoryCore");
-const fileBackend_1 = require("./storage/fileBackend");
-const sandbox_1 = require("./sandbox");
+import { AutonomousLoop } from './autonomousLoop';
+import { SessionManager } from './sessionCore';
+import { getBudget, selectHistory, assembleSystem, sanitizeUserInput, foldObservation } from './contextCore';
+import { retrieve, consolidateTurn, setMemoryStore } from './memoryCore';
+import { createFileBackend } from './storage/fileBackend';
+import { Sandbox } from './sandbox';
+import { MCPManager } from './mcpClient';
 // ---------------------------------------------------------------------------
 // Internal helpers
 // ---------------------------------------------------------------------------
@@ -180,7 +178,7 @@ function toolCallsToMsgShape(toolCalls) {
 // ---------------------------------------------------------------------------
 // AgentInstance
 // ---------------------------------------------------------------------------
-class AgentInstance {
+export class AgentInstance {
     _llm;
     _systemPrompt;
     _tools;
@@ -193,15 +191,21 @@ class AgentInstance {
     _streamingEnabled;
     _contextEnabled;
     _approvalCallback;
+    _humanInputCallback;
     _sandbox;
+    _mcpManager = null;
+    _mcpConfigs;
+    _mcpInitialized = false;
+    _mcpInitPromise = null;
     constructor(config) {
         this._llm = config.llm;
         this._maxToolRounds = config.maxToolRounds ?? 20;
-        this._sandbox = new sandbox_1.Sandbox(config.sandbox);
+        this._sandbox = new Sandbox(config.sandbox);
         this._memoryEnabled = config.enableMemory ?? false;
         this._streamingEnabled = config.enableStreaming ?? false;
         this._contextEnabled = config.enableContext ?? true;
         this._approvalCallback = config.approvalCallback;
+        this._humanInputCallback = config.humanInputCallback;
         // Assemble tools
         this._tools = [];
         if (config.includeBuiltinTools !== false) {
@@ -215,6 +219,8 @@ class AgentInstance {
         const skillTool = buildSkillTool(this._skills);
         if (skillTool)
             this._tools.push(skillTool);
+        // Human-in-the-loop tool
+        this._tools.push(this._buildAskUserTool());
         // Build lookup and OpenAI format
         this._toolMap = new Map(this._tools.map((t) => [t.name, t]));
         this._openaiTools = toolDefsToOpenAI(this._tools);
@@ -238,15 +244,51 @@ class AgentInstance {
                 storage = createCloudBackend();
             }
             else if (config.storage.backend === 'file') {
-                storage = (0, fileBackend_1.createFileBackend)({ sessionDir: config.storage.dir });
+                storage = createFileBackend({ sessionDir: config.storage.dir });
             }
         }
-        this._sessionMgr = new sessionCore_1.SessionManager({
+        this._sessionMgr = new SessionManager({
             store: storage?.sessionStore ?? undefined,
         });
         if (storage?.memoryStore && this._memoryEnabled) {
-            (0, memoryCore_1.setMemoryStore)(storage.memoryStore);
+            setMemoryStore(storage.memoryStore);
         }
+        // MCP servers (connected lazily since connect is async)
+        this._mcpConfigs = config.mcpServers ?? [];
+    }
+    /**
+     * Initialize MCP server connections. Called lazily on first chat/stream,
+     * or can be called explicitly for eager initialization.
+     */
+    async initMCP() {
+        if (this._mcpInitialized || !this._mcpConfigs.length)
+            return;
+        if (this._mcpInitPromise)
+            return this._mcpInitPromise;
+        this._mcpInitPromise = (async () => {
+            try {
+                this._mcpManager = new MCPManager();
+                await this._mcpManager.connect(this._mcpConfigs);
+                // Merge MCP tools into the agent's tool list
+                const mcpToolDefs = this._mcpManager.getToolDefinitions();
+                for (const mcpTool of mcpToolDefs) {
+                    this._openaiTools.push({
+                        type: 'function',
+                        function: {
+                            name: mcpTool.name,
+                            description: mcpTool.description,
+                            parameters: mcpTool.input_schema,
+                        },
+                    });
+                }
+            }
+            catch (e) {
+                console.error('[AgentInstance] MCP connection failed, continuing without MCP tools:', e.message ?? e);
+                this._mcpManager = null;
+            }
+            this._mcpInitialized = true;
+        })();
+        return this._mcpInitPromise;
     }
     // ---- Public API ----
     /** Send a single message (no session, stateless). */
@@ -295,9 +337,21 @@ class AgentInstance {
      * until self-evaluation meets the quality threshold or max iterations.
      */
     async runTask(config) {
-        const loop = new autonomousLoop_1.AutonomousLoop(this);
+        const loop = new AutonomousLoop(this);
         return loop.run(config);
     }
+    /**
+     * Gracefully shut down MCP server connections.
+     * Call this when the agent is no longer needed to release resources.
+     */
+    async close() {
+        if (this._mcpManager) {
+            await this._mcpManager.close();
+            this._mcpManager = null;
+            this._mcpInitialized = false;
+            this._mcpInitPromise = null;
+        }
+    }
     // ---- Session wrapper ----
     _wrapSession(session) {
         const self = this;
@@ -309,7 +363,12 @@ class AgentInstance {
                 const result = await self._runLoop(message, session.history);
                 session.history = result.history;
                 session.updatedAt = Date.now() / 1000;
-                await self._sessionMgr.saveSession(session);
+                try {
+                    await self._sessionMgr.saveSession(session);
+                }
+                catch (e) {
+                    console.error('[AgentInstance] Failed to save session:', e.message ?? e);
+                }
                 return { ...result, sessionId: session.id };
             },
             async *stream(message) {
@@ -328,8 +387,48 @@ class AgentInstance {
             },
         };
     }
+    // ---- Human-in-the-loop ----
+    _buildAskUserTool() {
+        const self = this;
+        return {
+            name: 'ask_user',
+            description: 'Ask the user a question and wait for their response. ' +
+                'Use this when you need clarification, additional information, ' +
+                'confirmation on an important decision, or when the task is ambiguous. ' +
+                'Do NOT use this for trivial questions you can resolve yourself.',
+            parameters: {
+                question: {
+                    type: 'string',
+                    description: 'The question to ask the user',
+                },
+            },
+            required: ['question'],
+            execute: async (args) => {
+                const question = args.question ?? '';
+                if (!self._humanInputCallback) {
+                    return '[Human input not available] No humanInputCallback is configured. Proceed with your best judgment.';
+                }
+                try {
+                    const answer = await self._humanInputCallback(question);
+                    return answer || '(User provided no response)';
+                }
+                catch (e) {
+                    return `[Human input error] ${e.message ?? String(e)}`;
+                }
+            },
+        };
+    }
     // ---- Internal agent loop ----
     async _executeTool(name, args) {
+        // Route MCP tools to MCPManager
+        if (this._mcpManager?.isMCPTool(name)) {
+            try {
+                return await this._mcpManager.callTool(name, args);
+            }
+            catch (e) {
+                return `[MCP tool error] ${name}: ${e.message ?? String(e)}`;
+            }
+        }
         const tool = this._toolMap.get(name);
         if (!tool)
             return `Unknown tool: ${name}`;
@@ -366,23 +465,33 @@ class AgentInstance {
             return this._systemPrompt;
         let ragLines;
         if (this._memoryEnabled) {
-            const memories = await (0, memoryCore_1.retrieve)(userInput, 5);
-            ragLines = memories.map((m) => m[0]).filter(Boolean);
+            try {
+                const memories = await retrieve(userInput, 5);
+                ragLines = memories.map((m) => m[0]).filter(Boolean);
+            }
+            catch (e) {
+                console.error('[AgentInstance] Memory retrieval failed, continuing without memories:', e.message ?? e);
+            }
         }
-        return (0, contextCore_1.assembleSystem)({
+        return assembleSystem({
             baseSystem: this._systemPrompt,
             ragLines: ragLines?.length ? ragLines : undefined,
         });
     }
     async _runLoop(userInput, history) {
-        const sanitized = (0, contextCore_1.sanitizeUserInput)(userInput);
+        await this.initMCP();
+        const sanitized = sanitizeUserInput(userInput);
         const message = sanitized.text;
         const system = await this._buildSystemForTurn(message);
         // Trim history if context management enabled
         let workingHistory = [...history];
         if (this._contextEnabled) {
-            const budget = (0, contextCore_1.getBudget)();
-            workingHistory = (0, contextCore_1.selectHistory)(workingHistory, message, budget.history);
+            const budget = getBudget();
+            const selected = selectHistory(workingHistory, message, budget.history);
+            // #16: guarantee at least last 2 messages if history exists
+            workingHistory = selected.length > 0 ? selected
+                : workingHistory.length >= 2 ? workingHistory.slice(-2)
+                    : [...workingHistory];
         }
         workingHistory.push({ role: 'user', content: message });
         const apiMessages = [
@@ -392,21 +501,37 @@ class AgentInstance {
         let toolRounds = 0;
         let hadToolCalls = false;
         while (true) {
-            const response = (await this._llm.chat(apiMessages, {
-                tools: this._openaiTools,
-                maxTokens: 8000,
-                stream: false,
-            }));
+            // #1: LLM call with retry
+            let response;
+            try {
+                response = await this._llmCallWithRetry(apiMessages, false);
+            }
+            catch (e) {
+                const errMsg = `I encountered an error communicating with the AI model: ${e.message ?? String(e)}. Please try again.`;
+                workingHistory.push({ role: 'assistant', content: errMsg });
+                history.length = 0;
+                history.push(...workingHistory);
+                return { reply: errMsg, history: workingHistory, hadToolCalls };
+            }
             const tcs = response.toolCalls?.length
                 ? toolCallsToMsgShape(response.toolCalls)
                 : [];
             const content = response.content ?? '';
+            const thinking = response.thinking ?? null;
             if (!tcs.length) {
-                workingHistory.push({ role: 'assistant', content: content.trim() });
+                const assistantMsg = { role: 'assistant', content: content.trim() };
+                if (thinking)
+                    assistantMsg.thinking = thinking;
+                workingHistory.push(assistantMsg);
+                // #8: memory consolidation failure handling
                 if (this._memoryEnabled) {
-                    await (0, memoryCore_1.consolidateTurn)(message, content.trim());
+                    try {
+                        await consolidateTurn(message, content.trim());
+                    }
+                    catch (e) {
+                        console.error('[AgentInstance] consolidateTurn failed:', e.message ?? e);
+                    }
                 }
-                // Sync back
                 history.length = 0;
                 history.push(...workingHistory);
                 return {
@@ -432,25 +557,36 @@ class AgentInstance {
                     args = JSON.parse(tc.function.arguments || '{}');
                 }
                 catch {
-                    args = {};
+                    // #15: inform LLM about parse failure instead of silent {}
+                    results.push({
+                        tool_call_id: tc.id,
+                        content: `[Argument parse error] Could not parse arguments for tool "${tc.function.name}". Raw: ${(tc.function.arguments || '').slice(0, 200)}`,
+                    });
+                    continue;
+                }
+                // #4: tool execution try-catch
+                let output;
+                try {
+                    output = await this._executeTool(tc.function.name, args);
+                }
+                catch (e) {
+                    output = `[Tool error] ${tc.function.name}: ${e.message ?? String(e)}`;
                 }
-                let output = await this._executeTool(tc.function.name, args);
                 if (this._contextEnabled) {
-                    output = (0, contextCore_1.foldObservation)(output);
+                    output = foldObservation(output);
                 }
                 results.push({ tool_call_id: tc.id, content: output });
             }
-            // Append to conversation
-            apiMessages.push({
+            // Append to conversation (preserve thinking if present)
+            const assistantToolMsg = {
                 role: 'assistant',
                 content: content || '',
                 tool_calls: tcs,
-            });
-            workingHistory.push({
-                role: 'assistant',
-                content: content || '',
-                tool_calls: tcs,
-            });
+            };
+            if (thinking)
+                assistantToolMsg.thinking = thinking;
+            apiMessages.push(assistantToolMsg);
+            workingHistory.push({ ...assistantToolMsg });
             for (const r of results) {
                 apiMessages.push({
                     role: 'tool',
@@ -466,13 +602,17 @@ class AgentInstance {
         }
     }
     async *_runLoopStream(userInput, history, onComplete) {
-        const sanitized = (0, contextCore_1.sanitizeUserInput)(userInput);
+        await this.initMCP();
+        const sanitized = sanitizeUserInput(userInput);
         const message = sanitized.text;
         const system = await this._buildSystemForTurn(message);
         let workingHistory = [...history];
         if (this._contextEnabled) {
-            const budget = (0, contextCore_1.getBudget)();
-            workingHistory = (0, contextCore_1.selectHistory)(workingHistory, message, budget.history);
+            const budget = getBudget();
+            const selected = selectHistory(workingHistory, message, budget.history);
+            workingHistory = selected.length > 0 ? selected
+                : workingHistory.length >= 2 ? workingHistory.slice(-2)
+                    : [...workingHistory];
         }
         workingHistory.push({ role: 'user', content: message });
         const apiMessages = [
@@ -482,26 +622,56 @@ class AgentInstance {
         let toolRounds = 0;
         let hadToolCalls = false;
         while (true) {
-            const streamGen = this._llm.chat(apiMessages, {
-                tools: this._openaiTools,
-                maxTokens: 8000,
-                stream: true,
-            });
+            let streamGen;
+            try {
+                streamGen = await this._llmCallWithRetry(apiMessages, true);
+            }
+            catch (e) {
+                const errMsg = `I encountered an error communicating with the AI model: ${e.message ?? String(e)}. Please try again.`;
+                workingHistory.push({ role: 'assistant', content: errMsg });
+                history.length = 0;
+                history.push(...workingHistory);
+                if (onComplete)
+                    onComplete({ reply: errMsg, history: workingHistory, hadToolCalls });
+                yield { reply: errMsg, done: true };
+                return;
+            }
             let lastResponse = null;
-            for await (const r of streamGen) {
-                if (r.content && !r.toolCalls?.length) {
-                    yield { delta: r.content, done: false };
+            try {
+                for await (const r of streamGen) {
+                    if (r.content && !r.toolCalls?.length) {
+                        yield { delta: r.content, done: false };
+                    }
+                    lastResponse = r;
                 }
-                lastResponse = r;
+            }
+            catch (e) {
+                const errMsg = `Stream interrupted: ${e.message ?? String(e)}`;
+                workingHistory.push({ role: 'assistant', content: errMsg });
+                history.length = 0;
+                history.push(...workingHistory);
+                if (onComplete)
+                    onComplete({ reply: errMsg, history: workingHistory, hadToolCalls });
+                yield { reply: errMsg, done: true };
+                return;
             }
             const content = lastResponse?.content ?? '';
+            const thinking = lastResponse?.thinking ?? null;
             const tcs = lastResponse?.toolCalls?.length
                 ? toolCallsToMsgShape(lastResponse.toolCalls)
                 : [];
             if (!tcs.length) {
-                workingHistory.push({ role: 'assistant', content: content.trim() });
+                const assistantMsg = { role: 'assistant', content: content.trim() };
+                if (thinking)
+                    assistantMsg.thinking = thinking;
+                workingHistory.push(assistantMsg);
                 if (this._memoryEnabled) {
-                    await (0, memoryCore_1.consolidateTurn)(message, content.trim());
+                    try {
+                        await consolidateTurn(message, content.trim());
+                    }
+                    catch (e) {
+                        console.error('[AgentInstance] consolidateTurn failed:', e.message ?? e);
+                    }
                 }
                 history.length = 0;
                 history.push(...workingHistory);
@@ -536,23 +706,32 @@ class AgentInstance {
                     args = JSON.parse(tc.function.arguments || '{}');
                 }
                 catch {
-                    args = {};
+                    results.push({
+                        tool_call_id: tc.id,
+                        content: `[Argument parse error] Could not parse arguments for tool "${tc.function.name}". Raw: ${(tc.function.arguments || '').slice(0, 200)}`,
+                    });
+                    continue;
+                }
+                let output;
+                try {
+                    output = await this._executeTool(tc.function.name, args);
+                }
+                catch (e) {
+                    output = `[Tool error] ${tc.function.name}: ${e.message ?? String(e)}`;
                 }
-                let output = await this._executeTool(tc.function.name, args);
                 if (this._contextEnabled)
-                    output = (0, contextCore_1.foldObservation)(output);
+                    output = foldObservation(output);
                 results.push({ tool_call_id: tc.id, content: output });
             }
-            apiMessages.push({
-                role: 'assistant',
-                content: content || '',
-                tool_calls: tcs,
-            });
-            workingHistory.push({
+            const assistantToolMsg = {
                 role: 'assistant',
                 content: content || '',
                 tool_calls: tcs,
-            });
+            };
+            if (thinking)
+                assistantToolMsg.thinking = thinking;
+            apiMessages.push(assistantToolMsg);
+            workingHistory.push({ ...assistantToolMsg });
             for (const r of results) {
                 apiMessages.push({
                     role: 'tool',
@@ -567,6 +746,27 @@ class AgentInstance {
             }
         }
     }
+    // #1: LLM call with exponential backoff retry
+    async _llmCallWithRetry(apiMessages, stream, maxRetries = 3) {
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            try {
+                return this._llm.chat(apiMessages, {
+                    tools: this._openaiTools,
+                    maxTokens: 8000,
+                    stream,
+                });
+            }
+            catch (e) {
+                const status = e?.status ?? e?.response?.status;
+                const retryable = [429, 500, 502, 503].includes(status);
+                if (attempt < maxRetries && retryable) {
+                    await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt - 1)));
+                    continue;
+                }
+                throw e;
+            }
+        }
+        throw new Error('LLM call failed after retries');
+    }
 }
-exports.AgentInstance = AgentInstance;
 //# sourceMappingURL=agentInstance.js.map