ai_co_discuss 0.2.71 → 0.2.73

package/runner/discussion_launch.mjs

@@ -50,6 +50,8 @@ const HELP = `用法：codiscuss launch settings [--file FILE]
       codiscuss launch scheduler-check --file FILE
       codiscuss launch room-member --file FILE
       codiscuss launch pick-directory
+      codiscuss launch projects [--file FILE]
+      codiscuss launch machine-link --file FILE
 
 settings 读取本机软件默认配置；指定文件时保存，不启动 AI。
 start 使用启动 JSON 创建或接入房间并启动；--dry-run 只校验和预览。
@@ -60,6 +62,8 @@ api-key 将 base_url、api_key 保存于本机私有目录，只返回 api_key_r
 api-check 用 API profile 向模型发送一次极短请求，核对地址、密钥、协议与模型是否可用。
 scheduler-check 用智能调度配置（provider、model、api_key_ref）向决策模型发送一道是非题，核对供应商、模型与密钥是否可用。
 pick-directory 在本机弹出系统目录选择窗口，返回所选路径；取消时不返回路径。
+projects 读取本机已配置的项目（名称与绝对路径）；提供 JSON（projects 列表）时整体替换保存。
+machine-link 返回本机连接指定 site 的电脑编号、名称与凭据，供已登录管理员的网页完成配对；不存在时创建。
 room-member 为运行中的自由房间或讨论邀请、请回一位成员（讨论只接受本机唤醒的成员）；须提供 site、room_id、token、action（add/rejoin）、name。
 JSON 指定 site、entry（conversation/web）、room（建房内容，含 submission_id）
 或 room_id（已有房间）、participants（本次软件覆盖配置）。
@@ -71,7 +75,9 @@ conversation 还须 current_session_id，当前会话接手首个主持任务。
 // Windows PowerShell 5.1 ships WinForms. A background process cannot take the foreground, so the owner must be
 // shown (off-screen) as a topmost window; the dialog it owns then stays above the browser that asked for it.
 // windowsHide turns the process's first Show into a hide, so the owner is shown a second time to really appear.
-// Foreground rights are not guaranteed to a background process either, so a timer in the dialog's message loop pins the dialog owned by the hidden form topmost.
+// Under the local service the whole process chain has no console and no foreground rights: Windows then silently ignores
+// SetWindowPos(HWND_TOPMOST) on the dialog (it returns success). So once the dialog exists, a timer in its message loop
+// briefly attaches to the foreground window's input thread (the browser that asked) to borrow its right to raise the dialog.
 // The C# source must not contain single quotes: it is embedded in a single-quoted PowerShell string.
 const PICKER_RAISE_SOURCE = [
   'using System; using System.Runtime.InteropServices;',
@@ -80,8 +86,21 @@ const PICKER_RAISE_SOURCE = [
   '  [DllImport("user32.dll")] static extern bool EnumWindows(EnumProc proc, IntPtr arg);',
   '  [DllImport("user32.dll")] static extern IntPtr GetWindow(IntPtr handle, uint command);',
   '  [DllImport("user32.dll")] static extern bool SetWindowPos(IntPtr handle, IntPtr after, int x, int y, int width, int height, uint flags);',
-  '  public static void OwnedBy(IntPtr owner) {',
-  '    EnumWindows((handle, arg) => { if (GetWindow(handle, 4) == owner) SetWindowPos(handle, (IntPtr)(-1), 0, 0, 0, 0, 0x13); return true; }, IntPtr.Zero);',
+  '  [DllImport("user32.dll")] static extern IntPtr GetForegroundWindow();',
+  '  [DllImport("user32.dll")] static extern uint GetWindowThreadProcessId(IntPtr handle, IntPtr process);',
+  '  [DllImport("kernel32.dll")] static extern uint GetCurrentThreadId();',
+  '  [DllImport("user32.dll")] static extern bool AttachThreadInput(uint attach, uint to, bool on);',
+  '  [DllImport("user32.dll")] static extern bool BringWindowToTop(IntPtr handle);',
+  '  [DllImport("user32.dll")] static extern bool SetForegroundWindow(IntPtr handle);',
+  '  public static bool OwnedBy(IntPtr owner) {',
+  '    IntPtr dialog = IntPtr.Zero;',
+  '    EnumWindows((handle, arg) => { if (GetWindow(handle, 4) == owner) dialog = handle; return dialog == IntPtr.Zero; }, IntPtr.Zero);',
+  '    if (dialog == IntPtr.Zero) return false;',
+  '    uint current = GetCurrentThreadId(), foreground = GetWindowThreadProcessId(GetForegroundWindow(), IntPtr.Zero);',
+  '    bool attached = foreground != 0 && foreground != current && AttachThreadInput(current, foreground, true);',
+  '    SetWindowPos(dialog, (IntPtr)(-1), 0, 0, 0, 0, 0x13); BringWindowToTop(dialog); SetForegroundWindow(dialog);',
+  '    if (attached) AttachThreadInput(current, foreground, false);',
+  '    return true;',
   '  }',
   '}',
 ].join(' ');
@@ -91,7 +110,7 @@ const WINDOWS_PICKER = [
   '$owner = New-Object System.Windows.Forms.Form -Property @{ TopMost = $true; ShowInTaskbar = $false; FormBorderStyle = "None"; StartPosition = "Manual"; Location = New-Object System.Drawing.Point(-32000, -32000); Size = New-Object System.Drawing.Size(1, 1) }',
   `Add-Type -TypeDefinition '${PICKER_RAISE_SOURCE}'`,
   '$owner.Show(); $owner.Hide(); $owner.Show(); $owner.Activate()',
-  '$timer = New-Object System.Windows.Forms.Timer -Property @{ Interval = 150 }; $timer.Add_Tick({ [PickerRaise]::OwnedBy($owner.Handle) }); $timer.Start()',
+  '$timer = New-Object System.Windows.Forms.Timer -Property @{ Interval = 150 }; $timer.Add_Tick({ if ([PickerRaise]::OwnedBy($owner.Handle)) { $timer.Stop() } }); $timer.Start()',
   '$dialog = New-Object System.Windows.Forms.FolderBrowserDialog -Property @{ Description = "选择项目目录"; ShowNewFolderButton = $true }',
   'if ($dialog.ShowDialog($owner) -eq "OK") { $dialog.SelectedPath }',
   '$owner.Close()',
@@ -188,6 +207,34 @@ export function save_launch_settings(home, input) {
   return settings;
 }
 
+const PROJECT_NAME_LIMIT = 80;
+const PROJECT_ID_PATTERN = /^[0-9a-f]{8,32}$/;
+
+/** Read the named project directories saved on this computer, offered as launch cwd choices. */
+export function launch_projects(home) {
+  const path = join(home, 'launch-projects.json');
+  return existsSync(path) ? JSON.parse(readFileSync(path, 'utf8')) : { projects: [] };
+}
+
+/** Replace the project list; every path must be an existing folder on this computer. */
+// The id outlives renames and moves: other devices choose a project by id and never see its path.
+export function save_launch_projects(home, input) {
+  if (!Array.isArray(input.projects)) throw new Error('projects 必须为列表');
+  const projects = input.projects.map(item => ({ id: PROJECT_ID_PATTERN.test(item?.id) ? item.id : randomUUID().replaceAll('-', '').slice(0, 16),
+    name: String(item?.name || '').trim(), path: String(item?.path || '').trim() }));
+  const names = new Set();
+  for (const { name, path } of projects) {
+    if (!name || name.length > PROJECT_NAME_LIMIT) throw new Error(`项目名称不能为空，且不超过 ${PROJECT_NAME_LIMIT} 字`);
+    if (names.has(name)) throw new Error(`项目名称重复：${name}`);
+    names.add(name);
+    if (!isAbsolute(path)) throw new Error(`${name}：路径必须为完整绝对路径`);
+    if (!existsSync(path) || !statSync(path).isDirectory()) throw new Error(`${name}：这台电脑上不存在此文件夹：${path}`);
+  }
+  mkdirSync(home, { recursive: true, mode: 0o700 });
+  atomic_json(join(home, 'launch-projects.json'), { projects });
+  return { projects };
+}
+
 /** Reject malformed client fields before saving defaults or creating any discussion. */
 function validate_profile(name, profile, binding = false) {
   if (!clients_of(name) || !profile || typeof profile !== 'object' || Array.isArray(profile)) throw new Error(`不支持的软件配置：${name}`);
@@ -775,7 +822,8 @@ export async function launch_main(args = process.argv.slice(2), input_text) {
   assert_shared_home(home);
   let result;
   if (positionals[0] === 'settings') result = { ...(input ? save_launch_settings(home, input) : launch_settings(home)), api_providers: API_PROVIDERS,
-    scheduler_providers: SCHEDULER_PROVIDERS, api_keys: saved_api_keys(home) };
+    scheduler_providers: SCHEDULER_PROVIDERS, api_keys: saved_api_keys(home), projects: launch_projects(home).projects };
+  else if (positionals[0] === 'projects') result = input ? save_launch_projects(home, input) : launch_projects(home);
   else if (positionals[0] === 'api-key' && input) result = save_api_key(home, input);
   else if (positionals[0] === 'api-check' && input) result = await api_check(home, input);
   else if (positionals[0] === 'scheduler-check' && input) result = await scheduler_check(home, input);
@@ -788,6 +836,7 @@ export async function launch_main(args = process.argv.slice(2), input_text) {
   }
   else if (positionals[0] === 'room-member' && input) result = await room_member(home, input);
   else if (positionals[0] === 'pick-directory') result = await pick_directory();
+  else if (positionals[0] === 'machine-link' && input) result = (await import('./remote_launch.mjs')).machine_link(home, input.site);
   else if (positionals[0] === 'start' && input) result = await launch_discussion(home, input, { dry_run: values['dry-run'], browser_request: values.browser });
   else if (positionals[0] === 'room-config' && input) result = await room_configuration(home, input, { local_guard: values['configuration-locked'] });
   else throw new Error(HELP);

package/runner/discussion_local.mjs

@@ -11,6 +11,7 @@ import { atomic_json } from './discussion_adapters.mjs';
 import { acquire_lock } from './discussion_runner.mjs';
 import { assert_shared_home, main as service_main, service_home, service_pid, service_ready, start_service } from './discussion_service.mjs';
 import { detect_python, local_settings } from './discussion_setup.mjs';
+import { unlink_machine } from './remote_launch.mjs';
 import { tone } from './discussion_tui.mjs';
 
 const SCRIPT = fileURLToPath(import.meta.url);
@@ -25,7 +26,7 @@ const LOCAL_HELP = `用法：codiscuss local open|start|status|stop [--json]
       codiscuss local disconnect SITE
 
 connect 允许指定 HTTPS 站点通过此浏览器使用本机软件配置并启动 AI，打开连接链接完成接入。
