From 85b9dfcaeb1cf7f05b9702bfce954350a94b1c5c Mon Sep 17 00:00:00 2001
From: Devin Foley <devin@devinfoley.com>
Date: Wed, 27 May 2026 23:39:06 -0700
Subject: [PATCH] Fix final Greptile decomposition follow-ups

---
 server/src/__tests__/issues-service.test.ts   |  1 +
 server/src/services/issues.ts                 | 49 ++++++++++++-------
 .../IssuePlanDecompositionsSection.tsx        |  2 +-
 ui/src/pages/IssueDetail.test.tsx             |  5 +-
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/server/src/__tests__/issues-service.test.ts b/server/src/__tests__/issues-service.test.ts
index 68fe6338ef0..052ccb97ae4 100644
--- a/server/src/__tests__/issues-service.test.ts
+++ b/server/src/__tests__/issues-service.test.ts
@@ -3456,6 +3456,7 @@ describeEmbeddedPostgres("accepted plan decomposition", () => {
       actorAgentId: assigneeAgentId,
     });
 
+    expect(first.decomposition).not.toHaveProperty("requestedChildren");
     expect(first.childIssueIds).toHaveLength(2);
     expect(first.newlyCreatedIssues).toHaveLength(2);
     expect(first.decomposition.status).toBe("completed");
diff --git a/server/src/services/issues.ts b/server/src/services/issues.ts
index adf1c9c36bd..2f1f2dc44f6 100644
--- a/server/src/services/issues.ts
+++ b/server/src/services/issues.ts
@@ -32,6 +32,7 @@ import {
   projects,
 } from "@paperclipai/db";
 import type {
+  AcceptedPlanDecomposition,
   IssueCommentAuthorType,
   IssueCommentMetadata,
   IssueCommentPresentation,
@@ -288,6 +289,28 @@ type IssueLastActivityStat = {
   latestCommentAt: Date | null;
   latestLogAt: Date | null;
 };
+
+function serializeAcceptedPlanDecomposition(
+  decomposition: IssuePlanDecompositionRow,
+): AcceptedPlanDecomposition {
+  return {
+    id: decomposition.id,
+    companyId: decomposition.companyId,
+    sourceIssueId: decomposition.sourceIssueId,
+    acceptedPlanRevisionId: decomposition.acceptedPlanRevisionId,
+    acceptedInteractionId: decomposition.acceptedInteractionId,
+    status: decomposition.status as AcceptedPlanDecomposition["status"],
+    requestFingerprint: decomposition.requestFingerprint,
+    requestedChildCount: decomposition.requestedChildCount,
+    childIssueIds: normalizeIssuePlanDecompositionChildIds(decomposition.childIssueIds),
+    ownerAgentId: decomposition.ownerAgentId,
+    ownerUserId: decomposition.ownerUserId,
+    ownerRunId: decomposition.ownerRunId,
+    completedAt: decomposition.completedAt,
+    createdAt: decomposition.createdAt,
+    updatedAt: decomposition.updatedAt,
+  };
+}
 type IssueUserContextInput = {
   createdByUserId: string | null;
   assigneeUserId: string | null;
@@ -4356,9 +4379,11 @@ export function issueService(db: Db) {
         .map((childIssueId) => childIssueMap.get(childIssueId))
         .filter((row): row is typeof issues.$inferSelect => Boolean(row));
 
+      const decomposition = serializeAcceptedPlanDecomposition(currentClaim);
+
       return {
-        decomposition: currentClaim,
-        childIssueIds,
+        decomposition,
+        childIssueIds: decomposition.childIssueIds,
         childIssues: orderedChildIssues,
         newlyCreatedIssues,
       };
@@ -4414,24 +4439,10 @@ export function issueService(db: Db) {
       const childIssueMap = new Map(childIssueRows.map((row) => [row.id, row]));
 
       return rows.map((row) => {
-        const decomposition = row.decomposition;
-        const childIds = normalizeIssuePlanDecompositionChildIds(decomposition.childIssueIds);
+        const decomposition = serializeAcceptedPlanDecomposition(row.decomposition);
+        const childIds = decomposition.childIssueIds;
         return {
-          id: decomposition.id,
-          companyId: decomposition.companyId,
-          sourceIssueId: decomposition.sourceIssueId,
-          acceptedPlanRevisionId: decomposition.acceptedPlanRevisionId,
-          acceptedInteractionId: decomposition.acceptedInteractionId,
-          status: decomposition.status,
-          requestFingerprint: decomposition.requestFingerprint,
-          requestedChildCount: decomposition.requestedChildCount,
-          childIssueIds: childIds,
-          ownerAgentId: decomposition.ownerAgentId,
-          ownerUserId: decomposition.ownerUserId,
-          ownerRunId: decomposition.ownerRunId,
-          completedAt: decomposition.completedAt,
-          createdAt: decomposition.createdAt,
-          updatedAt: decomposition.updatedAt,
+          ...decomposition,
           acceptedPlanRevisionNumber: row.revisionNumber ?? null,
           childIssues: childIds
             .map((childId) => childIssueMap.get(childId) ?? null)
diff --git a/ui/src/components/IssuePlanDecompositionsSection.tsx b/ui/src/components/IssuePlanDecompositionsSection.tsx
index 9ba29a10540..dd17d19a4d2 100644
--- a/ui/src/components/IssuePlanDecompositionsSection.tsx
+++ b/ui/src/components/IssuePlanDecompositionsSection.tsx
@@ -55,7 +55,7 @@ export function IssuePlanDecompositionsSection({
       <ul className="space-y-3">
         {items.map((record) => {
           const requested = record.requestedChildCount ?? 0;
-          const created = record.childIssues?.length ?? 0;
+          const created = record.childIssueIds?.length ?? 0;
           const ownerName = record.ownerAgentId
             ? agentMap?.get(record.ownerAgentId)?.name ?? "agent"
             : null;
diff --git a/ui/src/pages/IssueDetail.test.tsx b/ui/src/pages/IssueDetail.test.tsx
index fb8823669cc..54b468f16a5 100644
--- a/ui/src/pages/IssueDetail.test.tsx
+++ b/ui/src/pages/IssueDetail.test.tsx
@@ -897,8 +897,8 @@ describe("IssueDetail", () => {
         acceptedInteractionId: null,
         status: "completed",
         requestFingerprint: "fingerprint-1",
-        requestedChildCount: 1,
-        childIssueIds: ["issue-2"],
+        requestedChildCount: 2,
+        childIssueIds: ["issue-2", "issue-3"],
         childIssues: [
           {
             id: "issue-2",
@@ -932,6 +932,7 @@ describe("IssueDetail", () => {
 
     expect(container.textContent).toContain("Plan decomposition");
     expect(container.textContent).toContain("Plan revision 2");
+    expect(container.textContent).toContain("2 of 2 child issues created");
     expect(container.textContent).toContain("First child issue");
     expect(mockIssuesApi.listAcceptedPlanDecompositions).toHaveBeenCalledWith("issue-1");
   });