optikit 1.2.5 → 1.3.0

package/src/cli.ts

@@ -1,387 +1,98 @@
 #!/usr/bin/env node
 
+// MCP mode: redirect all console output to stderr before any imports
+const isMcpMode = process.argv.includes("mcp");
+if (isMcpMode) {
+  const origLog = console.log;
+  console.log = (...args: unknown[]) => console.error(...args);
+  // Restore for JSON-RPC (SDK uses process.stdout directly)
+  void origLog;
+}
+
 import chalk from "chalk";
 import boxen from "boxen";
 import yargs from "yargs/yargs";
 import { hideBin } from "yargs/helpers";
-import { generateModule } from "./commands/project/generate.js";
-import { cleanProject } from "./commands/clean/flutter.js";
-import { cleanIosProject } from "./commands/clean/ios.js";
-import { updateFlutterVersion } from "./commands/version/update.js";
-import {
-  buildFlutterApk,
-  buildFlutterBundle,
-  buildFlutterIos,
-  buildFlutterIpa,
-} from "./commands/build/releases.js";
-import { boxenOptions } from "./styles.js";
-import { openIos, openAndroid, openIpaOutput, openBundleOutput, openApkOutput } from "./commands/project/open.js";
+import type { CommandModule } from "yargs";
 import { createRequire } from "module";
-import { createVscodeSettings } from "./commands/project/setup.js";
-import { initializeProject } from "./commands/config/init.js";
-import { rollbackFiles, rollbackRestore } from "./commands/config/rollback.js";
-import {
-  bumpVersion,
-  bumpIosBuildOnly,
-  bumpAndroidBuildOnly,
-  bumpBothBuilds,
-  showCurrentVersion
-} from "./commands/version/bump.js";
-import { listDevices, runApp, runAppInteractive } from "./commands/project/devices.js";
+import { bannerBoxOptions, createBanner } from "./styles.js";
+import { loadConfig } from "./utils/services/config.js";
+import { setDryRunMode } from "./utils/helpers/dryRun.js";
+
+// Command modules
+import { buildCommands } from "./commands/build/commands.js";
+import { cleanCommands } from "./commands/clean/commands.js";
+import { versionCommands } from "./commands/version/commands.js";
+import { projectCommands } from "./commands/project/commands.js";
+import { configCommands } from "./commands/config/commands.js";
+import { mcpCommands } from "./commands/mcp/commands.js";
+
 const require = createRequire(import.meta.url);
 const packageInfo: { version: string } = require("../package.json");
 
-const version = packageInfo.version;
+// Greeting banner (skip in MCP mode — stdout is reserved for JSON-RPC)
+if (!isMcpMode) {
+  console.log(boxen(createBanner(packageInfo.version), bannerBoxOptions));
+}
 
-const greeting = chalk.white.bold("Hello ^_^");
-console.log(boxen(greeting, boxenOptions));
+// Load config once
+const config = loadConfig();
 
