@yancyyu/openhermit 1.6.20 → 1.6.23

package/bin/hermit.mjs

@@ -17,6 +17,7 @@
 import { spawn, execSync } from 'node:child_process';
 import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
+import net from 'node:net';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -392,14 +393,43 @@ function isStarterProjectConfig(raw) {
   );
 }
 
-function hasRunnableProjectEntries(raw) {
+function configRequiresClaudeCode(raw) {
+  return /type\s*=\s*"claudecode"/.test(raw);
+}
+
+function hasProjectEntries(raw) {
   const projectPattern = /\[\[projects\]\]\nname\s*=\s*"([^"]+)"[\s\S]*?(?=\n\[\[projects\]\]|\s*$)/g;
-  for (const match of raw.matchAll(projectPattern)) {
-    if (!isStarterProjectConfig(match[0]) && !isManagedBootstrapBlock(match[0])) {
-      return true;
-    }
+  return [...raw.matchAll(projectPattern)].some((match) => !isManagedBootstrapBlock(match[0]));
+}
+
+function commandExists(command) {
+  try {
+    execSync(`${command} --version`, { stdio: 'ignore', shell: true });
+    return true;
+  } catch {
+    return false;
   }
-  return false;
+}
+
+function ensureClaudeCodeCliIfNeeded(raw) {
+  if (!configRequiresClaudeCode(raw) || commandExists('claude')) return;
+
+  console.log('[openHermit] Claude Code CLI not found; installing @anthropic-ai/claude-code...');
+  try {
+    execSync('npm install -g @anthropic-ai/claude-code@latest --prefer-online', {
+      stdio: 'inherit',
+      shell: true,
+    });
+  } catch (err) {
+    console.error('[openHermit] Failed to install Claude Code CLI automatically.');
+    console.error('[openHermit] Please install it manually: npm install -g @anthropic-ai/claude-code@latest');
+    throw err;
+  }
+
+  if (!commandExists('claude')) {
+    throw new Error('Claude Code CLI was installed but `claude` is still not available in PATH');
+  }
+  console.log('[openHermit] Claude Code CLI installed.');
 }
 
 function readCcConnectConfigState() {
@@ -426,8 +456,9 @@ function readCcConnectConfigState() {
       process.env.CC_CONNECT_BRIDGE_TOKEN ||
       process.env.CC_CONNECT_TOKEN ||
       parseTomlToken(raw, 'bridge'),
-    hasRunnableProjects: hasRunnableProjectEntries(raw),
+    hasProjects: hasProjectEntries(raw),
     isStarterConfig: isStarterProjectConfig(raw),
+    raw,
   };
 }
 
@@ -509,13 +540,62 @@ function resolveAliasLoaderRegister() {
   return `data:text/javascript,import { register } from "node:module"; import { pathToFileURL } from "node:url"; register(${JSON.stringify(aliasLoaderUrl)}, pathToFileURL("./"));`;
 }
 
+async function checkExistingOpenHermitServer() {
+  const url = `http://127.0.0.1:${port}`;
+  try {
+    const res = await fetch(`${url}/api/version`, { signal: AbortSignal.timeout(1000) });
+    if (res.ok) {
+      const version = (await res.text()).trim() || 'unknown';
+      return { running: true, version, url };
+    }
+  } catch {
+    // Port may be unused or owned by another process.
+  }
+  return { running: false, version: '', url };
+}
+
+async function isTcpPortAvailable(portNumber) {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    server.once('error', () => resolve(false));
+    server.once('listening', () => {
+      server.close(() => resolve(true));
+    });
+    server.listen(portNumber, '127.0.0.1');
+  });
+}
+
+async function assertWebPortAvailable() {
+  const existingServer = await checkExistingOpenHermitServer();
+  if (existingServer.running) {
+    console.log(`[openHermit] Already running: ${existingServer.url}`);
+    console.log(`[openHermit] Version: ${existingServer.version}`);
+    console.log('[openHermit] Run `openhermit stop` first, or use `openhermit --port <port>` for another instance.');
+    process.exit(0);
+  }
+
+  const available = await isTcpPortAvailable(Number.parseInt(port, 10));
+  if (!available) {
+    console.error(`[openHermit] Port ${port} is already in use.`);
+    console.error('[openHermit] Stop the existing process first, or start with another port:');
+    console.error(`  openhermit --port ${Number.parseInt(port, 10) + 1}`);
+    console.error('[openHermit] macOS/Linux: lsof -nP -iTCP:' + port + ' -sTCP:LISTEN');
+    console.error('[openHermit] Windows: netstat -ano | findstr :' + port);
+    process.exit(1);
+  }
+}
+
 let ccConnectProcess = null;
 let ccTokens = {
   managementToken: process.env.CC_CONNECT_TOKEN || process.env.CC_CONNECT_MANAGEMENT_TOKEN || '',
   bridgeToken: process.env.CC_CONNECT_BRIDGE_TOKEN || process.env.CC_CONNECT_TOKEN || '',
 };
