@yancyyu/openhermit 1.6.11 → 1.6.13

package/bin/hermit.mjs

@@ -16,7 +16,7 @@
 
 import { spawn, execSync } from 'node:child_process';
 import crypto from 'node:crypto';
-import { mkdirSync, writeFileSync, readFileSync, existsSync } from 'node:fs';
+import { 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';
@@ -56,14 +56,20 @@ Usage:
 Options:
   --port <number>    HTTP server port (default: 5680)
   --no-cc-connect    Do not auto-start bundled cc-connect
+  --daemon           Run openHermit in the background
   --version          Show current version
   --help             Show this help message
+  status             Show background service status
+  stop               Stop background service
   update             Check and install updates
 
 Examples:
   npx @yancyyu/openhermit             # Run without installing
   npx @yancyyu/openhermit --port 8080
   openhermit                          # After global install
+  openhermit --daemon
+  openhermit status
+  openhermit stop
   openhermit --version
   openhermit update
 `);
@@ -80,11 +86,16 @@ const portIndex = args.indexOf('--port');
 const port = portIndex !== -1 && args[portIndex + 1] ? args[portIndex + 1] : '5680';
 const skipCcConnect = args.includes('--no-cc-connect') || process.env.HERMIT_NO_CC_CONNECT === '1';
 const hermitHome = process.env.HERMIT_HOME || path.join(os.homedir(), '.hermit');
+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 ccConnectConfigPath =
   process.env.HERMIT_CC_CONNECT_CONFIG ||
   process.env.CC_CONNECT_CONFIG ||
   path.join(hermitHome, 'cc-connect', 'config.toml');
-const bootstrapProjectName = '__openhermit_bootstrap__';
+const bootstrapProjectName = 'default';
+const legacyBootstrapProjectName = '__openhermit_bootstrap__';
 
 // ---------------------------------------------------------------------------
 // Update command
@@ -141,6 +152,171 @@ async function runUpdate() {
   }
 }
 
+function readDaemonPid() {
+  try {
+    const raw = readFileSync(daemonPidPath, 'utf-8').trim();
+    const pid = Number.parseInt(raw, 10);
+    return Number.isFinite(pid) && pid > 0 ? pid : null;
+  } catch {
+    return null;
+  }
+}
+
+function isPidRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function removeDaemonPidFile() {
+  try {
+    unlinkSync(daemonPidPath);
+  } catch {
+    // Already gone.
+  }
+}
+
+function signalDaemon(pid, signal) {
+  if (!pid) return false;
+  try {
+    process.kill(-pid, signal);
+    return true;
+  } catch {
+    // Fall back to direct process signal.
+  }
+  try {
+    process.kill(pid, signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function collectFallbackPids() {
+  const pids = new Set();
+  const commands = [
+    `lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null || true`,
+    'lsof -tiTCP:9810 -sTCP:LISTEN 2>/dev/null || true',
+    'lsof -tiTCP:9820 -sTCP:LISTEN 2>/dev/null || true',
+    "pgrep -f '@yancyyu/openhermit|openhermit/bin/hermit\\.mjs|src/main/server\\.ts|cc-connect' 2>/dev/null || true",
+  ];
+
+  for (const command of commands) {
+    try {
+      const out = execSync(command, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
+      for (const line of out.split(/\s+/)) {
+        const pid = Number.parseInt(line, 10);
+        if (Number.isFinite(pid) && pid > 0 && pid !== process.pid) {
+          pids.add(pid);
+        }
+      }
+    } catch {
+      // Ignore missing lsof/pgrep or races with exiting processes.
+    }
+  }
+
+  return [...pids];
+}
+
+async function stopFallbackProcesses() {
+  const pids = collectFallbackPids();
+  if (pids.length === 0) return false;
+
+  for (const pid of pids) {
+    signalDaemon(pid, 'SIGTERM');
+  }
+  await new Promise((resolve) => setTimeout(resolve, 2_000));
+  for (const pid of pids) {
+    if (isPidRunning(pid)) {
+      signalDaemon(pid, 'SIGKILL');
+    }
+  }
+  return true;
+}
+
+function printDaemonStatus() {
+  const pid = readDaemonPid();
+  if (pid && isPidRunning(pid)) {
+    console.log(`[openHermit] Running in background (pid ${pid})`);
+    console.log(`[openHermit] Log: ${daemonLogPath}`);
+    process.exit(0);
+  }
+  if (pid) removeDaemonPidFile();
+  const fallbackPids = collectFallbackPids();
+  if (fallbackPids.length > 0) {
+    console.log(`[openHermit] Running without daemon pidfile (pids ${fallbackPids.join(', ')})`);
+    process.exit(0);
+  }
+  console.log('[openHermit] Not running');
+  process.exit(1);
+}
+
+async function stopDaemon() {
+  const pid = readDaemonPid();
+  if (!pid || !isPidRunning(pid)) {
+    if (pid) removeDaemonPidFile();
+    const stoppedFallback = await stopFallbackProcesses();
+    console.log(stoppedFallback ? '[openHermit] Stopped orphaned service processes' : '[openHermit] Not running');
+    process.exit(0);
+  }
+  console.log(`[openHermit] Stopping background service (pid ${pid})...`);
+  signalDaemon(pid, 'SIGTERM');
+  await new Promise((resolve) => setTimeout(resolve, 2_000));
+  if (isPidRunning(pid)) {
+    signalDaemon(pid, 'SIGKILL');
+  }
+  removeDaemonPidFile();
+  console.log('[openHermit] Stopped');
+  process.exit(0);
+}
+
+function startDaemon() {
+  const existingPid = readDaemonPid();
+  if (existingPid && isPidRunning(existingPid)) {
+    console.log(`[openHermit] Already running in background (pid ${existingPid})`);
+    console.log(`[openHermit] Log: ${daemonLogPath}`);
+    process.exit(0);
+  }
+
+  mkdirSync(path.dirname(daemonPidPath), { recursive: true });
+  mkdirSync(path.dirname(daemonLogPath), { recursive: true });
+  const out = openSync(daemonLogPath, 'a');
+  const err = openSync(daemonLogPath, 'a');
+  const childArgs = process.argv.slice(2).filter((arg) => arg !== '--daemon');
+  const child = spawn(process.execPath, [fileURLToPath(import.meta.url), ...childArgs], {
+    cwd: repoRoot,
+    detached: true,
+    env: {
+      ...process.env,
+      HERMIT_DAEMON_CHILD: '1',
+    },
+    stdio: ['ignore', out, err],
+  });
+  child.unref();
+  closeSync(out);
+  closeSync(err);
+  writeFileSync(daemonPidPath, String(child.pid), 'utf-8');
+  console.log(`[openHermit] Started in background (pid ${child.pid})`);
+  console.log(`[openHermit] URL: http://127.0.0.1:${port}`);
+  console.log(`[openHermit] Log: ${daemonLogPath}`);
+  process.exit(0);
+}
+
+if (args.includes('status')) {
+  printDaemonStatus();
+}
+
+if (args.includes('stop')) {
+  await stopDaemon();
+}
+
+if (daemonRequested && !daemonChild) {
+  startDaemon();
+}
+
 // ---------------------------------------------------------------------------
 // Check dependencies
 // ---------------------------------------------------------------------------
