mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-21 00:05:49 +02:00
## Thinking Path
> - Paperclip is the open source app people use to manage AI agents for
work
> - The `paperclipai` CLI can run Paperclip as a background service
(launchd on macOS, a systemd user unit on Linux), and that service
definition always launches the managed-install shim
> - #12148 made onboarding create the managed install first
(`ensureServiceShim()`), or refuse with a repair path, when the shim
does not exist
> - The standalone `paperclipai service install` command never got that
guard: it calls `manager.install()` directly, reports `installed: true`,
and leaves the supervisor crash-looping on a missing binary (for example
after a global npm install)
> - This pull request runs the same onboarding guard in `service
install` before any service definition is written
> - The benefit is that `service install` either produces a service that
can start, or fails with the same repair instructions onboarding gives,
and never reports success for a service that cannot run
## Linked Issues or Issue Description
- Fixes: #13841
- Refs #12148 (the onboarding-path fix this extends), #11755 and #11620
(related global-npm / service issues, not addressed here)
## What Changed
- `cli/src/onboard-service.ts`: moved the existing onboarding shim
guard, unchanged, into an exported `ensureServiceShim()` so both entry
points share it. It takes an optional `installIfMissing` flag that
defaults to `true`, so onboarding behaves exactly as before. When only
the shim is missing (a managed install is recorded and its current
payload is still present), the guard now runs the installer's existing
`smokePayload()` check (the payload must run and report its recorded
version), then rewrites the shim in place with the existing
`writeManagedShim()` instead of reinstalling. A payload that fails the
check gets no new shim; the command stops with the repair hint. The
recorded version and update channel stay unchanged, with no download and
no payload pruning. Otherwise the existing onboarding fallback
(reinstall the recorded git revision, or install this CLI's release
version) is unchanged.
- `cli/src/commands/service.ts`: `service install` now calls
`ensureServiceShim()` after the service manager is resolved and before
`manager.install()`. If the shim cannot be made available, the command
throws `Background service not installed: <reason>. Run \`paperclipai
install\`, then \`paperclipai service install\`.` (exit code 1) and
writes no service definition.
- With `--json`, the command only checks for the shim and does not start
a managed install. `installCommand()` prints progress to stdout, which
would corrupt the machine-readable result. JSON callers get a clean
non-zero exit with the repair hint; interactive callers get the same
behavior as onboarding (create the managed install, then the service).
The JSON output shape and all existing flags are unchanged.
- Docs: no change needed. `doc/INSTALLING.md` already says the service
uses the managed-install shim; this makes the command enforce that.
- Tests: a new command-level test (`service-install-command.test.ts`)
and one `ensureServiceShim` case in `onboard-service.test.ts`.
## Verification
- `pnpm exec vitest run
cli/src/__tests__/service-install-command.test.ts` on unmodified
`master` (efce9356): 3/3 tests fail (the guard is never called, and the
missing-shim command resolves instead of rejecting). With this change:
pass.
- `pnpm exec vitest run
cli/src/__tests__/service-install-command.test.ts
cli/src/__tests__/onboard-service.test.ts
cli/src/__tests__/service-health-check.test.ts`: 36/36 pass.
- The tests cover: the guard runs before `manager.install` (call order);
`--no-start-now` / `--no-start-on-login` are still forwarded;
`installed: true` JSON is printed only on success; a failed guard
rejects with the repair message, never calls `manager.install`, and
prints nothing; `--json` uses check-only mode; check-only mode never
calls `installCommand`; with a managed payload present, the repair
smoke-tests the payload, then restores the shim in place without calling
the installer, and rechecks the executable; a payload that fails the
smoke test gets no shim and no reinstall.
- `pnpm --filter paperclipai typecheck` and `pnpm --filter paperclipai
build`: pass.
- Repo-wide `pnpm -r typecheck` and `pnpm build` stop at the unchanged
`paperclip-runner` package because `cargo` is not installed locally.
They fail the same way on unmodified `master`, so CI is the authority
there.
- `pnpm test:run` locally: 32 server failures. 30 reproduce on
unmodified `master` (AI-connection/auth and worktree-provisioning
cases). The other 2 pass when run alone on both `master` and this
branch. None are in `cli/`.
- Manual check for reviewers: with no `~/.local/bin/paperclipai`,
`paperclipai service install --json` now exits 1 with the repair hint
and writes no LaunchAgent/unit. Without `--json`, it creates the managed
install first, then the service.
## Risks
- Low risk. Behavior changes only when the managed shim is missing,
which is exactly the case that used to produce a crash-looping service.
- Behavior shift: in that case, `service install --json` now fails
instead of reporting a service that cannot start. Scripts that relied on
the old false success will see exit code 1 and the repair instructions.
- Onboarding is unchanged. The guard body moved into a named function,
and onboarding calls it with the same defaults.
> 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
- Implementation and tests: OpenAI Codex, model `gpt-6-astra` (agentic
coding with tool use and code execution; context window not reported by
the runtime).
- Plan critique before implementation: OpenAI `gpt-5.6-sol` at high
reasoning effort (read-only).
- Coordination, scoping and PR description: Anthropic Claude Opus 5.5
(`claude-opus-5-5`, 1M context, tool use).
- Independent code review of the exact head: Anthropic `claude-sonnet-5`
at medium effort (read-only), no findings.
- A human contributor directed the work and owns the change.
## 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 searched GitHub for duplicate or related PRs and linked
them above
- [x] I have either (a) linked existing issues with `Fixes: #` / `Closes
#` / `Refs #` OR (b) described the issue in-PR following the relevant
issue template
- [x] I have not referenced internal/instance-local Paperclip issues or
links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip`
URLs)
- [x] My branch name describes the change (e.g. `docs/...`, `fix/...`)
and contains no internal Paperclip ticket id or instance-derived details
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [ ] All Paperclip CI gates are green
- [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups
- [x] I will address all Greptile and reviewer comments before
requesting merge
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: devinfoley <139239+devinfoley@users.noreply.github.com>
235 lines
12 KiB
TypeScript
235 lines
12 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import path from "node:path";
|
|
import * as p from "@clack/prompts";
|
|
import type { Command } from "commander";
|
|
import { readConfig, resolveConfigPath } from "../config/store.js";
|
|
import { resolvePaperclipInstanceId, resolvePaperclipInstanceRoot } from "../config/home.js";
|
|
import { detectServiceManager, type ServiceManager, type ServiceStatus } from "../services/service-manager.js";
|
|
import { ensureServiceShim } from "../onboard-service.js";
|
|
import { buildLocalHealthUrl } from "../utils/health-url.js";
|
|
|
|
type CommonOptions = { instance?: string; json?: boolean };
|
|
type HealthResult = { ok: boolean; serverVersion: string | null; error?: string };
|
|
|
|
function output(value: unknown, json: boolean | undefined): void {
|
|
if (json) console.log(JSON.stringify(value, null, 2));
|
|
else if (typeof value === "string") console.log(value);
|
|
else console.log(JSON.stringify(value, null, 2));
|
|
}
|
|
|
|
async function resolveManager(opts: CommonOptions): Promise<ServiceManager | null> {
|
|
const detection = await detectServiceManager({ instanceId: opts.instance });
|
|
if (detection.supported) return detection.manager;
|
|
output({ supported: false, message: detection.reason }, opts.json);
|
|
return null;
|
|
}
|
|
|
|
function healthUrl(instanceId: string): string {
|
|
process.env.PAPERCLIP_INSTANCE_ID = instanceId;
|
|
const config = readConfig(resolveConfigPath());
|
|
return buildLocalHealthUrl(config?.server.host, config?.server.port ?? 3100);
|
|
}
|
|
|
|
async function probeHealth(instanceId: string): Promise<HealthResult> {
|
|
try {
|
|
const response = await fetch(healthUrl(instanceId), { signal: AbortSignal.timeout(2_000) });
|
|
const body = await response.json() as { status?: unknown; serverVersion?: unknown; version?: unknown };
|
|
return { ok: response.ok && body.status === "ok", serverVersion: typeof body.serverVersion === "string" ? body.serverVersion : typeof body.version === "string" ? body.version : null };
|
|
} catch (error) {
|
|
return { ok: false, serverVersion: null, error: error instanceof Error ? error.message : String(error) };
|
|
}
|
|
}
|
|
|
|
async function waitForHealth(instanceId: string, expectedVersion: string | null, timeoutMs = 60_000): Promise<HealthResult> {
|
|
const deadline = Date.now() + timeoutMs;
|
|
let last: HealthResult = { ok: false, serverVersion: null };
|
|
while (Date.now() < deadline) {
|
|
last = await probeHealth(instanceId);
|
|
if (last.ok && (!expectedVersion || last.serverVersion === expectedVersion)) return last;
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
}
|
|
throw new Error(`Paperclip service did not become healthy${expectedVersion ? ` at version ${expectedVersion}` : ""}: ${last.error ?? `reported ${last.serverVersion ?? "no version"}`}`);
|
|
}
|
|
|
|
export function resolveRestartExpectedVersion(expectedVersion: string | null | undefined): string | null {
|
|
return expectedVersion ?? null;
|
|
}
|
|
|
|
export async function withHotRestartLock<T>(
|
|
instanceId: string,
|
|
callback: () => Promise<T>,
|
|
options: { timeoutMs?: number; pollMs?: number; isProcessAlive?: (pid: number) => boolean } = {},
|
|
): Promise<T> {
|
|
const instanceRoot = resolvePaperclipInstanceRoot(instanceId);
|
|
const lockPath = path.join(instanceRoot, "hot-restart.lock");
|
|
const token = `${process.pid}:${Date.now()}:${Math.random().toString(16).slice(2)}`;
|
|
const deadline = Date.now() + (options.timeoutMs ?? 120_000);
|
|
const pollMs = options.pollMs ?? 100;
|
|
const isProcessAlive = options.isProcessAlive ?? ((pid: number) => {
|
|
try {
|
|
process.kill(pid, 0);
|
|
return true;
|
|
} catch (error) {
|
|
return (error as NodeJS.ErrnoException).code !== "ESRCH";
|
|
}
|
|
});
|
|
await fs.mkdir(instanceRoot, { recursive: true });
|
|
|
|
while (true) {
|
|
try {
|
|
await fs.writeFile(lockPath, `${token}\n`, { encoding: "utf8", mode: 0o600, flag: "wx" });
|
|
break;
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
|
|
try {
|
|
const existingToken = (await fs.readFile(lockPath, "utf8")).trim();
|
|
const ownerPid = Number.parseInt(existingToken.split(":", 1)[0] ?? "", 10);
|
|
if (Number.isInteger(ownerPid) && ownerPid > 0 && !isProcessAlive(ownerPid)) {
|
|
if ((await fs.readFile(lockPath, "utf8")).trim() === existingToken) {
|
|
await fs.rm(lockPath, { force: true });
|
|
continue;
|
|
}
|
|
}
|
|
} catch (readError) {
|
|
if ((readError as NodeJS.ErrnoException).code === "ENOENT") continue;
|
|
throw readError;
|
|
}
|
|
if (Date.now() >= deadline) {
|
|
throw new Error(
|
|
`Another restart for instance ${instanceId} is still running. ` +
|
|
`If no restart process is active, remove the stale lock at ${lockPath} and retry.`,
|
|
);
|
|
}
|
|
await new Promise((resolve) => setTimeout(resolve, pollMs));
|
|
}
|
|
}
|
|
|
|
try {
|
|
return await callback();
|
|
} finally {
|
|
try {
|
|
if ((await fs.readFile(lockPath, "utf8")).trim() === token) {
|
|
await fs.rm(lockPath, { force: true });
|
|
}
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
}
|
|
}
|
|
}
|
|
|
|
async function writeHotRestartIntent(status: ServiceStatus, instanceId: string, drainRequired: boolean): Promise<{ requestedAt: string }> {
|
|
if (!status.pid) throw new Error(`Cannot restart ${status.serviceName}: supervisor did not report a server pid.`);
|
|
const health = await probeHealth(instanceId);
|
|
const instanceRoot = resolvePaperclipInstanceRoot(instanceId);
|
|
const requestedAt = new Date().toISOString();
|
|
await fs.mkdir(instanceRoot, { recursive: true });
|
|
await fs.rm(path.join(instanceRoot, "hot-restart-report.json"), { force: true });
|
|
await fs.writeFile(path.join(instanceRoot, "hot-restart-intent.json"), `${JSON.stringify({
|
|
version: 1,
|
|
requestedAt,
|
|
previousServerPid: status.pid,
|
|
previousServerVersion: health.serverVersion,
|
|
drainRequired,
|
|
requestedByRunId: process.env.PAPERCLIP_RUN_ID?.trim() || null,
|
|
}, null, 2)}\n`, "utf8");
|
|
return { requestedAt };
|
|
}
|
|
|
|
async function waitForRestartReport(instanceId: string, requestedAt: string, timeoutMs = 10_000): Promise<unknown | null> {
|
|
const reportPath = path.join(resolvePaperclipInstanceRoot(instanceId), "hot-restart-report.json");
|
|
const deadline = Date.now() + timeoutMs;
|
|
while (Date.now() < deadline) {
|
|
try {
|
|
const report = JSON.parse(await fs.readFile(reportPath, "utf8")) as { requestedAt?: unknown };
|
|
if (report.requestedAt === requestedAt) return report;
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
}
|
|
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export async function restartManagedService(input: { instanceId?: string; expectedVersion?: string | null; waitForDrain?: boolean } = {}): Promise<{ status: ServiceStatus; health: HealthResult; report: unknown | null }> {
|
|
const instanceId = resolvePaperclipInstanceId(input.instanceId);
|
|
return withHotRestartLock(instanceId, async () => {
|
|
const detection = await detectServiceManager({ instanceId });
|
|
if (!detection.supported) throw new Error(detection.reason);
|
|
const before = await detection.manager.status();
|
|
const intent = await writeHotRestartIntent(before, instanceId, input.waitForDrain ?? false);
|
|
await detection.manager.restart();
|
|
const health = await waitForHealth(instanceId, resolveRestartExpectedVersion(input.expectedVersion));
|
|
return { status: await detection.manager.status(), health, report: await waitForRestartReport(instanceId, intent.requestedAt) };
|
|
});
|
|
}
|
|
|
|
export function registerServiceCommands(program: Command): void {
|
|
const service = program.command("service").description("Manage Paperclip as a background service");
|
|
const common = (command: Command) => command.option("-i, --instance <id>", "Local instance id (default: default)").option("--json", "Print machine-readable JSON", false);
|
|
|
|
common(service.command("install").description("Install and register the background service"))
|
|
.option("--no-start-now", "Install without starting now")
|
|
.option("--no-start-on-login", "Install without enabling start on login")
|
|
.option("--enable-linger", "Allow systemd startup without an active login session", false)
|
|
.action(async (opts) => {
|
|
const manager = await resolveManager(opts); if (!manager) return;
|
|
const shim = await ensureServiceShim({ installIfMissing: !opts.json });
|
|
if (!shim.ok) {
|
|
throw new Error(
|
|
`Background service not installed: ${shim.reason ?? "the managed install could not be completed"}. ` +
|
|
"Run `paperclipai install`, then `paperclipai service install`.",
|
|
);
|
|
}
|
|
if (shim.installedNow) {
|
|
p.log.success("Installed the managed paperclipai payload and command shim for the service.");
|
|
}
|
|
const result = await manager.install({ startNow: opts.startNow, startOnLogin: opts.startOnLogin });
|
|
let lingerEnabled = false;
|
|
if (manager.enableLinger) {
|
|
let consent = opts.enableLinger === true;
|
|
if (!consent && process.stdin.isTTY && process.stdout.isTTY) {
|
|
consent = await p.confirm({ message: "Allow Paperclip to run without an active login session? This runs 'loginctl enable-linger' for your user and may request system authorization.", initialValue: false }) === true;
|
|
}
|
|
if (consent) { await manager.enableLinger(); lingerEnabled = true; }
|
|
}
|
|
output({ installed: true, changed: result.changed, platform: manager.platform, serviceName: manager.serviceName, definitionPath: manager.definitionPath, lingerEnabled }, opts.json);
|
|
});
|
|
|
|
common(service.command("uninstall").description("Stop, disable, and remove the background service")).action(async (opts) => {
|
|
const manager = await resolveManager(opts); if (!manager) return;
|
|
await manager.uninstall();
|
|
const status = await manager.status();
|
|
if (status.installed || status.active) throw new Error(`${manager.serviceName} is still loaded after uninstall.`);
|
|
output({ uninstalled: true, serviceName: manager.serviceName }, opts.json);
|
|
});
|
|
|
|
for (const verb of ["start", "stop"] as const) {
|
|
common(service.command(verb).description(`${verb === "start" ? "Start" : "Stop"} the background service`)).action(async (opts) => {
|
|
const manager = await resolveManager(opts); if (!manager) return;
|
|
await manager[verb]();
|
|
output(await manager.status(), opts.json);
|
|
});
|
|
}
|
|
|
|
common(service.command("restart").description("Hot-restart the service while preserving active agent runs"))
|
|
.option("--wait", "Wait for active runs to drain instead of adopting them", false)
|
|
.option("--expected-version <version>", "Require the restarted server to report this version")
|
|
.action(async (opts) => output(await restartManagedService({ instanceId: opts.instance, expectedVersion: opts.expectedVersion, waitForDrain: opts.wait }), opts.json));
|
|
|
|
common(service.command("status").description("Show supervisor and health status")).action(async (opts) => {
|
|
const manager = await resolveManager(opts); if (!manager) return;
|
|
const instanceId = resolvePaperclipInstanceId(opts.instance);
|
|
output({ ...await manager.status(), health: await probeHealth(instanceId) }, opts.json);
|
|
});
|
|
|
|
common(service.command("logs").description("Show service logs"))
|
|
.option("-f, --follow", "Follow new log output", false)
|
|
.option("-n, --lines <count>", "Number of recent lines", "100")
|
|
.action(async (opts) => {
|
|
const manager = await resolveManager(opts); if (!manager) return;
|
|
const lines = Number.parseInt(opts.lines, 10);
|
|
if (!Number.isInteger(lines) || lines < 1) throw new Error("--lines must be a positive integer.");
|
|
await manager.logs(opts.follow, lines);
|
|
});
|
|
}
|