Add session identifiers to new resource

Author: cameroncooke

.smithery/index.cjs

@@ -12,7 +12,7 @@
     "xcodebuildmcp-doctor": "build/doctor-cli.js"
   },
   "scripts": {
-    "build": "npm run generate:version && npm run generate:loaders && npx smithery build",
+    "build": "npm run generate:version && npm run generate:loaders && npx smithery build && tsup",
     "dev": "npm run generate:version && npm run generate:loaders && npx smithery dev",
     "build:tsup": "npm run generate:version && npm run generate:loaders && tsup",
     "dev:tsup": "npm run build:tsup && tsup --watch",

package.json

@@ -10,6 +10,10 @@ export const RESOURCE_LOADERS = {
     const module = await import('../mcp/resources/doctor.js');
     return module.default;
   },
+  'session-status': async () => {
+    const module = await import('../mcp/resources/session-status.js');
+    return module.default;
+  },
   simulators: async () => {
     const module = await import('../mcp/resources/simulators.js');
     return module.default;

src/core/generated-resources.ts

@@ -0,0 +1,53 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { getDefaultDebuggerManager } from '../../../utils/debugger/index.ts';
+import { activeLogSessions } from '../../../utils/log_capture.ts';
+import { activeDeviceLogSessions } from '../../../utils/log-capture/device-log-sessions.ts';
+import sessionStatusResource, { sessionStatusResourceLogic } from '../session-status.ts';
+
+describe('session-status resource', () => {
+  beforeEach(async () => {
+    activeLogSessions.clear();
+    activeDeviceLogSessions.clear();
+    await getDefaultDebuggerManager().disposeAll();
+  });
+
+  afterEach(async () => {
+    activeLogSessions.clear();
+    activeDeviceLogSessions.clear();
+    await getDefaultDebuggerManager().disposeAll();
+  });
+
+  describe('Export Field Validation', () => {
+    it('should export correct uri', () => {
+      expect(sessionStatusResource.uri).toBe('xcodebuildmcp://session-status');
+    });
+
+    it('should export correct description', () => {
+      expect(sessionStatusResource.description).toBe(
+        'Runtime session state for log capture and debugging',
+      );
+    });
+
+    it('should export correct mimeType', () => {
+      expect(sessionStatusResource.mimeType).toBe('text/plain');
+    });
+
+    it('should export handler function', () => {
+      expect(typeof sessionStatusResource.handler).toBe('function');
+    });
+  });
+
+  describe('Handler Functionality', () => {
+    it('should return empty status when no sessions exist', async () => {
+      const result = await sessionStatusResourceLogic();
+
+      expect(result.contents).toHaveLength(1);
+      const parsed = JSON.parse(result.contents[0].text);
+
+      expect(parsed.logging.simulator.activeSessionIds).toEqual([]);
+      expect(parsed.logging.device.activeSessionIds).toEqual([]);
+      expect(parsed.debug.currentSessionId).toBe(null);
+      expect(parsed.debug.sessionIds).toEqual([]);
+    });
+  });
+});

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

@@ -0,0 +1,44 @@
+/**
+ * Session Status Resource Plugin
+ *
+ * Provides read-only runtime session state for log capture and debugging.
+ */
+
+import { log } from '../../utils/logging/index.ts';
+import { getSessionRuntimeStatusSnapshot } from '../../utils/session-status.ts';
+
+export async function sessionStatusResourceLogic(): Promise<{ contents: Array<{ text: string }> }> {
+  try {
+    log('info', 'Processing session status resource request');
+    const status = getSessionRuntimeStatusSnapshot();
+
+    return {
+      contents: [
+        {
+          text: JSON.stringify(status, null, 2),
+        },
+      ],
+    };
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    log('error', `Error in session status resource handler: ${errorMessage}`);
+
+    return {
+      contents: [
+        {
+          text: `Error retrieving session status: ${errorMessage}`,
+        },
+      ],
+    };
+  }
+}
+
+export default {
+  uri: 'xcodebuildmcp://session-status',
+  name: 'session-status',
+  description: 'Runtime session state for log capture and debugging',
+  mimeType: 'text/plain',
+  async handler(): Promise<{ contents: Array<{ text: string }> }> {
+    return sessionStatusResourceLogic();
+  },
+};

src/mcp/resources/session-status.ts

@@ -10,10 +10,8 @@ import {
   createMockExecutor,
   createMockFileSystemExecutor,
 } from '../../../../test-utils/mock-executors.ts';
-import plugin, {
-  start_device_log_capLogic,
-  activeDeviceLogSessions,
-} from '../start_device_log_cap.ts';
+import plugin, { start_device_log_capLogic } from '../start_device_log_cap.ts';
+import { activeDeviceLogSessions } from '../../../../utils/log-capture/device-log-sessions.ts';
 import { sessionStore } from '../../../../utils/session-store.ts';
 
 describe('start_device_log_cap plugin', () => {

src/mcp/tools/logging/__tests__/start_device_log_cap.test.ts

@@ -5,7 +5,10 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { EventEmitter } from 'events';
 import * as z from 'zod';
 import plugin, { stop_device_log_capLogic } from '../stop_device_log_cap.ts';
-import { activeDeviceLogSessions, type DeviceLogSession } from '../start_device_log_cap.ts';
+import {
+  activeDeviceLogSessions,
+  type DeviceLogSession,
+} from '../../../../utils/log-capture/device-log-sessions.ts';
 import { createMockFileSystemExecutor } from '../../../../test-utils/mock-executors.ts';
 
 // Note: Logger is allowed to execute normally (integration testing pattern)

src/mcp/tools/logging/__tests__/stop_device_log_cap.test.ts

@@ -18,6 +18,10 @@ import {
   createSessionAwareTool,
   getSessionAwareToolSchemaShape,
 } from '../../../utils/typed-tool-factory.ts';
+import {
+  activeDeviceLogSessions,
+  type DeviceLogSession,
+} from '../../../utils/log-capture/device-log-sessions.ts';
 
 /**
  * Log file retention policy for device logs:
@@ -32,17 +36,6 @@ const DEVICE_LOG_FILE_PREFIX = 'xcodemcp_device_log_';
 // - Devices use 'xcrun devicectl' with console output only (no OSLog streaming)
 // The different command structures and output formats make sharing infrastructure complex.
 // However, both follow similar patterns for session management and log retention.
-export interface DeviceLogSession {
-  process: ChildProcess;
-  logFilePath: string;
-  deviceUuid: string;
-  bundleId: string;
-  logStream?: fs.WriteStream;
-  hasEnded: boolean;
-}
-
-export const activeDeviceLogSessions = new Map<string, DeviceLogSession>();
-
 const EARLY_FAILURE_WINDOW_MS = 5000;
 const INITIAL_OUTPUT_LIMIT = 8_192;
 const DEFAULT_JSON_RESULT_WAIT_MS = 8000;

src/mcp/tools/logging/start_device_log_cap.ts

@@ -7,7 +7,10 @@
 import * as fs from 'fs';
 import * as z from 'zod';
 import { log } from '../../../utils/logging/index.ts';
-import { activeDeviceLogSessions, type DeviceLogSession } from './start_device_log_cap.ts';
+import {
+  activeDeviceLogSessions,
+  type DeviceLogSession,
+} from '../../../utils/log-capture/device-log-sessions.ts';
 import { ToolResponse } from '../../../types/common.ts';
 import { getDefaultFileSystemExecutor, getDefaultCommandExecutor } from '../../../utils/command.ts';
 import { FileSystemExecutor } from '../../../utils/FileSystemExecutor.ts';

src/mcp/tools/logging/stop_device_log_cap.ts

@@ -75,6 +75,10 @@ export class DebuggerManager {
     return this.currentSessionId;
   }
 
+  listSessions(): DebugSessionInfo[] {
+    return Array.from(this.sessions.values()).map((session) => ({ ...session.info }));
+  }
+
   findSessionForSimulator(simulatorId: string): DebugSessionInfo | null {
     if (!simulatorId) return null;
     if (this.currentSessionId) {