@kubun/store-workflow 0.13.0 → 0.14.1

package/lib/api.d.ts

@@ -51,8 +51,9 @@ export type ListFilter = {
     queue?: string;
     status?: WorkflowStatus;
 };
-export type WorkflowScheduleRow = Omit<WorkflowSchedule, 'params' | 'enabled'> & {
+export type WorkflowScheduleRow = Omit<WorkflowSchedule, 'params' | 'policy' | 'enabled'> & {
     params: unknown;
+    policy: unknown;
     enabled: boolean;
 };
 export type InsertScheduleInput = {
@@ -63,6 +64,24 @@ export type InsertScheduleInput = {
     every?: string | null;
     nextRun: number;
     enabled: boolean;
+    kind?: 'interval' | 'adaptive';
+    policy?: unknown | null;
+    lastOutcome?: string | null;
+    consecutiveCount?: number;
+};
+export type AdvanceScheduleAdaptiveInput = {
+    nextRun: number;
+    lastOutcome: string | null;
+    consecutiveCount: number;
+};
+export type UpsertAdaptiveScheduleInput = {
+    id: string;
+    workflowName: string;
+    params: unknown;
+    policy: unknown;
+    nextRun: number;
+    enabled: boolean;
+    reactivate?: boolean;
 };
 export type WorkflowStoreAPI = {
     insertInstance(input: InsertInstanceInput): Promise<InsertInstanceResult>;
@@ -78,10 +97,13 @@ export type WorkflowStoreAPI = {
     get(instanceID: string): Promise<WorkflowInstanceRow | null>;
     list(filter?: ListFilter): Promise<Array<WorkflowInstanceRow>>;
     insertSchedule(input: InsertScheduleInput, now: number): Promise<void>;
+    upsertAdaptiveSchedule(input: UpsertAdaptiveScheduleInput, now: number): Promise<WorkflowScheduleRow>;
     getSchedule(id: string): Promise<WorkflowScheduleRow | null>;
     listSchedules(): Promise<Array<WorkflowScheduleRow>>;
     listDueSchedules(now: number): Promise<Array<WorkflowScheduleRow>>;
     advanceSchedule(id: string, nextRun: number, now: number): Promise<void>;
+    advanceScheduleAdaptive(id: string, input: AdvanceScheduleAdaptiveInput, now: number): Promise<void>;
     setScheduleEnabled(id: string, enabled: boolean, now: number): Promise<void>;
+    setSchedulePolicy(id: string, policy: unknown, now: number): Promise<void>;
 };
 export declare function createWorkflowStore(db: Kysely<WorkflowTables>, adapter: Adapter): WorkflowStoreAPI;

package/lib/api.js

@@ -16,6 +16,7 @@ function rowToSchedule(row) {
     return {
         ...row,
         params: decodeJSON(row.params),
+        policy: decodeJSON(row.policy),
         // Stored as integer 0/1 across adapters.
         enabled: Number(row.enabled) === 1
     };
@@ -25,6 +26,7 @@ export function createWorkflowStore(db, adapter) {
     const encodeJSON = (value)=>adapter.encodeJSON(value);
     const encodeNextAction = (value)=>value != null ? adapter.encodeJSON(value) : null;
     const encodeParams = (value)=>adapter.encodeJSON(value);
+    const encodePolicy = (value)=>value != null ? adapter.encodeJSON(value) : null;
     async function readRow(tx, instanceID) {
         return await tx.selectFrom('kubun_workflow_instances').selectAll().where('instance_id', '=', instanceID).executeTakeFirst();
     }
@@ -219,12 +221,48 @@ export function createWorkflowStore(db, adapter) {
                 params: encodeParams(input.params),
                 cron: input.cron ?? null,
                 every: input.every ?? null,
+                kind: input.kind ?? 'interval',
+                policy: encodePolicy(input.policy ?? null),
+                last_outcome: input.lastOutcome ?? null,
+                consecutive_count: input.consecutiveCount ?? 0,
                 next_run: input.nextRun,
                 enabled: input.enabled ? 1 : 0,
                 created_at: now,
                 updated_at: now
             }).execute();
         },
+        async upsertAdaptiveSchedule (input, now) {
+            const reactivate = input.reactivate ?? true;
+            // One statement, no preceding read: ON CONFLICT DO UPDATE lets two
+            // concurrent enables of the same id both commit — one inserts, the other
+            // updates — instead of the loser hitting the PK constraint. RETURNING
+            // hands back the row as committed by this statement. The update touches
+            // only next_run + enabled, so an existing row's params/policy and its
+            // last_outcome/consecutive_count streak survive a re-arm. Under
+            // reactivate:false the update keeps the stored `enabled` flag (a
+            // qualified self-reference, portable across SQLite and Postgres) so a
+            // user-paused row is not silently re-enabled; next_run still advances.
+            const row = await db.insertInto('kubun_workflow_schedules').values({
+                id: input.id,
+                workflow_name: input.workflowName,
+                params: encodeParams(input.params),
+                cron: null,
+                every: null,
+                kind: 'adaptive',
+                policy: encodePolicy(input.policy ?? null),
+                last_outcome: null,
+                consecutive_count: 0,
+                next_run: input.nextRun,
+                enabled: input.enabled ? 1 : 0,
+                created_at: now,
+                updated_at: now
+            }).onConflict((oc)=>oc.column('id').doUpdateSet((eb)=>({
+                        next_run: input.nextRun,
+                        enabled: reactivate ? input.enabled ? 1 : 0 : eb.ref('kubun_workflow_schedules.enabled'),
+                        updated_at: now
+                    }))).returningAll().executeTakeFirstOrThrow();
+            return rowToSchedule(row);
+        },
         async getSchedule (id) {
             const row = await db.selectFrom('kubun_workflow_schedules').selectAll().where('id', '=', id).executeTakeFirst();
             return row != null ? rowToSchedule(row) : null;
@@ -243,11 +281,25 @@ export function createWorkflowStore(db, adapter) {
                 updated_at: now
             }).where('id', '=', id).execute();
         },
+        async advanceScheduleAdaptive (id, input, now) {
+            await db.updateTable('kubun_workflow_schedules').set({
+                next_run: input.nextRun,
+                last_outcome: input.lastOutcome,
+                consecutive_count: input.consecutiveCount,
+                updated_at: now
+            }).where('id', '=', id).execute();
+        },
         async setScheduleEnabled (id, enabled, now) {
             await db.updateTable('kubun_workflow_schedules').set({
                 enabled: enabled ? 1 : 0,
                 updated_at: now
             }).where('id', '=', id).execute();
+        },
+        async setSchedulePolicy (id, policy, now) {
+            await db.updateTable('kubun_workflow_schedules').set({
+                policy: encodePolicy(policy),
+                updated_at: now
+            }).where('id', '=', id).execute();
         }
     };
 }

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import type { StoreProvider } from '@kubun/db';
 import type { WorkflowStoreAPI } from './api.js';
