@agent-native/core 0.68.0 → 0.68.2

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/corpus/templates/design/app/pages/NotFound.tsx

@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
 
 export default function NotFound() {
   return (
-    <div className="min-h-screen bg-background flex flex-col items-center justify-center">
+    <div className="flex min-h-full w-full flex-col items-center justify-center bg-background px-4 py-12">
       <h1 className="text-6xl font-bold text-muted-foreground/60 mb-4">404</h1>
       <p className="text-sm text-muted-foreground mb-6">
         The page you are looking for does not exist.

package/corpus/templates/design/app/routes/$.tsx

@@ -0,0 +1,9 @@
+import NotFound from "@/pages/NotFound";
+
+export function meta() {
+  return [{ title: "Not Found - Design" }];
+}
+
+export default function CatchAllRoute() {
+  return <NotFound />;
+}

package/corpus/templates/mail/app/pages/NotFound.tsx

@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
 
 export function NotFound() {
   return (
-    <div className="flex h-screen items-center justify-center bg-background">
+    <div className="flex min-h-full w-full items-center justify-center bg-background px-4 py-12">
       <div className="text-center">
         <IconMail className="h-12 w-12 text-muted-foreground/40 mx-auto mb-4" />
         <h1 className="text-2xl font-semibold text-foreground">404</h1>

package/corpus/templates/mail/app/routes/$.tsx

@@ -0,0 +1,9 @@
+import { NotFound } from "@/pages/NotFound";
+
+export function meta() {
+  return [{ title: "Not Found - Mail" }];
+}
+
+export default function CatchAllRoute() {
+  return <NotFound />;
+}

package/corpus/templates/plan/app/global.css

@@ -380,9 +380,9 @@
   --rail-gap: 2rem;
 }
 
-@media (min-width: 1024px) {
+@container plan-doc (min-width: 64rem) {
   .plan-content-surface[data-plan-layout="wide"] .plan-document-shell {
-    --plan-wide-component-width: min(1560px, calc(100vw - 5rem));
+    --plan-wide-component-width: min(1560px, calc(100cqw - 5rem));
   }
 
   .plan-content-surface[data-plan-layout="wide"] .plan-document-flow-stack {

package/corpus/templates/slides/app/pages/NotFound.tsx

@@ -10,7 +10,7 @@ export default function NotFound() {
   }, [location.pathname]);
 
   return (
-    <div className="min-h-screen flex items-center justify-center bg-background">
+    <div className="flex min-h-0 w-full flex-1 items-center justify-center bg-background px-4 py-12">
       <div className="text-center">
         <h1 className="text-6xl font-bold text-muted-foreground/40 mb-2">
           404

package/corpus/templates/slides/app/routes/$.tsx

@@ -0,0 +1,9 @@
+import NotFound from "@/pages/NotFound";
+
+export function meta() {
+  return [{ title: "Not Found - Slides" }];
+}
+
+export default function CatchAllRoute() {
+  return <NotFound />;
+}

package/corpus/templates/slides/server/lib/google-docs-oauth.ts

@@ -30,19 +30,55 @@ interface GoogleUserInfo {
   verified_email?: boolean;
 }
 
+interface GoogleOAuthCredentials {
+  clientId: string;
+  clientSecret: string;
+}
+
+function readCredentialPair(
+  clientIdKey: string,
+  clientSecretKey: string,
+): GoogleOAuthCredentials | null {
+  const clientId = process.env[clientIdKey];
+  const clientSecret = process.env[clientSecretKey];
+  if (!clientId || !clientSecret) return null;
+  return { clientId, clientSecret };
+}
+
+function resolveGoogleProviderCredentialCandidates(): GoogleOAuthCredentials[] {
+  const primary = readCredentialPair(
+    "GOOGLE_CLIENT_ID",
+    "GOOGLE_CLIENT_SECRET",
+  );
+  const legacy = readCredentialPair(
+    "GOOGLE_LEGACY_CLIENT_ID",
+    "GOOGLE_LEGACY_CLIENT_SECRET",
+  );
+  if (!primary) return legacy ? [legacy] : [];
+  if (!legacy || legacy.clientId === primary.clientId) return [primary];
+  return [primary, legacy];
+}
+
 function getOAuthCredentials(): { clientId: string; clientSecret: string } {
-  const clientId = process.env.GOOGLE_CLIENT_ID;
-  const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
-  if (!clientId || !clientSecret) {
+  const credentials = resolveGoogleProviderCredentialCandidates()[0];
+  if (!credentials) {
     throw new Error(
       "Google OAuth is not configured. Set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET.",
     );
   }
-  return { clientId, clientSecret };
+  return credentials;
 }
 
 export function isGoogleDocsOAuthConfigured(): boolean {
-  return !!(process.env.GOOGLE_CLIENT_ID && process.env.GOOGLE_CLIENT_SECRET);
+  return resolveGoogleProviderCredentialCandidates().length > 0;
+}
+
+function isPermanentGoogleRefreshError(error: string | undefined): boolean {
+  return (
+    error === "invalid_grant" ||
+    error === "unauthorized_client" ||
+    error === "invalid_client"
+  );
 }
 
 export function getGooglePickerConfig(): {
@@ -98,35 +134,55 @@ async function refreshGoogleDocsToken(
     throw new Error("Google Docs connection expired. Please reconnect.");
   }
 
-  const { clientId, clientSecret } = getOAuthCredentials();
-  const response = await fetch(TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      refresh_token: tokens.refresh_token,
-      client_id: clientId,
-      client_secret: clientSecret,
-      grant_type: "refresh_token",
-    }),
-  });
-  const data = (await response.json()) as {
+  const credentialCandidates = resolveGoogleProviderCredentialCandidates();
+  let data: {
     access_token?: string;
     expires_in?: number;
     token_type?: string;
     scope?: string;
     error?: string;
     error_description?: string;
-  };
-  if (!response.ok || !data.access_token) {
-    if (
-      data.error === "invalid_grant" ||
-      data.error === "unauthorized_client" ||
-      data.error === "invalid_client"
-    ) {
+  } | null = null;
+  let lastStatusText = "Could not refresh Google token.";
+  for (const credentials of credentialCandidates) {
+    const response = await fetch(TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        refresh_token: tokens.refresh_token,
+        client_id: credentials.clientId,
+        client_secret: credentials.clientSecret,
+        grant_type: "refresh_token",
+      }),
+    });
+    lastStatusText = response.statusText;
+    data = (await response.json()) as {
+      access_token?: string;
+      expires_in?: number;
+      token_type?: string;
+      scope?: string;
+      error?: string;
+      error_description?: string;
+    };
+    if (response.ok && data.access_token) break;
+    if (!isPermanentGoogleRefreshError(data.error)) {
+      throw new Error(
+        data.error_description ||
+          data.error ||
+          "Could not refresh Google token.",
+      );
+    }
+  }
+
+  if (!data?.access_token) {
+    if (isPermanentGoogleRefreshError(data?.error)) {
       await deleteOAuthTokens(GOOGLE_DOCS_PROVIDER, accountId);
     }
     throw new Error(
-      data.error_description || data.error || "Could not refresh Google token.",
+      data?.error_description ||
+        data?.error ||
+        lastStatusText ||
+        "Could not refresh Google token.",
     );
   }
 

package/corpus/templates/videos/app/pages/NotFound.tsx

@@ -12,7 +12,7 @@ const NotFound = () => {
   }, [location.pathname]);
 
   return (
-    <div className="min-h-screen flex items-center justify-center bg-background">
+    <div className="flex min-h-full w-full items-center justify-center bg-background px-4 py-12">
       <div className="text-center">
         <h1 className="text-5xl font-bold text-muted-foreground/30 mb-3">
           404

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();