@the-open-engine/zeroshot 6.38.0 → 6.39.0

package/src/agent/structured-output-error.ts

@@ -0,0 +1,105 @@
+const STRUCTURED_OUTPUT_INVALID_CODE = 'STRUCTURED_OUTPUT_INVALID';
+
+interface ValidationFailure {
+  readonly error?: unknown;
+}
+
+interface RecoveryResult {
+  readonly status?: string;
+  readonly attempts?: number;
+  readonly lastError?: unknown;
+}
+
+interface StructuredOutputAgent {
+  readonly id: string;
+  readonly role: string;
+}
+
+interface StructuredOutputFailure {
+  readonly message: string;
+  readonly code: unknown;
+  readonly details?: unknown;
+}
+
+function createStructuredOutputInvalidError(
+  message: string,
+  kind: unknown,
+  validation: ValidationFailure | null = null,
+  recovery: RecoveryResult | null = null
+): Error & {
+  code: typeof STRUCTURED_OUTPUT_INVALID_CODE;
+  details: {
+    kind: unknown;
+    validationError: unknown;
+    recoveryAttempts: number | undefined;
+    recoveryError: unknown;
+  };
+} {
+  const properties: {
+    code: typeof STRUCTURED_OUTPUT_INVALID_CODE;
+    details: {
+      kind: unknown;
+      validationError: unknown;
+      recoveryAttempts: number | undefined;
+      recoveryError: unknown;
+    };
+  } = {
+    code: STRUCTURED_OUTPUT_INVALID_CODE,
+    details: {
+      kind,
+      validationError: validation?.error ?? null,
+      recoveryAttempts: recovery?.status === 'exhausted' ? recovery.attempts : 0,
+      recoveryError: recovery?.status === 'exhausted' ? recovery.lastError : null,
+    },
+  };
+  return Object.assign(new Error(message), properties);
+}
+
+function isStructuredOutputInvalidError(error: unknown): boolean {
+  if ((typeof error !== 'object' || error === null) && typeof error !== 'function') {
+    return false;
+  }
+  return 'code' in error && error.code === STRUCTURED_OUTPUT_INVALID_CODE;
+}
+
+function buildStructuredOutputClusterFailure(
+  agent: StructuredOutputAgent,
+  error: StructuredOutputFailure
+): {
+  topic: 'CLUSTER_FAILED';
+  receiver: 'broadcast';
+  content: {
+    text: string;
+    data: {
+      reason: 'structured_output_invalid';
+      agentId: string;
+      role: string;
+      code: unknown;
+      details: unknown;
+      error: string;
+    };
+  };
+} {
+  return {
+    topic: 'CLUSTER_FAILED',
+    receiver: 'broadcast',
+    content: {
+      text: `Cluster failed: structured output is invalid for ${agent.id} - ${error.message}`,
+      data: {
+        reason: 'structured_output_invalid',
+        agentId: agent.id,
+        role: agent.role,
+        code: error.code,
+        details: error.details ?? null,
+        error: error.message,
+      },
+    },
+  };
+}
+
+export = {
+  STRUCTURED_OUTPUT_INVALID_CODE,
+  createStructuredOutputInvalidError,
+  isStructuredOutputInvalidError,
+  buildStructuredOutputClusterFailure,
+};

package/src/agent/validation-platform.js

@@ -1,35 +1,35 @@
-const PLATFORM_MISMATCH_REGEX =
-  /EBADPLATFORM|Unsupported platform|darwin-arm64|linux-x64|@esbuild\/linux-x64/i;
-
+"use strict";
+const PLATFORM_MISMATCH_REGEX = /EBADPLATFORM|Unsupported platform|darwin-arm64|linux-x64|@esbuild\/linux-x64/i;
+function isValidationCriterion(value) {
+    return (typeof value === 'object' && value !== null) || typeof value === 'function';
+}
 function isPlatformMismatchReason(reason) {
-  if (!reason) return false;
-  return PLATFORM_MISMATCH_REGEX.test(String(reason));
+    if (!reason)
+        return false;
+    return PLATFORM_MISMATCH_REGEX.test(String(reason));
 }