-const options = yargs(hideBin(process.argv))
-  .command(
-    "generate module <moduleName>",
-    "Generate a module with structure",
-    (yargs) => {
-      return yargs.positional("moduleName", {
-        describe: "The name of the module to generate",
-        type: "string",
-      });
-    },
-    (argv) => {
-      const moduleName = argv.moduleName as string;
-      generateModule(moduleName);
-    }
-  )
-  .command(
-    "clean-flutter",
-    "Clean the Flutter project",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    (argv) => {
-      const noFvm = argv.disableFvm as boolean;
-      cleanProject(noFvm);
-    }
-  )
-  .command(
-    "clean-ios",
-    "Clean the iOS project",
-    (yargs) => {
-      return yargs
-        .option("clean-cache", {
-          type: "boolean",
-          default: false,
-          description:
-            "Run with CocoaPods cache cleaning (use --clean-cache to enable)",
-        })
-        .option("repo-update", {
-          type: "boolean",
-          default: false,
-          description:
-            "Run pod install with repository update (use --repo-update to enable)",
-        });
-    },
-    (argv) => {
-      const cleanCache = argv.cleanCache as boolean;
-      const repoUpdate = argv.repoUpdate as boolean;
-      cleanIosProject(cleanCache, repoUpdate);
-    }
-  )
-  .command(
-    "flutter-build-apk",
-    "Build the Flutter APK with release configuration, obfuscation, and split debug info",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    async (argv) => {
-      const noFvm = argv.disableFvm as boolean;
-      await buildFlutterApk(noFvm);
-    }
-  )
-  .command(
-    "flutter-build-bundle",
-    "Build the Flutter Bundle with release configuration, obfuscation, and split debug info",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    async (argv) => {
-      const noFvm = argv.disableFvm as boolean;
-      await buildFlutterBundle(noFvm);
-    }
-  )
-  .command(
-    "flutter-build-ios",
-    "Build the Flutter iOS app with release configuration and increment the build version",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    async (argv) => {
-      const noFvm = argv.disableFvm as boolean;
-      await buildFlutterIos(noFvm);
-    }
-  )
-  .command(
-    "flutter-build-ipa",
-    "Create a release IPA with an updated build version number",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    async (argv) => {
-      const noFvm = argv.disableFvm as boolean;
-      await buildFlutterIpa(noFvm);
-    }
-  )
-  .command(
-    "flutter-update-version",
-    "Update version and build numbers for both Android and iOS",
-    (yargs) => {
-      return yargs
-        .option("app-version", {
-          type: "string",
-          description: "The version number to set for both Android and iOS",
-          demandOption: false,
-          default: "",
-        })
-        .option("android-build", {
-          type: "string",
-          description: "The Android build number to set in pubspec.yaml",
-          demandOption: false,
-          default: "",
-        })
-        .option("ios-build", {
-          type: "string",
-          description:
-            "The iOS build number to set using agv-tool and Info.plist",
-          demandOption: false,
-          default: "",
-        });
-    },
-    async (argv) => {
-      const version = argv["app-version"];
-      const androidBuildNumber = argv["android-build"];
-      const iosBuildNumber = argv["ios-build"];
+// Collect all commands
+const allCommands: CommandModule[] = [
+  ...buildCommands,
+  ...cleanCommands,
+  ...versionCommands,
+  ...projectCommands,
+  ...configCommands,
+  ...mcpCommands,
+];
 
-      await updateFlutterVersion(version, androidBuildNumber, iosBuildNumber);
-    }
-  )
-  .command("open-ios", "Open the iOS project in Xcode", {}, async () => {
-    await openIos();
+// Build CLI
+const cli = yargs(hideBin(process.argv))
+  .scriptName("optikit")
+  .option("dry-run", {
+    type: "boolean",
+    default: false,
+    description: "Preview operations without executing them",
+    global: true,
   })
-  .command(
-    "open-android",
-    "Open the Android project in Android Studio",
-    {},
-    async () => {
-      await openAndroid();
+  .middleware((argv) => {
+    if (argv.dryRun) {
+      setDryRunMode(true);
     }
-  )
-  .command(
-    "open-ipa",
-    "Open the IPA build output directory",
-    {},
-    async () => {
-      await openIpaOutput();
-    }
-  )
-  .command(
-    "open-apk",
-    "Open the APK build output directory",
-    {},
-    async () => {
-      await openApkOutput();
+    if (config.useFvmByDefault === false && !process.argv.includes("--disable-fvm")) {
+      argv.disableFvm = true;
     }
-  )
-  .command(
-    "open-bundle",
-    "Open the Android Bundle build output directory",
-    {},
-    async () => {
-      await openBundleOutput();
-    }
-  )
-  .command(
-    "setup-vscode",
-    "Create a .vscode folder with recommended Flutter settings",
-    () => {},
-    async () => {
-      await createVscodeSettings();
-    }
-  )
-  .command(
-    "init",
-    "Initialize OptiKit configuration in the current project",
-    () => {},
-    async () => {
-      await initializeProject();
-    }
-  )
-  .command(
-    "rollback",
-    "List and restore files from OptiKit backups",
-    (yargs) => {
-      return yargs.option("restore", {
-        type: "number",
-        description: "Restore backup by index number",
-        demandOption: false,
-      });
-    },
-    async (argv) => {
-      const restoreIndex = argv.restore as number | undefined;
-      if (restoreIndex !== undefined) {
-        await rollbackRestore(restoreIndex);
-      } else {
-        await rollbackFiles();
-      }
-    }
-  )
-  .command(
-    "bump <type>",
-    "Bump version (major, minor, or patch)",
-    (yargs) => {
-      return yargs.positional("type", {
-        describe: "Version bump type (major, minor, patch)",
-        type: "string",
-        choices: ["major", "minor", "patch"],
-      });
-    },
-    async (argv) => {
-      const type = argv.type as 'major' | 'minor' | 'patch';
-      await bumpVersion(type);
-    }
-  )
-  .command(
-    "bump-ios",
-    "Increment iOS build number only (for TestFlight)",
-    () => {},
-    async () => {
-      await bumpIosBuildOnly();
-    }
-  )
-  .command(
-    "bump-android",
-    "Increment Android build number only",
-    () => {},
-    async () => {
-      await bumpAndroidBuildOnly();
-    }
-  )
-  .command(
-    "bump-build",
-    "Increment both Android and iOS build numbers",
-    () => {},
-    async () => {
-      await bumpBothBuilds();
-    }
-  )
-  .command(
-    "version",
-    "Show current version information",
-    () => {},
-    async () => {
-      await showCurrentVersion();
-    }
-  )
-  .command(
-    "devices",
-    "List all connected devices",
-    (yargs) => {
-      return yargs.option("disable-fvm", {
-        type: "boolean",
-        default: false,
-        description: "Run without FVM (use --disable-fvm to enable)",
-      });
-    },
-    async (argv) => {
-      const useFvm = !argv.disableFvm;
-      await listDevices(useFvm);
-    }
-  )
-  .command(
-    "run",
-    "Run Flutter app on connected device",
-    (yargs) => {
-      return yargs
-        .option("device", {
-          alias: "d",
-          type: "string",
-          description: "Specific device ID to run on",
-        })
-        .option("release", {
-          alias: "r",
-          type: "boolean",
-          default: false,
-          description: "Run in release mode",
-        })
-        .option("flavor", {
-          alias: "f",
-          type: "string",
-          description: "Build flavor to use",
-        })
-        .option("disable-fvm", {
-          type: "boolean",
-          default: false,
-          description: "Run without FVM (use --disable-fvm to enable)",
-        });
-    },
-    async (argv) => {
-      const useFvm = !argv.disableFvm;
-      await runApp({
-        device: argv.device as string | undefined,
-        release: argv.release as boolean,
-        flavor: argv.flavor as string | undefined,
-        useFvm,
-      });
-    }
-  )
-  .command(
-    "run-select",
-    "Interactive device selection and run",
-    (yargs) => {
-      return yargs
-        .option("release", {
-          alias: "r",
-          type: "boolean",
-          default: false,
-          description: "Run in release mode",
-        })
-        .option("flavor", {
-          alias: "f",
-          type: "string",
-          description: "Build flavor to use",
-        })
-        .option("disable-fvm", {
-          type: "boolean",
-          default: false,
-          description: "Run without FVM (use --disable-fvm to enable)",
-        });
-    },
-    async (argv) => {
-      const useFvm = !argv.disableFvm;
-      await runAppInteractive({
-        release: argv.release as boolean,
-        flavor: argv.flavor as string | undefined,
-        useFvm,
-      });
-    }
-  )
-  .version(version)
-  .help(true).argv;
+  });
+
+// Register all commands
+for (const command of allCommands) {
+  cli.command(command);
+}
+
+cli
+  .completion("completion", "Generate shell completion script")
+  .usage(chalk.white.bold("\nUsage:") + chalk.gray(" optikit <command> [options]"))
+  .epilogue(
+    chalk.cyan.bold("\nQuick Reference") + chalk.gray("  (use ok or optikit — both work)\n") +
+    "\n" +
+    chalk.cyan("  Build     ") + chalk.white.bold("apk  aab  ios  ipa  tf") + chalk.gray(" (testflight)\n") +
+    chalk.cyan("  Clean     ") + chalk.white.bold("c") + chalk.gray(" (flutter)  ") + chalk.white.bold("ci") + chalk.gray(" (iOS)  ") + chalk.white.bold("c -a") + chalk.gray(" (all)\n") +
+    chalk.cyan("  Bump      ") + chalk.white.bold("bump <type>  bi  ba  bb\n") +
+    chalk.cyan("  Version   ") + chalk.white.bold("v") + chalk.gray(" (show)  ") + chalk.white.bold("vset") + chalk.gray(" (set manually)\n") +
+    chalk.cyan("  Generate  ") + chalk.white.bold("gen module <name>  gen repo <name>  route <name>\n") +
+    chalk.cyan("  Run       ") + chalk.white.bold("run  rs") + chalk.gray(" (interactive)  ") + chalk.white.bold("devs") + chalk.gray(" (list devices)\n") +
+    chalk.cyan("  Open      ") + chalk.white.bold("xcode  studio\n") +
+    chalk.cyan("  Config    ") + chalk.white.bold("init  vscode  undo  up\n") +
+    chalk.cyan("  Info      ") + chalk.white.bold("info  dr  aliases\n") +
+    chalk.cyan("  MCP       ") + chalk.white.bold("mcp  setup-claude\n") +
+    "\n" +
+    chalk.cyan("  Combos    ") + chalk.green("ok apk --clean -o") + chalk.gray("  |  ") + chalk.green("ok ipa -b patch -o") + chalk.gray("  |  ") + chalk.green("ok tf -o") +
+    "\n\n" +
+    chalk.gray("  Run ") + chalk.white("optikit <command> --help") + chalk.gray(" for details  |  ") +
+    chalk.white("optikit aliases") + chalk.gray(" for full reference")
+  )
+  .version(packageInfo.version)
+  .help(true)
+  .argv;

package/src/commands/build/commands.ts

@@ -0,0 +1,169 @@
+import type { CommandModule } from "yargs";
+import {
+  buildFlutterApk,
+  buildFlutterBundle,
+  buildFlutterIos,
+  buildFlutterIpa,
+} from "./releases.js";
+import { cleanProject } from "../clean/flutter.js";
+import { cleanIosProject } from "../clean/ios.js";
+import { bumpVersion, bumpIosBuildOnly } from "../version/bump.js";
+import { openApkOutput, openBundleOutput, openIpaOutput } from "../project/open.js";
+import { LoggerHelpers } from "../../utils/services/logger.js";
+import { runTestflight } from "./testflight.js";
+
+const buildOptions = {
+  "disable-fvm": {
+    alias: "f",
+    type: "boolean" as const,
+    default: false,
+    description: "Run without FVM",
+  },
+  clean: {
+    type: "boolean" as const,
+    default: false,
+    description: "Clean before building",
+  },
+  open: {
+    alias: "o",
+    type: "boolean" as const,
+    default: false,
+    description: "Open output directory after build",
+  },
+  bump: {
+    alias: "b",
+    type: "string" as const,
+    choices: ["major", "minor", "patch"] as const,
+    description: "Bump version before building",
+  },
+};
+
+const ipaOptions = {
+  ...buildOptions,
+  "bump-ios": {
+    alias: "i",
+    type: "boolean" as const,
+    default: false,
+    description: "Bump iOS build number before building",
+  },
+};
+
+type BumpType = "major" | "minor" | "patch";
+
+interface BuildFlags {
+  disableFvm: boolean;
+  clean: boolean;
+  open: boolean;
+  bump?: BumpType;
+  bumpIos?: boolean;
+}
+
+async function runPreBuild(flags: BuildFlags, isIosBuild: boolean): Promise<void> {
+  // 1. Bump version
+  if (flags.bump) {
+    LoggerHelpers.step(`Bumping ${flags.bump} version...`);
+    await bumpVersion(flags.bump, true);
+  }
+  if (flags.bumpIos) {
+    LoggerHelpers.step("Bumping iOS build number...");
+    await bumpIosBuildOnly(true);
+  }
+
+  // 2. Clean
+  if (flags.clean) {
+    LoggerHelpers.step("Cleaning project...");
+    await cleanProject(flags.disableFvm);
+    if (isIosBuild) {
+      await cleanIosProject(false, false);
+    }
+  }
+}
+
+async function runPostBuild(flags: BuildFlags, openFn: () => Promise<void>): Promise<void> {
+  // 4. Open output
+  if (flags.open) {
+    await openFn();
+  }
+}
+
+function parseFlags(argv: Record<string, unknown>): BuildFlags {
+  return {
+    disableFvm: argv.disableFvm as boolean,
+    clean: argv.clean as boolean,
+    open: argv.open as boolean,
+    bump: argv.bump as BumpType | undefined,
+    bumpIos: argv.bumpIos as boolean | undefined,
+  };
+}
+
+export const buildCommands: CommandModule[] = [
+  {
+    command: "flutter-build-apk",
+    aliases: ["apk"],
+    describe: "Build the Flutter APK with release configuration, obfuscation, and split debug info",
+    builder: buildOptions,
+    handler: async (argv) => {
+      const flags = parseFlags(argv);
+      await runPreBuild(flags, false);
+      await buildFlutterApk(flags.disableFvm);
+      await runPostBuild(flags, openApkOutput);
+    },
+  },
+  {
+    command: "flutter-build-bundle",
+    aliases: ["aab"],
+    describe: "Build the Flutter Bundle with release configuration, obfuscation, and split debug info",
+    builder: buildOptions,
+    handler: async (argv) => {
+      const flags = parseFlags(argv);
+      await runPreBuild(flags, false);
+      await buildFlutterBundle(flags.disableFvm);
+      await runPostBuild(flags, openBundleOutput);
+    },
+  },
+  {
+    command: "flutter-build-ios",
+    aliases: ["ios"],
+    describe: "Build the Flutter iOS app with release configuration and increment the build version",
+    builder: buildOptions,
+    handler: async (argv) => {
+      const flags = parseFlags(argv);
+      await runPreBuild(flags, true);
+      await buildFlutterIos(flags.disableFvm);
+    },
+  },
+  {
+    command: "flutter-build-ipa",
+    aliases: ["ipa"],
+    describe: "Create a release IPA with an updated build version number",
+    builder: ipaOptions,
+    handler: async (argv) => {
+      const flags = parseFlags(argv);
+      await runPreBuild(flags, true);
+      await buildFlutterIpa(flags.disableFvm);
+      await runPostBuild(flags, openIpaOutput);
+    },
+  },
+  {
+    command: "testflight",
+    aliases: ["tf"],
+    describe: "Bump iOS build number and build IPA (TestFlight workflow)",
+    builder: {
+      "disable-fvm": {
+        alias: "f",
+        type: "boolean" as const,
+        default: false,
+        description: "Run without FVM",
+      },
+      open: {
+        alias: "o",
+        type: "boolean" as const,
+        default: false,
+        description: "Open IPA output directory after build",
+      },
+    },
+    handler: async (argv) => {
+      await runTestflight(argv.disableFvm as boolean, argv.open as boolean);
+    },
+  },
+];

package/src/commands/build/testflight.ts

@@ -0,0 +1,18 @@
+import { bumpIosBuildOnly } from "../version/bump.js";
+import { buildFlutterIpa } from "./releases.js";
+import { openIpaOutput } from "../project/open.js";
+import { LoggerHelpers } from "../../utils/services/logger.js";
+
+export { runTestflight };
+
+async function runTestflight(disableFvm: boolean, open: boolean): Promise<void> {
+  LoggerHelpers.step("Bumping iOS build number...");
+  await bumpIosBuildOnly(true);
+
+  LoggerHelpers.step("Building IPA...");
+  await buildFlutterIpa(disableFvm);
+
+  if (open) {
+    await openIpaOutput();
+  }
+}