@osolmaz/pi-workflows 0.11.1 → 0.12.0

package/src/extension/step-message.ts

@@ -12,6 +12,7 @@ export type WorkflowAgentStepMessageDetails = {
   kind: PromptDeliveryKind;
   contract: AgentStepContract;
   presentation?: AgentStepPresentation;
+  turnIntentId?: string;
 };
 
 type WorkflowAgentStepMessage = {

package/src/herdr/setup.ts

@@ -115,20 +115,20 @@ function preflightPackage(packageRoot: string): PluginPackage {
   try {
     root = fs.realpathSync(requestedRoot);
   } catch (error) {
-    throw new Error(`Pi Workflows package root is missing: ${requestedRoot}`, { cause: error });
+    throw new Error(`pi-workflows package root is missing: ${requestedRoot}`, { cause: error });
   }
   if (!fs.statSync(root).isDirectory()) {
-    throw new Error(`Pi Workflows package root is not a directory: ${requestedRoot}`);
+    throw new Error(`pi-workflows package root is not a directory: ${requestedRoot}`);
   }
   const packagePath = checkedRegularFile(root, "package.json");
   const manifestPath = checkedRegularFile(root, MANIFEST_NAME);
   const packageJson = parseJsonObject(fs.readFileSync(packagePath, "utf8"), "package.json");
   if (packageJson["name"] !== PACKAGE_NAME) {
-    throw new Error(`Unexpected Pi Workflows package name in ${packagePath}.`);
+    throw new Error(`Unexpected pi-workflows package name in ${packagePath}.`);
   }
   const packageVersion = packageJson["version"];
   if (typeof packageVersion !== "string" || packageVersion.length === 0) {
-    throw new Error(`Pi Workflows package version is missing in ${packagePath}.`);
+    throw new Error(`pi-workflows package version is missing in ${packagePath}.`);
   }
 
   const manifest = fs.readFileSync(manifestPath, "utf8");

package/src/host/runner.ts

@@ -289,6 +289,9 @@ export class WorkflowHost {
         },
       },
     });
+    if (!store.markWorkflowRunRunning({ runId, claimToken })) {
+      throw new ClaimLostError(runId);
+    }
     const parkEngine = () => engine.park();
     this.parkedEngines.push(parkEngine);
 

package/src/workflows/command-batch.ts

