deepline 0.1.163 → 0.1.164

package/dist/bundling-sources/apps/play-runner-workers/src/entry.ts

@@ -3559,6 +3559,18 @@ function resolveSheetContractFromReq(
   }
 }
 
+function staticPipelineFromReq(req: RunRequest): PlayStaticPipeline | null {
+  const snapshot = req.contractSnapshot as
+    | { staticPipeline?: unknown }
+    | undefined
+    | null;
+  const pipeline = snapshot?.staticPipeline;
+  if (!pipeline || typeof pipeline !== 'object' || Array.isArray(pipeline)) {
+    return null;
+  }
+  return pipeline as PlayStaticPipeline;
+}
+
 /**
  * Direct-Neon writes from the shared harness Worker. Resolves the org runtime
  * Postgres URL via `create_db_session` inside that long-lived Worker, then
@@ -4290,6 +4302,7 @@ function createMinimalWorkerCtx(
       mapName: name,
       rowCountHint,
       executionPlan: plan,
+      staticPipeline: staticPipelineFromReq(req),
     });
     const outputFields = fieldEntries.map(([field]) => field);
     const updateMapProgress = (

package/dist/bundling-sources/apps/play-runner-workers/src/runtime/map-chunk-plan.ts

@@ -1,83 +1,319 @@
 import {
   chooseMapChunkSize,
-  EXECUTION_PLAN_DEFAULTS,
   type ExecutionPlan,
 } from '../../../../shared_libs/play-runtime/execution-plan';
+import { getPlayRuntimeBatchStrategy } from '../../../../shared_libs/play-runtime/play-runtime-batching-registry';
 import { TOOL_CALLING_MAP_CHUNK_SIZE } from '../../../../shared_libs/play-runtime/map-chunk-limits';
+import {
+  flattenStaticSubsteps,
+  getTopLevelPipelineSubsteps,
+  type PlayStaticColumnProducer,
+  type PlayStaticPipeline,
+  type PlayStaticSubstep,
+} from '../../../../shared_libs/plays/static-pipeline';
 
 export const CACHE_ENABLED_SIMPLE_MAP_CHUNK_SIZE = 10_000;
 export { TOOL_CALLING_MAP_CHUNK_SIZE };
-export const WORKER_SUBREQUEST_SAFE_TOOL_CALLS_PER_CHUNK =
-  TOOL_CALLING_MAP_CHUNK_SIZE;
+// Cloudflare preview Workers enforce the 50-subrequest invocation limit. Leave
+// headroom for coordinator/storage calls around row-level unbatched tool RPCs.
+export const UNBATCHED_TOOL_SUBREQUESTS_PER_CHUNK_BUDGET = 40;
+// Fresh unbatched tool calls use one RUNTIME_API integration execute RPC and
+// one HARNESS durable-receipt completion RPC. Batch-cap rows by both.
+export const SUBREQUESTS_PER_UNBATCHED_TOOL_CALL = 2;
 
 export type WorkerMapChunkPlanInput = {
   mapName: string;
   rowCountHint: number | null;
   executionPlan?: ExecutionPlan | null;
+  staticPipeline?: PlayStaticPipeline | null;
+};
+
+type PlanMap = ExecutionPlan['maps'][number];
+type ChunkSizingMap = Pick<
+  PlanMap,
+  | 'mapName'
+  | 'tableNamespace'
+  | 'outputFields'
+  | 'defaultChunkSize'
+  | 'stepsPerChunk'
+> &
+  Partial<Pick<PlanMap, 'externalStepFields'>>;
+type ChunkSizingPlan = {
+  maps: ChunkSizingMap[];
+  toolDeclarations?: ExecutionPlan['toolDeclarations'];
+  softWorkflowStepBudget?: number | null;
 };
 
+type MapToolStats = [totalToolCount: number, unbatchedToolCount: number];
+
+function declarationBelongsToMapOutput(
+  declaration: { field?: string | null },
+  outputFields: readonly string[],
+  externalStepFields: readonly string[] = [],
+): boolean {
+  const fieldName = declaration.field;
+  if (fieldName == null) return true;
+  if (
+    outputFields.some(
+      (field) => fieldName === field || fieldName.startsWith(`${field}.`),
+    )
+  ) {
+    return true;
+  }
+  return externalStepFields.some(
+    (field) => fieldName === field || fieldName.endsWith(`.${field}`),
+  );
+}
+
+function isUnbatchedTool(toolId: string): boolean {
+  return getPlayRuntimeBatchStrategy(toolId) === null;
+}
+
+function countToolSubsteps(
+  substeps: readonly PlayStaticSubstep[],
+): MapToolStats {
+  let totalToolCount = 0;
+  let unbatchedToolCount = 0;
+
+  for (const substep of substeps) {
+    if (substep.type === 'tool') {
+      totalToolCount += 1;
+      if (isUnbatchedTool(substep.toolId)) {
+        unbatchedToolCount += 1;
+      }
+      continue;
+    }
+
+    if (substep.type === 'waterfall') {
+      for (const step of substep.steps ?? []) {
+        if (!step.toolId) continue;
+        totalToolCount += 1;
+        if (isUnbatchedTool(step.toolId)) {
+          unbatchedToolCount += 1;
+        }
+      }
+      continue;
+    }
+
+    if (
+      substep.type === 'step_suite' ||
+      substep.type === 'control_flow' ||
+      substep.type === 'dataset'
+    ) {
+      const [nestedTotal, nestedUnbatched] = countToolSubsteps(
+        substep.steps ?? [],
+      );
+      totalToolCount += nestedTotal;
+      unbatchedToolCount += nestedUnbatched;
+    }
+  }
+
+  return [totalToolCount, unbatchedToolCount];
+}
+
+function countProducerTools(
+  producers: readonly PlayStaticColumnProducer[],
+): MapToolStats {
+  let totalToolCount = 0;
+  let unbatchedToolCount = 0;
+
+  for (const producer of producers) {
+    if (producer.kind === 'tool' && producer.toolId) {
+      totalToolCount += 1;
+      if (isUnbatchedTool(producer.toolId)) {
+        unbatchedToolCount += 1;
+      }
+    }
+    if (producer.substep.type === 'waterfall') {
+      for (const step of producer.substep.steps ?? []) {
+        if (!step.toolId) continue;
+        totalToolCount += 1;
+        if (isUnbatchedTool(step.toolId)) {
+          unbatchedToolCount += 1;
+        }
+      }
+    }
+    if (producer.steps?.length) {
+      const [nestedTotal, nestedUnbatched] = countProducerTools(producer.steps);
+      totalToolCount += nestedTotal;
+      unbatchedToolCount += nestedUnbatched;
+    }
+  }
+
+  return [totalToolCount, unbatchedToolCount];
+}
+
+function datasetBelongsToPlanMap(
+  dataset: Extract<PlayStaticSubstep, { type: 'dataset' }>,
+  planMap: ChunkSizingMap,
+  mapName: string,
+): boolean {
+  return [dataset.name, dataset.tableNamespace, dataset.field].some(
+    (datasetName) =>
+      typeof datasetName === 'string' &&
+      datasetName.length > 0 &&
+      (datasetName === planMap.mapName ||
+        datasetName === planMap.tableNamespace ||
+        datasetName === mapName),
+  );
+}
+
+function countMapLocalTools(input: {
+  staticPipeline: PlayStaticPipeline | null | undefined;
+  planMap: ChunkSizingMap | null | undefined;
+  mapName: string;
+}): MapToolStats | null {
+  if (!input.staticPipeline || !input.planMap) return null;
+  const planMap = input.planMap;
+  const dataset = flattenStaticSubsteps(
+    getTopLevelPipelineSubsteps(input.staticPipeline),
+  ).find(
+    (substep): substep is Extract<PlayStaticSubstep, { type: 'dataset' }> =>
+      substep.type === 'dataset' &&
+      datasetBelongsToPlanMap(substep, planMap, input.mapName),
+  );
+  if (!dataset) return null;
+
+  if (dataset.steps?.length) {
+    return countToolSubsteps(dataset.steps);
+  }
+
+  if (dataset.columns?.length) {
+    return countProducerTools(
+      dataset.columns.flatMap((column) => column.producers),
+    );
+  }
+
+  return [0, 0];
+}
+
+function countFallbackDeclarationTools(input: {
+  declarations: readonly { toolId: string; field?: string | null }[];
+  outputFields: readonly string[];
+  externalStepFields?: readonly string[];
+}): MapToolStats {
+  let totalToolCount = 0;
+  let unbatchedToolCount = 0;
+
+  for (const declaration of input.declarations) {
+    if (
+      !declarationBelongsToMapOutput(
+        declaration,
+        input.outputFields,
+        input.externalStepFields ?? [],
+      )
+    ) {
+      continue;
+    }
+    totalToolCount += 1;
+    if (isUnbatchedTool(declaration.toolId)) {
+      unbatchedToolCount += 1;
+    }
+  }
+
+  return [totalToolCount, unbatchedToolCount];
+}
+
+function countDeclarationTools(
+  declarations: readonly { toolId: string; field?: string | null }[],
+): MapToolStats {
+  return [
+    declarations.length,
+    declarations.filter((declaration) => isUnbatchedTool(declaration.toolId))
+      .length,
+  ];
+}
+
+function countNestedExecutionSteps(
+  substeps: readonly PlayStaticSubstep[] | undefined,
+): number {
+  let stepsPerChunk = 1;
+  for (const substep of substeps ?? []) {
+    if (substep.type === 'waterfall') {
+      stepsPerChunk = Math.max(stepsPerChunk, substep.steps?.length ?? 1);
+      continue;
+    }
+    if (substep.type === 'step_suite') {
+      stepsPerChunk = Math.max(stepsPerChunk, substep.steps.length);
+      continue;
+    }
+    if (substep.type === 'control_flow' || substep.type === 'dataset') {
+      stepsPerChunk = Math.max(
+        stepsPerChunk,
+        countNestedExecutionSteps(substep.steps),
+      );
+    }
+  }
+  return stepsPerChunk;
+}
+
+function buildStaticChunkSizingPlan(
+  staticPipeline: PlayStaticPipeline | null,
+): ChunkSizingPlan | null {
+  if (!staticPipeline) return null;
+  const datasets = flattenStaticSubsteps(
+    getTopLevelPipelineSubsteps(staticPipeline),
+  ).filter(
+    (substep): substep is Extract<PlayStaticSubstep, { type: 'dataset' }> =>
+      substep.type === 'dataset',
+  );
+  if (datasets.length === 0) return null;
+  return {
+    maps: datasets.map((dataset) => {
+      const stepsPerChunk = countNestedExecutionSteps(dataset.steps);
+      return {
+        mapName: dataset.name ?? dataset.field,
+        tableNamespace: dataset.tableNamespace ?? dataset.field,
+        outputFields: dataset.outputFields ?? [],
+        defaultChunkSize: stepsPerChunk > 1 ? 1_000 : 5_000,
+        stepsPerChunk,
+      };
+    }),
+  };
+}
+
 export function chooseWorkerMapRowsPerChunk(
   input: WorkerMapChunkPlanInput,
 ): number {
-  const plan = input.executionPlan ?? null;
+  const plan: ChunkSizingPlan | null = input.executionPlan
+    ? {
+        maps: input.executionPlan.maps,
+        toolDeclarations: input.executionPlan.toolDeclarations,
+        softWorkflowStepBudget:
+          input.executionPlan.chunkPlan.softWorkflowStepBudget,
+      }
+    : buildStaticChunkSizingPlan(input.staticPipeline ?? null);
   const planMap = plan?.maps.find(
     (candidate) =>
       candidate.mapName === input.mapName ||
       candidate.tableNamespace === input.mapName,
   );
+  const staticMapToolStats = countMapLocalTools({
+    staticPipeline: input.staticPipeline,
+    planMap,
+    mapName: input.mapName,
+  });
+  const mapToolStats =
+    staticMapToolStats ??
+    (plan && planMap
+      ? countFallbackDeclarationTools({
+          declarations: plan.toolDeclarations ?? [],
+          outputFields: planMap.outputFields,
+          externalStepFields: planMap.externalStepFields ?? [],
+        })
+      : plan
+        ? countDeclarationTools(plan.toolDeclarations ?? [])
+        : [0, 0]);
   const rowsPerChunk = chooseMapChunkSize({
     totalRows: input.rowCountHint,
     mapCount: Math.max(1, plan?.maps.length ?? 1),
     stepsPerChunk: planMap?.stepsPerChunk ?? 1,
     preferredChunkSize: planMap?.defaultChunkSize,
-    softWorkflowStepBudget: plan?.chunkPlan.softWorkflowStepBudget,
+    softWorkflowStepBudget: plan?.softWorkflowStepBudget,
   });
-  const estimatedSubrequestProducingSteps =
-    estimateSubrequestProducingStepsForMap(plan, planMap);
-  if (estimatedSubrequestProducingSteps > 0) {
-    const subrequestSafeRows = Math.max(
-      1,
-      Math.floor(
-        WORKER_SUBREQUEST_SAFE_TOOL_CALLS_PER_CHUNK /
-          estimatedSubrequestProducingSteps,
-      ),
-    );
-    if (subrequestSafeRows < rowsPerChunk) {
-      if (input.rowCountHint === null || !Number.isFinite(input.rowCountHint)) {
-        return subrequestSafeRows;
-      }
-      const totalRows = Math.max(0, Math.floor(input.rowCountHint));
-      const mapCount = Math.max(1, plan?.maps.length ?? 1);
-      const softBudget =
-        plan?.chunkPlan.softWorkflowStepBudget ??
-        EXECUTION_PLAN_DEFAULTS.workflowSoftStepBudget;
-      const maxChunksPerMap = Math.max(
-        1,
-        Math.floor(
-          Math.max(
-            mapCount,
-            Math.floor(
-              (softBudget -
-                EXECUTION_PLAN_DEFAULTS.ingestStepCount -
-                EXECUTION_PLAN_DEFAULTS.finalizationStepCount) /
-                estimatedSubrequestProducingSteps,
-            ),
-          ) / mapCount,
-        ),
-      );
-      const requiredChunks = Math.ceil(totalRows / subrequestSafeRows);
-      if (requiredChunks <= maxChunksPerMap) return subrequestSafeRows;
-      throw new Error(
-        `Worker budget exceeded for map "${input.mapName}": ${requiredChunks}/${maxChunksPerMap} chunks.`,
-      );
-    }
-    return rowsPerChunk;
-  }
 
   const toolFreeSimpleMap =
-    !!planMap &&
-    planMap.stepsPerChunk === 1 &&
-    estimateSubrequestProducingStepsForMap(plan, planMap) === 0;
+    !!planMap && planMap.stepsPerChunk === 1 && mapToolStats[0] === 0;
   if (
     toolFreeSimpleMap &&
     (input.rowCountHint === null ||
@@ -86,75 +322,22 @@ export function chooseWorkerMapRowsPerChunk(
     return Math.max(rowsPerChunk, CACHE_ENABLED_SIMPLE_MAP_CHUNK_SIZE);
   }
 
-  return rowsPerChunk;
-}
-
-function estimateSubrequestProducingStepsForMap(
-  plan: ExecutionPlan | null,
-  planMap: ExecutionPlan['maps'][number] | undefined,
-): number {
-  const toolDeclarations = plan?.toolDeclarations ?? [];
-  if (!planMap) {
-    return toolDeclarations.length;
-  }
-  const explicitExternalSteps = Array.isArray(planMap.externalStepFields)
-    ? planMap.externalStepFields.length
-    : 0;
-  const mapStepsPerChunk =
-    explicitExternalSteps > 0
-      ? 0
-      : (planMap.stepsPerChunk ?? 1) > 1
-        ? (planMap.stepsPerChunk ?? 1)
-        : 0;
-  if (toolDeclarations.length === 0) {
-    return Math.max(mapStepsPerChunk, explicitExternalSteps);
-  }
-  const outputFields = new Set(
-    planMap.outputFields.map((field) => field.trim()).filter(Boolean),
-  );
-  const explicitExternalStepFields = new Set(
-    (planMap.externalStepFields ?? [])
-      .map((field) => field.trim())
-      .filter(Boolean),
-  );
-  const hasModernStepMetadata =
-    Array.isArray(planMap.stepFields) ||
-    Array.isArray(planMap.externalStepFields);
-  const mapFields = new Set([
-    planMap.mapName,
-    planMap.tableNamespace,
-    ...planMap.outputFields,
-    ...(planMap.externalStepFields ?? []),
-    ...(hasModernStepMetadata ? [] : (planMap.stepFields ?? [])),
-    ...planMap.waterfallStages.flatMap((stage) => [
-      stage.waterfallId,
-      ...stage.stageIds,
-    ]),
-  ]);
-  let scopedToolDeclarations = 0;
-  for (const declaration of toolDeclarations) {
-    const field = declaration.field?.trim();
-    if (!field) continue;
-    if (mapFields.has(field)) {
-      scopedToolDeclarations += 1;
-      continue;
-    }
-    if (!field.includes('.')) {
-      continue;
-    }
-    const firstSegment = field.slice(0, field.indexOf('.'));
-    const lastSegment = field.slice(field.lastIndexOf('.') + 1);
-    if (
-      outputFields.has(firstSegment) ||
-      explicitExternalStepFields.has(lastSegment) ||
-      (!hasModernStepMetadata && outputFields.has(lastSegment))
-    ) {
-      scopedToolDeclarations += 1;
-    }
+  if (mapToolStats[1] > 0) {
+    const unbatchedToolCallsPerRow =
+      staticMapToolStats !== null
+        ? mapToolStats[1]
+        : Math.max(planMap?.stepsPerChunk ?? 1, mapToolStats[1]);
+    const unbatchedSubrequestsPerRow =
+      unbatchedToolCallsPerRow * SUBREQUESTS_PER_UNBATCHED_TOOL_CALL;
+    const unbatchedToolRowsPerChunk = Math.max(
+      1,
+      Math.floor(
+        UNBATCHED_TOOL_SUBREQUESTS_PER_CHUNK_BUDGET /
+          unbatchedSubrequestsPerRow,
+      ),
+    );
+    return Math.min(rowsPerChunk, unbatchedToolRowsPerChunk);
   }
-  return Math.max(
-    mapStepsPerChunk,
-    explicitExternalSteps,
-    scopedToolDeclarations,
-  );
+
+  return rowsPerChunk;
 }

package/dist/bundling-sources/sdk/src/release.ts

@@ -104,10 +104,10 @@ export const SDK_RELEASE = {
   // 0.1.111 ships dataset-native tool list getters and result row datasets.
   // 0.1.154 removes the short-lived generated enrich StepOptions recompute
   // fields shipped in 0.1.153.
-  version: '0.1.163',
+  version: '0.1.164',
   apiContract: '2026-06-dataset-handle-results-hard-cutover',
   supportPolicy: {
-    latest: '0.1.163',
+    latest: '0.1.164',
     minimumSupported: '0.1.53',
     deprecatedBelow: '0.1.53',
     commandMinimumSupported: [

package/dist/cli/index.js

@@ -622,10 +622,10 @@ var SDK_RELEASE = {
   // 0.1.111 ships dataset-native tool list getters and result row datasets.
   // 0.1.154 removes the short-lived generated enrich StepOptions recompute
   // fields shipped in 0.1.153.
-  version: "0.1.163",
+  version: "0.1.164",
   apiContract: "2026-06-dataset-handle-results-hard-cutover",
   supportPolicy: {
-    latest: "0.1.163",
+    latest: "0.1.164",
     minimumSupported: "0.1.53",
     deprecatedBelow: "0.1.53",
     commandMinimumSupported: [
@@ -5421,6 +5421,7 @@ async function handleUsage(options) {
   const params = new URLSearchParams();
   if (options.limit) params.set("recent_limit", options.limit);
   if (options.offset) params.set("recent_offset", options.offset);
+  if (options.runId) params.set("run_id", options.runId);
   const suffix = Array.from(params).length > 0 ? `?${params.toString()}` : "";
   const payload = await http.get(
     `/api/v2/billing/usage${suffix}`
@@ -5973,8 +5974,9 @@ Notes:
 Examples:
   deepline billing usage
   deepline billing usage --limit 50 --offset 50 --json
+  deepline billing usage --run-id play/example/run/20260630t120000-000-abcdef --json
 `
-  ).option("--limit <n>", "Recent-call page size").option("--offset <n>", "Recent-call offset").option("--json", "Emit JSON output. Also automatic when stdout is piped").action(handleUsage);
+  ).option("--limit <n>", "Recent-call page size").option("--offset <n>", "Recent-call offset").option("--run-id <run_id>", "Show recent usage for one play run").option("--json", "Emit JSON output. Also automatic when stdout is piped").action(handleUsage);
   billing.command("limit").description("Show configured monthly limit state.").addHelpText(
     "after",
     `
@@ -16830,6 +16832,8 @@ var ENRICH_EXPORT_BACKING_ROWS_WAIT_MS = 6e4;
 var ENRICH_EXPORT_BACKING_ROWS_POLL_MS = 1e3;
 var ENRICH_SOURCE_ROW_INDEX_COLUMN = "__deeplineSourceRowIndex";
 var ENRICH_ORIGINAL_SOURCE_ROW_INDEX_COLUMN = "__deeplineOriginalSourceRowIndex";
+var ENRICH_CELL_META_FIELD = "__deeplineCellMeta";
+var ENRICH_CELL_META_PATCH_FIELD = "__deeplineCellMetaPatch";
 var EXIT_SERVER2 = 5;
 var ENRICH_DEBUG_T0 = Date.now();
 var GENERATED_ENRICH_ROWS_TABLE_NAMESPACE = "deepline_enrich_rows";
@@ -17902,6 +17906,18 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
   const data = record.data;
   if (data && typeof data === "object" && !Array.isArray(data)) {
     const exported = { ...data };
+    applyFailureCellMeta(exported, exported[ENRICH_CELL_META_FIELD], {
+      rowError: record.error
+    });
+    applyFailureCellMeta(exported, record.cellMeta, { rowError: record.error });
+    applyFailureCellMeta(exported, record.cellMetaPatch, {
+      rowError: record.error
+    });
+    applyFailureCellMeta(exported, record[ENRICH_CELL_META_PATCH_FIELD], {
+      rowError: record.error
+    });
+    delete exported[ENRICH_CELL_META_FIELD];
+    delete exported[ENRICH_CELL_META_PATCH_FIELD];
     const inputIndex = typeof record.inputIndex === "number" ? record.inputIndex : typeof record.inputIndex === "string" && record.inputIndex.trim() ? Number(record.inputIndex) : Number.NaN;
     if (Number.isInteger(inputIndex) && inputIndex >= 0) {
       if (ENRICH_SOURCE_ROW_INDEX_COLUMN in exported) {
@@ -17912,6 +17928,18 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
     return exported;
   }
   const fallback = { ...record };
+  applyFailureCellMeta(fallback, fallback[ENRICH_CELL_META_FIELD], {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, record.cellMeta, {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, record.cellMetaPatch, {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, fallback[ENRICH_CELL_META_PATCH_FIELD], {
+    rowError: record.error
+  });
   for (const key of [
     "key",
     "status",
@@ -17919,6 +17947,8 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
     "inputIndex",
     "runId",
     "error",
+    ENRICH_CELL_META_FIELD,
+    ENRICH_CELL_META_PATCH_FIELD,
     "stage",
     "provider",
     "seq",
@@ -17929,6 +17959,45 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
   }
   return fallback;
 }
+function failureCellFromMeta(meta, fallback) {
+  if (!isRecord7(meta)) {
+    return null;
+  }
+  const status = typeof meta.status === "string" ? meta.status.trim().toLowerCase() : "";
+  const hasFailureStatus = status === "failed" || status === "error";
+  const explicitError = typeof meta.error === "string" && meta.error.trim() ? meta.error.trim() : typeof meta.last_error === "string" && meta.last_error.trim() ? meta.last_error.trim() : typeof meta.message === "string" && meta.message.trim() ? meta.message.trim() : "";
+  if (!hasFailureStatus && !explicitError) {
+    return null;
+  }
+  const fallbackError = hasFailureStatus && typeof fallback.rowError === "string" && fallback.rowError.trim() ? fallback.rowError.trim() : "";
+  const error = explicitError || fallbackError;
+  const message = error || `Column status: ${status || "failed"}`;
+  return {
+    status: status || "failed",
+    error: message,
+    ...typeof meta.operation === "string" && meta.operation.trim() ? { operation: meta.operation.trim() } : {},
+    ...typeof meta.provider === "string" && meta.provider.trim() ? { provider: meta.provider.trim() } : {}
+  };
+}
+function applyFailureCellMeta(row, cellMeta, fallback) {
+  if (!isRecord7(cellMeta)) {
+    return;
+  }
+  for (const [field, meta] of Object.entries(cellMeta)) {
+    if (!field || field.startsWith("__")) {
+      continue;
+    }
+    const failure = failureCellFromMeta(meta, fallback);
+    if (!failure) {
+      continue;
+    }
+    const existing = row[field];
+    if (isNonEmptyCsvCell(existing) && !cellFailureError(existing)) {
+      continue;
+    }
+    row[field] = failure;
+  }
+}
 function mergeExportedSheetRow(target, next) {
   const baseMetadata = target._metadata;
   const nextMetadata = next._metadata;
@@ -17990,7 +18059,7 @@ function stripEnrichSourceRowIndex(row) {
   }
   return stripped;
 }
-function collectHardFailureAliases(config) {
+function collectHardFailureAliasSpecs(config) {
   const aliases = [];
   const seen = /* @__PURE__ */ new Set();
   for (const command of config.commands) {
@@ -18005,10 +18074,25 @@ function collectHardFailureAliases(config) {
       continue;
     }
     seen.add(alias);
-    aliases.push(alias);
+    aliases.push({
+      alias,
+      operation: command.operation?.trim() || command.tool.trim() || void 0
+    });
   }
   return aliases;
 }
