jerry/claude-agent-acp
1
0
Fork 0
mirror of https://github.com/agentclientprotocol/claude-agent-acp.git synced 2026-10-27 04:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Setup linter (#12)

Browse Source 
Fixes basic issues. For now, we're still allowing `any`, but it'd be
nice to move away from it.
This commit is contained in:
Agus Zubiaga
2025-09-02 19:06:32 -03:00
committed by GitHub
parent 28f36d7474
commit a3038d383f
12 changed files with 1935 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.eslintignore Normal file
View File

@@ -0,0 +1,6 @@
node_modules/
dist/
coverage/
*.min.js
*.config.js
.github/

33
.eslintrc.json Normal file
View File

@@ -0,0 +1,33 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": ["@typescript-eslint"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
"env": {
"node": true,
"es2020": true
},
"rules": {
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{
"argsIgnorePattern": "^_"
}
],
"no-console": "off",
"no-constant-condition": "off",
"default-case": "error",
"prefer-const": "error",
"no-var": "error",
"eqeqeq": ["error", "always"],
"curly": ["error", "all"]
},
"ignorePatterns": ["dist", "node_modules", "*.js"]
}

3
.github/workflows/ci.yml vendored
View File

@@ -35,6 +35,9 @@ jobs:
- name: Check formatting
run: npm run format:check
- name: Run linter
run: npm run lint
- name: Build
run: npm run build

4
.prettierrc.json Normal file
View File

@@ -0,0 +1,4 @@
{
"printWidth": 100,
"tabWidth": 2
}

1535
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

7
package.json
View File

@@ -14,8 +14,11 @@
"build": "tsc",
"start": "node dist/index.js",
"dev": "npm run build && npm run start",
"lint": "eslint src --ext .ts",
"lint:fix": "eslint src --ext .ts --fix",
"format": "prettier --write .",
"format:check": "prettier --check .",
"check": "npm run lint && npm run format:check",
"test": "vitest",
"test:integration": "RUN_INTEGRATION_TESTS=true vitest run",
"test:run": "vitest run",
@@ -46,7 +49,11 @@
"@types/minimist": "^1.2.5",
"@types/node": "^24.3.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.42.0",
"@typescript-eslint/parser": "^8.42.0",
"@vitest/ui": "^3.2.4",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"prettier": "^3.6.2",
"ts-node": "^10.9.2",
"typescript": "^5.4.0",

92
src/acp-agent.ts
View File

