@highstate/backend 0.9.9 → 0.9.10

package/dist/{chunk-EQ4LMS7B.js → chunk-WXDYCRTT.js}

@@ -43,61 +43,6 @@ function errorToString(error) {
   }
   return JSON.stringify(error);
 }
-function createAsyncBatcher(fn, { waitMs = 100, maxWaitTimeMs = 1e3 } = {}) {
-  let batch = [];
-  let activeTimeout = null;
-  let maxWaitTimeout = null;
-  let firstCallTimestamp = null;
-  async function processBatch() {
-    if (batch.length === 0) return;
-    const currentBatch = batch;
-    batch = [];
-    await fn(currentBatch);
-    if (maxWaitTimeout) {
-      clearTimeout(maxWaitTimeout);
-      maxWaitTimeout = null;
-    }
-    firstCallTimestamp = null;
-  }
-  function schedule() {
-    if (activeTimeout) clearTimeout(activeTimeout);
-    activeTimeout = setTimeout(() => {
-      activeTimeout = null;
-      void processBatch();
-    }, waitMs);
-    if (!firstCallTimestamp) {
-      firstCallTimestamp = Date.now();
-      maxWaitTimeout = setTimeout(() => {
-        if (activeTimeout) clearTimeout(activeTimeout);
-        activeTimeout = null;
-        void processBatch();
-      }, maxWaitTimeMs);
-    }
-  }
-  return {
-    /**
-     * Add an item to the batch.
-     */
-    call(item) {
-      batch.push(item);
-      schedule();
-    },
-    /**
-     * Immediately flush the pending batch (if any).
-     */
-    async flush() {
-      if (activeTimeout) {
-        clearTimeout(activeTimeout);
-        activeTimeout = null;
-      }
-      if (maxWaitTimeout) {
-        clearTimeout(maxWaitTimeout);
-        maxWaitTimeout = null;
-      }
-      await processBatch();
-    }
-  };
-}
 
 // src/common/pulumi.ts
 import { BetterLock } from "better-lock";
@@ -280,11 +225,10 @@ export {
   tryWrapAbortErrorLike,
   stringArrayType,
   errorToString,
-  createAsyncBatcher,
   LocalPulumiHost,
   valueToString,
   stringToValue,
   updateResourceCount,
   resolveMainLocalProject
 };
-//# sourceMappingURL=chunk-EQ4LMS7B.js.map
+//# sourceMappingURL=chunk-WXDYCRTT.js.map

