@wix/evalforge-evaluator 0.159.0 → 0.161.0

package/build/index.js

@@ -821,6 +821,29 @@ async function appendToFile(filePath, content) {
 ${content}` : content;
   await (0, import_promises6.writeFile)(filePath, merged, "utf8");
 }
+function validateGenericDirectory(dir, cwd) {
+  const trimmed = dir.trim();
+  if (!trimmed) {
+    throw new Error(`Generic rule directory must not be empty`);
+  }
+  if (trimmed.startsWith("/") || trimmed.startsWith("\\") || trimmed.startsWith("~")) {
+    throw new Error(`Generic rule directory must be relative, got: "${dir}"`);
+  }
+  const segments = trimmed.split(/[\\/]/);
+  if (segments.some((s) => s === "..")) {
+    throw new Error(
+      `Generic rule directory may not contain "..", got: "${dir}"`
+    );
+  }
+  const normalizedCwd = cwd.endsWith(import_path7.sep) ? cwd.slice(0, -1) : cwd;
+  const resolved = (0, import_path7.resolve)(normalizedCwd, trimmed);
+  if (!resolved.startsWith(normalizedCwd + import_path7.sep)) {
+    throw new Error(
+      `Generic rule directory escapes the working directory: "${dir}"`
+    );
+  }
+  return trimmed;
+}
 async function writeRulesToFilesystem(cwd, rules) {
   if (rules.length === 0) return;
   const nameCount = /* @__PURE__ */ new Map();
@@ -845,6 +868,21 @@ async function writeRulesToFilesystem(cwd, rules) {
         await (0, import_promises6.writeFile)(filePath, rule.content, "utf8");
         break;
       }
+      case "generic": {
+        const directory = validateGenericDirectory(
+          rule.directory ?? ".opencode/rules",
+          cwd
+        );
+        const dirPath = (0, import_path7.join)(cwd, directory);
+        await (0, import_promises6.mkdir)(dirPath, { recursive: true });
+        const filename = toRuleFilename(rule.name, i, nameCount);
+        await (0, import_promises6.writeFile)((0, import_path7.join)(dirPath, `${filename}.md`), rule.content, "utf8");
+        break;
+      }
+      default: {
+        const _exhaustive = rule.ruleType;
+        throw new Error(`Unhandled ruleType: ${_exhaustive}`);
+      }
     }
   }
   console.log(`[Rules] Written ${rules.length} rule(s) to ${cwd}`);
@@ -2366,12 +2404,25 @@ async function buildOpenCodeEnv(options) {
     ...defaultPermission,
     ...configPermission
   };
+  let instructions;
+  if (options.rules && options.rules.length > 0) {
+    const genericDirs = /* @__PURE__ */ new Set();
+    for (const rule of options.rules) {
+      if (rule.ruleType === "generic") {
+        genericDirs.add(rule.directory ?? ".opencode/rules");
+      }
+    }
+    if (genericDirs.size > 0) {
+      instructions = Array.from(genericDirs).sort().map((d) => `${d}/*.md`);
+    }
+  }
   const config = {
     model: `${providerID}/${modelID}`,
     provider,
     ...Object.keys(agentOverrides).length > 0 ? { agent: { build: agentOverrides } } : {},
     permission,
-    ...mcp ? { mcp } : {}
+    ...mcp ? { mcp } : {},
+    ...instructions ? { instructions } : {}
   };
   const env = {
     ...process.env,
@@ -2886,7 +2937,7 @@ function spawnOpenCodeProcess(opts) {
     traceContext,
     initialStepNumber
   } = opts;
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     let resolved = false;
     let stderr = "";
     let lineBuffer = "";
@@ -2906,7 +2957,7 @@ function spawnOpenCodeProcess(opts) {
       if (resolved) return;
       resolved = true;
       cleanup();
-      resolve2({
+      resolve3({
         events,
         success,
         isIdleTimeout,
@@ -2923,7 +2974,7 @@ function spawnOpenCodeProcess(opts) {
         detached: true
       });
     } catch (spawnError) {
-      resolve2({
+      resolve3({
         events: [],
         success: false,
         isIdleTimeout: false,
@@ -3114,6 +3165,7 @@ async function executeWithOpenCode(skills, scenario, options) {
     aiGatewayUrl: options.aiGatewayUrl,
     aiGatewayHeaders: options.aiGatewayHeaders,
     mcps: options.mcps,
+    rules: options.rules,
     cwd: options.cwd,
     config: options.config
   });
@@ -3861,6 +3913,19 @@ async function executeWithAiSdk(context) {
   } catch (err) {
     const baseMsg = err instanceof Error ? err.message : String(err);
     const ctx = extractGatewayErrorContext(err);
+    const apiError = findApiCallError(err);
+    console.error(
+      "[AI gateway error]",
+      JSON.stringify({
+        provider,
+        model: modelId,
+        message: baseMsg,
+        statusCode: apiError?.statusCode,
+        xWixRequestId: getHeader(apiError?.responseHeaders, "x-wix-request-id"),
+        proxyRequestId: getProxyBodyFields(apiError?.responseBody).proxy_request_id,
+        failurePhase: getProxyBodyFields(apiError?.responseBody).failure_phase
+      })
+    );
     throw new Error(
       `AI gateway request failed (provider=${provider}, model=${modelId}): ${baseMsg}${ctx}`,
       { cause: err }