@yancyyu/openhermit 1.6.13 → 1.6.15

package/bin/alias-loader.mjs

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import path from 'node:path';
-import { pathToFileURL } from 'node:url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 
-const repoRoot = path.resolve(path.dirname(new URL(import.meta.url).pathname), '..');
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 
 const ALIASES = [
   ['@features/', 'src/features/'],

package/bin/hermit.mjs

@@ -16,7 +16,7 @@
 
 import { spawn, execSync } from 'node:child_process';
 import crypto from 'node:crypto';
-import { closeSync, existsSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import os from 'node:os';
 import path from 'node:path';
@@ -55,7 +55,7 @@ Usage:
 
 Options:
   --port <number>    HTTP server port (default: 5680)
-  --no-cc-connect    Do not auto-start bundled cc-connect
+  --no-cc-connect    Do not auto-start bundled runtime service
   --daemon           Run openHermit in the background
   --version          Show current version
   --help             Show this help message
@@ -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 serverLogPath = path.join(hermitHome, 'logs', 'openhermit-server.log');
 const ccConnectConfigPath =
   process.env.HERMIT_CC_CONNECT_CONFIG ||
   process.env.CC_CONNECT_CONFIG ||
@@ -517,10 +518,10 @@ if (!skipCcConnect) {
   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] cc-connect already running: ${ccBaseUrl}`);
+    console.log(`[openHermit] Runtime service already running: ${ccBaseUrl}`);
   } else {
-    console.log('[openHermit] Starting bundled cc-connect...');
-    console.log(`[openHermit] cc-connect config: ${ccConnectConfigPath}`);
+    console.log('[openHermit] Starting bundled runtime service...');
+    console.log(`[openHermit] Runtime config: ${ccConnectConfigPath}`);
     ccConnectProcess = spawn(process.execPath, [resolveCcConnectRunner(), '-config', ccConnectConfigPath], {
       cwd: repoRoot,
       detached: true,
@@ -534,7 +535,7 @@ if (!skipCcConnect) {
     });
     const ready = await waitForCcConnect(ccBaseUrl, ccTokens.managementToken, 30_000);
     if (!ready) {
-      console.warn('[openHermit] cc-connect did not become ready within 30s; openHermit will keep trying via API.');
+      console.warn('[openHermit] Runtime service did not become ready within 30s; openHermit will keep trying via API.');
     }
   }
 }
@@ -576,6 +577,29 @@ 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}`);
+  }
+}
+
 const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderRegister(), '--import', resolveTsxLoader(), 'src/main/server.ts'], {
   cwd: repoRoot,
   detached: true,
@@ -590,7 +614,17 @@ const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderReg
     CC_CONNECT_BRIDGE_TOKEN: ccTokens.bridgeToken,
     CC_CONNECT_CONFIG: ccConnectConfigPath,
   },
