@agent-native/core 0.68.0 → 0.68.1

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @agent-native/core
 
+## 0.68.1
+
+### Patch Changes
+
+- 48356d7: Forward Builder gateway heartbeat JSONL frames through the engine and agent SSE stream so long upstream silences (adaptive thinking, TTFT) do not trip the client no-progress timeout.
+- 48356d7: Fix guided question selection UX: preserve answers across poll refreshes, pause polling while a form is open, show clearer selected-state affordances (including `aria-pressed` on option buttons), and stop duplicate Explore/Decide injection in Design question flows.
+- 48356d7: Resume page-load chat reconnect from the last seen run event seq instead of replaying the full SSE history, preventing duplicated assistant turns after refresh.
+
 ## 0.68.0
 
 ### Minor Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.68.0",
+  "version": "0.68.1",
   "type": "module",
   "engines": {
     "node": ">=22"

package/corpus/core/src/agent/engine/builder-engine.ts

@@ -58,6 +58,8 @@ export const BUILDER_SUPPORTED_MODELS = BUILDER_MODEL_CONFIG.supportedModels;
 // (Netlify synchronous Functions are 60s) hard-kill the invocation.
 const DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS = 45_000;
 const MAX_BUILDER_GATEWAY_TIMEOUT_MS = 45_000;
+/** Local ai-services has no serverless wall; allow longer streams in dev. */
+const MAX_LOCAL_BUILDER_GATEWAY_TIMEOUT_MS = 180_000;
 const BUILDER_GATEWAY_NETWORK_ERROR_CODE = "builder_gateway_network_error";
 
 export const BUILDER_DEFAULT_MODEL = BUILDER_MODEL_CONFIG.defaultModel;
@@ -533,6 +535,10 @@ async function* parseJsonlStream(
           };
           break;
 
+        case "heartbeat":
+          yield { type: "gateway-heartbeat" };
+          break;
+
         case "tool-call": {
           flushPending();
           parts.push({
@@ -749,14 +755,27 @@ export function createBuilderEngine(
   return new BuilderEngine();
 }
 
+function resolveMaxBuilderGatewayTimeoutMs(): number {
+  try {
+    const base = getBuilderGatewayBaseUrl();
+    if (/^https?:\/\/(localhost|127\.0\.0\.1)([:/]|$)/i.test(base)) {
+      return MAX_LOCAL_BUILDER_GATEWAY_TIMEOUT_MS;
+    }
+  } catch {
+    // ignore malformed override
+  }
+  return MAX_BUILDER_GATEWAY_TIMEOUT_MS;
+}
+
 function getBuilderGatewayTimeoutMs(): number {
   const raw = process.env.AGENT_NATIVE_BUILDER_GATEWAY_TIMEOUT_MS;
-  if (!raw) return DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
+  const maxMs = resolveMaxBuilderGatewayTimeoutMs();
+  if (!raw) return maxMs;
   const parsed = Number(raw);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    return DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
+    return maxMs;
   }
-  return Math.min(parsed, MAX_BUILDER_GATEWAY_TIMEOUT_MS);
+  return Math.min(parsed, maxMs);
 }
 
 function createGatewayAbortSignal(

package/corpus/core/src/agent/engine/types.ts

@@ -141,6 +141,7 @@ export type EngineEvent =
   | { type: "thinking-delta"; text: string; signature?: string }
   | { type: "tool-input-start"; id?: string; name?: string }
   | { type: "tool-input-delta"; id?: string; name?: string; text?: string }
+  | { type: "gateway-heartbeat" }
   | { type: "tool-call"; id: string; name: string; input: unknown }
   | {
       type: "tool-call-error";

package/corpus/core/src/agent/production-agent.ts

@@ -2573,6 +2573,8 @@ export async function runAgentLoop(opts: {
               event.name ??
               (event.id ? toolInputNames.get(event.id) : undefined);
             sendToolInputActivity(toolName);
+          } else if (event.type === "gateway-heartbeat") {
+            send({ type: "stream_keepalive" });
           } else if (event.type === "tool-call") {
             // The authoritative tool-call blocks arrive in assistant-content.
           } else if (event.type === "tool-call-error") {

package/corpus/core/src/agent/types.ts

@@ -169,6 +169,7 @@ export type AgentChatEvent =
   | { type: "text"; text: string }
   | { type: "thinking"; text: string }
   | { type: "activity"; label: string; tool?: string }
+  | { type: "stream_keepalive" }
   | { type: "tool_start"; tool: string; input: Record<string, string> }
   | {
       type: "tool_done";

package/corpus/core/src/client/AssistantChat.tsx

@@ -50,7 +50,12 @@ import type {
   ChatThreadSnapshot,
 } from "./use-chat-threads.js";
 import { useAgentEngineConfigured } from "./use-agent-engine-configured.js";
-import { getActiveRun } from "./active-run-state.js";
+import {
+  getActiveRun,
+  resolveReconnectAfterSeq,
+  setActiveRun,
+  updateActiveRunSeq,
+} from "./active-run-state.js";
 import {
   AgentAutoContinueSignal,
   type ContentPart,
@@ -1247,6 +1252,7 @@ const AssistantChatInner = forwardRef<
   // When stop is clicked during reconnect, keep content visible (don't wipe it)
   const [reconnectFrozen, setReconnectFrozen] = useState(false);
   const reconnectRunIdRef = useRef<string | null>(null);
+  const [reconnectAfterSeq, setReconnectAfterSeq] = useState(0);
   const reconnectAbortRef = useRef<AbortController | null>(null);
   // Nuclear stop: user clicked stop. Clears the stop button/indicator AND
   // lets new submissions go through immediately — prevents the "stuck
@@ -1456,6 +1462,13 @@ const AssistantChatInner = forwardRef<
       if (reconnectRunIdRef.current === runId) return true;
 
       reconnectRunIdRef.current = runId;
+      const afterSeq = resolveReconnectAfterSeq(threadId, runId);
+      setReconnectAfterSeq(afterSeq);
+      setActiveRun({
+        threadId,
+        runId,
+        lastSeq: afterSeq > 0 ? afterSeq - 1 : -1,
+      });
       setIsReconnecting(true);
       setReconnectFrozen(false);
       setReconnectContent([]);
@@ -1498,9 +1511,16 @@ const AssistantChatInner = forwardRef<
       const streamReconnect = async () => {
         let noProgressDuringReconnect = false;
         let latestContent: ContentPart[] = [];
+        const threadPollInterval =
+          afterSeq > 0
+            ? window.setInterval(() => {
+                if (reconnectRunIdRef.current !== runId) return;
+                void refreshThreadFromServer();
+              }, 2000)
+            : undefined;
         try {
           const sseRes = await fetch(
-            `${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=0`,
+            `${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=${afterSeq}`,
             { signal: abortCtrl.signal },
           );
           if (sseRes.ok && sseRes.body) {
@@ -1511,6 +1531,7 @@ const AssistantChatInner = forwardRef<
             let rafPending = false;
             let latestSnapshot: ContentPart[] = [];
             const scheduleUpdate = (snapshot: ContentPart[]) => {
+              if (afterSeq > 0) return;
               latestSnapshot = snapshot;
               if (rafPending) return;
               rafPending = true;
@@ -1526,8 +1547,11 @@ const AssistantChatInner = forwardRef<
               toolCallCounter,
               tabId,
               scheduleUpdate,
+              (seq) => updateActiveRunSeq(seq),
             );
-            setReconnectContent([...content]);
+            if (afterSeq === 0) {
+              setReconnectContent([...content]);
+            }
           }
         } catch (err) {
           if (
@@ -1543,6 +1567,9 @@ const AssistantChatInner = forwardRef<
             noProgressDuringReconnect = true;
           }
         } finally {
+          if (threadPollInterval !== undefined) {
+            window.clearInterval(threadPollInterval);
+          }
           clearInterval(watchdog);
           clearTimeout(maxReconnectTimer);
         }
@@ -1570,9 +1597,17 @@ const AssistantChatInner = forwardRef<
           } catch {
             // Best effort — the important part is unwinding the UI.
           }
-          settleInterruptedToolCalls(latestContent);
-          setReconnectContent([...latestContent]);
-          setReconnectFrozen(latestContent.length > 0);
+          if (afterSeq > 0) {
+            // Tail-resume only replays new events; never freeze that slice as a
+            // complete assistant turn — the server thread is authoritative.
+            await refreshThreadFromServer();
+            setReconnectContent([]);
+            setReconnectFrozen(false);
+          } else {
+            settleInterruptedToolCalls(latestContent);
+            setReconnectContent([...latestContent]);
+            setReconnectFrozen(latestContent.length > 0);
+          }
           setRunErrorInfo({
             message:
               "The previous agent run stopped producing visible progress while reconnecting, so it was stopped before it could keep looping.",
@@ -1584,6 +1619,7 @@ const AssistantChatInner = forwardRef<
           reconnectAbortRef.current = null;
           setIsReconnecting(false);
           reconnectRunIdRef.current = null;
+          setReconnectAfterSeq(0);
           window.dispatchEvent(
             new CustomEvent("agentNative.chatRunning", {
               detail: { isRunning: false, tabId: tabId || threadId },
@@ -1610,6 +1646,7 @@ const AssistantChatInner = forwardRef<
           reconnectAbortRef.current = null;
           setIsReconnecting(false);
           reconnectRunIdRef.current = null;
+          setReconnectAfterSeq(0);
           window.dispatchEvent(
             new CustomEvent("agentNative.chatRunning", {
               detail: { isRunning: false, tabId: tabId || threadId },
@@ -2360,6 +2397,7 @@ const AssistantChatInner = forwardRef<
       reconnectAbortRef.current?.abort();
       reconnectAbortRef.current = null;
       reconnectRunIdRef.current = null;
+      setReconnectAfterSeq(0);
       setIsReconnecting(false);
       setReconnectFrozen(reconnectContent.length > 0);
     }
@@ -3159,6 +3197,7 @@ const AssistantChatInner = forwardRef<
                         />
                       )}
                       {(isReconnecting || reconnectFrozen) &&
+                        reconnectAfterSeq === 0 &&
                         reconnectContent.length > 0 && (
                           <ReconnectStreamMessage content={reconnectContent} />
                         )}

package/corpus/core/src/client/active-run-state.ts

@@ -35,3 +35,19 @@ export function clearActiveRun(): void {
     sessionStorage.removeItem(STORAGE_KEY);
   } catch {}
 }
+
+/** Resume reconnect SSE after the last seen event (0 = replay from the start). */
+export function resolveReconnectAfterSeq(
+  threadId: string,
+  runId: string,
+): number {
+  const stored = getActiveRun();
+  if (
+    stored?.threadId === threadId &&
+    stored?.runId === runId &&
+    Number.isFinite(stored.lastSeq)
+  ) {
+    return stored.lastSeq + 1;
+  }
+  return 0;
+}

package/corpus/core/src/client/guided-questions.tsx

@@ -357,6 +357,37 @@ function optionKey(option: GuidedQuestionOption): string {
   return `${option.value.toLowerCase()}::${option.label.toLowerCase()}`;
 }
 
+/** Stable content hash so poll refreshes do not reset in-progress answers. */
+export function guidedQuestionsFingerprint(
+  questions: GuidedQuestion[],
+): string {
+  return JSON.stringify(
+    questions.map((question) => ({
+      id: question.id,
+      type: question.type,
+      header: question.header ?? null,
+      question: question.question,
+      description: question.description ?? null,
+      multiSelect: question.multiSelect ?? false,
+      required: question.required ?? false,
+      allowOther: question.allowOther ?? null,
+      includeExplore: question.includeExplore ?? null,
+      includeDecide: question.includeDecide ?? null,
+      min: question.min ?? null,
+      max: question.max ?? null,
+      step: question.step ?? null,
+      placeholder: question.placeholder ?? null,
+      options: (question.options ?? question.choices ?? []).map((option) => ({
+        label: option.label,
+        value: option.value,
+        color: option.color ?? null,
+        description: option.description ?? null,
+        recommended: option.recommended ?? false,
+      })),
+    })),
+  );
+}
+
 function withDefaultOptions(question: GuidedQuestion): GuidedQuestionOption[] {
   const base = question.options ?? question.choices ?? [];
   const seen = new Set(base.map(optionKey));
@@ -403,10 +434,14 @@ export function GuidedQuestionFlow({
   className,
 }: GuidedQuestionFlowProps) {
   const [answers, setAnswers] = useState<GuidedQuestionAnswers>({});
+  const questionsFingerprint = useMemo(
+    () => guidedQuestionsFingerprint(questions),
+    [questions],
+  );
 
   useEffect(() => {
     setAnswers({});
-  }, [questions]);
+  }, [questionsFingerprint]);
 
   const setAnswer = useCallback((id: string, value: unknown) => {
     setAnswers((prev) => ({ ...prev, [id]: value }));
@@ -663,23 +698,26 @@ function OptionButton({
     <button
       type="button"
       onClick={onClick}
+      aria-pressed={selected}
       className={cn(
         "group flex min-h-[56px] cursor-pointer items-start gap-2 rounded-md border px-3 py-2 text-left transition-colors",
         selected
-          ? "border-primary bg-primary/10 text-primary"
+          ? "border-primary bg-primary/10 text-foreground ring-2 ring-primary/25"
           : "border-border bg-muted/30 text-muted-foreground hover:border-muted-foreground/50 hover:bg-muted/45 hover:text-foreground",
       )}
     >
-      {multiSelect && (
-        <span
-          className={cn(
-            "mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded border",
-            selected ? "border-primary bg-primary text-primary-foreground" : "",
-          )}
-        >
-          {selected && <IconCheck className="h-3 w-3" />}
-        </span>
-      )}
+      <span
+        className={cn(
+          "mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center border",
+          multiSelect ? "rounded-sm" : "rounded-full",
+          selected
+            ? "border-primary bg-primary text-primary-foreground"
+            : "border-border bg-background",
+        )}
+        aria-hidden
+      >
+        {selected && <IconCheck className="h-3 w-3" />}
+      </span>
       <span className="min-w-0 flex-1">
         <span className="flex flex-wrap items-center gap-1.5 text-sm font-medium leading-5">
           {option.label}
@@ -940,6 +978,17 @@ export function useGuidedQuestionFlow({
     [queryKey, normalizedBrowserTabId],
   );
 
+  const resolvedRefetchInterval =
+    refetchInterval === false
+      ? false
+      : (query: { state: { data?: GuidedQuestionPayload | null } }) => {
+          const activeQuestions = query.state.data?.questions;
+          if (Array.isArray(activeQuestions) && activeQuestions.length > 0) {
+            return false;
+          }
+          return refetchInterval;
+        };
+
   const { data } = useQuery({
     queryKey: resolvedQueryKey,
     queryFn: async () => {
@@ -951,9 +1000,7 @@ export function useGuidedQuestionFlow({
         try {
           const parsed = JSON.parse(text);
           if (Array.isArray(parsed?.questions) && parsed.questions.length > 0) {
-            return { ...parsed, _ts: Date.now() } as GuidedQuestionPayload & {
-              _ts: number;
-            };
+            return parsed as GuidedQuestionPayload;
           }
         } catch {
           return null;
@@ -967,13 +1014,22 @@ export function useGuidedQuestionFlow({
         (await read(stateKey))
       );
     },
-    refetchInterval,
+    refetchInterval: resolvedRefetchInterval,
     structuralSharing: false,
   });
 
   useEffect(() => {
     if (Array.isArray(data?.questions) && data.questions.length > 0) {
-      setPayload(data);
+      setPayload((prev) => {
+        if (
+          prev &&
+          guidedQuestionsFingerprint(prev.questions) ===
+            guidedQuestionsFingerprint(data.questions)
+        ) {
+          return prev;
+        }
+        return data;
+      });
     } else {
       setPayload(null);
     }

package/corpus/core/src/client/sse-event-processor.ts

@@ -357,6 +357,10 @@ export function processEvent(
     };
   }
 
+  if (ev.type === "stream_keepalive") {
+    return { action: "continue" };
+  }
+
   if (ev.type === "activity") {
     const tool = ev.tool?.trim() || undefined;
     const label = humanizeToolLabelText(ev.label ?? "Working", tool);
@@ -868,6 +872,7 @@ export async function readSSEStreamRaw(
   toolCallCounter: { value: number },
   tabId: string | undefined,
   onUpdate: (content: ContentPart[]) => void,
+  onSeq?: (seq: number) => void,
 ): Promise<void> {
   const reader = body.getReader();
   const decoder = new TextDecoder();
@@ -907,6 +912,10 @@ export async function readSSEStreamRaw(
         sawDataEvent = true;
         lastMeaningfulEventAt = Date.now();
 
+        if (ev.seq !== undefined && onSeq) {
+          onSeq(ev.seq);
+        }
+
         const { action, autoContinue } = processEvent(
           ev,
           content,

package/corpus/core/src/templates/workspace-root/.env.example

@@ -36,6 +36,10 @@ BUILDER_PRIVATE_KEY=
 BUILDER_PUBLIC_KEY=
 BUILDER_USER_ID=
 
+# Local ai-services LLM gateway. Leave unset to use the hosted Builder gateway.
+# ai-services listens on API_PORT (default 8080): /agent-native/gateway/v1/messages
+BUILDER_GATEWAY_BASE_URL=
+
 # Builder app creation / branching. In local dev these can live in .env.
 # In production, configure deploy env vars instead; production app creation
 # never writes credentials or project IDs to the filesystem.

package/corpus/templates/design/actions/show-design-questions.ts

@@ -47,6 +47,18 @@ const questionSchema = z.object({
   includeDecide: z.boolean().optional(),
 });
 
+function normalizeDesignQuestions(
+  questions: z.infer<typeof questionSchema>[],
+): z.infer<typeof questionSchema>[] {
+  return questions.map((question) => ({
+    ...question,
+    // The agent supplies Explore/Decide choices explicitly when needed.
+    // Default injection duplicates cards on every question in the form.
+    includeExplore: question.includeExplore ?? false,
+    includeDecide: question.includeDecide ?? false,
+  }));
+}
+
 export default defineAction({
   description:
     "Show a Claude Design-style question form in the Design editor before " +
@@ -95,6 +107,8 @@ export default defineAction({
   }) => {
     await assertAccess("design", designId, "editor");
 
+    const normalizedQuestions = normalizeDesignQuestions(questions);
+
     await writeAppState(designQuestionsStateKey(designId), {
       designId,
       title: title ?? "Quick questions before I design",
@@ -103,7 +117,7 @@ export default defineAction({
         "Pick what matters. Use Other for specifics, or let the agent decide.",
       skipLabel: skipLabel ?? "Decide for me",
       submitLabel: submitLabel ?? "Continue",
-      questions,
+      questions: normalizedQuestions,
     });
 
     return {

package/corpus/templates/design/app/hooks/use-agent-generating.ts

@@ -8,10 +8,16 @@ import {
 // legitimately take several minutes, so avoid treating normal latency as
 // failure.
 const GENERATION_ORPHAN_TIMEOUT_MS = 30 * 60_000;
+// Auto-continue briefly sets isRunning=false between gateway continuations.
+// Debounce stop handling so we do not flash "generation complete" mid-turn.
+const CHAT_STOP_DEBOUNCE_MS = 4_000;
 
 interface UseAgentGeneratingOptions {
   onComplete?: (tabId: string | null) => void;
   onStale?: (tabId: string | null) => void;
+  /** When chat starts on a tab we did not open, adopt it if this returns true. */
+  shouldAdoptRunningTab?: () => boolean;
+  onAdoptRunningTab?: (tabId: string) => void;
 }
 
 /**
@@ -23,9 +29,17 @@ export function useAgentGenerating(options: UseAgentGeneratingOptions = {}) {
   const [generating, setGenerating] = useState(false);
   const activeTabIdRef = useRef<string | null>(null);
   const timeoutRef = useRef<number | null>(null);
+  const stopDebounceRef = useRef<number | null>(null);
   const callbacksRef = useRef(options);
   callbacksRef.current = options;
 
+  const clearStopDebounce = useCallback(() => {
+    if (stopDebounceRef.current) {
+      window.clearTimeout(stopDebounceRef.current);
+      stopDebounceRef.current = null;
+    }
+  }, []);
+
   const clearGenerationTimeout = useCallback(() => {
     if (timeoutRef.current) {
       window.clearTimeout(timeoutRef.current);
@@ -35,9 +49,10 @@ export function useAgentGenerating(options: UseAgentGeneratingOptions = {}) {
 
   const reset = useCallback(() => {
     clearGenerationTimeout();
+    clearStopDebounce();
     activeTabIdRef.current = null;
     setGenerating(false);
-  }, [clearGenerationTimeout]);
+  }, [clearGenerationTimeout, clearStopDebounce]);
 
   const startGenerationTimeout = useCallback(
     (tabId: string | null) => {
@@ -68,25 +83,49 @@ export function useAgentGenerating(options: UseAgentGeneratingOptions = {}) {
         const eventTabId =
           typeof detail.tabId === "string" ? detail.tabId : null;
 
-        if (!activeTabIdRef.current && detail.isRunning) return;
-        if (eventTabId && eventTabId !== activeTabIdRef.current) return;
+        if (!activeTabIdRef.current && detail.isRunning) {
+          if (eventTabId && callbacksRef.current.shouldAdoptRunningTab?.()) {
+            activeTabIdRef.current = eventTabId;
+            callbacksRef.current.onAdoptRunningTab?.(eventTabId);
+            setGenerating(true);
+            startGenerationTimeout(eventTabId);
+            return;
+          }
+          return;
+        }
+        if (eventTabId && eventTabId !== activeTabIdRef.current) {
+          if (!detail.isRunning && !activeTabIdRef.current) {
+            return;
+          }
+          return;
+        }
 
         if (!detail.isRunning) {
-          callbacksRef.current.onComplete?.(activeTabIdRef.current);
-          reset();
+          clearStopDebounce();
+          const tabId = activeTabIdRef.current;
+          stopDebounceRef.current = window.setTimeout(() => {
+            stopDebounceRef.current = null;
+            if (activeTabIdRef.current !== tabId) return;
+            callbacksRef.current.onComplete?.(tabId);
+            reset();
+          }, CHAT_STOP_DEBOUNCE_MS);
           return;
         }
+        clearStopDebounce();
         setGenerating(true);
         startGenerationTimeout(activeTabIdRef.current);
       }
     };
     window.addEventListener("agentNative.chatRunning", handler);
     return () => window.removeEventListener("agentNative.chatRunning", handler);
-  }, [reset, startGenerationTimeout]);
+  }, [clearStopDebounce, reset, startGenerationTimeout]);
 
   useEffect(() => {
-    return () => clearGenerationTimeout();
-  }, [clearGenerationTimeout]);
+    return () => {
+      clearGenerationTimeout();
+      clearStopDebounce();
+    };
+  }, [clearGenerationTimeout, clearStopDebounce]);
 
   const submit = useCallback(
     (

package/corpus/templates/design/app/pages/DesignEditor.tsx

@@ -428,6 +428,12 @@ export default function DesignEditor() {
   } = useAgentGenerating({
     onComplete: handleGenerationComplete,
     onStale: markGenerationStale,
+    shouldAdoptRunningTab: () =>
+      Boolean(id) && !generationOutputReadyRef.current,
+    onAdoptRunningTab: (tabId) => {
+      setGenerationChatTabId(tabId);
+      setHasPendingGeneration(true);
+    },
   });
   const handleQuestionFlowContinue = useCallback(
     (runTabId: string) => {

package/dist/agent/engine/builder-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/builder-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAwBpB,eAAO,MAAM,oBAAoB,EAAE,kBAMlC,CAAC;AAEF,eAAO,MAAM,wBAAwB,wOAAuC,CAAC;AAS7E,eAAO,MAAM,qBAAqB,qBAAoC,CAAC;AA2qBvE,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,WAAW,CAEb"}
+{"version":3,"file":"builder-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/builder-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAwBpB,eAAO,MAAM,oBAAoB,EAAE,kBAMlC,CAAC;AAEF,eAAO,MAAM,wBAAwB,wOAAuC,CAAC;AAW7E,eAAO,MAAM,qBAAqB,qBAAoC,CAAC;AA+qBvE,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,WAAW,CAEb"}

package/dist/agent/engine/builder-engine.js

@@ -33,6 +33,8 @@ export const BUILDER_SUPPORTED_MODELS = BUILDER_MODEL_CONFIG.supportedModels;
 // (Netlify synchronous Functions are 60s) hard-kill the invocation.
 const DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS = 45_000;
 const MAX_BUILDER_GATEWAY_TIMEOUT_MS = 45_000;
+/** Local ai-services has no serverless wall; allow longer streams in dev. */
+const MAX_LOCAL_BUILDER_GATEWAY_TIMEOUT_MS = 180_000;
 const BUILDER_GATEWAY_NETWORK_ERROR_CODE = "builder_gateway_network_error";
 export const BUILDER_DEFAULT_MODEL = BUILDER_MODEL_CONFIG.defaultModel;
 /**
@@ -442,6 +444,9 @@ async function* parseJsonlStream(reader, model, captureContext = {}) {
                                 : "",
                     };
                     break;
+                case "heartbeat":
+                    yield { type: "gateway-heartbeat" };
+                    break;
                 case "tool-call": {
                     flushPending();
                     parts.push({
@@ -640,15 +645,28 @@ function htmlToText(html) {
 export function createBuilderEngine(_config = {}) {
     return new BuilderEngine();
 }
+function resolveMaxBuilderGatewayTimeoutMs() {
+    try {
+        const base = getBuilderGatewayBaseUrl();
+        if (/^https?:\/\/(localhost|127\.0\.0\.1)([:/]|$)/i.test(base)) {
+            return MAX_LOCAL_BUILDER_GATEWAY_TIMEOUT_MS;
+        }
+    }
+    catch {
+        // ignore malformed override
+    }
+    return MAX_BUILDER_GATEWAY_TIMEOUT_MS;
+}
 function getBuilderGatewayTimeoutMs() {
     const raw = process.env.AGENT_NATIVE_BUILDER_GATEWAY_TIMEOUT_MS;
+    const maxMs = resolveMaxBuilderGatewayTimeoutMs();
     if (!raw)
-        return DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
+        return maxMs;
     const parsed = Number(raw);
     if (!Number.isFinite(parsed) || parsed <= 0) {
-        return DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
+        return maxMs;
     }
-    return Math.min(parsed, MAX_BUILDER_GATEWAY_TIMEOUT_MS);
+    return Math.min(parsed, maxMs);
 }
 function createGatewayAbortSignal(parentSignal, timeoutMs) {
     const controller = new AbortController();