@bastani/atomic 0.8.1-1 → 0.8.2-0

package/dist/builtin/workflows/src/extension/runtime.ts

@@ -153,23 +153,47 @@ export function createExtensionRuntime(opts: ExtensionRuntimeOpts = {}): Extensi
     };
   }
 
+  function withoutUndefinedProperties<T extends object>(value: T): Partial<T> {
+    return Object.fromEntries(
+      Object.entries(value).filter(([, field]) => field !== undefined),
+    ) as Partial<T>;
+  }
+
   function directOptions(args: WorkflowToolArgs): WorkflowDirectOptions {
+    const {
+      workflow: _workflow,
+      inputs: _inputs,
+      action: _action,
+      runId: _runId,
+      task,
+      tasks: _tasks,
+      chain: _chain,
+      chainName,
+      concurrency,
+      async: _async,
+      intercom: _intercom,
+      output,
+      outputMode,
+      chainDir,
+      maxOutput,
+      artifacts,
+      progress,
+      worktree,
+      ...stageOptions
+    } = args;
+
     return {
-      ...(typeof args.task === "string" ? { task: args.task } : {}),
-      ...(typeof args.chainName === "string" ? { chainName: args.chainName } : {}),
-      ...(args.context !== undefined ? { context: args.context } : {}),
-      ...(typeof args.forkFromSessionFile === "string" ? { forkFromSessionFile: args.forkFromSessionFile } : {}),
-      ...(typeof args.concurrency === "number" ? { concurrency: args.concurrency } : {}),
-      ...(typeof args.chainDir === "string" ? { chainDir: args.chainDir } : {}),
-      ...(typeof args.cwd === "string" ? { cwd: args.cwd } : {}),
-      ...(args.output !== undefined ? { output: args.output } : {}),
-      ...(args.outputMode !== undefined ? { outputMode: args.outputMode } : {}),
-      ...(args.maxOutput !== undefined ? { maxOutput: args.maxOutput } : {}),
-      ...(typeof args.artifacts === "boolean" ? { artifacts: args.artifacts } : {}),
-      ...(typeof args.sessionDir === "string" ? { sessionDir: args.sessionDir } : {}),
-      ...(typeof args.progress === "boolean" ? { progress: args.progress } : {}),
-      ...(typeof args.worktree === "boolean" ? { worktree: args.worktree } : {}),
-      ...(Array.isArray(args.fallbackModels) ? { fallbackModels: args.fallbackModels } : {}),
+      ...withoutUndefinedProperties(stageOptions),
+      ...(typeof task === "string" ? { task } : {}),
+      ...(typeof chainName === "string" ? { chainName } : {}),
+      ...(typeof concurrency === "number" ? { concurrency } : {}),
+      ...(typeof chainDir === "string" ? { chainDir } : {}),
+      ...(output !== undefined ? { output } : {}),
+      ...(outputMode !== undefined ? { outputMode } : {}),
+      ...(maxOutput !== undefined ? { maxOutput } : {}),
+      ...(typeof artifacts === "boolean" ? { artifacts } : {}),
+      ...(typeof progress === "boolean" ? { progress } : {}),
+      ...(typeof worktree === "boolean" ? { worktree } : {}),
     };
   }
 
@@ -182,7 +206,7 @@ export function createExtensionRuntime(opts: ExtensionRuntimeOpts = {}): Extensi
   function directModelRequests(args: WorkflowToolArgs): Array<{ readonly model?: WorkflowDirectTaskItem["model"]; readonly fallbackModels?: readonly string[] }> {
     const options = directOptions(args);
     const withFallbackDefault = (item: WorkflowDirectTaskItem) => ({
-      model: item.model,
+      model: item.model ?? options.model,
       fallbackModels: item.fallbackModels ?? options.fallbackModels,
     });
     if (args.task !== undefined && typeof args.task === "object") return [withFallbackDefault(args.task)];

package/dist/builtin/workflows/src/extension/wiring.ts

@@ -22,6 +22,7 @@
  */
 
 import type { CreateAgentSessionOptions } from "@earendil-works/pi-coding-agent";
+import type { ChatMessageRenderOptions } from "@bastani/atomic";
 import type { StageAdapters, StageSessionRuntime } from "../runs/foreground/stage-runner.js";
 import type { StageExecutionMeta, StageOptions } from "../shared/types.js";
 
@@ -233,6 +234,7 @@ function makeStageExtensionUiContext(ui: PiUISurface) {
     setTheme: ui.setTheme ?? (() => ({ success: false, error: "pi-workflows: theme UI is unavailable" })),
     getToolsExpanded: ui.getToolsExpanded ?? (() => false),
     setToolsExpanded: ui.setToolsExpanded ?? (() => undefined),
+    getChatRenderSettings: ui.getChatRenderSettings ?? (() => undefined),
   };
 }
 
