@harness-mix/cli 0.1.7 → 0.1.9

package/scripts/handoff-checkpoint-test.cjs

@@ -3,6 +3,7 @@ const fs = require('node:fs/promises');
 const path = require('node:path');
 const { HandoffCheckpoints } = require('../src/main/host/handoff-checkpoints');
 const { HandoffAccess } = require('../src/main/host/handoff-access');
+const { SessionHistory } = require('../src/main/host/session-history');
 const { dispatch } = require('../src/main/host/handoff-mcp.cjs');
 
 async function main() {
@@ -47,6 +48,17 @@ async function main() {
   thread.messages[0].text = 'mutated after handoff';
   assert.doesNotMatch(JSON.stringify(runtime.handoffs.owned(thread.id, checkpoint.checkpointId)), /mutated after handoff/);
 
+  // 引用会话只读工具：pi 原生历史存根（30 轮），用户消息里显式给出 harness-mix://session/ 链接才可读
+  const sessionRef = Buffer.from(JSON.stringify(['pi', 'past-1'])).toString('base64url');
+  thread.messages.push({ id: 'user-2', role: 'user', text: `看看 [旧会话](harness-mix://session/${sessionRef}) 的结论` });
+  runtime.adapters.set('pi', { manifest: { integrations: { mcp: false } } });
+  runtime.threads = [thread];
+  runtime.execution = { isRunning: () => false };
+  runtime.history = new SessionHistory(runtime, {
+    async listNative() { return [{ nativeSessionId: 'past-1', title: '旧会话', cwd: process.cwd(), updatedAt: 5, running: null }]; },
+    async readNative() { return Array.from({ length: 30 }, (_, i) => ({ id: `m${i}`, role: i % 2 ? 'assistant' : 'user', text: `turn-${i}`, at: i })); },
+  });
+
   const access = new HandoffAccess(runtime);
   const connection = await access.connection({ ...thread, harnessId: 'target', pendingHandoff: { checkpointId: checkpoint.checkpointId } });
   assert.ok(connection);
@@ -59,6 +71,7 @@ async function main() {
     assert.deepEqual(catalog.tools.map(tool => tool.name), [
       'get_handoff_checkpoint', 'list_handoff_conversation', 'list_handoff_evidence',
       'read_handoff_evidence', 'list_handoff_files', 'read_handoff_plan',
+      'get_session_info', 'list_session_messages',
     ]);
     const result = await dispatch({ id: 2, method: 'tools/call', params: { name: 'get_handoff_checkpoint', arguments: { checkpoint_id: checkpoint.checkpointId } } });
     const summary = JSON.parse(result.content[0].text);
@@ -67,6 +80,31 @@ async function main() {
     const denied = await dispatch({ id: 3, method: 'tools/call', params: { name: 'get_handoff_checkpoint', arguments: { checkpoint_id: 'handoff_outside_scope' } } });
     assert.equal(denied.isError, true);
     assert.match(denied.content[0].text, /outside this native session scope/);
+
+    // 引用会话：元数据廉价读取（无内嵌消息时 messageCount 为 null）
+    const info = JSON.parse((await dispatch({ id: 4, method: 'tools/call', params: { name: 'get_session_info', arguments: { session_id: sessionRef } } })).content[0].text);
+    assert.equal(info.harnessId, 'pi');
+    assert.equal(info.title, '旧会话');
+    assert.equal(info.messageCount, null);
+    assert.equal(info.branch, null);
+    // 引用会话：正文分页（offset 0 = 最近一页，nextOffset 逐页向更早翻）
+    const recent = JSON.parse((await dispatch({ id: 5, method: 'tools/call', params: { name: 'list_session_messages', arguments: { session_id: sessionRef, limit: 12 } } })).content[0].text);
+    assert.equal(recent.messageCount, 30);
+    assert.equal(recent.returned, 12);
+    assert.equal(recent.hasMore, true);
+    assert.equal(recent.nextOffset, 12);
+    assert.match(recent.transcript, /User: turn-28/);
+    assert.doesNotMatch(recent.transcript, /turn-17/);
+    const oldest = JSON.parse((await dispatch({ id: 6, method: 'tools/call', params: { name: 'list_session_messages', arguments: { session_id: sessionRef, offset: 24, limit: 12 } } })).content[0].text);
+    assert.equal(oldest.returned, 6);
+    assert.equal(oldest.hasMore, false);
+    assert.equal(oldest.nextOffset, null);
+    assert.match(oldest.transcript, /User: turn-0/);
+    // 未被用户引用的会话拒绝读取
+    const otherRef = Buffer.from(JSON.stringify(['pi', 'past-2'])).toString('base64url');
+    const deniedSession = await dispatch({ id: 7, method: 'tools/call', params: { name: 'get_session_info', arguments: { session_id: otherRef } } });
+    assert.equal(deniedSession.isError, true);
+    assert.match(deniedSession.content[0].text, /not referenced/);
   } finally {
     if (oldUrl === undefined) delete process.env.HARNESS_MIX_HANDOFF_URL; else process.env.HARNESS_MIX_HANDOFF_URL = oldUrl;
     if (oldKey === undefined) delete process.env.HARNESS_MIX_HANDOFF_KEY; else process.env.HARNESS_MIX_HANDOFF_KEY = oldKey;

package/scripts/integrations-test.cjs

@@ -78,7 +78,7 @@ async function main() {
   const acp = acpServers(selected.servers, collab);
   assert.equal(acp.length, 2); assert.equal(acp[1].name, 'harness-mix'); assert.deepEqual(acp[0].env, []);
   assert.ok(namedServers(selected.servers, collab)['hm-user-probe']);
-  const catalog = await manager.catalog(); assert.equal(catalog.harnesses.length, 16);
+  const catalog = await manager.catalog(); assert.equal(catalog.harnesses.length, 17);
   for (const a of adapters.values()) {
     const entry = catalog.harnesses.find(h => h.id === a.manifest.id);
     assert.equal(entry.mcp, a.manifest.integrations?.mcp === true);
@@ -93,6 +93,9 @@ async function main() {
   assert.deepEqual(manager.roots(adapters.get('zcode'), { scope: 'project', cwd: project }), [path.join(project, '.zcode/skills'), path.join(project, '.agents/skills')]);
   // Trae IDE (.trae) and TraeCode CLI (.traecli) share one managed root set.
   assert.deepEqual(manager.roots(adapters.get('trae'), { scope: 'project', cwd: project }), [path.join(project, '.trae/skills'), path.join(project, '.traecli/skills'), path.join(project, '.agents/skills')]);
+  // Cline 官方文档：全局 ~/.cline/skills 与项目 .cline/skills。
+  assert.deepEqual(manager.roots(adapters.get('cline'), { scope: 'global', cwd: null }), [path.join(home, '.cline/skills')]);
+  assert.deepEqual(manager.roots(adapters.get('cline'), { scope: 'project', cwd: project }), [path.join(project, '.cline/skills')]);
   // Hermes documents no project-scope skills directory, so only its global root is managed.
   assert.deepEqual(manager.roots(adapters.get('hermes'), { scope: 'project', cwd: project }), []);
   assert.deepEqual(manager.roots(adapters.get('hermes'), { scope: 'global', cwd: null }), [path.join(home, '.hermes/skills')]);
@@ -116,7 +119,7 @@ async function main() {
   const globalOnly = await blocked.ensureSkillRoots({ cwd: 'relative-not-absolute' }, adapters.get('codex'), {});
   assert.equal(globalOnly.length, 1);
   // Exercise the real protocol dispatcher without starting native processes.
-  assert.equal((await NativeProtocol.prototype.request.call({ runtime }, 'codexhost/integrations/catalog', {})).harnesses.length, 16);
+  assert.equal((await NativeProtocol.prototype.request.call({ runtime }, 'codexhost/integrations/catalog', {})).harnesses.length, 17);
   assert.equal((await NativeProtocol.prototype.request.call({ runtime }, 'codexhost/integrations/list', local)).skills.length, 3);
   console.log('integrations: scope precedence, persistence, native status projection, no credential fields, unsupported capabilities, skill install/disable/restore, links, and protocol PASS');
 }

package/scripts/kiro-cursor-adapters-test.cjs

@@ -57,6 +57,24 @@ if (process.argv.includes('--fixture')) {
         assert.deepEqual(nativeCommand(module.manifest.id, ['acp']), { command: process.execPath, args: ['acp'] });
       } finally { if (previous === undefined) delete process.env[key]; else process.env[key] = previous; }
     }
+    // Cline：官方 `cline --acp`；诚实能力声明（无 plan/原生 diff/thinking 档/独立提问），
+    // 保留 resume 与 plan/act 权限模式；命令只认 cline 与 HARNESS_MIX_CLINE_EXECUTABLE。
+    {
+      const module = require('../src/main/adapters/cline');
+      const caps = module.manifest.capabilities;
+      assert.deepEqual(module.manifest.integrations.skills, { global: ['.cline/skills'], project: ['.cline/skills'] });
+      for (const [capability, expected] of [['fork', false], ['questions', false], ['thinkingLevels', false], ['plan', false], ['nativeDiff', false], ['usage', false], ['resume', true], ['permissionModes', true], ['models', true], ['attachments', true], ['approvals', true]])
+        assert.equal(caps[capability], expected, `cline ${capability}`);
+      const previous = process.env.HARNESS_MIX_CLINE_EXECUTABLE;
+      try {
+        delete process.env.HARNESS_MIX_CLINE_EXECUTABLE;
+        process.env.HARNESS_MIX_CLINE_EXECUTABLE = __filename + '.missing';
+        assert.throws(() => nativeCommand('cline', ['--acp']), /未安装/);
+        assert.equal((await module.create().inspect()).available, false);
+        process.env.HARNESS_MIX_CLINE_EXECUTABLE = process.execPath;
+        assert.deepEqual(nativeCommand('cline', ['--acp']), { command: process.execPath, args: ['--acp'] });
+      } finally { if (previous === undefined) delete process.env.HARNESS_MIX_CLINE_EXECUTABLE; else process.env.HARNESS_MIX_CLINE_EXECUTABLE = previous; }
+    }
     const adapter = acpAdapter({ id: 'fixture', name: 'Fixture', bin: () => ({ command: process.execPath, args: [__filename, '--fixture'] }), args: [], requestTimeoutMs: 5000 }).create();
     const events = [];
     let session;

package/scripts/native-acp-depth-test.cjs

@@ -47,7 +47,7 @@ if (process.argv.includes('--fixture')) {
   });
 } else {
   (async () => {
-    for (const vendor of ['codebuddy', 'kiro-cli', 'cursor-cli', 'qoder', 'zcode', 'trae']) {
+    for (const vendor of ['codebuddy', 'kiro-cli', 'cursor-cli', 'qoder', 'zcode', 'trae', 'cline']) {
       const module = nativeAcp({ id: vendor, name: vendor, args: [], timeoutMs: 2000, command: () => ({ command: process.execPath, args: [__filename, '--fixture'] }) });
       const adapter = module.create(), events = [];
       let s;

package/scripts/native-protocol-test.cjs

@@ -16,13 +16,20 @@ async function main() {
   const adapter = { manifest: { id: 'pi', name: 'Pi', capabilities: { streaming: true, models: true, approvals: true, questions: true, resume: true } },
     async open(input) { emits.push(input.emit); emit = input.emit; return {}; },
     async describe() { return { models: [{ id: 'demo', name: 'Demo', provider: 'test' }], thinkingLevels: [{ id: 'high', label: 'High', default: true }, { id: 'low', label: 'Low' }], permissionModes: [] }; },
-    async send() {}, async cancel() {}, async close() {},
+    async send(session, text, hooks, extras) { sendExtras.push(extras); }, async cancel() {}, async close() {},
     async respond(session, id, answer) { answers.push({ id, answer }); } };
+  const sendExtras = [];
   runtime.adapters.set('pi', adapter); runtime.status.pi = { available: true };
   const events = [];
+  let observeQueueOrder = false;
+  let queueResponseResolved = false;
+  let queueNotificationBeforeResponse = false;
   const section = { id: 'test-pinned-section', name: 'Pinned', appearance: null };
   const officialRequests = [];
-  const bridge = new NativeProtocol(runtime, event => events.push(event), async (method, params) => {
+  const bridge = new NativeProtocol(runtime, event => {
+    if (observeQueueOrder && event?.method === 'thread/queue/changed' && !queueResponseResolved) queueNotificationBeforeResponse = true;
+    events.push(event);
+  }, async (method, params) => {
     officialRequests.push({ method, params });
     if (method === 'threadSection/list') return { data: [section], nextCursor: null };
     if (method === 'account/read') return { account: { type: 'chatgpt', email: 'native@example.com', planType: 'plus' }, requiresOpenaiAuth: true };
@@ -149,13 +156,18 @@ async function main() {
     await wait(() => !runtime.threads.find(t => t.id === prewarmed.thread.id).reviewPending && !runtime.sending.has(prewarmed.thread.id));
     emit = emits[0]; // 恢复主线程的事件源（open 顺序：主线程序，预热线程后）
     schemas.threadInspectionSchema.parse(await bridge.request('codexhost/thread/inspect', { threadId }));
-    const turn = await bridge.request('turn/start', { threadId, input: [{ type: 'text', text: 'test' }] });
+    const turn = await bridge.request('turn/start', { threadId, input: [{ type: 'text', text: 'test' }], approvalPolicy: 'never', sandboxPolicy: { type: 'dangerFullAccess' } });
+    // turn/start 在 currentTurn 建立后即返回，adapter.send 的调用在其后；等待透传到达
+    await wait(() => sendExtras.at(-1)?.turnPermissions != null);
+    assert.deepEqual(sendExtras.at(-1).turnPermissions, { approvalPolicy: 'never', sandboxPolicy: { type: 'dangerFullAccess' } }, 'turn/start 权限参数透传到适配器');
     assert.ok(runtime.core.getTurn(turn.turn.id), 'Native turn IDs come from the existing ProtocolCore');
     emit({ kind: 'thinking-delta', text: 'reason' });
     emit({ kind: 'text-delta', text: 'hello' });
     emit({ kind: 'text-delta', text: ' world' });
     emit({ kind: 'tool', toolCallId: 't', title: 'Read', state: 'running', input: '{}' });
     emit({ kind: 'tool', toolCallId: 't', title: 'Read', state: 'completed', output: 'done' });
+    emit({ kind: 'tool', toolCallId: 'sh', title: 'Bash', state: 'running', input: '{"command":"cat package.json"}' });
+    emit({ kind: 'tool', toolCallId: 'sh', title: 'Bash', state: 'completed', output: '{}' });
     emit({ kind: 'approval', requestId: 'permission', method: 'confirm', title: 'Allow?' });
     const approval = events.find(e => e.id?.startsWith('harness-mix:approval:'));
     assert.equal(answers.length, 0, 'Approval is not fabricated');
@@ -169,7 +181,13 @@ async function main() {
     emit({ kind: 'completed', finalAnswer: true });
     await wait(() => !runtime.threads.find(t => t.id === threadId).reviewPending && !runtime.sending.has(threadId));
     assert.equal(events.filter(e => e.method === 'item/agentMessage/delta').map(e => e.params.delta).join(''), 'hello world');
-    assert.ok(events.some(e => e.method === 'item/completed' && e.params.item.type === 'mcpToolCall'));
+    // 非终端工具投影为 dynamicToolCall（摘要显示真实工具名），终端命令投影为原生 commandExecution
+    assert.ok(events.some(e => e.method === 'item/completed' && e.params.item.type === 'dynamicToolCall' && e.params.item.tool === 'Read'));
+    const execItem = events.filter(e => e.method === 'item/completed').map(e => e.params.item).find(i => i.type === 'commandExecution');
+    assert.equal(execItem?.command, 'cat package.json', 'Shell tool projects the real command text');
+    assert.equal(execItem?.commandActions?.[0]?.type, 'read', 'Simple cat command classifies as a read action');
+    assert.equal(execItem?.commandActions?.[0]?.path, 'package.json');
+    assert.equal(typeof execItem?.durationMs, 'number', 'Command execution carries a real duration');
     // Desktop 以 `diff --git a/x b/x` 切分文件并提取路径，且只在 @@ hunk 头之后计数增删行
     const turnDiff = events.filter(e => e.method === 'turn/diff/updated').at(-1).params.diff;
     assert.ok(turnDiff.includes('diff --git a/a.txt b/a.txt'), 'turn diff carries git-style file headers');
@@ -177,11 +195,26 @@ async function main() {
     assert.ok(turnDiff.includes('@@ -0,0 +1,1 @@') && turnDiff.includes('+hello'), 'turn diff carries a countable hunk');
     assert.ok(events.some(e => e.method === 'turn/diff/updated' && e.params.diff.includes('a.txt')));
     assert.equal(events.filter(e => e.method === 'turn/completed' && e.params.threadId === threadId).length, 1);
+    // Desktop「已处理/用时」计时契约：item/started 带 startedAtMs、item/completed 带
+    // completedAtMs，终态 Turn 带 startedAt/completedAt（epoch 秒）与 durationMs（毫秒）；
+    // 缺这些字段时 Desktop 无法合成 worked-for 计时项，完成回合只显示集成摘要。
+    const completedTurn = events.filter(e => e.method === 'turn/completed' && e.params.threadId === threadId && e.params.turn.status === 'completed').at(-1).params.turn;
+    assert.equal(typeof completedTurn.durationMs, 'number', 'Completed turn carries durationMs for the Desktop worked-for timer');
+    assert.ok(Number.isInteger(completedTurn.startedAt) && Number.isInteger(completedTurn.completedAt), 'Completed turn carries epoch-second startedAt/completedAt');
+    assert.ok(completedTurn.durationMs >= 0 && completedTurn.completedAt >= completedTurn.startedAt, 'Turn timing fields are coherent');
+    assert.ok(events.filter(e => e.method === 'item/started').every(e => typeof e.params.startedAtMs === 'number'), 'item/started carries startedAtMs');
+    assert.ok(events.filter(e => e.method === 'item/completed').every(e => typeof e.params.completedAtMs === 'number'), 'item/completed carries completedAtMs');
     const history = await bridge.request('thread/read', { threadId });
     assert.equal(history.thread.turns[0].status, 'completed');
+    assert.equal(typeof history.thread.turns[0].durationMs, 'number', 'Restored turns keep durationMs');
     const projectedChange = history.thread.turns[0].items.flatMap(i => i.type === 'fileChange' ? i.changes : []).find(change => change.path === 'a.txt');
     assert.equal(projectedChange?.kind.type, 'add', 'fileChange item projects the added kind');
     assert.ok(projectedChange?.diff.includes('diff --git a/a.txt b/a.txt') && projectedChange.diff.includes('@@ -0,0 +1,1 @@'), 'fileChange item carries a full unified diff');
+    await bridge.request('thread/settings/update', { threadId, approvalPolicy: 'never', sandboxPolicy: { type: 'dangerFullAccess' } });
+    assert.deepEqual(runtime.threads.find(t => t.id === threadId).options.turnPermissions, { approvalPolicy: 'never', sandboxPolicy: { type: 'dangerFullAccess' } }, 'Desktop 权限菜单设置存储到线程');
+    const resumed = await bridge.request('thread/resume', { threadId });
+    assert.equal(resumed.approvalPolicy, 'never', 'thread/resume 回显实际生效的权限');
+    assert.deepEqual(resumed.sandbox, { type: 'dangerFullAccess' }, 'thread/resume 回显实际生效的沙箱');
     await bridge.request('thread/name/set', { threadId, name: 'Local Core' });
     await bridge.request('thread/archive', { threadId });
     assert.equal(runtime.threads.find(t => t.id === threadId).archived, true);
@@ -341,13 +374,18 @@ async function main() {
     const qThread = await bridge.request('thread/start', { cwd: root, model: routeModel('pi') });
     const qThreadId = qThread.thread.id;
     assert.deepEqual(await bridge.request('thread/queue/list', { threadId: qThreadId }), { data: [], nextCursor: null });
+    observeQueueOrder = true;
     const q1 = await bridge.request('thread/queue/add', {
       threadId: qThreadId,
       input: [{ type: 'text', text: '排队补充需求 1' }],
       clientUserMessageId: 'client-msg-1',
     });
+    queueResponseResolved = true;
     assert.equal(typeof q1.queuedSubmission.id, 'string');
     assert.equal(q1.queuedSubmission.clientUserMessageId, 'client-msg-1');
+    await wait(() => events.at(-1)?.method === 'thread/queue/changed' && events.at(-1)?.params?.threadId === qThreadId);
+    assert.equal(queueNotificationBeforeResponse, false, 'Queue mutation response precedes changed notification so Desktop edits keep the current id');
+    observeQueueOrder = false;
     assert.equal(events.at(-1)?.method, 'thread/queue/changed');
     assert.equal(events.at(-1)?.params?.threadId, qThreadId);
 
@@ -388,6 +426,24 @@ async function main() {
     assert.equal(qList.data.length, 1);
     assert.equal(qList.data[0].id, q1.queuedSubmission.id);
 
+    // 输入准备或原生启动失败时不得丢失排队项，仍可编辑后重试。
+    await bridge.request('thread/queue/update', {
+      threadId: qThreadId,
+      queuedSubmissionId: q1.queuedSubmission.id,
+      input: [{ type: 'unsupported-test-input' }],
+    });
+    await assert.rejects(bridge.request('thread/queue/start', {
+      threadId: qThreadId,
+      queuedSubmissionId: q1.queuedSubmission.id,
+    }), /Unsupported native input type/);
+    qList = await bridge.request('thread/queue/list', { threadId: qThreadId });
+    assert.equal(qList.data[0]?.id, q1.queuedSubmission.id, 'Failed queue start keeps the item for editing or retry');
+    await bridge.request('thread/queue/update', {
+      threadId: qThreadId,
+      queuedSubmissionId: q1.queuedSubmission.id,
+      input: [{ type: 'text', text: '修正后的排队消息' }],
+    });
+
     // 空闲状态启动排队消息
     const startedQ = await bridge.request('thread/queue/start', {
       threadId: qThreadId,

package/scripts/native-ui-smoke.cjs

@@ -12,7 +12,7 @@ app.whenReady().then(async () => {
   const icons = getAllIconsDictionary();
   icons.harnesses['claude-code'] = icons.harnesses.claude;
   icons.harnesses['deepseek-harness'] = icons.harnesses.dsh;
-  const bundle = await esbuild.build({ stdin: { contents: `export { createRendererAgentIcon } from './src/native-ui/renderer-extension/src/renderer-agent-icon.ts'; export { mountRendererAgentPicker, renderRendererAgentPicker } from './src/native-ui/renderer-extension/src/renderer-agent-picker.ts'; export { mountRendererModelPicker, renderRendererModelPicker } from './src/native-ui/renderer-extension/src/renderer-model-picker.ts'; export { mountRendererHarnessHandoff } from './src/native-ui/renderer-extension/src/renderer-harness-handoff.ts'; export { restoredThreadOwnership } from './src/native-ui/renderer-extension/src/renderer-binding-probe.ts'; export { installRendererSidebarAgentIcons } from './src/native-ui/renderer-extension/src/renderer-sidebar-agent-icons.ts'; export { installRendererSettingsLifecycle } from './src/native-ui/renderer-extension/src/harness-mix-settings.ts'; export { createAccountsSettingsPage } from './src/native-ui/renderer-extension/src/settings/accounts-page.ts'; export { createStorageSettingsPage } from './src/native-ui/renderer-extension/src/settings/storage-page.ts'; export { aboutPage } from './src/native-ui/renderer-extension/src/settings/pages.ts'; export { rendererSettingsMessages } from './src/native-ui/renderer-extension/src/settings/localization.ts'; export { installRendererSettingsShell } from './src/native-ui/renderer-extension/src/settings/shell.ts';`, resolveDir: process.cwd() }, bundle: true, alias: { '@codexhost/shared-contracts': path.resolve('src/native-ui/shared-contracts/src/index.ts') }, platform: 'browser', format: 'iife', globalName: 'NativeUI', write: false, loader: { '.svg': 'dataurl', '.png': 'dataurl', '.css': 'text' }, logLevel: 'silent' });
+  const bundle = await esbuild.build({ stdin: { contents: `export { createRendererAgentIcon } from './src/native-ui/renderer-extension/src/renderer-agent-icon.ts'; export { mountRendererAgentPicker, renderRendererAgentPicker } from './src/native-ui/renderer-extension/src/renderer-agent-picker.ts'; export { mountRendererModelPicker, renderRendererModelPicker } from './src/native-ui/renderer-extension/src/renderer-model-picker.ts'; export { mountRendererHarnessHandoff } from './src/native-ui/renderer-extension/src/renderer-harness-handoff.ts'; export { restoredThreadOwnership } from './src/native-ui/renderer-extension/src/renderer-binding-probe.ts'; export { installRendererSidebarAgentIcons } from './src/native-ui/renderer-extension/src/renderer-sidebar-agent-icons.ts'; export { installRendererSettingsLifecycle } from './src/native-ui/renderer-extension/src/harness-mix-settings.ts'; export { createAccountsSettingsPage } from './src/native-ui/renderer-extension/src/settings/accounts-page.ts'; export { createStorageSettingsPage } from './src/native-ui/renderer-extension/src/settings/storage-page.ts'; export { createSkinSettingsPage } from './src/native-ui/renderer-extension/src/settings/skin-market.ts'; export { applyRendererSkin } from './src/native-ui/renderer-extension/src/settings/skin-runtime.ts'; export { aboutPage } from './src/native-ui/renderer-extension/src/settings/pages.ts'; export { rendererSettingsMessages } from './src/native-ui/renderer-extension/src/settings/localization.ts'; export { installRendererSettingsShell } from './src/native-ui/renderer-extension/src/settings/shell.ts';`, resolveDir: process.cwd() }, bundle: true, alias: { '@codexhost/shared-contracts': path.resolve('src/native-ui/shared-contracts/src/index.ts') }, platform: 'browser', format: 'iife', globalName: 'NativeUI', write: false, loader: { '.svg': 'dataurl', '.png': 'dataurl', '.webp': 'dataurl', '.css': 'text' }, logLevel: 'silent' });
   const win = new BrowserWindow({ show: false, width: 900, height: 650, webPreferences: { contextIsolation: true, sandbox: true, offscreen: true, backgroundThrottling: false } });
   await win.loadURL('data:text/html,<html><head><style>body{background:%2317191d;color:white;font:16px Arial;padding:40px}button{background:%23272a30;color:white;border:0;padding:12px}img{vertical-align:middle}main{display:flex;gap:25px;margin-bottom:40px}</style></head><body><h2>Harness Mix native components</h2><main></main></body></html>');
   await win.webContents.executeJavaScript(`globalThis.__HARNESS_MIX_ICONS__=${JSON.stringify(icons)};globalThis.__HARNESS_MIX_MODEL_FAMILIES__=${JSON.stringify(MODEL_FAMILIES.map(f => ({ id: f.id, pattern: f.regex.source })))};${bundle.outputFiles[0].text}`);
@@ -22,7 +22,7 @@ app.whenReady().then(async () => {
     lifecycle.dispose();
     return pageIds;
   })()`);
-  assert.deepEqual(liveSettingsPages, ['connections', 'accounts', 'mcp', 'skills', 'session-import', 'storage', 'updates', 'about']);
+  assert.deepEqual(liveSettingsPages, ['connections', 'accounts', 'mcp', 'skills', 'session-import', 'storage', 'skins', 'updates', 'about']);
   const { NativeProtocol } = require('../src/main/native/protocol');
   const nativeThreads = ['pi', 'claude', 'dsh', 'antigravity'].map((harnessId, index) => ({ id: 'sidebar-' + index, harnessId, model: { id: 'model-' + index, provider: 'native' }, options: {} }));
   const protocol = new NativeProtocol({ threads: nativeThreads, getThread: id => nativeThreads.find(thread => thread.id === id), subscribe: () => () => {}, core: { subscribe: () => () => {} }, describe: async () => ({}), getCapabilities: () => ({}) }, () => {});
@@ -137,6 +137,7 @@ app.whenReady().then(async () => {
         inspectStorage:async () => ({storageSchemaVersion:3,threadCount:12,loadedThreadCount:2,indexBytes:2048,recordBytes:5242880,recordCount:12,legacyBytes:0}),
         optimizeStorage:async () => ({before:{storageSchemaVersion:3,threadCount:12,loadedThreadCount:2,indexBytes:2048,recordBytes:5242880,recordCount:12,legacyBytes:0},after:{storageSchemaVersion:3,threadCount:12,loadedThreadCount:2,indexBytes:2048,recordBytes:4194304,recordCount:12,legacyBytes:0}}),
       })),
+      NativeUI.createSkinSettingsPage(messages),
       NativeUI.aboutPage(messages, () => ({ readCurrentVersion:async () => ({version:'0.1.4'}), checkUpdate:async () => { throw new Error('not expected'); } })),
     ], messages, document);
     shell.openSettings(undefined, 'accounts');
@@ -156,6 +157,35 @@ app.whenReady().then(async () => {
   assert.match(storageText, /Schema v3/);
   assert.match(storageText, /12 个任务/);
   fs.writeFileSync(path.join(out, 'settings-storage.png'), (await win.webContents.capturePage()).toPNG());
+  const skinResult = await win.webContents.executeJavaScript(`(async () => {
+    globalThis.__codexhostSettingsShellV1.openSettings(undefined, 'skins');
+    const shadow = globalThis.__codexhostSettingsShellV1.root.shadowRoot;
+    const firstButton = shadow.querySelector('button[data-skin-action="styler-nocturne-studio"]');
+    const mikuButton = shadow.querySelector('button[data-skin-action="miku-488137"]');
+    firstButton.click();
+    mikuButton.click();
+    await new Promise(resolve => setTimeout(resolve, 300));
+    return {
+      text: shadow.textContent,
+      active: document.documentElement.getAttribute('data-harness-mix-skin'),
+      style: Boolean(document.getElementById('harness-mix-renderer-skin')),
+      cardCount: shadow.querySelectorAll('.skin-card').length,
+      bundledPreviewCount: [...shadow.querySelectorAll('.skin-preview')].filter(preview => preview.style.backgroundImage.includes('data:image/webp')).length,
+    };
+  })()`);
+    assert.match(skinResult.text, /Native Codex.*Miku 488137.*原神 · 晨曦.*鸣潮 · 共鸣.*龙珠 · 筋斗云.*金辉盛境.*夜曲工作室.*静谧花园/s);
+    assert.equal(skinResult.active, 'miku-488137');
+  assert.equal(skinResult.style, true);
+    assert.equal(skinResult.cardCount, 17);
+    assert.equal(skinResult.bundledPreviewCount, 16);
+    fs.writeFileSync(path.join(out, 'settings-skins.png'), (await win.webContents.capturePage()).toPNG());
+    await win.webContents.executeJavaScript(`(() => {
+      const shadow = globalThis.__codexhostSettingsShellV1.root.shadowRoot;
+      const page = shadow.querySelector('.settings-page');
+      page.scrollTop = page.scrollHeight;
+    })()`);
+    await new Promise(resolve => setTimeout(resolve, 100));
+    fs.writeFileSync(path.join(out, 'settings-skins-discovery.png'), (await win.webContents.capturePage()).toPNG());
   const aboutText = await win.webContents.executeJavaScript(`(async () => {
     globalThis.__codexhostSettingsShellV1.openSettings(undefined, 'about');
     await new Promise(resolve => setTimeout(resolve, 100));
@@ -163,6 +193,66 @@ app.whenReady().then(async () => {
   })()`);
   assert.match(aboutText, /v0\.1\.4/);
   fs.writeFileSync(path.join(out, 'settings-about.png'), (await win.webContents.capturePage()).toPNG());
+  await win.setSize(1055, 616);
+  const skinShowcase = await win.webContents.executeJavaScript(`(async () => {
+    document.body.innerHTML = '<div id="root"><aside class="app-shell-left-panel"><button aria-haspopup="menu" aria-label="Open Codex menu"><span>Codex</span></button><nav><strong>新建任务</strong><span>拉取请求</span><span>云端</span><span>已安排</span><span>插件</span><small>项目</small><span class="active" data-app-action-sidebar-thread-active="true">Miku Codex</span><span>开源项目</span><span>Harness Mix</span></nav><footer>Harness Mix</footer></aside><main class="main-surface" data-app-shell-main-surface="default"><section class="welcome"><h1>你想让我们在 Miku Codex 中构建什么？</h1><div class="suggestions"><button class="bg-card">探索并理解代码</button><button class="bg-card">构建新功能、应用或工具</button><button class="bg-card">审查代码并提出修改建议</button><button class="bg-card">修复问题和失败</button></div></section><section class="composer-surface-chrome"><small>Miku Codex　 本地　 main</small><div>随心输入</div><footer>＋　完全访问 <span>5.6 Luna　↑</span></footer></section></main></div>';
+    const fixtureStyle = document.createElement('style');
+    fixtureStyle.textContent = '*{box-sizing:border-box}html,body,#root{width:100%;height:100%;margin:0}body{padding:0!important;overflow:hidden;font-family:Arial,"Microsoft YaHei",sans-serif}#root{display:flex}.app-shell-left-panel{display:flex;flex:0 0 204px;flex-direction:column;padding:6px 10px 12px}.app-shell-left-panel button{border:0;color:inherit;font:700 16px inherit;text-align:left}.app-shell-left-panel nav{display:flex;flex-direction:column;gap:12px;padding:5px 2px;font-size:13px}.app-shell-left-panel nav small{margin-top:6px;opacity:.55}.app-shell-left-panel nav .active{padding:7px;border-radius:7px}.app-shell-left-panel>footer{margin-top:auto;font-size:12px}.main-surface{position:relative;display:flex;flex:1;align-items:center;justify-content:center;overflow:hidden}.welcome{width:min(660px,70vw);text-align:center;transform:translateY(-35px)}.welcome h1{margin:0 0 26px;font-size:23px;font-weight:500}.suggestions{display:grid;grid-template-columns:repeat(4,1fr);gap:8px}.suggestions button{min-height:76px;padding:12px;border:1px solid #fff8;border-radius:9px;color:inherit;text-align:left;font-weight:600}.composer-surface-chrome{position:absolute;right:13%;bottom:12px;left:13%;min-height:94px;padding:12px 18px;border:1px solid transparent;border-radius:16px}.composer-surface-chrome>div{padding:13px 0;color:#52617a99}.composer-surface-chrome footer{font-size:11px}.composer-surface-chrome footer span{float:right}';
+    document.head.append(fixtureStyle);
+    NativeUI.applyRendererSkin('miku-488137', document);
+    await new Promise(resolve => setTimeout(resolve, 150));
+    const root = getComputedStyle(document.getElementById('root'));
+    const main = getComputedStyle(document.querySelector('.main-surface'));
+    const logo = getComputedStyle(document.querySelector('.app-shell-left-panel button'));
+    const polaroid = getComputedStyle(document.body, '::after');
+    return { rootBackground:root.backgroundImage, mainBackground:main.backgroundImage, logoBackground:logo.backgroundImage, polaroidBackground:polaroid.backgroundImage };
+  })()`);
+  assert.match(skinShowcase.rootBackground, /data:image\/webp/);
+  assert.match(skinShowcase.mainBackground, /linear-gradient/);
+  assert.match(skinShowcase.logoBackground, /data:image\/webp/);
+  assert.match(skinShowcase.polaroidBackground, /data:image\/webp/);
+  fs.writeFileSync(path.join(out, 'skin-miku-full.png'), (await win.webContents.capturePage()).toPNG());
+  await win.setSize(1020, 716);
+  const readableConversation = await win.webContents.executeJavaScript(`(async () => {
+    document.body.innerHTML = '<div id="root"><aside class="app-shell-left-panel"><button aria-haspopup="menu" aria-label="Open Codex menu"><span>Codex</span></button><nav><strong>新建任务</strong><span>Pull Request</span><span>定时任务</span><span>插件</span><small>项目</small><span>snipaste-pro</span><span>harness-mix</span><span class="active" data-app-action-sidebar-thread-active="true">查找换肤界面差异原因</span></nav><footer>Harness Mix</footer></aside><main class="main-surface chat" data-app-shell-main-surface="default"><header>查找换肤界面差异原因</header><div class="chat-scroll"><article data-local-conversation-final-assistant><div data-response-annotation-conversation><small>用时 19秒</small><p>是的，准确说是修改了 Codex UI 的运行时表现层。</p><p>它会：</p><ul><li>注入 CSS、替换颜色变量和背景图。</li><li>把部分原生面板变成半透明。</li><li>增加 Logo、拍立得等纯视觉装饰。</li><li>保留原有按钮、输入框、会话和交互逻辑。</li></ul><p>它不会修改 Codex 的安装包、模型调用、账号、权限或会话归属。</p></div></article></div><section class="composer-surface-chrome"><div>随心输入</div><footer>＋　完全访问 <span>GPT-5.6 Sol　↑</span></footer></section></main></div>';
+    const chatStyle = document.createElement('style');
+    chatStyle.textContent = '.app-shell-left-panel button{background:transparent}.chat.main-surface{display:block;padding:0 22px}.chat>header{height:56px;padding:18px 4px;border-bottom:1px solid #6b789633;font-size:14px}.chat-scroll{height:calc(100% - 180px);overflow:auto;padding:42px 8px 80px}.chat article{max-width:760px;margin:0 auto;font-size:15px;line-height:1.7}.chat article small{opacity:.55}.chat article p{margin:13px 0}.chat article li{margin:4px 0}.chat .composer-surface-chrome{right:22px;bottom:14px;left:22px;background:#fff}';
+    document.head.append(chatStyle);
+    NativeUI.applyRendererSkin('dragonball-nimbus', document);
+    await new Promise(resolve => setTimeout(resolve, 150));
+    const response = getComputedStyle(document.querySelector('[data-response-annotation-conversation]'));
+    return { background:response.backgroundColor, color:response.color, padding:response.padding, radius:response.borderRadius };
+  })()`);
+  assert.notEqual(readableConversation.background, 'rgba(0, 0, 0, 0)');
+  assert.notEqual(readableConversation.background, 'transparent');
+  assert.equal(readableConversation.padding, '14px 16px 12px');
+  assert.equal(readableConversation.radius, '18px');
+  fs.writeFileSync(path.join(out, 'skin-conversation-readable.png'), (await win.webContents.capturePage()).toPNG());
+  const darkSurfaceResult = await win.webContents.executeJavaScript(`(async () => {
+    document.body.innerHTML = '<div id="root"><aside class="app-shell-left-panel"><button aria-haspopup="menu" aria-label="Open Codex menu"><span>Codex</span></button><nav><strong>新对话</strong><span>Pull Request</span><span>定时任务</span><span>插件</span><small>项目</small><span class="active" data-app-action-sidebar-thread-active="true">暗色皮肤全界面适配</span></nav></aside><main class="main-surface dark-fixture" data-app-shell-main-surface="default"><header>暗色皮肤全界面适配</header><article data-response-annotation-conversation><p>正文、工具状态、评审卡和输入区都需要保持清晰。</p><section class="review-card"><div>已编辑 3 个文件</div><button class="review-action">审核</button><button class="review-row">src/settings/skin-runtime.ts</button><button class="review-row">scripts/native-ui-smoke.cjs</button></section></article><section class="composer-real" data-composer-layout="multiline"><input placeholder="随心输入"><button>完全访问</button><button>GPT-5.6 Sol</button></section></main></div>';
+    const darkFixtureStyle = document.createElement('style');
+    darkFixtureStyle.textContent = 'html,body,#root{width:100%;height:100%;margin:0}.dark-fixture{position:relative;display:block;padding:24px}.dark-fixture>header{padding:12px 0}.dark-fixture article{max-width:700px;margin:80px auto}.review-card{margin-top:24px;padding:14px;border:1px solid var(--color-token-border-default);border-radius:12px;background:color-mix(in srgb,var(--color-surface-elevated-secondary) 50%,transparent)}.review-card button{color:var(--color-text-primary)}.review-action{float:right;background:var(--color-background-primary-soft-alpha)}.review-row{display:block;width:100%;margin-top:10px;padding:10px;text-align:left;border:0;background:color-mix(in srgb,var(--color-surface) 70%,transparent)}.composer-real{position:absolute;right:24px;bottom:16px;left:24px;padding:18px;border-radius:20px;background:color-mix(in srgb,var(--color-surface-elevated-secondary) 86%,transparent)}.composer-real input{width:70%;padding:8px;color:var(--color-text-primary);background:transparent;border:0}.composer-real button{margin-left:8px;color:var(--color-text-secondary);background:transparent;border:0}';
+    document.head.append(darkFixtureStyle);
+    NativeUI.applyRendererSkin('dragonball-nimbus', document);
+    await new Promise(resolve => setTimeout(resolve, 50));
+    const before = { buttons:document.querySelectorAll('button').length, inputs:document.querySelectorAll('input').length };
+    const lightReviewBackground = getComputedStyle(document.querySelector('.review-card')).backgroundColor;
+    NativeUI.applyRendererSkin('genshin-night', document);
+    await new Promise(resolve => setTimeout(resolve, 150));
+    const review = getComputedStyle(document.querySelector('.review-card'));
+    const row = getComputedStyle(document.querySelector('.review-row'));
+    const composer = getComputedStyle(document.querySelector('.composer-real'));
+    const after = { buttons:document.querySelectorAll('button').length, inputs:document.querySelectorAll('input').length };
+    return { before, after, active:document.documentElement.getAttribute('data-harness-mix-skin'), lightReviewBackground, reviewBackground:review.backgroundColor, rowBackground:row.backgroundColor, composerBackground:composer.backgroundColor, color:review.color };
+  })()`);
+  assert.deepEqual(darkSurfaceResult.after, darkSurfaceResult.before);
+  assert.equal(darkSurfaceResult.active, 'genshin-night');
+  assert.notEqual(darkSurfaceResult.reviewBackground, darkSurfaceResult.lightReviewBackground);
+  assert.doesNotMatch(darkSurfaceResult.reviewBackground, /255, 255, 255/);
+  assert.doesNotMatch(darkSurfaceResult.rowBackground, /255, 255, 255/);
+  assert.doesNotMatch(darkSurfaceResult.composerBackground, /255, 255, 255/);
+  assert.equal(darkSurfaceResult.color, 'rgb(240, 230, 200)');
+  fs.writeFileSync(path.join(out, 'skin-dark-all-surfaces.png'), (await win.webContents.capturePage()).toPNG());
   win.destroy();
   console.log('PASS: real Electron native picker, graphical Harness handoff, official Account/Usage, sharded Storage metrics, live About version and all project Harness/model SVGs load');
   app.quit();

package/scripts/switch-harness-test.cjs

@@ -2,7 +2,7 @@ const assert = require('node:assert/strict');
 const fs = require('node:fs/promises');
 const path = require('node:path');
 const { HostRuntime } = require('../src/main/host/runtime');
-const { CAP, buildHandoffContext } = require('../src/main/host/handoff');
+const { CAP, buildHandoffContext, composeHandoffEnvelope } = require('../src/main/host/handoff');
 
 /**
  * 跨 Harness 原地切换（switchHarness）脚本级测试：
@@ -13,15 +13,18 @@ const { CAP, buildHandoffContext } = require('../src/main/host/handoff');
 const wait = async fn => { for (let i = 0; i < 300; i++) { if (fn()) return; await new Promise(r => setTimeout(r, 10)); } throw new Error('Timed out'); };
 
 function fakeHarness(id, name) {
-  const state = { sent: [], opens: [], closed: 0, hold: null, withFileChange: false };
+  const state = { sent: [], opens: [], closed: 0, hold: null, withFileChange: false, openError: null, openWait: null, sendError: null };
   const adapter = {
     manifest: { id, name, aliases: [id], capabilities: {} },
     async open(input) {
       state.opens.push({ restore: input.thread.restore === true, nativeSessionId: input.thread.nativeSessionId, nativeSessionFile: input.thread.nativeSessionFile });
+      if (state.openWait) await state.openWait;
+      if (state.openError) throw new Error(state.openError);
       return { nativeSessionId: input.thread.nativeSessionId };
     },
     async send(session, text, hooks) {
       state.sent.push(text);
+      if (state.sendError) throw new Error(state.sendError);
       if (state.hold) { state.hold.hooks = hooks; return; } // 挂起：Turn 保持 running，等待测试手动 settle
       if (state.withFileChange) hooks.emit({ kind: 'file-change', changes: [{ path: 'src/login.ts', before: '', after: 'x', complete: true, changeType: 'added' }] });
       hooks.emit({ kind: 'text-delta', text: `${name} 回复` });
@@ -46,6 +49,8 @@ async function main() {
   assert.deepEqual(optimized.conversationTail.map(message => message.role), ['user', 'assistant', 'user', 'assistant']);
   assert.equal(optimized.conversationTail.at(-1).text, longSolution, '最新方案应获得更大的交接预算');
   assert.ok(optimized.conversationTail.reduce((sum, message) => sum + message.text.length, 0) <= CAP.totalChars);
+  assert.match(composeHandoffEnvelope({ fromHarnessId: 'a', context: {}, intent: 'review' }), /Do not modify files/);
+  assert.match(composeHandoffEnvelope({ fromHarnessId: 'a', context: {}, intent: 'reanalyze' }), /Reanalyze the task independently/);
 
   await fs.mkdir('output', { recursive: true });
   const root = await fs.mkdtemp(path.resolve('output/switch-harness-'));
@@ -90,17 +95,21 @@ async function main() {
     const checkpointBeforeSend = rt.handoffs.get(thread.id, firstCheckpointId);
     assert.equal(checkpointBeforeSend.intent, 'continue');
     assert.equal(checkpointBeforeSend.fileState.files.some(file => file.path === 'src/login.ts' && file.changeType === 'added'), true);
-    assert.equal(rt.handoffs.owned(thread.id, firstCheckpointId).status, 'checkpoint-created');
-    assert.equal(thread.restore, false, '新 Harness 上是全新原生会话');
-    assert.equal(rt.sessions.has(thread.id), false, '切换后旧原生会话已关闭');
+    assert.equal(rt.handoffs.owned(thread.id, firstCheckpointId).status, 'ready');
+    assert.equal(b.state.opens[0].restore, false, '新 Harness 上是全新原生会话');
+    assert.equal(thread.restore, undefined, '目标 Session 打开后清理瞬态 restore 标记');
+    assert.equal(thread.pendingHandoff.phase, 'ready');
+    assert.equal(rt.sessions.has(thread.id), true, '目标 Harness 连接成功后才完成切换');
     assert.equal(a.state.closed, 1);
-    assert.equal(b.state.opens.length, 0, '目标 Harness 惰性拉起，切换瞬间不开进程');
+    assert.equal(b.state.opens.length, 1, '切换阶段预先连接目标 Harness');
     assert.equal(thread.messages.filter(m => m.role === 'user').length, 1, '/switch 指令本身不落在会话里');
+    await assert.rejects(rt.switchHarness(thread.id, 'a'), /上一次 Harness 接力尚未完成/);
+    assert.ok((await rt.listCommands({ threadId: thread.id })).some(command => command.id === 'switch-cancel'));
 
     // 4) 切换后首轮：信封注入 prompt，可见消息保持干净，注入后清除标记
     await rt.send(thread.id, '继续');
     await settle(thread.id);
-    assert.equal(b.state.opens.length, 1);
+    assert.equal(b.state.opens.length, 1, '首轮发送复用切换阶段已连接的目标 Session');
     assert.equal(b.state.opens[0].restore, false);
     assert.notEqual(thread.nativeSessionId, aNativeId);
     assert.match(b.state.sent[0], /\[Harness Mix handoff\]/);
@@ -119,18 +128,18 @@ async function main() {
     await settle(thread.id);
     assert.ok(!b.state.sent[1].includes('[Harness Mix handoff]'), '信封只注入一次');
 
-    // 6) 切回 A：原生会话引用恢复（惰性 open 走 restore 路径），chain 压栈两条
+    // 6) 切回 A：原生会话引用恢复并在提交切换前验证连接，chain 压栈两条
     await rt.send(thread.id, '/switch a');
     assert.equal(thread.harnessId, 'a');
     assert.equal(thread.harnessChain.length, 2);
     assert.equal(thread.harnessChain[1].harnessId, 'b');
     assert.equal(thread.nativeSessionId, aNativeId, '切回恢复原原生会话标识');
-    assert.equal(thread.restore, true);
-    await rt.send(thread.id, '我回来了');
-    await settle(thread.id);
+    assert.equal(thread.restore, undefined);
     assert.equal(a.state.opens.length, 2);
     assert.equal(a.state.opens[1].restore, true, '切回走原生恢复路径');
     assert.equal(a.state.opens[1].nativeSessionId, aNativeId);
+    await rt.send(thread.id, '我回来了');
+    await settle(thread.id);
     assert.match(a.state.sent[1], /\[Harness Mix handoff\]/, '切回首轮同样注入信封');
 
     // 7) 守卫：执行中 / 同 Harness / 未知 Harness / 草稿 / 协作子任务
@@ -152,7 +161,65 @@ async function main() {
     const child = await rt.createThread({ harnessId: 'a', cwd: root, parentThreadId: thread.id });
     await assert.rejects(rt.switchHarness(child.id, 'b'), /协作子任务/);
 
-    // 8) 持久化：threads.json 里切换链完整（含原生会话引用，供重启后惰性恢复）
+    // 8) 待投递接力可显式取消：关闭目标 Session，恢复源 Harness，不污染既有链
+    const chainBeforeCancel = thread.harnessChain.length;
+    const cancelCandidate = await rt.switchHarness(thread.id, 'b', { intent: 'review' });
+    assert.equal(thread.pendingHandoff.phase, 'ready');
+    await rt.send(thread.id, '/switch cancel');
+    assert.equal(thread.harnessId, 'a');
+    assert.equal(thread.pendingHandoff, undefined);
+    assert.equal(thread.harnessChain.length, chainBeforeCancel);
+    assert.equal(rt.handoffs.owned(thread.id, cancelCandidate.checkpointId).status, 'cancelled');
+    assert.equal(rt.sessions.get(thread.id)?.adapter, a.adapter);
+
+    // 9) 目标连接失败时事务回滚：线程归属、原生源 Session 与 chain 都恢复
+    const c = fakeHarness('c', 'Gamma');
+    c.state.openError = 'Gamma auth expired';
+    rt.adapters.set('c', c.adapter); rt.status.c = { available: true };
+    await assert.rejects(rt.switchHarness(thread.id, 'c'), /已恢复原 Harness.*Gamma auth expired/);
+    assert.equal(thread.harnessId, 'a');
+    assert.equal(thread.pendingHandoff, undefined);
+    assert.equal(thread.harnessChain.length, chainBeforeCancel);
+    assert.equal(rt.sessions.get(thread.id)?.adapter, a.adapter);
+    const rolledBack = [...rt.handoffs.checkpoints.values()].find(row => row.targetHarnessId === 'c');
+    assert.equal(rolledBack.status, 'rolled-back');
+
+    // 10) 首轮投递失败保留检查点；下一次发送复用同一目标 Session 和同一检查点重试
+    a.state.withFileChange = false;
+    const retryThread = await rt.createThread({ harnessId: 'a', cwd: root });
+    await rt.send(retryThread.id, '准备接力重试');
+    await settle(retryThread.id);
+    const retrySwitch = await rt.switchHarness(retryThread.id, 'b', { intent: 'review' });
+    b.state.sendError = 'temporary transport failure';
+    await rt.send(retryThread.id, '先审查');
+    await settle(retryThread.id);
+    assert.equal(retryThread.pendingHandoff.phase, 'failed');
+    assert.equal(rt.handoffs.owned(retryThread.id, retrySwitch.checkpointId).status, 'failed');
+    b.state.sendError = null;
+    await rt.send(retryThread.id, '重试审查');
+    await settle(retryThread.id);
+    assert.equal(retryThread.pendingHandoff, undefined);
+    assert.equal(rt.handoffs.owned(retryThread.id, retrySwitch.checkpointId).status, 'active');
+    assert.match(b.state.sent.at(-1), /Handoff mode: review.*Do not modify files/s);
+
+    // 11) 并发切换按 Thread 串行化：第二个 RPC 不得在第一个连接期间再创建检查点
+    const concurrentThread = await rt.createThread({ harnessId: 'a', cwd: root });
+    await rt.send(concurrentThread.id, '准备并发切换');
+    await settle(concurrentThread.id);
+    const d = fakeHarness('d', 'Delta');
+    let releaseDelta;
+    d.state.openWait = new Promise(resolve => { releaseDelta = resolve; });
+    rt.adapters.set('d', d.adapter); rt.status.d = { available: true };
+    const firstSwitch = rt.switchHarness(concurrentThread.id, 'd');
+    await wait(() => rt.switching.has(concurrentThread.id));
+    await assert.rejects(rt.switchHarness(concurrentThread.id, 'b'), /正在切换 Harness/);
+    releaseDelta();
+    await firstSwitch;
+    assert.equal(concurrentThread.harnessId, 'd');
+    await rt.cancelHarnessSwitch(concurrentThread.id);
+    assert.equal(concurrentThread.harnessId, 'a');
+
+    // 12) 持久化：threads.json 里切换链完整（含原生会话引用，供重启后惰性恢复）
     await rt.store.save(rt.threads);
     const persisted = (await rt.store.load()).find(t => t.id === thread.id);
     assert.equal(persisted.harnessId, 'a');

package/scripts/tool-concurrency-regression-test.cjs

@@ -89,20 +89,22 @@ async function main() {
     const call = { type: 'assistant', message: { content: [{ type: 'tool_use', id: 'same-id', name: 'Read', input: { file_path: 'a.txt' } }] } };
     for (const event of projectEvent(call)) emitA(event);
     emitB({ kind: 'tool', toolCallId: 'same-id', title: 'Read', state: 'running', input: 'b.txt' });
-    assert.equal(notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'mcpToolCall').length, 0);
+    assert.equal(notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'dynamicToolCall').length, 0);
     for (const event of projectEvent({ type: 'user', message: { content: [{ type: 'tool_result', tool_use_id: 'same-id', content: [{ type: 'text', text: 'only A' }] }] } })) emitA(event);
     emitB({ kind: 'tool', toolCallId: 'same-id', state: 'error', output: 'only B failed' });
-    const completed = notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'mcpToolCall');
+    const completed = notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'dynamicToolCall');
     assert.equal(completed.length, 2);
-    assert.equal(completed.find(n => n.params.threadId === a.id).params.item.result.content[0].text, 'only A');
-    assert.equal(completed.find(n => n.params.threadId === b.id).params.item.error.message, 'only B failed');
+    assert.equal(completed.find(n => n.params.threadId === a.id).params.item.contentItems[0].text, 'only A');
+    const failedB = completed.find(n => n.params.threadId === b.id).params.item;
+    assert.equal(failedB.status, 'failed');
+    assert.equal(failedB.contentItems[0].text, 'only B failed');
     assert.equal(a.tools[0].input, '{"file_path":"a.txt"}');
     assert.equal(a.tools[0].output, 'only A');
     assert.equal(b.tools[0].output, 'only B failed');
     emitB({ kind: 'tool', toolCallId: 'same-id', state: 'error', output: { error: 'late detail' } });
-    const late = notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'mcpToolCall').at(-1);
+    const late = notifications.filter(n => n.method === 'item/completed' && n.params?.item?.type === 'dynamicToolCall').at(-1);
     assert.equal(late.params.threadId, b.id);
-    assert.equal(late.params.item.result.content[0].text, '{"error":"late detail"}');
+    assert.equal(late.params.item.contentItems[0].text, '{"error":"late detail"}');
     emitA({ kind: 'completed', finalAnswer: true });
     assert.equal(rt.execution.isRunning(b.id), true);
     emitB({ kind: 'completed', finalAnswer: true });

package/src/assets/icons/cline-color.svg

@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Cline</title><path d="M17.035 3.991c2.75 0 4.98 2.24 4.98 5.003v1.667l1.45 2.896a1.01 1.01 0 01-.002.909l-1.448 2.864v1.668c0 2.762-2.23 5.002-4.98 5.002H7.074c-2.751 0-4.98-2.24-4.98-5.002V17.33l-1.48-2.855a1.01 1.01 0 01-.003-.927l1.482-2.887V8.994c0-2.763 2.23-5.003 4.98-5.003h9.962zM8.265 9.6a2.274 2.274 0 00-2.274 2.274v4.042a2.274 2.274 0 004.547 0v-4.042A2.274 2.274 0 008.265 9.6zm7.326 0a2.274 2.274 0 00-2.274 2.274v4.042a2.274 2.274 0 104.548 0v-4.042A2.274 2.274 0 0015.59 9.6z"></path><path d="M12.054 5.558a2.779 2.779 0 100-5.558 2.779 2.779 0 000 5.558z"></path></svg>