@harness-mix/cli 0.1.3 → 0.1.5

package/src/native-ui/renderer-extension/src/settings/integrations-page.ts

@@ -0,0 +1,102 @@
+import type { RendererSettingsPageDefinition, RendererSettingsPageMountContext } from './core.js';
+import type { RendererSettingsMessages } from './localization.js';
+import type { RendererIntegrationsClient, IntegrationSnapshot, IntegrationScope } from '../renderer-integrations-client.js';
+
+export function createIntegrationsSettingsPage(messages: RendererSettingsMessages, getClient: () => RendererIntegrationsClient | null): RendererSettingsPageDefinition {
+  const zh = messages.locale === 'zh-CN';
+  const tr = (cn: string, en: string) => zh ? cn : en;
+  return Object.freeze({
+    id: 'integrations', label: 'MCP / Skills', icon: 'connections',
+    mount(context: RendererSettingsPageMountContext) {
+      const { content } = context;
+      const lifecycle = { signal: context.signal, runLatest: context.runLatest, get disposed() { return context.signal.aborted; } };
+      const doc = content.ownerDocument;
+      const el = <K extends keyof HTMLElementTagNameMap>(tag: K, text = '') => { const node = doc.createElement(tag); node.textContent = text; return node; };
+      const title = el('h2', 'MCP / Skills');
+      const note = el('p', tr('为每个 Harness 配置工具与技能。变更在下次打开原生会话时生效；正在运行的会话保持当前配置。', 'Configure tools and skills per Harness. Changes apply the next time a native session opens; running sessions keep their configuration.'));
+      note.className = 'settings-page-description';
+      const controls = el('div'); controls.className = 'settings-integrations-controls';
+      const harness = el('select'); harness.setAttribute('aria-label', 'Harness');
+      const level = el('select'); level.setAttribute('aria-label', tr('作用范围', 'Scope'));
+      for (const [value, label] of [['global', tr('全局', 'Global')], ['project', tr('项目', 'Project')]]) { const option = el('option', label); option.value = value!; level.append(option); }
+      const cwd = el('input'); cwd.placeholder = tr('项目绝对路径', 'Absolute project path'); cwd.setAttribute('aria-label', cwd.placeholder); cwd.hidden = true;
+      const body = el('div'); body.className = 'settings-integrations-body';
+      const status = el('p'); status.setAttribute('role', 'status'); status.setAttribute('aria-live', 'polite');
+      let busy = false;
+      const button = (label: string, action: () => void) => { const b = el('button', label); b.type = 'button'; b.className = 'settings-command-button settings-command-button--secondary'; b.addEventListener('click', action, { signal: lifecycle.signal }); return b; };
+      const input = (): IntegrationScope => ({ harnessId: harness.value, scope: level.value === 'project' ? 'project' : 'global', ...(level.value === 'project' ? { cwd: cwd.value.trim() } : {}) });
+      const fail = (error: unknown) => { status.textContent = error instanceof Error ? error.message : String(error); status.setAttribute('role', 'alert'); };
+      const client = () => { const c = getClient(); if (!c) throw new Error(tr('Host 尚未连接，请连接后刷新。', 'Host is not connected. Connect and refresh.')); return c; };
+      const setBusy = (value: boolean) => { busy = value; for (const node of content.querySelectorAll<HTMLButtonElement | HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>('button, input, select, textarea')) node.disabled = value || node.dataset.readonly === 'true'; };
+      const refresh = async () => {
+        if (busy || lifecycle.disposed) return;
+        setBusy(true); status.textContent = tr('正在读取…', 'Loading…');
+        await lifecycle.runLatest(() => client().listIntegrations(input()), { success: data => { render(data); status.textContent = ''; }, failure: fail });
+        if (!lifecycle.disposed) setBusy(false);
+      };
+      const mutate = async (operation: (c: RendererIntegrationsClient, selected: IntegrationScope) => Promise<unknown>) => {
+        if (busy) return;
+        const selected = input(); setBusy(true);
+        try { await operation(client(), selected); if (!lifecycle.disposed) { setBusy(false); await refresh(); status.textContent = tr('已保存，下次打开原生会话时生效。', 'Saved. Applies on the next native session open.'); } }
+        catch (error) { if (!lifecycle.disposed) { setBusy(false); fail(error); } }
+      };
+      const field = (form: HTMLElement, label: string, node: HTMLElement) => { const wrap = el('label', label); wrap.className = 'settings-integrations-field'; wrap.append(node); form.append(wrap); };
+      const render = (snapshot: IntegrationSnapshot) => {
+        body.replaceChildren();
+        body.append(el('h3', 'MCP'));
+        for (const native of snapshot.native) {
+          const row = el('section'); row.className = 'settings-integrations-row';
+          row.append(el('strong', `${tr('原生报告', 'Native report')} · ${native.name || native.sessionId} · ${native.status}`), el('code', native.tools.join(', ')));
+          body.append(row);
+        }
+        body.append(el('p', snapshot.mcpSupported ? tr('本页管理的 stdio 服务会传入原生 Harness。保留原有 MCP 配置；认证由原生环境管理。', 'Managed stdio servers are passed to the native Harness. Existing MCP configuration is retained; authentication stays in the native environment.') : tr('此 Harness 尚无已接入的原生 MCP 配置接口。', 'No supported native MCP configuration interface for this Harness.')));
+        for (const server of snapshot.servers) {
+          const row = el('section'); row.className = 'settings-integrations-row';
+          const detail = el('div');
+          detail.append(el('strong', server.name), el('p', `${server.scope === 'global' ? tr('全局', 'Global') : tr('项目', 'Project')} · ${!server.effective ? tr('被项目配置覆盖', 'Overridden by project') : !server.enabled ? tr('已停用', 'Disabled') : server.appliedSessions ? tr(`已传入 ${server.appliedSessions} 个会话（连接状态未报告）`, `Passed to ${server.appliedSessions} sessions (connection unreported)`) : tr('已配置，尚未传入会话', 'Configured; not yet passed to a session')}`), el('code', `${server.command} ${JSON.stringify(server.args)}`));
+          row.append(detail);
+          if (server.editable) {
+            row.append(button(server.enabled ? tr('停用', 'Disable') : tr('启用', 'Enable'), () => { void mutate((c, selected) => c.saveMcp({ ...selected, server: { name: server.name, command: server.command, args: server.args, enabled: !server.enabled } })); }),
+              button(tr('编辑', 'Edit'), () => { name.value = server.name; command.value = server.command; args.value = JSON.stringify(server.args, null, 2); name.focus(); }),
+              button(tr('移除配置', 'Remove'), () => { void mutate((c, selected) => c.removeMcp({ ...selected, id: server.id })); }));
+          }
+          body.append(row);
+        }
+        const form = el('form'); form.className = 'settings-integrations-form';
+        const name = el('input'); name.required = true; name.pattern = '[a-zA-Z0-9](?:[a-zA-Z0-9_]|-){0,63}';
+        const command = el('input'); command.required = true; command.placeholder = tr('可执行文件，如 node', 'Executable, e.g. node');
+        const args = el('textarea'); args.value = '[]'; args.rows = 3;
+        if (snapshot.mcpSupported) {
+          field(form, tr('服务名称（同名保存即更新）', 'Server name (save the same name to update)'), name);
+          field(form, tr('可执行文件', 'Executable'), command); field(form, tr('参数（JSON 字符串数组；不要填写密钥）', 'Arguments (JSON string array; no credentials)'), args);
+          const save = button(tr('保存 MCP', 'Save MCP'), () => {}); save.type = 'submit'; form.append(save);
+          form.addEventListener('submit', event => { event.preventDefault(); try { const parsed: unknown = JSON.parse(args.value); if (!Array.isArray(parsed) || !parsed.every(a => typeof a === 'string')) throw new Error(tr('参数必须是字符串数组', 'Arguments must be a string array')); const server = { name: name.value.trim(), command: command.value.trim(), args: parsed as string[], enabled: true }; void mutate((c, selected) => c.saveMcp({ ...selected, server })); } catch (error) { fail(error); } }, { signal: lifecycle.signal });
+          body.append(form);
+        }
+        body.append(el('h3', 'Skills'), el('p', snapshot.skillsSupported ? tr('从原生技能目录发现，不代表当前会话已加载。停用会保留文件；共享目录的变更会影响所有读取该目录的 Harness。', 'Discovered in native skill directories, not necessarily loaded in the current session. Disabling retains files. Changes to shared directories affect every Harness that reads them.') : tr('此 Harness 的原生技能目录尚未确认，暂不写入。', 'Native skill directories are not yet verified for this Harness.')));
+        for (const skill of snapshot.skills) {
+          const row = el('section'); row.className = 'settings-integrations-row';
+          const detail = el('div'); detail.append(el('strong', skill.name), el('p', skill.enabled ? tr('已发现 · 加载状态未报告', 'Discovered · load status unreported') : tr('已停用 · 文件已保留', 'Disabled · files retained')), el('code', skill.path)); row.append(detail);
+          if (skill.writable) row.append(button(skill.enabled ? tr('停用', 'Disable') : tr('恢复', 'Restore'), () => { void mutate((c, selected) => c.changeSkill({ ...selected, name: skill.name, root: skill.root, action: skill.enabled ? 'disable' : 'enable' })); }));
+          else row.append(el('span', tr('链接目录，只读', 'Linked directory, read-only')));
+          body.append(row);
+        }
+        if (snapshot.skillsSupported) {
+          const install = el('form'); install.className = 'settings-integrations-form';
+          const source = el('input'); source.required = true; source.placeholder = tr('包含 SKILL.md 的本地目录', 'Local directory containing SKILL.md');
+          const skillName = el('input'); skillName.required = true;
+          field(install, tr('技能名称', 'Skill name'), skillName); field(install, tr('源目录绝对路径', 'Absolute source directory'), source);
+          const save = button(tr('安装到当前 Harness', 'Install for this Harness'), () => {}); save.type = 'submit'; install.append(save);
+          install.addEventListener('submit', event => { event.preventDefault(); const change = { name: skillName.value.trim(), source: source.value.trim(), action: 'install' as const }; void mutate((c, selected) => c.changeSkill({ ...selected, ...change })); }, { signal: lifecycle.signal }); body.append(install);
+        }
+      };
+      const reload = button(tr('刷新', 'Refresh'), () => { void refresh(); });
+      controls.append(harness, level, cwd, reload); content.append(title, note, controls, status, body);
+      harness.addEventListener('change', () => { void refresh(); }, { signal: lifecycle.signal });
+      level.addEventListener('change', () => { cwd.hidden = level.value !== 'project'; body.replaceChildren(); if (!cwd.hidden && !cwd.value) { cwd.focus(); status.textContent = tr('填写项目路径，然后刷新。', 'Enter the project path, then refresh.'); } else void refresh(); }, { signal: lifecycle.signal });
+      cwd.addEventListener('change', () => { void refresh(); }, { signal: lifecycle.signal });
+      void lifecycle.runLatest(() => client().integrationCatalog(), { success: data => { for (const item of data.harnesses) { const option = el('option', `${item.name}${item.available ? '' : tr(' · 未就绪', ' · not ready')}`); option.value = item.id; harness.append(option); } void refresh(); }, failure: fail });
+      return undefined;
+    },
+  });
+}