+let runtimeSetupMode = false;
+
+await assertWebPortAvailable();
 
 if (!skipCcConnect) {
+  let shouldStartRuntime = false;
   ccTokens = readCcConnectConfigState();
   const ccBaseUrl = process.env.CC_CONNECT_BASE_URL || 'http://127.0.0.1:9820';
   const alreadyRunning = await waitForCcConnect(ccBaseUrl, ccTokens.managementToken, 1_000);
@@ -551,19 +631,33 @@ if (!skipCcConnect) {
     ccTokens = readCcConnectConfigState();
     if (initCode === 0 && ccTokens.configExists) {
       console.log('[openHermit] Runtime starter config created.');
-      console.log('[openHermit] Open the panel to finish setup before starting the runtime service.');
+      try {
+        ensureClaudeCodeCliIfNeeded(ccTokens.raw);
+      } catch {
+        printLogTail('Runtime', runtimeLogPath);
+        process.exit(1);
+      }
+      shouldStartRuntime = true;
     } else {
       console.error(`[openHermit] Runtime config initialization failed (code ${initCode}).`);
       printLogTail('Runtime', runtimeLogPath);
       process.exit(1);
     }
-  } else if (!ccTokens.hasRunnableProjects) {
-    console.log('[openHermit] Runtime config is a starter template; starting control panel only.');
-    console.log(`[openHermit] Edit runtime config in the UI before starting the runtime service.`);
-    if (ccTokens.isStarterConfig) {
-      console.log(`[openHermit] Starter config: ${ccConnectConfigPath}`);
+  } else if (ccTokens.hasProjects) {
+    try {
+      ensureClaudeCodeCliIfNeeded(ccTokens.raw);
+    } catch {
+      printLogTail('Runtime', runtimeLogPath);
+      process.exit(1);
     }
+    shouldStartRuntime = true;
   } else {
+    console.error('[openHermit] Runtime config has no projects. Please edit the config and try again.');
+    console.error(`[openHermit] Runtime config: ${ccConnectConfigPath}`);
+    process.exit(1);
+  }
+
+  if (shouldStartRuntime) {
     console.log('[openHermit] Starting bundled runtime service...');
     console.log(`[openHermit] Runtime config: ${ccConnectConfigPath}`);
     ccConnectProcess = spawn(process.execPath, [resolveCcConnectRunner(), '-config', ccConnectConfigPath], {
@@ -651,6 +745,7 @@ const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderReg
     HOST: process.env.HOST || '127.0.0.1',
     NODE_ENV: 'production',
     HERMIT_HOME: hermitHome,
+    HERMIT_RUNTIME_SETUP_MODE: runtimeSetupMode ? '1' : '0',
     CC_CONNECT_TOKEN: ccTokens.managementToken,
     CC_CONNECT_MANAGEMENT_TOKEN: ccTokens.managementToken,
     CC_CONNECT_BRIDGE_TOKEN: ccTokens.bridgeToken,

package/package.json

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

package/src/main/server.ts

@@ -68,6 +68,7 @@ const HOST = process.env.HOST ?? '127.0.0.1';
 const PORT = Number.parseInt(process.env.PORT ?? '5680', 10);
 const STATIC_DIR = process.env.STATIC_DIR ?? path.resolve(REPO_ROOT, 'dist-renderer');
 const HARNESS_BRIDGE_CONNECT_TIMEOUT_MS = 10_000;
+const RUNTIME_SETUP_MODE = process.env.HERMIT_RUNTIME_SETUP_MODE === '1';
 
 // ===========================================================================
 // Hermit runtime config — ~/.hermit/config.json
@@ -2183,6 +2184,11 @@ function isCronNotFoundError(error: unknown): boolean {
   return /(\b404\b|not found|no matching|does not exist|不存在)/i.test(message);
 }
 
+function isRuntimeUnavailableError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error);
+  return /ECONNREFUSED|ECONNRESET|ENOTFOUND|ETIMEDOUT|fetch failed|cc-connect 不可达/i.test(message);
+}
+
 app.get('/api/schedules', async () => {
   try {
     const jobs = await cc.listCronJobs();
@@ -2190,6 +2196,9 @@ app.get('/api/schedules', async () => {
     const workDirMap = await resolveTeamWorkDirs(jobs.map((job) => job.project));
     return jobs.map((job) => mapCronJobToSchedule(job, workDirMap.get(job.project) ?? ''));
   } catch (err) {
+    if (RUNTIME_SETUP_MODE && isRuntimeUnavailableError(err)) {
+      return [];
+    }
     app.log.warn({ err }, 'list schedules from cc-connect failed');
     return [];
   }