test: trim duplicate session recovery coverage

Author: thymikee

src/daemon/__tests__/request-finalization.test.ts

@@ -29,31 +29,3 @@ test('finalizeDaemonResponse preserves handler error hints from details', () =>
     expect(finalized.error.hint).toBe('Run agent-device session list and reuse --session default.');
   }
 });
-
-test('finalizeDaemonResponse prefers top-level error hint over details hint', () => {
-  const req: DaemonRequest = {
-    token: 'token',
-    session: 'default',
-    command: 'open',
-    positionals: [],
-    flags: {},
-  };
-  const response: DaemonResponse = {
-    ok: false,
-    error: {
-      code: 'DEVICE_IN_USE',
-      message: 'Device is already in use by session "default".',
-      hint: 'Use the top-level hint.',
-      details: {
-        hint: 'Use the details hint.',
-      },
-    },
-  };
-
-  const finalized = finalizeDaemonResponse(req, response, () => 'artifact-id');
-
-  expect(finalized.ok).toBe(false);
-  if (!finalized.ok) {
-    expect(finalized.error.hint).toBe('Use the top-level hint.');
-  }
-});

src/daemon/__tests__/request-lock-policy.test.ts

@@ -2,7 +2,6 @@ import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { applyRequestLockPolicy } from '../request-lock-policy.ts';
 import type { SessionState } from '../types.ts';
-import { AppError } from '../../utils/errors.ts';
 
 const IOS_SESSION: SessionState = {
   name: 'qa-ios',
@@ -33,21 +32,6 @@ const ANDROID_SESSION: SessionState = {
   },
 };
 
