mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-18 11:40:39 +09:00
Normalize escaped multiline issue and approval text (#4444)
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - The board and agent APIs accept multiline issue, approval, interaction, and document text > - Some callers accidentally send literal escaped newline sequences like `\n` instead of JSON-decoded line breaks > - That makes comments, descriptions, documents, and approval notes render as flattened text instead of readable markdown > - This pull request centralizes multiline text normalization in shared validators > - The benefit is newline-preserving API behavior across issue and approval workflows without route-specific fixes ## What Changed - Added a shared `multilineTextSchema` helper that normalizes escaped `\n`, `\r\n`, and `\r` sequences to real line breaks. - Applied the helper to issue descriptions, issue update comments, issue comment bodies, suggested task descriptions, interaction summaries, issue documents, approval comments, and approval decision notes. - Added shared validator regressions for issue and approval multiline inputs. ## Verification - `pnpm exec vitest run --project @paperclipai/shared packages/shared/src/validators/approval.test.ts packages/shared/src/validators/issue.test.ts` - `pnpm --filter @paperclipai/shared typecheck` ## Risks - Low risk. This only changes text fields that are explicitly multiline user/operator content. - If a caller intentionally wanted literal backslash-n text in these fields, it will now render as a real line break. > 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 coding agent, tool-enabled with shell/GitHub/Paperclip API access. Context window was not reported by the runtime. ## 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>
This commit is contained in:
parent
5a0c1979cf
commit
0c6961a03e
5 changed files with 130 additions and 9 deletions
31
packages/shared/src/validators/approval.test.ts
Normal file
31
packages/shared/src/validators/approval.test.ts
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import {
|
||||||
|
addApprovalCommentSchema,
|
||||||
|
requestApprovalRevisionSchema,
|
||||||
|
resolveApprovalSchema,
|
||||||
|
} from "./approval.js";
|
||||||
|
|
||||||
|
describe("approval validators", () => {
|
||||||
|
it("passes real line breaks through unchanged", () => {
|
||||||
|
expect(addApprovalCommentSchema.parse({ body: "Looks good\n\nApproved." }).body)
|
||||||
|
.toBe("Looks good\n\nApproved.");
|
||||||
|
expect(resolveApprovalSchema.parse({ decisionNote: "Decision\n\nApproved." }).decisionNote)
|
||||||
|
.toBe("Decision\n\nApproved.");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts null and omitted optional decision notes", () => {
|
||||||
|
expect(resolveApprovalSchema.parse({ decisionNote: null }).decisionNote).toBeNull();
|
||||||
|
expect(resolveApprovalSchema.parse({}).decisionNote).toBeUndefined();
|
||||||
|
expect(requestApprovalRevisionSchema.parse({ decisionNote: null }).decisionNote).toBeNull();
|
||||||
|
expect(requestApprovalRevisionSchema.parse({}).decisionNote).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes escaped line breaks in approval comments and decision notes", () => {
|
||||||
|
expect(addApprovalCommentSchema.parse({ body: "Looks good\\n\\nApproved." }).body)
|
||||||
|
.toBe("Looks good\n\nApproved.");
|
||||||
|
expect(resolveApprovalSchema.parse({ decisionNote: "Decision\\n\\nApproved." }).decisionNote)
|
||||||
|
.toBe("Decision\n\nApproved.");
|
||||||
|
expect(requestApprovalRevisionSchema.parse({ decisionNote: "Decision\\r\\nRevise." }).decisionNote)
|
||||||
|
.toBe("Decision\nRevise.");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { APPROVAL_TYPES } from "../constants.js";
|
import { APPROVAL_TYPES } from "../constants.js";
|
||||||
|
import { multilineTextSchema } from "./text.js";
|
||||||
|
|
||||||
export const createApprovalSchema = z.object({
|
export const createApprovalSchema = z.object({
|
||||||
type: z.enum(APPROVAL_TYPES),
|
type: z.enum(APPROVAL_TYPES),
|
||||||
|
|
@ -11,13 +12,13 @@ export const createApprovalSchema = z.object({
|
||||||
export type CreateApproval = z.infer<typeof createApprovalSchema>;
|
export type CreateApproval = z.infer<typeof createApprovalSchema>;
|
||||||
|
|
||||||
export const resolveApprovalSchema = z.object({
|
export const resolveApprovalSchema = z.object({
|
||||||
decisionNote: z.string().optional().nullable(),
|
decisionNote: multilineTextSchema.optional().nullable(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type ResolveApproval = z.infer<typeof resolveApprovalSchema>;
|
export type ResolveApproval = z.infer<typeof resolveApprovalSchema>;
|
||||||
|
|
||||||
export const requestApprovalRevisionSchema = z.object({
|
export const requestApprovalRevisionSchema = z.object({
|
||||||
decisionNote: z.string().optional().nullable(),
|
decisionNote: multilineTextSchema.optional().nullable(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type RequestApprovalRevision = z.infer<typeof requestApprovalRevisionSchema>;
|
export type RequestApprovalRevision = z.infer<typeof requestApprovalRevisionSchema>;
|
||||||
|
|
@ -29,7 +30,7 @@ export const resubmitApprovalSchema = z.object({
|
||||||
export type ResubmitApproval = z.infer<typeof resubmitApprovalSchema>;
|
export type ResubmitApproval = z.infer<typeof resubmitApprovalSchema>;
|
||||||
|
|
||||||
export const addApprovalCommentSchema = z.object({
|
export const addApprovalCommentSchema = z.object({
|
||||||
body: z.string().min(1),
|
body: multilineTextSchema.pipe(z.string().min(1)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type AddApprovalComment = z.infer<typeof addApprovalCommentSchema>;
|
export type AddApprovalComment = z.infer<typeof addApprovalCommentSchema>;
|
||||||
|
|
|
||||||
78
packages/shared/src/validators/issue.test.ts
Normal file
78
packages/shared/src/validators/issue.test.ts
Normal file
|
|
@ -0,0 +1,78 @@
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import {
|
||||||
|
addIssueCommentSchema,
|
||||||
|
createIssueSchema,
|
||||||
|
respondIssueThreadInteractionSchema,
|
||||||
|
suggestedTaskDraftSchema,
|
||||||
|
updateIssueSchema,
|
||||||
|
upsertIssueDocumentSchema,
|
||||||
|
} from "./issue.js";
|
||||||
|
|
||||||
|
describe("issue validators", () => {
|
||||||
|
it("passes real line breaks through unchanged", () => {
|
||||||
|
const parsed = createIssueSchema.parse({
|
||||||
|
title: "Follow up PR",
|
||||||
|
description: "Line 1\n\nLine 2",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(parsed.description).toBe("Line 1\n\nLine 2");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("accepts null and omitted optional multiline issue fields", () => {
|
||||||
|
expect(createIssueSchema.parse({ title: "Follow up PR", description: null }).description)
|
||||||
|
.toBeNull();
|
||||||
|
expect(createIssueSchema.parse({ title: "Follow up PR" }).description)
|
||||||
|
.toBeUndefined();
|
||||||
|
expect(updateIssueSchema.parse({ comment: undefined }).comment)
|
||||||
|
.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes JSON-escaped line breaks in issue descriptions", () => {
|
||||||
|
const parsed = createIssueSchema.parse({
|
||||||
|
title: "Follow up PR",
|
||||||
|
description: "PR: https://example.com/pr/1\\n\\nShip the follow-up.",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(parsed.description).toBe("PR: https://example.com/pr/1\n\nShip the follow-up.");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes escaped line breaks in issue update comments", () => {
|
||||||
|
const parsed = updateIssueSchema.parse({
|
||||||
|
comment: "Done\\n\\n- Verified the route",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(parsed.comment).toBe("Done\n\n- Verified the route");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes escaped line breaks in issue comment bodies", () => {
|
||||||
|
const parsed = addIssueCommentSchema.parse({
|
||||||
|
body: "Progress update\\r\\n\\r\\nNext action.",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(parsed.body).toBe("Progress update\n\nNext action.");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes escaped line breaks in generated task drafts", () => {
|
||||||
|
const parsed = suggestedTaskDraftSchema.parse({
|
||||||
|
clientKey: "task-1",
|
||||||
|
title: "Follow up",
|
||||||
|
description: "Line 1\\n\\nLine 2",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(parsed.description).toBe("Line 1\n\nLine 2");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes escaped line breaks in thread summaries and documents", () => {
|
||||||
|
const response = respondIssueThreadInteractionSchema.parse({
|
||||||
|
answers: [],
|
||||||
|
summaryMarkdown: "Summary\\n\\nNext action",
|
||||||
|
});
|
||||||
|
const document = upsertIssueDocumentSchema.parse({
|
||||||
|
format: "markdown",
|
||||||
|
body: "# Plan\\n\\nShip it",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(response.summaryMarkdown).toBe("Summary\n\nNext action");
|
||||||
|
expect(document.body).toBe("# Plan\n\nShip it");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -10,6 +10,7 @@ import {
|
||||||
ISSUE_THREAD_INTERACTION_KINDS,
|
ISSUE_THREAD_INTERACTION_KINDS,
|
||||||
ISSUE_THREAD_INTERACTION_STATUSES,
|
ISSUE_THREAD_INTERACTION_STATUSES,
|
||||||
} from "../constants.js";
|
} from "../constants.js";
|
||||||
|
import { multilineTextSchema } from "./text.js";
|
||||||
|
|
||||||
export const ISSUE_EXECUTION_WORKSPACE_PREFERENCES = [
|
export const ISSUE_EXECUTION_WORKSPACE_PREFERENCES = [
|
||||||
"inherit",
|
"inherit",
|
||||||
|
|
@ -130,7 +131,7 @@ export const createIssueSchema = z.object({
|
||||||
blockedByIssueIds: z.array(z.string().uuid()).optional(),
|
blockedByIssueIds: z.array(z.string().uuid()).optional(),
|
||||||
inheritExecutionWorkspaceFromIssueId: z.string().uuid().optional().nullable(),
|
inheritExecutionWorkspaceFromIssueId: z.string().uuid().optional().nullable(),
|
||||||
title: z.string().min(1),
|
title: z.string().min(1),
|
||||||
description: z.string().optional().nullable(),
|
description: multilineTextSchema.optional().nullable(),
|
||||||
status: z.enum(ISSUE_STATUSES).optional().default("backlog"),
|
status: z.enum(ISSUE_STATUSES).optional().default("backlog"),
|
||||||
priority: z.enum(ISSUE_PRIORITIES).optional().default("medium"),
|
priority: z.enum(ISSUE_PRIORITIES).optional().default("medium"),
|
||||||
assigneeAgentId: z.string().uuid().optional().nullable(),
|
assigneeAgentId: z.string().uuid().optional().nullable(),
|
||||||
|
|
@ -168,7 +169,7 @@ export type CreateIssueLabel = z.infer<typeof createIssueLabelSchema>;
|
||||||
|
|
||||||
export const updateIssueSchema = createIssueSchema.partial().extend({
|
export const updateIssueSchema = createIssueSchema.partial().extend({
|
||||||
assigneeAgentId: z.string().trim().min(1).optional().nullable(),
|
assigneeAgentId: z.string().trim().min(1).optional().nullable(),
|
||||||
comment: z.string().min(1).optional(),
|
comment: multilineTextSchema.pipe(z.string().min(1)).optional(),
|
||||||
reviewRequest: issueReviewRequestSchema.optional().nullable(),
|
reviewRequest: issueReviewRequestSchema.optional().nullable(),
|
||||||
reopen: z.boolean().optional(),
|
reopen: z.boolean().optional(),
|
||||||
resume: z.boolean().optional(),
|
resume: z.boolean().optional(),
|
||||||
|
|
@ -187,7 +188,7 @@ export const checkoutIssueSchema = z.object({
|
||||||
export type CheckoutIssue = z.infer<typeof checkoutIssueSchema>;
|
export type CheckoutIssue = z.infer<typeof checkoutIssueSchema>;
|
||||||
|
|
||||||
export const addIssueCommentSchema = z.object({
|
export const addIssueCommentSchema = z.object({
|
||||||
body: z.string().min(1),
|
body: multilineTextSchema.pipe(z.string().min(1)),
|
||||||
reopen: z.boolean().optional(),
|
reopen: z.boolean().optional(),
|
||||||
resume: z.boolean().optional(),
|
resume: z.boolean().optional(),
|
||||||
interrupt: z.boolean().optional(),
|
interrupt: z.boolean().optional(),
|
||||||
|
|
@ -213,7 +214,7 @@ export const suggestedTaskDraftSchema = z.object({
|
||||||
parentClientKey: z.string().trim().min(1).max(120).nullable().optional(),
|
parentClientKey: z.string().trim().min(1).max(120).nullable().optional(),
|
||||||
parentId: z.string().uuid().nullable().optional(),
|
parentId: z.string().uuid().nullable().optional(),
|
||||||
title: z.string().trim().min(1).max(240),
|
title: z.string().trim().min(1).max(240),
|
||||||
description: z.string().trim().max(20000).nullable().optional(),
|
description: multilineTextSchema.pipe(z.string().trim().max(20000)).nullable().optional(),
|
||||||
priority: z.enum(ISSUE_PRIORITIES).nullable().optional(),
|
priority: z.enum(ISSUE_PRIORITIES).nullable().optional(),
|
||||||
assigneeAgentId: z.string().uuid().nullable().optional(),
|
assigneeAgentId: z.string().uuid().nullable().optional(),
|
||||||
assigneeUserId: z.string().trim().min(1).nullable().optional(),
|
assigneeUserId: z.string().trim().min(1).nullable().optional(),
|
||||||
|
|
@ -439,7 +440,7 @@ export type RejectIssueThreadInteraction = z.infer<typeof rejectIssueThreadInter
|
||||||
|
|
||||||
export const respondIssueThreadInteractionSchema = z.object({
|
export const respondIssueThreadInteractionSchema = z.object({
|
||||||
answers: z.array(askUserQuestionsAnswerSchema).max(20),
|
answers: z.array(askUserQuestionsAnswerSchema).max(20),
|
||||||
summaryMarkdown: z.string().max(20000).nullable().optional(),
|
summaryMarkdown: multilineTextSchema.pipe(z.string().max(20000)).nullable().optional(),
|
||||||
});
|
});
|
||||||
export type RespondIssueThreadInteraction = z.infer<typeof respondIssueThreadInteractionSchema>;
|
export type RespondIssueThreadInteraction = z.infer<typeof respondIssueThreadInteractionSchema>;
|
||||||
|
|
||||||
|
|
@ -462,7 +463,7 @@ export const issueDocumentFormatSchema = z.enum(ISSUE_DOCUMENT_FORMATS);
|
||||||
export const upsertIssueDocumentSchema = z.object({
|
export const upsertIssueDocumentSchema = z.object({
|
||||||
title: z.string().trim().max(200).nullable().optional(),
|
title: z.string().trim().max(200).nullable().optional(),
|
||||||
format: issueDocumentFormatSchema,
|
format: issueDocumentFormatSchema,
|
||||||
body: z.string().max(524288),
|
body: multilineTextSchema.pipe(z.string().max(524288)),
|
||||||
changeSummary: z.string().trim().max(500).nullable().optional(),
|
changeSummary: z.string().trim().max(500).nullable().optional(),
|
||||||
baseRevisionId: z.string().uuid().nullable().optional(),
|
baseRevisionId: z.string().uuid().nullable().optional(),
|
||||||
});
|
});
|
||||||
|
|
|
||||||
10
packages/shared/src/validators/text.ts
Normal file
10
packages/shared/src/validators/text.ts
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
export function normalizeEscapedLineBreaks(value: string): string {
|
||||||
|
return value
|
||||||
|
.replace(/\\r\\n/g, "\n")
|
||||||
|
.replace(/\\n/g, "\n")
|
||||||
|
.replace(/\\r/g, "\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
export const multilineTextSchema = z.string().transform(normalizeEscapedLineBreaks);
|
||||||
Loading…
Add table
Add a link
Reference in a new issue