@relayfx/sdk 0.3.4 → 0.3.6

package/dist/{index-cphmds30.js → index-mtvz1bjn.js}

@@ -1114,42 +1114,46 @@ var Classification = Schema17.Union([
   TimerWait,
   ExternalWait
 ]).annotate({ identifier: "Relay.WaitClassification" });
-var suffixAfter = (waitId, namespace) => waitId.slice(namespace.length);
+var scopedToolCallId = (waitId, namespace) => {
+  const scope = waitId.slice(namespace.length);
+  const separator = scope.indexOf(":");
+  return ToolCallId.make(decodeURIComponent(scope.slice(separator + 1)));
+};
 var classify = (input) => {
   const waitId = input.wait_id;
   if (waitId.startsWith("wait:permission:")) {
     return {
       kind: "permission",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:permission:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:permission:")
     };
   }
   if (waitId.startsWith("wait:approval:")) {
     return {
       kind: "tool_approval",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:approval:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:approval:")
     };
   }
   if (waitId.startsWith("wait:child:")) {
     return {
       kind: "child_join",
       wait_id: waitId,
-      child_execution_id: ChildExecutionId.make(suffixAfter(waitId, "wait:child:"))
+      child_execution_id: ChildExecutionId.make(waitId.slice("wait:child:".length))
     };
   }
   if (waitId.startsWith("wait:inbox:")) {
     return {
       kind: "inbox",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:inbox:"))
+      tool_call_id: ToolCallId.make(waitId.slice("wait:inbox:".length))
     };
   }
   if (waitId.startsWith("wait:tool:")) {
     return {
       kind: "tool_placement",
       wait_id: waitId,
-      tool_call_id: ToolCallId.make(suffixAfter(waitId, "wait:tool:"))
+      tool_call_id: scopedToolCallId(waitId, "wait:tool:")
     };
   }
   if (waitId.startsWith("wait:reply:") || input.envelope_id !== undefined && input.mode === "reply") {
@@ -2019,6 +2023,7 @@ var ClaimToolWorkInput = Schema22.Struct({
   claim_expires_at: exports_shared_schema.TimestampMillis
 }).annotate({ identifier: "Relay.Operation.ClaimToolWorkInput" });
 var CompleteToolWorkInput = Schema22.Struct({
+  execution_id: exports_ids_schema.ExecutionId,
   tool_call_id: exports_ids_schema.ToolCallId,
   attempt_id: exports_ids_schema.ToolAttemptId,
   worker_id: exports_tool_schema.WorkerId,
@@ -2026,6 +2031,7 @@ var CompleteToolWorkInput = Schema22.Struct({
   completed_at: exports_shared_schema.TimestampMillis
 }).annotate({ identifier: "Relay.Operation.CompleteToolWorkInput" });
 var ReleaseToolWorkInput = Schema22.Struct({
+  execution_id: exports_ids_schema.ExecutionId,
   tool_call_id: exports_ids_schema.ToolCallId,
   attempt_id: exports_ids_schema.ToolAttemptId,
   worker_id: exports_tool_schema.WorkerId,
@@ -2034,6 +2040,7 @@ var ReleaseToolWorkInput = Schema22.Struct({
   error: Schema22.optionalKey(Schema22.String)
 }).annotate({ identifier: "Relay.Operation.ReleaseToolWorkInput" });
 var ListToolAttemptsInput = Schema22.Struct({
+  execution_id: exports_ids_schema.ExecutionId,
   tool_call_id: exports_ids_schema.ToolCallId
 }).annotate({ identifier: "Relay.Operation.ListToolAttemptsInput" });
 var ToolAttempt = Schema22.Struct({

package/dist/index.js

@@ -13,10 +13,10 @@ import {
   exports_tool_runtime,
   exports_workflow_definition_host,
   makeDatabaseIdentity
-} from "./index-01rpd00m.js";
+} from "./index-e02krw55.js";
 import {
   exports_model_registry
-} from "./index-25gwk9tj.js";
+} from "./index-8fpd6kvj.js";
 import {
   Service,
   exports_address_schema,
@@ -40,7 +40,7 @@ import {
   exports_tool_schema,
   exports_wait_schema,
   exports_workflow_schema
-} from "./index-cphmds30.js";
+} from "./index-mtvz1bjn.js";
 import {
   __export
 } from "./index-nb39b5ae.js";
@@ -127,6 +127,7 @@ var runOnce = Effect2.fn("ToolWorker.runOnce")(function* (options) {
   const outcome = yield* handlerOutcome(options, lease);
   const completedAt = yield* Clock.currentTimeMillis;
   yield* client.completeToolWork({
+    execution_id: lease.execution_id,
     tool_call_id: lease.call.id,
     attempt_id: lease.attempt.attempt_id,
     worker_id: options.workerId,
@@ -169,13 +170,13 @@ __export(exports_language_model_registration, {
   OpenAiAccountCredentialError: () => OpenAiAccountCredentialError
 });
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/deterministic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/deterministic.js
 import { OpenAiClient as OpenAiClient2 } from "@effect/ai-openai";
 import { Config as Config2, Effect as Effect4, Layer as Layer3, Option, Stream as Stream2 } from "effect";
 import { LanguageModel, Response } from "effect/unstable/ai";
 import { FetchHttpClient as FetchHttpClient2 } from "effect/unstable/http";
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/openai.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openai.js
 import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai";
 import { Config, Effect as Effect3, Layer as Layer2, Redacted, Schema, Stream } from "effect";
 import { AiError } from "effect/unstable/ai";
@@ -263,7 +264,7 @@ var openAiAccount = (input) => exports_model_registry.registrationFromLayer({
 var withOpenAiAccount = (input) => exports_model_registry.layerFromRegistrationEffects([openAiAccount(input)]);
 var withOpenAiAccountFetch = (input) => withOpenAiAccount(input).pipe(Layer2.provide(FetchHttpClient.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/deterministic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/deterministic.js
 var deterministicModelLayer = Layer3.effect(LanguageModel.LanguageModel, LanguageModel.make({
   generateText: () => Effect4.succeed([{ type: "text", text: "deterministic response" }]),
   streamText: () => Stream2.make(Response.makePart("text-delta", { id: "text", delta: "deterministic response" }))
@@ -296,7 +297,7 @@ var withOpenAiOrDeterministic = (options) => Layer3.unwrap(Effect4.gen(function*
 }));
 var withOpenAiOrDeterministicFetch = (options) => withOpenAiOrDeterministic(options).pipe(Layer3.provide(FetchHttpClient2.layer));
 
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/anthropic.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/anthropic.js
 import { AnthropicClient, AnthropicLanguageModel } from "@effect/ai-anthropic";
 import { Config as Config3, Layer as Layer4, Redacted as Redacted2 } from "effect";
 import { AiError as AiError2 } from "effect/unstable/ai";
@@ -321,7 +322,7 @@ var anthropic = (input) => exports_model_registry.registrationFromLayer({
 var anthropicClientLayerConfig = AnthropicClient.layerConfig;
 var withAnthropic = (options) => exports_model_registry.layerFromRegistrationEffects([anthropic(options)]).pipe(Layer4.provide(AnthropicClient.layerConfig({ ...options.clientConfig, apiKey: options.apiKey })));
 var withAnthropicFetch = (options) => withAnthropic(options).pipe(Layer4.provide(FetchHttpClient3.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/openai-compat.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openai-compat.js
 import { OpenAiClient as OpenAiClient3, OpenAiLanguageModel as OpenAiLanguageModel2 } from "@effect/ai-openai-compat";
 import { Config as Config4, Layer as Layer5, Redacted as Redacted3 } from "effect";
 import { FetchHttpClient as FetchHttpClient4 } from "effect/unstable/http";
@@ -344,7 +345,7 @@ var clientLayerConfig = (options) => OpenAiClient3.layerConfig({
 });
 var withOpenAiCompatible = (options) => exports_model_registry.layerFromRegistrationEffects([openAiCompatible(options)]).pipe(Layer5.provide(clientLayerConfig(options)));
 var withOpenAiCompatibleFetch = (options) => withOpenAiCompatible(options).pipe(Layer5.provide(FetchHttpClient4.layer));
-// ../../node_modules/.bun/@batonfx+providers@0.6.1/node_modules/@batonfx/providers/dist/openrouter.js
+// ../../node_modules/.bun/@batonfx+providers@0.6.2/node_modules/@batonfx/providers/dist/openrouter.js
 import { OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter";
 import { Config as Config5, Layer as Layer6, Redacted as Redacted4 } from "effect";
 import { AiError as AiError3 } from "effect/unstable/ai";

package/dist/migrations/20260718140000_execution_scoped_tool_calls/migration.sql

@@ -0,0 +1,35 @@
+ALTER TABLE "relay_tool_results" ADD COLUMN "execution_id" text;
+--> statement-breakpoint
+UPDATE "relay_tool_results" result SET "execution_id" = call."execution_id"
+FROM "relay_tool_calls" call
+WHERE result."tenant_id" = call."tenant_id" AND result."tool_call_id" = call."id";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" ALTER COLUMN "execution_id" SET NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD COLUMN "execution_id" text;
+--> statement-breakpoint
+UPDATE "relay_tool_attempts" attempt SET "execution_id" = call."execution_id"
+FROM "relay_tool_calls" call
+WHERE attempt."tenant_id" = call."tenant_id" AND attempt."tool_call_id" = call."id";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ALTER COLUMN "execution_id" SET NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls" DROP CONSTRAINT "pk_relay_tool_calls";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls" ADD CONSTRAINT "pk_relay_tool_calls" PRIMARY KEY ("tenant_id", "execution_id", "id");
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" DROP CONSTRAINT "pk_relay_tool_results";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" ADD CONSTRAINT "pk_relay_tool_results" PRIMARY KEY ("tenant_id", "execution_id", "tool_call_id");
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" DROP CONSTRAINT "pk_relay_tool_attempts";
+--> statement-breakpoint
+DROP INDEX "uq_relay_tool_attempts_number";
+--> statement-breakpoint
+DROP INDEX "idx_relay_tool_attempts_call";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD CONSTRAINT "pk_relay_tool_attempts" PRIMARY KEY ("tenant_id", "execution_id", "tool_call_id", "id");
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_relay_tool_attempts_number" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_attempts_call" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");

package/dist/migrations/mysql/0011_execution_scoped_tool_calls.sql

@@ -0,0 +1,29 @@
+ALTER TABLE `relay_tool_results` ADD COLUMN `execution_id` VARCHAR(191) NULL;
+--> statement-breakpoint
+UPDATE `relay_tool_results` result JOIN `relay_tool_calls` tool_call
+ON result.`tenant_id` = tool_call.`tenant_id` AND result.`tool_call_id` = tool_call.`id`
+SET result.`execution_id` = tool_call.`execution_id`;
+--> statement-breakpoint
+ALTER TABLE `relay_tool_results` MODIFY COLUMN `execution_id` VARCHAR(191) NOT NULL;
+--> statement-breakpoint
+ALTER TABLE `relay_tool_attempts` ADD COLUMN `execution_id` VARCHAR(191);
+--> statement-breakpoint
+UPDATE `relay_tool_attempts` attempt JOIN `relay_tool_calls` tool_call
+ON attempt.`tenant_id` = tool_call.`tenant_id` AND attempt.`tool_call_id` = tool_call.`id`
+SET attempt.`execution_id` = tool_call.`execution_id`;
+--> statement-breakpoint
+ALTER TABLE `relay_tool_attempts` MODIFY COLUMN `execution_id` VARCHAR(191) NOT NULL;
+--> statement-breakpoint
+ALTER TABLE `relay_tool_calls` DROP PRIMARY KEY, ADD CONSTRAINT `pk_relay_tool_calls` PRIMARY KEY (`tenant_id`, `execution_id`, `id`);
+--> statement-breakpoint
+ALTER TABLE `relay_tool_results` DROP PRIMARY KEY, ADD CONSTRAINT `pk_relay_tool_results` PRIMARY KEY (`tenant_id`, `execution_id`, `tool_call_id`);
+--> statement-breakpoint
+DROP INDEX `uq_relay_tool_attempts_number` ON `relay_tool_attempts`;
+--> statement-breakpoint
+DROP INDEX `idx_relay_tool_attempts_call` ON `relay_tool_attempts`;
+--> statement-breakpoint
+ALTER TABLE `relay_tool_attempts` DROP PRIMARY KEY, ADD CONSTRAINT `pk_relay_tool_attempts` PRIMARY KEY (`tenant_id`, `execution_id`, `tool_call_id`, `id`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `uq_relay_tool_attempts_number` ON `relay_tool_attempts` (`tenant_id`, `execution_id`, `tool_call_id`, `attempt_number`);
+--> statement-breakpoint
+CREATE INDEX `idx_relay_tool_attempts_call` ON `relay_tool_attempts` (`tenant_id`, `execution_id`, `tool_call_id`, `attempt_number`);

package/dist/migrations/pg/20260718140000_execution_scoped_tool_calls/migration.sql

@@ -0,0 +1,35 @@
+ALTER TABLE "relay_tool_results" ADD COLUMN "execution_id" text;
+--> statement-breakpoint
+UPDATE "relay_tool_results" result SET "execution_id" = call."execution_id"
+FROM "relay_tool_calls" call
+WHERE result."tenant_id" = call."tenant_id" AND result."tool_call_id" = call."id";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" ALTER COLUMN "execution_id" SET NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD COLUMN "execution_id" text;
+--> statement-breakpoint
+UPDATE "relay_tool_attempts" attempt SET "execution_id" = call."execution_id"
+FROM "relay_tool_calls" call
+WHERE attempt."tenant_id" = call."tenant_id" AND attempt."tool_call_id" = call."id";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ALTER COLUMN "execution_id" SET NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls" DROP CONSTRAINT "pk_relay_tool_calls";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls" ADD CONSTRAINT "pk_relay_tool_calls" PRIMARY KEY ("tenant_id", "execution_id", "id");
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" DROP CONSTRAINT "pk_relay_tool_results";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results" ADD CONSTRAINT "pk_relay_tool_results" PRIMARY KEY ("tenant_id", "execution_id", "tool_call_id");
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" DROP CONSTRAINT "pk_relay_tool_attempts";
+--> statement-breakpoint
+DROP INDEX "uq_relay_tool_attempts_number";
+--> statement-breakpoint
+DROP INDEX "idx_relay_tool_attempts_call";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD CONSTRAINT "pk_relay_tool_attempts" PRIMARY KEY ("tenant_id", "execution_id", "tool_call_id", "id");
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_relay_tool_attempts_number" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_attempts_call" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");

package/dist/migrations/sqlite/0011_execution_scoped_tool_calls.sql

@@ -0,0 +1,53 @@
+ALTER TABLE "relay_tool_results" ADD COLUMN "execution_id" TEXT NULL;
+--> statement-breakpoint
+UPDATE "relay_tool_results" SET "execution_id" = (
+	SELECT call."execution_id" FROM "relay_tool_calls" call
+	WHERE call."tenant_id" = "relay_tool_results"."tenant_id" AND call."id" = "relay_tool_results"."tool_call_id"
+);
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD COLUMN "execution_id" TEXT;
+--> statement-breakpoint
+UPDATE "relay_tool_attempts" SET "execution_id" = (
+	SELECT call."execution_id" FROM "relay_tool_calls" call
+	WHERE call."tenant_id" = "relay_tool_attempts"."tenant_id" AND call."id" = "relay_tool_attempts"."tool_call_id"
+);
+--> statement-breakpoint
+CREATE TABLE "relay_tool_calls_next" AS SELECT * FROM "relay_tool_calls";
+--> statement-breakpoint
+DROP TABLE "relay_tool_calls";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls_next" RENAME TO "relay_tool_calls";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_calls" ON "relay_tool_calls" ("tenant_id", "execution_id", "id");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_execution" ON "relay_tool_calls" ("tenant_id", "execution_id", "created_at");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_remote_claim" ON "relay_tool_calls" ("tenant_id", "placement_kind", "placement_key", "state", "available_at", "created_at", "id");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_stale_claim" ON "relay_tool_calls" ("tenant_id", "state", "claim_expires_at");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_client_pending" ON "relay_tool_calls" ("tenant_id", "placement_kind", "state", "created_at", "id");
+--> statement-breakpoint
+CREATE TABLE "relay_tool_results_next" AS SELECT * FROM "relay_tool_results";
+--> statement-breakpoint
+DROP TABLE "relay_tool_results";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results_next" RENAME TO "relay_tool_results";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_results" ON "relay_tool_results" ("tenant_id", "execution_id", "tool_call_id");
+--> statement-breakpoint
+DROP INDEX "uq_relay_tool_attempts_number";
+--> statement-breakpoint
+DROP INDEX "idx_relay_tool_attempts_call";
+--> statement-breakpoint
+CREATE TABLE "relay_tool_attempts_next" AS SELECT * FROM "relay_tool_attempts";
+--> statement-breakpoint
+DROP TABLE "relay_tool_attempts";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts_next" RENAME TO "relay_tool_attempts";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_attempts" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "id");
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_relay_tool_attempts_number" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_attempts_call" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");

package/dist/mysql.js

@@ -2,14 +2,14 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-pr9133xv.js";
+} from "./index-2vsf6dks.js";
 import {
   MigratorError,
   RuntimeMigrationError,
   SqlFailure
-} from "./index-01rpd00m.js";
-import"./index-25gwk9tj.js";
-import"./index-cphmds30.js";
+} from "./index-e02krw55.js";
+import"./index-8fpd6kvj.js";
+import"./index-mtvz1bjn.js";
 import"./index-nb39b5ae.js";
 
 // src/mysql.ts

package/dist/postgres.js

@@ -2,7 +2,7 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-pr9133xv.js";
+} from "./index-2vsf6dks.js";
 import {
   Dialect,
   RuntimeMigrationError,
@@ -14,11 +14,11 @@ import {
   fromDbTimestamp,
   fromNullableDbTimestamp,
   timestampParam
-} from "./index-01rpd00m.js";
-import"./index-25gwk9tj.js";
+} from "./index-e02krw55.js";
+import"./index-8fpd6kvj.js";
 import {
   exports_ids_schema
-} from "./index-cphmds30.js";
+} from "./index-mtvz1bjn.js";
 import {
   __export
 } from "./index-nb39b5ae.js";
@@ -659,7 +659,7 @@ var relayToolCalls = pgTable("relay_tool_calls", {
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
   updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow()
 }, (table) => [
-  primaryKey({ columns: [table.tenantId, table.id], name: "pk_relay_tool_calls" }),
+  primaryKey({ columns: [table.tenantId, table.executionId, table.id], name: "pk_relay_tool_calls" }),
   index("idx_relay_tool_calls_execution").on(table.tenantId, table.executionId, table.createdAt),
   index("idx_relay_tool_calls_remote_claim").on(table.tenantId, table.placementKind, table.placementKey, table.state, table.availableAt, table.createdAt, table.id),
   index("idx_relay_tool_calls_stale_claim").on(table.tenantId, table.state, table.claimExpiresAt),
@@ -667,6 +667,7 @@ var relayToolCalls = pgTable("relay_tool_calls", {
 ]);
 var relayToolAttempts = pgTable("relay_tool_attempts", {
   tenantId: tenantId(),
+  executionId: text("execution_id").$type().notNull(),
   id: text("id").$type().notNull(),
   toolCallId: text("tool_call_id").$type().notNull(),
   attemptNumber: integer("attempt_number").notNull(),
@@ -677,18 +678,27 @@ var relayToolAttempts = pgTable("relay_tool_attempts", {
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
   completedAt: timestamp("completed_at", { withTimezone: true })
 }, (table) => [
-  primaryKey({ columns: [table.tenantId, table.toolCallId, table.id], name: "pk_relay_tool_attempts" }),
-  uniqueIndex("uq_relay_tool_attempts_number").on(table.tenantId, table.toolCallId, table.attemptNumber),
-  index("idx_relay_tool_attempts_call").on(table.tenantId, table.toolCallId, table.attemptNumber)
+  primaryKey({
+    columns: [table.tenantId, table.executionId, table.toolCallId, table.id],
+    name: "pk_relay_tool_attempts"
+  }),
+  uniqueIndex("uq_relay_tool_attempts_number").on(table.tenantId, table.executionId, table.toolCallId, table.attemptNumber),
+  index("idx_relay_tool_attempts_call").on(table.tenantId, table.executionId, table.toolCallId, table.attemptNumber)
 ]);
 var relayToolResults = pgTable("relay_tool_results", {
   tenantId: tenantId(),
+  executionId: text("execution_id").$type().notNull(),
   toolCallId: text("tool_call_id").$type().notNull(),
   outputJson: jsonb("output_json").notNull(),
   error: text("error"),
   metadataJson: jsonb("metadata_json").$type().notNull().default({}),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
-}, (table) => [primaryKey({ columns: [table.tenantId, table.toolCallId], name: "pk_relay_tool_results" })]);
+}, (table) => [
+  primaryKey({
+    columns: [table.tenantId, table.executionId, table.toolCallId],
+    name: "pk_relay_tool_results"
+  })
+]);
 var relayRouteAttempts = pgTable("relay_route_attempts", {
   tenantId: tenantId(),
   id: text("id").notNull(),
@@ -717,7 +727,7 @@ var relayIdempotencyKeys = pgTable("relay_idempotency_keys", {
   uniqueIndex("uq_relay_idempotency_scope_operation_key").on(table.tenantId, table.scope, table.operation, table.key)
 ]);
 // src/postgres.ts
-var schemaHead = "20260712200000_workflow_runtime";
+var schemaHead = "20260718140000_execution_scoped_tool_calls";
 var migrationNames = [
   "20260701002839_sour_cerebro",
   "20260701041134_acoustic_hulk",
@@ -743,6 +753,7 @@ var migrationNames = [
   "20260712170000_topic_subscriptions",
   "20260712180000_child_fan_out",
   "20260712190000_workflow_definitions",
+  "20260712200000_workflow_runtime",
   schemaHead
 ];
 var migrationsFolderUrl = import.meta.url.endsWith("/src/postgres.ts") ? new URL("../../../migrations/pg", import.meta.url) : new URL("./migrations/pg", import.meta.url);

package/dist/sqlite.js

@@ -2,7 +2,7 @@
 import {
   database,
   normalizeMigrationCause
-} from "./index-pr9133xv.js";
+} from "./index-2vsf6dks.js";
 import {
   DatabaseAlreadyOwned,
   RuntimeConfigurationError,
@@ -12,9 +12,9 @@ import {
   make,
   makeDatabaseIdentity,
   runtimeLayer
-} from "./index-01rpd00m.js";
-import"./index-25gwk9tj.js";
-import"./index-cphmds30.js";
+} from "./index-e02krw55.js";
+import"./index-8fpd6kvj.js";
+import"./index-mtvz1bjn.js";
 import"./index-nb39b5ae.js";
 
 // src/sqlite-runtime.ts
@@ -602,6 +602,62 @@ var _0010_workflow_runtime_default = `CREATE TABLE IF NOT EXISTS relay_workflow_
 CREATE TABLE IF NOT EXISTS relay_workflow_lifecycle_events (tenant_id TEXT NOT NULL, execution_id TEXT NOT NULL, sequence INTEGER NOT NULL, event_type TEXT NOT NULL, operation_id TEXT, data_json TEXT, created_at INTEGER NOT NULL, PRIMARY KEY (tenant_id, execution_id, sequence));
 `;
 
+// ../../migrations/sqlite/0011_execution_scoped_tool_calls.sql
+var _0011_execution_scoped_tool_calls_default = `ALTER TABLE "relay_tool_results" ADD COLUMN "execution_id" TEXT NULL;
+--> statement-breakpoint
+UPDATE "relay_tool_results" SET "execution_id" = (
+	SELECT call."execution_id" FROM "relay_tool_calls" call
+	WHERE call."tenant_id" = "relay_tool_results"."tenant_id" AND call."id" = "relay_tool_results"."tool_call_id"
+);
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts" ADD COLUMN "execution_id" TEXT;
+--> statement-breakpoint
+UPDATE "relay_tool_attempts" SET "execution_id" = (
+	SELECT call."execution_id" FROM "relay_tool_calls" call
+	WHERE call."tenant_id" = "relay_tool_attempts"."tenant_id" AND call."id" = "relay_tool_attempts"."tool_call_id"
+);
+--> statement-breakpoint
+CREATE TABLE "relay_tool_calls_next" AS SELECT * FROM "relay_tool_calls";
+--> statement-breakpoint
+DROP TABLE "relay_tool_calls";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_calls_next" RENAME TO "relay_tool_calls";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_calls" ON "relay_tool_calls" ("tenant_id", "execution_id", "id");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_execution" ON "relay_tool_calls" ("tenant_id", "execution_id", "created_at");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_remote_claim" ON "relay_tool_calls" ("tenant_id", "placement_kind", "placement_key", "state", "available_at", "created_at", "id");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_stale_claim" ON "relay_tool_calls" ("tenant_id", "state", "claim_expires_at");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_calls_client_pending" ON "relay_tool_calls" ("tenant_id", "placement_kind", "state", "created_at", "id");
+--> statement-breakpoint
+CREATE TABLE "relay_tool_results_next" AS SELECT * FROM "relay_tool_results";
+--> statement-breakpoint
+DROP TABLE "relay_tool_results";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_results_next" RENAME TO "relay_tool_results";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_results" ON "relay_tool_results" ("tenant_id", "execution_id", "tool_call_id");
+--> statement-breakpoint
+DROP INDEX "uq_relay_tool_attempts_number";
+--> statement-breakpoint
+DROP INDEX "idx_relay_tool_attempts_call";
+--> statement-breakpoint
+CREATE TABLE "relay_tool_attempts_next" AS SELECT * FROM "relay_tool_attempts";
+--> statement-breakpoint
+DROP TABLE "relay_tool_attempts";
+--> statement-breakpoint
+ALTER TABLE "relay_tool_attempts_next" RENAME TO "relay_tool_attempts";
+--> statement-breakpoint
+CREATE UNIQUE INDEX "pk_relay_tool_attempts" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "id");
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_relay_tool_attempts_number" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");
+--> statement-breakpoint
+CREATE INDEX "idx_relay_tool_attempts_call" ON "relay_tool_attempts" ("tenant_id", "execution_id", "tool_call_id", "attempt_number");
+`;
+
 // src/sqlite-migrations.ts
 import { Effect } from "effect";
 import { SqlClient } from "effect/unstable/sql/SqlClient";
@@ -622,7 +678,8 @@ var migrations = [
   { id: 7, name: "topic_subscriptions", file: "0007_topic_subscriptions.sql", source: _0007_topic_subscriptions_default },
   { id: 8, name: "child_fan_out", file: "0008_child_fan_out.sql", source: _0008_child_fan_out_default },
   { id: 9, name: "workflow_definitions", file: "0009_workflow_definitions.sql", source: _0009_workflow_definitions_default },
-  { id: 10, name: "workflow_runtime", file: "0010_workflow_runtime.sql", source: _0010_workflow_runtime_default }
+  { id: 10, name: "workflow_runtime", file: "0010_workflow_runtime.sql", source: _0010_workflow_runtime_default },
+  { id: 11, name: "execution_scoped_tool_calls", file: "0011_execution_scoped_tool_calls.sql", source: _0011_execution_scoped_tool_calls_default }
 ];
 var loader = Effect.succeed(migrations.map(({ id, name, source }) => [id, name, Effect.succeed(execute(source))]));
 

package/dist/types/relay/operation.d.ts

@@ -918,6 +918,9 @@ export declare const ClaimToolWorkInput: Schema.Struct<{
 export interface ClaimToolWorkInput extends Schema.Schema.Type<typeof ClaimToolWorkInput> {
 }
 export declare const CompleteToolWorkInput: Schema.Struct<{
+    readonly execution_id: Schema.brand<Schema.String, "Relay.ExecutionId"> & {
+        make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ExecutionId">;
+    };
     readonly tool_call_id: Schema.brand<Schema.String, "Relay.ToolCallId"> & {
         make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ToolCallId">;
     };
@@ -937,6 +940,9 @@ export declare const CompleteToolWorkInput: Schema.Struct<{
 export interface CompleteToolWorkInput extends Schema.Schema.Type<typeof CompleteToolWorkInput> {
 }
 export declare const ReleaseToolWorkInput: Schema.Struct<{
+    readonly execution_id: Schema.brand<Schema.String, "Relay.ExecutionId"> & {
+        make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ExecutionId">;
+    };
     readonly tool_call_id: Schema.brand<Schema.String, "Relay.ToolCallId"> & {
         make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ToolCallId">;
     };
@@ -951,6 +957,9 @@ export declare const ReleaseToolWorkInput: Schema.Struct<{
 export interface ReleaseToolWorkInput extends Schema.Schema.Type<typeof ReleaseToolWorkInput> {
 }
 export declare const ListToolAttemptsInput: Schema.Struct<{
+    readonly execution_id: Schema.brand<Schema.String, "Relay.ExecutionId"> & {
+        make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ExecutionId">;
+    };
     readonly tool_call_id: Schema.brand<Schema.String, "Relay.ToolCallId"> & {
         make: (input: unknown, options?: import("effect/SchemaAST").ParseOptions) => string & import("effect/Brand").Brand<"Relay.ToolCallId">;
     };

package/dist/types/relay/sqlite-migrations.d.ts

@@ -50,5 +50,10 @@ export declare const migrations: readonly [{
     readonly name: "workflow_runtime";
     readonly file: "0010_workflow_runtime.sql";
     readonly source: string;
+}, {
+    readonly id: 11;
+    readonly name: "execution_scoped_tool_calls";
+    readonly file: "0011_execution_scoped_tool_calls.sql";
+    readonly source: string;
 }];
-export declare const loader: Effect.Effect<(readonly [1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10, "baseline" | "child_fan_out" | "durable_entities" | "durable_inbox" | "durable_tool_placement" | "ephemeral_presence" | "execution_state" | "topic_subscriptions" | "workflow_definitions" | "workflow_runtime", Effect.Effect<Effect.Effect<void, import("effect/unstable/sql/SqlError").SqlError, SqlClient>, never, never>])[], never, never>;
+export declare const loader: Effect.Effect<(readonly [1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11, "baseline" | "child_fan_out" | "durable_entities" | "durable_inbox" | "durable_tool_placement" | "ephemeral_presence" | "execution_scoped_tool_calls" | "execution_state" | "topic_subscriptions" | "workflow_definitions" | "workflow_runtime", Effect.Effect<Effect.Effect<void, import("effect/unstable/sql/SqlError").SqlError, SqlClient>, never, never>])[], never, never>;

package/dist/types/runtime/agent/relay-permissions.d.ts

@@ -21,5 +21,4 @@ export interface Config {
     readonly startedAt: number;
     readonly eventSequence: Execution.ExecutionEventSequence;
 }
-export declare const waitIdForToolCall: (toolCallId: string) => string & import("effect/Brand").Brand<"Relay.WaitId">;
 export declare const layer: (config: Config) => Layer.Layer<Permissions.Permissions | Permissions.RuleStore, never, never>;

package/dist/types/runtime/tool/tool-runtime-identifiers.d.ts

@@ -0,0 +1,9 @@
+import { Ids } from "../../schema/index";
+export type ToolWaitKind = "approval" | "permission" | "tool";
+declare const eventId: (executionId: Ids.ExecutionId, toolCallId: Ids.ToolCallId | string, kind: "tool-requested" | "tool-result" | "approval-requested" | "approval-resolved" | "permission-requested" | "permission-resolved") => string & import("effect/Brand").Brand<"Relay.EventId">;
+declare const waitId: (kind: ToolWaitKind, executionId: Ids.ExecutionId, toolCallId: Ids.ToolCallId | string) => string & import("effect/Brand").Brand<"Relay.WaitId">;
+export declare const Identifiers: {
+    eventId: typeof eventId;
+    waitId: typeof waitId;
+};
+export {};

package/dist/types/runtime/tool/tool-runtime-service.d.ts

@@ -6,6 +6,7 @@ import { Service as EventLogService } from "../execution/event-log-service";
 import { Service as WaitServiceService } from "../wait/wait-service";
 export * from "./tool-runtime-contract";
 import { Service } from "./tool-runtime-contract";
+export { Identifiers } from "./tool-runtime-identifiers";
 import type { DynamicToolOptions, PlacedToolOptions, RegisteredTool, RunInput, ToolkitRegistrationOptions, ToolOptions } from "./tool-runtime-contract";
 export declare const toolFromRegistered: (tool: RegisteredTool) => AiTool.Any;
 export declare const toolsFromToolkit: {

package/dist/types/store-sql/schema/relay-schema.d.ts

@@ -6140,6 +6140,21 @@ export declare const relayToolAttempts: import("drizzle-orm/pg-core").PgTableWit
             identity: undefined;
             generated: undefined;
         }>;
+        executionId: import("drizzle-orm/pg-core").PgBuildColumn<"relay_tool_attempts", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").Set$Type<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, string & import("effect/Brand").Brand<"Relay.ExecutionId">>>, {
+            name: string;
+            tableName: "relay_tool_attempts";
+            dataType: "string";
+            data: string & import("effect/Brand").Brand<"Relay.ExecutionId">;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
         id: import("drizzle-orm/pg-core").PgBuildColumn<"relay_tool_attempts", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").Set$Type<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, string & import("effect/Brand").Brand<"Relay.ToolAttemptId">>>, {
             name: string;
             tableName: "relay_tool_attempts";
@@ -6297,6 +6312,21 @@ export declare const relayToolResults: import("drizzle-orm/pg-core").PgTableWith
             identity: undefined;
             generated: undefined;
         }>;
+        executionId: import("drizzle-orm/pg-core").PgBuildColumn<"relay_tool_results", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").Set$Type<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, string & import("effect/Brand").Brand<"Relay.ExecutionId">>>, {
+            name: string;
+            tableName: "relay_tool_results";
+            dataType: "string";
+            data: string & import("effect/Brand").Brand<"Relay.ExecutionId">;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
         toolCallId: import("drizzle-orm/pg-core").PgBuildColumn<"relay_tool_results", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").Set$Type<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, string & import("effect/Brand").Brand<"Relay.ToolCallId">>>, {
             name: string;
             tableName: "relay_tool_results";