@tenetkit/pg 0.38.4 → 0.39.0

package/dist/postgres/claims.d.ts

@@ -12,6 +12,7 @@ export declare const refreshLease: (input: {
     readonly runId: string;
     readonly workerId: string;
     readonly attemptFence: number;
+    readonly cancellationRequested: boolean;
     readonly lease: Duration.Input;
 }) => Effect.Effect<boolean, import("effect/unstable/sql/SqlError").SqlError, SqlClient.SqlClient>;
 export declare const requireClaim: (input: {

package/dist/postgres/claims.js

@@ -10,19 +10,24 @@ export const claimReadyRuns = (options) => Effect.gen(function* () {
         SELECT r.run_id
         FROM tenetkit_runs r
         WHERE r.status IN ('queued', 'running', 'cancelling')
-          AND r.cancellation_requested = FALSE
           AND (
-            (
-              r.parent_run_id IS NULL
+            (r.cancellation_requested = TRUE AND r.status = 'cancelling')
+            OR (
+              r.cancellation_requested = FALSE
               AND (
-                r.status = 'running'
-                OR EXISTS (SELECT 1 FROM tenetkit_lanes l WHERE l.head_run_id = r.run_id)
+                (
+                  r.parent_run_id IS NULL
+                  AND (
+                    r.status = 'running'
+                    OR EXISTS (SELECT 1 FROM tenetkit_lanes l WHERE l.head_run_id = r.run_id)
+                  )
+                )
+                OR EXISTS (
+                  SELECT 1 FROM tenetkit_run_links link
+                  WHERE link.child_run_id = r.run_id AND link.readiness = 'ready'
+                )
               )
             )
-            OR EXISTS (
-              SELECT 1 FROM tenetkit_run_links link
-              WHERE link.child_run_id = r.run_id AND link.readiness = 'ready'
-            )
           )
           AND (
             r.owner_worker_id IS NULL
@@ -74,7 +79,7 @@ export const refreshLease = (input) => Effect.gen(function* () {
       WHERE run_id = ${input.runId}
         AND owner_worker_id = ${input.workerId}
         AND attempt_fence = ${input.attemptFence}
-        AND cancellation_requested = FALSE
+        AND cancellation_requested = ${input.cancellationRequested}
         AND status NOT IN ('succeeded', 'failed', 'cancelled')
       RETURNING run_id
     `;

package/dist/postgres/pg-helpers.js

@@ -12,7 +12,7 @@ import { RunNotFound, RunTerminal, RuntimeUnavailable } from "tenetkit/runtime/d
 import { StaleClaim } from "tenetkit/runtime/driver/sql/errors";
 import { admitChildSettlementFromEventId } from "tenetkit/runtime/driver/sql/settlement-notifications";
 import { discardPendingSteering } from "tenetkit/runtime/driver/sql/store-steering-disposition";
-import { hasUnsettledChild, loadTerminalEvent, reconcileChildWaitWith, } from "tenetkit/runtime/driver/sql/store-child-settlement";
+import { hasPendingOperationCancellation, hasUnsettledChild, loadTerminalEvent, reconcileChildWaitWith, } from "tenetkit/runtime/driver/sql/store-child-settlement";
 import { appendTerminalToolResultsForEvent } from "tenetkit/runtime/driver/sql/session-terminalization";
 export const loadRun = (runId) => Effect.gen(function* () {
     const sql = yield* SqlClient.SqlClient;
@@ -209,7 +209,9 @@ export const completeRun = Function.dual(3, (hub, run, result) => Effect.gen(fun
         const runningFanOut = yield* sql `
         SELECT fan_out_id FROM tenetkit_fan_outs WHERE parent_run_id = ${run.runId} AND status = 'running' LIMIT 1
       `;
-        if (runningFanOut.length > 0 || (yield* hasUnsettledChild(run.runId))) {
+        if (runningFanOut.length > 0 ||
+            (yield* hasPendingOperationCancellation(run.runId)) ||
+            (yield* hasUnsettledChild(run.runId))) {
             yield* sql `
           UPDATE tenetkit_runs SET owner_worker_id = NULL, lease_expires_at = NULL WHERE run_id = ${run.runId}
         `;
@@ -299,6 +301,8 @@ export const settleParent = Function.dual(3, (hub, child, terminalEventId) => Ef
     `;
     if (running.length > 0)
         return;
+    if (yield* hasPendingOperationCancellation(parent.runId))
+        return;
     if (yield* hasUnsettledChild(parent.runId))
         return;
     const cancelled = yield* appendEvent(hub, currentParent, {

package/dist/postgres/store-cancel.js

@@ -1,7 +1,8 @@
 import { Effect, Function } from "effect";
 import { RunNotFound, RuntimeUnavailable } from "tenetkit/runtime/driver/errors";
 import { isTerminal } from "tenetkit/runtime/driver/run";
-import { hasUnsettledChild } from "tenetkit/runtime/driver/sql/store-child-settlement";
+import { hasPendingOperationCancellation, hasUnsettledChild } from "tenetkit/runtime/driver/sql/store-child-settlement";
+import { markOperationCancellations } from "tenetkit/runtime/driver/sql/store-operations";
 import { afterTerminal, appendEvent, loadRun, settleParent } from "./pg-helpers.js";
 import { cancelOwnedFanOuts } from "./store-fan-out.js";
 import { reconcileProgramCancellation } from "tenetkit/runtime/driver/sql/store-program";
@@ -24,6 +25,11 @@ export const makeCancelRun = (input) => {
             yield* appendEvent(input.hub, current, { _tag: "RunCancellationRequested", ...(reason === undefined ? {} : { reason }) }, needsResolution ? "needs-resolution" : "cancelling");
             current = (yield* loadRun(runId));
         }
+        const marked = terminal ? 0 : yield* markOperationCancellations(runId);
+        if (marked > 0 && current.status === "needs-resolution") {
+            yield* input.sql `UPDATE tenetkit_runs SET status = 'cancelling' WHERE run_id = ${runId}`;
+            current = (yield* loadRun(runId));
+        }
         if (!terminal)
             yield* reconcileProgramCancellation(runId, reason ?? current.cancelReason);
         yield* input.sql `
@@ -62,6 +68,8 @@ export const makeCancelRun = (input) => {
       `;
         if (running.length > 0)
             return;
+        if (yield* hasPendingOperationCancellation(runId))
+            return;
         if (yield* hasUnsettledChild(runId))
             return;
         const event = yield* appendEvent(input.hub, current, { _tag: "RunCancelled", ...(reason === undefined ? {} : { reason }) }, "cancelled");

package/dist/postgres/store-claims.js

@@ -30,6 +30,7 @@ export const makePostgresClaims = (input) => {
             runId: leaseInput.runId,
             workerId: leaseInput.workerId,
             attemptFence: leaseInput.attemptFence,
+            cancellationRequested: leaseInput.cancellationRequested,
             lease: leaseInput.lease ?? "30 seconds",
         })),
         releaseClaim: (releaseInput) => run(releaseClaim({

package/dist/postgres/store-ops.d.ts

@@ -17,5 +17,5 @@ export declare const postgresOperations: (input: {
     readonly requireRun: (runId: string) => Effect.Effect<DecodedRun, RunNotFound | RuntimeUnavailable | SqlError, SqlR>;
     readonly requireClaim: (claim: import("tenetkit/runtime/driver/run-store").ExecutionClaim) => Effect.Effect<void, import("tenetkit/runtime/driver/sql/errors").StaleClaim | RunNotFound | RuntimeUnavailable | SqlError, SqlR>;
     readonly nextId: (prefix: string) => Effect.Effect<string>;
-}) => Pick<RunStoreInterface, "recordOperation" | "startOperation" | "completeOperation" | "commitModelResponse" | "commitInterruptedModelResponse" | "expireRunningOperation" | "recoverRunningOperations" | "getOperation" | "getOperationByKey" | "resolveOperation">;
+}) => Pick<RunStoreInterface, "recordOperation" | "startOperation" | "completeOperation" | "commitModelResponse" | "commitInterruptedModelResponse" | "expireRunningOperation" | "recoverRunningOperations" | "getOperation" | "getOperationByKey" | "operationCancellations" | "acknowledgeOperationCancellation" | "resolveOperation">;
 export {};

package/dist/postgres/store-ops.js

@@ -11,6 +11,7 @@ import { encodeContinuation } from "tenetkit/runtime/driver/steering";
 import { checkpointRef } from "tenetkit/runtime/driver/executable-manifest";
 import { getProgramOperation, resolveProgramOperation } from "tenetkit/runtime/driver/sql/store-program";
 import { settleAdmittedCancellation } from "tenetkit/runtime/driver/sql/store-control";
+import { acknowledgeOperationCancellation, operationCancellations } from "tenetkit/runtime/driver/sql/store-operations";
 import { postgresModelResponseOperations } from "./store-model-response.js";
 import { appendHandoffSessionEntry, verifyHandoffSessionEntry } from "./session-store.js";
 import { handoffSessionEntry, isHandoffCommit, sameHandoffCheckpoint, sameHandoffCommit, } from "tenetkit/runtime/driver/handoff-session";
@@ -74,6 +75,9 @@ export const postgresOperations = (input) => {
                 }
                 return toOperationRecord(prior);
             }
+            if (loaded.cancellationRequested) {
+                return yield* RuntimeUnavailable.make({ message: `run ${loaded.runId} is cancelling` });
+            }
             const steeringEntryIds = op.steeringEntryIds ?? [];
             const pending = yield* sql `
             SELECT entry_id FROM tenetkit_run_steering
@@ -134,7 +138,10 @@ export const postgresOperations = (input) => {
             return toOperationRecord(rows[0]);
         })),
         startOperation: (op) => fenced(op, Effect.gen(function* () {
-            yield* requireRun(op.runId);
+            const loaded = yield* requireRun(op.runId);
+            if (loaded.cancellationRequested) {
+                return yield* RuntimeUnavailable.make({ message: `run ${loaded.runId} is cancelling` });
+            }
             yield* sql `
             UPDATE tenetkit_run_operations
             SET status = 'running', started_at = NOW()
@@ -159,7 +166,11 @@ export const postgresOperations = (input) => {
             if (row === undefined)
                 return yield* RuntimeUnavailable.make({ message: "operation missing" });
             const current = toOperationRecord(row);
-            if (row.status === "succeeded" || row.status === "failed" || row.status === "unknown") {
+            if (row.status === "cancelling" ||
+                row.status === "cancelled" ||
+                row.status === "succeeded" ||
+                row.status === "failed" ||
+                row.status === "unknown") {
                 if (current.kind === "handoff" && current.status === "succeeded" && isHandoffCommit(current.result)) {
                     if (op.outcome._tag !== "Succeeded" ||
                         !sameHandoffCommit(current.result, op.outcome.value) ||
@@ -274,6 +285,8 @@ export const postgresOperations = (input) => {
           `;
             return rows[0] === undefined ? undefined : toOperationRecord(rows[0]);
         })),
+        operationCancellations: (claim) => fenced(claim, operationCancellations(claim)),
+        acknowledgeOperationCancellation: (op) => fenced(op, acknowledgeOperationCancellation(op)),
         resolveOperation: (op) => run(Effect.gen(function* () {
             yield* lockRunHierarchy(op.runId);
             const loaded = yield* requireRun(op.runId);

package/dist/postgres/store.js

@@ -45,6 +45,7 @@ import { reconcileCancellationRequested } from "tenetkit/runtime/driver/sql/sess
 import { cancelSessionRuns } from "./session-cancellation.js";
 import { makePostgresSessionStore } from "./session-store.js";
 import { readinessForAdmission } from "tenetkit/runtime/driver/sql/store-child-capacity";
+import { hasPendingOperationCancellation } from "tenetkit/runtime/driver/sql/store-child-settlement";
 export const makePostgresServices = (options) => Effect.gen(function* () {
     const source = options.source ?? "postgres";
     const addressBindings = new Map(options.addresses.map((entry) => [entry.address, entry.executable]));
@@ -291,7 +292,8 @@ export const makePostgresServices = (options) => Effect.gen(function* () {
                 return yield* RunTerminal.make({ runId: loaded.runId, status: loaded.status });
             }
             if (loaded.cancellationRequested) {
-                if (yield* deferCancelledFanOutParent(sql, loaded.runId))
+                if ((yield* deferCancelledFanOutParent(sql, loaded.runId)) ||
+                    (yield* hasPendingOperationCancellation(loaded.runId)))
                     return;
                 const event = yield* appendEvent(transactionHub, loaded, { _tag: "RunCancelled", ...(loaded.cancelReason === undefined ? {} : { reason: loaded.cancelReason }) }, "cancelled");
                 const settled = (yield* loadRun(loaded.runId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.38.4",
+  "version": "0.39.0",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@effect/sql-pg": "4.0.0-rc.111",
-    "tenetkit": "0.38.4"
+    "tenetkit": "0.39.0"
   },
   "devDependencies": {
     "@effect/vitest": "4.0.0-rc.111",