rivet-design 0.22.0 → 0.23.0

package/dist/cli/commands/mcpServe.js

@@ -54,6 +54,35 @@ const telemetry_1 = require("../telemetry");
 const displayLocale_1 = require("../../utils/displayLocale");
 const pluginContext_1 = require("../../hosts/pluginContext");
 const errorMessage_1 = require("../../utils/errorMessage");
+const GuidanceVerifierRunner_1 = require("../../services/GuidanceVerifierRunner");
+const toolPresentation = (title, behavior) => ({
+    title,
+    annotations: { title, ...behavior },
+});
+const STATUS_PRESENTATION = toolPresentation('Check Rivet status', {
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true,
+});
+const LOGIN_PRESENTATION = toolPresentation('Sign in to Rivet', {
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true,
+});
+const VARIANTS_PRESENTATION = toolPresentation('Generate design variants', {
+    readOnlyHint: false,
+    destructiveHint: true,
+    idempotentHint: false,
+    openWorldHint: true,
+});
+const DESIGN_CONTEXT_PRESENTATION = toolPresentation('Gather design context', {
+    readOnlyHint: false,
+    destructiveHint: true,
+    idempotentHint: false,
+    openWorldHint: true,
+});
 const DIRECTION_TITLE_MAX_WORDS = 5;
 const DIRECTION_SUBTITLE_MAX_WORDS = 10;
 const RELEVANT_FILE_MAX_COUNT = 12;
@@ -118,7 +147,7 @@ const STATUS_DESCRIPTION = 'Current Rivet session state for this project: server
     "include: ['history'] adds past variant sets; ['auth'] adds signed-in state.";
 const VARIANTS_DESCRIPTION = "Drive the variant lifecycle ('directions' in the UI). Actions: 'start' (generate N directions), " +
     "'complete' (report one work item done), 'commit' (write a chosen variant to the working tree), 'cancel'. " +
-    "Before 'start', author a 1\u20133 word runLabel summarizing the batch and one brief per direction: label = 1\u20135 word title naming the concrete change; body = \u226410-word subtitle; " +
+    "Before every 'start', including fresh apps, resolve saved instructions with rivet_design_context contextAction=resolve, then author a 1\u20133 word runLabel summarizing the batch and one brief per direction: label = 1\u20135 word title naming the concrete change; body = \u226410-word subtitle; " +
     `Write runLabel, label, and body naturally in ${DISPLAY_LOCALE}. ` +
     'optional notes = richer implementation intent (tokens, motion specs, constraints) delivered verbatim to that direction\u2019s worker. briefs.length sets the count. ' +
     "Rivet normally builds directions with its own server-side workers: variants in flight with NO nextAction means watch rivet_status until terminal — implement nothing. When a response DOES carry nextAction.action='complete_host_variant_work' (executor unavailable), follow its parallelism instructions EXACTLY: they name the worker agent type when one applies, and each item's workerPrompt points at a server-authored briefing containing the full packet and completion command \u2014 compose nothing, never re-plan briefs, and let each worker self-report the moment it finishes. " +
@@ -167,21 +196,30 @@ const buildMcpServer = async (options = {}) => {
         const project = toolProject ?? serveProject;
         return project ? ['--project', project] : [];
     };