-  stdio: 'inherit',
+  stdio: ['ignore', 'pipe', 'pipe'],
+});
+
+serverProcess.stdout?.on('data', (chunk) => {
+  process.stdout.write(chunk);
+  appendServerLog(chunk);
+});
+
+serverProcess.stderr?.on('data', (chunk) => {
+  process.stderr.write(chunk);
+  appendServerLog(chunk);
 });
 
 serverProcess.on('exit', (code) => {
@@ -598,6 +632,7 @@ serverProcess.on('exit', (code) => {
   signalDaemon(ccConnectProcess?.pid, 'SIGTERM');
   if (code !== 0) {
     console.error(`[openHermit] Server exited with code ${code}`);
+    printServerLogTail();
     process.exit(code ?? 1);
   }
 });

package/bin/postinstall.mjs

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+import { readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+
+let version = 'unknown';
+try {
+  version = JSON.parse(readFileSync(path.join(packageRoot, 'package.json'), 'utf-8')).version;
+} catch {
+  // Keep install non-blocking.
+}
+
+let runtimeVersion = 'bundled';
+try {
+  runtimeVersion = JSON.parse(readFileSync(require.resolve('cc-connect/package.json'), 'utf-8')).version;
+} catch {
+  // Keep install non-blocking.
+}
+
+const hermitHome = process.env.HERMIT_HOME || path.join(os.homedir(), '.hermit');
+
+console.log(`[openHermit] Installed ${version}`);
+console.log(`[openHermit] Bundled runtime service: ${runtimeVersion}`);
+console.log(`[openHermit] Data directory: ${hermitHome}`);
+console.log('[openHermit] Start with: openhermit');
+console.log('[openHermit] Background mode: openhermit --daemon');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yancyyu/openhermit",
   "type": "module",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {
@@ -34,6 +34,7 @@
     "dev:server": "tsx watch src/main/server.ts",
     "dev:web": "vite --config vite.web.config.ts",
     "build:web": "vite build --config vite.web.config.ts --outDir ../../dist-renderer --emptyOutDir",
+    "postinstall": "node ./bin/postinstall.mjs",
     "prepack": "pnpm build:web",
     "start": "node bin/hermit.mjs",
     "typecheck": "tsc --noEmit",

package/src/main/server.ts

@@ -50,6 +50,16 @@ import { TaskDispatchService } from './services/teams-mvp/TaskDispatchService';
 import type { TaskBusConfig } from '@shared/types/team';
 import { UpdateService } from './services/UpdateService';
 
+process.on('uncaughtException', (err) => {
+  console.error('[openHermit:server] uncaughtException', err);
+  process.exit(1);
+});
+
+process.on('unhandledRejection', (reason) => {
+  console.error('[openHermit:server] unhandledRejection', reason);
+  process.exit(1);
+});
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(path.join(__dirname, '../../package.json'), 'utf-8'));
 const REPO_ROOT = path.resolve(__dirname, '..', '..');
@@ -1033,11 +1043,10 @@ app.delete<{ Params: { name: string }; Querystring: { deleteFiles?: string } }>(
   async (request, reply) => {
     const teamName = request.params.name;
     try {
+      let restartRequired = false;
       try {
         const result = await cc.deleteProject(teamName);
-        if (result.restart_required) {
-          await cc.restart();
-        }
+        restartRequired = result.restart_required === true;
       } catch (err) {
         request.log.warn({ err, teamName }, 'delete cc-connect project failed or project missing');
       }
@@ -1048,7 +1057,7 @@ app.delete<{ Params: { name: string }; Querystring: { deleteFiles?: string } }>(
         request.log.warn({ err, teamName }, 'delete local team metadata failed or already missing');
       }
 
-      return { ok: true, restartRequired: false };
+      return { ok: true, restartRequired };
     } catch (err) {
       return reply.code(500).send(reply500(err));
     }

package/src/renderer/components/settings/sections/PlatformsSection.tsx

@@ -7,6 +7,8 @@
 
 import { useCallback, useEffect, useState } from 'react';
 
+import { api } from '@renderer/api';
+import { confirm } from '@renderer/components/common/ConfirmDialog';
 import { Button } from '@renderer/components/ui/button';
 import {
   Dialog,
@@ -198,14 +200,20 @@ async function addPlatform(
   projectName: string,
   type: string,
   options: Record<string, string>
-): Promise<void> {
+): Promise<{ restartRequired: boolean }> {
   const res = await fetch(`/api/v1/projects/${encodeURIComponent(projectName)}/add-platform`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ type, options }),
   });
-  const json = (await res.json()) as { ok: boolean; error?: string };
+  const json = (await res.json()) as {
+    ok: boolean;
+    error?: string;
+    data?: { restart_required?: boolean };
+    restart_required?: boolean;
+  };
   if (!json.ok) throw new Error(json.error ?? '添加失败');
+  return { restartRequired: json.data?.restart_required === true || json.restart_required === true };
 }
 
 // ---------------------------------------------------------------------------
@@ -482,8 +490,19 @@ function AddPlatformDialog({
         else if (v === 'false') ccOptions[k] = false;
         else ccOptions[k] = v;
       }
-      await addPlatform(projectName, platformType, ccOptions as Record<string, string>);
+      const result = await addPlatform(projectName, platformType, ccOptions as Record<string, string>);
       onAdded(projectName);
+      if (result.restartRequired) {
+        const shouldRestart = await confirm({
+          title: '重启 cc-connect',
+          message: '渠道已添加。需要重启 cc-connect 才会生效。',
+          confirmLabel: '立即重启',
+          cancelLabel: '稍后重启',
+        });
+        if (shouldRestart) {
+          await api.ccSettings.restart();
+        }
+      }
     } catch (e) {
       setError(e instanceof Error ? e.message : '添加失败');
     } finally {

package/src/renderer/components/team/TeamDetailView.tsx

@@ -1830,7 +1830,19 @@ export const TeamDetailView = ({
     setDeleteConfirmOpen(false);
     void (async () => {
       try {
-        await deleteTeam(teamName);
+        const result = await deleteTeam(teamName);
+        if (result.restartRequired) {
+          const shouldRestart = await confirm({
+            title: '重启 cc-connect',
+            message: '团队已从配置中删除。需要重启 cc-connect 才会停止对应运行时。',
+            confirmLabel: '立即重启',
+            cancelLabel: '稍后重启',
+            variant: 'danger',
+          });
+          if (shouldRestart) {
+            await api.ccSettings.restart();
+          }
+        }
         if (tabId) closeTab(tabId);
         openTeamsTab();
       } catch {

package/src/renderer/components/team/TeamListView.tsx

@@ -539,7 +539,19 @@ export const TeamListView = (): React.JSX.Element => {
         });
         if (confirmed) {
           try {
-            await deleteTeam(teamName);
+            const result = await deleteTeam(teamName);
+            if (result.restartRequired) {
+              const shouldRestart = await confirm({
+                title: '重启 cc-connect',
+                message: '团队已从配置中删除。需要重启 cc-connect 才会停止对应运行时。',
+                confirmLabel: '立即重启',
+                cancelLabel: '稍后重启',
+                variant: 'danger',
+              });
+              if (shouldRestart) {
+                await api.ccSettings.restart();
+              }
+            }
           } catch {
             // error via store
           }