From 3692fc9f0013a19ea083c561a59f2fb4291277d8 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Sun, 8 Nov 2026 20:47:54 +0800
Subject: [PATCH 1/8] feat(acp): add DeepSeek Harness and ZCode to the registry

Search can install DeepSeek Harness and the unofficial ZCode ACP bridge
through the existing registry driver. An official entry with the same id
replaces the supplemental record.

Local ACP commands use the same sign-in step. On Windows, a standard npm
cmd shim such as dsh.cmd launches through node instead of a shell.
---
 .../SettingsProviderAccountsRouteScreen.tsx   |  5 +-
 ...nstanceDialog.environment.browser.test.tsx |  8 +-
 .../AddProviderInstanceDialog.logic.ts        |  1 -
 .../settings/AddProviderInstanceDialog.tsx    | 26 ++-----
 .../ProviderAuthenticationSection.tsx         |  7 +-
 docs/user/providers-acp.md                    | 29 +++++++-
 .../src/server/AcpRegistrySupport.test.ts     | 70 ++++++++++++++++++
 .../src/server/AcpRegistrySupport.ts          | 56 ++++++++++++--
 .../src/server/driver.test.ts                 | 51 +++++++++++++
 .../src/server/driver.ts                      |  6 +-
 .../src/server/supplementalAgents.test.ts     | 30 ++++++++
 .../src/server/supplementalAgents.ts          | 74 +++++++++++++++++++
 packages/shared/src/shell.test.ts             | 37 ++++++++++
 packages/shared/src/shell.ts                  | 40 ++++++++++
 14 files changed, 403 insertions(+), 37 deletions(-)
 create mode 100644 packages/provider-acp-registry/src/server/supplementalAgents.test.ts
 create mode 100644 packages/provider-acp-registry/src/server/supplementalAgents.ts