@@ -216,21 +392,37 @@ callback_path = "/openhermit-bootstrap"
 `;
 }
 
-function migrateManagedBootstrapProject(raw) {
-  const projectPattern = /(^|\n)(#.*\n)*\[\[projects\]\]\nname\s*=\s*"__openhermit_bootstrap__"[\s\S]*?(?=\n(#.*\n)*\[\[projects\]\]|\s*$)/m;
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function findProjectBlock(raw, name) {
+  const projectPattern = new RegExp(
+    `\\[\\[projects\\]\\]\\nname\\s*=\\s*"${escapeRegExp(name)}"[\\s\\S]*?(?=\\n\\[\\[projects\\]\\]|\\s*$)`
+  );
   const match = raw.match(projectPattern);
-  if (!match) return raw;
+  return match ? { pattern: projectPattern, match } : null;
+}
 
-  const block = match[0];
-  const isLegacyManagedBootstrap =
-    block.includes('type = "feishu"') &&
-    block.includes('app_id = "placeholder"') &&
-    block.includes('app_secret = "placeholder"');
+function isManagedBootstrapBlock(block) {
+  return (
+    block.includes('disabled_commands = ["*"]') &&
+    (block.includes('app_id = "placeholder"') ||
+      block.includes('channel_token = "openhermit-bootstrap"') ||
+      block.includes('callback_path = "/openhermit-bootstrap"'))
+  );
+}
 
-  if (!isLegacyManagedBootstrap) return raw;
+function migrateManagedBootstrapProject(raw) {
+  const legacyBlock = findProjectBlock(raw, legacyBootstrapProjectName);
+  if (!legacyBlock || !isManagedBootstrapBlock(legacyBlock.match[0])) return raw;
 
-  const prefix = match[1] === '\n' ? '\n' : '';
-  return raw.replace(projectPattern, `${prefix}${buildBootstrapProjectToml().trimStart()}`);
+  const withoutLegacy = raw.replace(legacyBlock.pattern, '').replace(/\n{3,}/g, '\n\n').trimEnd();
+  if (findProjectBlock(withoutLegacy, bootstrapProjectName)) {
+    return `${withoutLegacy}\n`;
+  }
+
+  return `${withoutLegacy}\n${buildBootstrapProjectToml()}`;
 }
 
 function ensureCcConnectConfig() {
@@ -331,6 +523,7 @@ if (!skipCcConnect) {
     console.log(`[openHermit] cc-connect config: ${ccConnectConfigPath}`);
     ccConnectProcess = spawn(process.execPath, [resolveCcConnectRunner(), '-config', ccConnectConfigPath], {
       cwd: repoRoot,
+      detached: true,
       env: {
         ...process.env,
         CC_CONNECT_TOKEN: ccTokens.managementToken,
@@ -385,6 +578,7 @@ console.log('[openHermit] Launching server...\n');
 
 const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderRegister(), '--import', resolveTsxLoader(), 'src/main/server.ts'], {
   cwd: repoRoot,
+  detached: true,
   env: {
     ...process.env,
     PORT: port,
@@ -400,22 +594,34 @@ const serverProcess = spawn(process.execPath, ['--import', resolveAliasLoaderReg
 });
 
 serverProcess.on('exit', (code) => {
+  if (shuttingDown) return;
+  signalDaemon(ccConnectProcess?.pid, 'SIGTERM');
   if (code !== 0) {
     console.error(`[openHermit] Server exited with code ${code}`);
     process.exit(code ?? 1);
   }
 });
 
-process.on('SIGINT', () => {
+let shuttingDown = false;
+function shutdown(exitCode = 0) {
+  if (shuttingDown) return;
+  shuttingDown = true;
   console.log('\n[openHermit] Shutting down...');
-  serverProcess.kill('SIGINT');
-  ccConnectProcess?.kill('SIGINT');
+  signalDaemon(serverProcess?.pid, 'SIGTERM');
+  signalDaemon(ccConnectProcess?.pid, 'SIGTERM');
+  setTimeout(() => {
+    signalDaemon(serverProcess?.pid, 'SIGKILL');
+    signalDaemon(ccConnectProcess?.pid, 'SIGKILL');
+    process.exit(exitCode);
+  }, 2_000).unref();
+}
+
+process.on('SIGINT', () => {
+  shutdown(0);
 });
 
 process.on('SIGTERM', () => {
-  console.log('\n[openHermit] Shutting down...');
-  serverProcess.kill('SIGTERM');
-  ccConnectProcess?.kill('SIGTERM');
+  shutdown(0);
 });
 
 console.log(`[openHermit] Server starting on http://127.0.0.1:${port}`);

