@aexol/spectral 0.9.231 → 0.9.240

package/dist/generated/zeus/index.js

@@ -698,6 +698,11 @@ export var PresetSource;
     PresetSource["SYSTEM"] = "SYSTEM";
     PresetSource["USER"] = "USER";
 })(PresetSource || (PresetSource = {}));
+export var FollowUpMode;
+(function (FollowUpMode) {
+    FollowUpMode["INJECT"] = "INJECT";
+    FollowUpMode["QUEUE"] = "QUEUE";
+})(FollowUpMode || (FollowUpMode = {}));
 export var AgentMode;
 (function (AgentMode) {
     AgentMode["SUBAGENT"] = "SUBAGENT";

package/dist/mcp/server-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../../src/mcp/server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAKnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,mCAAmC,EACnC,SAAS,EACV,MAAM,YAAY,CAAC;AAMpB,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG3F,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,YAAY,CAAC;CAC/C;AAED,KAAK,gBAAgB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,mCAAmC,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;AAElH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,eAAe,CAAgD;IACvE,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,cAAc,CAAmC;IAEzD,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAI3D,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAyBtE,gBAAgB;IAmF9B,OAAO,CAAC,YAAY;YAWN,mBAAmB;YAyEnB,aAAa;YAab,iBAAiB;IAkB/B,OAAO,CAAC,iCAAiC;IAQzC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAI/E,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI3C,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgBpE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAelC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAIzD,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAIlD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOzB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOrC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;CAMjD"}
+{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../../src/mcp/server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAKnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,mCAAmC,EACnC,SAAS,EACV,MAAM,YAAY,CAAC;AAMpB,OAAO,EAA2B,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAI3F,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,YAAY,CAAC;CAC/C;AAED,KAAK,gBAAgB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,mCAAmC,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;AAElH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,eAAe,CAAgD;IACvE,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,cAAc,CAAmC;IAEzD,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAI3D,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAyBtE,gBAAgB;IAmF9B,OAAO,CAAC,YAAY;YAWN,mBAAmB;YAyEnB,aAAa;YAab,iBAAiB;IAkB/B,OAAO,CAAC,iCAAiC;IAQzC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAI/E,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI3C,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgBpE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAelC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAIzD,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAIlD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOzB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOrC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;CAMjD"}

package/dist/mcp/server-manager.js

@@ -10,6 +10,7 @@ import { McpOAuthProvider } from "./mcp-oauth-provider.js";
 import { supportsOAuth } from "./mcp-auth-flow.js";
 import { registerSamplingHandler } from "./sampling-handler.js";
 import { interpolateEnvRecord, resolveBearerToken, resolveConfigPath } from "./utils.js";
+import { augmentPath, getPathEnvKey } from "../utils/augment-path.js";
 export class McpServerManager {
     connections = new Map();
     connectPromises = new Map();
@@ -293,6 +294,11 @@ function resolveEnv(env) {
             resolved[key] = value;
         }
     }
+    // MCP stdio servers are spawned by name (`npx -y pkg`, `node server.js`), so
+    // they live or die by PATH. When spectral itself was launched from a GUI
+    // context that PATH has no node/npm in it — augment it for the child only,
+    // leaving our own process env untouched.
+    resolved[getPathEnvKey(resolved)] = augmentPath(resolved[getPathEnvKey(resolved)]);
     if (!env)
         return resolved;
     const overrides = interpolateEnvRecord(env);

package/dist/memory/tools/receive-agent-observations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"receive-agent-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/receive-agent-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAIhF,eAAO,MAAM,oCAAoC,+BAA+B,CAAC;AAEjF,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,aAAa,GAAG,YAAY,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,4BAA4B;;;iFAqEvC,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE5E"}
+{"version":3,"file":"receive-agent-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/receive-agent-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAIhF,eAAO,MAAM,oCAAoC,+BAA+B,CAAC;AAEjF,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,aAAa,GAAG,YAAY,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,4BAA4B;;;iFAkFvC,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE5E"}

package/dist/memory/tools/receive-agent-observations.js

@@ -8,7 +8,8 @@ export const receiveAgentObservationsTool = defineTool({
     label: "Receive observations from other agents",
     description: "Poll for observations shared by other active sessions on this machine working in the " +
         "same directory (same-machine, same-cwd; no cross-machine or team relay). " +
-        "Call this before starting work or when you suspect another agent has shared context.",
+        "Call this before starting work or when you suspect another agent has shared context. " +
+        "Delivery is per-recipient: each session polls its own inbox, and you never see your own messages.",
     promptSnippet: "Use receive_agent_observations() to pull shared observations from other active sessions on this machine.",
     promptGuidelines: [
         "Messages are same-machine + same-cwd only; there is no cross-machine or team fan-out.",
@@ -29,7 +30,13 @@ export const receiveAgentObservationsTool = defineTool({
             };
         }
         const projectId = store.getProjectByCwd(ctx.cwd);
-        const sessionId = ctx.sessionManager.getSessionId?.();
+        // Subagents receive a DISTINCT derived observation session id on the
+        // SubagentToolContext so they poll their own inbox; primary sessions
+        // fall back to the session manager's id. Never the bare parent id for
+        // subagents — per-recipient delivery would let a subagent consume the
+        // parent's broadcast observations.
+        const subCtx = ctx;
+        const sessionId = subCtx.observationSessionId ?? subCtx.sessionManager?.getSessionId?.();
         if (!projectId || !sessionId) {
             return {
                 content: [{ type: "text", text: "No project/session context." }],
@@ -40,6 +47,9 @@ export const receiveAgentObservationsTool = defineTool({
             projectId,
             channel: "memory",
             recipientSessionId: sessionId,
+            // Self-filtering: never surface the requesting session's own
+            // observations back to it (live subscribe already does this).
+            excludeSenderSessionId: sessionId,
             since: params.since,
             limit: params.limit ?? 20,
             markDelivered: true,

package/dist/relay/dispatcher.d.ts

@@ -43,7 +43,7 @@
  * re-exported below so existing imports from `relay/dispatcher.js` keep
  * working.
  */
-import type { AutoOptimizeFrame, AutoResearchFrame, CancelTurnFrame, ClientMessageFrame, SubscribeFrame } from "@aexol/relay-protocol";
+import type { AutoOptimizeFrame, AutoResearchFrame, CancelTurnFrame, ClientMessageFrame, SubscribeFrame, StopToolCallFrame } from "@aexol/relay-protocol";
 import type { SessionStreamManager, Subscriber } from "../server/session-stream.js";
 import type { SessionStore } from "../server/storage.js";
 import { coerceImages, hasImages, MAX_INLINE_IMAGE_BASE64_CHARS } from "../server/image-attachments.js";
@@ -124,6 +124,18 @@ export declare function handleCancelTurn(frame: CancelTurnFrame, deps: {
         error: (...args: unknown[]) => void;
     };
 }): void;
+export type { StopToolCallFrame };
+/**
+ * Dispatch a `stop_tool_call` frame. Stops ONE hung/long-running tool call
+ * for the session — that call is aborted, the agent receives a synthesized
+ * user-stop tool result, and the turn continues (unlike `cancel_turn`).
+ *
+ * Guarded: unknown toolCallId → no crash, the manager broadcasts a
+ * best-effort `tool_stop_result` info frame.
+ */
+export declare function handleStopToolCall(frame: StopToolCallFrame, deps: {
+    manager: SessionStreamManager;
+}): Promise<void>;
 /**
  * Detach every subscriber the dispatcher has attached. Called by
  * `serve.ts` on relay disconnect / shutdown so the underlying spectral

package/dist/relay/dispatcher.d.ts.map

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

package/dist/relay/dispatcher.js

@@ -291,7 +291,11 @@ export async function handleClientMessage(frame, deps) {
     // Set autonomous iterative loop state before firing the prompt.
     // loop:true  → start/renew loop with the current content as original prompt;
     // loop:false → stop any active loop.
-    manager.setLoopActive(sessionId, isLoop, content, loopMaxIterations, loopGoal);
+    // Arm loop state BEFORE any await: for non-reference prompts this is
+    // synchronous, preserving the client_message/subscribe interleave below.
+    // For "@preset:<name>" prompts this returns a promise that we await just
+    // before firing the turn, so the loop replays the EXPANDED prompt.
+    const armed = manager.setLoopActive(sessionId, isLoop, content, loopMaxIterations, loopGoal);
     // 2. Attach (idempotent). On first attach we capture the replay payload
     //    and synthesize a `session_ready` ws_event so the browser sees the
     //    same first frame it would have on a direct WS connection.
@@ -350,6 +354,30 @@ export async function handleClientMessage(frame, deps) {
             });
         }
     }
+    // "@preset:<name>" loop prompts: resolve the preset before the turn fires
+    // (undefined = already armed synchronously — no yield, no reordering).
+    // The arm path resolves to the EXPANDED prompt; `null` means it failed or
+    // was aborted (loop state changed mid-resolution) — fall back to the raw
+    // content in those cases. The promise is caught, not just awaited: serve
+    // calls this handler fire-and-forget, so a rejection (e.g. a sync throw
+    // from teamIdForSession inside the manager) would otherwise surface as an
+    // unhandled rejection instead of a visible error event.
+    let expandedLoopPrompt = null;
+    if (armed instanceof Promise) {
+        try {
+            expandedLoopPrompt = await armed;
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            logger.error?.(`[dispatcher] loop arming failed for ${sessionId}:`, err);
+            relay.send({
+                kind: "ws_event",
+                sessionId,
+                event: { type: "error", message: humanizeProviderError(msg) },
+            });
+        }
+    }
+    const promptContent = expandedLoopPrompt ?? content;
     // 3. Fire the prompt. `prompt()` resolves on `agent_end`; errors are
     //    converted to `error` events by the manager itself, so we just log.
     //    `modelId` (Phase 3 — Available Models whitelist) is forwarded as
@@ -359,7 +387,7 @@ export async function handleClientMessage(frame, deps) {
     //
     //    When `loop: true`, loop state is set before prompting; the normal
     //    model is used — loop replay is handled by session-stream on agent_end.
-    manager.prompt(sessionId, content, modelId, validImages, reasoningEffort).catch((err) => {
+    manager.prompt(sessionId, promptContent, modelId, validImages, reasoningEffort).catch((err) => {
         logger.error?.(`[dispatcher] manager.prompt failed for ${sessionId}:`, err);
     });
     // Arm the interval scheduler after the first (immediate) launch.
@@ -440,6 +468,17 @@ export async function handleSubscribe(frame, deps) {
 export function handleCancelTurn(frame, deps) {
     deps.manager.cancelTurn(frame.sessionId);
 }
+/**
+ * Dispatch a `stop_tool_call` frame. Stops ONE hung/long-running tool call
+ * for the session — that call is aborted, the agent receives a synthesized
+ * user-stop tool result, and the turn continues (unlike `cancel_turn`).
+ *
+ * Guarded: unknown toolCallId → no crash, the manager broadcasts a
+ * best-effort `tool_stop_result` info frame.
+ */
+export async function handleStopToolCall(frame, deps) {
+    await deps.manager.stopToolCall(frame.sessionId, frame.toolCallId, frame.reason);
+}
 /**
  * Detach every subscriber the dispatcher has attached. Called by
  * `serve.ts` on relay disconnect / shutdown so the underlying spectral

package/dist/sdk/agent-core/agent-loop.js

@@ -267,13 +267,21 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                     newMessages.push(result);
                 }
                 // Fix 1: Track consecutive tool call errors; terminate after threshold.
-                const turnHasError = toolResults.some((r) => r.isError);
+                // User-stopped results (`stoppedByUser`) are deliberate user actions,
+                // not tool failures — they must not count toward the threshold, or a
+                // run where the user stops every tool call dies as "10 consecutive
+                // tool call errors" (defeating the per-call stop feature). A batch of
+                // only user-stopped results leaves the counter unchanged; normal
+                // results still reset it.
+                const turnHasError = toolResults.some((r) => r.isError && !r.stoppedByUser);
+                const batchAllUserStopped = toolResults.length > 0 &&
+                    toolResults.every((r) => r.isError && r.stoppedByUser === true);
                 if (turnHasError) {
                     consecutiveToolErrors++;
                     if (consecutiveToolErrors >= MAX_CONSECUTIVE_TOOL_ERRORS) {
                         const lastErrorResult = [...toolResults]
                             .reverse()
-                            .find((r) => r.isError);
+                            .find((r) => r.isError && !r.stoppedByUser);
                         const lastErrorMsg = lastErrorResult?.content.find((c) => c.type === "text")?.text ||
                             "Unknown tool error";
                         const finalMessage = {
@@ -303,7 +311,9 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                         return;
                     }
                 }
-                else {
+                else if (!batchAllUserStopped) {
+                    // Pure success/normal batch: reset as today. An all-user-stopped
+                    // batch is neither a real error nor a success — counter unchanged.
                     consecutiveToolErrors = 0;
                 }
             }

package/dist/sdk/agent-core/agent.d.ts

@@ -1,4 +1,4 @@
-import { type ImageContent, type Message, type SimpleStreamOptions, type ThinkingBudgets, type Transport } from "../ai/index.js";
+import { type ImageContent, type Message, type SimpleStreamOptions, type Transport } from "../ai/index.js";
 import type { AfterToolCallContext, AfterToolCallResult, AgentEvent, AgentLoopTurnUpdate, AgentMessage, AgentState, BeforeToolCallContext, BeforeToolCallResult, QueueMode, StreamFn, ToolExecutionMode } from "./types.js";
 export type { QueueMode } from "./types.js";
 /** Options for constructing an {@link Agent}. */
@@ -16,7 +16,6 @@ export interface AgentOptions {
     steeringMode?: QueueMode;
     followUpMode?: QueueMode;
     sessionId?: string;
-    thinkingBudgets?: ThinkingBudgets;
     transport?: Transport;
     maxRetryDelayMs?: number;
     toolExecution?: ToolExecutionMode;
@@ -32,6 +31,7 @@ export declare class Agent {
     private readonly listeners;
     private readonly steeringQueue;
     private readonly followUpQueue;
+    private readonly toolCallRegistry;
     convertToLlm: (messages: AgentMessage[]) => Message[] | Promise<Message[]>;
     transformContext?: (messages: AgentMessage[], signal?: AbortSignal) => Promise<AgentMessage[]>;
     streamFn: StreamFn;
@@ -44,8 +44,6 @@ export declare class Agent {
     private activeRun?;
     /** Session identifier forwarded to providers for cache-aware backends. */
     sessionId?: string;
-    /** Optional per-level thinking token budgets forwarded to the stream function. */
-    thinkingBudgets?: ThinkingBudgets;
     /** Preferred transport forwarded to the stream function. */
     transport: Transport;
     /** Optional cap for provider-requested retry delays. */
@@ -92,6 +90,15 @@ export declare class Agent {
     get signal(): AbortSignal | undefined;
     /** Abort the current run, if one is active. */
     abort(): void;
+    /**
+     * Stop a single in-flight tool call (user-initiated per-call stop).
+     *
+     * Aborts only the targeted call's execution — siblings keep running and the
+     * agent loop CONTINUES the turn with a synthesized user-stop tool result
+     * ("Tool call stopped by user (was running too long)"). Returns false for
+     * unknown/finished toolCallIds (no-op).
+     */
+    stopToolCall(toolCallId: string, reason?: string): Promise<boolean>;
     /**
      * Resolve when the current run and all awaited event listeners have finished.
      *

package/dist/sdk/agent-core/agent.d.ts.map

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

package/dist/sdk/agent-core/agent.js

@@ -1,5 +1,6 @@
 import { streamSimple, } from "../ai/index.js";
 import { runAgentLoop, runAgentLoopContinue } from "./agent-loop.js";
+import { ToolCallRegistry } from "./tool-call-registry.js";
 function defaultConvertToLlm(messages) {
     return messages.filter((message) => message.role === "user" || message.role === "assistant" || message.role === "toolResult");
 }
@@ -88,6 +89,7 @@ export class Agent {
     listeners = new Set();
     steeringQueue;
     followUpQueue;
+    toolCallRegistry = new ToolCallRegistry();
     convertToLlm;
     transformContext;
     streamFn;
@@ -100,8 +102,6 @@ export class Agent {
     activeRun;
     /** Session identifier forwarded to providers for cache-aware backends. */
     sessionId;
-    /** Optional per-level thinking token budgets forwarded to the stream function. */
-    thinkingBudgets;
     /** Preferred transport forwarded to the stream function. */
     transport;
     /** Optional cap for provider-requested retry delays. */
@@ -122,7 +122,6 @@ export class Agent {
         this.steeringQueue = new PendingMessageQueue(options.steeringMode ?? "one-at-a-time");
         this.followUpQueue = new PendingMessageQueue(options.followUpMode ?? "one-at-a-time");
         this.sessionId = options.sessionId;
-        this.thinkingBudgets = options.thinkingBudgets;
         this.transport = options.transport ?? "auto";
         this.maxRetryDelayMs = options.maxRetryDelayMs;
         this.toolExecution = options.toolExecution ?? "parallel";
@@ -196,6 +195,17 @@ export class Agent {
     abort() {
         this.activeRun?.abortController.abort();
     }
+    /**
+     * Stop a single in-flight tool call (user-initiated per-call stop).
+     *
+     * Aborts only the targeted call's execution — siblings keep running and the
+     * agent loop CONTINUES the turn with a synthesized user-stop tool result
+     * ("Tool call stopped by user (was running too long)"). Returns false for
+     * unknown/finished toolCallIds (no-op).
+     */
+    async stopToolCall(toolCallId, reason) {
+        return this.toolCallRegistry.stop(toolCallId, reason);
+    }
     /**
      * Resolve when the current run and all awaited event listeners have finished.
      *
@@ -211,6 +221,7 @@ export class Agent {
         this._state.streamingMessage = undefined;
         this._state.pendingToolCalls = new Set();
         this._state.errorMessage = undefined;
+        this.toolCallRegistry.clear();
         this.clearFollowUpQueue();
         this.clearSteeringQueue();
     }
@@ -284,7 +295,6 @@ export class Agent {
             onPayload: this.onPayload,
             onResponse: this.onResponse,
             transport: this.transport,
-            thinkingBudgets: this.thinkingBudgets,
             maxRetryDelayMs: this.maxRetryDelayMs,
             toolExecution: this.toolExecution,
             beforeToolCall: this.beforeToolCall,
@@ -301,6 +311,7 @@ export class Agent {
                 return this.steeringQueue.drain();
             },
             getFollowUpMessages: async () => this.followUpQueue.drain(),
+            toolCallRegistry: this.toolCallRegistry,
         };
     }
     async runWithLifecycle(executor) {
@@ -316,6 +327,7 @@ export class Agent {
         this._state.isStreaming = true;
         this._state.streamingMessage = undefined;
         this._state.errorMessage = undefined;
+        this.toolCallRegistry.clear();
         try {
             await executor(abortController.signal);
         }

package/dist/sdk/agent-core/tool-call-registry.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Killable registry of in-flight tool executions for one agent run.
+ *
+ * The agent loop hands every `tool.execute()` a run-level abort signal, which
+ * makes whole-turn cancellation the only kill path. This registry adds a
+ * per-call controller chained from the run signal so a single hung/long-running
+ * tool call can be aborted on its own (`stopToolCall`) while its siblings keep
+ * running and the agent loop continues the turn.
+ *
+ * Lifecycle:
+ *  - `register()` is called by the tool executor right before execution and
+ *    returns a handle carrying the per-call abort signal.
+ *  - `settle()` is called by the executor when the call finishes (success or
+ *    error) — it removes the entry and resolves the handle's `settled` promise,
+ *    which is what `stop()` awaits.
+ *  - `stop()` marks a user-initiated stop (so the caught abort error is
+ *    replaced by the synthesized user-stop tool result), aborts only the
+ *    targeted call's controller, and resolves once the call settles.
+ *
+ * Chaining: when the run-level signal aborts (turn cancel), every per-call
+ * controller aborts too, so existing whole-turn cancel behavior is preserved.
+ */
+/** Default reason recorded on the handle when the caller passes none. */
+export declare const DEFAULT_USER_STOP_REASON = "stopped by user";
+/**
+ * Exactly-matching synthesized toolResult content per the `stop_tool_call`
+ * wire contract. The wire tool_result frame carries `stoppedByUser: true`.
+ */
+export declare const USER_STOP_TOOL_RESULT_TEXT = "Tool call stopped by user (was running too long)";
+/** Handle for one in-flight tool call execution. */
+export interface InFlightToolCallHandle {
+    readonly toolCallId: string;
+    readonly toolName: string;
+    /** Per-call abort signal source. `controller.signal` is what tools receive. */
+    readonly controller: AbortController;
+    /** Resolves when the executor settles this call (success or error). */
+    readonly settled: Promise<void>;
+    /** Set true when a user-initiated stop targets this call. */
+    userStopRequested: boolean;
+    /** Reason supplied by the caller of `stop()` (defaults to "stopped by user"). */
+    userStopReason?: string;
+    /** Resolve the `settled` promise. Called by the executor, not by callers. */
+    settle(): void;
+}
+/**
+ * Per-run killable registry of in-flight tool executions.
+ * Keyed by toolCallId; one Agent owns one registry per run.
+ */
+export declare class ToolCallRegistry {
+    private readonly calls;
+    /**
+     * Register an in-flight call and return its handle. The returned
+     * controller's signal aborts when this call is stopped individually OR
+     * when the run-level signal aborts (turn cancel propagates).
+     */
+    register(toolCallId: string, toolName: string, runSignal?: AbortSignal): InFlightToolCallHandle;
+    /** Look up an in-flight call by id. Undefined for unknown/finished ids. */
+    get(toolCallId: string): InFlightToolCallHandle | undefined;
+    /**
+     * Mark a user-initiated stop and abort only this call's controller.
+     * Returns false for unknown/finished ids (no-op). Idempotent: a second
+     * stop for the same id keeps the first marker and reason.
+     */
+    markUserStop(toolCallId: string, reason?: string): boolean;
+    /**
+     * Abort only the targeted call and resolve once it settles.
+     * Returns false for unknown/finished ids (no-op).
+     */
+    stop(toolCallId: string, reason?: string): Promise<boolean>;
+    /** Settle an in-flight call. Called by the executor when execution ends. */
+    settle(toolCallId: string): void;
+    /** Settle and drop every tracked call. Called when a run starts/ends. */
+    clear(): void;
+}
+//# sourceMappingURL=tool-call-registry.d.ts.map

package/dist/sdk/agent-core/tool-call-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-call-registry.d.ts","sourceRoot":"","sources":["../../../src/sdk/agent-core/tool-call-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,yEAAyE;AACzE,eAAO,MAAM,wBAAwB,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,0BAA0B,qDACY,CAAC;AAEpD,oDAAoD;AACpD,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC;IACrC,uEAAuE;IACvE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,6DAA6D;IAC7D,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iFAAiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,MAAM,IAAI,IAAI,CAAC;CACf;AAED;;;GAGG;AACH,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6C;IAEnE;;;;OAIG;IACH,QAAQ,CACP,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,WAAW,GACrB,sBAAsB;IA+CzB,2EAA2E;IAC3E,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS;IAI3D;;;;OAIG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO;IAe1D;;;OAGG;IACG,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMjE,4EAA4E;IAC5E,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIhC,yEAAyE;IACzE,KAAK,IAAI,IAAI;CAIb"}

package/dist/sdk/agent-core/tool-call-registry.js

@@ -0,0 +1,131 @@
+/**
+ * Killable registry of in-flight tool executions for one agent run.
+ *
+ * The agent loop hands every `tool.execute()` a run-level abort signal, which
+ * makes whole-turn cancellation the only kill path. This registry adds a
+ * per-call controller chained from the run signal so a single hung/long-running
+ * tool call can be aborted on its own (`stopToolCall`) while its siblings keep
+ * running and the agent loop continues the turn.
+ *
+ * Lifecycle:
+ *  - `register()` is called by the tool executor right before execution and
+ *    returns a handle carrying the per-call abort signal.
+ *  - `settle()` is called by the executor when the call finishes (success or
+ *    error) — it removes the entry and resolves the handle's `settled` promise,
+ *    which is what `stop()` awaits.
+ *  - `stop()` marks a user-initiated stop (so the caught abort error is
+ *    replaced by the synthesized user-stop tool result), aborts only the
+ *    targeted call's controller, and resolves once the call settles.
+ *
+ * Chaining: when the run-level signal aborts (turn cancel), every per-call
+ * controller aborts too, so existing whole-turn cancel behavior is preserved.
+ */
+/** Default reason recorded on the handle when the caller passes none. */
+export const DEFAULT_USER_STOP_REASON = "stopped by user";
+/**
+ * Exactly-matching synthesized toolResult content per the `stop_tool_call`
+ * wire contract. The wire tool_result frame carries `stoppedByUser: true`.
+ */
+export const USER_STOP_TOOL_RESULT_TEXT = "Tool call stopped by user (was running too long)";
+/**
+ * Per-run killable registry of in-flight tool executions.
+ * Keyed by toolCallId; one Agent owns one registry per run.
+ */
+export class ToolCallRegistry {
+    calls = new Map();
+    /**
+     * Register an in-flight call and return its handle. The returned
+     * controller's signal aborts when this call is stopped individually OR
+     * when the run-level signal aborts (turn cancel propagates).
+     */
+    register(toolCallId, toolName, runSignal) {
+        const existing = this.calls.get(toolCallId);
+        if (existing)
+            return existing;
+        const controller = new AbortController();
+        let settle = () => { };
+        const settled = new Promise((resolve) => {
+            settle = resolve;
+        });
+        const handle = {
+            toolCallId,
+            toolName,
+            controller,
+            settled,
+            userStopRequested: false,
+            settle: () => {
+                this.calls.delete(toolCallId);
+                settle();
+            },
+        };
+        if (runSignal) {
+            if (runSignal.aborted) {
+                try {
+                    controller.abort();
+                }
+                catch {
+                    // ignore — abort must never throw into the executor
+                }
+            }
+            else {
+                const onRunAbort = () => {
+                    try {
+                        controller.abort();
+                    }
+                    catch {
+                        // ignore
+                    }
+                };
+                runSignal.addEventListener("abort", onRunAbort, { once: true });
+                void settled.then(() => runSignal.removeEventListener("abort", onRunAbort));
+            }
+        }
+        this.calls.set(toolCallId, handle);
+        return handle;
+    }
+    /** Look up an in-flight call by id. Undefined for unknown/finished ids. */
+    get(toolCallId) {
+        return this.calls.get(toolCallId);
+    }
+    /**
+     * Mark a user-initiated stop and abort only this call's controller.
+     * Returns false for unknown/finished ids (no-op). Idempotent: a second
+     * stop for the same id keeps the first marker and reason.
+     */
+    markUserStop(toolCallId, reason) {
+        const handle = this.calls.get(toolCallId);
+        if (!handle)
+            return false;
+        if (!handle.userStopRequested) {
+            handle.userStopRequested = true;
+            handle.userStopReason = reason ?? DEFAULT_USER_STOP_REASON;
+            try {
+                handle.controller.abort();
+            }
+            catch {
+                // ignore — abort must never throw into the caller
+            }
+        }
+        return true;
+    }
+    /**
+     * Abort only the targeted call and resolve once it settles.
+     * Returns false for unknown/finished ids (no-op).
+     */
+    async stop(toolCallId, reason) {
+        if (!this.markUserStop(toolCallId, reason))
+            return false;
+        await this.calls.get(toolCallId)?.settled;
+        return true;
+    }
+    /** Settle an in-flight call. Called by the executor when execution ends. */
+    settle(toolCallId) {
+        this.calls.get(toolCallId)?.settle();
+    }
+    /** Settle and drop every tracked call. Called when a run starts/ends. */
+    clear() {
+        for (const handle of this.calls.values())
+            handle.settle();
+        this.calls.clear();
+    }
+}

package/dist/sdk/agent-core/tool-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-execution.d.ts","sourceRoot":"","sources":["../../../src/sdk/agent-core/tool-execution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,SAAS,EACT,aAAa,EAEd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,YAAY,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,qBAAqB,CAAC,CA2BhC;AAED,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAmXF;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAYlG"}
+{"version":3,"file":"tool-execution.d.ts","sourceRoot":"","sources":["../../../src/sdk/agent-core/tool-execution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,YAAY,EACZ,eAAe,EACf,SAAS,EACT,aAAa,EAEb,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAOtD;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,YAAY,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,qBAAqB,CAAC,CA2BhC;AAED,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AA0fF;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAYlG"}