fix(prd-7): M1 architecture review — consolidate duplication, fix bugs, memoize detection
- F1: Consolidated updateForgejoCommentBody into unified updateCommentBody (~150 lines removed) - F2: Fixed wrong run identifier in update-with-branch.ts (context.runId → getForgejoRunIndex()) - F3: Memoized detectPlatform() with _resetPlatformCache() for tests - F4: Added getServerUrl() runtime helper to resolve constant-vs-function inconsistency - F5: Fixed sticky comment bot matching on Forgejo via context.inputs.botName - F6: Documented GHES heuristic misidentification in docs/forgejo.md - Updated PRD M1 checkbox to complete Progress: 17% complete — M1 done, M2 (error handling review) next Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Vlad MocanuandClaude Opus 4.6 committed
1 parent
ae326659b1
commit
ac58fb6c14
15 files changed
+151
-266
No files matched your search
@@ -6,10 +6,12 @@ import {
|
||||
createForgejoBranchLink,
|
||||
createForgejoPrCompareUrl,
|
||||
createForgejoCommentBody,
|
||||
extractOwnerRepoFromUrl,
|
||||
updateForgejoCommentBody,
|
||||
type CommentUpdateInput,
|
||||
} from "../src/forgejo/comment-logic";
|
||||
import {
|
||||
extractOwnerRepoFromUrl,
|
||||
updateCommentBody,
|
||||
type CommentUpdateInput,
|
||||
} from "../src/github/operations/comment-logic";
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Test helpers
|
||||
@@ -307,10 +309,10 @@ describe("extractOwnerRepoFromUrl", () => {
|
||||
});
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// updateForgejoCommentBody
|
||||
// updateCommentBody
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
describe("updateForgejoCommentBody", () => {
|
||||
describe("updateCommentBody", () => {
|
||||
const forgejoBaseInput: CommentUpdateInput = {
|
||||
currentBody: "Initial comment body",
|
||||
actionFailed: false,
|
||||
@@ -332,7 +334,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "testuser",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude finished @testuser's task**");
|
||||
expect(result).not.toContain("Claude Code is working");
|
||||
expect(result).not.toContain("<img");
|
||||
@@ -345,7 +347,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "testuser",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude finished @testuser's task**");
|
||||
expect(result).not.toContain("Claude Code is working");
|
||||
expect(result).not.toContain("⏳");
|
||||
@@ -359,7 +361,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "trigger-user",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"**Claude finished @trigger-user's task in 1m 14s**",
|
||||
);
|
||||
@@ -373,7 +375,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
executionDetails: { duration_ms: 45000 },
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude encountered an error after 45s**");
|
||||
});
|
||||
|
||||
@@ -386,7 +388,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
errorDetails: "Failed to fetch issue data",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude encountered an error after 45s**");
|
||||
expect(result).toContain("[View job]");
|
||||
expect(result).toContain("```\nFailed to fetch issue data\n```");
|
||||
@@ -400,7 +402,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
currentBody: "Some comment",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(`—— [View job](${forgejoBaseInput.jobUrl})`);
|
||||
});
|
||||
});
|
||||
@@ -412,7 +414,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
branchName: "claude/issue-5-20240101-1200",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
// This is the critical fix: GitHub's version uses a hardcoded github.com regex
|
||||
// which fails for Forgejo URLs. Our version uses extractOwnerRepoFromUrl.
|
||||
expect(result).toContain(
|
||||
@@ -427,7 +429,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
branchName: "feature-branch",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("• `feature-branch`");
|
||||
expect(result).not.toContain("[`feature-branch`]");
|
||||
});
|
||||
@@ -440,7 +442,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
"\n[View branch](https://git.wxs.ro/wxs/myrepo/tree/feature-branch)",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"• [`feature-branch`](https://git.wxs.ro/wxs/myrepo/tree/feature-branch)",
|
||||
);
|
||||
@@ -453,7 +455,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
"\n[View branch](https://git.wxs.ro/wxs/myrepo/tree/auto-detected-branch)",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"• [`auto-detected-branch`](https://git.wxs.ro/wxs/myrepo/tree/auto-detected-branch)",
|
||||
);
|
||||
@@ -468,7 +470,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
"\n[Create a PR](https://git.wxs.ro/wxs/myrepo/compare/main...feature)",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"• [Create PR ➔](https://git.wxs.ro/wxs/myrepo/compare/main...feature)",
|
||||
);
|
||||
@@ -481,7 +483,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
"Some comment with [Create a PR](https://git.wxs.ro/wxs/myrepo/compare/main...fix)",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"• [Create PR ➔](https://git.wxs.ro/wxs/myrepo/compare/main...fix)",
|
||||
);
|
||||
@@ -496,7 +498,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
currentBody: `Done!\n\n[Create a PR](${forgejoUrl})`,
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(`• [Create PR ➔](${forgejoUrl})`);
|
||||
});
|
||||
});
|
||||
@@ -509,7 +511,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "testuser",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain(
|
||||
"**Claude finished @testuser's task in 1m 15s**",
|
||||
);
|
||||
@@ -522,7 +524,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "testuser",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude finished @testuser's task in 31s**");
|
||||
});
|
||||
|
||||
@@ -533,7 +535,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "testuser",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).toContain("**Claude finished @testuser's task**");
|
||||
expect(result).not.toContain(" in ");
|
||||
});
|
||||
@@ -553,7 +555,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "trigger-user",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
|
||||
// Check header
|
||||
expect(result).toContain(
|
||||
@@ -594,7 +596,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
prLink: "",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
|
||||
expect(result).toContain("Claude finished @claude's task in 1m 30s");
|
||||
expect(result).toContain(`[View job](${forgejoBaseInput.jobUrl})`);
|
||||
@@ -612,7 +614,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "user",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
expect(result).not.toContain("[View job run]");
|
||||
expect(result).toContain("[View job]");
|
||||
});
|
||||
@@ -626,7 +628,7 @@ describe("updateForgejoCommentBody", () => {
|
||||
triggerUsername: "user",
|
||||
};
|
||||
|
||||
const result = updateForgejoCommentBody(input);
|
||||
const result = updateCommentBody(input);
|
||||
// Old link in body removed
|
||||
expect(result).not.toContain("[View branch]");
|
||||
// New branch in header
|
||||
|
||||
Reference in new issue
Block a user