-disconnect 撤销该站点的新启动权限；已运行的讨论须另行暂停。
+disconnect 撤销该站点的新启动权限（含其他设备经网站转来的启动）；已运行的讨论须另行暂停。
 数据保留在服务目录中；重新 connect 会替换该站点的旧连接。
 结果摘要写入终端；输出被重定向或加 --json 时 JSON 写入 stdout。
 `;
@@ -48,7 +49,7 @@ export function save_site_connection(home, site, token = null) {
     const path = join(home, 'site-connections.json');
     const settings = existsSync(path) ? JSON.parse(readFileSync(path, 'utf8')) : { sites: {} };
     if (token) settings.sites[origin] = { token_hash: createHash('sha256').update(token).digest('hex') };
-    else delete settings.sites[origin];
+    else { delete settings.sites[origin]; unlink_machine(home, origin); }
     atomic_json(path, settings);
   } finally { release(); }
 }

package/runner/discussion_service.mjs

@@ -13,6 +13,7 @@ import { DiscussionRunner, DiscussionStore, acquire_lock, api, load_config, paus
 import { FreeRoomRunner } from './free_runner.mjs';
 
 const POLL_MS = 2000;
+const REMOTE_SYNC_MS = 3000;
 const START_WAIT_MS = 5000;
 const STOP_WAIT_MS = 20_000;
 const REGISTRY_WAIT_MS = 5000;
@@ -400,8 +401,15 @@ export async function run_service(home, output = () => {}) {
     log_line(`讨论服务已启动 pid=${process.pid}`);
     atomic_json(join(home, 'status.json'), { pid: process.pid, ready: true,
       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;
     while (!stopped && !existsSync(stop_path)) {
       try { await service.tick(); } 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}`); }
