@withone/cli 1.23.0 → 1.24.0

package/dist/{chunk-Z45IBT5P.js → chunk-AVOGNLC7.js}

@@ -447,6 +447,22 @@ var execAsync = promisify(exec);
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+var StepTimeoutError = class extends Error {
+  errorCode = "TIMEOUT";
+  constructor(stepId, timeoutMs) {
+    super(`Step "${stepId}" exceeded timeout of ${timeoutMs}ms`);
+    this.name = "StepTimeoutError";
+  }
+};
+function withTimeout(promise, timeoutMs, stepId) {
+  let timer;
+  const timeoutPromise = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new StepTimeoutError(stepId, timeoutMs)), timeoutMs);
+  });
+  return Promise.race([promise, timeoutPromise]).finally(() => {
+    if (timer) clearTimeout(timer);
+  });
+}
 function computeRetryDelay(onError, attempt) {
   const base = onError.retryDelayMs ?? 1e3;
   const max = onError.maxDelayMs ?? 3e4;
@@ -898,7 +914,7 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
   if (flowStack.includes(resolvedKey)) {
     throw new Error(`Circular flow detected: ${[...flowStack, resolvedKey].join(" \u2192 ")}`);
   }
-  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-DFUFU2LM.js");
+  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-LCDHSLUT.js");
   const { flow: subFlow, rootDir: subRootDir } = loadFlowWithMeta2(resolvedKey);
   const subContext = await executeFlow(
     subFlow,
@@ -910,10 +926,35 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
     void 0,
     [...flowStack, resolvedKey]
   );
+  const finalStep = subFlow.steps[subFlow.steps.length - 1];
+  const finalOutput = finalStep ? subContext.steps[finalStep.id]?.output : void 0;
+  let flattenedOutput;
+  if (finalOutput && typeof finalOutput === "object" && !Array.isArray(finalOutput)) {
+    const collisions = Object.keys(finalOutput).filter(
+      (k) => k in subContext.steps
+    );
+    if (collisions.length > 0) {
+      options.onEvent?.({
+        event: "flow:warning",
+        message: `Sub-flow "${resolvedKey}" final step output fields [${collisions.join(", ")}] collide with sub-step ids \u2014 flattened fields take precedence.`
+      });
+    }
+    flattenedOutput = {
+      ...subContext.steps,
+      ...finalOutput,
+      _steps: subContext.steps
+    };
+  } else {
+    flattenedOutput = {
+      ...subContext.steps,
+      _steps: subContext.steps,
+      ...finalOutput !== void 0 ? { _finalOutput: finalOutput } : {}
+    };
+  }
   return {
     status: "success",
-    output: subContext.steps,
-    response: subContext.steps
+    output: flattenedOutput,
+    response: flattenedOutput
   };
 }
 async function executePaginateStep(step, context, api, permissions, allowedActionIds, options) {
@@ -1031,47 +1072,37 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
         context.steps[step.id] = result2;
         return result2;
       }
