@tenetkit/pg 0.38.0 → 0.38.2

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" | "getOperation" | "getOperationByKey" | "resolveOperation">;
+}) => Pick<RunStoreInterface, "recordOperation" | "startOperation" | "completeOperation" | "commitModelResponse" | "commitInterruptedModelResponse" | "expireRunningOperation" | "recoverRunningOperations" | "getOperation" | "getOperationByKey" | "resolveOperation">;
 export {};

package/dist/postgres/store-ops.js

@@ -18,6 +18,38 @@ import { lockRunHierarchy } from "./locks.js";
 export const postgresOperations = (input) => {
     const { sql, hub, run, runNoTxn, requireRun, requireClaim, nextId } = input;
     const fenced = (claim, effect) => run(sql `SELECT run_id FROM tenetkit_runs WHERE run_id = ${claim.runId} FOR UPDATE`.pipe(Effect.andThen(requireClaim(claim)), Effect.andThen(effect)));
+    const expire = (op) => Effect.gen(function* () {
+        const loaded = yield* requireRun(op.runId);
+        const rows = yield* sql `
+        SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
+      `;
+        const row = rows[0];
+        if (row === undefined)
+            return yield* RuntimeUnavailable.make({ message: "operation missing" });
+        if (row.status !== "running") {
+            return { record: toOperationRecord(row), outcome: row.status };
+        }
+        if (canBlindRetry(row.replay_policy)) {
+            yield* sql `
+          UPDATE tenetkit_run_operations
+          SET status = 'requested', started_at = NULL, finished_at = NULL, owner_worker_id = NULL, lease_expires_at = NULL
+          WHERE run_id = ${op.runId} AND operation_id = ${op.operationId} AND status = 'running'
+        `;
+            const next = yield* sql `
+          SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
+        `;
+            return { record: toOperationRecord(next[0]), outcome: "retried" };
+        }
+        yield* sql `
+        UPDATE tenetkit_run_operations SET status = 'unknown', finished_at = NOW()
+        WHERE run_id = ${op.runId} AND operation_id = ${op.operationId} AND status = 'running'
+      `;
+        yield* appendEvent(hub, loaded, { _tag: "OperationUnknown", operationId: op.operationId }, loaded.cancellationRequested ? "cancelling" : "needs-resolution");
+        const next = yield* sql `
+        SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
+      `;
+        return { record: toOperationRecord(next[0]), outcome: "unknown" };
+    });
     return {
         recordOperation: (op) => fenced(op, Effect.gen(function* () {
             const loaded = yield* requireRun(op.runId);
@@ -212,37 +244,18 @@ export const postgresOperations = (input) => {
             return toOperationRecord(rows[0]);
         })),
         ...postgresModelResponseOperations(input),
-        expireRunningOperation: (op) => fenced(op, Effect.gen(function* () {
-            const loaded = yield* requireRun(op.runId);
-            const rows = yield* sql `
-            SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
+        expireRunningOperation: (op) => fenced(op, expire(op)),
+        recoverRunningOperations: (claim) => fenced(claim, Effect.gen(function* () {
+            const operations = yield* sql `
+            SELECT operation_id FROM tenetkit_run_operations
+            WHERE run_id = ${claim.runId} AND status = 'running'
+            ORDER BY operation_id
           `;
-            const row = rows[0];
-            if (row === undefined)
-                return yield* RuntimeUnavailable.make({ message: "operation missing" });
-            if (row.status !== "running") {
-                return { record: toOperationRecord(row), outcome: row.status };
+            for (const operation of operations) {
+                yield* expire({ runId: claim.runId, operationId: operation.operation_id });
             }
-            if (canBlindRetry(row.replay_policy)) {
-                yield* sql `
-              UPDATE tenetkit_run_operations
-              SET status = 'requested', started_at = NULL, finished_at = NULL, owner_worker_id = NULL, lease_expires_at = NULL
-              WHERE run_id = ${op.runId} AND operation_id = ${op.operationId} AND status = 'running'
-            `;
-                const next = yield* sql `
-              SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
-            `;
-                return { record: toOperationRecord(next[0]), outcome: "retried" };
-            }
-            yield* sql `
-            UPDATE tenetkit_run_operations SET status = 'unknown', finished_at = NOW()
-            WHERE run_id = ${op.runId} AND operation_id = ${op.operationId} AND status = 'running'
-          `;
-            yield* appendEvent(hub, loaded, { _tag: "OperationUnknown", operationId: op.operationId }, loaded.cancellationRequested ? "cancelling" : "needs-resolution");
-            const next = yield* sql `
-            SELECT * FROM tenetkit_run_operations WHERE run_id = ${op.runId} AND operation_id = ${op.operationId}
-          `;
-            return { record: toOperationRecord(next[0]), outcome: "unknown" };
+            const loaded = yield* requireRun(claim.runId);
+            return loaded.status === "needs-resolution" ? "blocked" : "ready";
         })),
         getOperation: (op) => runNoTxn(Effect.gen(function* () {
             yield* requireRun(op.runId);
@@ -318,8 +331,15 @@ export const postgresOperations = (input) => {
               WHERE run_id = ${op.runId} AND operation_id = ${op.operationId} AND status = 'unknown'
             `;
             }
+            const unresolved = yield* sql `
+            SELECT COUNT(*)::int AS unresolved FROM tenetkit_run_operations
+            WHERE run_id = ${op.runId} AND status = 'unknown'
+          `;
+            const runStatus = Number(unresolved[0]?.unresolved ?? 0) > 0
+                ? sql `'needs-resolution'`
+                : sql `CASE WHEN cancellation_requested THEN 'cancelling' ELSE 'queued' END`;
             yield* sql `
-            UPDATE tenetkit_runs SET status = CASE WHEN cancellation_requested THEN 'cancelling' ELSE 'queued' END, owner_worker_id = NULL, lease_expires_at = NULL, updated_at = NOW()
+            UPDATE tenetkit_runs SET status = ${runStatus}, owner_worker_id = NULL, lease_expires_at = NULL, updated_at = NOW()
             WHERE run_id = ${op.runId} AND status = 'needs-resolution'
           `;
             yield* settleAdmittedCancellation(hub, op.runId);

package/package.json

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