mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-31 14:16:39 +01:00
perf(server): overlap OpenCode setup and trace reply recovery (#18367)
Overlap eligible OpenCode GitHub and assigned MCP preparation. Trace deferred reply discovery and recovery, and forward the native GitHub transport recorder. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
1 parent
e54354d9d3
commit
f53db0c70f
12 files changed
+138
-26
No files matched your search
@@ -3,6 +3,7 @@ import { spawn, execFile } from "node:child_process";
|
||||
import { mkdtemp, mkdir, readFile, rm, writeFile, access } from "node:fs/promises";
|
||||
import { promisify } from "node:util";
|
||||
import type { CommandManagedDuplexChannel, CommandManagedRuntimeRunner } from "@paperclipai/adapter-utils/command-managed-runtime";
|
||||
import type { DuplexObservabilityRecorder } from "@paperclipai/adapter-utils/duplex-observability";
|
||||
import { startAdapterExecutionTargetPaperclipBridge } from "@paperclipai/adapter-utils/execution-target";
|
||||
import { tmpdir } from "node:os";
|
||||
import path from "node:path";
|
||||
@@ -39,7 +40,7 @@ function localDuplexChannel(command: readonly string[], cwd: string): CommandMan
|
||||
async function broker(resolveCredentials = vi.fn(async (binding: ReturnType<typeof run>) => ({
|
||||
status: "available", env: { GH_TOKEN: `fixture-${binding.runId}` },
|
||||
})), remote = false, bridgeUnavailable = false, onLog?: (stream: "stdout" | "stderr", chunk: string) => Promise<void>,
|
||||
duplex?: { enabled?: boolean; capability: boolean; unavailable?: boolean }) {
|
||||
duplex?: { enabled?: boolean; capability: boolean; unavailable?: boolean; recorder?: DuplexObservabilityRecorder }) {
|
||||
const root = await mkdtemp(path.join(tmpdir(), "native-github-reuse-"));
|
||||
cleanups.push(() => rm(root, { recursive: true, force: true }));
|
||||
const bin = path.join(root, "real-bin");
|
||||
@@ -61,7 +62,7 @@ duplex?: { enabled?: boolean; capability: boolean; unavailable?: boolean }) {
|
||||
});
|
||||
const target = remote ? { kind: "remote" as const, transport: "sandbox" as const, providerKey: "test",
|
||||
remoteCwd: root, runner: { execute, ...(duplex ? { openDuplexChannel } : {}) }, streamRunLogs: false,
|
||||
...(duplex ? { enableSandboxDuplexBridge: duplex.enabled, effectiveCapabilities: {
|
||||
...(duplex ? { enableSandboxDuplexBridge: duplex.enabled, duplexObservabilityRecorder: duplex.recorder, effectiveCapabilities: {
|
||||
reusableLeases: true, nativeSyncIn: false, nativeSyncOut: false, persistentProcessSessions: false,
|
||||
independentControlCommands: true, incrementalSessionOutput: false, concurrentSyncOperations: false,
|
||||
duplexCommandStream: duplex.capability, runnerWebSocketIngress: false,
|
||||
@@ -122,9 +123,13 @@ it.each([false, true])("resolves managed GitHub credentials from OpenCode shell
|
||||
expect(childEnvironment.githubTokenPresent).toBe(false);
|
||||
}, 30000);
|
||||
it("uses the selected duplex transport across credential rotation without file polling", async () => {
|
||||
const b = await broker(undefined, true, false, undefined, { enabled: true, capability: true });
|
||||
const recorder = { recordSpan: vi.fn(), incrementCounter: vi.fn(), emitEvent: vi.fn() };
|
||||
const b = await broker(undefined, true, false, undefined, { enabled: true, capability: true, recorder });
|
||||
expect(b.bridgeModes).toEqual(["http2_v1"]);
|
||||
expect(b.openDuplexChannel).toHaveBeenCalledOnce();
|
||||
expect(recorder.recordSpan).toHaveBeenCalledWith(expect.objectContaining({ name: "sandbox.duplex.channel_open", dimensions: {
|
||||
provider: "other", transport: "http2", outcome: "ok",
|
||||
} }));
|
||||
const commandsAfterStartup = b.execute.mock.calls.length;
|
||||
expect((await request(b)).status).toBe(403);
|
||||
const releaseA = b.activate(run("a"));
|
||||
@@ -135,6 +140,8 @@ it("uses the selected duplex transport across credential rotation without file p
|
||||
releaseA();
|
||||
expect(await (await request(b)).json()).toMatchObject({ env: { GH_TOKEN: "fixture-b" } });
|
||||
expect(b.resolveCredentials.mock.calls.map(([binding]) => binding.runId)).toEqual(["a", "b"]);
|
||||
expect(recorder.recordSpan).toHaveBeenCalledWith(expect.objectContaining({ name: "sandbox.duplex.request" }));
|
||||
expect(recorder.emitEvent).not.toHaveBeenCalledWith(expect.objectContaining({ dimensions: expect.objectContaining({ transport: "file" }) }));
|
||||
expect(b.execute.mock.calls).toHaveLength(commandsAfterStartup);
|
||||
releaseB();
|
||||
await b.stop();
|
||||
|
||||
@@ -3,6 +3,7 @@ import { createServer } from "node:http";
|
||||
import {
|
||||
cleanupGitHubOperationLaunchers,
|
||||
adapterExecutionTargetEnablesSandboxDuplexBridge,
|
||||
adapterExecutionTargetDuplexObservabilityRecorder,
|
||||
githubOperationLauncherDirectory,
|
||||
prepareGitHubOperationLaunchers,
|
||||
startAdapterExecutionTargetPaperclipBridge,
|
||||
@@ -107,6 +108,7 @@ export async function createNativeGitHubAccess(input: {
|
||||
hostApiToken: token,
|
||||
hostApiUrl: url,
|
||||
enableSandboxDuplexBridge: duplexRequested,
|
||||
duplexObservabilityRecorder: adapterExecutionTargetDuplexObservabilityRecorder(input.target),
|
||||
onLog: input.onLog,
|
||||
});
|
||||
if (input.target?.kind === "remote" && !bridge) {
|
||||
|
||||
@@ -7,6 +7,7 @@ import type { NativeResponsePresentationScope } from "../native-response-present
|
||||
import { onCommittedChatResponseAuthorityRegistered } from "../durable-chat-wakeup.js";
|
||||
import { registerScopedDeadlineWork } from "../scoped-deadline-work.js";
|
||||
import { recoverCommittedNativeChatResponse } from "./native-run-finalizer.js";
|
||||
import { measureRunPhase, withRunResponsePresentationTiming } from "../execution-preparation-timing.js";
|
||||
|
||||
export function registerNativeResponsePresentationWork(db: Db,
|
||||
coordinator: ReturnType<typeof createDeliveryWorkCoordinator>, canRun: () => boolean) {
|
||||
@@ -20,27 +21,35 @@ export function nativeResponsePresentationWork(db: Db) {
|
||||
const query = nativeResponsePresentationCandidates(scope, after, runId).as("pending_native_response");
|
||||
return db.select().from(query).orderBy(asc(query.id));
|
||||
};
|
||||
async function load(scope?: NativeResponsePresentationScope, signal?: AbortSignal, canRun = () => true): Promise<Entry[]> {
|
||||
function load(scope?: NativeResponsePresentationScope, signal?: AbortSignal, canRun = () => true): Promise<Entry[]> {
|
||||
const work = () => loadWithinTrace(scope, signal, canRun);
|
||||
return scope?.runId ? withRunResponsePresentationTiming(scope.runId, work) : work();
|
||||
}
|
||||
async function loadWithinTrace(scope: NativeResponsePresentationScope | undefined, signal: AbortSignal | undefined,
|
||||
canRun: () => boolean): Promise<Entry[]> {
|
||||
const entries: Entry[] = [];
|
||||
let after: string | undefined;
|
||||
while (canRun() && !signal?.aborted) {
|
||||
const rows = await candidates(scope, after);
|
||||
const rows = await measureRunPhase("response.resolve", () => candidates(scope, after));
|
||||
for (const row of rows) entries.push({ id: row.id, companyId: row.companyId, issueId: row.issueId, agentId: row.agentId, dueAt: row.nextAttemptAt?.getTime() ?? 0 });
|
||||
if (rows.length < 100) return entries;
|
||||
after = rows[rows.length - 1].id;
|
||||
}
|
||||
throw new Error("Native response presentation discovery stopped");
|
||||
}
|
||||
async function check(entry: Entry, signal?: AbortSignal): Promise<Entry | null> {
|
||||
function check(entry: Entry, signal?: AbortSignal): Promise<Entry | null> {
|
||||
return withRunResponsePresentationTiming(entry.id, () => checkWithinTrace(entry, signal));
|
||||
}
|
||||
async function checkWithinTrace(entry: Entry, signal?: AbortSignal): Promise<Entry | null> {
|
||||
if (signal?.aborted) throw new Error("Native response presentation recovery stopped");
|
||||
const scope = { companyId: entry.companyId, issueId: entry.issueId };
|
||||
const [current] = await candidates(scope, undefined, entry.id);
|
||||
const [current] = await measureRunPhase("response.resolve", () => candidates(scope, undefined, entry.id));
|
||||
if (!current) return null;
|
||||
if (current.nextAttemptAt && current.nextAttemptAt.getTime() > Date.now()) return { ...entry, dueAt: current.nextAttemptAt.getTime() };
|
||||
if (signal?.aborted) throw new Error("Native response presentation recovery stopped");
|
||||
const recoveryStartedAt = Date.now();
|
||||
await recoverCommittedNativeChatResponse(db, { ...scope, runId: entry.id, onlyWhenDue: true });
|
||||
const [remaining] = await candidates(scope, undefined, entry.id);
|
||||
const [remaining] = await measureRunPhase("response.resolve", () => candidates(scope, undefined, entry.id));
|
||||
return remaining?.nextAttemptAt && remaining.nextAttemptAt.getTime() > recoveryStartedAt
|
||||
? { ...entry, dueAt: remaining.nextAttemptAt.getTime() } : null;
|
||||
}
|
||||
|
||||
@@ -67,6 +67,7 @@ import { issueRecoveryActionService } from "../issue-recovery-actions.js";
|
||||
import { issueService } from "../issues.js";
|
||||
import { publishChatPublicationCommitSignal } from "../chat-publication-reconciliation.js";
|
||||
import { nativeSha256 } from "./canonical.js";
|
||||
import { beginRunPhase, measureRunPhase, withRunResponsePresentationTiming } from "../execution-preparation-timing.js";
|
||||
import {
|
||||
readNativeBoardResponseWaitOrigin,
|
||||
readNativeBoardResponseWaitSource,
|
||||
@@ -736,11 +737,20 @@ export async function repairCommittedNativeChatResponse(
|
||||
export async function recoverCommittedNativeChatResponse(
|
||||
db: Db,
|
||||
input: { companyId: string; issueId: string; runId: string; onlyWhenDue?: boolean },
|
||||
): Promise<boolean> {
|
||||
return withRunResponsePresentationTiming(input.runId, () => recoverCommittedNativeChatResponseInScope(db, input));
|
||||
}
|
||||
|
||||
async function recoverCommittedNativeChatResponseInScope(
|
||||
db: Db,
|
||||
input: { companyId: string; issueId: string; runId: string; onlyWhenDue?: boolean },
|
||||
): Promise<boolean> {
|
||||
let agentId: string | null = null;
|
||||
let materialized = false;
|
||||
const entered = beginRunPhase("response.transaction.entry");
|
||||
try {
|
||||
materialized = await db.transaction(async (transaction) => {
|
||||
materialized = await measureRunPhase("response.transaction", () => db.transaction(async (transaction) => {
|
||||
entered();
|
||||
const tx = transaction as unknown as Db;
|
||||
|
||||
|
||||
@@ -1022,10 +1032,12 @@ export async function recoverCommittedNativeChatResponse(
|
||||
await projectCommittedRun({ db: tx, run, coordinator });
|
||||
agentId = run.agentId;
|
||||
return true;
|
||||
});
|
||||
}));
|
||||
} catch (error) {
|
||||
if (error instanceof CommittedChatResponseAuthorizationError) return false;
|
||||
throw error;
|
||||
} finally {
|
||||
entered();
|
||||
}
|
||||
if (materialized && agentId)
|
||||
publishChatPublicationCommitSignal({
|
||||
|
||||
@@ -12376,7 +12376,14 @@ describe("runnerd provider runtime wiring", () => {
|
||||
}
|
||||
});
|
||||
|
||||
it.each(["github", "assigned"] as const)("cleans run-owned access after overlapping executor failure: %s", async failure => {
|
||||
it.each((["codex", "opencode"] as const).flatMap(provider =>
|
||||
(["github", "assigned"] as const).map(failure => ({ provider, failure })),
|
||||
))("cleans run-owned access after overlapping $provider executor failure: $failure", async ({ provider, failure }) => {
|
||||
const current = {
|
||||
...execution,
|
||||
provider: provider === "codex" ? execution.provider : { kind: "opencode", model: null },
|
||||
session: { ...execution.session, driverKind: provider === "codex" ? "codex_app_server" : "opencode_server" },
|
||||
} as NativeExecutionInputV1;
|
||||
const issueService = vi.spyOn(issueServiceModule, "issueService").mockReturnValue({
|
||||
update: vi.fn(async () => ({ status: "blocked", statusVersion: 1 })),
|
||||
} as unknown as ReturnType<typeof issueServiceModule.issueService>);
|
||||
@@ -12402,7 +12409,7 @@ describe("runnerd provider runtime wiring", () => {
|
||||
state.createBackend.mockClear();
|
||||
let settled = false;
|
||||
const running = executePaperclipNativeSession({
|
||||
db: leaseDb(execution), execution, runnerInstanceId: "runner-overlap-cleanup",
|
||||
db: leaseDb(current), execution: current, runnerInstanceId: "runner-overlap-cleanup",
|
||||
useRunnerd: true, managedGitHub: true,
|
||||
runnerEnvironment: {
|
||||
PAPERCLIP_NATIVE_MCP_NAME: "paperclip-assigned",
|
||||
@@ -12428,7 +12435,7 @@ describe("runnerd provider runtime wiring", () => {
|
||||
expect(state.execute).not.toHaveBeenCalled();
|
||||
expect(state.createBackend).not.toHaveBeenCalled();
|
||||
if (failure === "assigned") {
|
||||
expect(activate).toHaveBeenCalledWith(execution.binding);
|
||||
expect(activate).toHaveBeenCalledWith(current.binding);
|
||||
expect(deactivate).toHaveBeenCalledOnce();
|
||||
expect(stop).toHaveBeenCalledOnce();
|
||||
}
|
||||
|
||||
@@ -9186,7 +9186,8 @@ async function executePaperclipNativeSessionWithinScope(
|
||||
return input.runnerEnvironment;
|
||||
};
|
||||
const overlapGitHubPreparation = needsCoreGitHubAccess(input) && input.useRunnerd && input.backend === undefined
|
||||
&& input.runnerExecutionTarget?.kind === "remote" && input.execution.provider.kind === "codex"
|
||||
&& input.runnerExecutionTarget?.kind === "remote"
|
||||
&& (input.execution.provider.kind === "codex" || input.execution.provider.kind === "opencode")
|
||||
&& input.execution.schema !== "paperclip.native-execution-input.v6"
|
||||
&& input.execution.schema !== "paperclip.native-execution-input.v8";
|
||||
if (!overlapGitHubPreparation) await prepareRunnerEnvironment();
|
||||
|
||||
Reference in new issue
Block a user