@highstate/backend 0.9.7 → 0.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "type": "module",
   "files": [
     "dist",
@@ -26,7 +26,7 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/contract": "^0.9.7",
+    "@highstate/contract": "^0.9.9",
     "@types/node": "^22.10.1",
     "ajv": "^8.17.1",
     "better-lock": "^3.2.0",
@@ -65,5 +65,5 @@
     "rollup": "^4.28.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "e94eab53d62db20e6354c176cf1a9317fe846812"
+  "gitHead": "1c04a713fa1bb7c0231e5e6d0537709097bb0e8e"
 }

package/src/orchestrator/operation-workset.ts

@@ -22,6 +22,7 @@ import {
   type InputResolverOutput,
   type InstanceState,
   type InstanceStateUpdate,
+  type InstanceStatus,
   type LibraryModel,
   type ProjectOperation,
   type ResolvedInstanceInput,
@@ -96,12 +97,12 @@ export class OperationWorkset {
     return this.instanceIdsToUpdate.has(instanceId)
   }
 
-  public updateState(update: InstanceStateUpdate): InstanceState {
+  public updateState(update: InstanceStateUpdate, phase: OperationPhase): InstanceState {
     const finalState = applyPartialInstanceState(this.stateMap, update)
     this.stateManager.emitStatePatch(this.operation.projectId, createInstanceStatePatch(update))
 
     if (finalState.parentId) {
-      this.recalculateCompositeInstanceState(finalState.parentId)
+      this.recalculateCompositeInstanceState(finalState.parentId, phase)
     }
 
     return finalState
@@ -202,7 +203,7 @@ export class OperationWorkset {
       .filter((state): state is InstanceState => !!state)
   }
 
-  private recalculateCompositeInstanceState(instanceId: string): void {
+  private recalculateCompositeInstanceState(instanceId: string, phase: OperationPhase): void {
     const state = this.stateMap.get(instanceId) ?? createInstanceState(instanceId)
     let currentResourceCount = 0
     let totalResourceCount = 0
@@ -222,6 +223,7 @@ export class OperationWorkset {
 
     const updatedState = {
       ...state,
+      status: OperationWorkset.getStatusByOperationPhase(phase),
       currentResourceCount,
       totalResourceCount,
     }
@@ -230,7 +232,7 @@ export class OperationWorkset {
     this.stateManager.emitStatePatch(this.operation.projectId, updatedState)
 
     if (state.parentId) {
-      this.recalculateCompositeInstanceState(state.parentId)
+      this.recalculateCompositeInstanceState(state.parentId, phase)
     }
   }
 
@@ -431,6 +433,17 @@ export class OperationWorkset {
     return undefined
   }
 
+  private static getStatusByOperationPhase(phase: OperationPhase): InstanceStatus {
+    switch (phase) {
+      case "update":
+        return "updating"
+      case "destroy":
+        return "destroying"
+      case "refresh":
+        return "refreshing"
+    }
+  }
+
   public async getUpToDateInputHash(instance: InstanceModel): Promise<string> {
     const component = this.library.components[instance.type]
 

package/src/orchestrator/operation.ts

@@ -11,7 +11,6 @@ import { mapValues } from "remeda"
 import {
   type InstanceState,
   type InstanceStateUpdate,
-  type InstanceStatus,
   type ProjectOperation,
   type InstanceTriggerInvocation,
   createInstanceState,
@@ -220,7 +219,7 @@ export class RuntimeOperation {
         ...state,
         parentId: instance?.parentId,
         latestOperationId: this.operation.id,
-        status: this.getStatusByOperationType(),
+        status: "pending",
         error: null,
       })
 
@@ -575,7 +574,7 @@ export class RuntimeOperation {
       return
     }
 
-    const state = this.workset.updateState(patch)
+    const state = this.workset.updateState(patch, this.currentPhase)
 
     // do not persist anyting for preview operations
     if (this.operation.type !== "preview") {
@@ -604,21 +603,6 @@ export class RuntimeOperation {
     return instancePromise
   }
 
-  private getStatusByOperationType(): InstanceStatus {
-    switch (this.operation.type) {
-      case "update":
-        return "updating"
-      case "preview":
-        return "previewing"
-      case "recreate":
-        return "updating"
-      case "destroy":
-        return "destroying"
-      case "refresh":
-        return "refreshing"
-    }
-  }
-
   private getInstanceDependencies(instance: InstanceModel): InstanceModel[] {
     const dependencies: InstanceModel[] = []
     const instanceInputs = this.workset.resolvedInstanceInputs.get(instance.id) ?? {}