@@ -0,0 +1,254 @@
+import path from "node:path";
+import { CancelledError, TimeoutError, errorMessage, isAbortLikeError } from "./errors.js";
+import { runShellAction, shellOutputTruncation, shellResultFromError } from "./shell.js";
+import type { MaybePromise, ShellActionResult } from "./types.js";
+
+export const COMMAND_BATCH_RESULT_SCHEMA = "pi-workflows.command-batch-result.v1";
+export const MAX_COMMAND_BATCH_ITEMS = 64;
+export const MAX_COMMAND_BATCH_CONCURRENCY = 8;
+export const MAX_COMMAND_BATCH_TIMEOUT_MS = 60 * 60_000;
+export const MAX_COMMAND_BATCH_OUTPUT_CHARS = 1_000_000;
+
+const MAX_ERROR_CHARS = 2_000;
+const ITEM_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,63}$/;
+
+export type CommandBatchItem = {
+  id: string;
+  command: string;
+  args: string[];
+  cwd: string;
+  timeoutMs: number;
+  maxOutputChars: number;
+};
+
+export type CommandBatchRequest = {
+  items: CommandBatchItem[];
+  maxConcurrency: number;
+};
+
+export type CommandBatchItemOutcome = "succeeded" | "failed" | "timedOut" | "cancelled";
+
+export type CommandBatchItemResult = ShellActionResult & {
+  id: string;
+  outcome: CommandBatchItemOutcome;
+  stdoutTruncated: boolean;
+  stderrTruncated: boolean;
+  error?: string;
+};
+
+export type CommandBatchResult = {
+  schema: typeof COMMAND_BATCH_RESULT_SCHEMA;
+  items: CommandBatchItemResult[];
+  completed: number;
+  total: number;
+};
+
+export type RunCommandBatchOptions = {
+  signal?: AbortSignal;
+  onItemSettled?: (
+    result: CommandBatchItemResult,
+    completed: number,
+    total: number,
+  ) => MaybePromise<void>;
+};
+
+export function validateCommandBatchRequest(value: unknown): CommandBatchRequest {
+  const request = requireRecord(value, "command batch request");
+  for (const key of Object.keys(request)) {
+    if (key !== "items" && key !== "maxConcurrency") {
+      throw new Error(`command batch request.${key} is not supported`);
+    }
+  }
+  if (!Array.isArray(request.items)) {
+    throw new Error("command batch items must be an array");
+  }
+  if (request.items.length > MAX_COMMAND_BATCH_ITEMS) {
+    throw new Error(`command batch items must contain at most ${MAX_COMMAND_BATCH_ITEMS} entries`);
+  }
+  const ids = new Set<string>();
+  const items = request.items.map((item, index) => {
+    const normalized = validateItem(item, index);
+    if (ids.has(normalized.id)) {
+      throw new Error(`command batch item id is duplicated: ${normalized.id}`);
+    }
+    ids.add(normalized.id);
+    return normalized;
+  });
+  const maxConcurrency = positiveInteger(
+    request.maxConcurrency,
+    "command batch maxConcurrency",
+    MAX_COMMAND_BATCH_CONCURRENCY,
+  );
+  return { items, maxConcurrency };
+}
+
+export async function runCommandBatch(
+  input: CommandBatchRequest,
+  options: RunCommandBatchOptions = {},
+): Promise<CommandBatchResult> {
+  const request = validateCommandBatchRequest(input);
+  const total = request.items.length;
+  if (total === 0) {
+    return { schema: COMMAND_BATCH_RESULT_SCHEMA, items: [], completed: 0, total: 0 };
+  }
+
+  const results = Array.from<CommandBatchItemResult | undefined>({ length: total });
+  const signal = options.signal;
+  let nextIndex = 0;
+  let completed = 0;
+
+  const worker = async () => {
+    while (!signal?.aborted) {
+      const index = nextIndex;
+      if (index >= total) return;
+      nextIndex += 1;
+      if (signal?.aborted) return;
+
+      const item = request.items[index];
+      if (item === undefined) return;
+      const result = await runItem(item, signal);
+      results[index] = result;
+      completed += 1;
+      try {
+        await options.onItemSettled?.(result, completed, total);
+      } catch {
+        // Completion callbacks are observational and cannot change batch execution.
+      }
+    }
+  };
+
+  const workerCount = Math.min(request.maxConcurrency, total);
+  await Promise.all(Array.from({ length: workerCount }, worker));
+
+  for (let index = 0; index < total; index += 1) {
+    if (results[index] !== undefined) continue;
+    const item = request.items[index];
+    if (item !== undefined) results[index] = cancelledResult(item);
+  }
+
+  return {
+    schema: COMMAND_BATCH_RESULT_SCHEMA,
+    items: results as CommandBatchItemResult[],
+    completed,
+    total,
+  };
+}
+
+function validateItem(value: unknown, index: number): CommandBatchItem {
+  const item = requireRecord(value, `command batch items[${index}]`);
+  const allowed = new Set(["id", "command", "args", "cwd", "timeoutMs", "maxOutputChars"]);
+  for (const key of Object.keys(item)) {
+    if (!allowed.has(key)) throw new Error(`command batch items[${index}].${key} is not supported`);
+  }
+  const id = requireString(item.id, `command batch items[${index}].id`);
+  if (!ITEM_ID_PATTERN.test(id)) {
+    throw new Error(`command batch items[${index}].id is invalid`);
+  }
+  const command = requireString(item.command, `command batch items[${index}].command`);
+  if (!Array.isArray(item.args) || item.args.some((arg) => typeof arg !== "string")) {
+    throw new Error(`command batch items[${index}].args must be an array of strings`);
+  }
+  const cwd = requireString(item.cwd, `command batch items[${index}].cwd`);
+  if (!path.isAbsolute(cwd)) {
+    throw new Error(`command batch items[${index}].cwd must be absolute`);
+  }
+  const timeoutMs = positiveInteger(
+    item.timeoutMs,
+    `command batch items[${index}].timeoutMs`,
+    MAX_COMMAND_BATCH_TIMEOUT_MS,
+  );
+  const maxOutputChars = positiveInteger(
+    item.maxOutputChars,
+    `command batch items[${index}].maxOutputChars`,
+    MAX_COMMAND_BATCH_OUTPUT_CHARS,
+  );
+  return { id, command, args: [...item.args] as string[], cwd, timeoutMs, maxOutputChars };
+}
+
+async function runItem(
+  item: CommandBatchItem,
+  signal?: AbortSignal,
+): Promise<CommandBatchItemResult> {
+  try {
+    const result = await runShellAction(
+      {
+        command: item.command,
+        args: item.args,
+        cwd: item.cwd,
+        timeoutMs: item.timeoutMs,
+        maxOutputChars: item.maxOutputChars,
+      },
+      signal,
+    );
+    return itemResult(item.id, "succeeded", result);
+  } catch (error) {
+    const result = shellResultFromError(error) ?? emptyShellResult(item);
+    const outcome =
+      error instanceof TimeoutError
+        ? "timedOut"
+        : error instanceof CancelledError || isAbortLikeError(error)
+          ? "cancelled"
+          : "failed";
+    return itemResult(item.id, outcome, result, boundedError(error));
+  }
+}
+
+function itemResult(
+  id: string,
+  outcome: CommandBatchItemOutcome,
+  result: ShellActionResult,
+  error?: string,
+): CommandBatchItemResult {
+  const truncation = shellOutputTruncation(result);
+  return {
+    id,
+    outcome,
+    ...result,
+    stdoutTruncated: truncation.stdout,
+    stderrTruncated: truncation.stderr,
+    ...(error !== undefined ? { error } : {}),
+  };
+}
+
+function cancelledResult(item: CommandBatchItem): CommandBatchItemResult {
+  return itemResult(item.id, "cancelled", emptyShellResult(item), "Command was not started");
+}
+
+function emptyShellResult(item: CommandBatchItem): ShellActionResult {
+  return {
+    command: item.command,
+    args: [...item.args],
+    cwd: item.cwd,
+    stdout: "",
+    stderr: "",
+    exitCode: null,
+    signal: null,
+    durationMs: 0,
+  };
+}
+
+function boundedError(error: unknown): string {
+  const message = errorMessage(error);
+  return message.length <= MAX_ERROR_CHARS ? message : `${message.slice(0, MAX_ERROR_CHARS)}…`;
+}
+
+function positiveInteger(value: unknown, label: string, maximum: number): number {
+  if (!Number.isSafeInteger(value) || (value as number) < 1 || (value as number) > maximum) {
+    throw new Error(`${label} must be an integer from 1 through ${maximum}`);
+  }
+  return value as number;
+}
+
+function requireRecord(value: unknown, label: string): Record<string, unknown> {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(`${label} must be an object`);
+  }
+  return value as Record<string, unknown>;
+}
+
+function requireString(value: unknown, label: string): string {
+  if (typeof value !== "string" || value.trim().length === 0) {
+    throw new Error(`${label} must be a non-empty string`);
+  }
+  return value;
+}

