@cuylabs/agent-core 0.7.0 → 0.8.0

package/dist/index.js

@@ -1,3 +1,81 @@
+import {
+  FileStorage,
+  MemoryStorage,
+  STORAGE_VERSION,
+  SessionManager,
+  buildEntryPath,
+  buildMessagesFromEntries,
+  configureDefaultSessionManager,
+  createMessageEntry,
+  createMetadataEntry,
+  deserializeMessage,
+  extractSessionInfo,
+  generateEntryId,
+  getDataDir,
+  getDefaultSessionManager,
+  getGitRootHash,
+  getLeafId,
+  getProjectId,
+  getProjectSessionsDir,
+  getSessionsDir,
+  parseJSONL,
+  serializeMessage,
+  toJSONL,
+  toJSONLBatch
+} from "./chunk-BDBZ3SLK.js";
+import {
+  DEFAULT_MAX_CONCURRENT,
+  DEFAULT_MAX_SPAWN_DEPTH,
+  DEFAULT_SESSION_TITLE_PREFIX,
+  SubAgentTracker,
+  createSubAgentTools
+} from "./chunk-7MUFEN4K.js";
+import {
+  ToolRegistry,
+  defaultRegistry
+} from "./chunk-SDSBEQXG.js";
+import {
+  TurnChangeTracker,
+  clearCheckpoints,
+  createCheckpointManager,
+  createTurnTracker
+} from "./chunk-VBWWUHWI.js";
+import {
+  Presets,
+  applyPreset,
+  careful,
+  code,
+  createPreset,
+  explore,
+  filterTools,
+  mergePresets,
+  plan,
+  quick,
+  review,
+  watch
+} from "./chunk-CAA7FHIH.js";
+import {
+  DEFAULT_INSTRUCTION_PATTERNS,
+  DEFAULT_MAX_DEPTH,
+  DEFAULT_MAX_FILE_SIZE,
+  PRIORITY_BASE,
+  PRIORITY_CUSTOM,
+  PRIORITY_ENVIRONMENT,
+  PRIORITY_INSTRUCTIONS,
+  PRIORITY_OVERRIDE,
+  PRIORITY_SKILLS,
+  PromptBuilder,
+  createPromptBuilder,
+  detectModelFamily,
+  discoverInstructions,
+  formatEnvironment,
+  formatInstructions,
+  gatherEnvironment,
+  getAvailableFamilies,
+  getTemplate,
+  loadGlobalInstructions,
+  summarizeEnvironment
+} from "./chunk-IVUJDISU.js";
 import {
   AgentTurnEngine,
   ContextOverflowError,
@@ -30,48 +108,15 @@ import {
   runToolBatch,
   snapshotAgentWorkflowMessage,
   snapshotAgentWorkflowMessages
-} from "./chunk-3HNO5SVI.js";
+} from "./chunk-4BDA7DQY.js";
+import {
+  LocalSignal
+} from "./chunk-KUVSERLJ.js";
 import {
   createSkillResourceTool,
   createSkillTool,
   createSkillTools
 } from "./chunk-YUUJK53A.js";
