Fix bundling for MCP/CTL commands

Author: pimterry

pack.ts

@@ -51,6 +51,7 @@ const packageApp = async () => {
         // Add the fully bundled source (not normally packaged by npm):
         path.join('bundle', 'index.js'),
         path.join('bundle', 'error-tracking.js'),
+        path.join('bundle', 'api', 'bridge-client.js'),
         // Static resources normally stored in browser-launcher
         path.join('bundle', 'bl-resources')
     ].map((extraFile) =>

rspack.config.js

@@ -15,7 +15,8 @@ console.log(
 module.exports = {
     entry: {
         index: './src/index.ts',
-        'error-tracking': './src/error-tracking.ts'
+        'error-tracking': './src/error-tracking.ts',
+        'api/bridge-client': './src/api/bridge-client.ts'
     },
     output: {
         path: OUTPUT_DIR,

src/commands/ctl.ts

@@ -1,9 +1,21 @@
+type BridgeClientModule = typeof import('../api/bridge-client');
+
 import { parseArgs } from 'util';
 
 import { Command } from '@oclif/command';
 
-import { apiRequest } from '../api/bridge-client';
-import { HtkOperation } from '../api/ui-operation-bridge';
+import { IS_PROD_BUILD } from '../constants';
+import type { HtkOperation } from '../api/ui-operation-bridge';
+
+function maybeBundleImport<T>(moduleName: string): T {
+    if (IS_PROD_BUILD || process.env.OCLIF_TS_NODE === '0') {
+        return require('../../bundle/' + moduleName);
+    } else {
+        return require('../' + moduleName);
+    }
+}
+
+const { apiRequest } = maybeBundleImport<BridgeClientModule>('api/bridge-client');
 
 // Custom argument parsing setup. Included here as Oclif's parsing can't handle the dynamic command
 // config (commands defined by the UI itself) and the logic isn't quite complex enough for a separate dep.

src/commands/mcp.ts

@@ -1,12 +1,22 @@
+type BridgeClientModule = typeof import('../api/bridge-client');
+
 import * as readline from 'readline';
 import { execFile } from 'child_process';
 
 import { Command, flags } from '@oclif/command';
-import { delay } from '@httptoolkit/util';
 
-import { SERVER_VERSION } from '../constants';
-import { apiRequest } from '../api/bridge-client';
-import { HtkOperation } from '../api/ui-operation-bridge';
+import { IS_PROD_BUILD, SERVER_VERSION } from '../constants';
+import type { HtkOperation } from '../api/ui-operation-bridge';
+
+function maybeBundleImport<T>(moduleName: string): T {
+    if (IS_PROD_BUILD || process.env.OCLIF_TS_NODE === '0') {
+        return require('../../bundle/' + moduleName);
+    } else {
+        return require('../' + moduleName);
+    }
+}
+
+const { apiRequest } = maybeBundleImport<BridgeClientModule>('api/bridge-client');
 
 interface JsonRpcRequest {
     jsonrpc: '2.0';
@@ -88,7 +98,7 @@ async function startHttpToolkit(
     // Wait for the UI to connect and send operations
     const deadline = Date.now() + LAUNCH_TIMEOUT_MS;
     while (Date.now() < deadline) {
-        await delay(LAUNCH_POLL_MS);
+        await new Promise(resolve => setTimeout(resolve, LAUNCH_POLL_MS));
         await refreshOperations();
         try {
             const status = await apiRequest('GET', '/api/status');