fix(device): Remove stale log session state

Remove the remaining physical-device log capture bookkeeping now that the
standalone device log capture tools are gone. This keeps session status and
shutdown cleanup aligned with the actual device build-and-run behavior.

Also correct the device build-and-run manifest and changelog wording so they
no longer claim physical-device runtime logs are captured automatically.

Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: cameroncooke

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixed
 
+- Removed stale physical-device log session status and shutdown cleanup for deprecated standalone device log capture, and corrected the device build-and-run tool description.
 - Fixed CLI test summaries showing false-positive compiler errors from xcodebuild NSError dump lines, and added compiler-error snapshot coverage for simulator, device, and macOS build-style flows ([#383](https://github.com/getsentry/XcodeBuildMCP/issues/383)).
 - Fixed simulator OSLog helper cleanup so server and daemon startup reconcile same-workspace orphaned log streams without stopping helpers owned by live sessions in other workspaces ([#382](https://github.com/getsentry/XcodeBuildMCP/issues/382)).
 
@@ -34,7 +35,7 @@ xcodebuildmcp simulator build-and-run --scheme MyApp --project-path ./MyApp.xcod
 xcodebuildmcp simulator launch-app --simulator-id <UDID> --bundle-id com.example.MyApp
 ```
 
-For MCP clients, use `build_run_sim`, `launch_app_sim`, or `build_run_device` and read the returned runtime log path.
+For MCP clients, use `build_run_sim` or `launch_app_sim` and read the returned runtime log path.
 
 ### New! Structured outputs
 

manifests/tools/build_run_device.yaml

@@ -3,10 +3,10 @@ module: mcp/tools/device/build_run_device
 names:
   mcp: build_run_device
   cli: build-and-run
-description: Build, install, and launch on physical device. Runtime logs are captured automatically and the log file path is included in the response. Preferred single-step run tool when defaults are set.
+description: Build, install, and launch on physical device. Preferred single-step run tool when defaults are set.
 outputSchema:
   schema: xcodebuildmcp.output.build-run-result
-  version: "1"
+  version: '1'
 predicates:
   - hideWhenXcodeAgentMode
 annotations:

src/mcp/resources/__tests__/session-status.test.ts

@@ -7,7 +7,6 @@ import type { ChildProcess } from 'node:child_process';
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { clearDaemonActivityRegistry } from '../../../daemon/activity-registry.ts';
 import { getDefaultDebuggerManager } from '../../../utils/debugger/index.ts';
-import { activeDeviceLogSessions } from '../../../utils/log-capture/device-log-sessions.ts';
 import {
   clearAllSimulatorLaunchOsLogSessionsForTests,
   registerSimulatorLaunchOsLogSession,
@@ -39,15 +38,13 @@ describe('session-status resource', () => {
       workspaceKey: 'workspace-a',
     });
     setSimulatorLaunchOsLogRecordActiveOverrideForTests(async () => true);
-    activeDeviceLogSessions.clear();
     clearAllProcesses();
     await clearAllSimulatorLaunchOsLogSessionsForTests();
     clearDaemonActivityRegistry();
     await getDefaultDebuggerManager().disposeAll();
   });
 
   afterEach(async () => {
-    activeDeviceLogSessions.clear();
     clearAllProcesses();
     await clearAllSimulatorLaunchOsLogSessionsForTests();
     clearDaemonActivityRegistry();
@@ -66,7 +63,7 @@ describe('session-status resource', () => {
       const parsed = JSON.parse(result.contents[0].text);
 
       expect(parsed.logging.simulator.activeLaunchOsLogSessions).toEqual([]);
-      expect(parsed.logging.device.activeSessionIds).toEqual([]);
+      expect(parsed.logging.device).toBeUndefined();
       expect(parsed.debug.currentSessionId).toBe(null);
       expect(parsed.debug.sessionIds).toEqual([]);
       expect(parsed.watcher).toEqual({ running: false, watchedPath: null });

src/server/__tests__/mcp-shutdown.test.ts

@@ -4,11 +4,6 @@ const mocks = vi.hoisted(() => ({
   stopXcodeStateWatcher: vi.fn(async () => undefined),
   shutdownXcodeToolsBridge: vi.fn(async () => undefined),
   disposeAll: vi.fn(async () => undefined),
-  stopAllDeviceLogCaptures: vi.fn(async () => ({
-    stoppedSessionCount: 0,
-    errorCount: 0,
-    errors: [],
-  })),
   stopOwnedSimulatorLaunchOsLogSessions: vi.fn(async () => ({
     stoppedSessionCount: 0,
     errorCount: 0,
@@ -38,9 +33,6 @@ vi.mock('../../integrations/xcode-tools-bridge/index.ts', () => ({
 vi.mock('../../utils/debugger/index.ts', () => ({
   getDefaultDebuggerManager: () => ({ disposeAll: mocks.disposeAll }),
 }));
-vi.mock('../../utils/log-capture/device-log-sessions.ts', () => ({
-  stopAllDeviceLogCaptures: mocks.stopAllDeviceLogCaptures,
-}));
 vi.mock('../../utils/log-capture/simulator-launch-oslog-sessions.ts', () => ({
   stopOwnedSimulatorLaunchOsLogSessions: mocks.stopOwnedSimulatorLaunchOsLogSessions,
 }));
@@ -88,7 +80,6 @@ describe('runMcpShutdown', () => {
         debuggerSessionCount: 0,
         simulatorLaunchOsLogSessionCount: 0,
         ownedSimulatorLaunchOsLogSessionCount: 0,
-        deviceLogSessionCount: 0,
         videoCaptureSessionCount: 0,
         swiftPackageProcessCount: 0,
         matchingMcpProcessCount: 0,
@@ -105,7 +96,6 @@ describe('runMcpShutdown', () => {
     expect(mocks.stopXcodeStateWatcher).toHaveBeenCalledTimes(1);
     expect(mocks.shutdownXcodeToolsBridge).toHaveBeenCalledTimes(1);
     expect(mocks.disposeAll).toHaveBeenCalledTimes(1);
-    expect(mocks.stopAllDeviceLogCaptures).toHaveBeenCalledTimes(1);
     expect(mocks.stopOwnedSimulatorLaunchOsLogSessions).toHaveBeenCalledTimes(1);
     expect(mocks.stopAllVideoCaptureSessions).toHaveBeenCalledTimes(1);
     expect(mocks.stopAllTrackedProcesses).toHaveBeenCalledTimes(1);
@@ -135,7 +125,6 @@ describe('runMcpShutdown', () => {
         debuggerSessionCount: 0,
         simulatorLaunchOsLogSessionCount: 1,
         ownedSimulatorLaunchOsLogSessionCount: 1,
-        deviceLogSessionCount: 0,
         videoCaptureSessionCount: 0,
         swiftPackageProcessCount: 0,
         matchingMcpProcessCount: 0,
@@ -175,7 +164,6 @@ describe('runMcpShutdown', () => {
         debuggerSessionCount: 0,
         simulatorLaunchOsLogSessionCount: 2,
         ownedSimulatorLaunchOsLogSessionCount: 2,
-        deviceLogSessionCount: 0,
         videoCaptureSessionCount: 0,
         swiftPackageProcessCount: 0,
         matchingMcpProcessCount: 0,
@@ -214,7 +202,6 @@ describe('runMcpShutdown', () => {
         debuggerSessionCount: 1,
         simulatorLaunchOsLogSessionCount: 0,
         ownedSimulatorLaunchOsLogSessionCount: 0,
-        deviceLogSessionCount: 0,
         videoCaptureSessionCount: 0,
         swiftPackageProcessCount: 0,
         matchingMcpProcessCount: 0,

src/server/mcp-lifecycle.ts

@@ -1,7 +1,6 @@
 import process from 'node:process';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { getDefaultDebuggerManager } from '../utils/debugger/index.ts';
-import { activeDeviceLogSessions } from '../utils/log-capture/device-log-sessions.ts';
 import {
   listActiveSimulatorLaunchOsLogSessions,
   terminateLiveSimulatorLaunchOsLogSessionsSync,
@@ -65,7 +64,6 @@ export interface McpLifecycleSnapshot {
   debuggerSessionCount: number;
   simulatorLaunchOsLogSessionCount: number;
   ownedSimulatorLaunchOsLogSessionCount: number;
-  deviceLogSessionCount: number;
   videoCaptureSessionCount: number;
   swiftPackageProcessCount: number;
   matchingMcpProcessCount: number | null;
@@ -306,7 +304,6 @@ export async function buildMcpLifecycleSnapshot(options: {
     ownedSimulatorLaunchOsLogSessionCount: simulatorLaunchOsLogSessions.filter(
       (session) => session.ownedByCurrentProcess,
     ).length,
-    deviceLogSessionCount: activeDeviceLogSessions.size,
     videoCaptureSessionCount: listActiveVideoCaptureSessionIds().length,
     swiftPackageProcessCount: activeProcesses.size,
     matchingMcpProcessCount: peerSample.count,

src/server/mcp-shutdown.ts

@@ -2,7 +2,6 @@ import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { getDefaultDebuggerManager } from '../utils/debugger/index.ts';
 import { stopXcodeStateWatcher } from '../utils/xcode-state-watcher.ts';
 import { shutdownXcodeToolsBridge } from '../integrations/xcode-tools-bridge/index.ts';
-import { stopAllDeviceLogCaptures } from '../utils/log-capture/device-log-sessions.ts';
 import { stopOwnedSimulatorLaunchOsLogSessions } from '../utils/log-capture/simulator-launch-oslog-sessions.ts';
 import { stopAllVideoCaptureSessions } from '../utils/video_capture.ts';
 import { stopAllTrackedProcesses } from '../mcp/tools/swift-package/active-processes.ts';
@@ -196,11 +195,6 @@ export async function runMcpShutdown(input: {
       timeoutMs: bulkStepTimeoutMs(input.snapshot.ownedSimulatorLaunchOsLogSessionCount),
       operation: () => stopOwnedSimulatorLaunchOsLogSessions(STEP_TIMEOUT_MS),
     },
-    {
-      name: 'device-logs.stop-all',
-      timeoutMs: bulkStepTimeoutMs(input.snapshot.deviceLogSessionCount),
-      operation: () => stopAllDeviceLogCaptures(STEP_TIMEOUT_MS),
-    },
     {
       name: 'video-capture.stop-all',
       timeoutMs: bulkStepTimeoutMs(input.snapshot.videoCaptureSessionCount),

src/snapshot-tests/__fixtures__/mcp/resources/session-status--success.txt

@@ -1,11 +1,7 @@
 {
   "logging": {
     "simulator": {
-      "activeSessionIds": [],
       "activeLaunchOsLogSessions": []
-    },
-    "device": {
-      "activeSessionIds": []
     }
   },
   "debug": {

src/utils/log-capture/device-log-sessions.ts

@@ -1,6 +1,5 @@
 import { getDefaultDebuggerManager } from './debugger/index.ts';
 import { listActiveSimulatorLaunchOsLogSessions } from './log-capture/index.ts';
-import { activeDeviceLogSessions } from './log-capture/device-log-sessions.ts';
 import { getDaemonActivitySnapshot } from '../daemon/activity-registry.ts';
 import { activeProcesses } from '../mcp/tools/swift-package/active-processes.ts';
 import { listActiveVideoCaptureSessionIds } from './video_capture.ts';
@@ -19,7 +18,6 @@ export type SessionRuntimeStatusSnapshot = {
         ownedByCurrentProcess: boolean;
       }>;
     };
-    device: { activeSessionIds: string[] };
   };
   debug: {
     currentSessionId: string | null;
@@ -61,9 +59,6 @@ export async function getSessionRuntimeStatusSnapshot(): Promise<SessionRuntimeS
       simulator: {
         activeLaunchOsLogSessions: await listActiveSimulatorLaunchOsLogSessions(),
       },
-      device: {
-        activeSessionIds: Array.from(activeDeviceLogSessions.keys()).sort(),
-      },
     },
     debug: {
       currentSessionId: debuggerManager.getCurrentSessionId(),