-    const runCommand = async (command, rest, toolCallHandoffArgs = []) => {
+    const verificationAbort = new AbortController();
+    const runCommand = async (command, rest, commandOptions = {}) => {
         const progress = [];
         const io = {
             writeEnvelope: () => { },
             writeProgress: (message) => progress.push(message),
         };
-        const argv = [...rest, ...handoffArgs, ...toolCallHandoffArgs];
+        const argv = [
+            ...rest,
+            ...handoffArgs,
+            ...(commandOptions.handoffArgs ?? []),
+        ];
         const startedAt = Date.now();
         let result;
         try {
             await maybeResumePendingLogin();
-            result = await dispatch(command, argv, io);
+            result = await dispatch(command, argv, io, {
+                signal: commandOptions.signal,
+            });
             if (!result.envelope.ok && (0, exports.isStaleAttachError)(result.envelope)) {
                 (0, client_1.invalidateAttachCache)();
-                result = await dispatch(command, argv, io);
+                result = await dispatch(command, argv, io, {
+                    signal: commandOptions.signal,
+                });
             }
         }
         catch (error) {
@@ -309,15 +347,19 @@ const buildMcpServer = async (options = {}) => {
             return result;
         });
     };
-    mcp.tool('rivet_status', STATUS_DESCRIPTION, {
-        project: v3_1.z
-            .string()
-            .optional()
-            .describe('Project root path; defaults to the server for the current directory'),
-        include: v3_1.z
-            .array(v3_1.z.enum(['history', 'auth']))
-            .optional()
-            .describe('history = committed/past variant sets; auth = signed-in state'),
+    mcp.registerTool('rivet_status', {
+        ...STATUS_PRESENTATION,
+        description: STATUS_DESCRIPTION,
+        inputSchema: {
+            project: v3_1.z
+                .string()
+                .optional()
+                .describe('Project root path; defaults to the server for the current directory'),
+            include: v3_1.z
+                .array(v3_1.z.enum(['history', 'auth']))
+                .optional()
+                .describe('history = committed/past variant sets; auth = signed-in state'),
+        },
     }, async ({ project, include }) => {
         const startedAt = Date.now();
         const wantHistory = include?.includes('history') ?? false;
@@ -368,14 +410,18 @@ const buildMcpServer = async (options = {}) => {
             },
         });
     });
-    mcp.tool('rivet_login', LOGIN_DESCRIPTION, {
-        waitSeconds: v3_1.z
-            .number()
-            .int()
-            .min(0)
-            .max(LOGIN_WAIT_MAX_SECONDS)
-            .optional()
-            .describe('How long to wait for the user to finish the browser sign-in before returning (default 45). Pass a higher value when the user says they need a moment; 0 returns immediately after opening the browser.'),
+    mcp.registerTool('rivet_login', {
+        ...LOGIN_PRESENTATION,
+        description: LOGIN_DESCRIPTION,
+        inputSchema: {
+            waitSeconds: v3_1.z
+                .number()
+                .int()
+                .min(0)
+                .max(LOGIN_WAIT_MAX_SECONDS)
+                .optional()
+                .describe('How long to wait for the user to finish the browser sign-in before returning (default 45). Pass a higher value when the user says they need a moment; 0 returns immediately after opening the browser.'),
+        },
     }, async ({ waitSeconds }) => {
         const startedAt = Date.now();
         const loginResult = (data, ok = true) => {
@@ -470,170 +516,177 @@ const buildMcpServer = async (options = {}) => {
             }, false);
         }
     });
-    mcp.tool('rivet_variants', VARIANTS_DESCRIPTION, {
-        action: v3_1.z.enum(['start', 'complete', 'commit', 'cancel']),
-        instruction: v3_1.z
-            .string()
-            .optional()
-            .describe('start: what to vary and how'),
-        runLabel: contracts_1.runLabelSchema.describe('start: AI-authored 1–3 word summary shared by every direction in this batch'),
-        count: v3_1.z
-            .number()
-            .int()
-            .positive()
-            .optional()
-            .describe('start: number of variants'),
-        briefs: v3_1.z
-            .array(v3_1.z.object({
-            label: v3_1.z
+    mcp.registerTool('rivet_variants', {
+        ...VARIANTS_PRESENTATION,
+        description: VARIANTS_DESCRIPTION,
+        inputSchema: {
+            action: v3_1.z.enum(['start', 'complete', 'commit', 'cancel']),
+            instruction: v3_1.z
                 .string()
-                .trim()
-                .min(1)
-                .max(48)
-                .refine((label) => label.split(/\s+/).length <= DIRECTION_TITLE_MAX_WORDS, {
-                message: 'Direction titles must contain at most 5 words',
+                .optional()
+                .describe('start: what to vary and how'),
+            runLabel: contracts_1.runLabelSchema.describe('start: AI-authored 1–3 word summary shared by every direction in this batch'),
+            count: v3_1.z
+                .number()
+                .int()
+                .positive()
+                .optional()
+                .describe('start: number of variants'),
+            briefs: v3_1.z
+                .array(v3_1.z.object({
+                label: v3_1.z
+                    .string()
+                    .trim()
+                    .min(1)
+                    .max(48)
+                    .refine((label) => label.split(/\s+/).length <= DIRECTION_TITLE_MAX_WORDS, {
+                    message: 'Direction titles must contain at most 5 words',
+                })
+                    .describe('AI-authored 1–5 word direction title'),
+                body: v3_1.z
+                    .string()
+                    .trim()
+                    .min(1)
+                    .max(600)
+                    .refine((body) => body.split(/\s+/).length <= DIRECTION_SUBTITLE_MAX_WORDS, {
+                    message: 'Direction subtitles must contain at most 10 words',
+                })
+                    .describe('Concise direction subtitle of at most 10 words'),
+                notes: v3_1.z
+                    .string()
+                    .trim()
+                    .min(1)
+                    .max(4000)
+                    .optional()
+                    .describe('Optional implementation notes for this direction, passed verbatim to its worker (design tokens, motion specs, constraints). Not shown in UI chips.'),
+                visualReferenceUrl: v3_1.z.string().url().optional(),
+            }))
+                .min(contracts_1.VARIANT_COUNT_MIN)
+                .max(contracts_1.VARIANT_COUNT_MAX)
+                .superRefine((briefs, context) => {
+                const labels = briefs.map((brief) => brief.label.toLowerCase());
+                if (new Set(labels).size !== labels.length) {
+                    context.addIssue({
+                        code: v3_1.z.ZodIssueCode.custom,
+                        message: 'Direction titles must be distinct',
+                    });
+                }
             })
-                .describe('AI-authored 1–5 word direction title'),
-            body: v3_1.z
+                .optional()
+                .describe('start: one AI-authored title/subtitle brief per direction; use one for a single visualization or distinct briefs for divergent ideas; briefs.length sets the variant count'),
+            element: v3_1.z
                 .string()
-                .trim()
-                .min(1)
-                .max(600)
-                .refine((body) => body.split(/\s+/).length <= DIRECTION_SUBTITLE_MAX_WORDS, {
-                message: 'Direction subtitles must contain at most 10 words',
-            })
-                .describe('Concise direction subtitle of at most 10 words'),
-            notes: v3_1.z
+                .optional()
+                .describe('start: CSS selector scoping the variation'),
+            files: v3_1.z
+                .array(v3_1.z.string().trim().min(1))
+                .max(RELEVANT_FILE_MAX_COUNT)
+                .optional()
+                .describe('start: known project files for workers to inspect before broader discovery'),
+            fresh: v3_1.z
+                .boolean()
+                .optional()
+                .describe('start: ignore prior variant context'),
+            profile: v3_1.z
+                .enum(['auto', 'off'])
+                .optional()
+                .describe('start: saved references are off by default; auto selects relevant references when the user asks for them'),
+            guidance: v3_1.z
+                .enum(['auto', 'off'])
+                .optional()
+                .describe('start: apply saved instructions, or turn them off for this request only'),
+            excludedGuidanceIds: v3_1.z
+                .array(v3_1.z.string().min(1).max(200))
+                .optional()
+                .describe('start: saved instruction document IDs to exclude for this request only'),
+            fidelity: v3_1.z
+                .enum(['low', 'medium', 'high'])
+                .optional()
+                .describe("start: the user's design-fidelity intent. low = fast sketch-grade workers (quick ideas/explorations); medium = balanced; high = the default with maximum deliberation, up to a few minutes (polished/pixel-perfect/final asks). Omit when unstated."),
+            workerProvider: v3_1.z
+                .enum(['claude', 'codex', 'cursor'])
+                .optional()
+                .describe('start: run the workers on this provider CLI instead of the one matching your caller agent. Pass ONLY when the user explicitly asks ("use opus for the workers") — it spends on that provider\'s subscription, so never infer it.'),
+            workerModel: v3_1.z
                 .string()
                 .trim()
                 .min(1)
-                .max(4000)
+                .max(200)
                 .optional()
-                .describe('Optional implementation notes for this direction, passed verbatim to its worker (design tokens, motion specs, constraints). Not shown in UI chips.'),
-            visualReferenceUrl: v3_1.z.string().url().optional(),
-        }))
-            .min(contracts_1.VARIANT_COUNT_MIN)
-            .max(contracts_1.VARIANT_COUNT_MAX)
-            .superRefine((briefs, context) => {
-            const labels = briefs.map((brief) => brief.label.toLowerCase());
-            if (new Set(labels).size !== labels.length) {
-                context.addIssue({
-                    code: v3_1.z.ZodIssueCode.custom,
-                    message: 'Direction titles must be distinct',
-                });
-            }
-        })
-            .optional()
-            .describe('start: one AI-authored title/subtitle brief per direction; use one for a single visualization or distinct briefs for divergent ideas; briefs.length sets the variant count'),
-        element: v3_1.z
-            .string()
-            .optional()
-            .describe('start: CSS selector scoping the variation'),
-        files: v3_1.z
-            .array(v3_1.z.string().trim().min(1))
-            .max(RELEVANT_FILE_MAX_COUNT)
-            .optional()
-            .describe('start: known project files for workers to inspect before broader discovery'),
-        fresh: v3_1.z
-            .boolean()
-            .optional()
-            .describe('start: ignore prior variant context'),
-        profile: v3_1.z
-            .enum(['auto', 'off'])
-            .optional()
-            .describe('start: saved references are off by default; auto selects relevant references when the user asks for them'),
-        guidance: v3_1.z
-            .enum(['auto', 'off'])
-            .optional()
-            .describe('start: apply saved instructions, or turn them off for this request only'),
-        excludedGuidanceIds: v3_1.z
-            .array(v3_1.z.string().min(1).max(200))
-            .optional()
-            .describe('start: saved instruction document IDs to exclude for this request only'),
-        fidelity: v3_1.z
-            .enum(['low', 'medium', 'high'])
-            .optional()
-            .describe("start: the user's design-fidelity intent. low = fast sketch-grade workers (quick ideas/explorations); medium = balanced; high = the default with maximum deliberation, up to a few minutes (polished/pixel-perfect/final asks). Omit when unstated."),
-        workerProvider: v3_1.z
-            .enum(['claude', 'codex', 'cursor'])
-            .optional()
-            .describe('start: run the workers on this provider CLI instead of the one matching your caller agent. Pass ONLY when the user explicitly asks ("use opus for the workers") — it spends on that provider\'s subscription, so never infer it.'),
-        workerModel: v3_1.z
-            .string()
-            .trim()
-            .min(1)
-            .max(200)
-            .optional()
-            .describe('start: pin the worker model id for the selected (or caller-matching) provider. Pass ONLY on an explicit user request; a pinned model never silently falls back.'),
-        contextImages: v3_1.z
-            .array(v3_1.z.string().trim().min(1))
-            .min(1)
-            .optional()
-            .describe('start: local reference image file paths (png/jpg/webp/gif/avif). Rivet copies them into the run context and every worker views them natively — pass the actual images instead of describing them in notes.'),
-        contextAssets: v3_1.z
-            .array(contracts_1.contextAssetInputSchema)
-            .min(1)
-            .max(contracts_1.CONTEXT_ASSET_MAX_ITEMS)
-            .optional()
-            .describe('start: local regular files copied into every variant workspace and exposed to workers with stable file and reference paths.'),
-        referencePages: v3_1.z
-            .array(v3_1.z.string().trim().min(1))
-            .min(1)
-            .max(3)
-            .optional()
-            .describe('start (fresh only): reference page URLs. Rivet renders each page server-side (design evidence + screenshot) — pass the raw URLs, never capture evidence or screenshot pages yourself.'),
-        referenceVideos: v3_1.z
-            .array(v3_1.z.string().trim().min(1))
-            .min(1)
-            .max(2)
-            .optional()
-            .describe('start (fresh only): local reference video file paths (mp4/mov/webm/m4v). Rivet samples keyframes server-side — pass the raw paths, never run ffmpeg yourself.'),
-        target: v3_1.z
-            .string()
-            .optional()
-            .describe('start: sessionId:variantId — refine an existing variant in place'),
-        workId: v3_1.z.string().optional().describe('complete: host work item id'),
-        status: v3_1.z
-            .enum(['succeeded', 'failed', 'cancelled'])
-            .optional()
-            .describe('complete: terminal work status'),
-        output: v3_1.z
-            .unknown()
-            .optional()
-            .describe('complete: optional orchestrator output payload'),
-        error: v3_1.z.string().optional().describe('complete: failure message'),
-        title: v3_1.z.string().optional().describe('complete: optional variant title'),
-        description: v3_1.z
-            .string()
-            .optional()
-            .describe('complete: optional variant description'),
-        variantId: v3_1.z
-            .string()
-            .optional()
-            .describe('commit: the variant to write into the working tree'),
-        sessionId: v3_1.z
-            .string()
-            .optional()
-            .describe('complete/commit: source session (optional) · cancel: session to cancel (required)'),
-        project: v3_1.z.string().optional().describe('Project root path'),
+                .describe('start: pin the worker model id for the selected (or caller-matching) provider. Pass ONLY on an explicit user request; a pinned model never silently falls back.'),
+            contextImages: v3_1.z
+                .array(v3_1.z.string().trim().min(1))
+                .min(1)
+                .optional()
+                .describe('start: local reference image file paths (png/jpg/webp/gif/avif). Rivet copies them into the run context and every worker views them natively — pass the actual images instead of describing them in notes.'),
+            contextAssets: v3_1.z
+                .array(contracts_1.contextAssetInputSchema)
+                .min(1)
+                .max(contracts_1.CONTEXT_ASSET_MAX_ITEMS)
+                .optional()
+                .describe('start: local regular files copied into every variant workspace and exposed to workers with stable file and reference paths.'),
+            referencePages: v3_1.z
+                .array(v3_1.z.string().trim().min(1))
+                .min(1)
+                .max(3)
+                .optional()
+                .describe('start (fresh only): reference page URLs. Rivet renders each page server-side (design evidence + screenshot) — pass the raw URLs, never capture evidence or screenshot pages yourself.'),
+            referenceVideos: v3_1.z
+                .array(v3_1.z.string().trim().min(1))
+                .min(1)
+                .max(2)
+                .optional()
+                .describe('start (fresh only): local reference video file paths (mp4/mov/webm/m4v). Rivet samples keyframes server-side — pass the raw paths, never run ffmpeg yourself.'),
+            target: v3_1.z
+                .string()
+                .optional()
+                .describe('start: sessionId:variantId — refine an existing variant in place'),
+            workId: v3_1.z.string().optional().describe('complete: host work item id'),
+            status: v3_1.z
+                .enum(['succeeded', 'failed', 'cancelled'])
+                .optional()
+                .describe('complete: terminal work status'),
+            output: v3_1.z
+                .unknown()
+                .optional()
+                .describe('complete: optional orchestrator output payload'),
+            error: v3_1.z.string().optional().describe('complete: failure message'),
+            title: v3_1.z
+                .string()
+                .optional()
+                .describe('complete: optional variant title'),
+            description: v3_1.z
+                .string()
+                .optional()
+                .describe('complete: optional variant description'),
+            variantId: v3_1.z
+                .string()
+                .optional()
+                .describe('commit: the variant to write into the working tree'),
+            sessionId: v3_1.z
+                .string()
+                .optional()
+                .describe('complete/commit: source session (optional) · cancel: session to cancel (required)'),
+            project: v3_1.z.string().optional().describe('Project root path'),
+        },
     }, async ({ action, instruction, runLabel, count, briefs, element, files, fresh, fidelity, profile, guidance, excludedGuidanceIds, workerProvider, workerModel, contextImages, contextAssets, referencePages, referenceVideos, target, workId, status, output, error, title, description, variantId, sessionId, project, }, extra) => {
         const startedAt = Date.now();
         let rest;
         if (action === 'start') {
-            if (!briefs && !fresh) {
+            if (!briefs) {
                 return completeToolCall({
                     toolName: 'rivet_variants',
                     operation: action,
                     startedAt,
-                    envelope: (0, envelope_1.errorResult)('rivet_variants', 'USAGE_ERROR', 'rivet_variants action=start requires briefs with one AI-authored title/subtitle per direction (fresh starts may omit them — Rivet authors directions server-side).').envelope,
+                    envelope: (0, envelope_1.errorResult)('rivet_variants', 'USAGE_ERROR', 'rivet_variants action=start requires briefs with one AI-authored title/subtitle per direction, including fresh starts.').envelope,
                 });
             }
-            if (!runLabel && !fresh) {
+            if (!runLabel) {
                 return completeToolCall({
                     toolName: 'rivet_variants',
                     operation: action,
                     startedAt,
-                    envelope: (0, envelope_1.errorResult)('rivet_variants', 'USAGE_ERROR', 'rivet_variants action=start requires runLabel with an AI-authored 1–3 word batch summary (fresh starts may omit it).').envelope,
+                    envelope: (0, envelope_1.errorResult)('rivet_variants', 'USAGE_ERROR', 'rivet_variants action=start requires runLabel with an AI-authored 1–3 word batch summary, including fresh starts.').envelope,
                 });
             }
             rest = [
@@ -692,7 +745,7 @@ const buildMcpServer = async (options = {}) => {
         else {
             rest = ['cancel', ...(sessionId !== undefined ? [sessionId] : [])];
         }
-        const { envelope, progress } = await runCommand('variants', [...rest, ...projectArgs(project)], (0, callerModel_1.callerModelArgsFromToolMeta)(extra._meta));
+        const { envelope, progress } = await runCommand('variants', [...rest, ...projectArgs(project)], { handoffArgs: (0, callerModel_1.callerModelArgsFromToolMeta)(extra._meta) });
         return completeToolCall({
             toolName: 'rivet_variants',
             operation: action,
@@ -703,162 +756,210 @@ const buildMcpServer = async (options = {}) => {
                 (target !== undefined ? target.split(':')[0] : undefined),
         });
     });
-    mcp.tool('rivet_design_context', DESIGN_CONTEXT_DESCRIPTION, {
-        contextAction: v3_1.z
-            .enum([
-            'add',
-            'list',
-            'show',
-            'update',
-            'enable',
-            'disable',
-            'remove',
-            'resolve',
-            'inspect',
-        ])
-            .optional()
-            .describe('Manage saved instructions applied across projects. Separate from optional reference profiles; lookup uses no model.'),
-        contextId: v3_1.z
-            .string()
-            .min(1)
-            .max(200)
-            .optional()
-            .describe('Saved instruction document ID for show, update, enable, disable, or remove'),
-        contextFile: v3_1.z
-            .string()
-            .min(1)
-            .optional()
-            .describe('Local UTF-8 Markdown file copied when adding or updating saved instructions'),
-        contextReferences: v3_1.z
-            .string()
-            .min(1)
-            .optional()
-            .describe('Local JSON reference manifest for context add/update. Entries are {kind:"url"|"repository",url,intent,revision?,files?:[{name,path}]} or {kind:"directory",path,intent}. Repository URLs default to URL-only; existing local repositories or installed libraries use directory pointers without cloning or copying contents. Directory paths resolve relative to the manifest and remain live read-only sources, not snapshots. Omit files and additional setup Markdown unless the user explicitly requests a snapshot or approves a file selection. URLs are not fetched; this does not authorize source ingestion.'),
-        guidance: v3_1.z
-            .enum(['auto', 'off'])
-            .optional()
-            .describe('resolve: selection mode for this read only'),
-        excludedGuidanceIds: v3_1.z
-            .array(v3_1.z.string().min(1).max(200))
-            .optional()
-            .describe('resolve: saved instruction document IDs to exclude for this read only'),
-        url: v3_1.z
-            .string()
-            .optional()
-            .describe('The URL to gather design context from'),
-        profileAction: v3_1.z
-            .enum([
-            'status',
-            'diagnostics',
-            'rebuild-index',
-            'enable',
-            'disable',
-            'connect',
-            'refresh',
-            'pause',
-            'resume',
-            'retry',
-            'add-text',
-            'add-images',
-            'pins',
-            'add-variant',
-            'references',
-            'reference',
-            'include',
-            'exclude',
-            'remove',
-            'suggest',
-            'inspect',
-            'discover',
-            'plan',
-            'import',
-            'onboarding',
-        ])
-            .optional()
-            .describe('Manage the local cross-project design profile instead of fetching a URL. sourceId also identifies a job for pause/resume/retry.'),
-        title: v3_1.z.string().optional(),
-        text: v3_1.z.string().optional(),
-        files: v3_1.z.array(v3_1.z.string()).optional(),
-        query: v3_1.z.string().optional(),
-        sourceId: v3_1.z.string().optional(),
-        profileId: v3_1.z
-            .string()
-            .uuid()
-            .optional()
-            .describe('Library identity from the copied command'),
-        referenceKeys: v3_1.z
-            .array(v3_1.z.string())
-            .min(1)
-            .max(design_library_1.DESIGN_REFERENCE_BATCH_LIMIT)
-            .optional()
-            .describe('One or more copied shortId@revision keys to resolve in a single query'),
-        isDetailed: v3_1.z
-            .boolean()
-            .optional()
-            .describe('Include full saved text, analysis, sources, and validated image paths; default metadata only'),
-        discoveryId: v3_1.z
-            .string()
-            .uuid()
-            .optional()
-            .describe('Saved discovery to plan selected collections from'),
-        planId: v3_1.z
-            .string()
-            .uuid()
-            .optional()
-            .describe('Saved plan to inspect or explicitly approve'),
-        planRevision: v3_1.z
-            .string()
-            .optional()
-            .describe('Exact revision shown in the reviewed plan'),
-        collectionIds: v3_1.z.array(v3_1.z.string()).optional(),
-        isApproved: v3_1.z
-            .boolean()
-            .optional()
-            .describe('Set true only after the user approves the displayed scope and agent usage'),
-        onboardingAction: v3_1.z.enum(['later', 'dismiss', 'reset']).optional(),
-        referenceProvider: v3_1.z
-            .enum(['cosmos', 'pinterest', 'arena', 'x'])
-            .optional()
-            .describe('Provider to discover or set onboarding preferences for. Cosmos discovery requires its public profile URL.'),
-        requestId: v3_1.z
-            .string()
-            .min(1)
-            .max(200)
-            .optional()
-            .describe('Top-level workId from variants start to inspect, or suggestion request identity'),
-        projectId: v3_1.z
-            .string()
-            .optional()
-            .describe('Stable library project ID for pins or add-variant'),
-        variantRef: v3_1.z
-            .string()
-            .optional()
-            .describe('Exact sessionId:variantId to save as profile context'),
-        note: v3_1.z.string().optional(),
-        imageFile: v3_1.z
-            .string()
-            .optional()
-            .describe('Supplied screenshot for a direction without a saved static preview'),
-        runtime: v3_1.z.enum(['codex', 'claude', 'cursor']).optional(),
-        screenshot: v3_1.z
-            .boolean()
-            .optional()
-            .describe('Capture a screenshot (render path only)'),
-        width: v3_1.z
-            .number()
-            .int()
-            .positive()
-            .optional()
-            .describe('Viewport width (render path only)'),
-        height: v3_1.z
-            .number()
-            .int()
-            .positive()
-            .optional()
-            .describe('Viewport height (render path only)'),
-        project: v3_1.z.string().optional().describe('Project root path'),
-    }, async ({ url, contextAction, contextId, contextFile, contextReferences, guidance, excludedGuidanceIds, screenshot, width, height, project, profileAction, title, text, files, query, sourceId, profileId, referenceKeys, isDetailed, discoveryId, planId, planRevision, collectionIds, isApproved, onboardingAction, referenceProvider, requestId, projectId, variantRef, note, imageFile, runtime, }) => {
+    mcp.registerTool('rivet_design_context', {
+        ...DESIGN_CONTEXT_PRESENTATION,
+        description: DESIGN_CONTEXT_DESCRIPTION,
+        inputSchema: {
+            contextAction: v3_1.z
+                .enum([
+                'add',
+                'list',
+                'show',
+                'update',
+                'enable',
+                'disable',
+                'remove',
+                'resolve',
+                'inspect',
+                'verifier',
+                'verify',
+            ])
+                .optional()
+                .describe('Manage saved instructions applied across projects. verifier retrieves one source and its checking recipe without execution; verify explicitly runs a saved executable package locally against project and contextVerifierInput. No automatic verification. Separate from optional reference profiles; lookup uses no model.'),
+            contextId: v3_1.z
+                .string()
+                .min(1)
+                .max(200)
+                .optional()
+                .describe('Saved instruction document ID for show, update, enable, disable, remove, verifier, or verify'),
+            contextFile: v3_1.z
+                .string()
+                .min(1)
+                .optional()
+                .describe('Local UTF-8 Markdown file copied when adding or updating saved instructions'),
+            contextVerifier: v3_1.z
+                .string()
+                .min(1)
+                .optional()
+                .describe('update: local UTF-8 Markdown verifier recipe, saved only after the user agrees to reuse it; requires contextSourceDigest'),
+            contextVerifierPackage: v3_1.z
+                .string()
+                .min(1)
+                .optional()
+                .describe('update: local JSON manifest {runtime:"node",entrypoint:"verify.mjs",files:[{name,path}]} for trusted local executable code retained beside contextVerifier; no dependency installation'),
+            contextVerifierInput: v3_1.z
+                .string()
+                .min(1)
+                .optional()
+                .describe('verify: required local JSON object with package-specific target URL, selectors, modes and prerequisites; explicit local execution, not a sandbox'),
+            contextSourceDigest: v3_1.z
+                .string()
+                .regex(/^[a-f0-9]{64}$/)
+                .optional()
+                .describe('update: exact sourceDigest from contextAction verifier, binding the recipe to the source inspected'),
+            removeContextVerifier: v3_1.z
+                .boolean()
+                .optional()
+                .describe('update: remove only the saved verifier recipe, preserving its source'),
+            contextReferences: v3_1.z
+                .string()
+                .min(1)
+                .optional()
+                .describe('Local JSON reference manifest for context add/update. Entries are {kind:"url"|"repository",url,intent,revision?,files?:[{name,path}]} or {kind:"directory",path,intent}. Repository URLs default to URL-only; existing local repositories or installed libraries use directory pointers without cloning or copying contents. Directory paths resolve relative to the manifest and remain live read-only sources, not snapshots. Omit files and additional setup Markdown unless the user explicitly requests a snapshot or approves a file selection. URLs are not fetched; this does not authorize source ingestion.'),
+            guidance: v3_1.z
+                .enum(['auto', 'off'])
+                .optional()
+                .describe('resolve: selection mode for this read only'),
+            excludedGuidanceIds: v3_1.z
+                .array(v3_1.z.string().min(1).max(200))
+                .optional()
+                .describe('resolve: saved instruction document IDs to exclude for this read only'),
+            url: v3_1.z
+                .string()
+                .optional()
+                .describe('The URL to gather design context from'),
+            profileAction: v3_1.z
+                .enum([
+                'status',
+                'diagnostics',
+                'rebuild-index',
+                'enable',
+                'disable',
+                'connect',
+                'refresh',
+                'pause',
+                'resume',
+                'retry',
+                'add-text',
+                'add-images',
+                'pins',
+                'add-variant',
+                'references',
+                'reference',
+                'include',
+                'exclude',
+                'remove',
+                'suggest',
+                'inspect',
+                'discover',
+                'plan',
+                'import',
+                'onboarding',
+            ])
+                .optional()
+                .describe('Manage the local cross-project design profile instead of fetching a URL. sourceId also identifies a job for pause/resume/retry.'),
+            title: v3_1.z.string().optional(),
+            text: v3_1.z.string().optional(),
+            files: v3_1.z.array(v3_1.z.string()).optional(),
+            query: v3_1.z.string().optional(),
+            sourceId: v3_1.z.string().optional(),
+            profileId: v3_1.z
+                .string()
+                .uuid()
+                .optional()
+                .describe('Library identity from the copied command'),
+            referenceKeys: v3_1.z
+                .array(v3_1.z.string())
+                .min(1)
+                .max(design_library_1.DESIGN_REFERENCE_BATCH_LIMIT)
+                .optional()
+                .describe('One or more copied shortId@revision keys to resolve in a single query'),
+            isDetailed: v3_1.z
+                .boolean()
+                .optional()
+                .describe('Include full saved text, analysis, sources, and validated image paths; default metadata only'),
+            discoveryId: v3_1.z
+                .string()
+                .uuid()
+                .optional()
+                .describe('Saved discovery to plan selected collections from'),
+            planId: v3_1.z
+                .string()
+                .uuid()
+                .optional()
+                .describe('Saved plan to inspect or explicitly approve'),
+            planRevision: v3_1.z
+                .string()
+                .optional()
+                .describe('Exact revision shown in the reviewed plan'),
+            collectionIds: v3_1.z.array(v3_1.z.string()).optional(),
+            isApproved: v3_1.z
+                .boolean()
+                .optional()
+                .describe('Set true only after the user approves the displayed scope and agent usage'),
+            onboardingAction: v3_1.z.enum(['later', 'dismiss', 'reset']).optional(),
+            referenceProvider: v3_1.z
+                .enum(['cosmos', 'pinterest', 'arena', 'x'])
+                .optional()
+                .describe('Provider to discover or set onboarding preferences for. Cosmos discovery requires its public profile URL.'),
+            requestId: v3_1.z
+                .string()
+                .min(1)
+                .max(200)
+                .optional()
+                .describe('Top-level workId from variants start to inspect, or suggestion request identity'),
+            projectId: v3_1.z
+                .string()
+                .optional()
+                .describe('Stable library project ID for pins or add-variant'),
+            variantRef: v3_1.z
+                .string()
+                .optional()
+                .describe('Exact sessionId:variantId to save as profile context'),
+            note: v3_1.z.string().optional(),
+            imageFile: v3_1.z
+                .string()
+                .optional()
+                .describe('Supplied screenshot for a direction without a saved static preview'),
+            runtime: v3_1.z.enum(['codex', 'claude', 'cursor']).optional(),
+            screenshot: v3_1.z
+                .boolean()
+                .optional()
+                .describe('Capture a screenshot (render path only)'),
+            width: v3_1.z
+                .number()
+                .int()
+                .positive()
+                .optional()
+                .describe('Viewport width (render path only)'),
+            height: v3_1.z
+                .number()
+                .int()
+                .positive()
+                .optional()
+                .describe('Viewport height (render path only)'),
+            project: v3_1.z.string().optional().describe('Project root path'),
+        },
+    }, async ({ url, contextAction, contextId, contextFile, contextReferences, contextVerifier, contextVerifierPackage, contextVerifierInput, contextSourceDigest, removeContextVerifier, guidance, excludedGuidanceIds, screenshot, width, height, project, profileAction, title, text, files, query, sourceId, profileId, referenceKeys, isDetailed, discoveryId, planId, planRevision, collectionIds, isApproved, onboardingAction, referenceProvider, requestId, projectId, variantRef, note, imageFile, runtime, }, extra) => {
         const startedAt = Date.now();
+        const hasVerifierUpdate = contextVerifier !== undefined ||
+            contextVerifierPackage !== undefined ||
+            contextSourceDigest !== undefined ||
+            removeContextVerifier === true;
+        if (contextVerifierInput !== undefined && contextAction !== 'verify')
+            return completeToolCall({
+                toolName: 'rivet_design_context',
+                operation: 'context.verify',
+                startedAt,
+                envelope: (0, envelope_1.errorResult)('context.verify', 'USAGE_ERROR', 'contextVerifierInput requires contextAction verify').envelope,
+            });
+        if (hasVerifierUpdate && contextAction !== 'update')
+            return completeToolCall({
+                toolName: 'rivet_design_context',
+                operation: 'context.update',
+                startedAt,
+                envelope: (0, envelope_1.errorResult)('context.update', 'USAGE_ERROR', 'Verifier changes require contextAction update').envelope,
+            });
         if (contextAction) {
             if (profileAction || url) {
                 return completeToolCall({
@@ -874,6 +975,8 @@ const buildMcpServer = async (options = {}) => {
                 'enable',
                 'disable',
                 'remove',
+                'verifier',
+                'verify',
             ].includes(contextAction);
             const isWriteAction = contextAction === 'add' || contextAction === 'update';
             const isResolveAction = contextAction === 'resolve';
@@ -890,6 +993,19 @@ const buildMcpServer = async (options = {}) => {
                 ...(isWriteAction && contextReferences !== undefined
                     ? ['--references', contextReferences]
                     : []),
+                ...(contextVerifier !== undefined
+                    ? ['--verifier', contextVerifier]
+                    : []),
+                ...(contextVerifierPackage !== undefined
+                    ? ['--verifier-package', contextVerifierPackage]
+                    : []),
+                ...(contextVerifierInput !== undefined
+                    ? ['--input', contextVerifierInput]
+                    : []),
+                ...(contextSourceDigest !== undefined
+                    ? ['--source-digest', contextSourceDigest]
+                    : []),
+                ...(removeContextVerifier ? ['--remove-verifier'] : []),
                 ...(isResolveAction && guidance !== undefined
                     ? ['--guidance', guidance]
                     : []),
@@ -897,7 +1013,7 @@ const buildMcpServer = async (options = {}) => {
                     ? ['--exclude-guidance', JSON.stringify(excludedGuidanceIds)]
                     : []),
                 ...projectArgs(project),
-            ]);
+            ], { signal: AbortSignal.any([extra.signal, verificationAbort.signal]) });
             return completeToolCall({
                 toolName: 'rivet_design_context',
                 operation: `context.${contextAction}`,
@@ -994,7 +1110,14 @@ const buildMcpServer = async (options = {}) => {
             progress,
         });
     });
-    return { mcp, telemetry };
+    return {
+        mcp,
+        telemetry,
+        cancelVerifications: async () => {
+            verificationAbort.abort();
+            await (0, GuidanceVerifierRunner_1.cancelGuidanceVerifications)();
+        },
+    };
 };
 exports.buildMcpServer = buildMcpServer;
 const guardStdout = () => {
@@ -1053,12 +1176,20 @@ const handleMcpServe = async (rest, io) => {
     catch (error) {
         return (0, envelope_1.errorResult)('mcp', 'OPERATION_FAILED', `Could not start the MCP server: ${(0, errorMessage_1.errorMessage)(error)}`);
     }
-    built.mcp.server.onclose = () => {
-        const shutdown = built.telemetry?.shutdown();
-        void Promise.resolve(shutdown)
+    let isClosing = false;
+    const shutdown = () => {
+        if (isClosing)
+            return;
+        isClosing = true;
+        void built
+            .cancelVerifications()
+            .then(() => built.telemetry?.shutdown())
             .catch(() => { })
             .finally(() => process.exit(0));
     };
+    built.mcp.server.onclose = shutdown;
+    process.once('SIGINT', shutdown);
+    process.once('SIGTERM', shutdown);
     io.writeProgress('Rivet MCP server started on stdio (rivet mcp serve)');
     return new Promise(() => { });
 };