rcf-lite 0.8.0 → 0.10.0

package/src/cli/help.js

@@ -1,14 +1,17 @@
-// Top-level and per-subcommand help. British English, ASCII hyphens
-// only (Phase 4 §D17).
+// Top-level, per-group and per-verb help. British English, ASCII
+// hyphens only (Phase 4 §D17). No em-dashes anywhere in user-facing
+// strings.
 //
-// Single-source rule: this module owns the TOP_LEVEL block and NOTHING
-// else. Every per-subcommand block is imported from the module that
-// implements the subcommand, so `rcf help <cmd>` and `rcf <cmd> --help`
-// are the same string by construction. Do not reintroduce a local copy
-// of a subcommand's help - `test/cli/help-parity.test.js` fails the
-// moment the two paths differ. (This file previously kept private
-// duplicates of nine blocks; every one of them had drifted stale, and
-// `rcf help create` was hiding the `cn` kind outright.)
+// Single-source rule (unchanged): each per-verb block is imported from
+// the module that implements the verb, so `rcf help <group> <verb>` and
+// `rcf <group> <verb> --help` are the same string by construction. Do
+// not reintroduce a local copy of a verb's help - `help-parity.test.js`
+// fails the moment the two paths differ.
+//
+// The 0.10.0 reorg introduces two new surfaces:
+//   - GROUP_HELP: printed by `rcf <group>` bare and `rcf help <group>`
+//   - TOP_LEVEL_HELP: grouped verb catalogue; the primary cold-reader
+//     entry point.
 
 import { HELP as BUILD_HELP } from './build.js';
 import { HELP as COVERAGE_HELP } from './coverage.js';
@@ -34,51 +37,83 @@ import { HELP as BROWSER_VERIFY_HELP } from './browser-verify.js';
 import { HELP as UPDATE_HELP } from './update.js';
 import { HELP as VALIDATE_HELP } from './validate.js';
 import { HELP as VIEW_HELP } from './view.js';
-// Track C+D (elicitation-and-playbook-hardening-0.7.0) verbs.
 import { HELP as REQ_CLASSIFY_HELP } from './req-classify.js';
 import { HELP as REQ_BASELINE_HELP } from './req-baseline.js';
 import { HELP as INTAKE_HELP } from './intake.js';
