@smithers-orchestrator/engine 0.17.0 → 0.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithers-orchestrator/engine",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Concrete Smithers workflow execution engine",
   "type": "module",
   "sideEffects": false,
@@ -33,20 +33,20 @@
     "react": "^19.2.5",
     "react-dom": "^19.2.5",
     "zod": "^4.3.6",
-    "@smithers-orchestrator/agents": "0.17.0",
-    "@smithers-orchestrator/components": "0.17.0",
-    "@smithers-orchestrator/driver": "0.17.0",
-    "@smithers-orchestrator/db": "0.17.0",
-    "@smithers-orchestrator/errors": "0.17.0",
-    "@smithers-orchestrator/graph": "0.17.0",
-    "@smithers-orchestrator/memory": "0.17.0",
-    "@smithers-orchestrator/react-reconciler": "0.17.0",
-    "@smithers-orchestrator/observability": "0.17.0",
-    "@smithers-orchestrator/sandbox": "0.17.0",
-    "@smithers-orchestrator/scheduler": "0.17.0",
-    "@smithers-orchestrator/scorers": "0.17.0",
-    "@smithers-orchestrator/time-travel": "0.17.0",
-    "@smithers-orchestrator/vcs": "0.17.0"
+    "@smithers-orchestrator/agents": "0.18.0",
+    "@smithers-orchestrator/db": "0.18.0",
+    "@smithers-orchestrator/driver": "0.18.0",
+    "@smithers-orchestrator/errors": "0.18.0",
+    "@smithers-orchestrator/graph": "0.18.0",
+    "@smithers-orchestrator/memory": "0.18.0",
+    "@smithers-orchestrator/observability": "0.18.0",
+    "@smithers-orchestrator/scheduler": "0.18.0",
+    "@smithers-orchestrator/scorers": "0.18.0",
+    "@smithers-orchestrator/time-travel": "0.18.0",
+    "@smithers-orchestrator/components": "0.18.0",
+    "@smithers-orchestrator/react-reconciler": "0.18.0",
+    "@smithers-orchestrator/sandbox": "0.18.0",
+    "@smithers-orchestrator/vcs": "0.18.0"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/effect/workflow-bridge.js

