apify-test-tools 0.10.1-beta.2 → 0.10.1-beta.4

package/dist/bin/utils/config/parser.js

@@ -1,5 +1,6 @@
 import z from 'zod';
-import { CONFIG_FILE_STRATEGY } from './structures/base.js';
+import { ExistingDirSchema, RelativeDirSchema } from '../path/schema.js';
+import { CONFIG_FILE_STRATEGY, } from './structures/base.js';
 import { GROUPED_PARSER } from './structures/grouped.js';
 import { LEGACY_PARSER } from './structures/legacy.js';
 const CONFIG_FILE_STRATEGIES = {
@@ -21,31 +22,32 @@ const normalizeFolder = (folder) => {
     const stripped = stripTrailingSlash(folder);
     return stripped === '.' ? '' : stripped;
 };
-/**
- * Normalizes the paths the user wrote and checks the cross-entry invariants a per-entry schema
- * cannot: that no two actors claim the same folder once normalized, nor the same actor on the
- * platform. Collects every violation before throwing, so one run reports all of them rather than
- * only the first.
- *
- * @returns the actors it vouched for, with their paths normalized.
- * @throws Error listing every problem found.
- */
+const ValidatedConfigSchema = z.array(z.object({
+    actorFullName: z.string(),
+    folder: ExistingDirSchema,
+    tokenEnvVar: z.string(),
+    overrideActorContext: z.array(RelativeDirSchema).optional(),
+}));
+/** Normalize and validate paths, then check collisions using their final spelling. */
 function verifyConfiguration(body) {
-    const seenFolders = new Set();
-    const seenActorFullNames = new Set();
-    const errors = [];
     const normalized = body.map((entry) => ({
         ...entry,
         folder: normalizeFolder(entry.folder),
         overrideActorContext: entry.overrideActorContext?.map(stripTrailingSlash),
     }));
-    for (const [index, entry] of normalized.entries()) {
+    const parsed = ValidatedConfigSchema.safeParse(normalized);
+    if (!parsed.success)
+        throw new Error(z.prettifyError(parsed.error));
+    const seenFolders = new Set();
+    const seenActorFullNames = new Set();
+    const errors = [];
+    for (const [index, entry] of parsed.data.entries()) {
         // TODO: drop folder uniqueness (this requires several changes on other places)
-        if (seenFolders.has(entry.folder)) {
+        if (seenFolders.has(entry.folder.path)) {
             errors.push(`Duplicate folder "${body[index].folder}". Each actor must have a unique folder.`);
         }
         else {
-            seenFolders.add(entry.folder);
+            seenFolders.add(entry.folder.path);
         }
         if (seenActorFullNames.has(entry.actorFullName)) {
             errors.push(`Duplicate actor "${entry.actorFullName}". Each entry must point at a different actor.`);
@@ -54,10 +56,9 @@ function verifyConfiguration(body) {
             seenActorFullNames.add(entry.actorFullName);
         }
     }
-    if (errors.length > 0) {
+    if (errors.length > 0)
         throw new Error(errors.join('\n'));
-    }
-    return normalized;
+    return parsed.data;
 }
 // eslint-disable-next-line no-underscore-dangle
 export const _privates = {
@@ -65,9 +66,9 @@ export const _privates = {
     verifyConfiguration,
 };
 export function parseConfigFile(body) {
-    const strategy = selectStrategy(body);
-    const resolved = strategy.parse(body);
-    const validated = verifyConfiguration(resolved);
-    return validated;
+    const { mode, ...rest } = body;
+    const strategy = selectStrategy({ mode });
+    const resolved = strategy.parse(rest);
+    return verifyConfiguration(resolved);
 }
 //# sourceMappingURL=parser.js.map

package/dist/bin/utils/config/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../bin/utils/config/parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../bin/utils/config/parser.ts"],"names":[],"mappings":"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"}

package/dist/bin/utils/config/structures/base.d.ts

@@ -1,4 +1,5 @@
 import { type ZodType } from 'zod';
+import type { ExistingDir, RelativeDir } from '../../path/repo-relative.js';
 export declare const ACTOR_FULL_NAME_REGEX: RegExp;
 export interface ResolvedActorConfig {
     actorFullName: string;
@@ -6,6 +7,10 @@ export interface ResolvedActorConfig {
     tokenEnvVar: string;
     overrideActorContext: string[] | undefined;
 }
+export interface ValidatedActorConfig extends Omit<ResolvedActorConfig, 'folder' | 'overrideActorContext'> {
+    folder: ExistingDir;
+    overrideActorContext?: RelativeDir[];
+}
 export declare enum CONFIG_FILE_STRATEGY {
     LEGACY = "legacy",
     GROUPED = "grouped"

package/dist/bin/utils/config/structures/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../bin/utils/config/structures/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AAQlD,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAKF,MAAM,WAAW,mBAAmB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC9C;AAED,oBAAY,oBAAoB;IAC5B,MAAM,WAAW;IACjB,OAAO,YAAY;CACtB;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,mBAAmB,EAAE,CAAC;CACnE,CAAC;AAEF,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,SAAS,oBAAoB,EAE/F,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,mBAAmB,EAAE;;IAIvC;;;;;;;;;;;;;;OAcG;kBACW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAQ5C"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../bin/utils/config/structures/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AAIlD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAM5E,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAKF,MAAM,WAAW,mBAAmB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,sBAAsB,CAAC;IACtG,MAAM,EAAE,WAAW,CAAC;IACpB,oBAAoB,CAAC,EAAE,WAAW,EAAE,CAAC;CACxC;AAED,oBAAY,oBAAoB;IAC5B,MAAM,WAAW;IACjB,OAAO,YAAY;CACtB;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,mBAAmB,EAAE,CAAC;CACnE,CAAC;AAEF,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,SAAS,oBAAoB,EAE/F,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,mBAAmB,EAAE;;IAIvC;;;;;;;;;;;;;;OAcG;kBACW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;EAQ5C"}

package/dist/bin/utils/config/structures/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../bin/utils/config/structures/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,KAAK,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAErD,SAAS,gBAAgB,CAAC,KAAa;IACnC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAC3C,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAC3F,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAChD,CAAC;AAYF,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC5B,yCAAiB,CAAA;IACjB,2CAAmB,CAAA;AACvB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B;AAOD,MAAM,UAAU,cAAc;AAC1B,mEAAmE;AACnE,IAAU,EACV,MAAkB,EAClB,OAA2C;IAE3C,OAAO;QACH,IAAI;QACJ;;;;;;;;;;;;;;WAcG;QACH,KAAK,EAAE,CAAC,IAA6B,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../bin/utils/config/structures/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,KAAK,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIrD,SAAS,gBAAgB,CAAC,KAAa;IACnC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAC3C,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAC3F,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAChD,CAAC;AAiBF,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC5B,yCAAiB,CAAA;IACjB,2CAAmB,CAAA;AACvB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B;AAOD,MAAM,UAAU,cAAc;AAC1B,mEAAmE;AACnE,IAAU,EACV,MAAkB,EAClB,OAA2C;IAE3C,OAAO;QACH,IAAI;QACJ;;;;;;;;;;;;;;WAcG;QACH,KAAK,EAAE,CAAC,IAA6B,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;KACJ,CAAC;AACN,CAAC"}

package/dist/bin/utils/json-file.d.ts

@@ -1,9 +1,10 @@
+import type { ExistingFile } from './path/repo-relative.js';
 /**
  * Why a JSON object could not be produced from a path. Callers that already have their own
  * user-facing wording (e.g. the config file reader) switch on this instead of re-deriving the
  * cause from an error message.
  */
-export type JsonObjectReadFailureReason = 'not-a-file' | 'unreadable' | 'invalid-json' | 'not-an-object';
+export type JsonObjectReadFailureReason = 'unreadable' | 'invalid-json' | 'not-an-object';
 export type JsonObjectReadResult = {
     success: true;
     contents: Record<string, unknown>;
@@ -16,5 +17,5 @@ export type JsonObjectReadResult = {
  * Reads a file and parses it as a JSON object, reporting every way that can go wrong as a value
  * instead of a thrown error — the caller decides which failures are fatal and how to word them.
  */
-export declare function safeReadJsonObjectFile(path: string): JsonObjectReadResult;
+export declare function safeReadJsonObjectFile(filePath: ExistingFile): JsonObjectReadResult;
 //# sourceMappingURL=json-file.d.ts.map

package/dist/bin/utils/json-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-file.d.ts","sourceRoot":"","sources":["../../../bin/utils/json-file.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,MAAM,2BAA2B,GAAG,YAAY,GAAG,YAAY,GAAG,cAAc,GAAG,eAAe,CAAC;AAEzG,MAAM,MAAM,oBAAoB,GAC1B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACpD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,2BAA2B,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAQ9E;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CA+BzE"}
+{"version":3,"file":"json-file.d.ts","sourceRoot":"","sources":["../../../bin/utils/json-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,MAAM,2BAA2B,GAAG,YAAY,GAAG,cAAc,GAAG,eAAe,CAAC;AAE1F,MAAM,MAAM,oBAAoB,GAC1B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACpD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,2BAA2B,CAAC;IAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAQ9E;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,oBAAoB,CA0BnF"}

package/dist/bin/utils/json-file.js

@@ -1,4 +1,4 @@
-import { readFileSync, statSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 const failed = (reason, message) => ({
     success: false,
     reason,
@@ -8,34 +8,29 @@ const failed = (reason, message) => ({
  * Reads a file and parses it as a JSON object, reporting every way that can go wrong as a value
  * instead of a thrown error — the caller decides which failures are fatal and how to word them.
  */
-export function safeReadJsonObjectFile(path) {
+export function safeReadJsonObjectFile(filePath) {
     let file;
     try {
-        // `stat`, not `lstat`: a symlink must resolve to its target, matching what `readFile` does below.
-        const stats = statSync(path);
-        if (!stats.isFile()) {
-            return failed('not-a-file', `Expected ${path} to be a file`);
-        }
-        file = readFileSync(path, 'utf8');
+        file = readFileSync(filePath.path, 'utf8');
     }
     catch {
-        return failed('unreadable', `Expected ${path} to exist or be readable`);
+        return failed('unreadable', `Expected ${filePath} to exist or be readable`);
     }
     let parsed;
     try {
         parsed = JSON.parse(file);
     }
     catch (err) {
-        return failed('invalid-json', `Failed to parse ${path}: ${err}`);
+        return failed('invalid-json', `Failed to parse ${filePath}: ${err}`);
     }
     if (parsed === null) {
-        return failed('not-an-object', `Expected ${path} to be a JSON object, not null`);
+        return failed('not-an-object', `Expected ${filePath} to be a JSON object, not null`);
     }
     if (Array.isArray(parsed)) {
-        return failed('not-an-object', `Expected ${path} to be a JSON object, not an array`);
+        return failed('not-an-object', `Expected ${filePath} to be a JSON object, not an array`);
     }
     if (typeof parsed !== 'object') {
-        return failed('not-an-object', `Expected ${path} to be a JSON object`);
+        return failed('not-an-object', `Expected ${filePath} to be a JSON object`);
     }
     return { success: true, contents: parsed };
 }

package/dist/bin/utils/json-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../bin/utils/json-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAajD,MAAM,MAAM,GAAG,CAAC,MAAmC,EAAE,OAAe,EAAwB,EAAE,CAAC,CAAC;IAC5F,OAAO,EAAE,KAAK;IACd,MAAM;IACN,OAAO,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAY;IAC/C,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACD,kGAAkG;QAClG,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAClB,OAAO,MAAM,CAAC,YAAY,EAAE,YAAY,IAAI,eAAe,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,MAAM,CAAC,YAAY,EAAE,YAAY,IAAI,0BAA0B,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,cAAc,EAAE,mBAAmB,IAAI,KAAK,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,IAAI,gCAAgC,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,IAAI,oCAAoC,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,IAAI,sBAAsB,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAiC,EAAE,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"json-file.js","sourceRoot":"","sources":["../../../bin/utils/json-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAevC,MAAM,MAAM,GAAG,CAAC,MAAmC,EAAE,OAAe,EAAwB,EAAE,CAAC,CAAC;IAC5F,OAAO,EAAE,KAAK;IACd,MAAM;IACN,OAAO,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAsB;IACzD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACD,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,MAAM,CAAC,YAAY,EAAE,YAAY,QAAQ,0BAA0B,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,cAAc,EAAE,mBAAmB,QAAQ,KAAK,GAAG,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,QAAQ,gCAAgC,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,QAAQ,oCAAoC,CAAC,CAAC;IAC7F,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,eAAe,EAAE,YAAY,QAAQ,sBAAsB,CAAC,CAAC;IAC/E,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAiC,EAAE,CAAC;AAC1E,CAAC"}

package/dist/bin/utils/path/repo-relative.d.ts

@@ -0,0 +1,35 @@
+export declare abstract class AbstractPath {
+    #private;
+    constructor(rawPath: string);
+    isEqualTo(other: AbstractPath): boolean;
+    get path(): string;
+    toString(): string;
+    toJSON(): string;
+    private assertNoEscape;
+}
+export declare class RelativeDir extends AbstractPath {
+    static readonly ROOT: RelativeDir;
+    joinDir(relativePath: string): RelativeDir;
+    joinFile(relativePath: string): RelativeFile;
+    contains(other: AbstractPath): boolean;
+    isStrictAncestorOf(other: AbstractPath): boolean;
+    assertIsDir(): this;
+    private join;
+}
+export declare class ExistingDir extends RelativeDir {
+    constructor(rawPath: string);
+    static initialize(dir: RelativeDir): ExistingDir;
+}
+export declare class RelativeFile extends AbstractPath {
+    constructor(rawPath: string);
+    get parent(): RelativeDir;
+    joinDir(relativePath: string): RelativeDir;
+    joinFile(relativePath: string): RelativeFile;
+    isWithin(scope: RelativeDir): boolean;
+    assertIsFile(): this;
+}
+export declare class ExistingFile extends RelativeFile {
+    constructor(rawPath: string);
+    static initialize(file: RelativeFile): ExistingFile;
+}
+//# sourceMappingURL=repo-relative.d.ts.map

package/dist/bin/utils/path/repo-relative.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo-relative.d.ts","sourceRoot":"","sources":["../../../../bin/utils/path/repo-relative.ts"],"names":[],"mappings":"AAgBA,8BAAsB,YAAY;;gBAElB,OAAO,EAAE,MAAM;IAW3B,SAAS,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAMvC,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,QAAQ,IAAI,MAAM;IAIlB,MAAM,IAAI,MAAM;IAIhB,OAAO,CAAC,cAAc;CAKzB;AAED,qBAAa,WAAY,SAAQ,YAAY;IACzC,MAAM,CAAC,QAAQ,CAAC,IAAI,cAAwB;IAE5C,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;IAI1C,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY;IAO5C,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAMtC,kBAAkB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IAOhD,WAAW,IAAI,IAAI;IAQnB,OAAO,CAAC,IAAI;CAOf;AAED,qBAAa,WAAY,SAAQ,WAAW;gBAC5B,OAAO,EAAE,MAAM;IAK3B,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW;CAGnD;AAED,qBAAa,YAAa,SAAQ,YAAY;gBAC9B,OAAO,EAAE,MAAM;IAM3B,IAAI,MAAM,IAAI,WAAW,CAExB;IAID,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;IAK1C,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY;IAI5C,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO;IAMrC,YAAY,IAAI,IAAI;CAOvB;AAED,qBAAa,YAAa,SAAQ,YAAY;gBAC9B,OAAO,EAAE,MAAM;IAK3B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY;CAGtD"}

package/dist/bin/utils/path/repo-relative.js

@@ -0,0 +1,137 @@
+/* eslint-disable max-classes-per-file */
+import { statSync } from 'node:fs';
+import path from 'node:path';
+// Git and the config file always use "/", so paths are POSIX regardless of the host OS.
+const { posix } = path;
+// A file path cannot end in "/", ".", "..", or be empty: each of those names a directory.
+const assertNamesFile = (rawPath) => {
+    const lastSegment = rawPath.slice(rawPath.lastIndexOf('/') + 1);
+    if (lastSegment === '' || lastSegment === '.' || lastSegment === '..') {
+        throw new Error(`Expected a file path, got directory path "${rawPath}".`);
+    }
+};
+// Shared by the file and directory paths. Use it as a parameter type where either kind is fine.
+export class AbstractPath {
+    #path;
+    constructor(rawPath) {
+        if (posix.isAbsolute(rawPath)) {
+            throw new Error(`Expected a relative path, got absolute path "${rawPath}".`);
+        }
+        const normalized = posix.normalize(rawPath);
+        // normalize keeps a trailing slash ("actors/foo/"), which would make equal paths compare unequal.
+        this.#path = normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
+        this.assertNoEscape(rawPath);
+    }
+    // A file and a directory are never equal, even when spelled the same.
+    isEqualTo(other) {
+        // inheritance safe check, at least one of the two is a subclass of the other
+        const isRelativeOf = this instanceof other.constructor || other instanceof this.constructor;
+        return isRelativeOf && this.#path === other.#path;
+    }
+    get path() {
+        return this.#path;
+    }
+    toString() {
+        return this.path;
+    }
+    toJSON() {
+        return this.path;
+    }
+    assertNoEscape(raw) {
+        if (this.#path === '..' || this.#path.startsWith('../')) {
+            throw new Error(`Path "${raw}" escapes the repo root.`);
+        }
+    }
+}
+export class RelativeDir extends AbstractPath {
+    static ROOT = new RelativeDir('.');
+    joinDir(relativePath) {
+        return new RelativeDir(this.join(relativePath));
+    }
+    joinFile(relativePath) {
+        // Must be checked before joining: posix.join('actors/foo', '.') is "actors/foo", which looks like a file.
+        assertNamesFile(relativePath);
+        return new RelativeFile(this.join(relativePath));
+    }
+    // True when `other` is this directory itself or lies inside it.
+    contains(other) {
+        // the root contains every path
+        if (this.path === '.')
+            return true;
+        return this.isEqualTo(other) || other.path.startsWith(`${this.path}/`);
+    }
+    isStrictAncestorOf(other) {
+        // you are not an ancestor of yourself
+        return !this.isEqualTo(other) && this.contains(other);
+    }
+    // Throws unless this path exists and is a directory. Paths resolve against the process working
+    // directory, which is the repo root.
+    assertIsDir() {
+        // `stat`, not `lstat`: a symlink must resolve to its target, matching what reading it does.
+        const stats = statSync(this.path, { throwIfNoEntry: false });
+        if (!stats)
+            throw new Error(`Expected directory "${this}" to exist.`);
+        if (!stats.isDirectory())
+            throw new Error(`Expected "${this}" to be a directory.`);
+        return this;
+    }
+    join(relativePath) {
+        // Must be checked here: posix.join('.', '/etc') is "etc", so the constructor would not catch it.
+        if (posix.isAbsolute(relativePath)) {
+            throw new Error(`Expected a relative path to join with "${this}", got absolute path "${relativePath}".`);
+        }
+        return posix.join(this.path, relativePath);
+    }
+}
+export class ExistingDir extends RelativeDir {
+    constructor(rawPath) {
+        super(rawPath);
+        this.assertIsDir();
+    }
+    static initialize(dir) {
+        return new ExistingDir(dir.path);
+    }
+}
+export class RelativeFile extends AbstractPath {
+    constructor(rawPath) {
+        assertNamesFile(rawPath);
+        super(rawPath);
+    }
+    // The directory containing this file.
+    get parent() {
+        return new RelativeDir(posix.dirname(this.path));
+    }
+    // Resolves against the file's directory, the way a path written inside the file is meant
+    // (e.g. `dockerContextDir: ".."` in `.actor/actor.json` is the actor folder).
+    joinDir(relativePath) {
+        return this.parent.joinDir(relativePath);
+    }
+    // Resolves against the file's directory, e.g. a sibling file.
+    joinFile(relativePath) {
+        return this.parent.joinFile(relativePath);
+    }
+    isWithin(scope) {
+        return scope.contains(this);
+    }
+    // Throws unless this path exists and is a file. Paths resolve against the process working
+    // directory, which is the repo root.
+    assertIsFile() {
+        // `stat`, not `lstat`: a symlink must resolve to its target, matching what reading it does.
+        const stats = statSync(this.path, { throwIfNoEntry: false });
+        if (!stats)
+            throw new Error(`Expected file "${this}" to exist.`);
+        if (!stats.isFile())
+            throw new Error(`Expected "${this}" to be a file.`);
+        return this;
+    }
+}
+export class ExistingFile extends RelativeFile {
+    constructor(rawPath) {
+        super(rawPath);
+        this.assertIsFile();
+    }
+    static initialize(file) {
+        return new ExistingFile(file.path);
+    }
+}
+//# sourceMappingURL=repo-relative.js.map

package/dist/bin/utils/path/repo-relative.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo-relative.js","sourceRoot":"","sources":["../../../../bin/utils/path/repo-relative.ts"],"names":[],"mappings":"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"}

package/dist/bin/utils/path/schema.d.ts

@@ -0,0 +1,7 @@
+import z from 'zod';
+import { ExistingDir, ExistingFile, RelativeDir, RelativeFile } from './repo-relative.js';
+export declare const RelativeDirSchema: z.ZodPipe<z.ZodString, z.ZodTransform<RelativeDir, string>>;
+export declare const ExistingDirSchema: z.ZodPipe<z.ZodString, z.ZodTransform<ExistingDir, string>>;
+export declare const RelativeFileSchema: z.ZodPipe<z.ZodString, z.ZodTransform<RelativeFile, string>>;
+export declare const ExistingFileSchema: z.ZodPipe<z.ZodString, z.ZodTransform<ExistingFile, string>>;
+//# sourceMappingURL=schema.d.ts.map

package/dist/bin/utils/path/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../bin/utils/path/schema.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAY1F,eAAO,MAAM,iBAAiB,6DAA+C,CAAC;AAC9E,eAAO,MAAM,iBAAiB,6DAA+C,CAAC;AAC9E,eAAO,MAAM,kBAAkB,8DAAgD,CAAC;AAChF,eAAO,MAAM,kBAAkB,8DAAgD,CAAC"}

package/dist/bin/utils/path/schema.js

@@ -0,0 +1,16 @@
+import z from 'zod';
+import { ExistingDir, ExistingFile, RelativeDir, RelativeFile } from './repo-relative.js';
+const parsePath = (construct) => z.string().transform((value, ctx) => {
+    try {
+        return construct(value);
+    }
+    catch (error) {
+        ctx.addIssue({ code: 'custom', message: error instanceof Error ? error.message : String(error) });
+        return z.NEVER;
+    }
+});
+export const RelativeDirSchema = parsePath((value) => new RelativeDir(value));
+export const ExistingDirSchema = parsePath((value) => new ExistingDir(value));
+export const RelativeFileSchema = parsePath((value) => new RelativeFile(value));
+export const ExistingFileSchema = parsePath((value) => new ExistingFile(value));
+//# sourceMappingURL=schema.js.map

package/dist/bin/utils/path/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../bin/utils/path/schema.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE1F,MAAM,SAAS,GAAG,CAAI,SAA+B,EAAE,EAAE,CACrD,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,GAAG,EAAsB,EAAE;IACpD,IAAI,CAAC;QACD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClG,OAAO,CAAC,CAAC,KAAK,CAAC;IACnB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC"}

package/dist/bin/utils.d.ts

@@ -6,22 +6,30 @@ export declare const isOutsideDir: (childPath: string, parentPath: string) => bo
  * to keep, e.g. because .actor/ must survive even if .gitignore would otherwise exclude it.
  * This also means .git/ itself is never walked, since git never lists its own internals here.
  */
-export declare const listRepoFilePaths: (repoRoot: string, subDir: string) => string[];
+export declare const listRepoFilePaths: (repoRoot: string, subDir: string) => Promise<string[]>;
 /**
  * Given paths relative to the repo root, returns the subset that `git` would exclude because of
  * .gitignore rules (including nested .gitignore files, `.git/info/exclude`, and global excludes —
  * anything `git` itself respects). Delegating to `git check-ignore` avoids re-implementing gitignore
  * pattern matching.
  */
-export declare const getGitignoredPaths: (relativePaths: string[]) => Set<string>;
+export declare const getGitignoredPaths: (relativePaths: string[], cwd?: string) => Promise<Set<string>>;
 export type SourceFile = {
     name: string;
     content: Buffer;
 };
 export declare const readSourceFile: (absPath: string, rootDir: string) => Promise<SourceFile>;
-export declare const spawnCommandInGhWorkspace: (command: string, args?: string[]) => string;
+export declare class GitCommandError extends Error {
+    readonly args: readonly string[];
+    readonly gitError: string;
+    readonly exitCode?: number;
+    readonly cause: unknown;
+    constructor(args: readonly string[], error: unknown, operation?: string);
+}
+/** Runs Git asynchronously, passing each argument directly to Git without a shell. */
+export declare const runGitCommand: (args: string[], { cwd, operation }?: {
+    cwd?: string;
+    operation?: string;
+}) => Promise<string>;
 export declare const getEnvVar: (varName: string, defaultValue?: string) => string;
-export declare const setCwd: ({ workspace }: {
-    workspace: string | undefined;
-}) => void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/bin/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../bin/utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,EAAE,YAAY,MAAM,KAAG,OACZ,CAAC;AAE1D;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,MAAM,EAY1E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,eAAe,MAAM,EAAE,KAAG,GAAG,CAAC,MAAM,CAetE,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,cAAc,GAAU,SAAS,MAAM,EAAE,SAAS,MAAM,KAAG,OAAO,CAAC,UAAU,CAGxF,CAAC;AAEH,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,EAAE,OAAM,MAAM,EAAO,WAgB7E,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,EAAE,eAAe,MAAM,KAAG,MAMlE,CAAC;AAIF,eAAO,MAAM,MAAM,GAAI,eAAe;IAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,SAItE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../bin/utils.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,YAAY,GAAI,WAAW,MAAM,EAAE,YAAY,MAAM,KAAG,OACZ,CAAC;AAE1D;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CAO1F,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAU,eAAe,MAAM,EAAE,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAiBnG,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,cAAc,GAAU,SAAS,MAAM,EAAE,SAAS,MAAM,KAAG,OAAO,CAAC,UAAU,CAGxF,CAAC;AAEH,qBAAa,eAAgB,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;gBAEZ,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM;CAmB1E;AAED,sFAAsF;AACtF,eAAO,MAAM,aAAa,GACtB,MAAM,MAAM,EAAE,EACd,qBAAoB;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,KAC9D,OAAO,CAAC,MAAM,CAUhB,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,EAAE,eAAe,MAAM,KAAG,MAMlE,CAAC"}

package/dist/bin/utils.js

@@ -1,6 +1,9 @@
-import { spawnSync } from 'node:child_process';
+import { execFile } from 'node:child_process';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { promisify } from 'node:util';
+import { logger } from './logger.js';
+const execFileAsync = promisify(execFile);
 // Returns true when `childPath` is not inside `parentPath`.
 // Used to detect monorepo actors whose dockerContextDir escapes the actor directory.
 export const isOutsideDir = (childPath, parentPath) => path.relative(parentPath, childPath).startsWith('..');
@@ -11,16 +14,13 @@ export const isOutsideDir = (childPath, parentPath) => path.relative(parentPath,
  * to keep, e.g. because .actor/ must survive even if .gitignore would otherwise exclude it.
  * This also means .git/ itself is never walked, since git never lists its own internals here.
  */
-export const listRepoFilePaths = (repoRoot, subDir) => {
+export const listRepoFilePaths = async (repoRoot, subDir) => {
     const relSubDir = path.relative(repoRoot, subDir).split(path.sep).join('/') || '.';
-    const result = spawnSync('git', ['ls-files', '--cached', '--others', '-z', '--', relSubDir], {
+    const output = await runGitCommand(['ls-files', '--cached', '--others', '-z', '--', relSubDir], {
         cwd: repoRoot,
-        maxBuffer: 100 * 1024 * 1024,
+        operation: 'list repository files for the local build',
     });
-    if (result.status !== 0) {
-        throw new Error(`[Command failed]: git ls-files\n${result.stderr.toString()}`);
-    }
-    return result.stdout.toString().split('\0').filter(Boolean);
+    return output.split('\0').filter(Boolean);
 };
 /**
  * Given paths relative to the repo root, returns the subset that `git` would exclude because of
@@ -28,37 +28,60 @@ export const listRepoFilePaths = (repoRoot, subDir) => {
  * anything `git` itself respects). Delegating to `git check-ignore` avoids re-implementing gitignore
  * pattern matching.
  */
-export const getGitignoredPaths = (relativePaths) => {
+export const getGitignoredPaths = async (relativePaths, cwd) => {
     if (relativePaths.length === 0)
         return new Set();
-    const result = spawnSync('git', ['check-ignore', '--stdin'], {
-        input: relativePaths.join('\n'),
-        maxBuffer: 100 * 1024 * 1024,
-    });
     // Exit code 1 means none of the given paths are ignored - not an error. Anything else
     // (e.g. 128 for "not a git repository") is a real failure.
-    if (result.status !== 0 && result.status !== 1) {
-        throw new Error(`[Command failed]: git check-ignore\n${result.stderr.toString()}`);
-    }
-    return new Set(result.stdout.toString().split('\n').filter(Boolean));
+    return runGitCommand(['check-ignore', '--', ...relativePaths], {
+        cwd,
+        operation: 'check which repository paths are ignored',
+    })
+        .then((output) => new Set(output.split('\n').filter(Boolean)))
+        .catch((error) => {
+        // exit code 1 means none of the given paths are ignored - not an error
+        if (error instanceof GitCommandError && error.exitCode === 1) {
+            return new Set();
+        }
+        throw error;
+    });
 };
 export const readSourceFile = async (absPath, rootDir) => ({
     name: path.relative(rootDir, absPath).split(path.sep).join('/'),
     content: await fs.readFile(absPath),
 });
-export const spawnCommandInGhWorkspace = (command, args = []) => {
-    console.error(command, args.join(' '));
-    const commandResult = spawnSync(command, args, { shell: true, maxBuffer: 100 * 1024 * 1024 });
-    if (commandResult.error) {
-        throw new Error(`[Command failed]: ${command}\n${commandResult.error}`);
+export class GitCommandError extends Error {
+    args;
+    gitError;
+    exitCode;
+    cause;
+    constructor(args, error, operation) {
+        const stderr = typeof error === 'object' && error !== null && 'stderr' in error && typeof error.stderr === 'string'
+            ? error.stderr.trim()
+            : '';
+        const gitError = stderr || (error instanceof Error ? error.message : String(error));
+        const exitCode = typeof error === 'object' && error !== null && 'code' in error && typeof error.code === 'number'
+            ? error.code
+            : undefined;
+        const command = `git ${args.map((arg) => JSON.stringify(arg)).join(' ')}`;
+        const operationContext = operation ? `Failed to ${operation}.\n` : '';
+        super(`${operationContext}Command: ${command}\nGit error: ${gitError}`);
+        this.name = 'GitCommandError';
+        this.args = [...args];
+        this.gitError = gitError;
+        this.exitCode = exitCode;
+        this.cause = error;
     }
-    if (commandResult.stderr.toString().length > 0) {
-        // For some reason 'git' command prints stderr when checking out to detached HEAD state (we only use detached HEAD for testing though)
-        if (!commandResult.stderr.toString().includes(`You are in 'detached HEAD' state`)) {
-            throw new Error(`[Command printed stderr]: ${command}\n${commandResult.stderr.toString()}`);
-        }
-    }
-    return commandResult.stdout.toString().trim();
+}
+/** Runs Git asynchronously, passing each argument directly to Git without a shell. */
+export const runGitCommand = async (args, { cwd, operation } = {}) => {
+    logger.debug('git', args);
+    const { stdout } = await execFileAsync('git', args, { cwd, encoding: 'utf8', maxBuffer: 100 * 1024 * 1024 }).catch((error) => {
+        const err = new GitCommandError(args, error, operation);
+        logger.debug('git command failed:\n', err);
+        throw err;
+    });
+    return stdout.trim();
 };
 export const getEnvVar = (varName, defaultValue) => {
     const value = process.env[varName] ?? defaultValue;
@@ -67,11 +90,4 @@ export const getEnvVar = (varName, defaultValue) => {
     }
     return value;
 };
-// Commands expect to run from the repository root (config file and Actor folders are relative to it).
-// That is the current directory by default, --workspace points elsewhere, e.g. for local development.
-export const setCwd = ({ workspace }) => {
-    if (workspace) {
-        process.chdir(workspace);
-    }
-};
 //# sourceMappingURL=utils.js.map