@yancyyu/openhermit 1.6.18 → 1.6.20

package/bin/hermit.mjs

@@ -15,7 +15,6 @@
  */
 
 import { spawn, execSync } from 'node:child_process';
-import crypto from 'node:crypto';
 import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import os from 'node:os';
@@ -96,7 +95,7 @@ const ccConnectConfigPath =
   process.env.HERMIT_CC_CONNECT_CONFIG ||
   process.env.CC_CONNECT_CONFIG ||
   path.join(hermitHome, 'cc-connect', 'config.toml');
-const bootstrapProjectNames = new Set(['default', '__openhermit_bootstrap__']);
+const starterProjectName = 'my-project';
 
 // ---------------------------------------------------------------------------
 // Update command
@@ -350,10 +349,6 @@ Please install dependencies first:
 // cc-connect sidecar
 // ---------------------------------------------------------------------------
 
-function randomToken() {
-  return crypto.randomBytes(16).toString('hex');
-}
-
 function escapeTomlPath(value) {
   return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
@@ -384,63 +379,45 @@ function isManagedBootstrapBlock(block) {
   );
 }
 
-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;
+function isStarterProjectConfig(raw) {
+  const block = findProjectBlock(raw, starterProjectName);
+  if (!block) return false;
+  const text = block.match[0];
+  return (
+    text.includes('name = "my-project"') &&
+    text.includes('type = "claudecode"') &&
+    text.includes('work_dir = "/path/to/your/project"') &&
+    text.includes('app_id = "your-feishu-app-id"') &&
+    text.includes('app_secret = "your-feishu-app-secret"')
+  );
 }
 
-function hasRealProjectEntries(raw) {
+function hasRunnableProjectEntries(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])) {
+    if (!isStarterProjectConfig(match[0]) && !isManagedBootstrapBlock(match[0])) {
       return true;
     }
   }
   return false;
 }
 
-function ensureCcConnectConfig() {
+function readCcConnectConfigState() {
   mkdirSync(path.dirname(ccConnectConfigPath), { recursive: true });
   if (!existsSync(ccConnectConfigPath)) {
-    const managementToken = randomToken();
-    const bridgeToken = randomToken();
-    const config = `data_dir = "${escapeTomlPath(path.join(hermitHome, 'cc-connect', 'data'))}"
-language = "zh"
-
-[management]
-enabled = true
-host = "127.0.0.1"
-port = 9820
-token = "${managementToken}"
-
-[bridge]
-enabled = true
-host = "127.0.0.1"
-port = 9810
-token = "${bridgeToken}"
-path = "/bridge/ws"
-
-[log]
-level = "info"
-`;
-    writeFileSync(ccConnectConfigPath, config, 'utf-8');
+    return {
+      configExists: false,
+      managementToken: process.env.CC_CONNECT_TOKEN || process.env.CC_CONNECT_MANAGEMENT_TOKEN || '',
+      bridgeToken: process.env.CC_CONNECT_BRIDGE_TOKEN || process.env.CC_CONNECT_TOKEN || '',
+      hasRunnableProjects: false,
+      isStarterConfig: false,
+    };
   }
 
-  let raw = readFileSync(ccConnectConfigPath, 'utf-8');
-  const migrated = stripManagedBootstrapProjects(raw);
-  if (migrated !== raw) {
-    raw = migrated;
-    writeFileSync(ccConnectConfigPath, raw, 'utf-8');
-  }
+  const raw = readFileSync(ccConnectConfigPath, 'utf-8');
 
   return {
+    configExists: true,
     managementToken:
       process.env.CC_CONNECT_TOKEN ||
       process.env.CC_CONNECT_MANAGEMENT_TOKEN ||
@@ -449,7 +426,8 @@ level = "info"
       process.env.CC_CONNECT_BRIDGE_TOKEN ||
       process.env.CC_CONNECT_TOKEN ||
       parseTomlToken(raw, 'bridge'),
-    hasRealProjects: hasRealProjectEntries(raw),
+    hasRunnableProjects: hasRunnableProjectEntries(raw),
+    isStarterConfig: isStarterProjectConfig(raw),
   };
 }
 
@@ -538,14 +516,53 @@ let ccTokens = {
 };
 
 if (!skipCcConnect) {
-  ccTokens = ensureCcConnectConfig();
+  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);
   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 if (!ccTokens.configExists) {
+    console.log('[openHermit] Initializing runtime config with bundled runtime service...');
+    console.log(`[openHermit] Runtime config: ${ccConnectConfigPath}`);
+    const initProcess = spawn(process.execPath, [resolveCcConnectRunner(), '-config', ccConnectConfigPath], {
+      cwd: repoRoot,
+      env: {
+        ...process.env,
+        CC_CONNECT_TOKEN: ccTokens.managementToken,
+        CC_CONNECT_MANAGEMENT_TOKEN: ccTokens.managementToken,
+        CC_CONNECT_BRIDGE_TOKEN: ccTokens.bridgeToken,
+      },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    initProcess.stdout?.on('data', (chunk) => {
+      process.stdout.write(chunk);
+      appendLog(runtimeLogPath, chunk);
+    });
+    initProcess.stderr?.on('data', (chunk) => {
+      process.stderr.write(chunk);
+      appendLog(runtimeLogPath, chunk);
+    });
+
+    const initCode = await new Promise((resolve) => {
+      initProcess.on('exit', (code) => resolve(code ?? 1));
+      initProcess.on('error', () => resolve(1));
+    });
+
+    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.');
+    } 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 {
     console.log('[openHermit] Starting bundled runtime service...');
     console.log(`[openHermit] Runtime config: ${ccConnectConfigPath}`);

package/package.json

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