4272c1604d
## Thinking Path > - Paperclip orchestrates AI-agent companies through a control plane that can start, supervise, and recover agent runs. > - Local adapters are the bridge between Paperclip issues and concrete agent runtimes such as Claude, Codex, and other ACP-compatible tools. > - The roadmap calls out broader “bring your own agent” and claw-style agent support, and ACPX gives Paperclip one path to normalize multiple ACP agents behind a single adapter. > - The branch needed to become one reviewable PR against current `paperclipai/paperclip:master`, without carrying stale base conflicts or generated lockfile churn. > - This pull request adds an experimental built-in `acpx_local` adapter, integrates it through the server/CLI/UI adapter surfaces, and adds regression coverage for runtime execution, skill sync, stream parsing, diagnostics, and log redaction. > - The benefit is that Paperclip can run Claude/Codex/custom ACP agents through ACPX while keeping operator configuration, skills, logging, and transcript rendering inside the existing adapter model. ## What Changed - Added `@paperclipai/adapter-acpx-local` with server execution, config schema, ACPX session handling, CLI formatting, UI config helpers, and stdout parsing. - Registered `acpx_local` across CLI, server, shared constants, UI adapter metadata, adapter capabilities, and agent creation/editing surfaces. - Added ACPX runtime execution support with persistent sessions, local-agent JWT environment handling, skill snapshots, runtime skill materialization, and isolation/security regressions. - Added ACPX adapter diagnostics and marked the adapter experimental in the UI. - Added command/env secret redaction for resolved command metadata in adapter-utils, server event storage, and the Agent Detail invocation UI. - Added Storybook coverage for ACPX config, transcript rendering, and skill states, plus PR screenshots under `docs/pr-screenshots/pap-2944/`. - Rebased the branch onto current `public-gh/master`; `pnpm-lock.yaml` is intentionally not included and there are no migration/schema changes. ## Verification - `pnpm exec vitest run packages/adapters/acpx-local/src/server/execute.test.ts packages/adapters/acpx-local/src/server/test.test.ts packages/adapters/acpx-local/src/cli/format-event.test.ts packages/adapters/acpx-local/src/ui/parse-stdout.test.ts packages/adapter-utils/src/server-utils.test.ts server/src/__tests__/redaction.test.ts server/src/__tests__/acpx-local-execute.test.ts server/src/__tests__/acpx-local-skill-sync.test.ts server/src/__tests__/acpx-local-adapter-environment.test.ts server/src/__tests__/adapter-routes.test.ts server/src/__tests__/agent-skills-routes.test.ts ui/src/adapters/metadata.test.ts` — 12 files, 87 tests passed. - `pnpm --filter @paperclipai/adapter-acpx-local typecheck` — passed. - `pnpm --filter @paperclipai/server typecheck` — passed. - `pnpm --filter @paperclipai/ui typecheck` — passed. - Confirmed PR diff does not include `pnpm-lock.yaml`, database schema files, or migrations. Screenshots:    ## Risks - Medium risk: this introduces a new built-in adapter package and touches runtime execution, adapter registration, agent config, skills, and transcript rendering. - ACPX and ACP agent behavior can vary by installed tool versions; the adapter is marked experimental to set operator expectations. - `pnpm-lock.yaml` is excluded per repository PR policy, so dependency lock refresh must be handled by the repo’s automation or maintainers. - No database migration risk: no schema or migration files changed. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex coding agent based on GPT-5, with repository tool use, shell execution, git operations, and local verification. Exact hosted context window was not exposed in this environment. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
159 lines
4.7 KiB
TypeScript
159 lines
4.7 KiB
TypeScript
import type { TranscriptEntry } from "@paperclipai/adapter-utils";
|
|
|
|
function parseJson(line: string): Record<string, unknown> | null {
|
|
try {
|
|
const parsed = JSON.parse(line);
|
|
if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return null;
|
|
return parsed as Record<string, unknown>;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function asString(value: unknown, fallback = ""): string {
|
|
return typeof value === "string" ? value : fallback;
|
|
}
|
|
|
|
function asNumber(value: unknown, fallback = 0): number {
|
|
return typeof value === "number" && Number.isFinite(value) ? value : fallback;
|
|
}
|
|
|
|
function stringify(value: unknown): string {
|
|
if (typeof value === "string") return value;
|
|
if (value === null || value === undefined) return "";
|
|
try {
|
|
return JSON.stringify(value, null, 2);
|
|
} catch {
|
|
return String(value);
|
|
}
|
|
}
|
|
|
|
function pickToolUseId(parsed: Record<string, unknown>): string {
|
|
return (
|
|
asString(parsed.toolCallId) ||
|
|
asString(parsed.toolUseId) ||
|
|
asString(parsed.id)
|
|
);
|
|
}
|
|
|
|
function statusText(parsed: Record<string, unknown>): string {
|
|
const text = asString(parsed.text).trim();
|
|
const tag = asString(parsed.tag).trim();
|
|
const used = asNumber(parsed.used, -1);
|
|
const size = asNumber(parsed.size, -1);
|
|
const parts: string[] = [];
|
|
if (text) parts.push(text);
|
|
if (tag && !text) parts.push(tag);
|
|
if (used >= 0 && size > 0) parts.push(`(${used}/${size} ctx)`);
|
|
return parts.join(" ") || tag || "status";
|
|
}
|
|
|
|
export function parseAcpxStdoutLine(line: string, ts: string): TranscriptEntry[] {
|
|
const parsed = parseJson(line);
|
|
if (!parsed) return [{ kind: "stdout", ts, text: line }];
|
|
|
|
const type = asString(parsed.type);
|
|
if (type === "acpx.session") {
|
|
const agent = asString(parsed.agent, "acpx");
|
|
const mode = asString(parsed.mode);
|
|
const permissionMode = asString(parsed.permissionMode);
|
|
const tail = [mode, permissionMode].filter(Boolean).join(" / ");
|
|
return [{
|
|
kind: "init",
|
|
ts,
|
|
model: tail ? `${agent} (${tail})` : agent,
|
|
sessionId:
|
|
asString(parsed.acpSessionId) ||
|
|
asString(parsed.sessionId) ||
|
|
asString(parsed.runtimeSessionName),
|
|
}];
|
|
}
|
|
|
|
if (type === "acpx.text_delta") {
|
|
const text = asString(parsed.text);
|
|
if (!text) return [];
|
|
const channel = asString(parsed.channel) || asString(parsed.stream);
|
|
return [{
|
|
kind: channel === "thought" || channel === "thinking" ? "thinking" : "assistant",
|
|
ts,
|
|
text,
|
|
delta: true,
|
|
}];
|
|
}
|
|
|
|
if (type === "acpx.tool_call") {
|
|
const status = asString(parsed.status);
|
|
const text = asString(parsed.text);
|
|
const name = asString(parsed.name, "acp_tool");
|
|
const toolUseId = pickToolUseId(parsed);
|
|
const input =
|
|
parsed.input !== undefined
|
|
? parsed.input
|
|
: text || status
|
|
? { ...(text ? { text } : {}), ...(status ? { status } : {}) }
|
|
: {};
|
|
const entries: TranscriptEntry[] = [
|
|
{
|
|
kind: "tool_call",
|
|
ts,
|
|
name,
|
|
toolUseId: toolUseId || undefined,
|
|
input,
|
|
},
|
|
];
|
|
if (status === "completed" || status === "failed" || status === "cancelled") {
|
|
entries.push({
|
|
kind: "tool_result",
|
|
ts,
|
|
toolUseId: toolUseId || name,
|
|
toolName: name,
|
|
content: text || status,
|
|
isError: status !== "completed",
|
|
});
|
|
}
|
|
return entries;
|
|
}
|
|
|
|
if (type === "acpx.tool_result") {
|
|
return [{
|
|
kind: "tool_result",
|
|
ts,
|
|
toolUseId: pickToolUseId(parsed) || asString(parsed.name, "acp_tool"),
|
|
toolName: asString(parsed.name) || undefined,
|
|
content: stringify(parsed.content ?? parsed.output ?? parsed.error),
|
|
isError: parsed.isError === true || parsed.error !== undefined,
|
|
}];
|
|
}
|
|
|
|
if (type === "acpx.status") {
|
|
return [{ kind: "system", ts, text: statusText(parsed) }];
|
|
}
|
|
|
|
if (type === "acpx.result") {
|
|
return [{
|
|
kind: "result",
|
|
ts,
|
|
text: asString(parsed.summary, asString(parsed.stopReason, asString(parsed.text))),
|
|
inputTokens: asNumber(parsed.inputTokens),
|
|
outputTokens: asNumber(parsed.outputTokens),
|
|
cachedTokens: asNumber(parsed.cachedTokens),
|
|
costUsd: asNumber(parsed.costUsd),
|
|
subtype: asString(parsed.subtype, asString(parsed.stopReason, "acpx.result")),
|
|
isError: parsed.isError === true,
|
|
errors: Array.isArray(parsed.errors)
|
|
? parsed.errors.map((error) => stringify(error)).filter(Boolean)
|
|
: [],
|
|
}];
|
|
}
|
|
|
|
if (type === "acpx.error") {
|
|
return [{ kind: "stderr", ts, text: asString(parsed.message, line) }];
|
|
}
|
|
|
|
if (type.startsWith("acpx.")) {
|
|
return [{ kind: "system", ts, text: asString(parsed.message, type) }];
|
|
}
|
|
|
|
return [{ kind: "stdout", ts, text: line }];
|
|
}
|