github-issue-tower-defence-management 1.104.4 → 1.105.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-issue-tower-defence-management",
-  "version": "1.104.4",
+  "version": "1.105.0",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

package/src/adapter/entry-points/cli/index.test.ts

@@ -73,23 +73,22 @@ jest.mock('../handlers/HandleScheduledEventUseCaseHandler', () => ({
     handle: jest.fn().mockResolvedValue(null),
   })),
 }));
-import type { StartConsoleServerOptions } from '../console/consoleServer';
+import type { StartWebServerOptions } from '../console/webServer';
 
-const mockStartConsoleServer = jest
-  .fn<Promise<unknown>, [StartConsoleServerOptions]>()
+const mockStartWebServer = jest
+  .fn<Promise<unknown>, [StartWebServerOptions]>()
   .mockResolvedValue({
     close: jest.fn(),
     address: jest.fn().mockReturnValue({ port: 9981 }),
   });
-jest.mock('../console/consoleServer', () => {
+jest.mock('../console/webServer', () => {
   const actual: Record<string, unknown> = jest.requireActual(
-    '../console/consoleServer',
+    '../console/webServer',
   );
   return {
     ...actual,
-    startConsoleServer: (
-      options: StartConsoleServerOptions,
-    ): Promise<unknown> => mockStartConsoleServer(options),
+    startWebServer: (options: StartWebServerOptions): Promise<unknown> =>
+      mockStartWebServer(options),
   };
 });
 
@@ -1677,10 +1676,10 @@ mysteryKey: 'value'
     });
   });
 
