ai_co_discuss 0.3.71 → 0.3.72

package/docs/runner.md

@@ -47,6 +47,16 @@ codiscuss setup
 
 其他设备通过已配对电脑的加密连接读取同一目录。文件内容最多预览前 128 KB，支持 UTF-8 和带 BOM 的 UTF-16；HTML 展示内联样式与内嵌图片。文件访问限于房间项目目录，目录外的链接灰显。
 
+### 多个项目目录
+
+一个房间可以有一个主项目目录和最多 8 个其他项目目录。新建房间选好项目目录后，点下方“添加其他项目目录”；建房后在“成员与设置 → 协作设置”的“项目目录”一行增删，保存后从各成员下一次执行起生效，会话不中断。主项目目录设置后不能更改；建房时没选的，可在同一行补设一次，已在房间的成员保留原会话、按自己的项目权限读写它。
+
+- 成员按自己的项目权限读写这些目录：只读成员全部只读，可写成员全部可写。
+- “文件”页上方可切换目录；输入框里 `@` 搜索文件时会一起搜其他目录，选中后按完整路径引用。
+- Claude Code、Codex CLI、agy 和 API 成员由程序限制读写；Codex App、Antigravity App 与在原窗口工作的手动成员只在任务里写明，实际权限以软件自身设置为准。
+
+工作目录不在房间任何项目目录里的成员（例如手动接入时它的 Claude 会话属于别的文件夹，或在启动配置里给它设了别的工作目录）也可以加入：它在自己的目录工作，对房间的目录只读，它自己目录里的改动不参与冲突提示。它加入或换目录时，网页右下角会提示一次，成员卡上也会标出它的工作目录。Codex CLI、API 成员，以及只读档的 Claude Code、agy 由程序保证改不了房间目录；其他情况（App、手动成员、可写档的 Claude Code 与 agy、自动与全放开）只在任务里要求，成员卡会注明“程序拦不住”。
+
 ### 从 AI 对话发起
 
 在要担任主持人的本地 AI 对话中调用 `discuss-host` 和 `discuss-participant`，说明站点、议题、参与者与上限。主持技能沿用本机软件配置建房，当前会话继续主持。agy 不能在自己的对话中主持全自动讨论。
@@ -74,7 +84,8 @@ codiscuss local connect https://你的站点
 
 之后：
 - 设备在浏览器里保存一把不可导出的设备密钥，之后打开网站直接可用。网站只认电脑签过名的设备名单，没有能被盗用的账号密码。
-- 每台设备授权 30 天，到期前用通行密钥续期。勾选“临时设备”的只授权 1 天，用于借来的电脑。
+- 每台设备授权 30 天。到期前或到期后 30 天内打开网页，用通行密钥确认一次即续期 30 天，不用回到电脑前；超过这段时间须重新配对。勾选“临时设备”的只授权 1 天，用于借来的电脑，不能续期。
+- 新设备的浏览器不支持通行密钥时（例如没有 Google Play 服务的安卓平板），在电脑上添加设备前勾选“允许不用通行密钥”再生成二维码。这样的设备不需要每日确认，也不能续期，到期须回电脑前重新配对；它在解锁状态下被别人拿到就能操作电脑，只在确实需要时勾选。
 - 新设备只能在电脑前添加，已配对设备不能远程添加。设备丢失时，在其他已配对设备或电脑上解绑它；只有一台外出设备时，回到电脑前解绑并重新配对。
 - 每台设备的记录按钮（时钟图标）列出电脑为它记下的配对、解绑、每日确认和远程操作（不含内容）；已解绑设备的记录汇总在列表末尾。看到不是你做的操作，立即解绑对应设备。
 - 清除浏览器数据会删掉设备密钥，需要回到电脑前重新配对。

package/package.json

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

package/runner/adapters/antigravity_cli.mjs