package/src/workflows/engine.ts

@@ -983,9 +983,11 @@ export class WorkflowEngine {
       if (abort.signal.aborted) {
         throw abortError(abort.signal);
       }
-      timer = setTimeout(() => {
-        abort.abort(new TimeoutError(timeoutMs));
-      }, timeoutMs);
+      if (timeoutMs !== null) {
+        timer = setTimeout(() => {
+          abort.abort(new TimeoutError(timeoutMs));
+        }, timeoutMs);
+      }
       this.activeAttempt = { runDir, state, nodeId, attemptId, signal: abort.signal };
       const dispatched = this.dispatchNode(
         workflow,
@@ -1047,8 +1049,9 @@ export class WorkflowEngine {
     node: WorkflowNodeDefinition,
     context: WorkflowNodeContext,
     abort: AbortController,
-  ): Promise<number> {
+  ): Promise<number | null> {
     const configured = node.timeoutMs;
+    if (configured === null) return null;
     if (typeof configured !== "function") {
       return assertValidTimeout(configured ?? this.defaultNodeTimeoutMs);
     }
@@ -1061,7 +1064,7 @@ export class WorkflowEngine {
         Promise.resolve(configured(context)),
         abortRejection(abort.signal),
       ]);
-      return assertValidTimeout(resolved);
+      return resolved === null ? null : assertValidTimeout(resolved);
     } finally {
       clearTimeout(timer);
     }

package/src/workflows/index.ts

@@ -74,6 +74,21 @@ export {
   type WorkflowSearchPaths,
 } from "./loader.js";
 export { renderShellCommand, runShellAction } from "./shell.js";
+export {
+  COMMAND_BATCH_RESULT_SCHEMA,
+  MAX_COMMAND_BATCH_CONCURRENCY,
+  MAX_COMMAND_BATCH_ITEMS,
+  MAX_COMMAND_BATCH_OUTPUT_CHARS,
+  MAX_COMMAND_BATCH_TIMEOUT_MS,
+  runCommandBatch,
+  validateCommandBatchRequest,
+  type CommandBatchItem,
+  type CommandBatchItemOutcome,
+  type CommandBatchItemResult,
+  type CommandBatchRequest,
+  type CommandBatchResult,
+  type RunCommandBatchOptions,
+} from "./command-batch.js";
 export {
   estimateProgress,
   formatProgressLine,

package/src/workflows/migrate-sources.ts

@@ -24,7 +24,11 @@ export type LegacySourceMigrationQueue = {
     leaseMs: number;
   }): boolean;
   parkWorkflowRun(options: { runId: string; claimToken: string }): boolean;
-  getWorkflowRun(runId: string): { status: "claimed" | "parked" | "done" } | undefined;
+  getWorkflowRun(runId: string):
+    | {
+        status: "queued" | "starting" | "running" | "parked" | "done" | "failed" | "cancelled";
+      }
+    | undefined;
   setWorkflowRunOriginSession?(runId: string, originSessionId: string): boolean;
 };
 