-// 0.7.1 packaging consolidation: `rcf verify <verb>` routes to the same
-// help block the transition-grace `rcf-verify` alias bin uses.
-import { TOP_LEVEL_HELP as VERIFY_HELP } from '../verify/cli/help.js';
+import { HELP as BLUEPRINT_HELP } from './blueprint.js';
+import { HELP as STANDARDS_HELP } from './standards.js';
+
+// Verify group members (from the verify-suite subtree).
+import { HELP as VERIFY_RUN_HELP } from '../verify/cli/run.js';
+import { HELP as VERIFY_REPORT_HELP } from '../verify/cli/report.js';
+import { HELP as VERIFY_PROVISION_HELP } from '../verify/cli/provision.js';
+import { HELP as VERIFY_CLEANUP_HELP } from '../verify/cli/cleanup.js';
+import { HELP as VERIFY_MCP_HELP } from '../verify/cli/mcp.js';
+
+// Rendering order (spec §rcf help top-level layout): core first, then
+// the five RCF stages in canonical order.
+export const GROUP_ORDER = ['discover', 'define', 'build', 'verify', 'audit'];
 
 const TOP_LEVEL = `Usage: rcf <command> [options]
 
-Commands:
-  init                Scaffold a new RCF project
-  view                Render the tree as HTML (live server)
-  validate            Walk the tree and report schema and reference issues
-  create <kind>       Create a new document
-  read <id>           Print a document's body to stdout
-  update <id>         Patch fields on an existing document
-  delete <id>         Delete a document (refuses on dependents by default)
-  link <us-id>        Link a US to a TAC (appends to tacIds; idempotent)
-  unlink <us-id>      Unlink a US from a TAC
-  coverage            Structural coverage report (PRD -> REQ -> US -> AC -> TS -> TC)
-  trace <id>          Walk the graph forward / back / both from an id
-  impact <id>         Impact fan-out with per-node action label
-  build [fbs-id]      Assemble FBS spec bundles and drive the build queue
-  finalise <fbs-id>   Ship gate: verify the deployed app, then mark verified
-  doctor              Diagnose init-hygiene drift (0.6.0 spec); --fix repairs
-  guidance [topic]    Print a method document from the installed pack
-  mcp                 Serve the project over MCP (local stdio)
-  preflight           Elicit pre-flight service-attestation + design-shape record
-  fbs <fbs-id>        FBS-level verbs (depends-on)
-  test-suite <ts-id>  Test-suite verbs (provenance, approve)
-  review <fbs-id>     REVIEW-stage audit (test-theatre + mutation-sampling)
-  ui-classify <id>    Run the UI-bearing classifier on one FBS
-  ui-baseline <verb>  UI baseline: init | show | opt-out
-  design <fbs-id>     Design substage: dispatch worker or hand-author artefacts
-  browser-verify <id> Stage 5 browser-verification gate for a UI-bearing FBS
-  req-classify <id>   Rerun the REQ-shape classifier and write the block
-  req-baseline <verb> Baseline-AC sweep and opt-out ledger for classified REQs
-  intake              Variable-fidelity intake stage (classify supplied artefacts)
-  verify <verb>       Adversarial ship gate (run|report|provision|cleanup|mcp); the legacy rcf-verify bin is a transition alias
-  help [command]      Print help for a command
+The Requirements Confidence Framework CLI. Verbs are grouped by the
+five RCF stages, plus a small core set for platform plumbing.
+
+core         Platform plumbing that predates any RCF stage.
+  init                     Scaffold a new RCF project in this directory.
+  doctor                   Diagnose and repair init-hygiene drift.
+  guidance [topic]         Print a method document from the installed pack.
+  mcp                      Serve the project over MCP (local stdio).
+  help [group] [verb]      Print help for a group or a verb.
+
+discover     Learn what is already true for this project.
+  intake                   Classify supplied artefacts.
+  preflight                Elicit third-party service dependencies.
+  req-classify <req-id>    Classify one or every REQ by shape.
+  req-baseline <verb>      Sweep and record baseline ACs per REQ.
+  ui-classify <fbs-id>     Classify one FBS as UI-bearing or not.
+  ui-baseline <verb>       Rule and record the project's UI defaults.
+
+define       Author the RCF tree.
+  create <kind>            Create a new document.
+  read <id>                Print a document's body.
+  update <id>              Patch fields on an existing document.
+  delete <id>              Delete a document.
+  link <us-id>             Link a US to a TAC.
+  unlink <us-id>           Unlink a US from a TAC.
+  validate                 Walk the tree and report schema and reference
+                           issues.
+  design <fbs-id> <verb>   Design substage for a UI-bearing FBS.
+  blueprint <verb>         Compose blueprints onto the project.
+  standards <verb>         Register standards packs against the project.
+
+build        Drive the FBS queue and the five-stage build cycle.
+  queue                    Show the FBS build queue.
+  bundle <fbs-id>          Spec bundle for one FBS (or --next).
+  mark <fbs-id> <status>   Record a lifecycle transition.
+  finalise <fbs-id>        Ship gate: run the independent verifier and
+                           promote a complete FBS to verified.
+  review <fbs-id>          Stage-3-to-Stage-4 audit.
+  fbs <fbs-id> <verb>      FBS-level operations.
+  test-suite <ts-id> <verb>  Test-suite operations.
+
+verify       Run the independent adversarial ship-gate verifier.
+  run                      Run adversarial verification; emit a report.
+  report <path>            Re-render a prior report artifact.
+  provision                Stand up prerequisite accounts and sandboxes.
+  cleanup                  Tear down provisioned artefacts.
+  mcp                      Serve verify over MCP (local stdio).
+  browser <fbs-id>         Stage 5 browser-verification gate.
+
+audit        Inspect the tree and its rollups.
+  view                     Live HTML tree render (long-running server).
+  coverage [scope-id]      Structural coverage over the REQ chain.
+  trace <id>               Walk the graph forward, back, or both from a node.
+  impact <id>              Change-impact fan-out from a node.
 
 Options:
-  --version           Print the package version and exit
-  --help              Print this help and exit
+  --version                Print the package version and exit.
+  --help                   Print this help and exit.
 
 Exit codes:
   0  success
@@ -87,48 +122,180 @@ Exit codes:
   3  schema validation or broken references
   4  refused (delete with dependents; other blocked mutations)
 
-Run 'rcf help <command>' for command-specific help.
+Run 'rcf help <group>' for group help; 'rcf help <group> <verb>' for
+per-verb help.
+`;
+
+const DISCOVER_HELP = `Usage: rcf discover <verb> [options]
+
+Learn what is already true for this project: classify supplied
+artefacts, elicit external dependencies, propose baseline defaults from
+prior art, classify existing REQs and FBS items.
+
+Verbs:
+  intake                   Classify supplied artefacts.
+  preflight                Elicit third-party service dependencies.
+  req-classify <req-id>    Classify one or every REQ by shape.
+  req-baseline <verb>      Sweep and record baseline ACs per REQ.
+  ui-classify <fbs-id>     Classify one FBS as UI-bearing or not.
+  ui-baseline <verb>       Rule and record the project's UI defaults.
+
+Run 'rcf help discover <verb>' for per-verb help.
 `;
 
