farmwork 1.0.0 → 1.0.2

package/src/init.js

@@ -1,15 +1,12 @@
 import inquirer from "inquirer";
-import chalk from "chalk";
-import ora from "ora";
 import fs from "fs-extra";
 import path from "path";
 import { fileURLToPath } from "url";
+import { farmTerm, emojis } from "./terminal.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const TEMPLATES_DIR = path.join(__dirname, "..", "templates");
 
-// Try to detect package.json info
 function detectPackageJson() {
   try {
     const pkgPath = path.join(process.cwd(), "package.json");
@@ -32,19 +29,19 @@ const QUESTIONS = [
   {
     type: "input",
     name: "projectName",
-    message: "Project name:",
+    message: "🌱 Project name:",
     default: path.basename(process.cwd()),
   },
   {
     type: "list",
     name: "packageManager",
-    message: "Package manager:",
+    message: "🧺 Package manager:",
     choices: ["npm", "yarn", "pnpm", "bun"],
   },
   {
     type: "input",
     name: "testCommand",
-    message: "Test command:",
+    message: "🥒 Test command:",
     default: (answers) => {
       const { scripts } = detectPackageJson();
       const pm = answers.packageManager;
@@ -56,7 +53,7 @@ const QUESTIONS = [
   {
     type: "input",
     name: "buildCommand",
-    message: "Build command:",
+    message: "🌽 Build command:",
     default: (answers) => {
       const { scripts } = detectPackageJson();
       const pm = answers.packageManager;
@@ -67,7 +64,7 @@ const QUESTIONS = [
   {
     type: "input",
     name: "lintCommand",
-    message: "Lint command:",
+    message: "🦉 Lint command:",
     default: (answers) => {
       const { scripts } = detectPackageJson();
       const pm = answers.packageManager;
@@ -78,13 +75,13 @@ const QUESTIONS = [
   {
     type: "confirm",
     name: "includeStorybook",
-    message: "Include Storybook support? (React/Vue component docs)",
+    message: "🐄 Include Storybook support?",
     default: () => detectPackageJson().hasStorybook,
   },
   {
     type: "confirm",
     name: "includeI18n",
-    message: "Include i18n support? (multi-language translations)",
+    message: "🌻 Include i18n support?",
     default: false,
   },
 ];
@@ -93,27 +90,27 @@ const STORYBOOK_QUESTIONS = [
   {
     type: "input",
     name: "storybookUrl",
-    message: "Storybook URL (e.g., storybook.yoursite.com):",
+    message: "🌿 Storybook URL:",
     default: "storybook.example.com",
   },
   {
     type: "input",
     name: "netlifyAuthToken",
-    message: "Netlify Auth Token (from netlify.com/user/applications):",
+    message: "🗝️ Netlify Auth Token:",
     validate: (input) =>
       input.length > 0 || "Auth token is required for deployment",
   },
   {
     type: "input",
     name: "netlifySiteId",
-    message: "Netlify Site ID (from site settings):",
+    message: "🏷️ Netlify Site ID:",
     validate: (input) =>
       input.length > 0 || "Site ID is required for deployment",
   },
   {
     type: "confirm",
     name: "passwordProtect",
-    message: "Password protect Storybook? (Recommended for private components)",
+    message: "🐕 Password protect Storybook?",
     default: true,
   },
 ];
@@ -121,38 +118,99 @@ const STORYBOOK_QUESTIONS = [
 export async function init(options) {
   const cwd = process.cwd();
 
-  console.log(chalk.cyan("\n🌽 Farmwork Initialization\n"));
+  // Show animated logo
+  await farmTerm.logoAnimated();
+
+  // Check if farmwork is already installed
+  const claudeDir = path.join(cwd, ".claude");
+  const farmworkConfig = path.join(cwd, ".farmwork.json");
+  const claudeMd = path.join(cwd, "CLAUDE.md");
+
+  const isAlreadyInstalled =
+    fs.existsSync(claudeDir) &&
+    (fs.existsSync(farmworkConfig) || fs.existsSync(claudeMd));
+
+  if (isAlreadyInstalled && !options.force) {
+    farmTerm.warn("Farmwork is already installed in this project!");
+    farmTerm.nl();
+
+    // Show what's detected
+    farmTerm.gray("  Detected:\n");
+    if (fs.existsSync(claudeDir)) farmTerm.gray("    • .claude/ directory\n");
+    if (fs.existsSync(claudeMd)) farmTerm.gray("    • CLAUDE.md\n");
+    if (fs.existsSync(farmworkConfig)) farmTerm.gray("    • .farmwork.json\n");
+    farmTerm.nl();
+
+    const { continueInit } = await inquirer.prompt([
+      {
+        type: "list",
+        name: "continueInit",
+        message: "What would you like to do?",
+        choices: [
+          {
+            name: "🐴 Re-initialize (will backup existing files)",
+            value: "reinit",
+          },
+          { name: "🐮 Run doctor instead (check health)", value: "doctor" },
+          { name: "🌾 Run status instead (view metrics)", value: "status" },
+          { name: "🐔 Exit", value: "exit" },
+        ],
+      },
+    ]);
+
+    if (continueInit === "exit") {
+      farmTerm.info("No changes made. Your farm is safe! 🌾\n");
+      return;
+    }
+
+    if (continueInit === "doctor") {
+      farmTerm.nl();
+      const { doctor } = await import("./doctor.js");
+      await doctor();
+      return;
+    }
+
+    if (continueInit === "status") {
+      farmTerm.nl();
+      const { status } = await import("./status.js");
+      await status();
+      return;
+    }
+
+    // continueInit === "reinit" - proceed with force
+    options.force = true;
+    farmTerm.nl();
+  }
+
+  farmTerm.header("FARMWORK INITIALIZATION", "primary");
+  farmTerm.info(
+    "Let's set up your farm! Answer a few questions to get started.\n",
+  );
 
   const answers = await inquirer.prompt(QUESTIONS);
 
-  // Ask Storybook deployment questions if Storybook is enabled
+  // Storybook configuration
   if (answers.includeStorybook) {
-    console.log(chalk.cyan("\n🍇 Storybook Deployment Configuration\n"));
-    console.log(
-      chalk.gray(
-        "We recommend deploying Storybook to Netlify with password protection.",
-      ),
+    farmTerm.nl();
+    farmTerm.section("Storybook Deployment", "🐄");
+    farmTerm.gray(
+      "  We recommend deploying Storybook to Netlify with password protection.\n",
     );
-    console.log(
-      chalk.gray(
-        "This keeps your component documentation private while accessible to your team.\n",
-      ),
+    farmTerm.gray(
+      "  This keeps your component docs private but accessible to your team.\n\n",
     );
 
     const storybookAnswers = await inquirer.prompt(STORYBOOK_QUESTIONS);
     Object.assign(answers, storybookAnswers);
 
     if (answers.passwordProtect) {
-      console.log(
-        chalk.yellow("\n🍋 Remember to enable password protection in Netlify:"),
-      );
-      console.log(
-        chalk.gray("   Site settings → Access control → Password protection"),
-      );
+      farmTerm.nl();
+      farmTerm.warn("Remember to enable password protection in Netlify:");
+      farmTerm.gray("  Site settings → Access control → Password protection\n");
     }
   }
 
-  // Check for existing files that would be overwritten
+  // Check for existing files
   const existingFiles = [];
   const filesToCheck = [
     {
@@ -170,11 +228,6 @@ export async function init(options) {
       name: ".farmwork.json",
       backup: null,
     },
-    {
-      path: path.join(cwd, ".claude", "settings.json"),
-      name: ".claude/settings.json",
-      backup: ".claude/OLD_settings.json",
-    },
     {
       path: path.join(cwd, ".claude", "commands"),
       name: ".claude/commands/",
@@ -204,17 +257,23 @@ export async function init(options) {
   let didBackupClaudeMd = false;
 
   if (existingFiles.length > 0 && !options.force) {
-    console.log(chalk.yellow("\n🍋 The following files/folders already exist:"));
+    farmTerm.nl();
+    farmTerm.warn("The following files/folders already exist:");
+    farmTerm.nl();
+
     for (const file of existingFiles) {
       if (file.isDir) {
-        console.log(chalk.gray(`   - ${file.name}`) + chalk.dim(" (will add new files)"));
+        farmTerm.gray(`    ${file.name}`);
+        farmTerm.cyan(" (will add new files)\n");
       } else if (file.backup) {
-        console.log(chalk.gray(`   - ${file.name}`) + chalk.dim(` (will backup to ${file.backup})`));
+        farmTerm.gray(`    ${file.name}`);
+        farmTerm.yellow(` → ${file.backup}\n`);
       } else {
-        console.log(chalk.gray(`   - ${file.name}`) + chalk.dim(" (will overwrite)"));
+        farmTerm.gray(`    ${file.name}`);
+        farmTerm.red(" (will overwrite)\n");
       }
     }
-    console.log("");
+    farmTerm.nl();
 
     const { overwriteChoice } = await inquirer.prompt([
       {
@@ -223,290 +282,223 @@ export async function init(options) {
         message: "How would you like to proceed?",
         choices: [
           {
-            name: "Continue (backup files, add to existing folders)",
+            name: "🌱 Continue (backup files, add to existing folders)",
             value: "overwrite",
           },
-          { name: "Cancel installation", value: "cancel" },
+          { name: "🐔 Cancel installation", value: "cancel" },
         ],
       },
     ]);
 
     if (overwriteChoice === "cancel") {
-      console.log(chalk.gray("\nInstallation cancelled."));
+      farmTerm.nl();
+      farmTerm.gray("  Installation cancelled.\n\n");
       process.exit(0);
     }
 
-    // Backup files that have backup paths
-    console.log("");
+    // Backup files
+    farmTerm.nl();
     for (const file of existingFiles) {
       if (file.backup) {
         const backupPath = path.join(cwd, file.backup);
         await fs.copy(file.path, backupPath);
-        console.log(chalk.gray(`   Backed up ${file.name} → ${file.backup}`));
+        farmTerm.status(`Backed up ${file.name} → ${file.backup}`, "pass");
         if (file.name === "CLAUDE.md") {
           didBackupClaudeMd = true;
         }
       }
     }
-    console.log("");
   }
 
-  // Store for use in final output
   answers._didBackupClaudeMd = didBackupClaudeMd;
 
-  const spinner = ora("Creating Farmwork structure...").start();
+  // Planting animation
+  farmTerm.nl();
+  farmTerm.section("Planting Your Farm", emojis.seedling);
 
   try {
-    // Create folder structure
-    await fs.ensureDir(path.join(cwd, "_AUDIT"));
-    await fs.ensureDir(path.join(cwd, "_PLANS"));
-    await fs.ensureDir(path.join(cwd, ".claude", "commands"));
-    await fs.ensureDir(path.join(cwd, ".claude", "agents"));
-
-    spinner.text = "Creating CLAUDE.md...";
-    await createClaudeMd(cwd, answers);
-
-    spinner.text = "Creating FARMHOUSE.md...";
-    await createFarmhouseMd(cwd, answers);
-
-    spinner.text = "Creating audit documents...";
-    await createAuditDocs(cwd, answers);
-
-    spinner.text = "Creating justfile...";
-    await createJustfile(cwd, answers);
-
-    spinner.text = "Creating core agents...";
-    await createAgents(cwd, answers);
-
-    spinner.text = "Creating core commands...";
-    await createCommands(cwd, answers);
+    // Create folder structure with animations
+    const steps = [
+      {
+        name: "Creating directories",
+        fn: async () => {
+          await fs.ensureDir(path.join(cwd, "_AUDIT"));
+          await fs.ensureDir(path.join(cwd, "_PLANS"));
+          await fs.ensureDir(path.join(cwd, ".claude", "commands"));
+          await fs.ensureDir(path.join(cwd, ".claude", "agents"));
+        },
+      },
+      { name: "Planting CLAUDE.md", fn: () => createClaudeMd(cwd, answers) },
+      {
+        name: "Building FARMHOUSE.md",
+        fn: () => createFarmhouseMd(cwd, answers),
+      },
+      {
+        name: "Creating audit documents",
+        fn: () => createAuditDocs(cwd, answers),
+      },
+      { name: "Laying out justfile", fn: () => createJustfile(cwd, answers) },
+      { name: "Training agents", fn: () => createAgents(cwd, answers) },
+      { name: "Setting up commands", fn: () => createCommands(cwd, answers) },
+      { name: "Configuring settings", fn: () => createSettings(cwd, answers) },
+      {
+        name: "Writing .farmwork.json",
+        fn: () => createProduceConfig(cwd, answers),
+      },
+    ];
 
-    spinner.text = "Creating settings...";
-    await createSettings(cwd, answers);
+    for (const step of steps) {
+      await farmTerm.spin(step.name, step.fn);
+    }
 
-    spinner.text = "Creating .farmwork.json...";
-    await createProduceConfig(cwd, answers);
+    // Install dependencies
+    farmTerm.nl();
+    farmTerm.section("Installing Tools", emojis.horse);
 
-    // Check and install just if needed
-    spinner.text = "Checking for just command runner...";
-    try {
+    // Check and install just
+    await farmTerm.spin("Checking for just command runner", async () => {
       const { execSync } = await import("child_process");
       try {
         execSync("which just", { stdio: "ignore" });
       } catch {
-        spinner.text = "Installing just...";
         try {
-          // Try brew first (macOS), then cargo
           try {
-            execSync("brew install just", { stdio: "inherit" });
-            console.log(
-              chalk.green("\n🌱 Just installed successfully via Homebrew"),
-            );
+            execSync("brew install just", { stdio: "pipe" });
           } catch {
-            execSync("cargo install just", { stdio: "inherit" });
-            console.log(
-              chalk.green("\n🌱 Just installed successfully via Cargo"),
-            );
+            execSync("cargo install just", { stdio: "pipe" });
           }
         } catch {
-          console.log(
-            chalk.yellow("\n🍋 Could not install just automatically."),
-          );
-          console.log(chalk.gray("   Install manually: brew install just"));
-          console.log(chalk.gray("   Or see: https://github.com/casey/just"));
+          farmTerm.warn("Could not install just automatically.");
+          farmTerm.gray("    Install manually: brew install just\n");
         }
       }
-    } catch (e) {
-      // Silently continue if check fails
-    }
+    });
 
-    spinner.text = "Setting up beads issue tracking...";
-    try {
+    // Check and install beads
+    await farmTerm.spin("Setting up beads issue tracking", async () => {
       const { execSync } = await import("child_process");
-
-      // Check if bd is installed
       try {
         execSync("which bd", { stdio: "ignore" });
       } catch {
-        // bd not found, try to install it (npm first, then brew, then cargo)
-        spinner.text = "Installing beads (bd)...";
         let installed = false;
-
-        // Try npm first (most common)
         try {
-          execSync("npm install -g @beads/bd", { stdio: "inherit" });
-          console.log(chalk.green("\n🌱 Beads installed successfully via npm"));
+          execSync("npm install -g @beads/bd", { stdio: "pipe" });
           installed = true;
         } catch {
-          // Try homebrew
           try {
-            execSync("brew install steveyegge/beads/bd", { stdio: "inherit" });
-            console.log(
-              chalk.green("\n🌱 Beads installed successfully via Homebrew"),
-            );
+            execSync("brew install steveyegge/beads/bd", { stdio: "pipe" });
             installed = true;
           } catch {
-            // Try cargo as last resort
             try {
-              execSync("cargo install beads", { stdio: "inherit" });
-              console.log(
-                chalk.green("\n🌱 Beads installed successfully via Cargo"),
-              );
+              execSync("cargo install beads", { stdio: "pipe" });
               installed = true;
             } catch {
               // All methods failed
             }
           }
         }
-
         if (!installed) {
-          console.log(
-            chalk.yellow("\n🍋 Could not install beads automatically."),
-          );
-          console.log(
-            chalk.gray("   Install manually: npm install -g @beads/bd"),
-          );
-          console.log(chalk.gray("   Or: brew install steveyegge/beads/bd"));
-          console.log(
-            chalk.gray("   Or see: https://github.com/steveyegge/beads"),
-          );
+          farmTerm.warn("Could not install beads automatically.");
+          farmTerm.gray("    Install manually: npm install -g @beads/bd\n");
         }
       }
 
-      // Initialize beads in the project
-      spinner.text = "Initializing beads...";
+      // Initialize beads
       try {
         execSync("bd init", { cwd, stdio: "ignore" });
       } catch {
-        // bd init might fail if already initialized or not installed
+        // bd init might fail if already initialized
       }
 
-      // Clean up beads-generated agent files (we use CLAUDE.md instead)
-      spinner.text = "Cleaning up beads defaults...";
+      // Clean up beads-generated files
       const beadsAgentFiles = ["AGENTS.md", "@AGENTS.md"];
       for (const file of beadsAgentFiles) {
-        const filePath = path.join(cwd, file);
         try {
-          await fs.remove(filePath);
+          await fs.remove(path.join(cwd, file));
         } catch {
-          // File doesn't exist, ignore
+          // File doesn't exist
         }
       }
-    } catch (e) {
-      console.log(
-        chalk.yellow(
-          "\n🍋 Could not set up beads. Install with: cargo install beads",
-        ),
-      );
-    }
-
-    spinner.succeed(chalk.green("Farmwork initialized!"));
-
-    console.log(chalk.cyan("\n🌱 Created structure:"));
-    console.log(`   ${chalk.green("🌱")} _AUDIT/`);
-    console.log(`   ${chalk.green("🌱")} _PLANS/`);
-    console.log(`   ${chalk.green("🌱")} .claude/commands/`);
-    console.log(`   ${chalk.green("🌱")} .claude/agents/`);
-    console.log(`   ${chalk.green("🌱")} CLAUDE.md`);
-    console.log(`   ${chalk.green("🌱")} justfile`);
-    console.log(`   ${chalk.green("🌱")} .farmwork.json`);
-
-    console.log(chalk.cyan("\n🥕 Next steps:"));
-    console.log(
-      `   1. Run ${chalk.yellow("just --list")} to see available commands`,
-    );
-    console.log(
-      `   2. Say ${chalk.yellow('"till the land"')} to Claude to audit your setup`,
-    );
-    console.log(
-      `   3. Say ${chalk.yellow('"make a plan for <feature>"')} to start planning`,
+    });
+
+    // Success!
+    farmTerm.nl();
+    farmTerm.divider("═", 50);
+    farmTerm.success("Farmwork initialized successfully!");
+
+    // Show created structure
+    farmTerm.section("Created Structure", emojis.corn);
+    await farmTerm.planting(
+      [
+        "_AUDIT/",
+        "_PLANS/",
+        ".claude/commands/",
+        ".claude/agents/",
+        "CLAUDE.md",
+        "justfile",
+        ".farmwork.json",
+      ],
+      "Files planted",
     );
 
-    console.log(chalk.cyan("\n🌾 Now let Claude Code get comfortable!"));
-    console.log(chalk.gray("   Copy and paste this prompt to Claude Code:\n"));
-    console.log(
-      chalk.white(
-        "   ┌─────────────────────────────────────────────────────────────────────────┐",
-      ),
-    );
-    console.log(
-      chalk.white("   │") +
-        chalk.yellow(
-          " Hey Claude, I am using the Farmwork framework, please go through the    ",
-        ) +
-        chalk.white("│"),
-    );
-    console.log(
-      chalk.white("   │") +
-        chalk.yellow(
-          " justfile and create project-specific commands, and go through my app    ",
-        ) +
-        chalk.white("│"),
-    );
-    console.log(
-      chalk.white("   │") +
-        chalk.yellow(
-          " and suggest any project-specific subagents that would work well.        ",
-        ) +
-        chalk.white("│"),
-    );
-    console.log(
-      chalk.white(
-        "   └─────────────────────────────────────────────────────────────────────────┘",
-      ),
+    // Next steps
+    farmTerm.section("Next Steps", emojis.carrot);
+    farmTerm.nl();
+    farmTerm.white("  1. ");
+    farmTerm.yellow("just --list");
+    farmTerm.gray(" → See available commands\n");
+    farmTerm.white("  2. ");
+    farmTerm.yellow('"open the farm"');
+    farmTerm.gray(" → Audit your setup\n");
+    farmTerm.white("  3. ");
+    farmTerm.yellow('"make a plan for <feature>"');
+    farmTerm.gray(" → Start planning\n");
+
+    // Claude prompt box
+    farmTerm.nl();
+    farmTerm.section("Get Claude Comfortable", emojis.wheat);
+    farmTerm.gray("  Copy and paste this prompt to Claude Code:\n\n");
+
+    farmTerm.box(
+      "Prompt for Claude",
+      [
+        "Hey Claude, I am using the Farmwork framework,",
+        "please go through the justfile and create",
+        "project-specific commands, and go through my",
+        "app and suggest project-specific subagents",
+        "that would work well.",
+      ],
+      "secondary",
     );
 
     // Show merge prompt if we backed up CLAUDE.md
     if (answers._didBackupClaudeMd) {
-      console.log(chalk.cyan("\n🥬 Merge your old instructions!"));
-      console.log(
-        chalk.gray(
-          "   Your old CLAUDE.md was backed up. Use this prompt to merge:\n",
-        ),
-      );
-      console.log(
-        chalk.white(
-          "   ┌─────────────────────────────────────────────────────────────────────────┐",
-        ),
-      );
-      console.log(
-        chalk.white("   │") +
-          chalk.yellow(
-            " Hey Claude, look at my CLAUDE.md file and merge the project-specific   ",
-          ) +
-          chalk.white("│"),
+      farmTerm.nl();
+      farmTerm.section("Merge Your Old Instructions", "🥬");
+      farmTerm.gray(
+        "  Your old CLAUDE.md was backed up. Use this prompt to merge:\n\n",
       );
-      console.log(
-        chalk.white("   │") +
-          chalk.yellow(
-            " instructions from OLD_CLAUDE.md into it, so I have one file with all   ",
-          ) +
-          chalk.white("│"),
-      );
-      console.log(
-        chalk.white("   │") +
-          chalk.yellow(
-            " the Farmwork framework instructions plus my original project setup.    ",
-          ) +
-          chalk.white("│"),
-      );
-      console.log(
-        chalk.white("   │") +
-          chalk.yellow(
-            " Then delete OLD_CLAUDE.md when done. Same for OLD_justfile. Thank you.                                   ",
-          ) +
-          chalk.white("│"),
-      );
-      console.log(
-        chalk.white(
-          "   └─────────────────────────────────────────────────────────────────────────┘",
-        ),
+
+      farmTerm.box(
+        "Merge Prompt",
+        [
+          "Hey Claude, look at my CLAUDE.md file and",
+          "merge the project-specific instructions from",
+          "OLD_CLAUDE.md into it, so I have one file",
+          "with all the Farmwork instructions plus my",
+          "original project setup. Then delete the OLD",
+          "files when done.",
+        ],
+        "accent",
       );
     }
 
-    console.log("");
+    // Final tractor drive
+    farmTerm.nl();
+    await farmTerm.tractorAnimation("Your farm is ready!", 1500);
+    farmTerm.nl();
   } catch (error) {
-    spinner.fail(chalk.red("Failed to initialize Farmwork"));
+    farmTerm.error("Failed to initialize Farmwork");
     console.error(error);
     process.exit(1);
   }
@@ -548,11 +540,10 @@ Run these in order for a complete development cycle:
 
 | Phrase | Action |
 |--------|--------|
-| **till the land** | Audit systems, update \`_AUDIT/FARMHOUSE.md\` with current metrics |
-| **inspect the farm** | Full inspection: code review, cleanup, performance, security, code quality |
-| **go to market** | i18n scan + translator for missing translations |
-| **harvest crops** | Execute \`/push\` (lint, test, build, commit, push) |
-| **open the farm** | Full audit cycle (everything except push), then ask to proceed |
+| **open the farm** | Audit systems, update \`_AUDIT/FARMHOUSE.md\` with current metrics |
+| **count the herd** | Full inspection + dry run: code review, cleanup, performance, security, code quality, accessibility |
+| **go to market** | i18n scan + accessibility audit for missing translations and a11y issues |
+| **close the farm** | Execute \`/push\` (lint, test, build, commit, push) |
 
 ---
 
@@ -567,28 +558,30 @@ Run these in order for a complete development cycle:
 
 ### Farmwork Phrase Details
 
-**till the land**
+**open the farm**
 1. Launch \`the-farmer\` agent to audit all systems
 2. Run \`bd list --status closed | wc -l\` to get total completed issues
 3. Updates \`_AUDIT/FARMHOUSE.md\` with current metrics
 
-**inspect the farm** (Full Inspection)
-Runs all inspection agents in parallel:
+**count the herd** (Full Audit Cycle)
+Runs all inspection agents in parallel, then dry run quality gates. No push.
+
 1. **Code Review & Cleanup** - \`code-reviewer\` + \`unused-code-cleaner\`
-2. **Performance Audit** - Tests + \`performance-auditor\`, updates \`_AUDIT/PERFORMANCE.md\`
+2. **Performance Audit** - \`performance-auditor\`, updates \`_AUDIT/PERFORMANCE.md\`
 3. **Security Audit** - \`security-auditor\` for OWASP Top 10, updates \`_AUDIT/SECURITY.md\`
 4. **Code Quality** - \`code-smell-auditor\` for DRY violations, updates \`_AUDIT/CODE_QUALITY.md\`
-5. **Summary Report** - Consolidate findings
+5. **Accessibility** - \`accessibility-auditor\` for WCAG 2.1, updates \`_AUDIT/ACCESSIBILITY.md\`
+6. **Dry Run** - lint, tests, build (but NOT commit/push)
+7. **Summary Report** - Consolidate findings, ask user next steps
 
-**harvest crops**
-- Invoke the \`push\` skill immediately
+**go to market**
+1. Scan for hardcoded text not using i18n
+2. Launch \`i18n-locale-translator\` agent
+3. Launch \`accessibility-auditor\` for WCAG 2.1 compliance
+4. Updates \`_AUDIT/ACCESSIBILITY.md\`
 
-**open the farm** (Full Audit Cycle)
-1. **Till the Land** - Run \`the-farmer\` agent
-2. **Inspect the Farm** - Full inspection (code review, cleanup, performance, security, code quality)
-3. **Dry Run Harvest** - Run lint, tests, build (but NOT commit/push)
-4. **Summary Report** - Present consolidated findings
-5. **Ask User** - Ready to harvest (push)?
+**close the farm**
+- Invoke the \`push\` skill immediately
 
 ---
 
@@ -645,7 +638,7 @@ async function createFarmhouseMd(cwd, answers) {
   const content = `# Farmwork Farmhouse
 
 > Central command for the Farmwork agentic harness.
-> Updated automatically by \`the-farmer\` agent during \`/push\` or via "till the land" phrase.
+> Updated automatically by \`the-farmer\` agent during \`/push\` or via "open the farm" phrase.
 
 **Last Updated:** ${today}
 **Score:** 5.0/10
@@ -658,7 +651,7 @@ async function createFarmhouseMd(cwd, answers) {
 | Metric | Count |
 |--------|-------|
 | Commands | 1 |
-| Agents | 4 |
+| Agents | 10 |
 | Justfile Recipes | 10 |
 | Unit Tests | 0 |
 | E2E Tests | 0 |
@@ -676,7 +669,7 @@ All Claude Code commands and agents are documented, phrase triggers are tested a
 
 | Command | Description |
 |---------|-------------|
-| \`/push\` | Clean, lint, test, build, commit, push |
+| \`/push\` | Clean, lint, test, build, commit, push, update metrics |
 
 ---
 
@@ -688,6 +681,12 @@ All Claude Code commands and agents are documented, phrase triggers are tested a
 | \`code-reviewer\` | Quality & security code review |
 | \`security-auditor\` | OWASP vulnerability scanning |
 | \`performance-auditor\` | Performance anti-patterns |
+| \`code-smell-auditor\` | DRY violations, complexity, naming |
+| \`accessibility-auditor\` | WCAG 2.1 compliance, alt text, contrast |
+| \`unused-code-cleaner\` | Detect and remove dead code |
+| \`code-cleaner\` | Remove comments and console.logs |
+| \`i18n-locale-translator\` | Translate UI text to locales |
+| \`storybook-maintainer\` | Create/update Storybook stories |
 
 ---
 
@@ -697,11 +696,10 @@ All Claude Code commands and agents are documented, phrase triggers are tested a
 
 | Phrase | Action |
 |--------|--------|
-| \`till the land\` | Audit systems, update FARMHOUSE.md |
-| \`inspect the farm\` | Full inspection: code review, cleanup, performance, security, code quality |
-| \`go to market\` | i18n scan + translator |
-| \`harvest crops\` | Execute /push |
-| \`open the farm\` | Full audit cycle |
+| \`open the farm\` | Audit systems, update FARMHOUSE.md |
+| \`count the herd\` | Full inspection + dry run (no push) |
+| \`go to market\` | i18n scan + accessibility audit |
+| \`close the farm\` | Execute /push |
 
 ### Plan Phrases
 
@@ -755,6 +753,11 @@ async function createAuditDocs(cwd, answers) {
       title: "Performance Audit",
       description: "Performance metrics and optimization tracking",
     },
+    {
+      name: "ACCESSIBILITY.md",
+      title: "Accessibility Audit",
+      description: "WCAG 2.1 Level AA compliance tracking",
+    },
     {
       name: "CODE_QUALITY.md",
       title: "Code Quality Audit",
@@ -948,8 +951,8 @@ Reports findings with severity (CRITICAL, HIGH, MEDIUM, LOW) and remediation ste
     "security-auditor.md": `---
 name: security-auditor
 description: OWASP security vulnerability scanning
-tools: Read, Grep, Glob
-model: sonnet
+tools: Read, Grep, Glob, Edit
+model: haiku
 ---
 
 # Security Auditor Agent
@@ -967,8 +970,8 @@ Updates \`_AUDIT/SECURITY.md\` with results.
     "performance-auditor.md": `---
 name: performance-auditor
 description: Find memory leaks, unnecessary re-renders, and anti-patterns
-tools: Read, Grep, Glob
-model: sonnet
+tools: Read, Grep, Glob, Edit
+model: haiku
 ---
 
 # Performance Auditor Agent
@@ -982,6 +985,118 @@ Scans for performance anti-patterns:
 
 Reports findings with impact assessment.
 Updates \`_AUDIT/PERFORMANCE.md\` with results.
+`,
+    "code-smell-auditor.md": `---
+name: code-smell-auditor
+description: Detect DRY violations, complexity issues, naming problems, and technical debt
+tools: Read, Grep, Glob, Edit
+model: haiku
+---
+
+# Code Smell Auditor Agent
+
+Scans for code quality issues:
+- DRY violations (duplicated code)
+- Complexity issues (functions > 50 lines, deep nesting)
+- Naming issues (misleading names, abbreviations)
+- Magic values (hardcoded numbers/strings)
+- Technical debt (TODO, FIXME, HACK comments)
+
+Reports code health as GOOD / FAIR / NEEDS ATTENTION.
+Updates \`_AUDIT/CODE_QUALITY.md\` with results.
+`,
+    "accessibility-auditor.md": `---
+name: accessibility-auditor
+description: WCAG 2.1 accessibility auditing for React/Next.js applications
+tools: Read, Grep, Glob, Edit
+model: haiku
+---
+
+# Accessibility Auditor Agent
+
+Scans for WCAG 2.1 Level AA compliance issues:
+- Missing or inadequate alt text on images
+- Color contrast issues
+- Keyboard navigation problems
+- Missing ARIA labels and roles
+- Form accessibility (labels, error messages)
+- Focus management issues
+
+Reports findings by severity (CRITICAL, HIGH, MEDIUM, LOW).
+Updates \`_AUDIT/ACCESSIBILITY.md\` with results.
+`,
+    "unused-code-cleaner.md": `---
+name: unused-code-cleaner
+description: Detect and remove unused code (imports, functions, variables)
+tools: Read, Write, Edit, Bash, Grep, Glob
+model: haiku
+---
+
+# Unused Code Cleaner Agent
+
+Detects and removes unused code:
+- Unused imports
+- Unused functions and classes
+- Unused variables
+- Dead code paths
+- Console.log statements (optional)
+- Comments (preserves JSDoc)
+
+Use after refactoring, when removing features, or before production deployment.
+`,
+    "code-cleaner.md": `---
+name: code-cleaner
+description: Fast removal of comments, console.logs, and debug code while preserving JSDoc
+tools: Read, Edit, Glob, Grep
+model: haiku
+---
+
+# Code Cleaner Agent
+
+Fast cleanup of TypeScript/JavaScript files:
+
+## Removes
+- Line comments (\`//\`)
+- Block comments (\`/* */\`)
+- \`console.log\` statements
+
+## Preserves
+- JSDoc comments (\`/** */\`)
+- \`console.error\`, \`console.warn\`, \`console.info\`
+`,
+    "i18n-locale-translator.md": `---
+name: i18n-locale-translator
+description: Translate UI text content into English (en) and Japanese (jp) using i18n locale system
+tools: Read, Write, Edit, Glob, Grep
+model: sonnet
+---
+
+# i18n Locale Translator Agent
+
+Handles internationalization tasks:
+- Extract hardcoded text from components
+- Create translation keys in locale files
+- Translate content to English and Japanese
+- Update components to use translation hooks
+
+Use when adding new features or internationalizing existing hardcoded text.
+`,
+    "storybook-maintainer.md": `---
+name: storybook-maintainer
+description: Create and update Storybook stories for UI components
+tools: Read, Write, Edit, Glob, Grep
+model: haiku
+---
+
+# Storybook Maintainer Agent
+
+Manages Storybook stories for UI components:
+- Analyze component props and variants
+- Create comprehensive story files
+- Document component usage
+- Add controls for interactive props
+
+Use when adding new components or when existing components change significantly.
 `,
   };
 
@@ -993,93 +1108,129 @@ Updates \`_AUDIT/PERFORMANCE.md\` with results.
 async function createCommands(cwd, answers) {
   const pm = answers.packageManager || "npm";
 
-  // Build Storybook deployment steps if enabled
   const storybookSteps = answers.includeStorybook
     ? `
 
-### Step 6: Build & Deploy Storybook
+### Step 9: Deploy Storybook to Netlify
 
-Build Storybook for production:
-\`\`\`bash
-${pm} run build-storybook
-\`\`\`
-
-Deploy to Netlify (requires NETLIFY_AUTH_TOKEN and NETLIFY_STORYBOOK_SITE_ID in .claude/settings.local.json):
+Deploy the Storybook documentation site:
 \`\`\`bash
 npx netlify deploy --dir=storybook-static --site=$NETLIFY_STORYBOOK_SITE_ID --prod
 \`\`\`
 
+Note: Requires \`NETLIFY_AUTH_TOKEN\` and \`NETLIFY_STORYBOOK_SITE_ID\` in \`.claude/settings.local.json\`.
+If not configured, skip this step and inform the user to add the env vars.
+
 Storybook URL: https://${answers.storybookUrl || "storybook.example.com"}
 ${answers.passwordProtect ? "**Note:** This Storybook is password protected." : ""}
 `
     : "";
 
-  const finalStep = answers.includeStorybook
-    ? "### Step 7: Report Success"
-    : "### Step 6: Report Success";
-  const reportContent = answers.includeStorybook
-    ? `
-Show summary:
-- Files changed
-- Commit hash
-- Push status
-- Storybook deploy status
-`
-    : `
-Show summary:
-- Files changed
-- Commit hash
-- Push status
-`;
-
   const pushCommand = `---
-description: Clean, lint, test, build, commit, and push${answers.includeStorybook ? " (+ deploy Storybook)" : ""}
-allowed-tools: Bash(git:*), Bash(${pm}:*), Bash(npx:*)
+description: Clean, stage, lint, test, build, commit, push, and update metrics
+argument-hint: [optional: commit message override]
+allowed-tools: Bash(find:*), Bash(git:*), Bash(${pm}:*), Bash(npx:*)${answers.includeStorybook ? ", Bash(npx netlify:*)" : ""}, Task
 ---
 
 # Push Command
 
-Run quality gates, commit changes, and push to remote.${answers.includeStorybook ? " Then deploy Storybook." : ""}
+Run code cleanup, all quality gates, commit changes, and push to remote.
 
 ## Workflow
 
 Execute these steps in order. **Stop immediately if any step fails.**
 
-### Step 1: Stage All Changes
+### Step 1: Clean Up System Files
+Remove any .DS_Store files from the repository:
 \`\`\`bash
-git add -A
+find . -name '.DS_Store' -type f -delete
+\`\`\`
+
+### Step 2: Sync Packages
+Clean and reinstall node_modules to ensure package-lock.json stays in sync:
+\`\`\`bash
+rm -rf node_modules && ${pm} install
 \`\`\`
+This prevents \`${pm} ci\` failures in CI/CD due to lock file drift.
 
-### Step 2: Check for Changes
-Run \`git status\` to verify there are staged changes. If nothing to commit, stop.
+If package-lock.json was modified, it will be staged in the next step.
 
-### Step 3: Run Quality Gates
+### Step 3: Stage All Changes
+\`\`\`bash
+git add -A
+\`\`\`
 
-1. **Lint**: \`${answers.lintCommand}\`
-2. **Tests**: \`${answers.testCommand}\`
-3. **Build**: \`${answers.buildCommand}\`
+### Step 4: Check for Changes
+Run \`git status\` to verify there are staged changes. If nothing to commit, inform the user and stop.
 
-### Step 4: Generate Commit Message
+### Step 5: Clean Code
 
-Analyze staged changes and generate a concise commit message:
-- Starts with a type (feat, fix, refactor, docs, style, test, chore)
-- Summarizes the "why" not the "what"
-- 1-2 sentences maximum
+Run the code-cleaner agent on staged TypeScript files to remove comments and console.logs.
 
-### Step 5: Commit and Push
+This removes:
+- Line comments (\`//\`) and block comments (\`/* */\`)
+- \`console.log\` statements
 
-Create the commit with footer:
+It preserves:
+- JSDoc comments (\`/** */\`)
+- \`console.error\`, \`console.warn\`, \`console.info\`
 
+After cleaning, re-stage the modified files:
+\`\`\`bash
+git add -A
 \`\`\`
-🌽 Generated with [Claude Code](https://claude.com/claude-code)
 
-Co-Authored-By: Claude <noreply@anthropic.com>
+### Step 6: Run Quality Gates (in order)
+
+Run each check. If any fails, stop and report which check failed:
+
+1. **Lint**: \`${answers.lintCommand}\`${answers.includeStorybook ? `\n2. **Storybook**: \`${pm} run build-storybook\`` : ""}
+${answers.includeStorybook ? "3" : "2"}. **Unit Tests**: \`${answers.testCommand}\`
+${answers.includeStorybook ? "4" : "3"}. **Build**: \`${answers.buildCommand}\`
+
+### Step 7: Generate Commit Message
+
+If \`$ARGUMENTS\` is provided, use it as the commit message.
+
+Otherwise, analyze the staged changes:
+1. Run \`git diff --cached --stat\` to see changed files
+2. Run \`git diff --cached\` to see actual changes
+3. Run \`git log -5 --oneline\` to match the repository's commit style
+4. Generate a concise, descriptive commit message that:
+   - Starts with a type (feat, fix, refactor, docs, style, test, chore)
+   - Summarizes the "why" not the "what"
+   - Is 1-2 sentences maximum
+
+### Step 8: Commit and Push
+
+Create the commit with the message, including the standard footer:
+
+\`\`\`
+🌽 Generated with FARMWORK
 \`\`\`
 
-Then push: \`git push\`
+Then push to remote:
+\`\`\`bash
+git push
+\`\`\`
 ${storybookSteps}
-${finalStep}
-${reportContent}`;
+### Step 10: Update Farmhouse Metrics
+
+Run the-farmer agent to update \`_AUDIT/FARMHOUSE.md\` with current metrics:
+- Commands and agents inventory
+- Test counts (unit, e2e)
+- Completed issues count
+
+This keeps the harness documentation in sync with the codebase.
+
+### Step 11: Report Success
+
+Show a summary:
+- Files changed
+- Commit hash
+- Push status${answers.includeStorybook ? "\n- Storybook deploy status (if deployed)" : ""}
+- Harness metrics updated
+`;
 
   await fs.writeFile(
     path.join(cwd, ".claude", "commands", "push.md"),
@@ -1088,20 +1239,6 @@ ${reportContent}`;
 }
 
 async function createSettings(cwd, answers) {
-  const settings = {
-    permissions: {
-      allow: [],
-      deny: [],
-      ask: [],
-    },
-  };
-
-  await fs.writeFile(
-    path.join(cwd, ".claude", "settings.json"),
-    JSON.stringify(settings, null, 2),
-  );
-
-  // Create local settings for sensitive data (gitignored)
   if (answers.includeStorybook && answers.netlifyAuthToken) {
     const localSettings = {
       env: {
@@ -1115,7 +1252,6 @@ async function createSettings(cwd, answers) {
       JSON.stringify(localSettings, null, 2),
     );
 
-    // Ensure settings.local.json is gitignored
     const gitignorePath = path.join(cwd, ".gitignore");
     let gitignoreContent = "";
     try {
@@ -1155,10 +1291,9 @@ async function createProduceConfig(cwd, answers) {
       storybook: answers.includeStorybook || false,
       i18n: answers.includeI18n || false,
     },
-    audits: ["FARMHOUSE", "SECURITY", "PERFORMANCE", "CODE_QUALITY", "TESTS"],
+    audits: ["FARMHOUSE", "SECURITY", "PERFORMANCE", "ACCESSIBILITY", "CODE_QUALITY", "TESTS"],
   };
 
-  // Add Storybook configuration if enabled
   if (answers.includeStorybook) {
     config.storybook = {
       url: answers.storybookUrl || null,