stageflow 0.25.0 → 0.30.0

package/dist/mcp/catalogTools.js

@@ -1,39 +1,51 @@
-import path from "node:path";
 import { z } from "zod";
-import { browseCatalog, } from "../config/browseCatalog.js";
+import { catalogPathErrorBody, CatalogPathError, resolveCatalogRelativePath, resolveCatalogStartInput, selectCatalogRootForStart, } from "../config/catalogRelativePath.js";
+import { listModelsMultiProject, listPipelinesMultiProject, listTasksMultiProject, } from "../config/multiProjectCatalog.js";
+import { resolveCatalogRoots } from "../config/resolveCatalogRoots.js";
 import { describePipeline } from "../config/describePipeline.js";
 import { loadPipeline } from "../config/loadPipeline.js";
 import { readYamlObject } from "../config/readYamlObject.js";
 import { validateCatalog } from "../config/validateCatalog.js";
-import { PACKAGE_VERSION } from "../package-meta.js";
-import { findProjectRoot } from "../project/findProjectRoot.js";
+import { writeAudit } from "../logging/audit.js";
+import { logger as rootLogger } from "../logging/logger.js";
+import { PACKAGE_VERSION, BUILD_SHA } from "../package-meta.js";
+import { globalStageflowHome } from "../project/globalHome.js";
+import { getAuthStatus, } from "../agent/providerAuth.js";
 import { PipelineValidationError } from "../runtime/pipelineValidationError.js";
+import { PipelinePreflightError } from "../runtime/pipelineRunner.js";
 import { EnvelopeRefError, resolveEnvelopeRefsToTask, } from "../runtime/resolveEnvelopeRef.js";
 import { isTerminalProjection, isWaitingProjection, waitRun } from "./waitRun.js";
 import { mapStoreLookupError } from "../server/operatorResults.js";
+import { callerIdFromRequestAuth, getRequestAuth, } from "../server/requestAuthContext.js";
 import { projectRunForMcp } from "./projectRun.js";
 import { classifyArtifactContent, readRunArtifactBytes } from "./readArtifact.js";
 import { imageResult, textResult } from "./toolResults.js";