+function hardFailureOperationByAlias(config) {
+  const operations = /* @__PURE__ */ new Map();
+  if (!config) {
+    return operations;
+  }
+  for (const spec of collectHardFailureAliasSpecs(config)) {
+    if (spec.operation) {
+      operations.set(normalizeAlias2(spec.alias), spec.operation);
+    }
+  }
+  return operations;
+}
 function cellFailureError(value) {
   const parsed = parseMaybeJsonObject(value);
   if (!isRecord7(parsed)) {
@@ -18118,14 +18202,15 @@ function aliasFlattenedCells(row, alias) {
   return cells;
 }
 function collectEnrichFailureJobs(input2) {
-  const aliases = collectHardFailureAliases(input2.config);
+  const aliases = collectHardFailureAliasSpecs(input2.config);
   if (aliases.length === 0 || input2.rows.length === 0) {
     return [];
   }
   const rowOffset = input2.rowStart ?? 0;
   const jobs = [];
   input2.rows.forEach((row, rowIndex) => {
-    aliases.forEach((alias, aliasIndex) => {
+    aliases.forEach((spec, aliasIndex) => {
+      const { alias } = spec;
       const failure = aliasFailureCellCandidates(row, alias).map(cellFailureError).find(
         (candidate) => Boolean(candidate)
       );
@@ -18133,15 +18218,20 @@ function collectEnrichFailureJobs(input2) {
         return;
       }
       const rowId = sourceRowIndexFromEnrichRow(row, 0, Number.MAX_SAFE_INTEGER) ?? rowOffset + rowIndex;
+      const operation = failure.operation ?? spec.operation;
+      const message = enrichFailureMessageWithOperation(
+        failure.message,
+        operation
+      );
       jobs.push({
         job_id: `row-${rowId}-${alias}`,
         row_id: rowId,
         col_index: aliasIndex,
         column: alias,
         status: "failed",
-        last_error: failure.message,
-        error: failure.message,
-        ...failure.operation ? { operation: failure.operation } : {},
+        last_error: message,
+        error: message,
+        ...operation ? { operation } : {},
         ...failure.provider ? { provider: failure.provider } : {}
       });
     });
@@ -18149,7 +18239,7 @@ function collectEnrichFailureJobs(input2) {
   return jobs;
 }
 function collectStatusFailureJobs(input2) {
-  const aliases = collectHardFailureAliases(input2.config);
+  const aliases = collectHardFailureAliasSpecs(input2.config);
   if (aliases.length === 0) {
     return [];
   }
@@ -18157,7 +18247,8 @@ function collectStatusFailureJobs(input2) {
   const rowStart = input2.rowRange.rowStart ?? 0;
   const selectedRows = input2.rowRange.rowEnd !== null && input2.rowRange.rowEnd >= rowStart ? input2.rowRange.rowEnd - rowStart + 1 : Number.MAX_SAFE_INTEGER;
   const jobs = [];
-  aliases.forEach((alias, aliasIndex) => {
+  aliases.forEach((spec, aliasIndex) => {
+    const { alias } = spec;
     const stat2 = summaries.map((summary) => summary[alias]).find(isRecord7);
     if (!stat2) {
       return;
@@ -18174,7 +18265,12 @@ function collectStatusFailureJobs(input2) {
     if (!Number.isFinite(failedCount) || failedCount <= 0) {
       return;
     }
-    const message = firstCollectedStringField(stat2, "error") ?? firstCollectedStringField(stat2, "message") ?? `Column ${alias} failed for ${failedCount} row(s).`;
+    const message = statusFailureMessage({
+      stat: stat2,
+      alias,
+      failedCount,
+      operation: spec.operation
+    });
     for (let offset = 0; offset < failedCount; offset += 1) {
       const rowId = rowStart + offset;
       jobs.push({
@@ -18190,6 +18286,26 @@ function collectStatusFailureJobs(input2) {
   });
   return jobs;
 }
+function statusFailureMessage(input2) {
+  const raw = firstCollectedStringField(input2.stat, "error") ?? firstCollectedStringField(input2.stat, "message");
+  if (!raw) {
+    return `Column ${input2.alias} failed for ${input2.failedCount} row(s).`;
+  }
+  return enrichFailureMessageWithOperation(raw, input2.operation);
+}
+function enrichFailureMessageWithOperation(message, operation) {
+  const raw = message.trim();
+  const marker = operation?.trim();
+  if (!marker || raw.includes(marker)) {
+    return raw;
+  }
+  if (/^(?:[A-Za-z0-9_:-]+:\s*)?(?:Error|TypeError|ReferenceError|SyntaxError|RangeError):\s+/.test(
+    raw
+  )) {
+    return `${marker}: ${raw}`;
+  }
+  return `${marker}: Error: ${raw}`;
+}
 function collectCompleteStatusFailureMessages(input2) {
   const requiredCount = Math.max(1, Math.trunc(input2.rowCount));
   const jobs = collectStatusFailureJobs({
@@ -18756,6 +18872,7 @@ function materializeAliasSuccessCell(row, alias) {
 }
 function normalizeEnrichRowsForCsvExport(rows, config, options) {
   const aliases = config ? collectConfigScalarAliasOrder(config) : [];
+  const failureOperationByAlias = hardFailureOperationByAlias(config);
   return rows.map((row) => {
     const metadata = legacyMetadataFromRow(row);
     const normalized = metadata ? { ...row, _metadata: metadata } : { ...row };
@@ -18790,7 +18907,10 @@ function normalizeEnrichRowsForCsvExport(rows, config, options) {
         (candidate) => Boolean(candidate)
       );
       if (failure) {
-        normalized[alias] = failure.message;
+        normalized[alias] = enrichFailureMessageWithOperation(
+          failure.message,
+          failure.operation ?? failureOperationByAlias.get(normalizeAlias2(alias))
+        );
       }
     }
     for (const alias of aliases) {
@@ -18799,21 +18919,24 @@ function normalizeEnrichRowsForCsvExport(rows, config, options) {
         normalized[alias] = value;
         continue;
       }
-      if (isNonEmptyCsvCell(normalized[alias])) {
-        continue;
-      }
       const failure = aliasFailureCellCandidates(normalized, alias).map(cellFailureError).find(
         (candidate) => Boolean(candidate)
       );
       if (failure) {
-        normalized[alias] = failure.message;
+        normalized[alias] = enrichFailureMessageWithOperation(
+          failure.message,
+          failure.operation ?? failureOperationByAlias.get(normalizeAlias2(alias))
+        );
+        continue;
+      }
+      if (isNonEmptyCsvCell(normalized[alias])) {
         continue;
       }
-      const statusFailureMessage = options?.statusFailureMessages?.get(
+      const statusFailureMessage2 = options?.statusFailureMessages?.get(
         normalizeAlias2(alias)
       );
-      if (statusFailureMessage) {
-        normalized[alias] = statusFailureMessage;
+      if (statusFailureMessage2) {
+        normalized[alias] = statusFailureMessage2;
       }
     }
     return normalized;

package/dist/cli/index.mjs

@@ -607,10 +607,10 @@ var SDK_RELEASE = {
   // 0.1.111 ships dataset-native tool list getters and result row datasets.
   // 0.1.154 removes the short-lived generated enrich StepOptions recompute
   // fields shipped in 0.1.153.
-  version: "0.1.163",
+  version: "0.1.164",
   apiContract: "2026-06-dataset-handle-results-hard-cutover",
   supportPolicy: {
-    latest: "0.1.163",
+    latest: "0.1.164",
     minimumSupported: "0.1.53",
     deprecatedBelow: "0.1.53",
     commandMinimumSupported: [
@@ -5418,6 +5418,7 @@ async function handleUsage(options) {
   const params = new URLSearchParams();
   if (options.limit) params.set("recent_limit", options.limit);
   if (options.offset) params.set("recent_offset", options.offset);
+  if (options.runId) params.set("run_id", options.runId);
   const suffix = Array.from(params).length > 0 ? `?${params.toString()}` : "";
   const payload = await http.get(
     `/api/v2/billing/usage${suffix}`
@@ -5970,8 +5971,9 @@ Notes:
 Examples:
   deepline billing usage
   deepline billing usage --limit 50 --offset 50 --json
+  deepline billing usage --run-id play/example/run/20260630t120000-000-abcdef --json
 `
-  ).option("--limit <n>", "Recent-call page size").option("--offset <n>", "Recent-call offset").option("--json", "Emit JSON output. Also automatic when stdout is piped").action(handleUsage);
+  ).option("--limit <n>", "Recent-call page size").option("--offset <n>", "Recent-call offset").option("--run-id <run_id>", "Show recent usage for one play run").option("--json", "Emit JSON output. Also automatic when stdout is piped").action(handleUsage);
   billing.command("limit").description("Show configured monthly limit state.").addHelpText(
     "after",
     `
@@ -16857,6 +16859,8 @@ var ENRICH_EXPORT_BACKING_ROWS_WAIT_MS = 6e4;
 var ENRICH_EXPORT_BACKING_ROWS_POLL_MS = 1e3;
 var ENRICH_SOURCE_ROW_INDEX_COLUMN = "__deeplineSourceRowIndex";
 var ENRICH_ORIGINAL_SOURCE_ROW_INDEX_COLUMN = "__deeplineOriginalSourceRowIndex";
+var ENRICH_CELL_META_FIELD = "__deeplineCellMeta";
+var ENRICH_CELL_META_PATCH_FIELD = "__deeplineCellMetaPatch";
 var EXIT_SERVER2 = 5;
 var ENRICH_DEBUG_T0 = Date.now();
 var GENERATED_ENRICH_ROWS_TABLE_NAMESPACE = "deepline_enrich_rows";
@@ -17929,6 +17933,18 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
   const data = record.data;
   if (data && typeof data === "object" && !Array.isArray(data)) {
     const exported = { ...data };
+    applyFailureCellMeta(exported, exported[ENRICH_CELL_META_FIELD], {
+      rowError: record.error
+    });
+    applyFailureCellMeta(exported, record.cellMeta, { rowError: record.error });
+    applyFailureCellMeta(exported, record.cellMetaPatch, {
+      rowError: record.error
+    });
+    applyFailureCellMeta(exported, record[ENRICH_CELL_META_PATCH_FIELD], {
+      rowError: record.error
+    });
+    delete exported[ENRICH_CELL_META_FIELD];
+    delete exported[ENRICH_CELL_META_PATCH_FIELD];
     const inputIndex = typeof record.inputIndex === "number" ? record.inputIndex : typeof record.inputIndex === "string" && record.inputIndex.trim() ? Number(record.inputIndex) : Number.NaN;
     if (Number.isInteger(inputIndex) && inputIndex >= 0) {
       if (ENRICH_SOURCE_ROW_INDEX_COLUMN in exported) {
@@ -17939,6 +17955,18 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
     return exported;
   }
   const fallback = { ...record };
+  applyFailureCellMeta(fallback, fallback[ENRICH_CELL_META_FIELD], {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, record.cellMeta, {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, record.cellMetaPatch, {
+    rowError: record.error
+  });
+  applyFailureCellMeta(fallback, fallback[ENRICH_CELL_META_PATCH_FIELD], {
+    rowError: record.error
+  });
   for (const key of [
     "key",
     "status",
@@ -17946,6 +17974,8 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
     "inputIndex",
     "runId",
     "error",
+    ENRICH_CELL_META_FIELD,
+    ENRICH_CELL_META_PATCH_FIELD,
     "stage",
     "provider",
     "seq",
@@ -17956,6 +17986,45 @@ function exportableSheetRow2(row, sourceRowStart = 0) {
   }
   return fallback;
 }
+function failureCellFromMeta(meta, fallback) {
+  if (!isRecord7(meta)) {
+    return null;
+  }
+  const status = typeof meta.status === "string" ? meta.status.trim().toLowerCase() : "";
+  const hasFailureStatus = status === "failed" || status === "error";
+  const explicitError = typeof meta.error === "string" && meta.error.trim() ? meta.error.trim() : typeof meta.last_error === "string" && meta.last_error.trim() ? meta.last_error.trim() : typeof meta.message === "string" && meta.message.trim() ? meta.message.trim() : "";
+  if (!hasFailureStatus && !explicitError) {
+    return null;
+  }
+  const fallbackError = hasFailureStatus && typeof fallback.rowError === "string" && fallback.rowError.trim() ? fallback.rowError.trim() : "";
+  const error = explicitError || fallbackError;
+  const message = error || `Column status: ${status || "failed"}`;
+  return {
+    status: status || "failed",
+    error: message,
+    ...typeof meta.operation === "string" && meta.operation.trim() ? { operation: meta.operation.trim() } : {},
+    ...typeof meta.provider === "string" && meta.provider.trim() ? { provider: meta.provider.trim() } : {}
+  };
+}
+function applyFailureCellMeta(row, cellMeta, fallback) {
+  if (!isRecord7(cellMeta)) {
+    return;
+  }
+  for (const [field, meta] of Object.entries(cellMeta)) {
+    if (!field || field.startsWith("__")) {
+      continue;
+    }
+    const failure = failureCellFromMeta(meta, fallback);
+    if (!failure) {
+      continue;
+    }
+    const existing = row[field];
+    if (isNonEmptyCsvCell(existing) && !cellFailureError(existing)) {
+      continue;
+    }
+    row[field] = failure;
+  }
+}
 function mergeExportedSheetRow(target, next) {
   const baseMetadata = target._metadata;
   const nextMetadata = next._metadata;
@@ -18017,7 +18086,7 @@ function stripEnrichSourceRowIndex(row) {
   }
   return stripped;
 }
-function collectHardFailureAliases(config) {
+function collectHardFailureAliasSpecs(config) {
   const aliases = [];
   const seen = /* @__PURE__ */ new Set();
   for (const command of config.commands) {
@@ -18032,10 +18101,25 @@ function collectHardFailureAliases(config) {
       continue;
     }
     seen.add(alias);
-    aliases.push(alias);
+    aliases.push({
+      alias,
+      operation: command.operation?.trim() || command.tool.trim() || void 0
+    });
   }
   return aliases;
 }
+function hardFailureOperationByAlias(config) {
+  const operations = /* @__PURE__ */ new Map();
+  if (!config) {
+    return operations;
+  }
+  for (const spec of collectHardFailureAliasSpecs(config)) {
+    if (spec.operation) {
+      operations.set(normalizeAlias2(spec.alias), spec.operation);
+    }
+  }
+  return operations;
+}
 function cellFailureError(value) {
   const parsed = parseMaybeJsonObject(value);
   if (!isRecord7(parsed)) {
@@ -18145,14 +18229,15 @@ function aliasFlattenedCells(row, alias) {
   return cells;
 }
 function collectEnrichFailureJobs(input2) {
-  const aliases = collectHardFailureAliases(input2.config);
+  const aliases = collectHardFailureAliasSpecs(input2.config);
   if (aliases.length === 0 || input2.rows.length === 0) {
     return [];
   }
   const rowOffset = input2.rowStart ?? 0;
   const jobs = [];
   input2.rows.forEach((row, rowIndex) => {
-    aliases.forEach((alias, aliasIndex) => {
+    aliases.forEach((spec, aliasIndex) => {
+      const { alias } = spec;
       const failure = aliasFailureCellCandidates(row, alias).map(cellFailureError).find(
         (candidate) => Boolean(candidate)
       );
@@ -18160,15 +18245,20 @@ function collectEnrichFailureJobs(input2) {
         return;
       }
       const rowId = sourceRowIndexFromEnrichRow(row, 0, Number.MAX_SAFE_INTEGER) ?? rowOffset + rowIndex;
+      const operation = failure.operation ?? spec.operation;
+      const message = enrichFailureMessageWithOperation(
+        failure.message,
+        operation
+      );
       jobs.push({
         job_id: `row-${rowId}-${alias}`,
         row_id: rowId,
         col_index: aliasIndex,
         column: alias,
         status: "failed",
-        last_error: failure.message,
-        error: failure.message,
-        ...failure.operation ? { operation: failure.operation } : {},
+        last_error: message,
+        error: message,
+        ...operation ? { operation } : {},
         ...failure.provider ? { provider: failure.provider } : {}
       });
     });
@@ -18176,7 +18266,7 @@ function collectEnrichFailureJobs(input2) {
   return jobs;
 }
 function collectStatusFailureJobs(input2) {
-  const aliases = collectHardFailureAliases(input2.config);
+  const aliases = collectHardFailureAliasSpecs(input2.config);
   if (aliases.length === 0) {
     return [];
   }
@@ -18184,7 +18274,8 @@ function collectStatusFailureJobs(input2) {
   const rowStart = input2.rowRange.rowStart ?? 0;
   const selectedRows = input2.rowRange.rowEnd !== null && input2.rowRange.rowEnd >= rowStart ? input2.rowRange.rowEnd - rowStart + 1 : Number.MAX_SAFE_INTEGER;
   const jobs = [];
-  aliases.forEach((alias, aliasIndex) => {
+  aliases.forEach((spec, aliasIndex) => {
+    const { alias } = spec;
     const stat2 = summaries.map((summary) => summary[alias]).find(isRecord7);
     if (!stat2) {
       return;
@@ -18201,7 +18292,12 @@ function collectStatusFailureJobs(input2) {
     if (!Number.isFinite(failedCount) || failedCount <= 0) {
       return;
     }
-    const message = firstCollectedStringField(stat2, "error") ?? firstCollectedStringField(stat2, "message") ?? `Column ${alias} failed for ${failedCount} row(s).`;
+    const message = statusFailureMessage({
+      stat: stat2,
+      alias,
+      failedCount,
+      operation: spec.operation
+    });
     for (let offset = 0; offset < failedCount; offset += 1) {
       const rowId = rowStart + offset;
       jobs.push({
@@ -18217,6 +18313,26 @@ function collectStatusFailureJobs(input2) {
   });
   return jobs;
 }
+function statusFailureMessage(input2) {
+  const raw = firstCollectedStringField(input2.stat, "error") ?? firstCollectedStringField(input2.stat, "message");
+  if (!raw) {
+    return `Column ${input2.alias} failed for ${input2.failedCount} row(s).`;
+  }
+  return enrichFailureMessageWithOperation(raw, input2.operation);
+}
+function enrichFailureMessageWithOperation(message, operation) {
+  const raw = message.trim();
+  const marker = operation?.trim();
+  if (!marker || raw.includes(marker)) {
+    return raw;
+  }
+  if (/^(?:[A-Za-z0-9_:-]+:\s*)?(?:Error|TypeError|ReferenceError|SyntaxError|RangeError):\s+/.test(
+    raw
+  )) {
+    return `${marker}: ${raw}`;
+  }
+  return `${marker}: Error: ${raw}`;
+}
 function collectCompleteStatusFailureMessages(input2) {
   const requiredCount = Math.max(1, Math.trunc(input2.rowCount));
   const jobs = collectStatusFailureJobs({
@@ -18783,6 +18899,7 @@ function materializeAliasSuccessCell(row, alias) {
 }
 function normalizeEnrichRowsForCsvExport(rows, config, options) {
   const aliases = config ? collectConfigScalarAliasOrder(config) : [];
+  const failureOperationByAlias = hardFailureOperationByAlias(config);
   return rows.map((row) => {
     const metadata = legacyMetadataFromRow(row);
     const normalized = metadata ? { ...row, _metadata: metadata } : { ...row };
@@ -18817,7 +18934,10 @@ function normalizeEnrichRowsForCsvExport(rows, config, options) {
         (candidate) => Boolean(candidate)
       );
       if (failure) {
-        normalized[alias] = failure.message;
+        normalized[alias] = enrichFailureMessageWithOperation(
+          failure.message,
+          failure.operation ?? failureOperationByAlias.get(normalizeAlias2(alias))
+        );
       }
     }
     for (const alias of aliases) {
@@ -18826,21 +18946,24 @@ function normalizeEnrichRowsForCsvExport(rows, config, options) {
         normalized[alias] = value;
         continue;
       }
-      if (isNonEmptyCsvCell(normalized[alias])) {
-        continue;
-      }
       const failure = aliasFailureCellCandidates(normalized, alias).map(cellFailureError).find(
         (candidate) => Boolean(candidate)
       );
       if (failure) {
-        normalized[alias] = failure.message;
+        normalized[alias] = enrichFailureMessageWithOperation(
+          failure.message,
+          failure.operation ?? failureOperationByAlias.get(normalizeAlias2(alias))
+        );
+        continue;
+      }
+      if (isNonEmptyCsvCell(normalized[alias])) {
         continue;
       }
-      const statusFailureMessage = options?.statusFailureMessages?.get(
+      const statusFailureMessage2 = options?.statusFailureMessages?.get(
         normalizeAlias2(alias)
       );
-      if (statusFailureMessage) {
-        normalized[alias] = statusFailureMessage;
+      if (statusFailureMessage2) {
+        normalized[alias] = statusFailureMessage2;
       }
     }
     return normalized;

package/dist/index.js

@@ -421,10 +421,10 @@ var SDK_RELEASE = {
   // 0.1.111 ships dataset-native tool list getters and result row datasets.
   // 0.1.154 removes the short-lived generated enrich StepOptions recompute
   // fields shipped in 0.1.153.
-  version: "0.1.163",
+  version: "0.1.164",
   apiContract: "2026-06-dataset-handle-results-hard-cutover",
   supportPolicy: {
-    latest: "0.1.163",
+    latest: "0.1.164",
     minimumSupported: "0.1.53",
     deprecatedBelow: "0.1.53",
     commandMinimumSupported: [

package/dist/index.mjs

@@ -351,10 +351,10 @@ var SDK_RELEASE = {
   // 0.1.111 ships dataset-native tool list getters and result row datasets.
   // 0.1.154 removes the short-lived generated enrich StepOptions recompute
   // fields shipped in 0.1.153.
-  version: "0.1.163",
+  version: "0.1.164",
   apiContract: "2026-06-dataset-handle-results-hard-cutover",
   supportPolicy: {
-    latest: "0.1.163",
+    latest: "0.1.164",
     minimumSupported: "0.1.53",
     deprecatedBelow: "0.1.53",
     commandMinimumSupported: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepline",
-  "version": "0.1.163",
+  "version": "0.1.164",
   "description": "Deepline SDK + CLI — B2B data enrichment powered by durable cloud execution",
   "license": "MIT",
   "repository": {