@highstate/backend 0.12.1 → 0.13.0

package/src/database/_generated/project/models/WorkerVersion.ts

@@ -2,14 +2,14 @@
 /* !!! This is code generated by Prisma. Do not edit directly. !!! */
 /* eslint-disable */
 // @ts-nocheck 
-/**
+/*
  * This file exports the `WorkerVersion` model and its related types.
  *
  * 🟢 You can import this file directly.
  */
 
 import type * as PJTG from '../pjtg.ts';
-import * as runtime from "@prisma/client/runtime/client"
+import type * as runtime from "@prisma/client/runtime/client"
 import type * as $Enums from "../enums.ts"
 import type * as Prisma from "../internal/prismaNamespace.ts"
 
@@ -184,7 +184,7 @@ export type WorkerVersionGroupByArgs<ExtArgs extends runtime.Types.Extensions.In
 
 export type WorkerVersionGroupByOutputType = {
   id: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status: $Enums.WorkerVersionStatus
   enabled: boolean
   runtimeId: string | null
@@ -304,7 +304,7 @@ export type WorkerVersionScalarWhereWithAggregatesInput = {
 
 export type WorkerVersionCreateInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -319,7 +319,7 @@ export type WorkerVersionCreateInput = {
 
 export type WorkerVersionUncheckedCreateInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -334,7 +334,7 @@ export type WorkerVersionUncheckedCreateInput = {
 
 export type WorkerVersionUpdateInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -349,7 +349,7 @@ export type WorkerVersionUpdateInput = {
 
 export type WorkerVersionUncheckedUpdateInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -364,7 +364,7 @@ export type WorkerVersionUncheckedUpdateInput = {
 
 export type WorkerVersionCreateManyInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -377,7 +377,7 @@ export type WorkerVersionCreateManyInput = {
 
 export type WorkerVersionUpdateManyMutationInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -388,7 +388,7 @@ export type WorkerVersionUpdateManyMutationInput = {
 
 export type WorkerVersionUncheckedUpdateManyInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -564,7 +564,7 @@ export type WorkerVersionUpdateOneRequiredWithoutLogsNestedInput = {
 
 export type WorkerVersionCreateWithoutApiKeyInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -578,7 +578,7 @@ export type WorkerVersionCreateWithoutApiKeyInput = {
 
 export type WorkerVersionUncheckedCreateWithoutApiKeyInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -608,7 +608,7 @@ export type WorkerVersionUpdateToOneWithWhereWithoutApiKeyInput = {
 
 export type WorkerVersionUpdateWithoutApiKeyInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -622,7 +622,7 @@ export type WorkerVersionUpdateWithoutApiKeyInput = {
 
 export type WorkerVersionUncheckedUpdateWithoutApiKeyInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -636,7 +636,7 @@ export type WorkerVersionUncheckedUpdateWithoutApiKeyInput = {
 
 export type WorkerVersionCreateWithoutWorkerInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -650,7 +650,7 @@ export type WorkerVersionCreateWithoutWorkerInput = {
 
 export type WorkerVersionUncheckedCreateWithoutWorkerInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -705,7 +705,7 @@ export type WorkerVersionScalarWhereInput = {
 
 export type WorkerVersionCreateWithoutUnitRegistrationsInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -719,7 +719,7 @@ export type WorkerVersionCreateWithoutUnitRegistrationsInput = {
 
 export type WorkerVersionUncheckedCreateWithoutUnitRegistrationsInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -749,7 +749,7 @@ export type WorkerVersionUpdateToOneWithWhereWithoutUnitRegistrationsInput = {
 
 export type WorkerVersionUpdateWithoutUnitRegistrationsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -763,7 +763,7 @@ export type WorkerVersionUpdateWithoutUnitRegistrationsInput = {
 
 export type WorkerVersionUncheckedUpdateWithoutUnitRegistrationsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -777,7 +777,7 @@ export type WorkerVersionUncheckedUpdateWithoutUnitRegistrationsInput = {
 
 export type WorkerVersionCreateWithoutLogsInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -791,7 +791,7 @@ export type WorkerVersionCreateWithoutLogsInput = {
 
 export type WorkerVersionUncheckedCreateWithoutLogsInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -821,7 +821,7 @@ export type WorkerVersionUpdateToOneWithWhereWithoutLogsInput = {
 
 export type WorkerVersionUpdateWithoutLogsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -835,7 +835,7 @@ export type WorkerVersionUpdateWithoutLogsInput = {
 
 export type WorkerVersionUncheckedUpdateWithoutLogsInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -849,7 +849,7 @@ export type WorkerVersionUncheckedUpdateWithoutLogsInput = {
 
 export type WorkerVersionCreateManyWorkerInput = {
   id?: string
-  meta: PrismaJson.CommonObjectMeta
+  meta:PrismaJson.CommonObjectMeta
   status?: $Enums.WorkerVersionStatus
   enabled?: boolean
   runtimeId?: string | null
@@ -861,7 +861,7 @@ export type WorkerVersionCreateManyWorkerInput = {
 
 export type WorkerVersionUpdateWithoutWorkerInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -875,7 +875,7 @@ export type WorkerVersionUpdateWithoutWorkerInput = {
 
 export type WorkerVersionUncheckedUpdateWithoutWorkerInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: PrismaJson.CommonObjectMeta
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -889,7 +889,7 @@ export type WorkerVersionUncheckedUpdateWithoutWorkerInput = {
 
 export type WorkerVersionUncheckedUpdateManyWithoutWorkerInput = {
   id?: Prisma.StringFieldUpdateOperationsInput | string
-  meta?: Prisma.JsonNullValueInput | runtime.InputJsonValue
+  meta?:PrismaJson.CommonObjectMeta
   status?: Prisma.EnumWorkerVersionStatusFieldUpdateOperationsInput | $Enums.WorkerVersionStatus
   enabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
   runtimeId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
@@ -1047,7 +1047,7 @@ export type $WorkerVersionPayload<ExtArgs extends runtime.Types.Extensions.Inter
      * 
      * [CommonObjectMeta]
      */
-    meta: PrismaJson.CommonObjectMeta
+    meta:PrismaJson.CommonObjectMeta
     /**
      * The current status of the worker version reported by the runtime.
      */

package/src/database/_generated/project/models/WorkerVersionLog.ts

@@ -2,14 +2,14 @@
 /* !!! This is code generated by Prisma. Do not edit directly. !!! */
 /* eslint-disable */
 // @ts-nocheck 
-/**
+/*
  * This file exports the `WorkerVersionLog` model and its related types.
  *
  * 🟢 You can import this file directly.
  */
 
 import type * as PJTG from '../pjtg.ts';
-import * as runtime from "@prisma/client/runtime/client"
+import type * as runtime from "@prisma/client/runtime/client"
 import type * as $Enums from "../enums.ts"
 import type * as Prisma from "../internal/prismaNamespace.ts"
 

package/src/database/_generated/project/models.ts

@@ -2,7 +2,7 @@
 /* !!! This is code generated by Prisma. Do not edit directly. !!! */
 /* eslint-disable */
 // @ts-nocheck 
-/**
+/*
  * This is a barrel export file for all models and their related types.
  *
  * 🟢 You can import this file directly.

package/src/database/_generated/project/pjtg.ts

@@ -1,3 +1,4 @@
+import * as Prisma from './internal/prismaNamespace.ts';
 declare global {
   namespace PrismaJson {
     // This namespace will always be empty. Definitions should be done by

package/src/orchestrator/operation-workset.ts

@@ -1,10 +1,16 @@
 import type { InstanceId } from "@highstate/contract"
 import type { InstanceStateService, UpdateOperationStateOptions } from "../business"
 import type { InstanceOperationStatus } from "../database"
-import type { InstanceStatus, OperationPhase, OperationPhaseType, ProjectOutput } from "../shared"
 import type { OperationContext } from "./operation-context"
 import { EventEmitter, on } from "node:events"
 import { mapValues } from "remeda"
+import {
+  type InstanceStatus,
+  isTransientInstanceOperationStatus,
+  type OperationPhase,
+  type OperationPhaseType,
+  type ProjectOutput,
+} from "../shared"
 
 type AbortControllerPair = {
   abortController: AbortController
@@ -156,12 +162,12 @@ export class OperationWorkset {
       options,
     )
 
+    Object.assign(state, patch)
+
     if (state.parentInstanceId && this.currentPhase !== "preview") {
       // TODO: update all updates in single transaction
       await this.recalculateCompositeInstanceState(state.parentInstanceId)
     }
-
-    Object.assign(state, patch)
   }
 
   getAffectedCompositeChildren(instanceId: InstanceId): InstanceId[] {
@@ -184,38 +190,43 @@ export class OperationWorkset {
 
     let currentResourceCount = 0
     let totalResourceCount = 0
-    let knownTotatalResourceCount = 0
+    let knownTotalResourceCount = 0
 
     const children = this.context.getStateChildIds(instanceId)
     for (const childId of children) {
       const child = this.context.getState(childId)
 
-      if (child?.lastOperationState?.currentResourceCount) {
+      if (child?.lastOperationState?.currentResourceCount != null) {
         currentResourceCount += child.lastOperationState.currentResourceCount
       }
 
-      if (child?.lastOperationState?.totalResourceCount) {
+      if (child?.lastOperationState?.totalResourceCount != null) {
         totalResourceCount += child.lastOperationState.totalResourceCount
-        knownTotatalResourceCount += 1
+        knownTotalResourceCount += 1
       }
     }
 
     // extrapolate total resource count for other resources without total resource count
     const averageTotalResourceCount =
-      knownTotatalResourceCount > 0 ? Math.round(totalResourceCount / knownTotatalResourceCount) : 0
+      knownTotalResourceCount > 0 ? Math.round(totalResourceCount / knownTotalResourceCount) : 0
 
-    const notKnownTotalResourceCount = children.length - knownTotatalResourceCount
+    const notKnownTotalResourceCount = children.length - knownTotalResourceCount
     totalResourceCount += notKnownTotalResourceCount * averageTotalResourceCount
 
     const finalTotalResourceCount =
       this.currentPhase === "destroy" && state.lastOperationState?.totalResourceCount
         ? // do not override totalResourceCount with lower values when destroying instances
-          Math.min(totalResourceCount, state.lastOperationState.totalResourceCount)
+          Math.max(totalResourceCount, state.lastOperationState.totalResourceCount)
         : totalResourceCount
 
     await this.updateState(instanceId, {
       operationState: {
-        status: this.getTransientStatusByOperationPhase(),
+        status:
+          !state.lastOperationState?.status ||
+          // do not override final statuses
+          isTransientInstanceOperationStatus(state.lastOperationState.status)
+            ? this.getTransientStatusByOperationPhase()
+            : state.lastOperationState.status,
         currentResourceCount,
         totalResourceCount: finalTotalResourceCount,
       },

package/src/orchestrator/operation.ts

@@ -60,10 +60,19 @@ export class RuntimeOperation {
 
   cancel(): void {
     this.workset.cancel()
+    this.tryMarkOperationCancelling()
   }
 
   cancelInstance(instanceId: InstanceId): void {
     this.workset.cancelInstance(instanceId)
+    this.tryMarkOperationCancelling()
+  }
+
+  private tryMarkOperationCancelling(): void {
+    if (this.operation.status === "pending" || this.operation.status === "running") {
+      this.operation.status = "cancelling"
+      this.promiseTracker.track(this.updateOperation({ status: this.operation.status }))
+    }
   }
 
   async operateSafe(): Promise<void> {
@@ -914,11 +923,6 @@ export class RuntimeOperation {
       return
     }
 
-    this.logger.warn(
-      "finalizing %d unfinished operation states before shutting down",
-      unfinishedStates.length,
-    )
-
     for (const state of unfinishedStates) {
       await this.workset.updateState(state.instanceId, {
         operationState: {
@@ -929,6 +933,8 @@ export class RuntimeOperation {
           status: state.status === "deployed" ? "deployed" : "failed",
         },
       })
+
+      this.logger.warn(`finalized operation state for unfinished instance "%s"`, state.instanceId)
     }
   }
 

package/src/shared/models/project/operation.ts

@@ -218,6 +218,7 @@ export const operationStatusSchema = z.enum([
   "completed",
   "failed",
   "cancelled",
+  "cancelling",
 ]) satisfies z.ZodType<OperationStatus>
 
 export const operationMetaSchema = objectMetaSchema