@bastani/atomic 0.9.0-alpha.1 → 0.9.0-alpha.2

package/dist/builtin/workflows/src/runs/foreground/executor-stage-types.ts

@@ -3,10 +3,16 @@ import type { Store } from "../../shared/store.js";
 import type { StageContext } from "../../shared/types.js";
 import type { InternalStageContext } from "./stage-runner.js";
 import type { StageControlRegistry } from "./stage-control-registry.js";
-import type { RunOpts, ParallelFailFastScope } from "./executor-types.js";
+import type { ParallelFailFastScope } from "./executor-types.js";
 import type { StageScheduler } from "./executor-scheduler.js";
 import type { WorkflowExitManager } from "./executor-exit-manager.js";
 import type { WorkflowFailure } from "../../shared/workflow-failures.js";
+import type { EngineStageRuntimeOptions } from "../../engine/options.js";
+
+export interface StageMcpScope {
+  apply(): void;
+  clear(): void;
+}
 
 export interface LiveStageMutableState {
   activeAskUserQuestionAnonymousCalls: number;
@@ -27,12 +33,13 @@ export interface LiveStageRuntime {
   readonly stageSnapshot: StageSnapshot;
   readonly innerCtx: InternalStageContext;
   readonly activeStore: Store;
-  readonly opts: RunOpts;
+  readonly opts: EngineStageRuntimeOptions;
   readonly stageRegistry: StageControlRegistry;
   readonly scheduler: StageScheduler;
   readonly signal: AbortSignal;
   readonly exit: WorkflowExitManager;
   readonly classifyExecutorFailure: (error: unknown) => WorkflowFailure;
+  readonly mcpScope: StageMcpScope;
   readonly stageFailFastScope?: ParallelFailFastScope;
   readonly state: LiveStageMutableState;
   unregisterStageHandle: () => void;

package/dist/builtin/workflows/src/runs/foreground/executor-task-context.ts

@@ -1,132 +1,2 @@
-import type { StageContext, StageOptions, WorkflowTaskOptions, WorkflowTaskResult, WorkflowTaskStep, WorkflowChainOptions, WorkflowParallelOptions } from "../../shared/types.js";
-import type { GraphFrontierTracker } from "../shared/graph-inference.js";
-import type { WorkflowExitManager } from "./executor-exit-manager.js";
-import type { ParallelFailFastScope, ParallelFailFastStage } from "./executor-types.js";
-import { findWorkflowExitSignal } from "./executor-abort.js";
-import {
-  applyTaskContext,
-  chainStepPrompt,
-  parallelFallbackTask,
-  replaceTaskPlaceholder,
-  structuredTaskOutputText,
-  taskOptionsFromStep,
-  taskPrevious,
-  taskPrompt,
-  taskPromptOptions,
-  taskReadInstruction,
-  taskStageOptions,
-  taskWithSharedDefaults,
-  truncateTaskOutput,
-} from "./executor-task-prompts.js";
-import { cleanupPreparedWorktrees, collectWorktreeDiffs, mapParallelSteps, prepareDirectWorktrees, stageOptionsWithGitWorktree, stageOptionsWithInputDefaults } from "./executor-direct-helpers.js";
-import type { InternalStageContext } from "./stage-runner.js";
-
-export interface WorkflowTaskRunners {
-  task(name: string, options: WorkflowTaskOptions, stageFailFastScope?: ParallelFailFastScope): Promise<WorkflowTaskResult>;
-  chain(steps: readonly WorkflowTaskStep[], options?: WorkflowChainOptions): Promise<WorkflowTaskResult[]>;
-  parallel(steps: readonly WorkflowTaskStep[], options?: WorkflowParallelOptions): Promise<WorkflowTaskResult[]>;
-}
-
-export function createWorkflowTaskRunners(input: {
-  readonly runId: string;
-  readonly exit: WorkflowExitManager;
-  readonly tracker: GraphFrontierTracker;
-  readonly inputRuntimeDefaults: Partial<StageOptions>;
-  readonly workflowInvocationCwd: string;
-  readonly stage: (name: string, options?: StageOptions, scope?: ParallelFailFastScope) => StageContext;
-}): WorkflowTaskRunners {
-  const task = async (name: string, options: WorkflowTaskOptions, stageFailFastScope?: ParallelFailFastScope): Promise<WorkflowTaskResult> => {
-    input.exit.throwIfWorkflowExitSelected();
-    const runTaskOnce = async (taskOptions: WorkflowTaskOptions): Promise<WorkflowTaskResult> => {
-      input.exit.throwIfWorkflowExitSelected();
-      const resolvedTaskOptions = stageOptionsWithGitWorktree(stageOptionsWithInputDefaults(taskOptions, input.inputRuntimeDefaults), input.workflowInvocationCwd) ?? taskOptions;
-      const stage = input.stage(name, taskStageOptions(resolvedTaskOptions), stageFailFastScope);
-      const rawOutput = await stage.prompt(
-        applyTaskContext(`${taskReadInstruction(resolvedTaskOptions)}${taskPrompt(resolvedTaskOptions)}`, taskPrevious(resolvedTaskOptions)),
-        taskPromptOptions(resolvedTaskOptions),
-      );
-      const structured = typeof rawOutput === "string" ? undefined : rawOutput;
-      const text = truncateTaskOutput(structuredTaskOutputText(rawOutput), resolvedTaskOptions.maxOutput);
-      const sessionId = (() => {
-        try {
-          return stage.sessionId;
-        } catch {
-          return undefined;
-        }
-      })();
-      const stageMeta = (stage as InternalStageContext).__modelFallbackMeta?.() ?? {};
-      return {
-        name,
-        stageName: name,
-        text,
-        ...(structured !== undefined ? { structured } : {}),
-        ...(sessionId !== undefined ? { sessionId } : {}),
-        ...(stage.sessionFile !== undefined ? { sessionFile: stage.sessionFile } : {}),
-        ...(stageMeta.model !== undefined ? { model: stageMeta.model } : {}),
-        ...(stageMeta.fastMode === true ? { fastMode: stageMeta.fastMode } : {}),
-        ...(stageMeta.attemptedModels !== undefined ? { attemptedModels: stageMeta.attemptedModels } : {}),
-        ...(stageMeta.modelAttempts !== undefined ? { modelAttempts: stageMeta.modelAttempts } : {}),
-        ...(stageMeta.warnings !== undefined ? { warnings: stageMeta.warnings } : {}),
-      };
-    };
-
-    if (options.worktree !== true) return runTaskOnce(options);
-    const prepared = prepareDirectWorktrees(
-      [{ ...options, name }],
-      { ...options, worktree: true },
-      `${input.runId}-${name}-${crypto.randomUUID()}`,
-      name,
-    );
-    const preparedTask = prepared.tasks[0]!;
-    try {
-      const result = await runTaskOnce(preparedTask);
-      const worktreeDiffs = collectWorktreeDiffs(prepared, options.artifacts !== false);
-      return worktreeDiffs.artifacts.length === 0
-        ? result
-        : { ...result, artifacts: [...(result.artifacts ?? []), ...worktreeDiffs.artifacts] };
-    } finally {
-      cleanupPreparedWorktrees(prepared);
-    }
-  };
-
-  const chain = async (steps: readonly WorkflowTaskStep[], options: WorkflowChainOptions = {}): Promise<WorkflowTaskResult[]> => {
-    input.exit.throwIfWorkflowExitSelected();
-    const results: WorkflowTaskResult[] = [];
-    for (let index = 0; index < steps.length; index += 1) {
-      input.exit.throwIfWorkflowExitSelected();
-      const step = steps[index]!;
-      const explicitPrevious = taskPrevious(step);
-      const previous = explicitPrevious ?? (index > 0 ? results[index - 1] : undefined);
-      const prompt = replaceTaskPlaceholder(chainStepPrompt(step, index), options.task ?? "");
-      results.push(await task(step.name, taskWithSharedDefaults(taskOptionsFromStep(step, prompt, previous), options)));
-    }
-    return results;
-  };
-
-  const parallel = async (steps: readonly WorkflowTaskStep[], options: WorkflowParallelOptions = {}): Promise<WorkflowTaskResult[]> => {
-    input.exit.throwIfWorkflowExitSelected();
-    const fallback = parallelFallbackTask(steps, options);
-    const failFastEnabled = options.failFast !== false;
-    const parallelScope: ParallelFailFastScope = {
-      failed: false,
-      activeStages: new Map<string, ParallelFailFastStage>(),
-      parentIds: Object.freeze(input.tracker.currentParents()),
-    };
-    return mapParallelSteps(steps, options.concurrency, options.failFast, async (step) => {
-      input.exit.throwIfWorkflowExitSelected();
-      const prompt = replaceTaskPlaceholder(step.prompt ?? step.task ?? fallback, options.task ?? fallback);
-      return await task(step.name, taskWithSharedDefaults(taskOptionsFromStep(step, prompt, taskPrevious(step)), options), parallelScope);
-    }, (error) => {
-      if (!failFastEnabled) return;
-      parallelScope.failed = true;
-      parallelScope.firstFailure = error;
-      for (const stage of parallelScope.activeStages.values()) stage.skip();
-    }, {
-      beforeDequeue: input.exit.throwIfWorkflowExitSelected,
-      beforeMap: input.exit.throwIfWorkflowExitSelected,
-      isControlSignal: (error) => findWorkflowExitSignal(error, input.exit.exitScope) !== undefined,
-    });
-  };
-
-  return { task, chain, parallel };
-}
+export { createWorkflowTaskRunners } from "../../engine/primitives/task.js";
+export type { WorkflowTaskRunners } from "../../engine/primitives/task.js";

package/dist/builtin/workflows/src/runs/foreground/executor-types.ts

@@ -82,10 +82,10 @@ export interface RunOpts extends Omit<AuthoringContract.RunOpts, "adapters" | "s
   onRunEnd?: (runId: string, status: RunStatus, result?: WorkflowOutputValues, error?: string, exitReason?: string) => void;
 }
 
-export interface RunResult {
+export interface RunResult<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> {
   readonly runId: string;
   readonly status: RunStatus;
-  readonly result?: WorkflowOutputValues;
+  readonly result?: Partial<TOutputs>;
   readonly error?: string;
   /** True when the run reached its terminal status through ctx.exit(). */
   readonly exited?: boolean;

package/dist/builtin/workflows/src/runs/shared/graph-inference.ts

@@ -1,100 +1,2 @@
-/**
- * GraphFrontierTracker — infers DAG parents from JavaScript execution order.
- *
- * Algorithm:
- * - Maintain `frontier: Set<string>` — settled stage IDs not yet consumed as parents
- * - At onSpawn(stageId): snapshot current frontier as parents, store in stageParents
- * - At onSettle(stageId): remove stage's parents from frontier, add stageId to frontier
- * - getParents(stageId): return recorded parents
- */
-
-export interface StageNode {
-  readonly id: string;
-  readonly name: string;
-  readonly parentIds: readonly string[];
-}
-
-export class GraphFrontierTracker {
-  private frontier: Set<string> = new Set();
-  private stageParents: Map<string, string[]> = new Map();
-  private nodes: Map<string, StageNode> = new Map();
-
-  /**
-   * Call when ctx.stage(name) is invoked.
-   * Returns the inferred parent IDs (snapshot of current frontier).
-   */
-  onSpawn(stageId: string, stageName: string): string[] {
-    const parents = Array.from(this.frontier);
-    this.stageParents.set(stageId, parents);
-
-    this.nodes.set(stageId, {
-      id: stageId,
-      name: stageName,
-      parentIds: Object.freeze(parents),
-    });
-
-    return parents;
-  }
-
-  /**
-   * Snapshot the current frontier without registering or mutating a stage.
-   *
-   * Use this when an already-spawned stage needs its parents refreshed before
-   * it starts; `onSpawn` must only be called for the initial `ctx.stage()`
-   * invocation that creates the graph node.
-   */
-  currentParents(): string[] {
-    return Array.from(this.frontier);
-  }
-
-  /**
-   * Replace the recorded parents for a stage before it settles.
-   *
-   * Continuation replay uses source-run topology as authoritative: a replayed
-   * stage may spawn with provisional parents inferred from the continuation's
-   * current frontier, then install the translated source parents before the
-   * stage is recorded or settled.
-   */
-  replaceParents(stageId: string, parentIds: readonly string[]): void {
-    const parents = Array.from(parentIds);
-    this.stageParents.set(stageId, parents);
-    const node = this.nodes.get(stageId);
-    if (node !== undefined) {
-      this.nodes.set(stageId, {
-        ...node,
-        parentIds: Object.freeze(parents),
-      });
-    }
-  }
-
-  /**
-   * Call when the stage's Promise settles.
-   * Removes the stage's parents from the frontier and adds stageId to frontier.
-   */
-  onSettle(stageId: string): void {
-    const parents = this.stageParents.get(stageId) ?? [];
-    // Remove parents from frontier (they are now consumed)
-    for (const parentId of parents) {
-      this.frontier.delete(parentId);
-    }
-    // Add this stage to the frontier
-    this.frontier.add(stageId);
-  }
-
-  /** Get all recorded nodes as an array. */
-  getNodes(): StageNode[] {
-    return Array.from(this.nodes.values());
-  }
-
-  /** Get parent IDs for a stage. */
-  getParents(stageId: string): string[] {
-    return this.stageParents.get(stageId) ?? [];
-  }
-
-  /** Reset to initial state. */
-  reset(): void {
-    this.frontier.clear();
-    this.stageParents.clear();
-    this.nodes.clear();
-  }
-}
+export { GraphFrontierTracker } from "../../engine/graph-inference.js";
+export type { StageNode } from "../../engine/graph-inference.js";

package/dist/builtin/workflows/src/sdk-surface.ts

@@ -5,10 +5,11 @@
  * discovery. The package root re-exports this module directly.
  */
 
-export { defineWorkflow } from "./workflows/define-workflow.js";
+export { workflow } from "./authoring/workflow.js";
+export type { Static, TSchema } from "typebox";
 
 const REMOVED_RUN_WORKFLOW_MESSAGE =
-  "@bastani/workflows no longer exports runWorkflow; author workflows with defineWorkflow(...).compile()";
+  "@bastani/workflows no longer exports runWorkflow; author workflows with workflow({...})";
 
 /**
  * @deprecated Removed imperative workflow API. Kept as a runtime migration
@@ -18,22 +19,18 @@ export const runWorkflow: never = (() => {
   throw new Error(REMOVED_RUN_WORKFLOW_MESSAGE);
 }) as never;
 
-// TypeBox authoring surface so jiti-loaded workflows can `import { Type } from
-// "@bastani/workflows"` (the virtual module is built from this file).
-export { Type } from "typebox";
-export type { Static, TSchema } from "typebox";
 export { createRegistry } from "./workflows/registry.js";
 export { normalizeWorkflowName, workflowNamesEqual } from "./workflows/identity.js";
 export type * from "./shared/types.js";
 export { INTERACTIVE_WORKFLOW_POLICY, NON_INTERACTIVE_WORKFLOW_POLICY } from "./shared/types.js";
-export type { WorkflowBuilder, CompletedWorkflowBuilder } from "./workflows/define-workflow.js";
+export type { AuthoredWorkflowDefinition, AuthoredWorkflowSpec, WorkflowInputsFromSchemas, WorkflowOutputsFromSchemas, WorkflowProvidedInputsFromSchemas } from "./authoring/workflow.js";
 export type { WorkflowRegistry } from "./workflows/registry.js";
 
 export { run, runTask, runParallel, runChain, resolveInputs } from "./runs/foreground/executor.js";
 export type { RunOpts, RunResult, ResolvedInputs } from "./runs/foreground/executor.js";
 export type { AgentSessionAdapter, StageAdapters } from "./runs/foreground/stage-runner.js";
-export { GraphFrontierTracker } from "./runs/shared/graph-inference.js";
-export type { StageNode } from "./runs/shared/graph-inference.js";
+export { GraphFrontierTracker } from "./engine/graph-inference.js";
+export type { StageNode } from "./engine/graph-inference.js";
 export { setupGitWorktree } from "./runs/shared/worktree.js";
 export type { GitWorktreeSetupOptions, GitWorktreeSetupResult } from "./runs/shared/worktree.js";
 export { createStore, store } from "./shared/store.js";

package/dist/builtin/workflows/src/shared/authoring-contract-stage.d.ts

@@ -1,5 +1,4 @@
 /** Workflow authoring primitives, stage/session contracts, and task option types. */
-import type { BashCommandPolicy } from "@bastani/atomic";
 import type { Static, TSchema } from "typebox";
 export type { Static, TSchema };
 export type WorkflowSerializablePrimitive = string | number | boolean | null;
@@ -28,10 +27,11 @@ export type RunStatus = "pending" | "running" | "paused" | WorkflowExitStatus |
 export type WorkflowDetailsMode = "named" | "single" | "parallel" | "chain" | "inspection" | "control";
 export type WorkflowDetailsStatus = "accepted" | "running" | WorkflowExitStatus | "failed" | "killed" | "noop";
 export type WorkflowAction = "list" | "get" | "inputs" | "run" | "status" | "interrupt" | "resume";
+type WorkflowExitOutputValues<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> = [keyof TOutputs] extends [never] ? Readonly<Record<string, never>> : Partial<TOutputs>;
 export interface WorkflowExitOptions<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> {
     readonly status?: WorkflowExitStatus;
     readonly reason?: string;
-    readonly outputs?: Partial<TOutputs>;
+    readonly outputs?: WorkflowExitOutputValues<TOutputs>;
 }
 export interface WorkflowModelFallbackFields {
     /** Ordered model IDs to try after `model` fails; entries may use `:off|minimal|low|medium|high|xhigh` reasoning suffixes. */
@@ -124,7 +124,6 @@ export interface StageOptions<TSchemaDef extends TSchema | undefined = TSchema |
     readonly noTools?: "all" | "builtin";
     readonly excludedTools?: readonly string[];
     readonly customTools?: readonly WorkflowCustomToolDefinition[];
-    readonly bashPolicy?: BashCommandPolicy;
     readonly cwd?: string;
     readonly agentDir?: string;
     readonly scopedModels?: readonly WorkflowScopedModel[];
@@ -347,6 +346,13 @@ export interface WorkflowRunChildOptions<TInputs extends WorkflowInputValues = W
     readonly inputs?: TInputs;
     readonly stageName?: string;
 }
+type WorkflowRequiredKeys<T extends object> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? never : K;
+}[keyof T];
+export type WorkflowRunChildOptionsArgument<TInputs extends WorkflowInputValues = WorkflowInputValues> = [WorkflowRequiredKeys<TInputs>] extends [never] ? WorkflowRunChildOptions<TInputs> : WorkflowRunChildOptions<TInputs> & {
+    readonly inputs: TInputs;
+};
+export type WorkflowRunChildArgs<TInputs extends WorkflowInputValues = WorkflowInputValues> = [WorkflowRequiredKeys<TInputs>] extends [never] ? readonly [options?: WorkflowRunChildOptionsArgument<NoInfer<TInputs>>] : readonly [options: WorkflowRunChildOptionsArgument<NoInfer<TInputs>>];
 export interface WorkflowCompletedChildResult<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> extends WorkflowSerializableObject {
     readonly workflow: string;
     readonly runId: string;

package/dist/builtin/workflows/src/shared/authoring-contract-stage.ts

@@ -1,6 +1,5 @@
 /** Workflow authoring primitives, stage/session contracts, and task option types. */
 
-import type { BashCommandPolicy } from "@bastani/atomic";
 import type { Static, TSchema } from "typebox";
 
 export type { Static, TSchema };
@@ -38,10 +37,14 @@ export type WorkflowDetailsMode = "named" | "single" | "parallel" | "chain" | "i
 export type WorkflowDetailsStatus = "accepted" | "running" | WorkflowExitStatus | "failed" | "killed" | "noop";
 export type WorkflowAction = "list" | "get" | "inputs" | "run" | "status" | "interrupt" | "resume";
 
+type WorkflowExitOutputValues<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> = [keyof TOutputs] extends [never]
+  ? Readonly<Record<string, never>>
+  : Partial<TOutputs>;
+
 export interface WorkflowExitOptions<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> {
   readonly status?: WorkflowExitStatus;
   readonly reason?: string;
-  readonly outputs?: Partial<TOutputs>;
+  readonly outputs?: WorkflowExitOutputValues<TOutputs>;
 }
 
 export interface WorkflowModelFallbackFields {
@@ -156,7 +159,6 @@ export interface StageOptions<TSchemaDef extends TSchema | undefined = TSchema |
   readonly noTools?: "all" | "builtin";
   readonly excludedTools?: readonly string[];
   readonly customTools?: readonly WorkflowCustomToolDefinition[];
-  readonly bashPolicy?: BashCommandPolicy;
   readonly cwd?: string;
   readonly agentDir?: string;
   readonly scopedModels?: readonly WorkflowScopedModel[];
@@ -402,6 +404,18 @@ export interface WorkflowRunChildOptions<TInputs extends WorkflowInputValues = W
   readonly stageName?: string;
 }
 
+type WorkflowRequiredKeys<T extends object> = {
+  [K in keyof T]-?: {} extends Pick<T, K> ? never : K;
+}[keyof T];
+
+export type WorkflowRunChildOptionsArgument<TInputs extends WorkflowInputValues = WorkflowInputValues> = [WorkflowRequiredKeys<TInputs>] extends [never]
+  ? WorkflowRunChildOptions<TInputs>
+  : WorkflowRunChildOptions<TInputs> & { readonly inputs: TInputs };
+
+export type WorkflowRunChildArgs<TInputs extends WorkflowInputValues = WorkflowInputValues> = [WorkflowRequiredKeys<TInputs>] extends [never]
+  ? readonly [options?: WorkflowRunChildOptionsArgument<NoInfer<TInputs>>]
+  : readonly [options: WorkflowRunChildOptionsArgument<NoInfer<TInputs>>];
+
 export interface WorkflowCompletedChildResult<TOutputs extends WorkflowOutputValues = WorkflowOutputValues> extends WorkflowSerializableObject {
   readonly workflow: string;
   readonly runId: string;

package/dist/builtin/workflows/src/shared/authoring-contract-ui.d.ts

@@ -1,8 +1,8 @@
 /** Workflow authoring UI, builder, run, and result contract types. */
 import type { KeybindingsManager, Theme } from "@bastani/atomic";
 import type { Component, OverlayHandle, OverlayOptions, TUI } from "@earendil-works/pi-tui";
-import type { Static, TOptional, TSchema } from "typebox";
-import type { RunStatus, StageAdapters, StageContext, StageOptions, WorkflowAction, WorkflowArtifact, WorkflowChainOptions, WorkflowContextMode, WorkflowDetailsMode, WorkflowChildResult, WorkflowDetailsStatus, WorkflowExecutionMode, WorkflowExitOptions, WorkflowInputSchemaMap, WorkflowInputValues, WorkflowMcpPort, WorkflowModelCatalogPort, WorkflowOutputSchemaMap, WorkflowOutputValues, WorkflowParallelOptions, WorkflowPersistencePort, WorkflowRunChildOptions, WorkflowSerializableObject, WorkflowSerializableValue, WorkflowTaskOptions, WorkflowTaskResult, WorkflowTaskStep } from "./authoring-contract-stage.js";
+import type { TSchema } from "typebox";
+import type { RunStatus, StageAdapters, StageContext, StageOptions, WorkflowAction, WorkflowArtifact, WorkflowChainOptions, WorkflowContextMode, WorkflowDetailsMode, WorkflowChildResult, WorkflowDetailsStatus, WorkflowExecutionMode, WorkflowExitOptions, WorkflowInputSchemaMap, WorkflowInputValues, WorkflowMcpPort, WorkflowModelCatalogPort, WorkflowOutputSchemaMap, WorkflowOutputValues, WorkflowParallelOptions, WorkflowPersistencePort, WorkflowRunChildArgs, WorkflowSerializableObject, WorkflowSerializableValue, WorkflowTaskOptions, WorkflowTaskResult, WorkflowTaskStep } from "./authoring-contract-stage.js";
 export type WorkflowCustomUiComponent = Component & {
     dispose?(): void;
 };
@@ -55,7 +55,7 @@ export interface WorkflowRunContext<TInputs extends WorkflowInputValues = Workfl
     task(name: string, options: WorkflowTaskOptions): Promise<WorkflowTaskResult>;
     chain(steps: readonly WorkflowTaskStep[], options?: WorkflowChainOptions): Promise<WorkflowTaskResult[]>;
     parallel(steps: readonly WorkflowTaskStep[], options?: WorkflowParallelOptions): Promise<WorkflowTaskResult[]>;
-    workflow<TChildInputs extends WorkflowInputValues, TChildOutputs extends WorkflowOutputValues>(definition: WorkflowDefinition<TChildInputs, TChildOutputs> & TDefinitionBrand, options?: WorkflowRunChildOptions<TChildInputs>): Promise<WorkflowChildResult<TChildOutputs>>;
+    workflow<TChildInputs extends WorkflowInputValues, TChildOutputs extends WorkflowOutputValues, TChildRunInputs extends WorkflowInputValues = TChildInputs>(definition: WorkflowDefinition<TChildInputs, TChildOutputs, TChildRunInputs> & TDefinitionBrand, ...args: WorkflowRunChildArgs<TChildRunInputs>): Promise<WorkflowChildResult<TChildOutputs>>;
     readonly ui: WorkflowUIContext;
 }
 export type WorkflowRunFn<TInputs extends WorkflowInputValues = WorkflowInputValues, TOutputs extends WorkflowOutputValues = WorkflowOutputValues, TDefinitionBrand extends object = {}> = (ctx: WorkflowRunContext<TInputs, TDefinitionBrand, TOutputs>) => Promise<TOutputs> | TOutputs;
@@ -85,36 +85,7 @@ export interface WorkflowDefinition<TInputs extends WorkflowInputValues = Workfl
     readonly inputBindings?: WorkflowInputBindings;
     run(ctx: WorkflowRunContext<TInputs, TDefinitionBrand, TOutputs>): Promise<TOutputs> | TOutputs;
 }
-type DeclaredResolvedEntry<K extends string, S extends TSchema> = S extends TOptional<TSchema> ? {
-    readonly [P in K]?: Static<S>;
-} : {
-    readonly [P in K]: Static<S>;
-};
-type DeclaredProvidedEntry<K extends string, S extends TSchema> = S extends TOptional<TSchema> | {
-    readonly default: WorkflowSerializableValue;
-} ? {
-    readonly [P in K]?: Static<S>;
-} : {
-    readonly [P in K]: Static<S>;
-};
-type Simplify<T> = {
-    [K in keyof T]: T[K];
-} & {};
 export type NoExtraOutputs<TDeclared extends WorkflowOutputValues, TActual extends TDeclared> = TActual & Record<Exclude<keyof TActual, keyof TDeclared>, never>;
-export interface WorkflowBuilder<TInputs extends WorkflowInputValues = {}, TOutputs extends WorkflowOutputValues = {}, TRunInputs extends WorkflowInputValues = TInputs, TDefinitionBrand extends object = {}, TCompiledDefinition extends WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand> = WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand>> {
-    description(text: string): WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-    input<K extends string, S extends TSchema>(key: K, schema: S): WorkflowBuilder<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand, WorkflowDefinition<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand> & TDefinitionBrand>;
-    output<K extends string, S extends TSchema>(key: K, schema: S): WorkflowBuilder<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand, WorkflowDefinition<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand> & TDefinitionBrand>;
-    worktreeFromInputs(binding: WorkflowWorktreeInputBinding): WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-    run<TActualOutputs extends TOutputs>(fn: (ctx: WorkflowRunContext<TInputs, TDefinitionBrand, TOutputs>) => Promise<NoExtraOutputs<TOutputs, TActualOutputs>> | NoExtraOutputs<TOutputs, TActualOutputs>): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-}
-export interface CompletedWorkflowBuilder<TInputs extends WorkflowInputValues = {}, TOutputs extends WorkflowOutputValues = {}, TRunInputs extends WorkflowInputValues = TInputs, TDefinitionBrand extends object = {}, TCompiledDefinition extends WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand> = WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand>> extends WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition> {
-    description(text: string): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-    input<K extends string, S extends TSchema>(key: K, schema: S): CompletedWorkflowBuilder<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand, WorkflowDefinition<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand> & TDefinitionBrand>;
-    output<K extends string, S extends TSchema>(key: K, schema: S): CompletedWorkflowBuilder<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand, WorkflowDefinition<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand> & TDefinitionBrand>;
-    worktreeFromInputs(binding: WorkflowWorktreeInputBinding): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-    compile(): TCompiledDefinition;
-}
 export interface WorkflowOverlayAdapter extends WorkflowSerializableObject {
 }
 export interface RunSnapshot extends WorkflowSerializableObject {
@@ -233,4 +204,3 @@ export interface GitWorktreeSetupResult extends WorkflowSerializableObject {
     readonly repositoryRoot: string;
     readonly created: boolean;
 }
-export {};

package/dist/builtin/workflows/src/shared/authoring-contract-ui.ts

@@ -2,7 +2,7 @@
 
 import type { KeybindingsManager, Theme } from "@bastani/atomic";
 import type { Component, OverlayHandle, OverlayOptions, TUI } from "@earendil-works/pi-tui";
-import type { Static, TOptional, TSchema } from "typebox";
+import type { TSchema } from "typebox";
 import type {
   RunStatus,
   StageAdapters,
@@ -25,7 +25,7 @@ import type {
   WorkflowOutputValues,
   WorkflowParallelOptions,
   WorkflowPersistencePort,
-  WorkflowRunChildOptions,
+  WorkflowRunChildArgs,
   WorkflowSerializableObject,
   WorkflowSerializableValue,
   WorkflowTaskOptions,
@@ -95,9 +95,13 @@ export interface WorkflowRunContext<
   task(name: string, options: WorkflowTaskOptions): Promise<WorkflowTaskResult>;
   chain(steps: readonly WorkflowTaskStep[], options?: WorkflowChainOptions): Promise<WorkflowTaskResult[]>;
   parallel(steps: readonly WorkflowTaskStep[], options?: WorkflowParallelOptions): Promise<WorkflowTaskResult[]>;
-  workflow<TChildInputs extends WorkflowInputValues, TChildOutputs extends WorkflowOutputValues>(
-    definition: WorkflowDefinition<TChildInputs, TChildOutputs> & TDefinitionBrand,
-    options?: WorkflowRunChildOptions<TChildInputs>,
+  workflow<
+    TChildInputs extends WorkflowInputValues,
+    TChildOutputs extends WorkflowOutputValues,
+    TChildRunInputs extends WorkflowInputValues = TChildInputs,
+  >(
+    definition: WorkflowDefinition<TChildInputs, TChildOutputs, TChildRunInputs> & TDefinitionBrand,
+    ...args: WorkflowRunChildArgs<TChildRunInputs>
   ): Promise<WorkflowChildResult<TChildOutputs>>;
   readonly ui: WorkflowUIContext;
 }
@@ -143,85 +147,9 @@ export interface WorkflowDefinition<
   run(ctx: WorkflowRunContext<TInputs, TDefinitionBrand, TOutputs>): Promise<TOutputs> | TOutputs;
 }
 
-type DeclaredResolvedEntry<K extends string, S extends TSchema> = S extends TOptional<TSchema>
-  ? { readonly [P in K]?: Static<S> }
-  : { readonly [P in K]: Static<S> };
-
-type DeclaredProvidedEntry<K extends string, S extends TSchema> =
-  S extends TOptional<TSchema> | { readonly default: WorkflowSerializableValue }
-    ? { readonly [P in K]?: Static<S> }
-    : { readonly [P in K]: Static<S> };
-
-type Simplify<T> = { [K in keyof T]: T[K] } & {};
 export type NoExtraOutputs<TDeclared extends WorkflowOutputValues, TActual extends TDeclared> = TActual &
   Record<Exclude<keyof TActual, keyof TDeclared>, never>;
 
-export interface WorkflowBuilder<
-  TInputs extends WorkflowInputValues = {},
-  TOutputs extends WorkflowOutputValues = {},
-  TRunInputs extends WorkflowInputValues = TInputs,
-  TDefinitionBrand extends object = {},
-  TCompiledDefinition extends WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand> = WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand>,
-> {
-  description(text: string): WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-  input<K extends string, S extends TSchema>(
-    key: K,
-    schema: S,
-  ): WorkflowBuilder<
-    Simplify<TInputs & DeclaredResolvedEntry<K, S>>,
-    TOutputs,
-    Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>,
-    TDefinitionBrand,
-    WorkflowDefinition<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand> & TDefinitionBrand
-  >;
-  output<K extends string, S extends TSchema>(
-    key: K,
-    schema: S,
-  ): WorkflowBuilder<
-    TInputs,
-    Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>,
-    TRunInputs,
-    TDefinitionBrand,
-    WorkflowDefinition<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand> & TDefinitionBrand
-  >;
-  worktreeFromInputs(binding: WorkflowWorktreeInputBinding): WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-  run<TActualOutputs extends TOutputs>(
-    fn: (ctx: WorkflowRunContext<TInputs, TDefinitionBrand, TOutputs>) => Promise<NoExtraOutputs<TOutputs, TActualOutputs>> | NoExtraOutputs<TOutputs, TActualOutputs>,
-  ): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-}
-
-export interface CompletedWorkflowBuilder<
-  TInputs extends WorkflowInputValues = {},
-  TOutputs extends WorkflowOutputValues = {},
-  TRunInputs extends WorkflowInputValues = TInputs,
-  TDefinitionBrand extends object = {},
-  TCompiledDefinition extends WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand> = WorkflowDefinition<TInputs, TOutputs, TRunInputs, TDefinitionBrand>,
-> extends WorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition> {
-  description(text: string): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-  input<K extends string, S extends TSchema>(
-    key: K,
-    schema: S,
-  ): CompletedWorkflowBuilder<
-    Simplify<TInputs & DeclaredResolvedEntry<K, S>>,
-    TOutputs,
-    Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>,
-    TDefinitionBrand,
-    WorkflowDefinition<Simplify<TInputs & DeclaredResolvedEntry<K, S>>, TOutputs, Simplify<TRunInputs & DeclaredProvidedEntry<K, S>>, TDefinitionBrand> & TDefinitionBrand
-  >;
-  output<K extends string, S extends TSchema>(
-    key: K,
-    schema: S,
-  ): CompletedWorkflowBuilder<
-    TInputs,
-    Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>,
-    TRunInputs,
-    TDefinitionBrand,
-    WorkflowDefinition<TInputs, Simplify<TOutputs & (DeclaredResolvedEntry<K, S> & WorkflowOutputValues)>, TRunInputs, TDefinitionBrand> & TDefinitionBrand
-  >;
-  worktreeFromInputs(binding: WorkflowWorktreeInputBinding): CompletedWorkflowBuilder<TInputs, TOutputs, TRunInputs, TDefinitionBrand, TCompiledDefinition>;
-  compile(): TCompiledDefinition;
-}
-
 export interface WorkflowOverlayAdapter extends WorkflowSerializableObject {}
 export interface RunSnapshot extends WorkflowSerializableObject {}
 export interface ActiveRunEntry {