fix(ai): avoid empty CodeBuddy tools whitelist that hides MCP tools (#4214)

Omit tools in MCP mode and explicitly disallow CodeBuddy built-ins, preserving injected MCP visibility and the skills-mode Bash whitelist.

Fixes #4214

application/state/sftp/useSftpTransfers.transferPlan.test.tsx

@@ -6,7 +6,6 @@ import { act, create, type ReactTestRenderer } from "react-test-renderer";
 import { PREFLIGHT_STAT_CONCURRENCY, PREFLIGHT_STAT_MAX_FILES, useSftpTransfers } from "./useSftpTransfers";
 import { sftpTransferCenterStore } from "../sftpTransferCenterStore";
 import type { SftpPane } from "./types";
-import { buildCacheKey } from "./sharedRemoteHostCache";
 
 for (const direction of ["download", "upload"] as const) {
 test(`failed ${direction} connection replaces Waiting with the actual error (#3698)`, async () => {
@@ -1000,86 +999,3 @@ test("no-conflict local copy awaits discovery so a late stat cannot overwrite th
     restore();
   }
 });
-
-for (const scenario of ["folder-cp", "folder-fallback", "file-cp", "different-key", "missing-key", "non-utf8"] as const) {
-  test(`fresh remote copy selects a consistent strategy: ${scenario} (#4207)`, async () => {
-    const isDirectory = scenario.startsWith("folder");
-    const source = makePane("left");
-    const target = makePane("left");
-    target.connection = { ...target.connection!, id: "target-conn", currentPath: "/usr/tmp" };
-    if (scenario === "non-utf8") target.filenameEncoding = "gb18030";
-    const key = buildCacheKey("host-1", "debian", 22, "ssh", false, "user", "sftp");
-    const keys = new Map([["remote-conn", key], ["target-conn", key]]);
-    if (scenario === "different-key") keys.set("target-conn", buildCacheKey("host-2", "debian", 22, "ssh", false, "user", "sftp"));
-    if (scenario === "missing-key") keys.delete("target-conn");
-    const ownerId = `same-host-${scenario}-4207`;
-    const streams: Array<{ resumable: boolean; sameHost?: boolean; parentTaskId?: string }> = [];
-    const copies: unknown[][] = [];
-    let listings = 0;
-    let ops: ReturnType<typeof useSftpTransfers> | undefined;
-    let renderer: ReactTestRenderer | undefined;
-    const restore = installGlobals({
-      statSftp: async (id: string) => id === "sftp-source"
-        ? { type: "file", size: 3626, lastModified: 1758000001000 }
-        : null,
-      mkdirSftp: async () => undefined,
-      sameHostCopyDirectory: async (...args: unknown[]) => {
-        copies.push(args);
-        assert.equal(sftpTransferCenterStore.getTask(args[4] as string)?.resumable, false);
-        return { success: scenario !== "folder-fallback" };
-      },
-      startStreamTransfer: async (options: { transferId: string; resumable: boolean; sameHost?: boolean; parentTaskId?: string }) => {
-        streams.push(options);
-        assert.equal(sftpTransferCenterStore.getTask(options.transferId)?.resumable, options.resumable);
-        sftpTransferCenterStore.ingestBackgroundEvent({
-          type: "completed", transferId: options.transferId,
-          transferred: 3626, totalBytes: 3626, lifecycleEpoch: 0,
-        });
-        return {};
-      },
-    });
-    function Probe() {
-      ops = useSftpTransfers({
-        ownerId,
-        getActivePane: (side) => side === "left" ? source : target,
-        getPaneByConnectionId: () => null,
-        getTabByConnectionId: () => null,
-        updateTab: () => undefined,
-        refresh: async () => undefined,
-        clearCacheForConnection: () => undefined,
-        handleSessionError: () => undefined,
-        sftpSessionsRef: { current: new Map([["remote-conn", "sftp-source"], ["target-conn", "sftp-target"]]) },
-        connectionCacheKeyMapRef: { current: keys },
-        listLocalFiles: async () => [],
-        listRemoteFiles: async () => { listings++; return source.files; },
-      });
-      return null;
-    }
-    try {
-      await act(async () => { renderer = create(React.createElement(Probe)); });
-      await act(async () => {
-        const results = await ops!.startTransfer(
-          [{ name: isDirectory ? "bt_mine" : "aops_dns_view_demo.sh", isDirectory }], "left", "right",
-        );
-        assert.equal(results[0]?.status, "completed");
-      });
-      const eligible = ["folder-cp", "folder-fallback", "file-cp"].includes(scenario);
-      const rows = sftpTransferCenterStore.getOwnerTasks(ownerId);
-      assert.ok(rows.length > 0);
-      assert.ok(rows.every(row => row.resumable === !eligible));
-      assert.equal(copies.length, isDirectory ? 1 : 0);
-      if (isDirectory) assert.deepEqual(copies[0]?.slice(0, 4), ["sftp-source", "/opt/bt_mine", "/usr/tmp/bt_mine", "auto"]);
-      assert.equal(listings, scenario === "folder-fallback" ? 1 : 0);
-      assert.equal(streams.length, scenario === "folder-cp" ? 0 : 1);
-      if (streams.length) {
-        assert.equal(streams[0].resumable, !eligible);
-        assert.equal(streams[0].sameHost, !["different-key", "missing-key"].includes(scenario) || undefined);
-        if (isDirectory) assert.ok(streams[0].parentTaskId);
-      }
-    } finally {
-      await act(async () => { renderer?.unmount(); });
-      for (const row of sftpTransferCenterStore.getOwnerTasks(ownerId)) sftpTransferCenterStore.dismiss(row.id);
-      restore();
-    }
-  });
-}

application/state/sftp/useSftpTransfers.ts

@@ -1348,17 +1348,6 @@ export const useSftpTransfers = ({
       const sourceConnectionId = options?.sourceConnectionId ?? sourcePane.connection.id;
       const batchId = crypto.randomUUID();
       const usesLegacyScp = sourcePane.connection.fileProtocol === "scp" || targetPane.connection.fileProtocol === "scp";
-      const sourceCacheKey = connectionCacheKeyMapRef.current.get(sourcePane.connection.id);
-      const targetCacheKey = connectionCacheKeyMapRef.current.get(targetPane.connection.id);
-      const encodingSafeForExec = [sourcePane.filenameEncoding, targetPane.filenameEncoding]
-        .every((encoding) => !encoding || encoding === "utf-8" || encoding === "auto");
-      // Select the existing non-resumable cp route only for newly created copies.
-      // Resume/recovery keeps its saved strategy and checkpoints. If cp fails,
-      // recursive/download+upload fallback also remains non-resumable.
-      const useSameHostCopy = !usesLegacyScp
-        && !sourcePane.connection.isLocal && !targetPane.connection.isLocal
-        && !!sourceCacheKey && sourceCacheKey === targetCacheKey
-        && encodingSafeForExec;
 
       const newTasks: TransferTask[] = [];
       const skippedResults: TransferResult[] = [];
@@ -1593,10 +1582,8 @@ export const useSftpTransfers = ({
           sourceLastModified,
           preflightStatSkipped: preflightSkippedNames.has(file.name),
           origin: "manual",
-          resumable: !usesLegacyScp && !useSameHostCopy,
-          pauseUnavailableReason: usesLegacyScp
-            ? "This server uses legacy SCP; cancel and retry from the beginning instead"
-            : useSameHostCopy ? "Same-host copies cannot be paused; cancel and retry from the beginning instead" : undefined,
+          resumable: !usesLegacyScp,
+          pauseUnavailableReason: usesLegacyScp ? "This server uses legacy SCP; cancel and retry from the beginning instead" : undefined,
           phase: file.isDirectory ? "scanning" : "transferring",
         });
       }

components/sftp/localFileDrag.interaction.test.ts

@@ -75,9 +75,6 @@ test('list hook preserves local copy/move routing, remote HTML drag, selection a
     await act(async () => root.render(React.createElement(Harness, { local: false })));
     await act(async () => right.handlePaneDrop(event()));
     assert.equal(actions.at(-1)?.kind, 'copy');
-    actions.length = 0;
-    await act(async () => left.handleEntryDrop(entries[2], event()));
-    assert.deepEqual(actions, [{ kind: 'move', args: [['/files/b.txt'], '/files/folder'] }], 'same-pane remote drag stays a move');
   } finally {
     await act(async () => root.unmount());
     clearLocalFileDrag();

domain/knownHosts.test.ts

@@ -1,11 +1,6 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 import crypto from "node:crypto";
-import { createRequire } from "node:module";
-
-const require = createRequire(import.meta.url);
-const { describeHostKey } = require("../electron/bridges/hostKeyVerifier.cjs");
-const { mintHostCertificates, legacyCertificate, sshString, sshKeygenSkip } = require("../electron/bridges/fixtures/hostCertificates.test.fixture.cjs");
 
 import type { KnownHost } from "./models";
 import {
@@ -144,55 +139,6 @@ test("fingerprintFromPublicKey returns empty string on missing input", () => {
 
 // --- Migration --------------------------------------------------------------
 
-for (const options of [
-  { type: "ed25519" },
-  { type: "rsa", bits: 2048 },
-  ...[256, 384, 521].map((bits) => ({ type: "ecdsa", bits })),
-  { type: "ed25519", sk: true },
-  { type: "ecdsa", bits: 256, sk: true },
-]) {
-  test(`renderer certificate fingerprint and migration agree with verifier: ${JSON.stringify(options)}`, { skip: sshKeygenSkip }, (t) => {
-    const { first, renewed, different } = mintHostCertificates(t, options);
-    const expected = describeHostKey(first.blob).fingerprint;
-    assert.equal(fingerprintFromPublicKey(first.line), expected);
-    assert.equal(expected, first.publicKeyFingerprint);
-    assert.equal(fingerprintFromPublicKey(renewed.line), expected);
-    assert.notEqual(fingerprintFromPublicKey(different.line), expected);
-    assert.equal(fingerprintFromPublicKey(first.plain.line), expected);
-
-    const legacy = knownHost({
-      keyType: first.keyType,
-      publicKey: first.line,
-      fingerprint: crypto.createHash("sha256").update(first.blob).digest("base64").replace(/=+$/g, ""),
-    });
-    const migrated = normalizeKnownHost(legacy);
-    assert.equal(migrated.fingerprint, expected);
-    assert.equal(migrated.keyType, first.keyType);
-    assert.equal(migrated.publicKey, first.line);
-    assert.equal(normalizeKnownHost(migrated), migrated, "migration is idempotent");
-    assert.equal(normalizeKnownHost({ ...legacy, fingerprint: undefined }).fingerprint, expected);
-    assert.equal(normalizeKnownHost({ ...legacy, keyType: "" }).keyType, first.keyType);
-    const unrelated = { ...legacy, fingerprint: "unrelated-explicit-fingerprint" };
-    assert.equal(normalizeKnownHost(unrelated), unrelated);
-    const opaque = { ...legacy, publicKey: `SHA256:${legacy.fingerprint}` };
-    assert.equal(normalizeKnownHost(opaque), opaque);
-    const fingerprintOnly = { ...legacy, publicKey: undefined };
-    assert.equal(normalizeKnownHost(fingerprintOnly), fingerprintOnly);
-  });
-}
-
-test("renderer fingerprints v00 certificates and falls back for unparseable certificates", () => {
-  const cert = legacyCertificate("ssh-rsa", ["exponent", "modulus"]);
-  assert.equal(fingerprintFromPublicKey(cert.line), describeHostKey(cert.plain).fingerprint);
-  const malformed = Buffer.concat([
-    sshString("ssh-ed25519-cert-v01@openssh.com"), sshString("nonce"), sshString(Buffer.alloc(32)),
-  ]);
-  const line = `ssh-ed25519-cert-v01@openssh.com ${malformed.toString("base64")}`;
-  const fullHash = crypto.createHash("sha256").update(malformed).digest("base64").replace(/=+$/g, "");
-  assert.equal(fingerprintFromPublicKey(line), fullHash);
-  assert.equal(fingerprintFromPublicKey(line), describeHostKey(malformed).fingerprint);
-});
-
 test("normalizeKnownHost backfills fingerprint when only publicKey is stored", () => {
   const rawKey = makeRawPublicKey("ssh-ed25519");
   const base64Body = rawKey.toString("base64");

domain/knownHosts.ts

@@ -1,5 +1,4 @@
 import type { KnownHost } from "./models";
-import { extractCertificatePublicKey } from "@/domain/sshPublicKey.shared.cjs";
 
 const normalizeHost = (value: string) => value.trim().toLowerCase();
 
@@ -133,7 +132,7 @@ export const fingerprintFromPublicKey = (publicKey: string | undefined | null):
   const parts = trimmed.split(/\s+/);
   if (parts.length >= 2 && SSH_KEY_TYPE_PREFIX.test(parts[0])) {
     const bytes = base64Decode(parts[1]);
-    if (bytes) return stripPadding(base64Encode(sha256Bytes(extractCertificatePublicKey(bytes) || bytes)));
+    if (bytes) return stripPadding(base64Encode(sha256Bytes(bytes)));
   }
 
   return stripPadding(trimmed);
@@ -146,9 +145,9 @@ const extractKeyTypeFromPublicKey = (publicKey: string | undefined | null): stri
 };
 
 /**
- * Backfill missing `fingerprint` / `keyType` and migrate full-certificate
- * fingerprints to the underlying key when the certificate body is available.
- * Returns the same reference when nothing changes so callers can skip
+ * Backfill missing `fingerprint` / `keyType` on a stored record so the host
+ * verifier can match it without falling back to the brittle re-derivation
+ * path. Returns the same reference when nothing changes so callers can skip
  * persistence writes and React re-renders.
  */
 export const normalizeKnownHost = (knownHost: KnownHost): KnownHost => {
@@ -157,17 +156,9 @@ export const normalizeKnownHost = (knownHost: KnownHost): KnownHost => {
     && knownHost.keyType.length > 0
     && knownHost.keyType !== "unknown";
 
-  const parts = knownHost.publicKey?.trim().split(/\s+/) ?? [];
-  const certBytes = /-cert-v0[01]@openssh\.com$/.test(parts[0]) && parts[1]
-    ? base64Decode(parts[1]) : null;
-  const legacyCertFingerprint = certBytes && extractCertificatePublicKey(certBytes)
-    ? stripPadding(base64Encode(sha256Bytes(certBytes))) : "";
-  const migrateCertificate = legacyCertFingerprint
-    && stripPadding((knownHost.fingerprint ?? "").replace(/^SHA256:/i, "")) === legacyCertFingerprint;
+  if (hasFingerprint && hasKeyType) return knownHost;
 
-  if (hasFingerprint && hasKeyType && !migrateCertificate) return knownHost;
-
-  const derivedFingerprint = hasFingerprint && !migrateCertificate
+  const derivedFingerprint = hasFingerprint
     ? knownHost.fingerprint!
     : fingerprintFromPublicKey(knownHost.publicKey);
   const derivedKeyType = hasKeyType

domain/sshPublicKey.shared.cjs

@@ -1,84 +0,0 @@
-"use strict";
-
-// Extract only the public-key wire blob for fingerprinting, never CA trust or
-// certificate validation. ssh2's getPublicSSH() preserves the full certificate,
-// and its internal base-type helper is not exported. Keep this byte-only helper
-// shared by Electron and the renderer so migration uses exactly the same bytes.
-// Layouts: OpenSSH PROTOCOL.certkeys (v00/v01) and PROTOCOL.u2f (SK).
-function extractCertificatePublicKey(blob) {
-  let offset = 0;
-  const view = new DataView(blob.buffer, blob.byteOffset, blob.byteLength);
-  const skip = (length) => {
-    if (offset + length > blob.length) throw new Error("Truncated SSH key");
-    offset += length;
-  };
-  const readString = () => {
-    skip(4);
-    const length = view.getUint32(offset - 4, false);
-    const start = offset;
-    skip(length);
-    return blob.subarray(start, offset);
-  };
-  const ascii = (bytes) => String.fromCharCode(...bytes);
-
-  try {
-    const typeBytes = readString();
-    if (typeBytes.length > 128) return null;
-    const match = ascii(typeBytes).match(/^(.*)-cert-v0([01])@openssh\.com$/);
-    if (!match) return null;
-    let baseType = match[1];
-    const v01 = match[2] === "1";
-    if (/^rsa-sha2-(256|512)$/.test(baseType)) baseType = "ssh-rsa";
-    if (baseType === "sk-ssh-ed25519" || baseType === "sk-ecdsa-sha2-nistp256") {
-      baseType += "@openssh.com";
-    }
-    let fields;
-    switch (baseType) {
-      case "ssh-rsa": fields = 2; break;
-      case "ssh-dss": fields = 4; break;
-      case "ssh-ed25519": fields = 1; break;
-      case "sk-ssh-ed25519@openssh.com": fields = 2; break;
-      case "sk-ecdsa-sha2-nistp256@openssh.com": fields = 3; break;
-      case "ecdsa-sha2-nistp256":
-      case "ecdsa-sha2-nistp384":
-      case "ecdsa-sha2-nistp521": fields = 2; break;
-      default: return null;
-    }
-
-    // v00 put its nonce after the constraints, not before the key material.
-    if (v01) readString();
-    const keyStart = offset;
-    for (let i = 0; i < fields; i += 1) {
-      const field = readString();
-      const isApplication = baseType.startsWith("sk-") && i === fields - 1;
-      if (!field.length && !isApplication) return null;
-      if (i === 0 && baseType.includes("ed25519") && field.length !== 32) return null;
-      if (i === 0 && baseType.includes("ecdsa")) {
-        const curve = baseType.replace(/^sk-/, "").replace(/@openssh\.com$/, "").replace(/^ecdsa-sha2-/, "");
-        if (field.length > 8 || ascii(field) !== curve) return null;
-      }
-    }
-    const keyEnd = offset;
-    // Check the outer envelope too; truncated/unsupported certificates retain
-    // their full-blob fingerprint rather than gaining an inner-key match.
-    if (v01) skip(8); // serial
-    skip(4); // host/user type
-    readString(); // key ID
-    readString(); // principals
-    skip(16); // validity
-    readString(); // critical options (v00 constraints)
-    readString(); // extensions (v00 nonce)
-    readString(); // reserved
-    if (!readString().length || !readString().length || offset !== blob.length) return null;
-
-    const result = new Uint8Array(4 + baseType.length + keyEnd - keyStart);
-    new DataView(result.buffer).setUint32(0, baseType.length, false);
-    for (let i = 0; i < baseType.length; i += 1) result[4 + i] = baseType.charCodeAt(i);
-    result.set(blob.subarray(keyStart, keyEnd), 4 + baseType.length);
-    return result;
-  } catch {
-    return null;
-  }
-}
-
-exports.extractCertificatePublicKey = extractCertificatePublicKey;

electron-builder.config.cjs

@@ -84,7 +84,6 @@ module.exports = {
         // is excluded below, so the shared TOTP runtime must be listed.
         'domain/totp.shared.cjs',
         'domain/totpPrompt.shared.cjs',
-        'domain/sshPublicKey.shared.cjs',
         'lib/**/*.cjs',
         'lib/**/*.json',
         'skills/**/*',

electron/bridges/aiBridge/sdk/codebuddyDriver.cjs

@@ -24,6 +24,21 @@ const UI_DISALLOWED_TOOLS = ["AskUserQuestion"];
 const MCP_MODE_TOOLS = [];
 const SKILLS_MODE_TOOLS = ["Bash"];
 
+// Deduped built-in catalog from @tencent-ai/agent-sdk 0.3.258 cli/product.json.
+const CODEBUDDY_BUILTIN_TOOLS = [
+  "Agent", "Bash", "PowerShell", "Glob", "Grep", "Read", "Edit", "Write",
+  "NotebookEdit", "WebFetch", "ListMcpResources", "ReadMcpResource", "WaitForMcpServers",
+  "TaskCreate", "TaskGet", "TaskUpdate", "TaskList", "WebSearch", "EnterPlanMode",
+  "ExitPlanMode", "KillShell", "TaskStop", "TaskOutput", "SlashCommand", "Skill",
+  "SkillManage", "AskUserQuestion", "AskUserForStructuredInput", "LSP", "StructuredOutput",
+  "ToolSearch", "DeferExecuteTool", "ImageGen", "ImageEdit", "VideoGen", "Artifact",
+  "ArtifactControl", "ComputerUse", "TeamCreate", "TeamDelete", "SendMessage",
+  "SendUserMessage", "EnterWorktree", "LeaveWorktree", "CronCreate", "CronDelete",
+  "CronList", "DelegateTool", "WeChatReply", "WeComReply", "PushNotification",
+  "ReportFindings", "Workflow", "Monitor", "REPL", "A2AGetAgentCard", "A2ASendMessage",
+  "A2AGetTask", "A2ACancelTask",
+];
+
 const CODEBUDDY_IMAGE_MEDIA_TYPES = new Set(["image/jpeg", "image/png", "image/gif", "image/webp"]);
 
 function isCodebuddyImageAttachment(attachment) {
@@ -261,18 +276,19 @@ function buildCodebuddyQueryOptions({
     allowDangerouslySkipPermissions: true,
     extraArgs: { "dangerously-skip-permissions": null },
     mcpServers: toSdkMcpServers(injectedMcpServers),
-    tools: builtinTools,
-    // `tools` is the built-in tool whitelist. In mcp mode it is [], so CodeBuddy
-    // built-ins stay disabled while injected Netcatty MCP tools remain visible.
-    // Do not mirror that empty list into allowedTools: the SDK treats
-    // allowedTools as an auto-approval list, and allowedTools: [] prevents MCP
-    // tool calls from running under bypassPermissions.
-    disallowedTools: [...UI_DISALLOWED_TOOLS],
+    // Block built-ins explicitly in mcp mode: tools: [] becomes --tools "",
+    // which also hides injected MCP tools in CodeBuddy CLI v2.183.0.
+    // Leave allowedTools unset: an empty auto-approval list prevents MCP tool
+    // calls from running under bypassPermissions.
+    disallowedTools: builtinTools.length > 0
+      ? [...UI_DISALLOWED_TOOLS]
+      : [...new Set([...UI_DISALLOWED_TOOLS, ...CODEBUDDY_BUILTIN_TOOLS])],
     // Keep the SDK isolated from user/project settings so local hooks, plugins,
     // or extra MCP servers cannot expand Netcatty's controlled tool boundary.
     settingSources: [],
     env,
   };
+  if (builtinTools.length > 0) options.tools = builtinTools;
   const selection = splitCodebuddyModelSelection(model);
   if (selection.model) options.model = selection.model;
   if (abortController) options.abortController = abortController;

electron/bridges/aiBridge/sdk/codebuddyDriver.test.cjs

@@ -59,15 +59,51 @@ test("buildCodebuddyQueryOptions wires SDK options in isolated mode", () => {
   assert.equal(opts.pathToCodebuddyCode, "/opt/codebuddy/bin/codebuddy");
   assert.equal(opts.abortController, ac);
   assert.equal(opts.resume, "sess-1");
-  assert.deepEqual(opts.tools, []);
-  // allowedTools must stay unset in mcp mode: tools:[] disables built-ins, while
+  assert.ok(!("tools" in opts));
   // allowedTools:[] would prevent injected Netcatty MCP tools from running.
   assert.ok(!("allowedTools" in opts));
+  assert.ok(opts.disallowedTools.includes("Bash"));
   assert.ok(opts.disallowedTools.includes("AskUserQuestion"));
   assert.equal(opts.mcpServers["netcatty-remote-hosts"].type, "stdio");
   assert.deepEqual(opts.mcpServers["netcatty-remote-hosts"].env, { NETCATTY_MCP_PORT: "1" });
 });
 
+test("mcp and default mode block built-ins while preserving injected MCP servers", () => {
+  for (const toolIntegrationMode of ["mcp", undefined]) {
+    const opts = buildCodebuddyQueryOptions({
+      toolIntegrationMode,
+      injectedMcpServers: [{ name: "netcatty", command: "/abs/electron" }],
+    });
+    assert.ok(!("tools" in opts));
+    assert.ok(!("allowedTools" in opts));
+    assert.equal(opts.permissionMode, "bypassPermissions");
+    for (const name of ["Bash", "PowerShell", "Read", "Edit", "Write", "Agent", "Skill", "AskUserQuestion"]) {
+      assert.ok(opts.disallowedTools.includes(name), `${name} must stay disabled`);
+    }
+    assert.equal(opts.mcpServers.netcatty.command, "/abs/electron");
+  }
+});
+
+test("mcp mode omits --tools under the SDK serialization rule", () => {
+  for (const toolIntegrationMode of ["mcp", undefined]) {
+    const opts = buildCodebuddyQueryOptions({ toolIntegrationMode });
+    const args = [];
+    // @tencent-ai/agent-sdk lib/transport/process-transport.js
+    if (opts.tools !== undefined) {
+      args.push("--tools", opts.tools.join(","));
+    }
+    assert.deepEqual(args, []);
+  }
+});
+
+test("skills mode keeps the Bash whitelist and UI exclusions", () => {
+  const opts = buildCodebuddyQueryOptions({ toolIntegrationMode: "skills" });
+  assert.deepEqual(opts.tools, ["Bash"]);
+  assert.deepEqual(opts.disallowedTools, ["AskUserQuestion"]);
+  assert.ok(!opts.disallowedTools.includes("Bash"));
+  assert.ok(!("allowedTools" in opts));
+});
+
 test("built-in tools are mode-aware", () => {
   assert.deepEqual(codebuddyBuiltinTools("mcp"), []);
   assert.deepEqual(codebuddyBuiltinTools(undefined), []);

electron/bridges/fixtures/hostCertificates.test.fixture.cjs

@@ -1,76 +0,0 @@
-const fs = require("node:fs");
-const path = require("node:path");
-const { execFileSync } = require("node:child_process");
-
-let sshKeygenSkip = false;
-try {
-  execFileSync("ssh-keygen", ["-h"], { stdio: "ignore" });
-} catch (error) {
-  if (error.code === "ENOENT") sshKeygenSkip = "ssh-keygen is not installed";
-}
-
-const sshString = (value) => {
-  const body = Buffer.from(value);
-  const length = Buffer.alloc(4);
-  length.writeUInt32BE(body.length);
-  return Buffer.concat([length, body]);
-};
-
-// Real local certificates, with no server/network or security-key device.
-function mintHostCertificates(t, { type = "ed25519", bits, sk = false, user = false } = {}) {
-  const dir = fs.mkdtempSync(path.join(__dirname, ".hostcert-"));
-  t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
-  const keygen = (...args) => execFileSync("ssh-keygen", ["-q", ...args], { stdio: "pipe" });
-  const ca = path.join(dir, "ca");
-  keygen("-t", "ed25519", "-N", "", "-f", ca);
-  const readKey = (file) => {
-    const line = fs.readFileSync(file, "utf8").trim();
-    const [keyType, body] = line.split(/\s+/);
-    return { line, keyType, blob: Buffer.from(body, "base64") };
-  };
-  const mint = (name, validity, serial) => {
-    const host = path.join(dir, name);
-    if (!fs.existsSync(host)) {
-      keygen("-t", type, ...(bits ? ["-b", String(bits)] : []), "-N", "", "-f", host);
-      if (sk) {
-        const plain = readKey(`${host}.pub`);
-        const keyMaterial = plain.blob.subarray(4 + plain.keyType.length);
-        const skType = `sk-${plain.keyType}@openssh.com`;
-        const blob = Buffer.concat([sshString(skType), keyMaterial, sshString("ssh:netcatty-test")]);
-        fs.writeFileSync(`${host}.pub`, `${skType} ${blob.toString("base64")}\n`);
-      }
-    }
-    keygen("-s", ca, "-I", "netcatty-hostcert", ...(user ? [] : ["-h"]),
-      "-n", "127.0.0.1", "-V", validity, "-z", String(serial), `${host}.pub`);
-    const cert = readKey(`${host}-cert.pub`);
-    const listing = execFileSync("ssh-keygen", ["-L", "-f", `${host}-cert.pub`], { encoding: "utf8" });
-    const publicKeyFingerprint = listing.match(/Public key: .* SHA256:(\S+)/)?.[1];
-    if (!publicKeyFingerprint) throw new Error("Missing ssh-keygen certificate fingerprint");
-    return { ...cert, publicKeyFingerprint, plain: readKey(`${host}.pub`) };
-  };
-  return {
-    first: mint("host", "20250101:20260101", 1),
-    renewed: mint("host", "20260101:20270101", 2),
-    different: mint("other", "20260101:20270101", 3),
-  };
-}
-
-// Legacy v00 is no longer emitted by ssh-keygen. This follows the original
-// PROTOCOL.certkeys layout: key material first, nonce after constraints.
-function legacyCertificate(keyType, keyFields) {
-  const blob = Buffer.concat([
-    sshString(`${keyType}-cert-v00@openssh.com`),
-    ...keyFields.map(sshString),
-    Buffer.from([0, 0, 0, 2]),
-    sshString("legacy"), sshString(""), Buffer.alloc(16),
-    sshString(""), sshString("nonce"), sshString(""),
-    sshString("signing key"), sshString("signature"),
-  ]);
-  return {
-    blob,
-    plain: Buffer.concat([sshString(keyType), ...keyFields.map(sshString)]),
-    line: `${keyType}-cert-v00@openssh.com ${blob.toString("base64")}`,
-  };
-}
-
-module.exports = { mintHostCertificates, legacyCertificate, sshString, sshKeygenSkip };

electron/bridges/hostKeyVerifier.cjs

@@ -1,7 +1,6 @@
 const crypto = require("node:crypto");
 const { randomUUID } = require("node:crypto");
 const { utils: sshUtils } = require("ssh2");
-const { extractCertificatePublicKey } = require("../../domain/sshPublicKey.shared.cjs");
 
 const REQUEST_TTL_MS = 2 * 60 * 1000;
 const hostKeyRequests = new Map();
@@ -66,9 +65,8 @@ const fingerprintFromPublicKey = (publicKey) => {
   const parts = trimmed.split(/\s+/);
   if (parts.length >= 2 && /^ssh-|^ecdsa-|^sk-/.test(parts[0])) {
     try {
-      const blob = Buffer.from(parts[1], "base64");
       return crypto.createHash("sha256")
-        .update(extractCertificatePublicKey(blob) || blob)
+        .update(Buffer.from(parts[1], "base64"))
         .digest("base64")
         .replace(/=+$/g, "");
     } catch {
@@ -79,16 +77,7 @@ const fingerprintFromPublicKey = (publicKey) => {
 };
 
 const getKnownHostFingerprint = (knownHost) => {
-  const stored = normalizeFingerprint(knownHost?.fingerprint);
-  const parts = knownHost?.publicKey?.trim().split(/\s+/) || [];
-  if (parts.length >= 2 && /-cert-v0[01]@openssh\.com$/.test(parts[0])) {
-    const blob = Buffer.from(parts[1], "base64");
-    // Only replace an explicit fingerprint if it is the legacy full-cert hash.
-    // Fingerprint-only records cannot be migrated without the certificate body.
-    const legacy = crypto.createHash("sha256").update(blob).digest("base64").replace(/=+$/g, "");
-    if (!stored || stored === legacy) return fingerprintFromPublicKey(knownHost.publicKey);
-  }
-  return stored
+  return normalizeFingerprint(knownHost?.fingerprint)
     || fingerprintFromPublicKey(knownHost?.publicKey);
 };
 
@@ -145,7 +134,7 @@ const classifyHostKey = ({ knownHosts = [], hostname, port = 22, keyType, finger
 const describeHostKey = (rawKey) => {
   const key = Buffer.isBuffer(rawKey) ? rawKey : Buffer.from(rawKey || "");
   const fingerprint = crypto.createHash("sha256")
-    .update(extractCertificatePublicKey(key) || key)
+    .update(key)
     .digest("base64")
     .replace(/=+$/g, "");
   let keyType = "unknown";
@@ -160,9 +149,7 @@ const describeHostKey = (rawKey) => {
   try {
     const parsed = sshUtils.parseKey(key);
     const parsedKey = Array.isArray(parsed) ? parsed[0] : parsed;
-    // Keep the presented certificate identity, even if a parser returns its
-    // base algorithm or underlying public key as metadata.
-    if (parsedKey && !(parsedKey instanceof Error) && !/-cert-v0[01]@openssh\.com$/.test(keyType)) {
+    if (parsedKey && !(parsedKey instanceof Error)) {
       keyType = parsedKey.type || keyType;
       const publicSsh = parsedKey.getPublicSSH?.();
       if (publicSsh) publicKey = publicSsh.toString("utf8");

electron/bridges/hostKeyVerifier.test.cjs

@@ -1,13 +1,11 @@
 const test = require("node:test");
 const assert = require("node:assert/strict");
 const crypto = require("node:crypto");
-const { mintHostCertificates, legacyCertificate, sshString, sshKeygenSkip } = require("./fixtures/hostCertificates.test.fixture.cjs");
 
 const {
   classifyHostKey,
   createHostVerifier,
   describeHostKey,
-  getKnownHostFingerprint,
   handleResponse,
   normalizeFingerprint,
 } = require("./hostKeyVerifier.cjs");
@@ -19,84 +17,6 @@ const makeRawPublicKey = (keyType, body = "trusted imported host key") => {
   return Buffer.concat([length, type, Buffer.from(body)]);
 };
 
-const hashKey = (blob) => crypto.createHash("sha256").update(blob).digest("base64").replace(/=+$/g, "");
-
-test("host certificate renewals trust the inner key, including legacy saved fingerprints", { skip: sshKeygenSkip }, (t) => {
-  const { first, renewed, different } = mintHostCertificates(t);
-  const original = describeHostKey(first.blob);
-  const live = describeHostKey(renewed.blob);
-  const changed = describeHostKey(different.blob);
-  assert.notDeepEqual(first.blob, renewed.blob);
-  assert.equal(original.fingerprint, first.publicKeyFingerprint);
-  assert.equal(live.fingerprint, original.fingerprint);
-  assert.notEqual(changed.fingerprint, live.fingerprint);
-  assert.equal(original.keyType, "ssh-ed25519-cert-v01@openssh.com");
-  assert.equal(original.publicKey, `${first.keyType} ${first.blob.toString("base64")}`);
-  assert.equal(describeHostKey(first.plain.blob).fingerprint, hashKey(first.plain.blob));
-
-  const stored = { id: "kh-cert", hostname: "cert.local", port: 2222, ...original };
-  const classify = (key, record = stored) => classifyHostKey({
-    knownHosts: [record], hostname: "cert.local", port: 2222, ...key,
-  });
-  assert.equal(classify(live).status, "trusted");
-  assert.equal(classify(changed).status, "changed");
-  assert.equal(classify(changed, { ...stored, keyType: "ssh-rsa" }).status, "unknown");
-
-  const legacy = { ...stored, fingerprint: hashKey(first.blob) };
-  assert.notEqual(legacy.fingerprint, live.fingerprint);
-  assert.equal(getKnownHostFingerprint(legacy), live.fingerprint);
-  assert.equal(classify(live, legacy).status, "trusted");
-  assert.equal(classify(changed, legacy).status, "changed");
-  assert.equal(classify(live, { ...legacy, publicKey: undefined }).status, "changed");
-  assert.equal(classify(live, { ...legacy, publicKey: `SHA256:${legacy.fingerprint}` }).status, "changed");
-  assert.equal(classify(live, { ...legacy, fingerprint: "unrelated-explicit-fingerprint" }).status, "changed");
-  assert.equal(classify(live, { ...legacy, fingerprint: undefined }).status, "trusted");
-
-  // Renewal is trusted on reconnect, but changing the raw certificate during
-  // an established connection must still be rejected synchronously on rekey.
-  const verifier = createHostVerifier({ hostname: stored.hostname, port: stored.port, knownHosts: [legacy] });
-  const results = [];
-  verifier(first.blob, (accepted) => results.push(accepted));
-  verifier(Buffer.from(first.blob), (accepted) => results.push(accepted));
-  verifier(renewed.blob, (accepted) => results.push(accepted));
-  assert.deepEqual(results, [true, true, false]);
-});
-
-for (const options of [
-  { type: "rsa", bits: 2048 },
-  ...[256, 384, 521].map((bits) => ({ type: "ecdsa", bits })),
-  { type: "ed25519", sk: true },
-  { type: "ecdsa", bits: 256, sk: true },
-  { type: "ed25519", user: true },
-]) {
-  test(`certificate fingerprint matches ssh-keygen for ${JSON.stringify(options)}`, { skip: sshKeygenSkip }, (t) => {
-    const { first, renewed, different } = mintHostCertificates(t, options);
-    assert.equal(describeHostKey(first.blob).fingerprint, first.publicKeyFingerprint);
-    assert.equal(describeHostKey(first.blob).fingerprint, hashKey(first.plain.blob));
-    assert.equal(describeHostKey(renewed.blob).fingerprint, first.publicKeyFingerprint);
-    assert.notEqual(describeHostKey(different.blob).fingerprint, first.publicKeyFingerprint);
-  });
-}
-
-test("v00 certificates extract the key before the nonce", () => {
-  for (const [type, fields] of [["ssh-rsa", ["exponent", "modulus"]], ["ssh-dss", ["p", "q", "g", "y"]]]) {
-    const cert = legacyCertificate(type, fields);
-    assert.equal(describeHostKey(cert.blob).fingerprint, hashKey(cert.plain));
-    assert.equal(describeHostKey(cert.blob).keyType, `${type}-cert-v00@openssh.com`);
-  }
-});
-
-test("malformed and unsupported certificates keep their full-blob fingerprint", () => {
-  const truncated = Buffer.concat([
-    sshString("ssh-ed25519-cert-v01@openssh.com"), sshString("nonce"), sshString(Buffer.alloc(32)),
-  ]);
-  const badLength = Buffer.concat([sshString("ssh-ed25519-cert-v01@openssh.com"), Buffer.from([255, 255, 255, 255])]);
-  const unsupported = Buffer.concat([sshString("unknown-cert-v01@openssh.com"), sshString("nonce")]);
-  for (const blob of [truncated, badLength, unsupported]) {
-    assert.equal(describeHostKey(blob).fingerprint, hashKey(blob));
-  }
-});
-
 test("classifyHostKey prompts for unknown hosts", () => {
   const result = classifyHostKey({
     knownHosts: [],

electron/bridges/sftpBridge.cjs

@@ -1913,16 +1913,6 @@ function createSessionBackedSftpClient(sessionId, sshClient, options = {}) {
       const attrs = await statAsync(sftp, remotePath);
       return statResultFromAttrs(attrs);
     },
-    async lstat(remotePath) {
-      const sftp = await requireSftpChannel(client);
-      // Copy preflights must inspect link nodes, never their followed targets.
-      // lstatAsync falls back to STAT when LSTAT is absent, so reject first.
-      if (typeof sftp.lstat !== "function") {
-        throw Object.assign(new Error("Remote server does not support LSTAT"), { code: "ENOTSUP" });
-      }
-      const attrs = await lstatAsync(sftp, remotePath);
-      return statResultFromAttrs(attrs);
-    },
     async realPath(remotePath) {
       const sftp = await requireSftpChannel(client);
       return await realpathAsync(sftp, remotePath);

electron/bridges/sftpBridge.sessionBackedCopy.test.cjs

@@ -1,94 +0,0 @@
-const test = require("node:test");
-const assert = require("node:assert/strict");
-const { EventEmitter } = require("node:events");
-const { Readable, PassThrough } = require("node:stream");
-const sftpBridge = require("./sftpBridge.cjs");
-const transferBridge = require("./transferBridge.cjs");
-
-const missing = () => Object.assign(new Error("ENOENT"), { code: 2 });
-
-async function openSessionClient(t, { sourceIsLink = false, targetExists = false } = {}) {
-  const commands = [];
-  const channel = new EventEmitter();
-  channel.readdir = (_path, callback) => callback(null, []);
-  channel.mkdir = (_path, callback) => callback(null);
-  channel.unlink = (_path, callback) => callback(null);
-  channel.stat = (remotePath, callback) => {
-    if (String(remotePath) === "/target/file" && !targetExists) return callback(missing());
-    callback(null, { size: 66, mode: 0o100640, mtime: 1 });
-  };
-  channel.lstat = (remotePath, callback) => {
-    if (String(remotePath) === "/target" && !targetExists) return callback(missing());
-    callback(null, { size: 66, mode: sourceIsLink ? 0o120777 : 0o100640, mtime: 1 });
-  };
-  channel.createReadStream = () => Readable.from([Buffer.alloc(66)]);
-  const connection = {
-    sftp(callback) { callback(null, channel); },
-    exec(command, callback) {
-      commands.push(command);
-      const stream = new PassThrough();
-      stream.stderr = new PassThrough();
-      callback(null, stream);
-      setImmediate(() => stream.emit("close", 0));
-    },
-  };
-  const clients = new Map();
-  sftpBridge.init({
-    electronModule: { webContents: { fromId: () => null } },
-    sessions: new Map([["copy-session", { conn: connection }]]),
-    sftpClients: clients,
-  });
-  transferBridge.init({ sftpClients: clients });
-  const { sftpId } = await sftpBridge.openSftpForSession(null, {
-    sessionId: "copy-session", fileProtocol: "sftp",
-  });
-  t.after(() => sftpBridge.closeSftp(null, { sftpId }));
-  return { client: clients.get(sftpId), channel, commands, sftpId };
-}
-
-test("same-host file copy executes cp using the actual session-backed client (#4207)", async (t) => {
-  const { commands, sftpId } = await openSessionClient(t);
-  const result = await transferBridge.startTransfer({ sender: { send() {} } }, {
-    transferId: "session-backed-file-copy",
-    sourcePath: "/source/file", targetPath: "/target/file",
-    sourceType: "sftp", targetType: "sftp",
-    sourceSftpId: sftpId, targetSftpId: sftpId,
-    sourceEncoding: "utf-8", targetEncoding: "utf-8",
-    totalBytes: 66, sameHost: true, resumable: false,
-  });
-  assert.deepEqual(commands, ["cp -a '/source/file' '/target/file'"]);
-  assert.equal(result.error, undefined);
-});
-
-for (const sourceIsLink of [false, true]) {
-  test(`session-backed LSTAT preserves link classification (${sourceIsLink})`, async (t) => {
-    const { client } = await openSessionClient(t, { sourceIsLink });
-    assert.equal((await client.lstat("/source/file")).isSymbolicLink, sourceIsLink);
-    assert.equal((await client.stat("/source/file")).isSymbolicLink, false);
-  });
-}
-
-for (const unsupported of ["missing-method", "server-error"]) {
-  test(`session-backed LSTAT never follows STAT on ${unsupported}`, async (t) => {
-    const { client, channel } = await openSessionClient(t);
-    let statCalls = 0;
-    channel.stat = () => { statCalls++; throw new Error("must not follow symlinks"); };
-    if (unsupported === "missing-method") delete channel.lstat;
-    else channel.lstat = (_path, callback) => callback(Object.assign(new Error("unsupported"), { code: 8 }));
-    await assert.rejects(() => client.lstat("/source/file"), error =>
-      error.code === (unsupported === "missing-method" ? "ENOTSUP" : 8));
-    assert.equal(statCalls, 0);
-  });
-}
-
-for (const targetExists of [false, true]) {
-  test(`session-backed directory cp preserves the destination merge guard (${targetExists})`, async (t) => {
-    const { commands, sftpId } = await openSessionClient(t, { targetExists });
-    const result = await transferBridge.sameHostCopyDirectory({ sender: { send() {} } }, {
-      transferId: `session-backed-directory-copy-${targetExists}`,
-      sftpId, sourcePath: "/source", targetPath: "/target", encoding: "utf-8",
-    });
-    assert.equal(result.success, !targetExists);
-    assert.deepEqual(commands, targetExists ? [] : ["cp -ra '/source/.' '/target/'"]);
-  });
-}

electron/bridges/sshBridge/systemKnownHosts.cjs

@@ -41,8 +41,6 @@
  * leaves the Mosh stats bar empty (graceful degradation), never weakens
  * security.
  */
-const { extractCertificatePublicKey } = require("../../../domain/sshPublicKey.shared.cjs");
-
 function createSystemKnownHostsApi(ctx) {
   const { fs, path, os, crypto, log } = ctx;
 
@@ -66,7 +64,7 @@ function createSystemKnownHostsApi(ctx) {
     }
     if (blob.length === 0) return "";
     return stripFingerprintPadding(
-      crypto.createHash("sha256").update(extractCertificatePublicKey(blob) || blob).digest("base64"),
+      crypto.createHash("sha256").update(blob).digest("base64"),
     );
   };
 
@@ -178,7 +176,7 @@ function createSystemKnownHostsApi(ctx) {
 
   // Parse one known_hosts line into { revoked, certAuthority, hostField,
   // keyType, fingerprint } or null when it is a comment / blank / malformed.
-  // Certificates pin their underlying key, just like the live verifier.
+  // The fingerprint is the SHA-256 of the line's key blob.
   const parseKnownHostsLine = (rawLine) => {
     const line = String(rawLine || "").trim();
     if (!line || line.startsWith("#")) return null;

electron/bridges/sshBridge/systemKnownHosts.test.cjs

@@ -1,8 +1,6 @@
 const test = require("node:test");
 const assert = require("node:assert/strict");
 const crypto = require("node:crypto");
-const { mintHostCertificates, sshKeygenSkip } = require("../fixtures/hostCertificates.test.fixture.cjs");
-const { describeHostKey } = require("../hostKeyVerifier.cjs");
 const path = require("node:path");
 const os = require("node:os");
 
@@ -61,22 +59,6 @@ function hashedHostField(token, salt = crypto.randomBytes(20)) {
 
 const HOME_KH = path.join(os.homedir(), ".ssh", "known_hosts");
 
-test("system certificate entries pin the inner key across renewals without CA trust", { skip: sshKeygenSkip }, (t) => {
-  const { first, renewed, different } = mintHostCertificates(t);
-  const { api } = makeApi({ [HOME_KH]: `example.com ${first.line}\n` });
-  const liveFingerprint = describeHostKey(renewed.blob).fingerprint;
-  assert.equal(api.parseKnownHostsLine(`example.com ${first.line}`).fingerprint, liveFingerprint);
-  assert.equal(api.isHostKeyTrustedBySystem({ hostname: "example.com", fingerprint: liveFingerprint }), true);
-  assert.equal(api.isHostKeyTrustedBySystem({
-    hostname: "example.com", fingerprint: describeHostKey(different.blob).fingerprint,
-  }), false);
-
-  const revoked = makeApi({ [HOME_KH]: `example.com ${first.line}\n@revoked example.com ${renewed.line}\n` });
-  assert.equal(revoked.api.isHostKeyTrustedBySystem({ hostname: "example.com", fingerprint: liveFingerprint }), false);
-  const ca = makeApi({ [HOME_KH]: `@cert-authority example.com ${first.line}\n` });
-  assert.equal(ca.api.isHostKeyTrustedBySystem({ hostname: "example.com", fingerprint: liveFingerprint }), false);
-});
-
 test("system known_hosts paths include the OpenSSH defaults for the platform", () => {
   const { api } = makeApi();
   const paths = api.getSystemKnownHostsPaths();

electron/bridges/transferBridge.cjs

@@ -7174,13 +7174,6 @@ async function startTransferNow(event, payload, onProgress) {
         const singleChannelCopy = srcClient.__netcattySingleChannelSsh || sshClient?.__netcattySingleChannelSsh;
         if (sshClient && typeof sshClient.exec === 'function' && !singleChannelCopy) {
           try {
-            // cp -a preserves link nodes; the SFTP fallback follows target bytes.
-            // A failed lstat also falls through to that existing route.
-            const sourceAttrs = await runCancelablePreflight(() => srcClient.lstat(
-              encodePathForSession(sourceSftpId, sourcePath, resolvedSourceEnc),
-            ));
-            if (sourceAttrs.isSymbolicLink) throw new Error("Source is a symbolic link");
-
             const dir = path.dirname(targetPath).replace(/\\/g, '/');
             try {
               await runTransferAbortableOperation(transfer, (signal) => ensureRemoteDirForSession(
@@ -7193,18 +7186,6 @@ async function startTransferNow(event, payload, onProgress) {
               if (transfer.cancelled || transfer.signal?.aborted) throw new Error("Transfer cancelled");
             }
 
-            const targetClient = sftpClients.get(targetSftpId);
-            let existingRemoteMode = null;
-            try {
-              const attrs = await runCancelablePreflight(() => targetClient.stat(
-                encodePathForSession(targetSftpId, targetPath, resolvedTargetEnc),
-              ));
-              if (Number.isFinite(attrs?.mode)) existingRemoteMode = attrs.mode & 0o7777;
-            } catch {
-              // Missing destinations or failed stats need no permission restore.
-              if (transfer.cancelled || transfer.signal?.aborted) throw new Error("Transfer cancelled");
-            }
-
             const escapedSource = sourcePath.replace(/'/g, "'\\''");
             const escapedTarget = targetPath.replace(/'/g, "'\\''");
             const command = `cp -a '${escapedSource}' '${escapedTarget}'`;
@@ -7213,13 +7194,6 @@ async function startTransferNow(event, payload, onProgress) {
             if (result.code === 0) {
               sendProgress(fileSize, fileSize);
               sameHostDone = true;
-              await restoreRemoteUploadModeBestEffort(
-                targetClient,
-                targetSftpId,
-                targetPath,
-                resolvedTargetEnc,
-                existingRemoteMode,
-              );
             } else if (result.code === 127) {
               // Exit 127 = command not found — cache to skip future attempts
               cpUnavailableSet.add(srcClient);
@@ -8230,28 +8204,11 @@ async function sameHostCopyDirectory(event, payload) {
     }
     if (cpUnavailableSet.has(client)) return { success: false };
 
-    const resolvedEncoding = resolveEncodingForRequest(sftpId, encoding);
-    if (resolvedEncoding && resolvedEncoding !== 'utf-8') {
-      return { success: false };
-    }
-
     const sshClient = client.client;
     if (!sshClient || typeof sshClient.exec !== 'function') {
       return { success: false };
     }
 
-    // Merges must use recursive SFTP transfers to preserve destination child modes.
-    // Only a clearly missing target is safe for the remote cp optimization.
-    try {
-      await runTransferCancelablePreflight(transfer, () => client.lstat(
-        encodePathForSession(sftpId, targetPath, resolvedEncoding),
-      ));
-      return { success: false };
-    } catch (error) {
-      if (transfer.cancelled) throw new Error("Transfer cancelled");
-      if (!isMissingRemoteStageError(error)) return { success: false };
-    }
-
     if (transfer.cancelled) throw new Error("Transfer cancelled");
     const lifecyclePayload = {
       ...payload,
@@ -8276,7 +8233,8 @@ async function sameHostCopyDirectory(event, payload) {
       if (transfer.cancelled) throw new Error("Transfer cancelled");
     }
 
-    // Use "source/." to copy directory *contents* into the newly created target.
+    // Use "source/." to copy directory *contents* into target, preserving merge
+    // semantics consistent with the recursive per-file transfer path.
     // Without "/.", `cp -ra source target` would create target/source/ when target exists.
     const escapedSource = sourcePath.replace(/'/g, "'\\''");
     const escapedTarget = targetPath.replace(/'/g, "'\\''");

electron/bridges/transferBridge.globalFanout.test.cjs

@@ -106,7 +106,6 @@ test("same-host cp capability cache follows the live SFTP client, not a recycled
   bridge.init({ sftpClients });
 
   const makeClient = (exitCode, calls) => ({
-    async lstat() { throw Object.assign(new Error("ENOENT"), { code: 2 }); },
     client: {
       exec(_command, callback) {
         calls.count += 1;

electron/bridges/transferBridge.test.cjs

@@ -1294,9 +1294,7 @@ test("server-to-server resume cancellation settles while source identity verific
   t.after(async () => fs.promises.rm(tempPath, { force: true }));
   let markPrefixStarted;
   const prefixStarted = new Promise((resolve) => { markPrefixStarted = resolve; });
-  let execCalls = 0;
   const sourceClient = {
-    client: { exec() { execCalls += 1; throw new Error("checkpointed copies must not exec cp"); } },
     sftp: createFastSftp({
       createReadStream() {
         markPrefixStarted();
@@ -1319,7 +1317,7 @@ test("server-to-server resume cancellation settles while source identity verific
     targetSftpId: "target",
     totalBytes: 8,
     resumable: true,
-    sameHost: true,
+    sameHost: false,
     resumeStage: "download",
     checkpointBytes: 4,
     downloadCheckpointBytes: 4,
@@ -1334,7 +1332,6 @@ test("server-to-server resume cancellation settles while source identity verific
   ]);
 
   assert.match(result.error || "", /cancel/i);
-  assert.equal(execCalls, 0, "same-host resume must verify its saved prefix instead of running cp");
   assert.equal(sender.sent.some((entry) => entry.channel === "netcatty:transfer:cancelled"), true);
   assert.equal(sender.sent.some((entry) => entry.channel === "netcatty:transfer:complete"), false);
 });
@@ -13246,119 +13243,6 @@ test("same-host directory copy rejected by a committed close leaves no lease or
   assert.equal(sftpTransferSessionLeaseStore.getLeaseCount(sftpId), 0);
 });
 
-test("same-host directory copy skips cp when auto encoding resolves to non-UTF-8", async (t) => {
-  const {
-    sftpTransferSessionLeaseStore,
-  } = require("./sftpTransferSessionLease.cjs");
-  sftpTransferSessionLeaseStore.resetForTests();
-  t.after(() => sftpTransferSessionLeaseStore.resetForTests());
-
-  const sftpId = "same-host-directory-auto-gb18030";
-  // Seed the session's resolved encoding before the copy requests auto.
-  sftpBridge.resolveEncodingForRequest(sftpId, "gb18030");
-  let execCalls = 0;
-  transferBridge.init({
-    sftpClients: new Map([[sftpId, {
-      client: {
-        exec(_command, callback) {
-          execCalls += 1;
-          const stream = new EventEmitter();
-          stream.stderr = new EventEmitter();
-          callback(null, stream);
-          setImmediate(() => stream.emit("close", 0));
-        },
-      },
-    }]]),
-  });
-  const sender = createSender();
-
-  const result = await transferBridge.sameHostCopyDirectory(
-    { sender },
-    {
-      transferId: "same-host-directory-auto-gb18030-copy",
-      sftpId,
-      sourcePath: "/source",
-      targetPath: "/\u76ee\u6807",
-      encoding: "auto",
-    },
-  );
-
-  assert.equal(execCalls, 0);
-  assert.equal(result.success, false);
-  assert.deepEqual(sender.sent, []);
-  assert.equal(transferBridge._getActiveTransferCountForTests(), 0);
-  assert.equal(sftpTransferSessionLeaseStore.getLeaseCount(sftpId), 0);
-});
-
-for (const targetState of ["existing", "missing", "stat-error"]) {
-  test(`same-host directory copy ${targetState} target uses cp only for a fresh destination`, async (t) => {
-    const { sftpTransferSessionLeaseStore } = require("./sftpTransferSessionLease.cjs");
-    sftpTransferSessionLeaseStore.resetForTests();
-    t.after(() => sftpTransferSessionLeaseStore.resetForTests());
-    const sftpId = `same-host-directory-${targetState}`;
-    const commands = [];
-    const mkdirs = [];
-    let targetExists = targetState === "existing";
-    const client = {
-      async lstat(remotePath) {
-        assert.equal(String(remotePath), "/target");
-        assert.deepEqual(mkdirs, [], "check the destination before ensuring it");
-        if (targetState === "stat-error") {
-          throw Object.assign(new Error("Permission denied"), { code: 3 });
-        }
-        if (!targetExists) throw Object.assign(new Error("ENOENT"), { code: 2 });
-        return { isDirectory: true };
-      },
-      sftp: createFastSftp({
-        stat(_remotePath, callback) {
-          if (!targetExists) {
-            callback(Object.assign(new Error("ENOENT"), { code: 2 }));
-            return;
-          }
-          callback(null, { isDirectory: () => true });
-        },
-        mkdir(remotePath, callback) {
-          mkdirs.push(String(remotePath));
-          targetExists = true;
-          callback(null);
-        },
-      }),
-      client: {
-        exec(command, callback) {
-          commands.push(command);
-          assert.equal(targetExists, true, "create the fresh destination before cp");
-          const stream = new PassThrough();
-          stream.stderr = new PassThrough();
-          callback(null, stream);
-          setImmediate(() => stream.emit("close", 0));
-        },
-      },
-    };
-    const sftpClients = new Map([[sftpId, client]]);
-    transferBridge.init({ sftpClients });
-    sftpBridge.init({ sftpClients });
-    const sender = createSender();
-    const result = await transferBridge.sameHostCopyDirectory({ sender }, {
-      transferId: `${sftpId}-copy`, sftpId,
-      sourcePath: "/source", targetPath: "/target", encoding: "utf-8",
-    });
-
-    if (targetState === "missing") {
-      assert.deepEqual(result, { success: true });
-      assert.deepEqual(commands, ["cp -ra '/source/.' '/target/'"]);
-      assert.deepEqual(mkdirs, ["/target"]);
-      assert.equal(sender.sent.some(entry => entry.channel === "netcatty:transfer:complete"), true);
-    } else {
-      assert.deepEqual(result, { success: false });
-      assert.deepEqual(commands, []);
-      assert.deepEqual(mkdirs, []);
-      assert.deepEqual(sender.sent, []);
-    }
-    assert.equal(transferBridge._getActiveTransferCountForTests(), 0);
-    assert.equal(sftpTransferSessionLeaseStore.getLeaseCount(sftpId), 0);
-  });
-}
-
 test("same-host directory copy cancellation aborts cp and releases its lease", async (t) => {
   const {
     sftpTransferSessionLeaseStore,
@@ -13375,7 +13259,6 @@ test("same-host directory copy cancellation aborts cp and releases its lease", a
   stream.end = () => {};
   stream.destroy = () => {};
   const client = {
-    async lstat() { throw Object.assign(new Error("ENOENT"), { code: 2 }); },
     client: {
       exec(_command, callback) {
         callback(null, stream);
@@ -13459,7 +13342,6 @@ test("same-host file cp cancellation releases the shared session lease", async (
   stream.end = () => {};
   stream.destroy = () => {};
   const client = {
-    lstat: async () => ({ isSymbolicLink: false }),
     client: {
       exec(_command, callback) {
         callback(null, stream);
@@ -15257,209 +15139,3 @@ test("pending channel-open skips the fastPut reopen and uses the shared channel"
   assert.ok(sharedWrites >= 1);
   assert.deepEqual(remoteFiles.get(targetPath), payload);
 });
-
-test("same-host file cp restores existing destination mode", async () => {
-  const commands = [];
-  const chmods = [];
-  let targetMode = 0o100600;
-  let downloads = 0;
-  let uploads = 0;
-  const sourceSftp = createFastSftp({
-    open() { downloads++; throw new Error("unexpected download"); },
-  });
-  const sourceClient = {
-    sftp: sourceSftp,
-    lstat: async () => ({ isSymbolicLink: false }),
-    stat: async () => ({ size: 64, mode: 0o100644 }),
-    client: {
-      sftp: (callback) => callback(null, sourceSftp),
-      exec(command, callback) {
-        commands.push(command);
-        targetMode = 0o100644;
-        const stream = new PassThrough();
-        stream.stderr = new PassThrough();
-        callback(null, stream);
-        setImmediate(() => stream.emit("close", 0));
-      },
-    },
-  };
-  const targetClient = {
-    sftp: createFastSftp({
-      open() { uploads++; throw new Error("unexpected upload"); },
-    }),
-    stat: async () => ({ size: 64, mode: targetMode }),
-    chmod: async (remotePath, mode) => {
-      chmods.push([String(remotePath), mode]);
-      targetMode = mode;
-    },
-  };
-  transferBridge.init({ sftpClients: new Map([["source", sourceClient], ["target", targetClient]]) });
-  const result = await transferBridge.startTransfer({ sender: createSender() }, {
-    transferId: `same-host-cp-mode-${crypto.randomUUID()}`,
-    sourcePath: "/source/payload.bin", targetPath: "/target/payload.bin",
-    sourceType: "sftp", targetType: "sftp",
-    sourceSftpId: "source", targetSftpId: "target",
-    sourceEncoding: "utf-8", targetEncoding: "utf-8",
-    totalBytes: 64,
-    sameHost: true, resumable: false,
-  });
-  assert.equal(result.error, undefined, result.error);
-  assert.deepEqual(commands, ["cp -a '/source/payload.bin' '/target/payload.bin'"]);
-  assert.deepEqual(chmods, [["/target/payload.bin", 0o600]]);
-  assert.equal(targetMode, 0o600);
-  assert.equal(downloads, 0);
-  assert.equal(uploads, 0);
-});
-
-for (const sourceState of ["symlink", "lstat-error"]) {
-  test(`same-host file cp skips a source ${sourceState} and downloads/uploads target bytes`, async (t) => {
-    const transferId = `same-host-cp-fallback-${crypto.randomUUID()}`;
-    const sourcePath = "/opt/app/config";
-    const targetPath = "/tmp/app/config";
-    const payload = Buffer.from("contents of ../shared/config");
-    const commands = [];
-    let reads = 0;
-    let remote = Buffer.alloc(0);
-    let promoted = false;
-    const { sftp: sourceSftp } = createPipelinedDownloadSftp(payload);
-    const originalRead = sourceSftp.read;
-    sourceSftp.read = (...args) => { reads++; originalRead(...args); };
-    const sourceClient = {
-      sftp: sourceSftp,
-      async lstat(remotePath) {
-        assert.equal(String(remotePath), sourcePath);
-        if (sourceState === "lstat-error") throw new Error("lstat unsupported");
-        return { isSymbolicLink: true, size: "../shared/config".length };
-      },
-      stat: async () => ({ size: payload.length }),
-      client: {
-        sftp: (callback) => callback(null, sourceSftp),
-        exec(command, callback) {
-          commands.push(command);
-          callback(new Error("unexpected exec"));
-        },
-      },
-    };
-    const targetSftp = createFastSftp({
-      open(_path, _flags, callback) { callback(null, Buffer.from("target-handle")); },
-      write(_handle, buffer, offset, length, position, callback) {
-        if (remote.length < position + length) {
-          remote = Buffer.concat([remote, Buffer.alloc(position + length - remote.length)]);
-        }
-        buffer.copy(remote, position, offset, offset + length);
-        callback(null);
-      },
-      close(_handle, callback) { callback(null); },
-    });
-    const targetClient = {
-      sftp: targetSftp,
-      client: { sftp: (callback) => callback(null, targetSftp) },
-      async stat(remotePath) {
-        if (String(remotePath) === targetPath && remote.length === 0) {
-          throw Object.assign(new Error("ENOENT"), { code: 2 });
-        }
-        return { size: remote.length };
-      },
-      rename: async () => { promoted = true; },
-      delete: async () => {},
-    };
-    transferBridge.init({ sftpClients: new Map([["source", sourceClient], ["target", targetClient]]) });
-    const localStage = tempDirBridge.getTransferTempFilePath(transferId, "config");
-    t.after(async () => fs.promises.rm(localStage, { force: true }));
-    const result = await transferBridge.startTransfer({ sender: createSender() }, {
-      transferId, sourcePath, targetPath,
-      sourceType: "sftp", targetType: "sftp",
-      sourceSftpId: "source", targetSftpId: "target",
-      sourceEncoding: "utf-8", targetEncoding: "utf-8",
-      totalBytes: payload.length, sameHost: true, resumable: false,
-    });
-
-    assert.equal(result.error, undefined, result.error);
-    assert.deepEqual(commands, [], "source symlinks and lstat failures must bypass cp -a");
-    assert.ok(reads > 0, "fallback must download the followed source contents");
-    assert.deepEqual(remote, payload, "fallback must upload target bytes rather than the link node");
-    assert.equal(promoted, true);
-  });
-}
-
-for (const cpResult of [0, 127, 1, "exec-error"]) {
-  test(`fresh same-host file cp result ${cpResult} preserves copy/fallback behavior (#4207)`, async (t) => {
-    const transferId = `same-host-cp-${crypto.randomUUID()}`;
-    const payload = Buffer.from("same-host ordinary SFTP copy");
-    const commands = [];
-    const chmods = [];
-    let reads = 0;
-    let remote = Buffer.alloc(0);
-    let promoted = false;
-    const { sftp: sourceSftp } = createPipelinedDownloadSftp(payload);
-    const originalRead = sourceSftp.read;
-    sourceSftp.read = (...args) => { reads++; originalRead(...args); };
-    const sourceClient = {
-      sftp: sourceSftp,
-      lstat: async () => ({ isSymbolicLink: false }),
-      stat: async () => ({ size: payload.length }),
-      client: {
-        sftp: (callback) => callback(null, sourceSftp),
-        exec(command, callback) {
-          commands.push(command);
-          if (cpResult === "exec-error") { callback(new Error("exec denied")); return; }
-          const stream = new PassThrough();
-          stream.stderr = new PassThrough();
-          callback(null, stream);
-          setImmediate(() => stream.emit("close", cpResult));
-        },
-      },
-    };
-    const targetSftp = createFastSftp({
-      open(_path, _flags, callback) { callback(null, Buffer.from("target-handle")); },
-      write(_handle, buffer, offset, length, position, callback) {
-        if (remote.length < position + length) {
-          remote = Buffer.concat([remote, Buffer.alloc(position + length - remote.length)]);
-        }
-        buffer.copy(remote, position, offset, offset + length);
-        callback(null);
-      },
-      close(_handle, callback) { callback(null); },
-    });
-    const targetClient = {
-      sftp: targetSftp,
-      client: { sftp: (callback) => callback(null, targetSftp) },
-      stat: async (remotePath) => {
-        if (String(remotePath) === "/target/payload.bin" && remote.length === 0) {
-          throw Object.assign(new Error("ENOENT"), { code: 2 });
-        }
-        return { size: remote.length };
-      },
-      chmod: async (...args) => { chmods.push(args); },
-      rename: async () => { promoted = true; },
-      delete: async () => {},
-    };
-    transferBridge.init({ sftpClients: new Map([["source", sourceClient], ["target", targetClient]]) });
-    const localStage = tempDirBridge.getTransferTempFilePath(transferId, "payload.bin");
-    t.after(async () => fs.promises.rm(localStage, { force: true }));
-    const sender = createSender();
-    const result = await transferBridge.startTransfer({ sender }, {
-      transferId,
-      sourcePath: "/source/payload.bin",
-      targetPath: "/target/payload.bin",
-      sourceType: "sftp", targetType: "sftp",
-      sourceSftpId: "source", targetSftpId: "target",
-      sourceEncoding: "utf-8", targetEncoding: "utf-8",
-      totalBytes: payload.length,
-      sameHost: true, resumable: false,
-    });
-    assert.equal(result.error, undefined, result.error);
-    assert.deepEqual(commands, ["cp -a '/source/payload.bin' '/target/payload.bin'"]);
-    assert.equal(sender.sent.some(entry => entry.channel === "netcatty:transfer:complete"), true);
-    if (cpResult === 0) {
-      assert.deepEqual(chmods, [], "fresh cp must not restore destination permissions");
-      assert.equal(reads, 0, "successful cp must not download the source");
-      assert.equal(remote.length, 0, "successful cp must not upload through SFTP");
-      assert.equal(fs.existsSync(localStage), false);
-    } else {
-      assert.ok(reads > 0, "cp failure must fall back to SFTP download");
-      assert.deepEqual(remote, payload, "fallback must upload the downloaded contents");
-      assert.equal(promoted, true);
-    }
-  });
-}

vite.config.ts

@@ -111,7 +111,7 @@ export default defineConfig(() => {
       build: {
         // The shared runtime is also required by Electron; convert it for browser builds.
         commonjsOptions: {
-          include: [/node_modules/, /domain\/sshPublicKey\.shared\.cjs$/, /domain\/systemManager\/containerRuntime\.shared\.cjs$/, /domain\/plugin(?:RuntimePolicy|PermissionDescriptions|ThemePack|RemoteTreePolicy|ViewStylePolicy|GitHubRepository)\.cjs$/],
+          include: [/node_modules/, /domain\/systemManager\/containerRuntime\.shared\.cjs$/, /domain\/plugin(?:RuntimePolicy|PermissionDescriptions|ThemePack|RemoteTreePolicy|ViewStylePolicy|GitHubRepository)\.cjs$/],
         },
         chunkSizeWarningLimit: 3000,
         target: 'esnext', // Required for top-level await in WASM modules
@@ -134,7 +134,6 @@ export default defineConfig(() => {
         include: [
           // Keep the renderer alias pre-bundled so dev serves ESM instead of raw CommonJS.
           '@/domain/systemManager/containerRuntime.shared.cjs',
-          '@/domain/sshPublicKey.shared.cjs',
           '@/domain/pluginRuntimePolicy.cjs',
           '@/domain/pluginGitHubRepository.cjs',
           '@/domain/pluginPermissionDescriptions.cjs',