@@ -31,21 +31,11 @@ import * as fs from "node:fs";
import * as path from "node:path";
import * as os from "node:os";
import { v7 as uuidv7 } from "uuid";
import {
nodeToWebReadable,
nodeToWebWritable,
Pushable,
sleep,
unreachable,
} from "./utils.js";
import { nodeToWebReadable, nodeToWebWritable, Pushable, sleep, unreachable } from "./utils.js";
import { SessionNotification } from "@zed-industries/agent-client-protocol";
import { createMcpServer } from "./mcp-server.js";
import { AddressInfo } from "node:net";
import {
toolInfoFromToolUse,
planEntries,
toolUpdateFromToolResult,
} from "./tools.js";
import { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult } from "./tools.js";
type Session = {
query: Query;
@@ -64,14 +54,18 @@ type BackgroundTerminal =
pendingOutput: TerminalOutputResponse;
};
type ToolUseCache = {
[key: string]: { type: "tool_use"; id: string; name: string; input: any };
};
// Implement the ACP Agent interface
export class ClaudeAcpAgent implements Agent {
sessions: {
[key: string]: Session;
};
client: AgentSideConnection;
toolUseCache: { [key: string]: any };
fileContentCache: { [key: string]: any };
toolUseCache: ToolUseCache;
fileContentCache: { [key: string]: string };
backgroundTerminals: { [key: string]: BackgroundTerminal } = {};
clientCapabilities?: ClientCapabilities;
@@ -108,8 +102,8 @@ export class ClaudeAcpAgent implements Agent {
};
}
async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
let sessionId = uuidv7();
let input = new Pushable<SDKUserMessage>();
const sessionId = uuidv7();
const input = new Pushable<SDKUserMessage>();
const mcpServers: Record<string, McpServerConfig> = {};
if (Array.isArray(params.mcpServers)) {
@@ -125,12 +119,8 @@ export class ClaudeAcpAgent implements Agent {
}
}
let server = await createMcpServer(
this,
sessionId,
this.clientCapabilities,
);
let address = server.address() as AddressInfo;
const server = await createMcpServer(this, sessionId, this.clientCapabilities);
const address = server.address() as AddressInfo;
mcpServers["acp"] = {
type: "http",
url: "http://127.0.0.1:" + address.port + "/mcp",
@@ -139,7 +129,7 @@ export class ClaudeAcpAgent implements Agent {
},
};
let options: Options = {
const options: Options = {
cwd: params.cwd,
mcpServers,
permissionPromptToolName: "mcp__acp__permission",
@@ -200,7 +190,7 @@ export class ClaudeAcpAgent implements Agent {
input.push(promptToClaude(params));
while (true) {
let { value: message, done } = await query.next();
const { value: message, done } = await query.next();
if (done || !message) {
if (this.sessions[params.sessionId].cancelled) {
return { stopReason: "cancelled" };
@@ -238,8 +228,8 @@ export class ClaudeAcpAgent implements Agent {
}
if (
message.message.model == "<synthetic>" &&
message.message.content.length == 1 &&
message.message.model === "<synthetic>" &&
message.message.content.length === 1 &&
message.message.content[0].text.includes("Please run /login")
) {
throw RequestError.authRequired();
@@ -269,28 +259,22 @@ export class ClaudeAcpAgent implements Agent {
await this.sessions[params.sessionId].query.interrupt();
}
async readTextFile(
params: ReadTextFileRequest,
): Promise<ReadTextFileResponse> {
let response = await this.client.readTextFile(params);
async readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
const response = await this.client.readTextFile(params);
if (!params.limit && !params.line) {
this.fileContentCache[params.path] = response.content;
}
return response;
}
async writeTextFile(
params: WriteTextFileRequest,
): Promise<WriteTextFileResponse> {
let response = await this.client.writeTextFile(params);
async writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
const response = await this.client.writeTextFile(params);
this.fileContentCache[params.path] = params.content;
return response;
}
}
async function availableSlashCommands(
query: Query,
): Promise<AvailableCommand[]> {
async function availableSlashCommands(query: Query): Promise<AvailableCommand[]> {
const UNSUPPORTED_COMMANDS = [
"add-dir",
"agents", // Modal
@@ -342,28 +326,17 @@ async function availableSlashCommands(
]);
return commands
.map(
(command: {
name: string;
description: string;
argumentHint: string;
}) => {
const input = command.argumentHint
? { hint: command.argumentHint }
: null;
.map((command: { name: string; description: string; argumentHint: string }) => {
const input = command.argumentHint ? { hint: command.argumentHint } : null;
return {
name: command.name,
description: command.description || "",
input,
};
},
)
})
.filter(
(command: AvailableCommand) =>
!(
command.name.match(/\(MCP\)/) ||
UNSUPPORTED_COMMANDS.includes(command.name)
),
!(command.name.match(/\(MCP\)/) || UNSUPPORTED_COMMANDS.includes(command.name)),
);
}
@@ -462,13 +435,11 @@ function promptToClaude(prompt: PromptRequest): SDKUserMessage {
export function toAcpNotifications(
message: SDKAssistantMessage | SDKUserMessage,
sessionId: string,
toolUseCache: {
[key: string]: { type: "tool_use"; id: string; name: string; input: any };
},
toolUseCache: ToolUseCache,
fileContentCache: { [key: string]: string },
): SessionNotification[] {
let chunks = message.message.content as ContentChunk[];
let output = [];
const chunks = message.message.content as ContentChunk[];
const output = [];
// Only handle the first chunk for streaming; extend as needed for batching
for (const chunk of chunks) {
let update: SessionNotification["update"] | null = null;
@@ -488,8 +459,7 @@ export function toAcpNotifications(
content: {
type: "image",
data: chunk.source.type === "base64" ? chunk.source.data : "",
mimeType:
chunk.source.type === "base64" ? chunk.source.media_type : "",
mimeType: chunk.source.type === "base64" ? chunk.source.media_type : "",
uri: chunk.source.type === "url" ? chunk.source.url : undefined,
},
};
@@ -505,7 +475,7 @@ export function toAcpNotifications(
break;
case "tool_use":
toolUseCache[chunk.id] = chunk;
if (chunk.name == "TodoWrite") {
if (chunk.name === "TodoWrite") {
update = {
sessionUpdate: "plan",
entries: planEntries(chunk.input),
@@ -562,7 +532,7 @@ export function runAcp() {
type ContentChunk =
| { type: "text"; text: string }
| { type: "tool_use"; id: string; name: string; input: any } // input is serde_json::Value, so use any or unknown
| { type: "tool_use"; id: string; name: string; input: any }
| {
type: "tool_result";
content: string;

228
src/mcp-server.ts
View File

@@ -1,16 +1,13 @@
import express from "express";
import { randomUUID } from "node:crypto";
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
import { z } from "zod";
import { Server } from "node:http";
import { ClaudeAcpAgent } from "./acp-agent.js";
import {
ClientCapabilities,
TerminalOutputResponse,
} from "@zed-industries/agent-client-protocol";
import { tool } from "@anthropic-ai/claude-code";
import { sleep } from "./utils.js";
import { ClientCapabilities, TerminalOutputResponse } from "@zed-industries/agent-client-protocol";
import { sleep, unreachable } from "./utils.js";
export const SYSTEM_REMINDER = `
@@ -40,19 +37,12 @@ Never attempt to read a path that hasn't been previously mentioned.
In sessions with mcp__acp__read always use it instead of Read as it contains the most up-to-date contents.`,
inputSchema: {
abs_path: z
.string()
.describe("The absolute path to the file to read."),
abs_path: z.string().describe("The absolute path to the file to read."),
offset: z
.number()
.optional()
.describe(
"Which line to start reading from. Omit to start from the beginning.",
),
limit: z
.number()
.optional()
.describe("How many lines to read. Omit for the whole file."),
.describe("Which line to start reading from. Omit to start from the beginning."),
limit: z.number().optional().describe("How many lines to read. Omit for the whole file."),
},
annotations: {
title: "Read file",
@@ -75,7 +65,7 @@ In sessions with mcp__acp__read always use it instead of Read as it contains the
],
};
}
let content = await agent.readTextFile({
const content = await agent.readTextFile({
sessionId,
path: input.abs_path,
limit: input.limit,
@@ -114,9 +104,7 @@ In sessions with mcp__acp__read always use it instead of Read as it contains the
In sessions with mcp__acp__write always use it instead of Write as it will
allow the user to conveniently review changes.`,
inputSchema: {
abs_path: z
.string()
.describe("The absolute path to the file to write"),
abs_path: z.string().describe("The absolute path to the file to write"),
content: z.string().describe("The full content to write"),
},
annotations: {
@@ -140,7 +128,7 @@ allow the user to conveniently review changes.`,
],
};
}
let content = await agent.writeTextFile({
await agent.writeTextFile({
sessionId,
path: input.abs_path,
content: input.content,
@@ -181,12 +169,8 @@ File editing instructions:
- Do not escape quotes, newlines, or other characters.
- Only edit the specified file.`,
inputSchema: {
abs_path: z
.string()
.describe("The absolute path to the file to read."),
old_string: z
.string()
.describe("The old text to replace (must be unique in the file)"),
abs_path: z.string().describe("The absolute path to the file to read."),
old_string: z.string().describe("The old text to replace (must be unique in the file)"),
new_string: z.string().describe("The new text."),
},
annotations: {
@@ -211,21 +195,18 @@ File editing instructions:
};
}
let { content } = await agent.readTextFile({
const { content } = await agent.readTextFile({
sessionId,
path: input.abs_path,
});
const { newContent, lineNumbers } = replaceAndCalculateLocation(
content,
[
const { newContent, lineNumbers } = replaceAndCalculateLocation(content, [
{
oldText: input.old_string,
newText: input.new_string,
replaceAll: false,
},
],
);
]);
await agent.writeTextFile({
sessionId,
@@ -260,9 +241,7 @@ File editing instructions:
title: "Multi Edit",
description: `Edit a file with multiple sequential edits.`,
inputSchema: {
file_path: z
.string()
.describe("The absolute path to the file to modify"),
file_path: z.string().describe("The absolute path to the file to modify"),
edits: z
.array(
z.object({
@@ -271,15 +250,11 @@ File editing instructions:
replace_all: z
.boolean()
.optional()
.describe(
"Replace all occurrences of old_string (default false)",
),
.describe("Replace all occurrences of old_string (default false)"),
}),
)
.min(1)
.describe(
"Array of edit operations to perform sequentially on the file",
),
.describe("Array of edit operations to perform sequentially on the file"),
},
annotations: {
title: "Multi Edit file",
@@ -302,7 +277,7 @@ File editing instructions:
};
}
let { content } = await agent.readTextFile({
const { content } = await agent.readTextFile({
sessionId,
path: input.file_path,
});
@@ -341,9 +316,7 @@ File editing instructions:
title: "Bash",
description: "Executes a bash command",
inputSchema: {
command: z
.string()
.describe("The bash command to execute as a one-liner"),
command: z.string().describe("The bash command to execute as a one-liner"),
timeout_ms: z
.number()
.default(2 * 60 * 1000)
@@ -375,10 +348,7 @@ File editing instructions:
throw new Error("No tool call ID found");
}
if (
!agent.clientCapabilities?.terminal ||
!agent.client.createTerminal
) {
if (!agent.clientCapabilities?.terminal || !agent.client.createTerminal) {
throw new Error("unreachable");
}
@@ -439,10 +409,7 @@ File editing instructions:
status,
pendingOutput: {
...currentOutput,
output: stripCommonPrefix(
bgTerm.lastOutput?.output ?? "",
currentOutput.output,
),
output: stripCommonPrefix(bgTerm.lastOutput?.output ?? "", currentOutput.output),
},
};
@@ -486,9 +453,7 @@ File editing instructions:
inputSchema: {
id: z
.string()
.describe(
"The id of the background bash command as returned by `mcp__acp__Bash`",
),
.describe("The id of the background bash command as returned by `mcp__acp__Bash`"),
},
},
async (input) => {
@@ -538,9 +503,7 @@ File editing instructions:
inputSchema: {
id: z
.string()
.describe(
"The id of the background bash command as returned by `mcp__acp__Bash`",
),
.describe("The id of the background bash command as returned by `mcp__acp__Bash`"),
},
},
async (input) => {
@@ -551,17 +514,14 @@ File editing instructions:
}
switch (bgTerm.status) {
case "started":
case "started": {
await bgTerm.handle.kill();
const currentOutput = await bgTerm.handle.currentOutput();
agent.backgroundTerminals[bgTerm.handle.id] = {
status: "killed",
pendingOutput: {
...currentOutput,
output: stripCommonPrefix(
bgTerm.lastOutput?.output ?? "",
currentOutput.output,
),
output: stripCommonPrefix(bgTerm.lastOutput?.output ?? "", currentOutput.output),
},
};
await bgTerm.handle.release();
@@ -569,6 +529,7 @@ File editing instructions:
return {
content: [{ type: "text", text: "Command killed successfully." }],
};
}
case "aborted":
return {
content: [{ type: "text", text: "Command aborted by user." }],
@@ -586,69 +547,14 @@ File editing instructions:
content: [{ type: "text", text: "Command killed by timeout." }],
};
default: {
const unreachable: never = bgTerm;
return unreachable;
return unreachable(bgTerm);
}
}
},
);
function stripCommonPrefix(a: string, b: string): string {
let i = 0;
while (i < a.length && i < b.length && a[i] === b[i]) i++;
return b.slice(i);
}
function toolCommandOutput(
status: "started" | "aborted" | "exited" | "killed" | "timedOut",
output: TerminalOutputResponse,
): string {
const { exitStatus, output: commandOutput, truncated } = output;
let toolOutput = "";
switch (status) {
case "started": {
if (exitStatus?.exitCode == null) {
toolOutput += `Interrupted. `;
}
break;
}
case "killed":
toolOutput += `Killed. `;
break;
case "timedOut":
toolOutput += `Timed out. `;
break;
case "exited":
case "aborted":
break;
default: {
const unreachable: never = status;
return unreachable;
}
}
if (exitStatus?.exitCode != null && exitStatus.exitCode !== 0) {
toolOutput += `Failed with exit code ${exitStatus.exitCode}.`;
}
if (exitStatus?.signal != null) {
toolOutput += `Signal \`${exitStatus.signal}\`. `;
}
toolOutput += "Output:\n\n";
toolOutput += commandOutput;
if (truncated) {
toolOutput += `\n\nCommand output was too long, so it was truncated to ${commandOutput.length} bytes.`;
}
return toolOutput;
}
}
let alwaysAllowedTools: { [key: string]: boolean } = {};
const alwaysAllowedTools: { [key: string]: boolean } = {};
server.registerTool(
"permission",
{
@@ -688,7 +594,7 @@ File editing instructions:
],
};
}
let response = await agent.client.requestPermission({
const response = await agent.client.requestPermission({
options: [
{
kind: "allow_always",
@@ -705,11 +611,10 @@ File editing instructions:
},
});
if (
response.outcome?.outcome == "selected" &&
(response.outcome.optionId == "allow" ||
response.outcome.optionId == "allow_always")
response.outcome?.outcome === "selected" &&
(response.outcome.optionId === "allow" || response.outcome.optionId === "allow_always")
) {
if (response.outcome.optionId == "allow_always") {
if (response.outcome.optionId === "allow_always") {
alwaysAllowedTools[input.tool_name] = true;
}
return {
@@ -744,8 +649,7 @@ File editing instructions:
app.post("/mcp", async (req, res) => {
try {
const transport: StreamableHTTPServerTransport =
new StreamableHTTPServerTransport({
const transport: StreamableHTTPServerTransport = new StreamableHTTPServerTransport({
sessionIdGenerator: undefined,
});
res.on("close", () => {
@@ -760,7 +664,7 @@ File editing instructions:
jsonrpc: "2.0",
error: {
code: -32603,
message: "Internal server error",
message: `Internal server error: ${error}`,
},
id: null,
});
@@ -779,6 +683,64 @@ File editing instructions:
});
}
function stripCommonPrefix(a: string, b: string): string {
let i = 0;
while (i < a.length && i < b.length && a[i] === b[i]) {
i++;
}
return b.slice(i);
}
function toolCommandOutput(
status: "started" | "aborted" | "exited" | "killed" | "timedOut",
output: TerminalOutputResponse,
): string {
const { exitStatus, output: commandOutput, truncated } = output;
let toolOutput = "";
switch (status) {
case "started": {
if (exitStatus && (exitStatus.exitCode ?? null) === null) {
toolOutput += `Interrupted. `;
}
break;
}
case "killed":
toolOutput += `Killed. `;
break;
case "timedOut":
toolOutput += `Timed out. `;
break;
case "exited":
case "aborted":
break;
default: {
const unreachable: never = status;
return unreachable;
}
}
if (exitStatus) {
if (typeof exitStatus.exitCode === "number" && exitStatus.exitCode !== 0) {
toolOutput += `Failed with exit code ${exitStatus.exitCode}.`;
}
if (typeof exitStatus.signal === "string") {
toolOutput += `Signal \`${exitStatus.signal}\`. `;
}
}
toolOutput += "Output:\n\n";
toolOutput += commandOutput;
if (truncated) {
toolOutput += `\n\nCommand output was too long, so it was truncated to ${commandOutput.length} bytes.`;
}
return toolOutput;
}
/**
* Replace text in a file and calculate the line numbers where the edits occurred.
*
@@ -816,7 +778,9 @@ export function replaceAndCalculateLocation(
while (true) {
const index = currentContent.indexOf(edit.oldText, searchIndex);
if (index === -1) break;
if (index === -1) {
break;
}
// Add content before the match
parts.push(currentContent.substring(lastIndex, index));

69
src/tests/acp-agent.test.ts
View File

@@ -14,21 +14,15 @@ import {
WriteTextFileResponse,
} from "@zed-industries/agent-client-protocol";
import { nodeToWebWritable, nodeToWebReadable } from "../utils.js";
import {
markdownEscape,
toolInfoFromToolUse,
toolUpdateFromToolResult,
} from "../tools.js";
import { markdownEscape, toolInfoFromToolUse, toolUpdateFromToolResult } from "../tools.js";
import { toAcpNotifications } from "../acp-agent.js";
import { SDKAssistantMessage } from "@anthropic-ai/claude-code";
describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
"ACP subprocess integration",
() => {
describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration", () => {
let child: ReturnType<typeof spawn>;
beforeAll(async () => {
let valid = spawnSync("tsc", { stdio: "inherit" });
const valid = spawnSync("tsc", { stdio: "inherit" });
if (valid.status) {
throw new Error("failed to compile");
}
@@ -64,12 +58,8 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
return text;
}
async requestPermission(
params: RequestPermissionRequest,
): Promise<RequestPermissionResponse> {
const optionId = params.options.find(
(p) => p.kind === "allow_once",
)!.optionId;
async requestPermission(params: RequestPermissionRequest): Promise<RequestPermissionResponse> {
const optionId = params.options.find((p) => p.kind === "allow_once")!.optionId;
return { outcome: { outcome: "selected", optionId } };
}
@@ -85,16 +75,12 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
}
}
async writeTextFile(
params: WriteTextFileRequest,
): Promise<WriteTextFileResponse> {
async writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
this.files.set(params.path, params.content);
return null;
}
async readTextFile(
params: ReadTextFileRequest,
): Promise<ReadTextFileResponse> {
async readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
const content = this.files.get(params.path) ?? "";
return {
content,
@@ -136,8 +122,7 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
}
it("should connect to the ACP subprocess", async () => {
const { client, connection, newSessionResponse } =
await setupTestSession("./");
const { client, connection, newSessionResponse } = await setupTestSession("./");
await connection.prompt({
prompt: [
@@ -153,8 +138,7 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
}, 30000);
it("should include available commands", async () => {
const { client, connection, newSessionResponse } =
await setupTestSession(__dirname);
const { client, connection, newSessionResponse } = await setupTestSession(__dirname);
expect(newSessionResponse.availableCommands).toContainEqual({
name: "quick-math",
@@ -191,8 +175,7 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
expect(client.takeReceivedText()).toContain("Hello GPT-5");
}, 30000);
},
);
});
describe("tool conversions", () => {
it("should handle Bash nicely", () => {
@@ -279,8 +262,7 @@ describe("tool conversions", () => {
expect(toolInfoFromToolUse(tool_use, {})).toStrictEqual({
kind: "search",
title:
"List the `/Users/test/github/claude-code-acp` directory's contents",
title: "List the `/Users/test/github/claude-code-acp` directory's contents",
content: [],
locations: [],
});
@@ -494,7 +476,7 @@ describe("tool conversions", () => {
});
it("should handle KillBash entries", () => {
let tool_use = {
const tool_use = {
type: "tool_use",
id: "toolu_01PhLms5fuvmdjy2bb6dfUKT",
name: "KillBash",
@@ -511,7 +493,7 @@ describe("tool conversions", () => {
});
it("should handle BashOutput entries", () => {
let tool_use = {
const tool_use = {
type: "tool_use",
id: "toolu_01SJUWPtj1QspgANgtpqGPuN",
name: "BashOutput",
@@ -568,8 +550,7 @@ describe("tool conversions", () => {
activeForm: "Adding concurrent access tests",
},
{
content:
"Add tests for Each function with various data types",
content: "Add tests for Each function with various data types",
status: "pending",
activeForm: "Adding Each function tests",
},
@@ -708,7 +689,7 @@ describe("tool conversions", () => {
],
},
};
let fileCache: { [key: string]: string } = {
const fileCache: { [key: string]: string } = {
"/Users/test/project/config.json": JSON.stringify(
{
version: 1,
@@ -724,14 +705,14 @@ describe("tool conversions", () => {
content: [
{
newText: `{
\"version\": 2,
\"filler\": \"filler\",
\"enabled\": true
"version": 2,
"filler": "filler",
"enabled": true
}`,
oldText: `{
\"version\": 1,
\"filler\": \"filler\",
\"enabled\": false
"version": 1,
"filler": "filler",
"enabled": false
}`,
path: "/Users/test/project/config.json",
type: "diff",
@@ -811,9 +792,7 @@ describe("tool conversions", () => {
const update = toolUpdateFromToolResult(toolResult, toolUse);
expect(update.locations).toEqual([
{ path: "/Users/test/project/main.py", line: 42 },
]);
expect(update.locations).toEqual([{ path: "/Users/test/project/main.py", line: 42 }]);
});
it("should handle empty locations from edit tools", () => {
@@ -878,8 +857,6 @@ describe("escape markdown", () => {
text = "for example:\n```markdown\nHello *world*!\n```\n";
escaped = markdownEscape(text);
expect(escaped).toEqual(
"````\nfor example:\n```markdown\nHello *world*!\n```\n````",
);
expect(escaped).toEqual("````\nfor example:\n```markdown\nHello *world*!\n```\n````");
});
});

75
src/tests/replace-and-calculate-location.test.ts
View File

@@ -4,13 +4,9 @@ import { replaceAndCalculateLocation } from "../mcp-server.js";
describe("replaceAndCalculateLocation", () => {
it("should replace first occurrence and return correct line number", () => {
const content = "line 1\nline 2 with text\nline 3 with text\nline 4";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe(
"line 1\nline 2 with replaced\nline 3 with text\nline 4",
);
expect(result.newContent).toBe("line 1\nline 2 with replaced\nline 3 with text\nline 4");
expect(result.lineNumbers).toEqual([1]); // Line 2 (0-based indexing)
});
@@ -20,9 +16,7 @@ describe("replaceAndCalculateLocation", () => {
{ oldText: "text", newText: "replaced", replaceAll: true },
]);
expect(result.newContent).toBe(
"line 1\nline 2 with replaced\nline 3 with replaced\nline 4",
);
expect(result.newContent).toBe("line 1\nline 2 with replaced\nline 3 with replaced\nline 4");
expect(result.lineNumbers).toEqual([1, 2]); // Lines 2 and 3 (0-based)
});
@@ -54,9 +48,7 @@ describe("replaceAndCalculateLocation", () => {
{ oldText: "text", newText: "replaced", replaceAll: true },
]);
expect(result.newContent).toBe(
"line 1\rline 2 with replaced\rline 3 with replaced\rline 4",
);
expect(result.newContent).toBe("line 1\rline 2 with replaced\rline 3 with replaced\rline 4");
expect(result.lineNumbers).toEqual([1, 2]);
});
@@ -66,17 +58,13 @@ describe("replaceAndCalculateLocation", () => {
{ oldText: "text", newText: "replaced", replaceAll: true },
]);
expect(result.newContent).toBe(
"line 1\nline 2 with replaced\r\nline 3 with replaced\rline 4",
);
expect(result.newContent).toBe("line 1\nline 2 with replaced\r\nline 3 with replaced\rline 4");
expect(result.lineNumbers).toEqual([1, 2]);
});
it("should handle text at the beginning of file", () => {
const content = "text at start\nline 2\nline 3";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe("replaced at start\nline 2\nline 3");
expect(result.lineNumbers).toEqual([0]); // First line (0-based)
@@ -84,9 +72,7 @@ describe("replaceAndCalculateLocation", () => {
it("should handle text at the end of file", () => {
const content = "line 1\nline 2\nlast line with text";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe("line 1\nline 2\nlast line with replaced");
expect(result.lineNumbers).toEqual([2]); // Last line (0-based)
@@ -98,17 +84,13 @@ describe("replaceAndCalculateLocation", () => {
{ oldText: "text", newText: "replaced", replaceAll: true },
]);
expect(result.newContent).toBe(
"line 1\nreplaced replaced replaced\nline 3",
);
expect(result.newContent).toBe("line 1\nreplaced replaced replaced\nline 3");
expect(result.lineNumbers).toEqual([1]); // All on line 2 (0-based), deduplicated
});
it("should handle empty file content", () => {
const content = "";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe("");
expect(result.lineNumbers).toEqual([]);
@@ -117,9 +99,7 @@ describe("replaceAndCalculateLocation", () => {
it("should handle empty search text", () => {
// Test with replaceAll false (default)
const content1 = "line 1\nline 2\nline 3";
const result1 = replaceAndCalculateLocation(content1, [
{ oldText: "", newText: "replaced" },
]);
const result1 = replaceAndCalculateLocation(content1, [{ oldText: "", newText: "replaced" }]);
expect(result1.newContent).toBe(content1);
expect(result1.lineNumbers).toEqual([]);
@@ -142,9 +122,7 @@ describe("replaceAndCalculateLocation", () => {
it("should handle single line content", () => {
const content = "single line with text here";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe("single line with replaced here");
expect(result.lineNumbers).toEqual([0]); // Line 1 (0-based)
@@ -183,9 +161,7 @@ describe("replaceAndCalculateLocation", () => {
it("should handle very long lines", () => {
const longLine = "a".repeat(10000) + "text" + "b".repeat(10000);
const content = `line 1\n${longLine}\nline 3`;
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe(
`line 1\n${"a".repeat(10000)}replaced${"b".repeat(10000)}\nline 3`,
@@ -198,9 +174,7 @@ describe("replaceAndCalculateLocation", () => {
lines[500] = "line with text";
const content = lines.join("\n");
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.lineNumbers).toEqual([500]);
expect(result.newContent).includes("line with replaced");
@@ -224,9 +198,7 @@ describe("replaceAndCalculateLocation", () => {
const result1 = replaceAndCalculateLocation(content, [
{ oldText: "short", newText: "very very long text" },
]);
expect(result1.newContent).toBe(
"very very long text\nmedium line\nlong line here",
);
expect(result1.newContent).toBe("very very long text\nmedium line\nlong line here");
expect(result1.lineNumbers).toEqual([0]);
// Replacing with shorter text
@@ -260,9 +232,7 @@ describe("replaceAndCalculateLocation", () => {
it("should handle replacement at exact end of line", () => {
const content = "line ends with text\nnext line";
const result = replaceAndCalculateLocation(content, [
{ oldText: "text", newText: "replaced" },
]);
const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
expect(result.newContent).toBe("line ends with replaced\nnext line");
expect(result.lineNumbers).toEqual([0]);
@@ -302,9 +272,7 @@ describe("replaceAndCalculateLocation", () => {
// - All "foo" occurrences (lines 1, 3, 5 in original)
// - First "bar" occurrence (line 1 after first edit)
// - "line 3" (line 2 after previous edits)
expect(result.newContent).toBe(
"line 1\nFOO BAR\nLINE THREE\nFOO baz\nline 5\nbar FOO\nline 7",
);
expect(result.newContent).toBe("line 1\nFOO BAR\nLINE THREE\nFOO baz\nline 5\nbar FOO\nline 7");
// Line numbers reflect position in final content, deduplicated and sorted
expect(result.lineNumbers).toEqual([
@@ -326,9 +294,7 @@ describe("replaceAndCalculateLocation", () => {
// First edit replaces first "hello" only
// Second edit replaces all "world" in the modified content
// Third edit replaces remaining "hello"s in the modified content
expect(result.newContent).toBe(
"hi earth\ngreetings greetings\nearth greetings earth",
);
expect(result.newContent).toBe("hi earth\ngreetings greetings\nearth greetings earth");
// Line numbers reflect position in final content, deduplicated and sorted
expect(result.lineNumbers).toEqual([
@@ -340,17 +306,14 @@ describe("replaceAndCalculateLocation", () => {
it("should handle complex scenarios with marker-like text", () => {
// Test that our marker approach doesn't get confused by similar text
const content =
"line 1\n__MARKER__text\nline 3\n__REPLACE_MARKER_abc__\nline 5";
const content = "line 1\n__MARKER__text\nline 3\n__REPLACE_MARKER_abc__\nline 5";
const result = replaceAndCalculateLocation(content, [
{ oldText: "__MARKER__", newText: "REPLACED", replaceAll: true },
{ oldText: "text", newText: "content" },
{ oldText: "__REPLACE_MARKER_abc__", newText: "DONE" },
]);
expect(result.newContent).toBe(
"line 1\nREPLACEDcontent\nline 3\nDONE\nline 5",
);
expect(result.newContent).toBe("line 1\nREPLACEDcontent\nline 3\nDONE\nline 5");
// Line numbers should be correct even with marker-like text
expect(result.lineNumbers).toEqual([

93
src/tools.ts
View File

@@ -1,13 +1,10 @@
import { ContentBlock } from "@modelcontextprotocol/sdk/types.js";
import {
Client,
PlanEntry,
ToolCallContent,
ToolCallLocation,
ToolKind,
} from "@zed-industries/agent-client-protocol";
import { replaceAndCalculateLocation, SYSTEM_REMINDER } from "./mcp-server.js";
import { tool } from "@anthropic-ai/claude-code";
interface ToolInfo {
title: string;
@@ -47,9 +44,7 @@ export function toolInfoFromToolUse(
case "NotebookRead":
return {
title: input?.notebook_path
? `Read Notebook ${input.notebook_path}`
: "Read Notebook",
title: input?.notebook_path ? `Read Notebook ${input.notebook_path}` : "Read Notebook",
kind: "read",
content: [],
locations: input?.notebook_path ? [{ path: input.notebook_path }] : [],
@@ -57,9 +52,7 @@ export function toolInfoFromToolUse(
case "NotebookEdit":
return {
title: input?.notebook_path
? `Edit Notebook ${input.notebook_path}`
: "Edit Notebook",
title: input?.notebook_path ? `Edit Notebook ${input.notebook_path}` : "Edit Notebook",
kind: "edit",
content:
input && input.new_source
@@ -76,9 +69,7 @@ export function toolInfoFromToolUse(
case "Bash":
case "mcp__acp__Bash":
return {
title: input?.command
? "`" + input.command.replaceAll("`", "\\`") + "`"
: "Terminal",
title: input?.command ? "`" + input.command.replaceAll("`", "\\`") + "`" : "Terminal",
kind: "execute",
content:
input && input.description
@@ -111,11 +102,7 @@ export function toolInfoFromToolUse(
let limit = "";
if (input.limit) {
limit =
" (" +
((input.offset ?? 0) + 1) +
" - " +
((input.offset ?? 0) + input.limit) +
")";
" (" + ((input.offset ?? 0) + 1) + " - " + ((input.offset ?? 0) + input.limit) + ")";
} else if (input.offset) {
limit = " (from line " + (input.offset + 1) + ")";
}
@@ -157,8 +144,8 @@ export function toolInfoFromToolUse(
if (path && input.old_text) {
try {
let oldContent = cachedFileContent[path] || "";
let newContent = replaceAndCalculateLocation(oldContent, [
const oldContent = cachedFileContent[path] || "";
const newContent = replaceAndCalculateLocation(oldContent, [
{
oldText: input.old_string,
newText: input.new_string,
@@ -191,8 +178,8 @@ export function toolInfoFromToolUse(
}
case "mcp__acp__multi-edit":
case "MultiEdit":
let multiInput = input as {
case "MultiEdit": {
const multiInput = input as {
file_path: string;
edits: {
old_string: string;
@@ -200,18 +187,14 @@ export function toolInfoFromToolUse(
replace_all?: boolean;
}[];
};
let oldTextMulti = multiInput.edits
.map((edit: any) => edit.old_string)
.join("\n");
let newTextMulti = multiInput.edits
.map((edit: any) => edit.new_string)
.join("\n");
let oldTextMulti = multiInput.edits.map((edit: any) => edit.old_string).join("\n");
let newTextMulti = multiInput.edits.map((edit: any) => edit.new_string).join("\n");
try {
if (multiInput.edits && multiInput.file_path) {
let oldContent =
const oldContent =
cachedFileContent[multiInput.file_path] ||
multiInput.edits.map((edit: any) => edit.oldText).join("\n");
let newContent = replaceAndCalculateLocation(
const newContent = replaceAndCalculateLocation(
oldContent,
multiInput.edits.map((edit) => ({
oldText: edit.old_string,
@@ -240,8 +223,8 @@ export function toolInfoFromToolUse(
],
locations: input?.file_path ? [{ path: input.file_path }] : [],
};
case "mcp__acp__write":
}
case "mcp__acp__write": {
let content: ToolCallContent[] = [];
if (input && input.abs_path) {
content = [
@@ -266,6 +249,7 @@ export function toolInfoFromToolUse(
content,
locations: input?.abs_path ? [{ path: input.abs_path }] : [],
};
}
case "Write":
return {
@@ -330,6 +314,7 @@ export function toolInfoFromToolUse(
label += " -c";
break;
case "Content":
default:
break;
}
}
@@ -439,10 +424,7 @@ export function toolInfoFromToolUse(
}
}
export function toolUpdateFromToolResult(
toolResult: any,
toolUse: any | undefined,
): ToolUpdate {
export function toolUpdateFromToolResult(toolResult: any, toolUse: any | undefined): ToolUpdate {
switch (toolUse?.name) {
case "mcp__acp__edit":
case "edit":
@@ -453,15 +435,14 @@ export function toolUpdateFromToolResult(
const firstContent = toolResult.content[0];
const data = JSON.parse(firstContent.text || firstContent);
if (data.lineNumbers && Array.isArray(data.lineNumbers)) {
const locations: ToolCallLocation[] = data.lineNumbers.map(
(line: number) => ({
const locations: ToolCallLocation[] = data.lineNumbers.map((line: number) => ({
path: toolUse?.input?.abs_path || toolUse?.input?.file_path,
line: line,
}),
);
}));
return { locations };
}
} catch (e) {
} catch (error) {
console.error(`Error parsing edit tool result: ${error}`);
// If parsing fails, return empty object
return {};
}
@@ -477,15 +458,15 @@ export function toolUpdateFromToolResult(
const firstContent = toolResult.content[0];
const data = JSON.parse(firstContent.text || firstContent);
if (data.lineNumbers && Array.isArray(data.lineNumbers)) {
const locations: ToolCallLocation[] = data.lineNumbers.map(
(line: number) => ({
const locations: ToolCallLocation[] = data.lineNumbers.map((line: number) => ({
path: toolUse?.input?.file_path || toolUse?.input?.abs_path,
line: line,
}),
);
}));
return { locations };
}
} catch (e) {
} catch (error) {
console.error(`Error parsing edit tool result: ${error}`);
// If parsing fails, return empty object
return {};
}
@@ -504,29 +485,22 @@ export function toolUpdateFromToolResult(
content: toolResult.content.map((content: any) => ({
type: "content",
content:
content.type == "text"
content.type === "text"
? {
type: "text",
text: markdownEscape(
content.text.replace(SYSTEM_REMINDER, ""),
),
text: markdownEscape(content.text.replace(SYSTEM_REMINDER, "")),
}
: content,
})),
};
} else if (
typeof toolResult.content === "string" &&
toolResult.content.length > 0
) {
} else if (typeof toolResult.content === "string" && toolResult.content.length > 0) {
return {
content: [
{
type: "content",
content: {
type: "text",
text: markdownEscape(
toolResult.content.replace(SYSTEM_REMINDER, ""),
),
text: markdownEscape(toolResult.content.replace(SYSTEM_REMINDER, "")),
},
},
],
@@ -560,10 +534,7 @@ export function toolUpdateFromToolResult(
content,
})),
};
} else if (
typeof toolResult.content === "string" &&
toolResult.content.length > 0
) {
} else if (typeof toolResult.content === "string" && toolResult.content.length > 0) {
return {
content: [
{
@@ -597,7 +568,7 @@ export function planEntries(input: { todos: ClaudePlanEntry[] }): PlanEntry[] {
export function markdownEscape(text: string): string {
let escape = "```";
for (let [m] of text.matchAll(/^```+/gm)) {
for (const [m] of text.matchAll(/^```+/gm)) {
while (m.length >= escape.length) {
escape += "`";
}

15
src/utils.ts
View File

@@ -45,24 +45,23 @@ export class Pushable<T> implements AsyncIterable<T> {
}
// Helper to convert Node.js streams to Web Streams
export function nodeToWebWritable(
nodeStream: Writable,
): WritableStream<Uint8Array> {
export function nodeToWebWritable(nodeStream: Writable): WritableStream<Uint8Array> {
return new WritableStream<Uint8Array>({
write(chunk) {
return new Promise<void>((resolve, reject) => {
nodeStream.write(Buffer.from(chunk), (err) => {
if (err) reject(err);
else resolve();
if (err) {
reject(err);
} else {
resolve();
}
});
});
},
});
}
export function nodeToWebReadable(
nodeStream: Readable,
): ReadableStream<Uint8Array> {
export function nodeToWebReadable(nodeStream: Readable): ReadableStream<Uint8Array> {
return new ReadableStream<Uint8Array>({
start(controller) {
nodeStream.on("data", (chunk: Buffer) => {