yapout 0.4.1 → 0.5.0

package/dist/index.js

@@ -12,8 +12,11 @@ import { Command as Command16 } from "commander";
 // src/commands/login.ts
 import { Command } from "commander";
 import http from "http";
+import { createHash } from "crypto";
+import { hostname, userInfo } from "os";
 import chalk from "chalk";
 import open from "open";
+import { anyApi as anyApi2 } from "convex/server";
 
 // src/lib/config.ts
 import { homedir } from "os";
@@ -165,6 +168,16 @@ function getAppUrl() {
   return process.env.YAPOUT_APP_URL || "https://yapout.vercel.app";
 }
 
+// src/lib/convex.ts
+import { ConvexHttpClient } from "convex/browser";
+import { anyApi } from "convex/server";
+function createConvexClient(token) {
+  const url = getConvexUrl();
+  const client = new ConvexHttpClient(url);
+  client.setAuth(token);
+  return client;
+}
+
 // src/lib/protocol.ts
 import { execSync, spawnSync } from "child_process";
 import { platform, homedir as homedir2 } from "os";
@@ -413,6 +426,7 @@ function registerProtocolHandler() {
 }
 
 // src/commands/login.ts
+var CLI_VERSION = "0.5.0";
 function startCallbackServer() {
   return new Promise((resolve11) => {
     let resolveData;
@@ -493,6 +507,17 @@ var loginCommand = new Command("login").description("Authenticate with yapout").
         ` (expires in ${daysLeft} day${daysLeft === 1 ? "" : "s"})`
       )
     );
+    try {
+      const client = createConvexClient(creds.token);
+      const deviceId = createHash("sha256").update(hostname() + userInfo().username).digest("hex").slice(0, 16);
+      await client.mutation(anyApi2.functions.devices.registerDevice, {
+        deviceId,
+        name: hostname(),
+        cliVersion: CLI_VERSION
+      });
+    } catch {
+      console.warn(chalk.dim("Note: Could not register device. This is non-fatal."));
+    }
     try {
       registerProtocolHandler();
       console.log(
@@ -546,16 +571,6 @@ function requireAuth() {
   return creds;
 }
 
-// src/lib/convex.ts
-import { ConvexHttpClient } from "convex/browser";
-import { anyApi } from "convex/server";
-function createConvexClient(token) {
-  const url = getConvexUrl();
-  const client = new ConvexHttpClient(url);
-  client.setAuth(token);
-  return client;
-}
-
 // src/lib/prompts.ts
 import { select } from "@inquirer/prompts";
 async function pickProject(projects) {
@@ -916,7 +931,7 @@ import { Command as Command7 } from "commander";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { ConvexHttpClient as ConvexHttpClient2 } from "convex/browser";
-import { anyApi as anyApi2 } from "convex/server";
+import { anyApi as anyApi3 } from "convex/server";
 
 // src/mcp/tools/init.ts
 import { z } from "zod";
@@ -936,7 +951,7 @@ function registerInitTool(server, ctx) {
       const defaultBranch = getDefaultBranch(ctx.cwd);
       const projectName = args.name || repoFullName.split("/")[1] || "unnamed";
       const result = await ctx.client.mutation(
-        anyApi2.functions.projects.createProjectFromCli,
+        anyApi3.functions.projects.createProjectFromCli,
         {
           name: projectName,
           githubRepoFullName: repoFullName,
@@ -1024,7 +1039,7 @@ function registerCompactTool(server, ctx) {
       let lastUpdated;
       try {
         const project = await ctx.client.query(
-          anyApi2.functions.projects.getProject,
+          anyApi3.functions.projects.getProject,
           { projectId: ctx.projectId }
         );
         currentContext = project?.contextSummary ?? void 0;
@@ -1067,7 +1082,7 @@ function registerUpdateContextTool(server, ctx) {
         };
       }
       await ctx.client.mutation(
-        anyApi2.functions.projects.updateProjectContext,
+        anyApi3.functions.projects.updateProjectContext,
         {
           projectId: ctx.projectId,
           summary: args.summary
@@ -1137,7 +1152,7 @@ function registerQueueTool(server, ctx) {
         };
       }
       const data = await ctx.client.query(
-        anyApi2.functions.workQueue.getWorkQueue,
+        anyApi3.functions.workQueue.getWorkQueue,
         { projectId: ctx.projectId }
       );
       if (!data) {
@@ -1246,7 +1261,7 @@ function registerGetBriefTool(server, ctx) {
       }
       try {
         const data = await ctx.client.query(
-          anyApi2.functions.findings.getFindingBrief,
+          anyApi3.functions.findings.getFindingBrief,
           { findingId: itemId }
         );
         if (data) {
@@ -1260,7 +1275,7 @@ function registerGetBriefTool(server, ctx) {
       }
       try {
         const bundle = await ctx.client.query(
-          anyApi2.functions.bundles.getBundle,
+          anyApi3.functions.bundles.getBundle,
           { bundleId: itemId }
         );
         if (bundle) {
@@ -1431,7 +1446,7 @@ function formatBundleBrief(bundle, projectContext) {
 async function detectWorkItemKind(client, workItemId) {
   try {
     const bundle = await client.query(
-      anyApi2.functions.bundles.getBundle,
+      anyApi3.functions.bundles.getBundle,
       { bundleId: workItemId }
     );
     if (bundle) {
@@ -1485,7 +1500,7 @@ function registerClaimTool(server, ctx) {
 }
 async function claimStandalone(ctx, args, findingId) {
   const briefData = await ctx.client.query(
-    anyApi2.functions.findings.getFindingBrief,
+    anyApi3.functions.findings.getFindingBrief,
     { findingId }
   );
   if (!briefData) {
@@ -1506,11 +1521,11 @@ async function claimStandalone(ctx, args, findingId) {
   const slug = slugify(finding.title);
   const branchName = linearIssueId ? `${prefix}/${linearIssueId.toLowerCase()}-${slug}` : `${prefix}/${slug}`;
   const localClaim = await ctx.client.mutation(
-    anyApi2.functions.findings.claimFindingLocal,
+    anyApi3.functions.findings.claimFindingLocal,
     { findingId, branchName }
   );
   const claim = await ctx.client.mutation(
-    anyApi2.functions.workQueue.claimForImplementation,
+    anyApi3.functions.workQueue.claimForImplementation,
     {
       projectId: ctx.projectId,
       workItemId: findingId,
@@ -1520,7 +1535,7 @@ async function claimStandalone(ctx, args, findingId) {
   if (linearIssueId && ctx.projectId) {
     try {
       await ctx.client.action(
-        anyApi2.functions.linearStatusMutations.moveIssueStatus,
+        anyApi3.functions.linearStatusMutations.moveIssueStatus,
         {
           projectId: ctx.projectId,
           linearIssueId,
@@ -1577,11 +1592,11 @@ async function claimBundle(ctx, args, bundleId, bundleData) {
     };
   }
   const localClaim = await ctx.client.mutation(
-    anyApi2.functions.findings.claimFindingLocal,
+    anyApi3.functions.findings.claimFindingLocal,
     { findingId: primaryFinding._id, branchName }
   );
   const claim = await ctx.client.mutation(
-    anyApi2.functions.workQueue.claimForImplementation,
+    anyApi3.functions.workQueue.claimForImplementation,
     {
       projectId: ctx.projectId,
       workItemId: bundleId,
@@ -1592,7 +1607,7 @@ async function claimBundle(ctx, args, bundleId, bundleData) {
     if (f.linearIssueId && ctx.projectId) {
       try {
         await ctx.client.action(
-          anyApi2.functions.linearStatusMutations.moveIssueStatus,
+          anyApi3.functions.linearStatusMutations.moveIssueStatus,
           {
             projectId: ctx.projectId,
             linearIssueId: f.linearIssueId,
@@ -1606,7 +1621,7 @@ async function claimBundle(ctx, args, bundleId, bundleData) {
   let projectContext;
   try {
     const briefData = await ctx.client.query(
-      anyApi2.functions.findings.getFindingBrief,
+      anyApi3.functions.findings.getFindingBrief,
       { findingId: primaryFinding._id }
     );
     projectContext = briefData?.projectContext;
@@ -1646,7 +1661,7 @@ async function claimBundle(ctx, args, bundleId, bundleData) {
 async function getDefaultBranchForProject(ctx) {
   try {
     const data = await ctx.client.query(
-      anyApi2.functions.projects.getProject,
+      anyApi3.functions.projects.getProject,
       { projectId: ctx.projectId }
     );
     return data?.githubDefaultBranch || "main";
@@ -1665,7 +1680,7 @@ async function setupWorktree(ctx, itemId, branchName, defaultBranch, brief, pipe
   writeBrief(worktreePath, brief);
   try {
     await ctx.client.mutation(
-      anyApi2.functions.pipelineRuns.reportDaemonEvent,
+      anyApi3.functions.pipelineRuns.reportDaemonEvent,
       {
         pipelineRunId,
         event: "worktree_created",
@@ -1701,7 +1716,7 @@ function writeBrief(dir, brief) {
 async function reportClaimEvents(ctx, pipelineRunId, title, branchName) {
   try {
     await ctx.client.mutation(
-      anyApi2.functions.pipelineRuns.reportDaemonEvent,
+      anyApi3.functions.pipelineRuns.reportDaemonEvent,
       {
         pipelineRunId,
         event: "daemon_claimed",
@@ -1709,7 +1724,7 @@ async function reportClaimEvents(ctx, pipelineRunId, title, branchName) {
       }
     );
     await ctx.client.mutation(
-      anyApi2.functions.pipelineRuns.reportDaemonEvent,
+      anyApi3.functions.pipelineRuns.reportDaemonEvent,
       {
         pipelineRunId,
         event: "branch_created",
@@ -1736,7 +1751,7 @@ function registerEventTool(server, ctx) {
     async (args) => {
       try {
         await ctx.client.mutation(
-          anyApi2.functions.pipelineRuns.reportDaemonEvent,
+          anyApi3.functions.pipelineRuns.reportDaemonEvent,
           {
             pipelineRunId: args.pipelineRunId,
             event: args.event,
@@ -1993,7 +2008,7 @@ function registerShipTool(server, ctx) {
       }
       try {
         await ctx.client.mutation(
-          anyApi2.functions.pipelineRuns.reportDaemonEvent,
+          anyApi3.functions.pipelineRuns.reportDaemonEvent,
           {
             pipelineRunId: args.pipelineRunId,
             event: "push_completed",
@@ -2002,7 +2017,7 @@ function registerShipTool(server, ctx) {
         );
         if (prUrl) {
           await ctx.client.mutation(
-            anyApi2.functions.pipelineRuns.reportDaemonEvent,
+            anyApi3.functions.pipelineRuns.reportDaemonEvent,
             {
               pipelineRunId: args.pipelineRunId,
               event: "pr_opened",
@@ -2014,7 +2029,7 @@ function registerShipTool(server, ctx) {
       }
       try {
         await ctx.client.mutation(
-          anyApi2.functions.pipelineRuns.completePipelineLocal,
+          anyApi3.functions.pipelineRuns.completePipelineLocal,
           {
             pipelineRunId: args.pipelineRunId,
             githubPrNumber: prNumber,
@@ -2030,7 +2045,7 @@ function registerShipTool(server, ctx) {
         if (ctx.projectId) {
           try {
             await ctx.client.action(
-              anyApi2.functions.linearStatusMutations.moveIssueStatus,
+              anyApi3.functions.linearStatusMutations.moveIssueStatus,
               {
                 projectId: ctx.projectId,
                 linearIssueId: linearId,
@@ -2042,7 +2057,7 @@ function registerShipTool(server, ctx) {
           if (prUrl) {
             try {
               await ctx.client.action(
-                anyApi2.functions.linearStatusMutations.addLinearComment,
+                anyApi3.functions.linearStatusMutations.addLinearComment,
                 {
                   projectId: ctx.projectId,
                   linearIssueId: linearId,
@@ -2060,7 +2075,7 @@ function registerShipTool(server, ctx) {
           result.worktreeCleaned = true;
           try {
             await ctx.client.mutation(
-              anyApi2.functions.pipelineRuns.reportDaemonEvent,
+              anyApi3.functions.pipelineRuns.reportDaemonEvent,
               {
                 pipelineRunId: args.pipelineRunId,
                 event: "worktree_cleaned",
@@ -2151,7 +2166,7 @@ function registerCheckTool(server, ctx) {
         if (args.pipelineRunId) {
           try {
             await ctx.client.mutation(
-              anyApi2.functions.pipelineRuns.reportDaemonEvent,
+              anyApi3.functions.pipelineRuns.reportDaemonEvent,
               {
                 pipelineRunId: args.pipelineRunId,
                 event: "running_check",
@@ -2171,7 +2186,7 @@ function registerCheckTool(server, ctx) {
         if (args.pipelineRunId) {
           try {
             await ctx.client.mutation(
-              anyApi2.functions.pipelineRuns.reportDaemonEvent,
+              anyApi3.functions.pipelineRuns.reportDaemonEvent,
               {
                 pipelineRunId: args.pipelineRunId,
                 event: passed ? "check_passed" : "check_failed",
@@ -2215,11 +2230,11 @@ function registerBundleTool(server, ctx) {
     },
     async (args) => {
       const result = await ctx.client.mutation(
-        anyApi2.functions.bundles.createBundle,
+        anyApi3.functions.bundles.createBundle,
         { leadFindingId: args.withFinding, joiningFindingId: args.findingId }
       );
       const bundledBrief = await ctx.client.query(
-        anyApi2.functions.bundles.getBundledBrief,
+        anyApi3.functions.bundles.getBundledBrief,
         { bundleId: result.bundleId }
       );
       if (!bundledBrief) {
@@ -2316,7 +2331,7 @@ After calling this tool, you should:
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.localPipeline.claimForEnrichment,
+          anyApi3.functions.localPipeline.claimForEnrichment,
           {
             projectId,
             ...args.findingId ? { findingId: args.findingId } : {}
@@ -2376,7 +2391,7 @@ function registerGetExistingFindingsTool(server, ctx) {
       }
       try {
         const findings = await ctx.client.query(
-          anyApi2.functions.localPipeline.getExistingFindingTitles,
+          anyApi3.functions.localPipeline.getExistingFindingTitles,
           { projectId }
         );
         if (!findings || findings.length === 0) {
@@ -2471,14 +2486,13 @@ The finding transitions: enriching \u2192 enriched \u2192 ready.`,
       ).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 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,
+          anyApi3.functions.localPipeline.saveLocalEnrichment,
           {
             findingId: args.findingId,
             title: args.title,
@@ -2488,16 +2502,15 @@ The finding transitions: enriching \u2192 enriched \u2192 ready.`,
             clarifications: args.clarifications,
             isOversized: args.isOversized,
             suggestedSplit: args.suggestedSplit,
-            level: args.level,
             nature: args.nature
           }
         );
         await ctx.client.action(
-          anyApi2.functions.localPipeline.syncFindingToLinearLocal,
+          anyApi3.functions.localPipeline.syncFindingToLinearLocal,
           { findingId: args.findingId }
         );
         const finding = await ctx.client.query(
-          anyApi2.functions.findings.getFinding,
+          anyApi3.functions.findings.getFinding,
           { findingId: args.findingId }
         );
         if (args.sessionId) {
@@ -2556,7 +2569,7 @@ function registerSyncToLinearTool(server, ctx) {
     async (args) => {
       try {
         await ctx.client.action(
-          anyApi2.functions.localPipeline.syncFindingToLinearLocal,
+          anyApi3.functions.localPipeline.syncFindingToLinearLocal,
           { findingId: args.findingId }
         );
         return {
@@ -2614,7 +2627,7 @@ function registerSubmitYapSessionTool(server, ctx) {
       }
       try {
         const captureId = await ctx.client.mutation(
-          anyApi2.functions.captures.createFromYapSession,
+          anyApi3.functions.captures.createFromYapSession,
           {
             projectId: ctx.projectId,
             title: args.title,
@@ -2748,11 +2761,11 @@ Mark a finding as NOT ENRICHED (isEnriched: false or omitted) when:
 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:
+When the conversation feels complete, present a summary grouped by bundles and standalone issues:
 
 "Here's what I've gathered from our conversation:
 
-**[Project Name]** \u2014 [one-line description]
+**[Bundle Name]** \u2014 [one-line description]
   1. [Child issue] \u2014 enriched \u2713
   2. [Child issue] \u2014 enriched \u2713
   3. [Child issue] \u2014 needs enrichment (we didn't discuss scope)
@@ -2768,7 +2781,7 @@ SUBMITTING:
 On confirmation, call yapout_extract_from_yap with the full data.
 
 For each finding, provide:
-- title, description, sourceQuote, type, priority, confidence, level, nature
+- title, description, sourceQuote, type, priority, confidence, nature
 - isEnriched: your honest assessment (see above)
 
 For ENRICHED findings (isEnriched: true), also include:
@@ -2777,8 +2790,8 @@ For ENRICHED findings (isEnriched: true), also include:
 - 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 finding
 
-For PROJECT-level findings, also include:
-- projectDescription: what this body of work accomplishes
+For findings with CHILDREN (bundles), also include:
+- bundleDescription: 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)
 
@@ -2786,16 +2799,16 @@ 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 findings
+- Findings with children become bundles \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)
-- findings: the array (projects with children, standalone issues)
+- findings: the array (bundles with children, standalone issues)
 
-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.
+This creates findings (enriched or draft based on your assessment) and bundles \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 findings.
 
@@ -2831,7 +2844,7 @@ 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("Finding category"),
+  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"),
@@ -2858,22 +2871,21 @@ function registerExtractFromYapTool(server, ctx) {
           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("Finding category (do not use spike \u2014 use nature instead)"),
+          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)"),
-          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"),
           sourceFindingId: z15.string().optional().describe("ID of an existing finding this scopes (e.g., scoping a spike)"),
-          // Issue-level enrichment (when level === "issue")
+          // Enrichment data for standalone findings
           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)"),
-          acceptanceCriteria: z15.array(z15.string()).optional().describe("Testable acceptance criteria (standalone issues only, required if isEnriched)"),
-          implementationBrief: z15.string().optional().describe("Technical context (standalone issues only, optional)"),
-          clarifications: z15.array(clarificationSchema).optional().describe("Relevant Q&A from conversation (standalone issues only)"),
-          // Project-level fields (when level === "project")
-          projectDescription: z15.string().optional().describe("What this body of work accomplishes (projects only)"),
-          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")
+          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: 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.")
     },
@@ -2891,7 +2903,7 @@ function registerExtractFromYapTool(server, ctx) {
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.captures.extractFromYapSession,
+          anyApi3.functions.captures.extractFromYapSession,
           {
             projectId: ctx.projectId,
             title: args.sessionTitle,
@@ -2903,8 +2915,8 @@ function registerExtractFromYapTool(server, ctx) {
         let draftCount = 0;
         let totalFindings = 0;
         for (const item of result.items) {
-          if (item.level === "project") {
-            for (const child of item.children ?? []) {
+          if (item.children && item.children.length > 0) {
+            for (const child of item.children) {
               totalFindings++;
               if (child.findingStatus === "enriched") enrichedCount++;
               else draftCount++;
@@ -2954,35 +2966,36 @@ function registerExtractFromYapTool(server, ctx) {
   );
 }
 
-// src/mcp/tools/save-project-enrichment.ts
+// src/mcp/tools/decompose-finding.ts
 import { z as z16 } from "zod";
-function registerSaveProjectEnrichmentTool(server, ctx) {
+function registerDecomposeFindingTool(server, ctx) {
   server.tool(
-    "yapout_save_project_enrichment",
-    `Save the decomposition of a project-level finding into implementable child issues.
+    "yapout_decompose_finding",
+    `Decompose a finding into a bundle with child issues.
 
-Call this after enriching a finding with level: "project". The agent should have:
+Call this when enrichment reveals a finding is too large for a single PR.
+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 findings in yapout, transitions the original
-finding to "decomposed", and returns the child finding IDs for subsequent Linear sync.
+This tool creates a bundle in yapout, assigns child findings to it, and
+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: 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"),
+      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 child issues with. Omit to skip Linear project association \u2014 issues will be synced without a project."),
+      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"]).describe("Category of work"),
+          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")
         })
@@ -3002,10 +3015,10 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.localPipeline.saveProjectEnrichment,
+          anyApi3.functions.localPipeline.decomposeIntoBundle,
           {
             findingId: args.findingId,
-            projectDescription: args.projectDescription,
+            bundleDescription: args.bundleDescription,
             suggestedOrder: args.suggestedOrder,
             linearProjectId: args.linearProjectId,
             issues: args.issues
@@ -3018,10 +3031,12 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
               text: JSON.stringify(
                 {
                   findingId: result.findingId,
-                  status: "decomposed",
+                  bundleId: result.bundleId,
+                  status: "archived",
+                  archivedReason: "decomposed",
                   childFindingIds: result.childFindingIds,
                   suggestedOrder: result.suggestedOrder,
-                  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.`
+                  message: `Finding decomposed into bundle with ${result.childFindingIds.length} child issues. Original finding archived. Child findings are in draft status \u2014 enrich and sync each one individually, or approve them for the user to review.`
                 },
                 null,
                 2
@@ -3034,7 +3049,7 @@ full spec \u2014 schema changes, files to modify, edge cases, and acceptance cri
           content: [
             {
               type: "text",
-              text: `Error saving project enrichment: ${err.message}`
+              text: `Error decomposing finding: ${err.message}`
             }
           ],
           isError: true
@@ -3073,7 +3088,7 @@ The finding must be in "enriching" or "enriched" status. It will be transitioned
       }
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.findings.markDuplicate,
+          anyApi3.functions.findings.markDuplicate,
           {
             findingId: args.findingId,
             duplicateOfLinearId: args.duplicateOfLinearId,
@@ -3136,7 +3151,7 @@ and issue counts so you can ask the user for confirmation before creating a new
       }
       try {
         const project = await ctx.client.query(
-          anyApi2.functions.projects.getProject,
+          anyApi3.functions.projects.getProject,
           { projectId: ctx.projectId }
         );
         if (!project?.linearTeamId) {
@@ -3151,7 +3166,7 @@ and issue counts so you can ask the user for confirmation before creating a new
           };
         }
         const projects = await ctx.client.action(
-          anyApi2.functions.linearProjectsMutations.fetchProjectsDetailed,
+          anyApi3.functions.linearProjectsMutations.fetchProjectsDetailed,
           { teamId: project.linearTeamId }
         );
         return {
@@ -3213,7 +3228,7 @@ Optionally filter by tags, capture, or explicit finding IDs.`,
       }
       try {
         const allFindings = await ctx.client.query(
-          anyApi2.functions.findings.getProjectFindings,
+          anyApi3.functions.findings.getProjectFindings,
           { projectId }
         );
         let drafts = (allFindings ?? []).filter((f) => f.status === "draft");
@@ -3283,7 +3298,7 @@ When done=true, all findings have been processed.`,
         if (args.skip && args.skipFindingId) {
           try {
             await ctx.client.mutation(
-              anyApi2.functions.localPipeline.releaseEnrichmentClaim,
+              anyApi3.functions.localPipeline.releaseEnrichmentClaim,
               { findingId: args.skipFindingId }
             );
             updateSessionStats(args.sessionId, {
@@ -3293,7 +3308,7 @@ When done=true, all findings have been processed.`,
           }
         }
         const allFindings = await ctx.client.query(
-          anyApi2.functions.findings.getProjectFindings,
+          anyApi3.functions.findings.getProjectFindings,
           { projectId: session.projectId }
         );
         let drafts = (allFindings ?? []).filter(
@@ -3335,7 +3350,7 @@ When done=true, all findings have been processed.`,
         }
         const next = drafts[0];
         const claimResult = await ctx.client.mutation(
-          anyApi2.functions.localPipeline.claimForEnrichment,
+          anyApi3.functions.localPipeline.claimForEnrichment,
           { projectId: session.projectId, findingId: next._id }
         );
         if (!claimResult) {
@@ -3416,7 +3431,7 @@ The bundle and all its findings transition to "enriching" status.`,
     async (args) => {
       try {
         const result = await ctx.client.mutation(
-          anyApi2.functions.bundles.claimBundleForEnrichment,
+          anyApi3.functions.bundles.claimBundleForEnrichment,
           { bundleId: args.bundleId }
         );
         if (!result) {
@@ -3474,7 +3489,7 @@ Call yapout_sync_bundle_to_linear afterwards to create the Linear project.`,
     async (args) => {
       try {
         await ctx.client.mutation(
-          anyApi2.functions.bundles.saveBundleEnrichment,
+          anyApi3.functions.bundles.saveBundleEnrichment,
           {
             bundleId: args.bundleId,
             title: args.title,
@@ -3561,7 +3576,7 @@ async function startMcpServer() {
   registerSubmitYapSessionTool(server, ctx);
   registerStartYapTool(server, ctx);
   registerExtractFromYapTool(server, ctx);
-  registerSaveProjectEnrichmentTool(server, ctx);
+  registerDecomposeFindingTool(server, ctx);
   registerMarkDuplicateTool(server, ctx);
   registerGetLinearProjectsTool(server, ctx);
   registerStartEnrichmentTool(server, ctx);
@@ -3655,14 +3670,14 @@ import chalk11 from "chalk";
 import { ConvexHttpClient as ConvexHttpClient3 } from "convex/browser";
 
 // src/daemon/watcher.ts
-import { anyApi as anyApi4 } from "convex/server";
+import { anyApi as anyApi5 } from "convex/server";
 import { execSync as execSync4 } from "child_process";
 import { existsSync as existsSync9, mkdirSync as mkdirSync8 } from "fs";
 import { join as join10 } from "path";
 import { hostname as osHostname } from "os";
 
 // src/daemon/heartbeat.ts
-import { anyApi as anyApi3 } from "convex/server";
+import { anyApi as anyApi4 } from "convex/server";
 var HEARTBEAT_INTERVAL = 3e4;
 var Heartbeat = class {
   client;
@@ -3690,7 +3705,7 @@ var Heartbeat = class {
       if (currentTicketId) args.currentTicketId = currentTicketId;
       if (currentBranch) args.currentBranch = currentBranch;
       if (worktreePath) args.worktreePath = worktreePath;
-      await this.client.mutation(anyApi3.functions.agents.agentHeartbeat, args);
+      await this.client.mutation(anyApi4.functions.agents.agentHeartbeat, args);
     } catch {
     }
   }
@@ -3997,7 +4012,7 @@ var Watcher = class {
       );
       process.exit(1);
     }
-    await this.client.mutation(anyApi4.functions.agents.registerAgent, {
+    await this.client.mutation(anyApi5.functions.agents.registerAgent, {
       projectId: this.options.projectId,
       sessionId: this.sessionId,
       machineHostname: this.getHostname()
@@ -4033,7 +4048,7 @@ Waiting for ${this.spawner.activeCount} agent(s) to finish...`
       await this.spawner.gracefulShutdown();
     }
     try {
-      await this.client.mutation(anyApi4.functions.agents.unregisterAgent, {
+      await this.client.mutation(anyApi5.functions.agents.unregisterAgent, {
         sessionId: this.sessionId
       });
     } catch {
@@ -4047,7 +4062,7 @@ Waiting for ${this.spawner.activeCount} agent(s) to finish...`
     }
     this.heartbeat.stop();
     this.spawner.forceKill();
-    this.client.mutation(anyApi4.functions.agents.unregisterAgent, {
+    this.client.mutation(anyApi5.functions.agents.unregisterAgent, {
       sessionId: this.sessionId
     }).catch(() => {
     });
@@ -4089,7 +4104,7 @@ Waiting for ${this.spawner.activeCount} agent(s) to finish...`
   }
   async checkForEnrichmentWork(maxSlots) {
     const tickets = await this.client.query(
-      anyApi4.functions.localPipeline.getUnenrichedTickets,
+      anyApi5.functions.localPipeline.getUnenrichedTickets,
       { projectId: this.options.projectId }
     );
     if (!tickets || tickets.length === 0) return;
@@ -4118,7 +4133,7 @@ Waiting for ${this.spawner.activeCount} agent(s) to finish...`
   }
   async checkForImplementationWork(maxSlots) {
     const data = await this.client.query(
-      anyApi4.functions.tickets.getLocalQueuedTickets,
+      anyApi5.functions.tickets.getLocalQueuedTickets,
       { projectId: this.options.projectId }
     );
     if (!data || data.ready.length === 0) return;
@@ -4191,7 +4206,7 @@ Waiting for ${this.spawner.activeCount} agent(s) to finish...`
         if (wt.ticketId) {
           try {
             const ticket = await this.client.query(
-              anyApi4.functions.tickets.getTicket,
+              anyApi5.functions.tickets.getTicket,
               { ticketId: wt.ticketId }
             );
             if (ticket && (ticket.status === "failed" || ticket.status === "workflow2_done")) {
@@ -4376,15 +4391,15 @@ var queueCommand = new Command11("queue").description("Show pipeline state \u201
     process.exit(1);
   }
   const client = createConvexClient(creds.token);
-  const { anyApi: anyApi5 } = await import("convex/server");
+  const { anyApi: anyApi6 } = await import("convex/server");
   const [queueData, unenriched, pending] = await Promise.all([
-    client.query(anyApi5.functions.tickets.getLocalQueuedTickets, {
+    client.query(anyApi6.functions.tickets.getLocalQueuedTickets, {
       projectId: mapping.projectId
     }),
-    client.query(anyApi5.functions.localPipeline.getUnenrichedTickets, {
+    client.query(anyApi6.functions.localPipeline.getUnenrichedTickets, {
       projectId: mapping.projectId
     }),
-    client.query(anyApi5.functions.localPipeline.getPendingSources, {
+    client.query(anyApi6.functions.localPipeline.getPendingSources, {
       projectId: mapping.projectId
     })
   ]);
@@ -4475,9 +4490,9 @@ var nextCommand = new Command12("next").description("Claim the highest priority
     process.exit(1);
   }
   const client = createConvexClient(creds.token);
-  const { anyApi: anyApi5 } = await import("convex/server");
+  const { anyApi: anyApi6 } = await import("convex/server");
   const data = await client.query(
-    anyApi5.functions.tickets.getLocalQueuedTickets,
+    anyApi6.functions.tickets.getLocalQueuedTickets,
     { projectId: mapping.projectId }
   );
   if (!data?.ready || data.ready.length === 0) {
@@ -4502,7 +4517,7 @@ Claimed: ${ref} "${ticket.title}"`));
   }
   console.log(`Branch: ${chalk13.cyan(branchName)}`);
   const brief = await client.query(
-    anyApi5.functions.tickets.getTicketBrief,
+    anyApi6.functions.tickets.getTicketBrief,
     { ticketId: ticket.ticketId }
   );
   if (brief) {
@@ -4578,7 +4593,7 @@ var recapCommand = new Command13("recap").description("Show a summary of recent
     process.exit(1);
   }
   const client = createConvexClient(creds.token);
-  const { anyApi: anyApi5 } = await import("convex/server");
+  const { anyApi: anyApi6 } = await import("convex/server");
   const now = /* @__PURE__ */ new Date();
   const todayStart = new Date(
     now.getFullYear(),
@@ -4588,7 +4603,7 @@ var recapCommand = new Command13("recap").description("Show a summary of recent
   const weekStart = todayStart - 6 * 24 * 60 * 60 * 1e3;
   const since = opts.week ? weekStart : todayStart;
   const data = await client.query(
-    anyApi5.functions.localPipeline.getRecentActivity,
+    anyApi6.functions.localPipeline.getRecentActivity,
     { projectId: mapping.projectId, since }
   );
   if (!data) {

package/package.json

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