@lmzhen/dsh-evolution-state-domain 0.3.16 → 0.3.18

package/lib/index.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { DomainError, defineDomain, domainTable } from "@deepseek-ai/dsh-storage-domain";
+import { CLAIM_EXPIRY_MS, canClaimPending, canResolvePending, releasedStatus } from "@lmzhen/dsh-evolution-state-storage";
 //#region lib/types/index.js
 /**
 * storage-domain provider for evolution state.
@@ -30,7 +31,6 @@ const pendingSchema = z.object({
 	kind: z.union([
 		z.literal("memory"),
 		z.literal("skill"),
-		z.literal("skill_batch"),
 		z.literal("capability")
 	]),
 	summary: z.string(),
@@ -38,6 +38,7 @@ const pendingSchema = z.object({
 	createdAt: z.string(),
 	status: z.union([
 		z.literal("pending"),
+		z.literal("executing"),
 		z.literal("approved"),
 		z.literal("rejected")
 	]),
@@ -103,6 +104,20 @@ function apply(ctx) {
 		async saveCuratorState(record) {
 			await (await ensure()).table("curator_state").put("primary", record);
 		},
+		async transactCuratorState(task) {
+			const table = (await ensure()).table("curator_state");
+			try {
+				await table.update("primary", (current) => task(current) ?? current);
+			} catch (error) {
+				if (error instanceof DomainError && error.code === "missing-key") {
+					const next = task(null);
+					if (next !== null) await table.put("primary", next);
+					else await table.delete("primary");
+					return;
+				}
+				throw error;
+			}
+		},
 		async listPending(status = "pending") {
 			return [...(await ensure()).table("pending").entries()].map(([, value]) => value).filter((record) => record.status === status);
 		},
@@ -115,11 +130,12 @@ function apply(ctx) {
 				const slot = { record: null };
 				const now = Date.now();
 				await table.update(id, (current) => {
-					if (current.status !== "pending") return current;
+					if (!canClaimPending(current.status)) return current;
 					const claimedAt = typeof current.claimedAt === "string" ? Date.parse(current.claimedAt) : 0;
-					if (current.claimedBy !== void 0 && Number.isFinite(claimedAt) && now - claimedAt < 10 * 6e4) return current;
+					if (current.claimedBy !== void 0 && Number.isFinite(claimedAt) && now - claimedAt < CLAIM_EXPIRY_MS) return current;
 					slot.record = {
 						...current,
+						status: "executing",
 						claimedBy: claimId,
 						claimedAt: new Date(now).toISOString()
 					};
@@ -133,13 +149,15 @@ function apply(ctx) {
 		},
 		async releasePendingClaim(id, claimId) {
 			await (await ensure()).table("pending").update(id, (current) => {
-				if (current.status === "pending" && current.claimedBy === claimId) {
-					const released = { ...current };
-					delete released.claimedBy;
-					delete released.claimedAt;
-					return released;
-				}
-				return current;
+				if (current.status !== "pending" && current.status !== "executing") return current;
+				if (current.claimedBy !== claimId) return current;
+				const released = {
+					...current,
+					status: releasedStatus(current.status)
+				};
+				delete released.claimedBy;
+				delete released.claimedAt;
+				return released;
 			});
 		},
 		async tryResolvePending(id, status) {
@@ -147,7 +165,7 @@ function apply(ctx) {
 			try {
 				const resolved = { record: null };
 				const record = await table.update(id, (current) => {
-					if (current.status !== "pending") return current;
+					if (!canResolvePending(current.status)) return current;
 					resolved.record = {
 						...current,
 						status,
@@ -156,7 +174,7 @@ function apply(ctx) {
 					return resolved.record;
 				});
 				if (resolved.record === null) return {
-					record: record.status === status ? record : null,
+					record,
 					applied: false
 				};
 				return {
@@ -176,6 +194,7 @@ function apply(ctx) {
 		const dispose = ctx.evolutionStateStorage.registerProvider(provider);
 		return async () => {
 			dispose();
+			if (opening) await opening.catch(() => null);
 			if (domain) await domain.close();
 			domain = null;
 			opening = null;

package/lib/types/index.d.ts

@@ -9,7 +9,7 @@
  */
 import type { Context } from '@deepseek-ai/cordis';
 import { z } from 'zod';
-import type { CuratorStateRecord, PendingRecord, ReviewStateRecord } from '@deepseek-ai/dsh-evolution-state-storage';
+import { type CuratorStateRecord, type PendingRecord, type ReviewStateRecord } from '@deepseek-ai/dsh-evolution-state-storage';
 export declare const name = "evolution-state-domain";
 export declare const inject: string[];
 export declare const reviewStateSchema: z.ZodObject<{
@@ -26,11 +26,11 @@ export declare const curatorStateSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const pendingSchema: z.ZodObject<{
     id: z.ZodString;
-    kind: z.ZodUnion<readonly [z.ZodLiteral<"memory">, z.ZodLiteral<"skill">, z.ZodLiteral<"skill_batch">, z.ZodLiteral<"capability">]>;
+    kind: z.ZodUnion<readonly [z.ZodLiteral<"memory">, z.ZodLiteral<"skill">, z.ZodLiteral<"capability">]>;
     summary: z.ZodString;
     args: z.ZodUnknown;
     createdAt: z.ZodString;
-    status: z.ZodUnion<readonly [z.ZodLiteral<"pending">, z.ZodLiteral<"approved">, z.ZodLiteral<"rejected">]>;
+    status: z.ZodUnion<readonly [z.ZodLiteral<"pending">, z.ZodLiteral<"executing">, z.ZodLiteral<"approved">, z.ZodLiteral<"rejected">]>;
     resolvedAt: z.ZodOptional<z.ZodString>;
     claimedBy: z.ZodOptional<z.ZodString>;
     claimedAt: z.ZodOptional<z.ZodString>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-state-domain",
   "description": "storage-domain provider for evolution state (community build)",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "publishConfig": {
     "access": "public"
   },
@@ -38,11 +38,11 @@
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-storage-domain": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.16"
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.18"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-storage-domain": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.16"
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.18"
   }
 }