-/**
- * Every project a host serving a global store has ever recorded a run for,
- * plus this host's own launch directory (always included so a project with
- * zero runs yet still sees its own catalog).
- */
-async function catalogRootsFor(deps) {
-    const known = await deps.store.listProjectRoots();
-    return [...new Set([...known, deps.cwd])];
-}
-/** Resolve which project a given catalog path (pipeline/task) belongs to. */
-function projectRootForPath(deps, catalogPath) {
-    const absDir = path.dirname(path.resolve(deps.cwd, catalogPath));
-    return findProjectRoot(absDir) ?? deps.cwd;
-}
+import { buildRunExportPayload } from "../runstore/exportRunPayload.js";
+import { redactRunManifestForRead } from "../runstore/runManifest.js";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { runSkillsDir } from "../runtime/runSkills.js";
+import { listSkillsWithOrigin } from "../config/listSkills.js";
+import { findTokenShapedField, pickCheckoutOverride, tokenRejectedPayload, } from "../runtime/startPayload.js";
+import { loadPipelineFromObjectOutcome, loadPipelineOutcome, } from "../config/loadPipeline.js";
+import { preflightFailureCode, runPipelinePreflight, } from "../preflight/pipelinePreflight.js";
+import { toolchainHealthMap } from "../preflight/toolchain.js";
+const auditLog = rootLogger.child({ component: "audit" });
+const gitIdentitySchema = z
+    .object({
+    name: z.string().optional(),
+    email: z.string().optional(),
+})
+    .strict();
 const taskFileSchema = z.object({
     id: z.string(),
     goal: z.string(),
     context: z.string().optional(),
     constraints: z.string().optional(),
     checkout: z.string().optional(),
+    repository: z.string().optional(),
+    ref: z.string().optional(),
+    run_branch_template: z.string().optional(),
+    git_identity: gitIdentitySchema.optional(),
     input: z.record(z.string(), z.unknown()).optional(),
 });
 /**
@@ -50,16 +62,35 @@ const inlinePipelineSchema = z
     agent: z.unknown().optional(),
     model: z.unknown().optional(),
     schemas: z.unknown().optional(),
+    requires: z.unknown().optional(),
 })
     .strict();
 const startRunSchema = z
     .object({
     pipeline: z
         .union([z.string(), inlinePipelineSchema])
-        .describe("Filesystem path to a pipeline YAML file, or an inline pipeline definition object ({ id, stages: [...] }) authored directly in this call"),
+        .describe("Catalog-relative pipeline path, or an inline pipeline definition object ({ id, stages: [...] }) authored directly in this call"),
     task_path: z.string().optional(),
     task: taskFileSchema.optional(),
+    project_root: z.string().optional(),
+    checkout: z
+        .string()
+        .optional()
+        .describe("Catalog-relative checkout path (maps to RunManager checkoutOverride); absolute paths are rejected with absolute_path_not_allowed"),
+    checkout_override: z
+        .string()
+        .optional()
+        .describe("Alias of checkout; prefer checkout"),
+    skip_gates: z.boolean().optional(),
+    git_sha: z.string().optional(),
+    ci_pr_url: z.string().optional(),
+    ci_job_url: z.string().optional(),
+    skills: z
+        .record(z.string(), z.record(z.string(), z.string()))
+        .optional()
+        .describe("Run-scoped skills: name → { relativePath: utf-8 contents }. Requires SKILL.md per name; materialised under the run workspace skills dir (never the worktree)"),
 })
+    .passthrough()
     .refine((data) => Boolean(data.task_path) !== Boolean(data.task), {
     message: "Exactly one of task_path or task is required",
 });
@@ -77,7 +108,11 @@ const runStageSchema = z
     .object({
     stage: z
         .union([z.string(), z.record(z.string(), z.unknown())])
-        .describe("Filesystem path to a stage YAML file, or a bare inline stage body object ({ id, system_prompt, io, model?, gate_kinds?, mcp?, verify?, timeout_ms? } — no uses:/route/pipeline wrapper) authored directly in this call"),
+        .describe("Catalog-relative path to a stage YAML file (same path contract as start_run — absolute paths rejected, must be inside a registered project_root), or a bare inline stage body object ({ id, system_prompt, io, model?, gate_kinds?, mcp?, verify?, timeout_ms? } — no uses:/route/pipeline wrapper) authored directly in this call"),
+    project_root: z
+        .string()
+        .optional()
+        .describe("Catalog project root to resolve a string stage path against; required when multiple catalog roots are configured and no sole non-seeded root exists"),
     task_path: z.string().optional(),
     task: taskFileSchema.optional(),
     envelope_ref: z
@@ -102,62 +137,134 @@ const runStageSchema = z
         .describe("Wait budget in ms when blocking is true (same bounds as wait_run)"),
 })
     .refine((data) => [data.task_path, data.task, data.envelope_ref].filter(Boolean).length === 1, { message: "Exactly one of task_path, task, or envelope_ref is required" });
-const runStatusSchema = z.enum(["created", "running", "succeeded", "failed"]);
+const runStatusSchema = z.enum([
+    "created",
+    "queued",
+    "running",
+    "succeeded",
+    "failed",
+    "cancelled",
+]);
 export function registerCatalogTools(server, deps) {
-    const { manager, store, cwd } = deps;
-    server.registerTool("list_pipelines", {
-        description: "List manifest-declared pipeline paths across every project this host knows about (this host's own project plus any project a run has ever been recorded for). Each entry is tagged with project_root. A project with no runs yet won't appear until its first run exists.",
-        inputSchema: z.object({}),
-    }, async () => {
-        const roots = await catalogRootsFor(deps);
-        const pipelines = [];
-        for (const root of roots) {
-            try {
-                const catalog = await browseCatalog(root);
-                for (const p of catalog.pipelines) {
-                    pipelines.push({ ...p, project_root: root });
-                }
+    const { manager, store, cwd, providerAuthContext, providerBoot } = deps;
+    const agentDir = deps.agentDir ?? getAgentDir();
+    server.registerTool("list_skills", {
+        description: "List skills with name, description, and origin (run|checkout|host). Optional runId scopes to that run's resolution view (run-tier skills first, then checkout .pi/skills, then host).",
+        inputSchema: z.object({
+            runId: z.string().optional(),
+        }),
+    }, async ({ runId }) => {
+        try {
+            let runSkills;
+            let checkoutRoot;
+            if (runId !== undefined) {
+                const meta = await store.readRunMeta(runId);
+                runSkills = runSkillsDir(store.getWorkspaceDir(runId));
+                checkoutRoot = meta.checkout_root;
             }
-            catch {
-                // stale/unreadable project root recorded on an old run; skip it
+            const catalog = await listSkillsWithOrigin({
+                cwd,
+                agentDir,
+                ...(runSkills !== undefined ? { runSkillsDir: runSkills } : {}),
+                ...(checkoutRoot !== undefined ? { checkoutRoot } : {}),
+            });
+            return textResult({
+                skills: catalog.skills,
+                diagnostics: catalog.diagnostics,
+            });
+        }
+        catch (err) {
+            if (runId !== undefined) {
+                const mapped = mapStoreLookupError(err, { policy: "run" });
+                return textResult({ error: mapped.error, status: mapped.status }, true);
             }
+            throw err;
         }
-        return textResult({ pipelines });
+    });
+    server.registerTool("list_pipelines", {
+        description: "List manifest-declared pipeline paths across every project this host knows about (registered store roots and seeded roots). Each entry is tagged with project_root. Optional project_root filter narrows; unknown value returns unknown_project_root.",
+        inputSchema: z.object({
+            project_root: z.string().optional(),
+        }),
+    }, async ({ project_root }) => {
+        const result = await listPipelinesMultiProject({
+            store,
+            bootCwd: cwd,
+            projectRootFilter: project_root,
+        });
+        if (result.root_errors.some((e) => e.code === "unknown_project_root") &&
+            result.items.length === 0) {
+            return textResult({
+                error: result.root_errors[0].message,
+                code: "unknown_project_root",
+                root_errors: result.root_errors,
+            }, true);
+        }
+        return textResult({
+            pipelines: result.items,
+            root_errors: result.root_errors,
+            ...(result.tip !== undefined ? { tip: result.tip } : {}),
+        });
     });
     server.registerTool("list_tasks", {
-        description: "List manifest-declared task paths across every project this host knows about (this host's own project plus any project a run has ever been recorded for). Each entry is tagged with project_root. A project with no runs yet won't appear until its first run exists.",
-        inputSchema: z.object({}),
-    }, async () => {
-        const roots = await catalogRootsFor(deps);
-        const tasks = [];
-        for (const root of roots) {
-            try {
-                const catalog = await browseCatalog(root);
-                for (const t of catalog.tasks) {
-                    tasks.push({ ...t, project_root: root });
-                }
-            }
-            catch {
-                // stale/unreadable project root recorded on an old run; skip it
-            }
+        description: "List manifest-declared task paths across every project this host knows about (registered store roots and seeded roots). Each entry is tagged with project_root. Optional project_root filter narrows; unknown value returns unknown_project_root.",
+        inputSchema: z.object({
+            project_root: z.string().optional(),
+        }),
+    }, async ({ project_root }) => {
+        const result = await listTasksMultiProject({
+            store,
+            bootCwd: cwd,
+            projectRootFilter: project_root,
+        });
+        if (result.root_errors.some((e) => e.code === "unknown_project_root") &&
+            result.items.length === 0) {
+            return textResult({
+                error: result.root_errors[0].message,
+                code: "unknown_project_root",
+                root_errors: result.root_errors,
+            }, true);
         }
-        return textResult({ tasks });
+        return textResult({
+            tasks: result.items,
+            root_errors: result.root_errors,
+            ...(result.tip !== undefined ? { tip: result.tip } : {}),
+        });
     });
     server.registerTool("list_models", {
-        description: "List catalog model ids from the project catalog (same source as GET /api/models)",
-        inputSchema: z.object({}),
-    }, async () => {
-        const catalog = await browseCatalog(cwd);
-        return textResult({ models: catalog.models });
+        description: "List catalog model ids across every project this host knows about (same multi-root source as GET /api/models). Optional project_root filter narrows.",
+        inputSchema: z.object({
+            project_root: z.string().optional(),
+        }),
+    }, async ({ project_root }) => {
+        const result = await listModelsMultiProject({
+            store,
+            bootCwd: cwd,
+            projectRootFilter: project_root,
+        });
+        if (result.root_errors.some((e) => e.code === "unknown_project_root") &&
+            result.items.length === 0) {
+            return textResult({
+                error: result.root_errors[0].message,
+                code: "unknown_project_root",
+                root_errors: result.root_errors,
+            }, true);
+        }
+        return textResult({
+            models: result.models,
+            entries: result.items,
+            root_errors: result.root_errors,
+        });
     });
     server.registerTool("list_runs", {
-        description: "List known pipeline runs. Optional filters: status, since (ISO created_at lower bound), pipeline (id or path).",
+        description: "List known pipeline runs. Optional filters: status, since (ISO created_at lower bound), pipeline (id or path), caller_id.",
         inputSchema: z.object({
             status: runStatusSchema.optional(),
             since: z.string().optional(),
             pipeline: z.string().optional(),
+            caller_id: z.string().optional(),
         }),
-    }, async ({ status, since, pipeline }) => {
+    }, async ({ status, since, pipeline, caller_id }) => {
         const filter = {};
         if (status !== undefined)
             filter.status = status;
@@ -169,17 +276,137 @@ export function registerCatalogTools(server, deps) {
         }
         if (pipeline !== undefined)
             filter.pipeline = pipeline;
+        if (caller_id !== undefined)
+            filter.caller_id = caller_id;
         const runs = await store.listRuns(Object.keys(filter).length > 0 ? filter : undefined);
         return textResult({ runs });
     });
     server.registerTool("get_health", {
-        description: "Server health and soft-max run capacity: activeRunIds, activeCount, maxConcurrent, slotsAvailable, version. Start until slotsAvailable is 0; then wait for a run to finish or raise STAGEFLOW_MAX_CONCURRENT_RUNS.",
+        description: "Server health and soft-max run capacity: activeRunIds, activeCount, maxConcurrent, slotsAvailable, activeStageProcesses, version, stageflow_home, boot_providers (Host boot snapshot), providers_live (or pointer to list_providers), plus disk breakdown for the durable root. Start until slotsAvailable is 0; then wait for a run to finish or raise STAGEFLOW_MAX_CONCURRENT_RUNS.",
         inputSchema: z.object({}),
-    }, async () => textResult({ ...manager.getHealth(), version: PACKAGE_VERSION }));
+    }, async () => {
+        const boot_providers = providerBoot
+            ? {
+                configured: providerBoot.configured,
+                failures: providerBoot.failures,
+            }
+            : { configured: [], failures: [] };
+        let providers_live = {
+            configured: [],
+            note: "Live auth inspect — prefer list_providers / sf providers status. boot_providers is Host boot env only and may be empty when CLI credentials are configured.",
+        };
+        if (providerAuthContext !== undefined) {
+            try {
+                const status = await getAuthStatus(cwd, undefined, providerAuthContext);
+                const rows = Array.isArray(status) ? status : [status];
+                providers_live = {
+                    configured: rows
+                        .filter((r) => r.configured)
+                        .map((r) => r.providerId),
+                    note: providers_live.note,
+                };
+            }
+            catch {
+                /* keep empty configured + note */
+            }
+        }
+        return textResult({
+            ...(await manager.getHealthWithDisk()),
+            version: PACKAGE_VERSION,
+            build_sha: BUILD_SHA,
+            toolchain: toolchainHealthMap(),
+            stageflow_home: globalStageflowHome(),
+            boot_providers,
+            providers_live,
+            providers: boot_providers,
+        });
+    });
+    server.registerTool("preflight", {
+        description: "Check pipeline requires:/secrets:/mcp against the Host toolchain manifest and curated stage env before start_run. Accepts pipeline path or inline definition (same union as start_run). Returns { ok, checks } with status ok|missing_tool|tool_version_mismatch|unknown_version|secret_unavailable|unresolved_var. Does not create a Run. unknown_version is ok unless strict:true.",
+        inputSchema: z.object({
+            pipeline: z
+                .union([z.string(), inlinePipelineSchema])
+                .describe("Catalog-relative pipeline path, or an inline pipeline definition object"),
+            project_root: z.string().optional(),
+            strict: z
+                .boolean()
+                .optional()
+                .describe("When true, unknown_version fails (default false)"),
+        }),
+    }, async ({ pipeline, project_root, strict }) => {
+        const roots = await resolveCatalogRoots({
+            store: deps.store,
+            bootCwd: deps.cwd,
+        });
+        let loaded;
+        let projectRoot;
+        try {
+            const wireRoot = selectCatalogRootForStart(roots, project_root);
+            projectRoot = wireRoot.project_root;
+            if (typeof pipeline === "string") {
+                const resolved = resolveCatalogRelativePath({
+                    inputPath: pipeline,
+                    projectRoot: project_root,
+                    roots,
+                    fieldName: "pipeline",
+                });
+                projectRoot = resolved.root.project_root;
+                const outcome = await loadPipelineOutcome(resolved.absolutePath, {
+                    cwd: deps.cwd,
+                    projectRoot,
+                });
+                if (!outcome.ok) {
+                    return textResult({
+                        ok: false,
+                        error: outcome.issues[0]?.message ?? "pipeline load failed",
+                        code: outcome.issues[0]?.code ?? "config_invalid",
+                        issues: outcome.issues,
+                    }, true);
+                }
+                loaded = outcome.value;
+            }
+            else {
+                const outcome = await loadPipelineFromObjectOutcome(pipeline, {
+                    cwd: deps.cwd,
+                    projectRoot,
+                });
+                if (!outcome.ok) {
+                    return textResult({
+                        ok: false,
+                        error: outcome.issues[0]?.message ?? "pipeline load failed",
+                        code: outcome.issues[0]?.code ?? "config_invalid",
+                        issues: outcome.issues,
+                    }, true);
+                }
+                loaded = outcome.value;
+            }
+        }
+        catch (err) {
+            if (err instanceof CatalogPathError) {
+                return textResult(catalogPathErrorBody(err), true);
+            }
+            throw err;
+        }
+        const result = await runPipelinePreflight(loaded, {
+            projectRoot,
+            strict: strict === true,
+        });
+        const code = preflightFailureCode(result, { strict: strict === true });
+        return textResult({
+            ok: result.ok,
+            checks: result.checks,
+            ...(code !== undefined ? { code } : {}),
+        });
+    });
     server.registerTool("start_run", {
-        description: "Start a pipeline run using a filesystem pipeline path or an inline pipeline definition ({ id, stages: [...] }, each stage the same shape as a YAML stage body — no uses: refs), and either task_path (catalog task file) or an inline task object. Returns { runId }. On conflict returns isError with code busy_capacity (soft max full) or busy_checkout (same checkout leased), plus activeCount/maxConcurrent/activeRunIds and optional conflictingRunId/conflictingCheckout.",
+        description: "Start a pipeline run. Accepted params: pipeline (catalog-relative path or inline { id, stages: [...] } — stages are YAML stage bodies, no uses: refs), task_path XOR task (inline task may include repository/ref or checkout; repository XOR checkout with code task.binding_conflict), project_root, checkout (catalog-relative; prefer this name; absolute → absolute_path_not_allowed), checkout_override (alias of checkout), skip_gates, git_sha, ci_pr_url, ci_job_url, skills (name → { relativePath: utf-8 contents }; requires SKILL.md; materialised under runs/<runId>/skills/, never the worktree). REST POST /api/runs accepts path pipelines only (no inline pipeline). Returns { runId } or { runId, queued: true, queuePosition }. Errors: busy_capacity, busy_checkout, insufficient_disk, start.token_rejected, skills_*, inline_pipeline_too_large, catalog path-contract codes.",
         inputSchema: startRunSchema,
-    }, async ({ pipeline, task_path, task }) => {
+    }, async (args) => {
+        const tokenField = findTokenShapedField(args);
+        if (tokenField !== undefined) {
+            return textResult(tokenRejectedPayload(tokenField), true);
+        }
+        const { pipeline, task_path, task, project_root, checkout, checkout_override, skip_gates, git_sha, ci_pr_url, ci_job_url, skills, } = args;
         if (typeof pipeline === "string" && !pipeline.trim()) {
             return textResult({ error: "pipeline is required" }, true);
         }
@@ -187,26 +414,130 @@ export function registerCatalogTools(server, deps) {
         if (taskInput === undefined) {
             return textResult({ error: "Exactly one of task_path or task is required" }, true);
         }
+        let wireRoot;
+        let roots;
+        try {
+            ({ wireRoot, roots } = await resolveCatalogStartInput({ store: deps.store, bootCwd: deps.cwd }, project_root));
+        }
+        catch (err) {
+            if (err instanceof CatalogPathError) {
+                return textResult(catalogPathErrorBody(err), true);
+            }
+            throw err;
+        }
+        const wireProjectRoot = wireRoot.project_root;
+        let resolvedPipeline = pipeline;
+        let resolvedTask = taskInput;
+        let resolvedCheckout;
+        try {
+            if (typeof pipeline === "string") {
+                resolvedPipeline = resolveCatalogRelativePath({
+                    inputPath: pipeline,
+                    projectRoot: wireProjectRoot,
+                    roots,
+                    fieldName: "pipeline",
+                }).absolutePath;
+            }
+            if (typeof task_path === "string") {
+                resolvedTask = resolveCatalogRelativePath({
+                    inputPath: task_path,
+                    projectRoot: wireProjectRoot,
+                    roots,
+                    fieldName: "task_path",
+                }).absolutePath;
+            }
+            const rawCheckout = pickCheckoutOverride({ checkout, checkout_override });
+            if (rawCheckout !== undefined) {
+                resolvedCheckout = resolveCatalogRelativePath({
+                    inputPath: rawCheckout,
+                    projectRoot: wireProjectRoot,
+                    roots,
+                    fieldName: "checkout",
+                }).absolutePath;
+            }
+        }
+        catch (err) {
+            if (err instanceof CatalogPathError) {
+                return textResult(catalogPathErrorBody(err), true);
+            }
+            throw err;
+        }
+        const callerId = callerIdFromRequestAuth();
         let result;
         try {
-            result = await manager.startRun({ pipeline, task: taskInput });
+            result = await manager.startRun({
+                pipeline: resolvedPipeline,
+                task: resolvedTask,
+                projectRoot: wireRoot.path,
+                ...(resolvedCheckout !== undefined
+                    ? { checkoutOverride: resolvedCheckout }
+                    : {}),
+                ...(skip_gates !== undefined ? { skipGates: skip_gates } : {}),
+                ...(git_sha !== undefined ? { gitSha: git_sha } : {}),
+                ...(ci_pr_url !== undefined ? { ciPrUrl: ci_pr_url } : {}),
+                ...(ci_job_url !== undefined ? { ciJobUrl: ci_job_url } : {}),
+                ...(skills !== undefined ? { skills } : {}),
+                callerId,
+            });
         }
         catch (err) {
             if (err instanceof PipelineValidationError) {
+                writeAudit(auditLog, {
+                    caller_id: callerId,
+                    surface: getRequestAuth()?.surface ?? "mcp",
+                    action: "start_run",
+                    outcome: "error",
+                    error_code: "pipeline_validation",
+                });
                 return textResult({ error: "Pipeline validation failed", validation: err.result }, true);
             }
+            if (err instanceof PipelinePreflightError) {
+                writeAudit(auditLog, {
+                    caller_id: callerId,
+                    surface: getRequestAuth()?.surface ?? "mcp",
+                    action: "start_run",
+                    outcome: "error",
+                    error_code: err.code,
+                });
+                return textResult(err.toNetworkBody(), true);
+            }
             throw err;
         }
         if (!result.ok) {
+            writeAudit(auditLog, {
+                caller_id: callerId,
+                surface: getRequestAuth()?.surface ?? "mcp",
+                action: "start_run",
+                outcome: "error",
+                error_code: result.code,
+            });
             const { ok: _ok, reason, ...rest } = result;
             return textResult({ error: reason, ...rest }, true);
         }
-        return textResult({ runId: result.runId });
+        writeAudit(auditLog, {
+            caller_id: callerId,
+            surface: getRequestAuth()?.surface ?? "mcp",
+            action: "start_run",
+            target_run_id: result.runId,
+            outcome: "ok",
+        });
+        return textResult({
+            runId: result.runId,
+            ...(result.queued === true
+                ? {
+                    queued: true,
+                    queuePosition: result.queuePosition,
+                    ...(result.queuedCode !== undefined
+                        ? { queuedCode: result.queuedCode }
+                        : {}),
+                }
+                : {}),
+        });
     });
     server.registerTool("run_stage", {
         description: "Run a single stage directly, without authoring a pipeline. `stage` is a filesystem path to a stage YAML file, or a bare inline stage body ({ id, system_prompt, io, model?, gate_kinds?, mcp?, verify?, timeout_ms? } — no uses:/route/pipeline wrapper), and exactly one of task_path, an inline task, or envelope_ref ({ runId, stageId, attempt? }) to resolve a previously stored envelope — from another run_stage call or any stage in a full pipeline run — as this stage's input. Internally this synthesizes a one-stage pipeline and executes it through the normal run path, so it shows up in list_runs/get_run and is polled with wait_run / get_envelope exactly like any other run. By default returns { runId, stageId } immediately (async); pass blocking:true to wait in this same call and get back { runId, stageId, status: \"completed\"|\"needs_input\"|\"timeout\", envelope? , pending_prompt? }.",
         inputSchema: runStageSchema,
-    }, async ({ stage, task_path, task, envelope_ref, checkout, model, blocking, timeout_ms }) => {
+    }, async ({ stage, project_root, task_path, task, envelope_ref, checkout, model, blocking, timeout_ms }) => {
         let taskInput = task_path ?? task;
         if (envelope_ref) {
             try {
@@ -223,11 +554,28 @@ export function registerCatalogTools(server, deps) {
             return textResult({ error: "Exactly one of task_path, task, or envelope_ref is required" }, true);
         }
         let stageBody;
+        let stageProjectRoot;
         if (typeof stage === "string") {
             if (!stage.trim()) {
                 return textResult({ error: "stage is required" }, true);
             }
-            const absPath = path.resolve(cwd, stage);
+            let absPath = "";
+            try {
+                const { wireRoot, roots } = await resolveCatalogStartInput({ store: deps.store, bootCwd: deps.cwd }, project_root);
+                stageProjectRoot = wireRoot.path;
+                absPath = resolveCatalogRelativePath({
+                    inputPath: stage,
+                    projectRoot: wireRoot.project_root,
+                    roots,
+                    fieldName: "stage",
+                }).absolutePath;
+            }
+            catch (err) {
+                if (err instanceof CatalogPathError) {
+                    return textResult(catalogPathErrorBody(err), true);
+                }
+                throw err;
+            }
             try {
                 stageBody = await readYamlObject(absPath);
             }
@@ -254,7 +602,11 @@ export function registerCatalogTools(server, deps) {
         };
         let result;
         try {
-            result = await manager.startRun({ pipeline, task: taskInput });
+            result = await manager.startRun({
+                pipeline,
+                task: taskInput,
+                ...(stageProjectRoot !== undefined ? { projectRoot: stageProjectRoot } : {}),
+            });
         }
         catch (err) {
             if (err instanceof PipelineValidationError) {
@@ -308,7 +660,25 @@ export function registerCatalogTools(server, deps) {
     }, async ({ runId }) => {
         try {
             const detail = await store.readRun(runId);
-            return textResult(projectRunForMcp(detail));
+            return textResult({
+                ...projectRunForMcp(detail),
+                run_manifest: redactRunManifestForRead(detail.run_manifest),
+            });
+        }
+        catch (err) {
+            const mapped = mapStoreLookupError(err, { policy: "run" });
+            return textResult({ error: mapped.error, status: mapped.status }, true);
+        }
+    });
+    server.registerTool("export_run", {
+        description: "Export a single run as projectRun projection plus run_manifest. Works for running, cancelled, and terminal runs. Prefer over CLI sf export-run when the Host is reachable.",
+        inputSchema: z.object({
+            runId: z.string(),
+        }),
+    }, async ({ runId }) => {
+        try {
+            const detail = await store.readRun(runId);
+            return textResult(buildRunExportPayload(detail));
         }
         catch (err) {
             const mapped = mapStoreLookupError(err, { policy: "run" });
@@ -361,14 +731,21 @@ export function registerCatalogTools(server, deps) {
             else if (task !== undefined && task.trim())
                 scope = "task";
             if (scope === "full") {
-                const roots = await catalogRootsFor(deps);
+                const roots = await resolveCatalogRoots({
+                    store: deps.store,
+                    bootCwd: deps.cwd,
+                });
                 const results = [];
                 for (const root of roots) {
                     try {
-                        results.push(await validateCatalog({ cwd: root, scope: "full", strict: strict ?? false }));
+                        results.push(await validateCatalog({
+                            cwd: root.path,
+                            scope: "full",
+                            strict: strict ?? false,
+                        }));
                     }
                     catch {
-                        // stale/unreadable project root recorded on an old run; skip it
+                        // unreadable root; skip
                     }
                 }
                 const merged = {
@@ -383,13 +760,33 @@ export function registerCatalogTools(server, deps) {
                 return textResult(merged);
             }
             const target = scope === "pipeline" ? pipeline.trim() : task.trim();
-            const projectRoot = projectRootForPath(deps, target);
+            const roots = await resolveCatalogRoots({
+                store: deps.store,
+                bootCwd: deps.cwd,
+            });
+            let resolvedTarget = target;
+            let projectRoot = deps.cwd;
+            try {
+                const resolved = resolveCatalogRelativePath({
+                    inputPath: target,
+                    roots,
+                    fieldName: scope === "pipeline" ? "pipeline" : "task",
+                });
+                resolvedTarget = resolved.absolutePath;
+                projectRoot = resolved.root.path;
+            }
+            catch (err) {
+                if (err instanceof CatalogPathError) {
+                    return textResult(catalogPathErrorBody(err), true);
+                }
+                throw err;
+            }
             const result = await validateCatalog({
                 cwd: projectRoot,
                 scope,
                 projectRoot,
-                ...(scope === "pipeline" ? { pipeline: target } : {}),
-                ...(scope === "task" ? { task: target } : {}),
+                ...(scope === "pipeline" ? { pipeline: resolvedTarget } : {}),
+                ...(scope === "task" ? { task: resolvedTarget } : {}),
                 strict: strict ?? false,
             });
             return textResult(result);
@@ -400,23 +797,37 @@ export function registerCatalogTools(server, deps) {
         }
     });
     server.registerTool("describe_pipeline", {
-        description: "Describe a pipeline DAG from a filesystem path (same as start_run): stages with inbound needs (id, on, optional if), fork, gate_kinds, Clone Chain clone_cap and clone_mode, and feedback_loop, entry, and replay_safe when set.",
+        description: "Describe a pipeline DAG from a catalog-relative path (same path contract as start_run): stages with inbound needs (id, on, optional if), fork, gate_kinds, Clone Chain clone_cap and clone_mode, and feedback_loop, entry, and replay_safe when set.",
         inputSchema: z.object({
             pipeline: z.string(),
+            project_root: z.string().optional(),
         }),
-    }, async ({ pipeline }) => {
+    }, async ({ pipeline, project_root }) => {
         if (!pipeline.trim()) {
             return textResult({ error: "pipeline is required", status: 400 }, true);
         }
         try {
-            const loaded = await loadPipeline(pipeline.trim(), {
-                cwd: projectRootForPath(deps, pipeline.trim()),
+            const roots = await resolveCatalogRoots({
+                store: deps.store,
+                bootCwd: deps.cwd,
+            });
+            const resolved = resolveCatalogRelativePath({
+                inputPath: pipeline.trim(),
+                projectRoot: project_root,
+                roots,
+                fieldName: "pipeline",
+            });
+            const loaded = await loadPipeline(resolved.absolutePath, {
+                projectRoot: resolved.root.path,
             });
             return textResult(describePipeline(loaded));
         }
         catch (err) {
+            if (err instanceof CatalogPathError) {
+                return textResult(catalogPathErrorBody(err), true);
+            }
             const message = err instanceof Error ? err.message : String(err);
-            return textResult({ error: message, status: 404 }, true);
+            return textResult({ error: message, status: 400 }, true);
         }
     });
 }