@eigenpal/cli 0.6.17 → 0.7.1

package/dist/cli.js

@@ -17155,6 +17155,7 @@ var init_common = __esm(() => {
     AGENT_EXPERIMENT: "aexp",
     AGENT_EMAIL_ALIAS: "aea",
     AGENT_EMAIL_INVOCATION: "aei",
+    AUTOMATION_TRIGGER: "atr",
     SANDBOX_WS_TOKEN: "sws"
   };
   TimestampSchema = exports_external.union([exports_external.date(), exports_external.string().datetime()]).transform((val) => {
@@ -19807,6 +19808,63 @@ var init_execution_row = __esm(() => {
   ];
 });
 
+// ../types/src/run-expand.ts
+function isRunExpandSection(token) {
+  return RUN_EXPAND_SECTION_SET.has(token);
+}
+function parseRunExpand(raw) {
+  const sections = new Set;
+  const invalid = [];
+  for (const part of (raw ?? "").split(",")) {
+    const token = part.trim();
+    if (!token)
+      continue;
+    if (isRunExpandSection(token)) {
+      sections.add(token);
+    } else {
+      invalid.push(token);
+    }
+  }
+  return { sections, invalid };
+}
+function runIncludeErrorMessage(include) {
+  const hint = LEGACY_RUN_INCLUDE_MIGRATION[include];
+  return hint ? `Legacy \`include=${include}\` is removed: ${hint}.` : null;
+}
+function runExpandErrorMessage(invalid) {
+  const hints = invalid.map((token) => {
+    const hint = LEGACY_RUN_EXPAND_MIGRATION[token];
+    return hint ? `\`${token}\`: ${hint}` : null;
+  }).filter((line) => line !== null);
+  const base = `Unknown expand section(s): ${invalid.join(", ")}. Supported: ${RUN_EXPAND_SECTIONS.join(", ")}.`;
+  return hints.length > 0 ? `${base} ${hints.join("; ")}.` : base;
+}
+var RUN_EXPAND_SECTIONS, RUN_EXPAND_SECTION_SET, RUN_DETAIL_EXPAND_PRESET, LEGACY_RUN_EXPAND_MIGRATION, LEGACY_RUN_INCLUDE_MIGRATION;
+var init_run_expand = __esm(() => {
+  RUN_EXPAND_SECTIONS = ["input", "usage", "execution", "debug"];
+  RUN_EXPAND_SECTION_SET = new Set(RUN_EXPAND_SECTIONS);
+  RUN_DETAIL_EXPAND_PRESET = RUN_EXPAND_SECTIONS.join(",");
+  LEGACY_RUN_EXPAND_MIGRATION = {
+    output: "`output` is not expandable; completed detail responses include top-level `output`",
+    lineage: "use `expand=execution` — batch, retry, and annotation live on `execution`",
+    cost: "use `expand=usage`",
+    input: "still `expand=input` — args now live at `input.args`",
+    metadata: "use `expand=input` — metadata now lives at `input.metadata`",
+    observability: "use `expand=debug`",
+    feedback: "use `expand=execution` — feedback lives at `execution.feedback` (agent runs)",
+    steps: "use `expand=execution` — steps live at `execution.steps` (workflow runs)",
+    definition: "use `GET /api/v1/runs/{id}/definition`",
+    files: "downloadable output refs live at top-level `files` on completed detail responses; `expand=execution` adds `execution.files.output` metadata for agent runs",
+    expected: "use `expand=execution` — expected output lives at `execution.expected`",
+    trace: "trace id: `expand=debug` (`debug.traceId`); trace files: `GET /api/v1/runs/{id}/artifacts`",
+    issues: "use `GET /api/v1/runs/{id}/artifacts` and look for `issues.md`",
+    lockfile: "use `GET /api/v1/runs/{id}/artifacts` and look for `eigenpal.lock`"
+  };
+  LEGACY_RUN_INCLUDE_MIGRATION = {
+    detail: "the grouped run detail is returned by default; use `expand=input,usage,execution,debug` for optional sections"
+  };
+});
+
 // ../types/src/llm-determinism.ts
 var DETERMINISTIC_TEMPERATURE = 0;
 
@@ -65480,7 +65538,7 @@ function compareOutput(expectedData, actualData, fileFields, resultFileNames, ex
       mismatches.push({
         path: `output/${g}`,
         expected: "(golden file)",
-        actual: "(no matching file in result/)"
+        actual: "(no matching file in output/)"
       });
     }
   }
@@ -65990,7 +66048,7 @@ function formatRunTarget(target) {
   return version2 ? `${pathTarget}@${version2}` : pathTarget;
 }
 function runTargetToPathParts(target) {
-  const normalized = parseRunTarget(target);
+  const normalized = isNormalizedRunTarget(target) ? target : parseRunTarget(target);
   if (normalized.type === "agent") {
     return {
       pathTarget: normalized.packageName,
@@ -66003,9 +66061,21 @@ function runTargetToPathParts(target) {
   };
 }
 function runTargetApiPath(target) {
-  const { pathTarget, version: version2 } = runTargetToPathParts(target);
+  const { version: version2 } = runTargetToPathParts(target);
   const query = version2 ? `?${new URLSearchParams({ version: version2 }).toString()}` : "";
-  return `/api/v1/run/${encodeURIComponent(pathTarget)}${query}`;
+  return `/api/v1/runs${query}`;
+}
+function runStartJsonBody(target, input = {}) {
+  const normalized = typeof target === "string" ? parseRunTarget(target) : isNormalizedRunTarget(target) ? target : parseRunTarget(target);
+  const { pathTarget } = runTargetToPathParts(normalized);
+  return { target: pathTarget, input };
+}
+function runStartMultipartTarget(target) {
+  const normalized = typeof target === "string" ? parseRunTarget(target) : isNormalizedRunTarget(target) ? target : parseRunTarget(target);
+  return runTargetToPathParts(normalized).pathTarget;
+}
+function isNormalizedRunTarget(target) {
+  return typeof target === "object" && target !== null && "type" in target && (("idOrSlug" in target) || ("packageName" in target));
 }
 function pathToDottedPackageName(path) {
   const parsed = SourcePackagePathSchema.parse(path);
@@ -66214,6 +66284,54 @@ var init_grammar = __esm(() => {
   RunTargetSchema = exports_external.union([RunTargetStringSchema, RunTargetObjectSchema]);
 });
 
+// ../types/src/git-source/rerun-version.ts
+function parseWorkflowRerunVersion(raw) {
+  const value = raw?.trim() || "latest";
+  if (value === "latest")
+    return { ok: true, parsed: { kind: "latest" } };
+  if (value === RERUN_ORIGINAL_VERSION)
+    return { ok: true, parsed: { kind: "original" } };
+  const result = WorkflowRunVersionRefSchema.safeParse(value);
+  if (!result.success) {
+    return {
+      ok: false,
+      message: "Use latest, original, an exact X.Y.Z version, or a workflow version/history id (wfv_*, version_*, wfh_*)."
+    };
+  }
+  return { ok: true, parsed: { kind: "explicit", value: result.data } };
+}
+function parseAgentRerunVersion(raw) {
+  const value = raw?.trim() || "latest";
+  if (value === "latest")
+    return { ok: true, parsed: { kind: "latest" } };
+  if (value === RERUN_ORIGINAL_VERSION)
+    return { ok: true, parsed: { kind: "original" } };
+  const result = SourceVersionRefSchema.safeParse(value);
+  if (!result.success) {
+    return {
+      ok: false,
+      message: "Use latest, original, main, X.Y.Z, X.Y.x, X.x, or a 40-character commit SHA."
+    };
+  }
+  return { ok: true, parsed: { kind: "explicit", value: result.data } };
+}
+function resolveAgentOriginalSourceRef(provenance) {
+  if (provenance.resolvedCommitSha && SOURCE_COMMIT_SHA_PATTERN.test(provenance.resolvedCommitSha)) {
+    return provenance.resolvedCommitSha;
+  }
+  const candidate = provenance.resolvedGitRef ?? provenance.requestedSourceRef;
+  if (candidate) {
+    const parsed = SourceVersionRefSchema.safeParse(candidate);
+    if (parsed.success)
+      return parsed.data;
+  }
+  return "latest";
+}
+var RERUN_ORIGINAL_VERSION = "original";
+var init_rerun_version = __esm(() => {
+  init_grammar();
+});
+
 // ../types/src/git-source/lockfile.ts
 import { createHash } from "node:crypto";
 function parseSourcePackageRef(input) {
@@ -66578,11 +66696,86 @@ var init_secrets = __esm(() => {
 // ../types/src/git-source/index.ts
 var init_git_source = __esm(() => {
   init_grammar();
+  init_rerun_version();
   init_lockfile();
   init_manifests();
   init_secrets();
 });
 
+// ../types/src/automation/triggers.ts
+function workflowMethodEnabled(methods, type) {
+  return methods.some((method) => method.type === type);
+}
+function triggersFromWorkflowDefinition(definition) {
+  if (definition.kind === "block")
+    return [];
+  const methods = getTriggerMethods(definition);
+  return [
+    { type: "api", enabled: workflowMethodEnabled(methods, "api") },
+    { type: "manual", enabled: workflowMethodEnabled(methods, "manual") },
+    { type: "email", enabled: workflowMethodEnabled(methods, "email") },
+    { type: "cron", enabled: false }
+  ];
+}
+function triggersFromGitManifest(triggers) {
+  const emailEnabled = triggers?.email?.enabled ?? (triggers?.email?.aliases?.length ?? 0) > 0;
+  return [
+    { type: "api", enabled: triggers?.api ?? true },
+    { type: "email", enabled: emailEnabled },
+    { type: "manual", enabled: true },
+    { type: "cron", enabled: false }
+  ];
+}
+function isAgentEmailExplicitlyDisabled(config2) {
+  if (!config2 || typeof config2 !== "object" || Array.isArray(config2))
+    return false;
+  const triggers = config2.triggers;
+  if (!triggers || typeof triggers !== "object" || Array.isArray(triggers))
+    return false;
+  const email3 = triggers.email;
+  if (!email3 || typeof email3 !== "object" || Array.isArray(email3))
+    return false;
+  if (!("enabled" in email3))
+    return false;
+  return email3.enabled === false;
+}
+function triggersFromAgentConfig(input) {
+  const triggers = workflowTriggerConfigSchema.parse(input.config && typeof input.config === "object" && !Array.isArray(input.config) ? input.config.triggers : undefined);
+  const emailEnabled = input.hasActiveEmailAliases && !isAgentEmailExplicitlyDisabled(input.config);
+  return [
+    { type: "api", enabled: triggers.api.enabled },
+    {
+      type: "email",
+      enabled: emailEnabled
+    },
+    { type: "manual", enabled: true },
+    { type: "cron", enabled: false }
+  ];
+}
+function isAutomationTriggerEnabled(rows, type) {
+  return rows.find((row) => row.type === type)?.enabled ?? false;
+}
+var AUTOMATION_TRIGGER_TYPES;
+var init_triggers = __esm(() => {
+  init_email_trigger();
+  init_workflow();
+  AUTOMATION_TRIGGER_TYPES = ["api", "email", "manual", "cron"];
+});
+
+// ../types/src/api/display-path.ts
+function displayApiPath(path) {
+  return path.replace(/\{([^{}/]+)\}/g, ":$1");
+}
+function displayApiPathsInText(text) {
+  let result = text;
+  let prev;
+  do {
+    prev = result;
+    result = result.replace(/(\/api\/v1\/[^\s`'"({]*)\{([^{}/]+)\}/g, "$1:$2");
+  } while (result !== prev);
+  return result;
+}
+
 // ../types/src/storage/paths.ts
 function seg(name, value) {
   if (!value || !SEGMENT_RX.test(value)) {
@@ -66880,6 +67073,9 @@ __export(exports_src, {
   validateOutput: () => validateOutput,
   validateInput: () => validateInput,
   validateConfig: () => validateConfig,
+  triggersFromWorkflowDefinition: () => triggersFromWorkflowDefinition,
+  triggersFromGitManifest: () => triggersFromGitManifest,
+  triggersFromAgentConfig: () => triggersFromAgentConfig,
   toJsonSchema: () => toJsonSchema,
   suppressRequiredMissingErrorsForSchemaFileFields: () => suppressRequiredMissingErrorsForSchemaFileFields,
   suggestWorkflowName: () => suggestWorkflowName,
@@ -66889,22 +67085,30 @@ __export(exports_src, {
   schemaFileUploadMatchesField: () => schemaFileUploadMatchesField,
   runTargetToPathParts: () => runTargetToPathParts,
   runTargetApiPath: () => runTargetApiPath,
+  runStartMultipartTarget: () => runStartMultipartTarget,
+  runStartJsonBody: () => runStartJsonBody,
   runOutputKey: () => runOutputKey,
   runInputKey: () => runInputKey,
+  runIncludeErrorMessage: () => runIncludeErrorMessage,
+  runExpandErrorMessage: () => runExpandErrorMessage,
   rootS3Path: () => rootS3Path,
   resolveEffectiveMimeType: () => resolveEffectiveMimeType,
+  resolveAgentOriginalSourceRef: () => resolveAgentOriginalSourceRef,
   requiresSpecializedParser: () => requiresSpecializedParser,
   publicExecutionFailure: () => publicExecutionFailure,
   projectAgentInputFiles: () => projectAgentInputFiles,
   pathToDottedPackageName: () => pathToDottedPackageName,
+  parseWorkflowRerunVersion: () => parseWorkflowRerunVersion,
   parseStepType: () => parseStepType,
   parseSourcePackageRef: () => parseSourcePackageRef,
   parseRunTarget: () => parseRunTarget,
+  parseRunExpand: () => parseRunExpand,
   parseReleaseTag: () => parseReleaseTag,
   parseInputSchemaJson: () => parseInputSchemaJson,
   parseFileKey: () => parseFileKey,
   parseFailureEnvelope: () => parseFailureEnvelope,
   parseAutomationTarget: () => parseAutomationTarget,
+  parseAgentRerunVersion: () => parseAgentRerunVersion,
   noopTracingContext: () => noopTracingContext,
   mapOCRAttributes: () => mapOCRAttributes,
   mapLLMAttributes: () => mapLLMAttributes,
@@ -66917,11 +67121,14 @@ __export(exports_src, {
   isTerminalExecutionStatus: () => isTerminalExecutionStatus,
   isStepCategory: () => isStepCategory,
   isSchemaFile: () => isSchemaFile,
+  isRunExpandSection: () => isRunExpandSection,
   isOutputSchemaUnknown: () => isOutputSchemaUnknown,
   isNonSuccessTerminalExecutionStatus: () => isNonSuccessTerminalExecutionStatus,
   isLocalAgentResourcePath: () => isLocalAgentResourcePath,
   isFilePathDescriptor: () => isFilePathDescriptor,
   isFileOutput: () => isFileOutput,
+  isAutomationTriggerEnabled: () => isAutomationTriggerEnabled,
+  isAgentEmailExplicitlyDisabled: () => isAgentEmailExplicitlyDisabled,
   hasTriggerMethod: () => hasTriggerMethod,
   goldenFileSatisfiedInResult: () => goldenFileSatisfiedInResult,
   getTriggerMethods: () => getTriggerMethods,
@@ -66956,6 +67163,8 @@ __export(exports_src, {
   errorHintFor: () => errorHintFor,
   eigenpalAjv: () => eigenpalAjv,
   dottedPackageNameToPath: () => dottedPackageNameToPath,
+  displayApiPathsInText: () => displayApiPathsInText,
+  displayApiPath: () => displayApiPath,
   defaultScriptFunction: () => defaultScriptFunction,
   defaultScoreFunction: () => defaultScoreFunction,
   convertTsTypeToJsonSchema: () => convertTsTypeToJsonSchema,
@@ -67074,7 +67283,10 @@ __export(exports_src, {
   RootSourceManifestSchema: () => RootSourceManifestSchema,
   ReleaseTagSchema: () => ReleaseTagSchema,
   RUN_TARGET_SEGMENT_PATTERN: () => RUN_TARGET_SEGMENT_PATTERN,
+  RUN_EXPAND_SECTIONS: () => RUN_EXPAND_SECTIONS,
+  RUN_DETAIL_EXPAND_PRESET: () => RUN_DETAIL_EXPAND_PRESET,
   RUNS_TRIGGERED_BY_SYSTEM: () => RUNS_TRIGGERED_BY_SYSTEM,
+  RERUN_ORIGINAL_VERSION: () => RERUN_ORIGINAL_VERSION,
   ProcessorPortSchema: () => ProcessorPortSchema,
   ProcessorExecutionContextSchema: () => ProcessorExecutionContextSchema,
   ProcessorDefinitionSchema: () => ProcessorDefinitionSchema,
@@ -67114,6 +67326,7 @@ __export(exports_src, {
   LayoutElementTypeSchema: () => LayoutElementTypeSchema,
   LayoutElementSchema: () => LayoutElementSchema,
   LLM_JUDGE_PROMPT_MIN_LENGTH: () => LLM_JUDGE_PROMPT_MIN_LENGTH,
+  LEGACY_RUN_EXPAND_MIGRATION: () => LEGACY_RUN_EXPAND_MIGRATION,
   JudgeModeSchema: () => JudgeModeSchema,
   JsonSchemaSchema: () => JsonSchemaSchema,
   IfStepSchema: () => IfStepSchema,
@@ -67231,6 +67444,7 @@ __export(exports_src, {
   ActionInvokeWorkflowConfigSchema: () => ActionInvokeWorkflowConfigSchema,
   ActionHttpOutputSchema: () => ActionHttpOutputSchema,
   ActionHttpConfigSchema: () => ActionHttpConfigSchema,
+  AUTOMATION_TRIGGER_TYPES: () => AUTOMATION_TRIGGER_TYPES,
   AIStepSchema: () => AIStepSchema,
   ACTION_TYPES: () => ACTION_TYPES
 });
@@ -67240,12 +67454,14 @@ var init_src = __esm(() => {
   init_parser2();
   init_otel();
   init_execution_row();
+  init_run_expand();
   init_paths();
   init_s3_path_grammar();
   init_validation();
   init_workflow2();
   init_eval();
   init_git_source();
+  init_triggers();
   init_typed_script();
 });
 
@@ -188883,7 +189099,7 @@ import { fileURLToPath as fileURLToPath8 } from "url";
 // package.json
 var package_default = {
   name: "@eigenpal/cli",
-  version: "0.6.17",
+  version: "0.7.1",
   description: "Eigenpal CLI — author and run document workflows from your terminal. Agent-ready.",
   keywords: [
     "eigenpal",
@@ -191439,6 +191655,7 @@ function registerGitCommands(program2) {
 import path8 from "node:path";
 
 // src/commands/agents/shared.ts
+init_src();
 import { existsSync as existsSync6, promises as fs } from "node:fs";
 import path6 from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
@@ -191488,10 +191705,13 @@ async function writeBase64File(file2, contentBase64) {
 }
 async function pollRun(client, executionId, interval, maxWait) {
   const started = Date.now();
+  const base = `/api/v1/runs/${encodeURIComponent(executionId)}`;
   for (;; ) {
-    const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}?include=detail`);
-    if (isTerminal(payload.run?.status))
-      return payload;
+    const payload = await client.get(base);
+    const status = payload.execution?.status;
+    if (payload.finished || isTerminalExecutionStatus(status)) {
+      return await client.get(`${base}?expand=usage,execution`);
+    }
     if (Date.now() - started > maxWait * 1000) {
       process.stderr.write(`Timed out waiting for run ${executionId}
 `);
@@ -191517,14 +191737,16 @@ async function pollExperiment(client, agentId, batchId, interval, maxWait) {
 function renderRunPayload(payload, opts) {
   if (opts.json)
     return printJson(payload);
-  const run = payload.run;
-  if (!run)
+  const run = payload;
+  if (!run || run.id === undefined)
     return printJson(payload);
-  success2(`Run ${run.id} is ${run.status}`);
+  const status = run.execution?.status ?? (run.finished === true ? "completed" : "running");
+  success2(`Run ${run.id} is ${status}`);
 }
 function setExitCodeForFailedTerminalRun(payload) {
-  const status = payload.run?.status;
-  if (status === "failed" || status === "cancelled") {
+  const run = payload;
+  const status = run?.execution?.status;
+  if (status === "failed" || status === "cancelled" || run?.finished === true && run?.error) {
     process.exitCode = 1;
   }
 }
@@ -191555,9 +191777,6 @@ function parseResultsFormat(value) {
     return value;
   throw new InvalidArgumentError("format must be csv or json");
 }
-function isTerminal(status) {
-  return status === "completed" || status === "failed" || status === "cancelled";
-}
 async function confirmTyped(id, actionName) {
   if (!process.stdin.isTTY || !process.stderr.isTTY)
     return false;
@@ -192305,6 +192524,7 @@ async function stopSession(sessionId, opts) {
 }
 
 // src/commands/runs.ts
+init_src();
 import { spawnSync as spawnSync4 } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
 import { promises as fs6, readFileSync as readFileSync8 } from "node:fs";
@@ -192385,7 +192605,7 @@ async function resolveWorkflowId(client, idOrSlug) {
 }
 
 // src/lib/watch.ts
-var TERMINAL_STATUSES = new Set(["completed", "failed", "cancelled", "rejected"]);
+init_src();
 var STATUS_BADGES = {
   pending: "[ ]",
   running: "[..]",
@@ -192491,7 +192711,7 @@ async function watchExecution(opts) {
     }
     lastFetched = current;
     render(renderFrame(current));
-    if (TERMINAL_STATUSES.has(current.status)) {
+    if (isTerminalExecutionStatus(current.status)) {
       return { final: current, detached: false };
     }
     if (now() - start >= maxMs) {
@@ -192511,15 +192731,15 @@ function registerRunsCommands(program2) {
   });
   const listRunsCmd = addJsonFlag(withPagination(withBaseUrl(runs.command("list [source]")), 50)).alias("ls").description("List runs across workflows and agents, optionally scoped to one source.").option("--type <type>", "Filter by run type: workflow|agent").option("--status <status>", "Filter by run status").option("--source-ref <ref>", "Filter agent runs by source ref").option("--batch-id <id>", "Filter eval/experiment runs by batch id").option("--example-id <id>", "Filter eval runs by example id").option("--example-id-contains <text>", "Filter eval runs by example id substring").option("--from <date>", "Created at or after this ISO timestamp or relative date").option("--to <date>", "Created before this ISO timestamp or relative date").option("--created-after <date>", "Alias for --from").option("--created-before <date>", "Alias for --to").option("--completed-after <date>", "Completed at or after this ISO timestamp or relative date").option("--completed-before <date>", "Completed before this ISO timestamp or relative date").option("--compact", "Render compact run rows").option("--sort <field>", "Sort field; only createdAt is supported").option("--order <asc|desc>", "Sort order; only desc is supported");
   listRunsCmd.action(action(listRuns));
-  addJsonFlag(withBaseUrl(runs.command("get <run-id>"))).description("Get one run.").option("--step <name>", "For workflow runs, show only this step (or comma-separated list)").option("--include <parts>", "Comma-separated extra parts or workflow step fields: feedback,expected,files,trace,issues,input,output,error,duration,inputRef", "feedback").action(action(getRun));
+  addJsonFlag(withBaseUrl(runs.command("get <run-id>"))).description("Get one run.").option("--step <name>", "For workflow runs, show only this step (or comma-separated list)").option("--expand <sections>", "Comma-separated server expand sections for GET /api/v1/runs/:id: input, usage, execution, debug. Use execution for status/schemaValid; completed runs include top-level output/files/error.").option("--include <parts>", "Comma-separated local workflow step projection fields (error, duration, inputRef, …). Legacy expand names are mapped when possible; use --expand for server sections.", "feedback").action(action(getRun));
   addJsonFlag(withBaseUrl(runs.command("compare <reference-run-id> <run-id>"))).description("Compare one run against another run. PDF/DOCX text comparison uses pdftotext/python3 and reports byte fallbacks.").option("--baseline", "Compare actual outputs from both runs instead of expected artifacts").option("--step <name>", "For workflow runs, restrict comparison to one step").option("--out <dir>", "Write comparison artifacts to this directory").option("--normalize-dates", "Normalize YYYYMMDD and YYYY-MM-DD tokens in filenames/text").option("--fail-on-diff", "Exit 1 when comparison status is fail").action(action(compareRun));
-  addJsonFlag(withBaseUrl(runs.command("rerun <run-id>"))).description("Create a new run from a previous run's stored input snapshot.").option("--source-ref <ref>", "Source ref for the new run: latest (default) or original. Workflow runs support only latest/original.").option("--wait", "Poll until the rerun reaches a terminal status").option("--interval <seconds>", "Polling interval in seconds", intArg, 2).option("--max-wait <seconds>", "Maximum wait before exiting 2", intArg, 1800).action(action(rerunRun));
-  const artifacts = runs.command("artifacts").description("Inspect agent run artifacts.").action(() => {
+  addJsonFlag(withBaseUrl(runs.command("rerun <run-id>"))).description("Create a new run from a previous run's stored input snapshot.").option("--version <version>", "Version/source ref for the new run: latest (default), original, or an explicit ref (same grammar as eigenpal run)").option("--source-ref <ref>", "Alias for --version").option("--wait", "Poll until the rerun reaches a terminal status").option("--interval <seconds>", "Polling interval in seconds", intArg, 2).option("--max-wait <seconds>", "Maximum wait before exiting 2", intArg, 1800).action(action(rerunRun));
+  const artifacts = runs.command("artifacts").description("Inspect workflow and agent run artifacts.").action(() => {
     process.stderr.write("`eigenpal runs artifacts` requires a subcommand. Run `eigenpal runs artifacts --help`.\n");
     process.exit(2);
   });
-  addJsonFlag(withBaseUrl(artifacts.command("list <run-id>"))).description("List available agent run artifacts without downloading them.").action(action(listRunArtifacts));
-  withBaseUrl(artifacts.command("fetch <run-id>")).description("Download agent run artifacts by canonical artifact path.").option("--out <dir>", "Output directory").option("--include <parts>", "Comma-separated parts: output,input,metadata,issues,trace,lockfile,expected,all", "all").option("--path <path>", "Fetch one exact artifact path from `artifacts list`; repeatable", collectRepeated, []).option("--json", "Output a JSON summary of written artifacts").action(action(fetchRunArtifacts));
+  addJsonFlag(withBaseUrl(artifacts.command("list <run-id>"))).description("List available run artifacts without downloading them.").action(action(listRunArtifacts));
+  withBaseUrl(artifacts.command("fetch <run-id>")).description("Download run artifacts by canonical artifact path.").option("--out <dir>", "Output directory").option("--include <parts>", "Comma-separated parts: output,input,metadata,issues,trace,lockfile,expected,all", "all").option("--path <path>", "Fetch one exact artifact path from `artifacts list`; repeatable", collectRepeated, []).option("--json", "Output a JSON summary of written artifacts").action(action(fetchRunArtifacts));
   withBaseUrl(runs.command("trace <run-id>")).description("Print raw trace.jsonl for a run, or write it with --out.").option("--out <file>", "Output file path").action(action(traceRun));
   registerRunFeedbackCommands(runs);
   registerRunExpectedCommands(runs);
@@ -192553,7 +192773,7 @@ async function runExample(agentId, opts) {
     exampleId: opts.example,
     ...opts.sourceRef ? { sourceRef: opts.sourceRef } : {}
   });
-  const runId = started.runs?.[0]?.runId;
+  const runId = started.runs?.[0]?.id;
   if (opts.wait && runId) {
     const payload2 = await pollRun(client, runId, opts.interval, opts.maxWait);
     renderRunPayload(payload2, opts);
@@ -192561,7 +192781,7 @@ async function runExample(agentId, opts) {
     return;
   }
   const payload = {
-    runId,
+    id: runId,
     exampleId: opts.example,
     batchId: started.batchId,
     status: "pending"
@@ -192570,39 +192790,96 @@ async function runExample(agentId, opts) {
     return printJson(payload);
   success2(`Run ${runId ?? ""} queued for example ${opts.example}`);
 }
+var SERVER_EXPAND_SECTIONS = new Set(RUN_EXPAND_SECTIONS);
+var LEGACY_INCLUDE_EXPAND_MAP = {
+  output: null,
+  cost: "usage",
+  steps: "execution",
+  files: "execution",
+  feedback: "execution",
+  expected: "execution",
+  input: "input",
+  metadata: "input",
+  observability: "debug",
+  trace: "debug",
+  issues: null,
+  lockfile: null
+};
+function splitCsv(raw) {
+  if (!raw)
+    return [];
+  return raw.split(",").map((part) => part.trim()).filter(Boolean);
+}
+function collectExactServerExpandTokens(raw) {
+  const valid = [];
+  const invalid = [];
+  for (const token of splitCsv(raw)) {
+    if (SERVER_EXPAND_SECTIONS.has(token)) {
+      valid.push(token);
+    } else {
+      invalid.push(token);
+    }
+  }
+  if (invalid.length > 0) {
+    throw new Error(runExpandErrorMessage(invalid));
+  }
+  return valid;
+}
+function collectIncludeExpandTokens(raw) {
+  const sections = new Set;
+  for (const token of splitCsv(raw)) {
+    if (SERVER_EXPAND_SECTIONS.has(token))
+      sections.add(token);
+    else if (token in LEGACY_INCLUDE_EXPAND_MAP) {
+      const mapped = LEGACY_INCLUDE_EXPAND_MAP[token];
+      if (mapped)
+        sections.add(mapped);
+    }
+  }
+  return [...sections];
+}
+function serverExpandParam(args) {
+  if (args.expand !== undefined) {
+    const sections2 = new Set(collectExactServerExpandTokens(args.expand));
+    for (const part of collectIncludeExpandTokens(args.include))
+      sections2.add(part);
+    return [...sections2].join(",");
+  }
+  const sections = new Set(["usage", "execution"]);
+  for (const part of collectIncludeExpandTokens(args.include ?? "feedback"))
+    sections.add(part);
+  return [...sections].join(",");
+}
+function projectionIncludeSource(opts) {
+  const parts = [opts.include, opts.expand].filter(Boolean);
+  return parts.length > 0 ? parts.join(",") : undefined;
+}
 async function getRun(executionId, opts) {
   const client = buildClient(opts);
-  const include = opts.include ? `detail,${opts.include}` : "detail";
-  const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include
-  });
-  const run = payload.run;
-  if (!run)
-    return renderRunPayload(payload, opts);
+  const run = toLegacyRunView(await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
+    expand: serverExpandParam({ expand: opts.expand, include: opts.include })
+  }));
   if (opts.step && !isWorkflowRun(run)) {
     throw new Error("Agent runs do not have workflow steps. Use `eigenpal runs get <run-id> --json` to inspect the agent run payload.");
   }
   if (isWorkflowRun(run)) {
     const steps = filterWorkflowSteps(run.stepExecutions, opts.step);
-    const projectionIncludes = workflowStepProjectionIncludes(opts.include);
+    const projectionIncludes = workflowStepProjectionIncludes(projectionIncludeSource(opts));
     if (opts.step) {
-      return printJson({
-        ...payload,
-        run: { ...run, stepExecutions: projectWorkflowSteps(steps, projectionIncludes) }
-      });
+      return printJson({ ...run, stepExecutions: projectWorkflowSteps(steps, projectionIncludes) });
     }
     if (opts.json) {
-      return printJson(payload);
+      return printJson(run);
     }
     console.log(renderFrame(toExecutionSnapshot(run, executionId)));
     process.stderr.write(`${ui.dim(`use --json for the full payload, then pipe to jq for field projection`)}
 `);
     return;
   }
-  renderRunPayload(payload, opts);
+  renderRunPayload(run, opts);
 }
 function isWorkflowRun(run) {
-  return Array.isArray(run.stepExecutions);
+  return run.type === "workflow";
 }
 function isAgentRun(run) {
   return run.type === "agent";
@@ -192610,15 +192887,100 @@ function isAgentRun(run) {
 function ensureAgentRun(run, feature) {
   if (isAgentRun(run))
     return;
-  throw new Error(`${feature} is only available for agent runs. Workflow runs do not have agent artifacts, feedback, or expected files.`);
+  throw new Error(`${feature} is only available for agent runs. Workflow runs do not have agent feedback or expected files.`);
+}
+function objectOrNull(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function toLegacyRunView(run) {
+  const timing = objectOrNull(run.timing);
+  const source = objectOrNull(run.source);
+  const sourceGit = objectOrNull(source?.git);
+  const trigger = objectOrNull(run.trigger);
+  const lineage = objectOrNull(run.lineage);
+  const execution = objectOrNull(run.execution);
+  const legacyRetry = objectOrNull(lineage?.retry);
+  const retry = objectOrNull(execution?.retry) ?? legacyRetry;
+  const nextRun = objectOrNull(retry?.nextRun);
+  const evalInfo = objectOrNull(run.eval);
+  const result = objectOrNull(run.result);
+  const input = objectOrNull(run.input);
+  const usage = objectOrNull(run.usage);
+  const tokens = objectOrNull(usage?.tokens);
+  const executionFiles = objectOrNull(execution?.files);
+  const executionExpected = objectOrNull(execution?.expected);
+  const debug = objectOrNull(run.debug);
+  const hasGroupedShape = timing != null || source != null || result != null || run.output !== undefined;
+  if (!hasGroupedShape)
+    return run;
+  const terminalOutput = run.output !== undefined ? run.output : result?.output;
+  const terminalFiles = run.files !== undefined ? run.files : result?.files ?? executionFiles?.output;
+  const terminalError = run.error !== undefined ? run.error : result?.error;
+  const terminalSchemaValid = execution?.schemaValid !== undefined ? execution.schemaValid : result?.schemaValid;
+  return {
+    ...run,
+    createdAt: timing?.createdAt,
+    startedAt: timing?.startedAt,
+    completedAt: timing?.completedAt,
+    durationMs: timing?.durationMs,
+    cancelRequestedAt: timing?.cancelRequestedAt,
+    sourceId: source?.id,
+    sourceName: source?.name,
+    version: source?.version,
+    versionId: source?.versionId,
+    agentSlug: source?.slug,
+    model: source?.model,
+    requestedSourceRef: sourceGit?.requestedRef,
+    resolvedGitRef: sourceGit?.resolvedRef,
+    resolvedGitTag: sourceGit?.resolvedTag,
+    resolvedCommitSha: sourceGit?.commitSha,
+    triggerType: trigger?.type,
+    triggeredBy: trigger?.by,
+    emailTrigger: trigger?.email,
+    batchId: execution?.batchId ?? lineage?.batchId,
+    retryNumber: retry?.number,
+    previousExecutionId: retry?.previousRunId,
+    annotation: execution?.annotation ?? lineage?.annotation,
+    exampleId: evalInfo?.exampleId ?? evalInfo?.example,
+    exampleName: evalInfo?.example,
+    status: execution?.status ?? run.status,
+    finished: run.finished,
+    evalScore: evalInfo?.score,
+    evalPassed: evalInfo?.passed,
+    output: terminalOutput,
+    resultFiles: terminalFiles,
+    schemaValid: terminalSchemaValid,
+    error: terminalError,
+    input: input?.args,
+    inputFiles: input?.files,
+    metadata: input?.metadata,
+    cost: usage ? {
+      totalInputTokens: tokens?.input ?? null,
+      totalOutputTokens: tokens?.output ?? null,
+      totalCacheReadTokens: tokens?.cacheRead ?? null,
+      totalCacheWriteTokens: tokens?.cacheWrite ?? null,
+      llmCallCount: usage.llmCallCount,
+      ocrPagesProcessed: usage.ocrPagesProcessed,
+      agentTurns: usage.agentTurns,
+      creditsCharged: usage.creditsCharged,
+      durationMs: usage.durationMs
+    } : undefined,
+    stepExecutions: execution?.steps,
+    nextRetryId: nextRun?.id ?? objectOrNull(execution?.nextRetry)?.id,
+    nextRetryStatus: nextRun?.status ?? objectOrNull(execution?.nextRetry)?.status,
+    feedback: execution?.feedback,
+    expected: executionExpected?.output,
+    expectedFiles: executionExpected?.files,
+    observability: debug?.observability,
+    traceId: debug?.traceId
+  };
 }
 async function getRunForCompatibilityCheck(client, executionId) {
-  const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include: "detail"
-  });
-  if (!payload.run)
+  const raw = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`);
+  const run = raw ? toLegacyRunView(raw) : null;
+  if (!run || run.id === undefined)
     throw new Error(`Run ${executionId} not found`);
-  return payload.run;
+  return run;
 }
 async function ensureAgentRunById(client, executionId, feature) {
   ensureAgentRun(await getRunForCompatibilityCheck(client, executionId), feature);
@@ -192674,9 +193036,10 @@ function projectWorkflowStep(step, includes) {
   return out;
 }
 function toExecutionSnapshot(run, fallbackId) {
+  const execution = objectOrNull(run.execution);
   return {
     id: String(run.id ?? run.executionId ?? fallbackId),
-    status: String(run.status ?? "unknown"),
+    status: String(run.status ?? execution?.status ?? "unknown"),
     startedAt: typeof run.startedAt === "string" ? run.startedAt : null,
     completedAt: typeof run.completedAt === "string" ? run.completedAt : null,
     durationMs: typeof run.durationMs === "number" ? run.durationMs : null,
@@ -192712,9 +193075,15 @@ function previewOutput(value) {
 }
 async function rerunRun(executionId, opts) {
   const client = buildClient(opts);
-  const sourceRef = await resolveRerunSourceRef(client, executionId, opts.sourceRef);
-  let payload = await client.post(`/api/v1/runs/${encodeURIComponent(executionId)}/rerun`, sourceRef ? { sourceRef } : {});
-  const rerunId = String(payload.runId ?? payload.executionId ?? "");
+  const params = new URLSearchParams;
+  const version2 = (opts.sourceRef ?? opts.version)?.trim();
+  if (version2 && version2 !== "latest") {
+    params.set("version", version2);
+  }
+  const query = params.toString();
+  const path12 = `/api/v1/runs/${encodeURIComponent(executionId)}/rerun${query ? `?${query}` : ""}`;
+  let payload = await client.post(path12);
+  const rerunId = String(payload.id ?? "");
   if (opts.wait && rerunId) {
     payload = await pollRun(client, rerunId, opts.interval, opts.maxWait);
     renderRunPayload(payload, opts);
@@ -192725,41 +193094,12 @@ async function rerunRun(executionId, opts) {
     return printJson(payload);
   success2(`Started rerun ${ui.bold(rerunId)} from ${executionId}`);
 }
-async function resolveRerunSourceRef(client, executionId, requested) {
-  if (!requested)
-    return;
-  if (requested !== "original")
-    return requested;
-  const summary = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`);
-  const run = summary.run;
-  if (!run)
-    throw new Error(`Run ${executionId} not found`);
-  if (run.type === "workflow") {
-    return "original";
-  }
-  const detail = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include: "detail"
-  });
-  const agentRun = detail.run;
-  if (!agentRun)
-    throw new Error(`Run ${executionId} not found`);
-  const resolved = stringOrNull(agentRun.resolvedGitRef);
-  const requestedSource = stringOrNull(agentRun.requestedSourceRef);
-  const original = resolved ?? requestedSource;
-  if (!original) {
-    throw new Error(`Run ${executionId} does not have an original source ref to reuse`);
-  }
-  return original;
-}
 async function fetchRunArtifacts(executionId, opts) {
   const client = buildClient(opts);
-  const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include: "detail,expected,files,input,output,issues,trace,lockfile,metadata"
-  });
-  const run = payload.run;
-  if (!run)
-    throw new Error(`Run ${executionId} not found`);
-  ensureAgentRun(run, "Artifact download");
+  const baseRun = toLegacyRunView(await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
+    expand: "input,execution"
+  }));
+  const run = await attachListedArtifacts(client, executionId, baseRun);
   const out = path11.resolve(opts.out ?? path11.join(".eigenpal", "artifacts", "runs", executionId));
   await fs6.mkdir(out, { recursive: true });
   const written = [];
@@ -192794,14 +193134,7 @@ async function fetchRunArtifacts(executionId, opts) {
 }
 async function listRunArtifacts(executionId, opts) {
   const client = buildClient(opts);
-  const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include: "detail,expected,files,input,output,issues,trace,lockfile,metadata"
-  });
-  const run = payload.run;
-  if (!run)
-    throw new Error(`Run ${executionId} not found`);
-  ensureAgentRun(run, "Artifact inventory");
-  const artifacts = runArtifactInventory(run);
+  const artifacts = await listCanonicalRunArtifacts(client, executionId);
   if (opts.json)
     return printJson({ runId: executionId, artifacts });
   console.log(table(artifacts, [
@@ -192811,6 +193144,53 @@ async function listRunArtifacts(executionId, opts) {
     { key: "present", header: "PRESENT" }
   ]));
 }
+async function listCanonicalRunArtifacts(client, executionId) {
+  const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}/artifacts`);
+  return (payload.artifacts ?? []).map((artifact) => {
+    const name = String(artifact.name ?? "");
+    const artifactPath = stringOrNull(artifact.path);
+    const kind = inferArtifactKind(artifactPath, name);
+    return {
+      kind,
+      name,
+      path: artifactPath ?? artifactPathForKind(kind, name),
+      present: "yes"
+    };
+  });
+}
+async function attachListedArtifacts(client, executionId, run) {
+  const artifacts = await listCanonicalRunArtifacts(client, executionId);
+  return {
+    ...run,
+    resultFiles: [
+      ...artifactEntries(run.resultFiles),
+      ...artifacts.filter((a) => a.kind === "output").map(({ name, path: path12 }) => ({ name, path: path12 }))
+    ],
+    issueFiles: artifacts.filter((a) => a.kind === "issue").map(({ name }) => ({ name })),
+    traceFiles: artifacts.filter((a) => a.kind === "trace").map(({ name }) => ({ name })),
+    lockfileFiles: artifacts.filter((a) => a.kind === "lockfile").map(({ name }) => ({ name }))
+  };
+}
+function artifactPathForKind(kind, name) {
+  if (kind === "output")
+    return `output/${name}`;
+  return name;
+}
+function inferArtifactKind(artifactPath, name) {
+  if (artifactPath?.startsWith("output/"))
+    return "output";
+  if (artifactPath?.startsWith("input/"))
+    return "input";
+  if (artifactPath === "issues.md" || name === "issues.md")
+    return "issue";
+  if (artifactPath === "trace.jsonl" || name === "trace.jsonl")
+    return "trace";
+  if (artifactPath === "eigenpal.lock" || name === "eigenpal.lock")
+    return "lockfile";
+  if (name)
+    return "output";
+  return "";
+}
 function artifactIncluded(artifact, include) {
   const parts = new Set(include.split(",").map((part) => part.trim()).filter(Boolean));
   if (parts.has("all"))
@@ -192836,7 +193216,7 @@ async function writeJsonRunArtifact(out, artifactPath, value) {
 }
 async function writeDownloadedRunArtifact(client, executionId, out, artifactPath, routePrefix) {
   const routePath = routePrefix === "files" ? artifactPath : artifactPath.slice("expected/".length);
-  const routeBase = routePrefix === "files" ? "artifact" : "expected";
+  const routeBase = routePrefix === "files" ? "artifacts" : "expected";
   const response = await client.getStream(`/api/v1/runs/${encodeURIComponent(executionId)}/${routeBase}/${encodeRunArtifactPath(routePath)}`);
   const outPath = path11.join(out, artifactPath);
   await fs6.mkdir(path11.dirname(outPath), { recursive: true });
@@ -192848,9 +193228,9 @@ async function writeRunArtifact(client, executionId, out, artifactPath, run) {
     return artifactPath;
   }
   if (artifactPath === "input.json") {
-    if (run.inputJson == null)
+    if (run.input == null)
       return null;
-    await writeJsonRunArtifact(out, artifactPath, run.inputJson);
+    await writeJsonRunArtifact(out, artifactPath, run.input);
     return artifactPath;
   }
   if (artifactPath === "metadata.json") {
@@ -192887,18 +193267,13 @@ async function traceRun(executionId, opts) {
 }
 async function compareRun(referenceId, executionId, opts) {
   const client = buildClient(opts);
-  const targetPayload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-    include: "detail,files,output"
-  });
-  const target = targetPayload.run;
-  if (!target)
-    throw new Error(`Run ${executionId} not found`);
+  const target = toLegacyRunView(await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
+    expand: "execution"
+  }));
   const mode = opts.baseline ? "baseline" : "expected";
-  const reference = (await client.get(`/api/v1/runs/${encodeURIComponent(referenceId)}`, {
-    include: mode === "baseline" ? "detail,files,output" : "detail,expected"
-  })).run;
-  if (!reference)
-    throw new Error(`Reference run ${referenceId} not found`);
+  const reference = toLegacyRunView(await client.get(`/api/v1/runs/${encodeURIComponent(referenceId)}`, {
+    expand: "execution"
+  }));
   if (isWorkflowRun(reference) && isWorkflowRun(target)) {
     const report2 = compareWorkflowRuns(referenceId, reference, executionId, target, opts.step);
     if (opts.json) {
@@ -193042,7 +193417,8 @@ async function listRuns(source, opts) {
     ...parsedAgentTarget?.sourceRef ? { sourceRef: parsedAgentTarget.sourceRef } : {}
   };
   const payload = await client.get("/api/v1/runs", params);
-  const rows = opts.compact ? payload.runs.map(compactRunRow) : payload.runs;
+  const viewRuns = payload.runs.map(toLegacyRunView);
+  const rows = opts.compact ? viewRuns.map(compactRunRow) : viewRuns;
   if (opts.json)
     return printJson({ ...payload, runs: rows });
   if (payload.scanLimited) {
@@ -193221,9 +193597,9 @@ async function watchRunCommand(executionId, opts) {
   const result = await watchExecution({
     fetch: async () => {
       const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}`, {
-        include: "detail"
+        expand: "execution"
       });
-      return toExecutionSnapshot(payload.run ?? {}, executionId);
+      return toExecutionSnapshot(toLegacyRunView(payload), executionId);
     },
     maxMs: opts.maxWait * 1000,
     transitionIntervalMs: opts.interval * 1000,
@@ -193247,7 +193623,7 @@ async function cancelRun(executionId, opts) {
   renderRunPayload(payload, opts);
 }
 async function downloadTraceText(client, executionId) {
-  const response = await client.getStream(`/api/v1/runs/${encodeURIComponent(executionId)}/artifact/trace.jsonl`);
+  const response = await client.getStream(`/api/v1/runs/${encodeURIComponent(executionId)}/artifacts/trace.jsonl`);
   return Buffer.from(await response.arrayBuffer()).toString("utf-8");
 }
 function diffJson(expected, actual, basePath = "$") {
@@ -193292,6 +193668,19 @@ function diffJson(expected, actual, basePath = "$") {
 function fileNames(files) {
   return (Array.isArray(files) ? files : []).map((file2) => String(file2.name ?? "")).filter(Boolean).sort();
 }
+function artifactEntries(files) {
+  return (Array.isArray(files) ? files : []).map((file2) => {
+    const record2 = file2;
+    const name = String(record2.name ?? "");
+    if (!name)
+      return null;
+    const artifactPath = stringOrNull(record2.path);
+    return {
+      name,
+      ...artifactPath ? { path: artifactPath } : {}
+    };
+  }).filter((entry) => entry !== null).sort((a, b2) => a.name.localeCompare(b2.name));
+}
 function stringOrNull(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
@@ -193299,7 +193688,7 @@ function runArtifactInventory(run) {
   const rows = [
     { kind: "metadata", name: "run.json", path: "run.json", present: "yes" }
   ];
-  if (run.inputJson != null) {
+  if (run.input != null) {
     rows.push({ kind: "input", name: "input.json", path: "input.json", present: "yes" });
   }
   if (run.metadata != null) {
@@ -193311,8 +193700,13 @@ function runArtifactInventory(run) {
   for (const name of fileNames(run.inputFiles)) {
     rows.push({ kind: "input", name, path: `input/${name}`, present: "yes" });
   }
-  for (const name of fileNames(run.resultFiles).filter((name2) => name2 !== "issues.md" && name2 !== "trace.jsonl")) {
-    rows.push({ kind: "output", name, path: `output/${name}`, present: "yes" });
+  for (const artifact of artifactEntries(run.resultFiles).filter((file2) => file2.name !== "issues.md" && file2.name !== "trace.jsonl")) {
+    rows.push({
+      kind: "output",
+      name: artifact.name,
+      path: artifact.path ?? `output/${artifact.name}`,
+      present: "yes"
+    });
   }
   for (const name of fileNames(run.expectedFiles)) {
     rows.push({ kind: "expected", name, path: `expected/${name}`, present: "yes" });
@@ -193326,7 +193720,10 @@ function runArtifactInventory(run) {
   for (const name of fileNames(run.lockfileFiles)) {
     rows.push({ kind: "lockfile", name, path: name, present: "yes" });
   }
-  return rows.sort((a, b2) => a.path.localeCompare(b2.path));
+  const byPath = new Map;
+  for (const row of rows)
+    byPath.set(row.path, row);
+  return [...byPath.values()].sort((a, b2) => a.path.localeCompare(b2.path));
 }
 function normalizeGeneratedTokens(value) {
   return value.replace(/\d{4}-\d{2}-\d{2}/g, "<date>").replace(/\d{8}/g, "<date>");
@@ -193390,7 +193787,7 @@ async function compareMatchedFileText(client, left, right, out, matched, normali
 function runFileUrl(side, name) {
   const runId = encodeURIComponent(side.runId);
   const filename = encodeURIComponent(name);
-  return side.kind === "expected" ? `/api/v1/runs/${runId}/expected/${filename}` : `/api/v1/runs/${runId}/artifact/output/${filename}`;
+  return side.kind === "expected" ? `/api/v1/runs/${runId}/expected/${filename}` : `/api/v1/runs/${runId}/artifacts/${encodeRunArtifactPath(`output/${name}`)}`;
 }
 function encodeRunArtifactPath(artifactPath) {
   return artifactPath.split("/").map(encodeURIComponent).join("/");
@@ -194137,17 +194534,45 @@ function guessMimeType(filename) {
 }
 
 // src/commands/run-form-data.ts
+var RESERVED_FIELD_NAMES = new Set([
+  "_json",
+  "_metadata",
+  "_overrides",
+  "input",
+  "target",
+  "overrides",
+  "metadata"
+]);
 async function buildRunFormData(input) {
   const form = new FormData;
-  for (const spec of parseInputFileSpecs(input.inputFile)) {
+  form.append("target", input.target);
+  const inputObj = input.input ?? (input.inputJson ? JSON.parse(input.inputJson) : {});
+  form.append("input", JSON.stringify(inputObj));
+  if (input.overrides) {
+    form.append("overrides", JSON.stringify(input.overrides));
+  }
+  if (input.metadata) {
+    form.append("metadata", JSON.stringify(input.metadata));
+  }
+  for (const spec of parseInputFileSpecs(input.inputFile ?? [])) {
     const data = await fs7.readFile(spec.filePath);
-    const filename = path13.basename(spec.filePath);
-    const mimeType = guessMimeType(filename) || "application/octet-stream";
-    form.append(spec.fieldName, new Blob([data], { type: mimeType }), filename);
+    appendFilePart(form, spec.fieldName, data, path13.basename(spec.filePath));
+  }
+  for (const file2 of input.files ?? []) {
+    appendFilePart(form, file2.fieldName, file2.content, file2.filename, file2.mimeType);
   }
-  form.append("_json", JSON.stringify(input.inputJson ? JSON.parse(input.inputJson) : {}));
   return form;
 }
+function appendFilePart(form, fieldName, content, filename, mimeType) {
+  assertValidFileFieldName(fieldName);
+  const type = mimeType ?? guessMimeType(filename) ?? "application/octet-stream";
+  form.append(`files.${fieldName}`, new Blob([content], { type }), filename);
+}
+function assertValidFileFieldName(fieldName) {
+  if (RESERVED_FIELD_NAMES.has(fieldName) || fieldName.startsWith("files.")) {
+    throw new Error(`file field "${fieldName}" is reserved`);
+  }
+}
 function parseInputFileSpecs(inputFile) {
   const values = Array.isArray(inputFile) ? inputFile : [inputFile];
   return values.map((value) => {
@@ -194160,9 +194585,7 @@ function parseInputFileSpecs(inputFile) {
     if (!fieldName || !filePath) {
       throw new Error("--input-file must be <field=path> or a bare path");
     }
-    if (fieldName === "_json" || fieldName === "_metadata" || fieldName === "input") {
-      throw new Error(`--input-file field "${fieldName}" is reserved`);
-    }
+    assertValidFileFieldName(fieldName);
     return { fieldName, filePath };
   });
 }
@@ -194247,6 +194670,18 @@ async function formatFileIfAvailable(filepath) {
 function isWorkflowResult2(value) {
   return value != null && typeof value === "object" && "files" in value && Array.isArray(value.files);
 }
+async function listResultArtifacts(client, executionId) {
+  try {
+    const payload = await client.get(`/api/v1/runs/${encodeURIComponent(executionId)}/artifacts`);
+    return (payload.artifacts ?? []).filter((artifact) => typeof artifact.path === "string" && artifact.path.startsWith("output/") && typeof artifact.name === "string");
+  } catch {
+    return [];
+  }
+}
+async function downloadRunArtifact(client, executionId, artifactPath) {
+  const encodedPath = artifactPath.split("/").map(encodeURIComponent).join("/");
+  return client.getStream(`/api/v1/runs/${encodeURIComponent(executionId)}/artifacts/${encodedPath}`);
+}
 function filenameFromContentDisposition(header) {
   if (!header)
     return null;
@@ -194270,8 +194705,34 @@ async function writeExecutionArtifacts(client, exampleDir, payload) {
   const filesDir = join7(executionsDir, "files");
   mkdirSync5(filesDir, { recursive: true });
   const generatedFiles = [];
+  const resultArtifacts = await listResultArtifacts(client, payload.executionId);
+  if (resultArtifacts.length > 0) {
+    for (let i = 0;i < resultArtifacts.length; i++) {
+      const artifact = resultArtifacts[i];
+      const artifactPath = artifact.path;
+      if (typeof artifactPath !== "string")
+        continue;
+      const name = typeof artifact.name === "string" ? artifact.name : `file-${i}.bin`;
+      try {
+        const res = await downloadRunArtifact(client, payload.executionId, artifactPath);
+        const disposition = res.headers.get("Content-Disposition");
+        const filename = filenameFromContentDisposition(disposition) ?? name;
+        const safe = safeFilename(filename, `file-${i}${filename.includes(".") ? "" : ".bin"}`);
+        const destPath = join7(filesDir, safe);
+        const buf = Buffer.from(await res.arrayBuffer());
+        writeFileSync7(destPath, buf);
+        generatedFiles.push({
+          fileId: artifact.fileId ?? artifactPath,
+          stepName: artifact.stepName ?? "",
+          filename: safe
+        });
+      } catch (err) {
+        console.warn(`  Warning: could not download artifact ${artifactPath}:`, err);
+      }
+    }
+  }
   const result = payload.output;
-  if (isWorkflowResult2(result) && result.files.length > 0) {
+  if (generatedFiles.length === 0 && isWorkflowResult2(result) && result.files.length > 0) {
     for (let i = 0;i < result.files.length; i++) {
       const entry = result.files[i];
       const fileId = entry?.fileId;
@@ -194461,17 +194922,42 @@ function createProgressLines(options8) {
 var POLL_INTERVAL_MS = 2000;
 var MAX_POLL_MS = 5 * 60 * 1000;
 var DEFAULT_CONCURRENCY = 3;
+function runTerminalOutput(run) {
+  return run.output !== undefined ? run.output : run.result?.output;
+}
+function runTerminalError(run) {
+  const error52 = run.error !== undefined ? run.error : run.result?.error;
+  return error52 ?? undefined;
+}
 async function pollExecution(client, executionId) {
   const start = Date.now();
   while (Date.now() - start < MAX_POLL_MS) {
-    const payload = await client.get(`/api/v1/runs/${executionId}?include=detail`);
-    const res = "run" in payload && payload.run ? payload.run : payload;
-    if (["completed", "failed", "cancelled", "rejected"].includes(res.status))
-      return res;
+    const run = await client.get(`/api/v1/runs/${executionId}`);
+    const status = run.execution?.status ?? run.status;
+    if (run.finished || isTerminalExecutionStatus(status)) {
+      return {
+        executionId: run.id,
+        status: status ?? (run.error ? "failed" : "completed"),
+        output: runTerminalOutput(run),
+        error: runTerminalError(run)
+      };
+    }
     await new Promise((r5) => setTimeout(r5, POLL_INTERVAL_MS));
   }
   return { executionId, status: "timeout", error: "Execution timed out" };
 }
+function toExecutionArtifactPayload(run) {
+  const status = run.execution?.status ?? run.status ?? "unknown";
+  return {
+    executionId: run.id,
+    status,
+    createdAt: run.timing?.createdAt ?? new Date().toISOString(),
+    completedAt: run.timing?.completedAt ?? null,
+    error: run.error !== undefined ? run.error : run.result?.error ?? null,
+    output: runTerminalOutput(run),
+    stepExecutions: run.execution?.steps ?? []
+  };
+}
 async function runExec(client, dir, workflowIdOrSlug, exampleNames, options8 = {}) {
   const workflowId = await resolveWorkflowId(client, workflowIdOrSlug);
   const names = getExampleNames(dir, exampleNames.length ? exampleNames : undefined);
@@ -194517,21 +195003,26 @@ async function runExec(client, dir, workflowIdOrSlug, exampleNames, options8 = {
           progress.setRunning(index);
         else
           console.log(`${ui.dim("→")} ${name}`);
-        const form = new FormData;
-        form.append("_json", JSON.stringify(example.scalars));
-        if (example.overrides) {
-          form.append("_overrides", JSON.stringify(example.overrides));
-        }
-        for (const file2 of example.files) {
-          form.append(file2.argument, new Blob([file2.content], {
-            type: file2.mimeType ?? "application/octet-stream"
-          }), file2.filename);
-        }
+        const form = await buildRunFormData({
+          target: runStartMultipartTarget({
+            type: "workflow",
+            id: workflowId,
+            version: options8.version
+          }),
+          input: example.scalars,
+          overrides: example.overrides,
+          files: example.files.map((file2) => ({
+            fieldName: file2.argument,
+            content: file2.content,
+            filename: file2.filename,
+            mimeType: file2.mimeType
+          }))
+        });
         const res = await client.postFormData(runTargetApiPath({ type: "workflow", id: workflowId, version: options8.version }), form);
-        if (typeof res?.runId !== "string") {
-          throw new Error("Run API did not return runId");
+        if (typeof res?.id !== "string") {
+          throw new Error("Run API did not return a run id");
         }
-        const executionId = res.runId;
+        const executionId = res.id;
         process.stderr.write(`  ${ui.dim(`→ ${name}: ${executionId}`)}
 `);
         const result = await pollExecution(client, executionId);
@@ -194541,9 +195032,8 @@ async function runExec(client, dir, workflowIdOrSlug, exampleNames, options8 = {
         else
           failed++;
         try {
-          const artifactPayload = await client.get(`/api/v1/runs/${executionId}?include=detail`);
-          const artifact = "run" in artifactPayload && artifactPayload.run ? artifactPayload.run : artifactPayload;
-          const artifactDir = await writeExecutionArtifacts(client, exampleDir, artifact);
+          const run = await client.get(`/api/v1/runs/${executionId}?expand=execution`);
+          const artifactDir = await writeExecutionArtifacts(client, exampleDir, toExecutionArtifactPayload(run));
           if (!interactive)
             console.log(ui.dim(`  Artifacts: ${artifactDir}`));
         } catch (artErr) {
@@ -194617,12 +195107,18 @@ async function runTarget(target, opts) {
   const client = buildClient(opts);
   let payload;
   const runPath = runTargetApiPath(target);
+  const pathTarget = runStartMultipartTarget(target);
   if (opts.inputFile && opts.inputFile.length > 0) {
-    payload = await client.postFormData(runPath, await buildRunFormData({ inputFile: opts.inputFile, inputJson: opts.inputJson }));
+    const form = await buildRunFormData({
+      target: pathTarget,
+      inputFile: opts.inputFile,
+      inputJson: opts.inputJson
+    });
+    payload = await client.postFormData(runPath, form);
   } else {
-    payload = await client.post(runPath, opts.inputJson ? JSON.parse(opts.inputJson) : {});
+    payload = await client.post(runPath, runStartJsonBody(target, opts.inputJson ? JSON.parse(opts.inputJson) : {}));
   }
-  const runId = String(payload.runId ?? "");
+  const runId = String(payload.id ?? "");
   let waitedForTerminalRun = false;
   if (opts.wait && runId) {
     payload = await pollRun(client, runId, opts.interval, opts.maxWait);
@@ -194633,8 +195129,7 @@ async function runTarget(target, opts) {
     setExitCodeForFailedTerminalRun(payload);
 }
 async function rerunTarget(runId, opts) {
-  const sourceRef = opts.version === "latest" ? undefined : opts.version;
-  await rerunRun(runId, { ...opts, sourceRef });
+  await rerunRun(runId, { ...opts, version: opts.version });
 }
 
 // src/commands/skill/index.ts
@@ -198136,14 +198631,13 @@ ${ui.info("ℹ")} step-level errors live on \`stepExecutions[].error\` — see $
 
 `);
 }
-var TERMINAL_EXEC_STATES = new Set(["completed", "failed", "cancelled", "rejected"]);
 function summarizeExperimentExecutions(execs) {
   const counts = {};
   for (const e8 of execs) {
     const s5 = e8.status ?? "unknown";
     counts[s5] = (counts[s5] ?? 0) + 1;
   }
-  const terminal = execs.filter((e8) => TERMINAL_EXEC_STATES.has(e8.status ?? "")).length;
+  const terminal = execs.filter((e8) => isTerminalExecutionStatus(e8.status)).length;
   return {
     total: execs.length,
     terminal,