-// Every value here is an import. See the single-source rule at the top
-// of this file before adding an entry.
-const HELP_MAP = {
+const DEFINE_HELP = `Usage: rcf define <verb> [options]
+
+Author the RCF tree: create, edit, link, and validate RCF documents;
+compose blueprints and register standards packs; author the design
+substage for UI-bearing work. Everything that writes durable spec
+content lives here.
+
+Verbs:
+  create <kind>            Create a new document.
+  read <id>                Print a document's body.
+  update <id>              Patch fields on an existing document.
+  delete <id>              Delete a document.
+  link <us-id>             Link a US to a TAC.
+  unlink <us-id>           Unlink a US from a TAC.
+  validate                 Walk the tree and report schema and reference
+                           issues.
+  design <fbs-id> <verb>   Design substage for a UI-bearing FBS.
+  blueprint <verb>         Compose blueprints onto the project.
+  standards <verb>         Register standards packs against the project.
+
+Run 'rcf help define <verb>' for per-verb help.
+`;
+
+const BUILD_GROUP_HELP = `Usage: rcf build <verb> [options]
+
+Drive the FBS queue and the five-stage build cycle. Every FBS item
+walks: Define -> Build -> Review -> Test -> Finalise.
+
+Verbs:
+  queue                    Show the FBS build queue with parallel-safe tiers.
+  bundle <fbs-id>          Assemble the spec bundle for one FBS (or --next).
+  mark <fbs-id> <status>   Record a lifecycle transition (notStarted ->
+                           inProgress -> complete). 'verified' is written
+                           only by 'build finalise'.
+  finalise <fbs-id>        Ship gate: run the independent verifier and
+                           promote a complete FBS to verified.
+  review <fbs-id>          Stage-3-to-Stage-4 audit (test-theatre and
+                           mutation-sampling).
+  fbs <fbs-id> <verb>      FBS-level operations (depends-on).
+  test-suite <ts-id> <verb>  Test-suite operations (provenance, approve).
+
+Run 'rcf help build <verb>' for per-verb help.
+`;
+
+const VERIFY_GROUP_HELP = `Usage: rcf verify <verb> [options]
+
+Run the fresh-context adversarial ship-gate verifier against a running
+app, and gate UI-bearing work through browser verification. Independent
+ship-readiness signal, not a correctness proof.
+
+Verbs:
+  run                      Run adversarial verification; emit a report.
+  report <path>            Re-render a prior report artifact.
+  provision                Stand up prerequisite accounts and sandboxes.
+  cleanup                  Tear down provisioned artefacts (all prefixed
+                           'zzverify-').
+  mcp                      Serve verify over MCP (local stdio).
+  browser <fbs-id>         Stage 5 browser-verification gate for a
+                           UI-bearing FBS.
+
+Run 'rcf help verify <verb>' for per-verb help.
+`;
+
+const AUDIT_HELP = `Usage: rcf audit <verb> [options]
+
+Inspect the tree and its rollups: live HTML view, structural coverage,
+forward and backward trace, change-impact fan-out. Read-only visibility
+over what has been defined and built.
+
+Verbs:
+  view                     Live HTML tree render (long-running server).
+  coverage [scope-id]      Structural coverage over the PRD -> REQ -> US ->
+                           AC -> TS -> TC chain.
+  trace <id>               Walk the graph forward, back, or both from a node.
+  impact <id>              Change-impact fan-out from a node.
+
+Run 'rcf help audit <verb>' for per-verb help.
+`;
+
+export const GROUP_HELP = {
+  discover: DISCOVER_HELP,
+  define: DEFINE_HELP,
+  build: BUILD_GROUP_HELP,
+  verify: VERIFY_GROUP_HELP,
+  audit: AUDIT_HELP,
+};
+
+// Per-verb HELP_MAP is a two-level structure keyed by [group][verb].
+// Every value is an import from the module that implements the verb.
+// See the single-source rule at the top of this file before adding an
+// entry.
+export const HELP_MAP = {
+  discover: {
+    intake: INTAKE_HELP,
+    preflight: PREFLIGHT_HELP,
+    'req-classify': REQ_CLASSIFY_HELP,
+    'req-baseline': REQ_BASELINE_HELP,
+    'ui-classify': UI_CLASSIFY_HELP,
+    'ui-baseline': UI_BASELINE_HELP,
+  },
+  define: {
+    create: CREATE_HELP,
+    read: READ_HELP,
+    update: UPDATE_HELP,
+    delete: DELETE_HELP,
+    link: LINK_HELP,
+    unlink: UNLINK_HELP,
+    validate: VALIDATE_HELP,
+    design: DESIGN_HELP,
+    blueprint: BLUEPRINT_HELP,
+    standards: STANDARDS_HELP,
+  },
+  build: {
+    queue: BUILD_HELP,
+    bundle: BUILD_HELP,
+    mark: BUILD_HELP,
+    finalise: FINALISE_HELP,
+    review: REVIEW_HELP,
+    fbs: FBS_HELP,
+    'test-suite': TEST_SUITE_HELP,
+  },
+  verify: {
+    run: VERIFY_RUN_HELP,
+    report: VERIFY_REPORT_HELP,
+    provision: VERIFY_PROVISION_HELP,
+    cleanup: VERIFY_CLEANUP_HELP,
+    mcp: VERIFY_MCP_HELP,
+    browser: BROWSER_VERIFY_HELP,
+  },
+  audit: {
+    view: VIEW_HELP,
+    coverage: COVERAGE_HELP,
+    trace: TRACE_HELP,
+    impact: IMPACT_HELP,
+  },
+};
+
+// Core-verb HELP blocks live outside the group tree.
+export const CORE_HELP = {
   init: INIT_HELP,
-  validate: VALIDATE_HELP,
-  create: CREATE_HELP,
-  read: READ_HELP,
-  update: UPDATE_HELP,
-  delete: DELETE_HELP,
-  link: LINK_HELP,
-  unlink: UNLINK_HELP,
-  coverage: COVERAGE_HELP,
-  trace: TRACE_HELP,
-  impact: IMPACT_HELP,
-  build: BUILD_HELP,
-  finalise: FINALISE_HELP,
   doctor: DOCTOR_HELP,
   guidance: GUIDANCE_HELP,
   mcp: MCP_HELP,
-  view: VIEW_HELP,
-  preflight: PREFLIGHT_HELP,
-  review: REVIEW_HELP,
-  fbs: FBS_HELP,
-  'test-suite': TEST_SUITE_HELP,
-  'ui-classify': UI_CLASSIFY_HELP,
-  'ui-baseline': UI_BASELINE_HELP,
-  design: DESIGN_HELP,
-  'browser-verify': BROWSER_VERIFY_HELP,
-  // Track C+D (elicitation-and-playbook-hardening-0.7.0) verbs.
-  'req-classify': REQ_CLASSIFY_HELP,
-  'req-baseline': REQ_BASELINE_HELP,
-  intake: INTAKE_HELP,
-  // 0.7.1 packaging consolidation: verify subcommand tree.
-  verify: VERIFY_HELP,
 };
 
 /**
- * `rcf help [command]` handler. Positional after `help` names the
- * subcommand; absent → top-level help.
+ * `rcf help [group] [verb]` handler.
+ *
+ * Positional layout:
+ *   - no positionals            -> top-level help
+ *   - <core-verb>               -> per-verb help for a core verb
+ *   - <group>                   -> group help
+ *   - <group> <verb>            -> per-verb help for a grouped verb
  *
  * @param {string[]} argv - argv slice after `help`
  * @param {object} [deps]
@@ -141,16 +308,29 @@ export async function main(argv, deps = {}) {
     stdout.write(TOP_LEVEL);
     return 0;
   }
-  const cmd = argv[0];
-  const body = HELP_MAP[cmd];
-  if (!body) {
-    stderr.write(`[error] usage no help topic named '${cmd}'\n`);
-    stdout.write(TOP_LEVEL);
-    return 2;
+  const first = argv[0];
+  if (first in CORE_HELP) {
+    stdout.write(CORE_HELP[first]);
+    return 0;
+  }
+  if (first in GROUP_HELP) {
+    const verb = argv[1];
+    if (!verb) {
+      stdout.write(GROUP_HELP[first]);
+      return 0;
+    }
+    const body = HELP_MAP[first][verb];
+    if (!body) {
+      stderr.write(`[error] usage no help topic '${first} ${verb}'\n`);
+      stdout.write(GROUP_HELP[first]);
+      return 2;
+    }
+    stdout.write(body);
+    return 0;
   }
-  stdout.write(body);
-  return 0;
+  stderr.write(`[error] usage no help topic named '${first}'\n`);
+  stdout.write(TOP_LEVEL);
+  return 2;
 }
 
 export const TOP_LEVEL_HELP = TOP_LEVEL;
-export { HELP_MAP };

package/src/cli/impact.js

@@ -26,7 +26,7 @@ const OPTION_SPEC = {
   'to-code': { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf impact <id> [options]
+export const HELP = `Usage: rcf audit impact <id> [options]
 
 Report the fan-out for 'if <id> changes'. Emits ancestors (up to the
 root PRD / TAD / BS) plus descendants (down to test-leaves) with a

package/src/cli/init.js

@@ -22,7 +22,7 @@ import { parseArgs } from 'node:util';
 import { createInterface } from 'node:readline/promises';
 
 import { readFile, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { basename, join } from 'node:path';
 
 import { initProject } from '#core/store/init.js';
 import {
@@ -61,7 +61,11 @@ to elicit. Re-running on an existing project leaves the tree alone and
 refreshes the wiring.
 
 Options:
-  --project-name <name>     Project name (required for --non-interactive)
+  --project-name <name>     Project name. In non-interactive mode this
+                            defaults to the working directory's basename
+                            (pass explicitly to override); an unusable
+                            basename (empty, '.', or '/') still requires
+                            the flag.
   --non-interactive         Skip prompts; use seed values (default when
                             not on a TTY or when piped)
   --no-agent-setup          Scaffold the tree only; print the manual
@@ -115,10 +119,21 @@ export async function main(argv, deps = {}) {
       rl.close();
     }
   } else {
+    // Non-interactive: --project-name defaults to the working
+    // directory's basename. An unusable basename (empty, '.', or '/')
+    // still requires the flag - no silent fallback to a generic name.
     if (!projectName) {
-      stderr.write('[error] usage --project-name is required in non-interactive mode\n');
-      stderr.write(HELP);
-      return 2;
+      const candidate = basename(cwd).trim();
+      if (candidate && candidate !== '.' && candidate !== '/') {
+        projectName = candidate;
+      } else {
+        stderr.write(
+          `[error] usage --project-name is required in non-interactive mode `
+          + `(cwd basename '${candidate}' is unusable as a default)\n`,
+        );
+        stderr.write(HELP);
+        return 2;
+      }
     }
   }
 

package/src/cli/intake.js

@@ -30,8 +30,8 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf intake [--artefact <path>[,path]] [--kind <kind>] [--dry-run]
-       rcf intake --input <config.json> [--dry-run]
+export const HELP = `Usage: rcf discover intake [--artefact <path>[,path]] [--kind <kind>] [--dry-run]
+       rcf discover intake --input <config.json> [--dry-run]
 
 Variable-fidelity intake: read what the operator supplied, classify its
 fidelity, validate it against elicitation integrity, and record an
@@ -109,7 +109,7 @@ export async function main(argv, deps = {}) {
 
   const walkResult = await walkTree({ projectRoot });
   if (walkResult.errors.length > 0) {
-    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf validate' for details)\n`);
+    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf define validate' for details)\n`);
   }
 
   const outcome = await runIntakePhases({

package/src/cli/link.js

@@ -15,7 +15,7 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf link <us-id> --tac <tac-id> [options]
+export const HELP = `Usage: rcf define link <us-id> --tac <tac-id> [options]
 
 Options:
   --tac <tac-id>            TAC id to link (repeatable to link multiple
@@ -25,7 +25,7 @@ Options:
   --help                    Print this help
 `;
 
-export const UNLINK_HELP = `Usage: rcf unlink <us-id> --tac <tac-id> [options]
+export const UNLINK_HELP = `Usage: rcf define unlink <us-id> --tac <tac-id> [options]
 
 Options:
   --tac <tac-id>            TAC id to unlink (repeatable)
@@ -77,7 +77,7 @@ export async function main(argv, deps = {}) {
   // B5: pre-existing tree breakage no longer blocks write verbs - the
   // write is gated on the POST-write tree state inside the writer.
   if (walkResult.errors.length > 0) {
-    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf validate' for details)\n`);
+    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf define validate' for details)\n`);
   }
   const us = walkResult.tree.byId.get(usId);
   if (!us || walkResult.tree.kindById.get(usId) !== 'userStory') {

package/src/cli/preflight.js

@@ -47,7 +47,7 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf preflight [options]
+export const HELP = `Usage: rcf discover preflight [options]
 
 Elicit the pre-flight configuration record: for every third-party
 service the PRD or TAD names, force one of the five attestation modes,
@@ -115,7 +115,7 @@ export async function main(argv, deps = {}) {
 
   const walkResult = await walkTree({ projectRoot });
   if (walkResult.errors.length > 0) {
-    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding — run 'rcf validate' for details\n`);
+    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - run 'rcf define validate' for details\n`);
   }
   const { tree } = walkResult;
 

package/src/cli/read.js

@@ -13,7 +13,7 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf read <id> [options]
+export const HELP = `Usage: rcf define read <id> [options]
 
 Prints the document body to stdout and a schema-validity report to
 stderr: a valid document is reported as valid; an invalid-but-present

package/src/cli/req-baseline.js

@@ -47,7 +47,7 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf req-baseline <verb> [options]
+export const HELP = `Usage: rcf discover req-baseline <verb> [options]
 
 Verbs:
   sweep [--req <id> | --all] [--status] [--dry-run] [--yes] [--json]
@@ -131,7 +131,7 @@ export async function main(argv, deps = {}) {
 
   const walkResult = await walkTree({ projectRoot });
   if (walkResult.errors.length > 0) {
-    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf validate' for details)\n`);
+    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf define validate' for details)\n`);
   }
 
   if (verb === 'sweep') {

package/src/cli/req-classify.js

@@ -21,8 +21,8 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf req-classify <req-id> [options]
-       rcf req-classify --all [options]
+export const HELP = `Usage: rcf discover req-classify <req-id> [options]
+       rcf discover req-classify --all [options]
 
 Rerun the REQ-shape classifier for one requirement (or every requirement
 in the tree with --all) and write the resulting shapeClassification
@@ -86,7 +86,7 @@ export async function main(argv, deps = {}) {
 
   const walkResult = await walkTree({ projectRoot });
   if (walkResult.errors.length > 0) {
-    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf validate' for details)\n`);
+    stderr.write(`[warn] tree has ${walkResult.errors.length} pre-existing issue(s); proceeding - writes are validated against the post-write state (run 'rcf define validate' for details)\n`);
   }
 
   const reqIds = [];

package/src/cli/review.js

@@ -45,7 +45,7 @@ const OPTION_SPEC = {
   help: { type: 'boolean' },
 };
 
-export const HELP = `Usage: rcf review <fbs-id> [options]
+export const HELP = `Usage: rcf build review <fbs-id> [options]
 
 Run the REVIEW-stage audit (test-theatre + mutation-sampling) and write
 the reviewAudit record to the manifest. Exit 4 on any warn or block