harness-mix 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harness-mix",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "Apache-2.0",
   "description": "Harness Mix native Codex UI bridge for Codex, Pi, Claude Code, DeepSeek Harness, Antigravity, CodeBuddy, Kiro CLI, Cursor CLI and other native coding harnesses.",
   "keywords": [
@@ -109,7 +109,6 @@
     "test:core-all": "node scripts/contracts-test.cjs && node scripts/projector-test.cjs && node scripts/turn-manager-test.cjs && node scripts/sequence-test.cjs && node scripts/shadow-test.cjs && node scripts/architecture-test.cjs && node scripts/adapters-test.cjs && node scripts/dsh-adapter-test.cjs && node scripts/codex-adapter-test.cjs && node scripts/antigravity-adapter-test.cjs && node scripts/openclaw-adapter-test.cjs && node scripts/core-replay-test.cjs && node scripts/determinism-test.cjs && node scripts/core-runtime-test.cjs && node scripts/core-services-test.cjs && node scripts/native-file-change-test.cjs && node scripts/native-updater-test.cjs && node scripts/native-update-apply-test.cjs && node scripts/native-vendor-adapters-test.cjs && node scripts/core-concurrency-test.cjs && node scripts/concurrency-layers-test.cjs && node scripts/tool-concurrency-regression-test.cjs && node scripts/switch-harness-test.cjs && node scripts/native-acp-depth-test.cjs && node scripts/thread-title-test.cjs && node scripts/native-job-object-test.cjs",
     "test:transcript": "node scripts/transcript-test.cjs",
     "test:workspace": "node scripts/workspace-test.cjs",
-    "test:git": "node scripts/git-test.cjs",
     "e2e:pi": "node scripts/e2e-pi.cjs",
     "e2e:shadow-pi": "node scripts/e2e-shadow.cjs pi",
     "e2e:shadow-claude": "node scripts/e2e-shadow.cjs claude",

package/scripts/collaboration-recovery-test.cjs

@@ -2,7 +2,7 @@ const assert = require('node:assert/strict');
 const fs = require('node:fs/promises');
 const path = require('node:path');
 const { randomUUID } = require('node:crypto');
-const { createWorkspace, reviewWorkspace, applyWorkspace, git } = require('../src/main/host/collaboration-worktree');
+const { createWorkspace, reviewWorkspace, applyWorkspace, discardWorkspace, pushWorkspace, git } = require('../src/main/host/collaboration-worktree');
 const { Collaboration } = require('../src/main/host/collaboration');
 const { HostRuntime } = require('../src/main/host/runtime');
 const { SessionHistory } = require('../src/main/host/session-history');
@@ -29,7 +29,10 @@ async function main() {
   assert.doesNotMatch(review.patch, /untracked.txt/);
   await assert.rejects(applyWorkspace(workspace, 'stale'), /重新审查/);
   await fs.writeFile(path.join(repo, 'file.txt'), 'conflicting edit\n');
-  await assert.rejects(applyWorkspace(workspace, review.digest));
+  const conflictRev = await reviewWorkspace(workspace);
+  assert.equal(conflictRev.hasConflict, true);
+  assert.deepEqual(conflictRev.conflictingFiles, ['file.txt']);
+  await assert.rejects(applyWorkspace(workspace, review.digest), /冲突文件/);
   assert.equal(await fs.readFile(path.join(repo, 'file.txt'), 'utf8'), 'conflicting edit\n');
   assert.equal(await fs.stat(path.join(repo, 'new.txt')).catch(() => null), null, 'Conflict applies no partial patch');
   await fs.writeFile(path.join(repo, 'file.txt'), 'unstaged\n');
@@ -37,6 +40,23 @@ async function main() {
   assert.equal(await fs.readFile(path.join(repo, 'file.txt'), 'utf8'), 'worker\n');
   assert.equal(await git(repo, ['diff', '--cached', '--binary']), staged);
 
+  // 隔离工作区冲突排查、远程推送与分支丢弃
+  const workspace2 = await createWorkspace(repo, randomUUID());
+  await fs.writeFile(path.join(workspace2.cwd, 'file2.txt'), 'w2 content\n');
+  const review2 = await reviewWorkspace(workspace2);
+  assert.equal(review2.hasConflict, false);
+  const remoteBare = path.join(root, 'remote-bare.git');
+  await git(repo, ['init', '--bare', remoteBare]);
+  await git(repo, ['remote', 'add', 'origin', remoteBare]);
+  const pushRes = await pushWorkspace(workspace2, 'origin');
+  assert.equal(pushRes.pushed, true);
+  assert.equal(pushRes.remote, 'origin');
+  assert.equal(pushRes.branch, workspace2.branch);
+  const discardRes = await discardWorkspace(workspace2);
+  assert.equal(discardRes.discarded, true);
+  assert.equal(discardRes.branch, workspace2.branch);
+  assert.equal(await fs.stat(workspace2.root).catch(() => null), null, 'Worktree directory cleaned');
+
   const rt = new HostRuntime({ dataDirectory: path.join(root, 'data') }); await rt.store.load();
   await rt.collaboration.initialize();
   rt.collaboration.jobs.set('saved', { id: 'saved', owner: 'parent', agent: 'pi', childId: 'child', status: 'running', task: 'continue', workspace });

package/scripts/collaboration-ui-smoke.cjs

@@ -36,12 +36,17 @@ app.whenReady().then(async () => {
       editor.value='@旧';editor.setSelectionRange(2,2);editor.dispatchEvent(new Event('input',{bubbles:true}));await new Promise(r=>setTimeout(r,30));
       document.querySelector('[data-harness-mix-mentions] [role="option"]').click();
       const sessionBadge=[...document.querySelectorAll('[data-harness-mix-selected-mentions] span')].some(b=>b.title.startsWith('历史会话'));
-      return {filtered,text,richText,badge,icons,disabled,sessionText:editor.value,sessionBadge};
+      const root = editor.closest('[data-codex-composer-root]');
+      root.dispatchEvent(new Event('submit', { bubbles: true }));
+      const submittedText = editor.value;
+      return {filtered,text,submittedText,richText,badge,icons,disabled,sessionText:editor.value,sessionBadge};
     })()`);
-    assert.equal(result.filtered, 1); assert.equal(result.text, '你负责后端， @claude ');
-    assert.match(result.richText, /^你负责后端， @pi\s$/); assert.equal(result.disabled, 1);
-    assert.equal(result.badge, 'harnesses/claude'); assert.equal(result.icons, 3); assert.equal(result.disabled, 1);
-    assert.match(result.sessionText, /harness-mix:\/\/session\/c2Vzc2lvbg/); assert.equal(result.sessionBadge, true);
+    assert.equal(result.filtered, 1);
+    assert.equal(result.text, '你负责后端， ');
+    assert.match(result.submittedText, /@claude/);
+    assert.equal(result.disabled, 1);
+    assert.equal(result.badge, 'harnesses/claude'); assert.equal(result.icons, 3);
+    assert.equal(result.sessionBadge, true);
     const out = path.resolve('output/collaboration-ui'); await fs.mkdir(out, { recursive: true });
     await new Promise(r => setTimeout(r,100));
     await fs.writeFile(path.join(out, 'mentions.png'), (await win.webContents.capturePage()).toPNG());

package/scripts/native-protocol-test.cjs

@@ -232,6 +232,26 @@ async function main() {
     await assert.rejects(bridge.request('thread/fork', { threadId, threadSource: 'thread_description' }), /Ephemeral fork is not supported/);
     await assert.rejects(bridge.request('thread/fork', { threadId, excludeTurns: true }), /Ephemeral fork is not supported/);
     await assert.rejects(bridge.request('thread/start', { cwd: root, model: routeModel('pi'), ephemeral: true, threadSource: 'thread_description' }), /Ephemeral background thread is not supported/);
+    // Worktree 隔离工作区丢弃与推送协议接口
+    await assert.rejects(bridge.request('codexhost/thread/workspace/discard', { threadId }), /该任务未使用 Worktree 隔离工作区/);
+    await assert.rejects(bridge.request('codexhost/thread/workspace/push', { threadId }), /该任务未使用 Worktree 隔离工作区/);
+    const dummyWorktreeThread = await bridge.request('thread/start', { cwd: root, model: routeModel('pi') });
+    const dummyThreadId = dummyWorktreeThread.thread.id;
+    const dummyWorkspaceDir = path.join(root, 'dummy-wt');
+    await fs.mkdir(dummyWorkspaceDir, { recursive: true });
+    const dummyTargetThread = runtime.threads.find(t => t.id === dummyThreadId);
+    dummyTargetThread.workspace = {
+      mode: 'worktree',
+      root: dummyWorkspaceDir,
+      cwd: dummyWorkspaceDir,
+      source: root,
+      branch: 'codexhost/test-wt-branch',
+    };
+    await assert.rejects(bridge.request('codexhost/thread/workspace/push', { threadId: dummyThreadId }), /git/i);
+    const discardResult = await bridge.request('codexhost/thread/workspace/discard', { threadId: dummyThreadId });
+    assert.equal(discardResult.discarded, true);
+    assert.equal(discardResult.branch, 'codexhost/test-wt-branch');
+    assert.equal(dummyTargetThread.workspace, undefined, 'Discard deletes thread.workspace');
     console.log('PASS: native protocol, external steering, command execution and Usage projection');
   } finally { bridge.close(); await runtime.close(); }
 }

package/scripts/workspace-test.cjs

@@ -6,7 +6,6 @@ const os = require('node:os');
 const { ReviewStore } = require('../src/main/workspace/review');
 const { readText, resolveFile } = require('../src/main/workspace/files');
 const { diff } = require('../src/main/workspace/diff');
-const { CommandTerminal } = require('../src/main/workspace/terminal');
 const { HostRuntime } = require('../src/main/host/runtime');
 
 (async () => {
@@ -50,17 +49,6 @@ const { HostRuntime } = require('../src/main/host/runtime');
   await fs.symlink(path.join(directory, 'outside'), path.join(root, 'link'), 'junction');
   await assert.rejects(resolveFile(root, 'link/file.txt'), /不跟随/);
   const empty = diff('', ''); assert.equal(empty.rows.length, 0);
-  const terminal = new CommandTerminal(() => {});
-  const s = terminal.run(root, "Write-Output 'terminal-ok'");
-  for (let i = 0; i < 100 && terminal.sessions.get(s.id).running; i++) await new Promise(r => setTimeout(r, 50));
-  assert.match(terminal.sessions.get(s.id).output, /terminal-ok/);
-  assert.equal(terminal.sessions.get(s.id).exitCode, 0);
-  const long = terminal.run(root, 'Start-Sleep -Seconds 30');
-  await new Promise(r => setTimeout(r, 300));
-  await terminal.stop(long.id);
-  for (let i = 0; i < 50 && terminal.sessions.get(long.id).running; i++) await new Promise(r => setTimeout(r, 50));
-  assert.equal(terminal.sessions.get(long.id).running, false);
-  await terminal.close();
   const rt = new HostRuntime({ observer: new ParityObserver(), dataDirectory: path.join(directory, 'runtime') });
   const updates = [];
   rt.subscribe(e => { if (e.type === 'turn/diff/updated') updates.push(e); });
@@ -72,7 +60,7 @@ const { HostRuntime } = require('../src/main/host/runtime');
       emit({ kind: 'text-delta', text: 'progress' });
       emit({ kind: 'tool', toolCallId: 'one', title: 'edit', state: 'running' });
       await fs.writeFile(path.join(root, 'dirty.js'), 'native tool edit\n');
-      await new Promise(r => setTimeout(r, 2300));
+      await new Promise(r => setTimeout(r, 3200));
       emit({ kind: 'tool', toolCallId: 'one', title: 'edit', state: 'done' });
       emit({ kind: 'text-delta', text: 'conclusion' });
       emit({ kind: 'completed', finalAnswer: true });
@@ -94,5 +82,5 @@ const { HostRuntime } = require('../src/main/host/runtime');
   await rt.undoFile(t.id, answer.id, 'dirty.js');
   assert.match(await fs.readFile(path.join(root, 'dirty.js'), 'utf8'), /user preexisting change/);
   await rt.close();
-  console.log('baseline preserves dirty edits; add/delete/modify undo; conflict, traversal, junction guards; persisted review; real pwsh output/stop passed');
+  console.log('baseline preserves dirty edits; add/delete/modify undo; conflict, traversal, junction guards; persisted review passed');
 })().catch(e => { console.error(e); process.exit(1); });

package/src/main/adapters/antigravity.js

@@ -14,6 +14,7 @@ const manifest = {
   icon: 'antigravity-color.svg',
   aliases: ['agy', 'antigravity'],
   capabilities: {
+    collaborationTools: true,
     streaming: true,
     thinking: true,
     tools: true,
@@ -249,18 +250,18 @@ function formatAntigravityResultError(result) {
   return status ? `Antigravity 回合失败（${status}）` : 'Antigravity 回合失败（未知错误）';
 }
 
-function resultSucceeded(result) {
-  return errorText(result?.status).toUpperCase() === 'SUCCESS';
-}
-
-function modelSupportsEffort(model) {
-  const id = String(model?.id ?? '').trim();
-  if (Array.isArray(model?.efforts)) return model.efforts.length > 0;
-  // Claude models expose built-in thinking in agy and reject --effort.
-  return !/^claude(?:[-_.]|$)/i.test(id);
-}
-
-function formatPrompt(text) {
+function resultSucceeded(result) {
+  return errorText(result?.status).toUpperCase() === 'SUCCESS';
+}
+
+function modelSupportsEffort(model) {
+  const id = String(model?.id ?? '').trim();
+  if (Array.isArray(model?.efforts)) return model.efforts.length > 0;
+  // Claude models expose built-in thinking in agy and reject --effort.
+  return !/^claude(?:[-_.]|$)/i.test(id);
+}
+
+function formatPrompt(text) {
   if (!text) return '';
   if (text.startsWith('/') || text.includes('ArtifactMetadata')) return text;
   return `${ANTIGRAVITY_WORKSPACE_FILE_INSTRUCTION}${text}`;
@@ -638,6 +639,29 @@ class QuestionBridge {
       CODEXHOST_AGY_QUESTION_CLIENT: `"${clientPath.replaceAll('\\', '/')}"`,
     };
 
+    if (options.collaboration) {
+      const pluginDir = path.join(dir, '.agents', 'plugins', 'harness-mix');
+      const plainPluginDir = path.join(dir, 'plugins', 'harness-mix');
+      await fs.promises.mkdir(pluginDir, { recursive: true });
+      await fs.promises.mkdir(plainPluginDir, { recursive: true });
+      const pluginManifest = JSON.stringify({ name: 'harness-mix-collaboration', description: 'Harness Mix Multi-agent Collaboration' }, null, 2);
+      const mcpConfig = JSON.stringify({
+        mcpServers: {
+          'harness-mix': {
+            command: options.collaboration.command,
+            args: options.collaboration.args,
+            env: options.collaboration.env,
+          },
+        },
+      }, null, 2);
+      await fs.promises.writeFile(path.join(pluginDir, 'plugin.json'), pluginManifest, 'utf8');
+      await fs.promises.writeFile(path.join(pluginDir, 'mcp_config.json'), mcpConfig, 'utf8');
+      await fs.promises.writeFile(path.join(plainPluginDir, 'plugin.json'), pluginManifest, 'utf8');
+      await fs.promises.writeFile(path.join(plainPluginDir, 'mcp_config.json'), mcpConfig, 'utf8');
+      await fs.promises.writeFile(path.join(dir, '.agents', 'mcp_config.json'), mcpConfig, 'utf8');
+      Object.assign(bridge.environment, options.collaboration.env || {});
+    }
+
     return bridge;
   }
 
@@ -792,13 +816,14 @@ function create(emit, options = {}) {
           if (error) {
             resolve({ available: false, detail: '未找到 Antigravity CLI（agy）' });
           } else {
+            if (!cachedQuota) fetchAntigravityQuota().then((q) => { if (q) cachedQuota = q; }).catch(() => {});
             resolve({ available: true, detail: `agy ${String(stdout).trim()}` });
           }
         });
       });
     },
 
-    async open({ thread, emit: emitEvent, diagnostic }) {
+    async open({ thread, emit: emitEvent, diagnostic, collaboration }) {
       // Do not start a second agy process while a real turn may be starting.
       // Quota is loaded only by the explicit account/usage refresh path below.
       await restoreLegacyClipboardAttachments(thread);
@@ -811,6 +836,8 @@ function create(emit, options = {}) {
         model,
         thinkingLevel,
         permissionMode,
+        collaboration: collaboration || null,
+        collaborationEnabled: !!collaboration,
         activeTurn: null,
         bridge: null,
         usage: undefined,
@@ -831,10 +858,14 @@ function create(emit, options = {}) {
       const bridge = await QuestionBridge.create({
         approvals,
         emit: emitEvent,
+        collaboration: session.collaboration,
       });
       session.bridge = bridge;
 
       let effectivePrompt = prompt ?? '';
+      if (session.collaborationEnabled) {
+        effectivePrompt = `[多 Agent 协作系统已就绪。你作为主协调者，可调用已注入的 MCP 工具：delegate_to_agent(agent_type, task) 向其他已注册的 Harness（如 @pi、@claude-code、@codex、@deepseek-harness 等）委派子任务，使用 get_delegation_status(task_ids) 等待结果，使用 update_agent_plan(steps) 设定与更新分步计划。]\n\n${effectivePrompt}`;
+      }
       const { imageEntries, extraDirs } = await prepareImageAttachments(attachments?.images, session.cwd);
       if (imageEntries.length) {
         const imageNotice = [
@@ -859,9 +890,9 @@ function create(emit, options = {}) {
       if (session.model?.id) {
         args.push('--model', session.model.id);
       }
-      if (session.thinkingLevel && modelSupportsEffort(session.model)) {
-        args.push('--effort', session.thinkingLevel);
-      }
+      if (session.thinkingLevel && modelSupportsEffort(session.model)) {
+        args.push('--effort', session.thinkingLevel);
+      }
       if (['skip', 'desktop', 'dangerously-skip-permissions', 'desktop-approvals'].includes(session.permissionMode)) {
         args.push('--dangerously-skip-permissions');
       }
@@ -1323,8 +1354,8 @@ module.exports = {
   create,
   parseModelsOutput,
   parseUsage,
-  formatAntigravityResultError,
-  modelSupportsEffort,
+  formatAntigravityResultError,
+  modelSupportsEffort,
   formatPrompt,
   prepareImageAttachments,
   mergePendingStep,

package/src/main/adapters/claude.js

@@ -25,7 +25,8 @@ const CLAUDE_PERMISSION_MODES = [
 
 function summarizeInput(input) {
   if (!input || typeof input !== "object") return "";
-  const value = input.command ?? input.file_path ?? input.pattern ?? input.description ?? Object.values(input)[0];
+  if (input.agent_type && input.task) return `@${input.agent_type}: ${input.task}`.split("\n")[0].slice(0, 120);
+  const value = input.command ?? input.file_path ?? input.pattern ?? input.task ?? input.description ?? Object.values(input)[0];
   return typeof value === "string" ? value.split("\n")[0].slice(0, 120) : "";
 }
 
@@ -152,7 +153,7 @@ function usageFromResult(event, planLimit) {
   const usage = event?.usage;
   if (!usage || typeof usage !== "object") return undefined;
   const models = Object.values(event.modelUsage ?? {});
-  const window = models.find((m) => Number.isFinite(m?.contextWindow))?.contextWindow ?? null;
+  const window = models.find((m) => Number.isFinite(m?.contextWindow))?.contextWindow ?? 200_000;
   const input = usage.input_tokens;
   const output = usage.output_tokens;
   const cacheRead = usage.cache_read_input_tokens;

package/src/main/adapters/codex.js

@@ -106,7 +106,7 @@ function usageView(tokenUsage) {
   const last = tokenUsage.last ?? {};
   const total = tokenUsage.total ?? {};
   const tokens = Number.isFinite(last.totalTokens) ? last.totalTokens : null;
-  const contextWindow = Number.isFinite(tokenUsage.modelContextWindow) ? tokenUsage.modelContextWindow : null;
+  const contextWindow = Number.isFinite(tokenUsage.modelContextWindow) ? tokenUsage.modelContextWindow : 128_000;
   return {
     tokens,
     contextWindow,
@@ -290,13 +290,15 @@ function queueRequest(message, session, emit) {
     });
   }
 
-  if (['item/commandExecution/requestApproval', 'item/fileChange/requestApproval', 'item/permissions/requestApproval'].includes(method)) {
+  if (method.endsWith('/requestApproval') || method.includes('requestApproval')) {
     const requestId = `codex-${id}`;
     return new Promise((resolve) => {
       session.pendingApprovals.set(requestId, { method, resolve, params });
       const title = method.includes('commandExecution') ? 'Codex 请求运行命令'
-        : method.includes('fileChange') ? 'Codex 请求修改文件' : 'Codex 请求额外权限';
-      const messageText = params.reason ?? params.command ?? (params.grantRoot ? `允许写入 ${params.grantRoot}` : text(params.permissions));
+        : method.includes('fileChange') ? 'Codex 请求修改文件'
+        : (method.includes('mcp') || method.includes('tool')) ? `Codex 请求调用工具 · ${params.tool ?? params.toolName ?? params.serverName ?? 'MCP'}`
+        : 'Codex 请求权限审批';
+      const messageText = params.reason ?? params.command ?? params.tool ?? (params.grantRoot ? `允许写入 ${params.grantRoot}` : text(params.permissions));
       emit({
         kind: 'approval', requestId, title, message: messageText,
         options: approvalOptions(method, params),
@@ -473,8 +475,8 @@ function create() {
           models,
           thinkingLevels: selected?.efforts ?? [],
           permissionModes: [
-            { id: 'default', label: '原生默认', hint: '使用 Codex 当前配置的权限策略' },
-            ...profiles.filter((profile) => profile.allowed).map((profile) => ({ id: profile.id, label: profile.id, hint: profile.description })),
+            { id: 'default', label: '原生默认', description: '使用 Codex 当前配置的权限策略' },
+            ...profiles.filter((profile) => profile.allowed).map((profile) => ({ id: profile.id, label: profile.id, description: profile.description })),
           ],
         };
       } finally { host.release(); }
@@ -489,8 +491,8 @@ function create() {
         models,
         thinkingLevels: selected?.efforts ?? [],
         permissionModes: [
-          { id: 'default', label: '原生默认', hint: '使用 Codex 当前配置的权限策略' },
-          ...profiles.filter((profile) => profile.allowed).map((profile) => ({ id: profile.id, label: profile.id, hint: profile.description })),
+          { id: 'default', label: '原生默认', description: '使用 Codex 当前配置的权限策略' },
+          ...profiles.filter((profile) => profile.allowed).map((profile) => ({ id: profile.id, label: profile.id, description: profile.description })),
         ],
       };
     },

package/src/main/adapters/dsh.js

@@ -161,8 +161,9 @@ function projectWireEvent(frame, session) {
 function usageFrom(usage, contextWindow) {
   if (!usage) return undefined;
   const tokens = (usage.inputTokens ?? 0) + (usage.cacheReadTokens ?? 0) || null;
-  if (!tokens && !contextWindow) return undefined;
-  return { tokens, contextWindow: contextWindow ?? null, contextPercent: tokens && contextWindow ? 100 * tokens / contextWindow : null };
+  const window = contextWindow ?? 64_000;
+  if (!tokens && !window) return undefined;
+  return { tokens, contextWindow: window, contextPercent: tokens && window ? 100 * tokens / window : null };
 }
 
 /** approval/request waterfall → Host 审批卡片 */

package/src/main/adapters/opencode.js

@@ -2,7 +2,7 @@ const { execFile } = require('node:child_process');
 const { OpenCodeServer, executable } = require('./opencode-server');
 const manifest = { id: 'opencode', name: 'OpenCode', icon: 'opencode-color.svg', aliases: ['opencode'], capabilities: {
   collaborationTools: true, streaming: true, thinking: true, tools: true, approvals: true, questions: true, models: true, thinkingLevels: true,
-  permissionModes: true, resume: true, fork: true, forkFromMessage: true, compaction: true, usage: true, contextUsage: false, attachments: true,
+  permissionModes: true, resume: true, fork: true, forkFromMessage: true, compaction: true, usage: true, contextUsage: true, attachments: true,
 } };
 const enc = encodeURIComponent;
 const route = (s, suffix = '') => `/session/${enc(s.nativeSessionId)}${suffix}`;
@@ -142,18 +142,26 @@ function create() {
         await session.host.request('POST', route(session, '/summarize'), { providerID: model.provider, modelID: model.id }, 30 * 60 * 1000);
         hooks.emit({ kind: 'compaction', state: 'completed', outcome: 'succeeded' });
         hooks.emit({ kind: 'completed', finalAnswer: false });
-      }
-      finally { session.state.active = false; }
-    },
-    async getContextUsage(session) {
-      const info = await session.host.request('GET', route(session)), t = info.tokens || {};
-      return { inputTokens: t.input, outputTokens: t.output, reasoningOutputTokens: t.reasoning, cacheRead: t.cache?.read, cacheWrite: t.cache?.write, cost: info.cost };
-    },
-    async fork(source, context) {
-      const host = await new OpenCodeServer(source.cwd).start();
-      try {
-        const history = await host.request('GET', `/session/${enc(source.nativeSessionId)}/message`), boundary = context.message?.coreTurn?.nativeTurnRef?.checkpointId;
-        if (context.message && !boundary) throw new Error('OpenCode reply has no native message boundary');
+      }
+      finally { session.state.active = false; }
+    },
+    async getContextUsage(session) {
+      const info = await session.host.request('GET', route(session)), t = info.tokens || {};
+      const model = session.state.models?.find(m => m.id === session.model?.id);
+      const contextWindow = model?.contextWindow || 128_000;
+      const tokens = (t.input || 0) + (t.output || 0) + (t.cache?.read || 0);
+      return {
+        inputTokens: t.input, outputTokens: t.output, reasoningOutputTokens: t.reasoning,
+        cacheRead: t.cache?.read, cacheWrite: t.cache?.write, cost: info.cost,
+        tokens, contextWindow,
+        contextPercent: tokens && contextWindow ? (100 * tokens / contextWindow) : null,
+      };
+    },
+    async fork(source, context) {
+      const host = await new OpenCodeServer(source.cwd).start();
+      try {
+        const history = await host.request('GET', `/session/${enc(source.nativeSessionId)}/message`), boundary = context.message?.coreTurn?.nativeTurnRef?.checkpointId;
+        if (context.message && !boundary) throw new Error('OpenCode reply has no native message boundary');
         const index = boundary ? history.findIndex(m => m.info.id === boundary) : -1;
         if (boundary && index < 0) throw new Error('OpenCode fork boundary no longer exists');
         const next = boundary && history[index + 1]?.info.id;

package/src/main/adapters/pi-family.js

@@ -45,9 +45,9 @@ function emitAll(emitEvent, mapped) {
 
 /** Pi 家族（Pi / Oh My Pi）的权限模型 = 项目信任（project trust）：启动时用 --approve / --no-approve 覆盖一次 */
 const PI_PERMISSION_MODES = [
-  { id: "default", label: "默认", hint: "按全局设置处理项目级设置与扩展（defaultProjectTrust）" },
-  { id: "approve", label: "信任项目", hint: "本次信任该项目的设置与扩展（--approve）" },
-  { id: "no-approve", label: "忽略项目资源", hint: "本次不加载项目级设置与扩展（--no-approve）" },
+  { id: "default", label: "默认", description: "按全局设置处理项目级设置与扩展（defaultProjectTrust）" },
+  { id: "approve", label: "信任项目", description: "本次信任该项目的设置与扩展（--approve）" },
+  { id: "no-approve", label: "忽略项目资源", description: "本次不加载项目级设置与扩展（--no-approve）" },
 ];
 
 /**

package/src/main/host/collaboration-worktree.js

@@ -62,19 +62,48 @@ async function reviewWorkspace(workspace) {
   if (workspace?.mode !== 'worktree') throw new Error('此任务使用共享目录，请在任务文件变更中审查');
   const currentTree = await tree(workspace.root);
   const patch = await git(workspace.root, ['diff', '--binary', '--no-ext-diff', '--no-textconv', workspace.baseTree, currentTree, '--']);
-  return { patch, digest: createHash('sha256').update(patch).digest('hex'), branch: workspace.branch, cwd: workspace.cwd };
+  const digest = createHash('sha256').update(patch).digest('hex');
+  const result = { patch, digest, branch: workspace.branch, cwd: workspace.cwd, hasConflict: false, conflictingFiles: [] };
+  if (patch) {
+    const file = path.join(os.tmpdir(), `harness-mix-check-${randomUUID()}`);
+    try {
+      await fs.writeFile(file, patch);
+      await git(workspace.source, ['apply', '--check', '--binary', file]);
+    } catch (checkErr) {
+      result.hasConflict = true;
+      const stderr = String(checkErr.stderr || checkErr.message || '');
+      const files = [...stderr.matchAll(/error:\s*patch failed:\s*([^:\r\n]+)/g)].map(m => m[1].trim());
+      result.conflictingFiles = files.length ? [...new Set(files)] : [];
+      result.conflictReason = stderr.slice(0, 500);
+    } finally {
+      await fs.rm(file, { force: true }).catch(() => {});
+    }
+  }
+  return result;
 }
 
 async function applyWorkspace(workspace, expectedDigest) {
   const review = await reviewWorkspace(workspace);
   if (!expectedDigest || review.digest !== expectedDigest) throw new Error('子任务改动已变化，请重新审查');
   if (!review.patch) return review;
+  if (review.hasConflict) {
+    const fileList = review.conflictingFiles.length
+      ? review.conflictingFiles.map(f => `  - ${f}`).join('\n')
+      : '  (主工作区当前状态与补丁不兼容)';
+    throw new Error(
+      `无法应用工作区改动：检测到文件合并冲突。\n冲突文件：\n${fileList}\n` +
+      `建议操作：\n1. 可在子任务独立工作区 (${workspace.cwd}) 中手动合并或解决冲突；\n` +
+      `2. 使用 pushWorkspace 将隔离分支 (${workspace.branch}) 推送至 Git 远程仓库以发起 PR；\n` +
+      `3. 或使用 discardWorkspace 放弃并删除该分支。`
+    );
+  }
   const file = path.join(os.tmpdir(), `harness-mix-patch-${randomUUID()}`);
   try {
     await fs.writeFile(file, review.patch);
-    await git(workspace.source, ['apply', '--check', '--binary', file]);
     await git(workspace.source, ['apply', '--binary', file]);
-  } finally { await fs.rm(file, { force: true }); }
+  } catch (error) {
+    throw new Error(`应用改动失败：${error.stderr || error.message}`);
+  } finally { await fs.rm(file, { force: true }).catch(() => {}); }
   return review;
 }
 
@@ -89,4 +118,34 @@ async function removeWorkspace(workspace) {
   await fs.rm(workspace.root, { recursive: true, force: true }).catch(() => {});
 }
 
-module.exports = { createWorkspace, reviewWorkspace, applyWorkspace, removeWorkspace, git, tree };
+async function discardWorkspace(workspace) {
+  if (!workspace || workspace.mode !== 'worktree') return { discarded: false };
+  await removeWorkspace(workspace);
+  return { discarded: true, branch: workspace.branch };
+}
+
+async function pushWorkspace(workspace, remote = 'origin', remoteBranch = workspace.branch) {
+  if (!workspace || workspace.mode !== 'worktree') throw new Error('仅隔离工作区支持推送远程分支');
+  const currentTree = await tree(workspace.root);
+  let parentCommit = workspace.baseCommit;
+  try {
+    parentCommit = (await git(workspace.source, ['rev-parse', workspace.branch])).trim();
+  } catch {}
+  const commitMsg = `Harness Mix collaboration: ${workspace.branch}`;
+  const newCommit = (await git(workspace.source, [
+    '-c', 'user.name=Harness Mix',
+    '-c', 'user.email=harness-mix@localhost',
+    'commit-tree', currentTree,
+    '-p', parentCommit,
+    '-m', commitMsg,
+  ])).trim();
+  await git(workspace.source, ['update-ref', `refs/heads/${workspace.branch}`, newCommit]);
+  const remotes = (await git(workspace.source, ['remote'])).split(/\r?\n/).map(r => r.trim()).filter(Boolean);
+  if (!remotes.includes(remote)) {
+    throw new Error(`Git 远程 '${remote}' 不存在。可用远程：${remotes.join(', ') || '无'}`);
+  }
+  await git(workspace.source, ['push', remote, `${workspace.branch}:${remoteBranch}`]);
+  return { remote, branch: remoteBranch, commit: newCommit, pushed: true };
+}
+
+module.exports = { createWorkspace, reviewWorkspace, applyWorkspace, removeWorkspace, discardWorkspace, pushWorkspace, git, tree };

package/src/main/host/collaboration.js

@@ -4,7 +4,7 @@ const path = require('node:path');
 const { tools } = require('./collaboration-tools');
 const { z } = require('zod');
 const { Store } = require('./store');
-const { createWorkspace, reviewWorkspace, applyWorkspace } = require('./collaboration-worktree');
+const { createWorkspace, reviewWorkspace, applyWorkspace, discardWorkspace, pushWorkspace } = require('./collaboration-worktree');
 const validators = new Map(tools.map(tool => [tool.name, z.fromJSONSchema(tool.inputSchema)]));
 const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -58,6 +58,24 @@ class Collaboration {
     } finally { delete job.applying; }
   }
 
+  async discard(id) {
+    const job = this.jobs.get(id);
+    if (!job) throw new Error('子任务不存在');
+    if (job.status === 'running') throw new Error('子任务正在运行，请先取消');
+    const result = await discardWorkspace(job.workspace);
+    job.status = 'cancelled';
+    delete job.workspace;
+    await this.save();
+    return result;
+  }
+
+  async push(id, { remote = 'origin', branch } = {}) {
+    const job = this.jobs.get(id);
+    if (!job) throw new Error('子任务不存在');
+    if (job.status === 'running') throw new Error('请等待子任务完成后再推送分支');
+    return pushWorkspace(job.workspace, remote, branch);
+  }
+
   async connection(thread) {
     await this.initialize();
     if (!this.starting) this.starting = new Promise((resolve, reject) => {
@@ -94,7 +112,8 @@ class Collaboration {
     const pending = job.childId ? this.runtime.core.interactions?.pending(job.childId)?.[0] : null;
     return { task_id: job.id, parent_thread_id: job.owner, child_thread_id: job.childId, agent_type: job.agent, status: job.status,
       display_status: pending ? 'waiting_approval' : job.status, attention: pending ? { type: pending.type, title: pending.title, message: pending.message } : undefined,
-      task: job.task, workspace: job.workspace, applied: !!job.appliedDigest, result: job.result, error: job.error };
+      task: job.task, workspace: job.workspace, applied: !!job.appliedDigest, result: job.result, error: job.error,
+      diff: job.diff, digest: job.digest, branch: job.workspace?.branch };
   }
 
   async call(owner, name, args) {
@@ -193,6 +212,13 @@ class Collaboration {
       const messages = rt.core.getItemsForTurn(turn.id).filter(i => i.type === 'agent_message');
       const finals = messages.filter(i => i.phase === 'final');
       job.result = (finals.length ? finals : messages).map(i => i.content || '').join('\n').slice(0, 48000);
+      if (job.workspace?.mode === 'worktree' && job.status === 'completed') {
+        try {
+          const rev = await reviewWorkspace(job.workspace);
+          job.diff = rev.patch;
+          job.digest = rev.digest;
+        } catch {}
+      }
     } catch (error) { if (job.status === 'running') { job.status = 'failed'; job.error = error.message; } }
     finally { await this.save(); emit({ kind: 'tool', toolCallId, state: job.status === 'completed' ? 'done' : 'error', output: JSON.stringify(this.view(job)) }); }
   }

package/src/main/host/runtime.js

@@ -11,7 +11,7 @@ const { CoreSession } = require('./core-session');
 const { Collaboration, mentionedAgents } = require('./collaboration');
 const { SessionHistory } = require('./session-history');
 const { buildHandoffContext, composeHandoffEnvelope } = require('./handoff');
-const { createWorkspace, reviewWorkspace, applyWorkspace, removeWorkspace } = require('./collaboration-worktree');
+const { createWorkspace, reviewWorkspace, applyWorkspace, removeWorkspace, discardWorkspace, pushWorkspace } = require('./collaboration-worktree');
 
 /**
  * Host Runtime：harness-mix 的核心职责 —— 自研 Desktop 背后的
@@ -227,6 +227,27 @@ class HostRuntime {
     return result;
   }
 
+  async discardThreadWorkspace(threadId) {
+    const thread = this.#requireThread(threadId);
+    if (thread.workspace?.mode !== 'worktree') throw new Error('该任务未使用 Worktree 隔离工作区');
+    if (this.execution.isRunning(thread.id) || thread.reviewPending) throw new Error('请等待任务完成后再丢弃隔离分支');
+    const result = await discardWorkspace(thread.workspace);
+    delete thread.workspace;
+    this.#notify('status', `已丢弃并删除隔离分支 ${result.branch || ''}`, thread.id);
+    await this.#save();
+    this.#broadcast();
+    return result;
+  }
+
+  async pushThreadWorkspace(threadId, { remote = 'origin', branch } = {}) {
+    const thread = this.#requireThread(threadId);
+    if (thread.workspace?.mode !== 'worktree') throw new Error('该任务未使用 Worktree 隔离工作区');
+    if (this.execution.isRunning(thread.id) || thread.reviewPending) throw new Error('请等待任务完成后再推送分支');
+    const result = await pushWorkspace(thread.workspace, remote, branch);
+    this.#notify('status', `已成功将分支 ${result.branch} 推送到远程 ${result.remote}`, thread.id);
+    return result;
+  }
+
   async send(threadId, text, { commandId, attachments, delegateOf, collaborationOf, isolated = false } = {}) {
     // Reserve before opening a native session: two submissions can otherwise both
     // pass isRunning() while awaiting the same opening promise.