@exodus/xqa 5.2.0 → 5.4.0

package/README.md

@@ -180,7 +180,8 @@ Suite files live at `.xqa/suites/<name>.suite.json` and declare the work items p
     "beforeEach": {
       "script": "qa/prepare-sim.mjs",
       "env": { "APP_PROFILE": "funded" },
-      "timeoutSeconds": 120
+      "timeoutSeconds": 120,
+      "retries": 3
     }
   }
 }
@@ -206,6 +207,8 @@ Contract:
 - Exit 0 → proceed with item.
 - Non-zero exit → item marked failed, `executeItem` skipped, counts toward simulator-unhealthy threshold.
 - Default 120s timeout, overridable via `hooks.beforeEach.timeoutSeconds`.
+- Default 3 retries on failure (`HOOK_EXIT_NONZERO`, `HOOK_TIMEOUT`, `HOOK_SPAWN_FAILED`), overridable via `hooks.beforeEach.retries` (range `0..10`). Set to `0` to disable retries. Aborts (`HOOK_ABORTED`) are never retried.
+- A `HOOK_RETRY` suite event is emitted before each retry attempt with `attempt`, `maxAttempts`, and `previousErrorType`.
 - Honors the suite abort signal.
 
 ## Configuration

package/dist/xqa.cjs

@@ -161,7 +161,7 @@ var require_index_cjs = __commonJS({
         }, reject);
       }
     }
-    var ResultAsync28 = class _ResultAsync {
+    var ResultAsync29 = class _ResultAsync {
       constructor(res) {
         this._promise = res;
       }
@@ -262,8 +262,8 @@ var require_index_cjs = __commonJS({
           return new Ok(res.value);
         })));
       }
-      match(ok46, _err) {
-        return this._promise.then((res) => res.match(ok46, _err));
+      match(ok45, _err) {
+        return this._promise.then((res) => res.match(ok45, _err));
       }
       unwrapOr(t) {
         return this._promise.then((res) => res.unwrapOr(t));
@@ -299,17 +299,17 @@ var require_index_cjs = __commonJS({
         });
       }
     };