-export type { CheckpointInput, FailInput, FinishInput, InsertInstanceInput, InsertInstanceResult, InsertReason, InsertScheduleInput, ListFilter, WorkflowInstanceRow, WorkflowNextAction, WorkflowScheduleRow, WorkflowStatus, WorkflowStoreAPI, } from './api.js';
+export type { AdvanceScheduleAdaptiveInput, CheckpointInput, FailInput, FinishInput, InsertInstanceInput, InsertInstanceResult, InsertReason, InsertScheduleInput, ListFilter, WorkflowInstanceRow, WorkflowNextAction, WorkflowScheduleRow, WorkflowStatus, WorkflowStoreAPI, } from './api.js';
 export { createWorkflowStore } from './api.js';
 export { workflowStoreDefinition } from './definition.js';
 export { WORKFLOW_SINGLETON_UNIQUE_INDEX } from './migrations.js';

package/lib/migrations.js

@@ -40,7 +40,8 @@ export function getWorkflowMigrations(ctx) {
             ]).execute();
             await db.schema.createTable('kubun_workflow_schedules').ifNotExists().addColumn('id', t.text, (col)=>col.notNull().primaryKey()).addColumn('workflow_name', t.text, (col)=>col.notNull()).addColumn('params', t.json, (col)=>col.notNull())// Exactly one of cron / every is set; both nullable, the store persists
             // them without parsing.
-            .addColumn('cron', t.text).addColumn('every', t.text)// ms-epoch as bigint (not the `timestamp` column type), matching the
+            .addColumn('cron', t.text).addColumn('every', t.text)// Default keeps existing interval inserts working unchanged.
+            .addColumn('kind', t.text, (col)=>col.notNull().defaultTo('interval')).addColumn('policy', t.json).addColumn('last_outcome', t.text).addColumn('consecutive_count', 'integer', (col)=>col.notNull().defaultTo(0))// ms-epoch as bigint (not the `timestamp` column type), matching the
             // instance time columns and compared against an explicit numeric `now`.
             .addColumn('next_run', t.bigint, (col)=>col.notNull())// 0/1: no portable boolean column type across the adapters.
             .addColumn('enabled', 'integer', (col)=>col.notNull().defaultTo(1)).addColumn('created_at', t.bigint, (col)=>col.notNull()).addColumn('updated_at', t.bigint, (col)=>col.notNull()).execute();

package/lib/tables.d.ts

@@ -24,6 +24,10 @@ export type WorkflowScheduleTable = {
     params: unknown;
     cron: string | null;
     every: string | null;
+    kind: string;
+    policy: unknown | null;
+    last_outcome: string | null;
+    consecutive_count: number;
     next_run: number;
     enabled: number;
     created_at: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/store-workflow",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,14 +15,14 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "kysely": "^0.29.5",
-    "@kubun/db": "^0.13.0",
-    "@kubun/db-adapter": "^0.13.0"
+    "@kubun/db": "^0.14.0",
+    "@kubun/db-adapter": "^0.14.1",
+    "kysely": "^0.29.5"
   },
   "devDependencies": {
-    "@testcontainers/postgresql": "^12.1.0",
-    "@kubun/db-better-sqlite": "^0.13.0",
-    "@kubun/db-postgres": "^0.13.0"
+    "@kubun/db-better-sqlite": "^0.14.0",
+    "@kubun/db-postgres": "^0.14.0",
+    "@testcontainers/postgresql": "^12.1.0"
   },
   "publishConfig": {
     "access": "public"