@harness-mix/cli 0.2.0 → 0.2.2

package/src/main/host/collaboration.js

@@ -1,5 +1,6 @@
 const http = require('node:http');
 const { randomUUID } = require('node:crypto');
+const fs = require('node:fs');
 const path = require('node:path');
 const { tools } = require('./collaboration-tools');
 const { z } = require('zod');
@@ -10,6 +11,12 @@ const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 const MAX_CONCURRENT_SUBTASKS = 6;
 const MAX_SUBTASKS_PER_TURN = 16;
 
+// Settings → Collaboration 开关：两者默认开启。collaboration 关闭时不再注入协作
+// MCP、不解析 # 提及、拒绝一切协作工具调用；agentTeam 关闭时保留一次性委派，
+// 但隐藏并拒绝 create_agent_team 等团队工具。
+const DEFAULT_PREFERENCES = Object.freeze({ collaboration: true, agentTeam: true });
+const TEAM_TOOL_NAMES = new Set(['create_agent_team', 'assign_team_task', 'get_team_state', 'update_team_task', 'send_team_message']);
+
 // Dependency depth of each task: the longest chain of prerequisites, used to
 // lay the team board out in lanes.
 // Missing dependency ids are ignored (the runtime already rejects unknown ids at
@@ -79,10 +86,40 @@ class Collaboration {
     this.store = new Store(path.join(runtime.store.directory, 'collaboration'));
     this.teamStore = new Store(path.join(runtime.store.directory, 'collaboration'), 'teams.json');
     this.teams = new Map();
+    this.prefFile = path.join(runtime.store.directory, 'collaboration', 'preferences.json');
+    this.prefs = { ...DEFAULT_PREFERENCES };
+  }
+
+  async loadPreferences() {
+    try {
+      const parsed = JSON.parse(await fs.promises.readFile(this.prefFile, 'utf8'));
+      // 只认显式的 false：缺失字段/旧文件一律回落到默认开启
+      this.prefs = {
+        collaboration: parsed?.collaboration !== false,
+        agentTeam: parsed?.agentTeam !== false,
+      };
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error;
+    }
+  }
+
+  getPreferences() {
+    return { ...this.prefs };
+  }
+
+  async setPreferences(patch = {}) {
+    await this.initialize();
+    if (typeof patch.collaboration === 'boolean') this.prefs.collaboration = patch.collaboration;
+    if (typeof patch.agentTeam === 'boolean') this.prefs.agentTeam = patch.agentTeam;
+    await fs.promises.mkdir(path.dirname(this.prefFile), { recursive: true });
+    const tmp = `${this.prefFile}.${process.pid}.${randomUUID()}.tmp`;
+    await fs.promises.writeFile(tmp, JSON.stringify(this.prefs, null, 2));
+    await fs.promises.rename(tmp, this.prefFile);
+    return this.getPreferences();
   }
 
   async initialize() {
-    if (!this.loading) this.loading = Promise.all([this.store.load(), this.teamStore.load()]).then(async ([rows, teams]) => {
+    if (!this.loading) this.loading = this.loadPreferences().then(() => Promise.all([this.store.load(), this.teamStore.load()])).then(async ([rows, teams]) => {
       for (const row of rows) {
         if (!row.id || !row.owner || !row.agent) throw new Error('Invalid collaboration history');
         this.jobs.set(row.id, { ...row, ...(row.status === 'running' ? { status: 'interrupted', error: 'Host restarted; resume this native session explicitly.' } : {}) });
@@ -191,9 +228,12 @@ class Collaboration {
 
   emitTeam(team, action) {
     if (!this.runtime.execution.isRunning(team.owner)) return;
+    // 团队全部完成时把团队卡片结算为 done——否则它会作为未终态 tool_call
+    // 一直挂到回合结束，被投影成「执行中」。完成后若再 reopen，会以 running 复更。
+    const done = team.status === 'completed';
     this.runtime.emitCollaboration(team.owner, {
       kind: 'tool', toolCallId: `agent-team:${team.id}`, title: `Agent Team · ${team.name}`,
-      state: 'running', input: team.goal, output: JSON.stringify({ action, ...this.teamView(team) }),
+      state: done ? 'done' : 'running', input: team.goal, output: JSON.stringify({ action, ...this.teamView(team) }),
     });
   }
 
@@ -250,7 +290,7 @@ class Collaboration {
     let key = this.keys.get(thread.id);
     if (!key) { key = randomUUID(); this.keys.set(thread.id, key); }
     return { command: process.execPath, args: [path.join(__dirname, 'collaboration-mcp.cjs')],
-      env: { HARNESS_MIX_COLLAB_URL: `http://127.0.0.1:${this.server.address().port}`, HARNESS_MIX_COLLAB_KEY: key } };
+      env: { HARNESS_MIX_COLLAB_URL: `http://127.0.0.1:${this.server.address().port}`, HARNESS_MIX_COLLAB_KEY: key, HARNESS_MIX_COLLAB_TEAM: this.prefs.agentTeam ? '1' : '0' } };
   }
 
   async handle(req, res) {
@@ -360,13 +400,19 @@ class Collaboration {
     await this.initialize();
     if (this.closing) throw new Error('Host is closing');
     if (!validators.has(name)) throw new Error('Unknown collaboration tool');
+    if (!this.prefs.collaboration) {
+      throw new Error('多 Agent 协作已在设置中停用（设置 → 协作）。Multi-Agent collaboration is disabled in Settings → Collaboration.');
+    }
     args = validators.get(name).parse(args);
     const rt = this.runtime;
-    const teamTools = new Set(['create_agent_team', 'assign_team_task', 'get_team_state', 'update_team_task', 'send_team_message']);
+    const teamTools = TEAM_TOOL_NAMES;
     const participant = this.participant(principal, args.team_id);
     const owner = participant?.team.owner ?? principal;
     const parent = rt.threads.find(t => t.id === owner);
     if (teamTools.has(name)) {
+      if (name === 'create_agent_team' && !this.prefs.agentTeam) {
+        throw new Error('Agent Team 已在设置中停用（设置 → 协作）。Agent Team is disabled in Settings → Collaboration; one-shot delegation remains available.');
+      }
       if (!rt.execution.isRunning(principal) || (principal === owner && this.cancelling.has(owner))) throw new Error('Collaboration turn is no longer active');
       return this.teamCall(principal, name, args);
     }
@@ -407,8 +453,16 @@ class Collaboration {
       const jobs = [...this.jobs.values()].filter(j => j.owner === owner);
       if (jobs.filter(j => j.status === 'running').length >= MAX_CONCURRENT_SUBTASKS) throw new Error('At most six concurrent subtasks; collect existing results first');
       if (jobs.filter(j => j.turnId === rt.execution.lastTurn(owner)?.id).length >= MAX_SUBTASKS_PER_TURN) throw new Error('At most sixteen subtasks per lead turn');
+      // Risk-aware default: while another session outside this collaboration group is
+      // actively running in the lead directory, a shared workspace would let both sides
+      // silently overwrite each other — start new workers isolated ('auto' isolates Git
+      // projects into a worktree and falls back to shared only outside Git). A teammate's
+      // inherited workspace and an explicit isolation argument still win over the default.
+      const externalActive = rt.threads.some(t => t.id !== owner && t.parentThreadId !== owner && !this.isParticipant(t, owner)
+        && String(t.cwd).toLowerCase() === String(parent.cwd).toLowerCase()
+        && (rt.execution.isRunning(t.id) || t.reviewPending));
       const job = { id: randomUUID(), owner, agent, turnId: rt.execution.lastTurn(owner).id, status: 'running', task: args.task,
-        isolation: previousMemberJob?.isolation ?? args.isolation ?? 'shared',
+        isolation: previousMemberJob?.isolation ?? args.isolation ?? (externalActive ? 'auto' : 'shared'),
         ...(previousMemberJob?.workspace ? { workspace: previousMemberJob.workspace } : {}),
         ...(team ? { teamId: team.id, memberId: member.id, teamTaskId: teamTask.id, ...(member.childId ? { childId: member.childId } : {}) } : {}) };
       this.jobs.set(job.id, job);
@@ -460,18 +514,25 @@ class Collaboration {
   async run(parent, job, task) {
     const rt = this.runtime;
     const turnId = job.turnId;
-    const toolCallId = `collaboration:${randomUUID()}`;
-    const operation = job.childId ? 'sendInput' : 'spawnAgent';
-    const emit = event => {
+    const title = `Agent 协作 · ${rt.adapters.get(job.agent).manifest.name}`;
+    // 「创建智能体」(spawnAgent) 与「执行中」(sendInput) 是两个独立的投影 item：
+    // spawn 在子会话就绪后立即结算为 done，否则 Desktop 原生协作卡片会在整个
+    // 执行期间一直停留在「创建中 N 个智能体」。
+    const spawnCallId = `collaboration:${randomUUID()}`;
+    const workCallId = `collaboration:${randomUUID()}`;
+    const emit = (event, operation, toolCallId) => {
       if (rt.execution.lastTurn(parent.id)?.id === turnId) rt.emitCollaboration(parent.id, { ...event,
         collaboration: { ...this.view(job), operation } });
     };
+    // 已有子会话的后续输入（message_agent / resume / 团队持久成员）不涉及创建。
+    let spawnSettled = !!job.childId;
     try {
       if (!job.workspace) {
         job.workspace = await createWorkspace(parent.cwd, job.id, job.isolation);
         await this.save();
       }
       const workerPermMode = defaultWorkerPermissionMode(job.agent);
+      if (!spawnSettled) emit({ kind: 'tool', toolCallId: spawnCallId, title, input: task, state: 'running', output: JSON.stringify(this.view(job)) }, 'spawnAgent', spawnCallId);
       const child = job.childId ? rt.threads.find(t => t.id === job.childId) : await rt.createThread({
         harnessId: job.agent, cwd: job.workspace.cwd, title: `${parent.title} › ${task.slice(0, 40)}`, parentThreadId: parent.id,
         options: { ...(workerPermMode ? { permissionMode: workerPermMode } : {}) },
@@ -486,7 +547,11 @@ class Collaboration {
       if (!child) throw new Error('Native child history is missing; no replacement session was created');
       job.childId = child.id;
       await this.save();
-      emit({ kind: 'tool', toolCallId, title: `Agent 协作 · ${rt.adapters.get(job.agent).manifest.name}`, input: task, state: 'running', output: JSON.stringify(this.view(job)) });
+      if (!spawnSettled) {
+        emit({ kind: 'tool', toolCallId: spawnCallId, title, input: task, state: 'done', output: JSON.stringify(this.view(job)) }, 'spawnAgent', spawnCallId);
+        spawnSettled = true;
+      }
+      emit({ kind: 'tool', toolCallId: workCallId, title, input: task, state: 'running', output: JSON.stringify(this.view(job)) }, 'sendInput', workCallId);
       if (job.status !== 'running' || this.closing || !rt.execution.isRunning(parent.id)) { job.status = 'cancelled'; return; }
       // Child native file events remain visible; only the lead snapshots the shared workspace.
       const sending = rt.send(child.id, task, { collaborationOf: parent.id, isolated: job.workspace.mode === 'worktree' });
@@ -504,7 +569,7 @@ class Collaboration {
           turnInactiveSince = null;
         }
         const current = this.view(job).display_status;
-        if (current !== displayedStatus) { displayedStatus = current; emit({ kind: 'tool', toolCallId, state: 'running', output: JSON.stringify(this.view(job)) }); }
+        if (current !== displayedStatus) { displayedStatus = current; emit({ kind: 'tool', toolCallId: workCallId, state: 'running', output: JSON.stringify(this.view(job)) }, 'sendInput', workCallId); }
         if (Date.now() > until) { await rt.cancel(child.id); throw new Error('Subtask timed out after 30 minutes'); }
         await delay(100);
       }
@@ -549,7 +614,12 @@ class Collaboration {
         if (team) { this.refreshTeamStatus(team); await this.publishTeam(team, 'task_failed'); }
       }
     }
-    finally { await this.save(); emit({ kind: 'tool', toolCallId, state: job.status === 'completed' ? 'done' : 'error', output: JSON.stringify(this.view(job)) }); }
+    finally {
+      await this.save();
+      // 创建阶段失败（如原生会话启动报错）时，把仍在「创建中」的 spawn 卡片结算为错误。
+      if (!spawnSettled) emit({ kind: 'tool', toolCallId: spawnCallId, title, input: task, state: 'error', output: JSON.stringify(this.view(job)) }, 'spawnAgent', spawnCallId);
+      emit({ kind: 'tool', toolCallId: workCallId, title, state: job.status === 'completed' ? 'done' : 'error', output: JSON.stringify(this.view(job)) }, 'sendInput', workCallId);
+    }
   }
 
   async cancel(job) {