deepline 0.1.35 → 0.1.36

package/dist/index.d.mts

@@ -260,15 +260,9 @@ interface ToolDefinition {
         execute?: string;
         toolExecutionResult?: {
             type?: 'ToolExecutionResult';
-            toolOutput?: {
-                raw?: string | {
-                    path?: string;
-                    schema?: Record<string, unknown>;
-                };
-                meta?: string | {
-                    path?: string;
-                    schema?: Record<string, unknown>;
-                };
+            toolResponse?: {
+                raw?: string;
+                meta?: string;
             };
             meta?: string;
             extractedLists?: Array<{
@@ -862,15 +856,13 @@ type ExecuteToolRawOptions = {
 type ToolExecution<TData = unknown, TMeta = Record<string, unknown>> = {
     status: string;
     job_id?: string;
-    toolExecutionResult: {
-        toolOutput: {
-            raw: TData;
-            meta?: TMeta;
-        };
-        extractedLists?: Record<string, unknown>;
-        extractedValues?: Record<string, unknown>;
-        meta?: Record<string, unknown>;
+    meta?: Record<string, unknown>;
+    toolResponse: {
+        raw: TData;
+        meta?: TMeta;
     };
+    extractedLists?: Record<string, unknown>;
+    extractedValues?: Record<string, unknown>;
     billing?: Record<string, unknown>;
     [key: string]: unknown;
 };
@@ -1012,8 +1004,8 @@ declare class DeeplineClient {
     /**
      * Execute a tool and return the standard execution envelope.
      *
-     * The `toolExecutionResult.toolOutput.raw` field contains the raw tool output.
-     * `toolExecutionResult.toolOutput.meta` contains tool/provider metadata.
+     * The `toolResponse.raw` field contains the raw tool response.
+     * `toolResponse.meta` contains tool/provider metadata.
      * Top-level fields such as `status`, `job_id`, and `billing` describe the
      * Deepline execution envelope.
      */
@@ -1485,8 +1477,8 @@ declare class DeeplineClient {
     }>;
 }
 
-declare const SDK_VERSION = "0.1.35";
-declare const SDK_API_CONTRACT = "2026-05-v2-tool-result-contract";
+declare const SDK_VERSION = "0.1.36";
+declare const SDK_API_CONTRACT = "2026-05-v2-tool-response";
 
 /**
  * Base error class for all Deepline SDK errors.
@@ -1698,14 +1690,20 @@ type ToolResultTargetAccessor<T = unknown> = ToolResultTargetMetadata & {
 type ToolResultListAccessor<T = Record<string, unknown>> = ToolResultListMetadata & {
     get(): T[];
 };
-type ToolOutputEnvelope<TData = unknown, TMeta = Record<string, unknown>> = {
+type ToolResponseEnvelope<TData = unknown, TMeta = Record<string, unknown>> = {
     raw: TData;
     meta?: TMeta;
 };
 type ToolExecuteResultBase<TResult = unknown, TMeta = Record<string, unknown>> = {
     status: string;
-    toolOutput: ToolOutputEnvelope<TResult, TMeta>;
-    meta: ToolResultExecutionMetadata;
+    job_id?: string;
+    /** Deepline-owned execution/result metadata. */
+    meta?: Record<string, unknown>;
+    toolResponse: ToolResponseEnvelope<TResult, TMeta>;
+    extractedValues: Record<string, ToolResultTargetAccessor>;
+    extractedLists: Record<string, ToolResultListAccessor>;
+    /** Convenience alias for play code. Serialized output uses toolResponse. */
+    toolOutput: ToolResponseEnvelope<TResult, TMeta>;
     _metadata: {
         toolId: string;
         execution: ToolResultExecutionMetadata;
@@ -2267,7 +2265,7 @@ declare class DeeplineContext {
      * const tools = await deepline.tools.list();
      * const meta = await deepline.tools.get('apollo_people_search');
      * const companyLookup = await deepline.tools.execute('test_company_search', { domain: 'stripe.com' });
-     * const company = companyLookup.toolOutput.raw;
+     * const company = companyLookup.toolResponse.raw;
      * ```
      */
     get tools(): {

package/dist/index.d.ts

@@ -260,15 +260,9 @@ interface ToolDefinition {
         execute?: string;
         toolExecutionResult?: {
             type?: 'ToolExecutionResult';
-            toolOutput?: {
-                raw?: string | {
-                    path?: string;
-                    schema?: Record<string, unknown>;
-                };
-                meta?: string | {
-                    path?: string;
-                    schema?: Record<string, unknown>;
-                };
+            toolResponse?: {
+                raw?: string;
+                meta?: string;
             };
             meta?: string;
             extractedLists?: Array<{
@@ -862,15 +856,13 @@ type ExecuteToolRawOptions = {
 type ToolExecution<TData = unknown, TMeta = Record<string, unknown>> = {
     status: string;
     job_id?: string;
-    toolExecutionResult: {
-        toolOutput: {
-            raw: TData;
-            meta?: TMeta;
-        };
-        extractedLists?: Record<string, unknown>;
-        extractedValues?: Record<string, unknown>;
-        meta?: Record<string, unknown>;
+    meta?: Record<string, unknown>;
+    toolResponse: {
+        raw: TData;
+        meta?: TMeta;
     };
+    extractedLists?: Record<string, unknown>;
+    extractedValues?: Record<string, unknown>;
     billing?: Record<string, unknown>;
     [key: string]: unknown;
 };
@@ -1012,8 +1004,8 @@ declare class DeeplineClient {
     /**
      * Execute a tool and return the standard execution envelope.
      *
-     * The `toolExecutionResult.toolOutput.raw` field contains the raw tool output.
-     * `toolExecutionResult.toolOutput.meta` contains tool/provider metadata.
+     * The `toolResponse.raw` field contains the raw tool response.
+     * `toolResponse.meta` contains tool/provider metadata.
      * Top-level fields such as `status`, `job_id`, and `billing` describe the
      * Deepline execution envelope.
      */
@@ -1485,8 +1477,8 @@ declare class DeeplineClient {
     }>;
 }
 
-declare const SDK_VERSION = "0.1.35";
-declare const SDK_API_CONTRACT = "2026-05-v2-tool-result-contract";
+declare const SDK_VERSION = "0.1.36";
+declare const SDK_API_CONTRACT = "2026-05-v2-tool-response";
 
 /**
  * Base error class for all Deepline SDK errors.
@@ -1698,14 +1690,20 @@ type ToolResultTargetAccessor<T = unknown> = ToolResultTargetMetadata & {
 type ToolResultListAccessor<T = Record<string, unknown>> = ToolResultListMetadata & {
     get(): T[];
 };
-type ToolOutputEnvelope<TData = unknown, TMeta = Record<string, unknown>> = {
+type ToolResponseEnvelope<TData = unknown, TMeta = Record<string, unknown>> = {
     raw: TData;
     meta?: TMeta;
 };
 type ToolExecuteResultBase<TResult = unknown, TMeta = Record<string, unknown>> = {
     status: string;
-    toolOutput: ToolOutputEnvelope<TResult, TMeta>;
-    meta: ToolResultExecutionMetadata;
+    job_id?: string;
+    /** Deepline-owned execution/result metadata. */
+    meta?: Record<string, unknown>;
+    toolResponse: ToolResponseEnvelope<TResult, TMeta>;
+    extractedValues: Record<string, ToolResultTargetAccessor>;
+    extractedLists: Record<string, ToolResultListAccessor>;
+    /** Convenience alias for play code. Serialized output uses toolResponse. */
+    toolOutput: ToolResponseEnvelope<TResult, TMeta>;
     _metadata: {
         toolId: string;
         execution: ToolResultExecutionMetadata;
@@ -2267,7 +2265,7 @@ declare class DeeplineContext {
      * const tools = await deepline.tools.list();
      * const meta = await deepline.tools.get('apollo_people_search');
      * const companyLookup = await deepline.tools.execute('test_company_search', { domain: 'stripe.com' });
-     * const company = companyLookup.toolOutput.raw;
+     * const company = companyLookup.toolResponse.raw;
      * ```
      */
     get tools(): {

package/dist/index.js

@@ -215,8 +215,8 @@ function resolveConfig(options) {
 }
 
 // src/version.ts
-var SDK_VERSION = "0.1.35";
-var SDK_API_CONTRACT = "2026-05-v2-tool-result-contract";
+var SDK_VERSION = "0.1.36";
+var SDK_API_CONTRACT = "2026-05-v2-tool-response";
 
 // ../shared_libs/play-runtime/coordinator-headers.ts
 var COORDINATOR_INTERNAL_TOKEN_HEADER = "x-deepline-internal-token";
@@ -527,7 +527,7 @@ function sleep(ms) {
 var TERMINAL_PLAY_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled"]);
 var INCLUDE_TOOL_METADATA_HEADER = "x-deepline-include-tool-metadata";
 var EXECUTE_RESPONSE_CONTRACT_HEADER = "x-deepline-execute-response-contract";
-var V2_EXECUTE_RESPONSE_CONTRACT = "v2-tool-execution-result";
+var V2_EXECUTE_RESPONSE_CONTRACT = "v2-tool-response";
 var COMPILE_MANIFEST_RETRY_DELAYS_MS = [250, 1e3];
 function sleep2(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
@@ -796,8 +796,8 @@ var DeeplineClient = class {
   /**
    * Execute a tool and return the standard execution envelope.
    *
-   * The `toolExecutionResult.toolOutput.raw` field contains the raw tool output.
-   * `toolExecutionResult.toolOutput.meta` contains tool/provider metadata.
+   * The `toolResponse.raw` field contains the raw tool response.
+   * `toolResponse.meta` contains tool/provider metadata.
    * Top-level fields such as `status`, `job_id`, and `billing` describe the
    * Deepline execution envelope.
    */
@@ -1624,12 +1624,12 @@ function isRecord2(value) {
 }
 function toV2RawToolOutputPath(path) {
   const normalized = String(path || "").trim().replace(/^\./, "");
-  if (!normalized) return "toolExecutionResult.toolOutput.raw";
-  if (normalized === "toolExecutionResult.toolOutput.raw" || normalized.startsWith("toolExecutionResult.toolOutput.raw.")) {
+  if (!normalized) return "toolResponse.raw";
+  if (normalized === "toolResponse.raw" || normalized.startsWith("toolResponse.raw.")) {
     return normalized;
   }
   const rawPath = normalized.replace(/^result\.data\.?/, "").replace(/^result\.?/, "").replace(/^data\.?/, "").replace(/^\./, "");
-  return rawPath ? `toolExecutionResult.toolOutput.raw.${rawPath}` : "toolExecutionResult.toolOutput.raw";
+  return rawPath ? `toolResponse.raw.${rawPath}` : "toolResponse.raw";
 }
 function isMeaningfulValue(value) {
   if (value == null) return false;
@@ -1700,12 +1700,12 @@ function normalizeResultPath(path) {
 }
 function toV2RawToolOutputPathPreservingProviderData(path) {
   const normalized = String(path || "").trim().replace(/^\./, "");
-  if (!normalized) return "toolExecutionResult.toolOutput.raw";
-  if (normalized === "toolExecutionResult.toolOutput.raw" || normalized.startsWith("toolExecutionResult.toolOutput.raw.")) {
+  if (!normalized) return "toolResponse.raw";
+  if (normalized === "toolResponse.raw" || normalized.startsWith("toolResponse.raw.")) {
     return normalized;
   }
   const rawPath = normalized.replace(/^result\.?/, "").replace(/^\./, "");
-  return rawPath ? `toolExecutionResult.toolOutput.raw.${rawPath}` : "toolExecutionResult.toolOutput.raw";
+  return rawPath ? `toolResponse.raw.${rawPath}` : "toolResponse.raw";
 }
 function candidateResultPaths(path) {
   const candidates = [
@@ -1949,11 +1949,9 @@ function buildListAccessors(result, lists) {
 function createToolExecuteResult(input) {
   const result = toResultEnvelope(input.result);
   const resultRoot = {
-    toolExecutionResult: {
-      toolOutput: {
-        raw: result.data,
-        ...result.meta ? { meta: result.meta } : {}
-      }
+    toolResponse: {
+      raw: result.data,
+      ...result.meta ? { meta: result.meta } : {}
     }
   };
   const targets = buildTargets(
@@ -1967,16 +1965,26 @@ function createToolExecuteResult(input) {
     targets,
     lists
   };
+  const toolResponse = {
+    raw: result.data,
+    ...result.meta ? { meta: result.meta } : {}
+  };
+  const extractedValues = buildExtractedAccessors(targets);
+  const extractedLists = buildListAccessors(resultRoot, lists);
   const wrapper = {
     status: input.status,
-    toolOutput: {
-      raw: result.data,
-      ...result.meta ? { meta: result.meta } : {}
-    },
-    meta: input.execution,
-    extractedValues: buildExtractedAccessors(targets),
-    extractedLists: buildListAccessors(resultRoot, lists)
+    ...input.jobId ? { job_id: input.jobId } : {},
+    ...input.meta ? { meta: input.meta } : {},
+    toolResponse,
+    extractedValues,
+    extractedLists
   };
+  Object.defineProperties(wrapper, {
+    toolOutput: {
+      value: toolResponse,
+      enumerable: false
+    }
+  });
   Object.defineProperty(wrapper, "_metadata", {
     value: metadata,
     enumerable: false
@@ -2123,7 +2131,7 @@ var DeeplineContext = class {
    * const tools = await deepline.tools.list();
    * const meta = await deepline.tools.get('apollo_people_search');
    * const companyLookup = await deepline.tools.execute('test_company_search', { domain: 'stripe.com' });
-   * const company = companyLookup.toolOutput.raw;
+   * const company = companyLookup.toolResponse.raw;
    * ```
    */
   get tools() {
@@ -2251,12 +2259,13 @@ function stringArray(value) {
   return Array.isArray(value) ? value.map(String) : [];
 }
 function toolExecutionEnvelopeToResult(fallbackToolId, response) {
-  const raw = response.toolExecutionResult?.toolOutput?.raw ?? null;
-  const meta = response.toolExecutionResult?.toolOutput?.meta;
+  const raw = response.toolResponse?.raw ?? null;
+  const meta = response.toolResponse?.meta;
   const metadata = isRecord3(response._metadata) ? response._metadata.tool : null;
   const toolMetadata = isRecord3(metadata) ? metadata : {};
   return createToolExecuteResult({
     status: typeof response.status === "string" ? response.status : "completed",
+    jobId: typeof response.job_id === "string" ? response.job_id : void 0,
     result: {
       data: raw,
       ...isRecord3(meta) ? { meta } : {}
@@ -2273,7 +2282,8 @@ function toolExecutionEnvelopeToResult(fallbackToolId, response) {
       idempotent: true,
       cached: false,
       source: "live"
-    }
+    },
+    meta: isRecord3(response.meta) ? response.meta : void 0
   });
 }
 function defineInput(schema) {
@@ -2411,17 +2421,13 @@ function normalizeRows2(value) {
 }
 function candidateRoots(payload) {
   const roots = [{ path: null, value: payload }];
-  if (isPlainObject(payload) && isPlainObject(payload.toolExecutionResult)) {
-    roots.push({ path: "toolExecutionResult", value: payload.toolExecutionResult });
-    const toolOutput = payload.toolExecutionResult.toolOutput;
-    if (isPlainObject(toolOutput)) {
-      roots.push({ path: "toolExecutionResult.toolOutput", value: toolOutput });
-      if (Object.prototype.hasOwnProperty.call(toolOutput, "raw")) {
-        roots.push({
-          path: "toolExecutionResult.toolOutput.raw",
-          value: toolOutput.raw
-        });
-      }
+  if (isPlainObject(payload) && isPlainObject(payload.toolResponse)) {
+    roots.push({ path: "toolResponse", value: payload.toolResponse });
+    if (Object.prototype.hasOwnProperty.call(payload.toolResponse, "raw")) {
+      roots.push({
+        path: "toolResponse.raw",
+        value: payload.toolResponse.raw
+      });
     }
   }
   if (isPlainObject(payload) && isPlainObject(payload.output)) {

package/dist/index.mjs

@@ -169,8 +169,8 @@ function resolveConfig(options) {
 }
 
 // src/version.ts
-var SDK_VERSION = "0.1.35";
-var SDK_API_CONTRACT = "2026-05-v2-tool-result-contract";
+var SDK_VERSION = "0.1.36";
+var SDK_API_CONTRACT = "2026-05-v2-tool-response";
 
 // ../shared_libs/play-runtime/coordinator-headers.ts
 var COORDINATOR_INTERNAL_TOKEN_HEADER = "x-deepline-internal-token";
@@ -481,7 +481,7 @@ function sleep(ms) {
 var TERMINAL_PLAY_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled"]);
 var INCLUDE_TOOL_METADATA_HEADER = "x-deepline-include-tool-metadata";
 var EXECUTE_RESPONSE_CONTRACT_HEADER = "x-deepline-execute-response-contract";
-var V2_EXECUTE_RESPONSE_CONTRACT = "v2-tool-execution-result";
+var V2_EXECUTE_RESPONSE_CONTRACT = "v2-tool-response";
 var COMPILE_MANIFEST_RETRY_DELAYS_MS = [250, 1e3];
 function sleep2(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
@@ -750,8 +750,8 @@ var DeeplineClient = class {
   /**
    * Execute a tool and return the standard execution envelope.
    *
-   * The `toolExecutionResult.toolOutput.raw` field contains the raw tool output.
-   * `toolExecutionResult.toolOutput.meta` contains tool/provider metadata.
+   * The `toolResponse.raw` field contains the raw tool response.
+   * `toolResponse.meta` contains tool/provider metadata.
    * Top-level fields such as `status`, `job_id`, and `billing` describe the
    * Deepline execution envelope.
    */
@@ -1578,12 +1578,12 @@ function isRecord2(value) {
 }
 function toV2RawToolOutputPath(path) {
   const normalized = String(path || "").trim().replace(/^\./, "");
-  if (!normalized) return "toolExecutionResult.toolOutput.raw";
-  if (normalized === "toolExecutionResult.toolOutput.raw" || normalized.startsWith("toolExecutionResult.toolOutput.raw.")) {
+  if (!normalized) return "toolResponse.raw";
+  if (normalized === "toolResponse.raw" || normalized.startsWith("toolResponse.raw.")) {
     return normalized;
   }
   const rawPath = normalized.replace(/^result\.data\.?/, "").replace(/^result\.?/, "").replace(/^data\.?/, "").replace(/^\./, "");
-  return rawPath ? `toolExecutionResult.toolOutput.raw.${rawPath}` : "toolExecutionResult.toolOutput.raw";
+  return rawPath ? `toolResponse.raw.${rawPath}` : "toolResponse.raw";
 }
 function isMeaningfulValue(value) {
   if (value == null) return false;
@@ -1654,12 +1654,12 @@ function normalizeResultPath(path) {
 }
 function toV2RawToolOutputPathPreservingProviderData(path) {
   const normalized = String(path || "").trim().replace(/^\./, "");
-  if (!normalized) return "toolExecutionResult.toolOutput.raw";
-  if (normalized === "toolExecutionResult.toolOutput.raw" || normalized.startsWith("toolExecutionResult.toolOutput.raw.")) {
+  if (!normalized) return "toolResponse.raw";
+  if (normalized === "toolResponse.raw" || normalized.startsWith("toolResponse.raw.")) {
     return normalized;
   }
   const rawPath = normalized.replace(/^result\.?/, "").replace(/^\./, "");
-  return rawPath ? `toolExecutionResult.toolOutput.raw.${rawPath}` : "toolExecutionResult.toolOutput.raw";
+  return rawPath ? `toolResponse.raw.${rawPath}` : "toolResponse.raw";
 }
 function candidateResultPaths(path) {
   const candidates = [
@@ -1903,11 +1903,9 @@ function buildListAccessors(result, lists) {
 function createToolExecuteResult(input) {
   const result = toResultEnvelope(input.result);
   const resultRoot = {
-    toolExecutionResult: {
-      toolOutput: {
-        raw: result.data,
-        ...result.meta ? { meta: result.meta } : {}
-      }
+    toolResponse: {
+      raw: result.data,
+      ...result.meta ? { meta: result.meta } : {}
     }
   };
   const targets = buildTargets(
@@ -1921,16 +1919,26 @@ function createToolExecuteResult(input) {
     targets,
     lists
   };
+  const toolResponse = {
+    raw: result.data,
+    ...result.meta ? { meta: result.meta } : {}
+  };
+  const extractedValues = buildExtractedAccessors(targets);
+  const extractedLists = buildListAccessors(resultRoot, lists);
   const wrapper = {
     status: input.status,
-    toolOutput: {
-      raw: result.data,
-      ...result.meta ? { meta: result.meta } : {}
-    },
-    meta: input.execution,
-    extractedValues: buildExtractedAccessors(targets),
-    extractedLists: buildListAccessors(resultRoot, lists)
+    ...input.jobId ? { job_id: input.jobId } : {},
+    ...input.meta ? { meta: input.meta } : {},
+    toolResponse,
+    extractedValues,
+    extractedLists
   };
+  Object.defineProperties(wrapper, {
+    toolOutput: {
+      value: toolResponse,
+      enumerable: false
+    }
+  });
   Object.defineProperty(wrapper, "_metadata", {
     value: metadata,
     enumerable: false
@@ -2077,7 +2085,7 @@ var DeeplineContext = class {
    * const tools = await deepline.tools.list();
    * const meta = await deepline.tools.get('apollo_people_search');
    * const companyLookup = await deepline.tools.execute('test_company_search', { domain: 'stripe.com' });
-   * const company = companyLookup.toolOutput.raw;
+   * const company = companyLookup.toolResponse.raw;
    * ```
    */
   get tools() {
@@ -2205,12 +2213,13 @@ function stringArray(value) {
   return Array.isArray(value) ? value.map(String) : [];
 }
 function toolExecutionEnvelopeToResult(fallbackToolId, response) {
-  const raw = response.toolExecutionResult?.toolOutput?.raw ?? null;
-  const meta = response.toolExecutionResult?.toolOutput?.meta;
+  const raw = response.toolResponse?.raw ?? null;
+  const meta = response.toolResponse?.meta;
   const metadata = isRecord3(response._metadata) ? response._metadata.tool : null;
   const toolMetadata = isRecord3(metadata) ? metadata : {};
   return createToolExecuteResult({
     status: typeof response.status === "string" ? response.status : "completed",
+    jobId: typeof response.job_id === "string" ? response.job_id : void 0,
     result: {
       data: raw,
       ...isRecord3(meta) ? { meta } : {}
@@ -2227,7 +2236,8 @@ function toolExecutionEnvelopeToResult(fallbackToolId, response) {
       idempotent: true,
       cached: false,
       source: "live"
-    }
+    },
+    meta: isRecord3(response.meta) ? response.meta : void 0
   });
 }
 function defineInput(schema) {
@@ -2365,17 +2375,13 @@ function normalizeRows2(value) {
 }
 function candidateRoots(payload) {
   const roots = [{ path: null, value: payload }];
-  if (isPlainObject(payload) && isPlainObject(payload.toolExecutionResult)) {
-    roots.push({ path: "toolExecutionResult", value: payload.toolExecutionResult });
-    const toolOutput = payload.toolExecutionResult.toolOutput;
-    if (isPlainObject(toolOutput)) {
-      roots.push({ path: "toolExecutionResult.toolOutput", value: toolOutput });
-      if (Object.prototype.hasOwnProperty.call(toolOutput, "raw")) {
-        roots.push({
-          path: "toolExecutionResult.toolOutput.raw",
-          value: toolOutput.raw
-        });
-      }
+  if (isPlainObject(payload) && isPlainObject(payload.toolResponse)) {
+    roots.push({ path: "toolResponse", value: payload.toolResponse });
+    if (Object.prototype.hasOwnProperty.call(payload.toolResponse, "raw")) {
+      roots.push({
+        path: "toolResponse.raw",
+        value: payload.toolResponse.raw
+      });
     }
   }
   if (isPlainObject(payload) && isPlainObject(payload.output)) {

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

@@ -62,6 +62,7 @@ import type { PlayRuntimeManifestMap } from '../../../shared_libs/plays/compiler
 import {
   derivePlayRowIdentity,
   derivePlayRowIdentityFromKey,
+  deriveToolRequestIdentity,
 } from '../../../shared_libs/plays/row-identity';
 import {
   getTopLevelPipelineSubsteps,
@@ -95,6 +96,7 @@ import {
   type WorkerDatasetHandle,
   type WorkerDatasetInput,
 } from './runtime/dataset-handles';
+import { runWorkerRuntimeReceiptBoundary } from './runtime/receipts';
 // The harness stub forwards leaf calls (validation, runtime-api HTTP) into
 // the long-lived Play Harness Worker via env.HARNESS. We import the
 // `setHarnessBinding` setter eagerly so it's available the moment
@@ -3013,6 +3015,19 @@ function createMinimalWorkerCtx(
   };
   const rootGovernance = req.playCallGovernance;
   const rootRunId = rootGovernance?.rootRunId ?? req.runId;
+  const executeWithRuntimeReceipt = async <T>(
+    key: string,
+    execute: () => Promise<T> | T,
+  ): Promise<T> =>
+    runWorkerRuntimeReceiptBoundary({
+      baseUrl: req.baseUrl,
+      executorToken: req.executorToken,
+      playName: req.playName,
+      runId: req.runId,
+      key,
+      postRuntimeApi,
+      execute,
+    });
   // Local ancestry chain that always ENDS with the currently-executing play
   // (req.playName). The /api/v2/plays/run lineage validator requires the
   // submitted ancestry's tail to equal the executor token's play name (i.e.
@@ -3743,13 +3758,14 @@ function createMinimalWorkerCtx(
     },
     async step<T>(name: string, callback: () => Promise<T> | T): Promise<T> {
       assertNotAborted(abortSignal);
-      if (!name.trim()) {
+      const normalizedName = name.trim();
+      if (!normalizedName) {
         throw new Error('ctx.step(name, callback) requires a name.');
       }
       // Static pipeline JS blocks are already Workflow steps in the Workers
       // backend. Nesting another `step.do` here can leave preview runs parked
       // inside the JS stage before they reach subsequent event waits.
-      return await callback();
+      return await executeWithRuntimeReceipt(`step:${normalizedName}`, callback);
     },
     async runSteps<T>(
       program: WorkerStepProgram,
@@ -3909,21 +3925,33 @@ function createMinimalWorkerCtx(
       input: Record<string, unknown>,
     ): Promise<unknown> => {
       assertNotAborted(abortSignal);
-      return executeToolWithLifecycle(
-        req,
-        { id: key, toolId, input },
-        workflowStep,
-        callbacks,
+      return await executeWithRuntimeReceipt(
+        deriveToolRequestIdentity({ toolId, requestInput: input }),
+        () =>
+          executeToolWithLifecycle(
+            req,
+            { id: key, toolId, input },
+            workflowStep,
+            callbacks,
+          ),
       );
     },
     tools: {
       async execute(requestArg: unknown): Promise<unknown> {
         assertNotAborted(abortSignal);
-        return executeToolWithLifecycle(
-          req,
-          normalizeToolExecuteArgs(requestArg),
-          workflowStep,
-          callbacks,
+        const request = normalizeToolExecuteArgs(requestArg);
+        return await executeWithRuntimeReceipt(
+          deriveToolRequestIdentity({
+            toolId: request.toolId,
+            requestInput: request.input,
+          }),
+          () =>
+            executeToolWithLifecycle(
+              req,
+              request,
+              workflowStep,
+              callbacks,
+            ),
         );
       },
     },