@standardagents/builder 0.17.0-next.a4b7340 → 0.17.1

package/dist/runtime.js

@@ -195,6 +195,16 @@ function getGoogleFallbackPricing(modelId) {
   if (prefixMatch) return { ...prefixMatch.pricing, source: "google-static" };
   return null;
 }
+function getAnthropicFallbackPricing(modelId) {
+  const normalized = normalizeModelId(modelId);
+  let best = null;
+  for (const entry of ANTHROPIC_MODEL_PRICING_PREFIXES) {
+    if (normalized.startsWith(entry.prefix) && (!best || entry.prefix.length > best.prefix.length)) {
+      best = entry;
+    }
+  }
+  return best ? { ...best.pricing, source: "anthropic-static" } : null;
+}
 function getGroqFallbackPricing(modelId) {
   const pricing = GROQ_MODEL_PRICING[normalizeModelId(modelId)];
   return pricing ? { ...pricing, source: "groq-static" } : null;
@@ -225,6 +235,9 @@ function resolveModelPricing(modelDef, providerName) {
       source: "model"
     };
   }
+  if (providerName === "anthropic") {
+    return getAnthropicFallbackPricing(modelDef.model);
+  }
   if (providerName === "cerebras") {
     return getCerebrasFallbackPricing(modelDef.model);
   }
@@ -260,10 +273,29 @@ function calculateUsageCost(usage, pricing) {
     costTotal: roundCost(costInput + costOutput)
   };
 }
