ai_co_discuss 0.3.35 → 0.3.37

package/docs/en/runner.md

@@ -91,6 +91,7 @@ Permissions are set per automatically started CLI member and default to read-onl
 | Open the local site | `codiscuss local open` |
 | Show status | `codiscuss local status` |
 | Stop | `codiscuss local stop` |
+| Restart the discussion service (picks up new environment variables; run it from a terminal that has them) | `codiscuss service restart` |
 | Start at login (Windows) | `codiscuss service autostart on` |
 
 ## Command Line

package/docs/runner.md

@@ -110,6 +110,7 @@ API 成员可以担任专家或主持人。房间指定了项目目录时，它
 | 打开本机网站 | `codiscuss local open` |
 | 查看状态 | `codiscuss local status` |
 | 停止 | `codiscuss local stop` |
+| 重启讨论服务（使新环境变量生效，须在已有新值的终端执行） | `codiscuss service restart` |
 | 登录时自动启动（Windows） | `codiscuss service autostart on` |
 
 ## 命令行

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },

package/runner/discussion_local.mjs

@@ -1,4 +1,4 @@
-/** Own the local website and only the discussion service started by this supervisor. */
+/** Own the local website and the discussion service it starts; local stop also stops a pre-existing service. */
 import { spawn } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
 import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, unlinkSync } from 'node:fs';
@@ -226,16 +226,15 @@ export function restart_reason(home = service_home()) {
   return null;
 }
 
-/** Ask the owned supervisor to stop, retaining its database and user configuration. */
+/** Stop the supervisor and any discussion service, retaining the database and user configuration. */
 async function stop_local(home) {
-  if (!local_status(home).pid) return local_status(home);
-  const path = join(home, 'local', 'stop.request');
-  atomic_json(path, { requested_at: Date.now() });
-  for (let waited = 0; waited < STOP_WAIT_MS; waited += POLL_MS) {
-    if (!local_status(home).pid) return local_status(home);
-    await sleep(POLL_MS);
+  if (local_status(home).pid) {
+    atomic_json(join(home, 'local', 'stop.request'), { requested_at: Date.now() });
+    for (let waited = 0; waited < STOP_WAIT_MS && local_status(home).pid; waited += POLL_MS) await sleep(POLL_MS);
+    if (local_status(home).pid) throw new Error('本机服务尚未停止，请查看 local/supervisor.log');
   }
-  throw new Error('本机服务尚未停止，请查看 local/supervisor.log');
+  if (service_pid(home)) await service_main(['stop'], () => {});
+  return local_status(home);
 }
 
 /** Open the supervisor's loopback URL or a website explicitly authorized by local connect. */
@@ -258,8 +257,7 @@ function local_summary(command, result, opened) {
     status: result.running ? [`本机网站运行中：${site}`]
       : result.website_running ? [`本机网站运行中：${site}，但讨论服务未运行；运行 codiscuss local open 恢复`]
         : ['本机网站未运行；运行 codiscuss local open 启动'],
-    stop: result.service_pid ? [`本机网站已停止；独立讨论服务仍在运行（PID ${result.service_pid}），可用 codiscuss service stop 单独停止；数据已保留`]
-      : ['本机网站与讨论服务已停止；数据已保留，运行 codiscuss local open 重新启动'],
+    stop: ['本机网站与讨论服务已停止；数据已保留，运行 codiscuss local open 重新启动'],
     connect: [`已连接 ${result.connected}；本机网站 ${tone.cyan(result.local_url || '')}`,
       opened ? '已在浏览器打开连接链接，请在该页面完成接入；连接链接不要转发' : `请在浏览器打开连接链接完成接入，链接不要转发：${result.url}`],
     disconnect: [`已撤销 ${result.disconnected} 的本机启动权限；正在运行的讨论需在进度看板暂停`],

package/runner/discussion_service.mjs

@@ -43,7 +43,7 @@ const REPO_ROOT = dirname(dirname(SCRIPT));
 const SHORTCUT_NAME = 'AI CoDiscuss 讨论服务.lnk';
 const TICK_STATES = { undefined: 'running', waiting: 'paused', false: 'idle' };
 const STATUS_LABELS = { running: '运行中', paused: '已暂停', idle: '等待启动', error: '异常' };
-const USAGE = '用法: discussion_service.mjs start|stop|status|open|run|list|add|remove|clean|shortcut|autostart [--config 私有配置.json] [on|off]';
+const USAGE = '用法: discussion_service.mjs start|stop|restart|status|open|run|list|add|remove|clean|shortcut|autostart [--config 私有配置.json] [on|off]';
 export const CONNECTION_FIELDS = ['executable', 'ipc_directory'];
 
 /** Read one atomic configuration version for editing and worker acknowledgement. */
@@ -798,6 +798,7 @@ export async function main(args = process.argv.slice(2), print = value => proces
     case 'run': return run_service(home);
     case 'start': return print(await start_service(home));
     case 'stop': return print(await stop_service(home));
+    case 'restart': await stop_service(home); return print(await start_service(home));
     case 'status': return print(service_status(home));
     case 'open': return print({ ...(await start_service(home)), opened: open_sites(home) });
     case 'list': return print({ home, configs: read_registry(home) });