-const RECORDING_SESSION: SessionState = {
-  ...ANDROID_SESSION,
-  name: 'default',
-  recordOnlySession: true,
-  recording: {
-    platform: 'android',
-    outPath: '/tmp/recording.mp4',
-    remotePath: '/sdcard/recording.mp4',
-    remotePid: '1234',
-    startedAt: Date.now(),
-    showTouches: false,
-    gestureEvents: [],
-  },
-};
-
 test('rejects fresh-session selector conflicts under request lock policy', () => {
   assert.throws(
     () =>
@@ -68,37 +52,6 @@ test('rejects fresh-session selector conflicts under request lock policy', () =>
   );
 });
 
-test('reject lock policy explains fresh-session recovery commands', () => {
-  assert.throws(
-    () =>
-      applyRequestLockPolicy({
-        token: 'token',
-        session: 'qa-ios',
-        command: 'snapshot',
-        positionals: [],
-        flags: {
-          device: 'Pixel 9',
-        },
-        meta: {
-          lockPolicy: 'reject',
-          lockPlatform: 'ios',
-        },
-      }),
-    (error) => {
-      assert.ok(error instanceof AppError);
-      assert.match(error.message, /snapshot is using a bound-session lock for ios/i);
-      assert.match(error.message, /--device=Pixel 9/i);
-      assert.match(error.details?.hint ?? '', /Remove conflicting device selectors/i);
-      assert.match(
-        error.details?.hint ?? '',
-        /agent-device open <app> --session qa-ios --platform ios/i,
-      );
-      assert.match(error.details?.hint ?? '', /agent-device session list/i);
-      return true;
-    },
-  );
-});
-
 test('allows open to choose a fresh-session target under request lock policy', () => {
   const req = applyRequestLockPolicy({
     token: 'token',
@@ -165,66 +118,6 @@ test('rejects existing-session selector conflicts under request lock policy', ()
   );
 });
 
-test('reject lock policy explains existing-session recovery commands', () => {
-  assert.throws(
-    () =>
-      applyRequestLockPolicy(
-        {
-          token: 'token',
-          session: 'qa-ios',
-          command: 'snapshot',
-          positionals: [],
-          flags: {
-            serial: 'emulator-5554',
-          },
-          meta: {
-            lockPolicy: 'reject',
-          },
-        },
-        IOS_SESSION,
-      ),
-    (error) => {
-      assert.ok(error instanceof AppError);
-      assert.match(error.message, /already bound to session "qa-ios"/i);
-      assert.match(error.message, /ios device "iPhone 16" \(SIM-001\)/i);
-      assert.match(error.message, /--serial=emulator-5554/i);
-      assert.match(error.details?.hint ?? '', /agent-device session list/i);
-      assert.match(error.details?.hint ?? '', /--session qa-ios/i);
-      assert.match(error.details?.hint ?? '', /agent-device close --session qa-ios/i);
-      return true;
-    },
-  );
-});
-
-test('reject lock policy explains recording-session recovery commands', () => {
-  assert.throws(
-    () =>
-      applyRequestLockPolicy(
-        {
-          token: 'token',
-          session: 'default',
-          command: 'snapshot',
-          positionals: [],
-          flags: {
-            device: 'Pixel 8',
-          },
-          meta: {
-            lockPolicy: 'reject',
-          },
-        },
-        RECORDING_SESSION,
-      ),
-    (error) => {
-      assert.ok(error instanceof AppError);
-      assert.match(error.message, /already bound to session "default"/i);
-      assert.match(error.details?.hint ?? '', /recording session "default"/i);
-      assert.match(error.details?.hint ?? '', /agent-device record stop --session default/i);
-      assert.match(error.details?.hint ?? '', /agent-device close --session default/i);
-      return true;
-    },
-  );
-});
-
 test('allows inventory commands to use explicit Apple selectors under another lock platform', () => {
   const req = applyRequestLockPolicy({
     token: 'token',

src/daemon/__tests__/session-routing.test.ts

@@ -4,11 +4,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { SessionStore } from '../session-store.ts';
-import {
-  resolveEffectiveSessionName,
-  resolveImplicitSessionScope,
-  sessionMatchesScope,
-} from '../session-routing.ts';
+import { resolveEffectiveSessionName } from '../session-routing.ts';
 import type { SessionState } from '../types.ts';
 
 function makeSession(name: string): SessionState {
@@ -115,32 +111,3 @@ test('keeps explicitly configured default session global', (t) => {
 
   assert.equal(resolved, 'default');
 });
-
-test('matches sessions only within the same implicit scope', (t) => {
-  const cwd = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-cwd-scope-'));
-  t.onTestFinished(() => {
-    fs.rmSync(cwd, { recursive: true, force: true });
-  });
-  const req = {
-    token: 't',
-    session: 'default',
-    command: 'session_list',
-    positionals: [],
-    flags: {},
-    meta: { cwd },
-  };
-  const scope = resolveImplicitSessionScope(req);
-  assert.ok(scope);
-
-  assert.equal(
-    sessionMatchesScope({ ...makeSession('default'), sessionScope: scope }, scope),
-    true,
-  );
-  assert.equal(
-    sessionMatchesScope(
-      { ...makeSession('default'), sessionScope: { kind: 'cwd', id: 'other' } },
-      scope,
-    ),
-    false,
-  );
-});

src/daemon/__tests__/session-selector.test.ts

@@ -60,22 +60,6 @@ test('selector mismatch explains session recovery commands', () => {
   );
 });
 
-test('selector mismatch quotes unsafe session names in recovery commands', () => {
-  const session = makeSession({ name: "default session; echo 'oops'" });
-  assert.throws(
-    () => assertSessionSelectorMatches(session, { platform: 'ios' }),
-    (err: unknown) => {
-      assert.ok(err instanceof AppError);
-      assert.match(err.details?.hint ?? '', /--session 'default session; echo '\\''oops'\\'''/);
-      assert.match(
-        err.details?.hint ?? '',
-        /agent-device close --session 'default session; echo '\\''oops'\\'''/,
-      );
-      return true;
-    },
-  );
-});
-
 test('accepts --platform apple alias for ios sessions', () => {
   const session = makeSession({
     device: {

src/daemon/handlers/__tests__/record-trace.test.ts

@@ -280,42 +280,6 @@ test('record stop releases session created only for recording', async () => {
   expect(sessionStore.get(sessionName)).toBeUndefined();
 });
 
-test('record stop releases record-only session even when recording state is stale', async () => {
-  const sessionStore = makeSessionStore();
-  const sessionName = 'stale-record-only-session';
-  const session = makeIosSimulatorSession(sessionName);
-  session.recordOnlySession = true;
-  sessionStore.set(sessionName, session);
-
-  const response = await runRecordCommand({
-    sessionStore,
-    sessionName,
-    positionals: ['stop'],
-  });
-
-  expect(response?.ok).toBe(false);
-  expect(sessionStore.get(sessionName)).toBeUndefined();
-});
-
-test('record stop keeps normal app session open after recording', async () => {
-  const sessionStore = makeSessionStore();
-  const sessionName = 'app-session';
-  const session = makeIosSimulatorRecordingSession(sessionName, {
-    appBundleId: 'com.apple.Preferences',
-  });
-  sessionStore.set(sessionName, session);
-
-  const response = await runRecordCommand({
-    sessionStore,
-    sessionName,
-    positionals: ['stop'],
-  });
-
-  expect(response?.ok).toBe(true);
-  expect(sessionStore.get(sessionName)).toBe(session);
-  expect(sessionStore.get(sessionName)?.recording).toBeUndefined();
-});
-
 test('record stop keeps normal app session open when stop validation fails', async () => {
   vi.useFakeTimers();
   vi.setSystemTime(20_000);