@prismatic-io/lux 0.0.2-preview.29 → 0.0.2-preview.30

package/src/orchestrator/fixture-identity.ts

@@ -5,6 +5,7 @@ import { contentHash, type FixturesRef, valueHash } from "../core/index.js";
 export type FixtureIdentity = {
   rootDir: string;
   hash: string;
+  fileHashes: ReadonlyMap<string, string>;
 };
 
 const fixtureEntries = async (
@@ -63,5 +64,12 @@ export const fixtureIdentity = async (
   if (metadata.isSymbolicLink() || !metadata.isDirectory()) {
     throw new Error(`fixtures: expected a real directory: ${rootDir}`);
   }
-  return { rootDir, hash: valueHash(await fixtureEntries(rootDir)) };
+  const entries = await fixtureEntries(rootDir);
+  return {
+    rootDir,
+    hash: valueHash(entries),
+    fileHashes: new Map(
+      entries.flatMap((entry) => (entry.hash === undefined ? [] : [[entry.path, entry.hash]])),
+    ),
+  };
 };

package/src/orchestrator/orchestrator.ts

@@ -358,13 +358,19 @@ export class Orchestrator {
       registry,
     );
 
-    const driverRef = resolveDriverReference(evalCase, this.defaultDriver, request.driver);
+    const driverRef = bindSubjectRoot(
+      resolveDriverReference(evalCase, this.defaultDriver, request.driver),
+      request.subjectRoot,
+    );
     const driverName = driverNameOf(driverRef);
-    const answererRef = resolveAnswererReference(
-      evalCase,
-      this.defaultAnswerer,
-      this.harness,
-      request.answererOverride,
+    const answererRef = bindSubjectRoot(
+      resolveAnswererReference(
+        evalCase,
+        this.defaultAnswerer,
+        this.harness,
+        request.answererOverride,
+      ),
+      request.subjectRoot,
     );
     const answererName = answererNameOf(answererRef);
 

package/src/orchestrator/run-execution.ts

@@ -12,6 +12,7 @@ import {
   type AnswerHistoryEntry,
   type Artifact,
   actionTiming,
+  bindRunExecutionWorkspace,
   type EvalCase,
   emptyUsage,
   type FixturesRef,
@@ -38,6 +39,7 @@ import {
   TokenUsageSchema,
   valueHash,
 } from "../core/index.js";
+import { identifyArtifactOrigins } from "./artifact-origin.js";
 import {
   createDriverSession,
   type DriverSession,
@@ -115,7 +117,9 @@ const readAnswererUsage = (answerer: Answerer): TokenUsage =>
 const stageFixtures = async (
   ref: FixturesRef | undefined,
   options: { fixturesRoot?: string; casePath: string; artifactsDir: string },
-): Promise<{ fixtures: ResolvedFixtures; hash: string } | undefined> => {
+): Promise<
+  { fixtures: ResolvedFixtures; hash: string; fileHashes: ReadonlyMap<string, string> } | undefined
+> => {
   if (!ref) return undefined;
   const path = typeof ref === "string" ? ref : ref.path;
   if (!isAbsolute(path) && !options.fixturesRoot && options.casePath === INLINE_CASE_PATH) {
@@ -130,7 +134,11 @@ const stageFixtures = async (
   if (staged.hash !== source.hash) {
     throw new Error(`fixtures: tree changed while staging: ${source.rootDir}`);
   }
-  return { fixtures: { rootDir: source.rootDir }, hash: staged.hash };
+  return {
+    fixtures: { rootDir: source.rootDir },
+    hash: staged.hash,
+    fileHashes: staged.fileHashes,
+  };
 };
 
 export const runDirOfError = (error: unknown): string | null =>
@@ -308,6 +316,7 @@ class RunExecution implements RunLifecycleEffects<RunResult> {
   private loop: DriverSession | undefined;
   private ready: ReadyState | undefined;
   private fixturesHash: string | undefined;
+  private fixtureFileHashes: ReadonlyMap<string, string> = new Map();
   private startAttempted = false;
   private loopOutcome: DriverSessionOutcome | undefined;
   private collection: Collection = { artifacts: [] };
@@ -378,6 +387,7 @@ class RunExecution implements RunLifecycleEffects<RunResult> {
       artifactsDir: this.workspace.path,
     });
     this.fixturesHash = staged?.hash;
+    this.fixtureFileHashes = staged?.fileHashes ?? new Map();
     if (request.abortSignal?.aborted) return;
 
     this.lifecycle("start-driver");
@@ -437,6 +447,8 @@ class RunExecution implements RunLifecycleEffects<RunResult> {
     this.metadata = completed.metadata;
     this.usage = completed.usage;
     this.run = completed.run;
+    const executionWorkspace = await this.args.driver.verificationWorkspace?.();
+    if (executionWorkspace) bindRunExecutionWorkspace(this.run, executionWorkspace);
     await writeFrozenCase(this.runDir.path, this.args.authoredCase, this.args.casePath);
     await this.runDir.writeJson("run.json", completed.metadata);
     await this.runDir.writeJson("artifacts.json", this.collection.artifacts);
@@ -577,9 +589,14 @@ class RunExecution implements RunLifecycleEffects<RunResult> {
     try {
       await this.args.driver.quiesce?.();
       const artifacts = await this.args.driver.collect();
+      const archived =
+        (await this.workspace?.archive(this.runDir.artifactsDir, artifacts)) ?? artifacts;
       return {
-        artifacts:
-          (await this.workspace?.archive(this.runDir.artifactsDir, artifacts)) ?? artifacts,
+        artifacts: await identifyArtifactOrigins(
+          this.runDir.path,
+          archived,
+          this.fixtureFileHashes,
+        ),
       };
     } catch (error) {
       const reason = errorMessage(error);

package/lib/drivers/shared/secure-copy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"secure-copy.d.ts","sourceRoot":"","sources":["../../../src/drivers/shared/secure-copy.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,uBAAuB,eACtB,MAAM,cACN,MAAM,cACN,MAAM,KACjB,OAAO,CAAC,IAAI,CA0Bd,CAAC"}

package/lib/drivers/shared/secure-copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"secure-copy.js","sourceRoot":"","sources":["../../../src/drivers/shared/secure-copy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,KAAa,EAAW,EAAE;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,OAAO,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAkB,EAClB,UAAkB,EAClB,UAAkB,EACH,EAAE;IACjB,IAAI,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,GAAG,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC;IACxF,IAAI,MAAoD,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,UAAU,EAAE,CAAC,CAAC;QAC3F,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,qDAAqD,UAAU,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC;QAChD,IACE,CAAC,YAAY,CAAC,MAAM,EAAE;YACtB,YAAY,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG;YACnC,YAAY,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,EACnC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;QAC/D,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;AACH,CAAC,CAAC"}