@@ -72,8 +72,12 @@ function isRetryableBridgeTaskFailure(attempt) {
     if (meta?.failureRetryable === false) {
         return false;
     }
+    const errorCode = parseAttemptErrorCode(attempt?.errorJson);
+    if (errorCode === "AGENT_CONFIG_INVALID") {
+        return false;
+    }
     const kind = typeof meta?.kind === "string" ? meta.kind : null;
-    return !(kind !== "agent" && parseAttemptErrorCode(attempt?.errorJson) === "INVALID_OUTPUT");
+    return !(kind !== "agent" && errorCode === "INVALID_OUTPUT");
 }
 /**
  * @param {SmithersDb} adapter

package/src/engine.js

@@ -25,7 +25,7 @@ import { findVcsRoot } from "@smithers-orchestrator/vcs/find-root";
 import * as BunContext from "@effect/platform-bun/BunContext";
 import { eq, getTableName } from "drizzle-orm";
 import { getTableColumns } from "drizzle-orm/utils";
-import { Chunk, Duration, Effect, Fiber, Metric, Queue, Schedule } from "effect";
+import { Cause, Chunk, Duration, Effect, Exit, Fiber, Metric, Queue, Schedule } from "effect";
 import { attemptDuration, cacheHits, cacheMisses, nodeDuration, promptSizeBytes, responseSizeBytes, runDuration, runsResumedTotal, schedulerConcurrencyUtilization, schedulerQueueDepth, schedulerWaitDuration, trackEvent, } from "@smithers-orchestrator/observability/metrics";
 import { runScorersAsync } from "@smithers-orchestrator/scorers/run-scorers";
 import { dirname, resolve } from "node:path";
@@ -287,6 +287,25 @@ function isHeartbeatPayloadValidationError(err) {
     return (code === "HEARTBEAT_PAYLOAD_NOT_JSON_SERIALIZABLE" ||
         code === "HEARTBEAT_PAYLOAD_TOO_LARGE");
 }
+/**
+ * Effect.runPromise rejects with a FiberFailure wrapper. For task execution we
+ * need the original failure so retry metadata can read SmithersError fields.
+ *
+ * @template A
+ * @param {Effect.Effect<A, unknown>} effect
+ * @returns {Promise<A>}
+ */
+async function runPromisePreservingFailure(effect) {
+    const exit = await Effect.runPromiseExit(effect);
+    if (Exit.isSuccess(exit)) {
+        return exit.value;
+    }
+    const failure = Cause.failureOption(exit.cause);
+    if (failure._tag === "Some") {
+        throw failure.value;
+    }
+    throw Cause.squash(exit.cause);
+}
 /**
  * @param {Record<string, unknown>} meta
  * @param {string} engine
@@ -1784,6 +1803,7 @@ function resolveTaskOutputs(tasks, workflow) {
         if (isTimerTask(task)) {
             continue;
         }
+        const hasAmbiguousOutputRef = Boolean(task.outputRef && workflow.ambiguousZodSchemas?.has(task.outputRef));
         // Already resolved (has a table)
         if (task.outputTable) {
             if (!task.outputSchema && task.outputTableName && workflow.schemaRegistry) {
@@ -1807,10 +1827,14 @@ function resolveTaskOutputs(tasks, workflow) {
                 }
             }
             if (!task.outputTable) {
+                if (hasAmbiguousOutputRef) {
+                    throw new SmithersError("UNKNOWN_OUTPUT_SCHEMA", `Task "${task.nodeId}" uses an output schema that is registered under multiple keys. Use createSmithers(...).outputs.<key> or a string output key instead of the shared raw Zod object.`);
+                }
                 throw new SmithersError("UNKNOWN_OUTPUT_SCHEMA", `Task "${task.nodeId}" uses an output ZodObject that is not registered in createSmithers()`);
             }
         }
         const raw = task.outputSchema;
+        const hasAmbiguousOutputSchema = Boolean(raw && typeof raw === "object" && workflow.ambiguousZodSchemas?.has(raw));
         // Resolve ZodObject via outputSchema when no outputRef resolved.
         if (!task.outputTable && raw && typeof raw === "object" && workflow.zodToKeyName) {
             const keyName = workflow.zodToKeyName.get(raw);
@@ -1824,6 +1848,9 @@ function resolveTaskOutputs(tasks, workflow) {
                 }
             }
             if (!task.outputTable) {
+                if (hasAmbiguousOutputSchema) {
+                    throw new SmithersError("UNKNOWN_OUTPUT_SCHEMA", `Task "${task.nodeId}" uses an output schema that is registered under multiple keys. Use createSmithers(...).outputs.<key> or a string output key instead of the shared raw Zod object.`);
+                }
                 throw new SmithersError("UNKNOWN_OUTPUT_SCHEMA", `Task "${task.nodeId}" uses an output ZodObject that is not registered in createSmithers()`);
             }
         }
@@ -2554,6 +2581,7 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
     let cacheJjBase = null;
     let responseText = null;
     let effectiveAgent = null;
+    let supportsNativeStructuredOutput = false;
     // Resolve effective root once so both caching and execution share it.
     const taskRoot = desc.worktreePath ?? toolConfig.rootDir;
     const stepCacheEnabled = cacheEnabled || Boolean(desc.cachePolicy);
@@ -2874,7 +2902,8 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
                     maybeCompleteHijack();
                 };
                 let effectivePrompt = desc.prompt ?? "";
-                if (desc.outputTable) {
+                supportsNativeStructuredOutput = effectiveAgent.supportsNativeStructuredOutput === true;
+                if (desc.outputTable && !supportsNativeStructuredOutput) {
                     const schemaDesc = describeSchemaShape(desc.outputTable, desc.outputSchema);
                     const jsonInstructions = [
                         "**REQUIRED OUTPUT** — You MUST end your response with a JSON object in a code fence matching this schema:",
@@ -3026,7 +3055,7 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
                 // Use fallback agent on retry attempts when available
                 let result;
                 try {
-                    result = await Effect.runPromise(withSmithersSpan(smithersSpanNames.agent, Effect.tryPromise({
+                    result = await runPromisePreservingFailure(withSmithersSpan(smithersSpanNames.agent, Effect.tryPromise({
                         try: () => {
                             const agentCall = guidedResumeMessages?.length
                                 ? {
@@ -3486,17 +3515,25 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
             const zodIssues = validation.error?.issues
                 ?.map((iss) => `  - ${(iss.path ?? []).join(".")}: ${iss.message}`)
                 .join("\n") ?? "Unknown validation error";
-            const schemaRetryPrompt = [
-                `Your output didn't match the required schema. Validation errors:`,
-                zodIssues,
-                ``,
-                `Please return valid JSON matching the schema exactly.`,
-                ``,
-                `You MUST output ONLY a valid JSON object with exactly these fields and types:`,
-                schemaDesc,
-                ``,
-                `Output ONLY the JSON object, no other text.`,
-            ].join("\n");
+            const schemaRetryPrompt = supportsNativeStructuredOutput
+                ? [
+                    `Your structured output didn't match the required schema. Validation errors:`,
+                    zodIssues,
+                    ``,
+                    `Return corrected structured data matching this schema:`,
+                    schemaDesc,
+                ].join("\n")
+                : [
+                    `Your output didn't match the required schema. Validation errors:`,
+                    zodIssues,
+                    ``,
+                    `Please return valid JSON matching the schema exactly.`,
+                    ``,
+                    `You MUST output ONLY a valid JSON object with exactly these fields and types:`,
+                    schemaDesc,
+                    ``,
+                    `Output ONLY the JSON object, no other text.`,
+                ].join("\n");
             logInfo("schema validation retry", {
                 runId,
                 nodeId: desc.nodeId,
@@ -3526,6 +3563,9 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
                     recordInternalHeartbeat();
                     emitOutput(text, "stderr");
                 },
+                ...(supportsNativeStructuredOutput
+                    ? { outputSchema: desc.outputSchema }
+                    : {}),
             });
             const retryText = (schemaRetryResult.text ?? "").trim();
             responseText = retryText || responseText;
@@ -3547,8 +3587,24 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
                 cloneJsonValue(schemaRetryMessages) ?? schemaRetryMessages;
             // Try to parse the retry response
             let retryOutput;
+            if (supportsNativeStructuredOutput) {
+                try {
+                    if (schemaRetryResult._output !== undefined &&
+                        schemaRetryResult._output !== null) {
+                        retryOutput = schemaRetryResult._output;
+                    }
+                    else if (schemaRetryResult.output !== undefined &&
+                        schemaRetryResult.output !== null) {
+                        retryOutput = schemaRetryResult.output;
+                    }
+                }
+                catch {
+                    // Structured output access threw; fall back to text parsing.
+                }
+            }
             try {
-                if (retryText.startsWith("{") || retryText.startsWith("[")) {
+                if (retryOutput === undefined &&
+                    (retryText.startsWith("{") || retryText.startsWith("["))) {
                     retryOutput = JSON.parse(retryText);
                 }
             }
@@ -3743,9 +3799,9 @@ async function legacyExecuteTask(adapter, db, runId, desc, descriptorMap, inputT
         if (effectiveError &&
             typeof effectiveError === "object" &&
             // @ts-ignore — duck-type on SmithersError shape
-            effectiveError.details &&
-            // @ts-ignore
-            effectiveError.details.failureRetryable === false) {
+            (effectiveError.details?.failureRetryable === false ||
+                // @ts-ignore
+                effectiveError.code === "AGENT_CONFIG_INVALID")) {
             attemptMeta.failureRetryable = false;
         }
         // Honour `discardResumeSession: true` from agent-side errors (e.g. kimi