-    function okAsync12(value) {
-      return new ResultAsync28(Promise.resolve(new Ok(value)));
+    function okAsync13(value) {
+      return new ResultAsync29(Promise.resolve(new Ok(value)));
     }
     function errAsync12(err45) {
-      return new ResultAsync28(Promise.resolve(new Err(err45)));
+      return new ResultAsync29(Promise.resolve(new Err(err45)));
     }
-    var fromPromise = ResultAsync28.fromPromise;
-    var fromSafePromise2 = ResultAsync28.fromSafePromise;
-    var fromAsyncThrowable9 = ResultAsync28.fromThrowable;
+    var fromPromise = ResultAsync29.fromPromise;
+    var fromSafePromise2 = ResultAsync29.fromSafePromise;
+    var fromAsyncThrowable9 = ResultAsync29.fromThrowable;
     var combineResultList = (resultList) => {
-      let acc = ok45([]);
+      let acc = ok41([]);
       for (const result of resultList) {
         if (result.isErr()) {
           acc = err41(result.error);
@@ -320,9 +320,9 @@ var require_index_cjs = __commonJS({
       }
       return acc;
     };
-    var combineResultAsyncList = (asyncResultList) => ResultAsync28.fromSafePromise(Promise.all(asyncResultList)).andThen(combineResultList);
+    var combineResultAsyncList = (asyncResultList) => ResultAsync29.fromSafePromise(Promise.all(asyncResultList)).andThen(combineResultList);
     var combineResultListWithAllErrors = (resultList) => {
-      let acc = ok45([]);
+      let acc = ok41([]);
       for (const result of resultList) {
         if (result.isErr() && acc.isErr()) {
           acc.error.push(result.error);
@@ -334,14 +334,14 @@ var require_index_cjs = __commonJS({
       }
       return acc;
     };
-    var combineResultAsyncListWithAllErrors = (asyncResultList) => ResultAsync28.fromSafePromise(Promise.all(asyncResultList)).andThen(combineResultListWithAllErrors);
+    var combineResultAsyncListWithAllErrors = (asyncResultList) => ResultAsync29.fromSafePromise(Promise.all(asyncResultList)).andThen(combineResultListWithAllErrors);
     exports2.Result = void 0;
     (function(Result3) {
       function fromThrowable21(fn, errorFn) {
         return (...args) => {
           try {
             const result = fn(...args);
-            return ok45(result);
+            return ok41(result);
           } catch (e3) {
             return err41(errorFn ? errorFn(e3) : e3);
           }
@@ -357,7 +357,7 @@ var require_index_cjs = __commonJS({
       }
       Result3.combineWithAllErrors = combineWithAllErrors;
     })(exports2.Result || (exports2.Result = {}));
-    function ok45(value) {
+    function ok41(value) {
       return new Ok(value);
     }
     function err41(err45) {
@@ -366,7 +366,7 @@ var require_index_cjs = __commonJS({
     function safeTry(body) {
       const n3 = body().next();
       if (n3 instanceof Promise) {
-        return new ResultAsync28(n3.then((r3) => r3.value));
+        return new ResultAsync29(n3.then((r3) => r3.value));
       }
       return n3.value;
     }
@@ -381,11 +381,11 @@ var require_index_cjs = __commonJS({
         return !this.isOk();
       }
       map(f6) {
-        return ok45(f6(this.value));
+        return ok41(f6(this.value));
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       mapErr(_f) {
-        return ok45(this.value);
+        return ok41(this.value);
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
       andThen(f6) {
@@ -400,14 +400,14 @@ var require_index_cjs = __commonJS({
           f6(this.value);
         } catch (e3) {
         }
-        return ok45(this.value);
+        return ok41(this.value);
       }
       orTee(_f) {
-        return ok45(this.value);
+        return ok41(this.value);
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
       orElse(_f) {
-        return ok45(this.value);
+        return ok41(this.value);
       }
       asyncAndThen(f6) {
         return f6(this.value);
@@ -417,15 +417,15 @@ var require_index_cjs = __commonJS({
         return f6(this.value).map(() => this.value);
       }
       asyncMap(f6) {
-        return ResultAsync28.fromSafePromise(f6(this.value));
+        return ResultAsync29.fromSafePromise(f6(this.value));
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       unwrapOr(_v) {
         return this.value;
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      match(ok46, _err) {
-        return ok46(this.value);
+      match(ok45, _err) {
+        return ok45(this.value);
       }
       safeUnwrap() {
         const value = this.value;
@@ -521,15 +521,15 @@ var require_index_cjs = __commonJS({
     var fromThrowable20 = exports2.Result.fromThrowable;
     exports2.Err = Err;
     exports2.Ok = Ok;
-    exports2.ResultAsync = ResultAsync28;
+    exports2.ResultAsync = ResultAsync29;
     exports2.err = err41;
     exports2.errAsync = errAsync12;
     exports2.fromAsyncThrowable = fromAsyncThrowable9;
     exports2.fromPromise = fromPromise;
     exports2.fromSafePromise = fromSafePromise2;
     exports2.fromThrowable = fromThrowable20;
-    exports2.ok = ok45;
-    exports2.okAsync = okAsync12;
+    exports2.ok = ok41;
+    exports2.okAsync = okAsync13;
     exports2.safeTry = safeTry;
   }
 });
@@ -5321,8 +5321,8 @@ var require_resolve_flow_scalar = __commonJS({
     };
     function parseCharCode(source, offset, length, onError) {
       const cc = source.substr(offset, length);
-      const ok45 = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
-      const code = ok45 ? parseInt(cc, 16) : NaN;
+      const ok41 = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
+      const code = ok41 ? parseInt(cc, 16) : NaN;
       if (isNaN(code)) {
         const raw = source.substr(offset - 2, length + 2);
         onError(offset - 2, "BAD_DQ_ESCAPE", `Invalid escape sequence ${raw}`);
@@ -49496,9 +49496,9 @@ var tq = k((oq) => {
 });
 var sq = k((aq) => {
   Object.defineProperty(aq, "__esModule", { value: true });
-  var ok45 = Q$(), tk = { keyword: "not", schemaType: ["object", "boolean"], trackErrors: true, code($) {
+  var ok41 = Q$(), tk = { keyword: "not", schemaType: ["object", "boolean"], trackErrors: true, code($) {
     let { gen: X, schema: J, it: Q } = $;
-    if ((0, ok45.alwaysValidSchema)(Q, J)) {
+    if ((0, ok41.alwaysValidSchema)(Q, J)) {
       $.fail();
       return;
     }
@@ -65151,6 +65151,15 @@ function normalizeSimulatorUnhealthy(event) {
     }
   ];
 }
+function normalizeHookRetry(event) {
+  return [
+    {
+      kind: "text",
+      style: "default",
+      text: `[${event.itemName}] HOOK_RETRY ${String(event.attempt)}/${String(event.maxAttempts)} after ${event.previousErrorType}`
+    }
+  ];
+}
 function normalizeSuiteCompleted(event) {
   return [
     {
@@ -65168,6 +65177,7 @@ var HANDLERS = {
   ITEM_TIMEOUT: (event) => normalizeItemTimeout(event),
   ITEM_ABORTED: (event) => normalizeItemAborted(event),
   SIMULATOR_UNHEALTHY: (event) => normalizeSimulatorUnhealthy(event),
+  HOOK_RETRY: (event) => normalizeHookRetry(event),
   SUITE_COMPLETED: (event) => normalizeSuiteCompleted(event)
 };
 function normalizeSuiteEvent(event) {
@@ -65571,6 +65581,7 @@ var SUITE_EVENT_TYPES = /* @__PURE__ */ new Set([
   "ITEM_TIMEOUT",
   "ITEM_ABORTED",
   "SIMULATOR_UNHEALTHY",
+  "HOOK_RETRY",
   "SUITE_COMPLETED"
 ]);
 var UI_EVENT_TYPES = /* @__PURE__ */ new Set([
@@ -65681,6 +65692,14 @@ function reduceSimulatorUnhealthy(state, event) {
   };
   return { ...state, log: [...state.log, entry] };
 }
+function reduceHookRetry(state, event) {
+  const entry = {
+    itemId: event.itemId,
+    source: "annotation",
+    lines: normalizeSuiteEvent(event)
+  };
+  return { ...state, log: [...state.log, entry] };
+}
 function reduceSuiteEvent(state, event) {
   switch (event.type) {
     case "ITEM_QUEUED": {
@@ -65698,6 +65717,9 @@ function reduceSuiteEvent(state, event) {
     case "SIMULATOR_UNHEALTHY": {
       return reduceSimulatorUnhealthy(state, event);
     }
+    case "HOOK_RETRY": {
+      return reduceHookRetry(state, event);
+    }
     case "SUITE_COMPLETED": {
       return { ...state, suiteEnded: true };
     }
@@ -79360,6 +79382,7 @@ function formatOptionalNumber(value) {
 // src/shell/debug-agent-events.ts
 var TOOL_INPUT_MAX = 120;
 var TOOL_ERROR_MAX = 120;
+var THOUGHT_TEXT_MAX = 240;
 var UNSERIALIZABLE = "[unserializable]";
 function tryStringify(value) {
   const result = JSON.stringify(value);
@@ -79443,6 +79466,13 @@ function handleVisualStep(context, event) {
 function handleError(context, event) {
   context.logger.log("ERROR", `${event.agent} ${event.message}`);
 }
+function flattenThoughtText(text) {
+  return text.replaceAll(/\s+/g, " ").trim();
+}
+function handleThought(context, event) {
+  const text = truncate(flattenThoughtText(event.text), THOUGHT_TEXT_MAX);
+  context.logger.log("THOUGHT", `${event.agent} ${text}`);
+}
 var AGENT_EVENT_HANDLERS = {
   STAGE_START: handleStageStart,
   STAGE_END: handleStageEnd,
@@ -79455,7 +79485,8 @@ var AGENT_EVENT_HANDLERS = {
   INSPECTOR_STEP_START: handleInspectorStepStart,
   INSPECTOR_STEP: handleInspectorStep,
   VISUAL_STEP: handleVisualStep,
-  ERROR: handleError
+  ERROR: handleError,
+  THOUGHT: handleThought
 };
 function handleAgentEvent(context, event) {
   const handler2 = AGENT_EVENT_HANDLERS[event.type];
@@ -79502,6 +79533,12 @@ function handleSimulatorUnhealthy(logger, event) {
     `sim=${event.simulatorUdid} failures=${String(event.consecutiveFailures)}`
   );
 }
+function handleHookRetry(logger, event) {
+  logger.log(
+    "HOOK_RETRY",
+    `id=${event.itemId} sim=${event.simulatorUdid} attempt=${String(event.attempt)}/${String(event.maxAttempts)} prev=${event.previousErrorType}`
+  );
+}
 function handleSuiteCompleted(logger, event) {
   logger.log(
     "SUITE_COMPLETED",
@@ -79516,6 +79553,7 @@ var SUITE_EVENT_HANDLERS = {
   ITEM_TIMEOUT: handleItemTimeout,
   ITEM_ABORTED: handleItemAborted,
   SIMULATOR_UNHEALTHY: handleSimulatorUnhealthy,
+  HOOK_RETRY: handleHookRetry,
   SUITE_COMPLETED: handleSuiteCompleted
 };
 function handleSuiteEvent(logger, event) {
@@ -85283,10 +85321,12 @@ var freestyleSchema = external_exports.union([external_exports.number().int().po
   }
   return value;
 });
+var MAX_HOOK_RETRIES = 10;
 var hookConfigSchema = external_exports.object({
   script: external_exports.string().min(1),
   env: external_exports.record(external_exports.string(), external_exports.string()).optional(),
-  timeoutSeconds: external_exports.number().int().positive().optional()
+  timeoutSeconds: external_exports.number().int().positive().optional(),
+  retries: external_exports.number().int().nonnegative().max(MAX_HOOK_RETRIES).optional()
 }).superRefine((data, context) => {
   if (data.env === void 0) {
     return;
@@ -85318,18 +85358,20 @@ var safeJsonParse5 = (0, import_neverthrow75.fromThrowable)(
     cause
   })
 );
+function pickDefined(object2) {
+  return Object.fromEntries(
+    Object.entries(object2).filter(([, value]) => value !== void 0)
+  );
+}
 function buildHookConfig(parsed) {
-  const { script, env: env3, timeoutSeconds } = parsed;
-  if (env3 !== void 0 && timeoutSeconds !== void 0) {
-    return { script, env: env3, timeoutSeconds };
-  }
-  if (env3 !== void 0) {
-    return { script, env: env3 };
-  }
-  if (timeoutSeconds !== void 0) {
-    return { script, timeoutSeconds };
-  }
-  return { script };
+  return {
+    script: parsed.script,
+    ...pickDefined({
+      env: parsed.env,
+      timeoutSeconds: parsed.timeoutSeconds,
+      retries: parsed.retries
+    })
+  };
 }
 function normalizeHooks(hooks) {
   if (hooks === void 0) {
@@ -85845,25 +85887,71 @@ function runHook(options2) {
 
 // src/suite/shell/hook-invoker.ts
 var DEFAULT_HOOK_TIMEOUT_SECONDS = 120;
+var DEFAULT_HOOK_RETRIES = 3;
 var MS_PER_SECOND5 = 1e3;
-async function invokeHook(input) {
-  const { hook: hook2, item, simulatorUdid, suiteName, hookCwd, hookBaseEnv, hookNodeExecPath, signal } = input;
-  const env3 = buildHookEnv({ item, simulatorUdid, suiteName, suiteEnv: hook2.env });
-  const timeoutSeconds = hook2.timeoutSeconds ?? DEFAULT_HOOK_TIMEOUT_SECONDS;
+var RETRYABLE_HOOK_ERROR_TYPES = /* @__PURE__ */ new Set([
+  "HOOK_EXIT_NONZERO",
+  "HOOK_TIMEOUT",
+  "HOOK_SPAWN_FAILED"
+]);
+async function runHookOnce(context) {
   return runHook({
-    script: hook2.script,
-    cwd: hookCwd,
-    env: env3,
-    baseEnv: hookBaseEnv,
-    nodeExecPath: hookNodeExecPath,
-    timeoutMs: timeoutSeconds * MS_PER_SECOND5,
-    signal
+    script: context.input.hook.script,
+    cwd: context.input.hookCwd,
+    env: context.env,
+    baseEnv: context.input.hookBaseEnv,
+    nodeExecPath: context.input.hookNodeExecPath,
+    timeoutMs: context.timeoutMs,
+    signal: context.input.signal
   });
 }
-async function maybeInvokeHook(input) {
+function emitRetryEvent(context, event) {
+  context.input.observer?.({
+    type: "HOOK_RETRY",
+    itemId: context.input.item.id,
+    itemName: context.input.item.name,
+    simulatorUdid: context.input.simulatorUdid,
+    attempt: event.attempt,
+    maxAttempts: context.maxAttempts,
+    previousErrorType: event.previous.type
+  });
+}
+async function runAllAttempts(context) {
+  let lastResult = await runHookOnce(context);
+  for (let attempt = 2; attempt <= context.maxAttempts; attempt += 1) {
+    if (lastResult.isOk()) {
+      return lastResult;
+    }
+    if (!isRetryableHookError(lastResult.error) || context.input.signal.aborted) {
+      return lastResult;
+    }
+    emitRetryEvent(context, { attempt, previous: lastResult.error });
+    lastResult = await runHookOnce(context);
+  }
+  return lastResult;
+}
+function buildAttemptContext(input) {
+  const env3 = buildHookEnv({
+    item: input.item,
+    simulatorUdid: input.simulatorUdid,
+    suiteName: input.suiteName,
+    suiteEnv: input.hook.env
+  });
+  const timeoutMs = (input.hook.timeoutSeconds ?? DEFAULT_HOOK_TIMEOUT_SECONDS) * MS_PER_SECOND5;
+  const maxAttempts = (input.hook.retries ?? DEFAULT_HOOK_RETRIES) + 1;
+  return { input, env: env3, timeoutMs, maxAttempts };
+}
+function invokeHook(input) {
+  const context = buildAttemptContext(input);
+  return import_neverthrow79.ResultAsync.fromSafePromise(runAllAttempts(context)).andThen((result) => result);
+}
+function isRetryableHookError(error48) {
+  return RETRYABLE_HOOK_ERROR_TYPES.has(error48.type);
+}
+function maybeInvokeHook(input) {
   const { hook: hook2 } = input;
   if (hook2 === void 0) {
-    return (0, import_neverthrow79.ok)();
+    return (0, import_neverthrow79.okAsync)();
   }
   return invokeHook({ ...input, hook: hook2 });
 }
@@ -85889,7 +85977,8 @@ function buildHookInvokeInput(workerContext, item) {
     hookCwd: config2.hookCwd,
     hookBaseEnv: config2.hookBaseEnv,
     hookNodeExecPath: config2.hookNodeExecPath,
-    signal: config2.signal
+    signal: config2.signal,
+    observer: config2.observer
   };
 }
 function emitItemStarted(state) {
@@ -94105,11 +94194,16 @@ var agentsSchema = external_exports.object({
   consolidator: consolidatorConfigSchema,
   triager: triagerConfigSchema
 }).strict();
+var planPrObjectSchema = external_exports.object({
+  enabled: external_exports.boolean().default(true)
+}).strict();
+var planPrSchema = external_exports.preprocess((value) => value ?? {}, planPrObjectSchema).default({ enabled: true });
 var rootConfigSchema = external_exports.object({
   version: external_exports.literal(1),
   run: runSchema,
   suites: suitesSchema,
-  agents: agentsSchema
+  agents: agentsSchema,
+  planPr: planPrSchema
 }).strict();
 
 // src/config.ts
@@ -94259,7 +94353,7 @@ function buildProgram(options2) {
 
 // src/index.ts
 process.title = "xqa";
-var version2 = `${"5.2.0"}${false ? ` (dev build +${"a4407af"})` : ""}`;
+var version2 = `${"5.4.0"}${false ? ` (dev build +${"fb81480"})` : ""}`;
 var program2 = buildProgram({ version: version2 });
 void program2.parseAsync(process.argv);
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/xqa",
-  "version": "5.2.0",
+  "version": "5.4.0",
   "type": "module",
   "engines": {
     "node": ">=22"