@lota-sdk/core 0.4.9 → 0.4.11

package/src/services/plan/plan-executor-helpers.ts

@@ -12,7 +12,7 @@ import {
   isSafePath,
   isSafePathOrRoot,
 } from '@lota-sdk/shared'
-import { Effect } from 'effect'
+import { Effect, Schema } from 'effect'
 
 import type { RecordIdInput } from '../../db/record-id'
 import { ensureRecordId } from '../../db/record-id'
@@ -25,10 +25,11 @@ import { isExecutableConditionExpression, readPathValue } from './plan-helpers'
 const SUCCESSFUL_TERMINAL_NODE_STATUSES = new Set(['completed', 'partial', 'skipped', 'scheduled', 'monitoring'])
 const HUMAN_NODE_TYPE_SET = new Set<string>(HUMAN_NODE_TYPE_VALUES)
 const STRUCTURAL_NODE_TYPE_SET = new Set<string>(STRUCTURAL_NODE_TYPE_VALUES)
+const decodeJsonLiteralEffect = Schema.decodeUnknownEffect(Schema.UnknownFromJsonString)
 
 function parseLiteralValue(raw: string): Effect.Effect<unknown> {
   const trimmed = raw.trim()
-  if (!trimmed.length) return Effect.succeed(undefined)
+  if (!trimmed.length) return Effect.void
   if (trimmed === 'true') return Effect.succeed(true)
   if (trimmed === 'false') return Effect.succeed(false)
   if (trimmed === 'null') return Effect.succeed(null)
@@ -41,9 +42,7 @@ function parseLiteralValue(raw: string): Effect.Effect<unknown> {
     return Effect.succeed(trimmed.slice(1, -1))
   }
 
-  return Effect.try({ try: (): unknown => JSON.parse(trimmed), catch: (cause) => cause }).pipe(
-    Effect.catch(() => Effect.succeed(trimmed)),
-  )
+  return decodeJsonLiteralEffect(trimmed).pipe(Effect.catch(() => Effect.succeed(trimmed)))
 }
 
 function buildArtifactContext(artifacts: Array<{ name: string; kind: string; payload?: unknown }>) {
@@ -149,7 +148,53 @@ type PlanNodeRunUpdate = Omit<
   completedAt?: string | Date | null
 }
 