package/package.json

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

package/src/main/server.ts

@@ -1033,30 +1033,22 @@ 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);
-        restartRequired = result.restart_required === true;
-        await svc.updateTeam(teamName, {
-          pendingDelete: true,
-          restartRequired,
-        });
+        if (result.restart_required) {
+          await cc.restart();
+        }
       } catch (err) {
         request.log.warn({ err, teamName }, 'delete cc-connect project failed or project missing');
-        try {
-          await svc.updateTeam(teamName, {
-            pendingDelete: true,
-            restartRequired: true,
-          });
-          restartRequired = true;
-        } catch {
-          // Local metadata may already be gone; keep deletion best-effort.
-        }
       }
-      if (request.query.deleteFiles === 'true') {
-        await svc.deleteTeam(teamName, { deleteFiles: true });
+
+      try {
+        await svc.deleteTeam(teamName, { deleteFiles: request.query.deleteFiles === 'true' });
+      } catch (err) {
+        request.log.warn({ err, teamName }, 'delete local team metadata failed or already missing');
       }
-      return { ok: true, restartRequired };
+
+      return { ok: true, restartRequired: false };
     } catch (err) {
       return reply.code(500).send(reply500(err));
     }

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

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

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

@@ -531,28 +531,15 @@ export const TeamListView = (): React.JSX.Element => {
           return;
         }
         const confirmed = await confirm({
-          title: '移入回收站',
-          message: `确定将团队“${teamDisplayName}”移入回收站吗？之后可以恢复。`,
-          confirmLabel: '移入回收站',
+          title: '删除团队',
+          message: `确定删除团队“${teamDisplayName}”吗？此操作会同步删除 cc-connect 项目并移除本地团队数据。`,
+          confirmLabel: '删除',
           cancelLabel: '取消',
           variant: 'danger',
         });
         if (confirmed) {
           try {
-            const result = await deleteTeam(teamName);
-            if (result.restartRequired) {
-              const shouldRestart = await confirm({
-                title: '需要重启 cc-connect',
-                message:
-                  '已调用 cc-connect 删除团队配置。cc-connect 需要重启后才会真正移除该团队并停止相关运行时。',
-                confirmLabel: '立即重启',
-                cancelLabel: '稍后重启',
-                variant: 'danger',
-              });
-              if (shouldRestart) {
-                await api.ccSettings.restart();
-              }
-            }
+            await deleteTeam(teamName);
           } catch {
             // error via store
           }