-var TOKENS_PER_MILLION, CEREBRAS_MODEL_PRICING, GOOGLE_MODEL_PRICING, GOOGLE_MODEL_PRICING_PREFIXES, GROQ_MODEL_PRICING, XAI_MODEL_PRICING;
+var TOKENS_PER_MILLION, ANTHROPIC_MODEL_PRICING_PREFIXES, CEREBRAS_MODEL_PRICING, GOOGLE_MODEL_PRICING, GOOGLE_MODEL_PRICING_PREFIXES, GROQ_MODEL_PRICING, XAI_MODEL_PRICING;
 var init_pricing = __esm({
   "src/agents/pricing.ts"() {
     TOKENS_PER_MILLION = 1e6;
+    ANTHROPIC_MODEL_PRICING_PREFIXES = [
+      { prefix: "claude-fable-5", pricing: { inputPrice: 10, outputPrice: 50, cachedPrice: 1 } },
+      { prefix: "claude-mythos", pricing: { inputPrice: 10, outputPrice: 50, cachedPrice: 1 } },
+      { prefix: "claude-opus-4-8", pricing: { inputPrice: 5, outputPrice: 25, cachedPrice: 0.5 } },
+      { prefix: "claude-opus-4-7", pricing: { inputPrice: 5, outputPrice: 25, cachedPrice: 0.5 } },
+      { prefix: "claude-opus-4-6", pricing: { inputPrice: 5, outputPrice: 25, cachedPrice: 0.5 } },
+      { prefix: "claude-opus-4-5", pricing: { inputPrice: 5, outputPrice: 25, cachedPrice: 0.5 } },
+      { prefix: "claude-opus-4-1", pricing: { inputPrice: 15, outputPrice: 75, cachedPrice: 1.5 } },
+      { prefix: "claude-opus-4", pricing: { inputPrice: 15, outputPrice: 75, cachedPrice: 1.5 } },
+      { prefix: "claude-sonnet-4-6", pricing: { inputPrice: 3, outputPrice: 15, cachedPrice: 0.3 } },
+      { prefix: "claude-sonnet-4-5", pricing: { inputPrice: 3, outputPrice: 15, cachedPrice: 0.3 } },
+      { prefix: "claude-sonnet-4", pricing: { inputPrice: 3, outputPrice: 15, cachedPrice: 0.3 } },
+      { prefix: "claude-haiku-4-5", pricing: { inputPrice: 1, outputPrice: 5, cachedPrice: 0.1 } },
+      { prefix: "claude-3-7-sonnet", pricing: { inputPrice: 3, outputPrice: 15, cachedPrice: 0.3 } },
+      { prefix: "claude-3-5-sonnet", pricing: { inputPrice: 3, outputPrice: 15, cachedPrice: 0.3 } },
+      { prefix: "claude-3-5-haiku", pricing: { inputPrice: 0.8, outputPrice: 4, cachedPrice: 0.08 } },
+      { prefix: "claude-3-opus", pricing: { inputPrice: 15, outputPrice: 75, cachedPrice: 1.5 } },
+      { prefix: "claude-3-haiku", pricing: { inputPrice: 0.25, outputPrice: 1.25, cachedPrice: 0.03 } }
+    ];
     CEREBRAS_MODEL_PRICING = {
       "zai-glm-4.7": {
         inputPrice: 2.25,
@@ -926,9 +958,9 @@ var init_ProviderRegistry = __esm({
           const fingerprint = this.getProviderFingerprint(providerName, modelDef);
           const cached = this.providerCache.get(modelName);
           if (cached?.fingerprint === fingerprint) {
-            return this.buildResult(cached.provider, modelDef);
+            return this.buildResult(cached.provider, modelDef, false);
           }
-          return this.cacheAndReturn(modelName, createTestProvider(), modelDef, fingerprint);
+          return this.cacheAndReturn(modelName, createTestProvider(), modelDef, fingerprint, false);
         }
         const apiKey = this.getApiKeyForProvider(providerName, env);
         if (apiKey) {
@@ -945,19 +977,19 @@ var init_ProviderRegistry = __esm({
           const fingerprint = this.getProviderFingerprint(providerName, modelDef, config);
           const cached = this.providerCache.get(modelName);
           if (cached?.fingerprint === fingerprint) {
-            return this.buildResult(cached.provider, modelDef);
+            return this.buildResult(cached.provider, modelDef, false);
           }
-          return this.cacheAndReturn(modelName, providerFactory(config), modelDef, fingerprint);
+          return this.cacheAndReturn(modelName, providerFactory(config), modelDef, fingerprint, false);
         }
         if (this.providerOverrideFn) {
           const overrideFingerprint = this.getProviderFingerprint(`override:${this.providerOverrideRevision}`, modelDef);
           const overrideCached = this.providerCache.get(modelName);
           if (overrideCached?.fingerprint === overrideFingerprint) {
-            return this.buildResult(overrideCached.provider, modelDef);
+            return this.buildResult(overrideCached.provider, modelDef, true);
           }
           const overrideProvider = this.providerOverrideFn(modelName, modelDef, env);
           if (overrideProvider) {
-            return this.cacheAndReturn(modelName, overrideProvider, modelDef, overrideFingerprint);
+            return this.cacheAndReturn(modelName, overrideProvider, modelDef, overrideFingerprint, true);
           }
         }
         const routing = resolvePlatformRouting(providerName, env);
@@ -969,18 +1001,18 @@ var init_ProviderRegistry = __esm({
           const fingerprint = this.getProviderFingerprint(`platform:${providerName}`, modelDef, config);
           const cached = this.providerCache.get(modelName);
           if (cached?.fingerprint === fingerprint) {
-            return this.buildResult(cached.provider, modelDef);
+            return this.buildResult(cached.provider, modelDef, true);
           }
-          return this.cacheAndReturn(modelName, providerFactory(config), modelDef, fingerprint);
+          return this.cacheAndReturn(modelName, providerFactory(config), modelDef, fingerprint, true);
         }
         throw new Error(`No API key found for provider: ${providerName}. Set the provider key or STANDARD_AGENTS_API_KEY.`);
       }
-      buildResult(provider, modelDef) {
-        return { provider, modelName: modelDef.model, modelDef };
+      buildResult(provider, modelDef, viaPlatform) {
+        return { provider, modelName: modelDef.model, modelDef, viaPlatform };
       }
-      cacheAndReturn(modelName, provider, modelDef, fingerprint) {
-        this.providerCache.set(modelName, { provider, fingerprint });
-        return this.buildResult(provider, modelDef);
+      cacheAndReturn(modelName, provider, modelDef, fingerprint, viaPlatform) {
+        this.providerCache.set(modelName, { provider, fingerprint, viaPlatform });
+        return this.buildResult(provider, modelDef, viaPlatform);
       }
       getProviderFingerprint(providerName, modelDef, config) {
         return JSON.stringify({
@@ -1413,6 +1445,23 @@ function convertUsage(usage) {
     provider: usage.provider
   };
 }
+function inferProviderFromModelId(model) {
+  const trimmed = model?.trim();
+  if (!trimmed) return null;
+  const slashIndex = trimmed.indexOf("/");
+  if (slashIndex <= 0) return null;
+  return trimmed.slice(0, slashIndex);
+}
+function inferInitialActualProvider(providerName, modelDef) {
+  if (providerName !== "openrouter") return null;
+  return inferProviderFromModelId(modelDef.model);
+}
+function normalizeProviderMetadataValue(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed || trimmed.toLowerCase() === "unknown") return void 0;
+  return trimmed;
+}
 var NON_VISION_PLACEHOLDER_TEXT, LLMRequest;
 var init_LLMRequest = __esm({
   "src/agents/LLMRequest.ts"() {
@@ -1581,6 +1630,7 @@ var init_LLMRequest = __esm({
             console.error("Failed to get provider name:", err);
           }
           const { requestBody, visionFiltering } = buildRequestBody(context, modelDef);
+          const initialActualProvider = inferInitialActualProvider(providerName, modelDef);
           const requestBodyForLog = {
             ...requestBody,
             messages: stripBase64FromMessages(
@@ -1599,6 +1649,7 @@ var init_LLMRequest = __esm({
             id,
             message_id: state.rootMessageId || crypto.randomUUID(),
             provider: providerName || this.getProviderFromModel(modelId),
+            actual_provider: initialActualProvider ?? void 0,
             model: modelId,
             model_name: modelDef.model,
             endpoint: "chat.completions",
@@ -1619,14 +1670,15 @@ var init_LLMRequest = __esm({
               await state.storage.sql.exec(
                 `
           INSERT INTO logs (
-            id, message_id, provider, model, model_name, endpoint,
+            id, message_id, provider, actual_provider, model, model_name, endpoint,
             request_body, tools_available, message_history_length, prompt_name,
             parent_log_id, retry_of_log_id, tools_schema, system_prompt, is_complete, created_at
-          ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16)
+          ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)
         `,
                 logData.id,
                 logData.message_id,
                 logData.provider,
+                logData.actual_provider,
                 logData.model,
                 logData.model_name,
                 logData.endpoint,
@@ -1661,7 +1713,7 @@ var init_LLMRequest = __esm({
        */
       static async callModel(modelId, context, state, logId) {
         const { ProviderRegistry: ProviderRegistry2 } = await Promise.resolve().then(() => (init_providers(), providers_exports));
-        const { provider, modelName, modelDef } = await ProviderRegistry2.getProvider(
+        const { provider, modelName, modelDef, viaPlatform } = await ProviderRegistry2.getProvider(
           modelId,
           state.env,
           state.thread.instance
@@ -1795,6 +1847,7 @@ var init_LLMRequest = __esm({
               }
             };
             response._provider = provider;
+            response._viaPlatform = viaPlatform;
             response._providerResponseId = providerResponseId;
             response._aggregate_response = {
               id: responseId,
@@ -1872,12 +1925,12 @@ var init_LLMRequest = __esm({
         try {
           const toolsCalled = response.tool_calls ? JSON.stringify(response.tool_calls.map((tc) => tc.function.name)) : null;
           const providerName = response._provider?.name;
-          const standardAgentsRouterUsed = providerName === "platform";
+          const standardAgentsRouterUsed = response._viaPlatform === true || providerName === "platform";
           const resolvedPricing = resolveModelPricing(modelDef, providerName);
           const calculatedCost = calculateUsageCost(response.usage, resolvedPricing);
           const providerReportedCost = typeof response.usage.cost === "number" ? response.usage.cost : typeof response.usage.cost === "string" ? parseFloat(response.usage.cost) : null;
           const cost_total = providerReportedCost != null && !Number.isNaN(providerReportedCost) ? providerReportedCost : calculatedCost?.costTotal ?? null;
-          const actualProvider = response.usage.provider;
+          const actualProvider = normalizeProviderMetadataValue(response.usage.provider) ?? null;
           const aggregateResponse = response._aggregate_response;
           const responseBody = aggregateResponse ? JSON.stringify(aggregateResponse) : JSON.stringify(response);
           const providerTools = [];
@@ -2305,8 +2358,13 @@ ${errorStack}` : ""}${errorDetails}`;
         }).catch((err) => {
           console.error("Async metadata fetch failed (non-fatal):", err);
         });
-        state.rootState.pendingMetadataPromises = state.rootState.pendingMetadataPromises || [];
-        state.rootState.pendingMetadataPromises.push(metadataPromise);
+        const rootState = state.rootState || state;
+        rootState.pendingMetadataPromises = rootState.pendingMetadataPromises || [];
+        rootState.pendingMetadataPromises.push(metadataPromise);
+        if (rootState !== state) {
+          state.pendingMetadataPromises = state.pendingMetadataPromises || [];
+          state.pendingMetadataPromises.push(metadataPromise);
+        }
       }
       /**
        * Update log record with async metadata from provider.
@@ -2316,9 +2374,12 @@ ${errorStack}` : ""}${errorDetails}`;
           const updates = [];
           const values = [];
           let paramIndex = 1;
-          if (metadata.actual_provider !== void 0) {
+          const actualProvider = normalizeProviderMetadataValue(
+            metadata.actual_provider ?? metadata.actualProvider ?? metadata.providerName
+          );
+          if (actualProvider !== void 0) {
             updates.push(`actual_provider = ?${paramIndex++}`);
-            values.push(metadata.actual_provider);
+            values.push(actualProvider);
           }
           if (metadata.generation_cost !== void 0) {
             updates.push(`cost_total = ?${paramIndex++}`);
@@ -2336,7 +2397,7 @@ ${errorStack}` : ""}${errorDetails}`;
               log_id: logId,
               data: {
                 id: logId,
-                ...metadata.actual_provider !== void 0 && { actual_provider: metadata.actual_provider },
+                ...actualProvider !== void 0 && { actual_provider: actualProvider },
                 ...metadata.generation_cost !== void 0 && { cost_total: metadata.generation_cost }
               }
             });
@@ -3062,6 +3123,11 @@ var init_ToolExecutor = __esm({
         state.sequence.queue.push(...toolCalls);
         state.sequence.isHandling = true;
         while (state.sequence.queue.length > 0) {
+          if (state.stopped) {
+            state.sequence.queue = [];
+            state.sequence.isHandling = false;
+            break;
+          }
           if (await state.thread.instance.shouldStop() || state.abortController?.signal.aborted) {
             state.sequence.queue = [];
             state.sequence.isHandling = false;
@@ -3090,7 +3156,17 @@ var init_ToolExecutor = __esm({
               });
               continue;
             }
-            const result = await this.executeToolCall(call, state, toolMessageId);
+            const previousToolCall = state.currentToolCall;
+            state.currentToolCall = {
+              id: call.id,
+              name: call.function.name
+            };
+            let result;
+            try {
+              result = await this.executeToolCall(call, state, toolMessageId);
+            } finally {
+              state.currentToolCall = previousToolCall;
+            }
             if (result.status === "error") {
               const error = new Error(result.error || "Tool execution failed");
               if (result.stack) {
@@ -4959,6 +5035,11 @@ ${attachmentPaths}`;
             }
           }
           const toolStatus = processedResult.status === "success" ? "success" : "error";
+          const parentNotifications = this.consumeParentNotificationsForToolCall(
+            state,
+            call
+          );
+          const notificationContent = parentNotifications[parentNotifications.length - 1]?.content;
           let message = {
             id: messageId,
             role: "tool",
@@ -4972,15 +5053,20 @@ ${attachmentPaths}`;
             parent_id: state.parentMessageId || null,
             depth: state.depth,
             attachments: attachmentRefs && attachmentRefs.length > 0 ? JSON.stringify(attachmentRefs) : null,
-            subagent_id: typeof processedResult.subagent_id === "string" && processedResult.subagent_id.trim().length > 0 ? processedResult.subagent_id.trim() : null
+            subagent_id: typeof processedResult.subagent_id === "string" && processedResult.subagent_id.trim().length > 0 ? processedResult.subagent_id.trim() : null,
+            metadata: parentNotifications.length > 0 ? {
+              parent_notification: true,
+              parent_notifications: parentNotifications,
+              parent_notification_content: notificationContent
+            } : void 0
           };
           message = await FlowEngine2.runBeforeCreateMessageHook(state, message);
           message.created_at = Date.now() * TIMESTAMP_MULTIPLIER;
           const currentPrompt = state.promptPath.length > 0 ? state.promptPath[state.promptPath.length - 1] : null;
           await state.storage.sql.exec(
             `
-        INSERT INTO messages (id, role, content, name, tool_call_id, created_at, tool_status, parent_id, depth, attachments, subagent_id, prompt)
-        VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)
+        INSERT INTO messages (id, role, content, name, tool_call_id, created_at, tool_status, parent_id, depth, attachments, subagent_id, prompt, metadata)
+        VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)
       `,
             message.id,
             message.role,
@@ -4993,7 +5079,8 @@ ${attachmentPaths}`;
             message.depth,
             message.attachments,
             message.subagent_id ?? null,
-            currentPrompt
+            currentPrompt,
+            message.metadata ? JSON.stringify(message.metadata) : null
           );
           await FlowEngine2.runAfterCreateMessageHook(state, message);
           const parentLogId = state.currentLogId || null;
@@ -5058,6 +5145,23 @@ ${attachmentPaths}`;
           await this.logError(state, error, `storeToolResult:${call.function.name}`);
         }
       }
+      static consumeParentNotificationsForToolCall(state, call) {
+        const pending = state.parentNotifications ?? [];
+        if (pending.length === 0) return [];
+        const matched = [];
+        const remaining = [];
+        for (const notification of pending) {
+          const matchesCallId = notification.toolCallId === call.id;
+          const matchesToolName = !notification.toolCallId && notification.toolName === call.function.name;
+          if (matchesCallId || matchesToolName) {
+            matched.push(notification);
+          } else {
+            remaining.push(notification);
+          }
+        }
+        state.parentNotifications = remaining;
+        return matched;
+      }
       static async createSilentGeneratedAssetPathMessagesFromToolResult(state, sourceToolMessage, refs, enabled) {
         if (!enabled || !refs || refs.length === 0) {
           return;
@@ -5519,6 +5623,8 @@ var init_FlowEngine = __esm({
           stoppedBy: state.stoppedBy,
           stopReason: state.stopReason,
           stopReasonCode: state.stopReasonCode,
+          sessionStopped: state.sessionStopped,
+          sessionStopResult: state.sessionStopResult,
           stepCount: state.stepCount,
           stream: state.stream.httpStream
         };
@@ -5718,6 +5824,8 @@ var init_FlowEngine = __esm({
           stoppedBy: stateInput.stoppedBy,
           stopReason: stateInput.stopReason,
           stopReasonCode: stateInput.stopReasonCode,
+          sessionStopped: stateInput.sessionStopped,
+          sessionStopResult: stateInput.sessionStopResult,
           messageHistory: [],
           sequence: stateInput.sequence || {
             queue: [],
@@ -5977,7 +6085,7 @@ var init_FlowEngine = __esm({
             max_session_turns: newAgentDef.maxSessionTurns ?? null,
             side_a_label: newAgentDef.sideA?.label ?? null,
             side_a_agent_prompt: newAgentDef.sideA?.prompt ?? null,
-            side_a_stop_on_response: newAgentDef.sideA?.stopOnResponse ?? false,
+            side_a_stop_on_response: newAgentDef.sideA?.stopOnResponse ?? true,
             side_a_stop_tool: newAgentDef.sideA?.stopTool ?? null,
             side_a_stop_tool_response_property: newAgentDef.sideA?.stopToolResponseProperty ?? null,
             side_a_max_steps: newAgentDef.sideA?.maxSteps ?? null,
@@ -5992,7 +6100,7 @@ var init_FlowEngine = __esm({
             side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
             side_b_label: newAgentDef.sideB?.label ?? null,
             side_b_agent_prompt: newAgentDef.sideB?.prompt ?? null,
-            side_b_stop_on_response: newAgentDef.sideB?.stopOnResponse ?? false,
+            side_b_stop_on_response: newAgentDef.sideB?.stopOnResponse ?? true,
             side_b_stop_tool: newAgentDef.sideB?.stopTool ?? null,
             side_b_stop_tool_response_property: newAgentDef.sideB?.stopToolResponseProperty ?? null,
             side_b_max_steps: newAgentDef.sideB?.maxSteps ?? null,
@@ -11687,34 +11795,79 @@ var init_ThreadStateImpl = __esm({
         this._metadata.tenvs = nextEnv;
       }
       async notifyParent(content) {
-        if (!content || !content.trim()) {
+        const trimmedContent = content?.trim();
+        if (!trimmedContent) {
           throw new Error("notifyParent requires non-empty content");
         }
-        const { parentThreadId, parentStub } = await this._getParentThreadStub();
-        if (typeof parentStub.queueMessage !== "function") {
-          throw new Error("notifyParent is not supported by this thread runtime");
+        if (this._flowState) {
+          const currentToolCall = this._flowState.currentToolCall;
+          const notification = {
+            content: trimmedContent,
+            toolCallId: currentToolCall?.id ?? null,
+            toolName: currentToolCall?.name ?? this._flowState.active?.tool ?? null,
+            created_at: Date.now() * 1e3
+          };
+          this._flowState.parentNotifications = [
+            ...this._flowState.parentNotifications ?? [],
+            notification
+          ];
+        }
+        const parentTarget = await this._getOptionalParentThreadStub();
+        if (parentTarget && typeof parentTarget.parentStub.queueMessage === "function") {
+          await parentTarget.parentStub.queueMessage(parentTarget.parentThreadId, {
+            role: "user",
+            content: trimmedContent,
+            silent: true,
+            metadata: { subagent_id: this.threadId }
+          });
         }
-        await parentStub.queueMessage(parentThreadId, {
-          role: "user",
-          content: content.trim(),
-          silent: true,
-          metadata: { subagent_id: this.threadId }
-        });
       }
       async setStatus(status) {
         if (!status || !status.trim()) {
           throw new Error("setStatus requires non-empty status");
         }
-        const { parentThreadId, parentStub } = await this._getParentThreadStub();
-        if (typeof parentStub.updateChildRegistryStatus !== "function") {
-          throw new Error("setStatus is not supported by this thread runtime");
+        const parentTarget = await this._getOptionalParentThreadStub();
+        if (!parentTarget || typeof parentTarget.parentStub.updateChildRegistryStatus !== "function") {
+          return;
         }
-        await parentStub.updateChildRegistryStatus(
-          parentThreadId,
+        await parentTarget.parentStub.updateChildRegistryStatus(
+          parentTarget.parentThreadId,
           this.threadId,
           status.trim()
         );
       }
+      async stopSession(options = {}) {
+        if (!this._flowState) {
+          throw new Error("stopSession requires active execution");
+        }
+        const notifyParent = options.notifyParent?.trim();
+        if (options.notifyParent !== void 0 && !notifyParent) {
+          throw new Error("stopSession notifyParent requires non-empty content");
+        }
+        const status = options.status?.trim();
+        if (options.status !== void 0 && !status) {
+          throw new Error("stopSession status requires non-empty status");
+        }
+        if (notifyParent) {
+          await this.notifyParent(notifyParent);
+        }
+        if (status) {
+          await this.setStatus(status);
+        }
+        const result = options.result?.trim() || "Session stopped.";
+        this._flowState.sessionStopped = true;
+        this._flowState.sessionStopResult = result;
+        this._flowState.stopped = true;
+        this._flowState.stoppedBy = this._flowState.currentSide;
+        this._flowState.stopReason = "Session stopped by state.stopSession()";
+        this._flowState.stopReasonCode = "state_stop_session";
+        this._flowState.emitTelemetry?.({
+          type: "stopped",
+          reason: this._flowState.stopReason,
+          side: this._flowState.currentSide,
+          timestamp: Date.now()
+        });
+      }
       async getChildThread(referenceId) {
         const agentBuilder = this._getAgentBuilderStub();
         const child = await agentBuilder.getThread(referenceId);
@@ -12127,19 +12280,47 @@ var init_ThreadStateImpl = __esm({
         return Object.keys(normalized).length > 0 ? normalized : null;
       }
       async _getParentThreadId() {
+        const parent = await this._getOptionalParentThreadId();
+        if (!parent) {
+          throw new Error(`Thread ${this.threadId} has no parent thread`);
+        }
+        return parent;
+      }
+      async _getOptionalParentThreadId() {
         const metadataParent = typeof this._metadata.parent === "string" && this._metadata.parent.trim().length > 0 ? this._metadata.parent.trim() : null;
         if (metadataParent) {
           return metadataParent;
         }
-        const agentBuilder = this._getAgentBuilderStub();
-        const thread = await agentBuilder.getThread(this.threadId);
+        let thread = null;
+        try {
+          const agentBuilder = this._getAgentBuilderStub();
+          thread = await agentBuilder.getThread(this.threadId);
+        } catch {
+          return null;
+        }
         const parent = thread && typeof thread.parent === "string" && thread.parent.trim().length > 0 ? thread.parent.trim() : null;
-        if (!parent) {
-          throw new Error(`Thread ${this.threadId} has no parent thread`);
+        if (parent) {
+          this._metadata.parent = parent;
         }
-        this._metadata.parent = parent;
         return parent;
       }
+      async _getOptionalParentThreadStub() {
+        const parentThreadId = await this._getOptionalParentThreadId();
+        if (!parentThreadId) {
+          return null;
+        }
+        try {
+          const threadNamespace = this._threadInstance.env.AGENT_BUILDER_THREAD;
+          if (!threadNamespace || typeof threadNamespace.idFromName !== "function" || typeof threadNamespace.get !== "function") {
+            return null;
+          }
+          const durableId = threadNamespace.idFromName(parentThreadId);
+          const parentStub = threadNamespace.get(durableId);
+          return { parentThreadId, parentStub };
+        } catch {
+          return null;
+        }
+      }
       async _getParentThreadStub() {
         const parentThreadId = await this._getParentThreadId();
         const durableId = this._threadInstance.env.AGENT_BUILDER_THREAD.idFromName(parentThreadId);
@@ -14208,6 +14389,7 @@ function createEndpointThreadStateBridge(state) {
     setEnv: (propertyName, value, options) => state.setEnv(propertyName, value, options),
     notifyParent: (content) => state.notifyParent(content),
     setStatus: (status) => state.setStatus(status),
+    stopSession: (options) => state.stopSession(options),
     queueTool: (toolName, args) => state.queueTool(toolName, args),
     invokeTool: (toolName, args) => state.invokeTool(toolName, args),
     scheduleEffect: (name, args, delay) => state.scheduleEffect(name, args, delay),
@@ -15427,6 +15609,15 @@ var DurableThread = class extends DurableObject {
     const terminalToolNames = await this.getTerminalSessionToolNames(agentId);
     const sessionFailToolNames = terminalToolNames.fail;
     const hasTerminalSessionTools = terminalToolNames.all.size > 0;
+    if (flowResult.sessionStopped) {
+      await emitParentHandoffStatus("result");
+      return {
+        status: "success",
+        result: flowResult.sessionStopResult?.trim() || "Session stopped.",
+        attachments: void 0,
+        terminal: true
+      };
+    }
     const latestInRunCursor = await this.ctx.storage.sql.exec(
       `
       SELECT role, name, content, tool_status, attachments
@@ -16006,27 +16197,30 @@ ${paths.join("\n")}`;
     if (!parentThreadId || !flowResult.stopped) {
       return;
     }
+    const sessionStopped = flowResult.sessionStopped === true;
     const terminalToolNames = await this.getTerminalSessionToolNames(agentName);
     const sessionFailToolNames = terminalToolNames.fail;
     const hasTerminalSessionTools = terminalToolNames.all.size > 0;
-    const latestTerminalMessage = hasTerminalSessionTools ? await this.getLatestTerminalSessionMessageAfter(
+    const latestTerminalMessage = !sessionStopped && hasTerminalSessionTools ? await this.getLatestTerminalSessionMessageAfter(
       previousTopLevelMessageId,
       terminalToolNames.all
     ) : null;
-    const latest = latestTerminalMessage ?? await this.getLatestTopLevelMessage();
-    if (!latest && !hasTerminalSessionTools) {
+    const latest = sessionStopped ? null : latestTerminalMessage ?? await this.getLatestTopLevelMessage();
+    if (!sessionStopped && !latest && !hasTerminalSessionTools) {
       return;
     }
-    if (latest && latest.id === previousTopLevelMessageId && !hasTerminalSessionTools) {
+    if (!sessionStopped && latest && latest.id === previousTopLevelMessageId && !hasTerminalSessionTools) {
       return;
     }
     const isTerminalSessionMessage = !!latest && latest.role === "tool" && !!latest.name && terminalToolNames.all.has(latest.name);
     const isFailSessionTerminal = isTerminalSessionMessage && !!latest.name && sessionFailToolNames.has(latest.name);
     const isSuccessfulTerminalSessionMessage = isTerminalSessionMessage && latest?.tool_status !== "error";
-    const isFailureWithoutTerminalMessage = hasTerminalSessionTools && !isSuccessfulTerminalSessionMessage;
+    const isFailureWithoutTerminalMessage = !sessionStopped && hasTerminalSessionTools && !isSuccessfulTerminalSessionMessage;
     const isErrorTerminal = latest?.tool_status === "error" || isFailSessionTerminal || isFailureWithoutTerminalMessage;
     let refs = [];
-    if (hasTerminalSessionTools) {
+    if (sessionStopped) {
+      refs = [];
+    } else if (hasTerminalSessionTools) {
       refs = this.parseAttachmentRefsJson(latestTerminalMessage?.attachments ?? null) ?? [];
     } else if (latest?.attachments) {
       refs = this.parseAttachmentRefsJson(latest.attachments) ?? [];
@@ -16044,7 +16238,7 @@ ${paths.join("\n")}`;
         parentStub,
         `from-subagent-${threadId}`
       );
-      const resultContent = isFailureWithoutTerminalMessage ? this.buildMissingTerminalSessionFailure(flowResult) : latest?.content || (isErrorTerminal ? "Subagent execution failed." : "Subagent completed.");
+      const resultContent = sessionStopped ? flowResult.sessionStopResult?.trim() || "Session stopped." : isFailureWithoutTerminalMessage ? this.buildMissingTerminalSessionFailure(flowResult) : latest?.content || (isErrorTerminal ? "Subagent execution failed." : "Subagent completed.");
       const attachmentSummary = this.formatSubagentAttachmentPathSummary(copiedRefs);
       const messageContent = isErrorTerminal ? `Subagent (reference: ${threadId}) has reported a failure:
 
@@ -16060,7 +16254,7 @@ ${resultContent}${attachmentSummary}`;
           metadata: { subagent_id: threadId }
         });
       }
-      const terminalChildRun = hasTerminalSessionTools;
+      const terminalChildRun = sessionStopped || hasTerminalSessionTools;
       await parentStub.updateChildRegistryStatus(
         parentThreadId,
         threadId,
@@ -17473,7 +17667,7 @@ ${resultContent}${attachmentSummary}`;
         max_session_turns: agentDef.maxSessionTurns,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
-        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? false,
+        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
@@ -17488,7 +17682,7 @@ ${resultContent}${attachmentSummary}`;
         side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
-        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
+        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? true,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,
@@ -17666,7 +17860,7 @@ ${resultContent}${attachmentSummary}`;
         max_session_turns: agentDef.maxSessionTurns,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
-        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? false,
+        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
@@ -17681,7 +17875,7 @@ ${resultContent}${attachmentSummary}`;
         side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
-        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
+        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? true,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,
@@ -17812,7 +18006,7 @@ ${resultContent}${attachmentSummary}`;
         max_session_turns: agentDef.maxSessionTurns,
         side_a_label: agentDef.sideA?.label,
         side_a_agent_prompt: qualifyPromptName(agentDef.sideA?.prompt),
-        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? false,
+        side_a_stop_on_response: agentDef.sideA?.stopOnResponse ?? true,
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
@@ -17827,7 +18021,7 @@ ${resultContent}${attachmentSummary}`;
         side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
-        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
+        side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? true,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,