yapout 0.1.0 → 0.3.0

package/dist/index.js

@@ -947,7 +947,7 @@ Read the following to build your understanding:
 - Database schema or type definitions
 - A few representative source files
 
-Output a single markdown document. Be concise \u2014 this will be given to other Claude Code sessions as context for implementing tickets.
+Output a single markdown document. Be concise \u2014 this will be given to other Claude Code sessions as context for implementing findings.
 
 After you produce the summary, call yapout_update_context with the summary text to save it.`;
 function registerCompactTool(server, ctx) {
@@ -1037,9 +1037,9 @@ import { z as z3 } from "zod";
 function registerQueueTool(server, ctx) {
   server.tool(
     "yapout_queue",
-    "List tickets ready for local implementation. Only returns tickets in backlog/unstarted Linear status.",
+    "List findings ready for local implementation. Only returns findings in backlog/unstarted Linear status.",
     {
-      includeBlocked: z3.boolean().optional().describe("Show blocked tickets too (default: false)")
+      includeBlocked: z3.boolean().optional().describe("Show blocked findings too (default: false)")
     },
     async (args) => {
       if (!ctx.projectId) {
@@ -1054,7 +1054,7 @@ function registerQueueTool(server, ctx) {
         };
       }
       const data = await ctx.client.query(
-        anyApi2.functions.tickets.getLocalQueuedTickets,
+        anyApi2.functions.findings.getQueuedWorkItems,
         { projectId: ctx.projectId }
       );
       if (!data) {
@@ -1067,7 +1067,7 @@ function registerQueueTool(server, ctx) {
       }
       let ready = data.ready;
       ready = ready.filter((t) => t.nature !== "operational");
-      const linearIds = ready.map((t) => t.linearTicketId).filter((id) => !!id);
+      const linearIds = ready.map((t) => t.linearIssueId).filter((id) => !!id);
       if (linearIds.length > 0) {
         try {
           const statuses = await ctx.client.action(
@@ -1078,8 +1078,8 @@ function registerQueueTool(server, ctx) {
             statuses.map((s) => [s.linearIssueId, s.statusType])
           );
           ready = ready.filter((t) => {
-            if (!t.linearTicketId) return true;
-            const type = statusMap.get(t.linearTicketId);
+            if (!t.linearIssueId) return true;
+            const type = statusMap.get(t.linearIssueId);
             if (!type) return true;
             return type === "backlog" || type === "unstarted";
           });
@@ -1114,21 +1114,21 @@ import { z as z4 } from "zod";
 function registerGetBriefTool(server, ctx) {
   server.tool(
     "yapout_get_brief",
-    "Fetch the full implementation context for a ticket",
+    "Fetch the full implementation context for a finding",
     {
-      ticketId: z4.string().describe("The ticket ID to get the brief for")
+      findingId: z4.string().describe("The finding ID to get the brief for")
     },
     async (args) => {
       const data = await ctx.client.query(
-        anyApi2.functions.tickets.getTicketBrief,
-        { ticketId: args.ticketId }
+        anyApi2.functions.findings.getFindingBrief,
+        { findingId: args.findingId }
       );
       if (!data) {
         return {
           content: [
             {
               type: "text",
-              text: "Ticket not found or you don't have access."
+              text: "Finding not found or you don't have access."
             }
           ],
           isError: true
@@ -1159,16 +1159,16 @@ function slugify(text) {
   return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
 }
 function formatBrief(data) {
-  const ticket = data.ticket;
+  const finding = data.finding;
   const sections = [
-    `# ${ticket.title}`,
+    `# ${finding.title}`,
     "",
-    `**Priority:** ${ticket.priority} | **Type:** ${ticket.type}`
+    `**Priority:** ${finding.priority} | **Type:** ${finding.type}`
   ];
