yapout 0.5.2 → 0.8.0

package/dist/index.js

@@ -28,6 +28,75 @@ import {
   writeFileSync,
   unlinkSync
 } from "fs";
+
+// src/lib/git.ts
+import { execSync } from "child_process";
+import { dirname, isAbsolute, resolve } from "path";
+function git(args, cwd) {
+  return execSync(`git ${args}`, { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+}
+function resolveRepoRoot(cwd) {
+  try {
+    const commonDir = git("rev-parse --git-common-dir", cwd);
+    const abs = isAbsolute(commonDir) ? commonDir : resolve(cwd, commonDir);
+    return dirname(abs);
+  } catch {
+    return cwd;
+  }
+}
+function getRepoFullName(cwd) {
+  const url = git("remote get-url origin", cwd);
+  const sshMatch = url.match(/git@github\.com:(.+?)(?:\.git)?$/);
+  if (sshMatch) return sshMatch[1];
+  const httpsMatch = url.match(/github\.com\/(.+?)(?:\.git)?$/);
+  if (httpsMatch) return httpsMatch[1];
+  throw new Error(`Could not parse GitHub repo from remote URL: ${url}`);
+}
+function getDefaultBranch(cwd) {
+  try {
+    const ref = git("rev-parse --abbrev-ref origin/HEAD", cwd);
+    return ref.replace("origin/", "");
+  } catch {
+    try {
+      git("rev-parse --verify origin/main", cwd);
+      return "main";
+    } catch {
+      return "master";
+    }
+  }
+}
+function getCurrentBranch(cwd) {
+  return git("branch --show-current", cwd);
+}
+function fetchOrigin(cwd) {
+  git("fetch origin", cwd);
+}
+function checkoutNewBranch(name, base, cwd) {
+  git(`checkout -b ${name} origin/${base}`, cwd);
+}
+function stageAll(cwd) {
+  git("add -A", cwd);
+  try {
+    git("reset HEAD -- .yapout/", cwd);
+  } catch {
+  }
+}
+function commit(message, cwd) {
+  git(`commit -m "${message.replace(/"/g, '\\"')}"`, cwd);
+  return git("rev-parse HEAD", cwd);
+}
+function push(branch, cwd) {
+  git(`push -u origin ${branch}`, cwd);
+}
+function getDiffStats(base, head, cwd) {
+  try {
+    return git(`diff --stat origin/${base}...${head}`, cwd);
+  } catch {
+    return "(could not compute diff stats)";
+  }
+}
+
+// src/lib/config.ts
 import { parse as yamlParse } from "yaml";
 var YAPOUT_DIR = join(homedir(), ".yapout");
 function ensureYapoutDir() {
@@ -72,19 +141,46 @@ function writeProjectMappings(mappings) {
   writeFileSync(PROJECTS_PATH, JSON.stringify(mappings, null, 2));
 }
 function getProjectMapping(dir) {
+  const root = resolveRepoRoot(dir);
   const mappings = readProjectMappings();
-  return mappings[dir] || null;
+  return mappings[root] || mappings[dir] || null;
 }
 function setProjectMapping(dir, mapping) {
   const mappings = readProjectMappings();
-  mappings[dir] = mapping;
+  mappings[resolveRepoRoot(dir)] = mapping;
   writeProjectMappings(mappings);
 }
 function removeProjectMapping(dir) {
+  const root = resolveRepoRoot(dir);
   const mappings = readProjectMappings();
-  delete mappings[dir];
+  delete mappings[root];
+  if (root !== dir) delete mappings[dir];
   writeProjectMappings(mappings);
 }
+var DEVICE_PATH = join(YAPOUT_DIR, "device.json");
+function readDeviceIdentity() {
+  if (!existsSync(DEVICE_PATH)) return null;
+  try {
+    return JSON.parse(readFileSync(DEVICE_PATH, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function writeDeviceIdentity(identity) {
+  ensureYapoutDir();
+  writeFileSync(DEVICE_PATH, JSON.stringify(identity, null, 2), { mode: 384 });
+}
+function getOrCreateDeviceIdentity(defaultName) {
+  const existing = readDeviceIdentity();
+  if (existing) return existing;
+  const identity = {
+    deviceId: typeof crypto !== "undefined" && "randomUUID" in crypto ? crypto.randomUUID() : `dev-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`,
+    name: defaultName,
+    createdAt: Date.now()
+  };
+  writeDeviceIdentity(identity);
+  return identity;
+}
 var WATCH_DEFAULTS = {
   auto_enrich: true,
   auto_implement: true,
@@ -97,7 +193,7 @@ var CONFIG_DEFAULTS = {
   watch: { ...WATCH_DEFAULTS }
 };
 function readYapoutConfig(cwd) {
-  const configPath = join(cwd, ".yapout", "config.yml");
+  const configPath = join(resolveRepoRoot(cwd), ".yapout", "config.yml");
   if (!existsSync(configPath)) return { ...CONFIG_DEFAULTS };
   try {
     const raw = yamlParse(readFileSync(configPath, "utf-8"));
@@ -179,10 +275,10 @@ function createConvexClient(token) {
 }
 
 // src/lib/protocol.ts
-import { execSync, spawnSync } from "child_process";
+import { execSync as execSync2, spawnSync } from "child_process";
 import { platform, homedir as homedir2 } from "os";
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2 } from "fs";
-import { join as join2, dirname } from "path";
+import { join as join2, dirname as dirname2 } from "path";
 function getYapoutBinPath() {
   const os = platform();
   try {
@@ -208,7 +304,7 @@ function registerWindows(yapoutPath) {
     `reg add "${key}\\shell\\open\\command" /ve /d "${handler}" /f`
   ];
   for (const cmd of commands) {
-    execSync(cmd, { stdio: "pipe" });
+    execSync2(cmd, { stdio: "pipe" });
   }
 }
 function registerMacOS(_yapoutPath) {
@@ -361,11 +457,11 @@ on idle
 end idle`;
   writeFileSync2(tmpScript, scriptContent);
   try {
-    execSync(`rm -rf "${appPath}"`, { stdio: "pipe" });
+    execSync2(`rm -rf "${appPath}"`, { stdio: "pipe" });
   } catch {
   }
-  mkdirSync2(dirname(appPath), { recursive: true });
-  execSync(`osacompile -s -o "${appPath}" "${tmpScript}"`, { stdio: "pipe" });
+  mkdirSync2(dirname2(appPath), { recursive: true });
+  execSync2(`osacompile -s -o "${appPath}" "${tmpScript}"`, { stdio: "pipe" });
   try {
     unlinkSync2(tmpScript);
   } catch {
@@ -381,12 +477,12 @@ end idle`;
   ];
   for (const cmd of plistCommands) {
     try {
-      execSync(`/usr/libexec/PlistBuddy -c '${cmd}' "${plistPath}"`, { stdio: "pipe" });
+      execSync2(`/usr/libexec/PlistBuddy -c '${cmd}' "${plistPath}"`, { stdio: "pipe" });
     } catch {
     }
   }
   try {
-    execSync(
+    execSync2(
       `/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -R "${appPath}"`,
       { stdio: "pipe" }
     );
@@ -406,7 +502,7 @@ MimeType=x-scheme-handler/yapout;
 `;
   writeFileSync2(join2(appsDir, "yapout-handler.desktop"), desktop);
   try {
-    execSync(
+    execSync2(
       `xdg-mime default yapout-handler.desktop x-scheme-handler/yapout`,
       { stdio: "pipe" }
     );
@@ -426,7 +522,7 @@ function registerProtocolHandler() {
 }
 
 // src/commands/login.ts
-var CLI_VERSION = "0.5.2";
+var CLI_VERSION = "0.8.0";
 function safeReturnTo(raw) {
   if (!raw) return null;
   try {
@@ -438,7 +534,7 @@ function safeReturnTo(raw) {
   }
 }
 function startCallbackServer() {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     let resolveData;
     let rejectData;
     const dataPromise = new Promise((res, rej) => {
@@ -487,7 +583,7 @@ function startCallbackServer() {
     server.listen(0, () => {
       const address = server.address();
       const port = typeof address === "object" && address ? address.port : 0;
-      resolve11({ port, data: dataPromise });
+      resolve12({ port, data: dataPromise });
     });
     setTimeout(() => {
       server.close();
@@ -558,7 +654,7 @@ var logoutCommand = new Command2("logout").description("Log out of yapout").acti
 
 // src/commands/link.ts
 import { Command as Command3 } from "commander";
-import { resolve, join as join3 } from "path";
+import { resolve as resolve2, join as join3 } from "path";
 import {
   existsSync as existsSync2,
   mkdirSync as mkdirSync3,
@@ -566,6 +662,7 @@ import {
   writeFileSync as writeFileSync3,
   appendFileSync
 } from "fs";
+import { hostname as hostname2 } from "os";
 import chalk4 from "chalk";
 
 // src/lib/auth.ts
@@ -592,9 +689,22 @@ import { select } from "@inquirer/prompts";
 async function pickProject(projects) {
   return await select({
     message: "Select a project to link to this directory:",
-    choices: projects.map((p) => ({
-      name: p.githubRepoFullName ? `${p.name} (${p.githubRepoFullName})` : p.name,
-      value: p
+    choices: projects.map((p) => {
+      const repo = p.githubRepoFullName ? ` (${p.githubRepoFullName})` : "";
+      const orgLabel = p.org ? ` [${p.org.name}]` : "";
+      return {
+        name: `${p.name}${repo}${orgLabel}`,
+        value: p
+      };
+    })
+  });
+}
+async function pickOrg(orgs, message = "Which org does this project belong to?") {
+  return await select({
+    message,
+    choices: orgs.map((o) => ({
+      name: `${o.name}  (${o.slug}, ${o.role})`,
+      value: o
     }))
   });
 }
@@ -626,7 +736,7 @@ branch_prefix: feat
 `;
 var linkCommand = new Command3("link").description("Link the current directory to a yapout project").action(async () => {
   const creds = requireAuth();
-  const cwd = resolve(process.cwd());
+  const cwd = resolveRepoRoot(resolve2(process.cwd()));
   const client = createConvexClient(creds.token);
   let projects;
   try {
@@ -648,6 +758,25 @@ var linkCommand = new Command3("link").description("Link the current directory t
     process.exit(1);
   }
   const selected = await pickProject(projects);
+  const device = getOrCreateDeviceIdentity(hostname2());
+  try {
+    await client.mutation(anyApi.functions.devices.registerDevice, {
+      deviceId: device.deviceId,
+      name: device.name,
+      cliVersion: getCliVersion(),
+      machineHostname: hostname2()
+    });
+    await client.mutation(anyApi.functions.projectCheckouts.linkCheckout, {
+      projectId: selected.id,
+      deviceId: device.deviceId,
+      localPath: cwd
+    });
+  } catch (err) {
+    console.warn(
+      chalk4.yellow("Warning: failed to record this checkout \u2014 "),
+      err.message
+    );
+  }
   setProjectMapping(cwd, {
     projectId: selected.id,
     projectName: selected.name,
@@ -688,23 +817,50 @@ var linkCommand = new Command3("link").description("Link the current directory t
   };
   writeFileSync3(mcpPath, JSON.stringify(mcpConfig, null, 2) + "\n");
   const label = selected.githubRepoFullName ? `${selected.name} (${selected.githubRepoFullName})` : selected.name;
+  const orgSuffix = selected.org ? ` in ${selected.org.name}` : "";
   console.log(
-    chalk4.green(`Linked to ${label}.`) + " Claude Code will discover yapout tools automatically."
+    chalk4.green(`Linked to ${label}${orgSuffix}.`) + " Claude Code will discover yapout tools automatically."
   );
 });
+function getCliVersion() {
+  try {
+    const pkg = JSON.parse(
+      readFileSync2(join3(import.meta.dirname, "..", "package.json"), "utf-8")
+    );
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
 
 // src/commands/unlink.ts
 import { Command as Command4 } from "commander";
-import { resolve as resolve2, join as join4 } from "path";
+import { resolve as resolve3, join as join4 } from "path";
 import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync4, rmSync } from "fs";
 import chalk5 from "chalk";
-var unlinkCommand = new Command4("unlink").description("Unlink the current directory from its yapout project").action(() => {
-  const cwd = resolve2(process.cwd());
+var unlinkCommand = new Command4("unlink").description("Unlink the current directory from its yapout project").action(async () => {
+  const cwd = resolve3(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.error(chalk5.yellow("No project linked to this directory."));
     process.exit(1);
   }
+  const device = readDeviceIdentity();
+  const creds = readCredentials();
+  if (device && creds) {
+    try {
+      const client = createConvexClient(creds.token);
+      await client.mutation(anyApi.functions.projectCheckouts.unlinkCheckout, {
+        projectId: mapping.projectId,
+        deviceId: device.deviceId
+      });
+    } catch (err) {
+      console.warn(
+        chalk5.yellow("Warning: failed to update server \u2014 "),
+        err.message
+      );
+    }
+  }
   removeProjectMapping(cwd);
   const yapoutDir = join4(cwd, ".yapout");
   if (existsSync3(yapoutDir)) {
@@ -733,7 +889,7 @@ var unlinkCommand = new Command4("unlink").description("Unlink the current direc
 
 // src/commands/status.ts
 import { Command as Command5 } from "commander";
-import { resolve as resolve3 } from "path";
+import { resolve as resolve4 } from "path";
 import chalk6 from "chalk";
 var statusCommand = new Command5("status").description("Show yapout status for this directory").action(() => {
   console.log(chalk6.bold("yapout status\n"));
@@ -755,7 +911,7 @@ var statusCommand = new Command5("status").description("Show yapout status for t
       `  Auth:     ${chalk6.green(creds.email)} (expires in ${daysLeft} day${daysLeft === 1 ? "" : "s"})`
     );
   }
-  const cwd = resolve3(process.cwd());
+  const cwd = resolve4(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.log(
@@ -771,7 +927,7 @@ var statusCommand = new Command5("status").description("Show yapout status for t
 
 // src/commands/init.ts
 import { Command as Command6 } from "commander";
-import { resolve as resolve4, join as join5 } from "path";
+import { resolve as resolve5, join as join5 } from "path";
 import {
   existsSync as existsSync4,
   mkdirSync as mkdirSync4,
@@ -779,66 +935,8 @@ import {
   readFileSync as readFileSync4,
   appendFileSync as appendFileSync2
 } from "fs";
+import { hostname as hostname3 } from "os";
 import chalk7 from "chalk";
-
-// src/lib/git.ts
-import { execSync as execSync2 } from "child_process";
-function git(args, cwd) {
-  return execSync2(`git ${args}`, { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-}
-function getRepoFullName(cwd) {
-  const url = git("remote get-url origin", cwd);
-  const sshMatch = url.match(/git@github\.com:(.+?)(?:\.git)?$/);
-  if (sshMatch) return sshMatch[1];
-  const httpsMatch = url.match(/github\.com\/(.+?)(?:\.git)?$/);
-  if (httpsMatch) return httpsMatch[1];
-  throw new Error(`Could not parse GitHub repo from remote URL: ${url}`);
-}
-function getDefaultBranch(cwd) {
-  try {
-    const ref = git("rev-parse --abbrev-ref origin/HEAD", cwd);
-    return ref.replace("origin/", "");
-  } catch {
-    try {
-      git("rev-parse --verify origin/main", cwd);
-      return "main";
-    } catch {
-      return "master";
-    }
-  }
-}
-function getCurrentBranch(cwd) {
-  return git("branch --show-current", cwd);
-}
-function fetchOrigin(cwd) {
-  git("fetch origin", cwd);
-}
-function checkoutNewBranch(name, base, cwd) {
-  git(`checkout -b ${name} origin/${base}`, cwd);
-}
-function stageAll(cwd) {
-  git("add -A", cwd);
-  try {
-    git("reset HEAD -- .yapout/", cwd);
-  } catch {
-  }
-}
-function commit(message, cwd) {
-  git(`commit -m "${message.replace(/"/g, '\\"')}"`, cwd);
-  return git("rev-parse HEAD", cwd);
-}
-function push(branch, cwd) {
-  git(`push -u origin ${branch}`, cwd);
-}
-function getDiffStats(base, head, cwd) {
-  try {
-    return git(`diff --stat origin/${base}...${head}`, cwd);
-  } catch {
-    return "(could not compute diff stats)";
-  }
-}
-
-// src/commands/init.ts
 var CONFIG_YAML_CONTENT2 = `# yapout local configuration
 # See: https://docs.yapout.dev/cli/config
 
@@ -863,9 +961,9 @@ branch_prefix: feat
 #   {{ticket.linearTicketId}}, {{ticket.id}}
 # commit_template: "{{ticket.type}}({{ticket.linearTicketId}}): {{ticket.title}}"
 `;
-var initCommand = new Command6("init").description("Create a yapout project from the current repo and link it").argument("[name]", "Project name (defaults to repo name)").action(async (name) => {
+var initCommand = new Command6("init").description("Create a yapout project from the current repo and link it").argument("[name]", "Project name (defaults to repo name)").option("--org <slug>", "Org slug to create the project in (skips picker)").action(async (name, options) => {
   const creds = requireAuth();
-  const cwd = resolve4(process.cwd());
+  const cwd = resolveRepoRoot(resolve5(process.cwd()));
   let repoFullName;
   let defaultBranch;
   try {
@@ -880,11 +978,82 @@ var initCommand = new Command6("init").description("Create a yapout project from
   }
   const projectName = name || repoFullName.split("/")[1] || "unnamed";
   const client = createConvexClient(creds.token);
+  let orgs;
+  try {
+    orgs = await client.query(
+      anyApi.functions.orgMembers.getMyOrgs,
+      {}
+    );
+  } catch (err) {
+    console.error(
+      chalk7.red("Failed to load your orgs."),
+      err.message
+    );
+    process.exit(1);
+  }
+  if (!orgs || orgs.length === 0) {
+    console.error(
+      chalk7.red(
+        "You aren't a member of any org. Sign in to the web app once to create your personal org, then re-run."
+      )
+    );
+    process.exit(1);
+  }
+  let chosenOrgId;
+  let chosenOrgName;
+  if (options?.org) {
+    const match = orgs.find((o) => o.org.slug === options.org);
+    if (!match) {
+      console.error(
+        chalk7.red(`Org "${options.org}" not found among your memberships.`)
+      );
+      console.error(
+        chalk7.dim(
+          "Available: " + orgs.map((o) => o.org.slug).join(", ")
+        )
+      );
+      process.exit(1);
+    }
+    chosenOrgId = match.org._id;
+    chosenOrgName = match.org.name;
+  } else if (orgs.length === 1) {
+    chosenOrgId = orgs[0].org._id;
+    chosenOrgName = orgs[0].org.name;
+    console.log(
+      chalk7.dim(`Creating in `) + chalk7.cyan(chosenOrgName)
+    );
+  } else {
+    const picked = await pickOrg(
+      orgs.map((o) => ({
+        id: o.org._id,
+        name: o.org.name,
+        slug: o.org.slug,
+        role: o.role
+      }))
+    );
+    chosenOrgId = picked.id;
+    chosenOrgName = picked.name;
+  }
+  const device = getOrCreateDeviceIdentity(hostname3());
+  try {
+    await client.mutation(anyApi.functions.devices.registerDevice, {
+      deviceId: device.deviceId,
+      name: device.name,
+      cliVersion: getCliVersion2(),
+      machineHostname: hostname3()
+    });
+  } catch (err) {
+    console.warn(
+      chalk7.yellow("Warning: device registration failed \u2014 "),
+      err.message
+    );
+  }
   let result;
   try {
     result = await client.mutation(
       anyApi.functions.projects.createProjectFromCli,
       {
+        orgId: chosenOrgId,
         name: projectName,
         githubRepoFullName: repoFullName,
         githubDefaultBranch: defaultBranch
@@ -897,6 +1066,18 @@ var initCommand = new Command6("init").description("Create a yapout project from
     );
     process.exit(1);
   }
+  try {
+    await client.mutation(anyApi.functions.projectCheckouts.linkCheckout, {
+      projectId: result.projectId,
+      deviceId: device.deviceId,
+      localPath: cwd
+    });
+  } catch (err) {
+    console.warn(
+      chalk7.yellow("Warning: failed to record project checkout \u2014 "),
+      err.message
+    );
+  }
   setProjectMapping(cwd, {
     projectId: result.projectId,
     projectName: result.projectName,
@@ -933,12 +1114,24 @@ var initCommand = new Command6("init").description("Create a yapout project from
   };
   writeFileSync5(mcpPath, JSON.stringify(mcpConfig, null, 2) + "\n");
   console.log(
-    chalk7.green(`Created project "${result.projectName}"`) + chalk7.dim(` (${repoFullName}, branch: ${defaultBranch})`)
+    chalk7.green(`Created project "${result.projectName}"`) + chalk7.dim(
+      ` in ${chosenOrgName} (${repoFullName}, branch: ${defaultBranch})`
+    )
   );
   console.log(
     chalk7.dim("Run ") + chalk7.cyan("yapout_compact") + chalk7.dim(" in Claude Code to generate project context.")
   );
 });
+function getCliVersion2() {
+  try {
+    const pkg = JSON.parse(
+      readFileSync4(join5(import.meta.dirname, "..", "package.json"), "utf-8")
+    );
+    return pkg.version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
 
 // src/commands/mcp-server.ts
 import { Command as Command7 } from "commander";
@@ -963,8 +1156,9 @@ function registerInitTool(server, ctx) {
       linearTeamId: z.string().optional().describe("Linear team ID to associate")
     },
     async (args) => {
-      const repoFullName = getRepoFullName(ctx.cwd);
-      const defaultBranch = getDefaultBranch(ctx.cwd);
+      const repoRoot = resolveRepoRoot(ctx.cwd);
+      const repoFullName = getRepoFullName(repoRoot);
+      const defaultBranch = getDefaultBranch(repoRoot);
       const projectName = args.name || repoFullName.split("/")[1] || "unnamed";
       const result = await ctx.client.mutation(
         anyApi3.functions.projects.createProjectFromCli,
@@ -977,12 +1171,12 @@ function registerInitTool(server, ctx) {
       );
       ctx.projectId = result.projectId;
       ctx.projectName = result.projectName;
-      setProjectMapping(ctx.cwd, {
+      setProjectMapping(repoRoot, {
         projectId: result.projectId,
         projectName: result.projectName,
         linkedAt: Date.now()
       });
-      const yapoutDir = join6(ctx.cwd, ".yapout");
+      const yapoutDir = join6(repoRoot, ".yapout");
       if (!existsSync5(yapoutDir)) mkdirSync5(yapoutDir, { recursive: true });
       const configPath = join6(yapoutDir, "config.yml");
       if (!existsSync5(configPath)) {
@@ -2125,7 +2319,7 @@ function truncate(text) {
 ` + lines.slice(-MAX_OUTPUT_LINES).join("\n");
 }
 function runCommand(command, cwd) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const start = Date.now();
     const child = exec(command, {
       cwd,
@@ -2133,7 +2327,7 @@ function runCommand(command, cwd) {
       maxBuffer: 10 * 1024 * 1024
       // 10MB
     }, (error, stdout, stderr) => {
-      resolve11({
+      resolve12({
         exitCode: error?.code ?? (error ? 1 : 0),
         stdout: truncate(stdout),
         stderr: truncate(stderr),
@@ -2141,7 +2335,7 @@ function runCommand(command, cwd) {
       });
     });
     child.on("error", () => {
-      resolve11({
+      resolve12({
         exitCode: 1,
         stdout: "",
         stderr: `Command timed out after ${COMMAND_TIMEOUT_MS / 1e3}s`,
@@ -2503,6 +2697,7 @@ The finding transitions: enriching \u2192 enriched \u2192 ready.`,
       isOversized: z11.boolean().optional().describe("Set to true if this finding is too large for a single PR"),
       suggestedSplit: z11.array(z11.string()).optional().describe("If oversized: suggested sub-finding titles for breaking it down"),
       nature: z11.enum(["implementable", "operational", "spike"]).optional().describe("Override the finding's nature if enrichment reveals it should be reclassified"),
+      cloudSafe: z11.boolean().optional().describe("Set to true ONLY if this is a small mechanical change a cloud agent can ship without sandbox testing \u2014 text/copy edits, classname tweaks, single-named-constant changes, \u226430 lines, single file, no logic/type/dependency changes. Default false."),
       sessionId: z11.string().optional().describe("Bulk enrichment session ID (from yapout_start_enrichment). Updates session stats.")
     },
     async (args) => {
@@ -2518,7 +2713,8 @@ The finding transitions: enriching \u2192 enriched \u2192 ready.`,
             clarifications: args.clarifications,
             isOversized: args.isOversized,
             suggestedSplit: args.suggestedSplit,
-            nature: args.nature
+            nature: args.nature,
+            cloudSafe: args.cloudSafe
           }
         );
         await ctx.client.action(
@@ -3183,7 +3379,7 @@ and issue counts so you can ask the user for confirmation before creating a new
         }
         const projects = await ctx.client.action(
           anyApi3.functions.linearProjectsMutations.fetchProjectsDetailed,
-          { teamId: project.linearTeamId }
+          { projectId: ctx.projectId, teamId: project.linearTeamId }
         );
         return {
           content: [
@@ -3494,6 +3690,7 @@ Call yapout_sync_bundle_to_linear afterwards to create the Linear project.`,
       enrichedDescription: z21.string().describe("Bundle-level description \u2014 the cohesive story of what this bundle delivers"),
       acceptanceCriteria: z21.array(z21.string()).describe("Bundle-level acceptance criteria"),
       implementationBrief: z21.string().describe("Bundle-level implementation brief \u2014 overall approach, architecture decisions, key files"),
+      cloudSafe: z21.boolean().optional().describe("Set true ONLY if the entire bundle is small mechanical work (\u226430 lines total, single-file ideally, text/className/constant edits). Default false. If unsure, false."),
       findings: z21.array(z21.object({
         findingId: z21.string().describe("Finding ID"),
         title: z21.string().describe("Refined finding title"),
@@ -3512,6 +3709,7 @@ Call yapout_sync_bundle_to_linear afterwards to create the Linear project.`,
             enrichedDescription: args.enrichedDescription,
             acceptanceCriteria: args.acceptanceCriteria,
             implementationBrief: args.implementationBrief,
+            cloudSafe: args.cloudSafe,
             findings: args.findings.map((f) => ({
               findingId: f.findingId,
               title: f.title,
@@ -3543,6 +3741,113 @@ Call yapout_sync_bundle_to_linear afterwards to create the Linear project.`,
   );
 }
 
+// src/mcp/tools/block-enrichment.ts
+import { z as z22 } from "zod";
+function registerBlockEnrichmentTool(server, ctx) {
+  server.tool(
+    "yapout_block_enrichment",
+    `Refuse to enrich a finding because the user has not provided enough specifics for an autonomous agent to complete the work end-to-end.
+
+Use this when the finding lacks any of: target file/component, intended behavior, scope boundaries, or success criteria. Do NOT produce a half-baked enrichment "for review" \u2014 block instead. The bar for "enriched" is "another agent can ship this with zero further input."
+
+The finding must currently be in "enriching" status (claimed via yapout_get_unenriched_finding).
+
+Transitions: enriching \u2192 needs_input. The user sees the blockerReason and questions in the UI, adds context, and resubmits.`,
+    {
+      findingId: z22.string().describe("The finding ID to block (currently in 'enriching')"),
+      blockerReason: z22.string().describe("One sentence: why this finding cannot be enriched as written. State the missing piece concretely."),
+      blockerQuestions: z22.array(z22.string()).min(1).describe("2-5 specific questions the user must answer before enrichment can succeed. Each must be answerable in a sentence or two.")
+    },
+    async (args) => {
+      try {
+        await ctx.client.mutation(
+          anyApi3.functions.localPipeline.blockLocalEnrichment,
+          {
+            findingId: args.findingId,
+            blockerReason: args.blockerReason,
+            blockerQuestions: args.blockerQuestions
+          }
+        );
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify(
+                {
+                  findingId: args.findingId,
+                  status: "needs_input",
+                  message: "Enrichment blocked. The user will see your questions and resubmit with more context."
+                },
+                null,
+                2
+              )
+            }
+          ]
+        };
+      } catch (err) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Error blocking enrichment: ${err.message}`
+            }
+          ],
+          isError: true
+        };
+      }
+    }
+  );
+  server.tool(
+    "yapout_block_bundle_enrichment",
+    `Refuse to enrich a bundle because the user has not provided enough specifics for an autonomous agent to ship it end-to-end.
+
+Same semantics as yapout_block_enrichment but for an entire bundle. Bundle status transitions enriching \u2192 needs_input; child findings revert to draft.`,
+    {
+      bundleId: z22.string().describe("The bundle ID to block (currently in 'enriching')"),
+      blockerReason: z22.string().describe("One sentence: why this bundle cannot be enriched."),
+      blockerQuestions: z22.array(z22.string()).min(1).describe("2-5 specific questions the user must answer.")
+    },
+    async (args) => {
+      try {
+        await ctx.client.mutation(
+          anyApi3.functions.bundles.blockBundleEnrichment,
+          {
+            bundleId: args.bundleId,
+            blockerReason: args.blockerReason,
+            blockerQuestions: args.blockerQuestions
+          }
+        );
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify(
+                {
+                  bundleId: args.bundleId,
+                  status: "needs_input",
+                  message: "Bundle enrichment blocked. The user will see your questions and resubmit."
+                },
+                null,
+                2
+              )
+            }
+          ]
+        };
+      } catch (err) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Error blocking bundle enrichment: ${err.message}`
+            }
+          ],
+          isError: true
+        };
+      }
+    }
+  );
+}
+
 // src/mcp/server.ts
 async function startMcpServer() {
   const cwd = process.cwd();
@@ -3573,7 +3878,7 @@ async function startMcpServer() {
   };
   const server = new McpServer({
     name: "yapout",
-    version: "0.5.2"
+    version: "0.8.0"
   });
   registerInitTool(server, ctx);
   registerCompactTool(server, ctx);
@@ -3599,6 +3904,7 @@ async function startMcpServer() {
   registerEnrichNextTool(server, ctx);
   registerEnrichBundleTool(server, ctx);
   registerSaveBundleEnrichmentTool(server, ctx);
+  registerBlockEnrichmentTool(server, ctx);
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }
@@ -3611,9 +3917,9 @@ var mcpServerCommand = new Command7("mcp-server").description("Start the MCP ser
 // src/commands/worktrees.ts
 import { Command as Command8 } from "commander";
 import chalk8 from "chalk";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve6 } from "path";
 var worktreesCommand = new Command8("worktrees").description("List active yapout worktrees").action(() => {
-  const cwd = resolve5(process.cwd());
+  const cwd = resolve6(process.cwd());
   const worktrees = listWorktrees(cwd);
   if (worktrees.length === 0) {
     console.log(chalk8.dim("No active yapout worktrees."));
@@ -3631,10 +3937,10 @@ var worktreesCommand = new Command8("worktrees").description("List active yapout
 // src/commands/clean.ts
 import { Command as Command9 } from "commander";
 import chalk9 from "chalk";
-import { resolve as resolve6 } from "path";
+import { resolve as resolve7 } from "path";
 var cleanCommand = new Command9("clean").description("Remove worktrees for completed or failed tickets").action(async () => {
   const creds = requireAuth();
-  const cwd = resolve6(process.cwd());
+  const cwd = resolve7(process.cwd());
   const worktrees = listWorktrees(cwd);
   if (worktrees.length === 0) {
     console.log(chalk9.dim("No worktrees to clean."));
@@ -3674,7 +3980,7 @@ var cleanCommand = new Command9("clean").description("Remove worktrees for compl
 
 // src/commands/watch.ts
 import { Command as Command10 } from "commander";
-import { resolve as resolve7 } from "path";
+import { resolve as resolve8 } from "path";
 import {
   readFileSync as readFileSync6,
   writeFileSync as writeFileSync9,
@@ -3909,10 +4215,10 @@ var Spawner = class {
     if (this.agents.size === 0) return;
     const timeout = 10 * 60 * 1e3;
     const start = Date.now();
-    await new Promise((resolve11) => {
+    await new Promise((resolve12) => {
       const check = () => {
         if (this.agents.size === 0 || Date.now() - start > timeout) {
-          resolve11();
+          resolve12();
           return;
         }
         setTimeout(check, 2e3);
@@ -4322,7 +4628,7 @@ var watchCommand = new Command10("watch").description("Watch for work and spawn
     return;
   }
   const creds = requireAuth();
-  const cwd = resolve7(process.cwd());
+  const cwd = resolve8(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.error(
@@ -4339,7 +4645,7 @@ var watchCommand = new Command10("watch").description("Watch for work and spawn
       chalk11.green("Watcher started in background") + chalk11.dim(` (PID ${process.pid}, log: ${LOG_FILE})`)
     );
   }
-  console.log(chalk11.bold(`yapout watch v${"0.5.2"}`));
+  console.log(chalk11.bold(`yapout watch v${"0.8.0"}`));
   console.log(
     `Project: ${chalk11.green(mapping.projectName)} (${mapping.projectId})`
   );
@@ -4394,11 +4700,11 @@ function isProcessRunning(pid) {
 
 // src/commands/queue.ts
 import { Command as Command11 } from "commander";
-import { resolve as resolve8 } from "path";
+import { resolve as resolve9 } from "path";
 import chalk12 from "chalk";
 var queueCommand = new Command11("queue").description("Show pipeline state \u2014 what's ready, blocked, and pending").action(async () => {
   const creds = requireAuth();
-  const cwd = resolve8(process.cwd());
+  const cwd = resolve9(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.error(
@@ -4491,13 +4797,13 @@ function formatAgo(ms) {
 
 // src/commands/next.ts
 import { Command as Command12 } from "commander";
-import { resolve as resolve9 } from "path";
+import { resolve as resolve10 } from "path";
 import { writeFileSync as writeFileSync10 } from "fs";
 import { join as join12 } from "path";
 import chalk13 from "chalk";
 var nextCommand = new Command12("next").description("Claim the highest priority ticket and set up for implementation").option("--worktree", "Create a git worktree instead of checking out a branch").action(async (opts) => {
   const creds = requireAuth();
-  const cwd = resolve9(process.cwd());
+  const cwd = resolve10(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.error(
@@ -4596,11 +4902,11 @@ function formatBrief(ref, ticket, brief) {
 
 // src/commands/recap.ts
 import { Command as Command13 } from "commander";
-import { resolve as resolve10 } from "path";
+import { resolve as resolve11 } from "path";
 import chalk14 from "chalk";
 var recapCommand = new Command13("recap").description("Show a summary of recent yapout activity").option("--week", "Show full week summary (default: today)").action(async (opts) => {
   const creds = requireAuth();
-  const cwd = resolve10(process.cwd());
+  const cwd = resolve11(process.cwd());
   const mapping = getProjectMapping(cwd);
   if (!mapping) {
     console.error(
@@ -4892,7 +5198,7 @@ var handleUriCommand = new Command15("handle-uri").description("Handle a yapout:
 
 // src/index.ts
 var program = new Command16();
-program.name("yapout").description("yapout \u2014 from meeting transcript to merged PR").version("0.5.2");
+program.name("yapout").description("yapout \u2014 from meeting transcript to merged PR").version("0.8.0");
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(initCommand);

package/package.json

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