chore: remove redundant trigger normalization in session handler

Author: thymikee

src/daemon/handlers/__tests__/session-trigger.test.ts

@@ -88,7 +88,7 @@ test('trigger-app-event supports explicit selector without active session', asyn
   assert.equal(response.ok, true);
 });
 
-test('trigger command records action and refreshes session app bundle context', async () => {
+test('trigger-app-event records action and refreshes session app bundle context', async () => {
   const sessionStore = makeStore();
   const session = makeSession('default', {
     platform: 'android',
@@ -103,8 +103,8 @@ test('trigger command records action and refreshes session app bundle context',
     req: {
       token: 't',
       session: 'default',
-      command: 'trigger-screenshot-notification',
-      positionals: [],
+      command: 'trigger-app-event',
+      positionals: ['screenshot_taken'],
       flags: {},
     },
     sessionName: 'default',
@@ -130,74 +130,3 @@ test('trigger command records action and refreshes session app bundle context',
   assert.equal(nextSession?.actions[0]?.command, 'trigger-app-event');
   assert.deepEqual(nextSession?.actions[0]?.positionals, ['screenshot_taken']);
 });
-
-test('trigger aliases are normalized to trigger-app-event before dispatch', async () => {
-  const sessionStore = makeStore();
-  sessionStore.set('default', makeSession('default', {
-    platform: 'android',
-    id: 'emulator-5554',
-    name: 'Pixel',
-    kind: 'emulator',
-    booted: true,
-  }));
-
-  let dispatchedCommand = '';
-  let dispatchedPositionals: string[] = [];
-  const response = await handleSessionCommands({
-    req: {
-      token: 't',
-      session: 'default',
-      command: 'trigger-memory-warning',
-      positionals: [],
-      flags: {},
-    },
-    sessionName: 'default',
-    logPath: '/tmp/daemon.log',
-    sessionStore,
-    invoke,
-    ensureReady: async () => {},
-    dispatch: async (_device, command, positionals) => {
-      dispatchedCommand = command;
-      dispatchedPositionals = positionals;
-      return { event: 'memory_warning', eventUrl: 'myapp://agent-device/event?name=memory_warning' };
-    },
-  });
-
-  assert.ok(response);
-  assert.equal(response.ok, true);
-  assert.equal(dispatchedCommand, 'trigger-app-event');
-  assert.deepEqual(dispatchedPositionals, ['memory_warning']);
-});
-
-test('trigger aliases reject unexpected positional arguments', async () => {
-  const sessionStore = makeStore();
-  sessionStore.set('default', makeSession('default', {
-    platform: 'android',
-    id: 'emulator-5554',
-    name: 'Pixel',
-    kind: 'emulator',
-    booted: true,
-  }));
-
-  await assert.rejects(
-    () => handleSessionCommands({
-      req: {
-        token: 't',
-        session: 'default',
-        command: 'trigger-screenshot',
-        positionals: ['extra'],
-        flags: {},
-      },
-      sessionName: 'default',
-      logPath: '/tmp/daemon.log',
-      sessionStore,
-      invoke,
-      ensureReady: async () => {},
-    }),
-    (error: unknown) =>
-      error instanceof Error
-      && 'code' in error
-      && (error as { code?: string }).code === 'INVALID_ARGS'
-      && /does not accept positional arguments/i.test(error.message),
-  );
-});

src/daemon/handlers/session.ts

@@ -7,7 +7,6 @@ import {
   validateAndNormalizeBatchSteps,
 } from '../../core/batch.ts';
 import { isCommandSupportedOnDevice } from '../../core/capabilities.ts';
-import { normalizeTriggerAliasCommand } from '../../core/app-events.ts';
 import { isDeepLinkTarget, resolveIosDeviceDeepLinkBundleId } from '../../core/open-target.ts';
 import { AppError, asAppError, normalizeError } from '../../utils/errors.ts';
 import { normalizePlatformSelector, type DeviceInfo } from '../../utils/device.ts';
@@ -53,7 +52,6 @@ const IOS_APPSTATE_SESSION_REQUIRED_MESSAGE =
 const BATCH_PARENT_FLAG_KEYS: Array<keyof CommandFlags> = ['platform', 'target', 'device', 'udid', 'serial', 'verbose', 'out'];
 const REPLAY_PARENT_FLAG_KEYS: Array<keyof CommandFlags> = ['platform', 'target', 'device', 'udid', 'serial', 'verbose', 'out'];
 const LOG_ACTIONS = ['path', 'start', 'stop', 'doctor', 'mark', 'clear'] as const;
-const TRIGGER_COMMANDS = new Set(['trigger-app-event']);
 const LOG_ACTIONS_MESSAGE = `logs requires ${LOG_ACTIONS.slice(0, -1).join(', ')}, or ${LOG_ACTIONS.at(-1)}`;
 const PERF_UNAVAILABLE_REASON = 'Not implemented for this platform in this release.';
 const STARTUP_SAMPLE_METHOD = 'open-command-roundtrip';
@@ -550,9 +548,7 @@ export async function handleSessionCommands(params: {
   const ensureReady = ensureReadyOverride ?? ensureDeviceReady;
   const resolveDevice = resolveTargetDeviceOverride ?? resolveTargetDevice;
   const stopIosRunner = stopIosRunnerOverride ?? stopIosRunnerSession;
-  const normalizedTrigger = normalizeTriggerAliasCommand(req.command, req.positionals ?? []);
-  const command = normalizedTrigger.command;
-  const triggerPositionals = normalizedTrigger.positionals;
+  const command = req.command;
 
   if (command === 'session_list') {
     const data = {
@@ -783,7 +779,7 @@ export async function handleSessionCommands(params: {
     });
   }
 
-  if (TRIGGER_COMMANDS.has(command)) {
+  if (command === 'trigger-app-event') {
     return await runSessionOrSelectorDispatch({
       req,
       sessionName,
@@ -793,7 +789,7 @@ export async function handleSessionCommands(params: {
       resolveDevice,
       dispatch,
       command: 'trigger-app-event',
-      positionals: triggerPositionals,
+      positionals: req.positionals ?? [],
       deriveNextSession: async (session, result) => {
         const eventUrl = typeof result?.eventUrl === 'string' ? result.eventUrl : undefined;
         const nextAppBundleId = eventUrl