@btravstack/temporal-worker 0.48.0 → 0.49.0

package/README.md

@@ -160,6 +160,9 @@ itself, inside its own error qualifier, so a contract it cannot satisfy is a
 startup `Err`, not a defect. `runtimeInfo()` reads `{ taskQueue, namespace }`
 back once the worker is polling.
 
+Activity-piece DI identities include the contract task queue. Separate worker
+contracts can reuse keys without sharing a port; wire activity names stay unchanged.
+
 A worker polling for several workflows can be several slices instead of one
 record: `TemporalWorkflowActivities(contract, key)({ inject: { name: Dep }, unit, fork, sync })` mints a
 provider for ONE workflow's activities (or a contract-global activity),
@@ -218,6 +221,8 @@ optional peers. See
 
 ## Options
 
+- `taskQueue`: pins `TEMPORAL_TASK_QUEUE`, defaulting to the contract queue; see the [reference](https://btravstack.github.io/btravstack/reference/temporal-worker).
+
 `TemporalModule(name)({...})` takes the starter's options plus `activities`
 and the module lists (`imports`, `provides`, `exports`, `needs`). It is the
 only way to compose the starter, which is not exported:

package/dist/index.d.mts

@@ -58,7 +58,7 @@ declare const WORKFLOW_ACTIVITIES_PREFIX = "TemporalWorkflowActivities:";
  * slices claiming one workflow di's duplicate-provider defect rather than a
  * silent merge.
  */
-type WorkflowActivitiesPortOf<C extends ContractDefinition, K extends ActivitiesKeyOf<C>> = PortClassOf<`${typeof WORKFLOW_ACTIVITIES_PREFIX}${K}`, ActivitiesRecordOf<C>[K]>;
+type WorkflowActivitiesPortOf<C extends ContractDefinition, K extends ActivitiesKeyOf<C>> = PortClassOf<`${typeof WORKFLOW_ACTIVITIES_PREFIX}${C["taskQueue"]}:${K}`, ActivitiesRecordOf<C>[K]>;
 /**
  * What a minted piece returns. A piece naming its own `fork` owes that
  * module's unmet needs, and leaves nothing for the root's `unit.activity` to
@@ -66,6 +66,7 @@ type WorkflowActivitiesPortOf<C extends ContractDefinition, K extends Activities
  */
 type MintedActivities<C extends ContractDefinition, K extends ActivitiesKeyOf<C>, N, U extends Readonly<Record<string, AnyPort>>, M extends AnyUnitModule | undefined> = Provider<InstanceType<WorkflowActivitiesPortOf<C, K>>, never, N | UnitNeedsOf$1<M>> & {
   readonly port: WorkflowActivitiesPortOf<C, K>;
+  readonly _activityKey?: K;
   /** Phantom: the ports this piece injects, which the root's `unit.activity` must export. */
   readonly _declared?: undefined extends M ? InstanceType<U[keyof U]> : never;
 };
@@ -80,16 +81,16 @@ type ScopedActivitiesOf<C extends ContractDefinition, K extends ActivitiesKeyOf<
  *
  * A worker that polls one queue for several workflows is several pieces, each
  * declaring the services its own activities call;
- * `TemporalActivities(contract)([...])` composes them. `contract` is read for
- * its TYPE only, and types both `key` and the record — so an activity the
- * workflow does not declare is a compile error here rather than at startup.
+ * `TemporalActivities(contract)([...])` composes them. The contract types both
+ * `key` and the record and supplies the task queue that namespaces the port.
+ * An undeclared activity is a compile error rather than a startup failure.
  *
  * `key` is any top-level key of the activities record, which includes a
  * contract-global activity as well as a workflow; the name is imprecise in that
  * one case deliberately, since narrowing it would lock such a contract out of
  * the split.
  *
- * There is no name to give: the key IS the port's name.
+ * The contract's task queue and the key identify the port; wire activity names stay unchanged.
  *
  * `unit` declares the ports the activities read off `context.unit`, resolved
  * out of the fork the attempt opened; the root's `unit.activity` module must
@@ -140,6 +141,7 @@ declare const TemporalConfig_base: import("@btravstack/di").PortClass<"TemporalC
 export declare class TemporalConfig extends TemporalConfig_base<{
   readonly address: string;
   readonly namespace: string;
+  readonly taskQueue: string;
   /** Temporal's `shutdownGraceTime`, in milliseconds. */
   readonly gracePeriodMs: number;
   /** Temporal's `shutdownForceTime`, in milliseconds. */
@@ -191,6 +193,8 @@ type TemporalTuning<Unit extends AnyUnitModule | undefined = undefined, Converte
   readonly address?: string;
   /** Pins `TemporalConfig.namespace` instead of reading `TEMPORAL_NAMESPACE`. */
   readonly namespace?: string;
+  /** Physical polling queue, independent of the logical contract and DI identities. Pins TEMPORAL_TASK_QUEUE. */
+  readonly taskQueue?: string;
   /**
    * Pins `TemporalConfig.forceAfterMs` instead of reading
    * `TEMPORAL_FORCE_AFTER_MS` (default `15_000`) — Temporal's
@@ -244,7 +248,7 @@ type TemporalOptions<C extends ContractDefinition, Unit extends AnyUnitModule |
 //#endregion
 //#region src/temporal-module.d.ts
 /** The starter's own module, as the sugar adds it to the application's imports. */
-type TemporalStarter<C extends ContractDefinition, Unit extends AnyUnitModule | undefined, Converter extends DataConverterPort> = Module<TemporalRuntime | TemporalConfig | TemporalConnection, ConfigInvalid | TemporalUnreachable, EnvReading<never, "TEMPORAL_ADDRESS" | "TEMPORAL_NAMESPACE" | "TEMPORAL_GRACE_PERIOD_MS" | "TEMPORAL_FORCE_AFTER_MS"> | Scope | ActivitiesInstanceOf<C> | UnitNeedsOf$1<Unit> | InstanceType<Converter>>;
+type TemporalStarter<C extends ContractDefinition, Unit extends AnyUnitModule | undefined, Converter extends DataConverterPort> = Module<TemporalRuntime | TemporalConfig | TemporalConnection, ConfigInvalid | TemporalUnreachable, EnvReading<never, "TEMPORAL_ADDRESS" | "TEMPORAL_NAMESPACE" | "TEMPORAL_TASK_QUEUE" | "TEMPORAL_GRACE_PERIOD_MS" | "TEMPORAL_FORCE_AFTER_MS"> | Scope | ActivitiesInstanceOf<C> | UnitNeedsOf$1<Unit> | InstanceType<Converter>>;
 /** The application's imports plus the starter — the tuple `Module(name)` is handed. */
 type Imports<I extends readonly AnyModule[], C extends ContractDefinition, Unit extends AnyUnitModule | undefined, Converter extends DataConverterPort> = readonly [...I, TemporalStarter<C, Unit, Converter>];
 /** The activities provider plus the application's own — the tuple `Module(name)` is handed. */
@@ -292,6 +296,7 @@ export declare const TemporalModule: <const Name extends string>(name: Name) =>
 /** One piece of the activities record — what `TemporalWorkflowActivities(contract, key)(…)` returns. */
 type PieceOf<C extends ContractDefinition> = { readonly [K in ActivitiesKeyOf<C>]: {
   readonly port: WorkflowActivitiesPortOf<C, K>;
+  readonly _activityKey?: K;
   /** Phantom, carrying the ports the piece injects off `context.unit`. */
   readonly _declared?: unknown;
 }; }[ActivitiesKeyOf<C>];
@@ -299,11 +304,9 @@ type PieceOf<C extends ContractDefinition> = { readonly [K in ActivitiesKeyOf<C>
 type DeclaredOf<T extends readonly {
   readonly _declared?: unknown;
 }[]> = NonNullable<T[number]["_declared"]>;
-/** The key a piece carries, read back off its port id. */
+/** The contract key a piece carries independently of its queue namespace. */
 type KeyOfPiece<P> = P extends {
-  readonly port: {
-    readonly portId: `${typeof WORKFLOW_ACTIVITIES_PREFIX}${infer K}`;
-  };
+  readonly _activityKey?: infer K;
 } ? K : never;
 /** The record's top-level keys no piece in `T` covers. */
 type Uncovered<C extends ContractDefinition, T extends readonly PieceOf<C>[]> = Exclude<ActivitiesKeyOf<C>, KeyOfPiece<T[number]>>;

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import { Observers, RuntimePort, RuntimeStartFailed, composeByPrefix, dispatchUnit, infrastructureExports, mintPiece, noObserverMember, releasedBy, withUnitRecord } from "@btravstack/core";
 import { Module, Port, Provider } from "@btravstack/di";
-import { Config, Env } from "@btravstack/config";
+import { Config, ConfigFieldInvalid, Env } from "@btravstack/config";
 import { declareActivitiesHandler } from "@temporal-contract/worker/activity";
 import { msToNumber } from "@temporalio/common";
 import { NativeConnection, Worker } from "@temporalio/worker";
 import { Ok, OkAsync, TaggedError, fromPromise, fromSafePromise, fromThrowable } from "unthrown";
 import { activityInfo } from "@temporalio/activity";
+import { defineContractBinding } from "@temporal-contract/contract";
 //#region src/unit.ts
 /**
 * One entry of the activities record — a contract-global activity's own
@@ -61,16 +62,16 @@ const WORKFLOW_ACTIVITIES_PREFIX = "TemporalWorkflowActivities:";
 *
 * A worker that polls one queue for several workflows is several pieces, each
 * declaring the services its own activities call;
-* `TemporalActivities(contract)([...])` composes them. `contract` is read for
-* its TYPE only, and types both `key` and the record — so an activity the
-* workflow does not declare is a compile error here rather than at startup.
+* `TemporalActivities(contract)([...])` composes them. The contract types both
+* `key` and the record and supplies the task queue that namespaces the port.
+* An undeclared activity is a compile error rather than a startup failure.
 *
 * `key` is any top-level key of the activities record, which includes a
 * contract-global activity as well as a workflow; the name is imprecise in that
 * one case deliberately, since narrowing it would lock such a contract out of
 * the split.
 *
-* There is no name to give: the key IS the port's name.
+* The contract's task queue and the key identify the port; wire activity names stay unchanged.
 *
 * `unit` declares the ports the activities read off `context.unit`, resolved
 * out of the fork the attempt opened; the root's `unit.activity` module must
@@ -84,7 +85,7 @@ const WORKFLOW_ACTIVITIES_PREFIX = "TemporalWorkflowActivities:";
 * declares are then checked against this module, here.
 */
 const TemporalWorkflowActivities = (contract, key) => {
-	const port = class extends Port(`${WORKFLOW_ACTIVITIES_PREFIX}${key}`) {};
+	const port = class extends Port(`${WORKFLOW_ACTIVITIES_PREFIX}${contract.taskQueue}:${key}`) {};
 	return (options) => mintPiece(port, (record, entry) => withFork(withUnit(record, entry), options.fork))(options);
 };
 //#endregion
@@ -154,6 +155,17 @@ const metaFor = () => {
 	};
 };
 //#endregion
+//#region src/task-queue.ts
+const taskQueueField = (contract) => {
+	const field = Config.string("TEMPORAL_TASK_QUEUE", { default: contract.taskQueue });
+	const check = (taskQueue) => fromThrowable(() => defineContractBinding(contract, { taskQueue }).taskQueue, (cause) => new ConfigFieldInvalid({ reason: String(cause) }))();
+	return {
+		variable: field.variable,
+		parse: (raw) => field.parse(raw).flatMap(check),
+		check
+	};
+};
+//#endregion
 //#region src/temporal-runtime.ts
 /**
 * Where the Temporal service is, as a service: the starter binds it from the
@@ -214,6 +226,7 @@ const temporal = (options) => {
 	const config = Config.provider(TemporalConfig)(Config.object({
 		address: Config.pinned(address, Config.string("TEMPORAL_ADDRESS", { default: "127.0.0.1:7233" })),
 		namespace: Config.pinned(namespace, Config.string("TEMPORAL_NAMESPACE", { default: "default" })),
+		taskQueue: Config.pinned(options.taskQueue, taskQueueField(options.contract)),
 		gracePeriodMs: Config.pinned(durationMs(options.gracePeriod), Config.integer("TEMPORAL_GRACE_PERIOD_MS", {
 			default: DEFAULT_GRACE_MS,
 			min: 0
@@ -269,8 +282,7 @@ const startFailed = (cause) => new RuntimeStartFailed({
 });
 const heldByWorker = (cause) => cause instanceof Error && cause.name === "IllegalStateError";
 const createWorker = (host, connection, config, activities, options, observers, dataConverter) => {
-	const { taskQueue } = options.contract;
-	const { namespace } = config;
+	const { namespace, taskQueue } = config;
 	return fromThrowable(() => declareActivitiesHandler({
 		contract: options.contract,
 		middleware: activityUnits(host, observers, (key) => forkOf(activities[key]) ?? options.unit?.activity),
@@ -377,7 +389,7 @@ const TemporalModule = (name) => (options) => {
 * and two slices claiming one key are di's duplicate-provider defect at build.
 */
 const TemporalActivities = (contract) => {
-	return composeByPrefix(TemporalActivitiesPort, WORKFLOW_ACTIVITIES_PREFIX, withUnit);
+	return composeByPrefix(TemporalActivitiesPort, `${WORKFLOW_ACTIVITIES_PREFIX}${contract.taskQueue}:`, withUnit);
 };
 //#endregion
 export { ActivityInput, TemporalActivities, TemporalConfig, TemporalConnection, TemporalModule, TemporalRuntime, TemporalUnreachable, TemporalWorkflowActivities };

package/dist/schedule.d.mts

@@ -1,6 +1,6 @@
 import { AsyncResult } from "unthrown";
-import { ScheduleNotFoundError, TypedScheduleClient, TypedScheduleCreateOptions, WorkflowValidationError } from "@temporal-contract/client";
 import { ContractDefinition } from "@temporal-contract/contract";
+import { ScheduleNotFoundError, TypedScheduleClient, TypedScheduleCreateOptions, WorkflowValidationError } from "@temporal-contract/client";
 //#region src/schedule.d.ts
 /** Whether the schedule had to be created, or was already there and had its spec reconciled. */
 export type ScheduleOutcome = "created" | "updated";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/temporal-worker",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "The Temporal worker runtime for @btravstack/core: one unit per activity attempt, and a drain that honours the kernel's deadline",
   "keywords": [
     "graceful-shutdown",
@@ -52,15 +52,15 @@
     }
   },
   "devDependencies": {
-    "@btravstack/config": "0.48.0",
-    "@btravstack/core": "0.48.0",
-    "@btravstack/di": "0.48.0",
+    "@btravstack/config": "0.49.0",
+    "@btravstack/core": "0.49.0",
+    "@btravstack/di": "0.49.0",
     "@btravstack/internal-test-infra": "0.0.0",
-    "@btravstack/testing": "0.48.0",
+    "@btravstack/testing": "0.49.0",
     "@btravstack/tsconfig": "0.4.0",
-    "@temporal-contract/client": "8.0.0-beta.14",
-    "@temporal-contract/contract": "8.0.0-beta.14",
-    "@temporal-contract/worker": "8.0.0-beta.14",
+    "@temporal-contract/client": "8.0.0-beta.15",
+    "@temporal-contract/contract": "8.0.0-beta.15",
+    "@temporal-contract/worker": "8.0.0-beta.15",
     "@temporalio/activity": "1.24.0",
     "@temporalio/client": "1.24.0",
     "@temporalio/common": "1.24.0",
@@ -78,12 +78,12 @@
     "zod": "4.6.7"
   },
   "peerDependencies": {
-    "@btravstack/config": "^0.48.0",
-    "@btravstack/core": "^0.48.0",
-    "@btravstack/di": "^0.48.0",
-    "@temporal-contract/client": "^8.0.0-beta.14",
-    "@temporal-contract/contract": "^8.0.0-beta.14",
-    "@temporal-contract/worker": "^8.0.0-beta.14",
+    "@btravstack/config": "^0.49.0",
+    "@btravstack/core": "^0.49.0",
+    "@btravstack/di": "^0.49.0",
+    "@temporal-contract/client": "^8.0.0-beta.15",
+    "@temporal-contract/contract": "^8.0.0-beta.15",
+    "@temporal-contract/worker": "^8.0.0-beta.15",
     "@temporalio/activity": "^1.24.0",
     "@temporalio/common": "^1.24.0",
     "@temporalio/worker": "^1.24.0",