@harness-mix/cli 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harness-mix/cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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": [
@@ -30,7 +30,8 @@
     "harness-mix": "scripts/launch-codex.cjs"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "postinstall": "node scripts/install-native.cjs",
   "files": [
@@ -176,11 +177,11 @@
     "zod": "4.4.3"
   },
   "optionalDependencies": {
-    "@harness-mix/native-win32-x64": "0.1.5",
-    "@harness-mix/native-win32-arm64": "0.1.5",
-    "@harness-mix/native-darwin-x64": "0.1.5",
-    "@harness-mix/native-darwin-arm64": "0.1.5",
-    "@harness-mix/native-linux-x64": "0.1.5",
-    "@harness-mix/native-linux-arm64": "0.1.5"
+    "@harness-mix/native-win32-x64": "0.1.6",
+    "@harness-mix/native-win32-arm64": "0.1.6",
+    "@harness-mix/native-darwin-x64": "0.1.6",
+    "@harness-mix/native-darwin-arm64": "0.1.6",
+    "@harness-mix/native-linux-x64": "0.1.6",
+    "@harness-mix/native-linux-arm64": "0.1.6"
   }
 }

package/scripts/collaboration-test.cjs

@@ -29,10 +29,11 @@ async function main() {
   const call = (name, args) => rt.collaboration.call(parent.id, name, args);
   const finish = (id, answer) => { const { s } = pending.get(id); pending.delete(id); active--; s.emit({ kind: 'text-delta', text: answer }); s.emit({ kind: 'completed', finalAnswer: true }); };
   try {
-    assert.deepEqual(mentionedAgents('ask @w and [Worker](harness-mix://agent/worker) `@lead` mail@lead.com @worker/foo', rt), ['worker']);
+    assert.deepEqual(mentionedAgents('ask #w and [Worker](harness-mix://agent/worker) `#lead` issue#lead #worker/foo', rt), ['worker']);
+    assert.deepEqual(mentionedAgents('leave @w to native Codex mentions', rt), []);
     await assert.rejects(call('list_agents', {}), /no longer active/);
     rt.history.context = async ({ nativeSessionId }) => { assert.equal(nativeSessionId, 'c2Vzc2lvbg'); return { harnessId: 'pi', title: 'Old session', cwd: root, transcript: 'User: prior question\nAssistant: prior answer' }; };
-    await rt.send(parent.id, '@worker review files @[Old session](harness-mix://session/c2Vzc2lvbg)');
+    await rt.send(parent.id, '#worker review files #[Old session](harness-mix://session/c2Vzc2lvbg)');
     assert.ok(rt.execution.isRunning(parent.id));
     assert.match(leadPrompt, /untrusted historical data[\s\S]*prior answer/);
     assert.match(leadPrompt, /Recovery checkpoint:[\s\S]*interrupted-fixture \(worker\)[\s\S]*call list_delegations now/);
@@ -88,7 +89,11 @@ async function main() {
     assert.equal((await call('get_delegation_status', { task_ids: [first.task_id], wait_ms: 3000 }))[0].result, 'follow-up-result');
     await assert.rejects(call('get_delegation_status', { task_ids: ['foreign-task'] }), /Unknown task/);
     await assert.rejects(rt.collaboration.call(jobs[0].childId, 'delegate_to_agent', { agent_type: 'worker', task: 'recursive' }), /Only lead/);
-    await assert.rejects(call('delegate_to_agent', { agent_type: 'worker', task: 'x', unexpected: true }));
+    await assert.rejects(call('delegate_to_agent', { agent_type: 'worker', task: 'x', unexpected: true }));
+    const savedMentions = parent.activeMentions;
+    delete parent.activeMentions;
+    await assert.rejects(call('delegate_to_agent', { agent_type: 'worker', task: 'unauthorized' }), /用户本轮未显式委派/);
+    parent.activeMentions = savedMentions;
     const denied = await fetch(ownerConnection.env.HARNESS_MIX_COLLAB_URL, { method: 'POST', headers: { Authorization: 'Bearer invalid' }, body: '{}' });
     assert.equal(denied.status, 403);
     const outsider = await rt.createThread({ harnessId: 'worker', cwd: root });

package/scripts/collaboration-ui-smoke.cjs

@@ -5,53 +5,67 @@ const path = require('node:path');
 app.disableHardwareAcceleration();
 app.whenReady().then(async () => {
   const bundle = await require('esbuild').build({ stdin: { contents: `export * from './src/native-ui/renderer-extension/src/renderer-harness-mentions.ts';`, resolveDir: process.cwd() }, bundle: true, platform: 'browser', format: 'iife', globalName: 'Mentions', write: false });
-  const win = new BrowserWindow({ show: false, width: 900, height: 650, webPreferences: { sandbox: true, contextIsolation: true, offscreen: true } });
+  const win = new BrowserWindow({ show: false, width: 900, height: 650, webPreferences: { sandbox: true, contextIsolation: true, offscreen: true, backgroundThrottling: false } });
   try {
-    await win.loadURL('data:text/html;charset=utf-8,' + encodeURIComponent('<body style="font:16px system-ui;padding:32px"><h2>Harness Mix · 多 Agent 协作</h2><p>主任务负责分工、收集结果与验证。</p><div data-codex-composer-root style="position:absolute;bottom:50px;width:750px"><textarea style="width:100%;height:90px;font:16px system-ui" placeholder="输入 @ 选择协作 Harness"></textarea><div contenteditable="true" style="border:1px solid gray;padding:16px">你负责后端，</div></div></body>'));
+    await win.loadURL('data:text/html;charset=utf-8,' + encodeURIComponent('<body style="font:16px system-ui;padding:32px"><h2>Harness Mix · 多 Agent 协作</h2><p>主任务负责分工、收集结果与验证。</p><div data-codex-composer-root data-composer-draft-id="textarea-smoke" style="position:absolute;left:40px;bottom:50px;width:750px;box-sizing:border-box;padding:14px;border:2px solid #aaa;border-radius:16px"><textarea style="width:100%;height:90px;border:0;outline:0;resize:none;font:16px system-ui" placeholder="输入 # 选择协作 Harness"></textarea></div><div data-codex-composer-root data-composer-draft-id="rich-smoke" style="position:fixed;left:-1200px;width:400px"><div contenteditable="true" style="border:1px solid gray;padding:16px">你负责后端，</div></div></body>'));
     await win.webContents.executeJavaScript(`globalThis.__HARNESS_MIX_ICONS__ = ${JSON.stringify(require('../src/main/native/icons').getAllIconsDictionary())}`);
     await win.webContents.executeJavaScript(bundle.outputFiles[0].text);
     const result = await win.webContents.executeJavaScript(`(async () => {
-      const api = Mentions.installHarnessMentions(async () => ({agents:[{id:'pi',name:'Pi',available:true,lead:true},{id:'claude',name:'Claude Code',available:true,lead:true},{id:'dsh',name:'DeepSeek Harness',available:false,lead:false}],sessions:[{id:'c2Vzc2lvbg',title:'旧版登录审查',harnessId:'claude',cwd:'E:/project',running:false}]}));
-      const editor = document.querySelector('textarea');
-      editor.focus(); editor.value = '你负责后端， @cl'; editor.setSelectionRange(editor.value.length,editor.value.length); editor.dispatchEvent(new Event('input',{bubbles:true}));
+      const api = Mentions.installHarnessMentions(async () => ({agents:[{id:'pi',name:'Pi',available:true,lead:true},{id:'claude',name:'Claude Code',available:true,lead:true},{id:'dsh',name:'DeepSeek Harness',available:false,lead:false}],sessions:[{id:'c2Vzc2lvbg',title:'旧版登录审查',harnessId:'claude',cwd:'E:/project',running:false}]}));
+      const editor = document.querySelector('textarea');
+      editor.focus(); editor.value = '@cl'; editor.setSelectionRange(editor.value.length,editor.value.length); editor.dispatchEvent(new Event('input',{bubbles:true}));
+      await new Promise(r=>setTimeout(r,30));
+      const atTriggerStayedNative = document.querySelector('[data-harness-mix-mentions]').hidden;
+      editor.focus(); editor.value = '你负责后端， #cl'; editor.setSelectionRange(editor.value.length,editor.value.length); editor.dispatchEvent(new Event('input',{bubbles:true}));
       await new Promise(r=>setTimeout(r,30));
       const filtered = document.querySelectorAll('[data-harness-mix-mentions] [role="option"]').length;
       editor.dispatchEvent(new KeyboardEvent('keydown',{key:'Enter',bubbles:true,cancelable:true}));
-      const text = editor.value;
-      const badge = document.querySelector('[data-harness-mix-selected-mentions] img')?.dataset.harnessMixIcon;
+      const text = editor.value;
+      const badge = document.querySelector('[data-harness-mix-selected-mentions] img')?.dataset.harnessMixIcon;
+      const badgeButton = document.querySelector('[data-harness-mix-selected-mentions] button');
+      const inline = badgeButton?.parentElement?.nextElementSibling === editor && editor.parentElement?.dataset.harnessMixHasMentions === 'true';
+      editor.value = '你负责后端， #pi'; editor.setSelectionRange(editor.value.length,editor.value.length); editor.dispatchEvent(new Event('input',{bubbles:true}));
+      await new Promise(r=>setTimeout(r,30));
+      editor.dispatchEvent(new KeyboardEvent('keydown',{key:'Enter',bubbles:true,cancelable:true}));
+      const selectedAgentCount = editor.parentElement.querySelectorAll('[data-harness-mix-mention-badge^="agent:"]').length;
       const rich = document.querySelector('[contenteditable]'); rich.focus();
       const selection = getSelection(), range = document.createRange(); range.selectNodeContents(rich); range.collapse(false); selection.removeAllRanges(); selection.addRange(range);
-      document.execCommand('insertText',false,' @pi');
+      document.execCommand('insertText',false,' #pi');
       await new Promise(r=>setTimeout(r,30));
       rich.textContent = rich.textContent; // Native editor redraw replaces the original Range nodes.
       document.querySelector('[data-harness-mix-mentions] [role="option"]').click();
       const richText = rich.textContent;
-      editor.focus(); editor.value='@'; editor.setSelectionRange(1,1); editor.dispatchEvent(new Event('input',{bubbles:true}));
+      editor.focus(); editor.value='#'; editor.setSelectionRange(1,1); editor.dispatchEvent(new Event('input',{bubbles:true}));
       await new Promise(r=>setTimeout(r,30));
       globalThis.mentionSmoke = api;
       const tabs = document.querySelectorAll('[data-harness-mix-mentions] [role=tab]').length;
       if (tabs !== 2) throw new Error('Missing Agents/session tabs');
       const icons = document.querySelectorAll('[data-harness-mix-mentions] img').length;
       const disabled = document.querySelectorAll('[data-harness-mix-mentions] [role="option"]:disabled').length;
-      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('历史会话'));
-      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);
+      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] [data-harness-mix-mention-badge]')].some(b=>b.title.startsWith('移除历史会话'));
+      editor.value='请分别实现并审查这个任务。'; editor.setSelectionRange(editor.value.length,editor.value.length); editor.dispatchEvent(new Event('input',{bubbles:true}));
+      globalThis.mentionSmokeEditor = editor;
+      return {atTriggerStayedNative,filtered,text,richText,badge,badgeLabel:badgeButton?.getAttribute('aria-label'),inline,selectedAgentCount,icons,disabled,sessionBadge};
+    })()`);
+    assert.equal(result.atTriggerStayedNative, 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());
+    assert.equal(result.disabled, 1);
+    assert.equal(result.badge, 'harnesses/claude'); assert.equal(result.icons, 3);
+    assert.match(result.badgeLabel, /^移除协作 Agent /);
+    assert.equal(result.inline, true);
+    assert.equal(result.selectedAgentCount, 2);
+    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());
+    const submittedText = await win.webContents.executeJavaScript(`(() => { const root=mentionSmokeEditor.closest('[data-codex-composer-root]'); root.dispatchEvent(new Event('submit',{bubbles:true})); return mentionSmokeEditor.value; })()`);
+    assert.match(submittedText, /#claude/);
+    assert.match(submittedText, /#pi/);
     await win.webContents.executeJavaScript('mentionSmoke.dispose()');
     assert.equal(await win.webContents.executeJavaScript('document.querySelectorAll("[data-harness-mix-mentions]").length'), 0);
-    console.log('PASS: Electron native composer @ Harness/session icons, badges, keyboard selection, textarea/rich text and cleanup');
+    console.log('PASS: Electron native composer # Harness/session icons, badges, keyboard selection, textarea/rich text and cleanup');
   } finally { win.destroy(); app.quit(); }
 }).catch(error => { console.error(error); app.exit(1); });

package/scripts/integrations-test.cjs

@@ -12,7 +12,7 @@ async function main() {
   await fs.mkdir(project, { recursive: true }); await fs.mkdir(home);
   const adapters = new Map(buildAdapters(() => {}).map(a => [a.manifest.id, a]));
   const runtime = { adapters, status: {}, sessions: new Map(), store: { directory: path.join(root, 'data') }, resolveHarnessId: id => id };
-  const manager = runtime.integrations = new Integrations(runtime, { home });
+  const manager = runtime.integrations = new Integrations(runtime, { home, environment: {} });
   const global = { harnessId: 'claude', scope: 'global' }, local = { harnessId: 'claude', scope: 'project', cwd: project };
   const server = { name: 'probe', command: process.execPath, args: ['probe.cjs'], enabled: true };
   await Promise.all([manager.save({ ...global, server }), manager.save({ ...local, server: { ...server, enabled: false } })]);
@@ -29,8 +29,27 @@ async function main() {
   await manager.save({ ...global, server: { ...server, args: ['changed.cjs'] } });
   assert.equal((await manager.list(global)).servers[0].appliedSessions, 0, 'changed config not claimed as applied');
   const reload = new Integrations(runtime, { home }); assert.equal((await reload.list(global)).servers.length, 1);
-  await assert.rejects(manager.save({ ...global, server: { ...server, env: { SECRET: 'never' } } }));
+  const stdioExtended = { name: 'stdio-ext', command: process.execPath, args: ['probe.cjs'], env: { NODE_ENV: 'test' }, env_vars: ['PATH'], cwd: project, enabled: true };
+  await manager.save({ ...local, server: stdioExtended });
+  const stdioLoaded = (await manager.list(local)).servers.find(s => s.name === 'stdio-ext');
+  assert.equal(stdioLoaded.transportType, 'stdio');
+  assert.deepEqual(stdioLoaded.env, { NODE_ENV: 'test' });
+  assert.deepEqual(stdioLoaded.env_vars, ['PATH']);
+  assert.equal(stdioLoaded.cwd, project);
+
+  const http = { name: 'http-probe', transportType: 'streamable_http', url: 'https://mcp.example.com/mcp', bearer_token_env_var: 'MCP_TOKEN', http_headers: { 'X-Custom': 'val' }, env_http_headers: { 'X-Auth': 'TOKEN_VAR' }, enabled: true };
+  await manager.save({ ...global, server: http });
+  const httpLoaded = (await manager.list(global)).servers.find(s => s.name === 'http-probe');
+  assert.equal(httpLoaded.transportType, 'streamable_http');
+  assert.equal(httpLoaded.url, 'https://mcp.example.com/mcp');
+  assert.equal(httpLoaded.bearer_token_env_var, 'MCP_TOKEN');
+  assert.deepEqual(httpLoaded.http_headers, { 'X-Custom': 'val' });
+  assert.deepEqual(httpLoaded.env_http_headers, { 'X-Auth': 'TOKEN_VAR' });
+
+  await assert.rejects(manager.save({ ...global, server: { ...server, invalidProp: 'never' } }));
   await assert.rejects(manager.save({ ...global, server: { ...server, args: ['--token', 'never'] } }));
+  await assert.rejects(manager.save({ ...global, server: { name: 'bad-url', url: 'invalid-url', enabled: true } }));
+  await assert.rejects(manager.save({ ...global, server: { name: 'bad-bearer', url: 'https://example.com', bearer_token_env_var: '123-bad', enabled: true } }));
   await assert.rejects(manager.save({ ...global, harnessId: 'pi', server }), /no supported/);
   await assert.rejects(manager.remove({ ...local, id: snapshot.servers[0].id }), /scope/);
   await assert.rejects(manager.list({ ...local, cwd: 'relative' }));
@@ -44,6 +63,11 @@ async function main() {
   await assert.rejects(fs.access(nativeFile)); assert.equal((await manager.list(local)).skills[0].enabled, false);
   await manager.skillChange({ ...local, name: 'sample', action: 'enable' });
   assert.equal(await fs.readFile(path.join(project, '.claude/skills/sample/scripts/sample.txt'), 'utf8'), 'unchanged');
+  const droppedMarkdown = Buffer.from('---\nname: dropped\ndescription: Dropped skill\n---\n# Dropped\n').toString('base64');
+  await manager.skillChange({ ...local, name: 'dropped', files: [{ path: 'SKILL.md', contentBase64: droppedMarkdown }], action: 'install' });
+  assert.match(await fs.readFile(path.join(project, '.claude/skills/dropped/SKILL.md'), 'utf8'), /Dropped skill/);
+  await assert.rejects(manager.skillChange({ ...local, name: 'escape', files: [{ path: '../SKILL.md', contentBase64: droppedMarkdown }], action: 'install' }), /invalid path/);
+  await assert.rejects(manager.skillChange({ ...local, name: 'bad-data', files: [{ path: 'SKILL.md', contentBase64: '***' }], action: 'install' }), /invalid file data/);
   await assert.rejects(manager.skillChange({ ...local, name: '../escape', source, action: 'install' }));
   await assert.rejects(manager.skillChange({ ...local, name: 'sample', root, action: 'disable' }));
   const link = path.join(project, '.claude/skills/linked');
@@ -55,10 +79,45 @@ async function main() {
   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);
-  for (const a of adapters.values()) assert.equal(catalog.harnesses.find(h => h.id === a.manifest.id).mcp, a.manifest.integrations?.mcp === true);
+  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);
+    assert.equal(entry.skills, true, `${a.manifest.id} must declare verified native skill roots`);
+    const roots = await manager.ensureSkillRoots({ cwd: project }, a);
+    assert.ok(roots.length > 0, `${a.manifest.id} must resolve at least one native skill root`);
+    for (const skillRoot of roots) assert.equal((await fs.stat(skillRoot)).isDirectory(), true);
+  }
+  assert.deepEqual(manager.roots(adapters.get('antigravity'), { scope: 'global', cwd: null }), [path.join(home, '.gemini/config/skills')]);
+  assert.deepEqual(manager.roots(adapters.get('dsh'), { scope: 'project', cwd: project }), [path.join(project, '.dsh/skills'), path.join(project, '.agents/skills')]);
+  assert.deepEqual(manager.roots(adapters.get('zcode'), { scope: 'global', cwd: null }), [path.join(home, '.zcode/skills'), path.join(home, '.agents/skills')]);
+  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')]);
+  // 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')]);
+  // Environment overrides relocate global roots; the deprecated-but-loaded $CODEX_HOME/skills stays discoverable.
+  const codexHome = path.join(root, 'codex-home'), hermesHome = path.join(root, 'hermes-home');
+  const overridden = new Integrations(runtime, { home, environment: { CODEX_HOME: codexHome, HERMES_HOME: hermesHome } });
+  assert.deepEqual(overridden.roots(adapters.get('codex'), { scope: 'global', cwd: null }), [path.join(home, '.agents/skills'), path.join(codexHome, 'skills')]);
+  assert.deepEqual(overridden.roots(adapters.get('hermes'), { scope: 'global', cwd: null }), [path.join(hermesHome, 'skills')]);
+  // A root that cannot be created is reported and skipped, never fatal to opening a session.
+  const blockedHome = path.join(root, 'blocked-home');
+  await fs.mkdir(path.join(blockedHome, '.codex'), { recursive: true });
+  await fs.writeFile(path.join(blockedHome, '.codex', 'skills'), 'not a directory');
+  const blocked = new Integrations(runtime, { home: blockedHome, environment: {} });
+  const reported = [];
+  const ensured = await blocked.ensureSkillRoots({ cwd: project }, adapters.get('codex'), { onError: message => reported.push(message) });
+  assert.ok(!ensured.some(value => value.endsWith(path.join('.codex', 'skills'))), 'uncreatable root is skipped');
+  assert.equal(ensured.length, 2, 'the remaining global and project roots are still created');
+  assert.equal(reported.length, 1, 'the skipped root is reported');
+  assert.equal((await fs.stat(ensured[0])).isDirectory(), true);
+  // An unusable project scope degrades to global roots instead of failing the launch.
+  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/list', local)).skills.length, 2);
+  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');
 }
 main().catch(error => { console.error(error); process.exitCode = 1; });

package/scripts/integrations-ui-smoke.cjs

@@ -14,14 +14,13 @@ app.whenReady().then(async () => {
   const adapters = new Map(buildAdapters(() => {}).map(a => [a.manifest.id, a]));
   const runtime = { adapters, sessions: new Map(), status: { claude: { available: true } }, store: { directory: path.join(out, 'data') }, resolveHarnessId: id => id };
   runtime.integrations = new Integrations(runtime, { home: path.join(out, 'home') });
-  const source = path.join(out, 'skill-source'); await fs.mkdir(source); await fs.writeFile(path.join(source, 'SKILL.md'), '---\nname: ui-skill\ndescription: UI fixture\n---\n# Test\n');
   const preload = path.join(out, 'preload.cjs');
   await fs.writeFile(preload, `const {contextBridge,ipcRenderer}=require('electron');contextBridge.exposeInMainWorld('integrationTest',{request:(method,params)=>ipcRenderer.invoke('integrations-test',method,params)});`);
   ipcMain.handle('integrations-test', (_event, method, params) => {
     assert.ok(method.startsWith('codexhost/integrations/'));
     return NativeProtocol.prototype.request.call({ runtime }, method, params);
   });
-  const build = await esbuild.build({ stdin: { contents: `export {createIntegrationsSettingsPage} from './src/native-ui/renderer-extension/src/settings/integrations-page.ts'; export {mountRendererSettingsShell} from './src/native-ui/renderer-extension/src/settings/shell.ts'; export {createRendererSettingsPageRegistry} from './src/native-ui/renderer-extension/src/settings/core.ts'; export {rendererSettingsMessages} from './src/native-ui/renderer-extension/src/settings/localization.ts'; export {createRendererIntegrationsClient} from './src/native-ui/renderer-extension/src/renderer-integrations-client.ts';`, resolveDir: process.cwd() }, bundle: true, platform: 'browser', format: 'iife', globalName: 'IntegrationUI', write: false, alias: { '@codexhost/shared-contracts': path.resolve('src/native-ui/shared-contracts/src/index.ts') }, loader: { '.svg': 'dataurl', '.png': 'dataurl', '.css': 'text' } });
+  const build = await esbuild.build({ stdin: { contents: `export {createMcpSettingsPage,createSkillsSettingsPage} from './src/native-ui/renderer-extension/src/settings/integrations-page.ts'; export {mountRendererSettingsShell} from './src/native-ui/renderer-extension/src/settings/shell.ts'; export {createRendererSettingsPageRegistry} from './src/native-ui/renderer-extension/src/settings/core.ts'; export {rendererSettingsMessages} from './src/native-ui/renderer-extension/src/settings/localization.ts'; export {createRendererIntegrationsClient} from './src/native-ui/renderer-extension/src/renderer-integrations-client.ts';`, resolveDir: process.cwd() }, bundle: true, platform: 'browser', format: 'iife', globalName: 'IntegrationUI', write: false, alias: { '@codexhost/shared-contracts': path.resolve('src/native-ui/shared-contracts/src/index.ts') }, loader: { '.svg': 'dataurl', '.png': 'dataurl', '.css': 'text' } });
   const consoleProblems = [];
   const win = new BrowserWindow({ show: false, width: 1100, height: 900, webPreferences: { preload, contextIsolation: true, sandbox: true, offscreen: true } });
   win.webContents.on('console-message', (_event, details) => { if (details.level === 'error' || details.level === 'warning') consoleProblems.push(details.message); });
@@ -31,32 +30,94 @@ app.whenReady().then(async () => {
     const result = await win.webContents.executeJavaScript(`(async()=>{
       const messages=IntegrationUI.rendererSettingsMessages('zh-CN');
       const client=IntegrationUI.createRendererIntegrationsClient((m,p)=>window.integrationTest.request(m,p));
-      const registry=IntegrationUI.createRendererSettingsPageRegistry([IntegrationUI.createIntegrationsSettingsPage(messages,()=>client)]);
-      const shell=IntegrationUI.mountRendererSettingsShell(registry,document,messages); shell.openSettings();
+      const registry=IntegrationUI.createRendererSettingsPageRegistry([IntegrationUI.createMcpSettingsPage(messages,()=>client),IntegrationUI.createSkillsSettingsPage(messages,()=>client)]);
+      const shell=IntegrationUI.mountRendererSettingsShell(registry,document,messages); shell.openSettings(undefined,'mcp');
       const root=shell.root.shadowRoot;
       const wait=async predicate=>{for(let i=0;i<100;i++){if(predicate())return;await new Promise(r=>setTimeout(r,30));}throw Error('UI timed out');};
-      await wait(()=>root.querySelector('select')?.options.length===16 && !root.querySelector('select').disabled);
+      await wait(()=>root.querySelector('select')?.options.length===17 && !root.querySelector('select').disabled);
       const [harness,scope]=root.querySelectorAll('select');harness.value='claude';harness.dispatchEvent(new Event('change'));
-      await wait(()=>root.querySelector('.settings-integrations-form')&&!harness.disabled);
+      await wait(()=>root.querySelector('.settings-integrations-toolbar')&&!harness.disabled);
       scope.value='project';scope.dispatchEvent(new Event('change'));
       const cwd=root.querySelector('.settings-integrations-controls input');cwd.value=${JSON.stringify(project)};cwd.dispatchEvent(new Event('change'));
-      await wait(()=>root.querySelector('.settings-integrations-form')&&!harness.disabled);
-      const form=root.querySelector('form'); const fields=form.querySelectorAll('input');fields[0].value='ui-probe';fields[1].value='node';form.querySelector('textarea').value='["probe.cjs"]';form.requestSubmit();
+      await wait(()=>root.querySelector('.settings-integrations-toolbar')&&!harness.disabled);
+      Array.from(root.querySelectorAll('button')).find(b=>b.textContent.includes('添加 MCP')).click();
+      const form=root.querySelector('form'); const fields=form.querySelectorAll('input');fields[0].value='ui-probe';fields[1].value='node';fields[2].value='probe.cjs';form.requestSubmit();
       await wait(()=>root.textContent.includes('ui-probe')&&!harness.disabled&&!!root.querySelector('.settings-integrations-row'));
       const mcpRow=()=>Array.from(root.querySelectorAll('.settings-integrations-row')).find(r=>r.querySelector('strong')?.textContent==='ui-probe');
-      mcpRow().querySelector('button').click();await wait(()=>mcpRow()?.textContent.includes('已停用')&&!harness.disabled);
-      mcpRow().querySelector('button').click();await wait(()=>mcpRow()?.textContent.includes('已配置')&&!harness.disabled);
-      const skillForm=root.querySelectorAll('form')[1];const skillFields=skillForm.querySelectorAll('input');skillFields[0].value='ui-skill';skillFields[1].value=${JSON.stringify(source)};skillForm.requestSubmit();
+      mcpRow().querySelectorAll('button')[1].click();await wait(()=>mcpRow()?.textContent.includes('已停用')&&!harness.disabled);
+      mcpRow().querySelectorAll('button')[1].click();await wait(()=>mcpRow()?.textContent.includes('已配置')&&!harness.disabled);
+      harness.value = '__all__'; harness.dispatchEvent(new Event('change'));
+      await wait(()=>root.querySelector('.settings-mcp-overview-grid')&&!harness.disabled);
+      const mcpOverviewCard=Array.from(root.querySelectorAll('.settings-mcp-harness-card')).find(c=>c.querySelector('strong')?.textContent?.includes('Claude'));
+      if (!mcpOverviewCard || !mcpOverviewCard.textContent.includes('ui-probe')) throw Error('MCP overview missing ui-probe on Claude');
+      shell.openSettings(undefined,'skills');
+      await wait(()=>root.querySelector('.settings-skill-dropzone')&&!root.querySelector('select').disabled);
+      const [skillHarness,skillScope]=root.querySelectorAll('select');skillHarness.value='claude';skillHarness.dispatchEvent(new Event('change'));
+      await wait(()=>!skillHarness.disabled);skillScope.value='project';skillScope.dispatchEvent(new Event('change'));
+      const skillCwd=root.querySelector('.settings-integrations-controls input');skillCwd.value=${JSON.stringify(project)};skillCwd.dispatchEvent(new Event('change'));
+      await wait(()=>root.querySelector('.settings-skill-dropzone')&&!skillHarness.disabled);
+      const transfer=new DataTransfer();transfer.items.add(new File(['---\\nname: ui-skill\\ndescription: UI fixture\\n---\\n# Test\\n'],'ui-skill.md',{type:'text/markdown'}));
+      root.querySelector('.settings-skill-dropzone').dispatchEvent(new DragEvent('drop',{dataTransfer:transfer,bubbles:true,cancelable:true}));
       const skillRow=()=>Array.from(root.querySelectorAll('.settings-integrations-row')).find(r=>r.querySelector('strong')?.textContent==='ui-skill');
-      await wait(()=>skillRow()&&!harness.disabled);skillRow().querySelector('button').click();await wait(()=>skillRow()?.textContent.includes('已停用')&&!harness.disabled);
-      skillRow().querySelector('button').click();await wait(()=>skillRow()?.textContent.includes('已发现')&&!harness.disabled);
-      return {mcpSaved:true,mcpToggled:true,skillInstalled:true,skillRestored:true,scope:scope.value,text:root.textContent.slice(-2000)};
+      await wait(()=>skillRow()&&!skillHarness.disabled);skillRow().querySelector('button').click();await wait(()=>skillRow()?.textContent.includes('已停用')&&!skillHarness.disabled);
+      skillRow().querySelector('button').click();await wait(()=>skillRow()?.textContent.includes('已安装')&&!skillHarness.disabled);
+      skillHarness.value = '__all__'; skillHarness.dispatchEvent(new Event('change'));
+      await wait(()=>root.querySelector('.settings-skills-overview-grid')&&!skillHarness.disabled);
+      return {mcpSaved:true,mcpToggled:true,mcpOverviewRendered:true,skillDropped:true,skillRestored:true,overviewRendered:true,separatePages:registry.pages.map(p=>p.id),scope:skillScope.value,text:root.textContent.slice(-2000)};
     })()`);
     assert.equal(await win.webContents.executeJavaScript('document.title'), 'Harness Mix Integrations QA');
-    assert.ok(result.mcpSaved && result.skillRestored); assert.deepEqual(consoleProblems, []);
+    assert.ok(result.mcpSaved && result.mcpOverviewRendered && result.skillDropped && result.skillRestored && result.overviewRendered); assert.deepEqual(result.separatePages, ['mcp', 'skills']); assert.deepEqual(consoleProblems, []);
     const list = await runtime.integrations.list({ harnessId: 'claude', scope: 'project', cwd: project });
     assert.equal(list.servers[0].enabled, true); assert.equal(list.skills[0].enabled, true);
-    await fs.writeFile(path.join(out, 'settings.png'), (await win.webContents.capturePage()).toPNG());
+    const overviewImage = (await win.webContents.capturePage()).toPNG();
+    await fs.writeFile(path.join(out, 'overview.png'), overviewImage);
+    await fs.writeFile(path.join(out, 'settings.png'), overviewImage);
+    await fs.writeFile(path.join(out, 'skills.png'), overviewImage);
+    await win.webContents.executeJavaScript(`(async()=>{
+      const root=document.querySelector('[data-codexhost-settings-shell]').shadowRoot;
+      root.querySelector('button[data-page-id="mcp"]').click();
+      const wait=async predicate=>{for(let i=0;i<100;i++){if(predicate())return;await new Promise(r=>setTimeout(r,30));}throw Error('MCP screenshot timed out');};
+      await wait(()=>root.querySelector('select')?.options.length===17&&!root.querySelector('select').disabled);
+      const [harness,scope]=root.querySelectorAll('select');
+      scope.value='project';scope.dispatchEvent(new Event('change'));
+      const cwd=root.querySelector('.settings-integrations-controls input');cwd.value=${JSON.stringify(project)};cwd.dispatchEvent(new Event('change'));
+      harness.value='__all__';harness.dispatchEvent(new Event('change'));
+      await wait(()=>root.querySelector('.settings-mcp-overview-grid')&&root.textContent.includes('ui-probe')&&!harness.disabled);
+      const byServerBtn=Array.from(root.querySelectorAll('.settings-mcp-tabs button')).find(b=>b.textContent.includes('Server'));
+      byServerBtn?.click();
+      await wait(()=>root.querySelector('.settings-mcp-matrix-list')&&!harness.disabled);
+      const mcpMatrixCard=Array.from(root.querySelectorAll('.settings-mcp-matrix-card')).find(c=>c.querySelector('strong')?.textContent==='ui-probe');
+      if (!mcpMatrixCard) throw Error('MCP server matrix missing ui-probe card');
+    })()`);
+    await new Promise(r => setTimeout(r, 60));
+    await fs.writeFile(path.join(out, 'mcp-matrix.png'), (await win.webContents.capturePage()).toPNG());
+    await win.webContents.executeJavaScript(`(async()=>{
+      const root=document.querySelector('[data-codexhost-settings-shell]').shadowRoot;
+      const byHarnessBtn=Array.from(root.querySelectorAll('.settings-mcp-tabs button')).find(b=>b.textContent.includes('Harness'));
+      byHarnessBtn?.click();
+      const wait=async predicate=>{for(let i=0;i<100;i++){if(predicate())return;await new Promise(r=>setTimeout(r,30));}throw Error('MCP switch timed out');};
+      await wait(()=>root.querySelector('.settings-mcp-overview-grid')&&!root.querySelector('select').disabled);
+    })()`);
+    await new Promise(r => setTimeout(r, 60));
+    await fs.writeFile(path.join(out, 'mcp-overview.png'), (await win.webContents.capturePage()).toPNG());
+    await win.webContents.executeJavaScript(`(async()=>{
+      const root=document.querySelector('[data-codexhost-settings-shell]').shadowRoot;
+      const [harness,scope]=root.querySelectorAll('select');
+      harness.value='claude';harness.dispatchEvent(new Event('change'));
+      const wait=async predicate=>{for(let i=0;i<100;i++){if(predicate())return;await new Promise(r=>setTimeout(r,30));}throw Error('MCP reload timed out');};
+      await wait(()=>!harness.disabled);scope.value='project';scope.dispatchEvent(new Event('change'));
+      const cwd=root.querySelector('.settings-integrations-controls input');cwd.value=${JSON.stringify(project)};cwd.dispatchEvent(new Event('change'));
+      await wait(()=>root.textContent.includes('ui-probe')&&!harness.disabled);
+    })()`);
+    await fs.writeFile(path.join(out, 'mcp.png'), (await win.webContents.capturePage()).toPNG());
+    await win.webContents.executeJavaScript(`(async()=>{
+      const root=document.querySelector('[data-codexhost-settings-shell]').shadowRoot;
+      const mcpRow=Array.from(root.querySelectorAll('.settings-integrations-row')).find(r=>r.querySelector('strong')?.textContent?.includes('ui-probe'));
+      mcpRow.querySelector('button').click();
+      const wait=async predicate=>{for(let i=0;i<100;i++){if(predicate())return;await new Promise(r=>setTimeout(r,30));}throw Error('MCP editor timed out');};
+      await wait(()=>!root.querySelector('.settings-mcp-editor').hidden);
+    })()`);
+    await fs.writeFile(path.join(out, 'mcp-editor.png'), (await win.webContents.capturePage()).toPNG());
     await fs.writeFile(path.join(out, 'report.json'), JSON.stringify(result, null, 2));
     console.log(`Integrations rendered UI -> typed client -> NativeProtocol -> real files PASS: ${out}`);
   } finally { win.destroy(); app.quit(); }

package/scripts/native-protocol-test.cjs

@@ -326,7 +326,108 @@ async function main() {
     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');
+
+    // 消息排队（thread/queue/add, list, update, reorder, delete, start）能力验证
+    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 });
+    const q1 = await bridge.request('thread/queue/add', {
+      threadId: qThreadId,
+      input: [{ type: 'text', text: '排队补充需求 1' }],
+      clientUserMessageId: 'client-msg-1',
+    });
+    assert.equal(typeof q1.queuedSubmission.id, 'string');
+    assert.equal(q1.queuedSubmission.clientUserMessageId, 'client-msg-1');
+    assert.equal(events.at(-1)?.method, 'thread/queue/changed');
+    assert.equal(events.at(-1)?.params?.threadId, qThreadId);
+
+    const q2 = await bridge.request('thread/queue/add', {
+      threadId: qThreadId,
+      input: [{ type: 'text', text: '排队补充需求 2' }],
+      clientUserMessageId: 'client-msg-2',
+    });
+    let qList = await bridge.request('thread/queue/list', { threadId: qThreadId });
+    assert.equal(qList.data.length, 2);
+    assert.equal(qList.data[0].id, q1.queuedSubmission.id);
+    assert.equal(qList.data[1].id, q2.queuedSubmission.id);
+
+    // 更新排队项
+    const updated = await bridge.request('thread/queue/update', {
+      threadId: qThreadId,
+      queuedSubmissionId: q1.queuedSubmission.id,
+      input: [{ type: 'text', text: '更新后的补充需求 1' }],
+    });
+    assert.equal(updated.queuedSubmission.input[0].text, '更新后的补充需求 1');
+
+    // 重排序
+    await bridge.request('thread/queue/reorder', {
+      threadId: qThreadId,
+      queuedSubmissionIds: [q2.queuedSubmission.id, q1.queuedSubmission.id],
+    });
+    qList = await bridge.request('thread/queue/list', { threadId: qThreadId });
+    assert.equal(qList.data[0].id, q2.queuedSubmission.id);
+    assert.equal(qList.data[1].id, q1.queuedSubmission.id);
+
+    // 删除排队项
+    const del = await bridge.request('thread/queue/delete', {
+      threadId: qThreadId,
+      queuedSubmissionId: q2.queuedSubmission.id,
+    });
+    assert.equal(del.deleted, true);
+    qList = await bridge.request('thread/queue/list', { threadId: qThreadId });
+    assert.equal(qList.data.length, 1);
+    assert.equal(qList.data[0].id, q1.queuedSubmission.id);
+
+    // 空闲状态启动排队消息
+    const startedQ = await bridge.request('thread/queue/start', {
+      threadId: qThreadId,
+      queuedSubmissionId: q1.queuedSubmission.id,
+    });
+    assert.equal(typeof startedQ.turn?.id, 'string');
+    assert.deepEqual(await bridge.request('thread/queue/list', { threadId: qThreadId }), { data: [], nextCursor: null });
+
+    // 运行中打断执行排队消息（中途补充并打断执行）
+    let releaseHold;
+    const holdGate = new Promise(resolve => { releaseHold = resolve; });
+    const holdAdapter = {
+      manifest: { id: 'hold-adapter', name: 'Hold', capabilities: { streaming: true, models: true, resume: true } },
+      async open() { return {}; },
+      async send(session, text, { emit }) {
+        if (text.includes('长任务')) {
+          await holdGate;
+        } else {
+          emit({ kind: 'completed', finalAnswer: true });
+        }
+      },
+      async cancel() { releaseHold(); },
+      async close() {},
+    };
+    runtime.adapters.set('hold-adapter', holdAdapter);
+    runtime.status['hold-adapter'] = { available: true };
+    const steerThread = await bridge.request('thread/start', { cwd: root, model: routeModel('hold-adapter') });
+    const steerThreadId = steerThread.thread.id;
+    // 启动初始任务，使其进入运行中状态
+    const initTurn = await bridge.request('turn/start', {
+      threadId: steerThreadId,
+      input: [{ type: 'text', text: '长任务运行中...' }],
+    });
+    assert.equal(runtime.execution.isRunning(steerThreadId), true);
+    // 运行时添加排队补充
+    const steerQueue = await bridge.request('thread/queue/add', {
+      threadId: steerThreadId,
+      input: [{ type: 'text', text: '中途打断补充并立即执行' }],
+    });
+    assert.equal(typeof steerQueue.queuedSubmission.id, 'string');
+    // 执行 thread/queue/start：打断当前任务并立即执行补充内容
+    const midTurnStart = await bridge.request('thread/queue/start', {
+      threadId: steerThreadId,
+      queuedSubmissionId: steerQueue.queuedSubmission.id,
+    });
+    assert.notEqual(midTurnStart.turn.id, initTurn.turn.id, '排队消息中途启动已成功打断并派生新 Turn');
+    releaseHold();
+    await wait(() => !runtime.execution.isRunning(steerThreadId));
+
+    console.log('PASS: native protocol, external steering, command execution, message queue and Usage projection');
   } finally { bridge.close(); await runtime.close(); }
 }
 main().catch(error => { console.error(error); process.exitCode = 1; });

package/scripts/native-sidebar-test.cjs

@@ -21,6 +21,13 @@ assert.deepEqual(merged.data.map(t => t.id), ['official', 'external']);
 assert.equal(merged.nextCursor, 'next');
 assert.equal(mergeThreadPage(page, [thread], { cursor: 'next' }, t => t), page);
 
+const archivedThread = { id: 'archived-ext', archived: true, createdAt: 15 };
+const pageWithArchived = { data: [{ id: 'official', createdAt: 20 }, archivedThread], nextCursor: null };
+const mergedWithoutArchived = mergeThreadPage(pageWithArchived, [archivedThread], { archived: false }, t => t);
+assert.deepEqual(mergedWithoutArchived.data.map(t => t.id), ['official']);
+const mergedWithArchived = mergeThreadPage({ data: [{ id: 'official-archived', archived: true, createdAt: 20 }, archivedThread], nextCursor: null }, [archivedThread], { archived: true }, t => t);
+assert.deepEqual(mergedWithArchived.data.map(t => t.id), ['official-archived', 'archived-ext']);
+
 const root = fs.mkdtempSync(path.resolve('output/native-runtime-cache-test-'));
 const resources = path.join(root, 'resources');
 const cache = path.join(root, 'cache');