gencow 0.1.241 → 0.1.242

package/core/index.js

@@ -2925,15 +2925,8 @@ function deriveWorkflowStatus(status, currentStep) {
 
 // ../core/src/workflows-api.ts
 import { sql as sql4 } from "drizzle-orm";
-var WORKFLOW_STATUSES = /* @__PURE__ */ new Set(["pending", "running", "completed", "failed"]);
-var WORKFLOW_DERIVED_PENDING_STATUSES = /* @__PURE__ */ new Set(["queued", "waiting", "sleeping"]);
-function rowsFromResult(result) {
-  if (Array.isArray(result)) return result;
-  if (result && typeof result === "object" && Array.isArray(result.rows)) {
-    return result.rows;
-  }
-  return [];
-}
+
+// ../core/src/workflow-public-read-model.ts
 function parseJsonField(value) {
   if (typeof value !== "string") return value;
   try {
@@ -2950,6 +2943,57 @@ function toIsoString(value) {
 function toOptionalIsoString(value) {
   return value ? toIsoString(value) : null;
 }
+function publicV2Status(status) {
+  if (status === "completed" || status === "failed") return status;
+  if (status === "cancelled") return "failed";
+  if (status === "running") return "running";
+  return "pending";
+}
+function publicV2DerivedStatus(status) {
+  if (status === "queued" || status === "waiting" || status === "sleeping") return status;
+  return publicV2Status(status);
+}
+function mapV2WorkflowSummary(row) {
+  const error = parseJsonField(row.error_json);
+  return {
+    id: row.id,
+    name: row.workflow_name,
+    status: publicV2Status(row.status),
+    derivedStatus: publicV2DerivedStatus(row.status),
+    currentStep: row.current_step_key,
+    error: typeof error === "string" ? error : error && typeof error === "object" && "message" in error ? String(error.message) : null,
+    errorCode: row.status === "cancelled" ? "cancelled" : row.error_code,
+    retryCount: row.retry_count,
+    maxRetries: row.max_retries,
+    maxDurationMs: Number(row.max_active_duration_ms),
+    startedAt: toIsoString(row.created_at),
+    updatedAt: toIsoString(row.updated_at),
+    completedAt: toOptionalIsoString(row.completed_at)
+  };
+}
+function mapV2WorkflowStep(row) {
+  const error = parseJsonField(row.error_json);
+  return {
+    name: row.step_key,
+    status: row.status === "running" || row.status === "failed" || row.status === "completed" ? row.status : row.status === "skipped" ? "completed" : "pending",
+    output: parseJsonField(row.output_json),
+    error: typeof error === "string" ? error : error && typeof error === "object" && "message" in error ? String(error.message) : null,
+    startedAt: toOptionalIsoString(row.started_at),
+    updatedAt: toIsoString(row.updated_at),
+    completedAt: toOptionalIsoString(row.completed_at)
+  };
+}
+
+// ../core/src/workflows-api.ts
+var WORKFLOW_STATUSES = /* @__PURE__ */ new Set(["pending", "running", "completed", "failed"]);
+var WORKFLOW_DERIVED_PENDING_STATUSES = /* @__PURE__ */ new Set(["queued", "waiting", "sleeping"]);
+function rowsFromResult(result) {
+  if (Array.isArray(result)) return result;
+  if (result && typeof result === "object" && Array.isArray(result.rows)) {
+    return result.rows;
+  }
+  return [];
+}
 function mapWorkflowSummary(row) {
   return {
     id: row.id,
@@ -2967,6 +3011,26 @@ function mapWorkflowSummary(row) {
     completedAt: toOptionalIsoString(row.completed_at)
   };
 }
+function mapJoinedWorkflowSummary(row) {
+  if (!row.v2_id) return mapWorkflowSummary(row);
+  return mapV2WorkflowSummary({
+    id: row.v2_id,
+    workflow_name: row.v2_name,
+    status: row.v2_status,
+    args_json: null,
+    result_json: null,
+    error_json: row.v2_error_json,
+    error_code: row.v2_error_code,
+    current_step_key: row.v2_current_step,
+    retry_count: row.v2_retry_count,
+    max_retries: row.v2_max_retries,
+    max_active_duration_ms: row.v2_max_duration_ms,
+    created_at: row.v2_created_at,
+    updated_at: row.v2_updated_at,
+    completed_at: row.v2_completed_at,
+    user_id: null
+  });
+}
 function mapWorkflowStep(row) {
   return {
     name: row.step_name,
@@ -2999,13 +3063,6 @@ function normalizeDerivedStatus(status) {
   }
   return normalizeStatus(status);
 }
-function toWorkflowStatusFilter(status) {
-  if (status == null) return void 0;
-  if (WORKFLOW_DERIVED_PENDING_STATUSES.has(status)) {
-    return "pending";
-  }
-  return status;
-}
 async function ensureWorkflowRealtimeToken(db, workflowId, currentToken) {
   if (currentToken && currentToken.trim() !== "") return currentToken;
   const nextToken = createWorkflowRealtimeToken();
@@ -3028,7 +3085,8 @@ async function ensureWorkflowRealtimeToken(db, workflowId, currentToken) {
   return rereadToken && rereadToken.trim() !== "" ? rereadToken : null;
 }
 async function loadWorkflowSignalTarget(db, workflowId) {
-  const result = await db.execute(sql4`
+  try {
+    const result = await db.execute(sql4`
         SELECT
             id,
             name,
@@ -3038,8 +3096,12 @@ async function loadWorkflowSignalTarget(db, workflowId) {
         FROM _gencow_workflows
         WHERE id = ${workflowId}
         LIMIT 1
-  `);
-  return rowsFromResult(result)[0] ?? null;
+    `);
+    return rowsFromResult(result)[0] ?? null;
+  } catch (error) {
+    if (isMissingWorkflowV1Table(error)) return null;
+    throw error;
+  }
 }
 function isMissingWorkflowV2SignalSchemaError(error) {
   const code = error && typeof error === "object" && "code" in error ? String(error.code) : "";
@@ -3055,39 +3117,55 @@ function isMissingWorkflowV2PayloadSchemaError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return code === "42P01" || causeCode === "42P01" || message.includes('relation "_gencow_workflow_runs_v2" does not exist') || message.includes("relation _gencow_workflow_runs_v2 does not exist") || message.includes('relation "_gencow_workflow_steps_v2" does not exist') || message.includes("relation _gencow_workflow_steps_v2 does not exist");
 }
-async function loadWorkflowV2PayloadSnapshot(db, workflowId) {
+function isMissingWorkflowV1Table(error) {
+  const cause = error && typeof error === "object" && "cause" in error ? error.cause : null;
+  const message = `${error instanceof Error ? error.message : String(error)} ${cause instanceof Error ? cause.message : String(cause ?? "")}`;
+  return /relation "?_gencow_workflows"? does not exist|relation "?_gencow_workflow_steps"? does not exist|relation "?_gencow_workflow_events"? does not exist/.test(
+    message
+  );
+}
+async function loadWorkflowV2Run(db, workflowId) {
   try {
-    const runResult = await db.execute(sql4`
-      SELECT args_json, result_json
+    const result = await db.execute(sql4`
+      SELECT id, workflow_name, status, args_json, result_json, error_json, error_code,
+             current_step_key, retry_count, max_retries, max_active_duration_ms,
+             created_at, updated_at, completed_at, user_id
       FROM _gencow_workflow_runs_v2
       WHERE id = ${workflowId}
       LIMIT 1
     `);
-    const run = rowsFromResult(runResult)[0];
-    if (!run) return null;
+    return rowsFromResult(result)[0] ?? null;
+  } catch (error) {
+    if (isMissingWorkflowV2PayloadSchemaError(error)) return null;
+    throw error;
+  }
+}
+async function loadWorkflowV2Steps(db, workflowId) {
+  try {
     const stepResult = await db.execute(sql4`
-      SELECT step_key, output_json
+      SELECT step_key, status, output_json, error_json, started_at, updated_at, completed_at
       FROM _gencow_workflow_steps_v2
       WHERE run_id = ${workflowId}
+      ORDER BY step_index ASC, COALESCE(started_at, updated_at) ASC, step_key ASC
     `);
-    return {
-      run,
-      steps: new Map(
-        rowsFromResult(stepResult).map((step) => [
-          step.step_key,
-          parseJsonField(step.output_json)
-        ])
-      )
-    };
+    return rowsFromResult(stepResult);
   } catch (error) {
-    if (isMissingWorkflowV2PayloadSchemaError(error)) return null;
+    if (isMissingWorkflowV2PayloadSchemaError(error)) return [];
     throw error;
   }
 }
 async function tryRecordWorkflowV2Signal(options) {
   try {
-    await options.db.execute(sql4`
-      WITH inserted AS (
+    const result = await options.db.execute(sql4`
+      WITH eligible_run AS (
+        SELECT id
+        FROM _gencow_workflow_runs_v2
+        WHERE id = ${options.workflowId}
+          AND status IN ('queued', 'running', 'sleeping', 'waiting')
+          AND completed_at IS NULL
+          AND cancel_requested_at IS NULL
+        FOR UPDATE
+      ), inserted AS (
         INSERT INTO _gencow_workflow_signals_v2 (
           id,
           run_id,
@@ -3095,30 +3173,15 @@ async function tryRecordWorkflowV2Signal(options) {
           payload_json,
           idempotency_key
         )
-        VALUES (
-          ${crypto.randomUUID()},
-          ${options.workflowId},
+        SELECT
+          ${options.signalId},
+          eligible_run.id,
           ${options.event},
           ${workflowJsonb(options.payload)},
-          ${crypto.randomUUID()}
-        )
+          ${options.signalId}
+        FROM eligible_run
         RETURNING id, run_id
       ),
-      inserted_legacy AS (
-        INSERT INTO _gencow_workflow_events (
-          id,
-          workflow_id,
-          event_name,
-          payload
-        )
-        VALUES (
-          ${options.eventId},
-          ${options.workflowId},
-          ${options.event},
-          NULL
-        )
-        RETURNING id
-      ),
       queued_run AS (
         UPDATE _gencow_workflow_runs_v2 run
         SET
@@ -3160,17 +3223,34 @@ async function tryRecordWorkflowV2Signal(options) {
       )
       SELECT 1
       FROM inserted
-      LEFT JOIN inserted_legacy ON TRUE
       LEFT JOIN wake_notified ON TRUE
     `);
-    return true;
+    return rowsFromResult(result).length > 0 ? "accepted" : "rejected";
   } catch (error) {
-    if (isMissingWorkflowV2SignalSchemaError(error)) return false;
+    if (isMissingWorkflowV2SignalSchemaError(error)) return "absent";
     throw error;
   }
 }
+async function mirrorWorkflowV2SignalToV1(options) {
+  try {
+    await options.db.execute(sql4`
+      INSERT INTO _gencow_workflow_events (id, workflow_id, event_name, payload)
+      SELECT ${options.signalId}, workflow.id, ${options.event}, NULL
+      FROM _gencow_workflows workflow
+      WHERE workflow.id = ${options.workflowId}
+      ON CONFLICT (id) DO NOTHING
+    `);
+  } catch (error) {
+    if (!isMissingWorkflowV1Table(error)) {
+      console.warn("Workflow V1 signal mirror failed", { signalId: options.signalId });
+    }
+  }
+}
 async function loadWorkflowSnapshot(db, workflowId, options) {
-  const workflowResult = await db.execute(sql4`
+  const v2Run = await loadWorkflowV2Run(db, workflowId);
+  let workflowResult;
+  try {
+    workflowResult = await db.execute(sql4`
         SELECT
             id,
             name,
@@ -3192,16 +3272,25 @@ async function loadWorkflowSnapshot(db, workflowId, options) {
         WHERE id = ${workflowId}
         LIMIT 1
     `);
+  } catch (error) {
+    if (!v2Run || !isMissingWorkflowV1Table(error)) throw error;
+    workflowResult = [];
+  }
   const row = rowsFromResult(workflowResult)[0] ?? null;
-  if (!row) return null;
+  if (!v2Run && !row) return null;
   const viewerUserId = options?.viewerUserId ?? null;
-  if (options?.requireViewerMatch && row.user_id && row.user_id !== viewerUserId) {
+  const ownerId = v2Run ? v2Run.user_id : row?.user_id;
+  if (options?.requireViewerMatch && ownerId && ownerId !== viewerUserId) {
     return null;
   }
-  const realtimeToken = await ensureWorkflowRealtimeToken(db, workflowId, row.realtime_token);
+  const realtimeToken = row ? await ensureWorkflowRealtimeToken(db, workflowId, row.realtime_token) : v2Run?.id ?? null;
   if (!realtimeToken) return null;
-  const v2Payload = await loadWorkflowV2PayloadSnapshot(db, workflowId);
-  const stepsResult = await db.execute(sql4`
+  const v2Steps = v2Run ? await loadWorkflowV2Steps(db, workflowId) : [];
+  let steps = v2Steps.map(mapV2WorkflowStep);
+  if (steps.length === 0) {
+    let stepsResult;
+    try {
+      stepsResult = await db.execute(sql4`
         SELECT
             step_name,
             status,
@@ -3213,17 +3302,19 @@ async function loadWorkflowSnapshot(db, workflowId, options) {
         FROM _gencow_workflow_steps
         WHERE workflow_id = ${workflowId}
         ORDER BY COALESCE(started_at, updated_at) ASC, step_name ASC
-    `);
-  const steps = rowsFromResult(stepsResult).map((stepRow) => {
-    const mapped = mapWorkflowStep(stepRow);
-    return v2Payload?.steps.has(stepRow.step_name) ? { ...mapped, output: v2Payload.steps.get(stepRow.step_name) } : mapped;
-  });
+      `);
+    } catch (error) {
+      if (!v2Run || !isMissingWorkflowV1Table(error)) throw error;
+      stepsResult = [];
+    }
+    steps = rowsFromResult(stepsResult).map(mapWorkflowStep);
+  }
   return {
-    ...mapWorkflowSummary(row),
-    args: v2Payload ? deserializeWorkflowValue(parseJsonField(v2Payload.run.args_json)) : deserializeWorkflowValue(parseJsonField(row.args)),
-    result: v2Payload ? parseJsonField(v2Payload.run.result_json) : deserializeWorkflowValue(parseJsonField(row.result)),
+    ...v2Run ? mapV2WorkflowSummary(v2Run) : mapWorkflowSummary(row),
+    args: deserializeWorkflowValue(parseJsonField(v2Run ? v2Run.args_json : row.args)),
+    result: v2Run ? parseJsonField(v2Run.result_json) : deserializeWorkflowValue(parseJsonField(row.result)),
     steps,
-    realtimeKey: getWorkflowRealtimeKey(row.id, realtimeToken)
+    realtimeKey: getWorkflowRealtimeKey(workflowId, realtimeToken)
   };
 }
 function buildWorkflowBuiltinDefinitions() {
@@ -3251,9 +3342,11 @@ function buildWorkflowBuiltinDefinitions() {
       if (!normalizedEvent) {
         throw new GencowValidationError(`Argument "event": expected a non-empty string`);
       }
+      const v2Run = await loadWorkflowV2Run(ctx.unsafeDb, args.id);
       const workflow2 = await loadWorkflowSignalTarget(ctx.unsafeDb, args.id);
       const viewerUserId = ctx.auth.getUserIdentity()?.id ?? null;
-      if (!workflow2 || workflow2.user_id && workflow2.user_id !== viewerUserId) {
+      const ownerId = v2Run ? v2Run.user_id : workflow2?.user_id;
+      if (!v2Run && !workflow2 || ownerId && ownerId !== viewerUserId) {
         return {
           ok: false,
           workflowId: args.id,
@@ -3261,29 +3354,43 @@ function buildWorkflowBuiltinDefinitions() {
           scheduledJobId: null
         };
       }
-      if (workflow2.status === "completed" || workflow2.status === "failed") {
+      const workflowId = v2Run?.id ?? workflow2.id;
+      const workflowName = v2Run?.workflow_name ?? workflow2.name;
+      if (v2Run ? v2Run.status === "completed" || v2Run.status === "failed" || v2Run.status === "cancelled" || v2Run.completed_at !== null : workflow2.status === "completed" || workflow2.status === "failed") {
         return {
           ok: false,
-          workflowId: workflow2.id,
+          workflowId,
           event: normalizedEvent,
           scheduledJobId: null
         };
       }
       const persistedPayload = serializeWorkflowValue(args.payload);
       assertWorkflowPayloadWithinLimit({
-        workflowName: workflow2.name,
+        workflowName,
         kind: "signal",
         serializedValue: persistedPayload
       });
-      const eventId = crypto.randomUUID();
-      const recordedV2 = await tryRecordWorkflowV2Signal({
-        db: ctx.unsafeDb,
-        workflowId: workflow2.id,
-        event: normalizedEvent,
-        eventId,
-        payload: persistedPayload
-      });
-      if (!recordedV2) {
+      const signalId = crypto.randomUUID();
+      if (v2Run) {
+        const recordedV2 = await tryRecordWorkflowV2Signal({
+          db: ctx.unsafeDb,
+          workflowId,
+          event: normalizedEvent,
+          signalId,
+          payload: persistedPayload
+        });
+        if (recordedV2 !== "accepted") {
+          return { ok: false, workflowId, event: normalizedEvent, scheduledJobId: null };
+        }
+        if (workflow2) {
+          await mirrorWorkflowV2SignalToV1({
+            db: ctx.unsafeDb,
+            workflowId,
+            event: normalizedEvent,
+            signalId
+          });
+        }
+      } else {
         await ctx.unsafeDb.execute(sql4`
                 INSERT INTO _gencow_workflow_events (
                     id,
@@ -3292,18 +3399,18 @@ function buildWorkflowBuiltinDefinitions() {
                     payload
                 )
                 VALUES (
-                    ${eventId},
-                    ${workflow2.id},
+                    ${signalId},
+                    ${workflowId},
                     ${normalizedEvent},
                   ${workflowJsonb(persistedPayload)}
                 )
             `);
       }
       let scheduledJobId = null;
-      if (workflow2.status === "pending" && workflow2.current_step?.startsWith("wait:")) {
+      if (workflow2?.status === "pending" && workflow2.current_step?.startsWith("wait:")) {
         try {
-          scheduledJobId = ctx.scheduler.runAfter(0, getWorkflowResumeActionName(workflow2.name), {
-            workflowId: workflow2.id
+          scheduledJobId = ctx.scheduler.runAfter(0, getWorkflowResumeActionName(workflowName), {
+            workflowId
           });
         } catch {
           scheduledJobId = null;
@@ -3311,7 +3418,7 @@ function buildWorkflowBuiltinDefinitions() {
       }
       return {
         ok: true,
-        workflowId: workflow2.id,
+        workflowId,
         event: normalizedEvent,
         scheduledJobId
       };
@@ -3328,52 +3435,64 @@ function buildWorkflowBuiltinDefinitions() {
       const userId = ctx.auth.requireAuth().id;
       const limit = normalizeListLimit(args.limit);
       const requestedStatus = normalizeDerivedStatus(args.status);
-      const status = toWorkflowStatusFilter(requestedStatus);
-      const result = status == null ? await ctx.unsafeDb.execute(sql4`
-                    SELECT
-                        id,
-                        name,
-                        args,
-                        status,
-                        current_step,
-                        result,
-                        error,
-                        error_code,
-                        retry_count,
-                        max_retries,
-                        max_duration_ms,
-                        started_at,
-                        updated_at,
-                        completed_at,
-                        user_id
-                    FROM _gencow_workflows
-                    WHERE user_id = ${userId}
-                    ORDER BY started_at DESC
-                    LIMIT ${limit}
-                `) : await ctx.unsafeDb.execute(sql4`
-                    SELECT
-                        id,
-                        name,
-                        args,
-                        status,
-                        current_step,
-                        result,
-                        error,
-                        error_code,
-                        retry_count,
-                        max_retries,
-                        max_duration_ms,
-                        started_at,
-                        updated_at,
-                        completed_at,
-                        user_id
-                    FROM _gencow_workflows
-                    WHERE user_id = ${userId}
-                      AND status = ${status}
-                    ORDER BY started_at DESC
-                    LIMIT ${limit}
-                `);
-      return rowsFromResult(result).map(mapWorkflowSummary).filter((row) => requestedStatus == null || row.derivedStatus === requestedStatus);
+      const v1Derived = sql4`CASE WHEN w.status = 'pending' AND w.current_step LIKE 'sleep#%' THEN 'sleeping'
+        WHEN w.status = 'pending' AND w.current_step LIKE 'wait:%' THEN 'waiting'
+        WHEN w.status = 'pending' THEN 'queued' ELSE w.status END`;
+      const effectiveStatus = sql4`CASE WHEN v.id IS NOT NULL THEN
+        CASE WHEN v.status = 'cancelled' THEN 'failed'
+             WHEN v.status IN ('queued', 'waiting', 'sleeping') THEN 'pending'
+             ELSE v.status END
+        ELSE w.status END`;
+      const effectiveDerived = sql4`CASE WHEN v.id IS NOT NULL THEN
+        CASE WHEN v.status = 'cancelled' THEN 'failed'
+             WHEN v.status IN ('queued', 'waiting', 'sleeping') THEN v.status
+             ELSE v.status END
+        ELSE ${v1Derived} END`;
+      const statusForFilter = requestedStatus === "pending" ? effectiveStatus : effectiveDerived;
+      const v1StatusForFilter = requestedStatus === "pending" ? sql4`w.status` : v1Derived;
+      try {
+        const result = await ctx.unsafeDb.execute(sql4`
+          SELECT w.*, v.id AS v2_id, v.workflow_name AS v2_name,
+                 v.status AS v2_status, v.error_json AS v2_error_json,
+                 v.error_code AS v2_error_code, v.current_step_key AS v2_current_step,
+                 v.retry_count AS v2_retry_count, v.max_retries AS v2_max_retries,
+                 v.max_active_duration_ms AS v2_max_duration_ms,
+                 v.created_at AS v2_created_at, v.updated_at AS v2_updated_at,
+                 v.completed_at AS v2_completed_at
+          FROM _gencow_workflows w
+          FULL OUTER JOIN _gencow_workflow_runs_v2 v ON v.id = w.id
+          WHERE (CASE WHEN v.id IS NOT NULL THEN v.user_id ELSE w.user_id END) = ${userId}
+            AND (${requestedStatus ?? null}::text IS NULL OR ${statusForFilter} = ${requestedStatus ?? null})
+          ORDER BY COALESCE(v.created_at, w.started_at) DESC, COALESCE(v.id, w.id) DESC
+          LIMIT ${limit}
+        `);
+        return rowsFromResult(result).map(mapJoinedWorkflowSummary);
+      } catch (error) {
+        if (isMissingWorkflowV1Table(error)) {
+          const v2StatusForFilter = requestedStatus === "pending" ? sql4`CASE WHEN status IN ('queued', 'waiting', 'sleeping') THEN 'pending'
+                       WHEN status = 'cancelled' THEN 'failed' ELSE status END` : sql4`CASE WHEN status = 'cancelled' THEN 'failed' ELSE status END`;
+          const result2 = await ctx.unsafeDb.execute(sql4`
+            SELECT id, workflow_name, status, args_json, result_json, error_json, error_code,
+                   current_step_key, retry_count, max_retries, max_active_duration_ms,
+                   created_at, updated_at, completed_at, user_id
+            FROM _gencow_workflow_runs_v2
+            WHERE user_id = ${userId}
+              AND (${requestedStatus ?? null}::text IS NULL OR ${v2StatusForFilter} = ${requestedStatus ?? null})
+            ORDER BY created_at DESC, id DESC
+            LIMIT ${limit}
+          `);
+          return rowsFromResult(result2).map(mapV2WorkflowSummary);
+        }
+        if (!isMissingWorkflowV2PayloadSchemaError(error)) throw error;
+        const result = await ctx.unsafeDb.execute(sql4`
+          SELECT w.* FROM _gencow_workflows w
+          WHERE w.user_id = ${userId}
+            AND (${requestedStatus ?? null}::text IS NULL OR ${v1StatusForFilter} = ${requestedStatus ?? null})
+          ORDER BY w.started_at DESC, w.id DESC
+          LIMIT ${limit}
+        `);
+        return rowsFromResult(result).map(mapWorkflowSummary);
+      }
     }
   };
   const definitions = Object.freeze({

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gencow/core",
-  "version": "0.1.0",
+  "version": "0.1.45",
   "type": "module",
   "main": "index.js"
 }