package/dist/chunk-WXDYCRTT.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/common/utils.ts","../src/common/pulumi.ts","../src/common/local.ts"],"sourcesContent":["import { z } from \"zod\"\n\nexport async function runWithRetryOnError<T>(\n  runner: () => T | Promise<T>,\n  tryHandleError: (error: unknown) => boolean | Promise<boolean>,\n  maxRetries: number = 1,\n): Promise<T> {\n  let lastError: unknown\n\n  for (let i = 0; i < maxRetries + 1; i++) {\n    try {\n      return await runner()\n    } catch (e) {\n      lastError = e\n\n      if (await tryHandleError(e)) {\n        continue\n      }\n\n      throw e\n    }\n  }\n\n  throw lastError\n}\n\nexport class AbortError extends Error {\n  constructor(options?: ErrorOptions) {\n    super(\"Operation aborted\", options)\n  }\n}\n\nexport function isAbortError(error: unknown): boolean {\n  return error instanceof Error && error.name === \"AbortError\"\n}\n\nconst abortMessagePatterns = [\"Operation aborted\", \"Command was killed with SIGINT\"]\n\nexport function isAbortErrorLike(error: unknown): boolean {\n  if (error instanceof Error) {\n    return abortMessagePatterns.some(pattern => error.message.includes(pattern))\n  }\n\n  return false\n}\n\nexport function tryWrapAbortErrorLike(error: unknown): unknown {\n  if (isAbortErrorLike(error)) {\n    return new AbortError({ cause: error })\n  }\n\n  return error\n}\n\nexport const stringArrayType = z.string().transform(args => args.split(\",\").map(arg => arg.trim()))\n\nexport function errorToString(error: unknown): string {\n  if (error instanceof Error) {\n    return error.stack || error.message\n  }\n\n  return JSON.stringify(error)\n}\n","import type { ConfigMap, OpMap, OpType, Stack, WhoAmIResult } from \"@pulumi/pulumi/automation\"\nimport type { Logger } from \"pino\"\nimport { BetterLock } from \"better-lock\"\nimport { AbortError, runWithRetryOnError } from \"./utils\"\n\nexport type RunOptions = {\n  projectId: string\n  pulumiProjectName: string\n  pulumiStackName: string\n  envVars?: Record<string, string>\n}\n\nexport type RunLocalOptions = RunOptions & {\n  projectPath: string\n  stackConfig?: ConfigMap\n}\n\nexport class LocalPulumiHost {\n  private lock = new BetterLock()\n\n  private constructor(private readonly logger: Logger) {}\n\n  async getCurrentUser(): Promise<WhoAmIResult | null> {\n    const { LocalWorkspace } = await import(\"@pulumi/pulumi/automation/index.js\")\n    const workspace = await LocalWorkspace.create({})\n\n    try {\n      return await workspace.whoAmI()\n    } catch (error) {\n      this.logger.error({ msg: \"failed to get current user\", error })\n\n      return null\n    }\n  }\n\n  async runEmpty<T>(\n    options: RunOptions,\n    fn: (stack: Stack) => Promise<T>,\n    signal?: AbortSignal,\n  ): Promise<T> {\n    const { projectId, pulumiProjectName, pulumiStackName, envVars } = options\n\n    return await this.lock.acquire(`${pulumiProjectName}.${pulumiStackName}`, async () => {\n      const { LocalWorkspace } = await import(\"@pulumi/pulumi/automation/index.js\")\n\n      const stack = await LocalWorkspace.createOrSelectStack(\n        {\n          projectName: pulumiProjectName,\n          stackName: pulumiStackName,\n          program: () => Promise.resolve(),\n        },\n        {\n          projectSettings: {\n            name: pulumiProjectName,\n            runtime: \"nodejs\",\n          },\n          envVars: {\n            PULUMI_CONFIG_PASSPHRASE: this.getPassword(projectId),\n            PULUMI_K8S_AWAIT_ALL: \"true\",\n            ...envVars,\n          },\n        },\n      )\n\n      signal?.throwIfAborted()\n\n      try {\n        return await runWithRetryOnError(\n          () => fn(stack),\n          error => this.tryUnlockStack(stack, error),\n        )\n      } catch (e) {\n        if (e instanceof Error && e.message.includes(\"canceled\")) {\n          throw new AbortError()\n        }\n\n        throw e\n      }\n    })\n  }\n\n  async runLocal<T>(\n    options: RunLocalOptions,\n    fn: (stack: Stack) => Promise<T>,\n    signal?: AbortSignal,\n  ): Promise<T> {\n    const { projectId, pulumiProjectName, pulumiStackName, projectPath, stackConfig, envVars } =\n      options\n\n    return await this.lock.acquire(`${pulumiProjectName}.${pulumiStackName}`, async () => {\n      const { LocalWorkspace } = await import(\"@pulumi/pulumi/automation/index.js\")\n\n      const stack = await LocalWorkspace.createOrSelectStack(\n        {\n          stackName: pulumiStackName,\n          workDir: projectPath,\n        },\n        {\n          projectSettings: {\n            name: pulumiProjectName,\n            runtime: \"nodejs\",\n          },\n          stackSettings: stackConfig\n            ? {\n                [pulumiStackName]: {\n                  config: stackConfig,\n                },\n              }\n            : undefined,\n          envVars: {\n            PULUMI_CONFIG_PASSPHRASE: this.getPassword(projectId),\n            PULUMI_K8S_AWAIT_ALL: \"true\",\n            ...envVars,\n          },\n        },\n      )\n\n      signal?.throwIfAborted()\n\n      try {\n        return await runWithRetryOnError(\n          () => fn(stack),\n          error => this.tryUnlockStack(stack, error),\n        )\n      } catch (e) {\n        if (e instanceof Error && e.message.includes(\"canceled\")) {\n          throw new AbortError()\n        }\n\n        throw e\n      }\n    })\n  }\n\n  private sharedPassword: string = process.env.PULUMI_CONFIG_PASSPHRASE ?? \"\"\n  private passwords = new Map<string, string>()\n\n  hasPassword(projectId: string) {\n    return !!this.sharedPassword || this.passwords.has(projectId)\n  }\n\n  setPassword(projectId: string, password: string) {\n    this.passwords.set(projectId, password)\n  }\n\n  removePassword(projectId: string) {\n    this.passwords.delete(projectId)\n  }\n\n  private getPassword(projectId: string) {\n    return this.sharedPassword || this.passwords.get(projectId) || \"\"\n  }\n\n  async tryUnlockStack(stack: Stack, error: unknown) {\n    if (error instanceof Error && error.message.includes(\"the stack is currently locked\")) {\n      // TODO: kill the process if the hostname matches the current hostname\n\n      this.logger.warn({ stackName: stack.name }, \"inlocking stack\")\n      await stack.cancel()\n      return true\n    }\n\n    return false\n  }\n\n  static create(logger: Logger) {\n    return new LocalPulumiHost(logger.child({ service: \"LocalPulumiHost\" }))\n  }\n}\n\nexport function valueToString(value: unknown): string {\n  if (typeof value === \"string\") {\n    return value\n  }\n\n  return JSON.stringify(value)\n}\n\nexport function stringToValue(value: string): unknown {\n  try {\n    return JSON.parse(value)\n  } catch {\n    return value\n  }\n}\n\nexport function updateResourceCount(opType: OpType, currentCount: number): number {\n  switch (opType) {\n    case \"same\":\n    case \"create\":\n    case \"update\":\n    case \"replace\":\n    case \"create-replacement\":\n    case \"import\":\n    case \"import-replacement\":\n      return currentCount + 1\n\n    case \"delete\":\n    case \"delete-replaced\":\n    case \"discard\":\n    case \"discard-replaced\":\n    case \"remove-pending-replace\":\n      return currentCount - 1\n\n    case \"refresh\":\n    case \"read-replacement\":\n    case \"read\":\n      return currentCount\n\n    default:\n      throw new Error(`Unknown operation type: ${opType as string}`)\n  }\n}\n\nexport function calculateTotalResources(opMap: OpMap | undefined): number {\n  if (!opMap) {\n    return 0 // No operations imply no resources\n  }\n\n  let total = 0\n\n  for (const [op, count] of Object.entries(opMap)) {\n    const opType = op as OpType\n    const value = count ?? 0\n\n    total = updateResourceCount(opType, value)\n  }\n\n  return total\n}\n","import { basename } from \"node:path\"\nimport { findWorkspaceDir, readPackageJSON } from \"pkg-types\"\n\nexport async function resolveMainLocalProject(\n  projectPath?: string,\n  projectName?: string,\n): Promise<[projecPath: string, projectName: string]> {\n  if (!projectPath) {\n    projectPath = await findWorkspaceDir()\n  }\n\n  if (!projectName) {\n    const packageJson = await readPackageJSON(projectPath)\n    projectName = packageJson.name\n  }\n\n  if (!projectName) {\n    projectName = basename(projectPath)\n  }\n\n  return [projectPath, projectName]\n}\n"],"mappings":"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","names":[]}

