github-issue-tower-defence-management 1.44.10 → 1.45.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/bin/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.js +36 -1
- package/bin/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.js.map +1 -1
- package/bin/domain/usecases/StartPreparationUseCase.js +17 -2
- package/bin/domain/usecases/StartPreparationUseCase.js.map +1 -1
- package/package.json +1 -1
- package/src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts +58 -3
- package/src/domain/usecases/RevertOrphanedPreparationUseCase.test.ts +1 -0
- package/src/domain/usecases/StartPreparationUseCase.test.ts +125 -7
- package/src/domain/usecases/StartPreparationUseCase.ts +32 -3
- package/src/domain/usecases/adapter-interfaces/IssueRepository.ts +7 -0
- package/types/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.d.ts +3 -0
- package/types/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.d.ts.map +1 -1
- package/types/domain/usecases/StartPreparationUseCase.d.ts +1 -1
- package/types/domain/usecases/StartPreparationUseCase.d.ts.map +1 -1
- package/types/domain/usecases/adapter-interfaces/IssueRepository.d.ts +4 -0
- package/types/domain/usecases/adapter-interfaces/IssueRepository.d.ts.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
# [1.45.0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.44.10...v1.45.0) (2026-05-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **core:** add missing createdAt field to createPassingPr helper in RevertOrphanedPreparationUseCase tests ([7dde738](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/7dde738f385ed3bbd997ee66fc2ec4cf4ad053d4))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **core:** auto-resolve multiple-open-PR ambiguity by adopting oldest PR and closing newer ones ([6840f2c](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/6840f2c3890ad66e41ea0ac0bfc9deca1804c444)), closes [#561](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/561)
|
|
12
|
+
|
|
1
13
|
## [1.44.10](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.44.9...v1.44.10) (2026-05-16)
|
|
2
14
|
|
|
3
15
|
|
|
@@ -326,6 +326,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
|
|
|
326
326
|
return {
|
|
327
327
|
url: prUrl,
|
|
328
328
|
branchName: headRefName ?? null,
|
|
329
|
+
createdAt: new Date(0),
|
|
329
330
|
isConflicted,
|
|
330
331
|
isPassedAllCiJob,
|
|
331
332
|
isCiStateSuccess,
|
|
@@ -358,6 +359,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
|
|
|
358
359
|
url
|
|
359
360
|
number
|
|
360
361
|
state
|
|
362
|
+
createdAt
|
|
361
363
|
mergeable
|
|
362
364
|
headRefName
|
|
363
365
|
baseRefName
|
|
@@ -473,7 +475,11 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
|
|
|
473
475
|
const pr = item.source;
|
|
474
476
|
const prUrl = pr.url || '';
|
|
475
477
|
const baseRefName = pr.baseRefName ?? pr.baseRef?.name;
|
|
476
|
-
|
|
478
|
+
const prStatus = this.computePrStatus(prUrl, pr.headRefName, baseRefName, pr);
|
|
479
|
+
relatedPRsMap.set(prUrl, {
|
|
480
|
+
...prStatus,
|
|
481
|
+
createdAt: pr.createdAt ? new Date(pr.createdAt) : new Date(0),
|
|
482
|
+
});
|
|
477
483
|
}
|
|
478
484
|
hasNextPage = issueData.timelineItems.pageInfo.hasNextPage;
|
|
479
485
|
after = issueData.timelineItems.pageInfo.endCursor;
|
|
@@ -611,6 +617,35 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
|
|
|
611
617
|
}
|
|
612
618
|
return this.computePrStatus(pr.url, pr.headRefName, pr.baseRefName, pr);
|
|
613
619
|
};
|
|
620
|
+
this.closePullRequest = async (prUrl) => {
|
|
621
|
+
const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
|
|
622
|
+
const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`, {
|
|
623
|
+
method: 'PATCH',
|
|
624
|
+
headers: {
|
|
625
|
+
Authorization: `Bearer ${this.ghToken}`,
|
|
626
|
+
'Content-Type': 'application/json',
|
|
627
|
+
},
|
|
628
|
+
body: JSON.stringify({ state: 'closed' }),
|
|
629
|
+
});
|
|
630
|
+
if (!response.ok) {
|
|
631
|
+
throw new Error(`Failed to close PR ${prUrl}: HTTP ${response.status}`);
|
|
632
|
+
}
|
|
633
|
+
};
|
|
634
|
+
this.deletePullRequestBranch = async (prUrl, branchName) => {
|
|
635
|
+
const { owner, repo } = this.parseIssueUrl(prUrl);
|
|
636
|
+
const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/git/refs/heads/${encodeURIComponent(branchName)}`, {
|
|
637
|
+
method: 'DELETE',
|
|
638
|
+
headers: {
|
|
639
|
+
Authorization: `Bearer ${this.ghToken}`,
|
|
640
|
+
},
|
|
641
|
+
});
|
|
642
|
+
if (!response.ok && response.status !== 422) {
|
|
643
|
+
throw new Error(`Failed to delete branch ${branchName} for PR ${prUrl}: HTTP ${response.status}`);
|
|
644
|
+
}
|
|
645
|
+
};
|
|
646
|
+
this.createCommentByUrl = async (issueOrPrUrl, commentBody) => {
|
|
647
|
+
await this.restIssueRepository.createComment(issueOrPrUrl, commentBody);
|
|
648
|
+
};
|
|
614
649
|
}
|
|
615
650
|
}
|
|
616
651
|
exports.ApiV3CheerioRestIssueRepository = ApiV3CheerioRestIssueRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiV3CheerioRestIssueRepository.js","sourceRoot":"","sources":["../../../../src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ApiV3CheerioRestIssueRepository.js","sourceRoot":"","sources":["../../../../src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,8 +105,23 @@ class StartPreparationUseCase {
|
|
|
105
105
|
else {
|
|
106
106
|
const relatedPRs = await this.issueRepository.findRelatedOpenPRs(issue.url);
|
|
107
107
|
if (relatedPRs.length > 1) {
|
|
108
|
-
|
|
109
|
-
|
|
108
|
+
const sortedPRs = [...relatedPRs].sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
|
|
109
|
+
const canonicalPR = sortedPRs[0];
|
|
110
|
+
const duplicatePRs = sortedPRs.slice(1);
|
|
111
|
+
for (const duplicatePR of duplicatePRs) {
|
|
112
|
+
await this.issueRepository.closePullRequest(duplicatePR.url);
|
|
113
|
+
if (duplicatePR.branchName !== null) {
|
|
114
|
+
await this.issueRepository.deletePullRequestBranch(duplicatePR.url, duplicatePR.branchName);
|
|
115
|
+
}
|
|
116
|
+
await this.issueRepository.createCommentByUrl(duplicatePR.url, `This PR was automatically closed to resolve multiple-open-PR ambiguity for issue ${issue.url}. The adopted canonical PR is ${canonicalPR.url}.`);
|
|
117
|
+
}
|
|
118
|
+
const removedPrUrls = duplicatePRs.map((pr) => pr.url).join(', ');
|
|
119
|
+
await this.issueRepository.createCommentByUrl(issue.url, `${duplicatePRs.length} duplicate PR(s) were automatically closed to resolve multiple-open-PR ambiguity.\n\nRemoved PRs: ${removedPrUrls}\nAdopted PR: ${canonicalPR.url}`);
|
|
120
|
+
if (canonicalPR.branchName === null) {
|
|
121
|
+
console.warn(`Skipping issue ${issue.url}: adopted canonical PR has unavailable head branch.`);
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
branchName = canonicalPR.branchName;
|
|
110
125
|
}
|
|
111
126
|
else if (relatedPRs.length === 1) {
|
|
112
127
|
if (relatedPRs[0].branchName === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartPreparationUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":";;;AAKA,MAAa,uBAAuB;IAClC,YACmB,iBAGhB,EACgB,
|
|
1
|
+
{"version":3,"file":"StartPreparationUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,6 +26,7 @@ type TimelineItem = {
|
|
|
26
26
|
url?: string;
|
|
27
27
|
number?: number;
|
|
28
28
|
state?: string;
|
|
29
|
+
createdAt?: string;
|
|
29
30
|
mergeable?: string;
|
|
30
31
|
headRefName?: string;
|
|
31
32
|
baseRefName?: string;
|
|
@@ -693,6 +694,7 @@ export class ApiV3CheerioRestIssueRepository
|
|
|
693
694
|
return {
|
|
694
695
|
url: prUrl,
|
|
695
696
|
branchName: headRefName ?? null,
|
|
697
|
+
createdAt: new Date(0),
|
|
696
698
|
isConflicted,
|
|
697
699
|
isPassedAllCiJob,
|
|
698
700
|
isCiStateSuccess,
|
|
@@ -731,6 +733,7 @@ export class ApiV3CheerioRestIssueRepository
|
|
|
731
733
|
url
|
|
732
734
|
number
|
|
733
735
|
state
|
|
736
|
+
createdAt
|
|
734
737
|
mergeable
|
|
735
738
|
headRefName
|
|
736
739
|
baseRefName
|
|
@@ -855,11 +858,17 @@ export class ApiV3CheerioRestIssueRepository
|
|
|
855
858
|
const pr = item.source;
|
|
856
859
|
const prUrl = pr.url || '';
|
|
857
860
|
const baseRefName = pr.baseRefName ?? pr.baseRef?.name;
|
|
858
|
-
|
|
859
|
-
relatedPRsMap.set(
|
|
861
|
+
const prStatus = this.computePrStatus(
|
|
860
862
|
prUrl,
|
|
861
|
-
|
|
863
|
+
pr.headRefName,
|
|
864
|
+
baseRefName,
|
|
865
|
+
pr,
|
|
862
866
|
);
|
|
867
|
+
|
|
868
|
+
relatedPRsMap.set(prUrl, {
|
|
869
|
+
...prStatus,
|
|
870
|
+
createdAt: pr.createdAt ? new Date(pr.createdAt) : new Date(0),
|
|
871
|
+
});
|
|
863
872
|
}
|
|
864
873
|
|
|
865
874
|
hasNextPage = issueData.timelineItems.pageInfo.hasNextPage;
|
|
@@ -1017,4 +1026,50 @@ export class ApiV3CheerioRestIssueRepository
|
|
|
1017
1026
|
|
|
1018
1027
|
return this.computePrStatus(pr.url, pr.headRefName, pr.baseRefName, pr);
|
|
1019
1028
|
};
|
|
1029
|
+
|
|
1030
|
+
closePullRequest = async (prUrl: string): Promise<void> => {
|
|
1031
|
+
const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
|
|
1032
|
+
const response = await fetch(
|
|
1033
|
+
`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`,
|
|
1034
|
+
{
|
|
1035
|
+
method: 'PATCH',
|
|
1036
|
+
headers: {
|
|
1037
|
+
Authorization: `Bearer ${this.ghToken}`,
|
|
1038
|
+
'Content-Type': 'application/json',
|
|
1039
|
+
},
|
|
1040
|
+
body: JSON.stringify({ state: 'closed' }),
|
|
1041
|
+
},
|
|
1042
|
+
);
|
|
1043
|
+
if (!response.ok) {
|
|
1044
|
+
throw new Error(`Failed to close PR ${prUrl}: HTTP ${response.status}`);
|
|
1045
|
+
}
|
|
1046
|
+
};
|
|
1047
|
+
|
|
1048
|
+
deletePullRequestBranch = async (
|
|
1049
|
+
prUrl: string,
|
|
1050
|
+
branchName: string,
|
|
1051
|
+
): Promise<void> => {
|
|
1052
|
+
const { owner, repo } = this.parseIssueUrl(prUrl);
|
|
1053
|
+
const response = await fetch(
|
|
1054
|
+
`https://api.github.com/repos/${owner}/${repo}/git/refs/heads/${encodeURIComponent(branchName)}`,
|
|
1055
|
+
{
|
|
1056
|
+
method: 'DELETE',
|
|
1057
|
+
headers: {
|
|
1058
|
+
Authorization: `Bearer ${this.ghToken}`,
|
|
1059
|
+
},
|
|
1060
|
+
},
|
|
1061
|
+
);
|
|
1062
|
+
if (!response.ok && response.status !== 422) {
|
|
1063
|
+
throw new Error(
|
|
1064
|
+
`Failed to delete branch ${branchName} for PR ${prUrl}: HTTP ${response.status}`,
|
|
1065
|
+
);
|
|
1066
|
+
}
|
|
1067
|
+
};
|
|
1068
|
+
|
|
1069
|
+
createCommentByUrl = async (
|
|
1070
|
+
issueOrPrUrl: string,
|
|
1071
|
+
commentBody: string,
|
|
1072
|
+
): Promise<void> => {
|
|
1073
|
+
await this.restIssueRepository.createComment(issueOrPrUrl, commentBody);
|
|
1074
|
+
};
|
|
1020
1075
|
}
|
|
@@ -82,6 +82,7 @@ const createMockProject = (): Project => ({
|
|
|
82
82
|
const createPassingPr = () => ({
|
|
83
83
|
url: 'https://github.com/user/repo/pull/5',
|
|
84
84
|
branchName: 'i1',
|
|
85
|
+
createdAt: new Date('2024-01-01T00:00:00Z'),
|
|
85
86
|
isConflicted: false,
|
|
86
87
|
isPassedAllCiJob: true,
|
|
87
88
|
isCiStateSuccess: true,
|
|
@@ -87,6 +87,9 @@ describe('StartPreparationUseCase', () => {
|
|
|
87
87
|
| 'updateStatus'
|
|
88
88
|
| 'findRelatedOpenPRs'
|
|
89
89
|
| 'getOpenPullRequest'
|
|
90
|
+
| 'closePullRequest'
|
|
91
|
+
| 'deletePullRequestBranch'
|
|
92
|
+
| 'createCommentByUrl'
|
|
90
93
|
>
|
|
91
94
|
>;
|
|
92
95
|
let mockClaudeRepository: Mocked<Pick<ClaudeRepository, 'getUsage'>>;
|
|
@@ -108,6 +111,9 @@ describe('StartPreparationUseCase', () => {
|
|
|
108
111
|
updateStatus: jest.fn(),
|
|
109
112
|
findRelatedOpenPRs: jest.fn().mockResolvedValue([]),
|
|
110
113
|
getOpenPullRequest: jest.fn().mockResolvedValue(null),
|
|
114
|
+
closePullRequest: jest.fn().mockResolvedValue(undefined),
|
|
115
|
+
deletePullRequestBranch: jest.fn().mockResolvedValue(undefined),
|
|
116
|
+
createCommentByUrl: jest.fn().mockResolvedValue(undefined),
|
|
111
117
|
};
|
|
112
118
|
mockClaudeRepository = {
|
|
113
119
|
getUsage: jest.fn().mockResolvedValue([]),
|
|
@@ -225,6 +231,7 @@ describe('StartPreparationUseCase', () => {
|
|
|
225
231
|
const existingPR: RelatedPullRequest = {
|
|
226
232
|
url: 'https://github.com/user/repo/pull/42',
|
|
227
233
|
branchName: 'i1',
|
|
234
|
+
createdAt: new Date('2024-01-01'),
|
|
228
235
|
isConflicted: false,
|
|
229
236
|
isPassedAllCiJob: false,
|
|
230
237
|
isCiStateSuccess: false,
|
|
@@ -286,6 +293,7 @@ describe('StartPreparationUseCase', () => {
|
|
|
286
293
|
mockIssueRepository.getOpenPullRequest.mockResolvedValue({
|
|
287
294
|
url: 'https://github.com/user/repo/pull/354',
|
|
288
295
|
branchName: 'dependabot/npm_and_yarn/multi-cc382f683c',
|
|
296
|
+
createdAt: new Date('2024-01-01'),
|
|
289
297
|
isConflicted: false,
|
|
290
298
|
isPassedAllCiJob: false,
|
|
291
299
|
isCiStateSuccess: false,
|
|
@@ -385,6 +393,7 @@ describe('StartPreparationUseCase', () => {
|
|
|
385
393
|
mockIssueRepository.getOpenPullRequest.mockResolvedValue({
|
|
386
394
|
url: 'https://github.com/user/repo/pull/999',
|
|
387
395
|
branchName: null,
|
|
396
|
+
createdAt: new Date('2024-01-01'),
|
|
388
397
|
isConflicted: false,
|
|
389
398
|
isPassedAllCiJob: false,
|
|
390
399
|
isCiStateSuccess: false,
|
|
@@ -432,6 +441,7 @@ describe('StartPreparationUseCase', () => {
|
|
|
432
441
|
mockIssueRepository.getOpenPullRequest.mockResolvedValue({
|
|
433
442
|
url: 'https://github.com/user/repo/pull/999',
|
|
434
443
|
branchName: 'evil$(rm -rf /)',
|
|
444
|
+
createdAt: new Date('2024-01-01'),
|
|
435
445
|
isConflicted: false,
|
|
436
446
|
isPassedAllCiJob: false,
|
|
437
447
|
isCiStateSuccess: false,
|
|
@@ -463,18 +473,19 @@ describe('StartPreparationUseCase', () => {
|
|
|
463
473
|
);
|
|
464
474
|
consoleErrorSpy.mockRestore();
|
|
465
475
|
});
|
|
466
|
-
it('should
|
|
476
|
+
it('should auto-resolve by adopting oldest PR, closing newer PR with branch delete and comments when issue has multiple related open PRs', async () => {
|
|
467
477
|
const awaitingIssues: Issue[] = [
|
|
468
478
|
createMockIssue({
|
|
469
|
-
url: '
|
|
479
|
+
url: 'https://github.com/user/repo/issues/1',
|
|
470
480
|
title: 'Issue 1',
|
|
471
481
|
labels: ['category:impl'],
|
|
472
482
|
status: 'Awaiting Workspace',
|
|
473
483
|
}),
|
|
474
484
|
];
|
|
475
|
-
const
|
|
485
|
+
const olderPR: RelatedPullRequest = {
|
|
476
486
|
url: 'https://github.com/user/repo/pull/42',
|
|
477
487
|
branchName: 'i1',
|
|
488
|
+
createdAt: new Date('2024-01-01T00:00:00Z'),
|
|
478
489
|
isConflicted: false,
|
|
479
490
|
isPassedAllCiJob: false,
|
|
480
491
|
isCiStateSuccess: false,
|
|
@@ -482,9 +493,10 @@ describe('StartPreparationUseCase', () => {
|
|
|
482
493
|
isBranchOutOfDate: false,
|
|
483
494
|
missingRequiredCheckNames: [],
|
|
484
495
|
};
|
|
485
|
-
const
|
|
496
|
+
const newerPR: RelatedPullRequest = {
|
|
486
497
|
url: 'https://github.com/user/repo/pull/43',
|
|
487
498
|
branchName: 'i1-fix',
|
|
499
|
+
createdAt: new Date('2024-01-02T00:00:00Z'),
|
|
488
500
|
isConflicted: false,
|
|
489
501
|
isPassedAllCiJob: false,
|
|
490
502
|
isCiStateSuccess: false,
|
|
@@ -496,7 +508,100 @@ describe('StartPreparationUseCase', () => {
|
|
|
496
508
|
mockIssueRepository.getStoryObjectMap.mockResolvedValue(
|
|
497
509
|
createMockStoryObjectMap(awaitingIssues),
|
|
498
510
|
);
|
|
499
|
-
mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
|
|
511
|
+
mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
|
|
512
|
+
olderPR,
|
|
513
|
+
newerPR,
|
|
514
|
+
]);
|
|
515
|
+
mockLocalCommandRunner.runCommand.mockResolvedValue({
|
|
516
|
+
stdout: '',
|
|
517
|
+
stderr: '',
|
|
518
|
+
exitCode: 0,
|
|
519
|
+
});
|
|
520
|
+
await useCase.run({
|
|
521
|
+
projectUrl: 'https://github.com/user/repo',
|
|
522
|
+
awaitingWorkspaceStatus: 'Awaiting Workspace',
|
|
523
|
+
preparationStatus: 'Preparation',
|
|
524
|
+
defaultAgentName: 'agent1',
|
|
525
|
+
defaultLlmModelName: 'claude-opus',
|
|
526
|
+
defaultLlmAgentName: null,
|
|
527
|
+
configFilePath: '/path/to/config.yml',
|
|
528
|
+
maximumPreparingIssuesCount: null,
|
|
529
|
+
utilizationPercentageThreshold: 90,
|
|
530
|
+
allowedIssueAuthors: null,
|
|
531
|
+
codexHomeCandidates: null,
|
|
532
|
+
allowIssueCacheMinutes: 0,
|
|
533
|
+
});
|
|
534
|
+
expect(mockIssueRepository.closePullRequest).toHaveBeenCalledWith(
|
|
535
|
+
newerPR.url,
|
|
536
|
+
);
|
|
537
|
+
expect(mockIssueRepository.deletePullRequestBranch).toHaveBeenCalledWith(
|
|
538
|
+
newerPR.url,
|
|
539
|
+
newerPR.branchName,
|
|
540
|
+
);
|
|
541
|
+
expect(mockIssueRepository.createCommentByUrl).toHaveBeenCalledWith(
|
|
542
|
+
newerPR.url,
|
|
543
|
+
expect.stringContaining(olderPR.url),
|
|
544
|
+
);
|
|
545
|
+
expect(mockIssueRepository.createCommentByUrl).toHaveBeenCalledWith(
|
|
546
|
+
'https://github.com/user/repo/issues/1',
|
|
547
|
+
expect.stringContaining(newerPR.url),
|
|
548
|
+
);
|
|
549
|
+
expect(mockIssueRepository.closePullRequest).not.toHaveBeenCalledWith(
|
|
550
|
+
olderPR.url,
|
|
551
|
+
);
|
|
552
|
+
expect(mockLocalCommandRunner.runCommand.mock.calls).toHaveLength(1);
|
|
553
|
+
expect(mockLocalCommandRunner.runCommand.mock.calls[0]).toEqual([
|
|
554
|
+
'aw',
|
|
555
|
+
[
|
|
556
|
+
'https://github.com/user/repo/issues/1',
|
|
557
|
+
'impl',
|
|
558
|
+
'claude-opus',
|
|
559
|
+
'--configFilePath',
|
|
560
|
+
'/path/to/config.yml',
|
|
561
|
+
'--branch',
|
|
562
|
+
'i1',
|
|
563
|
+
],
|
|
564
|
+
]);
|
|
565
|
+
});
|
|
566
|
+
it('should skip issue after resolving duplicates when adopted canonical PR has null branchName', async () => {
|
|
567
|
+
const awaitingIssues: Issue[] = [
|
|
568
|
+
createMockIssue({
|
|
569
|
+
url: 'https://github.com/user/repo/issues/1',
|
|
570
|
+
title: 'Issue 1',
|
|
571
|
+
labels: ['category:impl'],
|
|
572
|
+
status: 'Awaiting Workspace',
|
|
573
|
+
}),
|
|
574
|
+
];
|
|
575
|
+
const olderPRNullBranch: RelatedPullRequest = {
|
|
576
|
+
url: 'https://github.com/user/repo/pull/42',
|
|
577
|
+
branchName: null,
|
|
578
|
+
createdAt: new Date('2024-01-01T00:00:00Z'),
|
|
579
|
+
isConflicted: false,
|
|
580
|
+
isPassedAllCiJob: false,
|
|
581
|
+
isCiStateSuccess: false,
|
|
582
|
+
isResolvedAllReviewComments: false,
|
|
583
|
+
isBranchOutOfDate: false,
|
|
584
|
+
missingRequiredCheckNames: [],
|
|
585
|
+
};
|
|
586
|
+
const newerPR: RelatedPullRequest = {
|
|
587
|
+
url: 'https://github.com/user/repo/pull/43',
|
|
588
|
+
branchName: 'i1-fix',
|
|
589
|
+
createdAt: new Date('2024-01-02T00:00:00Z'),
|
|
590
|
+
isConflicted: false,
|
|
591
|
+
isPassedAllCiJob: false,
|
|
592
|
+
isCiStateSuccess: false,
|
|
593
|
+
isResolvedAllReviewComments: false,
|
|
594
|
+
isBranchOutOfDate: false,
|
|
595
|
+
missingRequiredCheckNames: [],
|
|
596
|
+
};
|
|
597
|
+
mockProjectRepository.getByUrl.mockResolvedValue(mockProject);
|
|
598
|
+
mockIssueRepository.getStoryObjectMap.mockResolvedValue(
|
|
599
|
+
createMockStoryObjectMap(awaitingIssues),
|
|
600
|
+
);
|
|
601
|
+
mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
|
|
602
|
+
olderPRNullBranch,
|
|
603
|
+
newerPR,
|
|
604
|
+
]);
|
|
500
605
|
const consoleWarnSpy = jest
|
|
501
606
|
.spyOn(console, 'warn')
|
|
502
607
|
.mockImplementation(() => {});
|
|
@@ -514,10 +619,22 @@ describe('StartPreparationUseCase', () => {
|
|
|
514
619
|
codexHomeCandidates: null,
|
|
515
620
|
allowIssueCacheMinutes: 0,
|
|
516
621
|
});
|
|
622
|
+
expect(mockIssueRepository.closePullRequest).toHaveBeenCalledWith(
|
|
623
|
+
newerPR.url,
|
|
624
|
+
);
|
|
625
|
+
expect(mockIssueRepository.createCommentByUrl).toHaveBeenCalledWith(
|
|
626
|
+
newerPR.url,
|
|
627
|
+
expect.stringContaining(olderPRNullBranch.url),
|
|
628
|
+
);
|
|
629
|
+
expect(mockIssueRepository.createCommentByUrl).toHaveBeenCalledWith(
|
|
630
|
+
'https://github.com/user/repo/issues/1',
|
|
631
|
+
expect.stringContaining(newerPR.url),
|
|
632
|
+
);
|
|
517
633
|
expect(mockLocalCommandRunner.runCommand.mock.calls).toHaveLength(0);
|
|
518
|
-
expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(0);
|
|
519
634
|
expect(consoleWarnSpy).toHaveBeenCalledWith(
|
|
520
|
-
|
|
635
|
+
expect.stringContaining(
|
|
636
|
+
'adopted canonical PR has unavailable head branch',
|
|
637
|
+
),
|
|
521
638
|
);
|
|
522
639
|
consoleWarnSpy.mockRestore();
|
|
523
640
|
});
|
|
@@ -533,6 +650,7 @@ describe('StartPreparationUseCase', () => {
|
|
|
533
650
|
const prWithNullBranch: RelatedPullRequest = {
|
|
534
651
|
url: 'https://github.com/user/repo/pull/42',
|
|
535
652
|
branchName: null,
|
|
653
|
+
createdAt: new Date('2024-01-01'),
|
|
536
654
|
isConflicted: false,
|
|
537
655
|
isPassedAllCiJob: false,
|
|
538
656
|
isCiStateSuccess: false,
|
|
@@ -15,6 +15,9 @@ export class StartPreparationUseCase {
|
|
|
15
15
|
| 'updateStatus'
|
|
16
16
|
| 'findRelatedOpenPRs'
|
|
17
17
|
| 'getOpenPullRequest'
|
|
18
|
+
| 'closePullRequest'
|
|
19
|
+
| 'deletePullRequestBranch'
|
|
20
|
+
| 'createCommentByUrl'
|
|
18
21
|
>,
|
|
19
22
|
private readonly claudeRepository: Pick<ClaudeRepository, 'getUsage'>,
|
|
20
23
|
private readonly localCommandRunner: LocalCommandRunner,
|
|
@@ -202,10 +205,36 @@ export class StartPreparationUseCase {
|
|
|
202
205
|
issue.url,
|
|
203
206
|
);
|
|
204
207
|
if (relatedPRs.length > 1) {
|
|
205
|
-
|
|
206
|
-
|
|
208
|
+
const sortedPRs = [...relatedPRs].sort(
|
|
209
|
+
(a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
|
|
207
210
|
);
|
|
208
|
-
|
|
211
|
+
const canonicalPR = sortedPRs[0];
|
|
212
|
+
const duplicatePRs = sortedPRs.slice(1);
|
|
213
|
+
for (const duplicatePR of duplicatePRs) {
|
|
214
|
+
await this.issueRepository.closePullRequest(duplicatePR.url);
|
|
215
|
+
if (duplicatePR.branchName !== null) {
|
|
216
|
+
await this.issueRepository.deletePullRequestBranch(
|
|
217
|
+
duplicatePR.url,
|
|
218
|
+
duplicatePR.branchName,
|
|
219
|
+
);
|
|
220
|
+
}
|
|
221
|
+
await this.issueRepository.createCommentByUrl(
|
|
222
|
+
duplicatePR.url,
|
|
223
|
+
`This PR was automatically closed to resolve multiple-open-PR ambiguity for issue ${issue.url}. The adopted canonical PR is ${canonicalPR.url}.`,
|
|
224
|
+
);
|
|
225
|
+
}
|
|
226
|
+
const removedPrUrls = duplicatePRs.map((pr) => pr.url).join(', ');
|
|
227
|
+
await this.issueRepository.createCommentByUrl(
|
|
228
|
+
issue.url,
|
|
229
|
+
`${duplicatePRs.length} duplicate PR(s) were automatically closed to resolve multiple-open-PR ambiguity.\n\nRemoved PRs: ${removedPrUrls}\nAdopted PR: ${canonicalPR.url}`,
|
|
230
|
+
);
|
|
231
|
+
if (canonicalPR.branchName === null) {
|
|
232
|
+
console.warn(
|
|
233
|
+
`Skipping issue ${issue.url}: adopted canonical PR has unavailable head branch.`,
|
|
234
|
+
);
|
|
235
|
+
continue;
|
|
236
|
+
}
|
|
237
|
+
branchName = canonicalPR.branchName;
|
|
209
238
|
} else if (relatedPRs.length === 1) {
|
|
210
239
|
if (relatedPRs[0].branchName === null) {
|
|
211
240
|
console.warn(
|
|
@@ -6,6 +6,7 @@ import { StoryObjectMap } from '../../entities/StoryObjectMap';
|
|
|
6
6
|
export type RelatedPullRequest = {
|
|
7
7
|
url: string;
|
|
8
8
|
branchName: string | null;
|
|
9
|
+
createdAt: Date;
|
|
9
10
|
isConflicted: boolean;
|
|
10
11
|
isPassedAllCiJob: boolean;
|
|
11
12
|
isCiStateSuccess: boolean;
|
|
@@ -73,6 +74,12 @@ export interface IssueRepository {
|
|
|
73
74
|
update: (issue: Issue, project: Project) => Promise<void>;
|
|
74
75
|
findRelatedOpenPRs: (issueUrl: string) => Promise<RelatedPullRequest[]>;
|
|
75
76
|
getOpenPullRequest: (prUrl: string) => Promise<RelatedPullRequest | null>;
|
|
77
|
+
closePullRequest: (prUrl: string) => Promise<void>;
|
|
78
|
+
deletePullRequestBranch: (prUrl: string, branchName: string) => Promise<void>;
|
|
79
|
+
createCommentByUrl: (
|
|
80
|
+
issueOrPrUrl: string,
|
|
81
|
+
commentBody: string,
|
|
82
|
+
) => Promise<void>;
|
|
76
83
|
getAllOpened: (project: Project) => Promise<Issue[]>;
|
|
77
84
|
getStoryObjectMap: (
|
|
78
85
|
project: Project,
|
|
@@ -53,5 +53,8 @@ export declare class ApiV3CheerioRestIssueRepository extends BaseGitHubRepositor
|
|
|
53
53
|
getAllOpened: (project: Project) => Promise<Issue[]>;
|
|
54
54
|
getStoryObjectMap: (project: Project, allowCacheMinutes: number) => Promise<StoryObjectMap>;
|
|
55
55
|
getOpenPullRequest: (prUrl: string) => Promise<RelatedPullRequest | null>;
|
|
56
|
+
closePullRequest: (prUrl: string) => Promise<void>;
|
|
57
|
+
deletePullRequestBranch: (prUrl: string, branchName: string) => Promise<void>;
|
|
58
|
+
createCommentByUrl: (issueOrPrUrl: string, commentBody: string) => Promise<void>;
|
|
56
59
|
}
|
|
57
60
|
//# sourceMappingURL=ApiV3CheerioRestIssueRepository.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiV3CheerioRestIssueRepository.d.ts","sourceRoot":"","sources":["../../../../src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EACnB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,4BAA4B,EAC5B,WAAW,EACZ,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"ApiV3CheerioRestIssueRepository.d.ts","sourceRoot":"","sources":["../../../../src/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class StartPreparationUseCase {
|
|
|
7
7
|
private readonly issueRepository;
|
|
8
8
|
private readonly claudeRepository;
|
|
9
9
|
private readonly localCommandRunner;
|
|
10
|
-
constructor(projectRepository: Pick<ProjectRepository, 'getByUrl' | 'prepareStatus'>, issueRepository: Pick<IssueRepository, 'getStoryObjectMap' | 'updateStatus' | 'findRelatedOpenPRs' | 'getOpenPullRequest'>, claudeRepository: Pick<ClaudeRepository, 'getUsage'>, localCommandRunner: LocalCommandRunner);
|
|
10
|
+
constructor(projectRepository: Pick<ProjectRepository, 'getByUrl' | 'prepareStatus'>, issueRepository: Pick<IssueRepository, 'getStoryObjectMap' | 'updateStatus' | 'findRelatedOpenPRs' | 'getOpenPullRequest' | 'closePullRequest' | 'deletePullRequestBranch' | 'createCommentByUrl'>, claudeRepository: Pick<ClaudeRepository, 'getUsage'>, localCommandRunner: LocalCommandRunner);
|
|
11
11
|
run: (params: {
|
|
12
12
|
projectUrl: string;
|
|
13
13
|
awaitingWorkspaceStatus: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAIlC,OAAO,CAAC,QAAQ,CAAC,eAAe;
|
|
1
|
+
{"version":3,"file":"StartPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/StartPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAIlC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAUhC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAflB,iBAAiB,EAAE,IAAI,CACtC,iBAAiB,EACjB,UAAU,GAAG,eAAe,CAC7B,EACgB,eAAe,EAAE,IAAI,CACpC,eAAe,EACb,mBAAmB,GACnB,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,kBAAkB,GAClB,yBAAyB,GACzB,oBAAoB,CACvB,EACgB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EACpD,kBAAkB,EAAE,kBAAkB;IAGzD,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,uBAAuB,EAAE,MAAM,CAAC;QAChC,iBAAiB,EAAE,MAAM,CAAC;QAC1B,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,cAAc,EAAE,MAAM,CAAC;QACvB,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,8BAA8B,EAAE,MAAM,CAAC;QACvC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACrC,sBAAsB,EAAE,MAAM,CAAC;KAChC,KAAG,OAAO,CAAC,IAAI,CAAC,CAyPf;CACH"}
|
|
@@ -5,6 +5,7 @@ import { StoryObjectMap } from '../../entities/StoryObjectMap';
|
|
|
5
5
|
export type RelatedPullRequest = {
|
|
6
6
|
url: string;
|
|
7
7
|
branchName: string | null;
|
|
8
|
+
createdAt: Date;
|
|
8
9
|
isConflicted: boolean;
|
|
9
10
|
isPassedAllCiJob: boolean;
|
|
10
11
|
isCiStateSuccess: boolean;
|
|
@@ -38,6 +39,9 @@ export interface IssueRepository {
|
|
|
38
39
|
update: (issue: Issue, project: Project) => Promise<void>;
|
|
39
40
|
findRelatedOpenPRs: (issueUrl: string) => Promise<RelatedPullRequest[]>;
|
|
40
41
|
getOpenPullRequest: (prUrl: string) => Promise<RelatedPullRequest | null>;
|
|
42
|
+
closePullRequest: (prUrl: string) => Promise<void>;
|
|
43
|
+
deletePullRequestBranch: (prUrl: string, branchName: string) => Promise<void>;
|
|
44
|
+
createCommentByUrl: (issueOrPrUrl: string, commentBody: string) => Promise<void>;
|
|
41
45
|
getAllOpened: (project: Project) => Promise<Issue[]>;
|
|
42
46
|
getStoryObjectMap: (project: Project, allowCacheMinutes: number) => Promise<StoryObjectMap>;
|
|
43
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IssueRepository.d.ts","sourceRoot":"","sources":["../../../../src/domain/usecases/adapter-interfaces/IssueRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"IssueRepository.d.ts","sourceRoot":"","sources":["../../../../src/domain/usecases/adapter-interfaces/IssueRepository.ts"],"names":[],"mappings":"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"}
|