-      let result;
-      switch (step.type) {
-        case "action":
-          result = await executeActionStep(step, context, api, permissions, allowedActionIds);
-          break;
-        case "transform":
-          result = executeTransformStep(step, context);
-          break;
-        case "code":
-          result = await executeCodeStep(step, context, options);
-          break;
-        case "condition":
-          result = await executeConditionStep(step, context, api, permissions, allowedActionIds, options, flowStack);
-          break;
-        case "loop":
-          result = await executeLoopStep(step, context, api, permissions, allowedActionIds, options, flowStack);
-          break;
-        case "parallel":
-          result = await executeParallelStep(step, context, api, permissions, allowedActionIds, options, flowStack);
-          break;
-        case "file-read":
-          result = executeFileReadStep(step, context);
-          break;
-        case "file-write":
-          result = executeFileWriteStep(step, context);
-          break;
-        case "while":
-          result = await executeWhileStep(step, context, api, permissions, allowedActionIds, options, flowStack);
-          break;
-        case "flow":
-          result = await executeSubflowStep(step, context, api, permissions, allowedActionIds, options, flowStack);
-          break;
-        case "paginate":
-          result = await executePaginateStep(step, context, api, permissions, allowedActionIds, options);
-          break;
-        case "bash":
-          result = await executeBashStep(step, context, options);
-          break;
-        default:
-          throw new Error(`Unknown step type: ${step.type}`);
-      }
+      const dispatch = async () => {
+        switch (step.type) {
+          case "action":
+            return await executeActionStep(step, context, api, permissions, allowedActionIds);
+          case "transform":
+            return executeTransformStep(step, context);
+          case "code":
+            return await executeCodeStep(step, context, options);
+          case "condition":
+            return await executeConditionStep(step, context, api, permissions, allowedActionIds, options, flowStack);
+          case "loop":
+            return await executeLoopStep(step, context, api, permissions, allowedActionIds, options, flowStack);
+          case "parallel":
+            return await executeParallelStep(step, context, api, permissions, allowedActionIds, options, flowStack);
+          case "file-read":
+            return executeFileReadStep(step, context);
+          case "file-write":
+            return executeFileWriteStep(step, context);
+          case "while":
+            return await executeWhileStep(step, context, api, permissions, allowedActionIds, options, flowStack);
+          case "flow":
+            return await executeSubflowStep(step, context, api, permissions, allowedActionIds, options, flowStack);
+          case "paginate":
+            return await executePaginateStep(step, context, api, permissions, allowedActionIds, options);
+          case "bash":
+            return await executeBashStep(step, context, options);
+          default:
+            throw new Error(`Unknown step type: ${step.type}`);
+        }
+      };
+      const result = step.timeoutMs ? await withTimeout(dispatch(), step.timeoutMs, step.id) : await dispatch();
       result.durationMs = Date.now() - startTime;
       if (attempt > 1) {
         result.retries = attempt - 1;
@@ -1093,10 +1124,13 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
   const errorMessage = lastError?.message || "Unknown error";
   const strategy = step.onError?.strategy || "fail";
   const retriesUsed = Math.max(0, maxAttempts - 1);
+  const isTimeout = lastError instanceof StepTimeoutError;
+  const errorCode = lastError?.errorCode;
   if (strategy === "continue") {
     const result = {
-      status: "failed",
+      status: isTimeout ? "timeout" : "failed",
       error: errorMessage,
+      ...errorCode ? { errorCode } : {},
       durationMs: Date.now() - startTime,
       retries: retriesUsed
     };
@@ -1105,8 +1139,9 @@ async function executeSingleStep(step, context, api, permissions, allowedActionI
   }
   if (strategy === "fallback" && step.onError?.fallbackStepId) {
     const result = {
-      status: "failed",
+      status: isTimeout ? "timeout" : "failed",
       error: errorMessage,
+      ...errorCode ? { errorCode } : {},
       durationMs: Date.now() - startTime,
       retries: retriesUsed
     };
@@ -1243,7 +1278,8 @@ var FLOW_SCHEMA = {
     name: { type: "string", required: true, description: "Human-readable step label" },
     type: { type: "string", required: true, description: "Step type (determines which config object is required)" },
     if: { type: "string", required: false, description: "JS expression \u2014 skip step if falsy" },
-    unless: { type: "string", required: false, description: "JS expression \u2014 skip step if truthy" }
+    unless: { type: "string", required: false, description: "JS expression \u2014 skip step if truthy" },
+    timeoutMs: { type: "number", required: false, description: 'Wall-clock timeout (ms). On expiry the step fails with errorCode:"TIMEOUT"; with onError:continue the result gets status:"timeout".' }
   },
   stepTypes: [
     {
@@ -1751,6 +1787,39 @@ Every completed step produces both \`output\` and \`response\`:
 - **Code/transform steps**: \`output\` is the return value. \`response\` is an alias for \`output\`.
 - **In practice**: Use \`$.steps.stepId.response\` for action steps (API data) and \`$.steps.stepId.output\` for code/transform steps (computed data). Both work interchangeably, but using the semantically correct one makes flows easier to read.
 
+### Step result metadata (\`status\`, \`error\`, \`errorCode\`)
+
+Every step result also exposes execution metadata that downstream steps can inspect:
+
+| Field | Values | When set |
+|-------|--------|----------|
+| \`$.steps.X.status\` | \`"success"\` \\| \`"skipped"\` \\| \`"failed"\` \\| \`"timeout"\` | Always |
+| \`$.steps.X.error\` | error message string | When status is \`failed\` or \`timeout\` |
+| \`$.steps.X.errorCode\` | machine-readable code (e.g. \`"TIMEOUT"\`) | When the error has a code |
+| \`$.steps.X.durationMs\` | number | Always |
+| \`$.steps.X.retries\` | number | When the step was retried |
+
+This lets downstream steps distinguish \`skipped\` (\`if\` condition false) from \`failed\` (error, \`onError:continue\`) from \`timeout\` (exceeded \`timeoutMs\`) \u2014 e.g. \`"if": "$.steps.enrichment.status === 'timeout'"\` to retry with a longer window.
+
+### Sub-flow output (flattened)
+
+When a step has \`type: "flow"\`, the sub-flow's final step output is flattened onto the parent step's \`output\`:
+
+\`\`\`jsonc
+// Sub-flow "sub-consts" has a final step "load" that returns { CHART_URL, API_KEY }
+
+// Preferred (flattened):
+"{{$.steps.loadConfig.output.CHART_URL}}"
+
+// Legacy nested path (still works for backward compatibility):
+"{{$.steps.loadConfig.output.load.output.CHART_URL}}"
+
+// Escape hatch for programmatic access to the full sub-flow steps map:
+"{{$.steps.loadConfig.output._steps.load.output.CHART_URL}}"
+\`\`\`
+
+If a sub-step id collides with a flattened field name, the flattened field wins and the engine emits a \`flow:warning\` event.
+
 ## Error Handling
 
 \`\`\`json

package/dist/{flow-runner-DFUFU2LM.js → flow-runner-LCDHSLUT.js}

@@ -11,7 +11,7 @@ import {
   saveFlow,
   summarizeFlowInputs,
   walkSteps
-} from "./chunk-Z45IBT5P.js";
+} from "./chunk-AVOGNLC7.js";
 export {
   FlowRunner,
   collectStepTypes,

package/dist/index.js

@@ -16,7 +16,7 @@ import {
   loadFlowWithMeta,
   resolveFlowPath,
   saveFlow
-} from "./chunk-Z45IBT5P.js";
+} from "./chunk-AVOGNLC7.js";
 
 // src/index.ts
 import { createRequire as createRequire2 } from "module";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "CLI for managing One",
   "type": "module",
   "files": [