package/dist/highstate.manifest.json

@@ -1,8 +1,8 @@
 {
   "sourceHashes": {
-    "./dist/index.js": "bac9fe2cacea1c7b42619b6950c9516162da5dba571a6d8282fbe880645b7f97",
-    "./dist/shared/index.js": "8d015e5f855592ea97cbcf2152042d87f82087b1576d4e667d0cc0e873e68927",
-    "./dist/library/worker/main.js": "2acb09c0340ce9d3f6825ff0c7d2d8a08596f378aa41df211e464257f463497c",
+    "./dist/index.js": "65eb8a0ed4774e1bbd2a2a6176b0840b2fec9c515a620b90a963900a3cd5e155",
+    "./dist/shared/index.js": "0d314d61379d99c55057d507979d2f49119b0da831fbbc8681fccf05d99a4d5c",
+    "./dist/library/worker/main.js": "4e24e61811d3f605da65f70dc14cd2585f551e28773d96686cc188e66fe57650",
     "./dist/library/package-resolution-worker.js": "4bfa368ad35a64c109df9e5a468c057791164760fe166c4eb5d9a889dee4d7bc"
   }
 }

package/dist/index.js

@@ -1,8 +1,9 @@
 import {
+  InputHashResolver,
+  InputResolver,
   applyPartialInstanceState,
   compositeInstanceSchema,
-  createInputHashResolver,
-  createInputResolver,
+  createAsyncBatcher,
   createInstanceState,
   createInstanceStatePatch,
   diffLibraries,
@@ -17,10 +18,9 @@ import {
   isFinalOperationStatus,
   projectOperationSchema,
   terminalSessionSchema
-} from "./chunk-NMGIUI6X.js";
+} from "./chunk-DQDXRDUA.js";
 import {
   LocalPulumiHost,
-  createAsyncBatcher,
   errorToString,
   isAbortError,
   isAbortErrorLike,
@@ -31,7 +31,7 @@ import {
   tryWrapAbortErrorLike,
   updateResourceCount,
   valueToString
-} from "./chunk-EQ4LMS7B.js";
+} from "./chunk-WXDYCRTT.js";
 
 // src/secret/abstractions.ts
 var SecretAccessDeniedError = class extends Error {
@@ -950,17 +950,17 @@ var ProjectManager = class _ProjectManager {
   }
   async createInstance(projectId, instance) {
     const createdInstance = await this.projectBackend.createInstance(projectId, instance);
-    await this.updateCompositeInstance(projectId, createdInstance);
+    await this.evaluateChangedCompositeInstances(projectId);
     return createdInstance;
   }
   async updateInstance(projectId, instanceId, patch) {
     const instance = await this.projectBackend.updateInstance(projectId, instanceId, patch);
-    await this.updateCompositeInstance(projectId, instance);
+    await this.evaluateChangedCompositeInstances(projectId);
     return instance;
   }
   async renameInstance(projectId, instanceId, newName) {
     const instance = await this.projectBackend.renameInstance(projectId, instanceId, newName);
-    await this.updateCompositeInstance(projectId, instance);
+    await this.evaluateChangedCompositeInstances(projectId);
     return instance;
   }
   async deleteInstance(projectId, instanceId) {
@@ -969,40 +969,27 @@ var ProjectManager = class _ProjectManager {
       this.stateBackend.clearCompositeInstances(projectId, [instanceId])
     ]);
   }
