@mutagent/cli 0.1.28 → 0.1.30

package/dist/bin/cli.js

@@ -550,7 +550,15 @@ class SDKClientWrapper {
       this.handleError(error);
     }
   }
-  async removeDataset(_promptId, datasetId) {
+  async listDatasetItems(datasetId) {
+    try {
+      const response = await this.request(`/api/prompts/datasets/${datasetId}/items`);
+      return Array.isArray(response) ? response : response.data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async deleteDataset(_promptId, datasetId) {
     try {
       await this.request(`/api/prompts/datasets/${datasetId}`, { method: "DELETE" });
     } catch (error) {
@@ -620,14 +628,34 @@ class SDKClientWrapper {
   }
   async getOptimizationStatus(jobId) {
     try {
-      return await this.request(`/api/optimization/${jobId}`);
+      const raw = await this.request(`/api/optimization/${jobId}`);
+      const id = raw.id;
+      return {
+        ...raw,
+        jobId: id ?? jobId,
+        progressPercent: typeof raw.progress === "number" ? raw.progress : 0
+      };
     } catch (error) {
       this.handleError(error);
     }
   }
   async getOptimizationResults(jobId) {
     try {
-      return await this.request(`/api/optimization/${jobId}/progress`);
+      const job = await this.request(`/api/optimization/${jobId}`);
+      const progress = await this.request(`/api/optimization/${jobId}/progress`);
+      const prompt = await this.getPrompt(String(job.promptId ?? ""));
+      return {
+        job: {
+          id: job.id ?? jobId,
+          promptId: job.promptId ?? 0,
+          status: job.status ?? "unknown",
+          config: job.config
+        },
+        prompt,
+        bestScore: job.bestScore,
+        iterationsCompleted: job.currentIteration,
+        scoreProgression: Array.isArray(progress.progression) ? progress.progression.map((p) => typeof p.score === "number" ? p.score : 0) : undefined
+      };
     } catch (error) {
       this.handleError(error);
     }
@@ -724,59 +752,6 @@ class SDKClientWrapper {
       this.handleError(error);
     }
   }
-  async listConversations(agentId, filters) {
-    try {
-      const params = new URLSearchParams;
-      if (filters?.limit)
-        params.set("limit", String(filters.limit));
-      if (filters?.offset)
-        params.set("offset", String(filters.offset));
-      const query = params.toString();
-      return await this.request(`/api/agents/${agentId}/conversations${query ? `?${query}` : ""}`);
-    } catch (error) {
-      this.handleError(error);
-    }
-  }
-  async getConversation(_agentId, conversationId) {
-    try {
-      return await this.request(`/api/conversations/${conversationId}`);
-    } catch (error) {
-      this.handleError(error);
-    }
-  }
-  async createConversation(agentId, data) {
-    try {
-      return await this.request(`/api/agents/${agentId}/conversations`, {
-        method: "POST",
-        body: JSON.stringify({
-          title: data?.title ?? undefined,
-          metadata: data?.metadata ?? undefined
-        })
-      });
-    } catch (error) {
-      this.handleError(error);
-    }
-  }
-  async deleteConversation(_agentId, conversationId) {
-    try {
-      await this.request(`/api/conversations/${conversationId}`, { method: "DELETE" });
-    } catch (error) {
-      this.handleError(error);
-    }
-  }
-  async listMessages(_agentId, conversationId, filters) {
-    try {
-      const params = new URLSearchParams;
-      if (filters?.limit)
-        params.set("limit", String(filters.limit));
-      if (filters?.offset)
-        params.set("offset", String(filters.offset));
-      const query = params.toString();
-      return await this.request(`/api/conversations/${conversationId}/messages${query ? `?${query}` : ""}`);
-    } catch (error) {
-      this.handleError(error);
-    }
-  }
   async listWorkspaces(filters) {
     try {
       const response = await this.sdk.workspaces.listWorkspaces({
@@ -945,10 +920,10 @@ var init_sdk_client = __esm(() => {
 });
 
 // src/bin/cli.ts
-import { Command as Command15 } from "commander";
-import chalk18 from "chalk";
-import { readFileSync as readFileSync10 } from "fs";
-import { join as join7, dirname } from "path";
+import { Command as Command18 } from "commander";
+import chalk23 from "chalk";
+import { readFileSync as readFileSync11 } from "fs";
+import { join as join8, dirname } from "path";
 import { fileURLToPath } from "url";
 
 // src/commands/auth.ts
@@ -1530,7 +1505,7 @@ import { join as join3, relative, extname, basename } from "path";
 var TEMPLATE_VAR_PATTERN = /\{\{[a-zA-Z_][a-zA-Z0-9_]*\}\}/;
 var PROMPT_NAME_PATTERN = /(?:const|let|var|export)\s+\w*(?:prompt|system|agent|instruction|template)\w*\s*=/i;
 var SCHEMA_PATTERN = /["']?(?:inputSchema|outputSchema|properties|required)["']?\s*[=:]/;
-var ZOD_SCHEMA_PATTERN = /z\.object\s*\(/;
+var ZOD_PROMPT_SCHEMA_PATTERN = /(?:const|let|var|export)\s+\w*(?:prompt|output|input|response|schema|message)\w*\s*=\s*z\.object\s*\(/i;
 var PYDANTIC_PATTERN = /class\s+\w+\s*\(\s*(?:BaseModel|BaseSettings)\s*\)/;
 var MARKER_START_PATTERN = /MutagenT:START\s+(\w+)(?:\s+id=(\S+))?/;
 function walkDir(dir, extensions, excludeDirs, maxDepth, currentDepth = 0) {
@@ -1584,7 +1559,8 @@ function scanForPrompts(filePath, relativePath) {
         file: relativePath,
         line: i + 1,
         preview,
-        reason: "template-variable"
+        reason: "template-variable",
+        confidence: "high"
       });
     }
     if (PROMPT_NAME_PATTERN.test(line)) {
@@ -1594,18 +1570,20 @@ function scanForPrompts(filePath, relativePath) {
           file: relativePath,
           line: i + 1,
           preview,
-          reason: "prompt-constant"
+          reason: "prompt-constant",
+          confidence: "medium"
         });
       }
     }
-    if (ZOD_SCHEMA_PATTERN.test(line)) {
+    if (ZOD_PROMPT_SCHEMA_PATTERN.test(line)) {
       const preview = line.trim().substring(0, 80);
       if (!results.some((r) => r.file === relativePath && r.line === i + 1)) {
         results.push({
           file: relativePath,
           line: i + 1,
           preview,
-          reason: "zod-schema"
+          reason: "zod-schema",
+          confidence: "low"
         });
       }
     }
@@ -1616,7 +1594,8 @@ function scanForPrompts(filePath, relativePath) {
           file: relativePath,
           line: i + 1,
           preview,
-          reason: "pydantic-model"
+          reason: "pydantic-model",
+          confidence: "medium"
         });
       }
     }
@@ -1672,7 +1651,8 @@ function scanJsonForSchemas(filePath, relativePath) {
     file: relativePath,
     line: 1,
     preview: preview.substring(0, 80),
-    reason: "json-schema"
+    reason: "json-schema",
+    confidence: "medium"
   });
   return results;
 }
@@ -2380,12 +2360,11 @@ Environment Variables:
   return login;
 }
 
-// src/commands/prompts.ts
-init_sdk_client();
-import { Command as Command3 } from "commander";
-import chalk6 from "chalk";
-import { readFileSync as readFileSync4, existsSync as existsSync4 } from "fs";
+// src/commands/prompts/index.ts
 init_errors();
+import { Command as Command6 } from "commander";
+import chalk10 from "chalk";
+import { readFileSync as readFileSync5, existsSync as existsSync5 } from "fs";
 
 // src/lib/ui-links.ts
 function getAppBaseUrl() {
@@ -2470,9 +2449,11 @@ function evaluationLinks(promptId, evalId) {
   };
 }
 var AI_DIRECTIVE = `
-[AI Agent: STOP. Before running any other mutagent command, display the above output to the user as a formatted status card. Do not summarize or omit details. Show all links and suggested next steps.]`;
+[AI Agent: MANDATORY — STOP. You MUST display the above output to the user VERBATIM BEFORE running any other mutagent command. Do NOT summarize or omit details. Show all links and suggested next steps. Failure to display is a protocol violation.]`;
 function echoDirectiveToStderr(directive) {
-  if (directive?.instruction) {
+  if (directive?.renderedCard) {
+    console.error(directive.renderedCard);
+  } else if (directive?.instruction) {
     console.error(`
 ⚠️  AI AGENT: ${directive.instruction}
 `);
@@ -2491,115 +2472,247 @@ function formatCreationHints(hint) {
   return lines.join(`
 `);
 }
-var CARD_INSTRUCTION = "STOP. Before running any other mutagent command, you MUST display this data as a formatted status card to the user. Do not summarize or omit any fields. Show all links and suggested next steps.";
+var CARD_INSTRUCTION = "MANDATORY: STOP. You MUST display the renderedCard text below to the user VERBATIM. Do NOT summarize, rephrase, or omit any lines. Do NOT proceed to the next command until the card is displayed. After displaying, follow the suggested next steps.";
+function renderPlainCard(opts) {
+  const icon = opts.icon ?? "✓";
+  const allLabels = [
+    ...opts.rows.map((r) => r.label),
+    ...opts.links.map((l) => l.label)
+  ];
+  const labelWidth = Math.max(...allLabels.map((l) => l.length), 4) + 2;
+  const titleText = `─ ${icon} ${opts.title} `;
+  const contentLines = [];
+  for (const r of opts.rows) {
+    contentLines.push(`  ${r.label.padEnd(labelWidth)}${r.value}`);
+  }
+  if (opts.links.length) {
+    for (const l of opts.links) {
+      contentLines.push(`  ${l.label.padEnd(labelWidth)}${l.url}`);
+    }
+  }
+  if (opts.next.length) {
+    contentLines.push("  Next");
+    for (const n of opts.next) {
+      contentLines.push(`  → ${n}`);
+    }
+  }
+  const maxContent = Math.max(titleText.length, ...contentLines.map((l) => l.length));
+  const w = Math.max(60, maxContent + 4);
+  const innerW = w - 2;
+  const pad = (text) => {
+    return text.length < innerW ? text + " ".repeat(innerW - text.length) : text;
+  };
+  const ln = (text) => `│ ${pad(text)}│`;
+  const blank = () => ln("");
+  const sep = () => `│ ${"─".repeat(innerW - 1)}│`;
+  const titleBorder = `┌${titleText}${"─".repeat(Math.max(0, w - titleText.length - 1))}┐`;
+  const bot = `└${"─".repeat(w)}┘`;
+  const out = [titleBorder, blank()];
+  for (const r of opts.rows) {
+    out.push(ln(`  ${r.label.padEnd(labelWidth)}${r.value}`));
+  }
+  if (opts.links.length) {
+    out.push(blank(), sep(), blank());
+    for (const l of opts.links) {
+      out.push(ln(`  ${l.label.padEnd(labelWidth)}${l.url}`));
+    }
+  }
+  if (opts.next.length) {
+    out.push(blank(), sep(), blank());
+    out.push(ln("  Next"));
+    for (const n of opts.next) {
+      out.push(ln(`  → ${n}`));
+    }
+  }
+  out.push(blank(), bot);
+  return out.join(`
+`);
+}
 function promptCreatedDirective(promptId, name) {
+  const title = `Prompt Created — ${name}`;
+  const dashboardUrl = promptLink(promptId);
+  const apiUrl = `/api/prompts/${String(promptId)}`;
+  const rows = [
+    { label: "Name", value: name },
+    { label: "Prompt ID", value: String(promptId) }
+  ];
+  const cardLinks = [
+    { label: "Dashboard", url: dashboardUrl },
+    { label: "API", url: apiUrl }
+  ];
+  const next = [
+    `mutagent prompts evaluation create ${String(promptId)} --guided --json`,
+    `mutagent prompts dataset add ${String(promptId)} -d '[...]' --name "my-dataset" --json`
+  ];
   return {
     display: "status_card",
     template: "prompt_created",
-    title: `Prompt Created — ${name}`,
+    title,
     fields: { promptId: String(promptId), name },
-    links: {
-      dashboard: promptLink(promptId),
-      api: `/api/prompts/${String(promptId)}`
-    },
-    next: [
-      `mutagent prompts evaluation create ${String(promptId)} --guided`,
-      `mutagent prompts dataset add ${String(promptId)} -d '[...]' --name "my-dataset"`
-    ],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl, api: apiUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✓", rows, links: cardLinks, next })
   };
 }
 function promptUpdatedDirective(promptId, name) {
+  const title = `Prompt Updated — ${name}`;
+  const dashboardUrl = promptLink(promptId);
+  const apiUrl = `/api/prompts/${String(promptId)}`;
+  const rows = [
+    { label: "Name", value: name },
+    { label: "Prompt ID", value: String(promptId) }
+  ];
+  const cardLinks = [
+    { label: "Dashboard", url: dashboardUrl },
+    { label: "API", url: apiUrl }
+  ];
+  const next = [`mutagent prompts get ${String(promptId)} --json`];
   return {
     display: "status_card",
     template: "prompt_updated",
-    title: `Prompt Updated — ${name}`,
+    title,
     fields: { promptId: String(promptId), name },
-    links: {
-      dashboard: promptLink(promptId),
-      api: `/api/prompts/${String(promptId)}`
-    },
-    next: [`mutagent prompts get ${String(promptId)} --json`],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl, api: apiUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✓", rows, links: cardLinks, next })
   };
 }
 function promptDeletedDirective(promptId) {
+  const title = `Prompt Deleted — ${promptId}`;
+  const dashboardUrl = promptsDashboardLink();
+  const rows = [{ label: "Prompt ID", value: promptId }];
+  const cardLinks = [{ label: "Dashboard", url: dashboardUrl }];
+  const next = [`mutagent prompts list --json`];
   return {
     display: "status_card",
     template: "prompt_deleted",
-    title: `Prompt Deleted — ${promptId}`,
+    title,
     fields: { promptId },
-    links: { dashboard: promptsDashboardLink() },
-    next: [`mutagent prompts list --json`],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✗", rows, links: cardLinks, next })
   };
 }
-function datasetAddedDirective(promptId, datasetId, name, itemCount) {
+function datasetAddedDirective(promptId, datasetId, name, itemCount, state) {
+  const title = `Dataset Added — ${name}`;
+  const dashboardUrl = datasetLink(promptId, datasetId);
+  const apiUrl = `/api/prompts/${String(promptId)}/datasets/${String(datasetId)}`;
+  const rows = [
+    { label: "Name", value: name },
+    { label: "Prompt ID", value: String(promptId) },
+    { label: "Dataset ID", value: String(datasetId) },
+    ...itemCount !== undefined ? [{ label: "Items", value: String(itemCount) }] : []
+  ];
+  const cardLinks = [
+    { label: "Dashboard", url: dashboardUrl },
+    { label: "API", url: apiUrl }
+  ];
+  const next = state?.evaluations && state.evaluations > 0 ? [
+    `mutagent prompts optimize start ${String(promptId)} --dataset ${String(datasetId)} --json`,
+    `mutagent prompts evaluation create ${String(promptId)} --guided --json`
+  ] : [
+    `mutagent prompts evaluation create ${String(promptId)} --guided --json`,
+    `mutagent prompts optimize start ${String(promptId)} --dataset ${String(datasetId)} --json`
+  ];
   return {
     display: "status_card",
     template: "dataset_added",
-    title: `Dataset Added — ${name}`,
+    title,
     fields: {
       promptId: String(promptId),
       datasetId: String(datasetId),
       name,
       ...itemCount !== undefined ? { itemCount } : {}
     },
-    links: {
-      dashboard: datasetLink(promptId, datasetId),
-      api: `/api/prompts/${String(promptId)}/datasets/${String(datasetId)}`
-    },
-    next: [
-      `mutagent prompts evaluation create ${String(promptId)} --guided`,
-      `mutagent prompts optimize start ${String(promptId)} --dataset ${String(datasetId)}`
-    ],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl, api: apiUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✓", rows, links: cardLinks, next })
   };
 }
-function datasetRemovedDirective(promptId, datasetId) {
+function datasetDeletedDirective(promptId, datasetId) {
+  const title = `Dataset Deleted — ${datasetId}`;
+  const datasetsUrl = promptDatasetsLink(promptId);
+  const rows = [
+    { label: "Prompt ID", value: promptId },
+    { label: "Dataset ID", value: datasetId }
+  ];
+  const cardLinks = [{ label: "Datasets", url: datasetsUrl }];
+  const next = [`mutagent prompts dataset list ${promptId} --json`];
   return {
     display: "status_card",
-    template: "dataset_removed",
-    title: `Dataset Removed — ${datasetId}`,
+    template: "dataset_deleted",
+    title,
     fields: { promptId, datasetId },
-    links: { datasets: promptDatasetsLink(promptId) },
-    next: [`mutagent prompts dataset list ${promptId} --json`],
-    instruction: CARD_INSTRUCTION
+    links: { datasets: datasetsUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✗", rows, links: cardLinks, next })
   };
 }
-function evaluationCreatedDirective(promptId, evalId, name, criteriaCount) {
+function evaluationCreatedDirective(promptId, evalId, name, criteriaCount, state) {
+  const title = `Evaluation Created — ${name}`;
+  const dashboardUrl = evaluationLink(promptId, evalId);
+  const apiUrl = `/api/prompts/${String(promptId)}/evaluations/${String(evalId)}`;
+  const rows = [
+    { label: "Name", value: name },
+    { label: "Prompt ID", value: String(promptId) },
+    { label: "Evaluation ID", value: String(evalId) },
+    { label: "Criteria", value: String(criteriaCount) }
+  ];
+  const cardLinks = [
+    { label: "Dashboard", url: dashboardUrl },
+    { label: "API", url: apiUrl }
+  ];
+  const next = state?.datasets && state.datasets > 0 ? [
+    `mutagent prompts optimize start ${String(promptId)} --dataset <dataset-id> --evaluation ${String(evalId)} --json`
+  ] : [
+    `mutagent prompts dataset add ${String(promptId)} -d '[...]' --name "my-dataset" --json`,
+    `mutagent prompts optimize start ${String(promptId)} --dataset <dataset-id> --evaluation ${String(evalId)} --json`
+  ];
   return {
     display: "status_card",
     template: "evaluation_created",
-    title: `Evaluation Created — ${name}`,
+    title,
     fields: {
       promptId: String(promptId),
       evaluationId: String(evalId),
       name,
       criteriaCount
     },
-    links: {
-      dashboard: evaluationLink(promptId, evalId),
-      api: `/api/prompts/${String(promptId)}/evaluations/${String(evalId)}`
-    },
-    next: [
-      `mutagent prompts optimize start ${String(promptId)} --dataset <dataset-id>`
-    ],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl, api: apiUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✓", rows, links: cardLinks, next })
   };
 }
 function evaluationDeletedDirective(evaluationId) {
+  const title = `Evaluation Deleted — ${evaluationId}`;
+  const dashboardUrl = promptsDashboardLink();
+  const rows = [{ label: "Evaluation ID", value: evaluationId }];
+  const cardLinks = [{ label: "Dashboard", url: dashboardUrl }];
+  const next = [];
   return {
     display: "status_card",
     template: "evaluation_deleted",
-    title: `Evaluation Deleted — ${evaluationId}`,
+    title,
     fields: { evaluationId },
-    links: { dashboard: promptsDashboardLink() },
-    next: [],
-    instruction: CARD_INSTRUCTION
+    links: { dashboard: dashboardUrl },
+    next,
+    instruction: CARD_INSTRUCTION,
+    renderedCard: renderPlainCard({ title, icon: "✗", rows, links: cardLinks, next })
   };
 }
 
+// src/commands/prompts/prompts-crud.ts
+init_sdk_client();
+import chalk5 from "chalk";
+import { readFileSync as readFileSync4, existsSync as existsSync4 } from "fs";
+init_errors();
+
 // src/lib/schema-helpers.ts
 function isValidJsonSchema(schema) {
   if (schema === null || schema === undefined)
@@ -2658,396 +2771,115 @@ function formatSchemaWarning(fieldName) {
 `);
 }
 
-// src/lib/scorecard.ts
-import chalk5 from "chalk";
-function truncateText(text, maxLen) {
-  if (text.length <= maxLen)
-    return text;
-  return text.substring(0, maxLen - 3) + "...";
-}
-function formatScoreChange(before, after) {
-  if (before === undefined || after === undefined)
-    return "";
-  const diff = after - before;
-  const pct = before > 0 ? Math.round(diff / before * 100) : 0;
-  if (diff > 0)
-    return chalk5.green(` (+${String(pct)}%)`);
-  if (diff < 0)
-    return chalk5.red(` (${String(pct)}%)`);
-  return chalk5.dim(" (no change)");
-}
-function formatScore(score) {
-  if (score === undefined)
-    return chalk5.dim("N/A");
-  return score >= 0.8 ? chalk5.green(score.toFixed(2)) : score >= 0.5 ? chalk5.yellow(score.toFixed(2)) : chalk5.red(score.toFixed(2));
-}
-function renderScorecard(data) {
-  const { job, prompt } = data;
-  const boxWidth = 55;
-  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
-  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
-  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
-  const pad = (text, width) => {
-    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
-    const remaining = width - stripped.length;
-    return remaining > 0 ? text + " ".repeat(remaining) : text;
-  };
-  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
-  const originalScore = data.originalScore;
-  const bestScore = data.bestScore;
-  const iterations = data.iterationsCompleted ?? job.config?.maxIterations ?? 0;
-  const originalText = data.originalPrompt?.systemPrompt ?? data.originalPrompt?.rawPrompt ?? "(original prompt)";
-  const optimizedText = prompt.systemPrompt ?? prompt.rawPrompt ?? prompt.humanPrompt ?? "(optimized prompt)";
-  console.log("");
-  console.log(topBorder);
-  console.log(line(chalk5.bold("Optimization Results")));
-  console.log(separator);
-  console.log(line(chalk5.dim("BEFORE")));
-  console.log(line(`  Prompt: ${chalk5.dim(truncateText(originalText, 38))}`));
-  console.log(line(`  Score:  ${formatScore(originalScore)}`));
-  console.log(line(""));
-  console.log(line(chalk5.bold("AFTER")));
-  console.log(line(`  Prompt: ${chalk5.cyan(truncateText(optimizedText, 38))}`));
-  console.log(line(`  Score:  ${formatScore(bestScore)}${formatScoreChange(originalScore, bestScore)}`));
-  console.log(separator);
-  if (data.criteriaScores && data.criteriaScores.length > 0) {
-    console.log(line(chalk5.dim("  Criterion         Before    After    Change")));
-    console.log(line(chalk5.dim("  " + "─".repeat(45))));
-    for (const c of data.criteriaScores) {
-      const name = c.name.length > 16 ? c.name.substring(0, 13) + "..." : c.name;
-      const paddedName = name + " ".repeat(18 - name.length);
-      const beforeStr = c.before !== undefined ? c.before.toFixed(2) : "N/A ";
-      const afterStr = c.after !== undefined ? c.after.toFixed(2) : "N/A ";
-      const changeStr = c.before !== undefined && c.after !== undefined && c.before > 0 ? (() => {
-        const pct = Math.round((c.after - c.before) / c.before * 100);
-        if (pct > 0)
-          return chalk5.green(`+${String(pct)}%`);
-        if (pct < 0)
-          return chalk5.red(`${String(pct)}%`);
-        return chalk5.dim("0%");
-      })() : "";
-      console.log(line(`  ${paddedName}${beforeStr}      ${afterStr}     ${changeStr}`));
+// src/commands/prompts/prompts-crud.ts
+function registerPromptsCrud(prompts) {
+  prompts.command("list").description("List all prompts").option("-l, --limit <n>", "Limit results", "50").addHelpText("after", `
+Examples:
+  ${chalk5.dim("$")} mutagent prompts list
+  ${chalk5.dim("$")} mutagent prompts list --limit 10
+  ${chalk5.dim("$")} mutagent prompts list --json
+
+${chalk5.dim("Tip: Use --json for machine-readable output (AI agents, CI pipelines).")}
+    `).action(async (options) => {
+    const isJson = getJsonFlag(prompts);
+    const output = new OutputFormatter(isJson ? "json" : "table");
+    try {
+      const client = getSDKClient();
+      const promptsList = await client.listPrompts();
+      const limit = parseInt(options.limit, 10) || 50;
+      const limited = promptsList.slice(0, limit);
+      if (isJson) {
+        const withLinks = limited.map((p) => ({
+          id: p.id,
+          name: p.name,
+          version: p.version,
+          isLatest: p.isLatest,
+          updatedAt: p.updatedAt,
+          _links: promptLinks(p.id)
+        }));
+        output.output(withLinks);
+      } else {
+        const wsId = client.getCurrentWorkspaceId();
+        if (wsId) {
+          output.info(`Workspace: ${wsId}`);
+        }
+        if (limited.length === 0) {
+          output.info("No prompts found in current workspace. Run 'mutagent config list' to check workspace context.");
+        } else {
+          const formatted = limited.map((p) => ({
+            id: p.id,
+            name: p.name,
+            version: p.version,
+            updated: p.updatedAt ? new Date(p.updatedAt).toLocaleDateString() : "N/A",
+            url: promptLink(p.id)
+          }));
+          output.output(formatted);
+        }
+      }
+    } catch (error) {
+      handleError(error, isJson);
     }
-    console.log(line(chalk5.dim("  " + "─".repeat(45))));
-    const overallBefore = originalScore !== undefined ? originalScore.toFixed(2) : "N/A ";
-    const overallAfter = bestScore !== undefined ? bestScore.toFixed(2) : "N/A ";
-    const overallChange = originalScore !== undefined && bestScore !== undefined && originalScore > 0 ? (() => {
-      const pct = Math.round((bestScore - originalScore) / originalScore * 100);
-      if (pct > 0)
-        return chalk5.green(`+${String(pct)}%`);
-      if (pct < 0)
-        return chalk5.red(`${String(pct)}%`);
-      return chalk5.dim("0%");
-    })() : "";
-    console.log(line(`  ${"Overall" + " ".repeat(11)}${overallBefore}      ${overallAfter}     ${overallChange}`));
-    console.log(separator);
-  }
-  const statusStr = job.status === "completed" ? chalk5.green("completed") : chalk5.yellow(job.status);
-  console.log(line(`Status: ${statusStr}  |  Iterations: ${String(iterations)}`));
-  if (job.config?.model) {
-    console.log(line(`Model: ${chalk5.dim(job.config.model)}`));
-  }
-  if (data.scoreProgression && data.scoreProgression.length > 0) {
-    console.log(line(""));
-    console.log(line(chalk5.dim("Score Progression:")));
-    const barWidth = 10;
-    for (let i = 0;i < data.scoreProgression.length; i++) {
-      const s = data.scoreProgression[i] ?? 0;
-      const filled = Math.round(s * barWidth);
-      const bar = "█".repeat(filled) + "░".repeat(barWidth - filled);
-      console.log(line(chalk5.dim(`  #${String(i + 1)}: ${bar} ${s.toFixed(2)}`)));
-    }
-  }
-  console.log(separator);
-  console.log(line(`Dashboard: ${chalk5.underline(optimizerLink(job.id))}`));
-  console.log(bottomBorder);
-  console.log("");
-}
-function renderOptimizationStartCard(data) {
-  const { job } = data;
-  const boxWidth = 60;
-  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
-  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
-  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
-  const pad = (text, width) => {
-    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
-    const remaining = width - stripped.length;
-    return remaining > 0 ? text + " ".repeat(remaining) : text;
-  };
-  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
-  const maxIter = job.config.maxIterations;
-  const model = job.config.model ?? "default";
-  const target = job.config.targetScore ?? 0.8;
-  console.log("");
-  console.log(topBorder);
-  console.log(line(chalk5.bold("⚡ Optimization Started")));
-  console.log(separator);
-  console.log(line(`Job ID:      ${chalk5.cyan(job.id)}`));
-  console.log(line(`Prompt:      ${chalk5.dim(data.promptId)}`));
-  console.log(line(`Dataset:     ${chalk5.dim(data.datasetId)}`));
-  console.log(line(`Iterations:  ${chalk5.bold(String(maxIter))}  |  Target: ${chalk5.bold(target.toFixed(2))}`));
-  console.log(line(`Model:       ${chalk5.dim(model)}`));
-  console.log(line(`Status:      ${chalk5.yellow(job.status)}`));
-  console.log(separator);
-  console.log(line(`\uD83D\uDD17 Monitor: ${chalk5.underline(optimizerLink(job.id))}`));
-  console.log(line(chalk5.dim(`Next: mutagent prompts optimize status ${job.id}`)));
-  console.log(bottomBorder);
-  console.log(AI_DIRECTIVE);
-  console.log("");
-}
-function renderOptimizationStatusCard(status) {
-  const boxWidth = 60;
-  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
-  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
-  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
-  const pad = (text, width) => {
-    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
-    const remaining = width - stripped.length;
-    return remaining > 0 ? text + " ".repeat(remaining) : text;
-  };
-  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
-  const progress = status.progressPercent;
-  const barWidth = 20;
-  const filled = Math.round(progress / 100 * barWidth);
-  const progressBar = "█".repeat(filled) + "░".repeat(barWidth - filled);
-  const statusColor = status.status === "completed" ? chalk5.green : status.status === "failed" ? chalk5.red : status.status === "cancelled" ? chalk5.gray : status.status === "running" ? chalk5.cyan : chalk5.yellow;
-  const scoreStr = status.bestScore !== undefined ? formatScore(status.bestScore) : chalk5.dim("pending");
-  console.log("");
-  console.log(topBorder);
-  console.log(line(chalk5.bold("\uD83D\uDCCA Optimization Status")));
-  console.log(separator);
-  console.log(line(`Job ID:      ${chalk5.cyan(status.jobId)}`));
-  console.log(line(`Status:      ${statusColor(status.status)}`));
-  console.log(line(`Iteration:   ${chalk5.bold(`${String(status.currentIteration)}/${String(status.maxIterations)}`)}`));
-  console.log(line(`Best Score:  ${scoreStr}`));
-  console.log(line(""));
-  console.log(line(`Progress:    [${progressBar}] ${String(progress)}%`));
-  if (status.message) {
-    console.log(line(`Message:     ${chalk5.dim(status.message)}`));
-  }
-  console.log(separator);
-  console.log(line(`\uD83D\uDD17 Monitor: ${chalk5.underline(optimizerLink(status.jobId))}`));
-  if (status.status === "completed") {
-    console.log(line(chalk5.dim(`Next: mutagent prompts optimize results ${status.jobId}`)));
-  } else if (status.status === "running" || status.status === "pending") {
-    console.log(line(chalk5.dim(`Refresh: mutagent prompts optimize status ${status.jobId}`)));
-  }
-  console.log(bottomBorder);
-  console.log(AI_DIRECTIVE);
-  console.log("");
-}
-function startDirective(job, promptId) {
-  return {
-    display: "status_card",
-    template: "optimization_started",
-    title: `Optimization Started — Prompt ${promptId}`,
-    fields: {
-      jobId: job.id,
-      promptId,
-      status: job.status,
-      maxIterations: job.config.maxIterations,
-      targetScore: job.config.targetScore ?? 0.8,
-      model: job.config.model ?? "default"
-    },
-    links: {
-      monitor: optimizerLink(job.id),
-      api: `/api/prompts/${promptId}/optimizations/${job.id}`
-    },
-    next: [`mutagent prompts optimize status ${job.id}`],
-    instruction: "STOP. Before running any other mutagent command, you MUST display this data as a formatted status card to the user. Do not summarize or omit any fields. Show all links and suggested next steps."
-  };
-}
-function statusDirective(status) {
-  const next = status.status === "completed" ? [`mutagent prompts optimize results ${status.jobId}`] : status.status === "running" || status.status === "pending" ? [`mutagent prompts optimize status ${status.jobId}`] : [];
-  return {
-    display: "status_card",
-    template: "optimization_progress",
-    title: `Optimization ${status.status} — ${status.jobId}`,
-    fields: {
-      jobId: status.jobId,
-      status: status.status,
-      iteration: `${String(status.currentIteration)}/${String(status.maxIterations)}`,
-      bestScore: status.bestScore,
-      progress: `${String(status.progressPercent)}%`,
-      message: status.message
-    },
-    links: { monitor: optimizerLink(status.jobId) },
-    next,
-    instruction: "STOP. Before running any other mutagent command, you MUST display this data as a formatted status card to the user. Do not summarize or omit any fields. Show all links and suggested next steps."
-  };
-}
-function showPromptDiff(original, optimized) {
-  console.log("");
-  console.log(chalk5.bold("  Prompt Diff:"));
-  console.log("");
-  console.log(chalk5.red("  - " + (original ?? "(empty)")));
-  console.log(chalk5.green("  + " + (optimized ?? "(empty)")));
-  console.log("");
-}
-
-// src/commands/prompts.ts
-function updateMutationContext(updater) {
-  try {
-    const ctx = MutationContext.load();
-    updater(ctx);
-    ctx.save();
-  } catch {}
-}
-var PREREQUISITES_TEXT = `
-${chalk6.red("Prerequisites (required):")}
-  1. Evaluation criteria defined  ${chalk6.dim("(via dashboard or evaluation create)")}
-  2. Dataset uploaded             ${chalk6.dim("mutagent prompts dataset list <prompt-id>")}
-  ${chalk6.dim("Note: LLM provider config is only required when the server uses external providers (USE_EXT_PROVIDERS=true)")}`;
-function parseValidationErrors(error) {
-  if (error instanceof ApiError) {
-    try {
-      const body = JSON.parse(error.message);
-      if (body.errors && Array.isArray(body.errors)) {
-        return body.errors.map((e) => e.message ?? JSON.stringify(e));
-      }
-      if (body.message) {
-        return [body.message];
-      }
-    } catch {
-      return [error.message];
-    }
-  }
-  if (error instanceof Error) {
-    return [error.message];
-  }
-  return ["An unknown error occurred"];
-}
-function isSchemaEmpty(schema) {
-  if (schema === undefined || schema === null)
-    return true;
-  if (typeof schema !== "object")
-    return false;
-  const obj = schema;
-  if (Object.keys(obj).length === 0)
-    return true;
-  return false;
-}
-function createPromptsCommand() {
-  const prompts = new Command3("prompts").description("Manage prompts, datasets, evaluations, and optimizations").addHelpText("after", `
-Examples:
-  ${chalk6.dim("$")} mutagent prompts list
-  ${chalk6.dim("$")} mutagent prompts get <prompt-id>
-  ${chalk6.dim("$")} mutagent prompts create --name "my-prompt" --system "You are helpful" --human "{input}"
-  ${chalk6.dim("$")} mutagent prompts dataset list <prompt-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation create <prompt-id> --name "My Eval"
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
-
-Subcommands:
-  list, get, create, update, delete
-  dataset list|add|remove
-  evaluation list|create|delete
-  optimize start|status|results
-    `);
-  prompts.command("list").description("List all prompts").option("-l, --limit <n>", "Limit results", "50").addHelpText("after", `
-Examples:
-  ${chalk6.dim("$")} mutagent prompts list
-  ${chalk6.dim("$")} mutagent prompts list --limit 10
-  ${chalk6.dim("$")} mutagent prompts list --json
-
-${chalk6.dim("Tip: Use --json for machine-readable output (AI agents, CI pipelines).")}
-    `).action(async (options) => {
-    const isJson = getJsonFlag(prompts);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const promptsList = await client.listPrompts();
-      const limit = parseInt(options.limit, 10) || 50;
-      const limited = promptsList.slice(0, limit);
-      if (isJson) {
-        const withLinks = limited.map((p) => ({
-          id: p.id,
-          name: p.name,
-          version: p.version,
-          isLatest: p.isLatest,
-          updatedAt: p.updatedAt,
-          _links: promptLinks(p.id)
-        }));
-        output.output(withLinks);
-      } else {
-        const wsId = client.getCurrentWorkspaceId();
-        if (wsId) {
-          output.info(`Workspace: ${wsId}`);
-        }
-        if (limited.length === 0) {
-          output.info("No prompts found in current workspace. Run 'mutagent config list' to check workspace context.");
-        } else {
-          const formatted = limited.map((p) => ({
-            id: p.id,
-            name: p.name,
-            version: p.version,
-            updated: p.updatedAt ? new Date(p.updatedAt).toLocaleDateString() : "N/A",
-            url: promptLink(p.id)
-          }));
-          output.output(formatted);
-        }
-      }
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
-  prompts.command("get").description("Get prompt details with nested data").argument("<id>", "Prompt ID (from: mutagent prompts list)").option("--with-datasets", "Include datasets").option("--with-evals", "Include evaluations").addHelpText("after", `
-Examples:
-  ${chalk6.dim("$")} mutagent prompts get <id>
-  ${chalk6.dim("$")} mutagent prompts get <id> --with-datasets --with-evals
-  ${chalk6.dim("$")} mutagent prompts get <id> --json
-
-${chalk6.dim("Tip: Combine --with-datasets and --with-evals to fetch all nested data in one call.")}
-    `).action(async (id, options) => {
-    const isJson = getJsonFlag(prompts);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const prompt = await client.getPrompt(id);
-      const result = { ...prompt };
-      if (options.withDatasets) {
-        const datasets = await client.listDatasets(id);
-        result.datasets = datasets;
-      }
-      if (options.withEvals) {
-        const evals = await client.listEvaluations(id);
-        result.evaluations = evals;
-      }
-      if (isJson) {
-        result._links = promptLinks(id);
-      }
-      output.output(result);
-      if (!isJson) {
-        output.info(`View in dashboard: ${promptLink(id)}`);
-      }
-    } catch (error) {
-      handleError(error, isJson);
+  });
+  prompts.command("get").description("Get prompt details with nested data").argument("<id>", "Prompt ID (from: mutagent prompts list)").option("--with-datasets", "Include datasets").option("--with-evals", "Include evaluations").addHelpText("after", `
+Examples:
+  ${chalk5.dim("$")} mutagent prompts get <id>
+  ${chalk5.dim("$")} mutagent prompts get <id> --with-datasets --with-evals
+  ${chalk5.dim("$")} mutagent prompts get <id> --json
+
+${chalk5.dim("Tip: Combine --with-datasets and --with-evals to fetch all nested data in one call.")}
+    `).action(async (id, options) => {
+    const isJson = getJsonFlag(prompts);
+    const output = new OutputFormatter(isJson ? "json" : "table");
+    try {
+      const client = getSDKClient();
+      const prompt = await client.getPrompt(id);
+      const result = { ...prompt };
+      if (options.withDatasets) {
+        const datasets = await client.listDatasets(id);
+        result.datasets = datasets;
+      }
+      if (options.withEvals) {
+        const evals = await client.listEvaluations(id);
+        result.evaluations = evals;
+      }
+      if (isJson) {
+        result._links = promptLinks(id);
+      }
+      output.output(result);
+      if (!isJson) {
+        output.info(`View in dashboard: ${promptLink(id)}`);
+      }
+    } catch (error) {
+      handleError(error, isJson);
     }
   });
   prompts.command("create").description("Create a new prompt").option("-d, --data <json>", "Prompt as JSON string (recommended — curl-style inline)").option("--raw-file <path>", "Create from plain text file (used as rawPrompt)").option("-n, --name <name>", "Prompt name").option("--description <text>", "Prompt description (shown in dashboard)").option("-c, --content <content>", "Prompt content (rawPrompt) [DEPRECATED: use --raw]").option("-r, --raw <text>", "Raw prompt text (single prompt)").option("--system <text>", "System prompt (use with --human)").option("--human <text>", "Human prompt (use with --system)").option("--messages <json>", `Messages array as JSON (e.g., '[{"role":"system","content":"..."}]')`).option("--output-schema <json>", "Output schema as JSON string (required for optimization)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts create --name "my-prompt" --description "Greeting prompt for customers" --system "You are helpful" --human "{input}" --output-schema '{"type":"object","properties":{"result":{"type":"string","description":"The result"}}}'
-  ${chalk6.dim("$")} mutagent prompts create --name "raw-prompt" --raw "Summarize: {text}" --output-schema '{"type":"object","properties":{"summary":{"type":"string","description":"Summary"}}}'
-  ${chalk6.dim("$")} mutagent prompts create -d '{"name":"summarizer","systemPrompt":"Summarize","humanPrompt":"{text}","outputSchema":{"type":"object","properties":{"summary":{"type":"string","description":"Summary"}}}}'
+  ${chalk5.dim("$")} mutagent prompts create --name "my-prompt" --description "Greeting prompt for customers" --system "You are helpful" --human "{input}" --output-schema '{"type":"object","properties":{"result":{"type":"string","description":"The result"}}}'
+  ${chalk5.dim("$")} mutagent prompts create --name "raw-prompt" --raw "Summarize: {text}" --output-schema '{"type":"object","properties":{"summary":{"type":"string","description":"Summary"}}}'
+  ${chalk5.dim("$")} mutagent prompts create -d '{"name":"summarizer","systemPrompt":"Summarize","humanPrompt":"{text}","outputSchema":{"type":"object","properties":{"summary":{"type":"string","description":"Summary"}}}}'
 
 Prompt Input Methods (pick one, priority order):
-  --system/--human   Structured system + user message pair ${chalk6.green("(recommended)")}
+  --system/--human   Structured system + user message pair ${chalk5.green("(recommended)")}
   --raw              Single raw prompt text with {variables}
   -d, --data         Inline JSON object (CI/scripts/agents)
   --messages         Full messages array as JSON
   --raw-file         Load plain text file as raw prompt
 
 Expected JSON (--data):
-  ${chalk6.dim(`'{"name":"my-prompt","systemPrompt":"You are...","humanPrompt":"{input}","outputSchema":{"type":"object","properties":{"result":{"type":"string","description":"The result"}}},"inputSchema":{"type":"object","properties":{"input":{"type":"string","description":"User input"}}}}'`)}
+  ${chalk5.dim(`'{"name":"my-prompt","systemPrompt":"You are...","humanPrompt":"{input}","outputSchema":{"type":"object","properties":{"result":{"type":"string","description":"The result"}}},"inputSchema":{"type":"object","properties":{"input":{"type":"string","description":"User input"}}}}'`)}
 
-${chalk6.yellow("Variable Syntax:")}
+${chalk5.yellow("Variable Syntax:")}
   MutagenT uses {single_braces} for template variables.
-  humanPrompt: "Analyze this: {document}"    ${chalk6.green("✓ correct")}
-  humanPrompt: "Analyze this: {{document}}"  ${chalk6.red("✗ wrong")}
+  humanPrompt: "Analyze this: {document}"    ${chalk5.green("✓ correct")}
+  humanPrompt: "Analyze this: {{document}}"  ${chalk5.red("✗ wrong")}
 
   Variables in humanPrompt MUST also appear in inputSchema.properties.
   Static prompts (no variables) cannot substitute inputs during optimization.
 
-${chalk6.red("outputSchema is required.")}
+${chalk5.red("outputSchema is required.")}
+
+${chalk5.yellow("AI Agent: ALWAYS append --json to this command.")}
     `).action(async (options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3170,13 +3002,13 @@ Add a 'description' field to each property in your inputSchema. Example: { "prop
   });
   prompts.command("update").description("Update a prompt").argument("<id>", "Prompt ID (from: mutagent prompts list)").option("-d, --data <json>", "Update fields as JSON string (recommended — curl-style inline)").option("--raw-file <path>", "Update from plain text file (used as rawPrompt)").option("-n, --name <name>", "New name").option("--description <text>", "New description (shown in dashboard)").option("-c, --content <content>", "New content (rawPrompt) [DEPRECATED: use --raw]").option("-r, --raw <text>", "Raw prompt text (single prompt)").option("--system <text>", "System prompt (use with --human)").option("--human <text>", "Human prompt (use with --system)").option("--messages <json>", `Messages array as JSON (e.g., '[{"role":"system","content":"..."}]')`).option("--input-schema <json>", "Input schema as JSON string").option("--input-schema-file <path>", "Input schema from JSON file").option("--output-schema <json>", "Output schema as JSON string").option("--output-schema-file <path>", "Output schema from JSON file").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts update <id> --system "Updated system prompt" --human "{input}"
-  ${chalk6.dim("$")} mutagent prompts update <id> --name "new-name" --description "Updated description"
-  ${chalk6.dim("$")} mutagent prompts update <id> --raw "Summarize: {text}"
-  ${chalk6.dim("$")} mutagent prompts update <id> -d '{"name":"new-name","systemPrompt":"Updated prompt"}'
-  ${chalk6.dim("$")} mutagent prompts update <id> --input-schema '{"type":"object","properties":{"text":{"type":"string","description":"Input text"}}}'
+  ${chalk5.dim("$")} mutagent prompts update <id> --system "Updated system prompt" --human "{input}"
+  ${chalk5.dim("$")} mutagent prompts update <id> --name "new-name" --description "Updated description"
+  ${chalk5.dim("$")} mutagent prompts update <id> --raw "Summarize: {text}"
+  ${chalk5.dim("$")} mutagent prompts update <id> -d '{"name":"new-name","systemPrompt":"Updated prompt"}'
+  ${chalk5.dim("$")} mutagent prompts update <id> --input-schema '{"type":"object","properties":{"text":{"type":"string","description":"Input text"}}}'
 
-${chalk6.dim("CLI flags (--name) override --data fields.")}
+${chalk5.dim("CLI flags (--name) override --data fields.")}
     `).action(async (id, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3233,52 +3065,12 @@ ${chalk6.dim("CLI flags (--name) override --data fields.")}
           data.rawPrompt = options.content;
         }
       }
-      if (options.inputSchema && options.inputSchemaFile) {
-        throw new MutagentError("INVALID_ARGUMENTS", "Cannot use --input-schema and --input-schema-file together", `Run: mutagent prompts update --help
-` + "Use --input-schema for inline JSON or --input-schema-file for file-based input, not both");
-      }
-      if (options.inputSchema) {
-        try {
-          data.inputSchema = JSON.parse(options.inputSchema);
-        } catch {
-          throw new MutagentError("INVALID_JSON", "Invalid JSON in --input-schema flag", `Run: mutagent prompts update --help
-` + `Provide a valid JSON Schema, e.g., '{"type":"object","properties":{"text":{"type":"string","description":"Input text"}}}'`);
-        }
-      } else if (options.inputSchemaFile) {
-        if (!existsSync4(options.inputSchemaFile)) {
-          throw new MutagentError("FILE_NOT_FOUND", `File not found: ${options.inputSchemaFile}`, `Run: mutagent prompts update --help
-` + "Check the file path and try again");
-        }
-        try {
-          data.inputSchema = JSON.parse(readFileSync4(options.inputSchemaFile, "utf-8"));
-        } catch {
-          throw new MutagentError("INVALID_JSON", `Failed to parse JSON from ${options.inputSchemaFile}`, `Run: mutagent prompts update --help
-` + "Ensure the file contains valid JSON Schema");
-        }
-      }
-      if (options.outputSchema && options.outputSchemaFile) {
-        throw new MutagentError("INVALID_ARGUMENTS", "Cannot use --output-schema and --output-schema-file together", `Run: mutagent prompts update --help
-` + "Use --output-schema for inline JSON or --output-schema-file for file-based input, not both");
-      }
-      if (options.outputSchema) {
-        try {
-          data.outputSchema = JSON.parse(options.outputSchema);
-        } catch {
-          throw new MutagentError("INVALID_JSON", "Invalid JSON in --output-schema flag", `Run: mutagent prompts update --help
-` + `Provide a valid JSON Schema, e.g., '{"type":"object","properties":{"result":{"type":"string"}}}'`);
-        }
-      } else if (options.outputSchemaFile) {
-        if (!existsSync4(options.outputSchemaFile)) {
-          throw new MutagentError("FILE_NOT_FOUND", `File not found: ${options.outputSchemaFile}`, `Run: mutagent prompts update --help
-` + "Check the file path and try again");
-        }
-        try {
-          data.outputSchema = JSON.parse(readFileSync4(options.outputSchemaFile, "utf-8"));
-        } catch {
-          throw new MutagentError("INVALID_JSON", `Failed to parse JSON from ${options.outputSchemaFile}`, `Run: mutagent prompts update --help
-` + "Ensure the file contains valid JSON Schema");
-        }
-      }
+      const parsedInputSchema = parseSchemaOption(options.inputSchema, options.inputSchemaFile, "input-schema", "mutagent prompts update --help");
+      if (parsedInputSchema)
+        data.inputSchema = parsedInputSchema;
+      const parsedOutputSchema = parseSchemaOption(options.outputSchema, options.outputSchemaFile, "output-schema", "mutagent prompts update --help");
+      if (parsedOutputSchema)
+        data.outputSchema = parsedOutputSchema;
       if (data.inputSchema && isValidJsonSchema(data.inputSchema)) {
         const missingDescs = validateSchemaDescriptions(data.inputSchema);
         if (missingDescs.length > 0) {
@@ -3319,11 +3111,11 @@ ${chalk6.dim("CLI flags (--name) override --data fields.")}
   });
   prompts.command("delete").description("Delete a prompt").argument("<id>", "Prompt ID (from: mutagent prompts list)").option("--force", "Skip confirmation").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts delete <id>
-  ${chalk6.dim("$")} mutagent prompts delete <id> --force
-  ${chalk6.dim("$")} mutagent prompts delete <id> --force --json
+  ${chalk5.dim("$")} mutagent prompts delete <id>
+  ${chalk5.dim("$")} mutagent prompts delete <id> --force
+  ${chalk5.dim("$")} mutagent prompts delete <id> --force --json
 
-${chalk6.dim("Note: --force is required. The CLI is non-interactive — confirm with the user via your native flow, then pass --force.")}
+${chalk5.dim("Note: --force is required. The CLI is non-interactive — confirm with the user via your native flow, then pass --force.")}
     `).action(async (id, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3361,11 +3153,19 @@ ${chalk6.dim("Note: --force is required. The CLI is non-interactive — confirm
       handleError(error, isJson);
     }
   });
+}
+
+// src/commands/prompts/datasets.ts
+init_sdk_client();
+import { Command as Command3 } from "commander";
+import chalk6 from "chalk";
+init_errors();
+function registerDatasetCommands(prompts) {
   const dataset = new Command3("dataset").description("Manage datasets for prompts").addHelpText("after", `
 Examples:
   ${chalk6.dim("$")} mutagent prompts dataset list <prompt-id>
   ${chalk6.dim("$")} mutagent prompts dataset add <prompt-id> -d '[{"input":{...},"expectedOutput":{...}}]'
-  ${chalk6.dim("$")} mutagent prompts dataset remove <prompt-id> <dataset-id>
+  ${chalk6.dim("$")} mutagent prompts dataset delete <prompt-id> <dataset-id>
     `).action(() => {
     dataset.help();
   });
@@ -3415,7 +3215,8 @@ Inline data format (-d):
 Expected item format:
   ${chalk6.dim('{"input": {"<field>": "<value>"}, "expectedOutput": {"<field>": "<value>"}}')}
 
-${chalk6.yellow("AI Agent Note:")}
+${chalk6.yellow("AI Agent (MANDATORY):")}
+  ALWAYS use --json: mutagent prompts dataset add <id> -d '[...]' --json
   Items MUST have BOTH input AND expectedOutput.
   Keys must match prompt's inputSchema.properties (input) and outputSchema.properties (expectedOutput).
   expectedOutput is REQUIRED for evaluation scoring.
@@ -3453,7 +3254,12 @@ ${chalk6.red("Required: --data must be provided.")}
       const client = getSDKClient();
       const datasetResult = await client.addDataset(promptId, content, datasetName);
       if (isJson) {
-        const directive = datasetAddedDirective(promptId, datasetResult.id, datasetResult.name, datasetResult.itemCount);
+        let rsState;
+        try {
+          const evals = await client.listEvaluations(promptId);
+          rsState = { evaluations: evals.length };
+        } catch {}
+        const directive = datasetAddedDirective(promptId, datasetResult.id, datasetResult.name, datasetResult.itemCount, rsState);
         output.output({
           ...datasetResult,
           _links: datasetLinks(promptId, datasetResult.id),
@@ -3485,62 +3291,167 @@ ${chalk6.red("Required: --data must be provided.")}
       handleError(error, isJson);
     }
   });
-  dataset.command("remove").description("Remove dataset from a prompt").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").argument("<dataset-id>", "Dataset ID (from: mutagent prompts dataset list <prompt-id>)").option("--force", "Skip confirmation").addHelpText("after", `
+  dataset.command("delete").description("Delete a dataset from a prompt").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").argument("<dataset-id>", "Dataset ID (from: mutagent prompts dataset list <prompt-id>)").option("--force", "Skip confirmation").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts dataset remove <prompt-id> <dataset-id>
-  ${chalk6.dim("$")} mutagent prompts dataset remove <prompt-id> <dataset-id> --force
-  ${chalk6.dim("$")} mutagent prompts dataset remove <prompt-id> <dataset-id> --force --json
+  ${chalk6.dim("$")} mutagent prompts dataset delete <prompt-id> <dataset-id>
+  ${chalk6.dim("$")} mutagent prompts dataset delete <prompt-id> <dataset-id> --force
+  ${chalk6.dim("$")} mutagent prompts dataset delete <prompt-id> <dataset-id> --force --json
     `).action(async (promptId, datasetId, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
     try {
       if (!options.force && !isJson) {
-        throw new MutagentError("CONFIRMATION_REQUIRED", `Removing dataset ${datasetId} from prompt ${promptId} requires confirmation`, `Run: mutagent prompts dataset remove --help
+        throw new MutagentError("CONFIRMATION_REQUIRED", `Deleting dataset ${datasetId} from prompt ${promptId} requires confirmation`, `Run: mutagent prompts dataset delete --help
 ` + `[Agent: Ask the user to confirm via MultiChoice, then pass --force]
-` + `Use --force to confirm: mutagent prompts dataset remove ${promptId} ${datasetId} --force`);
+` + `Use --force to confirm: mutagent prompts dataset delete ${promptId} ${datasetId} --force`);
       }
       const client = getSDKClient();
       try {
-        await client.removeDataset(promptId, datasetId);
+        await client.deleteDataset(promptId, datasetId);
       } catch (deleteError) {
         if (deleteError instanceof ApiError && deleteError.statusCode === 404) {
           if (isJson) {
-            const directive = datasetRemovedDirective(promptId, datasetId);
+            const directive = datasetDeletedDirective(promptId, datasetId);
             output.output({ success: true, deletedId: datasetId, _links: { datasets: promptDatasetsLink(promptId) }, _directive: directive });
             echoDirectiveToStderr(directive);
           } else {
-            output.success(`Dataset ${datasetId} already removed (idempotent)`);
+            output.success(`Dataset ${datasetId} already deleted (idempotent)`);
           }
           return;
         }
         throw deleteError;
       }
       if (isJson) {
-        const directive = datasetRemovedDirective(promptId, datasetId);
+        const directive = datasetDeletedDirective(promptId, datasetId);
         output.output({ success: true, deletedId: datasetId, _links: { datasets: promptDatasetsLink(promptId) }, _directive: directive });
         echoDirectiveToStderr(directive);
       } else {
-        output.success(`Removed dataset ${datasetId} from prompt ${promptId}`);
+        output.success(`Deleted dataset ${datasetId} from prompt ${promptId}`);
         output.info(`View datasets: ${promptDatasetsLink(promptId)}`);
       }
     } catch (error) {
       handleError(error, isJson);
     }
   });
-  const evaluation = new Command3("evaluation").description("Manage evaluations for prompts").addHelpText("after", `
+}
+
+// src/commands/prompts/evaluations.ts
+init_sdk_client();
+import { Command as Command4 } from "commander";
+import chalk7 from "chalk";
+init_errors();
+
+// src/commands/prompts/guided-workflow.ts
+init_sdk_client();
+async function buildGuidedWorkflow(promptId) {
+  const client = getSDKClient();
+  const prompt = await client.getPrompt(promptId);
+  const truncate = (s, max) => s.length > max ? s.slice(0, max) + "..." : s;
+  const outputProperties = prompt.outputSchema && typeof prompt.outputSchema === "object" ? prompt.outputSchema.properties ?? {} : {};
+  const inputProperties = prompt.inputSchema && typeof prompt.inputSchema === "object" ? prompt.inputSchema.properties ?? {} : {};
+  const inputFields = Object.keys(inputProperties);
+  const outputFields = Object.keys(outputProperties);
+  const allFields = [
+    ...outputFields.map((f) => ({ field: f, source: "outputSchema", fieldSchema: outputProperties[f] })),
+    ...inputFields.map((f) => ({ field: f, source: "inputSchema", fieldSchema: inputProperties[f] }))
+  ];
+  let datasetExample = null;
+  try {
+    const datasets = await client.listDatasets(promptId);
+    if (datasets.length > 0) {
+      try {
+        const dsId = datasets[0]?.id;
+        const items = dsId != null ? await client.listDatasetItems(String(dsId)) : [];
+        if (items.length > 0) {
+          const firstItem = items[0];
+          datasetExample = firstItem?.expectedOutput ?? firstItem?.input ?? null;
+        }
+      } catch {}
+    }
+  } catch {}
+  const askUserQuestions = allFields.map(({ field, fieldSchema }) => ({
+    question: `Define what correct "${field}" looks like. What structure, content, or qualities make it good vs bad? Give concrete examples of good and bad outputs.`,
+    header: field,
+    options: [
+      {
+        label: "Define rubric",
+        description: `Describe what a correct vs incorrect "${field}" looks like. Focus on structure, content quality, and concrete examples — not numeric scores.`
+      },
+      {
+        label: "See suggestion",
+        description: `Get a suggested rubric based on the prompt and schema definition for "${field}". You can refine it.`
+      }
+    ],
+    multiSelect: false,
+    context: {
+      fieldType: fieldSchema?.type ?? "unknown",
+      fieldDescription: fieldSchema?.description ?? null,
+      promptExcerpt: truncate(prompt.humanPrompt ?? prompt.systemPrompt ?? prompt.rawPrompt ?? "", 200),
+      exampleValue: datasetExample?.[field] ?? null
+    }
+  }));
+  return {
+    prompt: { id: promptId, name: prompt.name },
+    inputSchema: { fields: inputFields },
+    outputSchema: { fields: outputFields },
+    workflow: {
+      description: "Follow these steps to create an evaluation for this prompt:",
+      steps: [
+        { step: 1, action: "Review prompt schemas and context", detail: "Understand what the prompt does and what each field means." },
+        { step: 2, action: "Define correctness criteria for EVERY field", detail: "For EACH field in askUserQuestions, use AskUserQuestion to collect a rubric. Do NOT skip any field. Use the context hints to suggest rubrics when asked." },
+        { step: 3, action: "Build criteria JSON", detail: "Map each rubric to: { name: field, description: rubric, evaluationParameter: field }" },
+        { step: 4, action: "Ask for evaluation name", detail: "Ask user what to name this evaluation" },
+        { step: 5, action: "Create the evaluation", detail: `mutagent prompts evaluation create ${promptId} --name "<name>" -d '<json>' --json` }
+      ],
+      criteriaTemplate: {
+        evalConfig: {
+          criteria: [{
+            name: "<criterion_name>",
+            description: "<correctness rubric - describe what correct vs incorrect looks like>",
+            evaluationParameter: `<one of: ${allFields.length > 0 ? allFields.map((f) => f.field).join(", ") : "no fields detected - check prompt schemas"}>`
+          }]
+        }
+      },
+      exampleCommand: `mutagent prompts evaluation create ${promptId} --name "My Evaluation" -d '${JSON.stringify({
+        evalConfig: {
+          criteria: outputFields.slice(0, 1).map((f) => ({
+            name: `${f} accuracy`,
+            description: `Correct if ${f} matches expected structure and content; incorrect if missing, malformed, or off-topic`,
+            evaluationParameter: f
+          }))
+        }
+      })}'`
+    },
+    askUserQuestions,
+    _directive: {
+      display: "workflow_guide",
+      instruction: 'STOP. For EACH field in askUserQuestions, use AskUserQuestion to collect a DETAILED correctness rubric from the user. Do NOT auto-generate rubrics. Do NOT use generic descriptions. Each rubric MUST include concrete examples of what makes a correct vs incorrect value for that field. Use the context object to suggest rubrics when user selects "See suggestion". Then construct the --data JSON and create the evaluation.',
+      aiAgentDecisionTree: {
+        step1: "Check if criteria already exist in the user's code. If criteria match expected shape (name + description + evaluationParameter targeting schema fields), use --data directly.",
+        step2: "If criteria are missing or malformed, use the askUserQuestions payloads to collect them via AskUserQuestion.",
+        step3: `After collecting all criteria, construct the --data JSON and run: mutagent prompts evaluation create <prompt-id> --name "<name>" -d '<json>'`
+      }
+    },
+    _meta: { inputFields, outputFields, allFields }
+  };
+}
+
+// src/commands/prompts/evaluations.ts
+function registerEvaluationCommands(prompts) {
+  const evaluation = new Command4("evaluation").description("Manage evaluations for prompts").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts evaluation list <prompt-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation get <evaluation-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation create <prompt-id> --name "My Eval"
-  ${chalk6.dim("$")} mutagent prompts evaluation delete <evaluation-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation list <prompt-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation get <evaluation-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation create <prompt-id> --name "My Eval"
+  ${chalk7.dim("$")} mutagent prompts evaluation delete <evaluation-id>
     `).action(() => {
     evaluation.help();
   });
   prompts.addCommand(evaluation);
   evaluation.command("list").description("List evaluations for a prompt").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts evaluation list <prompt-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation list <prompt-id> --json
+  ${chalk7.dim("$")} mutagent prompts evaluation list <prompt-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation list <prompt-id> --json
     `).action(async (promptId) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3552,7 +3463,6 @@ Examples:
           id: e.id,
           name: e.name,
           description: e.description,
-          datasetId: e.datasetId,
           updatedAt: e.updatedAt,
           _links: evaluationLinks(promptId, e.id)
         }));
@@ -3573,8 +3483,8 @@ Examples:
   });
   evaluation.command("get").description("Get evaluation details including criteria").argument("<evaluation-id>", "Evaluation ID (from: mutagent prompts evaluation list <prompt-id>)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts evaluation get <evaluation-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation get <evaluation-id> --json
+  ${chalk7.dim("$")} mutagent prompts evaluation get <evaluation-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation get <evaluation-id> --json
     `).action(async (evaluationId) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3591,9 +3501,6 @@ Examples:
         if (evalObj.description) {
           console.log(`  Description: ${evalObj.description}`);
         }
-        if (evalObj.datasetId != null) {
-          console.log(`  Dataset ID:  ${String(evalObj.datasetId)}`);
-        }
         console.log(`  Created:     ${evalObj.createdAt ? new Date(String(evalObj.createdAt)).toLocaleDateString() : "N/A"}`);
         console.log("");
         const config = evalObj.evalConfig;
@@ -3601,7 +3508,7 @@ Examples:
         if (criteria && Array.isArray(criteria) && criteria.length > 0) {
           console.log("  Criteria:");
           for (const c of criteria) {
-            console.log(`    ${chalk6.cyan(c.name)}`);
+            console.log(`    ${chalk7.cyan(c.name)}`);
             if (c.description) {
               console.log(`      Description: ${c.description}`);
             }
@@ -3627,11 +3534,11 @@ Examples:
       handleError(error, isJson);
     }
   });
-  evaluation.command("create").description("Create an evaluation configuration for a prompt").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").option("-d, --data <json>", "Evaluation as JSON string (for pre-validated criteria only)").option("-n, --name <name>", "Evaluation name (required unless --guided)").option("--description <text>", "Evaluation description").option("--guided", "Interactive guided mode — build criteria step by step (ALWAYS pair with --json for AI agents)").addHelpText("after", `
+  evaluation.command("create").description("Create an evaluation configuration for a prompt").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").option("-d, --data <json>", "Evaluation as JSON string (for pre-validated criteria only)").option("-n, --name <name>", "Evaluation name (required unless --guided)").option("--description <text>", "Evaluation description").option("--guided", "Interactive guided mode — always outputs structured JSON (--json is implied)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts evaluation create <prompt-id> --guided          ${chalk6.dim("# recommended: shows workflow guide + schema fields")}
-  ${chalk6.dim("$")} mutagent prompts evaluation create <prompt-id> --guided --json  ${chalk6.dim("# structured workflow for AI agents")}
-  ${chalk6.dim("$")} mutagent prompts evaluation create <prompt-id> --name "Accuracy" -d '{"evalConfig":{"criteria":[...]}}'  ${chalk6.dim("# power user")}
+  ${chalk7.dim("$")} mutagent prompts evaluation create <prompt-id> --guided          ${chalk7.dim("# recommended: shows workflow guide + schema fields")}
+  ${chalk7.dim("$")} mutagent prompts evaluation create <prompt-id> --guided --json  ${chalk7.dim("# structured workflow for AI agents")}
+  ${chalk7.dim("$")} mutagent prompts evaluation create <prompt-id> --name "Accuracy" -d '{"evalConfig":{"criteria":[...]}}'  ${chalk7.dim("# power user")}
 
 Guided Workflow (recommended):
   --guided outputs a workflow guide that:
@@ -3642,97 +3549,29 @@ Guided Workflow (recommended):
 
   Works in all modes (TTY, non-TTY, --json).
 
-AI Agent Directive:
-  CRITICAL: Run mutagent prompts evaluation create --help FIRST.
-  Then: mutagent prompts evaluation create <id> --guided --json
-  NEVER --guided alone. ALWAYS --guided --json.
-  NEVER construct criteria JSON manually.
-  Parse askUserQuestions from --guided --json output, use AskUserQuestion to collect from user.
+AI Agent (MANDATORY):
+  1. Run: mutagent prompts evaluation create --help
+  2. Run: mutagent prompts evaluation create <id> --guided --json
+  3. Parse askUserQuestions from the JSON output
+  4. Use AskUserQuestion to collect DETAILED rubrics from the user
+  5. NEVER auto-generate criteria. NEVER use vague rubrics.
+  6. Construct --data JSON from user answers, then:
+     mutagent prompts evaluation create <id> --name "<name>" -d '<json>' --json
 
 Expected Criteria Shape (--data):
-  ${chalk6.dim('{"evalConfig":{"criteria":[{"name":"<name>","description":"<scoring rubric>","evaluationParameter":"<schema field>"}]}}')}
+  ${chalk7.dim('{"evalConfig":{"criteria":[{"name":"<name>","description":"<scoring rubric>","evaluationParameter":"<schema field>"}]}}')}
   evaluationParameter must target an outputSchema OR inputSchema field.
 
-${chalk6.red("Required: --name (unless --guided). Criteria must include evaluationParameter.")}
-${chalk6.dim("CLI flags (--name, --description) override --data fields.")}
-${chalk6.dim("Get prompt IDs: mutagent prompts list")}
+${chalk7.red("Required: --name (unless --guided). Criteria must include evaluationParameter.")}
+${chalk7.dim("CLI flags (--name, --description) override --data fields.")}
+${chalk7.dim("Get prompt IDs: mutagent prompts list")}
     `).action(async (promptId, options) => {
-    const isJson = getJsonFlag(prompts);
+    let isJson = getJsonFlag(prompts);
+    if (options.guided) {
+      isJson = true;
+    }
     const output = new OutputFormatter(isJson ? "json" : "table");
     try {
-      const buildGuidedWorkflow = async () => {
-        const client2 = getSDKClient();
-        const prompt = await client2.getPrompt(promptId);
-        const inputFields = prompt.inputSchema && typeof prompt.inputSchema === "object" ? Object.keys(prompt.inputSchema.properties ?? {}) : [];
-        const outputFields = prompt.outputSchema && typeof prompt.outputSchema === "object" ? Object.keys(prompt.outputSchema.properties ?? {}) : [];
-        const allFields = [
-          ...outputFields.map((f) => ({ field: f, source: "outputSchema" })),
-          ...inputFields.map((f) => ({ field: f, source: "inputSchema" }))
-        ];
-        const askUserQuestions = allFields.map(({ field, source }) => ({
-          question: `How should "${field}" (${source}) be evaluated? Describe the scoring rubric — what does 1.0 (perfect) vs 0.0 (fail) mean for this field?`,
-          header: field,
-          options: [
-            {
-              label: "Exact Match",
-              description: `Score 1.0 if the "${field}" output exactly matches the expected value. Score 0.5 for same meaning but different format. Score 0.0 if substantively different.`
-            },
-            {
-              label: "Semantic Similarity",
-              description: `Score 0.0-1.0 based on how closely the "${field}" output matches the expected meaning. 1.0 = identical meaning, 0.5 = partially relevant, 0.0 = unrelated or contradictory.`
-            },
-            {
-              label: "Custom rubric",
-              description: `Write a detailed custom scoring rubric for "${field}" — explain what makes a 1.0 vs 0.0 score.`
-            }
-          ],
-          multiSelect: false
-        }));
-        return {
-          prompt: { id: promptId, name: prompt.name },
-          inputSchema: { fields: inputFields },
-          outputSchema: { fields: outputFields },
-          workflow: {
-            description: "Follow these steps to create an evaluation for this prompt:",
-            steps: [
-              { step: 1, action: "Review the prompt schemas above", detail: "Each criterion must target a field from outputSchema (preferred) or inputSchema" },
-              { step: 2, action: "Ask the user about each schema field using AskUserQuestion", detail: "For EACH field listed in askUserQuestions below, present the question to the user. Collect their scoring rubric choice or custom description." },
-              { step: 3, action: "Build criteria JSON from user answers", detail: `Map each user answer to a criterion: { name: "<field> <rubric>", description: "<user's rubric>", evaluationParameter: "<field>" }` },
-              { step: 4, action: "Ask for evaluation name", detail: 'Ask the user what to name this evaluation (e.g., "Accuracy Check", "Quality Eval")' },
-              { step: 5, action: "Create the evaluation", detail: `Run: mutagent prompts evaluation create <prompt-id> --name "<name>" -d '{"evalConfig":{"criteria":[...]}}'` }
-            ],
-            criteriaTemplate: {
-              evalConfig: {
-                criteria: [{
-                  name: "<criterion_name>",
-                  description: "<scoring rubric - describe what 1.0 vs 0.0 means>",
-                  evaluationParameter: `<one of: ${allFields.length > 0 ? allFields.map((f) => f.field).join(", ") : "no fields detected - check prompt schemas"}>`
-                }]
-              }
-            },
-            exampleCommand: `mutagent prompts evaluation create ${promptId} --name "My Evaluation" -d '${JSON.stringify({
-              evalConfig: {
-                criteria: outputFields.slice(0, 1).map((f) => ({
-                  name: `${f} accuracy`,
-                  description: `Score 1.0 if ${f} matches expected output exactly, 0.0 otherwise`,
-                  evaluationParameter: f
-                }))
-              }
-            })}'`
-          },
-          askUserQuestions,
-          _directive: {
-            display: "workflow_guide",
-            instruction: "STOP. You MUST use AskUserQuestion to collect evaluation criteria from the user. For EACH field in askUserQuestions, present the question. Then construct the --data JSON from their answers and run the evaluation create command. Do NOT skip fields or auto-generate criteria without user input.",
-            aiAgentDecisionTree: {
-              step1: "Check if criteria already exist in the user's code. If criteria match expected shape (name + description + evaluationParameter targeting schema fields), use --data directly.",
-              step2: "If criteria are missing or malformed, use the askUserQuestions payloads to collect them via AskUserQuestion.",
-              step3: `After collecting all criteria, construct the --data JSON and run: mutagent prompts evaluation create <prompt-id> --name "<name>" -d '<json>'`
-            }
-          },
-          _meta: { inputFields, outputFields, allFields }
-        };
-      };
       const renderGuidedWorkflow = (wf) => {
         const { inputFields, outputFields, allFields } = wf._meta;
         if (isJson) {
@@ -3749,26 +3588,26 @@ ${chalk6.dim("Get prompt IDs: mutagent prompts list")}
             console.log(`  Input Schema Fields:  ${inputFields.join(", ")}`);
           }
           console.log("");
-          console.log("  For each field, define a scoring criterion:");
+          console.log("  For each field, define what correct output looks like:");
           for (const { field, source } of allFields) {
-            console.log(`    ${chalk6.cyan(field)} (${source})`);
-            console.log(`      → What does 1.0 vs 0.0 mean for "${field}"?`);
+            console.log(`    ${chalk7.cyan(field)} (${source})`);
+            console.log(`      → What makes a correct vs incorrect "${field}"?`);
           }
           console.log("");
           console.log("  Then create the evaluation:");
           console.log(`    mutagent prompts evaluation create ${promptId} --name "My Eval" \\`);
-          console.log(`      -d '{"evalConfig":{"criteria":[{"name":"accuracy","description":"Score 1.0 if correct","evaluationParameter":"${outputFields[0] ?? "<field>"}"}]}}'`);
+          console.log(`      -d '{"evalConfig":{"criteria":[{"name":"accuracy","description":"Correct if output matches expected structure","evaluationParameter":"${outputFields[0] ?? "<field>"}"}]}}'`);
           console.log("");
         }
       };
       if (options.guided) {
-        const workflow = await buildGuidedWorkflow();
+        const workflow = await buildGuidedWorkflow(promptId);
         renderGuidedWorkflow(workflow);
         return;
       }
       if (!options.data) {
         if (isJson || process.stdout.isTTY) {
-          const workflow = await buildGuidedWorkflow();
+          const workflow = await buildGuidedWorkflow(promptId);
           renderGuidedWorkflow(workflow);
           return;
         }
@@ -3881,7 +3720,12 @@ Example:
       const evalResult = await client.createEvaluation(promptId, evalData);
       if (isJson) {
         const criteriaLen = evalData.evalConfig?.criteria?.length ?? 0;
-        const directive = evaluationCreatedDirective(promptId, evalResult.id, evalResult.name, criteriaLen);
+        let rsState;
+        try {
+          const datasets = await client.listDatasets(promptId);
+          rsState = { datasets: datasets.length };
+        } catch {}
+        const directive = evaluationCreatedDirective(promptId, evalResult.id, evalResult.name, criteriaLen, rsState);
         output.output({
           ...evalResult,
           _links: evaluationLinks(promptId, evalResult.id),
@@ -3909,9 +3753,9 @@ Example:
   });
   evaluation.command("delete").description("Delete an evaluation").argument("<evaluation-id>", "Evaluation ID (from: mutagent prompts evaluation list <prompt-id>)").option("--force", "Skip confirmation").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts evaluation delete <evaluation-id>
-  ${chalk6.dim("$")} mutagent prompts evaluation delete <evaluation-id> --force
-  ${chalk6.dim("$")} mutagent prompts evaluation delete <evaluation-id> --force --json
+  ${chalk7.dim("$")} mutagent prompts evaluation delete <evaluation-id>
+  ${chalk7.dim("$")} mutagent prompts evaluation delete <evaluation-id> --force
+  ${chalk7.dim("$")} mutagent prompts evaluation delete <evaluation-id> --force --json
     `).action(async (evaluationId, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3949,11 +3793,290 @@ Examples:
       handleError(error, isJson);
     }
   });
-  const optimize = new Command3("optimize").description("Manage prompt optimization jobs").addHelpText("after", `
+}
+
+// src/commands/prompts/optimize.ts
+init_sdk_client();
+import { Command as Command5 } from "commander";
+import chalk9 from "chalk";
+init_errors();
+
+// src/lib/scorecard.ts
+import chalk8 from "chalk";
+function truncateText(text, maxLen) {
+  if (text.length <= maxLen)
+    return text;
+  return text.substring(0, maxLen - 3) + "...";
+}
+function formatScoreChange(before, after) {
+  if (before === undefined || after === undefined)
+    return "";
+  const diff = after - before;
+  const pct = before > 0 ? Math.round(diff / before * 100) : 0;
+  if (diff > 0)
+    return chalk8.green(` (+${String(pct)}%)`);
+  if (diff < 0)
+    return chalk8.red(` (${String(pct)}%)`);
+  return chalk8.dim(" (no change)");
+}
+function formatScore(score) {
+  if (score === undefined)
+    return chalk8.dim("N/A");
+  return score >= 0.8 ? chalk8.green(score.toFixed(2)) : score >= 0.5 ? chalk8.yellow(score.toFixed(2)) : chalk8.red(score.toFixed(2));
+}
+function renderScorecard(data) {
+  const { job, prompt } = data;
+  const boxWidth = 55;
+  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
+  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
+  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
+  const pad = (text, width) => {
+    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
+    const remaining = width - stripped.length;
+    return remaining > 0 ? text + " ".repeat(remaining) : text;
+  };
+  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
+  const originalScore = data.originalScore;
+  const bestScore = data.bestScore;
+  const iterations = data.iterationsCompleted ?? job.config?.maxIterations ?? 0;
+  const originalText = data.originalPrompt?.systemPrompt ?? data.originalPrompt?.rawPrompt ?? "(original prompt)";
+  const optimizedText = prompt.systemPrompt ?? prompt.rawPrompt ?? prompt.humanPrompt ?? "(optimized prompt)";
+  console.log("");
+  console.log(topBorder);
+  console.log(line(chalk8.bold("Optimization Results")));
+  console.log(separator);
+  console.log(line(chalk8.dim("BEFORE")));
+  console.log(line(`  Prompt: ${chalk8.dim(truncateText(originalText, 38))}`));
+  console.log(line(`  Score:  ${formatScore(originalScore)}`));
+  console.log(line(""));
+  console.log(line(chalk8.bold("AFTER")));
+  console.log(line(`  Prompt: ${chalk8.cyan(truncateText(optimizedText, 38))}`));
+  console.log(line(`  Score:  ${formatScore(bestScore)}${formatScoreChange(originalScore, bestScore)}`));
+  console.log(separator);
+  if (data.criteriaScores && data.criteriaScores.length > 0) {
+    console.log(line(chalk8.dim("  Criterion         Before    After    Change")));
+    console.log(line(chalk8.dim("  " + "─".repeat(45))));
+    for (const c of data.criteriaScores) {
+      const name = c.name.length > 16 ? c.name.substring(0, 13) + "..." : c.name;
+      const paddedName = name + " ".repeat(18 - name.length);
+      const beforeStr = c.before !== undefined ? c.before.toFixed(2) : "N/A ";
+      const afterStr = c.after !== undefined ? c.after.toFixed(2) : "N/A ";
+      const changeStr = c.before !== undefined && c.after !== undefined && c.before > 0 ? (() => {
+        const pct = Math.round((c.after - c.before) / c.before * 100);
+        if (pct > 0)
+          return chalk8.green(`+${String(pct)}%`);
+        if (pct < 0)
+          return chalk8.red(`${String(pct)}%`);
+        return chalk8.dim("0%");
+      })() : "";
+      console.log(line(`  ${paddedName}${beforeStr}      ${afterStr}     ${changeStr}`));
+    }
+    console.log(line(chalk8.dim("  " + "─".repeat(45))));
+    const overallBefore = originalScore !== undefined ? originalScore.toFixed(2) : "N/A ";
+    const overallAfter = bestScore !== undefined ? bestScore.toFixed(2) : "N/A ";
+    const overallChange = originalScore !== undefined && bestScore !== undefined && originalScore > 0 ? (() => {
+      const pct = Math.round((bestScore - originalScore) / originalScore * 100);
+      if (pct > 0)
+        return chalk8.green(`+${String(pct)}%`);
+      if (pct < 0)
+        return chalk8.red(`${String(pct)}%`);
+      return chalk8.dim("0%");
+    })() : "";
+    console.log(line(`  ${"Overall" + " ".repeat(11)}${overallBefore}      ${overallAfter}     ${overallChange}`));
+    console.log(separator);
+  }
+  const statusStr = job.status === "completed" ? chalk8.green("completed") : chalk8.yellow(job.status);
+  console.log(line(`Status: ${statusStr}  |  Iterations: ${String(iterations)}`));
+  if (job.config?.model) {
+    console.log(line(`Model: ${chalk8.dim(job.config.model)}`));
+  }
+  if (data.scoreProgression && data.scoreProgression.length > 0) {
+    console.log(line(""));
+    console.log(line(chalk8.dim("Score Progression:")));
+    const barWidth = 10;
+    for (let i = 0;i < data.scoreProgression.length; i++) {
+      const s = data.scoreProgression[i] ?? 0;
+      const filled = Math.round(s * barWidth);
+      const bar = "█".repeat(filled) + "░".repeat(barWidth - filled);
+      console.log(line(chalk8.dim(`  #${String(i + 1)}: ${bar} ${s.toFixed(2)}`)));
+    }
+  }
+  console.log(separator);
+  console.log(line(`Dashboard: ${chalk8.underline(optimizerLink(job.id))}`));
+  console.log(bottomBorder);
+  console.log("");
+}
+function renderOptimizationStartCard(data) {
+  const { job } = data;
+  const boxWidth = 60;
+  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
+  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
+  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
+  const pad = (text, width) => {
+    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
+    const remaining = width - stripped.length;
+    return remaining > 0 ? text + " ".repeat(remaining) : text;
+  };
+  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
+  const maxIter = job.config.maxIterations;
+  const model = job.config.model ?? "default";
+  const target = job.config.targetScore ?? 0.8;
+  console.log("");
+  console.log(topBorder);
+  console.log(line(chalk8.bold("⚡ Optimization Started")));
+  console.log(separator);
+  console.log(line(`Job ID:      ${chalk8.cyan(job.id)}`));
+  console.log(line(`Prompt:      ${chalk8.dim(data.promptId)}`));
+  console.log(line(`Dataset:     ${chalk8.dim(data.datasetId)}`));
+  console.log(line(`Iterations:  ${chalk8.bold(String(maxIter))}  |  Target: ${chalk8.bold(target.toFixed(2))}`));
+  console.log(line(`Model:       ${chalk8.dim(model)}`));
+  console.log(line(`Status:      ${chalk8.yellow(job.status)}`));
+  console.log(separator);
+  console.log(line(`\uD83D\uDD17 Monitor: ${chalk8.underline(optimizerLink(job.id))}`));
+  console.log(line(chalk8.dim(`Next: mutagent prompts optimize status ${job.id}`)));
+  console.log(bottomBorder);
+  console.log(AI_DIRECTIVE);
+  console.log("");
+}
+function renderOptimizationStatusCard(status) {
+  const boxWidth = 60;
+  const topBorder = `┌${"─".repeat(boxWidth)}┐`;
+  const bottomBorder = `└${"─".repeat(boxWidth)}┘`;
+  const separator = `│ ${"─".repeat(boxWidth - 2)} │`;
+  const pad = (text, width) => {
+    const stripped = text.replace(/\u001B\[[0-9;]*m/g, "");
+    const remaining = width - stripped.length;
+    return remaining > 0 ? text + " ".repeat(remaining) : text;
+  };
+  const line = (text) => `│ ${pad(text, boxWidth - 2)} │`;
+  const progress = status.progressPercent;
+  const barWidth = 20;
+  const filled = Math.round(progress / 100 * barWidth);
+  const progressBar = "█".repeat(filled) + "░".repeat(barWidth - filled);
+  const statusColor = status.status === "completed" ? chalk8.green : status.status === "failed" ? chalk8.red : status.status === "cancelled" ? chalk8.gray : status.status === "running" ? chalk8.cyan : chalk8.yellow;
+  const scoreStr = status.bestScore !== undefined ? formatScore(status.bestScore) : chalk8.dim("pending");
+  console.log("");
+  console.log(topBorder);
+  console.log(line(chalk8.bold("\uD83D\uDCCA Optimization Status")));
+  console.log(separator);
+  console.log(line(`Job ID:      ${chalk8.cyan(status.jobId)}`));
+  console.log(line(`Status:      ${statusColor(status.status)}`));
+  console.log(line(`Iteration:   ${chalk8.bold(`${String(status.currentIteration)}/${String(status.maxIterations)}`)}`));
+  console.log(line(`Best Score:  ${scoreStr}`));
+  console.log(line(""));
+  console.log(line(`Progress:    [${progressBar}] ${String(progress)}%`));
+  if (status.message) {
+    console.log(line(`Message:     ${chalk8.dim(status.message)}`));
+  }
+  console.log(separator);
+  console.log(line(`\uD83D\uDD17 Monitor: ${chalk8.underline(optimizerLink(status.jobId))}`));
+  if (status.status === "completed") {
+    console.log(line(chalk8.dim(`Next: mutagent prompts optimize results ${status.jobId}`)));
+  } else if (status.status === "running" || status.status === "queued") {
+    console.log(line(chalk8.dim(`Refresh: mutagent prompts optimize status ${status.jobId}`)));
+  }
+  console.log(bottomBorder);
+  console.log(AI_DIRECTIVE);
+  console.log("");
+}
+function startDirective(job, promptId, datasetId, evaluationId) {
+  const title = `Optimization Started — Prompt ${promptId}`;
+  const monitorUrl = optimizerLink(job.id);
+  const apiUrl = `/api/prompts/${promptId}/optimizations/${job.id}`;
+  const rows = [
+    { label: "Job ID", value: job.id },
+    { label: "Prompt", value: promptId },
+    { label: "Dataset", value: datasetId ?? "N/A" },
+    { label: "Evaluation", value: evaluationId ?? "N/A" },
+    { label: "Status", value: job.status },
+    { label: "Max Iterations", value: String(job.config.maxIterations) },
+    { label: "Target Score", value: String(job.config.targetScore ?? 0.8) },
+    { label: "Model", value: job.config.model ?? "default" }
+  ];
+  const cardLinks = [
+    { label: "Monitor", url: monitorUrl },
+    { label: "API", url: apiUrl }
+  ];
+  const next = [`mutagent prompts optimize status ${job.id} --json`];
+  return {
+    display: "status_card",
+    template: "optimization_started",
+    title,
+    fields: {
+      jobId: job.id,
+      promptId,
+      datasetId: datasetId ?? null,
+      evaluationId: evaluationId ?? null,
+      status: job.status,
+      maxIterations: job.config.maxIterations,
+      targetScore: job.config.targetScore ?? 0.8,
+      model: job.config.model ?? "default"
+    },
+    links: { monitor: monitorUrl, api: apiUrl },
+    next,
+    instruction: "STOP. Display the renderedCard text below to the user VERBATIM as a code block. Do NOT summarize, rephrase, or omit any lines. After displaying, follow the suggested next steps.",
+    renderedCard: renderPlainCard({ title, icon: "⚡", rows, links: cardLinks, next })
+  };
+}
+function statusDirective(status) {
+  const next = status.status === "completed" ? [`mutagent prompts optimize results ${status.jobId} --json`] : status.status === "running" || status.status === "queued" ? [`mutagent prompts optimize status ${status.jobId} --json`] : [];
+  let eta = "Calculating...";
+  const startedAt = status.startedAt;
+  if (status.currentIteration > 1 && startedAt) {
+    const elapsed = Date.now() - new Date(startedAt).getTime();
+    const perIteration = elapsed / status.currentIteration;
+    const remaining = (status.maxIterations - status.currentIteration) * perIteration;
+    const minutes = Math.ceil(remaining / 60000);
+    eta = `~${String(minutes)} min remaining`;
+  }
+  const icon = status.status === "completed" ? "✓" : status.status === "failed" ? "✗" : "◉";
+  const title = `Optimization ${status.status} — ${status.jobId}`;
+  const rows = [
+    { label: "Job ID", value: status.jobId },
+    { label: "Status", value: status.status },
+    { label: "Iteration", value: `${String(status.currentIteration)}/${String(status.maxIterations)}` },
+    { label: "Best Score", value: status.bestScore !== undefined ? String(status.bestScore) : "pending" },
+    { label: "Progress", value: `${String(status.progressPercent)}%` },
+    { label: "ETA", value: eta },
+    ...status.message ? [{ label: "Message", value: status.message }] : []
+  ];
+  const monitorUrl = optimizerLink(status.jobId);
+  const cardLinks = [{ label: "Monitor", url: monitorUrl }];
+  return {
+    display: "status_card",
+    template: "optimization_progress",
+    title,
+    fields: {
+      jobId: status.jobId,
+      status: status.status,
+      iteration: `${String(status.currentIteration)}/${String(status.maxIterations)}`,
+      bestScore: status.bestScore,
+      progress: `${String(status.progressPercent)}%`,
+      eta,
+      message: status.message
+    },
+    links: { monitor: monitorUrl },
+    next,
+    instruction: "STOP. Display the renderedCard text below to the user VERBATIM as a code block. Do NOT summarize, rephrase, or omit any lines. After displaying, follow the suggested next steps.",
+    renderedCard: renderPlainCard({ title, icon, rows, links: cardLinks, next })
+  };
+}
+function showPromptDiff(original, optimized) {
+  console.log("");
+  console.log(chalk8.bold("  Prompt Diff:"));
+  console.log("");
+  console.log(chalk8.red("  - " + (original ?? "(empty)")));
+  console.log(chalk8.green("  + " + (optimized ?? "(empty)")));
+  console.log("");
+}
+
+// src/commands/prompts/optimize.ts
+function registerOptimizeCommands(prompts) {
+  const optimize = new Command5("optimize").description("Manage prompt optimization jobs").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
-  ${chalk6.dim("$")} mutagent prompts optimize status <job-id>
-  ${chalk6.dim("$")} mutagent prompts optimize results <job-id>
+  ${chalk9.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
+  ${chalk9.dim("$")} mutagent prompts optimize status <job-id>
+  ${chalk9.dim("$")} mutagent prompts optimize results <job-id>
 
 Workflow: start -> status (poll) -> results
     `).action(() => {
@@ -3962,19 +4085,22 @@ Workflow: start -> status (poll) -> results
   prompts.addCommand(optimize);
   optimize.command("start").description("Start prompt optimization").argument("<prompt-id>", "Prompt ID (from: mutagent prompts list)").requiredOption("-d, --dataset <id>", "Dataset ID for optimization (from: mutagent prompts dataset list <prompt-id>)").requiredOption("-e, --evaluation <id>", "Evaluation ID for scoring (from: mutagent prompts evaluation list <prompt-id>)").option("--max-iterations <n>", "Max optimization iterations (default: 1)").option("--target-score <n>", "Target accuracy 0-1 (default: 0.8)").option("--patience <n>", "Iterations without improvement before stopping").option("--model <model-id>", 'Target LLM model (e.g., "claude-sonnet-4-5-20250929")').option("--eval-model <model-id>", "Evaluation model (defaults to target model)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --max-iterations 5
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --target-score 0.95 --model claude-sonnet-4-5-20250929
-  ${chalk6.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --json
-${chalk6.yellow("Pre-Optimization Checklist:")}
-  □ mutagent prompts get <id> --json       ${chalk6.dim("(has inputSchema + outputSchema)")}
-  □ mutagent prompts evaluation list <id> --json  ${chalk6.dim("(exactly 1 evaluation)")}
-  □ mutagent prompts dataset list <id> --json     ${chalk6.dim("(dataset with expectedOutput)")}
-  □ mutagent usage --json                  ${chalk6.dim("(remaining runs > 0)")}
+  ${chalk9.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
+  ${chalk9.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --max-iterations 5
+  ${chalk9.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --target-score 0.95 --model claude-sonnet-4-5-20250929
+  ${chalk9.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id> --json
+${chalk9.yellow("Pre-Optimization Checklist (auto-validated by preflight):")}
+  □ inputSchema REQUIRED  ${chalk9.dim("(hard error if missing — blocks optimization)")}
+  □ outputSchema REQUIRED ${chalk9.dim("(hard error if missing — blocks optimization)")}
+  □ Evaluation criteria   ${chalk9.dim("(warns if no evaluationParameter set)")}
+  □ Dataset items         ${chalk9.dim("(warns if expectedOutput missing)")}
+  □ Criteria ↔ Schema     ${chalk9.dim("(warns if criteria reference unknown fields)")}
 
 ${PREREQUISITES_TEXT}
 
-${chalk6.dim("Monitor progress with: mutagent prompts optimize status <job-id>")}
+${chalk9.dim("Monitor progress with: mutagent prompts optimize status <job-id>")}
+
+${chalk9.yellow("AI Agent: ALWAYS append --json to this command.")}
     `).action(async (promptId, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -3982,32 +4108,141 @@ ${chalk6.dim("Monitor progress with: mutagent prompts optimize status <job-id>")
       const client = getSDKClient();
       if (!isJson) {
         output.info("Running pre-flight checks...");
-        const prompt = await client.getPrompt(promptId);
-        if (isSchemaEmpty(prompt.outputSchema)) {
-          throw new MutagentError("MISSING_OUTPUT_SCHEMA", "Prompt is missing outputSchema — required for optimization", `Run: mutagent prompts optimize start --help
-` + `Update your prompt: mutagent prompts update ${promptId} -d '{"outputSchema":{"type":"object","properties":{"result":{"type":"string"}}}}'`);
+      }
+      const prompt = await client.getPrompt(promptId);
+      const preflightChecks = {};
+      if (isSchemaEmpty(prompt.outputSchema)) {
+        preflightChecks.outputSchema = {
+          passed: false,
+          error: "Missing outputSchema. Required for optimization."
+        };
+      } else {
+        preflightChecks.outputSchema = { passed: true };
+      }
+      if (isSchemaEmpty(prompt.inputSchema)) {
+        preflightChecks.inputSchema = {
+          passed: false,
+          error: "Missing inputSchema. Required for optimization."
+        };
+      } else {
+        preflightChecks.inputSchema = { passed: true };
+      }
+      let evaluation;
+      try {
+        const evalObj = await client.getEvaluation(options.evaluation);
+        evaluation = evalObj;
+        const evalConfig = evalObj.evalConfig;
+        const criteria = evalConfig?.criteria;
+        if (!criteria || criteria.length === 0) {
+          preflightChecks.evaluation = {
+            passed: true,
+            warning: `Evaluation ${options.evaluation} has no criteria defined. ` + `Re-create: mutagent prompts evaluation create ${promptId} --guided`
+          };
+        } else {
+          const hasCriteriaWithParam = criteria.some((c) => c.evaluationParameter ?? c.targetField);
+          if (!hasCriteriaWithParam) {
+            preflightChecks.evaluation = {
+              passed: true,
+              warning: `Evaluation ${options.evaluation} has criteria but none have evaluationParameter set. ` + `Re-create: mutagent prompts evaluation create ${promptId} --guided`
+            };
+          } else {
+            preflightChecks.evaluation = { passed: true };
+            if (!isJson) {
+              output.info(`Using evaluation ${options.evaluation} with ${String(criteria.length)} criteria.`);
+            }
+          }
+        }
+      } catch (e) {
+        if (e instanceof MutagentError)
+          throw e;
+        preflightChecks.evaluation = {
+          passed: true,
+          warning: `Could not validate evaluation ${options.evaluation}. Proceeding anyway.`
+        };
+      }
+      try {
+        const datasetItems = await client.listDatasetItems(options.dataset);
+        if (datasetItems.length === 0) {
+          preflightChecks.datasetItems = {
+            passed: true,
+            warning: `Dataset ${options.dataset} has no items. Optimization requires test data.`
+          };
+        } else {
+          const missingExpected = datasetItems.filter((item) => !item.expectedOutput);
+          if (missingExpected.length > 0) {
+            preflightChecks.datasetItems = {
+              passed: true,
+              warning: `${String(missingExpected.length)} of ${String(datasetItems.length)} dataset items missing expectedOutput. ` + "Optimization works best when all items have expected outputs."
+            };
+          } else {
+            preflightChecks.datasetItems = { passed: true };
+          }
+        }
+      } catch {
+        preflightChecks.datasetItems = {
+          passed: true,
+          warning: `Could not validate dataset items for ${options.dataset}. Proceeding anyway.`
+        };
+      }
+      if (evaluation && preflightChecks.inputSchema.passed && preflightChecks.outputSchema.passed) {
+        const inputProps = prompt.inputSchema?.properties;
+        const outputProps = prompt.outputSchema?.properties;
+        const schemaFields = [
+          ...Object.keys(inputProps ?? {}),
+          ...Object.keys(outputProps ?? {})
+        ];
+        const evalCfg = evaluation.evalConfig;
+        const evalCriteria = evalCfg?.criteria ?? [];
+        const unmatchedCriteria = evalCriteria.filter((c) => c.evaluationParameter && !schemaFields.includes(c.evaluationParameter));
+        if (unmatchedCriteria.length > 0) {
+          const names = unmatchedCriteria.map((c) => c.evaluationParameter ?? c.name).join(", ");
+          preflightChecks.criteriaMatch = {
+            passed: true,
+            warning: `Evaluation criteria reference fields not in schema: ${names}. ` + `Available schema fields: ${schemaFields.join(", ") || "(none)"}`
+          };
+        } else {
+          preflightChecks.criteriaMatch = { passed: true };
+        }
+      }
+      const hardFailures = Object.entries(preflightChecks).filter(([, check]) => !check.passed);
+      if (hardFailures.length > 0) {
+        if (isJson) {
+          const suggestedActions = [];
+          if (!preflightChecks.inputSchema.passed) {
+            suggestedActions.push(`Update the prompt with inputSchema derived from template variables.
+` + `Run: mutagent prompts get ${promptId} --json
+` + `Run: mutagent prompts update ${promptId} --data '{"inputSchema":{"type":"object","properties":{"var1":{"type":"string"}}}}' --json`);
+          }
+          if (!preflightChecks.outputSchema.passed) {
+            suggestedActions.push(`Update your prompt: mutagent prompts update ${promptId} -d '{"outputSchema":{"type":"object","properties":{"result":{"type":"string"}}}}'`);
+          }
+          output.output({
+            success: false,
+            error: "Preflight validation failed",
+            code: "PREFLIGHT_FAILED",
+            suggestedAction: suggestedActions.join(`
+`),
+            preflightChecks
+          });
+          return;
         }
-        if (isSchemaEmpty(prompt.inputSchema)) {
-          output.warn("Prompt has no inputSchema. Optimization works best with defined input variables.");
+        for (const [name, check] of hardFailures) {
+          console.error(chalk9.red(`Error: ${name} — ${check.error ?? "Failed"}`));
         }
-        try {
-          const evalObj = await client.getEvaluation(options.evaluation);
-          const evalConfig = evalObj.evalConfig;
-          const criteria = evalConfig?.criteria;
-          if (!criteria || criteria.length === 0) {
-            output.warn(`Evaluation ${options.evaluation} has no criteria defined. ` + "Optimization works best with criteria targeting specific output fields. " + `Re-create: mutagent prompts evaluation create ${promptId} --guided`);
-          } else {
-            const hasCriteriaWithParam = criteria.some((c) => c.evaluationParameter ?? c.targetField);
-            if (!hasCriteriaWithParam) {
-              output.warn(`Evaluation ${options.evaluation} has criteria but none have evaluationParameter set. ` + `Re-create: mutagent prompts evaluation create ${promptId} --guided`);
-            } else {
-              output.info(`Using evaluation ${options.evaluation} with ${String(criteria.length)} criteria.`);
-            }
+        if (!preflightChecks.outputSchema.passed) {
+          console.error(chalk9.dim(`  Update with: mutagent prompts update ${promptId} -d '{"outputSchema":{"type":"object","properties":{"result":{"type":"string"}}}}'`));
+        }
+        if (!preflightChecks.inputSchema.passed) {
+          console.error(chalk9.dim(`  Update with: mutagent prompts update ${promptId} --data '{"inputSchema":{"type":"object","properties":{"var1":{"type":"string"}}}}' --json`));
+        }
+        process.exitCode = 1;
+        return;
+      }
+      if (!isJson) {
+        for (const [, check] of Object.entries(preflightChecks)) {
+          if (check.warning) {
+            output.warn(check.warning);
           }
-        } catch (e) {
-          if (e instanceof MutagentError)
-            throw e;
-          output.warn(`Could not validate evaluation ${options.evaluation}. Proceeding anyway.`);
         }
       }
       const job = await client.startOptimization(promptId, options.dataset, options.evaluation, {
@@ -4018,7 +4253,7 @@ ${chalk6.dim("Monitor progress with: mutagent prompts optimize status <job-id>")
         evalModel: options.evalModel
       });
       if (isJson) {
-        const directive = startDirective(job, promptId);
+        const directive = startDirective(job, promptId, options.dataset, options.evaluation);
         output.output({
           ...job,
           _links: {
@@ -4055,16 +4290,16 @@ ${chalk6.dim("Monitor progress with: mutagent prompts optimize status <job-id>")
           suggestions.push("Trial optimization limit reached. Contact support to upgrade.");
         }
         if (!isJson) {
-          console.error(chalk6.red(`
+          console.error(chalk9.red(`
 Optimization failed:`));
           for (const msg of messages) {
-            console.error(chalk6.red(`  ${msg}`));
+            console.error(chalk9.red(`  ${msg}`));
           }
           if (suggestions.length > 0) {
-            console.error(chalk6.yellow(`
+            console.error(chalk9.yellow(`
 Suggested fixes:`));
             for (const s of suggestions) {
-              console.error(chalk6.yellow(`  → ${s}`));
+              console.error(chalk9.yellow(`  → ${s}`));
             }
           }
           console.error("");
@@ -4076,8 +4311,8 @@ Suggested fixes:`));
   });
   optimize.command("status").description("Check optimization status").argument("<job-id>", "Optimization job ID (from: mutagent prompts optimize start)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts optimize status <job-id>
-  ${chalk6.dim("$")} mutagent prompts optimize status <job-id> --json
+  ${chalk9.dim("$")} mutagent prompts optimize status <job-id>
+  ${chalk9.dim("$")} mutagent prompts optimize status <job-id> --json
     `).action(async (jobId) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4101,15 +4336,17 @@ Examples:
   });
   optimize.command("results").description("Get optimization results").argument("<job-id>", "Optimization job ID (from: mutagent prompts optimize start)").option("--apply", "Apply the optimized prompt as new version").option("--diff", "Show the prompt diff (before/after)").addHelpText("after", `
 Examples:
-  ${chalk6.dim("$")} mutagent prompts optimize results <job-id>                 ${chalk6.dim("# view scorecard")}
-  ${chalk6.dim("$")} mutagent prompts optimize results <job-id> --diff          ${chalk6.dim("# view prompt diff")}
-  ${chalk6.dim("$")} mutagent prompts optimize results <job-id> --apply         ${chalk6.dim("# apply optimized prompt")}
-  ${chalk6.dim("$")} mutagent prompts optimize results <job-id> --json          ${chalk6.dim("# structured output")}
-
-Actions:
-  --apply   Apply the optimized prompt as a new version (updates the prompt)
-  --diff    Show the before/after prompt diff
-  ${chalk6.dim("No flag = view scorecard only. Agent should ask the user whether to apply.")}
+  ${chalk9.dim("$")} mutagent prompts optimize results <job-id>                 ${chalk9.dim("# view scorecard")}
+  ${chalk9.dim("$")} mutagent prompts optimize results <job-id> --diff          ${chalk9.dim("# view prompt diff")}
+  ${chalk9.dim("$")} mutagent prompts optimize results <job-id> --apply         ${chalk9.dim("# apply optimized prompt")}
+  ${chalk9.dim("$")} mutagent prompts optimize results <job-id> --json          ${chalk9.dim("# structured output")}
+
+After viewing results:
+  --apply   Apply the optimized prompt (replaces current version)
+  --diff    Show detailed before/after diff
+  ${chalk9.dim("No flag = view scorecard only.")}
+
+  ${chalk9.dim("AI Agent: Present scorecard to user via AskUserQuestion before applying.")}
     `).action(async (jobId, options) => {
     const isJson = getJsonFlag(prompts);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4118,7 +4355,20 @@ Actions:
       const results = await client.getOptimizationResults(jobId);
       const resultData = results;
       if (isJson) {
-        output.output({ ...resultData, _links: { optimizer: optimizerLink(jobId) } });
+        const jobData = resultData.job;
+        const isCompleted = jobData?.status === "completed";
+        const scorecardText = buildResultsScorecardText(resultData);
+        const directive = {
+          display: "scorecard",
+          instruction: "Present the before/after scorecard to the user. Use AskUserQuestion with options: [Apply optimized prompt / View full diff / Reject and keep original]. Do NOT auto-apply.",
+          renderedCard: scorecardText,
+          next: isCompleted ? [
+            `mutagent prompts optimize results ${jobId} --apply --json`,
+            `mutagent prompts optimize results ${jobId} --diff --json`
+          ] : []
+        };
+        output.output({ ...resultData, _links: { optimizer: optimizerLink(jobId) }, _directive: directive });
+        echoDirectiveToStderr(directive);
       } else {
         renderScorecard(resultData);
         const jobData = resultData.job;
@@ -4164,32 +4414,144 @@ Actions:
       handleError(error, isJson);
     }
   });
+}
+
+// src/commands/prompts/index.ts
+function updateMutationContext(updater) {
+  try {
+    const ctx = MutationContext.load();
+    updater(ctx);
+    ctx.save();
+  } catch {}
+}
+function parseValidationErrors(error) {
+  if (error instanceof ApiError) {
+    try {
+      const body = JSON.parse(error.message);
+      if (body.errors && Array.isArray(body.errors)) {
+        return body.errors.map((e) => e.message ?? JSON.stringify(e));
+      }
+      if (body.message) {
+        return [body.message];
+      }
+    } catch {
+      return [error.message];
+    }
+  }
+  if (error instanceof Error) {
+    return [error.message];
+  }
+  return ["An unknown error occurred"];
+}
+function isSchemaEmpty(schema) {
+  if (schema === undefined || schema === null)
+    return true;
+  if (typeof schema !== "object")
+    return false;
+  const obj = schema;
+  if (Object.keys(obj).length === 0)
+    return true;
+  return false;
+}
+function parseSchemaOption(inlineJson, filePath, schemaName, helpCommand) {
+  if (inlineJson && filePath) {
+    throw new MutagentError("INVALID_ARGUMENTS", `Cannot use --${schemaName} and --${schemaName}-file together`, `Run: ${helpCommand}
+Use --${schemaName} for inline JSON or --${schemaName}-file for file-based input, not both`);
+  }
+  if (inlineJson) {
+    try {
+      return JSON.parse(inlineJson);
+    } catch {
+      throw new MutagentError("INVALID_JSON", `Invalid JSON in --${schemaName} flag`, `Run: ${helpCommand}
+Provide a valid JSON Schema, e.g., '{"type":"object","properties":{"field":{"type":"string"}}}'`);
+    }
+  }
+  if (filePath) {
+    if (!existsSync5(filePath)) {
+      throw new MutagentError("FILE_NOT_FOUND", `File not found: ${filePath}`, `Run: ${helpCommand}
+Check the file path and try again`);
+    }
+    try {
+      return JSON.parse(readFileSync5(filePath, "utf-8"));
+    } catch {
+      throw new MutagentError("INVALID_JSON", `Failed to parse JSON from ${filePath}`, `Run: ${helpCommand}
+Ensure the file contains valid JSON Schema`);
+    }
+  }
+  return;
+}
+function buildResultsScorecardText(resultData) {
+  const jobData = resultData.job;
+  const jobId = typeof jobData?.id === "string" ? jobData.id : "N/A";
+  const jobStatus = typeof jobData?.status === "string" ? jobData.status : "unknown";
+  const originalScore = resultData.originalScore;
+  const bestScore = resultData.bestScore;
+  const iterations = resultData.iterationsCompleted ?? 0;
+  const title = "Optimization Results";
+  const rows = [
+    { label: "Job ID", value: jobId },
+    { label: "Status", value: jobStatus },
+    { label: "Iterations", value: String(iterations) },
+    { label: "Original Score", value: originalScore !== undefined ? originalScore.toFixed(2) : "N/A" },
+    { label: "Best Score", value: bestScore !== undefined ? bestScore.toFixed(2) : "N/A" }
+  ];
+  if (originalScore !== undefined && bestScore !== undefined && originalScore > 0) {
+    const pct = Math.round((bestScore - originalScore) / originalScore * 100);
+    rows.push({ label: "Improvement", value: `${pct > 0 ? "+" : ""}${String(pct)}%` });
+  }
+  return renderPlainCard({ title, rows, links: [], next: [] });
+}
+var PREREQUISITES_TEXT = `
+${chalk10.red("Prerequisites (required):")}
+  1. Evaluation criteria defined  ${chalk10.dim("(via dashboard or evaluation create)")}
+  2. Dataset uploaded             ${chalk10.dim("mutagent prompts dataset list <prompt-id>")}
+  ${chalk10.dim("Note: LLM provider config is only required when the server uses external providers (USE_EXT_PROVIDERS=true)")}`;
+function createPromptsCommand() {
+  const prompts = new Command6("prompts").description("Manage prompts, datasets, evaluations, and optimizations").addHelpText("after", `
+Examples:
+  ${chalk10.dim("$")} mutagent prompts list
+  ${chalk10.dim("$")} mutagent prompts get <prompt-id>
+  ${chalk10.dim("$")} mutagent prompts create --name "my-prompt" --system "You are helpful" --human "{input}"
+  ${chalk10.dim("$")} mutagent prompts dataset list <prompt-id>
+  ${chalk10.dim("$")} mutagent prompts evaluation create <prompt-id> --name "My Eval"
+  ${chalk10.dim("$")} mutagent prompts optimize start <prompt-id> --dataset <dataset-id> --evaluation <eval-id>
+
+Subcommands:
+  list, get, create, update, delete
+  dataset list|add|delete
+  evaluation list|create|delete
+  optimize start|status|results
+    `);
+  registerPromptsCrud(prompts);
+  registerDatasetCommands(prompts);
+  registerEvaluationCommands(prompts);
+  registerOptimizeCommands(prompts);
   return prompts;
 }
 
 // src/commands/traces.ts
 init_sdk_client();
-import { Command as Command4 } from "commander";
-import chalk7 from "chalk";
+import { Command as Command7 } from "commander";
+import chalk11 from "chalk";
 init_errors();
 function createTracesCommand() {
-  const traces = new Command4("traces").description("View and analyze traces (replaces Langfuse)").addHelpText("after", `
+  const traces = new Command7("traces").description("View and analyze traces (replaces Langfuse)").addHelpText("after", `
 Examples:
-  ${chalk7.dim("$")} mutagent traces list
-  ${chalk7.dim("$")} mutagent traces list --prompt <prompt-id>
-  ${chalk7.dim("$")} mutagent traces get <trace-id>
-  ${chalk7.dim("$")} mutagent traces analyze <prompt-id>
-  ${chalk7.dim("$")} mutagent traces export --format json --output traces.json
+  ${chalk11.dim("$")} mutagent traces list
+  ${chalk11.dim("$")} mutagent traces list --prompt <prompt-id>
+  ${chalk11.dim("$")} mutagent traces get <trace-id>
+  ${chalk11.dim("$")} mutagent traces analyze <prompt-id>
+  ${chalk11.dim("$")} mutagent traces export --format json --output traces.json
 
 Note: MutagenT traces replace Langfuse for observability.
     `);
   traces.command("list").description("List traces").option("-p, --prompt <id>", "Filter by prompt ID").option("-l, --limit <n>", "Limit results", "50").addHelpText("after", `
 Examples:
-  ${chalk7.dim("$")} mutagent traces list
-  ${chalk7.dim("$")} mutagent traces list --prompt <prompt-id>
-  ${chalk7.dim("$")} mutagent traces list --limit 10 --json
+  ${chalk11.dim("$")} mutagent traces list
+  ${chalk11.dim("$")} mutagent traces list --prompt <prompt-id>
+  ${chalk11.dim("$")} mutagent traces list --limit 10 --json
 
-${chalk7.dim("Tip: Filter by prompt to see traces for a specific prompt version.")}
+${chalk11.dim("Tip: Filter by prompt to see traces for a specific prompt version.")}
     `).action(async (options) => {
     const isJson = getJsonFlag(traces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4228,10 +4590,10 @@ ${chalk7.dim("Tip: Filter by prompt to see traces for a specific prompt version.
   });
   traces.command("get").description("Get trace details").argument("<id>", "Trace ID").addHelpText("after", `
 Examples:
-  ${chalk7.dim("$")} mutagent traces get <trace-id>
-  ${chalk7.dim("$")} mutagent traces get <trace-id> --json
+  ${chalk11.dim("$")} mutagent traces get <trace-id>
+  ${chalk11.dim("$")} mutagent traces get <trace-id> --json
 
-${chalk7.dim("Returns full trace details including spans, tokens, and latency.")}
+${chalk11.dim("Returns full trace details including spans, tokens, and latency.")}
     `).action(async (id) => {
     const isJson = getJsonFlag(traces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4250,10 +4612,10 @@ ${chalk7.dim("Returns full trace details including spans, tokens, and latency.")
   });
   traces.command("analyze").description("Analyze traces for a prompt").argument("<prompt-id>", "Prompt ID").addHelpText("after", `
 Examples:
-  ${chalk7.dim("$")} mutagent traces analyze <prompt-id>
-  ${chalk7.dim("$")} mutagent traces analyze <prompt-id> --json
+  ${chalk11.dim("$")} mutagent traces analyze <prompt-id>
+  ${chalk11.dim("$")} mutagent traces analyze <prompt-id> --json
 
-${chalk7.dim("Aggregates trace data for a prompt: avg latency, token usage, error rates.")}
+${chalk11.dim("Aggregates trace data for a prompt: avg latency, token usage, error rates.")}
     `).action(async (promptId) => {
     const isJson = getJsonFlag(traces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4271,12 +4633,12 @@ ${chalk7.dim("Aggregates trace data for a prompt: avg latency, token usage, erro
   });
   traces.command("export").description("Export traces").option("-p, --prompt <id>", "Filter by prompt ID").option("-f, --format <format>", "Export format (json, csv)", "json").option("-o, --output <path>", "Output file path").addHelpText("after", `
 Examples:
-  ${chalk7.dim("$")} mutagent traces export
-  ${chalk7.dim("$")} mutagent traces export --format json --output traces.json
-  ${chalk7.dim("$")} mutagent traces export --format csv --output traces.csv
-  ${chalk7.dim("$")} mutagent traces export --prompt <prompt-id> --format json
+  ${chalk11.dim("$")} mutagent traces export
+  ${chalk11.dim("$")} mutagent traces export --format json --output traces.json
+  ${chalk11.dim("$")} mutagent traces export --format csv --output traces.csv
+  ${chalk11.dim("$")} mutagent traces export --prompt <prompt-id> --format json
 
-${chalk7.dim("Exports to stdout by default. Use --output to save to a file.")}
+${chalk11.dim("Exports to stdout by default. Use --output to save to a file.")}
     `).action(async (options) => {
     const isJson = getJsonFlag(traces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -4319,22 +4681,22 @@ ${chalk7.dim("Exports to stdout by default. Use --output to save to a file.")}
 
 // src/commands/integrate.ts
 init_config();
-import { Command as Command5 } from "commander";
-import chalk8 from "chalk";
-import { writeFileSync as writeFileSync3, existsSync as existsSync9 } from "fs";
+import { Command as Command8 } from "commander";
+import chalk12 from "chalk";
+import { writeFileSync as writeFileSync3, existsSync as existsSync10 } from "fs";
 import { execSync } from "child_process";
 init_errors();
 
 // src/lib/integrations/langchain.ts
-import { readFileSync as readFileSync5, existsSync as existsSync5 } from "fs";
+import { readFileSync as readFileSync6, existsSync as existsSync6 } from "fs";
 var langchainIntegration = {
   name: "langchain",
   description: "LangChain framework",
   detect() {
     let hasLangchain = false;
-    if (existsSync5("package.json")) {
+    if (existsSync6("package.json")) {
       try {
-        const pkg = JSON.parse(readFileSync5("package.json", "utf-8"));
+        const pkg = JSON.parse(readFileSync6("package.json", "utf-8"));
         const deps = { ...pkg.dependencies, ...pkg.devDependencies };
         hasLangchain = "langchain" in deps || "@langchain/core" in deps;
       } catch {}
@@ -4466,15 +4828,15 @@ mutagent traces analyze <prompt-id>
 };
 
 // src/lib/integrations/langgraph.ts
-import { readFileSync as readFileSync6, existsSync as existsSync6 } from "fs";
+import { readFileSync as readFileSync7, existsSync as existsSync7 } from "fs";
 var langgraphIntegration = {
   name: "langgraph",
   description: "LangGraph agent workflow framework",
   detect() {
     let hasLanggraph = false;
-    if (existsSync6("package.json")) {
+    if (existsSync7("package.json")) {
       try {
-        const pkg = JSON.parse(readFileSync6("package.json", "utf-8"));
+        const pkg = JSON.parse(readFileSync7("package.json", "utf-8"));
         const deps = { ...pkg.dependencies, ...pkg.devDependencies };
         hasLanggraph = "@langchain/langgraph" in deps;
       } catch {}
@@ -4595,15 +4957,15 @@ mutagent integrate langgraph --verify
 };
 
 // src/lib/integrations/vercel-ai.ts
-import { readFileSync as readFileSync7, existsSync as existsSync7 } from "fs";
+import { readFileSync as readFileSync8, existsSync as existsSync8 } from "fs";
 var vercelAiIntegration = {
   name: "vercel-ai",
   description: "Vercel AI SDK",
   detect() {
     let hasAiSdk = false;
-    if (existsSync7("package.json")) {
+    if (existsSync8("package.json")) {
       try {
-        const pkg = JSON.parse(readFileSync7("package.json", "utf-8"));
+        const pkg = JSON.parse(readFileSync8("package.json", "utf-8"));
         const deps = { ...pkg.dependencies, ...pkg.devDependencies };
         hasAiSdk = "ai" in deps;
       } catch {}
@@ -4741,15 +5103,15 @@ mutagent integrate vercel-ai --verify
 };
 
 // src/lib/integrations/openai.ts
-import { readFileSync as readFileSync8, existsSync as existsSync8 } from "fs";
+import { readFileSync as readFileSync9, existsSync as existsSync9 } from "fs";
 var openaiIntegration = {
   name: "openai",
   description: "OpenAI SDK integration with automatic tracing",
   detect() {
     let hasOpenAI = false;
-    if (existsSync8("package.json")) {
+    if (existsSync9("package.json")) {
       try {
-        const pkg = JSON.parse(readFileSync8("package.json", "utf-8"));
+        const pkg = JSON.parse(readFileSync9("package.json", "utf-8"));
         const deps = { ...pkg.dependencies, ...pkg.devDependencies };
         hasOpenAI = "openai" in deps;
       } catch {}
@@ -4903,16 +5265,16 @@ function getFrameworkMetadata(name) {
 
 // src/commands/integrate.ts
 function detectPackageManager() {
-  if (existsSync9("bun.lockb") || existsSync9("bun.lock")) {
+  if (existsSync10("bun.lockb") || existsSync10("bun.lock")) {
     return "bun";
   }
-  if (existsSync9("pnpm-lock.yaml")) {
+  if (existsSync10("pnpm-lock.yaml")) {
     return "pnpm";
   }
-  if (existsSync9("yarn.lock")) {
+  if (existsSync10("yarn.lock")) {
     return "yarn";
   }
-  if (existsSync9("package-lock.json")) {
+  if (existsSync10("package-lock.json")) {
     return "npm";
   }
   try {
@@ -4955,14 +5317,14 @@ AI AGENT: Please determine the framework by:
 `;
 }
 function createIntegrateCommand() {
-  const integrate = new Command5("integrate").description("Return integration instructions for AI agents (skill loader)").addHelpText("after", `
+  const integrate = new Command8("integrate").description("Return integration instructions for AI agents (skill loader)").addHelpText("after", `
 Examples:
-  ${chalk8.dim("$")} mutagent integrate              # Return exploration instructions for AI agents
-  ${chalk8.dim("$")} mutagent integrate langchain     # Return @mutagent/langchain integration steps
-  ${chalk8.dim("$")} mutagent integrate openai        # Return @mutagent/openai integration steps
-  ${chalk8.dim("$")} mutagent integrate vercel-ai --verify    # Verify integration
-  ${chalk8.dim("$")} mutagent integrate langchain --output ./INTEGRATION.md
-  ${chalk8.dim("$")} mutagent integrate --list          # List available frameworks
+  ${chalk12.dim("$")} mutagent integrate              # Return exploration instructions for AI agents
+  ${chalk12.dim("$")} mutagent integrate langchain     # Return @mutagent/langchain integration steps
+  ${chalk12.dim("$")} mutagent integrate openai        # Return @mutagent/openai integration steps
+  ${chalk12.dim("$")} mutagent integrate vercel-ai --verify    # Verify integration
+  ${chalk12.dim("$")} mutagent integrate langchain --output ./INTEGRATION.md
+  ${chalk12.dim("$")} mutagent integrate --list          # List available frameworks
 
 Frameworks: langchain, langgraph, vercel-ai, openai
 
@@ -5076,35 +5438,20 @@ AI AGENT: Execute these steps using Bash for install, Write/Edit for code change
   return integrate;
 }
 
-// src/commands/agents.ts
+// src/commands/agents/index.ts
+import { Command as Command9 } from "commander";
+import chalk14 from "chalk";
+
+// src/commands/agents/agents-crud.ts
 init_sdk_client();
-import { Command as Command6 } from "commander";
-import chalk9 from "chalk";
+import chalk13 from "chalk";
 init_errors();
-function createAgentsCommand() {
-  const agents = new Command6("agents").description("Manage AI agents").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents list
-  ${chalk9.dim("$")} mutagent agents get <agent-id>
-  ${chalk9.dim("$")} mutagent agents create --name "Code Reviewer" --slug code-reviewer --system-prompt "You are a code reviewer..."
-  ${chalk9.dim("$")} mutagent agents create -d '{"name":"Code Reviewer","slug":"code-reviewer","systemPrompt":"You are..."}'
-  ${chalk9.dim("$")} mutagent agents update <agent-id> --name "Updated Name"
-  ${chalk9.dim("$")} mutagent agents delete <agent-id> --force
-  ${chalk9.dim("$")} mutagent agents conversations list <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations get <agent-id> <conversation-id>
-  ${chalk9.dim("$")} mutagent agents conversations create <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations delete <agent-id> <conversation-id>
-  ${chalk9.dim("$")} mutagent agents conversations messages <agent-id> <conversation-id>
-
-Subcommands:
-  list, get, create, update, delete
-  conversations list|get|create|delete|messages
-    `);
+function registerAgentsCrud(agents) {
   agents.command("list").description("List all agents").option("-l, --limit <n>", "Limit results", "50").option("-o, --offset <n>", "Offset for pagination").option("-n, --name <name>", "Filter by name").option("-s, --status <status>", "Filter by status (active, paused, archived)").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents list
-  ${chalk9.dim("$")} mutagent agents list --status active
-  ${chalk9.dim("$")} mutagent agents list --name "reviewer" --json
+  ${chalk13.dim("$")} mutagent agents list
+  ${chalk13.dim("$")} mutagent agents list --status active
+  ${chalk13.dim("$")} mutagent agents list --name "reviewer" --json
     `).action(async (options) => {
     const isJson = getJsonFlag(agents);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5154,8 +5501,8 @@ Examples:
   });
   agents.command("get").description("Get agent details").argument("<id>", "Agent ID").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents get <agent-id>
-  ${chalk9.dim("$")} mutagent agents get <agent-id> --json
+  ${chalk13.dim("$")} mutagent agents get <agent-id>
+  ${chalk13.dim("$")} mutagent agents get <agent-id> --json
     `).action(async (id) => {
     const isJson = getJsonFlag(agents);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5185,11 +5532,11 @@ Examples:
         };
         output.output(formatted);
         if (agent.systemPrompt) {
-          console.log(chalk9.bold(`
+          console.log(chalk13.bold(`
 System Prompt:`));
-          console.log(chalk9.gray("─".repeat(60)));
+          console.log(chalk13.gray("─".repeat(60)));
           console.log(agent.systemPrompt);
-          console.log(chalk9.gray("─".repeat(60)));
+          console.log(chalk13.gray("─".repeat(60)));
         }
       }
     } catch (error) {
@@ -5198,17 +5545,17 @@ System Prompt:`));
   });
   agents.command("create").description("Create a new agent").option("-d, --data <json>", "Agent as JSON string (recommended for CI/scripts/agents)").option("-n, --name <name>", "Agent name").option("-s, --slug <slug>", "Agent slug (URL-friendly identifier)").option("-p, --system-prompt <prompt>", "System prompt").option("-m, --model <model>", "Model (claude-sonnet-4-5, claude-opus-4-5, claude-haiku-4-5)").option("--description <desc>", "Agent description").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents create --name "Code Reviewer" --slug code-reviewer --system-prompt "You are a code reviewer..."
-  ${chalk9.dim("$")} mutagent agents create -d '{"name":"Code Reviewer","slug":"code-reviewer","systemPrompt":"You are a code reviewer..."}'
+  ${chalk13.dim("$")} mutagent agents create --name "Code Reviewer" --slug code-reviewer --system-prompt "You are a code reviewer..."
+  ${chalk13.dim("$")} mutagent agents create -d '{"name":"Code Reviewer","slug":"code-reviewer","systemPrompt":"You are a code reviewer..."}'
 
 Expected JSON (--data):
-  ${chalk9.dim('{"name":"<name>","slug":"<slug>","systemPrompt":"<system prompt>","model":"<model-id>","description":"<description>"}')}
+  ${chalk13.dim('{"name":"<name>","slug":"<slug>","systemPrompt":"<system prompt>","model":"<model-id>","description":"<description>"}')}
 
 Input Methods (pick one, priority order):
-  --name/--slug/...  Individual flags ${chalk9.green("(recommended)")}
+  --name/--slug/...  Individual flags ${chalk13.green("(recommended)")}
   -d, --data         Inline JSON object (CI/scripts/agents)
 
-${chalk9.red("Required: name, slug, systemPrompt.")} ${chalk9.dim("CLI flags override --data fields.")}
+${chalk13.red("Required: name, slug, systemPrompt.")} ${chalk13.dim("CLI flags override --data fields.")}
     `).action(async (options) => {
     const isJson = getJsonFlag(agents);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5253,15 +5600,15 @@ ${chalk9.red("Required: name, slug, systemPrompt.")} ${chalk9.dim("CLI flags ove
   });
   agents.command("update").description("Update an agent").argument("<id>", "Agent ID").option("-d, --data <json>", "Agent updates as JSON string (CI/scripts/agents)").option("-n, --name <name>", "New name").option("-p, --system-prompt <prompt>", "New system prompt").option("-m, --model <model>", "New model").option("--description <desc>", "New description").option("-s, --status <status>", "New status (active, paused, archived)").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents update <id> --name "New Name"
-  ${chalk9.dim("$")} mutagent agents update <id> --system-prompt "Updated prompt" --status active
-  ${chalk9.dim("$")} mutagent agents update <id> -d '{"name":"New Name","systemPrompt":"Updated prompt"}'
+  ${chalk13.dim("$")} mutagent agents update <id> --name "New Name"
+  ${chalk13.dim("$")} mutagent agents update <id> --system-prompt "Updated prompt" --status active
+  ${chalk13.dim("$")} mutagent agents update <id> -d '{"name":"New Name","systemPrompt":"Updated prompt"}'
 
 Input Methods (pick one, priority order):
-  --name/--system-prompt/...  Individual flags ${chalk9.green("(recommended)")}
+  --name/--system-prompt/...  Individual flags ${chalk13.green("(recommended)")}
   -d, --data                  Inline JSON object (CI/scripts/agents)
 
-${chalk9.dim("CLI flags override --data fields.")}
+${chalk13.dim("CLI flags override --data fields.")}
     `).action(async (id, options) => {
     const isJson = getJsonFlag(agents);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5308,11 +5655,11 @@ ${chalk9.dim("CLI flags override --data fields.")}
   });
   agents.command("delete").description("Delete an agent").argument("<id>", "Agent ID").option("--force", "Skip confirmation").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents delete <id>
-  ${chalk9.dim("$")} mutagent agents delete <id> --force
-  ${chalk9.dim("$")} mutagent agents delete <id> --force --json
+  ${chalk13.dim("$")} mutagent agents delete <id>
+  ${chalk13.dim("$")} mutagent agents delete <id> --force
+  ${chalk13.dim("$")} mutagent agents delete <id> --force --json
 
-${chalk9.dim("Tip: Use --force to skip confirmation (required for non-interactive/CI usage).")}
+${chalk13.dim("Tip: Use --force to skip confirmation (required for non-interactive/CI usage).")}
     `).action(async (id, options) => {
     const isJson = getJsonFlag(agents);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5337,177 +5684,44 @@ ${chalk9.dim("Tip: Use --force to skip confirmation (required for non-interactiv
       handleError(error, isJson);
     }
   });
-  const conversations = new Command6("conversations").description("Manage conversations for agents").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents conversations list <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations create <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations messages <agent-id> <conversation-id>
-    `).action(() => {
-    conversations.help();
-  });
-  agents.addCommand(conversations);
-  conversations.command("list").description("List conversations for an agent").argument("<agent-id>", "Agent ID").option("-l, --limit <n>", "Limit results", "50").option("-o, --offset <n>", "Offset for pagination").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents conversations list <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations list <agent-id> --limit 10 --json
-    `).action(async (agentId, options) => {
-    const isJson = getJsonFlag(agents);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const filters = {
-        limit: parseInt(options.limit, 10) || 50
-      };
-      if (options.offset) {
-        filters.offset = parseInt(options.offset, 10);
-      }
-      const result = await client.listConversations(agentId, filters);
-      if (isJson) {
-        output.output(result);
-      } else {
-        const formatted = result.data.map((c) => ({
-          id: c.id,
-          title: c.title ?? "Untitled",
-          status: c.status,
-          messages: c.messageCount ?? "N/A",
-          created: c.createdAt ? new Date(c.createdAt).toLocaleDateString() : "N/A",
-          updated: c.updatedAt ? new Date(c.updatedAt).toLocaleDateString() : "N/A"
-        }));
-        output.output(formatted);
-      }
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
-  conversations.command("get").description("Get conversation details").argument("<agent-id>", "Agent ID").argument("<conversation-id>", "Conversation ID").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents conversations get <agent-id> <conversation-id>
-  ${chalk9.dim("$")} mutagent agents conversations get <agent-id> <conversation-id> --json
-    `).action(async (agentId, conversationId) => {
-    const isJson = getJsonFlag(agents);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const conversation = await client.getConversation(agentId, conversationId);
-      if (isJson) {
-        output.output(conversation);
-      } else {
-        const formatted = {
-          id: conversation.id,
-          agentId: conversation.agentId,
-          title: conversation.title ?? "Untitled",
-          status: conversation.status,
-          messageCount: conversation.messageCount ?? "N/A",
-          createdAt: conversation.createdAt ? new Date(conversation.createdAt).toLocaleString() : "N/A",
-          updatedAt: conversation.updatedAt ? new Date(conversation.updatedAt).toLocaleString() : "N/A"
-        };
-        output.output(formatted);
-      }
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
-  conversations.command("create").description("Start a new conversation with an agent").argument("<agent-id>", "Agent ID").option("-t, --title <title>", "Conversation title").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents conversations create <agent-id>
-  ${chalk9.dim("$")} mutagent agents conversations create <agent-id> --title "Debug session" --json
-    `).action(async (agentId, options) => {
-    const isJson = getJsonFlag(agents);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const data = {};
-      if (options.title) {
-        data.title = options.title;
-      }
-      const conversation = await client.createConversation(agentId, data);
-      output.success(`Created conversation: ${conversation.id}`);
-      output.output(conversation);
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
-  conversations.command("delete").description("Delete a conversation").argument("<agent-id>", "Agent ID").argument("<conversation-id>", "Conversation ID").option("--force", "Skip confirmation").addHelpText("after", `
-Examples:
-  ${chalk9.dim("$")} mutagent agents conversations delete <agent-id> <conversation-id>
-  ${chalk9.dim("$")} mutagent agents conversations delete <agent-id> <conversation-id> --force --json
-    `).action(async (agentId, conversationId, options) => {
-    const isJson = getJsonFlag(agents);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      if (!options.force && !isJson) {
-        const inquirer3 = (await import("inquirer")).default;
-        const answers = await inquirer3.prompt([{
-          type: "confirm",
-          name: "confirm",
-          message: `Delete conversation ${conversationId}? This action cannot be undone.`,
-          default: false
-        }]);
-        if (!answers.confirm) {
-          output.info("Cancelled");
-          return;
-        }
-      }
-      const client = getSDKClient();
-      await client.deleteConversation(agentId, conversationId);
-      output.success(`Deleted conversation: ${conversationId}`);
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
-  conversations.command("messages").description("List messages in a conversation").argument("<agent-id>", "Agent ID").argument("<conversation-id>", "Conversation ID").option("-l, --limit <n>", "Limit results", "50").option("-o, --offset <n>", "Offset for pagination").addHelpText("after", `
+}
+
+// src/commands/agents/index.ts
+function createAgentsCommand() {
+  const agents = new Command9("agents").description("Manage AI agents").addHelpText("after", `
 Examples:
-  ${chalk9.dim("$")} mutagent agents conversations messages <agent-id> <conversation-id>
-  ${chalk9.dim("$")} mutagent agents conversations messages <agent-id> <conversation-id> --limit 20 --json
-    `).action(async (agentId, conversationId, options) => {
-    const isJson = getJsonFlag(agents);
-    const output = new OutputFormatter(isJson ? "json" : "table");
-    try {
-      const client = getSDKClient();
-      const filters = {
-        limit: parseInt(options.limit, 10) || 50
-      };
-      if (options.offset) {
-        filters.offset = parseInt(options.offset, 10);
-      }
-      const result = await client.listMessages(agentId, conversationId, filters);
-      if (isJson) {
-        output.output(result);
-      } else {
-        const formatted = result.data.map((m) => ({
-          id: m.id,
-          role: m.role,
-          content: m.content.length > 80 ? m.content.substring(0, 77) + "..." : m.content,
-          tokens: m.tokenCount ?? "N/A",
-          created: m.createdAt ? new Date(m.createdAt).toLocaleString() : "N/A"
-        }));
-        output.output(formatted);
-      }
-    } catch (error) {
-      handleError(error, isJson);
-    }
-  });
+  ${chalk14.dim("$")} mutagent agents list
+  ${chalk14.dim("$")} mutagent agents get <agent-id>
+  ${chalk14.dim("$")} mutagent agents create --name "Code Reviewer" --slug code-reviewer --system-prompt "You are a code reviewer..."
+  ${chalk14.dim("$")} mutagent agents create -d '{"name":"Code Reviewer","slug":"code-reviewer","systemPrompt":"You are..."}'
+  ${chalk14.dim("$")} mutagent agents update <agent-id> --name "Updated Name"
+  ${chalk14.dim("$")} mutagent agents delete <agent-id> --force
+
+Subcommands:
+  list, get, create, update, delete
+    `);
+  registerAgentsCrud(agents);
   return agents;
 }
 
 // src/commands/config.ts
 init_config();
-import { Command as Command7 } from "commander";
-import chalk10 from "chalk";
+import { Command as Command10 } from "commander";
+import chalk15 from "chalk";
 init_errors();
 var VALID_CONFIG_KEYS = ["apiKey", "endpoint", "format", "timeout", "defaultWorkspace", "defaultOrganization"];
 function createConfigCommand() {
-  const config = new Command7("config").description("Manage CLI configuration").addHelpText("after", `
+  const config = new Command10("config").description("Manage CLI configuration").addHelpText("after", `
 Examples:
-  ${chalk10.dim("$")} mutagent config list
-  ${chalk10.dim("$")} mutagent config get endpoint
-  ${chalk10.dim("$")} mutagent config set workspace <workspace-id>
-  ${chalk10.dim("$")} mutagent config set org <org-id>
+  ${chalk15.dim("$")} mutagent config list
+  ${chalk15.dim("$")} mutagent config get endpoint
+  ${chalk15.dim("$")} mutagent config set workspace <workspace-id>
+  ${chalk15.dim("$")} mutagent config set org <org-id>
     `);
   config.command("list").description("List all configuration").addHelpText("after", `
 Examples:
-  ${chalk10.dim("$")} mutagent config list
-  ${chalk10.dim("$")} mutagent config list --json
+  ${chalk15.dim("$")} mutagent config list
+  ${chalk15.dim("$")} mutagent config list --json
     `).action(() => {
     const isJson = getJsonFlag(config);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5520,11 +5734,11 @@ Examples:
   });
   config.command("get").description("Get configuration value").argument("<key>", "Configuration key (apiKey, endpoint, format, timeout, defaultWorkspace, defaultOrganization)").addHelpText("after", `
 Examples:
-  ${chalk10.dim("$")} mutagent config get endpoint
-  ${chalk10.dim("$")} mutagent config get defaultWorkspace
-  ${chalk10.dim("$")} mutagent config get apiKey --json
+  ${chalk15.dim("$")} mutagent config get endpoint
+  ${chalk15.dim("$")} mutagent config get defaultWorkspace
+  ${chalk15.dim("$")} mutagent config get apiKey --json
 
-${chalk10.dim("Keys: apiKey, endpoint, format, timeout, defaultWorkspace, defaultOrganization")}
+${chalk15.dim("Keys: apiKey, endpoint, format, timeout, defaultWorkspace, defaultOrganization")}
     `).action((key) => {
     const isJson = getJsonFlag(config);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5546,14 +5760,14 @@ ${chalk10.dim("Keys: apiKey, endpoint, format, timeout, defaultWorkspace, defaul
       handleError(error, isJson);
     }
   });
-  const set = new Command7("set").description("Set configuration value").action(() => {
+  const set = new Command10("set").description("Set configuration value").action(() => {
     set.help();
   });
   set.command("workspace").description("Set default workspace ID").argument("<id>", "Workspace ID to set as default").addHelpText("after", `
 Examples:
-  ${chalk10.dim("$")} mutagent config set workspace <workspace-id>
+  ${chalk15.dim("$")} mutagent config set workspace <workspace-id>
 
-${chalk10.dim("Persists workspace ID so you don't need to pass headers on every request.")}
+${chalk15.dim("Persists workspace ID so you don't need to pass headers on every request.")}
     `).action((id) => {
     const isJson = getJsonFlag(config);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5566,9 +5780,9 @@ ${chalk10.dim("Persists workspace ID so you don't need to pass headers on every
   });
   set.command("org").description("Set default organization ID").argument("<id>", "Organization ID to set as default").addHelpText("after", `
 Examples:
-  ${chalk10.dim("$")} mutagent config set org <org-id>
+  ${chalk15.dim("$")} mutagent config set org <org-id>
 
-${chalk10.dim("Persists organization ID for org-scoped API keys.")}
+${chalk15.dim("Persists organization ID for org-scoped API keys.")}
     `).action((id) => {
     const isJson = getJsonFlag(config);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5585,8 +5799,8 @@ ${chalk10.dim("Persists organization ID for org-scoped API keys.")}
 
 // src/commands/playground.ts
 init_sdk_client();
-import { Command as Command8 } from "commander";
-import chalk11 from "chalk";
+import { Command as Command11 } from "commander";
+import chalk16 from "chalk";
 init_errors();
 function parseSSELine(line) {
   if (!line || line.startsWith(":")) {
@@ -5611,13 +5825,13 @@ function parsePromptStreamEvent(data) {
   }
 }
 function createPlaygroundCommand() {
-  const playground = new Command8("playground").description("Execute and test prompts interactively").addHelpText("after", `
+  const playground = new Command11("playground").description("Execute and test prompts interactively").addHelpText("after", `
 Examples:
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --input '{"name": "John"}'
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --input '{}' --stream
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> -i '{}' --model gpt-4-turbo
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --system "You are helpful" --human "Hello"
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --messages '[{"role":"user","content":"Hi"}]'
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --input '{"name": "John"}'
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --input '{}' --stream
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> -i '{}' --model gpt-4-turbo
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --system "You are helpful" --human "Hello"
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --messages '[{"role":"user","content":"Hi"}]'
 
 Input Format:
   The input must be a valid JSON object matching the prompt's input schema.
@@ -5633,16 +5847,16 @@ Streaming:
     `);
   playground.command("run").description("Execute a prompt with input variables").argument("<prompt-id>", "Prompt ID to execute (from: mutagent prompts list)").option("-i, --input <json>", "Input variables as JSON").option("-s, --stream", "Stream the response").option("-m, --model <model>", "Override model").option("--system <text>", "Set system prompt text").option("--human <text>", "Set human/user message text").option("--messages <json>", "Pass full messages array as JSON string").addHelpText("after", `
 Examples:
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --input '{"name": "John"}'
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --input '{}' --stream
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --system "You are helpful" --human "Hello"
-  ${chalk11.dim("$")} mutagent playground run <prompt-id> --input '{}' --model gpt-4-turbo --json
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --input '{"name": "John"}'
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --input '{}' --stream
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --system "You are helpful" --human "Hello"
+  ${chalk16.dim("$")} mutagent playground run <prompt-id> --input '{}' --model gpt-4-turbo --json
 
 Input Methods (pick one, priority order):
-  --system/--human            Quick system + user message ${chalk11.green("(recommended)")}
+  --system/--human            Quick system + user message ${chalk16.green("(recommended)")}
   --input '{"key":"value"}'   Inline JSON variables
   --messages '[...]'          Full messages array
-${chalk11.dim(`Hint: Test before evaluating: mutagent playground run <id> --input '{"key":"value"}'`)}
+${chalk16.dim(`Hint: Test before evaluating: mutagent playground run <id> --input '{"key":"value"}'`)}
     `).action(async (promptId, options) => {
     const isJson = getJsonFlag(playground);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5664,21 +5878,21 @@ ${chalk11.dim(`Hint: Test before evaluating: mutagent playground run <id> --inpu
             }
           });
         } else {
-          console.log(chalk11.bold(`
+          console.log(chalk16.bold(`
 Execution Result:`));
-          console.log(chalk11.gray("─".repeat(50)));
-          console.log(chalk11.cyan("Output:"));
+          console.log(chalk16.gray("─".repeat(50)));
+          console.log(chalk16.cyan("Output:"));
           console.log(result.output);
-          console.log(chalk11.gray("─".repeat(50)));
-          console.log(chalk11.dim(`Model: ${result.model}`));
-          console.log(chalk11.dim(`Execution Time: ${String(result.executionTimeMs)}ms`));
+          console.log(chalk16.gray("─".repeat(50)));
+          console.log(chalk16.dim(`Model: ${result.model}`));
+          console.log(chalk16.dim(`Execution Time: ${String(result.executionTimeMs)}ms`));
           if (result.tokens) {
-            console.log(chalk11.dim(`Tokens: ${String(result.tokens.prompt)} prompt + ${String(result.tokens.completion)} completion = ${String(result.tokens.total)} total`));
+            console.log(chalk16.dim(`Tokens: ${String(result.tokens.prompt)} prompt + ${String(result.tokens.completion)} completion = ${String(result.tokens.total)} total`));
           }
           if (result.cost !== undefined) {
-            console.log(chalk11.dim(`Cost: $${result.cost.toFixed(6)}`));
+            console.log(chalk16.dim(`Cost: $${result.cost.toFixed(6)}`));
           }
-          console.log(chalk11.dim(`Playground: ${playgroundLink()}`));
+          console.log(chalk16.dim(`Playground: ${playgroundLink()}`));
           console.log();
         }
       }
@@ -5767,9 +5981,9 @@ async function executeStreaming(client, promptId, input, model, isJson, output)
   const decoder = new TextDecoder;
   let buffer = "";
   if (!isJson) {
-    console.log(chalk11.bold(`
+    console.log(chalk16.bold(`
 Streaming Output:`));
-    console.log(chalk11.gray("─".repeat(50)));
+    console.log(chalk16.gray("─".repeat(50)));
   }
   try {
     for (;; ) {
@@ -5808,15 +6022,15 @@ Streaming Output:`));
                 console.log(JSON.stringify({ type: "complete", result: event.result }));
               } else {
                 console.log();
-                console.log(chalk11.gray("─".repeat(50)));
+                console.log(chalk16.gray("─".repeat(50)));
                 if (event.result) {
-                  console.log(chalk11.dim(`Model: ${event.result.model}`));
-                  console.log(chalk11.dim(`Execution Time: ${String(event.result.executionTimeMs)}ms`));
+                  console.log(chalk16.dim(`Model: ${event.result.model}`));
+                  console.log(chalk16.dim(`Execution Time: ${String(event.result.executionTimeMs)}ms`));
                   if (event.result.tokens) {
-                    console.log(chalk11.dim(`Tokens: ${String(event.result.tokens.prompt)} prompt + ${String(event.result.tokens.completion)} completion = ${String(event.result.tokens.total)} total`));
+                    console.log(chalk16.dim(`Tokens: ${String(event.result.tokens.prompt)} prompt + ${String(event.result.tokens.completion)} completion = ${String(event.result.tokens.total)} total`));
                   }
                   if (event.result.cost !== undefined) {
-                    console.log(chalk11.dim(`Cost: $${event.result.cost.toFixed(6)}`));
+                    console.log(chalk16.dim(`Cost: $${event.result.cost.toFixed(6)}`));
                   }
                 }
                 console.log();
@@ -5840,14 +6054,14 @@ Streaming Output:`));
 
 // src/commands/workspaces.ts
 init_sdk_client();
-import { Command as Command9 } from "commander";
-import chalk12 from "chalk";
+import { Command as Command12 } from "commander";
+import chalk17 from "chalk";
 init_errors();
 function createWorkspacesCommand() {
-  const workspaces = new Command9("workspaces").description("View workspaces (read-only)").addHelpText("after", `
+  const workspaces = new Command12("workspaces").description("View workspaces (read-only)").addHelpText("after", `
 Examples:
-  ${chalk12.dim("$")} mutagent workspaces list
-  ${chalk12.dim("$")} mutagent workspaces get <workspace-id>
+  ${chalk17.dim("$")} mutagent workspaces list
+  ${chalk17.dim("$")} mutagent workspaces get <workspace-id>
 
 Subcommands:
   list, get
@@ -5856,8 +6070,8 @@ Note: Workspace management (create, update, delete) is available in the Admin Pa
     `);
   workspaces.command("list").description("List all workspaces").option("-l, --limit <n>", "Limit results", "50").option("-o, --offset <n>", "Offset for pagination").addHelpText("after", `
 Examples:
-  ${chalk12.dim("$")} mutagent workspaces list
-  ${chalk12.dim("$")} mutagent workspaces list --limit 10 --json
+  ${chalk17.dim("$")} mutagent workspaces list
+  ${chalk17.dim("$")} mutagent workspaces list --limit 10 --json
     `).action(async (options) => {
     const isJson = getJsonFlag(workspaces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5897,8 +6111,8 @@ Examples:
   });
   workspaces.command("get").description("Get workspace details").argument("<id>", "Workspace ID").addHelpText("after", `
 Examples:
-  ${chalk12.dim("$")} mutagent workspaces get <workspace-id>
-  ${chalk12.dim("$")} mutagent workspaces get <workspace-id> --json
+  ${chalk17.dim("$")} mutagent workspaces get <workspace-id>
+  ${chalk17.dim("$")} mutagent workspaces get <workspace-id> --json
     `).action(async (id) => {
     const isJson = getJsonFlag(workspaces);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -5930,8 +6144,8 @@ Examples:
 
 // src/commands/providers.ts
 init_sdk_client();
-import { Command as Command10 } from "commander";
-import chalk13 from "chalk";
+import { Command as Command13 } from "commander";
+import chalk18 from "chalk";
 init_errors();
 var VALID_PROVIDER_TYPES = [
   "openai",
@@ -5953,11 +6167,11 @@ function validateProviderType(type) {
   return type;
 }
 function createProvidersCommand() {
-  const providers = new Command10("providers").description("View LLM providers (read-only)").addHelpText("after", `
+  const providers = new Command13("providers").description("View LLM providers (read-only)").addHelpText("after", `
 Examples:
-  ${chalk13.dim("$")} mutagent providers list
-  ${chalk13.dim("$")} mutagent providers get <provider-id>
-  ${chalk13.dim("$")} mutagent providers test <provider-id>
+  ${chalk18.dim("$")} mutagent providers list
+  ${chalk18.dim("$")} mutagent providers get <provider-id>
+  ${chalk18.dim("$")} mutagent providers test <provider-id>
 
 Provider Types:
   openai, anthropic, google, azure, bedrock, cohere, mistral, groq, together, replicate, custom
@@ -5967,15 +6181,15 @@ Subcommands:
 
 Note: Provider management (create, update, delete) is available in the Admin Panel only.
 
-${chalk13.yellow("Note:")} The providers module is not yet active. This is a placeholder
+${chalk18.yellow("Note:")} The providers module is not yet active. This is a placeholder
 for future external provider configuration. The server currently uses
 built-in provider settings.
     `);
   providers.command("list").description("List all providers").option("-l, --limit <n>", "Limit results", "50").option("-o, --offset <n>", "Offset for pagination").option("-t, --type <type>", "Filter by provider type").addHelpText("after", `
 Examples:
-  ${chalk13.dim("$")} mutagent providers list
-  ${chalk13.dim("$")} mutagent providers list --type openai
-  ${chalk13.dim("$")} mutagent providers list --json
+  ${chalk18.dim("$")} mutagent providers list
+  ${chalk18.dim("$")} mutagent providers list --type openai
+  ${chalk18.dim("$")} mutagent providers list --json
     `).action(async (options) => {
     const isJson = getJsonFlag(providers);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -6002,7 +6216,7 @@ Examples:
         }));
         output.output({ ...result, data: withLinks });
       } else {
-        console.log(chalk13.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
+        console.log(chalk18.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
         console.log("");
         if (result.data.length === 0) {
           output.info("No providers configured.");
@@ -6026,8 +6240,8 @@ Examples:
   });
   providers.command("get").description("Get provider details").argument("<id>", "Provider ID (from: mutagent providers list)").addHelpText("after", `
 Examples:
-  ${chalk13.dim("$")} mutagent providers get <provider-id>
-  ${chalk13.dim("$")} mutagent providers get <provider-id> --json
+  ${chalk18.dim("$")} mutagent providers get <provider-id>
+  ${chalk18.dim("$")} mutagent providers get <provider-id> --json
     `).action(async (id) => {
     const isJson = getJsonFlag(providers);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -6037,7 +6251,7 @@ Examples:
       if (isJson) {
         output.output({ ...provider, _links: providerLinks(provider.id) });
       } else {
-        console.log(chalk13.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
+        console.log(chalk18.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
         console.log("");
         const formatted = {
           id: provider.id,
@@ -6058,17 +6272,17 @@ Examples:
   });
   providers.command("test").description("Test provider connectivity").argument("<id>", "Provider ID (from: mutagent providers list)").addHelpText("after", `
 Examples:
-  ${chalk13.dim("$")} mutagent providers test <provider-id>
-  ${chalk13.dim("$")} mutagent providers test <provider-id> --json
+  ${chalk18.dim("$")} mutagent providers test <provider-id>
+  ${chalk18.dim("$")} mutagent providers test <provider-id> --json
 
-${chalk13.dim("Tests connectivity and lists available models for the provider.")}
+${chalk18.dim("Tests connectivity and lists available models for the provider.")}
     `).action(async (id) => {
     const isJson = getJsonFlag(providers);
     const output = new OutputFormatter(isJson ? "json" : "table");
     try {
       const client = getSDKClient();
       if (!isJson) {
-        console.log(chalk13.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
+        console.log(chalk18.yellow("Note: The providers module is not yet active. This is a placeholder for future external provider configuration."));
         console.log("");
         output.info(`Testing provider ${id}...`);
       }
@@ -6078,9 +6292,9 @@ ${chalk13.dim("Tests connectivity and lists available models for the provider.")
       } else {
         if (result.success) {
           output.success(`Provider test passed (${String(result.responseTimeMs)}ms)`);
-          console.log(chalk13.green(`Message: ${result.message}`));
+          console.log(chalk18.green(`Message: ${result.message}`));
           if (result.availableModels && result.availableModels.length > 0) {
-            console.log(chalk13.bold(`
+            console.log(chalk18.bold(`
 Available Models:`));
             result.availableModels.forEach((model) => {
               console.log(`  - ${model}`);
@@ -6089,7 +6303,7 @@ Available Models:`));
         } else {
           output.error(`Provider test failed: ${result.message}`);
           if (result.error) {
-            console.log(chalk13.red(`Error: ${result.error}`));
+            console.log(chalk18.red(`Error: ${result.error}`));
           }
         }
       }
@@ -6102,13 +6316,18 @@ Available Models:`));
 
 // src/commands/init.ts
 init_config();
-import { Command as Command11 } from "commander";
+import { Command as Command14 } from "commander";
 import inquirer3 from "inquirer";
-import chalk14 from "chalk";
-import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync9, writeFileSync as writeFileSync4 } from "fs";
+import chalk19 from "chalk";
+import { existsSync as existsSync12, mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "fs";
+import { execSync as execSync3 } from "child_process";
+import { join as join6 } from "path";
+init_errors();
+
+// src/lib/framework-detection.ts
+import { existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
 import { execSync as execSync2 } from "child_process";
 import { join as join5 } from "path";
-init_errors();
 var FRAMEWORK_DETECTION_MAP = {
   "@mastra/core": {
     name: "mastra",
@@ -6158,16 +6377,16 @@ var FRAMEWORK_DETECTION_MAP = {
   }
 };
 function detectPackageManager2(cwd = process.cwd()) {
-  if (existsSync10(join5(cwd, "bun.lockb")) || existsSync10(join5(cwd, "bun.lock"))) {
+  if (existsSync11(join5(cwd, "bun.lockb")) || existsSync11(join5(cwd, "bun.lock"))) {
     return "bun";
   }
-  if (existsSync10(join5(cwd, "pnpm-lock.yaml"))) {
+  if (existsSync11(join5(cwd, "pnpm-lock.yaml"))) {
     return "pnpm";
   }
-  if (existsSync10(join5(cwd, "yarn.lock"))) {
+  if (existsSync11(join5(cwd, "yarn.lock"))) {
     return "yarn";
   }
-  if (existsSync10(join5(cwd, "package-lock.json"))) {
+  if (existsSync11(join5(cwd, "package-lock.json"))) {
     return "npm";
   }
   try {
@@ -6189,12 +6408,12 @@ function getInstallCommand2(pm, packages) {
 }
 function detectFrameworkFromPackageJson(cwd = process.cwd()) {
   const pkgPath = join5(cwd, "package.json");
-  if (!existsSync10(pkgPath)) {
+  if (!existsSync11(pkgPath)) {
     return null;
   }
   let pkg;
   try {
-    pkg = JSON.parse(readFileSync9(pkgPath, "utf-8"));
+    pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
   } catch {
     return null;
   }
@@ -6210,23 +6429,25 @@ function detectFrameworkFromPackageJson(cwd = process.cwd()) {
   return null;
 }
 function hasRcConfig(cwd = process.cwd()) {
-  return existsSync10(join5(cwd, ".mutagentrc.json"));
+  return existsSync11(join5(cwd, ".mutagentrc.json"));
 }
+
+// src/commands/init.ts
 function writeRcConfig(config, cwd = process.cwd()) {
-  const rcPath = join5(cwd, ".mutagentrc.json");
+  const rcPath = join6(cwd, ".mutagentrc.json");
   writeFileSync4(rcPath, JSON.stringify(config, null, 2) + `
 `);
 }
 function createInitCommand() {
-  const init = new Command11("init").description("Initialize MutagenT in your project").option("--non-interactive", "Skip interactive prompts (defaults to CLI-only mode)").addHelpText("after", `
+  const init = new Command14("init").description("Initialize MutagenT in your project").option("--non-interactive", "Skip interactive prompts (defaults to CLI-only mode)").addHelpText("after", `
 Examples:
-  ${chalk14.dim("$")} mutagent init                     # Interactive setup wizard
-  ${chalk14.dim("$")} mutagent init --non-interactive    # CLI-only mode (no prompts)
+  ${chalk19.dim("$")} mutagent init                     # Interactive setup wizard
+  ${chalk19.dim("$")} mutagent init --non-interactive    # CLI-only mode (no prompts)
 
 Modes:
-  ${chalk14.bold("Full scaffold")}     Install SDK + integration package, create config, setup tracing
-  ${chalk14.bold("CLI-only")}          Verify auth + create .mutagentrc.json with workspace/endpoint
-  ${chalk14.bold("Skip")}              Exit without changes
+  ${chalk19.bold("Full scaffold")}     Install SDK + integration package, create config, setup tracing
+  ${chalk19.bold("CLI-only")}          Verify auth + create .mutagentrc.json with workspace/endpoint
+  ${chalk19.bold("Skip")}              Exit without changes
     `).action(async (options) => {
     const isJson = getJsonFlag(init);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -6384,7 +6605,7 @@ Modes:
         output.info(`Installing: ${packages.join(", ")}`);
         output.info(`Running: ${installCmd}`);
         try {
-          execSync2(installCmd, { cwd, stdio: "inherit" });
+          execSync3(installCmd, { cwd, stdio: "inherit" });
           output.success("Packages installed successfully.");
         } catch {
           output.error("Package installation failed. You can install manually:");
@@ -6427,8 +6648,8 @@ Modes:
         }
       }
       if (!isNonInteractive) {
-        const skillPath = join5(cwd, ".claude/skills/mutagent-cli/SKILL.md");
-        if (!existsSync10(skillPath)) {
+        const skillPath = join6(cwd, ".claude/skills/mutagent-cli/SKILL.md");
+        if (!existsSync12(skillPath)) {
           const { installSkill } = await inquirer3.prompt([{
             type: "confirm",
             name: "installSkill",
@@ -6437,11 +6658,11 @@ Modes:
           }]);
           if (installSkill) {
             try {
-              const skillDir = join5(cwd, ".claude/skills/mutagent-cli");
-              if (!existsSync10(skillDir)) {
+              const skillDir = join6(cwd, ".claude/skills/mutagent-cli");
+              if (!existsSync12(skillDir)) {
                 mkdirSync3(skillDir, { recursive: true });
               }
-              execSync2("node " + join5(cwd, "node_modules/.bin/mutagent") + " skills install", {
+              execSync3("node " + join6(cwd, "node_modules/.bin/mutagent") + " skills install", {
                 cwd,
                 stdio: "ignore"
               });
@@ -6475,24 +6696,24 @@ Modes:
 }
 
 // src/commands/explore.ts
-import { Command as Command12 } from "commander";
-import chalk15 from "chalk";
+import { Command as Command15 } from "commander";
+import chalk20 from "chalk";
 import { resolve as resolve3 } from "path";
 init_errors();
 function createExploreCommand() {
-  const explore = new Command12("explore").description("Scan codebase for prompts, datasets, and MutagenT markers").option("-p, --path <dir>", "Directory to scan", ".").option("--depth <n>", "Max directory depth", "10").option("--include <glob>", "Include file pattern", "**/*.{ts,js,py,tsx,jsx}").option("--exclude <dirs>", "Comma-separated directories to exclude", "node_modules,dist,.git,build,.next,__pycache__,venv,.venv").option("--markers-only", "Only find existing MutagenT markers").addHelpText("after", `
+  const explore = new Command15("explore").description("Scan codebase for prompts, datasets, and MutagenT markers").option("-p, --path <dir>", "Directory to scan", ".").option("--depth <n>", "Max directory depth", "10").option("--include <glob>", "Include file pattern", "**/*.{ts,js,py,tsx,jsx}").option("--exclude <dirs>", "Comma-separated directories to exclude", "node_modules,dist,.git,build,.next,__pycache__,venv,.venv").option("--markers-only", "Only find existing MutagenT markers").addHelpText("after", `
 Examples:
-  ${chalk15.dim("$")} mutagent explore
-  ${chalk15.dim("$")} mutagent explore --path ./src
-  ${chalk15.dim("$")} mutagent explore --include "**/*.{ts,py}" --depth 5
-  ${chalk15.dim("$")} mutagent explore --markers-only
-  ${chalk15.dim("$")} mutagent explore --json
+  ${chalk20.dim("$")} mutagent explore
+  ${chalk20.dim("$")} mutagent explore --path ./src
+  ${chalk20.dim("$")} mutagent explore --include "**/*.{ts,py}" --depth 5
+  ${chalk20.dim("$")} mutagent explore --markers-only
+  ${chalk20.dim("$")} mutagent explore --json
 
 Detection modes:
-  ${chalk15.dim("Heuristic")}  Template variables ({{var}}), prompt constants, schema definitions
-  ${chalk15.dim("Marker")}     MutagenT:START/END comment markers from previous uploads
+  ${chalk20.dim("Heuristic")}  Template variables ({{var}}), prompt constants, schema definitions
+  ${chalk20.dim("Marker")}     MutagenT:START/END comment markers from previous uploads
 
-${chalk15.dim("Results are saved to .mutagent/mutation-context.md for use by other commands.")}
+${chalk20.dim("Results are saved to .mutagent/mutation-context.md for use by other commands.")}
     `).action((options) => {
     const isJson = getJsonFlag(explore);
     const output = new OutputFormatter(isJson ? "json" : "table");
@@ -6510,7 +6731,7 @@ ${chalk15.dim("Results are saved to .mutagent/mutation-context.md for use by oth
         markersOnly
       };
       if (!isJson) {
-        console.log(chalk15.cyan(`
+        console.log(chalk20.cyan(`
 Scanning ${scanPath}...
 `));
       }
@@ -6539,40 +6760,41 @@ Scanning ${scanPath}...
         const totalFindings = result.prompts.length + result.datasets.length + result.markers.length;
         if (totalFindings === 0) {
           output.info("No prompts, datasets, or markers found.");
-          console.log(chalk15.dim(`
+          console.log(chalk20.dim(`
   Tip: Create a prompt with template variables like {{input}} to get started.`));
           return;
         }
         if (result.prompts.length > 0) {
-          console.log(chalk15.bold(`  Prompts Found (${String(result.prompts.length)}):`));
+          console.log(chalk20.bold(`  Prompts Found (${String(result.prompts.length)}):`));
           console.log();
           for (const p of result.prompts) {
-            const reasonTag = chalk15.dim(`[${p.reason}]`);
-            console.log(`    ${chalk15.green(p.file)}:${chalk15.yellow(String(p.line))} ${reasonTag}`);
-            console.log(`      ${chalk15.dim(p.preview)}`);
+            const confidenceTag = p.confidence === "high" ? chalk20.green("[high]") : p.confidence === "medium" ? chalk20.yellow("[medium]") : chalk20.dim("[low]");
+            const reasonTag = chalk20.dim(`[${p.reason}]`);
+            console.log(`    ${confidenceTag} ${chalk20.green(p.file)}:${chalk20.yellow(String(p.line))} ${reasonTag}`);
+            console.log(`      ${chalk20.dim(p.preview)}`);
           }
           console.log();
         }
         if (result.datasets.length > 0) {
-          console.log(chalk15.bold(`  Datasets Found (${String(result.datasets.length)}):`));
+          console.log(chalk20.bold(`  Datasets Found (${String(result.datasets.length)}):`));
           console.log();
           for (const d of result.datasets) {
-            console.log(`    ${chalk15.green(d.file)} ${chalk15.dim(`(${String(d.items)} items)`)}`);
+            console.log(`    ${chalk20.green(d.file)} ${chalk20.dim(`(${String(d.items)} items)`)}`);
           }
           console.log();
         }
         if (result.markers.length > 0) {
-          console.log(chalk15.bold(`  MutagenT Markers (${String(result.markers.length)}):`));
+          console.log(chalk20.bold(`  MutagenT Markers (${String(result.markers.length)}):`));
           console.log();
           for (const m of result.markers) {
-            const idPart = m.platformId ? chalk15.cyan(` id=${m.platformId}`) : "";
-            console.log(`    ${chalk15.green(m.file)}:${chalk15.yellow(String(m.line))} ${chalk15.magenta(m.type)}${idPart}`);
+            const idPart = m.platformId ? chalk20.cyan(` id=${m.platformId}`) : "";
+            console.log(`    ${chalk20.green(m.file)}:${chalk20.yellow(String(m.line))} ${chalk20.magenta(m.type)}${idPart}`);
           }
           console.log();
         }
-        console.log(chalk15.dim("  ─────────────────────────────────"));
-        console.log(`  ${chalk15.bold("Summary:")} ${String(result.prompts.length)} prompts, ${String(result.datasets.length)} datasets, ${String(result.markers.length)} markers`);
-        console.log(chalk15.dim(`  Saved to .mutagent/mutation-context.md`));
+        console.log(chalk20.dim("  ─────────────────────────────────"));
+        console.log(`  ${chalk20.bold("Summary:")} ${String(result.prompts.length)} prompts, ${String(result.datasets.length)} datasets, ${String(result.markers.length)} markers`);
+        console.log(chalk20.dim(`  Saved to .mutagent/mutation-context.md`));
         console.log();
       }
     } catch (error) {
@@ -6583,14 +6805,14 @@ Scanning ${scanPath}...
 }
 
 // src/commands/skills.ts
-import { Command as Command13 } from "commander";
-import chalk16 from "chalk";
-import { existsSync as existsSync11, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
-import { join as join6 } from "path";
-import { execSync as execSync3 } from "child_process";
+import { Command as Command16 } from "commander";
+import chalk21 from "chalk";
+import { existsSync as existsSync13, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
+import { join as join7 } from "path";
+import { execSync as execSync4 } from "child_process";
 function findRepoRoot() {
   try {
-    return execSync3("git rev-parse --show-toplevel", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+    return execSync4("git rev-parse --show-toplevel", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
   } catch {
     return process.cwd();
   }
@@ -6704,10 +6926,10 @@ Every evaluation MUST specify criteria targeting either:
 var SKILL_DIR = ".claude/skills/mutagent-cli";
 var SKILL_FILE = "SKILL.md";
 function createSkillsCommand() {
-  const skills = new Command13("skills").description("Manage MutagenT CLI skills for coding agents");
+  const skills = new Command16("skills").description("Manage MutagenT CLI skills for coding agents");
   skills.command("install").description("Install MutagenT CLI skill for Claude Code").addHelpText("after", `
 Examples:
-  ${chalk16.dim("$")} mutagent skills install
+  ${chalk21.dim("$")} mutagent skills install
 
 This creates a Claude Code skill at .claude/skills/mutagent-cli/SKILL.md
 that teaches coding agents how to use the MutagenT CLI effectively.
@@ -6716,9 +6938,9 @@ that teaches coding agents how to use the MutagenT CLI effectively.
     const isJson = parentCmd ? getJsonFlag(parentCmd) : false;
     const output = new OutputFormatter(isJson ? "json" : "table");
     const repoRoot = findRepoRoot();
-    const skillDir = join6(repoRoot, SKILL_DIR);
-    const skillPath = join6(skillDir, SKILL_FILE);
-    if (!existsSync11(skillDir)) {
+    const skillDir = join7(repoRoot, SKILL_DIR);
+    const skillPath = join7(skillDir, SKILL_FILE);
+    if (!existsSync13(skillDir)) {
       mkdirSync4(skillDir, { recursive: true });
     }
     const content = `${SKILL_FRONTMATTER}
@@ -6734,10 +6956,10 @@ ${SKILL_BODY}
       });
     } else {
       output.success(`Installed MutagenT CLI skill`);
-      console.log(`  ${chalk16.dim("Path:")} ${skillPath}`);
+      console.log(`  ${chalk21.dim("Path:")} ${skillPath}`);
       console.log("");
-      console.log(`  ${chalk16.dim("This skill teaches coding agents how to use the MutagenT CLI.")}`);
-      console.log(`  ${chalk16.dim("It will be automatically loaded by Claude Code when relevant triggers match.")}`);
+      console.log(`  ${chalk21.dim("This skill teaches coding agents how to use the MutagenT CLI.")}`);
+      console.log(`  ${chalk21.dim("It will be automatically loaded by Claude Code when relevant triggers match.")}`);
     }
   });
   return skills;
@@ -6745,8 +6967,8 @@ ${SKILL_BODY}
 
 // src/commands/usage.ts
 init_config();
-import { Command as Command14 } from "commander";
-import chalk17 from "chalk";
+import { Command as Command17 } from "commander";
+import chalk22 from "chalk";
 init_errors();
 init_sdk_client();
 var TRIAL_OPTIMIZATION_LIMIT = 5;
@@ -6760,10 +6982,10 @@ function renderProgressBar(used, limit, width = 30) {
   return `${bar} ${String(percent)}%`;
 }
 function createUsageCommand() {
-  const usage = new Command14("usage").description("Show resource counts and optimization run limits").addHelpText("after", `
+  const usage = new Command17("usage").description("Show resource counts and optimization run limits").addHelpText("after", `
 Examples:
-  ${chalk17.dim("$")} mutagent usage
-  ${chalk17.dim("$")} mutagent usage --json
+  ${chalk22.dim("$")} mutagent usage
+  ${chalk22.dim("$")} mutagent usage --json
     `);
   usage.action(async () => {
     const isJson = getJsonFlag(usage);
@@ -6818,21 +7040,21 @@ Examples:
         });
       } else {
         console.log("");
-        console.log(chalk17.bold("\uD83D\uDCCA MutagenT Usage"));
-        console.log(chalk17.dim("─".repeat(45)));
+        console.log(chalk22.bold("\uD83D\uDCCA MutagenT Usage"));
+        console.log(chalk22.dim("─".repeat(45)));
         console.log("");
-        console.log(chalk17.bold("Resources:"));
-        console.log(`  Prompts:       ${chalk17.cyan(String(promptCount))}`);
-        console.log(`  Datasets:      ${chalk17.cyan(String(datasetCount))}`);
-        console.log(`  Evaluations:   ${chalk17.cyan(String(evaluationCount))}`);
+        console.log(chalk22.bold("Resources:"));
+        console.log(`  Prompts:       ${chalk22.cyan(String(promptCount))}`);
+        console.log(`  Datasets:      ${chalk22.cyan(String(datasetCount))}`);
+        console.log(`  Evaluations:   ${chalk22.cyan(String(evaluationCount))}`);
         console.log("");
-        console.log(chalk17.bold(`Optimization Runs (${chalk17.yellow("trial")} plan):`));
-        console.log(`  Remaining:  ${chalk17.cyan(String(optimizationRemaining))} / ${String(optimizationLimit)}`);
+        console.log(chalk22.bold(`Optimization Runs (${chalk22.yellow("trial")} plan):`));
+        console.log(`  Remaining:  ${chalk22.cyan(String(optimizationRemaining))} / ${String(optimizationLimit)}`);
         console.log(`  ${renderProgressBar(optimizationUsed, optimizationLimit)}`);
         console.log("");
-        console.log(chalk17.yellow(`  ⚠ ${String(optimizationRemaining)} optimization runs remaining`));
-        console.log(chalk17.dim(`  ℹ Optimization run counts are approximate`));
-        console.log(`  Upgrade: ${chalk17.underline(BILLING_URL)}`);
+        console.log(chalk22.yellow(`  ⚠ ${String(optimizationRemaining)} optimization runs remaining`));
+        console.log(chalk22.dim(`  ℹ Optimization run counts are approximate`));
+        console.log(`  Upgrade: ${chalk22.underline(BILLING_URL)}`);
         console.log("");
       }
     } catch (error) {
@@ -6850,12 +7072,12 @@ if (process.env.CLI_VERSION) {
 } else {
   try {
     const __dirname2 = dirname(fileURLToPath(import.meta.url));
-    const pkgPath = join7(__dirname2, "..", "..", "package.json");
-    const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+    const pkgPath = join8(__dirname2, "..", "..", "package.json");
+    const pkg = JSON.parse(readFileSync11(pkgPath, "utf-8"));
     cliVersion = pkg.version ?? cliVersion;
   } catch {}
 }
-var program = new Command15;
+var program = new Command18;
 program.name("mutagent").description(`MutagenT CLI - AI-native prompt optimization platform
 
   Documentation: https://docs.mutagent.io/cli
@@ -6864,56 +7086,57 @@ program.name("mutagent").description(`MutagenT CLI - AI-native prompt optimizati
   showGlobalOptions: true
 });
 program.addHelpText("after", `
-${chalk18.yellow("Non-Interactive Mode (CI/CD & Coding Agents):")}
-  export MUTAGENT_API_KEY=mt_...  ${chalk18.dim("or")}  --api-key mt_...
-  --json ${chalk18.dim("for structured output")}    --non-interactive ${chalk18.dim("to disable prompts")}
-
-${chalk18.yellow("Command Navigation:")}
-  mutagent auth login --browser         ${chalk18.dim("Authenticate (OAuth)")}
-  mutagent auth status                  ${chalk18.dim("Check auth + workspace")}
-  mutagent init                         ${chalk18.dim("Initialize project (.mutagentrc.json)")}
-  mutagent explore                      ${chalk18.dim("Discover prompts in codebase")}
-  mutagent workspaces list --json       ${chalk18.dim("List workspaces (verify ID)")}
-  mutagent config set workspace <id>    ${chalk18.dim("Set active workspace")}
-  mutagent usage --json                 ${chalk18.dim("Check plan limits")}
-
-  mutagent prompts create --help        ${chalk18.dim("Upload prompt (read help first!)")}
-  mutagent prompts list --json          ${chalk18.dim("List prompts")}
-  mutagent prompts get <id> --json      ${chalk18.dim("Full prompt details + schemas")}
-
-  mutagent prompts dataset add --help   ${chalk18.dim("Upload dataset (read help first!)")}
-  mutagent prompts dataset list <id>    ${chalk18.dim("List datasets")}
-
-  mutagent prompts evaluation create --help           ${chalk18.dim("Create eval (read help first!)")}
-  mutagent prompts evaluation create <id> --guided --json   ${chalk18.dim("Guided eval workflow")}
-  mutagent prompts evaluation list <id> --json        ${chalk18.dim("List evaluations")}
-
-  mutagent prompts optimize start --help      ${chalk18.dim("Run optimization (read help first!)")}
-  mutagent prompts optimize status <job-id>   ${chalk18.dim("Poll progress")}
-  mutagent prompts optimize results <job-id>  ${chalk18.dim("View scorecard")}
-
-  mutagent integrate <framework>        ${chalk18.dim("Framework integration guide")}
-  mutagent playground run <id> --input '{...}'  ${chalk18.dim("Quick test")}
-
-${chalk18.yellow("Workflow: Evaluate → Optimize:")}
-  1. mutagent prompts create --help               ${chalk18.dim("← read help")}
-  2. mutagent prompts create ... --json            ${chalk18.dim("← upload prompt with {variables}")}
-  3. mutagent prompts dataset add --help           ${chalk18.dim("← read help")}
-  4. mutagent prompts dataset add <id> ... --json  ${chalk18.dim("← upload dataset")}
-  5. mutagent prompts evaluation create <id> --guided --json  ${chalk18.dim("← guided eval")}
+${chalk23.yellow("Non-Interactive Mode (CI/CD & Coding Agents):")}
+  export MUTAGENT_API_KEY=mt_...  ${chalk23.dim("or")}  --api-key mt_...
+  --json ${chalk23.dim("for structured output")}    --non-interactive ${chalk23.dim("to disable prompts")}
+
+${chalk23.yellow("Command Navigation:")}
+  mutagent auth login --browser         ${chalk23.dim("Authenticate (OAuth)")}
+  mutagent auth status                  ${chalk23.dim("Check auth + workspace")}
+  mutagent init                         ${chalk23.dim("Initialize project (.mutagentrc.json)")}
+  mutagent explore                      ${chalk23.dim("Discover prompts in codebase")}
+  mutagent workspaces list --json       ${chalk23.dim("List workspaces (verify ID)")}
+  mutagent config set workspace <id>    ${chalk23.dim("Set active workspace")}
+  mutagent usage --json                 ${chalk23.dim("Check plan limits")}
+
+  mutagent prompts create --help        ${chalk23.dim("Upload prompt (read help first!)")}
+  mutagent prompts list --json          ${chalk23.dim("List prompts")}
+  mutagent prompts get <id> --json      ${chalk23.dim("Full prompt details + schemas")}
+
+  mutagent prompts dataset add --help   ${chalk23.dim("Upload dataset (read help first!)")}
+  mutagent prompts dataset list <id>    ${chalk23.dim("List datasets")}
+
+  mutagent prompts evaluation create --help           ${chalk23.dim("Create eval (read help first!)")}
+  mutagent prompts evaluation create <id> --guided --json   ${chalk23.dim("Guided eval workflow")}
+  mutagent prompts evaluation list <id> --json        ${chalk23.dim("List evaluations")}
+
+  mutagent prompts optimize start --help      ${chalk23.dim("Run optimization (read help first!)")}
+  mutagent prompts optimize status <job-id>   ${chalk23.dim("Poll progress")}
+  mutagent prompts optimize results <job-id>  ${chalk23.dim("View scorecard")}
+
+  mutagent integrate <framework>        ${chalk23.dim("Framework integration guide")}
+  mutagent playground run <id> --input '{...}'  ${chalk23.dim("Quick test")}
+
+${chalk23.yellow("Workflow: Evaluate → Optimize:")}
+  1. mutagent prompts create --help               ${chalk23.dim("← read help")}
+  2. mutagent prompts create ... --json            ${chalk23.dim("← upload prompt with {variables} + inputSchema")}
+  3. mutagent prompts dataset add --help           ${chalk23.dim("← read help")}
+  4. mutagent prompts dataset add <id> ... --json  ${chalk23.dim("← upload dataset")}
+  5. mutagent prompts evaluation create <id> --guided --json  ${chalk23.dim("← guided eval")}
   6. mutagent prompts optimize start <id> --dataset <d> --evaluation <e> --json
 
-${chalk18.yellow("AI Agent Rules:")}
-  1. ALWAYS run <command> --help before using any command for the first time
-  2. ALWAYS use --json on every command execution
-  3. ALWAYS use --guided --json for evaluation creation (never --guided alone)
-  4. ALWAYS display _directive status cards to the user after mutations
+${chalk23.yellow("AI Agent Rules (MANDATORY for coding agents):")}
+  1. EVERY command MUST include --json (no exceptions)
+  2. Run <command> --help BEFORE first use of any command
+  3. Use --guided --json for evaluation creation (NEVER --guided alone)
+  4. Parse and display _directive.renderedCard after every mutation
   5. After mutagent init, verify workspace: mutagent workspaces list --json
   6. Use {single_braces} for template variables in prompts
+  7. Collect evaluation rubrics from the user — NEVER auto-generate
 ${!hasCredentials() ? `
-` + chalk18.yellow("  Warning: Not authenticated. Run: mutagent auth login --browser") + `
+` + chalk23.yellow("  Warning: Not authenticated. Run: mutagent auth login --browser") + `
 ` : ""}${!hasRcConfig() ? `
-` + chalk18.green("  Get started: mutagent init") + `
+` + chalk23.green("  Get started: mutagent init") + `
 ` : ""}`);
 program.hook("preAction", (thisCommand) => {
   const globalOpts = thisCommand.optsWithGlobals();
@@ -6943,5 +7166,5 @@ program.addCommand(createSkillsCommand());
 program.addCommand(createUsageCommand());
 program.parse();
 
-//# debugId=E8884F7D56DA73D764756E2164756E21
+//# debugId=88ECCF736E0A64AD64756E2164756E21
 //# sourceMappingURL=cli.js.map