@yancyyu/openhermit 1.6.16 → 1.6.18

package/bin/hermit.mjs

@@ -90,13 +90,13 @@ 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 ||
   process.env.CC_CONNECT_CONFIG ||
   path.join(hermitHome, 'cc-connect', 'config.toml');
-const bootstrapProjectName = 'default';
-const legacyBootstrapProjectName = '__openhermit_bootstrap__';
+const bootstrapProjectNames = new Set(['default', '__openhermit_bootstrap__']);
 
 // ---------------------------------------------------------------------------
 // Update command
@@ -363,36 +363,6 @@ function parseTomlToken(raw, section) {
   return match?.[1] || '';
 }
 
-function hasProjectEntries(raw) {
-  return /^\s*\[\[projects\]\]/m.test(raw);
-}
-
-function buildBootstrapProjectToml() {
-  return `
-# Internal bootstrap project used only so cc-connect can start with an otherwise empty config.
-# It is safe to keep this project; users can replace or delete it after creating real teams.
-[[projects]]
-name = "${bootstrapProjectName}"
-disabled_commands = ["*"]
-
-[projects.agent]
-type = "claudecode"
-
-[projects.agent.options]
-work_dir = "${escapeTomlPath(hermitHome)}"
-mode = "default"
-
-[[projects.platforms]]
-type = "line"
-
-[projects.platforms.options]
-channel_secret = "openhermit-bootstrap"
-channel_token = "openhermit-bootstrap"
-port = "0"
-callback_path = "/openhermit-bootstrap"
-`;
-}
-
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -414,16 +384,26 @@ function isManagedBootstrapBlock(block) {
   );
 }
 
-function migrateManagedBootstrapProject(raw) {
-  const legacyBlock = findProjectBlock(raw, legacyBootstrapProjectName);
-  if (!legacyBlock || !isManagedBootstrapBlock(legacyBlock.match[0])) return raw;
-
-  const withoutLegacy = raw.replace(legacyBlock.pattern, '').replace(/\n{3,}/g, '\n\n').trimEnd();
-  if (findProjectBlock(withoutLegacy, bootstrapProjectName)) {
-    return `${withoutLegacy}\n`;
+function stripManagedBootstrapProjects(raw) {
+  let next = raw;
+  for (const name of bootstrapProjectNames) {
+    const block = findProjectBlock(next, name);
+    if (block && isManagedBootstrapBlock(block.match[0])) {
+      next = next.replace(block.pattern, '').replace(/\n{3,}/g, '\n\n').trimEnd() + '\n';
+    }
   }
+  return next;
+}
 
-  return `${withoutLegacy}\n${buildBootstrapProjectToml()}`;
+function hasRealProjectEntries(raw) {
+  const projectPattern = /\[\[projects\]\]\nname\s*=\s*"([^"]+)"[\s\S]*?(?=\n\[\[projects\]\]|\s*$)/g;
+  for (const match of raw.matchAll(projectPattern)) {
+    const name = match[1];
+    if (!bootstrapProjectNames.has(name) || !isManagedBootstrapBlock(match[0])) {
+      return true;
+    }
+  }
+  return false;
 }
 
 function ensureCcConnectConfig() {
@@ -449,20 +429,15 @@ path = "/bridge/ws"
 
 [log]
 level = "info"
-${buildBootstrapProjectToml()}`;
+`;
     writeFileSync(ccConnectConfigPath, config, 'utf-8');
   }
 
   let raw = readFileSync(ccConnectConfigPath, 'utf-8');
-  if (!hasProjectEntries(raw)) {
-    raw = `${raw.trimEnd()}\n${buildBootstrapProjectToml()}`;
+  const migrated = stripManagedBootstrapProjects(raw);
+  if (migrated !== raw) {
+    raw = migrated;
     writeFileSync(ccConnectConfigPath, raw, 'utf-8');
-  } else {
-    const migrated = migrateManagedBootstrapProject(raw);
-    if (migrated !== raw) {
-      raw = migrated;
-      writeFileSync(ccConnectConfigPath, raw, 'utf-8');
-    }
   }
 
   return {
@@ -474,6 +449,7 @@ ${buildBootstrapProjectToml()}`;
       process.env.CC_CONNECT_BRIDGE_TOKEN ||
       process.env.CC_CONNECT_TOKEN ||
       parseTomlToken(raw, 'bridge'),
+    hasRealProjects: hasRealProjectEntries(raw),
   };
 }
 
@@ -493,6 +469,54 @@ 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');
@@ -519,6 +543,9 @@ if (!skipCcConnect) {
   const alreadyRunning = await waitForCcConnect(ccBaseUrl, ccTokens.managementToken, 1_000);
   if (alreadyRunning) {
     console.log(`[openHermit] Runtime service already running: ${ccBaseUrl}`);
+  } else if (!ccTokens.hasRealProjects) {
+    console.log('[openHermit] No runtime projects configured; starting control panel only.');
+    console.log('[openHermit] Create a team in the UI to install/configure a runtime.');
   } else {
     console.log('[openHermit] Starting bundled runtime service...');
     console.log(`[openHermit] Runtime config: ${ccConnectConfigPath}`);
@@ -531,11 +558,28 @@ if (!skipCcConnect) {
         CC_CONNECT_MANAGEMENT_TOKEN: ccTokens.managementToken,
         CC_CONNECT_BRIDGE_TOKEN: ccTokens.bridgeToken,
       },
-      stdio: 'inherit',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    ccConnectProcess.stdout?.on('data', (chunk) => {
+      process.stdout.write(chunk);
+      appendLog(runtimeLogPath, chunk);
     });
-    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.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 +621,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 +644,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.16",
+  "version": "1.6.18",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {