@highstate/backend 0.9.13 → 0.9.15

package/dist/library/worker/main.js

@@ -113,16 +113,16 @@ function evaluateInstances(logger2, library2, allInstances, resolvedInputs, inst
   const results = [];
   const allInstancesMap = new Map(allInstances.map((instance) => [instance.id, instance]));
   for (const instanceId of instanceIds ?? []) {
-    const externalInstanceIds = new Set(allInstances.map((instance) => instance.id));
-    externalInstanceIds.delete(instanceId);
     try {
       logger2.debug({ instanceId }, "evaluating top-level instance");
-      resetEvaluation(externalInstanceIds);
+      resetEvaluation();
       evaluateInstance(instanceId);
       results.push({
         success: true,
         instanceId,
-        compositeInstances: getCompositeInstances()
+        compositeInstances: getCompositeInstances().filter(
+          (instance) => instanceId.includes(instance.instance.id) || !allInstancesMap.has(instance.instance.id)
+        )
       });
     } catch (error) {
       results.push({

package/dist/library/worker/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/library/worker/main.ts","../../../src/library/worker/loader.ts","../../../src/library/worker/evaluator.ts"],"sourcesContent":["import type { WorkerData, WorkerRequest, WorkerResponse } from \"./protocol\"\nimport { parentPort, workerData } from \"node:worker_threads\"\nimport { createJiti, type Jiti } from \"jiti\"\nimport { pino } from \"pino\"\nimport { mapValues } from \"remeda\"\nimport { errorToString } from \"../../common\"\nimport { loadLibrary, type Library } from \"./loader\"\nimport { evaluateInstances, evaluateModules } from \"./evaluator\"\n\nconst data = workerData as WorkerData\n\nconst logger = pino({ name: \"library-worker\", level: data.logLevel })\nlet jiti: Jiti\nlet library: Library\n\ntry {\n  logger.info(\"worker started\")\n  logger.trace({ data }, \"worker data\")\n\n  jiti = createJiti(import.meta.filename)\n  logger.debug({ filename: import.meta.filename }, \"jiti created\")\n\n  library = await loadLibrary(jiti, logger, data.modulePaths)\n\n  parentPort!.postMessage({\n    type: \"library\",\n    library: {\n      components: mapValues(library.components, component => component.model),\n      entities: library.entities,\n    },\n  } satisfies WorkerResponse)\n\n  logger.info(\"library loaded and sent\")\n} catch (error) {\n  logger.error({ error }, \"failed to load library\")\n\n  parentPort!.postMessage({\n    type: \"error\",\n    error: errorToString(error),\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-misused-promises\nparentPort!.on(\"message\", async message => {\n  try {\n    const request = message as WorkerRequest\n\n    switch (request.type) {\n      case \"evaluate-composite-instances\": {\n        const results = evaluateInstances(\n          logger,\n          library,\n          request.allInstances,\n          request.resolvedInputs,\n          request.instanceIds,\n        )\n\n        parentPort!.postMessage({\n          type: \"instance-evaluation-results\",\n          results,\n        } satisfies WorkerResponse)\n        break\n      }\n      case \"evaluate-modules\": {\n        const result = await evaluateModules(jiti, logger, request.modulePaths)\n\n        parentPort!.postMessage({\n          type: \"module-evaluation-result\",\n          result,\n        } satisfies WorkerResponse)\n        break\n      }\n    }\n  } catch (error) {\n    logger.error({ error }, \"failed to evaluate\")\n\n    parentPort!.postMessage({\n      type: \"error\",\n      error: errorToString(error),\n    } satisfies WorkerResponse)\n  }\n})\n","import type { Logger } from \"pino\"\nimport type { Jiti } from \"jiti\"\nimport Module from \"node:module\"\nimport {\n  type Component,\n  type Entity,\n  isComponent,\n  isEntity,\n  isUnitModel,\n  originalCreate,\n} from \"@highstate/contract\"\nimport { serializeFunction } from \"@pulumi/pulumi/runtime/index.js\"\nimport { sha256 } from \"crypto-hash\"\n\ndeclare module \"module\" {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Module {\n    function _load(request: unknown, parent: unknown, isMain: boolean): unknown\n  }\n}\n\nconst originalLoad = Module._load\n\nModule._load = function (request: unknown, parent: unknown, isMain: boolean) {\n  if (request === \"trace_events\") {\n    return {}\n  }\n\n  return originalLoad(request, parent, isMain)\n}\n\nexport type Library = Readonly<{\n  components: Readonly<Record<string, Component>>\n  entities: Readonly<Record<string, Entity>>\n}>\n\nexport async function loadLibrary(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<Library> {\n  const modules: Record<string, unknown> = {}\n  for (const modulePath of modulePaths) {\n    try {\n      logger.debug({ modulePath }, \"loading module\")\n      modules[modulePath] = await jiti.import(modulePath)\n\n      logger.debug({ modulePath }, \"module loaded\")\n    } catch (err) {\n      logger.error({ modulePath, err }, \"module load failed\")\n    }\n  }\n\n  const components: Record<string, Component> = {}\n  const entities: Record<string, Entity> = {}\n\n  await _loadLibrary(modules, components, entities)\n\n  logger.info(\n    {\n      componentCount: Object.keys(components).length,\n      entityCount: Object.keys(entities).length,\n    },\n    \"library loaded\",\n  )\n\n  logger.trace({ components, entities }, \"library content\")\n\n  return { components, entities }\n}\n\nasync function _loadLibrary(\n  value: unknown,\n  components: Record<string, Component>,\n  entities: Record<string, Entity>,\n): Promise<void> {\n  if (isComponent(value)) {\n    components[value.model.type] = value\n    value.model.definitionHash = await calculateComponentDefinitionHash(value)\n\n    for (const entity of value.entities.values()) {\n      entity.definitionHash ??= await calculateEntityDefinitionHash(entity)\n    }\n    return\n  }\n\n  if (isEntity(value)) {\n    entities[value.type] = value\n    entities[value.type].definitionHash ??= await calculateEntityDefinitionHash(value)\n    return\n  }\n\n  if (typeof value !== \"object\" || value === null) {\n    return\n  }\n\n  for (const key in value) {\n    await _loadLibrary((value as Record<string, unknown>)[key], components, entities)\n  }\n}\n\nasync function calculateComponentDefinitionHash(component: Component): Promise<string> {\n  if (isUnitModel(component.model)) {\n    return await sha256(JSON.stringify(component.model))\n  }\n\n  const serializedCreate = await serializeFunction(component[originalCreate])\n\n  return await sha256(JSON.stringify(component.model) + serializedCreate.text)\n}\n\nasync function calculateEntityDefinitionHash(entity: Entity): Promise<string> {\n  return await sha256(JSON.stringify(entity))\n}\n","import type { Logger } from \"pino\"\nimport type { Library } from \"./loader\"\nimport type { Jiti } from \"jiti\"\nimport type { InstanceEvaluationResult, ModuleEvaluationResult } from \"../abstractions\"\nimport type { ResolvedInstanceInput } from \"../../shared\"\nimport { getCompositeInstances, resetEvaluation, type InstanceModel } from \"@highstate/contract\"\nimport { BetterLock } from \"better-lock\"\nimport { errorToString } from \"../../common\"\n\nconst lock = new BetterLock()\n\nexport function evaluateModules(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<ModuleEvaluationResult> {\n  return lock.acquire(async () => {\n    resetEvaluation()\n    let lastModulePath = \"\"\n\n    try {\n      for (const modulePath of modulePaths) {\n        logger.info(\"loading module: %s\", modulePath)\n\n        lastModulePath = modulePath\n        await jiti.import(modulePath)\n\n        logger.debug(\"module loaded: %s\", modulePath)\n      }\n\n      return {\n        success: true,\n        compositeInstances: getCompositeInstances(),\n      }\n    } catch (error) {\n      return {\n        success: false,\n        modulePath: lastModulePath,\n        error: errorToString(error),\n      }\n    }\n  })\n}\n\nexport function evaluateInstances(\n  logger: Logger,\n  library: Library,\n  allInstances: InstanceModel[],\n  resolvedInputs: Record<string, Record<string, ResolvedInstanceInput[]>>,\n  instanceIds: string[],\n): InstanceEvaluationResult[] {\n  const results: InstanceEvaluationResult[] = []\n  const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))\n\n  for (const instanceId of instanceIds ?? []) {\n    const externalInstanceIds = new Set(allInstances.map(instance => instance.id))\n    externalInstanceIds.delete(instanceId)\n\n    try {\n      logger.debug({ instanceId }, \"evaluating top-level instance\")\n      resetEvaluation(externalInstanceIds)\n\n      evaluateInstance(instanceId)\n\n      results.push({\n        success: true,\n        instanceId,\n        compositeInstances: getCompositeInstances(),\n      })\n    } catch (error) {\n      results.push({\n        success: false,\n        instanceId,\n        error: errorToString(error),\n      })\n    }\n  }\n\n  return results\n\n  function evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>> = new Map(),\n  ): Record<string, unknown> {\n    let outputs = instanceOutputs.get(instanceId)\n\n    if (!outputs) {\n      outputs = _evaluateInstance(instanceId, instanceOutputs)\n      instanceOutputs.set(instanceId, outputs)\n    }\n\n    return outputs\n  }\n\n  function _evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>>,\n  ): Record<string, unknown> {\n    const inputs: Record<string, unknown> = {}\n    const instance = allInstancesMap.get(instanceId)\n\n    logger.info(\"evaluating instance\", { instanceId })\n\n    if (!instance) {\n      throw new Error(`Instance not found: ${instanceId}`)\n    }\n\n    for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {\n      inputs[inputName] = input.map(input => {\n        const evaluated = evaluateInstance(input.input.instanceId, instanceOutputs)\n\n        return evaluated[input.input.output]\n      })\n    }\n\n    const component = library.components[instance.type]\n    if (!component) {\n      throw new Error(`Component not found: ${instance.type}, required by instance: ${instanceId}`)\n    }\n\n    return component({\n      name: instance.name,\n      args: instance.args as Record<string, never>,\n      inputs: inputs as Record<string, never>,\n    })\n  }\n}\n"],"mappings":"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","names":["jiti","logger","jiti","logger","library","input"]}
+{"version":3,"sources":["../../../src/library/worker/main.ts","../../../src/library/worker/loader.ts","../../../src/library/worker/evaluator.ts"],"sourcesContent":["import type { WorkerData, WorkerRequest, WorkerResponse } from \"./protocol\"\nimport { parentPort, workerData } from \"node:worker_threads\"\nimport { createJiti, type Jiti } from \"jiti\"\nimport { pino } from \"pino\"\nimport { mapValues } from \"remeda\"\nimport { errorToString } from \"../../common\"\nimport { loadLibrary, type Library } from \"./loader\"\nimport { evaluateInstances, evaluateModules } from \"./evaluator\"\n\nconst data = workerData as WorkerData\n\nconst logger = pino({ name: \"library-worker\", level: data.logLevel })\nlet jiti: Jiti\nlet library: Library\n\ntry {\n  logger.info(\"worker started\")\n  logger.trace({ data }, \"worker data\")\n\n  jiti = createJiti(import.meta.filename)\n  logger.debug({ filename: import.meta.filename }, \"jiti created\")\n\n  library = await loadLibrary(jiti, logger, data.modulePaths)\n\n  parentPort!.postMessage({\n    type: \"library\",\n    library: {\n      components: mapValues(library.components, component => component.model),\n      entities: library.entities,\n    },\n  } satisfies WorkerResponse)\n\n  logger.info(\"library loaded and sent\")\n} catch (error) {\n  logger.error({ error }, \"failed to load library\")\n\n  parentPort!.postMessage({\n    type: \"error\",\n    error: errorToString(error),\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-misused-promises\nparentPort!.on(\"message\", async message => {\n  try {\n    const request = message as WorkerRequest\n\n    switch (request.type) {\n      case \"evaluate-composite-instances\": {\n        const results = evaluateInstances(\n          logger,\n          library,\n          request.allInstances,\n          request.resolvedInputs,\n          request.instanceIds,\n        )\n\n        parentPort!.postMessage({\n          type: \"instance-evaluation-results\",\n          results,\n        } satisfies WorkerResponse)\n        break\n      }\n      case \"evaluate-modules\": {\n        const result = await evaluateModules(jiti, logger, request.modulePaths)\n\n        parentPort!.postMessage({\n          type: \"module-evaluation-result\",\n          result,\n        } satisfies WorkerResponse)\n        break\n      }\n    }\n  } catch (error) {\n    logger.error({ error }, \"failed to evaluate\")\n\n    parentPort!.postMessage({\n      type: \"error\",\n      error: errorToString(error),\n    } satisfies WorkerResponse)\n  }\n})\n","import type { Logger } from \"pino\"\nimport type { Jiti } from \"jiti\"\nimport Module from \"node:module\"\nimport {\n  type Component,\n  type Entity,\n  isComponent,\n  isEntity,\n  isUnitModel,\n  originalCreate,\n} from \"@highstate/contract\"\nimport { serializeFunction } from \"@pulumi/pulumi/runtime/index.js\"\nimport { sha256 } from \"crypto-hash\"\n\ndeclare module \"module\" {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Module {\n    function _load(request: unknown, parent: unknown, isMain: boolean): unknown\n  }\n}\n\nconst originalLoad = Module._load\n\nModule._load = function (request: unknown, parent: unknown, isMain: boolean) {\n  if (request === \"trace_events\") {\n    return {}\n  }\n\n  return originalLoad(request, parent, isMain)\n}\n\nexport type Library = Readonly<{\n  components: Readonly<Record<string, Component>>\n  entities: Readonly<Record<string, Entity>>\n}>\n\nexport async function loadLibrary(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<Library> {\n  const modules: Record<string, unknown> = {}\n  for (const modulePath of modulePaths) {\n    try {\n      logger.debug({ modulePath }, \"loading module\")\n      modules[modulePath] = await jiti.import(modulePath)\n\n      logger.debug({ modulePath }, \"module loaded\")\n    } catch (err) {\n      logger.error({ modulePath, err }, \"module load failed\")\n    }\n  }\n\n  const components: Record<string, Component> = {}\n  const entities: Record<string, Entity> = {}\n\n  await _loadLibrary(modules, components, entities)\n\n  logger.info(\n    {\n      componentCount: Object.keys(components).length,\n      entityCount: Object.keys(entities).length,\n    },\n    \"library loaded\",\n  )\n\n  logger.trace({ components, entities }, \"library content\")\n\n  return { components, entities }\n}\n\nasync function _loadLibrary(\n  value: unknown,\n  components: Record<string, Component>,\n  entities: Record<string, Entity>,\n): Promise<void> {\n  if (isComponent(value)) {\n    components[value.model.type] = value\n    value.model.definitionHash = await calculateComponentDefinitionHash(value)\n\n    for (const entity of value.entities.values()) {\n      entity.definitionHash ??= await calculateEntityDefinitionHash(entity)\n    }\n    return\n  }\n\n  if (isEntity(value)) {\n    entities[value.type] = value\n    entities[value.type].definitionHash ??= await calculateEntityDefinitionHash(value)\n    return\n  }\n\n  if (typeof value !== \"object\" || value === null) {\n    return\n  }\n\n  for (const key in value) {\n    await _loadLibrary((value as Record<string, unknown>)[key], components, entities)\n  }\n}\n\nasync function calculateComponentDefinitionHash(component: Component): Promise<string> {\n  if (isUnitModel(component.model)) {\n    return await sha256(JSON.stringify(component.model))\n  }\n\n  const serializedCreate = await serializeFunction(component[originalCreate])\n\n  return await sha256(JSON.stringify(component.model) + serializedCreate.text)\n}\n\nasync function calculateEntityDefinitionHash(entity: Entity): Promise<string> {\n  return await sha256(JSON.stringify(entity))\n}\n","import type { Logger } from \"pino\"\nimport type { Library } from \"./loader\"\nimport type { Jiti } from \"jiti\"\nimport type { InstanceEvaluationResult, ModuleEvaluationResult } from \"../abstractions\"\nimport type { ResolvedInstanceInput } from \"../../shared\"\nimport { getCompositeInstances, resetEvaluation, type InstanceModel } from \"@highstate/contract\"\nimport { BetterLock } from \"better-lock\"\nimport { errorToString } from \"../../common\"\n\nconst lock = new BetterLock()\n\nexport function evaluateModules(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<ModuleEvaluationResult> {\n  return lock.acquire(async () => {\n    resetEvaluation()\n    let lastModulePath = \"\"\n\n    try {\n      for (const modulePath of modulePaths) {\n        logger.info(\"loading module: %s\", modulePath)\n\n        lastModulePath = modulePath\n        await jiti.import(modulePath)\n\n        logger.debug(\"module loaded: %s\", modulePath)\n      }\n\n      return {\n        success: true,\n        compositeInstances: getCompositeInstances(),\n      }\n    } catch (error) {\n      return {\n        success: false,\n        modulePath: lastModulePath,\n        error: errorToString(error),\n      }\n    }\n  })\n}\n\nexport function evaluateInstances(\n  logger: Logger,\n  library: Library,\n  allInstances: InstanceModel[],\n  resolvedInputs: Record<string, Record<string, ResolvedInstanceInput[]>>,\n  instanceIds: string[],\n): InstanceEvaluationResult[] {\n  const results: InstanceEvaluationResult[] = []\n  const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))\n\n  for (const instanceId of instanceIds ?? []) {\n    try {\n      logger.debug({ instanceId }, \"evaluating top-level instance\")\n      resetEvaluation()\n\n      evaluateInstance(instanceId)\n\n      results.push({\n        success: true,\n        instanceId,\n        compositeInstances: getCompositeInstances().filter(\n          instance =>\n            instanceId.includes(instance.instance.id) || !allInstancesMap.has(instance.instance.id),\n        ),\n      })\n    } catch (error) {\n      results.push({\n        success: false,\n        instanceId,\n        error: errorToString(error),\n      })\n    }\n  }\n\n  return results\n\n  function evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>> = new Map(),\n  ): Record<string, unknown> {\n    let outputs = instanceOutputs.get(instanceId)\n\n    if (!outputs) {\n      outputs = _evaluateInstance(instanceId, instanceOutputs)\n      instanceOutputs.set(instanceId, outputs)\n    }\n\n    return outputs\n  }\n\n  function _evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>>,\n  ): Record<string, unknown> {\n    const inputs: Record<string, unknown> = {}\n    const instance = allInstancesMap.get(instanceId)\n\n    logger.info(\"evaluating instance\", { instanceId })\n\n    if (!instance) {\n      throw new Error(`Instance not found: ${instanceId}`)\n    }\n\n    for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {\n      inputs[inputName] = input.map(input => {\n        const evaluated = evaluateInstance(input.input.instanceId, instanceOutputs)\n\n        return evaluated[input.input.output]\n      })\n    }\n\n    const component = library.components[instance.type]\n    if (!component) {\n      throw new Error(`Component not found: ${instance.type}, required by instance: ${instanceId}`)\n    }\n\n    return component({\n      name: instance.name,\n      args: instance.args as Record<string, never>,\n      inputs: inputs as Record<string, never>,\n    })\n  }\n}\n"],"mappings":"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","names":["jiti","logger","jiti","logger","library","input"]}

package/dist/shared/index.js

@@ -5,7 +5,6 @@ import {
   ValidationResolver,
   applyLibraryUpdate,
   applyPartialInstanceState,
-  buildDependentInstanceStateMap,
   compositeInstanceSchema,
   createAsyncBatcher,
   createInstanceState,
@@ -47,7 +46,7 @@ import {
   projectOperationSchema,
   resolverFactories,
   terminalSessionSchema
-} from "../chunk-C2TJAQAD.js";
+} from "../chunk-KTGKNSKM.js";
 export {
   GraphResolver,
   InputHashResolver,
@@ -55,7 +54,6 @@ export {
   ValidationResolver,
   applyLibraryUpdate,
   applyPartialInstanceState,
-  buildDependentInstanceStateMap,
   compositeInstanceSchema,
   createAsyncBatcher,
   createInstanceState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "type": "module",
   "files": [
     "dist",
@@ -26,7 +26,7 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/contract": "^0.9.13",
+    "@highstate/contract": "^0.9.15",
     "@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": "409b125db59464bd2b6afa36cc5c92e114c7312b"
+  "gitHead": "f61b9905d4cd50511b03331411f42595403ebc06"
 }

package/src/library/worker/evaluator.ts

@@ -53,19 +53,19 @@ export function evaluateInstances(
   const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))
 
   for (const instanceId of instanceIds ?? []) {
-    const externalInstanceIds = new Set(allInstances.map(instance => instance.id))
-    externalInstanceIds.delete(instanceId)
-
     try {
       logger.debug({ instanceId }, "evaluating top-level instance")
-      resetEvaluation(externalInstanceIds)
+      resetEvaluation()
 
       evaluateInstance(instanceId)
 
       results.push({
         success: true,
         instanceId,
-        compositeInstances: getCompositeInstances(),
+        compositeInstances: getCompositeInstances().filter(
+          instance =>
+            instanceId.includes(instance.instance.id) || !allInstancesMap.has(instance.instance.id),
+        ),
       })
     } catch (error) {
       results.push({

package/src/orchestrator/manager.ts

@@ -84,6 +84,8 @@ export class OperationManager {
         deleteUnreachableResources: request.options?.deleteUnreachableResources ?? false,
         forceDeleteState: request.options?.forceDeleteState ?? false,
         refresh: request.options?.refresh ?? false,
+        allowPartialCompositeInstanceUpdates:
+          request.options?.allowPartialCompositeInstanceUpdates ?? false,
       },
       error: null,
       startedAt: Date.now(),

package/src/orchestrator/operation-workset.ts

@@ -327,6 +327,16 @@ export class OperationWorkset {
       }
     }
 
+    // 4. if "allowPartialCompositeInstanceUpdates" is not set, include all children of the composite instances
+    if (!this.operation.options.allowPartialCompositeInstanceUpdates) {
+      for (const instanceId of this.instanceIdsToUpdate) {
+        const children = this.instanceChildrenMap.get(instanceId) ?? []
+        for (const child of children) {
+          this.instanceIdsToUpdate.add(child.id)
+        }
+      }
+    }
+
     this.operation.instanceIdsToUpdate = Array.from(this.instanceIdsToUpdate)
   }
 
@@ -412,6 +422,16 @@ export class OperationWorkset {
       }
     }
 
+    // 4. if "allowPartialCompositeInstanceUpdates" is not set, include all children of the composite instances
+    if (!this.operation.options.allowPartialCompositeInstanceUpdates) {
+      for (const instanceId of this.instanceIdsToDestroy) {
+        const children = this.stateChildIdMap.get(instanceId) ?? []
+        for (const childId of children) {
+          this.instanceIdsToDestroy.add(childId)
+        }
+      }
+    }
+
     this.operation.instanceIdsToDestroy = Array.from(this.instanceIdsToDestroy)
   }
 

package/src/orchestrator/operation.ts

@@ -430,6 +430,14 @@ export class RuntimeOperation {
       const dependents = this.workset.getDependentStates(state.id)
 
       for (const dependent of dependents) {
+        if (
+          !this.operation.options.destroyDependentInstances &&
+          !this.operation.instanceIdsToDestroy.includes(dependent.id)
+        ) {
+          // skip dependents that are not affected by the operation
+          continue
+        }
+
         dependentPromises.push(this.getInstancePromiseForOperation(dependent.id))
       }
 

package/src/runner/local.ts

@@ -13,6 +13,7 @@ import {
   instanceFileSchema,
   instancePageSchema,
   instanceStatusFieldSchema,
+  instanceTerminalMetaSchema,
   instanceTerminalSchema,
   instanceTriggerSchema,
   type InstancePageBlock,
@@ -606,9 +607,7 @@ export class LocalRunnerBackend implements RunnerBackend {
     }
 
     if (outputs["$terminals"]) {
-      const terminals = z.array(instanceTerminalSchema).parse(outputs["$terminals"].value)
-
-      patch.terminals = terminals.map(terminal => pick(terminal, ["name", "title", "description"]))
+      patch.terminals = z.array(instanceTerminalMetaSchema).parse(outputs["$terminals"].value)
     } else {
       patch.terminals = []
     }

package/src/shared/operation.ts

@@ -15,6 +15,7 @@ export const operationOptionsSchema = z.object({
    * Whether to force update all dependencies of the instances even if they are not changed.
    *
    * Only applicable for `update`, `preview`, `recreate`, and `refresh` operations.
+   *
    * By default, `false`.
    */
   forceUpdateDependencies: z.boolean().default(false),
@@ -23,6 +24,7 @@ export const operationOptionsSchema = z.object({
    * Whether to force update all children of the composite instances even if they are not changed.
    *
    * Only applicable for `update`, `preview`, `recreate`, and `refresh` operations.
+   *
    * By default, `false`.
    */
   forceUpdateChildren: z.boolean().default(false),
@@ -30,7 +32,8 @@ export const operationOptionsSchema = z.object({
   /**
    * Whether to destroy all dependents of the instances when destroying them.
    *
-   * Only applicable for `destroy`.
+   * Only applicable for `destroy` and `recreate` operations.
+   *
    * By default, `true`.
    */
   destroyDependentInstances: z.boolean().default(true),
@@ -39,6 +42,7 @@ export const operationOptionsSchema = z.object({
    * Whether to invoke destroy triggers when destroying the instances.
    *
    * Only applicable for `destroy`.
+   *
    * By default, `true`.
    */
   invokeDestroyTriggers: z.boolean().default(true),
@@ -59,6 +63,16 @@ export const operationOptionsSchema = z.object({
    */
   forceDeleteState: z.boolean().default(false),
 
+  /**
+   * Whether to allow partial updates of composite instances when updating, destroying or recreating them.
+   *
+   * If `true`, the operation will only update/destroy composite instance children that are directly referenced by other affected instances.
+   * If `false`, the operation will update/destroy all children at of the composite instances at all levels if at least one of them is referenced by affected instances.
+   *
+   * By default, `false`.
+   */
+  allowPartialCompositeInstanceUpdates: z.boolean().default(false),
+
   /**
    * Whether to refresh the state before running the operation.
    *

package/src/shared/resolvers/graph-resolver.ts

@@ -5,6 +5,7 @@ export type ResolverOutputHandler<TOutput> = (id: string, value: TOutput) => voi
 
 export abstract class GraphResolver<TNode, TOutput> {
   private readonly workset: Set<string> = new Set()
+  private readonly dependencyMap: Map<string, string[]> = new Map()
   private readonly dependentMap: Map<string, Set<string>> = new Map()
   private readonly outputMap: Map<string, TOutput> = new Map()
 
@@ -52,6 +53,30 @@ export abstract class GraphResolver<TNode, TOutput> {
    */
   protected abstract processNode(node: TNode, logger: Logger): TOutput | Promise<TOutput>
 
+  /**
+   * Gets all identifiers of the nodes that depend on the given node directly or indirectly.
+   */
+  getAllDependents(nodeId: string): string[] {
+    const result = new Set<string>()
+    const stack: string[] = [nodeId]
+
+    while (stack.length > 0) {
+      const dependents = this.dependentMap.get(stack.pop()!)
+      if (!dependents) {
+        continue
+      }
+
+      for (const dependentId of dependents) {
+        if (!result.has(dependentId)) {
+          result.add(dependentId)
+          stack.push(dependentId)
+        }
+      }
+    }
+
+    return Array.from(result)
+  }
+
   /**
    * Invalidates the node and all nodes that depend on it.
    *
@@ -82,9 +107,6 @@ export abstract class GraphResolver<TNode, TOutput> {
           stack.push(dependentId)
         }
       }
-
-      // clear the dependent map for the node
-      this.dependentMap.delete(nodeId)
     }
   }
 
@@ -94,9 +116,15 @@ export abstract class GraphResolver<TNode, TOutput> {
    * The abort signal of the previous operation must be called before calling this method again.
    */
   async process(signal?: AbortSignal): Promise<void> {
+    type StackItem = {
+      nodeId: string
+      resolved: boolean
+      dependencies: string[]
+    }
+
     while (this.workset.size > 0) {
       const rootNodeId = this.workset.values().next().value!
-      const stack = [{ nodeId: rootNodeId, resolved: false, dependencies: [] as string[] }]
+      const stack: StackItem[] = [{ nodeId: rootNodeId, resolved: false, dependencies: [] }]
 
       while (stack.length > 0) {
         const stackItem = stack[stack.length - 1]
@@ -126,14 +154,6 @@ export abstract class GraphResolver<TNode, TOutput> {
               continue
             }
 
-            // if (stack.some(item => item.nodeId === depId)) {
-            //   this.logger.warn(
-            //     { depId, nodeId, stack },
-            //     "dependency is already in the stack, looks like a circular dependency, skipping",
-            //   )
-            //   continue
-            // }
-
             if (!this.outputMap.has(depId)) {
               stack.push({ nodeId: depId, resolved: false, dependencies: [] })
               hasUnresolvedDependencies = true
@@ -155,7 +175,19 @@ export abstract class GraphResolver<TNode, TOutput> {
           return
         }
 
-        // update the dependent map
+        // remove all dependent nodes
+        const oldDependencies = this.dependencyMap.get(nodeId) ?? []
+        for (const depId of oldDependencies) {
+          const dependantSet = this.dependentMap.get(depId)
+          if (dependantSet) {
+            dependantSet.delete(nodeId)
+            if (dependantSet.size === 0) {
+              this.dependentMap.delete(depId)
+            }
+          }
+        }
+
+        // add the new dependencies
         for (const depId of stackItem.dependencies) {
           let dependantSet = this.dependentMap.get(depId)
           if (!dependantSet) {
@@ -168,6 +200,7 @@ export abstract class GraphResolver<TNode, TOutput> {
 
         this.outputMap.set(nodeId, output)
         this.outputHandler?.(nodeId, output)
+        this.dependencyMap.set(nodeId, stackItem.dependencies)
 
         stack.pop()
       }

package/src/shared/resolvers/registry.ts

@@ -1,21 +1,25 @@
 import type { Logger } from "pino"
 import type { GraphResolver, ResolverOutputHandler } from "./graph-resolver"
+import type { InstanceState } from "../state"
+import { StateResolver } from "./state"
 import { InputResolver, type InputResolverNode, type InputResolverOutput } from "./input"
 import { InputHashResolver, type InputHashNode, type InputHashOutput } from "./input-hash"
 import { ValidationResolver, type ValidationNode, type ValidationOutput } from "./validation"
 
-export type GraphResolverType = "InputResolver" | "InputHashResolver" | "ValidationResolver"
+export type GraphResolverType = keyof GraphResolverMap
 
 export type GraphResolverMap = {
   InputResolver: [InputResolverNode, InputResolverOutput]
   InputHashResolver: [InputHashNode, InputHashOutput]
   ValidationResolver: [ValidationNode, ValidationOutput]
+  StateResolver: [InstanceState, void]
 }
 
 export const resolverFactories = {
   InputResolver,
   InputHashResolver,
   ValidationResolver,
+  StateResolver,
 } as Record<
   GraphResolverType,
   new (

package/src/shared/resolvers/state.ts

@@ -0,0 +1,12 @@
+import type { InstanceState } from "../state"
+import { GraphResolver } from "./graph-resolver"
+
+export class StateResolver extends GraphResolver<InstanceState, void> {
+  protected getNodeDependencies(node: InstanceState): string[] {
+    return node.dependencyIds
+  }
+
+  protected processNode(): void {
+    return
+  }
+}

package/src/shared/state.ts

@@ -72,6 +72,7 @@ export const instanceTerminalMetaSchema = z.object({
   name: z.string(),
   title: z.string(),
   description: z.string().optional(),
+  icon: z.string().optional(),
 })
 
 export const instanceTerminalFileSchema = z.object({
@@ -147,6 +148,7 @@ export const instanceStateUpdateSchema = z
 
 export type InstanceStatusFieldValue = z.infer<typeof instanceStatusFieldValueSchema>
 export type InstanceStatusField = z.infer<typeof instanceStatusFieldSchema>
+export type InstanceTerminalMeta = z.infer<typeof instanceTerminalMetaSchema>
 export type InstanceTerminal = z.infer<typeof instanceTerminalSchema>
 
 export type InstanceStatus = z.infer<typeof instanceStatusSchema>
@@ -212,31 +214,6 @@ export function createInstanceStatePatch(update: InstanceStateUpdate): Partial<I
   return omit(update, ["secrets", "logLine"])
 }
 
-/**
- * Builds a map where instance id -> instance state ids that directly depend on the instance.
- *
- * @param instanceStates The instance states to build the map from.
- */
-export function buildDependentInstanceStateMap(
-  instanceStates: Map<string, InstanceState>,
-): Map<string, string[]> {
-  const dependentMap = new Map<string, string[]>()
-
-  for (const state of instanceStates.values()) {
-    for (const dependency of state.dependencyIds) {
-      let dependents = dependentMap.get(dependency)
-      if (!dependents) {
-        dependents = []
-        dependentMap.set(dependency, dependents)
-      }
-
-      dependents.push(state.id)
-    }
-  }
-
-  return dependentMap
-}
-
 /**
  * Gets all instance ids that depend on the given instance id (including recursively).
  * The instance id itself is not included in the result.

package/src/shared/terminal.ts

@@ -1,11 +1,12 @@
 import { z } from "zod"
 
 export const terminalSessionSchema = z.object({
-  id: z.string().nanoid(),
+  id: z.string().uuid(),
   projectId: z.string(),
   instanceId: z.string(),
   terminalName: z.string(),
   terminalTitle: z.string(),
+  terminalIcon: z.string().optional(),
   createdAt: z.coerce.date(),
   finishedAt: z.coerce.date().optional(),
 })

package/src/state/local.ts

@@ -326,7 +326,7 @@ export class LocalStateBackend implements StateBackend {
   async getTerminalSessions(projectId: string, instanceId: string): Promise<TerminalSession[]> {
     const sublevel = this.getTerminalSessionsSublevel(projectId, instanceId)
 
-    return await this.getAllSublevelItems(sublevel, terminalSessionSchema)
+    return await this.getAllSublevelItems(sublevel, terminalSessionSchema, 20, { reverse: true })
   }
 
   async getLastTerminalSession(

package/src/terminal/manager.ts

@@ -5,7 +5,7 @@ import type { RunnerBackend } from "../runner"
 import { PassThrough, type Stream, type Writable } from "node:stream"
 import { EventEmitter, on } from "node:events"
 import { parseInstanceId } from "@highstate/contract"
-import { nanoid } from "nanoid"
+import { uuidv7 } from "uuidv7"
 import { type InstanceTerminal, type TerminalSession, createAsyncBatcher } from "../shared"
 import { isAbortErrorLike } from "../common"
 
@@ -97,11 +97,12 @@ export class TerminalManager {
     }
 
     const terminalSession: TerminalSession = {
-      id: nanoid(),
+      id: uuidv7(),
       projectId,
       instanceId,
       terminalName,
       terminalTitle: factory.title,
+      terminalIcon: factory.icon,
       createdAt: new Date(),
     }
 
@@ -117,10 +118,11 @@ export class TerminalManager {
     projectId: string,
     instanceId: string,
     terminalName: string,
+    newSession = false,
   ): Promise<TerminalSession> {
     const existingSession = this.existingSessions.get(`${projectId}:${instanceId}.${terminalName}`)
 
-    if (existingSession) {
+    if (existingSession && !newSession) {
       return existingSession
     }
 

package/src/terminal/run.sh.ts

@@ -19,6 +19,8 @@ for key in "\${filesKeys[@]}"; do
   isBinary=$(jq -r ".files[\\"$key\\"].isBinary // false" <<<"$data")
   content=$(jq -r ".files[\\"$key\\"].content" <<<"$data")
   mode=$(jq -r ".files[\\"$key\\"].mode // 0" <<<"$data")
+  
+  mkdir -p "$(dirname "$key")"
 
   if [ "$isBinary" = "true" ]; then
     echo "$content" | base64 -d > "$key"