-  async updateCompositeInstance(projectId, instance) {
-    const { resolveInputHash, library } = await this.prepareInputHashResolver(projectId);
-    const component = library.components[instance.type];
-    if (!component) {
-      return;
-    }
-    if (isUnitModel2(component)) {
-      return;
-    }
-    const { inputHash: expectedInputHash } = await resolveInputHash(instance.id);
-    const inputHash = await this.stateBackend.getCompositeInstanceInputHash(projectId, instance.id);
-    if (inputHash !== expectedInputHash) {
-      this.logger.info("re-evaluating instance since input hash has changed", {
-        projectId,
-        instanceId: instance.id
-      });
-      await this.evaluateCompositeInstances(projectId, [instance.id]);
-    }
-  }
-  async evaluateCompositeInstances(projectId, instanceIds) {
+  async evaluateChangedCompositeInstances(projectId) {
+    const { inputHashResolver, instances, library, evaluatedInputHashes } = await this.prepareResolvers(projectId);
+    inputHashResolver.addAllNodesToWorkset();
+    await inputHashResolver.process();
+    const instanceIds = instances.filter((instance) => !isUnitModel2(library.components[instance.type])).filter(
+      (instance) => evaluatedInputHashes[instance.id] !== inputHashResolver.requireOutput(instance.id).inputHash
+    ).map((instance) => instance.id);
     await this.projectLockManager.getLock(projectId).lockInstances(instanceIds, async () => {
       this.logger.debug({ instanceIds }, "evaluating composite instances");
       for (const instanceId of instanceIds) {
         this.compositeInstanceEE.emit(projectId, { type: "evaluation-started", instanceId });
       }
       const [
-        { instances, resolvedInputs, stateMap, resolveInputHash },
+        { instances: instances2, resolvedInputs, stateMap, inputHashResolver: inputHashResolver2 },
         topLevelCompositeChildrenIds
       ] = await Promise.all([
-        this.prepareInputHashResolver(projectId),
+        this.prepareResolvers(projectId),
         this.stateBackend.getTopLevelCompositeChildrenIds(projectId, instanceIds)
       ]);
       const results = await this.libraryBackend.evaluateCompositeInstances(
-        instances,
+        instances2,
         resolvedInputs,
         instanceIds
       );
@@ -1012,15 +999,15 @@ var ProjectManager = class _ProjectManager {
         newState.evaluationError = result.success ? null : result.error;
         return newState;
       });
-      const inputHashes = /* @__PURE__ */ new Map();
-      for (const instanceId of instanceIds) {
-        const { inputHash } = await resolveInputHash(instanceId);
-        inputHashes.set(instanceId, inputHash);
-      }
+      inputHashResolver2.addAllNodesToWorkset();
+      await inputHashResolver2.process();
       const compositeInstances = results.filter((result) => result.success).flatMap(
         (result) => result.compositeInstances.map((instance) => ({
           ...instance,
-          inputHash: inputHashes.get(instance.instance.id)
+          inputHash: (
+            // only store inputHash for top-level composite instances
+            instance.instance.id === result.instanceId ? inputHashResolver2.requireOutput(instance.instance.id).inputHash : ""
+          )
         }))
       );
       const newTopLevelCompositeChildrenIds = Object.fromEntries(
@@ -1047,6 +1034,16 @@ var ProjectManager = class _ProjectManager {
       ]);
       for (const state of newStates) {
         this.stateManager.emitStatePatch(projectId, state);
+        if (state.evaluationError) {
+          this.logger.error(
+            { projectId, instanceId: state.id, error: state.evaluationError },
+            "instance evaluation failed"
+          );
+          this.compositeInstanceEE.emit(projectId, {
+            type: "failed",
+            instanceId: state.id
+          });
+        }
       }
       for (const instance of compositeInstances) {
         this.compositeInstanceEE.emit(projectId, { type: "updated", instance });
@@ -1073,11 +1070,14 @@ var ProjectManager = class _ProjectManager {
       await Promise.all(promises);
     });
   }
-  async prepareInputHashResolver(projectId) {
-    const { instances, hubs } = await this.projectBackend.getProject(projectId);
-    const library = await this.libraryBackend.loadLibrary();
+  async prepareResolvers(projectId) {
+    const [{ instances, hubs }, states, library, evaluatedInputHashes] = await Promise.all([
+      this.projectBackend.getProject(projectId),
+      this.stateBackend.getAllInstanceStates(projectId),
+      this.libraryBackend.loadLibrary(),
+      this.stateBackend.getCompositeInstanceInputHashes(projectId)
+    ]);
     const filteredInstances = instances.filter((instance) => instance.type in library.components);
-    const states = await this.stateBackend.getAllInstanceStates(projectId);
     const stateMap = new Map(states.map((state) => [state.id, state]));
     const inputResolverNodes = /* @__PURE__ */ new Map();
     for (const instance of filteredInstances) {
@@ -1090,11 +1090,13 @@ var ProjectManager = class _ProjectManager {
     for (const hub of hubs) {
       inputResolverNodes.set(`hub:${hub.id}`, { kind: "hub", hub });
     }
-    const resolveInputs = createInputResolver(inputResolverNodes, this.logger);
+    const inputResolver = new InputResolver(inputResolverNodes, this.logger);
+    inputResolver.addAllNodesToWorkset();
     const inputHashInputs = /* @__PURE__ */ new Map();
     const resolvedInputs = {};
+    await inputResolver.process();
     for (const instance of filteredInstances) {
-      const output = await resolveInputs(`instance:${instance.id}`);
+      const output = inputResolver.requireOutput(`instance:${instance.id}`);
       if (output.kind !== "instance") {
         throw new Error("Expected instance node");
       }
@@ -1118,13 +1120,15 @@ var ProjectManager = class _ProjectManager {
       });
       resolvedInputs[instance.id] = output.resolvedInputs;
     }
-    const resolveInputHash = createInputHashResolver(inputHashInputs, this.logger);
+    const inputHashResolver = new InputHashResolver(inputHashInputs, this.logger);
     return {
-      resolveInputHash,
+      inputHashInputs,
+      inputHashResolver,
       library,
-      instances,
+      instances: filteredInstances,
       stateMap,
-      resolvedInputs
+      resolvedInputs,
+      evaluatedInputHashes
     };
   }
   async watchLibraryChanges() {
@@ -1158,7 +1162,7 @@ var ProjectManager = class _ProjectManager {
     );
     const projects = await this.projectBackend.getProjectIds();
     for (const projectId of projects) {
-      const { resolveInputHash, instances } = await this.prepareInputHashResolver(projectId);
+      const { instances } = await this.prepareResolvers(projectId);
       const filteredInstances = instances.filter(
         (instance) => changedComponents.has(instance.type) && library.components[instance.type] && !isUnitModel2(library.components[instance.type])
       );
@@ -1166,16 +1170,8 @@ var ProjectManager = class _ProjectManager {
         { projectId, filteredInstanceIds: filteredInstances.map((instance) => instance.id) },
         "updating composite instances for project"
       );
-      const inputHashMap = /* @__PURE__ */ new Map();
-      for (const instance of filteredInstances) {
-        const { inputHash } = await resolveInputHash(instance.id);
-        inputHashMap.set(instance.id, inputHash);
-      }
       try {
-        await this.evaluateCompositeInstances(
-          projectId,
-          filteredInstances.map((instance) => instance.id)
-        );
+        await this.evaluateChangedCompositeInstances(projectId);
       } catch (error) {
         this.logger.error({ error }, "failed to evaluate composite instances");
       }
@@ -2296,10 +2292,13 @@ var LocalStateBackend = class _LocalStateBackend {
     const sublevel = this.getProjectCompositeInstancesSublevel(projectId);
     return this.getSublevelItem(sublevel, compositeInstanceSchema, instanceId);
   }
-  async getCompositeInstanceInputHash(projectId, instanceId) {
+  async getCompositeInstanceInputHashes(projectId) {
     const sublevel = this.getProjectCompositeInstanceInputHashesSublevel(projectId);
-    const inputHash = await sublevel.get(instanceId);
-    return inputHash ?? null;
+    const result = {};
+    for await (const [key, value] of sublevel.iterator()) {
+      result[key] = value;
+    }
+    return result;
   }
   async putCompositeInstances(projectId, instances) {
     this.validateArray(compositeInstanceSchema, instances);
@@ -2312,6 +2311,12 @@ var LocalStateBackend = class _LocalStateBackend {
           key: instance.instance.id,
           value: compositeInstanceSchema.parse(instance),
           sublevel
+        },
+        {
+          type: "put",
+          key: instance.instance.id,
+          value: instance.inputHash ?? "",
+          sublevel: inputHashesSublevel
         }
       ])
     );
@@ -2687,6 +2692,7 @@ import {
   parseInstanceId as parseInstanceId2
 } from "@highstate/contract";
 import { unique as unique2 } from "remeda";
+import { BetterLock as BetterLock3 } from "better-lock";
 var OperationWorkset = class _OperationWorkset {
   constructor(operation, library, stateManager, logger) {
     this.operation = operation;
@@ -2704,11 +2710,10 @@ var OperationWorkset = class _OperationWorkset {
   stateChildIdMap = /* @__PURE__ */ new Map();
   unitSourceHashMap = /* @__PURE__ */ new Map();
   inputResolver;
-  inputResolverInputs = /* @__PURE__ */ new Map();
-  inputResolverPromiseCache = /* @__PURE__ */ new Map();
+  inputResolverNodes = /* @__PURE__ */ new Map();
   inputHashResolver;
-  inputHashResolverInputs = /* @__PURE__ */ new Map();
-  inputHashResolverPromiseCache = /* @__PURE__ */ new Map();
+  inputHashNodes = /* @__PURE__ */ new Map();
+  inputHashResolverLock = new BetterLock3();
   resolvedInstanceInputs = /* @__PURE__ */ new Map();
   getInstance(instanceId) {
     const instance = this.instanceMap.get(instanceId);
@@ -2874,7 +2879,7 @@ var OperationWorkset = class _OperationWorkset {
         }
       }
       const state = this.stateMap.get(instance.id);
-      const { inputHash: expectedInputHash } = await this.inputHashResolver(instance.id);
+      const { inputHash: expectedInputHash } = this.inputHashResolver.requireOutput(instance.id);
       if (this.operation.options.forceUpdateDependencies) {
         this.instanceIdsToUpdate.add(instanceId);
         return;
@@ -2900,7 +2905,7 @@ var OperationWorkset = class _OperationWorkset {
           continue;
         }
         const state = this.stateMap.get(child.id);
-        const { inputHash: expectedInputHash } = await this.inputHashResolver(child.id);
+        const { inputHash: expectedInputHash } = this.inputHashResolver.requireOutput(child.id);
         if (state?.status !== "created" || state.inputHash !== expectedInputHash) {
           this.instanceIdsToUpdate.add(child.id);
         }
@@ -2995,17 +3000,20 @@ var OperationWorkset = class _OperationWorkset {
     }
   }
   async getUpToDateInputHash(instance) {
-    const component = this.library.components[instance.type];
-    this.inputHashResolverInputs.set(instance.id, {
-      instance,
-      component,
-      resolvedInputs: this.resolvedInstanceInputs.get(instance.id),
-      state: this.stateMap.get(instance.id),
-      sourceHash: this.getSourceHashIfApplicable(instance, component)
+    return await this.inputHashResolverLock.acquire(async () => {
+      const component = this.library.components[instance.type];
+      this.inputHashNodes.set(instance.id, {
+        instance,
+        component,
+        resolvedInputs: this.resolvedInstanceInputs.get(instance.id),
+        state: this.stateMap.get(instance.id),
+        sourceHash: this.getSourceHashIfApplicable(instance, component)
+      });
+      this.inputHashResolver.invalidate(instance.id);
+      await this.inputHashResolver.process();
+      const { inputHash } = this.inputHashResolver.requireOutput(instance.id);
+      return inputHash;
     });
-    this.inputHashResolverPromiseCache.delete(instance.id);
-    const { inputHash } = await this.inputHashResolver(instance.id);
-    return inputHash;
   }
   getLockInstanceIds() {
     return Array.from(this.instanceIdsToUpdate.union(this.instanceIdsToDestroy));
@@ -3017,18 +3025,12 @@ var OperationWorkset = class _OperationWorkset {
       stateBackend.getCompositeInstances(operation.projectId, signal),
       stateBackend.getAllInstanceStates(operation.projectId, signal)
     ]);
-    const unitSources = await libraryBackend.getResolvedUnitSources(
-      unique2(project.instances.map((i) => i.type))
-    );
     const workset = new _OperationWorkset(
       operation,
       library,
       stateManager,
       logger.child({ operationId: operation.id, service: "OperationWorkset" })
     );
-    for (const unitSource of unitSources) {
-      workset.unitSourceHashMap.set(unitSource.unitType, unitSource.sourceHash);
-    }
     for (const instance of project.instances) {
       workset.addInstance(instance);
     }
@@ -3051,6 +3053,12 @@ var OperationWorkset = class _OperationWorkset {
         }
       }
     }
+    const unitSources = await libraryBackend.getResolvedUnitSources(
+      unique2(Array.from(workset.instanceMap.values().map((i) => i.type)))
+    );
+    for (const unitSource of unitSources) {
+      workset.unitSourceHashMap.set(unitSource.unitType, unitSource.sourceHash);
+    }
     for (const state of states) {
       if (!workset.instanceMap.has(state.id)) {
         workset.logger.warn(
@@ -3061,29 +3069,26 @@ var OperationWorkset = class _OperationWorkset {
       workset.setState(state);
     }
     for (const instance of workset.instanceMap.values()) {
-      workset.inputResolverInputs.set(`instance:${instance.id}`, {
+      workset.inputResolverNodes.set(`instance:${instance.id}`, {
         kind: "instance",
         instance,
         component: library.components[instance.type]
       });
     }
     for (const hub of project.hubs) {
-      workset.inputResolverInputs.set(`hub:${hub.id}`, { kind: "hub", hub });
+      workset.inputResolverNodes.set(`hub:${hub.id}`, { kind: "hub", hub });
     }
-    workset.inputResolver = createInputResolver(
-      //
-      workset.inputResolverInputs,
-      logger,
-      { promiseCache: workset.inputResolverPromiseCache }
-    );
+    workset.inputResolver = new InputResolver(workset.inputResolverNodes, logger);
+    workset.inputResolver.addAllNodesToWorkset();
+    await workset.inputResolver.process();
     for (const instance of workset.instanceMap.values()) {
-      const output = await workset.inputResolver(`instance:${instance.id}`);
+      const output = workset.inputResolver.requireOutput(`instance:${instance.id}`);
       if (output.kind !== "instance") {
         throw new Error("Unexpected output kind");
       }
       workset.resolvedInstanceInputs.set(instance.id, output.resolvedInputs);
       const component = workset.library.components[instance.type];
-      workset.inputHashResolverInputs.set(instance.id, {
+      workset.inputHashNodes.set(instance.id, {
         instance,
         component,
         resolvedInputs: output.resolvedInputs,
@@ -3091,12 +3096,9 @@ var OperationWorkset = class _OperationWorkset {
         sourceHash: workset.getSourceHashIfApplicable(instance, component)
       });
     }
-    workset.inputHashResolver = createInputHashResolver(
-      //
-      workset.inputHashResolverInputs,
-      logger,
-      { promiseCache: workset.inputHashResolverPromiseCache }
-    );
+    workset.inputHashResolver = new InputHashResolver(workset.inputHashNodes, logger);
+    workset.inputHashResolver.addAllNodesToWorkset();
+    await workset.inputHashResolver.process();
     if (operation.type !== "destroy") {
       await workset.calculateInstanceIdsToUpdate();
     }