Merge pull request #240 from TheWizardsCode/copilot/legacy-cli-cutover-and-removal

Remove legacy CLI dual-dispatch and wire per-command yargs handlers

Author: Sorra

src/cli.core.ts

@@ -81,7 +81,7 @@ import { renderSequence } from "./sequence/renderer.js";
 import type { SequenceDefinition } from "./sequence/schema.js";
 
 /** Parse command-line arguments into a structured map. */
-function parseArgs(argv: string[]): {
+export function parseArgs(argv: string[]): {
   command: string | undefined;
   subcommand: string | undefined;
   flags: Record<string, string | boolean>;
@@ -1284,8 +1284,30 @@ function formatClassificationBatchTable(
 }
 
 /** Main CLI entry point. Exported for testability. */
-export async function main(argv: string[] = process.argv): Promise<number> {
-  const { command, subcommand, flags, layers } = parseArgs(argv);
+/**
+ * Dispatch a command using pre-parsed arguments.
+ *
+ * yargs (or any other caller) should perform argument parsing and pass the
+ * structured result here. `coreMain.main()` is now a thin wrapper around this
+ * function so that the legacy entry-point remains available.
+ *
+ * @param command    - Top-level command name (e.g. "generate", "stack"), or
+ *                     `undefined` for global flags only (--help, --version).
+ * @param subcommand - Subcommand name (e.g. "render" for `stack render`), or
+ *                     `undefined` when no subcommand is present.
+ * @param flags      - Parsed flag values keyed by their hyphenated CLI name
+ *                     (e.g. `"seed-range"`, `"keep-top"`). Boolean flags have
+ *                     value `true`; option values are stored as strings so that
+ *                     the command handlers can perform their own validation.
+ * @param layers     - Ordered list of `--layer` inline spec strings (stack cmd).
+ * @returns          Promise resolving to a numeric exit code (0 = success).
+ */
+export async function dispatchCommand(
+  command: string | undefined,
+  subcommand: string | undefined,
+  flags: Record<string, string | boolean>,
+  layers: string[],
+): Promise<number> {
   const jsonMode = flags["json"] === true;
 
   // Enable profiling when --profile flag is set
@@ -4217,6 +4239,15 @@ export async function main(argv: string[] = process.argv): Promise<number> {
   }
 }
 
+/**
+ * Legacy entry point — parses raw argv then delegates to dispatchCommand.
+ * Retained for backwards compatibility (bin scripts, tests that import main).
+ */
+export async function main(argv: string[] = process.argv): Promise<number> {
+  const { command, subcommand, flags, layers } = parseArgs(argv);
+  return dispatchCommand(command, subcommand, flags, layers);
+}
+
 // Run when executed directly (via ./bin/dev-cli.js or tf/toneforge commands).
 // The path check uses /cli.ts and /cli.js (with separator) to avoid
 // matching bin/dev-cli.js which invokes main() itself.

src/cli.yargs.ts

@@ -0,0 +1,12 @@
+export const command = "analyze";
+export const desc = "Analyze a sound's acoustic properties";
+
+export function builder(yargs: any) {
+  return yargs
+    .option("recipe", { type: "string", describe: "Recipe name" })
+    .option("seed", { type: "number", describe: "Seed for rendering" })
+    .option("input", { type: "string", describe: "Path to input WAV file" })
+    .option("output", { type: "string", describe: "Output directory for analysis files" })
+    .option("format", { type: "string", describe: "Output format (json or table)" })
+    .option("json", { type: "boolean", describe: "Output JSON" });
+}

src/cli/commands/analyze.ts

@@ -0,0 +1,13 @@
+export const command = "classify";
+export const desc = "Classify a sound by category, intensity, and texture";
+
+export function builder(yargs: any) {
+  return yargs
+    .option("recipe", { type: "string", describe: "Recipe name" })
+    .option("seed", { type: "number", describe: "Seed for rendering" })
+    .option("input", { type: "string", describe: "Path to input WAV file" })
+    .option("analysis", { type: "string", describe: "Path to analysis directory" })
+    .option("output", { type: "string", describe: "Output directory" })
+    .option("format", { type: "string", describe: "Output format (json or table)" })
+    .option("json", { type: "boolean", describe: "Output JSON" });
+}

src/cli/commands/classify.ts

@@ -0,0 +1,40 @@
+export const command = "explore";
+export const desc = "Explore and discover sounds through sweep, mutate, and promote workflows";
+
+export function builder(yargs: any) {
+  return yargs
+    .command("sweep", "Sweep a seed range and rank candidates", (y: any) => {
+      y.option("recipe", { type: "string", describe: "Recipe name" })
+        .option("seed-range", { type: "string", describe: "Seed range (start:end)" })
+        .option("keep-top", { type: "number", default: 5, describe: "Number of top candidates to keep" })
+        .option("rank-by", { type: "string", describe: "Metric to rank by" })
+        .option("clusters", { type: "number", default: 3, describe: "Number of clusters" })
+        .option("concurrency", { type: "number", default: 4, describe: "Concurrency level" })
+        .option("output", { type: "string", describe: "Output directory" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("mutate", "Mutate a seed to explore nearby sounds", (y: any) => {
+      y.option("recipe", { type: "string", describe: "Recipe name" })
+        .option("seed", { type: "number", describe: "Seed to mutate" })
+        .option("jitter", { type: "number", default: 0.1, describe: "Jitter amount (0-1)" })
+        .option("count", { type: "number", default: 20, describe: "Number of mutations" })
+        .option("rank-by", { type: "string", describe: "Metric to rank by" })
+        .option("output", { type: "string", describe: "Output directory" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("promote", "Promote a candidate to the library", (y: any) => {
+      y.option("run", { type: "string", describe: "Run ID" })
+        .option("latest", { type: "boolean", describe: "Use the latest run" })
+        .option("id", { type: "string", describe: "Candidate ID to promote" })
+        .option("category", { type: "string", describe: "Override category" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("show", "Show details of an exploration run", (y: any) => {
+      y.option("run", { type: "string", describe: "Run ID" })
+        .option("latest", { type: "boolean", describe: "Use the latest run" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("runs", "List all exploration runs", (y: any) => {
+      y.option("json", { type: "boolean", describe: "Output JSON" });
+    });
+}

src/cli/commands/explore.ts

@@ -10,10 +10,25 @@ export const desc = "Render and export procedural sounds";
 
 export function builder(yargs: any) {
   return yargs
-    .option("recipe", { type: "string", demandOption: true })
-    .option("seed", { type: "number" })
-    .option("output", { type: "string" })
-    .option("json", { type: "boolean" });
+    .option("recipe", {
+      type: "string",
+      describe: "Recipe name (e.g. ui-scifi-confirm)",
+    })
+    .option("seed", {
+      type: "string",
+      describe: "Integer seed for deterministic rendering",
+    })
+    .option("seed-range", {
+      type: "string",
+      describe: "Seed range for batch generation (e.g. 1:10)",
+    })
+    .option("output", {
+      type: "string",
+      describe: "Output WAV path or directory (for --seed-range)",
+    })
+    .option("json", { type: "boolean", describe: "Output JSON" })
+    .example("generate --recipe ui-scifi-confirm --seed 42", "Render a specific seed")
+    .example("generate --recipe ui-scifi-confirm", "Render with a random seed");
 }
 
 export async function handler(argv: Arguments) {

src/cli/commands/generate.ts

@@ -0,0 +1,32 @@
+export const command = "library";
+export const desc = "Manage the ToneForge sound library";
+
+export function builder(yargs: any) {
+  return yargs
+    .command("list", "List library entries", (y: any) => {
+      y.option("category", { type: "string", describe: "Filter by category" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("search", "Search library entries", (y: any) => {
+      y.option("category", { type: "string", describe: "Filter by category" })
+        .option("intensity", { type: "string", describe: "Filter by intensity" })
+        .option("texture", { type: "string", describe: "Filter by texture" })
+        .option("tags", { type: "string", describe: "Filter by tags" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("similar", "Find similar library entries", (y: any) => {
+      y.option("id", { type: "string", describe: "Entry ID to compare" })
+        .option("limit", { type: "number", default: 10, describe: "Maximum results" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("export", "Export library entries to WAV files", (y: any) => {
+      y.option("output", { type: "string", describe: "Output directory" })
+        .option("category", { type: "string", describe: "Filter by category" })
+        .option("format", { type: "string", default: "wav", describe: "Output format" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("regenerate", "Regenerate a library entry", (y: any) => {
+      y.option("id", { type: "string", describe: "Entry ID to regenerate" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    });
+}

src/cli/commands/library.ts

@@ -7,11 +7,15 @@ export const desc = "List available resources";
 
 export function builder(yargs: any) {
   return yargs
-    .positional("resource", { type: "string", default: "recipes" })
-    .option("search", { type: "string" })
-    .option("category", { type: "string" })
-    .option("tags", { type: "string" })
-    .option("json", { type: "boolean" });
+    .positional("resource", {
+      type: "string",
+      describe: "Resource type to list (e.g. recipes)",
+      default: "recipes",
+    })
+    .option("search", { type: "string", describe: "Search filter" })
+    .option("category", { type: "string", describe: "Filter by category" })
+    .option("tags", { type: "string", describe: "Filter by tags" })
+    .option("json", { type: "boolean", describe: "Output JSON" });
 }
 
 export async function handler(argv: Arguments) {

src/cli/commands/list.ts

@@ -8,7 +8,9 @@ export const command = "play <file>";
 export const desc = "Play a WAV file";
 
 export function builder(yargs: any) {
-  return yargs.positional("file", { type: "string" }).option("json", { type: "boolean" });
+  return yargs
+    .positional("file", { type: "string", describe: "Path to WAV file to play" })
+    .option("json", { type: "boolean", describe: "Output JSON" });
 }
 
 export async function handler(argv: Arguments) {

src/cli/commands/play.ts

@@ -0,0 +1,22 @@
+export const command = "sequence";
+export const desc = "Work with sound sequences defined by preset files";
+
+export function builder(yargs: any) {
+  return yargs
+    .command("generate", "Render a sequence to audio", (y: any) => {
+      y.option("preset", { type: "string", describe: "Path to sequence preset JSON" })
+        .option("seed", { type: "number", describe: "Seed for rendering" })
+        .option("output", { type: "string", describe: "Output WAV path" })
+        .option("duration", { type: "number", describe: "Duration override in seconds" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("simulate", "Simulate a sequence and show event schedule", (y: any) => {
+      y.option("preset", { type: "string", describe: "Path to sequence preset JSON" })
+        .option("seed", { type: "number", describe: "Seed for simulation" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    })
+    .command("inspect", "Inspect a sequence preset structure", (y: any) => {
+      y.option("preset", { type: "string", describe: "Path to sequence preset JSON" })
+        .option("json", { type: "boolean", describe: "Output JSON" });
+    });
+}