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

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,

package/src/adapter/entry-points/console/{consoleServer.test.ts → webServer.test.ts}

@@ -4,7 +4,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { mock } from 'jest-mock-extended';
 import {
-  DEFAULT_CONSOLE_PORT,
+  DEFAULT_WEB_PORT,
   CONSOLE_TOKEN_HEADER,
   hasDotSegment,
   requiresToken,
@@ -13,8 +13,8 @@ import {
   extractProvidedToken,
   resolveFlatInTmuxFilePath,
   resolveDashboardFilePath,
-  startConsoleServer,
-} from './consoleServer';
+  startWebServer,
+} from './webServer';
 import type { ImageFetcher } from './consoleImageProxy';
 import { IssueTitleStateCache } from './consoleReadApi';
 import { readDoneProjectItemIds } from './consoleDoneStore';
@@ -22,10 +22,10 @@ import { IssueRepository } from '../../../domain/usecases/adapter-interfaces/Iss
 import { Project } from '../../../domain/entities/Project';
 import { Issue } from '../../../domain/entities/Issue';
 
-describe('consoleServer pure helpers', () => {
-  describe('DEFAULT_CONSOLE_PORT', () => {
+describe('webServer pure helpers', () => {
+  describe('DEFAULT_WEB_PORT', () => {
     it('is 9981', () => {
-      expect(DEFAULT_CONSOLE_PORT).toBe(9981);
+      expect(DEFAULT_WEB_PORT).toBe(9981);
     });
   });
 
@@ -123,7 +123,7 @@ describe('consoleServer pure helpers', () => {
   });
 });
 
-describe('consoleServer integration', () => {
+describe('webServer integration', () => {
   const testToken = 'integration-test-token-value';
 
   const requestServer = (
@@ -175,7 +175,7 @@ describe('consoleServer integration', () => {
 
   it('starts on an ephemeral port and closes gracefully', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -192,7 +192,7 @@ describe('consoleServer integration', () => {
 
   it('serves the placeholder index without a token when ui-dist is absent', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'missing-ui-dist'),
       consoleDataOutputDir: null,
@@ -218,7 +218,7 @@ describe('consoleServer integration', () => {
 
   it('returns 404 for a missing non-index file when ui-dist is absent', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'missing-ui-dist'),
       consoleDataOutputDir: null,
@@ -248,7 +248,7 @@ describe('consoleServer integration', () => {
       path.join(uiDistDir, 'assets', 'app.js'),
       'console.log("app");',
     );
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir,
       consoleDataOutputDir: null,
@@ -280,7 +280,7 @@ describe('consoleServer integration', () => {
       path.join(uiDistDir, 'index.html'),
       '<!DOCTYPE html><title>spa</title><div id="root"></div>',
     );
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir,
       consoleDataOutputDir: null,
@@ -309,7 +309,7 @@ describe('consoleServer integration', () => {
 
   it('serves the placeholder index for per-project routes when ui-dist is absent', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'missing-ui-dist'),
       consoleDataOutputDir: null,
@@ -332,7 +332,7 @@ describe('consoleServer integration', () => {
     const uiDistDir = path.join(tmpDir, 'ui-dist');
     fs.mkdirSync(uiDistDir, { recursive: true });
     fs.writeFileSync(path.join(uiDistDir, '.env'), 'SECRET=should-not-serve');
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir,
       consoleDataOutputDir: null,
@@ -358,7 +358,7 @@ describe('consoleServer integration', () => {
 
   it('rejects .json and /api/* without a token and passes the gate with a valid token', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -403,7 +403,7 @@ describe('consoleServer integration', () => {
   });
 });
 
-describe('consoleServer new routes integration', () => {
+describe('webServer new routes integration', () => {
   const testToken = 'integration-test-token-value';
 
   const closeServer = (server: http.Server): Promise<void> =>
@@ -496,7 +496,7 @@ describe('consoleServer new routes integration', () => {
       path.join(listDir, '.done.json'),
       JSON.stringify({ projectItemIds: ['PVTI_drop'] }),
     );
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: dataDir,
@@ -533,7 +533,7 @@ describe('consoleServer new routes integration', () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
     const issueRepository = mock<IssueRepository>();
     issueRepository.getIssueOrPullRequestBody.mockResolvedValue('body text');
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -567,7 +567,7 @@ describe('consoleServer new routes integration', () => {
         createdAt: new Date('2026-06-18T03:21:00.000Z'),
       },
     ]);
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -616,7 +616,7 @@ describe('consoleServer new routes integration', () => {
       ...mock<Issue>(),
       itemId: 'PVTI_loaded',
     });
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: dataDir,
@@ -662,7 +662,7 @@ describe('consoleServer new routes integration', () => {
     issueRepository.approvePullRequest.mockRejectedValue(
       new Error('Failed to approve PR https://github.com/o/r/pull/1: HTTP 422'),
     );
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -698,7 +698,7 @@ describe('consoleServer new routes integration', () => {
   it('rejects an operation api with a malformed json body', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
     const issueRepository = mock<IssueRepository>();
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -749,7 +749,7 @@ describe('consoleServer new routes integration', () => {
 
   it('returns 404 for a read api when no repository is injected', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -809,7 +809,7 @@ describe('resolveFlatInTmuxFilePath', () => {
   });
 });
 
-describe('consoleServer flat in-tmux-by-human route integration', () => {
+describe('webServer flat in-tmux-by-human route integration', () => {
   const testToken = 'integration-test-token-value';
 
   const requestServer = (
@@ -878,7 +878,7 @@ describe('consoleServer flat in-tmux-by-human route integration', () => {
     fs.writeFileSync(path.join(inTmuxDataDir, 'index.v4.json'), indexV4Raw);
     fs.writeFileSync(path.join(inTmuxDataDir, 'index.v3.json'), indexV3Raw);
     fs.writeFileSync(path.join(tmpDir, 'secret.json'), '{"secret":true}');
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -992,7 +992,7 @@ describe('consoleServer flat in-tmux-by-human route integration', () => {
 
   it('returns 404 for the flat route when inTmuxDataDir is null', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -1030,7 +1030,7 @@ describe('resolveDashboardFilePath', () => {
   });
 });
 
-describe('consoleServer dashboard /tdpm.txt route integration', () => {
+describe('webServer dashboard /tdpm.txt route integration', () => {
   const testToken = 'integration-test-token-value';
 
   const requestServer = (
@@ -1094,7 +1094,7 @@ describe('consoleServer dashboard /tdpm.txt route integration', () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
     fs.writeFileSync(path.join(tmpDir, 'tdpm.txt'), dashboardRaw);
     fs.writeFileSync(path.join(tmpDir, 'secret.txt'), 'secret content');
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -1125,7 +1125,7 @@ describe('consoleServer dashboard /tdpm.txt route integration', () => {
 
   it('returns 404 for /tdpm.txt when the file is absent', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-    const server = await startConsoleServer({
+    const server = await startWebServer({
       accessToken: testToken,
       uiDistDir: path.join(tmpDir, 'ui-dist'),
       consoleDataOutputDir: null,
@@ -1146,7 +1146,7 @@ describe('consoleServer dashboard /tdpm.txt route integration', () => {
     const { server, tmpDir } = await (async () => {
       const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
       fs.writeFileSync(path.join(dir, 'tdpm.txt'), dashboardRaw);
-      const srv = await startConsoleServer({
+      const srv = await startWebServer({
         accessToken: testToken,
         uiDistDir: path.join(dir, 'ui-dist'),
         consoleDataOutputDir: null,
@@ -1177,7 +1177,7 @@ describe('consoleServer dashboard /tdpm.txt route integration', () => {
   });
 });
 
-describe('consoleServer image proxy', () => {
+describe('webServer image proxy', () => {
   const testToken = 'image-proxy-token-value';
   const githubToken = 'gh-token-value';
   const allowedUrl = 'https://github.com/user-attachments/assets/abc-123';
@@ -1244,7 +1244,7 @@ describe('consoleServer image proxy', () => {
   ): Promise<{ server: http.Server; tmpDir: string }> =>
     (async () => {
       const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
-      const server = await startConsoleServer({
+      const server = await startWebServer({
         accessToken: testToken,
         uiDistDir: path.join(tmpDir, 'ui-dist'),
         consoleDataOutputDir: null,