refactor(cli): use builtin argument owner directly

scripts/rea.mjs

@@ -80,14 +80,15 @@ if (!(await compiledRuntimeExists(runtimeFiles))) {
 } else {
   const {
     cliConfigurationError,
-    normalizeCliArguments,
     renderCliOutputArgumentError,
     renderEmptyFilteredCliOutput,
     renderVersionReport,
     parseCliOutputArguments,
   } = await import("../dist/cli-runtime/cliOutput.js");
   guardClosedStdout();
-  const cliArgs = isShellCompletion ? args : normalizeCliArguments(args);
+  const cliArgs = isShellCompletion
+    ? args
+    : builtinArguments.normalizeCliArguments(args);
   // Completion words are transport data, including partial output flags.
   const outputOptions = parseCliOutputArguments(
     isShellCompletion ? [] : cliArgs,

src/cli.ts

@@ -20,7 +20,7 @@ import { registerBinaryDiagnosticsCommands } from "./cli/binaryDiagnosticsComman
 import { registerFridaCommands } from "./cli/fridaCommands.js";
 import type { FridaInstrumentationPort } from "./application/frida/FridaInstrumentationPort.js";
 import { Cli } from "incur";
-import { normalizeCliArguments } from "./cliOutput.js";
+import { normalizeCliArguments } from "./cliBuiltinArguments.js";
 
 import { createLogger } from "./logger.js";
 import { parseLogLevel } from "./config/processStart.js";

src/cli/strictPositionals.ts

@@ -2,7 +2,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
 
 import { Errors, Parser, z } from "incur";
 
-import { splitIncurBuiltinArguments } from "../cliOutput.js";
+import { splitIncurBuiltinArguments } from "../cliBuiltinArguments.js";
 import type { CliInstance } from "./types.js";
 import { visitRegisteredCommands } from "./visitRegisteredCommands.js";
 

src/cliOutput.ts

@@ -1,8 +1,3 @@
-export {
-  normalizeCliArguments,
-  splitIncurBuiltinArguments,
-  type IncurBuiltinArgumentSplit,
-} from "./cliBuiltinArguments.js";
 import {
   declaredSensitiveValues,
   splitIncurBuiltinArguments,

tests/boundary/cli/cliOutput.test.ts

@@ -6,8 +6,8 @@ import { describe, expect, it } from "vitest";
 
 import { workspaceCliTest } from "../../support/cli/workspaceCliFixture.js";
 
+import { normalizeCliArguments } from "../../../src/cliBuiltinArguments.js";
 import {
-  normalizeCliArguments,
   renderCliOutputArgumentError,
   renderCliDocument,
   renderEmptyFilteredCliOutput,

tests/boundary/cli/dispatcher.test.ts

@@ -8,7 +8,7 @@ import { workspaceCliTest } from "../../support/cli/workspaceCliFixture.js";
 import type { TestWorkspace } from "../../support/workspace/workspaceFixture.js";
 
 const CLI_OUTPUT_RUNTIME =
-  "export const cliConfigurationError = () => undefined; export const normalizeCliArguments = (args) => args; export const parseCliOutputArguments = () => ({ validation: { ok: true } }); export const renderCliOutputArgumentError = () => ''; export const renderEmptyFilteredCliOutput = () => undefined; export const renderVersionReport = () => undefined;\n";
+  "export const cliConfigurationError = () => undefined; export const parseCliOutputArguments = () => ({ validation: { ok: true } }); export const renderCliOutputArgumentError = () => ''; export const renderEmptyFilteredCliOutput = () => undefined; export const renderVersionReport = () => undefined;\n";
 
 const installCliRuntime = async (
   workspace: TestWorkspace,

tests/support/cli/cliCommandSessionWorker.mjs

@@ -44,11 +44,13 @@ const { closeCliJavaScriptResources, createCli } =
   await import("../../../dist/cli-runtime/cli.js");
 const { createCliResultOutput } =
   await import("../../../dist/cli-runtime/cliResultOutput.js");
-const { cliCompletionShell, splitIncurBuiltinArguments } =
-  await import("../../../dist/cli-runtime/cliBuiltinArguments.js");
+const {
+  cliCompletionShell,
+  normalizeCliArguments,
+  splitIncurBuiltinArguments,
+} = await import("../../../dist/cli-runtime/cliBuiltinArguments.js");
 const {
   cliConfigurationError,
-  normalizeCliArguments,
   renderCliOutputArgumentError,
   renderEmptyFilteredCliOutput,
   parseCliOutputArguments,