ai_co_discuss 0.3.92 → 0.3.94

package/docs/runner.md

@@ -159,7 +159,7 @@ API 成员可以担任专家或主持人。房间指定了项目目录时，它
 
 ## 常见问题
 
-- **软件送达失败**：查看成员状态与原位失败卡，在对应软件中处理登录或权限；倒计时期间可以立即重试或停止。三次重试用尽后，讨论专家的失败交给主持人处理；也可跳过本次发言。
+- **软件送达失败**：查看成员状态与原位失败卡，在对应软件中处理登录或权限；倒计时期间可以立即重试或停止。本机接入程序重启或异常退出、导致进行中的软件进程随之结束时，同样自动重新投递同一执行，间隔缩短为 5 秒。三次重试用尽后，讨论专家的失败交给主持人处理；也可跳过本次发言。
 - **Codex 提示会话被占用**：原聊天仍被 Codex App 占用，可在进度看板切换到 App 接入。
 - **Windows 报告两处数据路径**：从普通终端管理服务，或设置环境变量 `DISCUSS_SERVICE_HOME`。
 - **结果不明**：已交付但无法确认的任务不会自动重发，请先在原会话与房间中核对。

package/package.json

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

package/runner/adapters/antigravity_cli.mjs

@@ -19,7 +19,8 @@ const AGY_MODEL_TAG = [0xe2, 0x01];
 
 /**
  * One operation a headless agy run refused, from the failed tool step, with the project grant that would allow it.
- * agy names the check that failed: a sandboxed or unsandboxed command, or a file write.
+ * agy names the check that failed: a sandboxed or unsandboxed command, a file write, or (1.5.3+) a file read outside
+ * the project folders.
  */
 export function agy_denial(step) {
   const message = step.tool_info?.error?.message || '';
@@ -28,9 +29,9 @@ export function agy_denial(step) {
   // Older agy did not name the check; a refused step with a command line was a command.
   const kind = message.match(/permission check failed for (\w+)/)?.[1] || (parameters.CommandLine ? 'command' : '');
   if (!kind) return null;
-  if (kind === 'write_file') {
-    const path = String(parameters.Path || parameters.TargetFile || message.match(/write_file\(([^)]+)\)/)?.[1] || '');
-    return { tool: 'write_file', detail: path.slice(0, DENIAL_FIELD), rule: path ? `write_file(${resolve(dirname(path)).replaceAll('\\', '/')})` : '' };
+  if (kind === 'write_file' || kind === 'read_file') {
+    const path = String(parameters.Path || parameters.TargetFile || message.match(new RegExp(`${kind}\\(([^)]+)\\)`))?.[1] || '');
+    return { tool: kind, detail: path.slice(0, DENIAL_FIELD), rule: path ? `${kind}(${resolve(dirname(path)).replaceAll('\\', '/')})` : '' };
   }
   const command = String(parameters.CommandLine || '');
   const rule = `${kind === 'unsandboxed' ? 'unsandboxed_command' : 'command'}(${command})`;
@@ -53,6 +54,18 @@ function check_agy_shell(user_home) {
   }
 }
 
+/**
+ * Skill folders agy loads by itself: its own folder and every entry in its global skills.json. agy shows the model these
+ * skills' paths, so a run must be able to read them (1.5.3 refuses reads outside the added directories); agy leaves ~/
+ * unexpanded on Windows.
+ */
+export function agy_skill_directories(user_home = homedir()) {
+  const entries = read_json(join(user_home, '.gemini', 'config', 'skills.json')).entries;
+  const listed = (Array.isArray(entries) ? entries : []).map(entry => entry?.path).filter(value => typeof value === 'string')
+    .map(value => process.platform !== 'win32' && value.startsWith('~/') ? join(user_home, value.slice(2)) : value);
+  return [join(user_home, '.gemini', 'config', 'skills'), ...listed].filter(value => isAbsolute(value) && existsSync(value));
+}
+
 /** Test directory containment on the current platform, including Windows drive boundaries. */
 function within_directory(parent, child) {
   const path = relative(resolve(parent), resolve(child));
@@ -94,7 +107,7 @@ function agy_project_grants(config, task, resources, user_home) {
   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'),
+  const protected_paths = [task.directory, ...task.skill_directories, ...agy_skill_directories(user_home), join(user_home, '.gemini'),
     ...(config.project_access === 'read' ? projects : []), ...read_only];
   if (protected_paths.some(directory => within_directory(directory, task.draft_directory))) {
     throw new Error('agy 草稿目录不能位于只读项目、运行目录、技能或 .gemini 配置目录中，未交付讨论任务');
@@ -156,7 +169,8 @@ 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, ...(task.extra_directories || []).map(item => item.path)].flatMap(directory => ['--add-dir', directory])];
+    '--add-dir', task.draft_directory, ...[...task.skill_directories, ...agy_skill_directories(user_home),
+      ...(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'] : []),
@@ -176,7 +190,8 @@ function lifecycle(state, event, task, bind) {
   const denied = step?.state === 'ERROR' ? agy_denial(step) : null;
   if (denied) {
     if (!state.denials.some(item => item.detail === denied.detail) && state.denials.length < MAX_DENIALS) state.denials.push(denied);
-    state.denial = `${denied.tool === 'write_file' ? '写入' : '运行'}了未授权的${denied.tool === 'write_file' ? '文件' : '命令'}「${denied.detail.slice(0, 120)}」，无人值守模式下无法确认权限而被自动拒绝，随后会话结束`;
+    const action = { write_file: '写入了未授权的文件', read_file: '读取了未授权的文件' }[denied.tool] || '运行了未授权的命令';
+    state.denial = `${action}「${denied.detail.slice(0, 120)}」，无人值守模式下无法确认权限而被自动拒绝，随后会话结束`;
   }
   if (event.event === 'result') {
     const result = event.result || {};

package/runner/free_runner.mjs

@@ -25,6 +25,8 @@ export const GOAL_IDLE_MS = 30_000;
 // A manual member's session that refuses a delivery is retried in the same execution, after a wait the owner can cut short.
 const MAX_DELIVERY_RETRIES = 3;
 const RETRY_DELAY_SECONDS = 60;
+// The cause is gone once the restarted runner is back, so its retry needs no long wait.
+const RESTART_RETRY_DELAY_SECONDS = 5;
 const MAX_RETRY_REASON = 500;
 const LIVE = ['reserving', 'delivering', 'sidecar_pending', 'running', 'retry_wait'];
 // The longest private chat reply the site keeps.
@@ -912,9 +914,10 @@ export class FreeRoomRunner {
     }
     // A restart between persisting and invoking cannot prove non-delivery, so it never resends.
     if (row.status === 'delivering') return this.fail(member.name, execution.id, '上次投递结果不明，未自动重发；请核对原会话后重新发送');
-    // Inherited from a runner that stopped or crashed: once its software processes are gone, no answer can come.
+    // Inherited from a runner that stopped or crashed: once its software processes are gone, no answer can come, so the
+    // same execution is delivered again after the retry wait instead of handing the failure to the host.
     if (row.status === 'running' && this.orphan(execution.id)?.alive === false) {
-      return this.fail(member.name, execution.id, '本机接入程序重启或异常退出，这次执行的软件进程已结束，未提交回答；请重新发送');
+      return this.retry_or_fail(member.name, execution, '本机接入程序重启或异常退出，这次执行的软件进程已结束，未提交回答', { restarted: true });
     }
     if (row.error) return this.retry_or_fail(member.name, execution, row.error);
     if (this.exited.has(execution.id)) {
@@ -1073,19 +1076,19 @@ export class FreeRoomRunner {
   }
   /**
    * A manual member's session refused the delivery, or the software failed before any turn ran: keep the execution and
-   * deliver again after a wait shown on the website, up to MAX_DELIVERY_RETRIES times; anything else, or the last
-   * attempt, fails as before.
+   * deliver again after a wait shown on the website, up to MAX_DELIVERY_RETRIES times; so is an execution whose software
+   * ended with the previous runner process (`restarted`). Anything else, or the last attempt, fails as before.
    */
-  async retry_or_fail(name, execution, reason) {
+  async retry_or_fail(name, execution, reason, { restarted = false } = {}) {
     const attempt = (execution.retry?.attempt || 0) + 1;
     const not_started = this.not_started.delete(execution.id);
     if (this.not_retryable.delete(execution.id)) return this.fail(name, execution.id, reason);
-    if (this.config.participants[name]?.project_access !== 'own' && !not_started) return this.fail(name, execution.id, reason);
+    if (!restarted && this.config.participants[name]?.project_access !== 'own' && !not_started) return this.fail(name, execution.id, reason);
     if (attempt > MAX_DELIVERY_RETRIES) return this.fail(name, execution.id, `${reason}（已自动重试 ${MAX_DELIVERY_RETRIES} 次）`);
     this.stop_member(name);
     this.exited.delete(execution.id);
     await api(this.config, `/executions/${execution.id}`, { action: 'retry_wait', attempt,
-      retry_at: Math.floor(Date.now() / 1000) + RETRY_DELAY_SECONDS, reason: reason.slice(0, MAX_RETRY_REASON) });
+      retry_at: Math.floor(Date.now() / 1000) + (restarted ? RESTART_RETRY_DELAY_SECONDS : RETRY_DELAY_SECONDS), reason: reason.slice(0, MAX_RETRY_REASON) });
     this.save(name, { status: 'retry_wait', error: '' });
   }
   /** Record the cause on the website, then stop this member's own processes. */