Skip to content

Integrate acp protocol#23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roulpriya merged 11 commits into from
May 8, 2026
Merged

Integrate acp protocol #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ce0d15
Add Claude JSON streaming agent support with real-time state management
roulpriya May 4, 2026
8c1f202
Unify agent protocol implementation with Agent Client Protocol (ACP) …
roulpriya May 5, 2026
4e48538
Add sequence tracking to maintain correct message and tool call order…
roulpriya May 5, 2026
65eb224
Consolidate persisted agent state
roulpriya May 5, 2026
a75e042
Add session handoff cancellation and improve agent state persistence
roulpriya May 6, 2026
4ee83e4
Support in-process Claude agent execution via AgentSideConnection
roulpriya May 6, 2026
8929d72
Preserve legacy agent state during migration and improve command pars…
roulpriya May 6, 2026
d072b7f
Remove dead code
roulpriya May 6, 2026
6ef49c3
Improve ACP process error handling and session state management
roulpriya May 7, 2026
1ef922d
Remove session channel from WebSocket notification clients handling
roulpriya May 7, 2026
4bb93dd
Add session ID overwrite operation and update status on process exit
roulpriya May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
221 changes: 221 additions & 0 deletions bun.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@
"prepare": "git config core.hooksPath scripts/githooks"
},
"dependencies": {
"@agentclientprotocol/claude-agent-acp": "^0.32.0",
"@agentclientprotocol/sdk": "^0.21.0",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
Expand All@@ -36,6 +38,7 @@
"@xterm/addon-attach": "^0.12.0",
"@xterm/addon-fit": "^0.11.0",
"@xterm/xterm": "^6.0.0",
"@zed-industries/codex-acp": "^0.13.0",
"bun": "1.3.11",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
Expand Down
20 changes: 20 additions & 0 deletions src/backend/db/database.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,11 +228,31 @@ export const agentStmts = {
).run(args);
},
},
overwriteSessionId: {
run: (args: { $sessionId: string; $id: string }): void => {
db.query("UPDATE agents SET session_id = $sessionId WHERE id = $id").run(args);
},
},
updateBaseBranch: {
run: (args: { $baseBranch: string; $id: string }): void => {
db.query("UPDATE agents SET base_branch = $baseBranch WHERE id = $id").run(args);
},
},
saveAgentState: {
run: (args: { $id: string; $agentState: string }): void => {
db.query("UPDATE agents SET agent_state = $agentState WHERE id = $id").run(args);
},
},
loadAgentState: {
get: (id: string): string | null => {
const row = db
.query<{ agent_state: string | null }, [string]>(
"SELECT agent_state FROM agents WHERE id = ?",
)
.get(id);
return row?.agent_state ?? null;
},
},
};

