2026-02-18 14:23:16 -06:00
|
|
|
// Re-export everything from the shared adapter-utils/server-utils package.
|
|
|
|
|
// This file is kept as a convenience shim so existing in-tree
|
|
|
|
|
// imports (process/, http/, heartbeat.ts) don't need rewriting.
|
2026-03-30 14:09:07 -05:00
|
|
|
import type { ChildProcess } from "node:child_process";
|
2026-02-18 13:53:03 -06:00
|
|
|
import { logger } from "../middleware/logger.js";
|
2026-03-30 14:09:07 -05:00
|
|
|
import * as serverUtils from "@paperclipai/adapter-utils/server-utils";
|
|
|
|
|
export type { RunProcessResult } from "@paperclipai/adapter-utils/server-utils";
|
|
|
|
|
|
|
|
|
|
type BuildInvocationEnvForLogsOptions = {
|
|
|
|
|
runtimeEnv?: NodeJS.ProcessEnv | Record<string, string>;
|
|
|
|
|
includeRuntimeKeys?: string[];
|
|
|
|
|
resolvedCommand?: string | null;
|
|
|
|
|
resolvedCommandEnvKey?: string;
|
|
|
|
|
};
|
|
|
|
|
|
2026-04-10 22:26:21 -05:00
|
|
|
export const runningProcesses: Map<string, { child: ChildProcess; graceSec: number; processGroupId: number | null }> =
|
2026-03-30 14:09:07 -05:00
|
|
|
serverUtils.runningProcesses;
|
|
|
|
|
export const MAX_CAPTURE_BYTES = serverUtils.MAX_CAPTURE_BYTES;
|
|
|
|
|
export const MAX_EXCERPT_BYTES = serverUtils.MAX_EXCERPT_BYTES;
|
|
|
|
|
export const parseObject = serverUtils.parseObject;
|
|
|
|
|
export const asString = serverUtils.asString;
|
|
|
|
|
export const asNumber = serverUtils.asNumber;
|
|
|
|
|
export const asBoolean = serverUtils.asBoolean;
|
|
|
|
|
export const asStringArray = serverUtils.asStringArray;
|
|
|
|
|
export const parseJson = serverUtils.parseJson;
|
|
|
|
|
export const appendWithCap = serverUtils.appendWithCap;
|
[codex] Improve agent runtime recovery and governance (#4086)
## Thinking Path
> - Paperclip orchestrates AI agents for zero-human companies.
> - The heartbeat runtime, agent import path, and agent configuration
defaults determine whether work is dispatched safely and predictably.
> - Several accumulated fixes all touched agent execution recovery, wake
routing, import behavior, and runtime concurrency defaults.
> - Those changes need to land together so the heartbeat service and
agent creation defaults stay internally consistent.
> - This pull request groups the runtime/governance changes from the
split branch into one standalone branch.
> - The benefit is safer recovery for stranded runs, bounded high-volume
reads, imported-agent approval correctness, skill-template support, and
a clearer default concurrency policy.
## What Changed
- Fixed stranded continuation recovery so successful automatic retries
are requeued instead of incorrectly blocking the issue.
- Bounded high-volume issue/log reads across issue, heartbeat, agent,
project, and workspace paths.
- Fixed imported-agent approval and instruction-path permission
handling.
- Quarantined seeded worktree execution state during worktree
provisioning.
- Queued approval follow-up wakes and hardened SQL_ASCII heartbeat
output handling.
- Added reusable agent instruction templates for hiring flows.
- Set the default max concurrent agent runs to five and updated related
UI/tests/docs.
## Verification
- `pnpm install --frozen-lockfile`
- `pnpm exec vitest run server/src/__tests__/company-portability.test.ts
server/src/__tests__/heartbeat-process-recovery.test.ts
server/src/__tests__/heartbeat-comment-wake-batching.test.ts
server/src/__tests__/heartbeat-list.test.ts
server/src/__tests__/issues-service.test.ts
server/src/__tests__/agent-permissions-routes.test.ts
packages/adapter-utils/src/server-utils.test.ts
ui/src/lib/new-agent-runtime-config.test.ts`
- Split integration check: merged this branch first, followed by the
other [PAP-1614](/PAP/issues/PAP-1614) branches, with no merge
conflicts.
- Confirmed this branch does not include `pnpm-lock.yaml`.
## Risks
- Medium risk: touches heartbeat recovery, queueing, and issue list
bounds in central runtime paths.
- Imported-agent and concurrency default behavior changes may affect
existing automation that assumes one-at-a-time default runs.
- No database migrations are included.
> 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, GPT-5.4 tool-enabled coding model, agentic
code-editing/runtime with local shell and GitHub CLI access; exact
context window and reasoning mode are not exposed by the Paperclip
harness.
## 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>
2026-04-20 06:19:48 -05:00
|
|
|
export const appendWithByteCap = serverUtils.appendWithByteCap;
|
2026-03-30 14:09:07 -05:00
|
|
|
export const resolvePathValue = serverUtils.resolvePathValue;
|
|
|
|
|
export const renderTemplate = serverUtils.renderTemplate;
|
|
|
|
|
export const redactEnvForLogs = serverUtils.redactEnvForLogs;
|
|
|
|
|
export const buildPaperclipEnv = serverUtils.buildPaperclipEnv;
|
|
|
|
|
export const defaultPathForPlatform = serverUtils.defaultPathForPlatform;
|
|
|
|
|
export const ensurePathInEnv = serverUtils.ensurePathInEnv;
|
|
|
|
|
export const ensureAbsoluteDirectory = serverUtils.ensureAbsoluteDirectory;
|
|
|
|
|
export const ensureCommandResolvable = serverUtils.ensureCommandResolvable;
|
|
|
|
|
export const resolveCommandForLogs = serverUtils.resolveCommandForLogs;
|
|
|
|
|
|
|
|
|
|
export function buildInvocationEnvForLogs(
|
|
|
|
|
env: Record<string, string>,
|
|
|
|
|
options: BuildInvocationEnvForLogsOptions = {},
|
|
|
|
|
): Record<string, string> {
|
|
|
|
|
const maybeBuildInvocationEnvForLogs = (
|
|
|
|
|
serverUtils as typeof serverUtils & {
|
|
|
|
|
buildInvocationEnvForLogs?: (
|
|
|
|
|
env: Record<string, string>,
|
|
|
|
|
options?: BuildInvocationEnvForLogsOptions,
|
|
|
|
|
) => Record<string, string>;
|
|
|
|
|
}
|
|
|
|
|
).buildInvocationEnvForLogs;
|
|
|
|
|
|
|
|
|
|
if (typeof maybeBuildInvocationEnvForLogs === "function") {
|
|
|
|
|
return maybeBuildInvocationEnvForLogs(env, options);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const merged: Record<string, string> = { ...env };
|
|
|
|
|
const runtimeEnv = options.runtimeEnv ?? {};
|
|
|
|
|
|
|
|
|
|
for (const key of options.includeRuntimeKeys ?? []) {
|
|
|
|
|
if (key in merged) continue;
|
|
|
|
|
const value = runtimeEnv[key];
|
|
|
|
|
if (typeof value !== "string" || value.length === 0) continue;
|
|
|
|
|
merged[key] = value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const resolvedCommand = options.resolvedCommand?.trim();
|
|
|
|
|
if (resolvedCommand) {
|
Add ACPX local adapter runtime (#4893)
## 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>
2026-04-30 19:57:05 -05:00
|
|
|
merged[options.resolvedCommandEnvKey ?? "PAPERCLIP_RESOLVED_COMMAND"] =
|
|
|
|
|
serverUtils.redactCommandTextForLogs(resolvedCommand);
|
2026-03-30 14:09:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return redactEnvForLogs(merged);
|
|
|
|
|
}
|
2026-02-18 14:23:16 -06:00
|
|
|
|
|
|
|
|
// Re-export runChildProcess with the server's pino logger wired in.
|
2026-03-03 08:45:26 -06:00
|
|
|
import type { RunProcessResult } from "@paperclipai/adapter-utils/server-utils";
|
2026-03-30 14:09:07 -05:00
|
|
|
const _runChildProcess = serverUtils.runChildProcess;
|
2026-02-18 13:53:03 -06:00
|
|
|
|
|
|
|
|
export async function runChildProcess(
|
|
|
|
|
runId: string,
|
|
|
|
|
command: string,
|
|
|
|
|
args: string[],
|
|
|
|
|
opts: {
|
|
|
|
|
cwd: string;
|
|
|
|
|
env: Record<string, string>;
|
|
|
|
|
timeoutSec: number;
|
|
|
|
|
graceSec: number;
|
|
|
|
|
onLog: (stream: "stdout" | "stderr", chunk: string) => Promise<void>;
|
|
|
|
|
},
|
|
|
|
|
): Promise<RunProcessResult> {
|
2026-02-18 14:23:16 -06:00
|
|
|
return _runChildProcess(runId, command, args, {
|
|
|
|
|
...opts,
|
|
|
|
|
onLogError: (err, id, msg) => logger.warn({ err, runId: id }, msg),
|
2026-02-18 13:53:03 -06:00
|
|
|
});
|
|
|
|
|
}
|