@yancyyu/openhermit 1.6.15 → 1.6.17

package/bin/hermit.mjs

@@ -90,6 +90,7 @@ const daemonRequested = args.includes('--daemon');
 const daemonChild = process.env.HERMIT_DAEMON_CHILD === '1';
 const daemonPidPath = path.join(hermitHome, 'openhermit.pid');
 const daemonLogPath = path.join(hermitHome, 'logs', 'openhermit.log');
+const runtimeLogPath = path.join(hermitHome, 'logs', 'openhermit-runtime.log');
 const serverLogPath = path.join(hermitHome, 'logs', 'openhermit-server.log');
 const ccConnectConfigPath =
   process.env.HERMIT_CC_CONNECT_CONFIG ||
@@ -493,13 +494,61 @@ async function waitForCcConnect(baseUrl, token, timeoutMs = 15_000) {
   return false;
 }
 
+function appendLog(filePath, chunk) {
+  try {
+    mkdirSync(path.dirname(filePath), { recursive: true });
+    appendFileSync(filePath, chunk);
+  } catch {
+    // Logging must never block startup.
+  }
+}
+
+function printLogTail(label, filePath) {
+  try {
+    const content = readFileSync(filePath, 'utf-8');
+    const lines = content.trimEnd().split(/\r?\n/).slice(-80);
+    console.error(`[openHermit] ${label} log: ${filePath}`);
+    if (lines.length > 0) {
+      console.error(`[openHermit] Last ${label} log lines:`);
+      console.error(lines.join('\n'));
+    }
+  } catch {
+    console.error(`[openHermit] ${label} log: ${filePath}`);
+  }
+}
+
+async function waitForRuntimeReady(baseUrl, token, child, timeoutMs = 30_000) {
+  let exitCode = null;
+  child.once('exit', (code) => {
+    exitCode = code ?? 1;
+  });
+
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    if (exitCode !== null) {
+      throw new Error(`Runtime service exited before becoming ready (code ${exitCode})`);
+    }
+    try {
+      const res = await fetch(`${baseUrl}/api/v1/status`, {
+        headers: token ? { Authorization: `Bearer ${token}` } : undefined,
+      });
+      if (res.ok) return;
+    } catch {
+      // keep polling
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+
+  throw new Error(`Runtime service did not become ready within ${Math.round(timeoutMs / 1000)}s`);
+}
+
 function resolveCcConnectRunner() {
   const pkgPath = require.resolve('cc-connect/package.json');
   return path.join(path.dirname(pkgPath), 'run.js');
 }
 
 function resolveTsxLoader() {
-  return require.resolve('tsx');
+  return pathToFileURL(require.resolve('tsx')).href;
 }
 
 function resolveAliasLoaderRegister() {
@@ -531,11 +580,28 @@ if (!skipCcConnect) {
         CC_CONNECT_MANAGEMENT_TOKEN: ccTokens.managementToken,
         CC_CONNECT_BRIDGE_TOKEN: ccTokens.bridgeToken,
       },
-      stdio: 'inherit',
+      stdio: ['ignore', 'pipe', 'pipe'],
     });
-    const ready = await waitForCcConnect(ccBaseUrl, ccTokens.managementToken, 30_000);
-    if (!ready) {
-      console.warn('[openHermit] Runtime service did not become ready within 30s; openHermit will keep trying via API.');
+
+    ccConnectProcess.stdout?.on('data', (chunk) => {
+      process.stdout.write(chunk);
+      appendLog(runtimeLogPath, chunk);
+    });
+    ccConnectProcess.stderr?.on('data', (chunk) => {
+      process.stderr.write(chunk);
+      appendLog(runtimeLogPath, chunk);
+    });
+
+    try {
+      await waitForRuntimeReady(ccBaseUrl, ccTokens.managementToken, ccConnectProcess, 30_000);
+    } catch (err) {
+      console.error(
+        `[openHermit] Runtime service failed to start: ${err instanceof Error ? err.message : String(err)}`
+      );
+      printLogTail('Runtime', runtimeLogPath);
+      signalDaemon(ccConnectProcess.pid, 'SIGTERM');
+      setTimeout(() => signalDaemon(ccConnectProcess?.pid, 'SIGKILL'), 2_000).unref();
+      process.exit(1);
     }
   }
 }
@@ -577,27 +643,8 @@ if (!existsSync(distRenderererDir) || !existsSync(path.join(distRenderererDir, '
 // Start the server
 console.log('[openHermit] Launching server...\n');
 
-function appendServerLog(chunk) {
-  try {
-    mkdirSync(path.dirname(serverLogPath), { recursive: true });
-    appendFileSync(serverLogPath, chunk);
-  } catch {
-    // Logging must never block startup.
-  }
-}
-
 function printServerLogTail() {
-  try {
-    const content = readFileSync(serverLogPath, 'utf-8');
-    const lines = content.trimEnd().split(/\r?\n/).slice(-60);
-    if (lines.length > 0) {
-      console.error(`[openHermit] Server log: ${serverLogPath}`);
-      console.error('[openHermit] Last server log lines:');
-      console.error(lines.join('\n'));
-    }
-  } catch {
-    console.error(`[openHermit] Server log: ${serverLogPath}`);
-  }
+  printLogTail('Server', serverLogPath);
 }
 
 const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderRegister(), '--import', resolveTsxLoader(), 'src/main/server.ts'], {
@@ -619,12 +666,12 @@ const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderReg
 
 serverProcess.stdout?.on('data', (chunk) => {
   process.stdout.write(chunk);
-  appendServerLog(chunk);
+  appendLog(serverLogPath, chunk);
 });
 
 serverProcess.stderr?.on('data', (chunk) => {
   process.stderr.write(chunk);
-  appendServerLog(chunk);
+  appendLog(serverLogPath, chunk);
 });
 
 serverProcess.on('exit', (code) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yancyyu/openhermit",
   "type": "module",
-  "version": "1.6.15",
+  "version": "1.6.17",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {