@agent-native/core 0.201.1 → 0.202.0-nightly-20261006033736

package/dist/jobs/run-history.js

@@ -33,7 +33,16 @@ function resolveRunLivenessCeilingMs() {
 const INTERRUPTED_RUN_MESSAGE = "Worker stopped before a terminal result was recorded. The serverless worker may have timed out or been recycled. No delivery was confirmed.";
 const INTERRUPTED_RUN_ERROR_CODE = "background_automation_interrupted";
 const claimLeaseMs = () => resolveRunLivenessCeilingMs();
-const RUNS_RETAINED_PER_AUTOMATION = 50;
+/**
+ * How long a queued dispatch's claim stays valid before another worker may take
+ * it over (`claimAutomationRun`). The stale-lock recovery must leave a row
+ * inside this lease to its own worker.
+ */
+export function automationRunClaimLeaseMs() {
+    return claimLeaseMs();
+}
+/** How many runs each automation retains; pruning bounds unfinished rows to this. */
+export const RUNS_RETAINED_PER_AUTOMATION = 50;
 const FAILURE_ALERT_LEASE_MS = 60_000;
 const FAILURE_ALERT_RETRY_BASE_MS = 60_000;
 const FAILURE_ALERT_RETRY_MAX_MS = 6 * 60 * 60_000;
@@ -203,6 +212,8 @@ function toRun(row, now) {
             : row.error_code == null
                 ? null
                 : stringifyValue(row.error_code),
+        dispatchPending: Number(row.dispatch_pending ?? 0) === 1,
+        claimedAt: row.claimed_at == null ? null : Number(row.claimed_at),
     };
 }
 export async function startAutomationRun(input) {
@@ -556,16 +567,10 @@ export async function processPendingAutomationFailureAlerts(options) {
     }
     return { attempted, delivered, deferred, suppressed, uncertain, failed };
 }