-  describe('serveConsole', () => {
+  describe('serveWeb', () => {
     it('should appear in the CLI help output', () => {
       const helpText = program.helpInformation();
-      expect(helpText).toContain('serveConsole');
+      expect(helpText).toContain('serveWeb');
     });
 
     it('should start the server on the default port 9981 when --port is omitted', async () => {
@@ -1690,13 +1689,13 @@ mysteryKey: 'value'
       await program.parseAsync([
         'node',
         'test',
-        'serveConsole',
+        'serveWeb',
         '--configFilePath',
         configFilePath,
       ]);
 
-      expect(mockStartConsoleServer).toHaveBeenCalledTimes(1);
-      const callArg = mockStartConsoleServer.mock.calls[0][0];
+      expect(mockStartWebServer).toHaveBeenCalledTimes(1);
+      const callArg = mockStartWebServer.mock.calls[0][0];
       expect(callArg.port).toBe(9981);
       expect(callArg.accessToken).toBe('config-token');
       expect(callArg.consoleDataOutputDir).toBeNull();
@@ -1717,7 +1716,7 @@ mysteryKey: 'value'
       await program.parseAsync([
         'node',
         'test',
-        'serveConsole',
+        'serveWeb',
         '--configFilePath',
         configFilePath,
         '--port',
@@ -1726,7 +1725,7 @@ mysteryKey: 'value'
         '/tmp/console-data',
       ]);
 
-      const callArg = mockStartConsoleServer.mock.calls[0][0];
+      const callArg = mockStartWebServer.mock.calls[0][0];
       expect(callArg.port).toBe(12345);
       expect(callArg.consoleDataOutputDir).toBe('/tmp/console-data');
 
@@ -1746,7 +1745,7 @@ mysteryKey: 'value'
         program.parseAsync([
           'node',
           'test',
-          'serveConsole',
+          'serveWeb',
           '--configFilePath',
           configFilePath,
         ]),
@@ -1774,7 +1773,7 @@ mysteryKey: 'value'
         program.parseAsync([
           'node',
           'test',
-          'serveConsole',
+          'serveWeb',
           '--configFilePath',
           configFilePath,
           '--port',
@@ -1795,12 +1794,12 @@ mysteryKey: 'value'
       await program.parseAsync([
         'node',
         'test',
-        'serveConsole',
+        'serveWeb',
         '--configFilePath',
         configFilePath,
       ]);
 
-      const callArg = mockStartConsoleServer.mock.calls[0][0];
+      const callArg = mockStartWebServer.mock.calls[0][0];
       expect(callArg.issueRepository).not.toBeNull();
       expect(callArg.issueTitleStateCache).not.toBeNull();
 
@@ -1833,7 +1832,7 @@ mysteryKey: 'value'
         program.parseAsync([
           'node',
           'test',
-          'serveConsole',
+          'serveWeb',
           '--configFilePath',
           configFilePath,
         ]),
@@ -1865,7 +1864,7 @@ mysteryKey: 'value'
         program.parseAsync([
           'node',
           'test',
-          'serveConsole',
+          'serveWeb',
           '--configFilePath',
           configFilePath,
         ]),
@@ -1879,4 +1878,58 @@ mysteryKey: 'value'
       processExitSpy.mockRestore();
     });
   });
+
+  describe('serveConsole (deprecated alias)', () => {
+    it('should appear in the CLI help output', () => {
+      const helpText = program.helpInformation();
+      expect(helpText).toContain('serveConsole');
+    });
+
+    it('should route to the same handler as serveWeb on the default port 9981', async () => {
+      writeConfig({ ...defaultConfig, consoleAccessToken: 'config-token' });
+      const logSpy = jest.spyOn(console, 'log').mockImplementation();
+
+      await program.parseAsync([
+        'node',
+        'test',
+        'serveConsole',
+        '--configFilePath',
+        configFilePath,
+      ]);
+
+      expect(mockStartWebServer).toHaveBeenCalledTimes(1);
+      const callArg = mockStartWebServer.mock.calls[0][0];
+      expect(callArg.port).toBe(9981);
+      expect(callArg.accessToken).toBe('config-token');
+      expect(callArg.consoleDataOutputDir).toBeNull();
+      expect(callArg.uiDistDir).toBe(
+        path.join(__dirname, '..', 'console', 'ui-dist'),
+      );
+
+      logSpy.mockRestore();
+    });
+
+    it('should use the provided --port and --consoleDataOutputDir', async () => {
+      writeConfig({ ...defaultConfig, consoleAccessToken: 'config-token' });
+      const logSpy = jest.spyOn(console, 'log').mockImplementation();
+
+      await program.parseAsync([
+        'node',
+        'test',
+        'serveConsole',
+        '--configFilePath',
+        configFilePath,
+        '--port',
+        '12345',
+        '--consoleDataOutputDir',
+        '/tmp/console-data',
+      ]);
+
+      const callArg = mockStartWebServer.mock.calls[0][0];
+      expect(callArg.port).toBe(12345);
+      expect(callArg.consoleDataOutputDir).toBe('/tmp/console-data');
+
+      logSpy.mockRestore();
+    });
+  });
 });

package/src/adapter/entry-points/cli/index.ts

@@ -32,10 +32,7 @@ import { GitHubIssueCommentRepository } from '../../repositories/GitHubIssueComm
 import { FetchWebhookRepository } from '../../repositories/FetchWebhookRepository';
 import { RevertOrphanedPreparationUseCase } from '../../../domain/usecases/RevertOrphanedPreparationUseCase';
 import * as path from 'path';
-import {
-  DEFAULT_CONSOLE_PORT,
-  startConsoleServer,
-} from '../console/consoleServer';
+import { DEFAULT_WEB_PORT, startWebServer } from '../console/webServer';
 import { IssueTitleStateCache } from '../console/consoleReadApi';
 import {
   buildPjcodeToProjectUrl,
@@ -73,7 +70,7 @@ type CheckIssueReviewReadinessOptions = {
   configFilePath: string;
 };
 
-type ServeConsoleOptions = {
+type ServeWebOptions = {
   configFilePath: string;
   port?: string;
   consoleDataOutputDir?: string;
@@ -596,146 +593,159 @@ program
     process.stdout.write(`${JSON.stringify(result)}\n`);
   });
 
-program
-  .command('serveConsole')
-  .description('Start the local TDPM Console HTTP server')
-  .requiredOption(
-    '--configFilePath <path>',
-    'Path to config file for tower defence management',
-  )
-  .option(
-    '--port <number>',
-    `Port for the console HTTP server (default: ${DEFAULT_CONSOLE_PORT})`,
-  )
-  .option(
-    '--consoleDataOutputDir <path>',
-    'Directory where console data files are written and served from',
-  )
-  .option(
-    '--inTmuxDataDir <path>',
-    `Directory containing the flat in-tmux-by-human static JSON files served at /in-tmux-by-human/*.json (default: ${DEFAULT_IN_TMUX_DATA_DIR})`,
-  )
-  .option(
-    '--dashboardDir <path>',
-    `Directory containing the dashboard HTML fragment tdpm.txt served unauthenticated at /tdpm.txt (default: ${DEFAULT_DASHBOARD_DIR})`,
-  )
-  .action(async (options: ServeConsoleOptions) => {
-    const config = loadConfigFile(options.configFilePath);
-
-    const accessToken = config.consoleAccessToken;
-    if (!accessToken) {
+const runServeWeb = async (options: ServeWebOptions): Promise<void> => {
+  const config = loadConfigFile(options.configFilePath);
+
+  const accessToken = config.consoleAccessToken;
+  if (!accessToken) {
+    console.error(
+      'consoleAccessToken is required. Provide it via the config file.',
+    );
+    process.exit(1);
+  }
+
+  let port = DEFAULT_WEB_PORT;
+  if (options.port !== undefined) {
+    const parsedPort = Number(options.port);
+    if (
+      !Number.isFinite(parsedPort) ||
+      !Number.isInteger(parsedPort) ||
+      parsedPort <= 0 ||
+      parsedPort > 65535
+    ) {
       console.error(
-        'consoleAccessToken is required. Provide it via the config file.',
+        'Invalid value for --port. It must be a positive integer between 1 and 65535.',
       );
       process.exit(1);
     }
-
-    let port = DEFAULT_CONSOLE_PORT;
-    if (options.port !== undefined) {
-      const parsedPort = Number(options.port);
-      if (
-        !Number.isFinite(parsedPort) ||
-        !Number.isInteger(parsedPort) ||
-        parsedPort <= 0 ||
-        parsedPort > 65535
-      ) {
+    port = parsedPort;
+  }
+
+  const token = process.env.GH_TOKEN;
+  if (!token) {
+    console.error('GH_TOKEN environment variable is required');
+    process.exit(1);
+  }
+
+  const projectUrl = config.projectUrl;
+  if (!projectUrl) {
+    console.error(
+      'projectUrl is required. Provide it via the config file or project README.',
+    );
+    process.exit(1);
+  }
+
+  const projectName = config.projectName ?? 'default';
+  const localStorageRepository = new LocalStorageRepository();
+  const cachePath = `./tmp/cache/${projectName}`;
+  const localStorageCacheRepository = new LocalStorageCacheRepository(
+    localStorageRepository,
+    cachePath,
+  );
+  const githubRepositoryParams = buildGithubRepositoryParams(
+    localStorageRepository,
+    token,
+  );
+  const projectRepository = new GraphqlProjectRepository(
+    ...githubRepositoryParams,
+  );
+  const apiV3IssueRepository = new ApiV3IssueRepository(
+    ...githubRepositoryParams,
+  );
+  const restIssueRepository = new RestIssueRepository(
+    ...githubRepositoryParams,
+  );
+  const graphqlProjectItemRepository = new GraphqlProjectItemRepository(
+    ...githubRepositoryParams,
+  );
+  const issueRepository = new ApiV3CheerioRestIssueRepository(
+    apiV3IssueRepository,
+    restIssueRepository,
+    graphqlProjectItemRepository,
+    localStorageCacheRepository,
+    ...githubRepositoryParams,
+  );
+
+  const pjcodeToProjectUrl = buildPjcodeToProjectUrl(
+    projectName,
+    projectUrl,
+    config.consoleProjects ?? null,
+  );
+  const resolveProject = createConsoleProjectResolver(
+    pjcodeToProjectUrl,
+    async (targetProjectUrl: string) => {
+      const targetProjectId =
+        await projectRepository.findProjectIdByUrl(targetProjectUrl);
+      if (!targetProjectId) {
+        console.error(`No project found for projectUrl ${targetProjectUrl}`);
+        return null;
+      }
+      const loadedProject = await projectRepository.getProject(targetProjectId);
+      if (!loadedProject) {
         console.error(
-          'Invalid value for --port. It must be a positive integer between 1 and 65535.',
+          `Failed to load project for projectUrl ${targetProjectUrl}`,
         );
-        process.exit(1);
+        return null;
       }
-      port = parsedPort;
-    }
-
-    const token = process.env.GH_TOKEN;
-    if (!token) {
-      console.error('GH_TOKEN environment variable is required');
-      process.exit(1);
-    }
-
-    const projectUrl = config.projectUrl;
-    if (!projectUrl) {
-      console.error(
-        'projectUrl is required. Provide it via the config file or project README.',
-      );
-      process.exit(1);
-    }
+      return loadedProject;
+    },
+  );
+
+  const uiDistDir = path.join(__dirname, '..', 'console', 'ui-dist');
+  const consoleDataOutputDir = options.consoleDataOutputDir ?? null;
+  const inTmuxDataDir = options.inTmuxDataDir ?? DEFAULT_IN_TMUX_DATA_DIR;
+  const dashboardDir = options.dashboardDir ?? DEFAULT_DASHBOARD_DIR;
+
+  await startWebServer({
+    accessToken,
+    uiDistDir,
+    consoleDataOutputDir,
+    inTmuxDataDir,
+    dashboardDir,
+    githubToken: token,
+    issueRepository,
+    resolveProject,
+    issueTitleStateCache: new IssueTitleStateCache(),
+    port,
+  });
+  console.log(`TDPM web server listening on port ${port}`);
+};
 
-    const projectName = config.projectName ?? 'default';
-    const localStorageRepository = new LocalStorageRepository();
-    const cachePath = `./tmp/cache/${projectName}`;
-    const localStorageCacheRepository = new LocalStorageCacheRepository(
-      localStorageRepository,
-      cachePath,
-    );
-    const githubRepositoryParams = buildGithubRepositoryParams(
-      localStorageRepository,
-      token,
-    );
-    const projectRepository = new GraphqlProjectRepository(
-      ...githubRepositoryParams,
-    );
-    const apiV3IssueRepository = new ApiV3IssueRepository(
-      ...githubRepositoryParams,
-    );
-    const restIssueRepository = new RestIssueRepository(
-      ...githubRepositoryParams,
-    );
-    const graphqlProjectItemRepository = new GraphqlProjectItemRepository(
-      ...githubRepositoryParams,
-    );
-    const issueRepository = new ApiV3CheerioRestIssueRepository(
-      apiV3IssueRepository,
-      restIssueRepository,
-      graphqlProjectItemRepository,
-      localStorageCacheRepository,
-      ...githubRepositoryParams,
-    );
+const addServeWebOptions = (command: Command): Command =>
+  command
+    .requiredOption(
+      '--configFilePath <path>',
+      'Path to config file for tower defence management',
+    )
+    .option(
+      '--port <number>',
+      `Port for the web HTTP server (default: ${DEFAULT_WEB_PORT})`,
+    )
+    .option(
+      '--consoleDataOutputDir <path>',
+      'Directory where console data files are written and served from',
+    )
+    .option(
+      '--inTmuxDataDir <path>',
+      `Directory containing the flat in-tmux-by-human static JSON files served at /in-tmux-by-human/*.json (default: ${DEFAULT_IN_TMUX_DATA_DIR})`,
+    )
+    .option(
+      '--dashboardDir <path>',
+      `Directory containing the dashboard HTML fragment tdpm.txt served unauthenticated at /tdpm.txt (default: ${DEFAULT_DASHBOARD_DIR})`,
+    );
+
+addServeWebOptions(program.command('serveWeb'))
+  .description(
+    'Start the local TDPM web server (console tabs, dashboard, and in-tmux session list)',
+  )
+  .action(async (options: ServeWebOptions) => {
+    await runServeWeb(options);
+  });
 
-    const pjcodeToProjectUrl = buildPjcodeToProjectUrl(
-      projectName,
-      projectUrl,
-      config.consoleProjects ?? null,
-    );
-    const resolveProject = createConsoleProjectResolver(
-      pjcodeToProjectUrl,
-      async (targetProjectUrl: string) => {
-        const targetProjectId =
-          await projectRepository.findProjectIdByUrl(targetProjectUrl);
-        if (!targetProjectId) {
-          console.error(`No project found for projectUrl ${targetProjectUrl}`);
-          return null;
-        }
-        const loadedProject =
-          await projectRepository.getProject(targetProjectId);
-        if (!loadedProject) {
-          console.error(
-            `Failed to load project for projectUrl ${targetProjectUrl}`,
-          );
-          return null;
-        }
-        return loadedProject;
-      },
-    );
-
-    const uiDistDir = path.join(__dirname, '..', 'console', 'ui-dist');
-    const consoleDataOutputDir = options.consoleDataOutputDir ?? null;
-    const inTmuxDataDir = options.inTmuxDataDir ?? DEFAULT_IN_TMUX_DATA_DIR;
-    const dashboardDir = options.dashboardDir ?? DEFAULT_DASHBOARD_DIR;
-
-    await startConsoleServer({
-      accessToken,
-      uiDistDir,
-      consoleDataOutputDir,
-      inTmuxDataDir,
-      dashboardDir,
-      githubToken: token,
-      issueRepository,
-      resolveProject,
-      issueTitleStateCache: new IssueTitleStateCache(),
-      port,
-    });
-    console.log(`TDPM Console server listening on port ${port}`);
+addServeWebOptions(program.command('serveConsole'))
+  .description('Deprecated alias for serveWeb. Use serveWeb instead.')
+  .action(async (options: ServeWebOptions) => {
+    await runServeWeb(options);
   });
 
 program

package/src/adapter/entry-points/console/ui/e2e/consoleTestHarness.ts

@@ -13,7 +13,7 @@ import type {
 } from '../../../../../domain/usecases/adapter-interfaces/IssueRepository';
 import type { ConsoleProjectBinding } from '../../consoleOperationApi';
 import { IssueTitleStateCache } from '../../consoleReadApi';
-import { startConsoleServer } from '../../consoleServer';
+import { startWebServer } from '../../webServer';
 
 export const CONSOLE_E2E_PJCODE = 'umino';
 export const CONSOLE_E2E_TOKEN = 'console-e2e-fixture-token-3f9c1a';
@@ -362,7 +362,7 @@ export const startConsoleE2eHarness = async (): Promise<ConsoleE2eHarness> => {
   ): Promise<ConsoleProjectBinding | null> =>
     pjcode === CONSOLE_E2E_PJCODE ? { pjcode, project } : null;
 
-  const server = await startConsoleServer({
+  const server = await startWebServer({
     accessToken: CONSOLE_E2E_TOKEN,
     uiDistDir,
     consoleDataOutputDir,