@agent-native/core 0.220.0 → 0.220.1-nightly-20261024183236

package/dist/org/handlers.d.ts

@@ -73,9 +73,9 @@ export declare const setWorkspaceAppDefaultVisibilityHandler: import("h3").Event
     visibility: WorkspaceAppDefaultVisibility;
 }>>;
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
+    name?: undefined;
     success: boolean;
     id?: undefined;
-    name?: undefined;
     role?: undefined;
 } | {
     success?: undefined;

package/dist/progress/routes.d.ts

@@ -2,6 +2,6 @@ export declare function createProgressHandler(): import("h3").EventHandlerWithFe
     error: string;
     ok?: undefined;
 } | {
-    ok: boolean;
     error?: undefined;
+    ok: boolean;
 }>>;

package/dist/provider-api/actions/custom-provider-registration.d.ts

@@ -75,7 +75,6 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         user: "user";
     }>>;
 }, z.core.$strip>>, {
-    message?: undefined;
     id?: undefined;
     deleted?: undefined;
     provider?: undefined;
@@ -92,8 +91,8 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     found?: undefined;
     registered?: undefined;
     label?: undefined;
-} | {
     message?: undefined;
+} | {
     id?: undefined;
     deleted?: undefined;
     count?: undefined;
@@ -102,8 +101,8 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     provider: import("../custom-registry.js").CustomProviderConfig;
     registered?: undefined;
     label?: undefined;
-} | {
     message?: undefined;
+} | {
     deleted?: undefined;
     provider?: undefined;
     count?: undefined;
@@ -112,8 +111,8 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     id: string;
     registered?: undefined;
     label?: undefined;
-} | {
     message?: undefined;
+} | {
     provider?: undefined;
     count?: undefined;
     providers?: undefined;
@@ -122,6 +121,7 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     id: string;
     registered?: undefined;
     label?: undefined;
+    message?: undefined;
 } | {
     deleted?: undefined;
     provider?: undefined;

package/dist/provider-api/actions/provider-api.d.ts

@@ -316,9 +316,9 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         notes?: string | undefined;
         scope?: "org" | "user" | undefined;
     }, {
+        message?: undefined;
         provider?: undefined;
         id?: undefined;
-        message?: undefined;
         deleted?: undefined;
         providers: {
             id: string;
@@ -334,9 +334,9 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         registered?: undefined;
         label?: undefined;
     } | {
+        message?: undefined;
         id?: undefined;
         count?: undefined;
-        message?: undefined;
         deleted?: undefined;
         providers?: undefined;
         found: boolean;
@@ -344,9 +344,9 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         registered?: undefined;
         label?: undefined;
     } | {
+        message?: undefined;
         provider?: undefined;
         count?: undefined;
-        message?: undefined;
         deleted?: undefined;
         providers?: undefined;
         found: boolean;
@@ -354,9 +354,9 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         registered?: undefined;
         label?: undefined;
     } | {
+        message?: undefined;
         provider?: undefined;
         count?: undefined;
-        message?: undefined;
         providers?: undefined;
         found?: undefined;
         deleted: boolean;

package/dist/provider-api/corpus-jobs.js

@@ -3,6 +3,7 @@ import { z } from "zod";
 import { defineAction } from "../action.js";
 import { getCredentialContext } from "../server/request-context.js";
 import { appendProviderCorpusJobHits, createProviderCorpusJob, deleteProviderCorpusJob, getProviderCorpusJob, getProviderCorpusJobHits, listProviderCorpusJobs, updateProviderCorpusJob, } from "./corpus-jobs-store.js";
+import { setBodyValueAtPath } from "./request-body.js";
 import { getStagedDatasetMeta, getStagedDatasetRows, stagedDatasetVersion, } from "./staged-datasets-store.js";
 const MethodSchema = z.enum(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD"]);
 const ProviderRequestSchema = z.object({
@@ -745,7 +746,7 @@ function buildPaginatedRequest(request, pagination, state) {
             query = { ...query, [pagination.cursorParam]: state.cursor };
         }
         if (pagination.cursorBodyPath) {
-            body = setAtPath(body, pagination.cursorBodyPath, state.cursor);
+            body = setBodyValueAtPath(body, pagination.cursorBodyPath, state.cursor);
         }
     }
     return { ...request, query, body };
@@ -758,7 +759,7 @@ function buildBatchRequest(request, batch, values) {
         query = { ...query, [batch.itemQueryParam]: payload };
     }
     if (batch.itemBodyPath) {
-        body = setAtPath(body, batch.itemBodyPath, values);
+        body = setBodyValueAtPath(body, batch.itemBodyPath, values);
     }
     return { ...request, query, body };
 }
@@ -1114,25 +1115,6 @@ function getAtPath(value, path) {
     }
     return current;
 }
-function setAtPath(base, path, value) {
-    const parts = pathParts(path);
-    if (!parts.length)
-        return value;
-    const root = base && typeof base === "object" && !Array.isArray(base)
-        ? JSON.parse(JSON.stringify(base))
-        : {};
-    let current = root;
-    for (const part of parts.slice(0, -1)) {
-        const existing = current[part];
-        const next = existing && typeof existing === "object" && !Array.isArray(existing)
-            ? { ...existing }
-            : {};
-        current[part] = next;
-        current = next;
-    }
-    current[parts[parts.length - 1]] = value;
-    return root;
-}
 function collectSearchStrings(item, textPaths, maxFields) {
     const paths = (textPaths ?? []).filter((path) => path.trim());
     if (!paths.length)

package/dist/provider-api/index.js

@@ -14,6 +14,7 @@ import { resolveWorkspaceConnectionCredentialForApp } from "../workspace-connect
 import { resolveWorkspaceConnectionForApp, } from "../workspace-connections/store.js";
 import { createProviderQuotaIdentity, createProviderRequestDedupeKey, executeWithProviderQuota, } from "./quota-governor.js";
 export { upsertCustomProvider, deleteCustomProvider, listCustomProviders, getCustomProvider, validateCustomBaseUrl, assertCanMutateCustomProviderScope, CustomProviderAuthError, } from "./custom-registry.js";
+import { setBodyValueAtPath } from "./request-body.js";
 export const PROVIDER_API_IDS = [
     "amplitude",
     "apollo",
@@ -1583,7 +1584,7 @@ export async function executeProviderApiRequest(args, runtime) {
                 query: queryWithCursor,
             });
             const bodyWithCursor = extra?.bodyCursor
-                ? setValueAtPath(substituteUnknown(args.body, placeholders), extra.bodyCursor.path, extra.bodyCursor.value)
+                ? setBodyValueAtPath(substituteUnknown(args.body, placeholders), extra.bodyCursor.path, extra.bodyCursor.value)
                 : substituteUnknown(args.body, placeholders);
             const pageBody = prepareBody(bodyWithCursor, headers);
             const requestKey = createProviderRequestDedupeKey({
@@ -2371,7 +2372,7 @@ async function executeCustomProviderApiRequest(args, customConfig, runtime) {
                 query: queryWithCursor,
             });
             const bodyWithCursor = extra?.bodyCursor
-                ? setValueAtPath(args.body, extra.bodyCursor.path, extra.bodyCursor.value)
+                ? setBodyValueAtPath(args.body, extra.bodyCursor.path, extra.bodyCursor.value)
                 : args.body;
             const pageBody = prepareBody(bodyWithCursor, headers);
             const requestKey = createProviderRequestDedupeKey({
@@ -4594,9 +4595,21 @@ function sanitizeOutboundHeaders(value) {
 function prepareBody(body, headers) {
     if (body === undefined || body === null)
         return undefined;
-    if (typeof body === "string")
-        return body;
     const hasContentType = Object.keys(headers).some((name) => name.toLowerCase() === "content-type");
+    if (typeof body === "string") {
+        let isJson = false;
+        try {
+            JSON.parse(body);
+            isJson = true;
+        }
+        catch {
+            // coercion-ok: JSON.parse is a probe; a throw means plain text, which keeps its existing content type.
+        }
+        if (isJson && !hasContentType) {
+            headers["Content-Type"] = "application/json";
+        }
+        return body;
+    }
     if (!hasContentType)
         headers["Content-Type"] = "application/json";
     return JSON.stringify(body);
@@ -4919,25 +4932,6 @@ function mergeQueryObjects(base, extra) {
     }
     return extra;
 }
-function setValueAtPath(base, path, value) {
-    const root = base && typeof base === "object" && !Array.isArray(base)
-        ? { ...base }
-        : {};
-    const parts = path.split(".").filter(Boolean);
-    if (!parts.length)
-        return root;
-    let current = root;
-    for (const part of parts.slice(0, -1)) {
-        const existing = current[part];
-        const next = existing && typeof existing === "object" && !Array.isArray(existing)
-            ? { ...existing }
-            : {};
-        current[part] = next;
-        current = next;
-    }
-    current[parts[parts.length - 1]] = value;
-    return root;
-}
 function clampTimeout(timeoutMs) {
     if (!Number.isFinite(timeoutMs))
         return DEFAULT_TIMEOUT_MS;

package/dist/provider-api/request-body.d.ts

@@ -0,0 +1 @@
+export declare function setBodyValueAtPath(base: unknown, path: string, value: unknown): unknown;

package/dist/provider-api/request-body.js

@@ -0,0 +1,50 @@
+const JSON_OBJECT_BODY_REQUIRED = "Body cursor pagination requires a JSON object request body.";
+// The one place a pagination cursor or batch is written into a request body.
+// A JSON-string body keeps its other fields and is re-serialized as a string.
+export function setBodyValueAtPath(base, path, value) {
+    const wasString = typeof base === "string";
+    let parsed = base;
+    // A blank string body is an empty body.
+    if (typeof parsed === "string" && parsed.trim() === "")
+        parsed = undefined;
+    if (typeof parsed === "string") {
+        try {
+            parsed = JSON.parse(parsed);
+        }
+        catch {
+            throw new Error(JSON_OBJECT_BODY_REQUIRED);
+        }
+    }
+    if (parsed !== undefined &&
+        parsed !== null &&
+        (typeof parsed !== "object" || Array.isArray(parsed))) {
+        throw new Error(JSON_OBJECT_BODY_REQUIRED);
+    }
+    const root = parsed
+        ? { ...parsed }
+        : {};
+    // `ids[0]` and `ids.0` are the same path.
+    const parts = path
+        .replace(/\[(\d+)\]/g, ".$1")
+        .split(".")
+        .map((part) => part.trim())
+        .filter(Boolean);
+    const isIndex = (part) => part !== undefined && /^\d+$/.test(part);
+    let current = root;
+    parts.slice(0, -1).forEach((part, index) => {
+        const existing = current[part];
+        const indexNext = isIndex(parts[index + 1]);
+        const next = Array.isArray(existing) && indexNext
+            ? [...existing]
+            : existing && typeof existing === "object" && !Array.isArray(existing)
+                ? { ...existing }
+                : indexNext
+                    ? []
+                    : {};
+        current[part] = next;
+        current = next;
+    });
+    if (parts.length)
+        current[parts[parts.length - 1]] = value;
+    return wasString ? JSON.stringify(root) : root;
+}

package/dist/provider-api/staging.js

@@ -24,6 +24,7 @@
  * here; redaction is applied to the response returned to the model.
  */
 import { fail } from "../action.js";
+import { setBodyValueAtPath } from "./request-body.js";
 import { rejectFailedProviderResult } from "./result-outcome.js";
 import { upsertStagedDataset, deriveColumns, legacyStagedDatasetId, stagedDatasetId, MAX_ROWS_PER_OWNER, } from "./staged-datasets-store.js";
 function getAtPath(obj, path) {
@@ -64,25 +65,6 @@ function extractNextCursor(body, path) {
         return null;
     return String(val);
 }
-function setAtPath(base, path, value) {
-    const root = base && typeof base === "object" && !Array.isArray(base)
-        ? { ...base }
-        : {};
-    const parts = path.split(".").filter(Boolean);
-    if (!parts.length)
-        return root;
-    let current = root;
-    for (const part of parts.slice(0, -1)) {
-        const existing = current[part];
-        const next = existing && typeof existing === "object" && !Array.isArray(existing)
-            ? { ...existing }
-            : {};
-        current[part] = next;
-        current = next;
-    }
-    current[parts[parts.length - 1]] = value;
-    return root;
-}
 async function sleepMs(ms) {
     await new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -153,7 +135,7 @@ export async function stagingExecuteRequest(args, execute, ctx) {
                 extraQuery[pagination.cursorParam] = lastCursor;
             }
             if (pagination.cursorBodyPath && lastCursor !== null) {
-                nextBody = setAtPath(baseArgs.body, pagination.cursorBodyPath, lastCursor);
+                nextBody = setBodyValueAtPath(baseArgs.body, pagination.cursorBodyPath, lastCursor);
             }
             const hasCursorMode = Boolean(pagination.cursorParam) || Boolean(pagination.cursorBodyPath);
             if (pagination.pageParam && !hasCursorMode) {

package/dist/secrets/routes.d.ts

@@ -57,39 +57,39 @@ export declare function createWriteSecretHandler(): import("h3").EventHandlerWit
 } | {
     error: string;
     errorCode?: undefined;
-    ok?: undefined;
     status?: undefined;
+    ok?: undefined;
 } | {
     error: string;
     errorCode: string;
-    ok?: undefined;
     status?: undefined;
+    ok?: undefined;
 } | {
-    error?: undefined;
     errorCode?: undefined;
     ok: boolean;
     status: string;
+    error?: undefined;
 } | {
-    ok?: undefined;
     error: string;
     removed?: undefined;
+    ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     removed: boolean;
+    error?: undefined;
 }>>;
 export declare function createTestSecretHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
     note?: undefined;
+    ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     note?: undefined;
-} | {
     error?: undefined;
+} | {
     ok: boolean;
     note: string;
+    error?: undefined;
 } | {
     note?: undefined;
     ok: boolean;
@@ -117,11 +117,11 @@ export declare function createAdHocSecretHandler(): import("h3").EventHandlerWit
 } | {
     error: string;
 } | {
-    error?: undefined;
     ok: boolean;
     key: string;
-} | {
     error?: undefined;
+} | {
     ok: boolean;
     removed: boolean;
+    error?: undefined;
 }>>;

package/dist/server/agent-engine-default-model-route.d.ts

@@ -8,8 +8,8 @@ export declare const AGENT_ENGINE_API_KEY_ACTION_NAME = "agent-engine-api-key";
  * resolveEngine's credential detection.
  */
 export declare function createAgentEngineDisconnectHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
     scope?: undefined;
 } | {
     ok: boolean;

package/dist/server/agent-engine-ollama-models-route.d.ts

@@ -1,6 +1,6 @@
 export declare function createAgentEngineOllamaModelsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
     models?: undefined;
 } | {
     error?: undefined;

package/dist/server/background-jobs.d.ts

@@ -0,0 +1,3 @@
+export type BackgroundJobStop = () => void | Promise<void>;
+export declare function registerBackgroundJobStop(stop: BackgroundJobStop): void;
+export declare function stopBackgroundJobs(timeoutMs?: number): Promise<void>;

package/dist/server/background-jobs.js

@@ -0,0 +1,33 @@
+/** How long shutdown waits for jobs to stop before it carries on without them. */
+const STOP_TIMEOUT_MS = 5_000;
+const stoppers = new Set();
+export function registerBackgroundJobStop(stop) {
+    stoppers.add(stop);
+}
+export async function stopBackgroundJobs(timeoutMs = STOP_TIMEOUT_MS) {
+    const toStop = [...stoppers];
+    stoppers.clear();
+    const pending = new Set(toStop);
+    const stopped = Promise.all(toStop.map(async (stop) => {
+        try {
+            await stop();
+        }
+        catch (error) {
+            console.error("[agent-native] background job stop failed:", error);
+        }
+        finally {
+            pending.delete(stop);
+        }
+    }));
+    let timer;
+    const timedOut = new Promise((resolve) => {
+        timer = setTimeout(resolve, timeoutMs);
+        timer.unref?.();
+    });
+    await Promise.race([stopped, timedOut]);
+    clearTimeout(timer);
+    if (pending.size > 0) {
+        const names = [...pending].map((stop) => stop.name || "anonymous");
+        console.warn(`[agent-native] background jobs still stopping after ${timeoutMs}ms; shutting down without them: ${names.join(", ")}`);
+    }
+}

package/dist/server/core-routes-plugin.js

@@ -62,6 +62,7 @@ import { getConfiguredAppBasePath, stripAppBasePath } from "./app-base-path.js";
 import { readAnalyticsSessionId } from "./attribution.js";
 import { getSession } from "./auth.js";
 import { createAutomationFailureUnsubscribeHandler } from "./automation-failure-notifications.js";
+import { registerBackgroundJobStop } from "./background-jobs.js";
 import { getBetterAuthInternalAdapter, getBetterAuthSync, } from "./better-auth-instance.js";
 import { resolveBuilderRequestAuthorization } from "./builder-api-auth.js";
 import { BUILDER_CONNECT_PARAM, BUILDER_CONNECT_MODE_PARAM, BUILDER_AGENT_NATIVE_PROVISION_MODE, BUILDER_CONNECT_ATTEMPT_PARAM, BUILDER_CONNECT_STATE_COOKIE, BUILDER_ENV_KEYS, BUILDER_OPENER_PARAM, BUILDER_RELAY_FLOW_HEADER, BUILDER_RELAY_SIGNATURE_HEADER, BUILDER_RELAY_STATE_PARAM, BUILDER_RELAY_TIMESTAMP_HEADER, appendBuilderConnectToken, appendBuilderConnectStateCookie, builderConnectTrackingProperties, BUILDER_UPSTREAM_FAILURE_STATUS, createBuilderConnectState, createBuilderBrowserCallbackErrorPage, createBuilderBrowserCallbackPage, createBuilderRelayRequest, getBuilderConnectCallbackOriginFromUrl, getBuilderConnectTrackingParams, getBuilderBrowserOriginForEvent, getBuilderBrowserStatusForEvent, isBuilderAccountAlreadyExistsError, isBuilderAccountProvisioningEnabled, isBuilderConnectCallbackUrlAllowed, isSignedBuilderConnectState, normalizeBuilderAgentContext, parseBuilderConnectStateCookie, provisionBuilderAccount, resolveBuilderBranchProjectId, resolveBuilderConnectCallbackUrl, resolveBuilderConnectCallbackState, resolveBuilderPreviewRelayParentOrigin, removeBuilderConnectStateCookie, runBuilderAgent, sendBuilderPopupErrorPage, verifyBuilderRelayRequest, verifyBuilderPreviewRelayStateForCallback, verifyBuilderConnectTokenAndGetOwner, signBuilderProvisioningToken, verifyBuilderProvisioningToken, withBuilderConnectTrackingParams, } from "./builder-browser.js";
@@ -2677,8 +2678,21 @@ export function createCoreRoutesPlugin(options = {}) {
                     return;
                 let lastSweep = 0;
                 const SWEEP_INTERVAL_MS = 2 * 60 * 1000;
-                setTimeout(() => {
-                    setInterval(() => {
+                let startupTimer = null;
+                let sweepTimer = null;
+                const stopSandboxExecutionSweep = () => {
+                    if (startupTimer) {
+                        clearTimeout(startupTimer);
+                        startupTimer = null;
+                    }
+                    if (sweepTimer) {
+                        clearInterval(sweepTimer);
+                        sweepTimer = null;
+                    }
+                };
+                startupTimer = setTimeout(() => {
+                    startupTimer = null;
+                    sweepTimer = setInterval(() => {
                         const now = Date.now();
                         if (now - lastSweep < SWEEP_INTERVAL_MS)
                             return;
@@ -2690,7 +2704,11 @@ export function createCoreRoutesPlugin(options = {}) {
                             // best-effort — never break the server
                         });
                     }, 30_000); // Check every 30s but only sweep once per 2min
+                    sweepTimer.unref?.();
                 }, 25_000); // Start 25s after init (after the agent sweeps)
+                startupTimer.unref?.();
+                registerBackgroundJobStop(stopSandboxExecutionSweep);
+                nitroApp.hooks?.hook?.("close", stopSandboxExecutionSweep);
             })();
             getH3App(nitroApp).use(`${P}/debug/runtime`, defineEventHandler(async (event) => {
                 setResponseHeader(event, "cache-control", "no-store");

package/dist/server/dev-database-lifecycle.js

@@ -1,4 +1,5 @@
 import { beginPgliteClientShutdown, closeDbExec, resumePgliteClientAccess, waitForPgliteClientOperations, } from "../db/client.js";
+import { stopBackgroundJobs } from "./background-jobs.js";
 const devDatabaseCloseApps = new WeakSet();
 let devDatabaseClosePromise;
 const devDatabaseHot = import.meta.hot;
@@ -41,10 +42,19 @@ async function closeDevDatabase(requestId) {
     }
 }
 export function installDevDatabaseCloseHook(nitroApp) {
-    if (process.env.NODE_ENV !== "development")
-        return;
     if (!nitroApp?.hooks?.hook || devDatabaseCloseApps.has(nitroApp))
         return;
     devDatabaseCloseApps.add(nitroApp);
-    nitroApp.hooks.hook("close", closeDevDatabase);
+    // Jobs must stop first: a tick against a closing client becomes an
+    // unhandled rejection and its next interval keeps the process alive.
+    // Keep this on the Nitro close hook (not inside closeDevDatabase): a
+    // Vite HMR restart closes/resumes the DB through that same function and
+    // nothing restarts jobs on resume.
+    nitroApp.hooks.hook("close", async () => {
+        await stopBackgroundJobs();
+        // Only the dev server owns its database. In production, detached work
+        // such as a sandbox run can still be saving its result while Nitro closes.
+        if (process.env.NODE_ENV === "development")
+            await closeDevDatabase();
+    });
 }

package/dist/server/interval-job.d.ts

@@ -6,6 +6,7 @@ export interface IntervalJobOptions {
     leading?: boolean;
 }
 export interface IntervalJobHandle {
-    stop(): void;
+    /** Stops scheduling and waits for any in-flight run to settle. */
+    stop(): Promise<void>;
 }
 export declare function startIntervalJob(runOnce: (signal: AbortSignal) => Promise<void>, options: IntervalJobOptions): IntervalJobHandle;

package/dist/server/interval-job.js

@@ -4,7 +4,7 @@ export function startIntervalJob(runOnce, options) {
     engine.start();
     return {
         stop() {
-            engine.stop();
+            return engine.stop();
         },
     };
 }

package/dist/shared/poll-engine.d.ts

@@ -9,7 +9,8 @@ export interface PollEngineOptions {
 }
 export interface PollEngineHandle {
     start(): void;
-    stop(): void;
+    /** Stops scheduling and waits (bounded by timeoutMs) for any in-flight attempt. */
+    stop(): Promise<void>;
     pollNow(): void;
     reschedule(): void;
     readonly isRunning: boolean;

package/dist/shared/poll-engine.js

@@ -26,6 +26,7 @@ export function createPollEngine(attempt, options) {
     let activeController = null;
     let activeStopRequested = false;
     let inFlightReport = null;
+    let currentAttempt = null;
     function clearTimer() {
         if (timer != null) {
             clearTimeout(timer);
@@ -83,6 +84,7 @@ export function createPollEngine(attempt, options) {
                 return;
             report(err);
         });
+        currentAttempt = settled;
         let timeoutError;
         try {
             await Promise.race([
@@ -113,6 +115,8 @@ export function createPollEngine(attempt, options) {
                 activeController = null;
             if (inFlightReport === report)
                 inFlightReport = null;
+            if (currentAttempt === settled)
+                currentAttempt = null;
             inFlight = false;
             if (gen === generation && running)
                 schedule(gen);
@@ -130,12 +134,32 @@ export function createPollEngine(attempt, options) {
             else
                 schedule(gen);
         },
-        stop() {
+        async stop() {
             running = false;
             generation++;
             clearTimer();
             activeStopRequested = true;
             activeController?.abort();
+            const pending = currentAttempt;
+            if (!pending)
+                return;
+            // Abort alone is not enough: an attempt that ignores the signal can
+            // hang forever and block Nitro close via stopBackgroundJobs().
+            const waitMs = getTimeoutMs();
+            let timer;
+            try {
+                await Promise.race([
+                    pending,
+                    new Promise((resolve) => {
+                        timer = setTimeout(resolve, waitMs);
+                        maybeUnref(timer);
+                    }),
+                ]);
+            }
+            finally {
+                if (timer != null)
+                    clearTimeout(timer);
+            }
         },
         pollNow() {
             if (!running || inFlight)

package/dist/shared/progress-events.d.ts

@@ -0,0 +1 @@
+export declare function isNonProgressEventType(type: string): boolean;

package/dist/shared/progress-events.js

@@ -0,0 +1,13 @@
+// Event types that never count as real run progress. The server's
+// `last_progress_at` write (run-manager) and the browser's durable liveness
+// cursor (sse-event-processor) both start from this list, so a reattached
+// client cannot see progress the server never persisted. Both layers add their
+// own stateful rule for action-preparation activity on top.
+const NON_PROGRESS_EVENT_TYPES = new Set([
+    "stream_keepalive",
+    "model_stream",
+    "clear",
+]);
+export function isNonProgressEventType(type) {
+    return NON_PROGRESS_EVENT_TYPES.has(type);
+}