@@ -539,6 +541,7 @@ export interface PiUISurface {
   setTheme?: (theme: string | unknown) => { success: boolean; error?: string };
   getToolsExpanded?: () => boolean;
   setToolsExpanded?: (expanded: boolean) => void;
+  getChatRenderSettings?: () => Partial<Omit<ChatMessageRenderOptions, "ui" | "cwd" | "markdownTheme">> | undefined;
 }
 
 /**

package/dist/builtin/workflows/src/extension/workflow-schema.ts

@@ -17,33 +17,54 @@ const IntercomOptionsSchema = Type.Object({
   ]))),
 });
 
-const DirectTaskSchema = Type.Object({
-  name: Type.String({ description: "Task/stage label." }),
-  prompt: Type.Optional(Type.String({ description: "Prompt text for this task." })),
-  task: Type.Optional(Type.String({ description: "Task text for this task." })),
-  context: Type.Optional(Type.Union([Type.Literal("fresh"), Type.Literal("fork")])),
+const MaxOutputSchema = Type.Object({
+  bytes: Type.Optional(Type.Number()),
+  lines: Type.Optional(Type.Number()),
+});
+
+const McpOptionsSchema = Type.Object({
+  allow: Type.Optional(Type.Array(Type.String())),
+  deny: Type.Optional(Type.Array(Type.String())),
+});
+
+const StageSessionOptionProperties = {
   cwd: Type.Optional(Type.String()),
+  agentDir: Type.Optional(Type.String()),
+  authStorage: Type.Optional(Type.Any()),
+  modelRegistry: Type.Optional(Type.Any()),
+  model: Type.Optional(Type.Any()),
+  thinkingLevel: Type.Optional(Type.String()),
+  scopedModels: Type.Optional(Type.Array(Type.Any())),
+  noTools: Type.Optional(Type.Union([Type.Literal("all"), Type.Literal("builtin")])),
+  tools: Type.Optional(Type.Array(Type.String())),
+  customTools: Type.Optional(Type.Array(Type.Any())),
+  resourceLoader: Type.Optional(Type.Any()),
+  sessionManager: Type.Optional(Type.Any()),
+  settingsManager: Type.Optional(Type.Any()),
+  sessionStartEvent: Type.Optional(Type.Any()),
+  fallbackModels: Type.Optional(Type.Array(Type.String())),
+  mcp: Type.Optional(McpOptionsSchema),
+  sessionDir: Type.Optional(Type.String()),
+  context: Type.Optional(Type.Union([Type.Literal("fresh"), Type.Literal("fork")])),
+  forkFromSessionFile: Type.Optional(Type.String()),
+};
+
+const WorkflowTaskOptionProperties = {
   output: Type.Optional(Type.Union([Type.String(), Type.Literal(false)])),
   outputMode: Type.Optional(Type.Union([Type.Literal("inline"), Type.Literal("file-only")])),
   reads: Type.Optional(Type.Union([Type.Array(Type.String()), Type.Literal(false)])),
   progress: Type.Optional(Type.Boolean()),
   worktree: Type.Optional(Type.Boolean()),
-  maxOutput: Type.Optional(Type.Object({
-    bytes: Type.Optional(Type.Number()),
-    lines: Type.Optional(Type.Number()),
-  })),
+  maxOutput: Type.Optional(MaxOutputSchema),
   artifacts: Type.Optional(Type.Boolean()),
-  sessionDir: Type.Optional(Type.String()),
-  model: Type.Optional(Type.Any()),
-  fallbackModels: Type.Optional(Type.Array(Type.String())),
-  tools: Type.Optional(Type.Any()),
-  toolNames: Type.Optional(Type.Array(Type.String())),
-  noTools: Type.Optional(Type.Any()),
-  thinkingLevel: Type.Optional(Type.String()),
-  mcp: Type.Optional(Type.Object({
-    allow: Type.Optional(Type.Array(Type.String())),
-    deny: Type.Optional(Type.Array(Type.String())),
-  })),
+};
+
+const DirectTaskSchema = Type.Object({
+  name: Type.String({ description: "Task/stage label." }),
+  prompt: Type.Optional(Type.String({ description: "Prompt text for this task." })),
+  task: Type.Optional(Type.String({ description: "Task text for this task." })),
+  ...StageSessionOptionProperties,
+  ...WorkflowTaskOptionProperties,
 });
 
 const ParallelChainStepSchema = Type.Object({
@@ -83,20 +104,9 @@ export const WorkflowParametersSchema = Type.Object({
   concurrency: Type.Optional(Type.Number()),
   async: Type.Optional(Type.Boolean()),
   intercom: Type.Optional(IntercomOptionsSchema),
-  context: Type.Optional(Type.Union([Type.Literal("fresh"), Type.Literal("fork")])),
-  cwd: Type.Optional(Type.String()),
-  output: Type.Optional(Type.Union([Type.String(), Type.Literal(false)])),
-  outputMode: Type.Optional(Type.Union([Type.Literal("inline"), Type.Literal("file-only")])),
+  ...StageSessionOptionProperties,
+  ...WorkflowTaskOptionProperties,
   chainDir: Type.Optional(Type.String()),
-  maxOutput: Type.Optional(Type.Object({
-    bytes: Type.Optional(Type.Number()),
-    lines: Type.Optional(Type.Number()),
-  })),
-  artifacts: Type.Optional(Type.Boolean()),
-  sessionDir: Type.Optional(Type.String()),
-  progress: Type.Optional(Type.Boolean()),
-  worktree: Type.Optional(Type.Boolean()),
-  fallbackModels: Type.Optional(Type.Array(Type.String())),
 });
 
 export type WorkflowParameters = Static<typeof WorkflowParametersSchema>;

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

@@ -376,21 +376,45 @@ function truncateTaskOutput(text: string, maxOutput: WorkflowMaxOutput | undefin
   return `${byBytes.text}\n\n[workflow output truncated; limits: ${limits.bytes} bytes, ${limits.lines} lines]`;
 }
 
+function withoutUndefinedProperties<T extends object>(value: T): Partial<T> {
+  return Object.fromEntries(
+    Object.entries(value).filter(([, field]) => field !== undefined),
+  ) as Partial<T>;
+}
+
 function directTaskWithDefaults(
   item: WorkflowDirectTaskItem,
   options: WorkflowDirectOptions,
 ): WorkflowDirectTaskItem {
+  const {
+    task: _task,
+    chainName: _chainName,
+    concurrency: _concurrency,
+    failFast: _failFast,
+    chainDir: _chainDir,
+    output,
+    outputMode,
+    progress,
+    worktree,
+    maxOutput,
+    artifacts,
+    ...stageDefaults
+  } = options;
+
+  const taskWithStageDefaults = {
+    ...withoutUndefinedProperties(stageDefaults),
+    ...withoutUndefinedProperties(item),
+    name: item.name,
+  } as WorkflowDirectTaskItem;
+
   return {
-    ...item,
-    ...(item.context === undefined && options.context !== undefined ? { context: options.context } : {}),
-    ...(item.forkFromSessionFile === undefined && options.forkFromSessionFile !== undefined ? { forkFromSessionFile: options.forkFromSessionFile } : {}),
-    ...(item.cwd === undefined && options.cwd !== undefined ? { cwd: options.cwd } : {}),
-    ...(item.output === undefined && options.output !== undefined ? { output: options.output } : {}),
-    ...(item.outputMode === undefined && options.outputMode !== undefined ? { outputMode: options.outputMode } : {}),
-    ...(item.maxOutput === undefined && options.maxOutput !== undefined ? { maxOutput: options.maxOutput } : {}),
-    ...(item.artifacts === undefined && options.artifacts !== undefined ? { artifacts: options.artifacts } : {}),
-    ...(item.sessionDir === undefined && options.sessionDir !== undefined ? { sessionDir: options.sessionDir } : {}),
-    ...(item.fallbackModels === undefined && options.fallbackModels !== undefined ? { fallbackModels: options.fallbackModels } : {}),
+    ...taskWithStageDefaults,
+    ...(item.output === undefined && output !== undefined ? { output } : {}),
+    ...(item.outputMode === undefined && outputMode !== undefined ? { outputMode } : {}),
+    ...(item.progress === undefined && progress !== undefined ? { progress } : {}),
+    ...(item.worktree === undefined && worktree !== undefined ? { worktree } : {}),
+    ...(item.maxOutput === undefined && maxOutput !== undefined ? { maxOutput } : {}),
+    ...(item.artifacts === undefined && artifacts !== undefined ? { artifacts } : {}),
   };
 }
 

package/dist/builtin/workflows/src/shared/types.ts

@@ -405,24 +405,20 @@ export interface WorkflowParallelChainStep {
 
 export type WorkflowChainStep = WorkflowDirectTaskItem | WorkflowParallelChainStep;
 
-export interface WorkflowDirectOptions extends WorkflowModelFallbackFields {
+export interface WorkflowDirectOptions extends StageOptions {
   /** Shared/root task used for `{task}` in direct parallel or chain steps. */
   task?: string;
   /** Optional named chain identifier for status/artifact grouping. */
   chainName?: string;
-  context?: "fresh" | "fork";
-  forkFromSessionFile?: string;
   concurrency?: number;
   failFast?: boolean;
   chainDir?: string;
-  cwd?: string;
   output?: string | false;
   outputMode?: WorkflowOutputMode;
   progress?: boolean;
   worktree?: boolean;
   maxOutput?: WorkflowMaxOutput;
   artifacts?: boolean;
-  sessionDir?: string;
 }
 
 // ---------------------------------------------------------------------------