-  if (ticket.linearUrl) {
-    sections.push(`**Linear:** ${ticket.linearUrl}`);
+  if (finding.linearIssueUrl) {
+    sections.push(`**Linear:** ${finding.linearIssueUrl}`);
   }
-  sections.push("", "## Description", "", ticket.description);
+  sections.push("", "## Description", "", finding.description);
   if (data.enrichedDescription) {
     sections.push("", "## Enriched Description", "", data.enrichedDescription);
   }
@@ -1202,9 +1202,9 @@ function formatBrief(data) {
 function registerClaimTool(server, ctx) {
   server.tool(
     "yapout_claim",
-    "Claim a ticket for local implementation. Creates a branch (or worktree), writes the brief, and updates status.",
+    "Claim a finding for local implementation. Creates a branch (or worktree), writes the brief, and updates status.",
     {
-      ticketId: z5.string().describe("The ticket ID to claim"),
+      findingId: z5.string().describe("The finding ID to claim"),
       worktree: z5.boolean().optional().describe("Create a git worktree for parallel work (default: false)")
     },
     async (args) => {
@@ -1220,37 +1220,37 @@ function registerClaimTool(server, ctx) {
         };
       }
       const briefData = await ctx.client.query(
-        anyApi2.functions.tickets.getTicketBrief,
-        { ticketId: args.ticketId }
+        anyApi2.functions.findings.getFindingBrief,
+        { findingId: args.findingId }
       );
       if (!briefData) {
         return {
           content: [
             {
               type: "text",
-              text: "Ticket not found or you don't have access."
+              text: "Finding not found or you don't have access."
             }
           ],
           isError: true
         };
       }
-      const ticket = briefData.ticket;
-      const linearTicketId = briefData.linearTicketId;
+      const finding = briefData.finding;
+      const linearIssueId = briefData.linearIssueId;
       const defaultBranch = briefData.defaultBranch || "main";
       const prefix = readBranchPrefix(ctx.cwd);
-      const slug = slugify(ticket.title);
-      const branchName = linearTicketId ? `${prefix}/${linearTicketId.toLowerCase()}-${slug}` : `${prefix}/${slug}`;
+      const slug = slugify(finding.title);
+      const branchName = linearIssueId ? `${prefix}/${linearIssueId.toLowerCase()}-${slug}` : `${prefix}/${slug}`;
       const claim = await ctx.client.mutation(
-        anyApi2.functions.tickets.claimTicketLocal,
-        { ticketId: args.ticketId, branchName }
+        anyApi2.functions.findings.claimFindingLocal,
+        { findingId: args.findingId, branchName }
       );
-      if (linearTicketId && ctx.projectId) {
+      if (linearIssueId && ctx.projectId) {
         try {
           await ctx.client.action(
             anyApi2.functions.linearStatusMutations.moveIssueStatus,
             {
               projectId: ctx.projectId,
-              linearIssueId: linearTicketId,
+              linearIssueId,
               statusType: "started"
             }
           );
@@ -1262,7 +1262,7 @@ function registerClaimTool(server, ctx) {
         fetchOrigin(ctx.cwd);
         worktreePath = createWorktree(
           ctx.cwd,
-          args.ticketId,
+          args.findingId,
           branchName,
           defaultBranch
         );
@@ -1312,7 +1312,7 @@ function registerClaimTool(server, ctx) {
           {
             pipelineRunId: claim.pipelineRunId,
             event: "daemon_claimed",
-            message: `Claimed ticket: ${ticket.title}`
+            message: `Claimed finding: ${finding.title}`
           }
         );
         await ctx.client.mutation(
@@ -1456,19 +1456,19 @@ async function createPullRequest(title, body, branch, base, repoFullName, cwd) {
 // src/mcp/tools/ship.ts
 import { join as join8 } from "path";
 import { existsSync as existsSync7, readFileSync as readFileSync6 } from "fs";
-function buildCommitMessage(message, template, ticket) {
+function buildCommitMessage(message, template, finding) {
   if (message) return message;
   if (template) {
-    return template.replace(/\{\{ticket\.type\}\}/g, ticket.type).replace(/\{\{ticket\.title\}\}/g, ticket.title).replace(/\{\{ticket\.linearTicketId\}\}/g, ticket.linearTicketId ?? "draft").replace(/\{\{ticket\.id\}\}/g, ticket.id ?? "").replace(/\{\{ticket\.priority\}\}/g, ticket.priority ?? "medium");
+    return template.replace(/\{\{finding\.type\}\}/g, finding.type).replace(/\{\{finding\.title\}\}/g, finding.title).replace(/\{\{finding\.linearIssueId\}\}/g, finding.linearIssueId ?? "draft").replace(/\{\{finding\.id\}\}/g, finding.id ?? "").replace(/\{\{finding\.priority\}\}/g, finding.priority ?? "medium");
   }
-  const prefix = ticket.type === "bug" ? "fix" : "feat";
-  const ref = ticket.linearTicketId ? ` (${ticket.linearTicketId})` : "";
-  return `${prefix}(${ticket.type}): ${ticket.title}${ref}`;
+  const prefix = finding.type === "bug" ? "fix" : "feat";
+  const ref = finding.linearIssueId ? ` (${finding.linearIssueId})` : "";
+  return `${prefix}(${finding.type}): ${finding.title}${ref}`;
 }
 function registerShipTool(server, ctx) {
   server.tool(
     "yapout_ship",
-    "Commit, push, open a PR, and mark the ticket as done. Run yapout_check first if post-flight checks are configured.",
+    "Commit, push, open a PR, and mark the finding as done. Run yapout_check first if post-flight checks are configured.",
     {
       message: z7.string().optional().describe("Custom commit message (overrides template)"),
       skipPr: z7.boolean().optional().describe("Just push, don't open a PR"),
@@ -1495,26 +1495,26 @@ function registerShipTool(server, ctx) {
       }
       const branch = getCurrentBranch(gitCwd);
       const defaultBranch = getDefaultBranch(gitCwd);
-      let ticketTitle = branch;
-      let ticketType = "feature";
-      let ticketLinearId;
+      let findingTitle = branch;
+      let findingType = "feature";
+      let findingLinearId;
       try {
         const briefPath = join8(gitCwd, ".yapout", "brief.md");
         if (existsSync7(briefPath)) {
           const brief = readFileSync6(briefPath, "utf-8");
           const titleMatch = brief.match(/^# (.+)$/m);
-          if (titleMatch) ticketTitle = titleMatch[1];
+          if (titleMatch) findingTitle = titleMatch[1];
           const typeMatch = brief.match(/\*\*Type:\*\* (\w+)/);
-          if (typeMatch) ticketType = typeMatch[1];
+          if (typeMatch) findingType = typeMatch[1];
           const linearMatch = brief.match(/\*\*Linear:\*\* .+\/([A-Z]+-\d+)\//);
-          if (linearMatch) ticketLinearId = linearMatch[1];
+          if (linearMatch) findingLinearId = linearMatch[1];
         }
       } catch {
       }
       const commitMsg = buildCommitMessage(args.message, config.commit_template, {
-        title: ticketTitle,
-        type: ticketType,
-        linearTicketId: ticketLinearId
+        title: findingTitle,
+        type: findingType,
+        linearIssueId: findingLinearId
       });
       stageAll(gitCwd);
       const sha = commit(commitMsg, gitCwd);
@@ -1538,7 +1538,7 @@ function registerShipTool(server, ctx) {
           const prBody = [
             `## Summary`,
             "",
-            ticketTitle,
+            findingTitle,
             "",
             `## Changes`,
             "",
@@ -1550,7 +1550,7 @@ function registerShipTool(server, ctx) {
             `Implemented via [yapout](https://yapout.dev) daemon`
           ].join("\n");
           const pr = await createPullRequest(
-            ticketTitle,
+            findingTitle,
             prBody,
             branch,
             defaultBranch,
@@ -1598,13 +1598,13 @@ function registerShipTool(server, ctx) {
       } catch (err) {
         result.completionError = err.message;
       }
-      if (ticketLinearId && ctx.projectId) {
+      if (findingLinearId && ctx.projectId) {
         try {
           await ctx.client.action(
             anyApi2.functions.linearStatusMutations.moveIssueStatus,
             {
               projectId: ctx.projectId,
-              linearIssueId: ticketLinearId,
+              linearIssueId: findingLinearId,
               statusType: "completed"
             }
           );
@@ -1616,7 +1616,7 @@ function registerShipTool(server, ctx) {
               anyApi2.functions.linearStatusMutations.addLinearComment,
               {
                 projectId: ctx.projectId,
-                linearIssueId: ticketLinearId,
+                linearIssueId: findingLinearId,
                 body: `PR opened: [#${prNumber}](${prUrl})`
               }
             );
@@ -1778,18 +1778,18 @@ import { existsSync as existsSync8, writeFileSync as writeFileSync8, mkdirSync a
 function registerBundleTool(server, ctx) {
   server.tool(
     "yapout_bundle",
-    "Add a ticket to the current ticket's bundle so they ship as one PR",
+    "Add a finding to the current finding's bundle so they ship as one PR",
     {
-      ticketId: z9.string().describe("Ticket ID to add to the bundle"),
-      withTicket: z9.string().describe("Lead ticket ID (currently being worked on)")
+      findingId: z9.string().describe("Finding ID to add to the bundle"),
+      withFinding: z9.string().describe("Lead finding ID (currently being worked on)")
     },
     async (args) => {
       const result = await ctx.client.mutation(
-        anyApi2.functions.tickets.bundleTickets,
-        { leadTicketId: args.withTicket, joiningTicketId: args.ticketId }
+        anyApi2.functions.bundles.createBundle,
+        { leadFindingId: args.withFinding, joiningFindingId: args.findingId }
       );
       const bundledBrief = await ctx.client.query(
-        anyApi2.functions.tickets.getBundledBrief,
+        anyApi2.functions.bundles.getBundledBrief,
         { bundleId: result.bundleId }
       );
       if (!bundledBrief) {
@@ -1806,14 +1806,14 @@ function registerBundleTool(server, ctx) {
         };
       }
       const sections = [
-        `# Bundle: ${bundledBrief.tickets.length} tickets`,
+        `# Bundle: ${bundledBrief.findings.length} findings`,
         ""
       ];
-      for (const t of bundledBrief.tickets) {
-        sections.push(`## ${t.linearTicketId ?? t.ticketId}: ${t.title}`);
+      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.linearUrl) sections.push(`**Linear:** ${t.linearUrl}`);
+        if (t.linearIssueUrl) sections.push(`**Linear:** ${t.linearIssueUrl}`);
         sections.push("", t.description);
         if (t.enrichedDescription) {
           sections.push("", "### Enriched Description", "", t.enrichedDescription);
@@ -1837,12 +1837,12 @@ function registerBundleTool(server, ctx) {
             text: JSON.stringify(
               {
                 bundleId: result.bundleId,
-                tickets: bundledBrief.tickets.map((t) => ({
-                  ticketId: t.ticketId,
+                findings: bundledBrief.findings.map((t) => ({
+                  findingId: t.findingId,
                   title: t.title
                 })),
                 combinedBrief,
-                message: `${bundledBrief.tickets.length} tickets bundled. Brief updated.`
+                message: `${bundledBrief.findings.length} findings bundled. Brief updated.`
               },
               null,
               2
@@ -1854,22 +1854,22 @@ function registerBundleTool(server, ctx) {
   );
 }
 
-// src/mcp/tools/get-unenriched-tickets.ts
+// src/mcp/tools/get-unenriched-findings.ts
 import { z as z10 } from "zod";
-function registerGetUnenrichedTicketsTool(server, ctx) {
+function registerGetUnenrichedFindingsTool(server, ctx) {
   server.tool(
-    "yapout_get_unenriched_ticket",
-    `Start enriching a ticket. Returns the next draft ticket (or a specific one by ID) with full context including the original transcript quote, project context, and existing ticket titles for duplicate detection.
+    "yapout_get_unenriched_finding",
+    `Start enriching a finding. Returns the next draft finding (or a specific one by ID) with full context including the original capture quote, project context, and existing finding titles for duplicate detection.
 
-The ticket is locked to "enriching" status \u2014 no other agent can enrich it concurrently.
+The finding is locked to "enriching" status \u2014 no other agent can enrich it concurrently.
 
 After calling this tool, you should:
 1. Read the relevant parts of the codebase to understand the area affected
-2. Check for duplicates against the existingTickets list
-3. If the decision is ambiguous, ask the developer clarifying questions in conversation
+2. Check for duplicates against the existingFindings list
+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`,
     {
-      ticketId: z10.string().optional().describe("Specific ticket ID to enrich. If omitted, returns the highest priority draft ticket.")
+      findingId: z10.string().optional().describe("Specific finding ID to enrich. If omitted, returns the highest priority draft finding.")
     },
     async (args) => {
       const projectId = ctx.projectId ?? process.env.YAPOUT_PROJECT_ID;
@@ -1889,7 +1889,7 @@ After calling this tool, you should:
           anyApi2.functions.localPipeline.claimForEnrichment,
           {
             projectId,
-            ...args.ticketId ? { ticketId: args.ticketId } : {}
+            ...args.findingId ? { findingId: args.findingId } : {}
           }
         );
         if (!result) {
@@ -1897,7 +1897,7 @@ After calling this tool, you should:
             content: [
               {
                 type: "text",
-                text: "No tickets need enrichment. All tickets are either already enriched or in progress."
+                text: "No findings need enrichment. All findings are either already enriched or in progress."
               }
             ]
           };
@@ -1915,7 +1915,7 @@ After calling this tool, you should:
           content: [
             {
               type: "text",
-              text: `Error claiming ticket for enrichment: ${err.message}`
+              text: `Error claiming finding for enrichment: ${err.message}`
             }
           ],
           isError: true
@@ -1925,11 +1925,11 @@ After calling this tool, you should:
   );
 }
 
-// src/mcp/tools/get-existing-tickets.ts
-function registerGetExistingTicketsTool(server, ctx) {
+// src/mcp/tools/get-existing-findings.ts
+function registerGetExistingFindingsTool(server, ctx) {
   server.tool(
-    "yapout_get_existing_tickets",
-    "Fetch all ticket titles in the project for duplicate detection during enrichment",
+    "yapout_get_existing_findings",
+    "Fetch all finding titles in the project for duplicate detection during enrichment",
     {},
     async () => {
       const projectId = ctx.projectId ?? process.env.YAPOUT_PROJECT_ID;
@@ -1945,16 +1945,16 @@ function registerGetExistingTicketsTool(server, ctx) {
         };
       }
       try {
-        const tickets = await ctx.client.query(
-          anyApi2.functions.localPipeline.getExistingTicketTitles,
+        const findings = await ctx.client.query(
+          anyApi2.functions.localPipeline.getExistingFindingTitles,
           { projectId }
         );
-        if (!tickets || tickets.length === 0) {
+        if (!findings || findings.length === 0) {
           return {
             content: [
               {
                 type: "text",
-                text: "No existing tickets in this project."
+                text: "No existing findings in this project."
               }
             ]
           };
@@ -1963,7 +1963,7 @@ function registerGetExistingTicketsTool(server, ctx) {
           content: [
             {
               type: "text",
-              text: JSON.stringify(tickets, null, 2)
+              text: JSON.stringify(findings, null, 2)
             }
           ]
         };
@@ -1972,7 +1972,7 @@ function registerGetExistingTicketsTool(server, ctx) {
           content: [
             {
               type: "text",
-              text: `Error fetching existing tickets: ${err.message}`
+              text: `Error fetching existing findings: ${err.message}`
             }
           ],
           isError: true
@@ -1984,23 +1984,53 @@ function registerGetExistingTicketsTool(server, ctx) {
 
 // src/mcp/tools/save-enrichment.ts
 import { z as z11 } from "zod";
+
+// src/mcp/tools/enrichment-session.ts
+var activeSessions = /* @__PURE__ */ new Map();
+function createSession(projectId, total, filter) {
+  const sessionId = crypto.randomUUID();
+  const session = {
+    sessionId,
+    projectId,
+    filter,
+    startedAt: Date.now(),
+    stats: { enriched: 0, skipped: 0, total },
+    contextDelivered: false
+  };
+  activeSessions.set(sessionId, session);
+  return session;
+}
+function getSession(sessionId) {
+  return activeSessions.get(sessionId);
+}
+function updateSessionStats(sessionId, update) {
+  const session = activeSessions.get(sessionId);
+  if (!session) return;
+  Object.assign(session.stats, update);
+}
+function markContextDelivered(sessionId) {
+  const session = activeSessions.get(sessionId);
+  if (session) session.contextDelivered = true;
+}
+
+// src/mcp/tools/save-enrichment.ts
 function registerSaveEnrichmentTool(server, ctx) {
   server.tool(
     "yapout_save_enrichment",
     `Save enrichment and sync to Linear. Call this after you have read the codebase, asked any necessary clarifying questions, and formulated a clean description, acceptance criteria, and implementation brief.
 
-The ticket must have been claimed via yapout_get_unenriched_ticket first (status must be "enriching").
+The finding must have been claimed via yapout_get_unenriched_finding first (status must be "enriching").
 
 This tool saves the enrichment, then automatically creates the Linear issue with:
 - Clean description + acceptance criteria as the issue body
 - Clarification Q&A as a branded comment (if any)
 - Implementation brief as attachment metadata
 
-The ticket transitions: enriching \u2192 enriched \u2192 synced.`,
+The finding transitions: enriching \u2192 enriched \u2192 synced.`,
     {
-      ticketId: z11.string().describe("The ticket ID to enrich (from yapout_get_unenriched_ticket)"),
-      title: z11.string().describe("Refined ticket 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 ticket a senior engineer would write."),
+      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(
@@ -2009,17 +2039,18 @@ The ticket transitions: enriching \u2192 enriched \u2192 synced.`,
           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: z11.boolean().optional().describe("Set to true if this ticket is too large for a single PR"),
-      suggestedSplit: z11.array(z11.string()).optional().describe("If oversized: suggested sub-ticket titles for breaking it down"),
-      level: z11.enum(["project", "issue"]).optional().describe("Override the decision's level if enrichment reveals it should be reclassified"),
-      nature: z11.enum(["implementable", "operational", "spike"]).optional().describe("Override the decision's nature if enrichment reveals it should be reclassified")
+      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"),
+      level: z11.enum(["project", "issue"]).optional().describe("Override the finding's level if enrichment reveals it should be reclassified"),
+      nature: z11.enum(["implementable", "operational", "spike"]).optional().describe("Override the finding's nature if enrichment reveals it should be reclassified"),
+      sessionId: z11.string().optional().describe("Bulk enrichment session ID (from yapout_start_enrichment). Updates session stats.")
     },
     async (args) => {
       try {
         await ctx.client.mutation(
           anyApi2.functions.localPipeline.saveLocalEnrichment,
           {
-            ticketId: args.ticketId,
+            findingId: args.findingId,
             title: args.title,
             cleanDescription: args.cleanDescription,
             acceptanceCriteria: args.acceptanceCriteria,
@@ -2032,21 +2063,33 @@ The ticket transitions: enriching \u2192 enriched \u2192 synced.`,
           }
         );
         await ctx.client.action(
-          anyApi2.functions.localPipeline.syncTicketToLinearLocal,
-          { ticketId: args.ticketId }
+          anyApi2.functions.localPipeline.syncFindingToLinearLocal,
+          { findingId: args.findingId }
         );
-        const ticket = await ctx.client.query(
-          anyApi2.functions.tickets.getTicket,
-          { ticketId: args.ticketId }
+        const finding = await ctx.client.query(
+          anyApi2.functions.findings.getFinding,
+          { findingId: args.findingId }
         );
+        if (args.sessionId) {
+          const session2 = getSession(args.sessionId);
+          if (session2) {
+            updateSessionStats(args.sessionId, {
+              enriched: session2.stats.enriched + 1
+            });
+          }
+        }
+        const session = args.sessionId ? getSession(args.sessionId) : null;
+        const estimatedTokens = session ? session.stats.enriched * 5e3 : 0;
+        const compactionHint = estimatedTokens > 1e5;
         const response = {
-          ticketId: args.ticketId,
-          linearIssueId: ticket?.linearTicketId ?? null,
-          linearUrl: ticket?.linearUrl ?? null,
-          message: ticket?.linearUrl ? `Ticket enriched and synced to Linear: ${ticket.linearUrl}` : "Ticket enriched and synced to Linear."
+          findingId: args.findingId,
+          linearIssueId: finding?.linearIssueId ?? null,
+          linearIssueUrl: finding?.linearIssueUrl ?? null,
+          compactionHint,
+          message: finding?.linearIssueUrl ? `Finding enriched and synced to Linear: ${finding.linearIssueUrl}` : "Finding enriched and synced to Linear."
         };
         if (args.isOversized && args.suggestedSplit?.length) {
-          response.warning = `This ticket is oversized. Suggested split: ${args.suggestedSplit.join(", ")}`;
+          response.warning = `This finding is oversized. Suggested split: ${args.suggestedSplit.join(", ")}`;
         }
         return {
           content: [
@@ -2076,15 +2119,15 @@ import { z as z12 } from "zod";
 function registerSyncToLinearTool(server, ctx) {
   server.tool(
     "yapout_sync_to_linear",
-    "Trigger Linear ticket creation for an enriched ticket. The sync runs server-side (encrypted Linear token in Convex).",
+    "Trigger Linear issue creation for an enriched finding. The sync runs server-side (encrypted Linear token in Convex).",
     {
-      ticketId: z12.string().describe("The ticket ID to sync to Linear")
+      findingId: z12.string().describe("The finding ID to sync to Linear")
     },
     async (args) => {
       try {
         await ctx.client.action(
-          anyApi2.functions.localPipeline.syncTicketToLinearLocal,
-          { ticketId: args.ticketId }
+          anyApi2.functions.localPipeline.syncFindingToLinearLocal,
+          { findingId: args.findingId }
         );
         return {
           content: [
@@ -2093,8 +2136,8 @@ function registerSyncToLinearTool(server, ctx) {
               text: JSON.stringify(
                 {
                   success: true,
-                  ticketId: args.ticketId,
-                  message: "Ticket synced to Linear successfully. It will now appear in the work queue for implementation."
+                  findingId: args.findingId,
+                  message: "Finding synced to Linear successfully. It will now appear in the work queue for implementation."
                 },
                 null,
                 2
@@ -2122,7 +2165,7 @@ import { z as z13 } from "zod";
 function registerSubmitYapSessionTool(server, ctx) {
   server.tool(
     "yapout_submit_yap_session",
-    "Submit a yap session transcript for decision extraction",
+    "Submit a yap session transcript for finding extraction",
     {
       title: z13.string().describe("Session title (e.g., 'Notification system brainstorm')"),
       transcript: z13.string().describe("Cleaned conversation transcript")
@@ -2140,8 +2183,8 @@ function registerSubmitYapSessionTool(server, ctx) {
         };
       }
       try {
-        const transcriptId = await ctx.client.mutation(
-          anyApi2.functions.transcripts.createFromYapSession,
+        const captureId = await ctx.client.mutation(
+          anyApi2.functions.captures.createFromYapSession,
           {
             projectId: ctx.projectId,
             title: args.title,
@@ -2154,8 +2197,8 @@ function registerSubmitYapSessionTool(server, ctx) {
               type: "text",
               text: JSON.stringify(
                 {
-                  transcriptId,
-                  message: "Yap session submitted. Decisions will appear for review shortly."
+                  captureId,
+                  message: "Yap session submitted. Findings will appear for review shortly."
                 },
                 null,
                 2
@@ -2233,46 +2276,46 @@ WHAT YOU DON'T DO:
 - Don't implement anything. Don't write code. Don't edit files. Just discuss.
 - Don't agree with everything. Challenge ideas that seem undercooked.
 - Don't ask more than 5 questions without letting the developer steer.
-- Don't make changes to the codebase, even if the user asks. A yap session produces decisions and tickets \u2014 implementation happens later through the normal ticket pipeline. If the user asks you to "just do it" or "make that change now," push back: "That's what the tickets are for. Let's capture it properly so it goes through review." This boundary is critical \u2014 implementing during a yap bypasses every approval gate yapout exists to enforce.
+- Don't make changes to the codebase, even if the user asks. A yap session produces findings \u2014 implementation happens later through the normal finding pipeline. If the user asks you to "just do it" or "make that change now," push back: "That's what the findings are for. Let's capture it properly so it goes through review." This boundary is critical \u2014 implementing during a yap bypasses every approval gate yapout exists to enforce.
 
 ${contextSection}
 
 DURING THE SESSION \u2014 COMPLETENESS TRACKING:
-As the conversation progresses, you are building a mental model of every decision. For each decision, track:
+As the conversation progresses, you are building a mental model of every finding. For each finding, track:
 - What has been clearly stated (title, scope, priority)
-- What has been discussed in enough depth to write a ticket (enrichment)
+- What has been discussed in enough depth to write a finding (enrichment)
 - What is still vague, contradicted, or unanswered
 
-The conversation does NOT need to follow a rigid structure. The user may jump between topics, change their mind, go on tangents, or revisit earlier decisions. This is normal \u2014 real conversations are not linear. Your job is to follow the thread and keep track of the state of each decision regardless of conversation order.
+The conversation does NOT need to follow a rigid structure. The user may jump between topics, change their mind, go on tangents, or revisit earlier findings. This is normal \u2014 real conversations are not linear. Your job is to follow the thread and keep track of the state of each finding regardless of conversation order.
 
 If the user contradicts an earlier statement, note it and confirm which version they mean when the time is right. Don't interrupt the flow for minor clarifications \u2014 batch them for later.
 
 BEFORE SUBMITTING \u2014 GAP FILLING:
-Before you submit, review your mental model of every decision. For each one, ask yourself:
-- Could a developer read this ticket and start working without asking questions?
+Before you submit, review your mental model of every finding. For each one, ask yourself:
+- Could a developer read this finding and start working without asking questions?
 - Are the acceptance criteria specific enough to verify?
 - Are there ambiguities the user didn't resolve?
 
 If there are gaps, ask the user to fill them. Be direct: "Before I submit, I need clarity on a few things..." Group related gaps together rather than asking one at a time.
 
-You do NOT need to fill every gap. If the conversation didn't cover something deeply enough, mark that decision as NOT enriched \u2014 it will go through the async enrichment pipeline later. Be honest about what you know vs. what you're guessing.
+You do NOT need to fill every gap. If the conversation didn't cover something deeply enough, mark that finding as NOT enriched \u2014 it will go through the async enrichment pipeline later. Be honest about what you know vs. what you're guessing.
 
 ENRICHMENT ASSESSMENT:
-For each decision, you must make an honest call: is this enriched or not?
+For each finding, you must make an honest call: is this enriched or not?
 
-Mark a decision as ENRICHED (isEnriched: true) when:
-- The conversation covered it thoroughly enough to produce a clear ticket
+Mark a finding as ENRICHED (isEnriched: true) when:
+- The conversation covered it thoroughly enough to produce a clear finding
 - You can write an enrichedDescription that a senior engineer would recognize as well-scoped
 - You can write at least 2-3 testable acceptance criteria
 - The user explicitly validated the scope (not just mentioned it in passing)
 
-Mark a decision as NOT ENRICHED (isEnriched: false or omitted) when:
+Mark a finding as NOT ENRICHED (isEnriched: false or omitted) when:
 - It came up late in the conversation without much discussion
 - The user mentioned it but didn't elaborate on scope or requirements
 - You're uncertain about key aspects (what it should do, how it should work)
 - It's a spike or needs further scoping
 
-This is a quality gate. Do not inflate your assessment \u2014 unenriched tickets get enriched properly later. Falsely marking something as enriched skips that process and produces bad tickets.
+This is a quality gate. Do not inflate your assessment \u2014 unenriched findings get enriched properly later. Falsely marking something as enriched skips that process and produces bad findings.
 
 PRESENTING THE FINAL PICTURE:
 When the conversation feels complete, present a summary grouped by project:
@@ -2294,17 +2337,17 @@ Should I submit this to yapout?"
 SUBMITTING:
 On confirmation, call yapout_extract_from_yap with the full data.
 
-For each decision, provide:
+For each finding, provide:
 - title, description, sourceQuote, type, priority, confidence, level, nature
 - isEnriched: your honest assessment (see above)
 
-For ENRICHED decisions (isEnriched: true), also include:
-- enrichedDescription: clean, final description \u2014 write the kind of ticket a senior engineer would write
+For ENRICHED findings (isEnriched: true), also include:
+- enrichedDescription: clean, final description \u2014 write the kind of finding a senior engineer would write
 - acceptanceCriteria: array of specific, testable statements
 - implementationBrief: (optional) technical context \u2014 files, approach, edge cases. Only include if you read the codebase during the session. The implementing agent reads the codebase anyway.
-- clarifications: relevant Q&A from the conversation that shaped the decision
+- clarifications: relevant Q&A from the conversation that shaped the finding
 
-For PROJECT-level decisions, also include:
+For PROJECT-level findings, also include:
 - projectDescription: what this body of work accomplishes
 - suggestedOrder: implementation sequencing ("Phase 1: A, then Phase 2: B+C")
 - children: array of child issues (each with their own enrichment data)
@@ -2313,18 +2356,18 @@ For children with DEPENDENCIES, include:
 - dependsOn: array of sibling indices (0-based) that must complete first
 
 Structure:
-- Projects include children inline \u2014 never create child issues as separate top-level decisions
+- Projects include children inline \u2014 never create child issues as separate top-level findings
 - Standalone issues go at the top level
 - The hierarchy you produce should be the final structure
 
 Call yapout_extract_from_yap with:
 - sessionTitle: descriptive title for this session
 - sessionTranscript: clean summary of the conversation (meeting-notes style)
-- decisions: the array (projects with children, standalone issues)
+- findings: the array (projects with children, standalone issues)
 
-This creates decisions (as converted \u2014 your participation was the approval), tickets (enriched or draft based on your assessment), and project decomposition \u2014 all in one call. Enriched tickets appear in the work queue ready for the user to sync to Linear.
+This creates findings (enriched or draft based on your assessment) and project decomposition \u2014 all in one call. Enriched findings appear in the work queue ready for the user to sync to Linear.
 
-Only fall back to yapout_submit_yap_session if the session was purely exploratory with no clear actionable decisions.
+Only fall back to yapout_submit_yap_session if the session was purely exploratory with no clear actionable findings.
 
 --- BEGIN THE SESSION NOW ---`;
       return {
@@ -2358,39 +2401,39 @@ 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"]).describe("Decision category"),
+  type: z15.enum(["feature", "bug", "chore"]).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 decision (0-1)"),
+  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 ticket a developer could pick up.
+  // issue thoroughly enough to produce a finding a developer could pick up.
   isEnriched: z15.boolean().optional().describe(
-    "Did the conversation cover this issue deeply enough to produce a complete ticket? true = enriched (ready for Linear), false/omitted = draft (needs async enrichment)"
+    "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: 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 decision"),
+  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 decisions 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-decision. Creates transcript, decisions (as converted), and tickets (enriched or draft). Enriched tickets are ready for the user to sync to Linear from the UI. Draft tickets need further enrichment via the async pipeline.",
+    "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: z15.string().describe("Descriptive title for this yap session"),
       sessionTranscript: z15.string().describe("Cleaned transcript of the conversation (meeting-notes style)"),
-      decisions: z15.array(
+      findings: z15.array(
         z15.object({
-          title: z15.string().describe("Decision title"),
+          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"]).describe("Decision category (do not use spike \u2014 use nature instead)"),
+          type: z15.enum(["feature", "bug", "chore"]).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 decision (0-1)"),
+          confidence: z15.number().min(0).max(1).describe("Your confidence this is a clear, actionable finding (0-1)"),
           level: z15.enum(["project", "issue"]).describe("project = body of work with children, issue = single unit"),
           nature: z15.enum(["implementable", "operational", "spike"]).describe("implementable = code changes, operational = manual task, spike = needs scoping"),
-          sourceDecisionId: z15.string().optional().describe("ID of an existing decision this scopes (e.g., scoping a spike)"),
+          sourceFindingId: z15.string().optional().describe("ID of an existing finding this scopes (e.g., scoping a spike)"),
           // Issue-level enrichment (when level === "issue")
           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 (standalone issues only, required if isEnriched)"),
@@ -2402,7 +2445,7 @@ function registerExtractFromYapTool(server, ctx) {
           suggestedOrder: z15.string().optional().describe("Implementation order: 'Phase 1: A, then Phase 2: B+C' (projects only)"),
           children: z15.array(childSchema).optional().describe("Child issues for project-level decisions")
         })
-      ).describe("Decisions from the conversation. Projects include children inline.")
+      ).describe("Findings from the conversation. Projects include children inline.")
     },
     async (args) => {
       if (!ctx.projectId) {
@@ -2418,27 +2461,27 @@ function registerExtractFromYapTool(server, ctx) {
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.transcripts.extractFromYapSession,
+          anyApi2.functions.captures.extractFromYapSession,
           {
             projectId: ctx.projectId,
             title: args.sessionTitle,
             transcript: args.sessionTranscript,
-            decisions: args.decisions
+            findings: args.findings
           }
         );
         let enrichedCount = 0;
         let draftCount = 0;
-        let totalTickets = 0;
+        let totalFindings = 0;
         for (const item of result.items) {
           if (item.level === "project") {
             for (const child of item.children ?? []) {
-              totalTickets++;
-              if (child.ticketStatus === "enriched") enrichedCount++;
+              totalFindings++;
+              if (child.findingStatus === "enriched") enrichedCount++;
               else draftCount++;
             }
           } else {
-            totalTickets++;
-            if (item.ticketStatus === "enriched") enrichedCount++;
+            totalFindings++;
+            if (item.findingStatus === "enriched") enrichedCount++;
             else draftCount++;
           }
         }
@@ -2451,14 +2494,14 @@ function registerExtractFromYapTool(server, ctx) {
               type: "text",
               text: JSON.stringify(
                 {
-                  transcriptId: result.transcriptId,
+                  captureId: result.captureId,
                   items: result.items,
                   summary: {
-                    totalTickets,
+                    totalFindings,
                     enriched: enrichedCount,
                     needsEnrichment: draftCount
                   },
-                  message: `Created ${totalTickets} ticket${totalTickets === 1 ? "" : "s"}: ${parts.join(", ")}. Review in the yapout work queue.`
+                  message: `Created ${totalFindings} finding${totalFindings === 1 ? "" : "s"}: ${parts.join(", ")}. Review in the yapout work queue.`
                 },
                 null,
                 2
@@ -2486,20 +2529,20 @@ import { z as z16 } from "zod";
 function registerSaveProjectEnrichmentTool(server, ctx) {
   server.tool(
     "yapout_save_project_enrichment",
-    `Save the decomposition of a project-level decision into implementable child issues.
+    `Save the decomposition of a project-level finding into implementable child issues.
 
-Call this after enriching a ticket with level: "project". The agent should have:
+Call this after enriching a finding with level: "project". The agent should have:
 1. Read the codebase extensively
 2. Asked the user scoping questions
 3. Produced a set of child issues with dependencies
 
-This tool creates child decisions and tickets in yapout, transitions the original
-ticket to "decomposed", and returns the child ticket IDs for subsequent Linear sync.
+This tool creates child findings in yapout, transitions the original
+finding to "decomposed", and returns the child finding IDs for subsequent Linear sync.
 
 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.`,
     {
-      ticketId: z16.string().describe("The project-level ticket being decomposed (from yapout_get_unenriched_ticket)"),
+      findingId: z16.string().describe("The project-level finding being decomposed (from yapout_get_unenriched_finding)"),
       projectDescription: z16.string().describe("Description for the project \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 child issues with. Omit to skip Linear project association \u2014 issues will be synced without a project."),
@@ -2531,7 +2574,7 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
         const result = await ctx.client.mutation(
           anyApi2.functions.localPipeline.saveProjectEnrichment,
           {
-            ticketId: args.ticketId,
+            findingId: args.findingId,
             projectDescription: args.projectDescription,
             suggestedOrder: args.suggestedOrder,
             linearProjectId: args.linearProjectId,
@@ -2544,11 +2587,11 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
               type: "text",
               text: JSON.stringify(
                 {
-                  ticketId: result.ticketId,
+                  findingId: result.findingId,
                   status: "decomposed",
-                  childTicketIds: result.childTicketIds,
+                  childFindingIds: result.childFindingIds,
                   suggestedOrder: result.suggestedOrder,
-                  message: `Project decomposed into ${result.childTicketIds.length} child issues. Original ticket marked as decomposed. Child tickets are in draft status \u2014 enrich and sync each one individually, or approve them for the user to review.`
+                  message: `Project decomposed into ${result.childFindingIds.length} child issues. Original finding marked as decomposed. Child findings are in draft status \u2014 enrich and sync each one individually, or approve them for the user to review.`
                 },
                 null,
                 2
@@ -2576,13 +2619,13 @@ import { z as z17 } from "zod";
 function registerMarkDuplicateTool(server, ctx) {
   server.tool(
     "yapout_mark_duplicate",
-    `Mark a ticket as a duplicate of existing Linear work. Use this during any enrichment
+    `Mark a finding as a duplicate of existing Linear work. Use this during any enrichment
 flow when you discover the work is already tracked in Linear.
 
-The ticket must be in "enriching" or "enriched" status. It will be transitioned to
+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.`,
     {
-      ticketId: z17.string().describe("The yapout ticket to archive as 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")
     },
@@ -2600,9 +2643,9 @@ The ticket must be in "enriching" or "enriched" status. It will be transitioned
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.tickets.markDuplicate,
+          anyApi2.functions.findings.markDuplicate,
           {
-            ticketId: args.ticketId,
+            findingId: args.findingId,
             duplicateOfLinearId: args.duplicateOfLinearId,
             reason: args.reason
           }
@@ -2613,10 +2656,10 @@ The ticket must be in "enriching" or "enriched" status. It will be transitioned
               type: "text",
               text: JSON.stringify(
                 {
-                  ticketId: result.ticketId,
+                  findingId: result.findingId,
                   status: "failed",
                   duplicateOf: result.duplicateOfLinearId,
-                  message: `Ticket archived as duplicate of ${args.duplicateOfLinearId}. Nothing synced to Linear.`
+                  message: `Finding archived as duplicate of ${args.duplicateOfLinearId}. Nothing synced to Linear.`
                 },
                 null,
                 2
@@ -2712,6 +2755,218 @@ and issue counts so you can ask the user for confirmation before creating a new
   );
 }
 
+// src/mcp/tools/start-enrichment.ts
+import { z as z18 } from "zod";
+function registerStartEnrichmentTool(server, ctx) {
+  server.tool(
+    "yapout_start_enrichment",
+    `Start a bulk enrichment session. Returns a session ID and the count of findings to process.
+
+Use this before calling yapout_enrich_next. The session tracks your progress (enriched/skipped/remaining)
+and maintains filter criteria so you don't re-pass them on every call.
+
+Optionally filter by tags, capture, or explicit finding IDs.`,
+    {
+      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.")
+    },
+    async (args) => {
+      const projectId = ctx.projectId ?? process.env.YAPOUT_PROJECT_ID;
+      if (!projectId) {
+        return {
+          content: [{ type: "text", text: "No project linked. Run yapout_init or yapout link first." }],
+          isError: true
+        };
+      }
+      try {
+        const allFindings = await ctx.client.query(
+          anyApi2.functions.findings.getProjectFindings,
+          { projectId }
+        );
+        let drafts = (allFindings ?? []).filter((f) => f.status === "draft");
+        if (args.filter?.tags?.length) {
+          const filterTags = new Set(args.filter.tags);
+          drafts = drafts.filter(
+            (f) => (f.tags ?? []).some((t) => filterTags.has(t))
+          );
+        }
+        if (args.filter?.captureId) {
+          const cid = args.filter.captureId;
+          drafts = drafts.filter((f) => f.captureId === cid);
+        }
+        if (args.filter?.findingIds?.length) {
+          const ids = new Set(args.filter.findingIds);
+          drafts = drafts.filter((f) => ids.has(f._id));
+        }
+        const session = createSession(projectId, drafts.length, args.filter);
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                sessionId: session.sessionId,
+                totalFindings: drafts.length,
+                filter: args.filter ?? null,
+                message: drafts.length > 0 ? `Starting enrichment session: ${drafts.length} finding${drafts.length !== 1 ? "s" : ""} to process.` : "No draft findings match the filter. Nothing to enrich."
+              }, null, 2)
+            }
+          ]
+        };
+      } catch (err) {
+        return {
+          content: [{ type: "text", text: `Error starting enrichment: ${err.message}` }],
+          isError: true
+        };
+      }
+    }
+  );
+}
+
+// src/mcp/tools/enrich-next.ts
+import { z as z19 } from "zod";
+function registerEnrichNextTool(server, ctx) {
+  server.tool(
+    "yapout_enrich_next",
+    `Get the next finding to enrich in a bulk enrichment session.
+
+If skip=true, releases the current finding back to draft and moves on.
+Returns the next unclaimed draft finding matching the session's filter.
+
+When done=true, all findings have been processed.`,
+    {
+      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)")
+    },
+    async (args) => {
+      const session = getSession(args.sessionId);
+      if (!session) {
+        return {
+          content: [{ type: "text", text: "Session not found. Start a new one with yapout_start_enrichment." }],
+          isError: true
+        };
+      }
+      try {
+        if (args.skip && args.skipFindingId) {
+          try {
+            await ctx.client.mutation(
+              anyApi2.functions.localPipeline.releaseEnrichmentClaim,
+              { findingId: args.skipFindingId }
+            );
+            updateSessionStats(args.sessionId, {
+              skipped: session.stats.skipped + 1
+            });
+          } catch {
+          }
+        }
+        const allFindings = await ctx.client.query(
+          anyApi2.functions.findings.getProjectFindings,
+          { projectId: session.projectId }
+        );
+        let drafts = (allFindings ?? []).filter(
+          (f) => f.status === "draft"
+        );
+        if (session.filter?.tags?.length) {
+          const filterTags = new Set(session.filter.tags);
+          drafts = drafts.filter(
+            (f) => (f.tags ?? []).some((t) => filterTags.has(t))
+          );
+        }
+        if (session.filter?.captureId) {
+          const cid = session.filter.captureId;
+          drafts = drafts.filter((f) => f.captureId === cid);
+        }
+        if (session.filter?.findingIds?.length) {
+          const ids = new Set(session.filter.findingIds);
+          drafts = drafts.filter((f) => ids.has(f._id));
+        }
+        if (drafts.length === 0) {
+          const total = session.stats.enriched + session.stats.skipped;
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  done: true,
+                  position: {
+                    current: total,
+                    total: session.stats.total,
+                    enriched: session.stats.enriched,
+                    skipped: session.stats.skipped
+                  },
+                  message: `All done! ${session.stats.enriched} enriched, ${session.stats.skipped} skipped.`
+                }, null, 2)
+              }
+            ]
+          };
+        }
+        const next = drafts[0];
+        const claimResult = await ctx.client.mutation(
+          anyApi2.functions.localPipeline.claimForEnrichment,
+          { projectId: session.projectId, findingId: next._id }
+        );
+        if (!claimResult) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  done: false,
+                  message: "Finding was claimed by another session. Call yapout_enrich_next again to get the next one.",
+                  position: {
+                    current: session.stats.enriched + session.stats.skipped,
+                    total: session.stats.total,
+                    enriched: session.stats.enriched,
+                    skipped: session.stats.skipped
+                  }
+                }, null, 2)
+              }
+            ]
+          };
+        }
+        const current = session.stats.enriched + session.stats.skipped + 1;
+        const includeContext = !session.contextDelivered;
+        if (includeContext) markContextDelivered(args.sessionId);
+        const existingTitles = (allFindings ?? []).filter((f) => f._id !== next._id && f.status !== "archived").map((f) => f.title);
+        const response = {
+          finding: {
+            findingId: claimResult.findingId,
+            title: claimResult.title,
+            description: claimResult.description,
+            sourceQuote: claimResult.sourceQuote,
+            type: claimResult.type,
+            priority: claimResult.priority
+          },
+          position: {
+            current,
+            total: session.stats.total,
+            enriched: session.stats.enriched,
+            skipped: session.stats.skipped
+          },
+          existingFindingTitles: existingTitles,
+          done: false
+        };
+        if (includeContext && claimResult.projectContext) {
+          response.projectContext = claimResult.projectContext;
+        }
+        return {
+          content: [
+            { type: "text", text: JSON.stringify(response, null, 2) }
+          ]
+        };
+      } catch (err) {
+        return {
+          content: [{ type: "text", text: `Error getting next finding: ${err.message}` }],
+          isError: true
+        };
+      }
+    }
+  );
+}
+
 // src/mcp/server.ts
 async function startMcpServer() {
   const cwd = process.cwd();
@@ -2754,8 +3009,8 @@ async function startMcpServer() {
   registerShipTool(server, ctx);
   registerCheckTool(server, ctx);
   registerBundleTool(server, ctx);
-  registerGetUnenrichedTicketsTool(server, ctx);
-  registerGetExistingTicketsTool(server, ctx);
+  registerGetUnenrichedFindingsTool(server, ctx);
+  registerGetExistingFindingsTool(server, ctx);
   registerSaveEnrichmentTool(server, ctx);
   registerSyncToLinearTool(server, ctx);
   registerSubmitYapSessionTool(server, ctx);
@@ -2764,6 +3019,8 @@ async function startMcpServer() {
   registerSaveProjectEnrichmentTool(server, ctx);
   registerMarkDuplicateTool(server, ctx);
   registerGetLinearProjectsTool(server, ctx);
+  registerStartEnrichmentTool(server, ctx);
+  registerEnrichNextTool(server, ctx);
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yapout",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "yapout CLI — link local repos, authenticate, and manage projects",
   "type": "module",
   "bin": {