fix: satisfy fallow command contract audit

Author: thymikee

src/command-catalog.ts

@@ -54,7 +54,7 @@ export const INTERNAL_COMMANDS = {
   sessionList: 'session_list',
 } as const;
 
-export const LOCAL_CLI_COMMANDS = {
+const LOCAL_CLI_COMMANDS = {
   auth: 'auth',
   connect: 'connect',
   connection: 'connection',

src/commands/cli-grammar/capture.ts

@@ -85,7 +85,7 @@ export const captureDaemonWriters = {
   ),
 } satisfies Record<string, DaemonWriter>;
 
-export function readWaitOptionsFromPositionals(
+function readWaitOptionsFromPositionals(
   positionals: string[],
   flags: CliFlags,
 ): WaitCommandOptions {

src/commands/cli-grammar/interactions.ts

@@ -129,7 +129,7 @@ export function readInteractionTargetFromPositionals(positionals: string[]): Int
   return { x: Number(positionals[0]), y: Number(positionals[1]) };
 }
 
-export function readLongPressTargetFromPositionals(positionals: string[]): LongPressOptions {
+function readLongPressTargetFromPositionals(positionals: string[]): LongPressOptions {
   const targetPositionals = readLongPressTargetPositionals(positionals);
   return {
     ...readInteractionTargetFromPositionals(targetPositionals.target),

src/commands/client-command-contracts.ts

@@ -1,5 +1,4 @@
 import type {
-  AgentDeviceClient,
   AppCloseOptions,
   ClipboardCommandOptions,
   MetroPrepareOptions,
@@ -11,27 +10,23 @@ import type {
   WaitCommandOptions,
 } from '../client-types.ts';
 import type { DaemonInstallSource } from '../contracts.ts';
-import { defineCommand } from './command-contract.ts';
 import {
   booleanSchema,
   booleanField,
   enumField,
-  fieldsInputSchema,
   integerField,
   integerSchema,
   jsonSchemaField,
   looseObjectField,
   looseObjectSchema,
   numberField,
   optionalEnum,
-  readFieldInput,
   requiredField,
   stringArrayField,
   stringField,
   stringSchema,
-  type InferCommandInput,
-  type CommandFieldMap,
 } from './command-input.ts';
+import { defineFieldCommand } from './field-command-contract.ts';
 
 const SURFACE_VALUES = ['app', 'frontmost-app', 'desktop', 'menubar'] as const;
 const WAIT_KIND_VALUES = ['duration', 'text', 'ref', 'selector'] as const;
@@ -363,25 +358,6 @@ export const clientCommandDefinitions = [
   ),
 ] as const;
 
-function defineFieldCommand<
-  const TName extends string,
-  const TFields extends CommandFieldMap,
-  TResult,
->(
-  name: TName,
-  description: string,
-  fields: TFields,
-  run: (client: AgentDeviceClient, input: InferCommandInput<TFields>) => Promise<TResult>,
-) {
-  return defineCommand({
-    name,
-    description,
-    inputSchema: fieldsInputSchema(fields),
-    readInput: (input) => readFieldInput(input, fields),
-    run,
-  });
-}
-
 function withoutApp(input: AppCloseOptions & { shutdown?: boolean }): { shutdown?: boolean } {
   const { app: _app, ...rest } = input;
   return rest;

src/commands/command-input.ts

@@ -85,7 +85,7 @@ export function stringSchema(description?: string): JsonSchema {
   return { type: 'string', ...(description ? { description } : {}) };
 }
 
-export function numberSchema(description?: string): JsonSchema {
+function numberSchema(description?: string): JsonSchema {
   return { type: 'number', ...(description ? { description } : {}) };
 }
 

src/commands/field-command-contract.ts

@@ -0,0 +1,27 @@
+import type { AgentDeviceClient } from '../client-types.ts';
+import { defineCommand } from './command-contract.ts';
+import {
+  fieldsInputSchema,
+  readFieldInput,
+  type CommandFieldMap,
+  type InferCommandInput,
+} from './command-input.ts';
+
+export function defineFieldCommand<
+  const TName extends string,
+  const TFields extends CommandFieldMap,
+  TResult,
+>(
+  name: TName,
+  description: string,
+  fields: TFields,
+  run: (client: AgentDeviceClient, input: InferCommandInput<TFields>) => Promise<TResult>,
+) {
+  return defineCommand({
+    name,
+    description,
+    inputSchema: fieldsInputSchema(fields),
+    readInput: (input) => readFieldInput(input, fields),
+    run,
+  });
+}

src/commands/interaction-command-contracts.ts

@@ -1,5 +1,4 @@
 import type {
-  AgentDeviceClient,
   ClickOptions,
   FindOptions,
   FlingOptions,
@@ -44,10 +43,10 @@ import {
   toRepeatedOptions,
   toSelectorSnapshotOptions,
   type CommonCommandInput,
-  type CommandFieldMap,
   type InferCommandInput,
   type PointInput,
 } from './command-input.ts';
+import { defineFieldCommand } from './field-command-contract.ts';
 
 const CLICK_BUTTON_VALUES = ['primary', 'secondary', 'middle'] as const;
 const GESTURE_KIND_VALUES = ['pan', 'fling', 'pinch', 'rotate', 'transform'] as const;
@@ -281,25 +280,6 @@ export const interactionCommandDefinitions = [
   }),
 ] as const;
 
-function defineFieldCommand<
-  const TName extends string,
-  const TFields extends CommandFieldMap,
-  TResult,
->(
-  name: TName,
-  description: string,
-  fields: TFields,
-  run: (client: AgentDeviceClient, input: InferCommandInput<TFields>) => Promise<TResult>,
-) {
-  return defineCommand({
-    name,
-    description,
-    inputSchema: fieldsInputSchema(fields),
-    readInput: (input) => readFieldInput(input, fields),
-    run,
-  });
-}
-
 function readGestureInput(input: unknown): GestureInput {
   const record = readInputRecord(input);
   const common = readCommonInput(record);

src/utils/cli-command-overrides.ts

@@ -60,7 +60,7 @@ const SCHEMA_ONLY_CLI_COMMAND_SCHEMAS = {
   },
 } as const satisfies Record<SchemaOnlyCliCommandName, CommandSchema>;
 
-export const CLI_COMMAND_OVERRIDES = {
+const CLI_COMMAND_OVERRIDES = {
   boot: {
     summary: 'Boot target device/simulator',
     allowedFlags: ['headless'],