+function patchField<K extends string, V>(
+  key: K,
+  patch: V | null | undefined,
+  existing: V | undefined,
+): Partial<Record<K, V>> {
+  if (patch === null) return {}
+  if (patch !== undefined) return { [key]: patch } as Partial<Record<K, V>>
+  if (existing !== undefined) return { [key]: existing } as Partial<Record<K, V>>
+  return {}
+}
+
 export function toNodeRunData(nodeRun: PlanNodeRunRecord, patch: PlanNodeRunUpdate) {
+  const patchedAttemptId =
+    patch.latestAttemptId === null
+      ? null
+      : patch.latestAttemptId !== undefined
+        ? ensureRecordId(patch.latestAttemptId, TABLES.PLAN_NODE_ATTEMPT)
+        : undefined
+  const existingAttemptId =
+    nodeRun.latestAttemptId !== undefined
+      ? ensureRecordId(nodeRun.latestAttemptId, TABLES.PLAN_NODE_ATTEMPT)
+      : undefined
+
+  const patchedScheduledAt =
+    patch.scheduledAt === null
+      ? null
+      : patch.scheduledAt !== undefined
+        ? toDatabaseDateTime(patch.scheduledAt)
+        : undefined
+  const existingScheduledAt = nodeRun.scheduledAt !== undefined ? toDatabaseDateTime(nodeRun.scheduledAt) : undefined
+
+  const patchedReadyAt =
+    patch.readyAt === null ? null : patch.readyAt !== undefined ? toDatabaseDateTime(patch.readyAt) : undefined
+  const existingReadyAt = nodeRun.readyAt !== undefined ? toDatabaseDateTime(nodeRun.readyAt) : undefined
+
+  const patchedStartedAt =
+    patch.startedAt === null ? null : patch.startedAt !== undefined ? toDatabaseDateTime(patch.startedAt) : undefined
+  const existingStartedAt = nodeRun.startedAt !== undefined ? toDatabaseDateTime(nodeRun.startedAt) : undefined
+
+  const patchedCompletedAt =
+    patch.completedAt === null
+      ? null
+      : patch.completedAt !== undefined
+        ? toDatabaseDateTime(patch.completedAt)
+        : undefined
+  const existingCompletedAt = nodeRun.completedAt !== undefined ? toDatabaseDateTime(nodeRun.completedAt) : undefined
+
   return {
     runId: ensureRecordId(nodeRun.runId, TABLES.PLAN_RUN),
     planSpecId: ensureRecordId(nodeRun.planSpecId, TABLES.PLAN_SPEC),
@@ -157,76 +202,16 @@ export function toNodeRunData(nodeRun: PlanNodeRunRecord, patch: PlanNodeRunUpda
     status: patch.status ?? nodeRun.status,
     attemptCount: patch.attemptCount ?? nodeRun.attemptCount,
     retryCount: patch.retryCount ?? nodeRun.retryCount,
-    ...(patch.resolvedInput === null
-      ? {}
-      : patch.resolvedInput !== undefined
-        ? { resolvedInput: patch.resolvedInput }
-        : nodeRun.resolvedInput
-          ? { resolvedInput: nodeRun.resolvedInput }
-          : {}),
-    ...(patch.latestStructuredOutput === null
-      ? {}
-      : patch.latestStructuredOutput !== undefined
-        ? { latestStructuredOutput: patch.latestStructuredOutput }
-        : nodeRun.latestStructuredOutput
-          ? { latestStructuredOutput: nodeRun.latestStructuredOutput }
-          : {}),
-    ...(patch.latestNotes === null
-      ? {}
-      : patch.latestNotes !== undefined
-        ? { latestNotes: patch.latestNotes }
-        : nodeRun.latestNotes
-          ? { latestNotes: nodeRun.latestNotes }
-          : {}),
-    ...(patch.latestAttemptId === null
-      ? {}
-      : patch.latestAttemptId !== undefined
-        ? { latestAttemptId: ensureRecordId(patch.latestAttemptId, TABLES.PLAN_NODE_ATTEMPT) }
-        : nodeRun.latestAttemptId
-          ? { latestAttemptId: ensureRecordId(nodeRun.latestAttemptId, TABLES.PLAN_NODE_ATTEMPT) }
-          : {}),
-    ...(patch.blockedReason === null
-      ? {}
-      : patch.blockedReason !== undefined
-        ? { blockedReason: patch.blockedReason }
-        : nodeRun.blockedReason
-          ? { blockedReason: nodeRun.blockedReason }
-          : {}),
-    ...(patch.failureClass === null
-      ? {}
-      : patch.failureClass !== undefined
-        ? { failureClass: patch.failureClass }
-        : nodeRun.failureClass
-          ? { failureClass: nodeRun.failureClass }
-          : {}),
-    ...(patch.scheduledAt === null
-      ? {}
-      : patch.scheduledAt !== undefined
-        ? { scheduledAt: toDatabaseDateTime(patch.scheduledAt) }
-        : nodeRun.scheduledAt
-          ? { scheduledAt: toDatabaseDateTime(nodeRun.scheduledAt) }
-          : {}),
-    ...(patch.readyAt === null
-      ? {}
-      : patch.readyAt !== undefined
-        ? { readyAt: toDatabaseDateTime(patch.readyAt) }
-        : nodeRun.readyAt
-          ? { readyAt: toDatabaseDateTime(nodeRun.readyAt) }
-          : {}),
-    ...(patch.startedAt === null
-      ? {}
-      : patch.startedAt !== undefined
-        ? { startedAt: toDatabaseDateTime(patch.startedAt) }
-        : nodeRun.startedAt
-          ? { startedAt: toDatabaseDateTime(nodeRun.startedAt) }
-          : {}),
-    ...(patch.completedAt === null
-      ? {}
-      : patch.completedAt !== undefined
-        ? { completedAt: toDatabaseDateTime(patch.completedAt) }
-        : nodeRun.completedAt
-          ? { completedAt: toDatabaseDateTime(nodeRun.completedAt) }
-          : {}),
+    ...patchField('resolvedInput', patch.resolvedInput, nodeRun.resolvedInput ?? undefined),
+    ...patchField('latestStructuredOutput', patch.latestStructuredOutput, nodeRun.latestStructuredOutput ?? undefined),
+    ...patchField('latestNotes', patch.latestNotes, nodeRun.latestNotes ?? undefined),
+    ...patchField('latestAttemptId', patchedAttemptId, existingAttemptId),
+    ...patchField('blockedReason', patch.blockedReason, nodeRun.blockedReason ?? undefined),
+    ...patchField('failureClass', patch.failureClass, nodeRun.failureClass ?? undefined),
+    ...patchField('scheduledAt', patchedScheduledAt, existingScheduledAt),
+    ...patchField('readyAt', patchedReadyAt, existingReadyAt),
+    ...patchField('startedAt', patchedStartedAt, existingStartedAt),
+    ...patchField('completedAt', patchedCompletedAt, existingCompletedAt),
   }
 }