-export async function finishAutomationRun(id, status, error, errorCode, 
-/**
- * `notify: false` records the run without queueing the owner email. Used for
- * the early failures of a streak that will pause: the owner is told once,
- * by the run that pauses it.
- */
-options = {}) {
+export async function finishAutomationRun(id, status, error, errorCode, options = {}) {
     await ensureTable();
     const existing = await getDbExec().execute({
-        sql: `SELECT owner, automation, path, org_id, app_id, notification_email, run_id, thread_id, started_at, status FROM ${TABLE} WHERE id = ? LIMIT 1`,
+        sql: `SELECT owner, automation, path, org_id, app_id, notification_email, run_id, thread_id, started_at, status, claimed_at FROM ${TABLE} WHERE id = ? LIMIT 1`,
         args: [id],
     });
     const row = existing.rows?.[0];
@@ -573,12 +578,13 @@ options = {}) {
     const shouldQueueFailureAlert = status !== "success" &&
         options.notify !== false &&
         Boolean(row?.notification_email);
+    const claimGuard = options.expectedClaimedAt !== undefined;
     const update = await getDbExec().execute({
         sql: `UPDATE ${TABLE}
           SET status = ?, finished_at = ?, error = ?, error_code = ?,
               failure_alert_state = ?, failure_alert_next_attempt_at = ?,
               failure_alert_claimed_at = NULL
-          WHERE id = ? AND status = 'running'`,
+          WHERE id = ? AND status = 'running'${claimGuard ? " AND claimed_at IS NOT DISTINCT FROM ?" : ""}`,
         args: [
             status,
             finishedAt,
@@ -587,6 +593,7 @@ options = {}) {
             shouldQueueFailureAlert ? "evaluating" : null,
             shouldQueueFailureAlert ? finishedAt : null,
             id,
+            ...(claimGuard ? [options.expectedClaimedAt] : []),
         ],
     });
     if (!row || Number(update.rowsAffected ?? 0) === 0)

package/dist/jobs/scheduler.js

@@ -1,3 +1,4 @@
+import { resolveBackgroundRunHardTimeoutMs } from "../agent/run-manager.js";
 import { resourceGetByPath, resourceListAllOwners, resourcePutIfCurrent, } from "../resources/store.js";
 import { countAutomationCredentialState, trackAutomationPaused, trackAutomationResumed, } from "./automation-events.js";
 import { applyAutomationFailure, classifyAutomationFailure, CLEAR_FAILURE_STATE, CONFIG_INVALID_ERROR_CODE, hasStalePause, isMissingCredentialCode, isPausedByFramework, isReservedIdentityBlocked, isTransientPauseProbeDue, OWNER_MISSING_ERROR_CODE, OWNER_RESERVED_ERROR_CODE, pauseNow, RESUME_AUTOMATION_PATCH, reservedIdentityMessage, runtimeFailureNextRun, TRANSIENT_PROBE_RESUME_PATCH, withDeliveryNote, } from "./automation-outcome.js";
@@ -5,7 +6,7 @@ import { backgroundRunCutOffReason, checkBackgroundAutomationCredentials, isBack
 import { nextOccurrence, isValidCron, describeCron, effectiveTimezone, } from "./cron.js";
 import { buildJobResourceContent, isRecoveredFactoryJob, jobBelongsToApp, parseJobResource, patchJobFrontmatterFields, recoveredFactoryOwnerOrgId, } from "./frontmatter.js";
 import { dispatchRemoteAutomation, finishRemoteAutomationHistory, getRemoteAutomationStatus, } from "./remote-execution.js";
-import { claimAutomationRun, finishAutomationRun, getAutomationRun, listAutomationRuns, } from "./run-history.js";
+import { automationRunClaimLeaseMs, claimAutomationRun, finishAutomationRun, getAutomationRun, listAutomationRuns, RUNS_RETAINED_PER_AUTOMATION, } from "./run-history.js";
 import { acquireAutomationSchedulerLease, recordAutomationSchedulerHealth, releaseAutomationSchedulerLease, renewAutomationSchedulerLease, AUTOMATION_SCHEDULER_LEASE_RENEWAL_MS, } from "./scheduler-health.js";
 import { reapStaleWork } from "./stale-reaper.js";
 export { classifyJobFrontmatter, classifyJobResource, normalizeJobMcpTools, parseJobResource, } from "./frontmatter.js";
@@ -187,7 +188,7 @@ async function processRecurringJobsWithLease(deps) {
                     meta.nextRun = nextOccurrence(meta.schedule, now, meta.timezone).toISOString();
                 }
                 if (await updateResource(resource, meta, body)) {
-                    await recoverStaleAutomationHistory(resource.owner, resource.path);
+                    await recoverStaleAutomationHistory(resource.owner, resource.path, now);
                 }
                 continue;
             }
@@ -337,20 +338,48 @@ async function processRecurringJobsWithLease(deps) {
         });
     }
 }
-async function recoverStaleAutomationHistory(owner, path) {
+async function recoverStaleAutomationHistory(owner, path, now) {
     const automation = path.replace(/^jobs\//, "").replace(/\.md$/, "");
+    const nowMs = now.getTime();
+    const livenessMs = resolveBackgroundRunHardTimeoutMs();
+    const claimLeaseMs = automationRunClaimLeaseMs();
     try {
-        const [run] = await listAutomationRuns({
+        // Settle every run the stopped worker left behind, not only the newest:
+        // a queued "Run now" can be newer than the run that actually stopped.
+        // Pruning bounds unfinished rows to this; a smaller batch could strand an
+        // older stopped row behind newer ones because this recovery runs once per
+        // stale lock.
+        const runs = await listAutomationRuns({
             owners: [owner],
             automation,
-            limit: 1,
+            limit: RUNS_RETAINED_PER_AUTOMATION,
         });
-        if (!run ||
-            run.finishedAt !== null ||
-            (run.status !== "running" && run.status !== "interrupted")) {
-            return;
+        for (const run of runs) {
+            if (run.finishedAt !== null ||
+                (run.status !== "running" && run.status !== "interrupted")) {
+                continue;
+            }
+            // A queued "Run now" inserts its history row before its worker starts.
+            // Until its claim lease passes, its worker (or the redelivery sweep) can
+            // still pick it up, so it is not stale however old the frontmatter lock
+            // it inherits is. This reads the stored claim, not the derived status: a
+            // row past the read-liveness ceiling still reports `interrupted`.
+            const lastQueueTouch = run.claimedAt ?? run.startedAt;
+            const dispatchIsClaimable = run.dispatchPending &&
+                Number.isFinite(lastQueueTouch) &&
+                lastQueueTouch > nowMs - claimLeaseMs;
+            const runIsWithinLiveness = Number.isFinite(run.startedAt) && run.startedAt > nowMs - livenessMs;
+            if (dispatchIsClaimable || runIsWithinLiveness)
+                continue;
+            try {
+                await finishAutomationRun(run.id, "error", "Worker stopped before a terminal result was recorded. The serverless worker may have timed out or been recycled. No delivery was confirmed.", "background_automation_interrupted", { expectedClaimedAt: run.claimedAt });
+            }
+            catch (error) {
+                // One failed write must not strand the rest of the batch: the
+                // frontmatter is already reset and this recovery runs once per lock.
+                console.warn(`[recurring-jobs] Could not record stale history for run "${run.id}":`, error instanceof Error ? error.message : error);
+            }
         }
-        await finishAutomationRun(run.id, "error", "Worker stopped before a terminal result was recorded. The serverless worker may have timed out or been recycled. No delivery was confirmed.", "background_automation_interrupted");
     }
     catch (error) {
         console.warn(`[recurring-jobs] Could not record stale history for "${automation}":`, error instanceof Error ? error.message : error);

package/dist/mcp/build-server.d.ts

@@ -48,6 +48,7 @@ export interface MCPConfig {
     directoryProfile?: {
         connectorCatalog: string[];
         instructions?: string;
+        widgets?: boolean;
         keyToolNames?: readonly string[];
         toolDescriptions?: Record<string, string>;
         toolParameterDescriptions?: Record<string, Record<string, string>>;

package/dist/mcp/build-server.js

@@ -961,8 +961,24 @@ async function resolveMcpAppResourceSafely(config, actionName, entry, requestMet
         return null;
     }
 }
+function mcpAppWidgetsEnabled(config) {
+    return !(config.catalogMode === "directory" &&
+        config.directoryProfile?.widgets === false);
+}
+function stripDirectoryWidgetMeta(config, metadata) {
+    if (mcpAppWidgetsEnabled(config))
+        return;
+    delete metadata.ui;
+    delete metadata[MCP_APP_RESOURCE_URI_META_KEY];
+    delete metadata["openai/ui"];
+    delete metadata["openai/outputTemplate"];
+    for (const key of Object.keys(metadata)) {
+        if (key.startsWith("openai/widget"))
+            delete metadata[key];
+    }
+}
 async function getMcpAppResources(config, actions, requestMeta) {
-    if (!requestMeta?.inlineMcpApps)
+    if (!requestMeta?.inlineMcpApps || !mcpAppWidgetsEnabled(config))
         return [];
     const resources = await Promise.all(Object.entries(actions).map(([name, entry]) => resolveMcpAppResourceSafely(config, name, entry, requestMeta)));
     return resources.filter((resource) => Boolean(resource));
@@ -1256,9 +1272,10 @@ export async function createMCPServerForRequest(config, identity, requestMeta) {
             approvalConfigurationError = true;
         }
     }
-    const supportsMcpApps = compactMcpAppCatalog ||
-        directoryCatalog ||
-        Object.values(advertisedActions).some((entry) => Boolean(entry.mcpApp?.resource));
+    const supportsMcpApps = mcpAppWidgetsEnabled(config) &&
+        (compactMcpAppCatalog ||
+            directoryCatalog ||
+            Object.values(advertisedActions).some((entry) => Boolean(entry.mcpApp?.resource)));
     const servedKeyToolNames = config.keyToolNames?.filter((name) => name in advertisedActions);
     const server = new Server(mcpServerInfo(config, requestMeta), {
         instructions: directoryCatalog
@@ -1400,12 +1417,15 @@ export async function createMCPServerForRequest(config, identity, requestMeta) {
                 .sort(([a], [b]) => compareMcpCatalogValues(a, b))
                 .map(async ([name, entry]) => {
                 const hasLink = typeof entry.link === "function";
-                const mcpAppResource = await resolveMcpAppResourceSafely(config, name, entry, requestMeta);
+                const mcpAppResource = mcpAppWidgetsEnabled(config)
+                    ? await resolveMcpAppResourceSafely(config, name, entry, requestMeta)
+                    : null;
                 const rawToolMeta = entry.tool._meta &&
                     typeof entry.tool._meta === "object" &&
                     !Array.isArray(entry.tool._meta)
                     ? { ...entry.tool._meta }
                     : {};
+                stripDirectoryWidgetMeta(config, rawToolMeta);
                 const inputSchema = mcpToolInputSchema(name, entry.tool.parameters);
                 if (directoryCatalog) {
                     const properties = inputSchema.properties;
@@ -1635,7 +1655,7 @@ export async function createMCPServerForRequest(config, identity, requestMeta) {
                     !!mcpResult.raw &&
                     typeof mcpResult.raw === "object" &&
                     mcpResult.raw.isError === true;
-                const mcpAppResourceCandidate = requestMeta?.inlineMcpApps
+                const mcpAppResourceCandidate = requestMeta?.inlineMcpApps && mcpAppWidgetsEnabled(config)
                     ? await resolveMcpAppResourceSafely(config, name, entry, requestMeta)
                     : null;
                 let directoryLinkUrl;
@@ -1846,7 +1866,10 @@ export async function createMCPServerForRequest(config, identity, requestMeta) {
                 return await withCallerContext(async () => {
                     const uri = request.params?.uri;
                     let found = null;
-                    for (const [name, entry] of Object.entries(advertisedActions)) {
+                    const resourceActions = mcpAppWidgetsEnabled(config)
+                        ? Object.entries(advertisedActions)
+                        : [];
+                    for (const [name, entry] of resourceActions) {
                         const resourceUri = getMcpAppResourceUri(config, name, entry);
                         if (!resourceUri || !matchesMcpAppResourceUri(resourceUri, uri)) {
                             continue;

package/dist/mcp/screen-memory-stdio.d.ts

@@ -140,13 +140,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
-            count?: undefined;
         };
         required?: undefined;
     };
@@ -171,13 +171,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
-            count?: undefined;
         };
         required?: undefined;
     };
@@ -196,13 +196,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
-            count?: undefined;
         };
         required?: undefined;
     };
@@ -231,13 +231,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             };
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
-            count?: undefined;
         };
     };
 } | {
@@ -260,12 +260,12 @@ export declare function screenMemoryMcpToolDefinitions(): ({
                 description: string;
             };
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
-            count?: undefined;
         };
     };
 } | {
@@ -317,6 +317,7 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt: {
                 type: string;
                 description: string;
@@ -336,7 +337,6 @@ export declare function screenMemoryMcpToolDefinitions(): ({
                 type: string;
             };
             requestId?: undefined;
-            count?: undefined;
         };
     };
 } | {
@@ -352,6 +352,7 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
+            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
@@ -360,7 +361,6 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             requestId: {
                 type: string;
             };
-            count?: undefined;
         };
     };
 })[];

package/dist/notifications/routes.d.ts

@@ -1,13 +1,13 @@
 export declare function createNotificationsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<"" | import("./types.js").Notification[] | {
     count: number;
     updated?: undefined;
-    ok?: undefined;
     error?: undefined;
+    ok?: undefined;
 } | {
     count?: undefined;
     updated: number;
-    ok?: undefined;
     error?: undefined;
+    ok?: undefined;
 } | {
     count?: undefined;
     updated?: undefined;

package/dist/observability/routes.d.ts

@@ -27,38 +27,38 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
+    id?: undefined;
     error: string;
     message: string;
     summary?: undefined;
     spans?: undefined;
-    id?: undefined;
     ok?: undefined;
 } | {
+    id?: undefined;
+    error?: undefined;
     message?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
-    id?: undefined;
-    error?: undefined;
     ok?: undefined;
 } | {
+    error?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     id: string;
-    error?: undefined;
     ok?: undefined;
 } | {
+    id?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
-    id?: undefined;
     error: any;
     ok?: undefined;
 } | {
+    id?: undefined;
+    error?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
-    id?: undefined;
-    error?: undefined;
     ok: boolean;
 }>>;

package/dist/org/index.d.ts

@@ -179,8 +179,8 @@ export declare const getMyOrgHandler: import("h3").EventHandlerWithFetch<import(
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     name?: undefined;
     success: boolean;
-    id?: undefined;
     role?: undefined;
+    id?: undefined;
 } | {
     success?: undefined;
     id: string;

package/dist/progress/routes.d.ts

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

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

@@ -75,9 +75,8 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         user: "user";
     }>>;
 }, z.core.$strip>>, {
-    message?: undefined;
     id?: undefined;
-    provider?: undefined;
+    message?: undefined;
     deleted?: undefined;
     providers: {
         id: string;
@@ -89,44 +88,45 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         updatedAt: number;
     }[];
     count: number;
+    provider?: undefined;
     found?: undefined;
     registered?: undefined;
     label?: undefined;
 } | {
-    message?: undefined;
     id?: undefined;
+    count?: undefined;
+    message?: undefined;
     deleted?: undefined;
     providers?: undefined;
-    count?: undefined;
     found: boolean;
     provider: import("../custom-registry.js").CustomProviderConfig;
     registered?: undefined;
     label?: undefined;
 } | {
+    count?: undefined;
     message?: undefined;
-    provider?: undefined;
     deleted?: undefined;
     providers?: undefined;
-    count?: undefined;
+    provider?: undefined;
     found: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
 } | {
+    count?: undefined;
     message?: undefined;
-    provider?: undefined;
     providers?: undefined;
-    count?: undefined;
+    provider?: undefined;
     found?: undefined;
     deleted: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
 } | {
-    provider?: undefined;
+    count?: undefined;
     deleted?: undefined;
     providers?: undefined;
-    count?: undefined;
+    provider?: undefined;
     found?: undefined;
     registered: boolean;
     id: string;

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

@@ -311,9 +311,10 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         notes?: string | undefined;
         scope?: "org" | "user" | undefined;
     }, {
+        provider?: undefined;
+        message?: undefined;
         id?: undefined;
         deleted?: undefined;
-        message?: undefined;
         providers: {
             id: string;
             label: string;
@@ -324,45 +325,44 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
             updatedAt: number;
         }[];
         count: number;
-        provider?: undefined;
         found?: undefined;
         registered?: undefined;
         label?: undefined;
     } | {
+        message?: undefined;
         id?: undefined;
-        count?: undefined;
         deleted?: undefined;
-        message?: undefined;
         providers?: undefined;
+        count?: undefined;
         found: boolean;
         provider: import("../custom-registry.js").CustomProviderConfig;
         registered?: undefined;
         label?: undefined;
     } | {
-        count?: undefined;
-        deleted?: undefined;
+        provider?: undefined;
         message?: undefined;
+        deleted?: undefined;
         providers?: undefined;
-        provider?: undefined;
+        count?: undefined;
         found: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
     } | {
-        count?: undefined;
+        provider?: undefined;
         message?: undefined;
         providers?: undefined;
-        provider?: undefined;
+        count?: undefined;
         found?: undefined;
         deleted: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
     } | {
-        count?: undefined;
+        provider?: undefined;
         deleted?: undefined;
         providers?: undefined;
-        provider?: undefined;
+        count?: undefined;
         found?: undefined;
         registered: boolean;
         id: string;

package/dist/provider-api/corpus-jobs.d.ts

@@ -73,7 +73,6 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     offset?: unknown;
     limit?: unknown;
 }, {
-    deleted?: undefined;
     jobs: {
         id: string;
         name: string;
@@ -84,6 +83,7 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
         updatedAt: string;
     }[];
     total: number;
+    deleted?: undefined;
     jobId?: undefined;
 } | {
     jobs?: undefined;
@@ -91,9 +91,9 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     deleted: boolean;
     jobId: string;
 } | {
-    deleted?: undefined;
     jobs?: undefined;
     total?: undefined;
+    deleted?: undefined;
     jobId?: undefined;
     hits: Record<string, unknown>[];
     offset: number;

package/dist/review/suggestions/actions.js

@@ -6,7 +6,7 @@ import { assertReviewableResourceAccess } from "../registry.js";
 import { ensureReviewTables, insertReviewCommentWithClient, resolveReviewThreadWithClient, } from "../store.js";
 import { suggestionActorKind, suggestionActorKindMatchesReceipt, } from "./actor-kind.js";
 import { getSuggestionAdapter } from "./registry.js";
-import { getSuggestion, ensureSuggestionTables, insertSuggestion, listSuggestions, recordDecision, getDecision, getSuggestionByCreationKey, recordSuggestionCreation, replaceSuggestionStatus, updateSuggestionStatus, getSuggestionAmendment, amendSuggestion, deleteUnclaimedSuggestion, getSuggestionProposal, insertSuggestionProposal, getProposalCreation, recordProposalCreation, getProposalDecision, recordProposalDecision, } from "./store.js";
+import { getSuggestion, ensureSuggestionTables, insertSuggestion, listSuggestions, recordDecision, getDecision, getSuggestionByCreationKey, recordSuggestionCreation, updateSuggestionStatus, getSuggestionAmendment, amendSuggestion, deleteUnclaimedSuggestion, getSuggestionProposal, insertSuggestionProposal, getProposalCreation, recordProposalCreation, getProposalDecision, recordProposalDecision, } from "./store.js";
 const base = { resourceType: z.string().min(1), resourceId: z.string().min(1) };
 const operation = z.object({
     ordinal: z.number().int().nonnegative(),
@@ -308,7 +308,7 @@ export const getResourceSuggestion = defineAction({
     },
 });
 export const decideResourceSuggestion = defineAction({
-    description: "Accept or reject a pending suggestion atomically.",
+    description: "Accept or reject a pending suggestion atomically. An accept that can no longer be placed on the current resource fails with 409 `suggestion_stale`, changes nothing, and leaves the suggestion pending.",
     schema: z.object({
         id: z.string().min(1),
         decision: z.enum(["accepted", "rejected"]),
@@ -365,22 +365,10 @@ export const decideResourceSuggestion = defineAction({
                 currentAdapter.version !== current.adapterVersion)
                 throw new Error("Suggestion adapter version is unavailable");
             if (current.baseRevision !== args.observedBase) {
-                if (!(await updateSuggestionStatus(tx, current.id, "stale", current.revision))) {
-                    return replayDecision(tx);
-                }
-                const decision = await recordDecision(tx, {
-                    suggestionId: current.id,
-                    idempotencyKey: args.idempotencyKey,
-                    reviewer: ctx?.userEmail ?? null,
-                    decision: args.decision,
-                    observedBase: args.observedBase,
-                    outcome: "stale",
-                    detail: "Base revision changed",
+                fail("The suggestion changed; refresh before deciding", {
+                    statusCode: 409,
+                    errorCode: "suggestion_conflict",
                 });
-                return {
-                    suggestion: await getSuggestion(current.id, tx),
-                    decision: decision.record,
-                };
             }
             const claimed = await updateSuggestionStatus(tx, current.id, args.decision, current.revision);
             if (!claimed)
@@ -412,23 +400,14 @@ export const decideResourceSuggestion = defineAction({
                     });
                 }
                 catch (error) {
-                    if (!(error instanceof Error) ||
-                        error.name !== "SuggestionStaleError") {
-                        throw error;
-                    }
-                    await replaceSuggestionStatus(tx, current.id, "accepted", "stale");
-                    await tx.execute({
-                        sql: "UPDATE agent_review_suggestion_decisions SET outcome = ?, detail = ? WHERE id = ?",
-                        args: ["stale", error.message, prior.record.id],
-                    });
-                    return {
-                        suggestion: await getSuggestion(current.id, tx),
-                        decision: {
-                            ...prior.record,
-                            outcome: "stale",
-                            detail: error.message,
-                        },
-                    };
+                    // Failing inside the transaction also rolls back the claim and
+                    // decision above, so the suggestion stays pending and reviewable.
+                    if (error instanceof Error && error.name === "SuggestionStaleError")
+                        fail(error.message, {
+                            statusCode: 409,
+                            errorCode: "suggestion_stale",
+                        });
+                    throw error;
                 }
             }
             if (!prior.duplicate) {
@@ -809,7 +788,7 @@ export const decideResourceSuggestionProposal = defineAction({
                     catch (error) {
                         if (error instanceof Error &&
                             error.name === "SuggestionStaleError") {
-                            fail("A proposal member is stale; no proposal edits were applied", { statusCode: 409, errorCode: "suggestion_conflict" });
+                            fail("A proposal member is stale; no proposal edits were applied", { statusCode: 409, errorCode: "suggestion_stale" });
                         }
                         throw error;
                     }