+      }
       await sleep(POLL_MS);
     }
   } finally {

package/runner/free_runner.mjs

@@ -9,6 +9,12 @@ import { ROUTE_CONFIDENCE, ROUTE_CONTEXT_MESSAGES, ROUTE_PROMPT_VERSION, ROUTE_W
 
 const PACKAGE_VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
 const RENEW_MS = 30_000;
+/** A changed phase is reported early, but no more often than this, since each report refreshes open pages. */
+const ACTIVITY_REPORT_MS = 10_000;
+/** Progress notes kept per execution, each cut to this length, and how many one renewal carries; the website enforces the same. */
+const MAX_EXECUTION_NOTES = 50;
+const MAX_NOTE_LENGTH = 500;
+const MAX_NOTES_PER_RENEW = 10;
 const MAX_DELIVERY_ATTEMPTS = 3;
 const LIVE = ['reserving', 'delivering', 'sidecar_pending', 'running'];
 const MAX_HASHED_BYTES = 5 * 1024 * 1024;
@@ -130,6 +136,9 @@ export class FreeRoomRunner {
     this.members = new Map();
     this.exited = new Set();
     this.snapshots = new Map();
+    // Execution id -> { phase, at, sent_phase, sent_at, notes, next_seq }: what the member's software last showed it doing,
+    // and the progress notes not yet on the website.
+    this.activity = new Map();
     this.context_errors = new Map();
     this.adopt(config);
     this.store.db.exec(`CREATE TABLE IF NOT EXISTS free_deliveries(member TEXT PRIMARY KEY, client_id TEXT NOT NULL,
@@ -329,7 +338,9 @@ export class FreeRoomRunner {
           requests: execution.requests, read_after: execution.read_until },
         on_binding: session => this.store.bind(member.name, session),
         on_process: child => this.track(member.name, child),
-        on_output: (path, chunk) => appendFileSync(path, chunk, { mode: 0o600 }),
+        on_output: (path, chunk) => { appendFileSync(path, chunk, { mode: 0o600 }); this.touch(execution.id); },
+        on_activity: phase => this.touch(execution.id, phase),
+        on_note: text => this.note(execution.id, text),
         // A stopped process may report after the next execution started; only its own execution takes the result.
         on_failure: error => { try { if (this.row(member.name)?.execution_id === execution.id) this.save(member.name, { error }); } catch { /* Store may already be closed at shutdown. */ } },
         on_exit: () => this.exited.add(execution.id),
@@ -357,6 +368,7 @@ export class FreeRoomRunner {
     }
     const execution = active.get(row.execution_id);
     if (!execution) {
+      this.activity.delete(row.execution_id);
       this.stop_member(member.name);
       return this.save(member.name, { status: 'idle', error: '' });
     }
@@ -369,11 +381,34 @@ export class FreeRoomRunner {
       return this.save(member.name, { status: 'idle' });
     }
     if (Date.now() >= execution.created_at * 1000 + minutes * 60_000) return this.fail(member.name, execution.id, `超过单次执行时限 ${minutes} 分钟；请核对原会话确认是否已有内容`);
-    if (Date.now() - row.last_renew >= RENEW_MS) {
-      await api(this.config, `/executions/${execution.id}`, { action: 'renew' });
+    const activity = this.activity.get(execution.id);
+    const changed = activity && (activity.phase !== activity.sent_phase || activity.at !== activity.sent_at || activity.notes.length);
+    const elapsed = Date.now() - row.last_renew;
+    if (elapsed >= RENEW_MS || (changed && elapsed >= ACTIVITY_REPORT_MS)) {
+      const notes = activity?.notes.slice(0, MAX_NOTES_PER_RENEW) || [];
+      await api(this.config, `/executions/${execution.id}`, { action: 'renew',
+        ...(activity ? { activity: activity.phase, activity_at: Math.floor(activity.at / 1000) } : {}), ...(notes.length ? { notes } : {}) });
+      if (activity) Object.assign(activity, { sent_phase: activity.phase, sent_at: activity.at, notes: activity.notes.slice(notes.length) });
       this.save(member.name, { last_renew: Date.now() });
     }
   }
+  /** Note that the software produced output now, and its phase when the output names one. */
+  touch(execution_id, phase) {
+    // Updated in place: a renewal in flight marks what it sent on this same record.
+    if (!this.activity.has(execution_id)) this.activity.set(execution_id, { phase: '', notes: [], next_seq: 0 });
+    const current = this.activity.get(execution_id);
+    if (phase) current.phase = phase;
+    current.at = Date.now();
+  }
+  /** Queue one progress note for the next renewal; numbering makes a retried renewal harmless, and notes past the cap are dropped. */
+  note(execution_id, text) {
+    this.touch(execution_id);
+    const current = this.activity.get(execution_id);
+    if (current.next_seq >= MAX_EXECUTION_NOTES) return;
+    current.next_seq += 1;
+    // Cut by UTF-16 units like the website's check, without leaving half of a surrogate pair.
+    current.notes.push({ seq: current.next_seq, text: text.slice(0, MAX_NOTE_LENGTH).replace(/[\uD800-\uDBFF]$/, '') });
+  }
   /** Report observed file changes once an execution has ended and its member's processes have exited. */
   async report_finished(active) {
     for (const [execution_id, snapshot] of this.snapshots) {
@@ -388,6 +423,7 @@ export class FreeRoomRunner {
   }
   /** Record the cause on the website, then stop this member's own processes. */
   async fail(name, execution_id, reason) {
+    this.activity.delete(execution_id);
     try { await api(this.config, `/executions/${execution_id}`, { action: 'fail', reason }); }
     catch (error) { if (!/HTTP 409/.test(error.message)) throw error; }
     this.save(name, { status: 'idle', error: reason });

package/runner/remote_launch.mjs

@@ -0,0 +1,101 @@
+/** Run room launches that other devices relay through a paired website; directories and credentials stay here. */
+import { randomBytes, randomUUID } from 'node:crypto';
+import { existsSync, mkdirSync, readFileSync } from 'node:fs';
+import { hostname } from 'node:os';
+import { join } from 'node:path';
+
+import { atomic_json } from './discussion_adapters.mjs';
+import { saved_api_keys } from './discussion_api.mjs';
+import { launch_discussion, launch_projects, launch_settings, platform_of } from './discussion_launch.mjs';
+
+const MACHINE_TOKEN_BYTES = 32;
+const MACHINE_NAME_MAX = 60;
+const SYNC_TIMEOUT_MS = 10000;
+const LINKS_FILE = 'machine-links.json';
+
+/** Read every site this computer is paired with. */
+export function machine_links(home) {
+  const path = join(home, LINKS_FILE);
+  return existsSync(path) ? JSON.parse(readFileSync(path, 'utf8')) : { sites: {} };
+}
+
+/** Return this computer's identity for one site, creating it on first use; the browser then pairs it as administrator. */
+export function machine_link(home, site) {
+  const origin = new URL(site).origin;
+  const links = machine_links(home);
+  links.sites[origin] ||= { id: randomUUID().replaceAll('-', ''), token: randomBytes(MACHINE_TOKEN_BYTES).toString('hex'),
+    name: (hostname() || '本机').slice(0, MACHINE_NAME_MAX) };
+  mkdirSync(home, { recursive: true, mode: 0o700 });
+  atomic_json(join(home, LINKS_FILE), links);
+  return links.sites[origin];
+}
+
+/** Forget a site's pairing so it can no longer hand launches to this computer. */
+export function unlink_machine(home, site) {
+  const links = machine_links(home);
+  if (!links.sites[site]) return;
+  delete links.sites[site];
+  atomic_json(join(home, LINKS_FILE), links);
+}
+
+/** Resolve the API key saved for a profile's base URL, as the connected browser does. */
+function api_key_ref(profile, keys) {
+  if (profile.api_key_ref || !profile.base_url) return profile.api_key_ref;
+  try { return keys[new URL(profile.base_url).href.replace(/\/+$/, '')]; } catch { return undefined; }
+}
+
+/** Platforms this computer can wake without further setup, and the client each uses. */
+export function ready_clients(home) {
+  const keys = saved_api_keys(home);
+  return Object.fromEntries(Object.entries(launch_settings(home).participants).filter(([, profile]) => profile.adapter === 'api'
+    ? Boolean(profile.base_url && profile.api_protocol && profile.model && api_key_ref(profile, keys))
+    : Boolean(profile.adapter && (profile.adapter === 'antigravity' ? profile.ipc_directory : profile.executable))).map(([name, profile]) => [name, profile.adapter]));
+}
+
+/** Turn a relayed request into the request the connected browser would send, using this computer's directory and keys. */
+export function local_request(home, site, request) {
+  const { local_project, ...input } = request;
+  if (input.cwd || input.access_file) throw new Error('远程启动只能选择电脑上已配置的项目');
+  const project = local_project ? launch_projects(home).projects.find(item => item.id === local_project) : null;
+  if (local_project && !project) throw new Error('所选项目已从这台电脑移除，请重新选择');
+  const keys = saved_api_keys(home), defaults = launch_settings(home).participants;
+  const participants = { ...(input.participants || {}) };
+  for (const member of input.room?.members || []) {
+    const profile = defaults[platform_of(member.name)];
+    const ref = profile?.adapter === 'api' && !participants[member.name]?.api_key_ref ? api_key_ref(profile, keys) : undefined;
+    if (ref) participants[member.name] = { ...participants[member.name], api_key_ref: ref };
+  }
+  return { ...input, participants, site, entry: 'web', ...(project ? { cwd: project.path } : {}) };
+}
+
+async function machine_request(site, link, path, body) {
+  const response = await fetch(`${site}/api/machines/${link.id}${path}`, { method: 'POST', redirect: 'error', signal: AbortSignal.timeout(SYNC_TIMEOUT_MS),
+    headers: { 'Content-Type': 'application/json', 'X-Machine-Token': link.token }, body: JSON.stringify(body) });
+  const result = await response.json();
+  if (!response.ok) throw new Error(`HTTP ${response.status}: ${result.error || '请求失败'}`);
+  return result;
+}
+
+/** Publish projects and clients to each paired site, then run every launch it relays, one at a time. */
+export async function sync_remote_launches(home, { launch = launch_discussion, log = () => {} } = {}) {
+  const projects = launch_projects(home).projects.filter(project => project.id).map(({ id, name }) => ({ id, name }));
+  const clients = ready_clients(home);
+  for (const [site, link] of Object.entries(machine_links(home).sites)) {
+    let launches;
+    try { ({ launches } = await machine_request(site, link, '/sync', { projects, clients })); }
+    catch (error) { log(`${site}: 同步电脑状态失败：${error.message}`); continue; }
+    for (const { id, request } of launches) {
+      const action = body => machine_request(site, link, `/launches/${encodeURIComponent(id)}`, body);
+      try {
+        await action({ action: 'claim' });
+        const result = await launch(home, local_request(home, site, request), { browser_request: true });
+        await action({ action: 'finish', room_id: result.room.id, status: result.status });
+        log(`${site}: 远程启动 ${id} 已创建房间 ${result.room.id}`);
+      } catch (error) {
+        log(`${site}: 远程启动 ${id} 失败：${error.message}`);
+        await action({ action: 'fail', error: error.message, stage: error.launch?.stage || 'not_started',
+          ...(error.launch?.room_id ? { room_id: error.launch.room_id } : {}) }).catch(() => {});
+      }
+    }
+  }
+}