-
 function findPlatformMismatchReason(result = {}) {
-  const criteriaResults = result.criteriaResults;
-  if (Array.isArray(criteriaResults)) {
-    for (const criteria of criteriaResults) {
-      if (criteria?.status !== 'CANNOT_VALIDATE') continue;
-      if (isPlatformMismatchReason(criteria.reason)) {
-        return String(criteria.reason);
-      }
+    const criteriaResults = result.criteriaResults;
+    if (Array.isArray(criteriaResults)) {
+        for (const criteria of criteriaResults) {
+            if (!isValidationCriterion(criteria) || criteria.status !== 'CANNOT_VALIDATE')
+                continue;
+            if (isPlatformMismatchReason(criteria.reason)) {
+                return String(criteria.reason);
+            }
+        }
     }
-  }
-
-  const errors = result.errors;
-  if (Array.isArray(errors)) {
-    for (const error of errors) {
-      if (isPlatformMismatchReason(error)) {
-        return String(error);
-      }
+    const errors = result.errors;
+    if (Array.isArray(errors)) {
+        for (const error of errors) {
+            if (isPlatformMismatchReason(error)) {
+                return String(error);
+            }
+        }
     }
-  }
-
-  return null;
+    return null;
 }
-
 module.exports = {
-  isPlatformMismatchReason,
-  findPlatformMismatchReason,
+    isPlatformMismatchReason,
+    findPlatformMismatchReason,
 };

package/src/agent/validation-platform.ts

@@ -0,0 +1,49 @@
+const PLATFORM_MISMATCH_REGEX =
+  /EBADPLATFORM|Unsupported platform|darwin-arm64|linux-x64|@esbuild\/linux-x64/i;
+
+interface ValidationCriterion {
+  readonly status?: unknown;
+  readonly reason?: unknown;
+}
+
+interface ValidationResult {
+  readonly criteriaResults?: unknown;
+  readonly errors?: unknown;
+}
+
+function isValidationCriterion(value: unknown): value is ValidationCriterion {
+  return (typeof value === 'object' && value !== null) || typeof value === 'function';
+}
+
+function isPlatformMismatchReason(reason: unknown): boolean {
+  if (!reason) return false;
+  return PLATFORM_MISMATCH_REGEX.test(String(reason));
+}
+
+function findPlatformMismatchReason(result: ValidationResult = {}): string | null {
+  const criteriaResults = result.criteriaResults;
+  if (Array.isArray(criteriaResults)) {
+    for (const criteria of criteriaResults) {
+      if (!isValidationCriterion(criteria) || criteria.status !== 'CANNOT_VALIDATE') continue;
+      if (isPlatformMismatchReason(criteria.reason)) {
+        return String(criteria.reason);
+      }
+    }
+  }
+
+  const errors = result.errors;
+  if (Array.isArray(errors)) {
+    for (const error of errors) {
+      if (isPlatformMismatchReason(error)) {
+        return String(error);
+      }
+    }
+  }
+
+  return null;
+}
+
+export = {
+  isPlatformMismatchReason,
+  findPlatformMismatchReason,
+};

package/src/agent-cli-provider/adapters/codex.ts

@@ -222,6 +222,8 @@ function buildCommand(context: string, options: BuildProviderCommandOptions = {}
       : null;
   addWebSearchArgs(args, options);
   if (resumeSessionId) {
+    // Codex 0.147 parses --sandbox on `exec`, not on the `resume` subcommand.
+    addAutoApproveArgs(args, options);
     args.push('resume');
   }
 
@@ -229,8 +231,8 @@ function buildCommand(context: string, options: BuildProviderCommandOptions = {}
   addModelArgs(args, options);
   if (!resumeSessionId) {
     addCwdArgs(args, options);
+    addAutoApproveArgs(args, options);
   }
-  addAutoApproveArgs(args, options);
   addSkipGitArgs(args, options);
   const finalContext = applySchemaArgs(args, cleanup, context, options);