@isomorph.ai/app-sdk 1.36.1 → 1.36.2

package/dist/runtime.js

@@ -237,18 +237,31 @@ export class Runs {
         const interrupted = expired.filter(run => !active.has(run.id));
         for (const run of interrupted) {
             const exhausted = run.attempt >= run.max_attempts;
-            await this.table().update({ status: exhausted ? 'failed' : 'queued', error: exhausted ? 'the worker was interrupted and no attempts remain' : run.error, lease_until: null, updated_at: now.toISOString() }).eq('id', run.id).eq('status', 'running');
+            const status = run.cancel_requested ? 'cancelled' : exhausted ? 'failed' : 'queued';
+            const { data } = await this.table().update({ status, error: status === 'failed' ? 'the worker was interrupted and no attempts remain' : run.error, lease_until: null, updated_at: now.toISOString() }).eq('id', run.id).eq('status', 'running').eq('cancel_requested', run.cancel_requested).select('id').maybeSingle();
+            // Cancellation may have arrived between reading the expired lease and
+            // writing its retry. It wins that race without leaving another attempt.
+            if (!data && !run.cancel_requested)
+                await this.table().update({ status: 'cancelled', lease_until: null, updated_at: now.toISOString() }).eq('id', run.id).eq('status', 'running').eq('cancel_requested', true);
         }
         return interrupted.length;
     }
     /** Claims the oldest queued run by a conditional update; null when the queue is empty or another worker won. */
     async claim(now) {
-        const { data: queued } = await this.table().select('id, attempt').eq('status', 'queued').order('created_at').limit(1);
-        const next = queued[0];
-        if (!next)
-            return null;
-        const { data } = await this.table().update({ status: 'running', attempt: next.attempt + 1, lease_until: new Date(now.getTime() + LEASE_MS).toISOString(), updated_at: now.toISOString() }).eq('id', next.id).eq('status', 'queued').select('*').maybeSingle();
-        return data;
+        while (true) {
+            const { data: queued } = await this.table().select('id, attempt, cancel_requested').eq('status', 'queued').order('created_at').limit(1);
+            const next = queued[0];
+            if (!next)
+                return null;
+            if (next.cancel_requested) {
+                const { data } = await this.table().update({ status: 'cancelled', lease_until: null, updated_at: now.toISOString() }).eq('id', next.id).eq('status', 'queued').eq('cancel_requested', true).select('id').maybeSingle();
+                if (!data)
+                    return null;
+                continue;
+            }
+            const { data } = await this.table().update({ status: 'running', attempt: next.attempt + 1, lease_until: new Date(now.getTime() + LEASE_MS).toISOString(), updated_at: now.toISOString() }).eq('id', next.id).eq('status', 'queued').eq('cancel_requested', false).select('*').maybeSingle();
+            return data;
+        }
     }
     async progress(id, percent, note) {
         await this.table().update({ progress: Math.max(0, Math.min(100, Math.round(percent))), ...(note === undefined ? {} : { note }), lease_until: new Date(Date.now() + LEASE_MS).toISOString(), updated_at: new Date().toISOString() }).eq('id', id);
@@ -261,8 +274,16 @@ export class Runs {
     async finish(run, outcome) {
         const retry = outcome.error !== undefined && !outcome.cancelled && run.attempt < run.max_attempts;
         const status = outcome.cancelled ? 'cancelled' : outcome.error === undefined ? 'succeeded' : retry ? 'queued' : 'failed';
-        await this.table().update({ status, result: outcome.result ?? null, error: outcome.error ?? null, progress: status === 'succeeded' ? 100 : run.progress, lease_until: null, updated_at: new Date().toISOString() }).eq('id', run.id).eq('status', 'running');
-        return status;
+        const now = new Date().toISOString();
+        if (!outcome.cancelled) {
+            const { data } = await this.table().update({ status, result: outcome.result ?? null, error: outcome.error ?? null, progress: status === 'succeeded' ? 100 : run.progress, lease_until: null, updated_at: now }).eq('id', run.id).eq('status', 'running').eq('cancel_requested', false).select('id').maybeSingle();
+            if (data)
+                return status;
+        }
+        // The handler may throw after the user cancels. A cancelled run is
+        // terminal even when that failure would otherwise be retried.
+        await this.table().update({ status: 'cancelled', result: null, error: null, lease_until: null, updated_at: now }).eq('id', run.id).eq('status', 'running').eq('cancel_requested', true);
+        return 'cancelled';
     }
 }
 export class Runtime {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isomorph.ai/app-sdk",
-  "version": "1.36.1",
+  "version": "1.36.2",
   "type": "module",
   "repository": {
     "type": "git",