diff --git a/apps/mobile/src/features/settings/SettingsProviderAccountsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsProviderAccountsRouteScreen.tsx
index a3b698dd9aff8..a368873f41578 100644
--- a/apps/mobile/src/features/settings/SettingsProviderAccountsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsProviderAccountsRouteScreen.tsx
@@ -174,9 +174,12 @@ function ProviderAccount({
     !signedIn &&
     !auth.error &&
     state?.methods === undefined;
+  const hasAdvertisedSignIn = (state?.methods?.length ?? 0) > 0;
   const needsExternalSetup =
     !active &&
     !signedIn &&
+    !isDiscovering &&
+    !hasAdvertisedSignIn &&
     (provider.setup?.canAuthenticate === false ||
       (provider.driver === "acpRegistry" && state?.methods?.length === 0));
   const url =
@@ -232,7 +235,7 @@ function ProviderAccount({
   const canSignIn =
     !active &&
     !needsExternalSetup &&
-    provider.setup?.canAuthenticate !== false &&
+    (provider.setup?.canAuthenticate !== false || hasAdvertisedSignIn) &&
     provider.enabled &&
     provider.installed;
   const signInDisabled = disabled || state === null;
diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx
index 568c6a953ffc7..e25eb79083268 100644
--- a/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx
+++ b/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx
@@ -244,7 +244,7 @@ describe("AddProviderInstanceDialog environment routing", () => {
     expect(actions.onOpenChange).toHaveBeenCalledWith(false);
   });
 
-  it("creates a local command in the selected environment without a sign-in step", async () => {
+  it("creates a local command in the selected environment and opens sign-in", async () => {
     setup();
     await using _screen = await render(dialog());
     await click("Show more");
@@ -271,7 +271,7 @@ describe("AddProviderInstanceDialog environment routing", () => {
     await type('input[aria-label="Environment variable value 1"]', "work");
     await click("Next");
     await type("#add-provider-label", "Deepseek Harness");
-    await click("Add instance");
+    await click("Continue to sign-in");
 
     expect(settingsHooks.useMutation).toHaveBeenCalledWith(remoteEnvironmentId);
     expect(settingsHooks.mutate).toHaveBeenCalledWith({
@@ -287,8 +287,8 @@ describe("AddProviderInstanceDialog environment routing", () => {
         ],
       },
     });
-    expect(actions.onOpenChange).toHaveBeenCalledWith(false);
-    expect(signInStep()).toBeNull();
+    expect(actions.onOpenChange).not.toHaveBeenCalled();
+    expect(signInStep()?.textContent).toContain("remote-device/acpRegistry_deepseek_harness");
   });
 
   it("rejects a queued save after the provider grant is revoked", async () => {
diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.logic.ts b/apps/web/src/components/settings/AddProviderInstanceDialog.logic.ts
index 1263c675e05b7..29e3ccac5daad 100644
--- a/apps/web/src/components/settings/AddProviderInstanceDialog.logic.ts
+++ b/apps/web/src/components/settings/AddProviderInstanceDialog.logic.ts
@@ -7,7 +7,6 @@ const ACP_REGISTRY_IDENTITY_STEP = 1;
 
 export const ADD_PROVIDER_WIZARD_STEPS = ["Provider", "Identity", "Config"] as const;
 export const ACP_REGISTRY_WIZARD_STEPS = ["Provider", "Identity", "Sign in"] as const;
-export const LOCAL_ACP_WIZARD_STEPS = ["Provider", "Identity"] as const;
 
 export interface ProviderIdentityDraft {
   readonly label: string;
diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
index e5074e4a9bfd1..0da2fbe9f94ce 100644
--- a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
+++ b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
@@ -46,7 +46,6 @@ import { WizardPanel, WizardPopup, WizardHeader, WizardFooter } from "../ui/wiza
 import {
   ADD_PROVIDER_WIZARD_STEPS,
   ACP_REGISTRY_WIZARD_STEPS,
-  LOCAL_ACP_WIZARD_STEPS,
   resolveAcpRegistryWizardNavigation,
   resolveWizardNavigation,
   updateProviderIdentityDraft,
@@ -277,7 +276,7 @@ export function AddProviderInstanceDialog({
     if (navigation.kind === "blocked") {
       setHasAttemptedSubmit(true);
     }
-    if (isAcpRegistry && !isLocalAcp && navigation.kind === "navigate" && navigation.step === 2) {
+    if (isAcpRegistry && navigation.kind === "navigate" && navigation.step === 2) {
       void handleSave();
       return;
     }
@@ -287,15 +286,10 @@ export function AddProviderInstanceDialog({
   const navigateToStep = (requestedStep: number) => {
     applyWizardNavigation(
       isAcpRegistry
-        ? isLocalAcp
-          ? resolveWizardNavigation(wizardStep, requestedStep, LOCAL_ACP_WIZARD_STEPS.length, {
-              instanceIdError,
-              prerequisite: { step: 0, error: acpSelectionError },
-            })
-          : resolveAcpRegistryWizardNavigation(wizardStep, requestedStep, {
-              instanceIdError,
-              selectionError: acpSelectionError,
-            })
+        ? resolveAcpRegistryWizardNavigation(wizardStep, requestedStep, {
+            instanceIdError,
+            selectionError: acpSelectionError,
+          })
         : resolveWizardNavigation(wizardStep, requestedStep, ADD_PROVIDER_WIZARD_STEPS.length, {
             instanceIdError,
           }),
@@ -409,7 +403,7 @@ export function AddProviderInstanceDialog({
       return;
     }
     onCreated?.(brandedId, driver);
-    if (isAcpRegistry && !isLocalAcp) {
+    if (isAcpRegistry) {
       setCreatedInstanceId(brandedId);
       setIsSaving(false);
       setWizardStep(2);
@@ -445,7 +439,7 @@ export function AddProviderInstanceDialog({
               currentStep={wizardStep}
               summaries={wizardStepSummaries}
               instanceIdError={instanceIdError}
-              steps={isLocalAcp ? LOCAL_ACP_WIZARD_STEPS : ACP_REGISTRY_WIZARD_STEPS}
+              steps={ACP_REGISTRY_WIZARD_STEPS}
               disabled={isSaving || isPreparingRegistryAgent || createdInstanceId !== null}
               identityStep={1}
               prerequisite={{ step: 0, error: acpSelectionError }}
@@ -752,11 +746,7 @@ export function AddProviderInstanceDialog({
                   disabled={isSaving || !canManageProviders}
                   onClick={() => void handleSave()}
                 >
-                  {isSaving
-                    ? "Adding..."
-                    : isAcpRegistry && !isLocalAcp
-                      ? "Continue to sign-in"
-                      : "Add instance"}
+                  {isSaving ? "Adding..." : isAcpRegistry ? "Continue to sign-in" : "Add instance"}
                 </Button>
               )}
             </WizardFooter>
diff --git a/apps/web/src/components/settings/ProviderAuthenticationSection.tsx b/apps/web/src/components/settings/ProviderAuthenticationSection.tsx
index f5c4ee146db2a..0582cb1224cfc 100644
--- a/apps/web/src/components/settings/ProviderAuthenticationSection.tsx
+++ b/apps/web/src/components/settings/ProviderAuthenticationSection.tsx
@@ -68,9 +68,12 @@ export function ProviderAuthenticationSection({
     !signedIn &&
     !query.error &&
     auth?.methods === undefined;
+  const hasAdvertisedSignIn = (auth?.methods?.length ?? 0) > 0;
   const needsExternalSetup =
     !active &&
     !signedIn &&
+    !isDiscovering &&
+    !hasAdvertisedSignIn &&
     (provider.setup?.canAuthenticate === false ||
       (provider.driver === "acpRegistry" && auth?.methods?.length === 0));
   const usesCredentials =
@@ -276,7 +279,9 @@ export function ProviderAuthenticationSection({
               >
                 Cancel
               </Button>
-            ) : !active && !needsExternalSetup && provider.setup?.canAuthenticate !== false ? (
+            ) : !active &&
+              !needsExternalSetup &&
+              (provider.setup?.canAuthenticate !== false || hasAdvertisedSignIn) ? (
               <Button
                 size="sm"
                 variant="outline"
diff --git a/docs/user/providers-acp.md b/docs/user/providers-acp.md
index 701d5638b3fd8..d0951a6d6712f 100644
--- a/docs/user/providers-acp.md
+++ b/docs/user/providers-acp.md
@@ -28,17 +28,37 @@ provider instance's environment overrides to use ACP v1.
 Search only shows agents that can run on the connected server. Registry agents are third-party
 code; review an agent's source and license before adding it.
 
+Search also lists DeepSeek Harness and ZCode. T3 Code installs those itself:
+
+| Agent                                                               | What T3 Code runs                                       |
+| ------------------------------------------------------------------- | ------------------------------------------------------- |
+| [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) | `dsh --profile acp` from `@deepseek-ai/dsh`             |
+| [ZCode bridge](https://github.com/supermomonga/zcode-acp)           | the `zcode-acp` binary from the bridge's GitHub release |
+
+DeepSeek Harness is the `dsh` CLI. Its ACP mode is a profile, not a separate program. Credentials
+stay in the `dsh` profile, and the sign-in step can be skipped when the CLI advertises no login.
+ZCode still needs a compatible ZCode desktop installation. The bridge is unofficial. Select **Add**
+for either agent, then complete the sign-in step.
+
 ## Add a local command
 
 In **Settings → Providers → Add provider**, select **Show more**, then **Local ACP command**. Enter the executable
 name or path on the selected environment, add one literal argument per row, and choose a display
-name. For DeepSeek Harness, use `dsh` with arguments `--profile` and `acp`.
+name.
+
+Available models and session controls follow each agent's advertised capabilities. DeepSeek's
+automation ACP profile does not provide transcript replay or session forking. Existing instances
+can also be used from mobile.
 
 Local commands require no registry entry or download. Environment overrides apply to the command;
 credentials and skills remain managed by the installed agent or its wrapper. Models and reasoning
 options come from ACP, including model IDs that contain JSON. T3 Code launches the executable directly
 without expanding shell expressions.
 
+On Windows, standard npm Node.js launchers (such as `dsh.cmd`) are resolved to their
+Node.js script and launched directly. Custom batch scripts still require an explicit underlying
+executable and literal arguments.
+
 ## Where agents run
 
 Registry agents always run on the machine that hosts your T3 Code server. That stays true when you
@@ -53,9 +73,10 @@ but keeps package installs. To use an existing local binary, set **Executable ov
 
 ## Signing in
 
-Open the agent's account section in **Settings → Providers** on web or desktop. Choose
-**Sign in** and, if the agent offers several methods, select one. For an installed, configured
-provider, mobile also offers **Settings → Providers**.
+Open the agent's account section in **Settings → Providers** on web or desktop, or finish the
+sign-in step shown after adding the instance. Choose **Sign in** and, if the agent offers several
+methods, select one. Local commands use this same account section once they advertise a login.
+For an installed, configured provider, mobile also offers **Settings → Providers**.
 
 Browser sign-in shows the agent's URL and waits for you to open or copy it before telling the
 agent to proceed. The page opens on your device, while the agent runs on the environment.
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
index 02a32ac40250d..dc0d6565ce58f 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
@@ -286,6 +286,7 @@ describe("AcpRegistrySupport", () => {
   it.effect("resolves a local executable path and inherits the host environment", () =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
       const cacheDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-acp-local-path-" });
       const commandPath = `${cacheDir}/dsh wrapper`;
       yield* fileSystem.writeFileString(commandPath, "#!/bin/sh\n");
@@ -310,6 +311,75 @@ describe("AcpRegistrySupport", () => {
       });
       expect(resolved.agent).toBeUndefined();
 
+      const shimDir = path.join(cacheDir, "npm");
+      const scriptPath = path.join(shimDir, "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js");
+      const shimPath = path.join(shimDir, "dsh.cmd");
+      const nodePath = path.join(shimDir, "node.exe");
+      yield* fileSystem.makeDirectory(path.dirname(scriptPath), { recursive: true });
+      yield* fileSystem.writeFileString(scriptPath, "");
+      yield* fileSystem.writeFileString(nodePath, "");
+      yield* fileSystem.writeFileString(
+        shimPath,
+        [
+          "@ECHO off",
+          "GOTO start",
+          ":find_dp0",
+          "SET dp0=%~dp0",
+          "EXIT /b",
+          ":start",
+          "SETLOCAL",
+          "CALL :find_dp0",
+          'IF EXIST "%dp0%\\node.exe" (',
+          '  SET "_prog=%dp0%\\node.exe"',
+          ") ELSE (",
+          '  SET "_prog=node"',
+          "  SET PATHEXT=%PATHEXT:;.JS;=;%",
+          ")",
+          'endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js" %*',
+          "",
+        ].join("\n"),
+      );
+      const windowsEnvironment = { PATH: shimDir, PATHEXT: ".EXE;.CMD" };
+      const npmResolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
+        cacheDir,
+        toolsDir: `${cacheDir}/tools`,
+        registryUrl,
+      }).pipe(
+        Effect.provideService(HostProcess.Platform, "win32"),
+        Effect.provideService(HostProcess.Environment, windowsEnvironment),
+      );
+      const npmSettings = decodeAcpRegistrySettings({
+        source: "local",
+        commandPath: shimPath,
+        commandArgs: ["--profile", "acp"],
+      });
+      expect(yield* npmResolver.inspect(npmSettings, windowsEnvironment)).toMatchObject({
+        status: "ready",
+        distribution: "local",
+      });
+      expect(
+        yield* npmResolver.resolve(npmSettings, "/workspace", windowsEnvironment),
+      ).toMatchObject({
+        distribution: "local",
+        spawn: {
+          command: nodePath,
+          args: [scriptPath, "--profile", "acp"],
+          cwd: "/workspace",
+          env: windowsEnvironment,
+          shell: false,
+        },
+      });
+      yield* fileSystem.remove(nodePath);
+      for (const failure of [
+        yield* npmResolver.inspect(npmSettings, windowsEnvironment).pipe(Effect.flip),
+        yield* npmResolver.resolve(npmSettings, "/workspace", windowsEnvironment).pipe(Effect.flip),
+      ]) {
+        expect(failure).toMatchObject({
+          reason: "runner_unavailable",
+          detail: "Node.js is required to launch this npm ACP command.",
+        });
+      }
+
       for (const extension of [".cmd", ".BAT"]) {
         const windowsResolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
           cacheDir,
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index 99b1cfdc9f958..b7b295a353ec1 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -17,6 +17,7 @@ import { cliArchiveTarCommand } from "@t3tools/shared/cliRelease";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import {
   mergePathEntries,
+  npmShimScript,
   resolveSpawnCommand,
   SpawnExecutableResolution,
 } from "@t3tools/shared/shell";
@@ -32,6 +33,7 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as AcpRegistryRuntimeCoordinator from "./AcpRegistryRuntimeCoordinator.ts";
+import { SUPPLEMENTAL_ACP_AGENT_RECORDS, appendMissingAgents } from "./supplementalAgents.ts";
 import * as PlatformError from "effect/PlatformError";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
@@ -187,6 +189,11 @@ export interface AcpRegistryIndex {
 
 const decodeRegistryIndexEnvelope = Schema.decodeUnknownEffect(AcpRegistryIndexEnvelope);
 const decodeRegistryAgent = Schema.decodeUnknownOption(AcpRegistryAgent);
+export const supplementalAcpAgents: ReadonlyArray<AcpRegistryAgent> =
+  SUPPLEMENTAL_ACP_AGENT_RECORDS.flatMap((candidate) => {
+    const decoded = decodeRegistryAgent(candidate);
+    return Option.isSome(decoded) ? [decoded.value] : [];
+  });
 const decodeJson = Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Unknown));
 const decodeNpmPackageManifest = Schema.decodeUnknownEffect(
   Schema.fromJsonString(NpmPackageManifest),
@@ -774,9 +781,17 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
     return { version: envelope.version, agents } satisfies AcpRegistryIndex;
   });
 
+  const supplementOfficialRegistry = (registry: AcpRegistryIndex): AcpRegistryIndex =>
+    registryUrl === ACP_REGISTRY_URL
+      ? { ...registry, agents: appendMissingAgents(registry.agents, supplementalAcpAgents) }
+      : registry;
   const readCachedRegistry = fileSystem
     .readFileString(registryCachePath)
-    .pipe(Effect.flatMap(decodeRegistryText), Effect.option);
+    .pipe(
+      Effect.flatMap(decodeRegistryText),
+      Effect.map(supplementOfficialRegistry),
+      Effect.option,
+    );
 
   const writeRegistryCache = (text: string) =>
     random.uuidV4().pipe(
@@ -851,7 +866,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
         detail: "ACP Registry index is not valid UTF-8.",
       });
     }
-    const registry = yield* decodeRegistryText(collected.text);
+    const registry = supplementOfficialRegistry(yield* decodeRegistryText(collected.text));
     yield* writeRegistryCache(collected.text);
     return registry;
   });
@@ -1700,7 +1715,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
   );
 
   const validateLocalExecutable = (command: string) =>
-    platform === "win32" && /\.(?:cmd|bat)$/iu.test(command)
+    platform === "win32" && /\.(?:cmd|bat)$/iu.test(command) && npmShimScript(command) === undefined
       ? Effect.fail(
           new AcpRegistryError({
             reason: "runner_unavailable",
@@ -1710,13 +1725,36 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
         )
       : Effect.void;
 
+  const launchLocalExecutable = (
+    command: string,
+    args: ReadonlyArray<string>,
+    env: NodeJS.ProcessEnv,
+  ) => {
+    const script = platform === "win32" ? npmShimScript(command) : undefined;
+    if (script === undefined) return { command, args };
+    const node =
+      resolveExecutable(command.replace(/[^\\/]+$/u, "node.exe"), platform, env) ??
+      resolveExecutable("node", platform, env);
+    if (node === undefined) {
+      return new AcpRegistryError({
+        reason: "runner_unavailable",
+        detail: "Node.js is required to launch this npm ACP command.",
+      });
+    }
+    return { command: node, args: [script, ...args] };
+  };
+
   const inspect: AcpRegistryCatalog["Service"]["inspect"] = Effect.fn("AcpRegistryCatalog.inspect")(
     function* (settings, environment) {
       if (settings.source === "local") {
         const command = settings.commandPath.trim();
         if (!command) return { status: "unconfigured" } as const;
         const executable = resolveExecutable(command, platform, environment ?? hostEnvironment);
-        if (executable !== undefined) yield* validateLocalExecutable(executable);
+        if (executable !== undefined) {
+          yield* validateLocalExecutable(executable);
+          const launched = launchLocalExecutable(executable, [], environment ?? hostEnvironment);
+          if (launched instanceof AcpRegistryError) return yield* launched;
+        }
         return executable === undefined
           ? ({
               status: "missing_runner",
@@ -1843,9 +1881,17 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
           });
         }
         yield* validateLocalExecutable(command);
+        const launched = launchLocalExecutable(command, settings.commandArgs, env);
+        if (launched instanceof AcpRegistryError) return yield* launched;
         return {
           distribution: "local",
-          spawn: { command, args: settings.commandArgs, cwd, env, shell: false },
+          spawn: {
+            command: launched.command,
+            args: launched.args,
+            cwd,
+            env,
+            shell: false,
+          },
         } satisfies ResolvedAcpRegistryAgent;
       }
       const agentId = settings.agentId.trim();
diff --git a/packages/provider-acp-registry/src/server/driver.test.ts b/packages/provider-acp-registry/src/server/driver.test.ts
index fbb4f16e97c75..ecec575f7fd48 100644
--- a/packages/provider-acp-registry/src/server/driver.test.ts
+++ b/packages/provider-acp-registry/src/server/driver.test.ts
@@ -126,6 +126,57 @@ describe("acpRegistrySnapshotReadiness", () => {
     ).toBe("unknown");
   });
 
+  it("offers sign-in for an installed local command before its probe", () => {
+    const snapshot = buildCheckedAcpRegistrySnapshot({
+      ...identity,
+      settings: decodeSettings({ source: "local", commandPath: "kimi", commandArgs: ["acp"] }),
+      checkedAt: "2026-08-13T10:00:00.000Z",
+      inspection: {
+        status: "ready",
+        agentId: "kimi",
+        version: null,
+        distribution: "local",
+      },
+    });
+
+    expect(snapshot.installed).toBe(true);
+    expect(snapshot.setup?.canAuthenticate).toBe(true);
+  });
+
+  it("hides sign-in after a local probe advertises no auth methods", () => {
+    const snapshot = buildCheckedAcpRegistrySnapshot({
+      ...identity,
+      settings: decodeSettings({
+        source: "local",
+        commandPath: "dsh",
+        commandArgs: ["--profile", "acp"],
+      }),
+      checkedAt: "2026-08-13T10:00:00.000Z",
+      inspection: {
+        status: "ready",
+        agentId: "dsh",
+        version: null,
+        distribution: "local",
+      },
+      probe: {
+        probe: {
+          instanceId: identity.instanceId,
+          ready: true,
+          icon: null,
+          authMethods: [],
+          models: [],
+          currentModelId: null,
+          configOptions: [],
+          sessionManagement: noSessionManagement,
+        },
+        slashCommands: [],
+        skills: [],
+      },
+    });
+
+    expect(snapshot.setup?.canAuthenticate).toBe(false);
+  });
+
   it("overlays live configuration without dropping probe-owned session capabilities", () => {
     const provider = buildCheckedAcpRegistrySnapshot({
       ...identity,
diff --git a/packages/provider-acp-registry/src/server/driver.ts b/packages/provider-acp-registry/src/server/driver.ts
index ef3e0c3e7416c..7207d20c34ee1 100644
--- a/packages/provider-acp-registry/src/server/driver.ts
+++ b/packages/provider-acp-registry/src/server/driver.ts
@@ -221,13 +221,13 @@ function baseSnapshot(
     setup: {
       canInstall: false,
       ...(input.documentationUrl ? { documentationUrl: input.documentationUrl } : {}),
+      // A finished probe with no auth methods is the only proof that sign-in is unavailable.
+      // Until then, an installed local command is offered the same account step as a registry agent.
       canAuthenticate:
         input.installed &&
         (input.probe
           ? input.probe.probe.authMethods.length > 0
-          : input.settings.source === "local"
-            ? (input.probeError?.authMethods?.length ?? 0) > 0
-            : input.settings.agentId.length > 0),
+          : input.settings.source === "local" || input.settings.agentId.length > 0),
     },
     ...(input.message ? { message: input.message } : {}),
     models: modelsFromDiscovery(input.probe?.probe, input.settings.customModels),
diff --git a/packages/provider-acp-registry/src/server/supplementalAgents.test.ts b/packages/provider-acp-registry/src/server/supplementalAgents.test.ts
new file mode 100644
index 0000000000000..238a1bf50f3ab
--- /dev/null
+++ b/packages/provider-acp-registry/src/server/supplementalAgents.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from "@effect/vitest";
+
+import { supplementalAcpAgents } from "./AcpRegistrySupport.ts";
+import { appendMissingAgents } from "./supplementalAgents.ts";
+
+describe("supplemental ACP agents", () => {
+  it("registers DeepSeek Harness and the ZCode bridge", () => {
+    expect(supplementalAcpAgents.map((agent) => agent.id)).toEqual([
+      "deepseek-harness",
+      "zcode-acp",
+    ]);
+    expect(supplementalAcpAgents[0]?.distribution.npx).toMatchObject({
+      package: "@deepseek-ai/dsh@0.2.2-rc.1",
+      args: ["--profile", "acp"],
+    });
+    expect(supplementalAcpAgents[1]?.distribution.binary?.["windows-x86_64"]?.cmd).toBe(
+      "zcode-acp.exe",
+    );
+  });
+
+  it("keeps an official entry when the same id is already published", () => {
+    const official = { id: "deepseek-harness", name: "Official" };
+    expect(appendMissingAgents([official], [{ id: "deepseek-harness", name: "Local" }])).toEqual([
+      official,
+    ]);
+    expect(appendMissingAgents([], [{ id: "zcode-acp", name: "ZCode" }])).toEqual([
+      { id: "zcode-acp", name: "ZCode" },
+    ]);
+  });
+});
diff --git a/packages/provider-acp-registry/src/server/supplementalAgents.ts b/packages/provider-acp-registry/src/server/supplementalAgents.ts
new file mode 100644
index 0000000000000..9562ad5d65d3f
--- /dev/null
+++ b/packages/provider-acp-registry/src/server/supplementalAgents.ts
@@ -0,0 +1,74 @@
+// Agents the official ACP Registry does not publish. They use the same install
+// and sign-in path as registry entries, and are skipped when an official id appears.
+export const SUPPLEMENTAL_ACP_AGENT_RECORDS = [
+  {
+    id: "deepseek-harness",
+    name: "DeepSeek Harness",
+    version: "0.2.2-rc.1",
+    description:
+      "DeepSeek Harness CLI. T3 installs dsh and starts it with --profile acp. Credentials stay in the dsh profile.",
+    authors: ["DeepSeek"],
+    license: "MIT",
+    website: "https://github.com/deepseek-ai/deepseek-harness",
+    repository: "https://github.com/deepseek-ai/deepseek-harness",
+    distribution: {
+      npx: {
+        package: "@deepseek-ai/dsh@0.2.2-rc.1",
+        args: ["--profile", "acp"],
+      },
+    },
+  },
+  {
+    id: "zcode-acp",
+    name: "ZCode",
+    version: "0.3.2",
+    description:
+      "Unofficial ACP bridge for an installed ZCode desktop. T3 downloads zcode-acp and starts it.",
+    authors: ["supermomonga"],
+    website: "https://github.com/supermomonga/zcode-acp",
+    repository: "https://github.com/supermomonga/zcode-acp",
+    distribution: {
+      binary: {
+        "darwin-aarch64": {
+          archive:
+            "https://github.com/supermomonga/zcode-acp/releases/download/v0.3.2/zcode-acp-darwin-arm64",
+          cmd: "zcode-acp",
+          sha256: "34d129c47bf5d50d3c00a55bbd16563d530f6edf0bbe7ee78a70da9ba1075fb3",
+        },
+        "darwin-x86_64": {
+          archive:
+            "https://github.com/supermomonga/zcode-acp/releases/download/v0.3.2/zcode-acp-darwin-x64",
+          cmd: "zcode-acp",
+          sha256: "b8bd83e9ad86117f4fbd488463fa5569f9577352377150c83e9596d935ee6504",
+        },
+        "linux-aarch64": {
+          archive:
+            "https://github.com/supermomonga/zcode-acp/releases/download/v0.3.2/zcode-acp-linux-arm64",
+          cmd: "zcode-acp",
+          sha256: "b8cdfffe55e922eebb6a295faa9db301cdc2e9e93d3dd38c0648514b8f33a16b",
+        },
+        "linux-x86_64": {
+          archive:
+            "https://github.com/supermomonga/zcode-acp/releases/download/v0.3.2/zcode-acp-linux-x64",
+          cmd: "zcode-acp",
+          sha256: "7c9c09b2961be81ae36bd700de097d4f06d91409d4178b6220e123768bffe4dd",
+        },
+        "windows-x86_64": {
+          archive:
+            "https://github.com/supermomonga/zcode-acp/releases/download/v0.3.2/zcode-acp-windows-x64.exe",
+          cmd: "zcode-acp.exe",
+          sha256: "2b88b1815544687a8b7e212255ae9e306307556dd590512f12eb40ef96cab225",
+        },
+      },
+    },
+  },
+] as const;
+
+export function appendMissingAgents<Agent extends { readonly id: string }>(
+  agents: ReadonlyArray<Agent>,
+  extra: ReadonlyArray<Agent>,
+): ReadonlyArray<Agent> {
+  const present = new Set(agents.map((agent) => agent.id));
+  const missing = extra.filter((agent) => !present.has(agent.id));
+  return missing.length === 0 ? agents : [...agents, ...missing];
+}
diff --git a/packages/shared/src/shell.test.ts b/packages/shared/src/shell.test.ts
index d4e831f2af4bd..0e451f7cbb5cf 100644
--- a/packages/shared/src/shell.test.ts
+++ b/packages/shared/src/shell.test.ts
@@ -28,6 +28,7 @@ import {
   mergePathEntries,
   mergePathValues,
   npmShimExecutable,
+  npmShimScript,
   preferGitForWindowsBinary,
   readEnvironmentFromLoginShell,
   readEnvironmentFromWindowsShell,
@@ -1216,3 +1217,39 @@ describe("pathSetupCommand", () => {
     ).toBeUndefined();
   });
 });
+
+describe("npmShimScript", () => {
+  const shim =
+    '@ECHO off\nGOTO start\n:find_dp0\nSET dp0=%~dp0\nEXIT /b\n:start\nSETLOCAL\nCALL :find_dp0\n\nIF EXIST "%dp0%\\node.exe" (\n  SET "_prog=%dp0%\\node.exe"\n) ELSE (\n  SET "_prog=node"\n  SET PATHEXT=%PATHEXT:;.JS;=;%\n)\n\nendLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js" %*\n';
+  const command = "C:\\npm\\dsh.cmd";
+  it("resolves a Node shim while refusing shell additions and missing scripts", () => {
+    expect(
+      npmShimScript(
+        command,
+        () => shim,
+        () => true,
+      ),
+    ).toBe("C:\\npm\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js");
+    expect(
+      npmShimScript(
+        "/tmp/npm/dsh.cmd",
+        () => shim,
+        (filePath) => filePath === "/tmp/npm/node_modules/@deepseek-ai/dsh/lib/bin.js",
+      ),
+    ).toBe("/tmp/npm/node_modules/@deepseek-ai/dsh/lib/bin.js");
+    expect(
+      npmShimScript(
+        command,
+        () => shim + "echo unsafe\n",
+        () => true,
+      ),
+    ).toBeUndefined();
+    expect(
+      npmShimScript(
+        command,
+        () => shim,
+        () => false,
+      ),
+    ).toBeUndefined();
+  });
+});
diff --git a/packages/shared/src/shell.ts b/packages/shared/src/shell.ts
index 8a0e0be51922a..da7e53946b32e 100644
--- a/packages/shared/src/shell.ts
+++ b/packages/shared/src/shell.ts
@@ -760,6 +760,46 @@ export function npmShimExecutable(
   return isFile(executable) ? executable : undefined;
 }
 
+const NPM_NODE_SHIM_BODY = [
+  'IF EXIST "%dp0%\\node.exe" (',
+  '  SET "_prog=%dp0%\\node.exe"',
+  ") ELSE (",
+  '  SET "_prog=node"',
+  "  SET PATHEXT=%PATHEXT:;.JS;=;%",
+  ")",
+].join("\n");
+
+// Keep the shim directory's original prefix. win32.join turns a POSIX temp path into a drive-root path.
+function joinShimTarget(shimPath: string, target: string): string {
+  const separatorIndex = Math.max(shimPath.lastIndexOf("/"), shimPath.lastIndexOf("\\"));
+  const directory = separatorIndex >= 0 ? shimPath.slice(0, separatorIndex + 1) : "";
+  const separator = shimPath.includes("\\") ? "\\" : "/";
+  return `${directory}${target.replaceAll(/[\\/]/g, separator)}`;
+}
+
+export function npmShimScript(
+  shimPath: string,
+  readFile: (filePath: string) => string | undefined = readFileSyncOrUndefined,
+  isFile: (filePath: string) => boolean = isFileSync,
+): string | undefined {
+  if (NodePath.win32.extname(shimPath).toLowerCase() !== ".cmd") return undefined;
+  const lines = readFile(shimPath)
+    ?.split(/\r?\n/)
+    .filter((line) => line.length > 0);
+  if (!lines || NPM_EXECUTABLE_SHIM_PREFIX.some((expected, index) => lines[index] !== expected)) {
+    return undefined;
+  }
+  const body = lines.slice(NPM_EXECUTABLE_SHIM_PREFIX.length);
+  if (body.length !== 7 || body.slice(0, -1).join("\n") !== NPM_NODE_SHIM_BODY) return undefined;
+  const target =
+    /^endLocal & goto #_undefined_# 2>NUL \|\| title %COMSPEC% & "%_prog%"  "%dp0%\\([^"%]+)" %\*$/.exec(
+      body.at(-1)!,
+    )?.[1];
+  if (!target) return undefined;
+  const script = joinShimTarget(shimPath, target);
+  return isFile(script) ? script : undefined;
+}
+
 export type XcodeGitLocator = (env: NodeJS.ProcessEnv) => string | undefined;
 
 // xcrun honors DEVELOPER_DIR and the `xcode-select` choice, as the shim does.

From b8dd9c267b07e1002ab5af0ed40a5f0d5e184f84 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Sun, 8 Nov 2026 20:53:31 +0800
Subject: [PATCH 2/8] fix(acp): use Schema.is for registry launch errors

effect-tsgo rejects instanceof on AcpRegistryError. The existing
isAcpRegistryError guard is the schema-aware check.
---
 .../provider-acp-registry/src/server/AcpRegistrySupport.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index b7b295a353ec1..aa05bf5469aa8 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -1753,7 +1753,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
         if (executable !== undefined) {
           yield* validateLocalExecutable(executable);
           const launched = launchLocalExecutable(executable, [], environment ?? hostEnvironment);
-          if (launched instanceof AcpRegistryError) return yield* launched;
+          if (isAcpRegistryError(launched)) return yield* launched;
         }
         return executable === undefined
           ? ({
@@ -1882,7 +1882,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
         }
         yield* validateLocalExecutable(command);
         const launched = launchLocalExecutable(command, settings.commandArgs, env);
-        if (launched instanceof AcpRegistryError) return yield* launched;
+        if (isAcpRegistryError(launched)) return yield* launched;
         return {
           distribution: "local",
           spawn: {

From de7a40ac1e7184830b6b2b64e6d8145c68bfed83 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Sun, 8 Nov 2026 20:59:45 +0800
Subject: [PATCH 3/8] fix(shared): accept npm 12 Node cmd shims

cmd-shim 9 puts the PATHEXT assignment on the launch line. The exact
matcher still rejects extra arguments and custom batch files.
---
 packages/shared/src/shell.test.ts | 26 ++++++++++++++++++++++++
 packages/shared/src/shell.ts      | 33 +++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/packages/shared/src/shell.test.ts b/packages/shared/src/shell.test.ts
index 0e451f7cbb5cf..2a277d5ad33c0 100644
--- a/packages/shared/src/shell.test.ts
+++ b/packages/shared/src/shell.test.ts
@@ -1252,4 +1252,30 @@ describe("npmShimScript", () => {
       ),
     ).toBeUndefined();
   });
+
+  it("resolves an npm 12 Node shim and rejects extra launch arguments", () => {
+    const npm12 =
+      '@ECHO off\nGOTO start\n:find_dp0\nSET dp0=%~dp0\nEXIT /b\n:start\nSETLOCAL\nCALL :find_dp0\n\nIF EXIST "%dp0%\\node.exe" (\n  SET "_prog=%dp0%\\node.exe"\n) ELSE (\n  SET "_prog=node"\n)\n\nendLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & set PATHEXT=%PATHEXT:;.JS;=;% & "%_prog%"  "%dp0%\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js" %*\n';
+    expect(
+      npmShimScript(
+        command,
+        () => npm12,
+        () => true,
+      ),
+    ).toBe("C:\\npm\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js");
+    expect(
+      npmShimScript(
+        command,
+        () => npm12.replace('"%_prog%"  "%dp0%', '"%_prog%" --experimental-strip-types "%dp0%'),
+        () => true,
+      ),
+    ).toBeUndefined();
+    expect(
+      npmShimScript(
+        command,
+        () => npm12 + "echo unsafe\n",
+        () => true,
+      ),
+    ).toBeUndefined();
+  });
 });
diff --git a/packages/shared/src/shell.ts b/packages/shared/src/shell.ts
index da7e53946b32e..d3c6161d6d5a9 100644
--- a/packages/shared/src/shell.ts
+++ b/packages/shared/src/shell.ts
@@ -769,6 +769,32 @@ const NPM_NODE_SHIM_BODY = [
   ")",
 ].join("\n");
 
+// cmd-shim 9, bundled with npm 12, moves that PATHEXT assignment onto the launch line.
+const NPM_NODE_SHIM_BODY_V9 = [
+  'IF EXIST "%dp0%\\node.exe" (',
+  '  SET "_prog=%dp0%\\node.exe"',
+  ") ELSE (",
+  '  SET "_prog=node"',
+  ")",
+].join("\n");
+
+const NPM_NODE_SHIM_LAUNCH =
+  /^endLocal & goto #_undefined_# 2>NUL \|\| title %COMSPEC% & "%_prog%"  "%dp0%\\([^"%]+)" %\*$/;
+const NPM_NODE_SHIM_LAUNCH_V9 =
+  /^endLocal & goto #_undefined_# 2>NUL \|\| title %COMSPEC% & set PATHEXT=%PATHEXT:;\.JS;=;% & "%_prog%"  "%dp0%\\([^"%]+)" %\*$/;
+
+function npmNodeShimTarget(body: ReadonlyArray<string>): string | undefined {
+  const launch = body.at(-1);
+  if (launch === undefined) return undefined;
+  if (body.length === 7 && body.slice(0, -1).join("\n") === NPM_NODE_SHIM_BODY) {
+    return NPM_NODE_SHIM_LAUNCH.exec(launch)?.[1];
+  }
+  if (body.length === 6 && body.slice(0, -1).join("\n") === NPM_NODE_SHIM_BODY_V9) {
+    return NPM_NODE_SHIM_LAUNCH_V9.exec(launch)?.[1];
+  }
+  return undefined;
+}
+
 // Keep the shim directory's original prefix. win32.join turns a POSIX temp path into a drive-root path.
 function joinShimTarget(shimPath: string, target: string): string {
   const separatorIndex = Math.max(shimPath.lastIndexOf("/"), shimPath.lastIndexOf("\\"));
@@ -789,12 +815,7 @@ export function npmShimScript(
   if (!lines || NPM_EXECUTABLE_SHIM_PREFIX.some((expected, index) => lines[index] !== expected)) {
     return undefined;
   }
-  const body = lines.slice(NPM_EXECUTABLE_SHIM_PREFIX.length);
-  if (body.length !== 7 || body.slice(0, -1).join("\n") !== NPM_NODE_SHIM_BODY) return undefined;
-  const target =
-    /^endLocal & goto #_undefined_# 2>NUL \|\| title %COMSPEC% & "%_prog%"  "%dp0%\\([^"%]+)" %\*$/.exec(
-      body.at(-1)!,
-    )?.[1];
+  const target = npmNodeShimTarget(lines.slice(NPM_EXECUTABLE_SHIM_PREFIX.length));
   if (!target) return undefined;
   const script = joinShimTarget(shimPath, target);
   return isFile(script) ? script : undefined;

From 78d958099e38ac378c642733b519823d18f33291 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 17:51:51 +0800
Subject: [PATCH 4/8] fix(acp): run an already installed dsh for DeepSeek
 Harness

When dsh is on PATH, T3 starts that copy with --profile acp and skips
the pinned install. Machines without dsh still install the package.
---
 docs/user/providers-acp.md                    |  6 +-
 .../src/server/AcpRegistrySupport.ts          | 56 ++++++++++++++++++-
 .../src/server/supplementalAgents.test.ts     |  7 ++-
 .../src/server/supplementalAgents.ts          |  7 ++-
 4 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/docs/user/providers-acp.md b/docs/user/providers-acp.md
index d0951a6d6712f..2389b64b1425f 100644
--- a/docs/user/providers-acp.md
+++ b/docs/user/providers-acp.md
@@ -35,8 +35,10 @@ Search also lists DeepSeek Harness and ZCode. T3 Code installs those itself:
 | [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) | `dsh --profile acp` from `@deepseek-ai/dsh`             |
 | [ZCode bridge](https://github.com/supermomonga/zcode-acp)           | the `zcode-acp` binary from the bridge's GitHub release |
 
-DeepSeek Harness is the `dsh` CLI. Its ACP mode is a profile, not a separate program. Credentials
-stay in the `dsh` profile, and the sign-in step can be skipped when the CLI advertises no login.
+DeepSeek Harness is the `dsh` CLI. When `dsh` is already installed, T3 Code runs that copy with
+`--profile acp` and keeps the credentials already stored in its profile. Otherwise T3 Code installs
+`@deepseek-ai/dsh`. ACP mode is a profile, not a separate program, and the sign-in step can be
+skipped when the CLI advertises no login.
 ZCode still needs a compatible ZCode desktop installation. The bridge is unofficial. Select **Add**
 for either agent, then complete the sign-in step.
 
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index aa05bf5469aa8..68cc1915a5086 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -33,7 +33,11 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as AcpRegistryRuntimeCoordinator from "./AcpRegistryRuntimeCoordinator.ts";
-import { SUPPLEMENTAL_ACP_AGENT_RECORDS, appendMissingAgents } from "./supplementalAgents.ts";
+import {
+  SUPPLEMENTAL_ACP_AGENT_RECORDS,
+  appendMissingAgents,
+  supplementalPathCommand,
+} from "./supplementalAgents.ts";
 import * as PlatformError from "effect/PlatformError";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
@@ -1693,7 +1697,14 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
       const registry = yield* refreshRegistry();
       const agent = yield* findAgent(registry, input.agentId);
       const distribution = yield* compatibleDistribution(agent, "auto");
-      if (distribution.kind === "binary") {
+      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommand =
+        localCommandName === undefined
+          ? undefined
+          : resolveExecutable(localCommandName, platform, hostEnvironment);
+      if (localCommand !== undefined) {
+        yield* validateLocalExecutable(localCommand);
+      } else if (distribution.kind === "binary") {
         // Only explicit command overrides may use PATH copies with different ACP capabilities.
         yield* withInstallPermit(agent.id)(
           installBinary(agent, distribution.binaryTarget!).pipe(
@@ -1800,6 +1811,22 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
             } as const);
       }
 
+      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommand =
+        localCommandName === undefined
+          ? undefined
+          : resolveExecutable(localCommandName, platform, environment ?? hostEnvironment);
+      if (localCommand !== undefined) {
+        yield* validateLocalExecutable(localCommand);
+        return {
+          status: "ready",
+          agentId,
+          version: null,
+          distribution: "local",
+          ...(documentationUrl ? { documentationUrl } : {}),
+        } as const;
+      }
+
       if (distribution.kind === "binary") {
         return yield* withInstallPermit(agent.id)(
           Effect.gen(function* () {
@@ -1910,6 +1937,31 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
       let commandBinDirectory: string | undefined;
       const effectiveEnvironment = environment ?? hostEnvironment;
       const commandOverride = settings.commandPath.trim();
+      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommand =
+        commandOverride.length === 0 && localCommandName !== undefined
+          ? resolveExecutable(localCommandName, platform, effectiveEnvironment)
+          : undefined;
+      if (localCommand !== undefined) {
+        yield* validateLocalExecutable(localCommand);
+        const launched = launchLocalExecutable(
+          localCommand,
+          distribution.args,
+          effectiveEnvironment,
+        );
+        if (isAcpRegistryError(launched)) return yield* launched;
+        return {
+          agent,
+          distribution: "local",
+          spawn: {
+            command: launched.command,
+            args: launched.args,
+            cwd,
+            env: effectiveEnvironment,
+            shell: false,
+          },
+        } satisfies ResolvedAcpRegistryAgent;
+      }
       if (commandOverride.length > 0) {
         const resolvedOverride = resolveExecutable(commandOverride, platform, effectiveEnvironment);
         if (resolvedOverride === undefined) {
diff --git a/packages/provider-acp-registry/src/server/supplementalAgents.test.ts b/packages/provider-acp-registry/src/server/supplementalAgents.test.ts
index 238a1bf50f3ab..4200c87bd07d0 100644
--- a/packages/provider-acp-registry/src/server/supplementalAgents.test.ts
+++ b/packages/provider-acp-registry/src/server/supplementalAgents.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest";
 
 import { supplementalAcpAgents } from "./AcpRegistrySupport.ts";
-import { appendMissingAgents } from "./supplementalAgents.ts";
+import { appendMissingAgents, supplementalPathCommand } from "./supplementalAgents.ts";
 
 describe("supplemental ACP agents", () => {
   it("registers DeepSeek Harness and the ZCode bridge", () => {
@@ -18,6 +18,11 @@ describe("supplemental ACP agents", () => {
     );
   });
 
+  it("uses an installed dsh before downloading DeepSeek Harness", () => {
+    expect(supplementalPathCommand("deepseek-harness")).toBe("dsh");
+    expect(supplementalPathCommand("zcode-acp")).toBeUndefined();
+  });
+
   it("keeps an official entry when the same id is already published", () => {
     const official = { id: "deepseek-harness", name: "Official" };
     expect(appendMissingAgents([official], [{ id: "deepseek-harness", name: "Local" }])).toEqual([
diff --git a/packages/provider-acp-registry/src/server/supplementalAgents.ts b/packages/provider-acp-registry/src/server/supplementalAgents.ts
index 9562ad5d65d3f..82c0b655c4333 100644
--- a/packages/provider-acp-registry/src/server/supplementalAgents.ts
+++ b/packages/provider-acp-registry/src/server/supplementalAgents.ts
@@ -6,7 +6,7 @@ export const SUPPLEMENTAL_ACP_AGENT_RECORDS = [
     name: "DeepSeek Harness",
     version: "0.2.2-rc.1",
     description:
-      "DeepSeek Harness CLI. T3 installs dsh and starts it with --profile acp. Credentials stay in the dsh profile.",
+      "DeepSeek Harness CLI. T3 runs an installed dsh with --profile acp, and installs @deepseek-ai/dsh only when dsh is not already on PATH. Credentials stay in the dsh profile.",
     authors: ["DeepSeek"],
     license: "MIT",
     website: "https://github.com/deepseek-ai/deepseek-harness",
@@ -64,6 +64,11 @@ export const SUPPLEMENTAL_ACP_AGENT_RECORDS = [
   },
 ] as const;
 
+/** Prefer this PATH command over a fresh install. Absent for agents that must be downloaded. */
+export function supplementalPathCommand(agentId: string): string | undefined {
+  return agentId === "deepseek-harness" ? "dsh" : undefined;
+}
+
 export function appendMissingAgents<Agent extends { readonly id: string }>(
   agents: ReadonlyArray<Agent>,
   extra: ReadonlyArray<Agent>,

From 10c11e3530f4265f30a8a8de25df31957008c798 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 18:05:58 +0800
Subject: [PATCH 5/8] fix(acp): keep official DeepSeek installs and name the
 ZCode desktop

A PATH dsh is used only for the supplemental record. An official
deepseek-harness entry keeps its own distribution. The ZCode bridge
requires desktop 3.11.2.
---
 docs/user/providers-acp.md                    |   4 +-
 .../src/server/AcpRegistrySupport.test.ts     | 105 ++++++++++++++++++
 .../src/server/AcpRegistrySupport.ts          |  11 +-
 .../src/server/supplementalAgents.ts          |   2 +-
 4 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/docs/user/providers-acp.md b/docs/user/providers-acp.md
index 2389b64b1425f..6f79d9bc02aca 100644
--- a/docs/user/providers-acp.md
+++ b/docs/user/providers-acp.md
@@ -39,8 +39,8 @@ DeepSeek Harness is the `dsh` CLI. When `dsh` is already installed, T3 Code runs
 `--profile acp` and keeps the credentials already stored in its profile. Otherwise T3 Code installs
 `@deepseek-ai/dsh`. ACP mode is a profile, not a separate program, and the sign-in step can be
 skipped when the CLI advertises no login.
-ZCode still needs a compatible ZCode desktop installation. The bridge is unofficial. Select **Add**
-for either agent, then complete the sign-in step.
+ZCode still needs ZCode desktop 3.11.2. The unofficial bridge rejects other desktop versions. Select
+**Add** for either agent, then complete the sign-in step.
 
 ## Add a local command
 
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
index dc0d6565ce58f..b14792aea9bb9 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
@@ -1745,6 +1745,111 @@ describe("AcpRegistrySupport", () => {
       ),
     );
   });
+
+  it.effect("runs an installed dsh for the supplemental DeepSeek record", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cacheDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-acp-dsh-path-" });
+      const binDir = `${cacheDir}/bin`;
+      const dshPath = `${binDir}/dsh`;
+      yield* fileSystem.makeDirectory(binDir);
+      yield* fileSystem.writeFileString(dshPath, "#!/bin/sh\n");
+      yield* fileSystem.chmod(dshPath, 0o755);
+      const environment = { PATH: binDir };
+      const resolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
+        cacheDir,
+        toolsDir: `${cacheDir}/tools`,
+        registryUrl: "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json",
+      }).pipe(Effect.provideService(HostProcess.Environment, environment));
+      const deepseekSettings = decodeAcpRegistrySettings({ agentId: "deepseek-harness" });
+
+      expect(yield* resolver.prepare({ agentId: "deepseek-harness" })).toMatchObject({
+        agentId: "deepseek-harness",
+        prepared: true,
+      });
+      expect(yield* resolver.inspect(deepseekSettings, environment)).toMatchObject({
+        status: "ready",
+        distribution: "local",
+      });
+      const resolved = yield* resolver.resolve(deepseekSettings, "/workspace", environment);
+      expect(resolved.distribution).toBe("local");
+      expect(resolved.spawn.command.replaceAll("\\", "/")).toMatch(/\/bin\/dsh$/);
+      expect(resolved.spawn.args).toEqual(["--profile", "acp"]);
+      expect(resolved.spawn.shell).toBe(false);
+      expect(yield* fileSystem.exists(`${cacheDir}/tools`)).toBe(false);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        layerResolver((request) =>
+          Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(JSON.stringify({ version: "1.0.0", agents: [] })),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+
+  it.effect("keeps an official DeepSeek entry on its own distribution when dsh is installed", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cacheDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-acp-dsh-official-",
+      });
+      const binDir = `${cacheDir}/bin`;
+      yield* fileSystem.makeDirectory(binDir);
+      yield* fileSystem.writeFileString(`${binDir}/dsh`, "#!/bin/sh\n");
+      yield* fileSystem.chmod(`${binDir}/dsh`, 0o755);
+      const environment = { PATH: binDir };
+      const resolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
+        cacheDir,
+        toolsDir: `${cacheDir}/tools`,
+        registryUrl: "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json",
+      }).pipe(Effect.provideService(HostProcess.Environment, environment));
+      const deepseekSettings = decodeAcpRegistrySettings({ agentId: "deepseek-harness" });
+
+      const prepared = yield* resolver.prepare({ agentId: "deepseek-harness" }).pipe(Effect.flip);
+      expect(prepared.reason).toBe("runner_unavailable");
+      expect(yield* resolver.inspect(deepseekSettings, environment)).toMatchObject({
+        status: "missing_runner",
+        distribution: "npx",
+        runner: "npm",
+      });
+      const resolved = yield* resolver
+        .resolve(deepseekSettings, "/workspace", environment)
+        .pipe(Effect.flip);
+      expect(resolved.reason).toBe("runner_unavailable");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        layerResolver((request) =>
+          Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(
+                JSON.stringify({
+                  version: "1.0.0",
+                  agents: [
+                    {
+                      id: "deepseek-harness",
+                      name: "Official DeepSeek",
+                      version: "9.9.9",
+                      description: "Official registry entry",
+                      distribution: {
+                        npx: { package: "@official/deepseek-harness@9.9.9", args: ["acp"] },
+                      },
+                    },
+                  ],
+                }),
+              ),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
 });
 
 describe("acpRegistryManagedBinaryDirectories", () => {
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index 68cc1915a5086..4c072a7a98077 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -198,6 +198,11 @@ export const supplementalAcpAgents: ReadonlyArray<AcpRegistryAgent> =
     const decoded = decodeRegistryAgent(candidate);
     return Option.isSome(decoded) ? [decoded.value] : [];
   });
+const supplementalAgentSet = new Set<AcpRegistryAgent>(supplementalAcpAgents);
+
+function installedCommandForSupplementalAgent(agent: AcpRegistryAgent): string | undefined {
+  return supplementalAgentSet.has(agent) ? supplementalPathCommand(agent.id) : undefined;
+}
 const decodeJson = Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Unknown));
 const decodeNpmPackageManifest = Schema.decodeUnknownEffect(
   Schema.fromJsonString(NpmPackageManifest),
@@ -1697,7 +1702,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
       const registry = yield* refreshRegistry();
       const agent = yield* findAgent(registry, input.agentId);
       const distribution = yield* compatibleDistribution(agent, "auto");
-      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommandName = installedCommandForSupplementalAgent(agent);
       const localCommand =
         localCommandName === undefined
           ? undefined
@@ -1811,7 +1816,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
             } as const);
       }
 
-      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommandName = installedCommandForSupplementalAgent(agent);
       const localCommand =
         localCommandName === undefined
           ? undefined
@@ -1937,7 +1942,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
       let commandBinDirectory: string | undefined;
       const effectiveEnvironment = environment ?? hostEnvironment;
       const commandOverride = settings.commandPath.trim();
-      const localCommandName = supplementalPathCommand(agent.id);
+      const localCommandName = installedCommandForSupplementalAgent(agent);
       const localCommand =
         commandOverride.length === 0 && localCommandName !== undefined
           ? resolveExecutable(localCommandName, platform, effectiveEnvironment)
diff --git a/packages/provider-acp-registry/src/server/supplementalAgents.ts b/packages/provider-acp-registry/src/server/supplementalAgents.ts
index 82c0b655c4333..1f9cf904a93c9 100644
--- a/packages/provider-acp-registry/src/server/supplementalAgents.ts
+++ b/packages/provider-acp-registry/src/server/supplementalAgents.ts
@@ -23,7 +23,7 @@ export const SUPPLEMENTAL_ACP_AGENT_RECORDS = [
     name: "ZCode",
     version: "0.3.2",
     description:
-      "Unofficial ACP bridge for an installed ZCode desktop. T3 downloads zcode-acp and starts it.",
+      "Unofficial ACP bridge for ZCode desktop 3.11.2. Other desktop versions are rejected. T3 downloads zcode-acp and starts it.",
     authors: ["supermomonga"],
     website: "https://github.com/supermomonga/zcode-acp",
     repository: "https://github.com/supermomonga/zcode-acp",

From c95809d976399e831303bab37762fbcca14bad45 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 18:19:40 +0800
Subject: [PATCH 6/8] docs(acp): say an existing dsh is used before install

The registry section said T3 always installs both agents. DeepSeek uses
an installed dsh first.
---
 docs/user/providers-acp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user/providers-acp.md b/docs/user/providers-acp.md
index 6f79d9bc02aca..cba12d54d5f5c 100644
--- a/docs/user/providers-acp.md
+++ b/docs/user/providers-acp.md
@@ -28,7 +28,7 @@ provider instance's environment overrides to use ACP v1.
 Search only shows agents that can run on the connected server. Registry agents are third-party
 code; review an agent's source and license before adding it.
 
-Search also lists DeepSeek Harness and ZCode. T3 Code installs those itself:
+Search also lists DeepSeek Harness and ZCode. T3 Code installs an agent when that command is not already available:
 
 | Agent                                                               | What T3 Code runs                                       |
 | ------------------------------------------------------------------- | ------------------------------------------------------- |

From df1674643455d2546527b2f5f2f320c89e175627 Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 18:36:21 +0800
Subject: [PATCH 7/8] fix(acp): anchor Windows npm shims before spawn

A relative shim resolves node.exe beside that file before PATH. The
script path is absolute, so the agent working directory cannot redirect it.
---
 .../src/server/AcpRegistrySupport.test.ts     | 79 +++++++++++++++++++
 .../src/server/AcpRegistrySupport.ts          | 20 ++++-
 2 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
index b14792aea9bb9..7651b8f26d201 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
@@ -1,3 +1,4 @@
+import * as NodePath from "node:path";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
@@ -283,6 +284,84 @@ describe("AcpRegistrySupport", () => {
     );
   });
 
+  it.effect("anchors a relative Windows npm shim to the server directory", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const cacheDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-acp-relative-shim-",
+      });
+      const shimDir = path.join(cacheDir, "npm");
+      const scriptPath = path.join(shimDir, "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js");
+      const shimPath = path.join(shimDir, "dsh.cmd");
+      const nodePath = path.join(shimDir, "node.exe");
+      const decoyDir = path.join(cacheDir, "decoy");
+      const decoyNode = path.join(decoyDir, "node.exe");
+      yield* fileSystem.makeDirectory(path.dirname(scriptPath), { recursive: true });
+      yield* fileSystem.makeDirectory(decoyDir, { recursive: true });
+      yield* fileSystem.writeFileString(scriptPath, "");
+      yield* fileSystem.writeFileString(nodePath, "");
+      yield* fileSystem.writeFileString(decoyNode, "");
+      yield* fileSystem.writeFileString(
+        shimPath,
+        [
+          "@ECHO off",
+          "GOTO start",
+          ":find_dp0",
+          "SET dp0=%~dp0",
+          "EXIT /b",
+          ":start",
+          "SETLOCAL",
+          "CALL :find_dp0",
+          'IF EXIST "%dp0%\\node.exe" (',
+          '  SET "_prog=%dp0%\\node.exe"',
+          ") ELSE (",
+          '  SET "_prog=node"',
+          "  SET PATHEXT=%PATHEXT:;.JS;=;%",
+          ")",
+          'endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js" %*',
+          "",
+        ].join("\n"),
+      );
+      const relativeShim = NodePath.relative(process.cwd(), shimPath);
+      const environment = { PATH: [decoyDir, shimDir].join(path.delimiter), PATHEXT: ".EXE;.CMD" };
+      const resolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
+        cacheDir,
+        toolsDir: `${cacheDir}/tools`,
+        registryUrl,
+      }).pipe(
+        Effect.provideService(HostProcess.Platform, "win32"),
+        Effect.provideService(HostProcess.Environment, environment),
+      );
+      const resolved = yield* resolver.resolve(
+        decodeAcpRegistrySettings({
+          source: "local",
+          commandPath: relativeShim,
+          commandArgs: ["--profile", "acp"],
+        }),
+        "/workspace",
+        environment,
+      );
+      const spawnCommand = resolved.spawn.command.replaceAll("\\", "/");
+      const scriptArg = String(resolved.spawn.args[0]).replaceAll("\\", "/");
+      expect(
+        NodePath.isAbsolute(resolved.spawn.command) || /^[A-Za-z]:/u.test(resolved.spawn.command),
+      ).toBe(true);
+      expect(spawnCommand.endsWith("/node.exe")).toBe(true);
+      expect(spawnCommand.includes("/decoy/")).toBe(false);
+      expect(scriptArg.endsWith("/node_modules/@deepseek-ai/dsh/lib/bin.js")).toBe(true);
+      expect(
+        NodePath.isAbsolute(String(resolved.spawn.args[0])) ||
+          /^[A-Za-z]:/u.test(String(resolved.spawn.args[0])),
+      ).toBe(true);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        layerResolver(() => Effect.die("unexpected registry request for a local provider")),
+      ),
+    ),
+  );
+
   it.effect("resolves a local executable path and inherits the host environment", () =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index 4c072a7a98077..06adbbcfce91c 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -21,6 +21,7 @@ import {
   resolveSpawnCommand,
   SpawnExecutableResolution,
 } from "@t3tools/shared/shell";
+import * as NodePath from "node:path";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
@@ -642,6 +643,13 @@ function searchRank(agent: AcpRegistryAgent, query: string): number | undefined
   return undefined;
 }
 
+function absoluteSpawnPath(filePath: string): string {
+  if (NodePath.win32.isAbsolute(filePath) || NodePath.posix.isAbsolute(filePath)) return filePath;
+  // A drive-relative path such as C:dsh.cmd has no slash. Keep it on that drive.
+  if (/^[A-Za-z]:/u.test(filePath)) return NodePath.win32.resolve(filePath);
+  return NodePath.resolve(filePath);
+}
+
 export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(function* (
   input: AcpRegistryCatalogOptions,
 ): Effect.fn.Return<
@@ -1748,16 +1756,22 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
   ) => {
     const script = platform === "win32" ? npmShimScript(command) : undefined;
     if (script === undefined) return { command, args };
+    const absoluteCommand = absoluteSpawnPath(command);
+    const separatorIndex = Math.max(
+      absoluteCommand.lastIndexOf("/"),
+      absoluteCommand.lastIndexOf("\\"),
+    );
+    const adjacentNode =
+      separatorIndex >= 0 ? `${absoluteCommand.slice(0, separatorIndex + 1)}node.exe` : "node.exe";
     const node =
-      resolveExecutable(command.replace(/[^\\/]+$/u, "node.exe"), platform, env) ??
-      resolveExecutable("node", platform, env);
+      resolveExecutable(adjacentNode, platform, env) ?? resolveExecutable("node", platform, env);
     if (node === undefined) {
       return new AcpRegistryError({
         reason: "runner_unavailable",
         detail: "Node.js is required to launch this npm ACP command.",
       });
     }
-    return { command: node, args: [script, ...args] };
+    return { command: absoluteSpawnPath(node), args: [absoluteSpawnPath(script), ...args] };
   };
 
   const inspect: AcpRegistryCatalog["Service"]["inspect"] = Effect.fn("AcpRegistryCatalog.inspect")(

From 1d21ef871c192cdb1096a03da3b41fecc52c50af Mon Sep 17 00:00:00 2001
From: malevrigns <99654957+malevrigns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 18:43:14 +0800
Subject: [PATCH 8/8] fix(acp): resolve shim paths with Effect Path

The type checker rejects node:path. Absolute shim paths now use the Path
service already available in the catalog.
---
 .../src/server/AcpRegistrySupport.test.ts              |  9 ++++-----
 .../src/server/AcpRegistrySupport.ts                   | 10 ++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
index 7651b8f26d201..ef34995d02503 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
@@ -1,4 +1,3 @@
-import * as NodePath from "node:path";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
@@ -323,8 +322,8 @@ describe("AcpRegistrySupport", () => {
           "",
         ].join("\n"),
       );
-      const relativeShim = NodePath.relative(process.cwd(), shimPath);
-      const environment = { PATH: [decoyDir, shimDir].join(path.delimiter), PATHEXT: ".EXE;.CMD" };
+      const relativeShim = path.relative(process.cwd(), shimPath);
+      const environment = { PATH: [decoyDir, shimDir].join(";"), PATHEXT: ".EXE;.CMD" };
       const resolver = yield* AcpRegistrySupport.makeAcpRegistryCatalog({
         cacheDir,
         toolsDir: `${cacheDir}/tools`,
@@ -345,13 +344,13 @@ describe("AcpRegistrySupport", () => {
       const spawnCommand = resolved.spawn.command.replaceAll("\\", "/");
       const scriptArg = String(resolved.spawn.args[0]).replaceAll("\\", "/");
       expect(
-        NodePath.isAbsolute(resolved.spawn.command) || /^[A-Za-z]:/u.test(resolved.spawn.command),
+        path.isAbsolute(resolved.spawn.command) || /^[A-Za-z]:/u.test(resolved.spawn.command),
       ).toBe(true);
       expect(spawnCommand.endsWith("/node.exe")).toBe(true);
       expect(spawnCommand.includes("/decoy/")).toBe(false);
       expect(scriptArg.endsWith("/node_modules/@deepseek-ai/dsh/lib/bin.js")).toBe(true);
       expect(
-        NodePath.isAbsolute(String(resolved.spawn.args[0])) ||
+        path.isAbsolute(String(resolved.spawn.args[0])) ||
           /^[A-Za-z]:/u.test(String(resolved.spawn.args[0])),
       ).toBe(true);
     }).pipe(
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
index 06adbbcfce91c..70550ae60712c 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
@@ -21,7 +21,6 @@ import {
   resolveSpawnCommand,
   SpawnExecutableResolution,
 } from "@t3tools/shared/shell";
-import * as NodePath from "node:path";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
@@ -643,13 +642,6 @@ function searchRank(agent: AcpRegistryAgent, query: string): number | undefined
   return undefined;
 }
 
-function absoluteSpawnPath(filePath: string): string {
-  if (NodePath.win32.isAbsolute(filePath) || NodePath.posix.isAbsolute(filePath)) return filePath;
-  // A drive-relative path such as C:dsh.cmd has no slash. Keep it on that drive.
-  if (/^[A-Za-z]:/u.test(filePath)) return NodePath.win32.resolve(filePath);
-  return NodePath.resolve(filePath);
-}
-
 export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(function* (
   input: AcpRegistryCatalogOptions,
 ): Effect.fn.Return<
@@ -669,6 +661,8 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
     digester.digest(Digest.sha256, data).pipe(Effect.map(Hex.encode), Effect.orDie);
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
+  const absoluteSpawnPath = (filePath: string) =>
+    path.isAbsolute(filePath) ? filePath : path.resolve(filePath);
   const httpClient = yield* HttpClient.HttpClient;
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const { settings: hostSettings } = yield* ProviderHost.ProviderHost;