ai_co_discuss 0.2.87 → 0.2.89

package/runner/discussion_runner.mjs

@@ -7,7 +7,7 @@ import { DatabaseSync } from 'node:sqlite';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { parseArgs } from 'node:util';
 import { setTimeout as sleep } from 'node:timers/promises';
-import { agy_command_rule, atomic_json, deliver_task, remove_agy_projects, setup_sidecar, sidecar_receipt, TASK_SUBCOMMANDS } from './discussion_adapters.mjs';
+import { agy_command_rule, atomic_json, deliver_task, remove_agy_projects, SegmentLog, setup_sidecar, sidecar_receipt, TASK_SUBCOMMANDS } from './discussion_adapters.mjs';
 import { read_api_key } from './discussion_api.mjs';
 import { with_expert_prompt } from './expert_prompts.mjs';
 import { decide_interjection, decide_next_speaker, decide_round, validate_scheduler } from './scheduler.mjs';
@@ -25,6 +25,8 @@ function windows_rg() {
 const AUTO_ENTER_ADAPTERS = new Set(['codex_cli', 'claude', 'antigravity_cli']);
 const DELIVERY_RETRY_DELAYS_MS = [2000, 4000];
 const RENEW_MS = 30_000;
+/** Recorded phase segments are reported quietly, waking no page, so they may go every tick. */
+const PROGRESS_REPORT_MS = 2_000;
 const ADAPTER_NAMES = ['codex', 'claude', 'antigravity', 'codex_cli', 'antigravity_cli', 'api'];
 export const CODEX_ADAPTERS = ['codex', 'codex_cli'];
 const REPO_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
@@ -213,8 +215,9 @@ export function task_files(config, event, token, binding, { suggestions = [], en
   const access_path = join(config.directory, `${id}.access.json`);
   const task_path = join(config.directory, `${id}.task.json`);
   atomic_json(access_path, { site: config.site, room: config.room, token, session_id: binding.session_id || '' });
-  const skills = [join(config.project, '.agents/skills/discuss-participant/SKILL.md')];
-  if (event.role === 'host') skills.push(join(config.project, '.agents/skills/discuss-host/SKILL.md'));
+  // Each skill's core plus its discussion-room page, so the task needs no detour through the skills' scenario tables.
+  const skills = [...['discuss-participant/SKILL.md', 'discuss-participant/references/discussion.md'],
+    ...event.role === 'host' ? ['discuss-host/SKILL.md', 'discuss-host/references/discussion.md'] : []].map(file => join(config.project, '.agents/skills', file));
   const adapter = config.participants[event.participant];
   const auto_enter = entered || AUTO_ENTER_ADAPTERS.has(adapter.adapter);
   const bound_access = process_access && AUTO_ENTER_ADAPTERS.has(adapter.adapter);
@@ -257,6 +260,7 @@ export class DiscussionRunner {
     this.seen = new Set();
     this.blocked = new Set();
     this.fetch = fetch_impl;
+    this.segments = new SegmentLog();
   }
   /** Append one timestamped stage to the event's trace file when CODISCUSS_TRACE=1; tracing must never affect delivery. */
   trace(id, stage, detail = {}) {
@@ -290,6 +294,7 @@ export class DiscussionRunner {
     try {
       const task = task_files(this.config, event, row.token, binding, { suggestions, entered: pre_entered, process_access: true });
       invoked = true;
+      this.segments.start(row.id);
       const result = await this.deliver(adapter, binding, { ...task, room_title: this.room_title,
         api_context: { site: this.config.site, room: this.config.room, token: row.token, home: this.config.api_home,
           event_id: row.id, role: event.role, turn_id: event.turn_id, scheduler_suggestions: suggestions, entered: pre_entered },
@@ -300,7 +305,8 @@ export class DiscussionRunner {
           if (AUTO_ENTER_ADAPTERS.has(adapter.adapter) && !entered) { entered = true; this.enter(row, session); }
         },
         on_process: child => this.track(event.participant, child),
-        on_output: (path, chunk) => appendFileSync(path, chunk, { mode: 0o600 }),
+        on_output: (path, chunk) => { appendFileSync(path, chunk, { mode: 0o600 }); this.segments.mark(row.id); },
+        on_activity: (phase, tool) => this.segments.mark(row.id, phase, tool),
         on_failure: error => { try { this.store.record(row.id, { error }); } catch { /* Store may already be closed at shutdown. */ } },
         on_exit: detail => this.exited.set(row.id, detail || ''),
       });
@@ -479,6 +485,7 @@ export class DiscussionRunner {
   async reconcile(row, event) {
     if (['completed', 'cancelled', 'failed'].includes(event.status)) {
       this.store.record(row.id, { status: event.status });
+      await this.report_segments(row.id, true);
       return;
     }
     // No app call occurs before dispatching is persisted. Reconcile a reserve response loss safely.
@@ -520,10 +527,17 @@ export class DiscussionRunner {
       }
       this.store.record(row.id, { status: 'started', last_renew: Date.now(), error: '' });
     }
+    if (this.segments.due(row.id, PROGRESS_REPORT_MS)) await this.report_segments(row.id);
+  }
+  /** Send the execution's recorded phase segments; `final` sends the rest once it has ended. */
+  report_segments(id, final = false) {
+    // Discussion executions keep no progress notes, so a report always carries segments.
+    return this.segments.report(id, final, ({ segments }) => api(this.config, `/events/${id}`, { action: 'segments', segments }));
   }
   /** Preserve the cause on the website and revoke work before asking for intervention. */
   async fail(row, reason) {
     this.log(`执行 #${row.id} 失败：${reason}`);
+    await this.report_segments(row.id, true);
     try { await api(this.config, `/events/${row.id}`, { action: 'fail', reason }); }
     catch (error) {
       if (!/HTTP 409/.test(error.message)) throw error;

package/runner/discussion_service.mjs

@@ -1,7 +1,7 @@
 /** Resident local service that dispatches registered rooms to software or configured API participants. */
 import { spawn, spawnSync } from 'node:child_process';
 import { createHash, randomUUID } from 'node:crypto';
-import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readdirSync, readFileSync, realpathSync, renameSync, unlinkSync } from 'node:fs';
+import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readdirSync, readFileSync, readSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
@@ -17,12 +17,18 @@ const REMOTE_SYNC_MS = 3000;
 const START_WAIT_MS = 5000;
 const STOP_WAIT_MS = 20_000;
 const REGISTRY_WAIT_MS = 5000;
+// Housekeeping: logs above the limit keep only their newest part; a launch folder no room uses is removed once it is this old.
+const SWEEP_MS = 6 * 60 * 60 * 1000;
+const LOG_LIMIT_BYTES = 5 * 1024 * 1024;
+const LOG_KEEP_BYTES = 1024 * 1024;
+const STALE_LAUNCH_MS = 7 * 24 * 60 * 60 * 1000;
+const SERVICE_LOGS = ['service.log', join('local', 'website.log'), join('local', 'supervisor.log')];
 const SCRIPT = fileURLToPath(import.meta.url);
 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|shortcut|autostart [--config 私有配置.json] [on|off]';
+const USAGE = '用法: discussion_service.mjs start|stop|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. */
@@ -351,10 +357,13 @@ export class DiscussionService {
       await worker.tick();
       if (!worker.removed) continue;
       // The room no longer exists on its website, so there is nothing to pause; drop the registration once.
+      const directory = worker.config?.directory;
       await worker.close(false);
       this.workers.delete(path);
       try { unregister_room(this.home, path); } catch { /* Already removed by another command. */ }
-      this.log(`${worker.state.site || ''}/${worker.state.room || path}: 房间已在网站删除，已撤销登记`);
+      // Its runtime, task files and answer drafts serve no one now; a file still held is left to the periodic sweep.
+      try { remove_room_files(this.home, path, directory); } catch (error) { this.log(`${worker.state.room || path}: 本机文件未能删除，稍后清理：${error.message}`); }
+      this.log(`${worker.state.site || ''}/${worker.state.room || path}: 房间已在网站删除，已撤销登记并删除本机文件`);
     }
     atomic_json(join(this.home, 'status.json'), { pid: process.pid, updated_at: Math.floor(Date.now() / 1000),
       rooms: [...this.workers.values()].map(worker => worker.state) });
@@ -366,6 +375,64 @@ export class DiscussionService {
   }
 }
 
+/** Delete one room's local files: its answer drafts, and its launch folder when the service created it under launches/. */
+export function remove_room_files(home, config_path, data_directory) {
+  const folder = dirname(resolve(config_path));
+  for (const directory of [data_directory, folder, join(folder, 'runtime')].filter(Boolean)) {
+    rmSync(service_drafts(home, directory), { recursive: true, force: true });
+  }
+  if (dirname(folder) === resolve(home, 'launches')) rmSync(folder, { recursive: true, force: true });
+}
+
+/** Keep only the newest part of a log that grew past the limit; writers append, so they continue at its new end. */
+function trim_log(path) {
+  if (!existsSync(path) || statSync(path).size <= LOG_LIMIT_BYTES) return false;
+  const size = statSync(path).size, tail = Buffer.alloc(LOG_KEEP_BYTES);
+  const handle = openSync(path, 'r');
+  try { readSync(handle, tail, 0, LOG_KEEP_BYTES, size - LOG_KEEP_BYTES); } finally { closeSync(handle); }
+  // Start at a whole line so the kept part does not open mid-entry.
+  writeFileSync(path, tail.subarray(tail.indexOf(10) + 1));
+  return true;
+}
+
+/** The newest change time of a launch folder's own records, which a pending launch still updates. */
+function launch_touched(folder) {
+  return Math.max(...[folder, join(folder, 'launch.json'), join(folder, 'config.json')].filter(existsSync).map(path => statSync(path).mtimeMs));
+}
+
+/**
+ * Remove what no registered room uses: launch folders left by rooms deleted while the service was off, or launches
+ * never confirmed, once they are a week old and no process holds them; answer drafts whose folder is gone; and the
+ * oversized part of the service's logs. Registered rooms, settings and the local website's database are never touched.
+ */
+export function sweep_service_home(home, now = Date.now()) {
+  const registered = read_registry(home).map(path => dirname(resolve(path)));
+  const launches = join(home, 'launches'), removed = { launches: [], drafts: [], logs: [] };
+  for (const name of existsSync(launches) ? readdirSync(launches) : []) {
+    const folder = join(launches, name);
+    if (registered.includes(folder) || service_pid(folder) || service_pid(join(folder, 'runtime')) || now - launch_touched(folder) < STALE_LAUNCH_MS) continue;
+    try { remove_room_files(home, join(folder, 'config.json')); removed.launches.push(name); } catch { /* Still held; the next sweep retries. */ }
+  }
+  // A draft folder is keyed by its room's data directory; one matching no remaining folder or registered room is orphaned.
+  const live = new Set();
+  for (const path of read_registry(home)) {
+    const folder = dirname(resolve(path));
+    for (const directory of [folder, join(folder, 'runtime')]) live.add(service_drafts(home, directory));
+    try { live.add(service_drafts(home, validate_config(JSON.parse(readFileSync(path, 'utf8')), folder).directory)); } catch { /* Covered by the folder keys. */ }
+  }
+  for (const name of existsSync(launches) ? readdirSync(launches) : []) {
+    for (const directory of [join(launches, name), join(launches, name, 'runtime')]) live.add(service_drafts(home, directory));
+  }
+  const drafts = join(home, 'drafts');
+  for (const name of existsSync(drafts) ? readdirSync(drafts) : []) {
+    if (live.has(join(drafts, name))) continue;
+    rmSync(join(drafts, name), { recursive: true, force: true });
+    removed.drafts.push(name);
+  }
+  for (const log of SERVICE_LOGS) if (trim_log(join(home, log))) removed.logs.push(log);
+  return removed;
+}
+
 /** Return the live service PID, or 0 when no service owns the home lock. */
 export function service_pid(home) {
   const path = join(home, 'runner.lock');
@@ -405,9 +472,18 @@ export async function run_service(home, output = () => {}) {
       updated_at: Math.floor(Date.now() / 1000), rooms: [] });
     // Loaded lazily: the relay runs launches, and the launch module itself depends on this one.
     const { sync_remote_launches } = await import('./remote_launch.mjs');
-    let synced_at = 0;
+    let synced_at = 0, swept_at = 0;
     while (!stopped && !existsSync(stop_path)) {
       try { await service.tick(); } catch (error) { log_line(`服务检查失败：${error.message}`); }
+      if (Date.now() - swept_at >= SWEEP_MS) {
+        swept_at = Date.now();
+        try {
+          const removed = sweep_service_home(home);
+          if (removed.launches.length || removed.drafts.length || removed.logs.length) {
+            log_line(`清理本机文件：启动目录 ${removed.launches.length} 个，草稿 ${removed.drafts.length} 个，日志 ${removed.logs.join('、') || '无'}`);
+          }
+        } catch (error) { log_line(`清理本机文件失败：${error.message}`); }
+      }
       if (Date.now() - synced_at >= REMOTE_SYNC_MS) {
         synced_at = Date.now();
         try { await sync_remote_launches(home, { log: log_line }); } catch (error) { log_line(`远程启动检查失败：${error.message}`); }
@@ -531,6 +607,7 @@ export async function main(args = process.argv.slice(2), print = value => proces
     case 'list': return print({ home, configs: read_registry(home) });
     case 'add': { const config = register_room(home, require_config()); return print({ added: config.room, site: config.site }); }
     case 'remove': unregister_room(home, require_config()); return print({ removed: resolve(values.config) });
+    case 'clean': return print(sweep_service_home(home));
     case 'shortcut': return print({ shortcut: write_shortcut('Desktop', 'open') });
     case 'autostart':
       if (option === 'on') return print({ autostart: write_shortcut('Startup', 'start') });

package/runner/expert_prompts.mjs

@@ -13,6 +13,20 @@ export const EXPERT_PROMPT_PRESETS = {
   api: '你读不到本地文件，相关内容以其他成员贴出的为准，不凭文件名猜测。缺信息时在回答里写明缺什么。',
 };
 
+/**
+ * Expert presets: a named instance with its description, prompt, project access and optionally model and effort,
+ * added in one click. The user's own presets live on this computer (`expert-presets.json` in the service home);
+ * one with a built-in's name replaces it.
+ */
+export const BUILTIN_EXPERT_PRESETS = [
+  { name: 'Codex-评审', builtin: true, project_access: 'read',
+    description: '专门做代码评审：对照计划文档检查改动，只提问题不改代码。',
+    system_prompt: '你是本房间的评审。先读主持人给出的计划文档与改动范围（执行报告列有改动文件，可用 git diff 查看），检查：是否符合计划与约定的接口、有无正确性问题、有无越出分工的改动、测试是否覆盖关键行为。按严重程度列出问题，每条附文件与行号和理由；没有问题就明确说通过。只评审，不修改文件。' },
+  { name: 'Gemini-文档', builtin: true, project_access: 'write',
+    description: '专门整理文档：按改动同步说明，只改文档不改代码。',
+    system_prompt: '你负责整理文档。先读计划文档与本次改动，按仓库现有文档的分工同步说明，只改文档文件，不改代码；不确定的事实标为待核实，不自行补写。多步任务中，在关键转折处用一句话写出进展再继续。' },
+];
+
 /** The prompt this member receives: its own text when set, otherwise its software's preset. */
 export function expert_prompt(profile = {}) {
   const own = Object.hasOwn(profile, 'system_prompt');