yapout 0.15.2 → 0.16.0

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command16 } from "commander";
+import { Command as Command17 } from "commander";
 
 // src/commands/login.ts
 import { Command as Command2 } from "commander";
@@ -45,6 +45,31 @@ function getRepoFullName(cwd) {
   if (httpsMatch) return httpsMatch[1];
   throw new Error(`Could not parse GitHub repo from remote URL: ${url}`);
 }
+function getOriginRemoteUrl(cwd) {
+  return git("remote get-url origin", cwd);
+}
+function normalizeGitRemote(raw) {
+  if (!raw) return null;
+  let s = raw.trim();
+  if (s.endsWith(".git")) s = s.slice(0, -4);
+  s = s.replace(/^git@([^:]+):/, "$1/");
+  s = s.replace(/^ssh:\/\/(?:git@)?/, "");
+  s = s.replace(/^https?:\/\//, "");
+  s = s.replace(/^github\.com\//, "");
+  const parts = s.split("/").filter(Boolean);
+  if (parts.length < 2) return null;
+  const owner = parts[0];
+  const repo = parts[1];
+  return `https://github.com/${owner}/${repo}`;
+}
+function isInGitRepo(cwd) {
+  try {
+    git("rev-parse --git-dir", cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function getDefaultBranch(cwd) {
   try {
     const ref = git("rev-parse --abbrev-ref origin/HEAD", cwd);
@@ -174,6 +199,43 @@ function getOrCreateDeviceIdentity(defaultName) {
   writeDeviceIdentity(identity);
   return identity;
 }
+function readResourceConfig(cwd) {
+  const path = join(resolveRepoRoot(cwd), ".yapout", "config.json");
+  if (!existsSync(path)) return null;
+  try {
+    const raw = JSON.parse(readFileSync(path, "utf-8"));
+    if (!raw || typeof raw !== "object") return null;
+    if (!raw.resourceId || !raw.canonicalId) return null;
+    return raw;
+  } catch {
+    return null;
+  }
+}
+function writeResourceConfig(cwd, cfg) {
+  const yapoutDir = join(resolveRepoRoot(cwd), ".yapout");
+  if (!existsSync(yapoutDir)) {
+    mkdirSync(yapoutDir, { recursive: true });
+  }
+  const path = join(yapoutDir, "config.json");
+  writeFileSync(path, JSON.stringify(cfg, null, 2) + "\n");
+}
+function readActiveExecution(cwd) {
+  const path = join(cwd, ".yapout", "active-execution.json");
+  if (!existsSync(path)) {
+    const fallback = join(resolveRepoRoot(cwd), ".yapout", "active-execution.json");
+    if (!existsSync(fallback)) return null;
+    try {
+      return JSON.parse(readFileSync(fallback, "utf-8"));
+    } catch {
+      return null;
+    }
+  }
+  try {
+    return JSON.parse(readFileSync(path, "utf-8"));
+  } catch {
+    return null;
+  }
+}
 var WATCH_DEFAULTS = {
   auto_enrich: true,
   auto_implement: true,
@@ -296,7 +358,7 @@ function requireAuth() {
 }
 
 // src/commands/serve.ts
-var CLI_VERSION = "0.15.2";
+var CLI_VERSION = "0.16.0";
 var DEFAULT_PORT = 7777;
 var PORT_RANGE = 10;
 var HEARTBEAT_MS = 12e4;
@@ -345,7 +407,7 @@ function startServer(payload) {
     res.writeHead(404, headers);
     res.end();
   });
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     let attempt = 0;
     const tryListen = () => {
       const port = DEFAULT_PORT + attempt;
@@ -361,7 +423,7 @@ function startServer(payload) {
       server.once("error", onError);
       server.listen(port, "127.0.0.1", () => {
         server.removeListener("error", onError);
-        resolve12({
+        resolve13({
           port,
           close: () => server.close()
         });
@@ -518,7 +580,7 @@ var serveCommand = new Command("serve").description(
 });
 
 // src/commands/login.ts
-var CLI_VERSION2 = "0.15.2";
+var CLI_VERSION2 = "0.16.0";
 function safeReturnTo(raw) {
   if (!raw) return null;
   try {
@@ -530,7 +592,7 @@ function safeReturnTo(raw) {
   }
 }
 function startCallbackServer() {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let resolveData;
     let rejectData;
     const dataPromise = new Promise((res, rej) => {
@@ -579,7 +641,7 @@ function startCallbackServer() {
     server.listen(0, () => {
       const address = server.address();
       const port = typeof address === "object" && address ? address.port : 0;
-      resolve12({ port, data: dataPromise });
+      resolve13({ port, data: dataPromise });
     });
     setTimeout(() => {
       server.close();
@@ -681,15 +743,6 @@ async function pickProject(projects) {
     })
   });
 }
-async function pickOrg(orgs, message = "Which org does this project belong to?") {
-  return await select({
-    message,
-    choices: orgs.map((o) => ({
-      name: `${o.name}  (${o.slug}, ${o.role})`,
-      value: o
-    }))
-  });
-}
 
 // src/commands/link.ts
 var CONFIG_YAML_CONTENT = `# yapout local configuration
@@ -716,7 +769,50 @@ branch_prefix: feat
 #   {{ticket.linearTicketId}}, {{ticket.id}}
 # commit_template: "{{ticket.type}}({{ticket.linearTicketId}}): {{ticket.title}}"
 `;
-var linkCommand = new Command4("link").description("Link the current directory to a yapout project").action(async () => {
+var linkCommand = new Command4("link").description(
+  "Link the current Resource into a Group (--group), or link the current directory to a project (legacy)."
+).option(
+  "--group <groupId>",
+  "Attach the active Resource into a Group (requires `yapout init` to have run in this repo)"
+).action(async (options) => {
+  if (options.group) {
+    await linkResourceToGroup(options.group);
+    return;
+  }
+  await legacyLinkProject();
+});
+async function linkResourceToGroup(groupId) {
+  const creds = requireAuth();
+  const cwd = resolve2(process.cwd());
+  const resourceCfg = readResourceConfig(cwd);
+  if (!resourceCfg) {
+    console.error(
+      chalk5.red("No `.yapout/config.json` found.") + " Run " + chalk5.cyan("yapout init") + " here first."
+    );
+    process.exit(1);
+  }
+  const client = createConvexClient(creds.token);
+  try {
+    await client.mutation(anyApi.functions.resourcesCli.linkResourceToGroup, {
+      resourceId: resourceCfg.resourceId,
+      groupId
+    });
+  } catch (err) {
+    console.error(
+      chalk5.red("Failed to link Resource to Group."),
+      err.message
+    );
+    process.exit(1);
+  }
+  writeResourceConfig(resolve2(process.cwd()), {
+    ...resourceCfg,
+    groupId
+  });
+  console.log(
+    chalk5.green("Linked Resource ") + chalk5.cyan(resourceCfg.canonicalId) + chalk5.green(" to Group ") + chalk5.cyan(groupId) + "."
+  );
+}
+async function legacyLinkProject() {
   const creds = requireAuth();
   const cwd = resolveRepoRoot(resolve2(process.cwd()));
   const client = createConvexClient(creds.token);
@@ -776,10 +872,7 @@ var linkCommand = new Command4("link").description("Link the current directory t
   if (existsSync3(gitignorePath)) {
     const content = readFileSync3(gitignorePath, "utf-8");
     if (!content.includes(".yapout/")) {
-      appendFileSync(
-        gitignorePath,
-        "\n# yapout local config\n.yapout/\n"
-      );
+      appendFileSync(gitignorePath, "\n# yapout local config\n.yapout/\n");
     }
   } else {
     writeFileSync3(gitignorePath, "# yapout local config\n.yapout/\n");
@@ -803,7 +896,7 @@ var linkCommand = new Command4("link").description("Link the current directory t
   console.log(
     chalk5.green(`Linked to ${label}${orgSuffix}.`) + " Claude Code will discover yapout tools automatically."
   );
-});
+}
 function getCliVersion() {
   try {
     const pkg = JSON.parse(
@@ -916,7 +1009,6 @@ import {
   readFileSync as readFileSync5,
   appendFileSync as appendFileSync2
 } from "fs";
-import { hostname as hostname4 } from "os";
 import chalk8 from "chalk";
 var CONFIG_YAML_CONTENT2 = `# yapout local configuration
 # See: https://docs.yapout.dev/cli/config
@@ -927,7 +1019,6 @@ var CONFIG_YAML_CONTENT2 = `# yapout local configuration
 #   - npm run lint
 #   - npm run typecheck
 #   - npm run test
-#   - sf project deploy --dry-run --target-org scratch
 post_flight: []
 
 # Require post_flight checks to pass before yapout_ship succeeds.
@@ -936,170 +1027,89 @@ ship_requires_checks: false
 
 # Git branch prefix (used by yapout_claim)
 branch_prefix: feat
-
-# Commit message template (optional \u2014 uses sensible default if omitted)
-# Available variables: {{ticket.title}}, {{ticket.type}}, {{ticket.priority}},
-#   {{ticket.linearTicketId}}, {{ticket.id}}
-# commit_template: "{{ticket.type}}({{ticket.linearTicketId}}): {{ticket.title}}"
 `;
-var initCommand = new Command7("init").description("Create a yapout project from the current repo and link it").argument("[name]", "Project name (defaults to repo name)").option("--org <slug>", "Org slug to create the project in (skips picker)").action(async (name, options) => {
+var initCommand = new Command7("init").description(
+  "Register the current repo as a Resource and start the MCP server scoped to it"
+).option(
+  "--group <groupId>",
+  "Optional Group id to attach the Resource to (defaults to the org's migration-bridge group)"
+).action(async (options) => {
   const creds = requireAuth();
-  const cwd = resolveRepoRoot(resolve5(process.cwd()));
-  let repoFullName;
-  let defaultBranch;
-  try {
-    repoFullName = getRepoFullName(cwd);
-    defaultBranch = getDefaultBranch(cwd);
-  } catch (err) {
+  const cwd = resolve5(process.cwd());
+  if (!isInGitRepo(cwd)) {
     console.error(
-      chalk8.red("Not a git repo with a GitHub remote."),
-      err.message
+      chalk8.red("`yapout init` must be run from inside a git repo.") + "\n  No .git/ directory found from " + chalk8.dim(cwd) + "."
     );
     process.exit(1);
   }
-  const projectName = name || repoFullName.split("/")[1] || "unnamed";
-  const client = createConvexClient(creds.token);
-  let orgs;
+  const repoRoot = resolveRepoRoot(cwd);
+  let rawRemote;
   try {
-    orgs = await client.query(
-      anyApi.functions.orgMembers.getMyOrgs,
-      {}
-    );
+    rawRemote = getOriginRemoteUrl(repoRoot);
   } catch (err) {
     console.error(
-      chalk8.red("Failed to load your orgs."),
-      err.message
+      chalk8.red("Failed to read origin remote URL.") + "\n  " + err.message + "\n  Set a GitHub remote (`git remote add origin ...`) before running `yapout init`."
     );
     process.exit(1);
   }
-  if (!orgs || orgs.length === 0) {
+  const canonicalId = normalizeGitRemote(rawRemote);
+  if (!canonicalId) {
     console.error(
       chalk8.red(
-        "You aren't a member of any org. Sign in to the web app once to create your personal org, then re-run."
-      )
+        `Could not derive a canonical id from the origin remote URL: ${rawRemote}`
+      ) + "\n  yapout currently supports github.com remotes only."
     );
     process.exit(1);
   }
-  let chosenOrgId;
-  let chosenOrgName;
-  if (options?.org) {
-    const match = orgs.find((o) => o.org.slug === options.org);
-    if (!match) {
-      console.error(
-        chalk8.red(`Org "${options.org}" not found among your memberships.`)
-      );
-      console.error(
-        chalk8.dim(
-          "Available: " + orgs.map((o) => o.org.slug).join(", ")
-        )
-      );
-      process.exit(1);
-    }
-    chosenOrgId = match.org._id;
-    chosenOrgName = match.org.name;
-  } else if (orgs.length === 1) {
-    chosenOrgId = orgs[0].org._id;
-    chosenOrgName = orgs[0].org.name;
-    console.log(
-      chalk8.dim(`Creating in `) + chalk8.cyan(chosenOrgName)
-    );
-  } else {
-    const picked = await pickOrg(
-      orgs.map((o) => ({
-        id: o.org._id,
-        name: o.org.name,
-        slug: o.org.slug,
-        role: o.role
-      }))
-    );
-    chosenOrgId = picked.id;
-    chosenOrgName = picked.name;
-  }
-  const device = getOrCreateDeviceIdentity(hostname4());
+  let defaultBranch;
   try {
-    await client.mutation(anyApi.functions.devices.registerDevice, {
-      deviceId: device.deviceId,
-      name: device.name,
-      cliVersion: getCliVersion2(),
-      machineHostname: hostname4()
-    });
-  } catch (err) {
-    console.warn(
-      chalk8.yellow("Warning: device registration failed \u2014 "),
-      err.message
-    );
+    defaultBranch = getDefaultBranch(repoRoot);
+  } catch {
+    defaultBranch = void 0;
   }
+  const client = createConvexClient(creds.token);
   let result;
   try {
     result = await client.mutation(
-      anyApi.functions.projects.createProjectFromCli,
+      anyApi.functions.resourcesCli.findOrCreateRepoResource,
       {
-        orgId: chosenOrgId,
-        name: projectName,
-        githubRepoFullName: repoFullName,
-        githubDefaultBranch: defaultBranch
+        canonicalId,
+        remoteUrl: canonicalId,
+        defaultBranch,
+        ...options?.group ? { groupId: options.group } : {}
       }
     );
   } catch (err) {
     console.error(
-      chalk8.red("Failed to create project."),
+      chalk8.red("Failed to register Resource."),
       err.message
     );
     process.exit(1);
   }
-  try {
-    await client.mutation(anyApi.functions.projectCheckouts.linkCheckout, {
-      projectId: result.projectId,
-      deviceId: device.deviceId,
-      localPath: cwd
-    });
-  } catch (err) {
-    console.warn(
-      chalk8.yellow("Warning: failed to record project checkout \u2014 "),
-      err.message
-    );
-  }
-  setProjectMapping(cwd, {
-    projectId: result.projectId,
-    projectName: result.projectName,
+  const yapoutDir = join5(repoRoot, ".yapout");
+  if (!existsSync5(yapoutDir)) mkdirSync3(yapoutDir, { recursive: true });
+  writeResourceConfig(repoRoot, {
+    resourceId: result.resourceId,
+    canonicalId: result.canonicalId,
+    groupId: result.groupId,
+    remoteUrl: canonicalId,
+    defaultBranch,
     linkedAt: Date.now()
   });
-  let agentToken = null;
-  try {
-    const agentRes = await client.mutation(
-      anyApi.functions.agents.createAgent,
-      {
-        projectId: result.projectId,
-        displayName: `${creds.email}'s default agent (${result.projectName})`,
-        roleDescription: "Default agent created at yapout init. Has full tool access.",
-        scopes: ["*"],
-        label: "yapout init default"
-      }
-    );
-    agentToken = agentRes.rawToken;
-  } catch (err) {
-    console.warn(
-      chalk8.yellow("Warning: failed to provision default agent \u2014 "),
-      err.message
-    );
-  }
-  const yapoutDir = join5(cwd, ".yapout");
-  if (!existsSync5(yapoutDir)) mkdirSync3(yapoutDir, { recursive: true });
-  const configPath = join5(yapoutDir, "config.yml");
-  if (!existsSync5(configPath)) {
-    writeFileSync5(configPath, CONFIG_YAML_CONTENT2);
+  const configYamlPath = join5(yapoutDir, "config.yml");
+  if (!existsSync5(configYamlPath)) {
+    writeFileSync5(configYamlPath, CONFIG_YAML_CONTENT2);
   }
-  const gitignorePath = join5(cwd, ".gitignore");
+  const gitignorePath = join5(repoRoot, ".gitignore");
   if (existsSync5(gitignorePath)) {
     const content = readFileSync5(gitignorePath, "utf-8");
     if (!content.includes(".yapout/")) {
-      appendFileSync2(
-        gitignorePath,
-        "\n# yapout local config\n.yapout/\n"
-      );
+      appendFileSync2(gitignorePath, "\n# yapout local config\n.yapout/\n");
     }
+  } else {
+    writeFileSync5(gitignorePath, "# yapout local config\n.yapout/\n");
   }
-  const mcpPath = join5(cwd, ".mcp.json");
+  const mcpPath = join5(repoRoot, ".mcp.json");
   let mcpConfig = {};
   if (existsSync5(mcpPath)) {
     try {
@@ -1110,40 +1120,25 @@ var initCommand = new Command7("init").description("Create a yapout project from
   if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
   const existingYapoutServer = mcpConfig.mcpServers.yapout ?? {};
   const existingEnv = existingYapoutServer.env && typeof existingYapoutServer.env === "object" ? existingYapoutServer.env : {};
-  const newEnv = { ...existingEnv };
-  if (agentToken) {
-    newEnv.YAPOUT_AGENT_TOKEN = agentToken;
-  }
   mcpConfig.mcpServers.yapout = {
     command: "yapout",
     args: ["mcp-server"],
-    ...Object.keys(newEnv).length > 0 ? { env: newEnv } : {}
+    ...Object.keys(existingEnv).length > 0 ? { env: existingEnv } : {}
   };
   writeFileSync5(mcpPath, JSON.stringify(mcpConfig, null, 2) + "\n");
+  const verb = result.created ? "Registered" : "Linked";
   console.log(
-    chalk8.green(`Created project "${result.projectName}"`) + chalk8.dim(
-      ` in ${chosenOrgName} (${repoFullName}, branch: ${defaultBranch})`
-    )
+    chalk8.green(`${verb} Resource `) + chalk8.cyan(canonicalId) + chalk8.dim(` (id: ${result.resourceId}).`)
   );
-  if (agentToken) {
-    console.log(
-      chalk8.dim("Provisioned default agent \u2014 token stored in ") + chalk8.cyan(".mcp.json")
-    );
+  if (defaultBranch) {
+    console.log(chalk8.dim(`  default branch: ${defaultBranch}`));
   }
   console.log(
-    chalk8.dim("Run ") + chalk8.cyan("yapout_compact") + chalk8.dim(" in Claude Code to generate project context.")
+    chalk8.dim(
+      "Claude Code will discover yapout's MCP tools via .mcp.json on next launch."
+    )
   );
 });
-function getCliVersion2() {
-  try {
-    const pkg = JSON.parse(
-      readFileSync5(join5(import.meta.dirname, "..", "package.json"), "utf-8")
-    );
-    return pkg.version ?? "unknown";
-  } catch {
-    return "unknown";
-  }
-}
 
 // src/commands/mcp-server.ts
 import { Command as Command8 } from "commander";
@@ -2581,7 +2576,7 @@ function truncate(text) {
 ` + lines.slice(-MAX_OUTPUT_LINES).join("\n");
 }
 function runCommand(command, cwd) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const start = Date.now();
     const child = exec(command, {
       cwd,
@@ -2589,7 +2584,7 @@ function runCommand(command, cwd) {
       maxBuffer: 10 * 1024 * 1024
       // 10MB
     }, (error, stdout, stderr) => {
-      resolve12({
+      resolve13({
         exitCode: error?.code ?? (error ? 1 : 0),
         stdout: truncate(stdout),
         stderr: truncate(stderr),
@@ -2597,7 +2592,7 @@ function runCommand(command, cwd) {
       });
     });
     child.on("error", () => {
-      resolve12({
+      resolve13({
         exitCode: 1,
         stdout: "",
         stderr: `Command timed out after ${COMMAND_TIMEOUT_MS / 1e3}s`,
@@ -2683,91 +2678,8 @@ function registerCheckTool(server, ctx) {
   );
 }
 
-// src/mcp/tools/bundle.ts
-import { z as z10 } from "zod";
-import { join as join10 } from "path";
-import { existsSync as existsSync10, writeFileSync as writeFileSync8, mkdirSync as mkdirSync7 } from "fs";
-function registerBundleTool(server, ctx) {
-  server.tool(
-    "yapout_bundle",
-    "Add a finding to the current finding's bundle so they ship as one PR",
-    {
-      findingId: z10.string().describe("Finding ID to add to the bundle"),
-      withFinding: z10.string().describe("Lead finding ID (currently being worked on)")
-    },
-    withScopeCheck(ctx, "yapout_bundle", async (args) => {
-      const result = await ctx.client.mutation(
-        anyApi5.functions.bundles.createBundle,
-        { leadFindingId: args.withFinding, joiningFindingId: args.findingId }
-      );
-      const bundledBrief = await ctx.client.query(
-        anyApi5.functions.bundles.getBundledBrief,
-        { bundleId: result.bundleId }
-      );
-      if (!bundledBrief) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                bundleId: result.bundleId,
-                message: "Bundled successfully but could not fetch combined brief."
-              })
-            }
-          ]
-        };
-      }
-      const sections = [
-        `# Bundle: ${bundledBrief.findings.length} findings`,
-        ""
-      ];
-      for (const t of bundledBrief.findings) {
-        sections.push(`## ${t.linearIssueId ?? t.findingId}: ${t.title}`);
-        sections.push("");
-        sections.push(`**Priority:** ${t.priority} | **Type:** ${t.type}`);
-        if (t.linearIssueUrl) sections.push(`**Linear:** ${t.linearIssueUrl}`);
-        sections.push("", t.description);
-        if (t.enrichedDescription) {
-          sections.push("", "### Enriched Description", "", t.enrichedDescription);
-        }
-        if (t.implementationBrief) {
-          sections.push("", "### Implementation Brief", "", t.implementationBrief);
-        }
-        sections.push("", "---", "");
-      }
-      if (bundledBrief.projectContext) {
-        sections.push("## Project Context", "", bundledBrief.projectContext);
-      }
-      const combinedBrief = sections.join("\n");
-      const yapoutDir = join10(ctx.cwd, ".yapout");
-      if (!existsSync10(yapoutDir)) mkdirSync7(yapoutDir, { recursive: true });
-      writeFileSync8(join10(yapoutDir, "brief.md"), combinedBrief);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              {
-                bundleId: result.bundleId,
-                findings: bundledBrief.findings.map((t) => ({
-                  findingId: t.findingId,
-                  title: t.title
-                })),
-                combinedBrief,
-                message: `${bundledBrief.findings.length} findings bundled. Brief updated.`
-              },
-              null,
-              2
-            )
-          }
-        ]
-      };
-    })
-  );
-}
-
 // src/mcp/tools/get-unenriched-findings.ts
-import { z as z11 } from "zod";
+import { z as z10 } from "zod";
 function registerGetUnenrichedFindingsTool(server, ctx) {
   server.tool(
     "yapout_get_unenriched_finding",
@@ -2781,7 +2693,7 @@ After calling this tool, you should:
 3. If the finding is ambiguous, ask the developer clarifying questions in conversation
 4. When confident, call yapout_save_enrichment with a clean description, acceptance criteria, and implementation brief`,
     {
-      findingId: z11.string().optional().describe("Specific finding ID to enrich. If omitted, returns the highest priority draft finding.")
+      findingId: z10.string().optional().describe("Specific finding ID to enrich. If omitted, returns the highest priority draft finding.")
     },
     withScopeCheck(ctx, "yapout_get_unenriched_finding", async (args) => {
       const projectId = ctx.projectId ?? process.env.YAPOUT_PROJECT_ID;
@@ -2895,7 +2807,7 @@ function registerGetExistingFindingsTool(server, ctx) {
 }
 
 // src/mcp/tools/save-enrichment.ts
-import { z as z12 } from "zod";
+import { z as z11 } from "zod";
 
 // src/mcp/tools/enrichment-session.ts
 var activeSessions = /* @__PURE__ */ new Map();
@@ -2940,22 +2852,22 @@ This tool saves the enrichment, then automatically creates the Linear issue with
 
 The finding transitions: enriching \u2192 enriched \u2192 ready.`,
     {
-      findingId: z12.string().describe("The finding ID to enrich (from yapout_get_unenriched_finding)"),
-      title: z12.string().describe("Refined finding title \u2014 improve it if the original was vague"),
-      cleanDescription: z12.string().describe("Human-readable summary for the Linear issue body. Write the kind of finding a senior engineer would write."),
-      acceptanceCriteria: z12.array(z12.string()).describe("List of testable acceptance criteria (each a single clear statement)"),
-      implementationBrief: z12.string().describe("Deep technical context for the implementing agent: which files, what approach, edge cases to watch for"),
-      clarifications: z12.array(
-        z12.object({
-          question: z12.string().describe("The question you asked the developer"),
-          answer: z12.string().describe("The developer's answer")
+      findingId: z11.string().describe("The finding ID to enrich (from yapout_get_unenriched_finding)"),
+      title: z11.string().describe("Refined finding title \u2014 improve it if the original was vague"),
+      cleanDescription: z11.string().describe("Human-readable summary for the Linear issue body. Write the kind of finding a senior engineer would write."),
+      acceptanceCriteria: z11.array(z11.string()).describe("List of testable acceptance criteria (each a single clear statement)"),
+      implementationBrief: z11.string().describe("Deep technical context for the implementing agent: which files, what approach, edge cases to watch for"),
+      clarifications: z11.array(
+        z11.object({
+          question: z11.string().describe("The question you asked the developer"),
+          answer: z11.string().describe("The developer's answer")
         })
       ).optional().describe("Only meaningful Q&A from the conversation \u2014 deviations from expected scope, scoping decisions, etc. Omit if you had no questions."),
-      isOversized: z12.boolean().optional().describe("Set to true if this finding is too large for a single PR"),
-      suggestedSplit: z12.array(z12.string()).optional().describe("If oversized: suggested sub-finding titles for breaking it down"),
-      nature: z12.enum(["implementable", "operational", "spike"]).optional().describe("Override the finding's nature if enrichment reveals it should be reclassified"),
-      cloudSafe: z12.boolean().optional().describe("Set to true ONLY if this is a small mechanical change a cloud agent can ship without sandbox testing \u2014 text/copy edits, classname tweaks, single-named-constant changes, \u226430 lines, single file, no logic/type/dependency changes. Default false."),
-      sessionId: z12.string().optional().describe("Bulk enrichment session ID (from yapout_start_enrichment). Updates session stats.")
+      isOversized: z11.boolean().optional().describe("Set to true if this finding is too large for a single PR"),
+      suggestedSplit: z11.array(z11.string()).optional().describe("If oversized: suggested sub-finding titles for breaking it down"),
+      nature: z11.enum(["implementable", "operational", "spike"]).optional().describe("Override the finding's nature if enrichment reveals it should be reclassified"),
+      cloudSafe: z11.boolean().optional().describe("Set to true ONLY if this is a small mechanical change a cloud agent can ship without sandbox testing \u2014 text/copy edits, classname tweaks, single-named-constant changes, \u226430 lines, single file, no logic/type/dependency changes. Default false."),
+      sessionId: z11.string().optional().describe("Bulk enrichment session ID (from yapout_start_enrichment). Updates session stats.")
     },
     withScopeCheck(ctx, "yapout_save_enrichment", async (args) => {
       try {
@@ -3027,13 +2939,13 @@ The finding transitions: enriching \u2192 enriched \u2192 ready.`,
 }
 
 // src/mcp/tools/sync-to-linear.ts
-import { z as z13 } from "zod";
+import { z as z12 } from "zod";
 function registerSyncToLinearTool(server, ctx) {
   server.tool(
     "yapout_sync_to_linear",
     "Trigger Linear issue creation for an enriched finding. The sync runs server-side (encrypted Linear token in Convex).",
     {
-      findingId: z13.string().describe("The finding ID to sync to Linear")
+      findingId: z12.string().describe("The finding ID to sync to Linear")
     },
     withScopeCheck(ctx, "yapout_sync_to_linear", async (args) => {
       try {
@@ -3073,14 +2985,14 @@ function registerSyncToLinearTool(server, ctx) {
 }
 
 // src/mcp/tools/submit-yap-session.ts
-import { z as z14 } from "zod";
+import { z as z13 } from "zod";
 function registerSubmitYapSessionTool(server, ctx) {
   server.tool(
     "yapout_submit_yap_session",
     "Submit a yap session transcript for finding extraction",
     {
-      title: z14.string().describe("Session title (e.g., 'Notification system brainstorm')"),
-      transcript: z14.string().describe("Cleaned conversation transcript")
+      title: z13.string().describe("Session title (e.g., 'Notification system brainstorm')"),
+      transcript: z13.string().describe("Cleaned conversation transcript")
     },
     withScopeCheck(ctx, "yapout_submit_yap_session", async (args) => {
       if (!ctx.projectId) {
@@ -3134,7 +3046,7 @@ function registerSubmitYapSessionTool(server, ctx) {
 }
 
 // src/mcp/tools/start-yap.ts
-import { z as z15 } from "zod";
+import { z as z14 } from "zod";
 var PERSONA_PRESETS = {
   "tech lead": "You are an experienced tech lead. You care about maintainability, simplicity, and shipping. Challenge over-engineering and vague scope.",
   "qa engineer": "You are a skeptical QA engineer. Focus on error states, edge cases, missing validation, accessibility, and user-facing failure modes.",
@@ -3150,10 +3062,10 @@ function registerStartYapTool(server, ctx) {
     "yapout_start_yap",
     "Start a yap session \u2014 a structured AI-guided brainstorming conversation. Call this when the user wants to brainstorm, discuss ideas, or have a yap session. Returns instructions for how to conduct the session. Available personas: tech lead (default), qa engineer, product owner, end user, or any custom description.",
     {
-      persona: z15.string().optional().describe(
+      persona: z14.string().optional().describe(
         'Interviewer persona: "tech lead", "qa engineer", "product owner", "end user", or a custom description'
       ),
-      context: z15.string().optional().describe("What the developer wants to discuss")
+      context: z14.string().optional().describe("What the developer wants to discuss")
     },
     withScopeCheck(ctx, "yapout_start_yap", async (args) => {
       if (!ctx.projectId) {
@@ -3304,57 +3216,57 @@ Only fall back to yapout_submit_yap_session if the session was purely explorator
 }
 
 // src/mcp/tools/extract-from-yap.ts
-import { z as z16 } from "zod";
-var clarificationSchema = z16.object({
-  question: z16.string().describe("The question asked during the conversation"),
-  answer: z16.string().describe("The answer given")
+import { z as z15 } from "zod";
+var clarificationSchema = z15.object({
+  question: z15.string().describe("The question asked during the conversation"),
+  answer: z15.string().describe("The answer given")
 });
-var childSchema = z16.object({
-  title: z16.string().describe("Child issue title"),
-  description: z16.string().describe("What needs to be done and why"),
-  sourceQuote: z16.string().describe("Relevant excerpt from the conversation"),
-  type: z16.enum(["feature", "bug", "chore", "spike"]).describe("Finding category"),
-  priority: z16.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
-  confidence: z16.number().min(0).max(1).describe("Confidence this is a clear, actionable finding (0-1)"),
-  nature: z16.enum(["implementable", "operational", "spike"]).describe("What kind of work"),
+var childSchema = z15.object({
+  title: z15.string().describe("Child issue title"),
+  description: z15.string().describe("What needs to be done and why"),
+  sourceQuote: z15.string().describe("Relevant excerpt from the conversation"),
+  type: z15.enum(["feature", "bug", "chore", "spike"]).describe("Finding category"),
+  priority: z15.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
+  confidence: z15.number().min(0).max(1).describe("Confidence this is a clear, actionable finding (0-1)"),
+  nature: z15.enum(["implementable", "operational", "spike"]).describe("What kind of work"),
   // Enrichment — set isEnriched: true only if the conversation covered this
   // issue thoroughly enough to produce a finding a developer could pick up.
-  isEnriched: z16.boolean().optional().describe(
+  isEnriched: z15.boolean().optional().describe(
     "Did the conversation cover this issue deeply enough to produce a complete finding? true = enriched (ready for Linear), false/omitted = draft (needs async enrichment)"
   ),
-  enrichedDescription: z16.string().optional().describe("Clean, final description for the Linear issue body (required if isEnriched)"),
-  acceptanceCriteria: z16.array(z16.string()).optional().describe("Testable acceptance criteria (required if isEnriched)"),
-  implementationBrief: z16.string().optional().describe("Technical context: files, approach, edge cases (optional \u2014 the implementing agent reads the codebase anyway)"),
-  clarifications: z16.array(clarificationSchema).optional().describe("Relevant Q&A from the conversation that shaped this finding"),
-  dependsOn: z16.array(z16.number()).optional().describe("Indices (0-based) of sibling children that must be completed first")
+  enrichedDescription: z15.string().optional().describe("Clean, final description for the Linear issue body (required if isEnriched)"),
+  acceptanceCriteria: z15.array(z15.string()).optional().describe("Testable acceptance criteria (required if isEnriched)"),
+  implementationBrief: z15.string().optional().describe("Technical context: files, approach, edge cases (optional \u2014 the implementing agent reads the codebase anyway)"),
+  clarifications: z15.array(clarificationSchema).optional().describe("Relevant Q&A from the conversation that shaped this finding"),
+  dependsOn: z15.array(z15.number()).optional().describe("Indices (0-based) of sibling children that must be completed first")
 });
 function registerExtractFromYapTool(server, ctx) {
   server.tool(
     "yapout_extract_from_yap",
     "Submit findings from a yap session you conducted. The yap session IS the enrichment \u2014 you participated in the conversation, gathered context, and can assess completeness per-finding. Creates capture, findings (enriched or draft). Enriched findings are ready for the user to sync to Linear from the UI. Draft findings need further enrichment via the async pipeline.",
     {
-      sessionTitle: z16.string().describe("Descriptive title for this yap session"),
-      sessionTranscript: z16.string().describe("Cleaned transcript of the conversation (meeting-notes style)"),
-      findings: z16.array(
-        z16.object({
-          title: z16.string().describe("Finding title"),
-          description: z16.string().describe("What needs to be done and why"),
-          sourceQuote: z16.string().describe("Relevant excerpt from the conversation"),
-          type: z16.enum(["feature", "bug", "chore", "spike"]).describe("Finding category (do not use spike \u2014 use nature instead)"),
-          priority: z16.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
-          confidence: z16.number().min(0).max(1).describe("Your confidence this is a clear, actionable finding (0-1)"),
-          nature: z16.enum(["implementable", "operational", "spike"]).describe("implementable = code changes, operational = manual task, spike = needs scoping"),
-          sourceFindingId: z16.string().optional().describe("ID of an existing finding this scopes (e.g., scoping a spike)"),
+      sessionTitle: z15.string().describe("Descriptive title for this yap session"),
+      sessionTranscript: z15.string().describe("Cleaned transcript of the conversation (meeting-notes style)"),
+      findings: z15.array(
+        z15.object({
+          title: z15.string().describe("Finding title"),
+          description: z15.string().describe("What needs to be done and why"),
+          sourceQuote: z15.string().describe("Relevant excerpt from the conversation"),
+          type: z15.enum(["feature", "bug", "chore", "spike"]).describe("Finding category (do not use spike \u2014 use nature instead)"),
+          priority: z15.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
+          confidence: z15.number().min(0).max(1).describe("Your confidence this is a clear, actionable finding (0-1)"),
+          nature: z15.enum(["implementable", "operational", "spike"]).describe("implementable = code changes, operational = manual task, spike = needs scoping"),
+          sourceFindingId: z15.string().optional().describe("ID of an existing finding this scopes (e.g., scoping a spike)"),
           // Enrichment data for standalone findings
-          isEnriched: z16.boolean().optional().describe("For standalone issues: was this thoroughly discussed? true = enriched, false = draft"),
-          enrichedDescription: z16.string().optional().describe("Clean description for Linear (required if isEnriched)"),
-          acceptanceCriteria: z16.array(z16.string()).optional().describe("Testable acceptance criteria (required if isEnriched)"),
-          implementationBrief: z16.string().optional().describe("Technical context (optional)"),
-          clarifications: z16.array(clarificationSchema).optional().describe("Relevant Q&A from conversation"),
+          isEnriched: z15.boolean().optional().describe("For standalone issues: was this thoroughly discussed? true = enriched, false = draft"),
+          enrichedDescription: z15.string().optional().describe("Clean description for Linear (required if isEnriched)"),
+          acceptanceCriteria: z15.array(z15.string()).optional().describe("Testable acceptance criteria (required if isEnriched)"),
+          implementationBrief: z15.string().optional().describe("Technical context (optional)"),
+          clarifications: z15.array(clarificationSchema).optional().describe("Relevant Q&A from conversation"),
           // Bundle fields — when a finding has children, a bundle is created
-          bundleDescription: z16.string().optional().describe("What this body of work accomplishes (only for findings with children)"),
-          suggestedOrder: z16.string().optional().describe("Implementation order: 'Phase 1: A, then Phase 2: B+C' (only for findings with children)"),
-          children: z16.array(childSchema).optional().describe("Child issues \u2014 when present, a bundle is created from this finding")
+          bundleDescription: z15.string().optional().describe("What this body of work accomplishes (only for findings with children)"),
+          suggestedOrder: z15.string().optional().describe("Implementation order: 'Phase 1: A, then Phase 2: B+C' (only for findings with children)"),
+          children: z15.array(childSchema).optional().describe("Child issues \u2014 when present, a bundle is created from this finding")
         })
       ).describe("Findings from the conversation. Projects include children inline.")
     },
@@ -3436,7 +3348,7 @@ function registerExtractFromYapTool(server, ctx) {
 }
 
 // src/mcp/tools/decompose-finding.ts
-import { z as z17 } from "zod";
+import { z as z16 } from "zod";
 function registerDecomposeFindingTool(server, ctx) {
   server.tool(
     "yapout_decompose_finding",
@@ -3454,19 +3366,19 @@ archives the original finding. Returns the bundle ID and child finding IDs.
 Each child issue's implementation brief must be detailed enough to stand alone as a
 full spec \u2014 schema changes, files to modify, edge cases, and acceptance criteria.`,
     {
-      findingId: z17.string().describe("The finding being decomposed (from yapout_get_unenriched_finding)"),
-      bundleDescription: z17.string().describe("Description for the bundle \u2014 what this body of work accomplishes"),
-      suggestedOrder: z17.string().describe("Human-readable implementation order (e.g. 'Phase 1: A, then Phase 2: B+C in parallel, then Phase 3: D')"),
-      linearProjectId: z17.string().optional().describe("Existing Linear project ID to associate with. Omit to skip Linear project association."),
-      issues: z17.array(
-        z17.object({
-          title: z17.string().describe("Child issue title"),
-          description: z17.string().describe("What needs to be done and why"),
-          acceptanceCriteria: z17.array(z17.string()).describe("Testable acceptance criteria"),
-          implementationBrief: z17.string().describe("Full spec: files to modify, schema changes, edge cases, approach"),
-          type: z17.enum(["feature", "bug", "chore", "spike"]).describe("Category of work"),
-          priority: z17.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
-          dependsOn: z17.array(z17.number()).describe("Indices (0-based) of issues in this array that must be completed first")
+      findingId: z16.string().describe("The finding being decomposed (from yapout_get_unenriched_finding)"),
+      bundleDescription: z16.string().describe("Description for the bundle \u2014 what this body of work accomplishes"),
+      suggestedOrder: z16.string().describe("Human-readable implementation order (e.g. 'Phase 1: A, then Phase 2: B+C in parallel, then Phase 3: D')"),
+      linearProjectId: z16.string().optional().describe("Existing Linear project ID to associate with. Omit to skip Linear project association."),
+      issues: z16.array(
+        z16.object({
+          title: z16.string().describe("Child issue title"),
+          description: z16.string().describe("What needs to be done and why"),
+          acceptanceCriteria: z16.array(z16.string()).describe("Testable acceptance criteria"),
+          implementationBrief: z16.string().describe("Full spec: files to modify, schema changes, edge cases, approach"),
+          type: z16.enum(["feature", "bug", "chore", "spike"]).describe("Category of work"),
+          priority: z16.enum(["urgent", "high", "medium", "low"]).describe("Priority level"),
+          dependsOn: z16.array(z16.number()).describe("Indices (0-based) of issues in this array that must be completed first")
         })
       ).describe("The child issues produced by decomposition")
     },
@@ -3529,7 +3441,7 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
 }
 
 // src/mcp/tools/mark-duplicate.ts
-import { z as z18 } from "zod";
+import { z as z17 } from "zod";
 function registerMarkDuplicateTool(server, ctx) {
   server.tool(
     "yapout_mark_duplicate",
@@ -3539,9 +3451,9 @@ flow when you discover the work is already tracked in Linear.
 The finding must be in "enriching" or "enriched" status. It will be transitioned to
 "failed" with the duplicate reference stored. Nothing is synced to Linear.`,
     {
-      findingId: z18.string().describe("The yapout finding to archive as a duplicate"),
-      duplicateOfLinearId: z18.string().describe("The Linear issue identifier it duplicates (e.g. 'ENG-234')"),
-      reason: z18.string().describe("Brief explanation of why this is a duplicate")
+      findingId: z17.string().describe("The yapout finding to archive as a duplicate"),
+      duplicateOfLinearId: z17.string().describe("The Linear issue identifier it duplicates (e.g. 'ENG-234')"),
+      reason: z17.string().describe("Brief explanation of why this is a duplicate")
     },
     withScopeCheck(ctx, "yapout_mark_duplicate", async (args) => {
       if (!ctx.projectId) {
@@ -3670,7 +3582,7 @@ and issue counts so you can ask the user for confirmation before creating a new
 }
 
 // src/mcp/tools/start-enrichment.ts
-import { z as z19 } from "zod";
+import { z as z18 } from "zod";
 function registerStartEnrichmentTool(server, ctx) {
   server.tool(
     "yapout_start_enrichment",
@@ -3681,10 +3593,10 @@ and maintains filter criteria so you don't re-pass them on every call.
 
 Optionally filter by tags, capture, or explicit finding IDs.`,
     {
-      filter: z19.object({
-        tags: z19.array(z19.string()).optional().describe("Only enrich findings with these tags"),
-        captureId: z19.string().optional().describe("Only enrich findings from this capture"),
-        findingIds: z19.array(z19.string()).optional().describe("Only enrich these specific findings")
+      filter: z18.object({
+        tags: z18.array(z18.string()).optional().describe("Only enrich findings with these tags"),
+        captureId: z18.string().optional().describe("Only enrich findings from this capture"),
+        findingIds: z18.array(z18.string()).optional().describe("Only enrich these specific findings")
       }).optional().describe("Filter criteria. If omitted, all draft findings in the project are included.")
     },
     withScopeCheck(ctx, "yapout_start_enrichment", async (args) => {
@@ -3740,7 +3652,7 @@ Optionally filter by tags, capture, or explicit finding IDs.`,
 }
 
 // src/mcp/tools/enrich-next.ts
-import { z as z20 } from "zod";
+import { z as z19 } from "zod";
 function registerEnrichNextTool(server, ctx) {
   server.tool(
     "yapout_enrich_next",
@@ -3751,9 +3663,9 @@ Returns the next unclaimed draft finding matching the session's filter.
 
 When done=true, all findings have been processed.`,
     {
-      sessionId: z20.string().describe("Session ID from yapout_start_enrichment"),
-      skip: z20.boolean().optional().describe("If true, skip the current finding (release back to draft)"),
-      skipFindingId: z20.string().optional().describe("The finding ID to skip (must be in 'enriching' status)")
+      sessionId: z19.string().describe("Session ID from yapout_start_enrichment"),
+      skip: z19.boolean().optional().describe("If true, skip the current finding (release back to draft)"),
+      skipFindingId: z19.string().optional().describe("The finding ID to skip (must be in 'enriching' status)")
     },
     withScopeCheck(ctx, "yapout_enrich_next", async (args) => {
       const session = getSession(args.sessionId);
@@ -3881,125 +3793,8 @@ When done=true, all findings have been processed.`,
   );
 }
 
-// src/mcp/tools/enrich-bundle.ts
-import { z as z21 } from "zod";
-function registerEnrichBundleTool(server, ctx) {
-  server.tool(
-    "yapout_enrich_bundle",
-    `Claim an entire bundle for enrichment. Returns ALL findings in the bundle at once
-with their relationships, source quotes, and project context.
-
-This is for enriching a bundle as a single cohesive unit \u2014 NOT individual findings.
-The agent should understand the full scope, ask questions about the bundle as a whole,
-then call yapout_save_bundle_enrichment with enrichment data for every finding.
-
-The bundle and all its findings transition to "enriching" status.`,
-    {
-      bundleId: z21.string().describe("The bundle ID to enrich")
-    },
-    withScopeCheck(ctx, "yapout_enrich_bundle", async (args) => {
-      try {
-        const result = await ctx.client.mutation(
-          anyApi5.functions.bundles.claimBundleForEnrichment,
-          { bundleId: args.bundleId }
-        );
-        if (!result) {
-          return {
-            content: [{ type: "text", text: "Failed to claim bundle for enrichment." }],
-            isError: true
-          };
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(result, null, 2)
-            }
-          ]
-        };
-      } catch (err) {
-        return {
-          content: [{ type: "text", text: `Error claiming bundle: ${err.message}` }],
-          isError: true
-        };
-      }
-    })
-  );
-}
-
-// src/mcp/tools/save-bundle-enrichment.ts
-import { z as z22 } from "zod";
-function registerSaveBundleEnrichmentTool(server, ctx) {
-  server.tool(
-    "yapout_save_bundle_enrichment",
-    `Save enrichment for an entire bundle at once. Call this after you've analyzed all
-findings in the bundle as a cohesive unit, read the codebase, and asked any questions.
-
-Provide:
-- Bundle-level: overall description, combined acceptance criteria, implementation brief
-- Per-finding: each finding gets its own refined title, description, acceptance criteria, and brief
-
-The bundle and all findings transition from "enriching" to "enriched".
-Call yapout_sync_bundle_to_linear afterwards to create the Linear project.`,
-    {
-      bundleId: z22.string().describe("The bundle ID"),
-      title: z22.string().optional().describe("Refined bundle title (optional, keeps existing if omitted)"),
-      enrichedDescription: z22.string().describe("Bundle-level description \u2014 the cohesive story of what this bundle delivers"),
-      acceptanceCriteria: z22.array(z22.string()).describe("Bundle-level acceptance criteria"),
-      implementationBrief: z22.string().describe("Bundle-level implementation brief \u2014 overall approach, architecture decisions, key files"),
-      cloudSafe: z22.boolean().optional().describe("Set true ONLY if the entire bundle is small mechanical work (\u226430 lines total, single-file ideally, text/className/constant edits). Default false. If unsure, false."),
-      findings: z22.array(z22.object({
-        findingId: z22.string().describe("Finding ID"),
-        title: z22.string().describe("Refined finding title"),
-        enrichedDescription: z22.string().describe("Finding-specific description"),
-        acceptanceCriteria: z22.array(z22.string()).describe("Finding-specific acceptance criteria"),
-        implementationBrief: z22.string().describe("Finding-specific implementation brief")
-      })).describe("Per-finding enrichment data \u2014 one entry per finding in the bundle")
-    },
-    withScopeCheck(ctx, "yapout_save_bundle_enrichment", async (args) => {
-      try {
-        await ctx.client.mutation(
-          anyApi5.functions.bundles.saveBundleEnrichment,
-          {
-            bundleId: args.bundleId,
-            title: args.title,
-            enrichedDescription: args.enrichedDescription,
-            acceptanceCriteria: args.acceptanceCriteria,
-            implementationBrief: args.implementationBrief,
-            cloudSafe: args.cloudSafe,
-            findings: args.findings.map((f) => ({
-              findingId: f.findingId,
-              title: f.title,
-              enrichedDescription: f.enrichedDescription,
-              acceptanceCriteria: f.acceptanceCriteria,
-              implementationBrief: f.implementationBrief
-            }))
-          }
-        );
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                bundleId: args.bundleId,
-                findingsEnriched: args.findings.length,
-                message: `Bundle enriched successfully (${args.findings.length} findings). Call yapout_sync_bundle_to_linear to create the Linear project.`
-              }, null, 2)
-            }
-          ]
-        };
-      } catch (err) {
-        return {
-          content: [{ type: "text", text: `Error saving bundle enrichment: ${err.message}` }],
-          isError: true
-        };
-      }
-    })
-  );
-}
-
 // src/mcp/tools/block-enrichment.ts
-import { z as z23 } from "zod";
+import { z as z20 } from "zod";
 function registerBlockEnrichmentTool(server, ctx) {
   server.tool(
     "yapout_block_enrichment",
@@ -4011,9 +3806,9 @@ The finding must currently be in "enriching" status (claimed via yapout_get_unen
 
 Transitions: enriching \u2192 needs_input. The user sees the blockerReason and questions in the UI, adds context, and resubmits.`,
     {
-      findingId: z23.string().describe("The finding ID to block (currently in 'enriching')"),
-      blockerReason: z23.string().describe("One sentence: why this finding cannot be enriched as written. State the missing piece concretely."),
-      blockerQuestions: z23.array(z23.string()).min(1).describe("2-5 specific questions the user must answer before enrichment can succeed. Each must be answerable in a sentence or two.")
+      findingId: z20.string().describe("The finding ID to block (currently in 'enriching')"),
+      blockerReason: z20.string().describe("One sentence: why this finding cannot be enriched as written. State the missing piece concretely."),
+      blockerQuestions: z20.array(z20.string()).min(1).describe("2-5 specific questions the user must answer before enrichment can succeed. Each must be answerable in a sentence or two.")
     },
     withScopeCheck(ctx, "yapout_block_enrichment", async (args) => {
       try {
@@ -4060,9 +3855,9 @@ Transitions: enriching \u2192 needs_input. The user sees the blockerReason and q
 
 Same semantics as yapout_block_enrichment but for an entire bundle. Bundle status transitions enriching \u2192 needs_input; child findings revert to draft.`,
     {
-      bundleId: z23.string().describe("The bundle ID to block (currently in 'enriching')"),
-      blockerReason: z23.string().describe("One sentence: why this bundle cannot be enriched."),
-      blockerQuestions: z23.array(z23.string()).min(1).describe("2-5 specific questions the user must answer.")
+      bundleId: z20.string().describe("The bundle ID to block (currently in 'enriching')"),
+      blockerReason: z20.string().describe("One sentence: why this bundle cannot be enriched."),
+      blockerQuestions: z20.array(z20.string()).min(1).describe("2-5 specific questions the user must answer.")
     },
     async (args) => {
       try {
@@ -5163,143 +4958,6 @@ function registerProjectTools(server, ctx) {
   registerTool(server, ctx, listProjectsTool);
 }
 
-// src/mcp/tools/bundles-crud.ts
-var getBundleTool = defineTool({
-  name: "yapout_get_bundle",
-  description: `Fetch a bundle by id, including its child findings array. Use this when you need full bundle context \u2014 title, description, enrichment data, claim state, child findings \u2014 not just the work-queue summary.`,
-  inputSchema: { bundleId: z.string() },
-  handler: async (ctx, args) => {
-    const bundle = await ctx.client.query(
-      anyApi5.functions.bundles.getBundle,
-      args
-    );
-    if (!bundle) {
-      return {
-        content: [{ type: "text", text: "Bundle not found." }],
-        isError: true
-      };
-    }
-    return {
-      content: [
-        { type: "text", text: JSON.stringify(bundle, null, 2) }
-      ]
-    };
-  }
-});
-var listBundlesTool = defineTool({
-  name: "yapout_list_bundles",
-  description: `List every bundle in the current project. Returns the bundle records (title, status, claim, archive metadata). For per-bundle child findings, follow up with yapout_get_bundle.`,
-  inputSchema: {},
-  handler: async (ctx) => {
-    if (!ctx.projectId) {
-      return {
-        content: [{ type: "text", text: "No project linked." }],
-        isError: true
-      };
-    }
-    const bundles = await ctx.client.query(
-      anyApi5.functions.bundles.getProjectBundles,
-      { projectId: ctx.projectId }
-    );
-    return {
-      content: [
-        { type: "text", text: JSON.stringify(bundles, null, 2) }
-      ]
-    };
-  }
-});
-var updateBundleTool = defineTool({
-  name: "yapout_update_bundle",
-  description: `Patch a bundle's editable content fields: title, description. Pass only the fields you want to change. Status / claim / archive go through dedicated tools.`,
-  inputSchema: {
-    bundleId: z.string(),
-    title: z.string().optional(),
-    description: z.string().optional()
-  },
-  handler: async (ctx, args) => {
-    await ctx.client.mutation(
-      anyApi5.functions.bundles.updateBundle,
-      args
-    );
-    return {
-      content: [{ type: "text", text: "Bundle updated." }]
-    };
-  }
-});
-var archiveBundleTool = defineTool({
-  name: "yapout_archive_bundle",
-  description: `Archive a bundle. Children are detached (their bundleId cleared) so they can be re-bundled or shipped solo. Use yapout_restore_bundle to bring it back.`,
-  inputSchema: { bundleId: z.string() },
-  handler: async (ctx, args) => {
-    await ctx.client.mutation(
-      anyApi5.functions.bundles.archiveBundle,
-      args
-    );
-    return {
-      content: [{ type: "text", text: "Bundle archived." }]
-    };
-  }
-});
-var restoreBundleTool = defineTool({
-  name: "yapout_restore_bundle",
-  description: `Restore an archived bundle. Defaults to draft; pass to: "ready" to bring it straight back to the open queue.`,
-  inputSchema: {
-    bundleId: z.string(),
-    to: z.enum(["draft", "ready"]).optional()
-  },
-  handler: async (ctx, args) => {
-    await ctx.client.mutation(
-      anyApi5.functions.bundles.restoreBundle,
-      args
-    );
-    return {
-      content: [{ type: "text", text: "Bundle restored." }]
-    };
-  }
-});
-var addFindingToBundleTool = defineTool({
-  name: "yapout_add_finding_to_bundle",
-  description: `Attach an existing finding to a bundle. The finding's bundleId is set; its status is left alone (use yapout_set_finding_status separately if you want to align statuses).`,
-  inputSchema: {
-    findingId: z.string(),
-    bundleId: z.string()
-  },
-  handler: async (ctx, args) => {
-    await ctx.client.mutation(
-      anyApi5.functions.findings.addToBundle,
-      args
-    );
-    return {
-      content: [{ type: "text", text: "Finding added to bundle." }]
-    };
-  }
-});
-var removeFindingFromBundleTool = defineTool({
-  name: "yapout_remove_finding_from_bundle",
-  description: `Detach a finding from its current bundle. The finding stays in the project; only its bundleId is cleared.`,
-  inputSchema: { findingId: z.string() },
-  handler: async (ctx, args) => {
-    await ctx.client.mutation(
-      anyApi5.functions.findings.removeFromBundle,
-      args
-    );
-    return {
-      content: [
-        { type: "text", text: "Finding removed from bundle." }
-      ]
-    };
-  }
-});
-function registerBundleCrudTools(server, ctx) {
-  registerTool(server, ctx, getBundleTool);
-  registerTool(server, ctx, listBundlesTool);
-  registerTool(server, ctx, updateBundleTool);
-  registerTool(server, ctx, archiveBundleTool);
-  registerTool(server, ctx, restoreBundleTool);
-  registerTool(server, ctx, addFindingToBundleTool);
-  registerTool(server, ctx, removeFindingFromBundleTool);
-}
-
 // src/mcp/tools/insights.ts
 var listInsightsTool = defineTool({
   name: "yapout_list_insights",
@@ -5471,7 +5129,7 @@ async function startMcpServer() {
   };
   const server = new McpServer({
     name: "yapout",
-    version: "0.15.2"
+    version: "0.16.0"
   });
   registerInitTool(server, ctx);
   registerCompactTool(server, ctx);
@@ -5482,7 +5140,6 @@ async function startMcpServer() {
   registerEventTool(server, ctx);
   registerShipTool(server, ctx);
   registerCheckTool(server, ctx);
-  registerBundleTool(server, ctx);
   registerGetUnenrichedFindingsTool(server, ctx);
   registerGetExistingFindingsTool(server, ctx);
   registerSaveEnrichmentTool(server, ctx);
@@ -5495,8 +5152,6 @@ async function startMcpServer() {
   registerGetLinearProjectsTool(server, ctx);
   registerStartEnrichmentTool(server, ctx);
   registerEnrichNextTool(server, ctx);
-  registerEnrichBundleTool(server, ctx);
-  registerSaveBundleEnrichmentTool(server, ctx);
   registerBlockEnrichmentTool(server, ctx);
   registerSessionTools(server, ctx);
   registerCodebaseTools(server, ctx);
@@ -5506,7 +5161,6 @@ async function startMcpServer() {
   registerFindingReadTools(server, ctx);
   registerFindingWriteTools(server, ctx);
   registerProjectTools(server, ctx);
-  registerBundleCrudTools(server, ctx);
   registerInsightTools(server, ctx);
   registerPipelineRunTools(server, ctx);
   const transport = new StdioServerTransport();
@@ -6191,9 +5845,89 @@ var pillarTest = new Command15("test").description("Send a test delivery to a pi
 });
 var pillarCommand = new Command15("pillar").description("Manage per-project pillar overrides (extraction / enrichment / intelligence / implementation)").addCommand(pillarList).addCommand(pillarSet).addCommand(pillarTest);
 
+// src/commands/observe.ts
+import { Command as Command16 } from "commander";
+import { resolve as resolve12 } from "path";
+import chalk16 from "chalk";
+var observeCommand = new Command16("observe").description("File an observation Raw against the active Execution").argument("<observation...>", "Freeform observation text").option(
+  "--severity <level>",
+  "Severity hint: low | normal | high (default: normal)"
+).option(
+  "--area <hint>",
+  "Optional scoping hint for the extraction chain (e.g., 'auth', 'billing')"
+).action(
+  async (words, options) => {
+    const creds = requireAuth();
+    const cwd = resolve12(process.cwd());
+    const resourceCfg = readResourceConfig(cwd);
+    if (!resourceCfg) {
+      console.error(
+        chalk16.red("No `.yapout/config.json` found.") + " Run " + chalk16.cyan("yapout init") + " in this repo first."
+      );
+      process.exit(1);
+    }
+    const active = readActiveExecution(cwd);
+    if (!active) {
+      console.error(
+        chalk16.red("No active Execution.") + " `yapout observe` must run from a worktree where " + chalk16.cyan("yapout pick") + " has been called."
+      );
+      process.exit(1);
+    }
+    const body = words.join(" ").trim();
+    if (!body) {
+      console.error(chalk16.red("Observation body cannot be empty."));
+      process.exit(1);
+    }
+    const severityHint = parseSeverity(options.severity);
+    if (options.severity && !severityHint) {
+      console.error(
+        chalk16.red(
+          `Invalid --severity: ${options.severity}. Allowed: low, normal, high.`
+        )
+      );
+      process.exit(1);
+    }
+    const client = createConvexClient(creds.token);
+    let result;
+    try {
+      result = await client.mutation(
+        anyApi.functions.resourcesCli.createAgentObservationRaw,
+        {
+          executionId: active.executionId,
+          body,
+          ...severityHint ? { severityHint } : {},
+          ...options.area ? { area: options.area } : {}
+        }
+      );
+    } catch (err) {
+      console.error(
+        chalk16.red("Failed to file observation."),
+        err.message
+      );
+      process.exit(1);
+    }
+    console.log(
+      chalk16.green("Filed agent observation. ") + chalk16.dim(
+        `(raw: ${result.rawId}, execution: ${result.executionId})`
+      )
+    );
+    console.log(
+      chalk16.dim(
+        "Extraction will turn this into a Request (or link it to an existing one)."
+      )
+    );
+  }
+);
+function parseSeverity(raw) {
+  if (!raw) return void 0;
+  const v = raw.toLowerCase();
+  if (v === "low" || v === "normal" || v === "high") return v;
+  return void 0;
+}
+
 // src/index.ts
-var program = new Command16();
-program.name("yapout").description("yapout \u2014 the PM tool for agents").version("0.15.2");
+var program = new Command17();
+program.name("yapout").description("yapout \u2014 the PM tool for agents").version("0.16.0");
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(initCommand);
@@ -6209,4 +5943,5 @@ program.addCommand(agentCommand);
 program.addCommand(webhookCommand);
 program.addCommand(inboundCommand);
 program.addCommand(pillarCommand);
+program.addCommand(observeCommand);
 program.parse();