package/src/workflows/schema.ts

@@ -35,10 +35,11 @@ function assertOptionalFunction(value: unknown, description: string): void {
 function assertCommonNodeFields(node: WorkflowNodeDefinition, nodeId: string): void {
   if (
     node.timeoutMs !== undefined &&
+    node.timeoutMs !== null &&
     typeof node.timeoutMs !== "function" &&
     (typeof node.timeoutMs !== "number" || !Number.isFinite(node.timeoutMs) || node.timeoutMs <= 0)
   ) {
-    fail(`node ${nodeId} timeoutMs must be a finite positive number or function`);
+    fail(`node ${nodeId} timeoutMs must be null, a finite positive number, or a function`);
   }
   if (node.statusDetail !== undefined && typeof node.statusDetail !== "string") {
     fail(`node ${nodeId} statusDetail must be a string`);

package/src/workflows/shell.ts

@@ -26,6 +26,16 @@ export function renderShellCommand(command: string, args: string[]): string {
   return renderedArgs.length > 0 ? `${command} ${renderedArgs}` : command;
 }
 
+export function shellOutputTruncation(result: ShellActionResult): {
+  stdout: boolean;
+  stderr: boolean;
+} {
+  return {
+    stdout: result.stdout.endsWith(TRUNCATION_MARKER),
+    stderr: result.stderr.endsWith(TRUNCATION_MARKER),
+  };
+}
+
 function shellFailure(
   spec: ShellActionExecution,
   args: string[],

package/src/workflows/store.ts

@@ -1417,7 +1417,9 @@ function snapshotNode(
       : exit !== undefined
         ? { includeTransition: "exit" as const }
         : {}),
-    ...(typeof node.timeoutMs === "number" ? { timeoutMs: node.timeoutMs } : {}),
+    ...(typeof node.timeoutMs === "number" || node.timeoutMs === null
+      ? { timeoutMs: node.timeoutMs }
+      : {}),
     ...(node.statusDetail !== undefined ? { statusDetail: node.statusDetail } : {}),
   };
   if (node.nodeType === "agent" && node.expectedOutput !== undefined) {

package/src/workflows/tool-input.ts

@@ -11,7 +11,7 @@ const inputSchema = Type.Unknown({
   description: "Checkpoint answer for answer; optional structured workflow input for start",
 });
 const runIdSchema = Type.String({
-  description: "Run id; optional for status and answer",
+  description: "Run id; optional for status, cancel, and answer",
 });
 const stepSchema = Type.String({
   description: "Workflow step id; required when action is update or submit",
@@ -50,7 +50,10 @@ export const WorkflowActionSchemas = {
   ),
   pause: Type.Object({ action: Type.Literal("pause") }, noExtraProperties),
   resume: Type.Object({ action: Type.Literal("resume") }, noExtraProperties),
-  cancel: Type.Object({ action: Type.Literal("cancel") }, noExtraProperties),
+  cancel: Type.Object(
+    { action: Type.Literal("cancel"), runId: Type.Optional(runIdSchema) },
+    noExtraProperties,
+  ),
   answer: Type.Object(
     {
       action: Type.Literal("answer"),

package/src/workflows/types.ts

@@ -71,9 +71,10 @@ export type WorkflowProgressData = {
 export type WorkflowNodeCommon = {
   /**
    * Per-node timeout or a callback that derives it from the run context.
-   * Falls back to the engine default (15 minutes).
+   * Null disables the wall-clock deadline. Omission falls back to the engine
+   * default (15 minutes).
    */
-  timeoutMs?: number | ((context: WorkflowNodeContext) => MaybePromise<number>);
+  timeoutMs?: number | null | ((context: WorkflowNodeContext) => MaybePromise<number | null>);
   /** Short human-readable label shown in the viewer while the node runs. */
   statusDetail?: string;
 };
@@ -715,7 +716,7 @@ export type WorkflowRunState = {
 
 export type WorkflowNodeSnapshot = {
   nodeType: WorkflowNodeDefinition["nodeType"];
-  timeoutMs?: number;
+  timeoutMs?: number | null;
   statusDetail?: string;
   summary?: string;
   expectedOutput?: string;