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. > - Agents request human input through durable issue interactions. > - A question form has a canonical presentation and a compatibility storage format. > - The creation API required agents to write both formats. > - Tool guidance told agents to split text and choice questions across those formats. > - This pull request accepts one complete canonical form and derives storage fields on the server. > - The benefit is a complete question card with stable answer and retry behavior. ## Linked Issues or Issue Description Related work: Refs #13630 and #14430. PR #13630 addresses the display of historical partial forms. This change fixes creation and keeps the check that rejects conflicting new forms. **What happened?** A question save supplied three compatibility questions and one canonical text question. The API correctly rejected the incomplete canonical form. The Runner's tool description encouraged this split. Sending only a complete canonical form also failed because the API required compatibility questions. **Expected behavior** An agent sends one complete `payload.questionSet` with every text and choice question. Paperclip derives `payload.questions` for storage and answer compatibility. Existing legacy requests remain valid. Explicitly conflicting dual forms remain invalid. **Steps to reproduce** 1. Call `paperclip_request_human_input` with `interactionKind: "questions"`. 2. Send `payload: { version: 1, questionSet: ... }` with a required text question and a required choice question. 3. The old API rejects the missing compatibility questions. With this change, it stores both questions and preserves the canonical form. 4. Retry with the same idempotency key. Confirm that only one interaction exists. 5. Submit both answers. Confirm that the normal resolver and continuation rules apply. **Paperclip version or commit** The branch is based on `cf8ad63c8`. The problem affects the native Runner and the interaction creation API. **Deployment mode** Server deployment with the native Paperclip Runner. Integration tests use the real interaction service and an embedded test database. ## What Changed - Add one shared canonical-to-storage projection. Reuse it for native harness question requests. - Accept canonical-only question creation at the shared validator and server boundary. - Export the input type and update the plugin SDK and its RPC contract. - Advertise a typed, complete question form in the live and scenario tool schemas. - Enforce canonical text and custom-answer constraints before ordinary or native resolution. Preserve harmless display whitespace. - Run regex matching in isolated workers with a deadline and resource limits. Both answer paths await the result before persistence. Saved native delivery uses the validated answer without taking another worker slot. - Update agent guidance and generated Runner contracts. - Test mixed forms, option-ID collisions, retries, answers, legacy requests, and conflicting forms. ## Verification - Interaction service, HTTP route, native bridge, and Runner authority suites: 221 tests passed after correcting an obsolete tool-description assertion. - Shared validator, plugin SDK, CLI, and UI compatibility suites: 67 tests passed. - Runner core tool-contract suite: 20 tests passed. AJV validates live and scenario schemas. - Final review regressions: 172 shared, service, native bridge, and authority tests passed. These cover text length, pattern, numeric limits, whitespace, custom option IDs, and historical pending cards. - Runner session suites: 67 tests passed. Published example tests: 4 tests passed. - Server typecheck and the shared/server builds passed after the compatibility fixes. - Final delivery verification: 35 response-delivery tests passed. The native delivery regression proves saved answers do not enter pattern workers; server typecheck and build passed. - Pattern security and answer-flow verification: 205 tests passed after repairing the child fixture loader. These cover pathological matching, event-loop responsiveness, worker concurrency, slot cleanup, HTTP routes, native delivery, and the full helper in a child process. - `pnpm -r typecheck` passed on the bounded-worker revision. - `pnpm build` passed on the bounded-worker revision. - All 55 GitHub checks passed on `fe457af`; four optional jobs were skipped. An unchanged Cursor adapter test timed out once in CI, passed locally, and passed on one failed-job rerun. - Reviewers can send the canonical-only mixed form above and verify that the saved interaction contains both canonical and compatibility questions. ## Risks - The creation API accepts a new input shape. Stored rows and answer contracts keep the existing shape. - The shared projection must preserve synthetic free-text option IDs. Collision and native round-trip tests cover this behavior. - Historical partial rows remain readable. New conflicting dual forms, including written-answer mismatches, remain rejected. - Existing pending cards retain the written-answer paths offered by their stored options. Canonical text constraints still apply. - Ordinary answers now enforce declared canonical constraints before persistence. Invalid answers leave the card pending. - Regex validation has a one-second deadline and a four-worker capacity limit. A complex pattern or capacity error leaves the card pending with a validation error. - No database migration or change to company authorization is required. ## Model Used - OpenAI GPT-6 through Codex. The session exposes the GPT-6 model family; its exact runtime model identifier and context window size are not exposed. Used reasoning, tool use, and code execution. ## 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 - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
389 lines
15 KiB
TypeScript
389 lines
15 KiB
TypeScript
import { and, eq, inArray, sql } from "drizzle-orm";
|
|
|
|
import type { Db } from "@paperclipai/db";
|
|
import { heartbeatRuns, issueThreadInteractions } from "@paperclipai/db";
|
|
import type {
|
|
AskUserQuestionsInteraction,
|
|
RespondIssueThreadInteraction,
|
|
} from "@paperclipai/shared";
|
|
|
|
import { questionSetToAskUserQuestionsPayload } from "@paperclipai/shared";
|
|
|
|
import type { PrpEvent } from "../../vendor/paperclip-runner/index.js";
|
|
import {
|
|
parsePaperclipQuestionSet,
|
|
type PaperclipQuestionSet,
|
|
} from "../../vendor/paperclip-runner/index.js";
|
|
import { logger } from "../../middleware/logger.js";
|
|
import { unprocessable } from "../../errors.js";
|
|
import { logActivity } from "../activity-log.js";
|
|
import { issueThreadInteractionService } from "../issue-thread-interactions.js";
|
|
import { questionResponseDeliveryService } from "../question-response-delivery.js";
|
|
import type { NativeRunStoreBinding } from "./native-run-coordinator-store.js";
|
|
|
|
import { parseQuestionInteractionAnswers, parseSavedQuestionInteractionAnswers } from "../question-interaction-answers.js";
|
|
|
|
const QUESTION_KEY_PREFIX = "paperclip-runner-question:";
|
|
const REQUEST_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,159}$/;
|
|
export const NATIVE_QUESTION_CANCELLATION_CONTEXT_KEY = "nativeQuestionCancellation";
|
|
|
|
type QueueCommand = (
|
|
type: string,
|
|
payload?: Record<string, unknown>,
|
|
commandId?: string,
|
|
) => { readonly commandId: string; readonly controllerSeq: number } | Promise<{ readonly commandId: string; readonly controllerSeq: number }>;
|
|
|
|
interface NativeQuestionCommandTarget {
|
|
binding: Pick<NativeRunStoreBinding, "companyId" | "issueId" | "runId" | "agentId">;
|
|
queueCommand: QueueCommand;
|
|
}
|
|
|
|
const activeTargets = new Map<string, NativeQuestionCommandTarget>();
|
|
|
|
interface NativeQuestionIdentity {
|
|
idempotencyKey?: string | null;
|
|
sourceRunId?: string | null;
|
|
payload: unknown;
|
|
}
|
|
|
|
export interface NativeQuestionAuthorizationIdentity extends NativeQuestionIdentity {
|
|
companyId: string;
|
|
issueId: string;
|
|
}
|
|
|
|
export type NativeQuestionCancellationCause =
|
|
| { kind: "issue_terminal"; issueStatus: string }
|
|
| { kind: "interaction_withdrawn"; interactionId: string }
|
|
| { kind: "interaction_cancelled"; interactionId: string };
|
|
|
|
type DbTransaction = Parameters<Parameters<Db["transaction"]>[0]>[0];
|
|
type NativeQuestionMutationDb = Pick<Db | DbTransaction, "select" | "update">;
|
|
|
|
function record(value: unknown): Record<string, unknown> | null {
|
|
return value && typeof value === "object" && !Array.isArray(value)
|
|
? value as Record<string, unknown>
|
|
: null;
|
|
}
|
|
|
|
function requestIdForInteraction(
|
|
interaction: NativeQuestionIdentity,
|
|
): string | null {
|
|
const payload = record(interaction.payload);
|
|
if (!interaction.sourceRunId || !payload?.questionSet) return null;
|
|
const key = interaction.idempotencyKey;
|
|
const expectedPrefix = `${QUESTION_KEY_PREFIX}${interaction.sourceRunId}:`;
|
|
if (!key?.startsWith(expectedPrefix)) return null;
|
|
const requestId = key.slice(expectedPrefix.length);
|
|
if (!REQUEST_ID_PATTERN.test(requestId)) return null;
|
|
return typeof payload.runtimeRequestId === "string" && payload.runtimeRequestId !== requestId
|
|
? null
|
|
: requestId;
|
|
}
|
|
|
|
function toInteractionPayload(questionSet: PaperclipQuestionSet, runtimeRequestId: string) {
|
|
return {
|
|
...questionSetToAskUserQuestionsPayload(questionSet),
|
|
runtimeRequestId,
|
|
// A generic task comment cannot satisfy this provider request.
|
|
supersedeOnUserComment: false,
|
|
};
|
|
}
|
|
|
|
|
|
async function authorizedNativeRun(
|
|
db: Pick<Db | DbTransaction, "select">,
|
|
interaction: NativeQuestionAuthorizationIdentity,
|
|
) {
|
|
const requestId = requestIdForInteraction(interaction);
|
|
if (!requestId || !interaction.sourceRunId) return null;
|
|
const run = await db.select({
|
|
id: heartbeatRuns.id,
|
|
companyId: heartbeatRuns.companyId,
|
|
issueId: heartbeatRuns.nativeIssueId,
|
|
agentId: heartbeatRuns.agentId,
|
|
runtimeMode: heartbeatRuns.runtimeMode,
|
|
status: heartbeatRuns.status,
|
|
}).from(heartbeatRuns).where(and(
|
|
eq(heartbeatRuns.id, interaction.sourceRunId),
|
|
eq(heartbeatRuns.companyId, interaction.companyId),
|
|
eq(heartbeatRuns.nativeIssueId, interaction.issueId),
|
|
eq(heartbeatRuns.runtimeMode, "native"),
|
|
)).limit(1).then((rows) => rows[0] ?? null);
|
|
return run ? { ...run, requestId } : null;
|
|
}
|
|
|
|
/** Materialize questions; permission requests use the privileged runtime card. */
|
|
export async function projectNativeRuntimeRequest(input: {
|
|
db: Db;
|
|
binding: Pick<NativeRunStoreBinding, "companyId" | "issueId" | "runId" | "agentId" | "normalizedSessionId" | "runnerSourceInstanceId">;
|
|
event: PrpEvent;
|
|
}): Promise<AskUserQuestionsInteraction | null> {
|
|
if (input.event.eventType !== "runtime_request.created") return null;
|
|
if (
|
|
input.event.runId !== input.binding.runId
|
|
|| input.event.normalizedSessionId !== input.binding.normalizedSessionId
|
|
|| input.event.sourceInstanceId !== input.binding.runnerSourceInstanceId
|
|
) {
|
|
throw new Error("native_runtime_request_binding_mismatch");
|
|
}
|
|
const request = record(record(input.event.payload)?.request);
|
|
if (
|
|
!request
|
|
|| request.schema !== "paperclip.runtime_request.v2"
|
|
|| request.status !== "pending"
|
|
|| typeof request.requestId !== "string"
|
|
|| !REQUEST_ID_PATTERN.test(request.requestId)
|
|
) {
|
|
throw new Error("native_runtime_request_invalid");
|
|
}
|
|
if (request.requestKind === "permission_approval" && request.type === "permission") {
|
|
const choices = Array.isArray(request.choices) ? request.choices.map(record) : [];
|
|
const supported = new Set(["accept", "accept_for_session", "decline", "cancel"]);
|
|
if (
|
|
typeof request.turnId !== "string"
|
|
|| request.turnId !== input.event.turnId
|
|
|| (request.itemId != null && typeof request.itemId !== "string")
|
|
|| (request.itemId ?? null) !== (input.event.itemId ?? null)
|
|
|| typeof request.prompt !== "string"
|
|
|| !request.prompt.trim()
|
|
|| request.prompt.length > 4000
|
|
|| choices.length === 0
|
|
|| choices.length > 4
|
|
|| choices.some((choice) => !choice
|
|
|| typeof choice.key !== "string" || !supported.has(choice.key)
|
|
|| typeof choice.label !== "string" || !choice.label.trim() || choice.label.length > 500)
|
|
|| new Set(choices.map((choice) => choice?.key)).size !== choices.length
|
|
|| (request.details !== undefined && !record(request.details))
|
|
) {
|
|
throw new Error("native_runtime_permission_invalid");
|
|
}
|
|
// The committed run event itself feeds TaskChatProtocolCard. Its decisions
|
|
// go through the instance-admin runtime-request route and the exact pending
|
|
// turn, not the human-only question-response delivery path. Returning here
|
|
// allows the durable coordinator to acknowledge the event without creating
|
|
// a second, less-privileged interaction or changing any offered choices.
|
|
return null;
|
|
}
|
|
if (request.requestKind !== "runtime" || request.type !== "input") {
|
|
throw new Error("native_runtime_request_invalid");
|
|
}
|
|
const questionSet = parsePaperclipQuestionSet(request.input);
|
|
if (questionSet.questions.some((question) => question.textValidation?.pattern !== undefined)) {
|
|
// JavaScript regular expressions have no execution budget. Provider-authored
|
|
// patterns therefore stay fail-closed until the runner contract supplies a
|
|
// bounded regex dialect rather than exposing the server to catastrophic backtracking.
|
|
throw new Error("native_runtime_question_pattern_unsupported");
|
|
}
|
|
const idempotencyKey = `${QUESTION_KEY_PREFIX}${input.binding.runId}:${request.requestId}`;
|
|
const existing = await input.db.select({ id: issueThreadInteractions.id })
|
|
.from(issueThreadInteractions)
|
|
.where(and(
|
|
eq(issueThreadInteractions.companyId, input.binding.companyId),
|
|
eq(issueThreadInteractions.issueId, input.binding.issueId),
|
|
eq(issueThreadInteractions.idempotencyKey, idempotencyKey),
|
|
))
|
|
.limit(1)
|
|
.then((rows) => rows[0] ?? null);
|
|
const interaction = await issueThreadInteractionService(input.db).create(
|
|
{ id: input.binding.issueId, companyId: input.binding.companyId },
|
|
{
|
|
kind: "ask_user_questions",
|
|
idempotencyKey,
|
|
sourceRunId: input.binding.runId,
|
|
resolverPolicy: "human_only",
|
|
continuationPolicy: "none",
|
|
...(questionSet.title ? { title: questionSet.title.slice(0, 240) } : {}),
|
|
...(typeof request.prompt === "string" ? { summary: request.prompt.slice(0, 1000) } : {}),
|
|
payload: toInteractionPayload(questionSet, request.requestId),
|
|
},
|
|
{ agentId: input.binding.agentId, runId: input.binding.runId },
|
|
{ supersedePendingSiblingInteractions: false },
|
|
) as AskUserQuestionsInteraction;
|
|
if (!existing) {
|
|
await logActivity(input.db, {
|
|
companyId: input.binding.companyId,
|
|
actorType: "agent",
|
|
actorId: input.binding.agentId,
|
|
agentId: input.binding.agentId,
|
|
runId: input.binding.runId,
|
|
action: "issue.thread_interaction_created",
|
|
entityType: "issue",
|
|
entityId: input.binding.issueId,
|
|
details: {
|
|
interactionId: interaction.id,
|
|
interactionKind: interaction.kind,
|
|
interactionStatus: interaction.status,
|
|
runtimeMode: "native",
|
|
},
|
|
});
|
|
}
|
|
if (interaction.status === "answered") {
|
|
await deliverNativeQuestionResponseDurably(input.db, interaction);
|
|
}
|
|
return interaction;
|
|
}
|
|
|
|
/** Validate untrusted board input before the existing interaction service persists it. */
|
|
export async function validateNativeQuestionResponseInput(
|
|
interaction: AskUserQuestionsInteraction,
|
|
input: RespondIssueThreadInteraction,
|
|
): Promise<void> {
|
|
if (!requestIdForInteraction(interaction) || !interaction.payload.questionSet) return;
|
|
try {
|
|
await parseQuestionInteractionAnswers(interaction.payload.questionSet, input.answers, interaction.payload.questions);
|
|
} catch (error) {
|
|
throw unprocessable(
|
|
error instanceof Error ? error.message : "Invalid native question response",
|
|
{ code: "invalid_question_response" },
|
|
);
|
|
}
|
|
}
|
|
|
|
/** Queue an answered interaction into the active durable PRP command stream. */
|
|
export async function deliverNativeQuestionResponse(
|
|
db: Db,
|
|
interaction: AskUserQuestionsInteraction,
|
|
): Promise<"not_native" | "pending" | "queued"> {
|
|
if (interaction.status !== "answered" || !interaction.result || !interaction.payload.questionSet) {
|
|
return "not_native";
|
|
}
|
|
const run = await authorizedNativeRun(db, interaction);
|
|
// A historical question can be answered after its provider turn has ended.
|
|
// Fall through to durable fresh-wake delivery instead of waiting forever for
|
|
// a command target that cannot return for this terminal run.
|
|
if (!run || ["succeeded", "failed", "cancelled", "timed_out"].includes(run.status)) return "not_native";
|
|
const response = parseSavedQuestionInteractionAnswers(interaction.payload.questionSet, interaction.result.answers, interaction.payload.questions);
|
|
const target = activeTargets.get(run.id);
|
|
if (
|
|
!target
|
|
|| target.binding.companyId !== run.companyId
|
|
|| target.binding.issueId !== run.issueId
|
|
|| target.binding.agentId !== run.agentId
|
|
) {
|
|
return "pending";
|
|
}
|
|
try {
|
|
await target.queueCommand(
|
|
"request.resolve",
|
|
{ requestId: run.requestId, response: response as unknown as Record<string, unknown> },
|
|
`question_${interaction.id}`,
|
|
);
|
|
return "queued";
|
|
} catch (error) {
|
|
logger.warn(
|
|
{ err: error, runId: run.id, interactionId: interaction.id },
|
|
"native question response remains durable for session recovery",
|
|
);
|
|
return "pending";
|
|
}
|
|
}
|
|
|
|
async function deliverNativeQuestionResponseDurably(
|
|
db: Db,
|
|
interaction: AskUserQuestionsInteraction,
|
|
): Promise<void> {
|
|
await questionResponseDeliveryService(db, {
|
|
heartbeat: {
|
|
wakeup: async () => {
|
|
throw new Error("native_question_wake_unreachable");
|
|
},
|
|
} as never,
|
|
resolveNativeQuestion: (candidate) => deliverNativeQuestionResponse(db, candidate),
|
|
}).deliver(interaction.id);
|
|
}
|
|
|
|
export async function flushNativeQuestionResponses(
|
|
db: Db,
|
|
runId: string,
|
|
): Promise<void> {
|
|
const target = activeTargets.get(runId);
|
|
if (!target) return;
|
|
const interactions = await issueThreadInteractionService(db).listForIssue(target.binding.issueId);
|
|
for (const interaction of interactions) {
|
|
if (
|
|
interaction.kind === "ask_user_questions"
|
|
&& interaction.sourceRunId === runId
|
|
&& interaction.status === "answered"
|
|
) {
|
|
await deliverNativeQuestionResponseDurably(db, interaction);
|
|
}
|
|
}
|
|
}
|
|
|
|
export function registerNativeQuestionCommandTarget(target: NativeQuestionCommandTarget): () => void {
|
|
const existing = activeTargets.get(target.binding.runId);
|
|
if (existing) throw new Error("native_question_command_target_conflict");
|
|
activeTargets.set(target.binding.runId, target);
|
|
return () => {
|
|
if (activeTargets.get(target.binding.runId) === target) {
|
|
activeTargets.delete(target.binding.runId);
|
|
}
|
|
};
|
|
}
|
|
|
|
export async function nativeQuestionRunToCancel(
|
|
db: Db,
|
|
interaction: NativeQuestionAuthorizationIdentity,
|
|
): Promise<string | null> {
|
|
const run = await authorizedNativeRun(db, interaction);
|
|
return run && ["queued", "running"].includes(run.status) ? run.id : null;
|
|
}
|
|
|
|
/**
|
|
* Persist cancellation intent in the same transaction that closes the issue.
|
|
* The post-commit fast path and the heartbeat recovery sweep both consume this
|
|
* marker, so process exit or a transient process-termination failure cannot
|
|
* strand a native run after its question has expired.
|
|
*/
|
|
export async function requestNativeQuestionRunCancellation(
|
|
db: NativeQuestionMutationDb,
|
|
interaction: NativeQuestionAuthorizationIdentity,
|
|
cause: NativeQuestionCancellationCause,
|
|
): Promise<string | null> {
|
|
const run = await authorizedNativeRun(db, interaction);
|
|
if (!run || !["queued", "running"].includes(run.status)) return null;
|
|
const marker = JSON.stringify({
|
|
version: 1,
|
|
issueId: interaction.issueId,
|
|
...cause,
|
|
requestedAt: new Date().toISOString(),
|
|
});
|
|
return db.update(heartbeatRuns).set({
|
|
contextSnapshot: sql`jsonb_set(
|
|
case
|
|
when jsonb_typeof(${heartbeatRuns.contextSnapshot}) = 'object'
|
|
then ${heartbeatRuns.contextSnapshot}
|
|
else '{}'::jsonb
|
|
end,
|
|
array[${NATIVE_QUESTION_CANCELLATION_CONTEXT_KEY}],
|
|
${marker}::jsonb,
|
|
true
|
|
)`,
|
|
updatedAt: new Date(),
|
|
}).where(and(
|
|
eq(heartbeatRuns.id, run.id),
|
|
eq(heartbeatRuns.companyId, interaction.companyId),
|
|
eq(heartbeatRuns.nativeIssueId, interaction.issueId),
|
|
eq(heartbeatRuns.runtimeMode, "native"),
|
|
inArray(heartbeatRuns.status, ["queued", "running"]),
|
|
)).returning({ id: heartbeatRuns.id }).then((rows) => rows[0]?.id ?? null);
|
|
}
|
|
|
|
/** Capture the minimum bound identity needed to cancel after the issue transaction commits. */
|
|
export function nativeQuestionCancellationIdentity(
|
|
interaction: NativeQuestionAuthorizationIdentity,
|
|
): NativeQuestionAuthorizationIdentity | null {
|
|
if (!requestIdForInteraction(interaction)) return null;
|
|
return {
|
|
companyId: interaction.companyId,
|
|
issueId: interaction.issueId,
|
|
sourceRunId: interaction.sourceRunId,
|
|
payload: interaction.payload,
|
|
idempotencyKey: interaction.idempotencyKey,
|
|
};
|
|
}
|
|
|
|
export const nativeQuestionBridgeInternals = {
|
|
resetForTests: () => activeTargets.clear(),
|
|
};
|