Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

feat: install Claude ACP connector from settings

tianma-ifcc85f652f164
diff --git a/apps/desktop/src/main/acp-adapter-manager.mjs b/apps/desktop/src/main/acp-adapter-manager.mjs
index f67cc072..62bfec94 100644
--- a/apps/desktop/src/main/acp-adapter-manager.mjs
+++ b/apps/desktop/src/main/acp-adapter-manager.mjs
@@ -16,7 +16,10 @@ const PI_PACKAGE_URL = "https://registry.npmjs.org/pi-acp/latest";
export const MAX_ARCHIVE_BYTES = 500 * 1024 * 1024;
export const MAX_EXTRACTED_BYTES = 2 * 1024 * 1024 * 1024;
const VERSION_PATTERN = /^\d+\.\d+\.\d+$/;
-const SUPPORTED_MAJOR = { codex: 2, antigravity: 1 };
+const SUPPORTED_MAJOR = { codex: 2, claudeCode: 0, antigravity: 1 };
+const NPM_PACKAGES = { codex: "@agentclientprotocol/codex-acp", claudeCode: "@agentclientprotocol/claude-agent-acp", piAgent: "pi-acp" };
+const MANAGED_IDS = ["codex", "claudeCode", "antigravity", "piAgent"];
+const npmEntryFile = (root, id) => path.join(root, "node_modules", ...NPM_PACKAGES[id].split("/"), "dist", "index.js");
const platformTarget = (platform, arch) => {
const system = { darwin: "darwin", linux: "linux", win32: "windows" }[platform];
@@ -33,12 +36,12 @@ const compareVersions = (left, right) => {
const commandFile = (root, id, version, platform) => id === "antigravity"
? path.join(root, id, version, platform === "win32" ? "agy_acp_server.exe" : "agy_acp_server.par")
- : path.join(root, id, version, "node_modules", ...(id === "codex" ? ["@agentclientprotocol", "codex-acp"] : ["pi-acp"]), "dist", "index.js");
+ : npmEntryFile(path.join(root, id, version), id);
const antigravityArgs = (platform) => platform === "linux" ? ["--uid="] : [];
export const managedAdapterCommand = (root, id, version, { platform = process.platform, executablePath = process.execPath } = {}) => {
- if (!VERSION_PATTERN.test(version) || !["codex", "antigravity", "piAgent"].includes(id)) return null;
+ if (!VERSION_PATTERN.test(version) || !MANAGED_IDS.includes(id)) return null;
const file = commandFile(root, id, version, platform);
if (!existsSync(file)) return null;
return id !== "antigravity"
@@ -74,12 +77,12 @@ const readPiRelease = async (fetchImpl) => {
};
export const selectAdapterRelease = (agents, id, { platform = process.platform, arch = process.arch } = {}) => {
- const entry = agents.find((agent) => agent?.id === (id === "codex" ? "codex-acp" : "antigravity-acp"));
+ const entry = agents.find((agent) => agent?.id === ({ codex: "codex-acp", claudeCode: "claude-acp", antigravity: "antigravity-acp" }[id]));
if (!entry || !VERSION_PATTERN.test(entry.version)) throw new Error("unsupported_release");
if (Number(entry.version.split(".")[0]) !== SUPPORTED_MAJOR[id]) throw new Error("unsupported_release");
- if (id === "codex") {
+ if (id === "codex" || id === "claudeCode") {
const packageName = entry.distribution?.npx?.package;
- if (packageName !== `@agentclientprotocol/codex-acp@${entry.version}`) throw new Error("unsupported_release");
+ if (packageName !== `${NPM_PACKAGES[id]}@${entry.version}`) throw new Error("unsupported_release");
return { id, version: entry.version, kind: "npm", packageName };
}
const target = platformTarget(platform, arch);
@@ -216,7 +219,7 @@ export function createAcpAdapterManager({ root, fetchImpl = fetch, platform = pr
};
const install = (id, validate, { updateOnly = false } = {}) => {
- if (!["codex", "antigravity", "piAgent"].includes(id)) return Promise.reject(new Error("unknown_adapter"));
+ if (!MANAGED_IDS.includes(id)) return Promise.reject(new Error("unknown_adapter"));
if (inFlight.has(id)) return inFlight.get(id);
const task = (async () => {
const previous = get(id);
@@ -241,7 +244,7 @@ export function createAcpAdapterManager({ root, fetchImpl = fetch, platform = pr
}
// Inspect the staged command before making it visible to future sessions.
const stagedFile = release.kind === "npm"
- ? path.join(stage, "node_modules", ...(id === "codex" ? ["@agentclientprotocol", "codex-acp"] : ["pi-acp"]), "dist", "index.js")
+ ? npmEntryFile(stage, id)
: path.join(stage, platform === "win32" ? "agy_acp_server.exe" : "agy_acp_server.par");
if (!existsSync(stagedFile)) throw new Error("adapter_install_failed");
const stagedCommand = release.kind === "npm"
@@ -269,7 +272,7 @@ export function createAcpAdapterManager({ root, fetchImpl = fetch, platform = pr
};
const prune = async () => {
- for (const id of ["codex", "antigravity", "piAgent"]) {
+ for (const id of MANAGED_IDS) {
const current = get(id)?.version;
const folder = path.join(root, id);
const names = await readdir(folder).catch(() => []);
@@ -284,5 +287,5 @@ export function createAcpAdapterManager({ root, fetchImpl = fetch, platform = pr
};
- return { get, install, prune, installedIds: () => ["codex", "antigravity", "piAgent"].filter((id) => get(id)) };
+ return { get, install, prune, installedIds: () => MANAGED_IDS.filter((id) => get(id)) };
}
diff --git a/apps/desktop/src/main/acp-adapter-manager.test.mjs b/apps/desktop/src/main/acp-adapter-manager.test.mjs
index 5bc6c1c9..c680e0df 100644
--- a/apps/desktop/src/main/acp-adapter-manager.test.mjs
+++ b/apps/desktop/src/main/acp-adapter-manager.test.mjs
@@ -42,6 +42,45 @@ describe("managed ACP adapters", () => {
await rm(root, { recursive: true, force: true });
}
});
+ test("installs Claude, preserves a working version on failed updates, and restores it after restart", async () => {
+ const root = await mkdtemp(path.join(tmpdir(), "edgeever-managed-claude-"));
+ let version = "0.88.0";
+ const entry = () => ({ id: "claude-acp", version, distribution: { npx: { package: `@agentclientprotocol/claude-agent-acp@${version}` } } });
+ expect(selectAdapterRelease([entry()], "claudeCode").packageName).toBe("@agentclientprotocol/[email protected]");
+ expect(() => selectAdapterRelease([{ ...entry(), distribution: { npx: { package: "[email protected]" } } }], "claudeCode")).toThrow("unsupported_release");
+ expect(() => selectAdapterRelease([{ ...entry(), version: "1.0.0" }], "claudeCode")).toThrow("unsupported_release");
+ const options = {
+ root,
+ executablePath: "/usr/bin/node",
+ fetchImpl: async () => new Response(JSON.stringify({ agents: [entry()] })),
+ installNpmImpl: async (args, stage) => {
+ expect(args).toContain(`@agentclientprotocol/claude-agent-acp@${version}`);
+ expect(args).toContain("--ignore-scripts");
+ const folder = path.join(stage, "node_modules", "@agentclientprotocol", "claude-agent-acp", "dist");
+ await mkdir(folder, { recursive: true });
+ await writeFile(path.join(folder, "index.js"), "// fake Claude adapter");
+ },
+ };
+ const manager = createAcpAdapterManager(options);
+ try {
+ await manager.install("claudeCode", async () => ({ state: "available" }));
+ expect(manager.installedIds()).toEqual(["claudeCode"]);
+ expect(manager.get("claudeCode").command.args[0]).toContain("claude-agent-acp");
+ version = "0.89.0";
+ await expect(manager.install("claudeCode", async () => ({ state: "failed", detail: "handshake_failed" }), { updateOnly: true })).rejects.toThrow("handshake_failed");
+ expect(createAcpAdapterManager(options).get("claudeCode").version).toBe("0.88.0");
+ await expect(manager.install("claudeCode", async (command) => ({ state: command.args[0].includes(".stage-") ? "needs_login" : "available" }), { updateOnly: true })).rejects.toThrow("adapter_probe_failed");
+ expect(manager.get("claudeCode").version).toBe("0.88.0");
+ await manager.install("claudeCode", async () => ({ state: "needs_login" }), { updateOnly: true });
+ expect(createAcpAdapterManager(options).get("claudeCode").version).toBe("0.89.0");
+ expect((await manager.install("claudeCode", async () => ({ state: "available" }))).updated).toBe(false);
+ await manager.prune();
+ expect((await readdir(path.join(root, "claudeCode"))).sort()).toEqual(["0.88.0", "0.89.0"]);
+ } finally {
+ await rm(root, { recursive: true, force: true });
+ }
+ });
+
test("accepts only the supported official distribution and platform command", () => {
expect(selectAdapterRelease([codexEntry("2.0.1")], "codex").version).toBe("2.0.1");
expect(() => selectAdapterRelease([{ ...codexEntry("2.0.1"), distribution: { npx: { package: "[email protected]" } } }], "codex")).toThrow("unsupported_release");
diff --git a/apps/web/src/components/settings/DesktopAcpAgentCard.tsx b/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
index c1f69dde..efc15eb0 100644
--- a/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
+++ b/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
@@ -163,7 +163,7 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
};
const install = async () => {
- if (adapterId !== "codex" && adapterId !== "antigravity" && adapterId !== "piAgent") return;
+ if (adapterId !== "codex" && adapterId !== "claudeCode" && adapterId !== "antigravity" && adapterId !== "piAgent") return;
setInstalling(true);
setInstallError(false);
try {
@@ -358,7 +358,7 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
) : null}
</div>
<div className="flex shrink-0 items-center gap-2">
- {shown?.state === "not_installed" && (adapterId === "codex" || adapterId === "antigravity" || (adapterId === "piAgent" && shown?.detail === "adapter_missing")) ? (
+ {shown?.state === "not_installed" && (adapterId === "codex" || adapterId === "claudeCode" || adapterId === "antigravity" || (adapterId === "piAgent" && shown?.detail === "adapter_missing")) ? (
<Button type="button" variant="outline" size="sm" className="h-8 bg-card text-xs font-normal" disabled={installing || probing} onClick={() => void install()}>
{installing ? t("aiAssistant.agentSource.installing") : t("aiAssistant.agentSource.install")}
</Button>
@@ -379,7 +379,7 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
{hasDetails ? (
<div className="space-y-2">
{shown?.state === "not_installed" ? (
- <p className="text-xs leading-relaxed text-slate-600">
+ <p className={adapterId === "claudeCode" ? "text-[11px] leading-4 text-slate-500" : "text-xs leading-relaxed text-slate-600"}>
{t(adapterId === "claudeCode" ? "aiAssistant.agentSource.claudeCodeMissingHint" : adapterId === "openClaw" ? "aiAssistant.agentSource.openClawMissingHint" : adapterId === "hermesAgent" ? "aiAssistant.agentSource.hermesAgentMissingHint" : adapterId === "grokBuild" ? "aiAssistant.agentSource.grokBuildMissingHint" : adapterId === "deepseekHarness" ? "aiAssistant.agentSource.deepseekHarnessMissingHint" : adapterId === "piAgent" ? shown.detail === "adapter_missing" ? "aiAssistant.agentSource.piAgentAdapterMissingHint" : "aiAssistant.agentSource.piAgentMissingHint" : adapterId === "workbuddyCn" || adapterId === "workbuddyIntl" ? "aiAssistant.agentSource.workbuddyMissingHint" : "aiAssistant.agentSource.installHint")}
</p>
) : null}
diff --git a/apps/web/src/lib/desktop-acp.ts b/apps/web/src/lib/desktop-acp.ts
index 10be9003..3aec6d80 100644
--- a/apps/web/src/lib/desktop-acp.ts
+++ b/apps/web/src/lib/desktop-acp.ts
@@ -174,7 +174,7 @@ export const probeDesktopAcpAdapter = async (input: { id: DesktopAcpAdapterId; p
return desktop.probeAcpAdapter(input);
};
-export const installDesktopAcpAdapter = async (id: Extract<DesktopAcpAdapterId, "codex" | "antigravity" | "piAgent">) => {
+export const installDesktopAcpAdapter = async (id: Extract<DesktopAcpAdapterId, "codex" | "claudeCode" | "antigravity" | "piAgent">) => {
const desktop = bridge();
if (!desktop?.installAcpAdapter) throw new Error("desktop_acp_unavailable");
return desktop.installAcpAdapter(id);
diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts
index 6ed28853..7a5b874c 100644
--- a/apps/web/src/vite-env.d.ts
+++ b/apps/web/src/vite-env.d.ts
@@ -130,8 +130,8 @@ interface EdgeEverDesktopBridge {
managed?: boolean;
authMethods?: Array<{ id: string; name: string }>;
}>;
- installAcpAdapter?(id: "codex" | "antigravity" | "piAgent"): Promise<{ updated: boolean; version?: string; adapter?: {
- id: "codex" | "antigravity" | "piAgent";
+ installAcpAdapter?(id: "codex" | "claudeCode" | "antigravity" | "piAgent"): Promise<{ updated: boolean; version?: string; adapter?: {
+ id: "codex" | "claudeCode" | "antigravity" | "piAgent";
label: string;
state: "not_installed" | "needs_login" | "available" | "failed";
detail?: string;
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 3a0af440..bb5634f3 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -1521,7 +1521,7 @@ export const enUS = {
install: "Install connector",
installHint: "When a local agent is detected, its connector downloads from the official source. This may exceed 100 MiB; updates are checked automatically.",
claudeCodeNotFound: "Claude Code ACP connector not found",
- claudeCodeMissingHint: "Run npm install -g @agentclientprotocol/claude-agent-acp and make sure claude-agent-acp runs from your shell. This connector is maintained by the ACP project.",
+ claudeCodeMissingHint: "Click “Install connector” to let EdgeEver install it and check the connection.",
openClawNotFound: "OpenClaw CLI not found",
openClawMissingHint: "Install the OpenClaw CLI and start its Gateway. EdgeEver connects using openclaw acp.",
openClawNoteAccessHint: "OpenClaw ACP does not accept session MCP servers. To access EdgeEver notes, configure EdgeEver MCP in the OpenClaw Gateway and check the instance and account.",
diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts
index 869fd694..5214f1e0 100644
--- a/packages/shared/src/i18n/ja.ts
+++ b/packages/shared/src/i18n/ja.ts
@@ -1521,7 +1521,7 @@ export const ja = {
install: "接続コンポーネントをインストール",
installHint: "ローカルのエージェントを検出すると、公式配布元からダウンロードします。100 MiB を超える場合があり、インストール後は更新を自動確認します。",
claudeCodeNotFound: "Claude Code ACP 接続コンポーネントが見つかりません",
- claudeCodeMissingHint: "npm install -g @agentclientprotocol/claude-agent-acp を実行し、claude-agent-acp をコマンドラインから実行できるようにしてください。この接続コンポーネントは ACP プロジェクトが提供します。",
+ claudeCodeMissingHint: "「接続コンポーネントをインストール」をクリックすると、EdgeEver がインストールして接続を確認します。",
openClawNotFound: "OpenClaw CLI が見つかりません",
openClawMissingHint: "OpenClaw CLI をインストールして Gateway を起動してください。EdgeEver は openclaw acp で接続します。",
openClawNoteAccessHint: "OpenClaw ACP はセッション MCP サーバーを受け付けません。EdgeEver のノートにアクセスするには、OpenClaw Gateway で EdgeEver MCP を別途設定し、インスタンスとアカウントを確認してください。",
diff --git a/packages/shared/src/i18n/pl.ts b/packages/shared/src/i18n/pl.ts
index f9e43392..de2f015f 100644
--- a/packages/shared/src/i18n/pl.ts
+++ b/packages/shared/src/i18n/pl.ts
@@ -1521,7 +1521,7 @@ export const pl = {
install: "Zainstaluj konektor",
installHint: "Po wykryciu lokalnego agenta jego konektor jest pobierany z oficjalnego źródła. Może zajmować ponad 100 MiB; aktualizacje są sprawdzane automatycznie.",
claudeCodeNotFound: "Nie znaleziono konektora Claude Code ACP",
- claudeCodeMissingHint: "Uruchom npm install -g @agentclientprotocol/claude-agent-acp i upewnij się, że polecenie claude-agent-acp działa w Twojej powłoce. Ten konektor jest utrzymywany przez projekt ACP.",
+ claudeCodeMissingHint: "Kliknij „Zainstaluj konektor”, aby EdgeEver zainstalował go i sprawdził połączenie.",
openClawNotFound: "Nie znaleziono OpenClaw CLI",
openClawMissingHint: "Zainstaluj OpenClaw CLI i uruchom jego Gateway. EdgeEver łączy się za pomocą openclaw acp.",
openClawNoteAccessHint: "OpenClaw ACP nie akceptuje serwerów MCP sesji. Aby uzyskać dostęp do notatek EdgeEver, skonfiguruj EdgeEver MCP w OpenClaw Gateway i sprawdź instancję oraz konto.",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index ccffbd5b..c59c87e7 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -1521,7 +1521,7 @@ export const zhCN = {
install: "安装连接组件",
installHint: "检测到本机 Agent 后会从官方来源下载,可能超过 100 MiB;安装后会自动检查更新。",
claudeCodeNotFound: "未找到 Claude Code ACP 连接组件",
- claudeCodeMissingHint: "请运行 npm install -g @agentclientprotocol/claude-agent-acp,并确保 claude-agent-acp 可从命令行运行。此连接组件由 ACP 项目提供。",
+ claudeCodeMissingHint: "点击“安装连接组件”,EdgeEver 会自动安装并检查连接。",
openClawNotFound: "未找到 OpenClaw CLI",
openClawMissingHint: "请安装 OpenClaw CLI 并启动 Gateway。EdgeEver 使用 openclaw acp 连接。",
openClawNoteAccessHint: "OpenClaw ACP 不接受会话级 MCP 服务;如需访问 EdgeEver 笔记,请在 OpenClaw Gateway 中单独配置 EdgeEver MCP,并核对实例和账号。",