-import {
-  FileStorage,
-  MemoryStorage,
-  STORAGE_VERSION,
-  SessionManager,
-  buildEntryPath,
-  buildMessagesFromEntries,
-  configureDefaultSessionManager,
-  createMessageEntry,
-  createMetadataEntry,
-  deserializeMessage,
-  extractSessionInfo,
-  generateEntryId,
-  getDataDir,
-  getDefaultSessionManager,
-  getGitRootHash,
-  getLeafId,
-  getProjectId,
-  getProjectSessionsDir,
-  getSessionsDir,
-  parseJSONL,
-  serializeMessage,
-  toJSONL,
-  toJSONLBatch
-} from "./chunk-BDBZ3SLK.js";
-import {
-  DEFAULT_MAX_CONCURRENT,
-  DEFAULT_MAX_SPAWN_DEPTH,
-  DEFAULT_SESSION_TITLE_PREFIX,
-  SubAgentTracker,
-  createSubAgentTools
-} from "./chunk-7MUFEN4K.js";
-import {
-  ToolRegistry,
-  defaultRegistry
-} from "./chunk-SDSBEQXG.js";
 import {
   MAX_BYTES,
   MAX_LINES,
@@ -84,11 +129,20 @@ import {
   truncateOutput
 } from "./chunk-P6YF7USR.js";
 import {
-  TurnChangeTracker,
-  clearCheckpoints,
-  createCheckpointManager,
-  createTurnTracker
-} from "./chunk-VBWWUHWI.js";
+  DEFAULT_EXTERNAL_DIRS,
+  DEFAULT_MAX_SCAN_DEPTH,
+  DEFAULT_SKILL_MAX_SIZE,
+  SKILL_FILENAME,
+  SkillRegistry,
+  createSkillRegistry,
+  discoverSkills,
+  emptySkillRegistry,
+  inferResourceType,
+  loadResourceContent,
+  loadSkillContent,
+  loadSkillMetadata,
+  parseFrontmatter
+} from "./chunk-LRHOS4ZN.js";
 import {
   ContextManager,
   DEFAULT_CONTEXT_LIMITS,
@@ -102,7 +156,7 @@ import {
   pruneContext,
   pruneToolResults,
   shouldPruneContext
-} from "./chunk-BNSHUWCV.js";
+} from "./chunk-WWYYNWEW.js";
 import {
   dockerHost,
   localHost
@@ -112,24 +166,26 @@ import {
   DEFAULT_RETRY_CONFIG,
   Inference,
   LLM,
-  LLMError,
   OUTPUT_TOKEN_MAX,
   buildToolSet,
   calculateDelay,
   createRetryHandler,
   createRetryState,
-  getErrorCategory,
-  getRetryDelay,
-  isRetryable,
-  isRetryableCategory,
-  parseRetryDelay,
   shouldRetry,
   sleep,
   stream,
   streamOnce,
   streamStep,
   withRetry
-} from "./chunk-5K7AQVOU.js";
+} from "./chunk-N6HWIEEA.js";
+import {
+  executeAgentToolCall
+} from "./chunk-7VKQ4WPB.js";
+import {
+  extractFilePathsFromArgs,
+  shouldCaptureBaseline,
+  withFileTracking
+} from "./chunk-VEKUXUVF.js";
 import {
   EXTENDED_LEVELS,
   FIXED_LEVELS,
@@ -149,29 +205,43 @@ import {
   shouldIncludeReasoningSummary,
   supportsReasoning,
   supportsReasoningSync
-} from "./chunk-ZPMACVZK.js";
+} from "./chunk-SQU2AJHO.js";
 import {
-  executeAgentToolCall
-} from "./chunk-IEFIQENH.js";
-import {
-  streamWithinScope
+  createScope,
+  currentScope,
+  restoreScope,
+  snapshotScope,
+  streamWithinScope,
+  withinScope
 } from "./chunk-N7P4PN3O.js";
 import {
-  extractFilePathsFromArgs,
-  shouldCaptureBaseline,
-  withFileTracking
-} from "./chunk-VEKUXUVF.js";
+  LLMError,
+  getErrorCategory,
+  getRetryDelay,
+  isRetryable,
+  isRetryableCategory,
+  parseRetryDelay
+} from "./chunk-RZITT45F.js";
+import {
+  createMCPManager,
+  defineServer,
+  httpServer,
+  sseServer,
+  stdioServer
+} from "./chunk-ZXAKHMWH.js";
 import {
-  ApprovalDeniedError,
-  ApprovalTimeoutError,
   MiddlewareRunner,
   approvalMiddleware,
-  createApprovalHandler,
   createTelemetryConfig,
-  getToolRisk,
   otelMiddleware,
   promptCacheMiddleware
-} from "./chunk-CDTV2UYU.js";
+} from "./chunk-YSLSEQ6B.js";
+import {
+  ApprovalDeniedError,
+  ApprovalTimeoutError,
+  createApprovalHandler,
+  getToolRisk
+} from "./chunk-BFM2YHNM.js";
 import {
   CacheCapabilitySource,
   CapabilityCache,
@@ -188,57 +258,16 @@ import {
   extractProvider,
   findCapabilityOverride,
   getDefaultResolver,
-  getModelId,
   getNetworkStatus,
   getProviderCompatibility,
-  getProviderId,
+  inferContextWindow,
   inferProvider,
   likelySupportsReasoning
-} from "./chunk-QGOGIP7T.js";
+} from "./chunk-RFEKJKTO.js";
 import {
-  createMCPManager,
-  defineServer,
-  httpServer,
-  sseServer,
-  stdioServer
-} from "./chunk-ZXAKHMWH.js";
-import {
-  DEFAULT_INSTRUCTION_PATTERNS,
-  DEFAULT_MAX_DEPTH,
-  DEFAULT_MAX_FILE_SIZE,
-  PRIORITY_BASE,
-  PRIORITY_CUSTOM,
-  PRIORITY_ENVIRONMENT,
-  PRIORITY_INSTRUCTIONS,
-  PRIORITY_OVERRIDE,
-  PRIORITY_SKILLS,
-  PromptBuilder,
-  createPromptBuilder,
-  detectModelFamily,
-  discoverInstructions,
-  formatEnvironment,
-  formatInstructions,
-  gatherEnvironment,
-  getAvailableFamilies,
-  getTemplate,
-  loadGlobalInstructions,
-  summarizeEnvironment
-} from "./chunk-IVUJDISU.js";
-import {
-  DEFAULT_EXTERNAL_DIRS,
-  DEFAULT_MAX_SCAN_DEPTH,
-  DEFAULT_SKILL_MAX_SIZE,
-  SKILL_FILENAME,
-  SkillRegistry,
-  createSkillRegistry,
-  discoverSkills,
-  emptySkillRegistry,
-  inferResourceType,
-  loadResourceContent,
-  loadSkillContent,
-  loadSkillMetadata,
-  parseFrontmatter
-} from "./chunk-LRHOS4ZN.js";
+  getModelId,
+  getProviderId
+} from "./chunk-DWYX7ASF.js";
 
 // src/agent/chat-loop/commit.ts
 function createChatLoopCommitBatchApplier(params) {
@@ -500,272 +529,6 @@ async function* runChatLoop(deps) {
   );
 }
 
