Tighten parser positional handling and ref flag validation

Author: thymikee

src/daemon/handlers/__tests__/interaction.test.ts

@@ -0,0 +1,22 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { unsupportedRefSnapshotFlags } from '../interaction.ts';
+
+test('unsupportedRefSnapshotFlags returns unsupported snapshot flags for @ref flows', () => {
+  const unsupported = unsupportedRefSnapshotFlags({
+    snapshotDepth: 2,
+    snapshotScope: 'Login',
+    snapshotRaw: true,
+    snapshotBackend: 'ax',
+  });
+  assert.deepEqual(unsupported, ['--depth', '--scope', '--raw', '--backend']);
+});
+
+test('unsupportedRefSnapshotFlags returns empty when no ref-unsupported flags are present', () => {
+  const unsupported = unsupportedRefSnapshotFlags({
+    platform: 'ios',
+    session: 'default',
+    verbose: true,
+  });
+  assert.deepEqual(unsupported, []);
+});

src/daemon/handlers/interaction.ts

@@ -41,6 +41,16 @@ export async function handleInteractionCommands(params: {
     }
     const refInput = req.positionals?.[0] ?? '';
     if (refInput.startsWith('@')) {
+      const unsupported = unsupportedRefSnapshotFlags(req.flags);
+      if (unsupported.length > 0) {
+        return {
+          ok: false,
+          error: {
+            code: 'INVALID_ARGS',
+            message: `click @ref does not support ${unsupported.join(', ')}.`,
+          },
+        };
+      }
       if (!session.snapshot) {
         return { ok: false, error: { code: 'INVALID_ARGS', message: 'No snapshot in session. Run snapshot first.' } };
       }
@@ -126,6 +136,16 @@ export async function handleInteractionCommands(params: {
   if (command === 'fill') {
     const session = sessionStore.get(sessionName);
     if (req.positionals?.[0]?.startsWith('@')) {
+      const unsupported = unsupportedRefSnapshotFlags(req.flags);
+      if (unsupported.length > 0) {
+        return {
+          ok: false,
+          error: {
+            code: 'INVALID_ARGS',
+            message: `fill @ref does not support ${unsupported.join(', ')}.`,
+          },
+        };
+      }
       if (!session?.snapshot) {
         return { ok: false, error: { code: 'INVALID_ARGS', message: 'No snapshot in session. Run snapshot first.' } };
       }
@@ -258,6 +278,16 @@ export async function handleInteractionCommands(params: {
     }
     const refInput = req.positionals?.[1] ?? '';
     if (refInput.startsWith('@')) {
+      const unsupported = unsupportedRefSnapshotFlags(req.flags);
+      if (unsupported.length > 0) {
+        return {
+          ok: false,
+          error: {
+            code: 'INVALID_ARGS',
+            message: `get @ref does not support ${unsupported.join(', ')}.`,
+          },
+        };
+      }
       if (!session.snapshot) {
         return { ok: false, error: { code: 'INVALID_ARGS', message: 'No snapshot in session. Run snapshot first.' } };
       }
@@ -511,3 +541,19 @@ async function captureSnapshotForSession(
   sessionStore.set(session.name, session);
   return session.snapshot;
 }
+
+const REF_UNSUPPORTED_FLAG_MAP: ReadonlyArray<[keyof CommandFlags, string]> = [
+  ['snapshotDepth', '--depth'],
+  ['snapshotScope', '--scope'],
+  ['snapshotRaw', '--raw'],
+  ['snapshotBackend', '--backend'],
+];
+
+export function unsupportedRefSnapshotFlags(flags: CommandFlags | undefined): string[] {
+  if (!flags) return [];
+  const unsupported: string[] = [];
+  for (const [key, label] of REF_UNSUPPORTED_FLAG_MAP) {
+    if (flags[key] !== undefined) unsupported.push(label);
+  }
+  return unsupported;
+}

src/utils/__tests__/args.test.ts

@@ -2,7 +2,7 @@ import test from 'node:test';
 import assert from 'node:assert/strict';
 import { parseArgs, usage } from '../args.ts';
 import { AppError } from '../errors.ts';
-import { getCliCommandNames } from '../command-schema.ts';
+import { getCliCommandNames, getSchemaCapabilityKeys } from '../command-schema.ts';
 import { listCapabilityCommands } from '../../core/capabilities.ts';
 
 test('parseArgs recognizes --relaunch', () => {
@@ -75,6 +75,10 @@ test('every capability command has a parser schema entry', () => {
   }
 });
 
+test('schema capability mappings match capability source-of-truth', () => {
+  assert.deepEqual(getSchemaCapabilityKeys(), listCapabilityCommands());
+});
+
 test('compat mode warns and strips unsupported pilot-command flags', () => {
   const parsed = parseArgs(['press', '10', '20', '--depth', '2'], { strictFlags: false });
   assert.equal(parsed.command, 'press');
@@ -109,6 +113,16 @@ test('unknown short flags are rejected', () => {
   );
 });
 
+test('negative numeric positionals are accepted without -- separator', () => {
+  const typed = parseArgs(['type', '-123'], { strictFlags: true });
+  assert.equal(typed.command, 'type');
+  assert.deepEqual(typed.positionals, ['-123']);
+
+  const pressed = parseArgs(['press', '-10', '20'], { strictFlags: true });
+  assert.equal(pressed.command, 'press');
+  assert.deepEqual(pressed.positionals, ['-10', '20']);
+});
+
 test('all commands participate in strict command-flag validation', () => {
   assert.throws(
     () => parseArgs(['open', 'Settings', '--depth', '1'], { strictFlags: true }),