@@ -74,19 +74,28 @@ export function antigravity_project(config, root = join(homedir(), '.gemini', 'c
   return matching[0];
 }
 
-/** Resolve only the user's selected folders; do not inherit another project's grants or settings. */
+/**
+ * Resolve only the user's selected folders, plus the room's other project directories (`task.extra_directories`); do
+ * not inherit another project's grants or settings.
+ */
 function agy_resources(config, task, root) {
-  if (config.project_id || config.project_name) return antigravity_project(config, root).projectResources?.resources || [];
-  return [{ folder: { folderUri: pathToFileURL(launch_directory(config, task)).href } }];
+  const extras = (task.extra_directories || []).map(item => ({ folder: { folderUri: pathToFileURL(item.path).href } }));
+  if (config.project_id || config.project_name) return [...antigravity_project(config, root).projectResources?.resources || [], ...extras];
+  return [{ folder: { folderUri: pathToFileURL(launch_directory(config, task)).href } }, ...extras];
 }
 
-/** Build native deny rules for protected directories, with separate writable answer storage. */
+/**
+ * Build native deny rules for protected directories, with separate writable answer storage. The room's project
+ * directories this member may only read are protected whatever its own access.
+ */
 function agy_project_grants(config, task, resources, user_home) {
   const folders = resources.map(resource => resource.gitFolder?.folderUri || resource.folder?.folderUri)
     .filter(uri => uri?.startsWith('file:')).map(uri => fileURLToPath(uri));
-  const projects = [...new Set([project_directory(config), ...folders].filter(directory => directory && !same_path(directory, task.draft_directory)))];
+  const read_only = (task.extra_directories || []).filter(item => item.access === 'read').map(item => item.path);
+  const projects = [...new Set([project_directory(config), ...folders].filter(directory => directory && !same_path(directory, task.draft_directory)
+    && !read_only.some(path => same_path(path, directory))))];
   const protected_paths = [task.directory, ...task.skill_directories, join(user_home, '.gemini'),
-    ...(config.project_access === 'read' ? projects : [])];
+    ...(config.project_access === 'read' ? projects : []), ...read_only];
   if (protected_paths.some(directory => within_directory(directory, task.draft_directory))) {
     throw new Error('agy 草稿目录不能位于只读项目、运行目录、技能或 .gemini 配置目录中，未交付讨论任务');
   }
@@ -147,7 +156,7 @@ export function remove_agy_projects(directory, user_home = homedir()) {
 function invocation(config, binding, task, user_home) {
   const project = config.session_id ? null : prepare_agy_project(config, binding, task, user_home);
   const args = ['--output-format', 'stream-json', '--print-timeout', '0', '--add-dir', task.directory,
-    '--add-dir', task.draft_directory, ...task.skill_directories.flatMap(directory => ['--add-dir', directory])];
+    '--add-dir', task.draft_directory, ...[...task.skill_directories, ...(task.extra_directories || []).map(item => item.path)].flatMap(directory => ['--add-dir', directory])];
   // Headless agy refuses `--mode auto` ("not available for this account", 1.4.10–1.4.11) though its interactive window
   // offers it; 全放开 uses the flag its own denial message suggests on top of the open project grants.
   args.push('--mode', 'accept-edits', ...(config.project_access === 'full' ? ['--dangerously-skip-permissions'] : []),
@@ -211,8 +220,29 @@ const events = {
     responses.delete(step.step_index);
     return text;
   },
+  detail: agy_detail,
 };
 
+/**
+ * One agy stream event as execution-detail entries keyed by step: a response grows by its text deltas, a tool step
+ * shows its main parameter and, once finished, its output or error.
+ */
+function agy_detail(event) {
+  if (event.event === 'result' && event.result?.status === 'ERROR') return [{ kind: 'error', body: String(event.result.error || '本轮失败') }];
+  const step = event.step_update;
+  if (!step) return [];
+  const id = `step-${step.step_index}`;
+  if (step.step_type === 'agent_response') return step.text_delta ? [{ id, kind: 'message', append: step.text_delta }] : [];
+  if (step.step_type !== 'tool') return [];
+  const parameters = step.tool_info?.parameters || {};
+  const subject = parameters.CommandLine ?? parameters.Path ?? parameters.AbsolutePath ?? parameters.TargetFile ?? Object.values(parameters).find(value => typeof value === 'string');
+  const finished = ['DONE', 'ERROR'].includes(step.state);
+  return [{ id, kind: step.tool_name === 'run_command' ? 'command' : EDIT_TOOLS.test(step.tool_name || '') ? 'edit' : 'tool',
+    title: step.tool_name === 'run_command' ? String(subject ?? '') : `${step.tool_name} ${subject ?? ''}`.trim(),
+    state: step.state === 'ERROR' ? 'failed' : finished ? 'done' : 'running',
+    body: finished ? String(step.tool_info?.error?.message ?? step.tool_info?.output ?? '') : undefined }];
+}
+
 /** Where agy keeps one conversation database, or '' when this machine has none by that ID. */
 export function session_path(session_id, env = process.env, home = homedir()) {
   const file = join(home, '.gemini', 'antigravity-cli', 'conversations', `${session_id}.db`);

package/runner/adapters/api.mjs

@@ -213,8 +213,10 @@ function project_text(project) {
   const attachments = '消息附件只显示名称、大小与 ID，内容读不到';
   if (!project) return `- 本地文件和消息附件（只显示名称、大小与 ID）的内容你都读不到：以其他成员贴出的为准，不凭文件名猜测；回答涉及时说明你没有读取，缺信息就写明缺什么。`;
   const tools = project.writable ? 'read、glob、grep、write、edit' : 'read、glob、grep';
+  const extras = project.roots.slice(1).map(item => `${item.root}（${item.writable ? '可读写' : '只读'}）`).join('、');
   return `- 可用 ${tools} 工具${project.writable ? '读写' : '只读'}本房间的项目目录，路径相对项目目录，不能越出；密钥文件、版本库元数据和接入程序的私有文件会被拒绝。${project.writable
-    ? '修改已有文件前先 read，局部修改优先用 edit；没有命令行，不能运行测试或构建，需要验证时在回答里说明，交给能运行命令的成员。技能里的草稿文件与 --body-file 不适用：回答正文直接放进 submit_chat，不要用 write 写草稿。' : '项目只读，不能修改文件。'}
+    ? '修改已有文件前先 read，局部修改优先用 edit；没有命令行，不能运行测试或构建，需要验证时在回答里说明，交给能运行命令的成员。技能里的草稿文件与 --body-file 不适用：回答正文直接放进 submit_chat，不要用 write 写草稿。' : '项目只读，不能修改文件。'}${extras ? `
+- 本房间另有项目目录，用绝对路径访问：${extras}。` : ''}
 - ${attachments}：以其他成员贴出的为准，不凭文件名猜测；回答涉及时说明你没有读取，缺信息就写明缺什么。`;
 }
 
@@ -264,6 +266,19 @@ function append_note(profile, history, text) {
   else history.push({ role: 'user', content: text });
 }
 
+/**
+ * Add user text before the next request. The last message is the user's at that point (the prompt, tool results or a
+ * reminder); protocols that keep one user message per turn take it into that message, a string prompt becoming a block.
+ */
+function add_user_text(profile, history, text) {
+  const last = history.at(-1);
+  if (profile.api_protocol === 'anthropic' && last?.role === 'user') {
+    if (typeof last.content === 'string') last.content = [{ type: 'text', text: last.content }];
+    last.content.push({ type: 'text', text });
+  } else if (profile.api_protocol === 'gemini' && last?.role === 'user') last.parts.push({ text });
+  else history.push(profile.api_protocol === 'gemini' ? { role: 'user', parts: [{ text }] } : { role: 'user', content: text });
+}
+
 /** Plain text of the model's latest reply, so a stop without a write can show its stated reason. */
 function last_reply_text(history, limit = REPLY_EXCERPT_CHARS) {
   const item = history.at(-1) || {};
@@ -297,6 +312,8 @@ async function run_participant(profile, key, context) {
   let used_tools = false;
   const turns = max_requests(context);
   for (let index = 0; !turns || index < turns; index++) {
+    // The owner's interjections join the conversation before the next model request, inside the same turn.
+    for (const text of (context.interjections || []).splice(0)) add_user_text(profile, state.history, `用户插话：${text}`);
     context.on_activity?.('thinking');
     const calls = await generate_with_retry(profile, key, state, context.signal);
     if (!calls.length) {
@@ -337,7 +354,9 @@ export async function api_delivery(profile, binding, task) {
   const controller = new AbortController();
   const child = new EventEmitter();
   child.kill = () => { controller.abort(); return true; };
-  const context = { ...task.api_context, participant: task.participant, directory: task.directory,
+  const interjections = [];
+  let running = true;
+  const context = { ...task.api_context, participant: task.participant, directory: task.directory, interjections,
     task_id: task.id, signal: controller.signal, on_activity: task.on_activity, on_note: task.on_note, on_edits: task.on_edits,
     expert_prompt: expert_prompt(profile),
     // The service home holds API keys and the task directory holds room credentials; neither is a project file.
@@ -351,9 +370,11 @@ export async function api_delivery(profile, binding, task) {
       await run_participant(profile, key, context);
     } catch (error) {
       if (!controller.signal.aborted) task.on_failure?.(error.message.replaceAll(key, '[已隐藏]'));
-    } finally { child.emit('close', 0); task.on_exit?.(); }
+    } finally { running = false; child.emit('close', 0); task.on_exit?.(); }
   });
-  return { status: 'accepted', session_id, capabilities: API_CALL };
+  // Taken at the next model request; the request already under way is not cut short.
+  const steer = text => { if (!running) return false; interjections.push(text); return true; };
+  return { status: 'accepted', session_id, capabilities: API_CALL, steer };
 }
 
 // The call is the runner's own, so it can be aborted and its tool steps are seen.

package/runner/adapters/api_files.mjs

@@ -4,7 +4,8 @@
  * Ported from the read / write / edit (packages/fs/tool-fs) and glob / grep (packages/fs/tool-fs-search) tools of
  * DeepSeek Harness, https://github.com/deepseek-ai/deepseek-harness at ce7073d, MIT License, Copyright (c) 2026 DeepSeek:
  * the same tool names, parameters, descriptions, result formats, limits and read-before-modify rule, rebuilt on Node
- * built-ins. Differences: every path stays inside the room's project directory; grep takes JavaScript regular
+ * built-ins. Differences: every path stays inside the room's project directories (the main one, where relative paths
+ * resolve, and the extra ones by absolute path, each read-only or writable); grep takes JavaScript regular
  * expressions and reads the files Git does not ignore, where DSH runs ripgrep; secrets, version-control metadata and the
  * runner's private files are refused; a result over the cap is cut instead of saved to a spill file.
  */
@@ -40,7 +41,7 @@ function tool(name, description, properties, required) {
 
 const DEFINITIONS = {
   read: tool('read', 'Read a UTF-8 text file and return line-numbered content.', {
-    file_path: { ...TEXT, description: 'Path to read, relative to the project directory.' },
+    file_path: { ...TEXT, description: 'Path to read, relative to the project directory, or absolute inside another listed project directory.' },
     offset: { ...NUMBER, description: '1-based first line to return. Defaults to 1.' },
     limit: { ...NUMBER, maximum: READ_LIMIT, description: `Maximum number of lines to return. Defaults to ${READ_LIMIT}.` },
   }, ['file_path']),
@@ -48,20 +49,20 @@ const DEFINITIONS = {
     + `Returns up to ${GLOB_MAX_RESULTS} paths in modification-time order; a larger result keeps the first paths.`, {
     pattern: { ...TEXT, description: 'Glob pattern to match file paths against (e.g. "**/*.ts", "src/**/*.test.js"). '
       + 'A pattern with no "/" matches the basename at any depth, so "*" and "*.ts" both search the whole tree; include a separator to anchor the depth.' },
-    path: { ...TEXT, description: 'Directory to search in. Defaults to the project directory; a relative path resolves against it.' },
+    path: { ...TEXT, description: 'Directory to search in. Defaults to the project directory; a relative path resolves against it, an absolute one may name another listed project directory.' },
   }, ['pattern']),
   grep: tool('grep', 'Search file contents with a JavaScript regular expression. Returns matching lines with line numbers, grouped by file. '
     + `Returns up to ${GREP_MAX_MATCHES} matches.`, {
     pattern: { ...TEXT, description: 'Regular expression to search for (JavaScript syntax).' },
-    path: { ...TEXT, description: 'File or directory to search. Defaults to the project directory; a relative path resolves against it.' },
+    path: { ...TEXT, description: 'File or directory to search. Defaults to the project directory; a relative path resolves against it, an absolute one may name another listed project directory.' },
     include: { ...TEXT, description: 'One glob filter for which files to search (e.g. "*.ts", "*.{js,jsx}"). Not a list; negation is not supported.' },
   }, ['pattern']),
   write: tool('write', 'Create or fully replace a UTF-8 text file.', {
-    file_path: { ...TEXT, description: 'Path to write, relative to the project directory. Provide `file_path` before `content` in the arguments.' },
+    file_path: { ...TEXT, description: 'Path to write, relative to the project directory, or absolute inside another listed project directory. Provide `file_path` before `content` in the arguments.' },
     content: { ...TEXT, description: 'Full UTF-8 text content to write.' },
   }, ['file_path', 'content']),
   edit: tool('edit', 'Edit an existing UTF-8 text file by replacing literal text.', {
-    file_path: { ...TEXT, description: 'Path to edit, relative to the project directory. Provide `file_path` before `old_string` and `new_string` in the arguments.' },
+    file_path: { ...TEXT, description: 'Path to edit, relative to the project directory, or absolute inside another listed project directory. Provide `file_path` before `old_string` and `new_string` in the arguments.' },
     old_string: { ...TEXT, description: 'Literal text to replace.' },
     new_string: { ...TEXT, description: 'Literal replacement text. Use an empty string to delete the match.' },
     replace_all: { type: 'boolean', description: 'Replace all matches. Defaults to false; when false, old_string must appear exactly once.' },
@@ -84,39 +85,53 @@ function real_path(path) {
 }
 
 /**
- * The project an API member may work in, or null when the room names none.
- * @param {{cwd?: string, project_access?: string}} options - the room's project directory and this member's access.
+ * The project an API member may work in, or null when the room names none. Without its own directory (it joined before
+ * the room had a project), the first of the room's directories is where relative paths resolve.
+ * @param {{cwd?: string, project_access?: string, extra_directories?: {path: string, access: string}[]}} options - the
+ *   member's project directory, its access, and the room's other directories with its access to each.
  * @param {string[]} private_paths - runner directories holding credentials, never readable through these tools.
- * @returns {{root: string, writable: boolean, private_paths: string[], observed: Map<string, string>} | null}
+ * @returns {{root: string, roots: {root: string, writable: boolean}[], writable: boolean, private_paths: string[],
+ *   observed: Map<string, string>} | null} `root` is the main directory; `writable` is whether any directory is.
  */
-export function open_project({ cwd, project_access }, private_paths = []) {
-  if (!cwd) return null;
-  return { root: realpathSync(cwd), writable: project_access === 'write', observed: new Map(),
+export function open_project({ cwd, project_access, extra_directories = [] }, private_paths = []) {
+  const roots = cwd ? [{ root: realpathSync(cwd), writable: project_access === 'write' }] : [];
+  for (const item of extra_directories) {
+    // A folder moved away since it was added is left out rather than failing the whole execution.
+    try { roots.push({ root: realpathSync(item.path), writable: project_access === 'write' && item.access === 'write' }); } catch { /* Gone. */ }
+  }
+  if (!roots.length) return null;
+  return { root: roots[0].root, roots, writable: roots.some(item => item.writable), observed: new Map(),
     private_paths: private_paths.filter(Boolean).map(path => real_path(resolve(path))) };
 }
 
+/** The project directory holding a real path, or undefined outside all of them. */
+function owner(project, path) {
+  return project.roots.find(item => inside(item.root, path));
+}
+
 /** The tools this member gets for its project; none without a project. */
 export function file_tools(project) {
   if (!project) return [];
   return [...READ_TOOLS, ...(project.writable ? WRITE_TOOLS : [])].map(name => DEFINITIONS[name]);
 }
 
-/** The project-relative path shown to the model, with forward slashes. */
+/** The path shown to the model, with forward slashes: relative in the main directory, absolute in the others. */
 function display(project, path) {
+  if (!inside(project.root, path)) return path.split(sep).join('/');
   return relative(project.root, path).split(sep).join('/') || '.';
 }
 
 /** Why a path inside the project is still refused, or '' when it may be used. */
 function refusal(project, path) {
-  if (relative(project.root, path).split(sep).some(part => VCS_DIRECTORIES.includes(part.toLowerCase()))) return 'version control metadata';
+  if (relative(owner(project, path)?.root ?? project.root, path).split(sep).some(part => VCS_DIRECTORIES.includes(part.toLowerCase()))) return 'version control metadata';
   const name = basename(path);
   if (!SECRET_EXAMPLES.test(name) && SECRET_NAMES.some(rule => rule.test(name))) return 'a secret file';
   if (project.private_paths.some(root => inside(root, path))) return "the runner's private files";
   return '';
 }
 
-/** Resolve a requested path to a real path inside the project, refusing protected files. */
-function target(project, requested, exists = true) {
+/** Resolve a requested path to a real path inside the project, refusing protected files and, to modify, read-only directories. */
+function target(project, requested, exists = true, modify = false) {
   if (typeof requested !== 'string' || !requested.trim()) throw new Error('file_path must be a non-empty string');
   const absolute = resolve(project.root, requested);
   let path;
@@ -125,7 +140,9 @@ function target(project, requested, exists = true) {
     if (error.code === 'ENOENT') throw new Error(`cannot resolve "${requested}": not found`);
     throw error;
   }
-  if (!inside(project.root, path)) throw new Error(`cannot access "${requested}": outside the project directory`);
+  const root = owner(project, path);
+  if (!root) throw new Error(`cannot access "${requested}": outside the project directories`);
+  if (modify && !root.writable) throw new Error(`cannot modify "${requested}": its directory is read-only for you`);
   const reason = refusal(project, path);
   if (reason) throw new Error(`cannot access "${requested}": ${reason} is not available to API members`);
   return { path, shown: display(project, path) };
@@ -216,7 +233,7 @@ function atomic_write(file, content, info) {
 
 function write(project, args) {
   if (typeof args.content !== 'string') throw new Error('content must be a string');
-  const file = target(project, args.file_path, false);
+  const file = target(project, args.file_path, false, true);
   let info = null;
   try { info = statSync(file.path); } catch (error) { if (error.code !== 'ENOENT') throw error; }
   if (info && !info.isFile()) throw new Error(`cannot write "${file.shown}": not a regular file`);
@@ -229,7 +246,7 @@ function edit(project, args) {
   for (const field of ['old_string', 'new_string']) if (typeof args[field] !== 'string') throw new Error(`${field} must be a string`);
   if (!args.old_string) throw new Error('old_string must be a non-empty string');
   if (args.old_string === args.new_string) throw new Error('old_string and new_string must differ');
-  const file = target(project, args.file_path);
+  const file = target(project, args.file_path, true, true);
   const info = regular_file(file, 'edit');
   check_observed(project, file, info);
   const raw = decode(file, readFileSync(file.path), 'edit');