-// src/presets/patterns.ts
-function globToRegex(pattern) {
-  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
-  return new RegExp(`^${escaped}$`, "i");
-}
-function matchesPatterns(id, patterns) {
-  return patterns.some((pattern) => globToRegex(pattern).test(id));
-}
-function filterTools(tools, options) {
-  const allowPatterns = options.allow ?? [];
-  const denyPatterns = options.deny ?? [];
-  return tools.filter((tool) => {
-    const matchesAllow = allowPatterns.length === 0 || matchesPatterns(tool.id, allowPatterns);
-    if (!matchesAllow) {
-      return false;
-    }
-    const matchesDeny = denyPatterns.length > 0 && matchesPatterns(tool.id, denyPatterns);
-    if (matchesDeny && allowPatterns.length === 0) {
-      return false;
-    }
-    return true;
-  });
-}
-
-// src/presets/apply.ts
-function applyPreset(preset, availableTools, baseSystemPrompt) {
-  const tools = filterTools(availableTools, {
-    allow: preset.allowTools,
-    deny: preset.denyTools
-  });
-  let systemPrompt = preset.systemPrompt;
-  if (systemPrompt && baseSystemPrompt) {
-    systemPrompt = systemPrompt.replace("{basePrompt}", baseSystemPrompt);
-  }
-  return {
-    name: preset.name,
-    systemPrompt,
-    tools: tools.length > 0 ? tools : void 0,
-    temperature: preset.temperature,
-    maxSteps: preset.maxSteps,
-    reasoningLevel: preset.reasoningLevel,
-    model: preset.model
-  };
-}
-function mergePresets(...presets) {
-  if (presets.length === 0) {
-    throw new Error("mergePresets requires at least one preset");
-  }
-  if (presets.length === 1) {
-    return presets[0];
-  }
-  const [first, ...rest] = presets;
-  const allAllow = [];
-  const allDeny = [];
-  for (const preset of presets) {
-    if (preset.allowTools?.length) {
-      allAllow.push(preset.allowTools);
-    }
-    if (preset.denyTools?.length) {
-      allDeny.push(...preset.denyTools);
-    }
-  }
-  const combinedAllow = allAllow.length > 0 ? allAllow.reduce(
-    (left, right) => left.length <= right.length ? left : right
-  ) : void 0;
-  return {
-    name: presets.map((preset) => preset.name).join("+"),
-    description: presets.map((preset) => preset.description).join(" | "),
-    allowTools: combinedAllow,
-    denyTools: allDeny.length > 0 ? [...new Set(allDeny)] : void 0,
-    systemPrompt: rest.reduce(
-      (value, preset) => preset.systemPrompt ?? value,
-      first.systemPrompt
-    ),
-    temperature: rest.reduce(
-      (value, preset) => preset.temperature ?? value,
-      first.temperature
-    ),
-    maxSteps: rest.reduce(
-      (value, preset) => preset.maxSteps ?? value,
-      first.maxSteps
-    ),
-    reasoningLevel: rest.reduce(
-      (value, preset) => preset.reasoningLevel ?? value,
-      first.reasoningLevel
-    ),
-    model: rest.reduce((value, preset) => preset.model ?? value, first.model)
-  };
-}
-function createPreset(options) {
-  return {
-    description: options.description ?? `Custom preset: ${options.name}`,
-    ...options
-  };
-}
-
-// src/presets/builtins.ts
-var explore = {
-  name: "explore",
-  description: "Read-only exploration mode for understanding content",
-  allowTools: ["read*", "search*", "glob*", "grep*", "list*", "find*"],
-  denyTools: ["write*", "edit*", "delete*", "bash*", "exec*", "run*"],
-  systemPrompt: `{basePrompt}
-
-## EXPLORATION MODE
-
-You are in **exploration mode**. Your goal is to thoroughly understand the content.
-
-Guidelines:
-- **Always start with glob or grep to discover correct paths** \u2014 never assume directory structure
-- Use search and read tools extensively to build understanding
-- Map out structures, dependencies, and patterns
-- Look for conventions, common patterns, and documentation
-- DO NOT modify anything \u2014 only read and analyse
-- Summarise findings clearly with references to specific locations
-
-Error recovery:
-- If a tool returns an error (ENOENT, not found, etc.), try a different path or approach
-- Use glob with broader patterns to discover the correct location
-- Keep going until you have a thorough answer \u2014 do not give up after one failure
-- You have multiple steps available \u2014 use them all if needed`,
-  temperature: 0.3,
-  maxSteps: 30
-};
-var plan = {
-  name: "plan",
-  description: "Planning mode for analyzing tasks and creating detailed plans",
-  allowTools: ["read*", "search*", "glob*", "grep*", "list*", "find*"],
-  denyTools: ["write*", "edit*", "delete*", "bash*", "exec*", "run*"],
-  systemPrompt: `{basePrompt}
-
-## PLANNING MODE
-
-You are in **planning mode**. Your goal is to analyze and plan before implementation.
-
-Guidelines:
-- Analyse the task requirements thoroughly
-- Research existing patterns and conventions
-- Identify potential impacts and dependencies
-- Create a clear, step-by-step implementation plan
-- DO NOT implement anything \u2014 only plan and document
-- Output a numbered list of specific, actionable steps`,
-  temperature: 0.2,
-  maxSteps: 20
-};
-var review = {
-  name: "review",
-  description: "Thorough review and analysis mode",
-  allowTools: ["read*", "grep*", "search*", "glob*", "list*"],
-  denyTools: ["*"],
-  systemPrompt: `{basePrompt}
-
-## REVIEW MODE
-
-You are in **review mode**. Your goal is to perform a thorough analysis.
-
-Review checklist:
-- [ ] Logic errors and edge cases
-- [ ] Security vulnerabilities
-- [ ] Performance issues
-- [ ] Error handling and recovery
-- [ ] Clarity and maintainability
-- [ ] Coverage gaps
-
-Guidelines:
-- Be thorough and systematic
-- Cite specific locations and details
-- Explain WHY something is an issue
-- Suggest concrete fixes
-- Rate severity: Critical / High / Medium / Low`,
-  temperature: 0.1,
-  maxSteps: 25
-};
-var quick = {
-  name: "quick",
-  description: "Fast mode for simple questions and quick operations",
-  systemPrompt: `{basePrompt}
-
-## QUICK MODE
-
-You are in **quick mode**. Be fast and focused.
-
-Guidelines:
-- Answer directly without lengthy explanations
-- Use minimal tool calls (1-3 max)
-- If you can't answer quickly, say so
-- Prioritize speed over thoroughness`,
-  temperature: 0,
-  maxSteps: 5
-};
-var careful = {
-  name: "careful",
-  description: "Extra cautious mode for sensitive operations",
-  denyTools: ["bash*", "exec*", "run*", "delete*", "remove*"],
-  systemPrompt: `{basePrompt}
-
-## CAREFUL MODE
-
-You are in **careful mode**. Every action must be verified.
-
-Guidelines:
-- Double-check before any file modifications
-- Explain what you're about to do BEFORE doing it
-- Prefer smaller, incremental changes
-- Always verify changes after making them
-- If uncertain, ask for clarification rather than guessing`,
-  temperature: 0,
-  maxSteps: 50
-};
-var code = {
-  name: "code",
-  description: "Full-power implementation mode for writing and modifying code",
-  systemPrompt: `{basePrompt}
-
-## IMPLEMENTATION MODE
-
-You are a focused **implementation agent**. Your goal is to complete the assigned task fully and correctly.
-
-Guidelines:
-- Read existing code first to understand context and conventions before making changes
-- Follow the project's existing patterns, naming conventions, and style
-- Make minimal, targeted changes \u2014 do not refactor unrelated code
-- Verify your work: re-read modified files, run tests or lint if available
-- If the task requires multiple files, handle them systematically one at a time
-
-Error recovery:
-- If a command fails, read the error output carefully and fix the root cause
-- If a test fails, read the failure details and iterate until it passes
-- If you cannot find a file, use glob or grep to discover the correct path
-- Keep iterating until the task is DONE \u2014 do not stop at a partial solution
-- You have many steps available \u2014 use them all if needed`,
-  temperature: 0,
-  maxSteps: 50
-};
-var watch = {
-  name: "watch",
-  description: "Process monitoring mode for running and watching long commands",
-  allowTools: ["bash*", "exec*", "run*", "read*", "grep*", "glob*", "list*", "find*"],
-  denyTools: ["write*", "edit*", "delete*", "remove*"],
-  systemPrompt: `{basePrompt}
-
-## WATCH MODE
-
-You are a **process monitor**. Your goal is to execute a command, observe its output, and report the result.
-
-Guidelines:
-- Run the command as given \u2014 do not modify or "improve" it
-- Wait for completion and capture the full output
-- Parse the output for success/failure status, error counts, warnings
-- Report a clear summary: what ran, whether it passed, key details
-- If the process fails, include the relevant error output verbatim
-- Do NOT attempt to fix issues \u2014 only observe and report`,
-  temperature: 0,
-  maxSteps: 10,
-  reasoningLevel: "low"
-};
-var Presets = {
-  explore,
-  plan,
-  review,
-  quick,
-  careful,
-  code,
-  watch
-};
-
 // src/agent/fork.ts
 function resolveForkOptions(options, parentTools, systemPrompt) {
   if (!options.preset) {
@@ -844,7 +607,7 @@ function createForkedAgentConfig(options) {
   };
 }
 
-// src/agent/mcp.ts
+// src/agent/mcp-bridge.ts
 async function ensureMcpTools(state) {
   if (!state.manager) {
     return { connected: false, cachedTools: void 0 };
@@ -1039,23 +802,14 @@ var InterventionController = class {
   }
 };
 
-// src/agent/model-detection.ts
+// src/agent/stream-provider.ts
 var DEFAULT_CUSTOM_STREAM_MODELS = [
   "computer-use-preview",
   "computer-use-preview-2025-03-11"
 ];
-function getModelId2(model) {
-  if (typeof model === "string") {
-    return model;
-  }
-  if (typeof model === "object" && model !== null && "modelId" in model) {
-    return String(model.modelId);
-  }
-  return void 0;
-}
 function needsCustomStreamProvider(model, customPatterns) {
-  const modelId = getModelId2(model);
-  if (!modelId) return false;
+  const modelId = getModelId(model);
+  if (!modelId || modelId === "[object Object]") return false;
   const patterns = customPatterns ?? DEFAULT_CUSTOM_STREAM_MODELS;
   return patterns.some((pattern) => modelId.includes(pattern));
 }
@@ -1070,7 +824,7 @@ function autoDetectStreamProvider(model, tools, explicitProvider) {
   const enhancedTools = tools;
   const customPatterns = enhancedTools.__customStreamModels;
   if (needsCustomStreamProvider(model, customPatterns) && hasStreamProviderFactory(enhancedTools)) {
-    const modelId = getModelId2(model);
+    const modelId = getModelId(model);
     if (modelId) {
       const streamConfig = {
         apiKey: process.env.OPENAI_API_KEY,
@@ -1115,10 +869,11 @@ function createEffectiveAgentConfig(config) {
   return {
     systemPrompt: DEFAULT_SYSTEM_PROMPT,
     cwd: process.cwd(),
-    maxOutputTokens: DEFAULT_MAX_TOKENS,
-    maxSteps: DEFAULT_MAX_STEPS,
     reasoningLevel: "off",
     ...config,
+    // Re-apply defaults after spread so explicit `undefined` from callers doesn't win.
+    maxSteps: config.maxSteps ?? DEFAULT_MAX_STEPS,
+    maxOutputTokens: config.maxOutputTokens ?? DEFAULT_MAX_TOKENS,
     streamProvider: effectiveStreamProvider
   };
 }
@@ -1145,10 +900,17 @@ function createAgentState(config) {
 }
 function createAgentContextManager(config) {
   const compactionConfig = config.compaction ?? {};
+  const modelId = getModelId(config.model);
+  const inferredWindow = inferContextWindow(modelId);
+  const contextWindow = config.contextWindow ?? inferredWindow ?? DEFAULT_CONTEXT_LIMITS.contextWindow;
+  const reserveTokens = Math.min(
+    32e3,
+    Math.max(8e3, Math.round(contextWindow * 0.12))
+  );
   return new ContextManager({
     limits: {
-      contextWindow: config.contextWindow ?? DEFAULT_CONTEXT_LIMITS.contextWindow,
-      reserveTokens: DEFAULT_CONTEXT_LIMITS.reserveTokens,
+      contextWindow,
+      reserveTokens,
       protectedTokens: compactionConfig.protectedTokens ?? DEFAULT_CONTEXT_LIMITS.protectedTokens,
       pruneMinimum: compactionConfig.pruneMinimum ?? DEFAULT_CONTEXT_LIMITS.pruneMinimum
     },
@@ -1294,6 +1056,8 @@ var Agent = class _Agent {
   mcpManager;
   /** Whether MCP has been connected (lazy init) */
   mcpConnected = false;
+  /** Whether skill tools have been resolved (lazy init) */
+  skillToolsResolved = false;
   /** Cached MCP tools (refreshed on connect) */
   mcpToolsCache;
   /** Prompt pipeline builder (when using layered prompt mode) */
@@ -1308,6 +1072,8 @@ var Agent = class _Agent {
   telemetrySettings;
   /** Tracing shutdown function (from `tracing` config auto-setup) */
   tracingShutdown;
+  /** Multi-consumer event dispatch */
+  _signal;
   constructor(config) {
     const setup = createAgentSetup(config);
     this.config = setup.config;
@@ -1323,6 +1089,17 @@ var Agent = class _Agent {
     this.middlewareRunner = setup.middlewareRunner;
     this.telemetrySettings = setup.telemetrySettings;
     this.tracingShutdown = setup.tracingShutdown;
+    this._signal = config.signal ?? new LocalSignal();
+  }
+  /**
+   * Event signal — subscribe to events without consuming the generator.
+   *
+   * Every event yielded by `chat()` is also dispatched here, allowing
+   * multiple passive observers (SSE routes, TUI, plugins) to listen
+   * concurrently.
+   */
+  get signal() {
+    return this._signal;
   }
   /** Agent name (identity for spans, Dapr workflows, etc.) */
   get name() {
@@ -1369,6 +1146,22 @@ var Agent = class _Agent {
   supportsReasoning() {
     return supportsReasoningSync(this.state.model);
   }
+  /**
+   * Ensure skill tools are registered when `prompt.skills` is configured.
+   * Lazy initialization — resolves the registry and adds tools on first use.
+   */
+  async ensureSkillTools() {
+    if (this.skillToolsResolved || !this.promptBuilder) return;
+    this.skillToolsResolved = true;
+    const registry = await this.promptBuilder.getSkillRegistry(this.config.cwd);
+    if (registry.size > 0) {
+      for (const tool of createSkillTools(registry)) {
+        if (!this.tools.has(tool.id)) {
+          this.tools.set(tool.id, tool);
+        }
+      }
+    }
+  }
   /**
    * Ensure MCP is connected and return tools
    * Lazy initialization - only connects on first use
@@ -1420,12 +1213,13 @@ var Agent = class _Agent {
    */
   async *chat(sessionId, message, options) {
     await this.ensureSession(sessionId);
+    await this.ensureSkillTools();
     const abort = options?.abort ?? new AbortController().signal;
     const turnId = `${sessionId}-turn-${++this.turnCounter}`;
     this.turnTracker.startTurn(turnId);
     await this.repairOrphanedToolCalls();
     const mcpTools = await this.ensureMCPConnected();
-    yield* runChatLoop({
+    const loop = runChatLoop({
       sessionId,
       message,
       abort,
@@ -1448,6 +1242,10 @@ var Agent = class _Agent {
         this.state.isStreaming = v;
       }
     });
+    for await (const event of loop) {
+      this._signal.emit(event);
+      yield event;
+    }
   }
   /**
    * Ensure a session is loaded or created
@@ -1778,6 +1576,17 @@ var Agent = class _Agent {
   setModel(model) {
     this.config.model = model;
     this.state.model = model;
+    if (this.config.contextWindow === void 0) {
+      const modelId = getModelId(model);
+      const inferred = inferContextWindow(modelId);
+      if (inferred) {
+        const reserveTokens = Math.min(
+          32e3,
+          Math.max(8e3, Math.round(inferred * 0.12))
+        );
+        this.contextManager.setLimits({ contextWindow: inferred, reserveTokens });
+      }
+    }
   }
   /**
    * Get the prompt builder (when using pipeline mode).
@@ -1995,6 +1804,7 @@ var Agent = class _Agent {
    * After calling close(), the agent should not be used.
    */
   async close() {
+    this._signal.clear();
     if (this.tracingShutdown) {
       await this.tracingShutdown();
     }
@@ -2061,6 +1871,7 @@ export {
   InterventionController,
   LLM,
   LLMError,
+  LocalSignal,
   MAX_BYTES,
   MAX_LINES,
   MemoryStorage,
@@ -2138,6 +1949,7 @@ export {
   createResolver,
   createRetryHandler,
   createRetryState,
+  createScope,
   createSkillRegistry,
   createSkillResourceTool,
   createSkillTool,
@@ -2145,6 +1957,7 @@ export {
   createSubAgentTools,
   createTelemetryConfig,
   createTurnTracker,
+  currentScope,
   defaultAgentTaskCheckpointStrategy,
   defaultRegistry,
   defineServer,
@@ -2197,6 +2010,7 @@ export {
   getToolRisk,
   hasStreamProviderFactory,
   httpServer,
+  inferContextWindow,
   inferProvider,
   inferResourceType,
   isContextOverflowing,
@@ -2227,6 +2041,7 @@ export {
   recordAgentWorkflowReplayDecision,
   restoreAgentWorkflowMessage,
   restoreAgentWorkflowMessages,
+  restoreScope,
   review,
   runChatLoop,
   runConcurrent,
@@ -2240,6 +2055,7 @@ export {
   sleep,
   snapshotAgentWorkflowMessage,
   snapshotAgentWorkflowMessages,
+  snapshotScope,
   sseServer,
   stdioServer,
   stream,
@@ -2253,5 +2069,6 @@ export {
   truncateOutput,
   watch,
   withFileTracking,
-  withRetry
+  withRetry,
+  withinScope
 };