export const integrationStmts = {
Expand Down
11 changes: 11 additions & 0 deletions src/backend/db/migrations/007_add_claude_state.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import type { Migration } from "../migrator.ts";

export default {
name: "007_add_claude_state",
up(db) {
const cols = db.query<{ name: string }>("SELECT name FROM pragma_table_info('agents')");
if (!cols.some((c) => c.name === "claude_state")) {
db.run("ALTER TABLE agents ADD COLUMN claude_state TEXT");
}
},
} satisfies Migration;
11 changes: 11 additions & 0 deletions src/backend/db/migrations/008_add_acp_state.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import type { Migration } from "../migrator.ts";

export default {
name: "008_add_acp_state",
up(db) {
const cols = db.query<{ name: string }>("SELECT name FROM pragma_table_info('agents')");
if (!cols.some((c) => c.name === "acp_state")) {
db.run("ALTER TABLE agents ADD COLUMN acp_state TEXT");
}
},
} satisfies Migration;
21 changes: 21 additions & 0 deletions src/backend/db/migrations/009_add_agent_state.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import type { Migration } from "../migrator.ts";

export default {
name: "009_add_agent_state",
up(db) {
const cols = db.query<{ name: string }>("SELECT name FROM pragma_table_info('agents')");
const colNames = new Set(cols.map((c) => c.name));
Comment on lines +6 to +7

@coderabbitaicoderabbitaiBotMay 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical | ⚡ Quick win

🧩 Analysis chain

🌐 Web query:

In Bun 1.3.x, does bun:sqlite's Database.query()return a statement that requires calling.all()/.get(), or can it be used directly with array methods like .map()?

💡 Result:

In Bun 1.3.x, bun:sqlite’s Database.query() returns a prepared Statement object, and the SQL is not executed until you call methods like .all() or .get() on that Statement.[1][2] So you cannot directly do db.query(...).map(...) because the return value from Database.query() is a Statement, not an array. To use array methods, you must execute the statement first, e.g. db.query(...).all().map(...) (or .get() if you expect a single row).[1][3] Example: const stmt = db.query("SELECT * FROM users"); // prepares; does not run yet const users = stmt.all; const names = users.map(u => u.name); This matches the docs showing: const stmt = db.query(...); // run the query stmt.all(...) and that .all() returns results as an array of objects.[2][3]

Citations:

🏁 Script executed:

cat -n src/backend/db/migrations/009_add_agent_state.ts | head -30

Repository: inputforge/agentforge

Length of output: 802

Call .all() before iterating the pragma rows.

db.query() returns a Statement object in bun:sqlite, not an array. Calling .map() directly on it will throw a runtime error, causing the migration to fail. Use .all() to execute the statement and get results as an array.

Suggested fix
- const cols = db.query<{ name: string }>("SELECT name FROM pragma_table_info('agents')");- const colNames = new Set(cols.map((c) => c.name));+ const cols = db+ .query<{ name: string }, []>("SELECT name FROM pragma_table_info('agents')")+ .all();+ const colNames = new Set(cols.map((c) => c.name));
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constcols=db.query<{name: string}>("SELECT name FROM pragma_table_info('agents')");
constcolNames=newSet(cols.map((c)=>c.name));
constcols=db
.query<{name: string},[]>("SELECT name FROM pragma_table_info('agents')")
.all();
constcolNames=newSet(cols.map((c)=>c.name));
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@src/backend/db/migrations/009_add_agent_state.ts` around lines 6 - 7, The
migration currently calls db.query("SELECT name FROM
pragma_table_info('agents')") and then treats the result as an array by doing
cols.map(...), but db.query returns a Statement in bun:sqlite; change the code
to execute the statement (call .all()) before iterating: obtain rows via
cols.all() (or call db.query(...).all() directly), then build colNames from the
resulting array (used where cols and colNames are defined) so the subsequent new
column checks use a true array instead of a Statement.


if (!colNames.has("agent_state")) {
db.run("ALTER TABLE agents ADD COLUMN agent_state TEXT");
}
if (colNames.has("claude_state")) {
db.run("UPDATE agents SET agent_state = COALESCE(agent_state, claude_state)");
db.run("ALTER TABLE agents DROP COLUMN claude_state");
}
if (colNames.has("acp_state")) {
db.run("UPDATE agents SET agent_state = COALESCE(agent_state, acp_state)");
db.run("ALTER TABLE agents DROP COLUMN acp_state");
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
},
} satisfies Migration;
5 changes: 4 additions & 1 deletion src/backend/db/migrations/registry.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,7 @@ import m003 from "./003_add_session_id.ts";
import m004 from "./004_add_agent_base_branch.ts";
import m005 from "./005_add_integrations.ts";
import m006 from "./006_add_ticket_base_branch.ts";
export const migrations: Migration[] = [m001, m002, m003, m004, m005, m006];
import m007 from "./007_add_claude_state.ts";
import m008 from "./008_add_acp_state.ts";
import m009 from "./009_add_agent_state.ts";
export const migrations: Migration[] = [m001, m002, m003, m004, m005, m006, m007, m008, m009];
129 changes: 20 additions & 109 deletions src/backend/routes/agents.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,9 @@ import { Hono } from "hono";
import { randomUUID } from "crypto";
import { agentStmts, remoteStmts, ticketStmts } from "../db/index.ts";
import { errorMeta, logger } from "../lib/logger.ts";
import { agentProcessManager } from "../services/AgentProcessManager.ts";
import { codexAppServerManager } from "../services/CodexAppServerManager.ts";
import { acpClientManager } from "../services/AcpClientManager.ts";
import { GitWorktreeManager } from "../services/GitWorktreeManager.ts";
import type { OrchestratorService } from "../services/OrchestratorService.ts";
import type { AgentType } from "../../common/types.ts";
import { shellSessionManager } from "../services/ShellSessionManager.ts";
import { broadcastNotification, clearShellScrollback } from "../ws/hub.ts";

Expand All@@ -28,33 +26,20 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const remoteConfig = remoteStmts.get.get();
if (!remoteConfig) return c.json({ error: "no remote configured" }, 400);

log.debug("fetching diff", {
agentId: agent.id,
worktreePath: agent.worktreePath,
baseBranch: agent.baseBranch,
});
try {
const git = new GitWorktreeManager(remoteConfig.localPath);
const diff = await git.getDiff(agent.worktreePath, agent.baseBranch);
log.debug("diff fetched", { agentId: agent.id, files: diff.files.length });
return c.json(diff);
} catch (err) {
log.error("failed to fetch diff", { agentId: agent.id, ...errorMeta(err) });
return c.json({ error: (err as Error).message }, 500);
}
});

app.get("/:id/codex-state", async (c) => {
app.get("/:id/acp-state", (c) => {
const agent = agentStmts.get.get(c.req.param("id"));
if (!agent) return c.json({ error: "agent not found" }, 404);
if (agent.type !== "codex") return c.json({ error: "agent is not a codex agent" }, 400);

try {
return c.json(await codexAppServerManager.getState(agent));
} catch (err) {
log.error("failed to load codex state", { agentId: agent.id, ...errorMeta(err) });
return c.json({ error: (err as Error).message }, 500);
}
return c.json(acpClientManager.getState(agent.id));
});

app.post("/:id/merge", async (c) => {
Expand All@@ -64,17 +49,11 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const remoteConfig = remoteStmts.get.get();
if (!remoteConfig) return c.json({ error: "no remote configured" }, 400);

log.info("merge requested", {
agentId: agent.id,
branch: agent.branch,
baseBranch: agent.baseBranch,
});
try {
const git = new GitWorktreeManager(remoteConfig.localPath);
const result = await git.mergeToBase(agent.worktreePath, agent.branch, agent.baseBranch);

if (result.success) {
log.info("merge succeeded", { agentId: agent.id, branch: agent.branch });
const ticket = ticketStmts.get.get(agent.ticketId);
if (ticket) {
ticketStmts.updateStatus.run({ $status: "done", $updatedAt: Date.now(), $id: ticket.id });
Expand All@@ -88,19 +67,11 @@ export function agentsRouter(orchestrator: OrchestratorService) {
});
});
}
} else if (result.conflicted) {
log.warn("merge aborted: rebase conflict", { agentId: agent.id, branch: agent.branch });
} else {
log.warn("merge failed", { agentId: agent.id, branch: agent.branch, error: result.error });
}

return c.json(result);
} catch (err) {
log.error("merge threw unexpected error", {
agentId: agent.id,
branch: agent.branch,
...errorMeta(err),
});
log.error("merge threw unexpected error", { agentId: agent.id, ...errorMeta(err) });
return c.json({ success: false, conflicted: false, error: (err as Error).message }, 500);
}
});
Expand All@@ -109,35 +80,13 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const agent = agentStmts.get.get(c.req.param("id"));
if (!agent) return c.json({ error: "agent not found" }, 404);

let targetAgentId = agent.id;

const isRunning =
agent.type === "codex"
? codexAppServerManager.isRunning(agent.id)
: agentProcessManager.isRunning(agent.id);

if (!isRunning) {
log.info("spawning agent for commit", { agentId: agent.id, ticketId: agent.ticketId });
await orchestrator.spawnAgent(agent.ticketId, agent.type as AgentType);
const ticket = ticketStmts.get.get(agent.ticketId);
if (ticket?.agentId) targetAgentId = ticket.agentId;
}

log.info("sending commit prompt", { agentId: targetAgentId });
if (agent.type === "codex") {
const targetAgent = agentStmts.get.get(targetAgentId);
if (!targetAgent) return c.json({ error: "agent not found" }, 404);
await codexAppServerManager.writeToAgent(
targetAgent,
"Please commit all current changes with a descriptive commit message.",
);
} else {
agentProcessManager.write(
targetAgentId,
try {
await acpClientManager.writeToAgent(
agent,
"Please commit all current changes with a descriptive commit message.",
);
await Bun.sleep(100);
agentProcessManager.write(targetAgentId, Buffer.from([0x0d]));
} catch (err) {
return c.json({ error: (err as Error).message }, 400);
}
return c.json({ ok: true });
});
Expand All@@ -149,35 +98,16 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const remoteConfig = remoteStmts.get.get();
if (!remoteConfig) return c.json({ error: "no remote configured" }, 400);

const isRunning =
agent.type === "codex"
? codexAppServerManager.isRunning(agent.id)
: agentProcessManager.isRunning(agent.id);
// Only abort on conflict when the agent isn't running — if it is running,
// leave the worktree in the conflicted state so the agent can resolve it.
log.info("rebase requested", {
agentId: agent.id,
baseBranch: agent.baseBranch,
isRunning,
});
const isRunning = acpClientManager.isRunning(agent.id);

try {
const git = new GitWorktreeManager(remoteConfig.localPath);
const result = await git.rebase(agent.worktreePath, agent.baseBranch, !isRunning);
if (result.success) {
log.info("rebase succeeded", { agentId: agent.id });
} else if (result.conflicted) {
log.warn("rebase conflict detected", { agentId: agent.id, isRunning });
if (isRunning) {
const prompt =
"There are conflicts when rebasing onto the base branch. Please resolve the conflicts, complete the rebase, and commit.";
if (agent.type === "codex") {
await codexAppServerManager.writeToAgent(agent, prompt);
} else {
agentProcessManager.write(agent.id, prompt);
await Bun.sleep(100);
agentProcessManager.write(agent.id, Buffer.from([0x0d]));
}
}
if (result.conflicted && isRunning) {
await acpClientManager.writeToAgent(
agent,
"There are conflicts when rebasing onto the base branch. Please resolve the conflicts, complete the rebase, and commit.",
);
}
return c.json({ ...result, resolving: result.conflicted && isRunning });
} catch (err) {
Expand All@@ -193,24 +123,15 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const id = c.req.param("id");
const agent = agentStmts.get.get(id);
if (!agent) return c.json({ error: "agent not found" }, 404);
if (agent.type !== "codex") {
return c.json({ error: "interrupt unsupported for agent type" }, 400);
}
codexAppServerManager.interrupt(id);
acpClientManager.interrupt(id);
return c.body(null, 204);
});

app.post("/:id/kill", (c) => {
const id = c.req.param("id");
const agent = agentStmts.get.get(id);
if (!agent) return c.json({ error: "agent not found" }, 404);

log.info("killing agent", { agentId: id });
if (agent.type === "codex") {
codexAppServerManager.kill(id);
} else {
agentProcessManager.kill(id);
}
acpClientManager.kill(id);
agentStmts.updateStatus.run({ $id: id, $status: "error", $endedAt: Date.now() });
return c.body(null, 204);
});
Expand All@@ -219,13 +140,7 @@ export function agentsRouter(orchestrator: OrchestratorService) {
const id = c.req.param("id");
const agent = agentStmts.get.get(id);
if (!agent) return c.json({ error: "agent not found" }, 404);

log.info("restarting agent", { agentId: id });
if (agent.type === "codex") {
await codexAppServerManager.killAndWait(id);
} else {
await agentProcessManager.killAndWait(id);
}
await acpClientManager.killAndWait(id);
await orchestrator.resumeAgent(agent);
return c.body(null, 204);
});
Expand All@@ -243,11 +158,7 @@ export function agentsRouter(orchestrator: OrchestratorService) {
try {
const agent = agentStmts.get.get(id);
if (!agent) return c.json({ error: "agent not found" }, 404);
if (agent.type === "codex") {
await codexAppServerManager.writeToAgent(agent, body.input, body.clientId);
} else {
agentProcessManager.write(id, body.input);
}
await acpClientManager.writeToAgent(agent, body.input, body.clientId);
return c.json({ ok: true });
} catch (err) {
log.error("failed to write input to agent", { agentId: id, ...errorMeta(err) });
Expand Down
4 changes: 2 additions & 2 deletions src/backend/routes/tickets.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Hono } from "hono";
import { randomUUID } from "crypto";
import { agentStmts, remoteStmts, ticketStmts } from "../db/index.ts";
import { agentProcessManager } from "../services/AgentProcessManager.ts";
import { acpClientManager } from "../services/AcpClientManager.ts";
import type { AgentType, Ticket, TicketStatus } from "../../common/types.ts";
import { broadcastNotification } from "../ws/hub.ts";
import type { OrchestratorService } from "../services/OrchestratorService.ts";
Expand DownExpand Up@@ -89,7 +89,7 @@ export function ticketsRouter(orchestrator: OrchestratorService) {

const ticket = ticketStmts.get.get(id);
if (!ticket) return c.json({ error: "ticket not found" }, 404);
if (ticket.agentId && agentProcessManager.isRunning(ticket.agentId)) {
if (ticket.agentId && acpClientManager.isRunning(ticket.agentId)) {
return c.json({ error: "agent already running for this ticket" }, 409);
}

Expand Down
Loading
Loading