package/src/native-ui/renderer-extension/src/settings/localization.ts

@@ -88,7 +88,12 @@ export interface RendererSettingsMessages {
   readonly accountDeleteFailed: string;
   readonly accountActive: string;
   readonly accountUse: string;
-  readonly accountSignIn: string;
+  readonly accountSignIn: string;
+  readonly accountSignOut: string;
+  readonly accountSignOutConfirm: string;
+  readonly accountSigningOut: string;
+  readonly accountSignedOut: string;
+  readonly accountSignOutFailed: string;
   readonly accountSigningIn: string;
   readonly accountDeviceCodePrerequisite: string;
   readonly accountVerificationDescription: string;
@@ -299,9 +304,9 @@ const ENGLISH_MESSAGES: RendererSettingsMessages = Object.freeze({
   sessionImportRetrying: "Opening...",
   connectionsDescription:
     "View runtime status by Host. Select an item to inspect details or complete its setup.",
-  accountsDescription: "Choose the default account for new Codex tasks and check account limits.",
-  accountTaskHint:
-    "Existing tasks keep the account they were created with. Multi-account is currently available for Codex.",
+  accountsDescription: "Manage isolated native Codex accounts and compare each account's live limits.",
+  accountTaskHint:
+    "Signing in or switching accounts does not affect tasks already running. New tasks use the selected account.",
   accountConnected: "Connected accounts",
   accountDefaultBadge: "Default",
   accountAdd: "Add Account",
@@ -327,7 +332,12 @@ const ENGLISH_MESSAGES: RendererSettingsMessages = Object.freeze({
   accountDeleteFailed: "Could not delete the Account.",
   accountActive: "Default",
   accountUse: "Set as default",
-  accountSignIn: "Sign in",
+  accountSignIn: "Sign in",
+  accountSignOut: "Sign out",
+  accountSignOutConfirm: "Sign out of the current official Codex account?",
+  accountSigningOut: "Signing out of official Codex...",
+  accountSignedOut: "Signed out of official Codex.",
+  accountSignOutFailed: "Could not sign out of official Codex.",
   accountSigningIn: "Starting device sign-in...",
   accountDeviceCodePrerequisite:
     "Before signing in, enable “Enable device code authorization for Codex” in Web Settings → Account security & sign-in.",
@@ -498,9 +508,10 @@ const ENGLISH_MESSAGES: RendererSettingsMessages = Object.freeze({
   aboutOpenSource: "Harness Mix is an open-source project. The source code is available at:",
   aboutStarCallout: "⭐ If this project helps you, please give us a Star! ⭐",
   aboutRepository: "Open-source repository",
-  pageLabels: Object.freeze({
-    connections: "Connections",
-    accounts: "Accounts",
+  pageLabels: Object.freeze({
+    connections: "Connections",
+    accounts: "Accounts",
+    integrations: 'MCP / Skills',
     "session-import": "Session Import",
     updates: "Updates",
     about: "About",
@@ -554,8 +565,8 @@ const CHINESE_MESSAGES: RendererSettingsMessages = Object.freeze({
   sessionImportRetryOpen: "重试打开",
   sessionImportRetrying: "正在打开……",
   connectionsDescription: "按 Host 查看运行时状态。选择一项，在右侧检查详情或完成配置。",
-  accountsDescription: "选择新建 Codex 任务的默认账号，并查看各账号额度。",
-  accountTaskHint: "切换默认账号不会影响已开始的任务。目前仅支持 Codex 多账号。",
+  accountsDescription: "管理相互隔离的原生 Codex 账号，并对比每个账号的实时额度。",
+  accountTaskHint: "登录或切换账号不会影响已开始的任务；新任务使用当前选中的账号。",
   accountConnected: "已连接账号",
   accountDefaultBadge: "默认",
   accountAdd: "添加账号",
@@ -581,7 +592,12 @@ const CHINESE_MESSAGES: RendererSettingsMessages = Object.freeze({
   accountDeleteFailed: "删除账号失败。",
   accountActive: "默认账号",
   accountUse: "设为默认",
-  accountSignIn: "登录",
+  accountSignIn: "登录",
+  accountSignOut: "退出登录",
+  accountSignOutConfirm: "确定退出当前官方 Codex 账号吗？",
+  accountSigningOut: "正在退出官方 Codex...",
+  accountSignedOut: "已退出官方 Codex。",
+  accountSignOutFailed: "退出官方 Codex 失败。",
   accountSigningIn: "正在启动设备登录...",
   accountDeviceCodePrerequisite:
     "登录前，请先在 Web 端的“设置 → 账号安全与登录”中开启“为 Codex 启用设备代码授权”。",
@@ -750,8 +766,9 @@ const CHINESE_MESSAGES: RendererSettingsMessages = Object.freeze({
   aboutRepository: "开源仓库",
   pageLabels: Object.freeze({
     connections: "连接",
-    accounts: "账号",
-    "session-import": "会话导入",
+    accounts: "账号",
+    integrations: 'MCP / Skills',
+    "session-import": "会话导入",
     updates: "更新",
     about: "关于",
   }),

package/src/native-ui/renderer-extension/src/settings/pages.ts

@@ -26,7 +26,9 @@ import {
   type RendererSessionImportClient,
   type RendererImportedThreadOpener,
 } from "./session-import-page.js";
-import { createReleaseNotesElement } from "./release-notes.js";
+import { createReleaseNotesElement } from "./release-notes.js";
+import { createIntegrationsSettingsPage } from './integrations-page.js';
+import type { RendererIntegrationsClient } from '../renderer-integrations-client.js';
 import { createAccountsSettingsPage, type RendererCodexAccountClient } from "./accounts-page.js";
 
 export type {
@@ -71,7 +73,8 @@ function windowsInstallerDownloadUrl(window: Window | null | undefined, version:
 
 export const DEFAULT_RENDERER_SETTINGS_PAGE_IDS = [
   "connections",
-  "accounts",
+  "accounts",
+  "integrations",
   "session-import",
   "updates",
   "about",
@@ -79,11 +82,12 @@ export const DEFAULT_RENDERER_SETTINGS_PAGE_IDS = [
 
 export type DefaultRendererSettingsPageId = (typeof DEFAULT_RENDERER_SETTINGS_PAGE_IDS)[number];
 
-export interface RendererUpdateClient {
-  checkUpdate(): Promise<UpdateCheckResult>;
-  startUpdate(): Promise<UpdateStartResult>;
-  readUpdateStatus(): Promise<UpdateStatusResult>;
-}
+export interface RendererUpdateClient {
+  checkUpdate(): Promise<UpdateCheckResult>;
+  startUpdate(): Promise<UpdateStartResult>;
+  readUpdateStatus(): Promise<UpdateStatusResult>;
+  readCurrentVersion?(): Promise<{ version: string }>;
+}
 
 function panelIconName(view: string): RendererSettingsIconName {
   if (view === "failed" || view === "error") return "alert";
@@ -154,7 +158,10 @@ function formatUpdateBytes(value: number): string {
   return `${scaled.toFixed(scaled >= 10 ? 0 : 1)} ${unit}`;
 }
 
-export function aboutPage(messages: RendererSettingsMessages): RendererSettingsPageDefinition {
+export function aboutPage(
+  messages: RendererSettingsMessages,
+  getClient: () => RendererUpdateClient | null = () => null,
+): RendererSettingsPageDefinition {
   return Object.freeze({
     id: "about",
     label: messages.pageLabels.about,
@@ -177,7 +184,7 @@ export function aboutPage(messages: RendererSettingsMessages): RendererSettingsP
       versionRow.className = "settings-about-version-row";
       const versionBadge = document.createElement("span");
       versionBadge.className = "settings-about-version-badge";
-      versionBadge.textContent = "v0.1.2";
+      versionBadge.textContent = "v…";
       const checkUpdateBtn = document.createElement("button");
       checkUpdateBtn.type = "button";
       checkUpdateBtn.className = "settings-command-button settings-command-button--secondary";
@@ -217,9 +224,27 @@ export function aboutPage(messages: RendererSettingsMessages): RendererSettingsP
         repositoryUrl,
       );
       repositorySection.append(openSource, repository);
-      panel.append(product, tagline, versionRow, introduction, starCallout, repositorySection);
-      context.content.append(heading, panel);
-      return undefined;
+      panel.append(product, tagline, versionRow, introduction, starCallout, repositorySection);
+      context.content.append(heading, panel);
+      const client = getClient();
+      const readVersion = client?.readCurrentVersion
+        ? () => client.readCurrentVersion!()
+        : client
+          ? () => client.checkUpdate().then(({ currentVersion }) => ({ version: currentVersion }))
+          : null;
+      if (readVersion) {
+        void context.runLatest(readVersion, {
+          success(result) {
+            versionBadge.textContent = `v${result.version}`;
+          },
+          failure() {
+            versionBadge.textContent = "v—";
+          },
+        });
+      } else {
+        versionBadge.textContent = "v—";
+      }
+      return undefined;
     },
   });
 }
@@ -597,15 +622,17 @@ export function createDefaultRendererSettingsPages(
   getDiagnostics: () => RendererConnectionDiagnostics | null = () => null,
   getAccountClient: () => RendererCodexAccountClient | null = () => null,
   getSessionImportClient: () => RendererSessionImportClient | null = () => null,
-  openImportedThread: RendererImportedThreadOpener = () =>
-    Promise.reject(new Error("Imported Thread navigation is unavailable")),
+  openImportedThread: RendererImportedThreadOpener = () =>
+    Promise.reject(new Error("Imported Thread navigation is unavailable")),
+  getIntegrationsClient: () => RendererIntegrationsClient | null = () => null,
 ): readonly RendererSettingsPageDefinition[] {
   return Object.freeze([
     createConnectionsSettingsPage(messages, getDiagnostics),
-    createAccountsSettingsPage(messages, getAccountClient),
+    createAccountsSettingsPage(messages, getAccountClient),
+    createIntegrationsSettingsPage(messages, getIntegrationsClient),
     createSessionImportSettingsPage(messages, getSessionImportClient, openImportedThread),
     updatesPage(messages, getUpdateClient),
-    aboutPage(messages),
+    aboutPage(messages, getUpdateClient),
   ]);
 }
 
@@ -615,7 +642,8 @@ export function createDefaultRendererSettingsRegistry(
   getDiagnostics: () => RendererConnectionDiagnostics | null = () => null,
   getAccountClient: () => RendererCodexAccountClient | null = () => null,
   getSessionImportClient: () => RendererSessionImportClient | null = () => null,
-  openImportedThread?: RendererImportedThreadOpener,
+  openImportedThread?: RendererImportedThreadOpener,
+  getIntegrationsClient?: () => RendererIntegrationsClient | null,
 ): RendererSettingsPageRegistry {
   return createRendererSettingsPageRegistry(
     createDefaultRendererSettingsPages(
@@ -624,7 +652,8 @@ export function createDefaultRendererSettingsRegistry(
       getDiagnostics,
       getAccountClient,
       getSessionImportClient,
-      openImportedThread,
+      openImportedThread,
+      getIntegrationsClient,
     ),
   );
 }

package/src/native-ui/renderer-extension/src/settings/shell.css

@@ -2236,3 +2236,16 @@ button {
 .settings-install-steps li {
   margin-bottom: 2px;
 }
+/* MCP / Skills share the existing settings shell and its theme. */
+.settings-integrations-controls { display: flex; flex-wrap: wrap; gap: 10px; align-items: center; margin: 18px 0; }
+.settings-integrations-controls input { flex: 1; min-width: 180px; }
+.settings-integrations-controls input[hidden] { display: none; }
+.settings-integrations-controls select, .settings-integrations-controls input,
+.settings-integrations-field input, .settings-integrations-field textarea { box-sizing: border-box; padding: 8px 10px; border: 1px solid var(--border, #8885); border-radius: 7px; color: inherit; background: transparent; font: inherit; }
+.settings-integrations-body p { font-size: 12px; line-height: 1.6; opacity: .8; }
+.settings-integrations-row { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; border: 1px solid var(--border, #8885); padding: 14px; margin: 10px 0; border-radius: 10px; }
+.settings-integrations-row > div { flex: 1; min-width: 180px; }
+.settings-integrations-row code { display: block; overflow-wrap: anywhere; font-size: 11px; }
+.settings-integrations-form { display: grid; gap: 12px; margin: 16px 0 28px; }
+.settings-integrations-field { display: grid; gap: 6px; font-size: 12px; }
+.settings-integrations-form > button { justify-self: start; }

package/src/native-ui/renderer-extension/test/renderer-agent-picker.test.ts

@@ -79,7 +79,7 @@ describe("Renderer Agent picker presentation", () => {
           isDefault: false,
         },
       ),
-    ).toBe("Agent: Codex · reviewer@example.com (locked)");
+    ).toBe("Agent: Codex（官方原生） · reviewer@example.com (locked)");
     expect(rendererAgentPickerTooltip({ agent: "claude-code", phase: "locked" }, undefined)).toBe(
       "Agent: Claude Code (locked)",
     );
@@ -94,7 +94,7 @@ describe("Renderer Agent picker presentation", () => {
         "grok",
       ]),
     ).toEqual({
-      label: "Codex",
+      label: "Codex（官方原生）",
       triggerDisabled: false,
       nativeModelHidden: false,
       optionDisabled: { codex: false, pi: true, "claude-code": true, grok: true },
@@ -107,27 +107,58 @@ describe("Renderer Agent picker presentation", () => {
     expect(
       rendererAgentPickerView({ agent: "codex", phase: "draft" }, "ready", false, ["codex"], {}, 2),
     ).toMatchObject({
-      label: "Codex",
+      label: "Codex（官方原生）",
       triggerDisabled: false,
       optionDisabled: { codex: false },
     });
   });
 
-  it("hides the native Model for an external Agent and locks submitted selection", () => {
+  it("turns a submitted external Agent picker into a Harness handoff picker", () => {
     expect(
-      rendererAgentPickerView({ agent: "pi", phase: "locked" }, "ready", false, ["codex", "pi"], {
-        pi: "ready",
-      }),
+      rendererAgentPickerView(
+        { agent: "pi", phase: "locked" },
+        "ready",
+        false,
+        ["codex", "pi", "claude-code"],
+        { pi: "ready", "claude-code": "ready" },
+      ),
     ).toEqual({
       label: "Pi",
-      triggerDisabled: true,
+      triggerDisabled: false,
       nativeModelHidden: true,
-      optionDisabled: { codex: true, pi: true },
-      downloadVisible: { pi: false },
-      errorVisible: { pi: false },
+      optionDisabled: { codex: true, pi: true, "claude-code": false },
+      downloadVisible: { pi: false, "claude-code": false },
+      errorVisible: { pi: false, "claude-code": false },
     });
   });
 
+  it("offers another ready external Harness while keeping official Codex unavailable", () => {
+    expect(
+      rendererAgentPickerView(
+        { agent: "pi", phase: "locked" },
+        "ready",
+        false,
+        ["codex", "pi", "claude-code", "grok"],
+        { pi: "ready", "claude-code": "ready", grok: "unavailable" },
+      ),
+    ).toMatchObject({
+      triggerDisabled: false,
+      optionDisabled: { codex: true, pi: true, "claude-code": false, grok: true },
+    });
+  });
+
+  it("keeps an official Codex conversation locked because HostRuntime does not own it", () => {
+    expect(
+      rendererAgentPickerView(
+        { agent: "codex", phase: "locked" },
+        "ready",
+        false,
+        ["codex", "pi"],
+        { pi: "ready" },
+      ),
+    ).toMatchObject({ triggerDisabled: true, optionDisabled: { codex: true, pi: true } });
+  });
+
   it("hides the native Model and disables all choices while switching", () => {
     expect(
       rendererAgentPickerView({ agent: "codex", phase: "draft" }, "ready", true, ["codex", "pi"]),
@@ -145,7 +176,7 @@ describe("Renderer Agent picker presentation", () => {
         pi: "notInstalled",
       }),
     ).toEqual({
-      label: "Codex",
+      label: "Codex（官方原生）",
       triggerDisabled: false,
       nativeModelHidden: false,
       optionDisabled: { codex: false, pi: true },
@@ -160,7 +191,7 @@ describe("Renderer Agent picker presentation", () => {
         pi: "error",
       }),
     ).toEqual({
-      label: "Codex",
+      label: "Codex（官方原生）",
       triggerDisabled: false,
       nativeModelHidden: false,
       optionDisabled: { codex: false, pi: true },

package/src/native-ui/renderer-extension/test/renderer-chatgpt-context.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { CHATGPT_CONTEXT_MAX_LENGTH, buildChatGptContextDraft, redactChatGptContextText, sanitizeChatGptSourceUrl } from "../src/renderer-chatgpt-context.js";
+
+describe("ChatGPT context package", () => {
+  it("marks imported text as untrusted context", () => {
+    const draft = buildChatGptContextDraft({ title: "架构讨论", sourceUrl: "https://chatgpt.com/c/example?utm_source=secret#turn", mode: "loaded-messages", messages: [{ role: "user", text: "给一个迁移方案" }, { role: "assistant", text: "先建立共享契约" }], truncated: false });
+    expect(draft).toContain("不可信历史资料"); expect(draft).toContain("不恢复原聊天"); expect(draft).toContain("User: 给一个迁移方案"); expect(draft).toContain("Assistant: 先建立共享契约"); expect(draft).toContain("https://chatgpt.com/c/example"); expect(draft).not.toContain("utm_source");
+  });
+  it("redacts credentials and caps the package", () => {
+    expect(redactChatGptContextText("Authorization: Bearer abcdefghijklmnopqrstuvwxyz sk-abcdefghijklmnopqrstuvwxyz123456")).not.toContain("abcdefghijklmnopqrstuvwxyz");
+    const draft = buildChatGptContextDraft({ title: "大段聊天", mode: "selection", messages: [{ role: "user", text: "x".repeat(CHATGPT_CONTEXT_MAX_LENGTH * 2) }], truncated: true });
+    expect(draft.length).toBeLessThanOrEqual(CHATGPT_CONTEXT_MAX_LENGTH); expect(draft).toContain("已截断");
+  });
+  it("accepts only sanitized HTTPS ChatGPT links", () => {
+    expect(sanitizeChatGptSourceUrl("https://chatgpt.com/c/abc?token=nope#part")).toBe("https://chatgpt.com/c/abc");
+    expect(sanitizeChatGptSourceUrl("http://chatgpt.com/c/abc")).toBeUndefined(); expect(sanitizeChatGptSourceUrl("https://example.com/c/abc")).toBeUndefined();
+  });
+});

package/src/native-ui/renderer-extension/test/renderer-codex-account-state.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
-import { RendererCodexAccountState } from "../src/renderer-codex-account-state.js";
+import {
+  codexAccountRouteOverride,
+  RendererCodexAccountState,
+} from "../src/renderer-codex-account-state.js";
 import { createRendererModelClient } from "../src/renderer-model-client.js";
 
 const account = (accountId: string, active = false) => ({
@@ -17,6 +20,15 @@ function createState(sendRequest: (method: string, params: unknown) => Promise<u
 }
 
 describe("Host-scoped Codex Account state", () => {
+  it("routes isolated Accounts through Harness Mix even when they are the active default", () => {
+    const accounts = [
+      { ...account("official"), management: "native" as const },
+      { ...account("work", true), management: "isolated" as const },
+    ];
+    expect(codexAccountRouteOverride(accounts, "work")).toBe("work");
+    expect(codexAccountRouteOverride(accounts, "official")).toBeNull();
+  });
+
   it("coalesces concurrent refreshes on the same concrete client", async () => {
     const response = Promise.withResolvers<unknown>();
     const sendRequest = vi.fn(() => response.promise);

package/src/native-ui/renderer-extension/test/renderer-harness-handoff.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  HARNESS_HANDOFF_NOTE_MAX_LENGTH,
+  rendererHarnessHandoffMessages,
+} from "../src/renderer-harness-handoff.js";
+
+describe("Renderer Harness handoff", () => {
+  it("uses a bounded note compatible with the Host switch contract", () => {
+    expect(HARNESS_HANDOFF_NOTE_MAX_LENGTH).toBe(2000);
+  });
+
+  it("explains that the task and working tree stay in place", () => {
+    const messages = rendererHarnessHandoffMessages("zh-CN");
+    expect(messages.title).toBe("接力当前任务");
+    expect(messages.description).toMatch(/任务窗口.*对话记录.*文件现场/);
+    expect(messages.context).toMatch(/近期对话.*最新方案.*计划.*变更文件/);
+    expect(messages.running).toMatch(/先停止或等待完成/);
+  });
+});

package/src/native-ui/renderer-extension/test/renderer-model-client.test.ts

@@ -278,12 +278,13 @@ describe("Renderer fixed Model request client", () => {
         },
       })
       .mockResolvedValueOnce({ status: null })
-      .mockResolvedValueOnce({ threadId: "thread-1" });
+      .mockResolvedValueOnce({ threadId: "thread-1", checkpointId: "handoff-1" });
     const client = createRendererModelClient([{ addNotificationCallback, sendRequest }]);
     if (!client) throw new Error("Synthetic Model client was not created");
     expect(Object.keys(client).sort()).toEqual([
       "activateCodexAccount",
       "cancelCodexAccountLogin",
+      "changeSkill",
       "checkUpdate",
       "consumeCodexAccountResetCredit",
       "createCodexAccount",
@@ -299,18 +300,24 @@ describe("Renderer fixed Model request client", () => {
       "inspectThreadCommands",
       "inspectThreadUsage",
       "installHarness",
+      "integrationCatalog",
       "listCodexAccounts",
       "listCollaborationAgents",
       "listHarnessAccounts",
       "listHarnessPlugins",
       "listHarnessSessions",
+      "listIntegrations",
       "listSessionImportSources",
       "listThreadOwnership",
       "loginHarnessAccount",
+      "logoutCodexAccount",
       "messageThread",
       "openHarnessWebUi",
+      "readCurrentVersion",
       "readUpdateStatus",
       "refreshCodexAccounts",
+      "removeMcp",
+      "saveMcp",
       "selectThreadModel",
       "selectThreadPermissionMode",
       "selectThreadThinking",
@@ -444,7 +451,7 @@ describe("Renderer fixed Model request client", () => {
         harnessId: "claude-code",
         note: "继续补测试",
       }),
-    ).resolves.toEqual({ threadId: "thread-1" });
+    ).resolves.toEqual({ threadId: "thread-1", checkpointId: "handoff-1" });
     expect(sendRequest).toHaveBeenNthCalledWith(13, THREAD_HARNESS_SWITCH_METHOD, {
       threadId: "thread-1",
       harnessId: "claude-code",

package/src/native-ui/renderer-extension/test/settings/localization.test.ts

@@ -75,6 +75,6 @@ describe("Renderer settings localization", () => {
       createDefaultRendererSettingsPages(rendererSettingsMessages("zh-CN")).map(
         ({ label }) => label,
       ),
-    ).toEqual(["连接", "账号", "会话导入", "更新", "关于"]);
+    ).toEqual(["连接", "账号", "MCP / Skills", "会话导入", "更新", "关于"]);
   });
 });