github-issue-tower-defence-management 1.186.1 → 1.187.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.
Files changed (12) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/bin/domain/usecases/ClearDependedIssueURLUseCase.js +19 -4
  3. package/bin/domain/usecases/ClearDependedIssueURLUseCase.js.map +1 -1
  4. package/bin/domain/usecases/RevertOrphanedPreparationUseCase.js +6 -0
  5. package/bin/domain/usecases/RevertOrphanedPreparationUseCase.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/domain/usecases/ClearDependedIssueURLUseCase.test.ts +154 -0
  8. package/src/domain/usecases/ClearDependedIssueURLUseCase.ts +29 -4
  9. package/src/domain/usecases/RevertOrphanedPreparationUseCase.test.ts +168 -6
  10. package/src/domain/usecases/RevertOrphanedPreparationUseCase.ts +6 -0
  11. package/types/domain/usecases/ClearDependedIssueURLUseCase.d.ts.map +1 -1
  12. package/types/domain/usecases/RevertOrphanedPreparationUseCase.d.ts.map +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ # [1.187.0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.186.1...v1.187.0) (2026-08-28)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * **RevertOrphanedPreparationUseCase:** detect conflicting PRs for non-developer agent issues ([#1804](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1804)) ([780af57](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/780af57eecb9110664c849014b3a7b96291fa89b)), closes [HiromiShikata/umino-corporait-operation#30914](https://github.com/HiromiShikata/umino-corporait-operation/issues/30914)
7
+
8
+
9
+ ### Features
10
+
11
+ * **ClearDependedIssueURLUseCase:** auto-remove Icebox depended issue URLs from dependency field ([#1791](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1791)) ([22d6509](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/22d6509abcffd9604e39b91331dc472cd1152f4a)), closes [#1777](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1777)
12
+
1
13
  ## [1.186.1](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.186.0...v1.186.1) (2026-08-28)
2
14
 
3
15
 
package/bin/domain/usecases/ClearDependedIssueURLUseCase.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ClearDependedIssueURLUseCase = void 0;
4
+ const WorkflowStatus_1 = require("../entities/WorkflowStatus");
4
5
  class ClearDependedIssueURLUseCase {
5
6
  constructor(issueRepository) {
6
7
  this.issueRepository = issueRepository;
@@ -26,15 +27,22 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
26
27
  const notFoundDependedIssueUrls = absentDependedIssueIsResolvable
27
28
  ? issue.dependedIssueUrls.filter((dependedIssueUrl) => !input.issues.some((depIssue) => depIssue.url === dependedIssueUrl))
28
29
  : [];
29
- const openDependedIssueUrls = issue.dependedIssueUrls.filter((dependedIssueUrl) => input.issues.some((depIssue) => depIssue.url === dependedIssueUrl && !depIssue.isClosed));
30
+ const iceboxDependedIssueUrls = issue.dependedIssueUrls.filter((dependedIssueUrl) => input.issues.some((depIssue) => depIssue.url === dependedIssueUrl &&
31
+ !depIssue.isClosed &&
32
+ depIssue.status === WorkflowStatus_1.ICEBOX_STATUS_NAME));
33
+ const openDependedIssueUrls = issue.dependedIssueUrls.filter((dependedIssueUrl) => input.issues.some((depIssue) => depIssue.url === dependedIssueUrl &&
34
+ !depIssue.isClosed &&
35
+ depIssue.status !== WorkflowStatus_1.ICEBOX_STATUS_NAME));
30
36
  const closedDependedIssueUrls = issue.dependedIssueUrls.filter((dependedIssueUrl) => input.issues.some((depIssue) => depIssue.url === dependedIssueUrl && depIssue.isClosed));
31
37
  if (notFoundDependedIssueUrls.length === 0 &&
32
- closedDependedIssueUrls.length === 0) {
38
+ closedDependedIssueUrls.length === 0 &&
39
+ iceboxDependedIssueUrls.length === 0) {
33
40
  continue;
34
41
  }
35
42
  const remainingDependedIssueUrls = absentDependedIssueIsResolvable
36
43
  ? openDependedIssueUrls
37
- : issue.dependedIssueUrls.filter((dependedIssueUrl) => !closedDependedIssueUrls.includes(dependedIssueUrl));
44
+ : issue.dependedIssueUrls.filter((dependedIssueUrl) => !closedDependedIssueUrls.includes(dependedIssueUrl) &&
45
+ !iceboxDependedIssueUrls.includes(dependedIssueUrl));
38
46
  if (remainingDependedIssueUrls.length === 0) {
39
47
  await this.issueRepository.clearProjectField(input.project, dependedIssueUrlSeparatedByComma.fieldId, issue);
40
48
  }
@@ -43,7 +51,8 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
43
51
  }
44
52
  if (closedDependedIssueUrls.length > 0) {
45
53
  const allCleared = remainingDependedIssueUrls.length === 0 &&
46
- notFoundDependedIssueUrls.length === 0;
54
+ notFoundDependedIssueUrls.length === 0 &&
55
+ iceboxDependedIssueUrls.length === 0;
47
56
  await this.issueRepository.createComment(issue, `${allCleared ? 'All depended issues are already closed, dependency field cleared' : 'Some depended issues are already closed, removed from dependency field'}:
48
57
  ${closedDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
49
58
  }
@@ -51,6 +60,12 @@ ${closedDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
51
60
  await this.issueRepository.createComment(issue, `Dependency removed:
52
61
  ${notFoundDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
53
62
  }
63
+ if (iceboxDependedIssueUrls.length > 0) {
64
+ const iceboxAllCleared = remainingDependedIssueUrls.length === 0 &&
65
+ closedDependedIssueUrls.length === 0 &&
66
+ notFoundDependedIssueUrls.length === 0;
67
+ await this.issueRepository.createComment(issue, `${iceboxAllCleared ? 'All depended issues are in Icebox, dependency field cleared' : 'Some depended issues are in Icebox, removed from dependency field'}:\n${iceboxDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`);
68
+ }
54
69
  }
55
70
  };
56
71
  this.findCircularDependedIssueUrls = (issue, issues) => issue.dependedIssueUrls.filter((dependedIssueUrl) => {
package/bin/domain/usecases/ClearDependedIssueURLUseCase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClearDependedIssueURLUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/ClearDependedIssueURLUseCase.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IACvC,YACW,eAGR;QAHQ,oBAAe,GAAf,eAAe,CAGvB;QAGH,QAAG,GAAG,KAAK,EAAE,KAIZ,EAAiB,EAAE;YAClB,MAAM,gCAAgC,GACpC,KAAK,CAAC,OAAO,CAAC,gCAAgC,CAAC;YACjD,IAAI,CAAC,gCAAgC,EAAE,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,MAAM,+BAA+B,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;YACzD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjC,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC1D,SAAS;gBACX,CAAC;gBACD,MAAM,yBAAyB,GAAG,+BAA+B;oBAC/D,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;oBACzD,CAAC,CAAC,EAAE,CAAC;gBACP,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAC1C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,CACN,CAAC;oBACF,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL;EACR,yBAAyB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACxD,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,MAAM,yBAAyB,GAAG,+BAA+B;oBAC/D,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5B,CAAC,gBAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAChB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,gBAAgB,CAChD,CACJ;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,qBAAqB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC1D,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,KAAK,gBAAgB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAC1D,CACJ,CAAC;gBACF,MAAM,uBAAuB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5D,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,KAAK,gBAAgB,IAAI,QAAQ,CAAC,QAAQ,CACzD,CACJ,CAAC;gBACF,IACE,yBAAyB,CAAC,MAAM,KAAK,CAAC;oBACtC,uBAAuB,CAAC,MAAM,KAAK,CAAC,EACpC,CAAC;oBACD,SAAS;gBACX,CAAC;gBACD,MAAM,0BAA0B,GAAG,+BAA+B;oBAChE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5B,CAAC,gBAAgB,EAAE,EAAE,CACnB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACtD,CAAC;gBACN,IAAI,0BAA0B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAC1C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,CACN,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAC/C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,EACL,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CACrC,CAAC;gBACJ,CAAC;gBACD,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvC,MAAM,UAAU,GACd,0BAA0B,CAAC,MAAM,KAAK,CAAC;wBACvC,yBAAyB,CAAC,MAAM,KAAK,CAAC,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL,GAAG,UAAU,CAAC,CAAC,CAAC,kEAAkE,CAAC,CAAC,CAAC,wEAAwE;EACrK,uBAAuB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtD,CAAC;gBACJ,CAAC;gBACD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL;EACR,yBAAyB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACxD,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEM,kCAA6B,GAAG,CACtC,KAAY,EACZ,MAAe,EACL,EAAE,CACZ,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,EAAE;YAClD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC7C,MAAM,KAAK,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACjC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,EAAE,CAAC;oBACT,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACtC,CAAC;gBACD,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,SAAS;gBACX,CAAC;gBACD,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC5B,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;gBACxE,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACjD,CAAC;YACD,OAAO,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IA5HF,CAAC;CA6HL;AAnID,oEAmIC"}
1
+ {"version":3,"file":"ClearDependedIssueURLUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/ClearDependedIssueURLUseCase.ts"],"names":[],"mappings":";;;AAGA,+DAAgE;AAEhE,MAAa,4BAA4B;IACvC,YACW,eAGR;QAHQ,oBAAe,GAAf,eAAe,CAGvB;QAGH,QAAG,GAAG,KAAK,EAAE,KAIZ,EAAiB,EAAE;YAClB,MAAM,gCAAgC,GACpC,KAAK,CAAC,OAAO,CAAC,gCAAgC,CAAC;YACjD,IAAI,CAAC,gCAAgC,EAAE,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,MAAM,+BAA+B,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;YACzD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjC,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC1D,SAAS;gBACX,CAAC;gBACD,MAAM,yBAAyB,GAAG,+BAA+B;oBAC/D,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;oBACzD,CAAC,CAAC,EAAE,CAAC;gBACP,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAC1C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,CACN,CAAC;oBACF,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL;EACR,yBAAyB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACxD,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,MAAM,yBAAyB,GAAG,+BAA+B;oBAC/D,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5B,CAAC,gBAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAChB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,gBAAgB,CAChD,CACJ;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,uBAAuB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5D,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,KAAK,gBAAgB;oBACjC,CAAC,QAAQ,CAAC,QAAQ;oBAClB,QAAQ,CAAC,MAAM,KAAK,mCAAkB,CACzC,CACJ,CAAC;gBACF,MAAM,qBAAqB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC1D,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,KAAK,gBAAgB;oBACjC,CAAC,QAAQ,CAAC,QAAQ;oBAClB,QAAQ,CAAC,MAAM,KAAK,mCAAkB,CACzC,CACJ,CAAC;gBACF,MAAM,uBAAuB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5D,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CACf,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,GAAG,KAAK,gBAAgB,IAAI,QAAQ,CAAC,QAAQ,CACzD,CACJ,CAAC;gBACF,IACE,yBAAyB,CAAC,MAAM,KAAK,CAAC;oBACtC,uBAAuB,CAAC,MAAM,KAAK,CAAC;oBACpC,uBAAuB,CAAC,MAAM,KAAK,CAAC,EACpC,CAAC;oBACD,SAAS;gBACX,CAAC;gBACD,MAAM,0BAA0B,GAAG,+BAA+B;oBAChE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAC5B,CAAC,gBAAgB,EAAE,EAAE,CACnB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBACnD,CAAC,uBAAuB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACtD,CAAC;gBACN,IAAI,0BAA0B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAC1C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,CACN,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAC/C,KAAK,CAAC,OAAO,EACb,gCAAgC,CAAC,OAAO,EACxC,KAAK,EACL,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CACrC,CAAC;gBACJ,CAAC;gBACD,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvC,MAAM,UAAU,GACd,0BAA0B,CAAC,MAAM,KAAK,CAAC;wBACvC,yBAAyB,CAAC,MAAM,KAAK,CAAC;wBACtC,uBAAuB,CAAC,MAAM,KAAK,CAAC,CAAC;oBACvC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL,GAAG,UAAU,CAAC,CAAC,CAAC,kEAAkE,CAAC,CAAC,CAAC,wEAAwE;EACrK,uBAAuB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtD,CAAC;gBACJ,CAAC;gBACD,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL;EACR,yBAAyB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACxD,CAAC;gBACJ,CAAC;gBACD,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvC,MAAM,gBAAgB,GACpB,0BAA0B,CAAC,MAAM,KAAK,CAAC;wBACvC,uBAAuB,CAAC,MAAM,KAAK,CAAC;wBACpC,yBAAyB,CAAC,MAAM,KAAK,CAAC,CAAC;oBACzC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CACtC,KAAK,EACL,GAAG,gBAAgB,CAAC,CAAC,CAAC,6DAA6D,CAAC,CAAC,CAAC,mEAAmE,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7N,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEM,kCAA6B,GAAG,CACtC,KAAY,EACZ,MAAe,EACL,EAAE,CACZ,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,EAAE;YAClD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC7C,MAAM,KAAK,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACjC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,EAAE,CAAC;oBACT,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACtC,CAAC;gBACD,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,SAAS;gBACX,CAAC;gBACD,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC5B,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;gBACxE,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACjD,CAAC;YACD,OAAO,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IApJF,CAAC;CAqJL;AA3JD,oEA2JC"}
package/bin/domain/usecases/RevertOrphanedPreparationUseCase.js CHANGED
@@ -164,6 +164,12 @@ class RevertOrphanedPreparationUseCase {
164
164
  if (isNonDeveloperAgent ||
165
165
  hasLabelNotRequiringPullRequest ||
166
166
  (categoryLabels.length > 0 && !categoryLabels.includes('category:e2e'))) {
167
+ const prsToCheck = issue.isPr
168
+ ? await this.resolveOpenPrsForPrItem(issue.url)
169
+ : await this.issueRepository.findRelatedOpenPRs(issue.url);
170
+ if (prsToCheck.some((pr) => pr.isConflicted)) {
171
+ return { outcome: 'reject', comments };
172
+ }
167
173
  return { outcome: 'advanceToQualityCheck', comments };
168
174
  }
169
175
  const prsToCheck = issue.isPr
package/bin/domain/usecases/RevertOrphanedPreparationUseCase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RevertOrphanedPreparationUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RevertOrphanedPreparationUseCase.js","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "github-issue-tower-defence-management",
3
- "version": "1.186.1",
3
+ "version": "1.187.0",
4
4
  "description": "",
5
5
  "main": "bin/index.js",
6
6
  "scripts": {
package/src/domain/usecases/ClearDependedIssueURLUseCase.test.ts CHANGED
@@ -3,6 +3,7 @@ import { IssueRepository } from './adapter-interfaces/IssueRepository';
3
3
  import { ClearDependedIssueURLUseCase } from './ClearDependedIssueURLUseCase';
4
4
  import { Project } from '../entities/Project';
5
5
  import { Issue } from '../entities/Issue';
6
+ import { ICEBOX_STATUS_NAME } from '../entities/WorkflowStatus';
6
7
 
7
8
  describe('ClearDependedIssueURLUseCase', () => {
8
9
  jest.setTimeout(30 * 1000);
@@ -514,12 +515,162 @@ describe('ClearDependedIssueURLUseCase', () => {
514
515
  [basicIssueThree, 'Circular dependency removed:\n- url1\n- url2'],
515
516
  ],
516
517
  },
518
+ {
519
+ name: 'should call clearProjectField and Icebox comment when depended issue is open and Icebox',
520
+ input: {
521
+ project: basicProject,
522
+ issues: [
523
+ {
524
+ ...mock<Issue>(),
525
+ url: 'url-icebox',
526
+ dependedIssueUrls: [],
527
+ isClosed: false,
528
+ status: ICEBOX_STATUS_NAME,
529
+ },
530
+ {
531
+ ...basicIssueTwo,
532
+ dependedIssueUrls: ['url-icebox'],
533
+ },
534
+ ],
535
+ cacheUsed: false,
536
+ },
537
+ expectedIssueRepositoryClearProjectFieldCalls: [
538
+ [
539
+ basicProject,
540
+ 'fieldId',
541
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox'] },
542
+ ],
543
+ ],
544
+ expectedIssueRepositoryUpdateTextFieldCalls: [],
545
+ expectedIssueRepositoryCreateCommentCalls: [
546
+ [
547
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox'] },
548
+ 'All depended issues are in Icebox, dependency field cleared:\n- url-icebox',
549
+ ],
550
+ ],
551
+ },
552
+ {
553
+ name: 'should call updateProjectTextField with remaining URL and Icebox comment when deps are mix of Icebox and open non-Icebox',
554
+ input: {
555
+ project: basicProject,
556
+ issues: [
557
+ {
558
+ ...mock<Issue>(),
559
+ url: 'url-icebox',
560
+ dependedIssueUrls: [],
561
+ isClosed: false,
562
+ status: ICEBOX_STATUS_NAME,
563
+ },
564
+ {
565
+ ...mock<Issue>(),
566
+ url: 'url-open',
567
+ dependedIssueUrls: [],
568
+ isClosed: false,
569
+ status: 'In Progress',
570
+ },
571
+ {
572
+ ...basicIssueTwo,
573
+ dependedIssueUrls: ['url-icebox', 'url-open'],
574
+ },
575
+ ],
576
+ cacheUsed: false,
577
+ },
578
+ expectedIssueRepositoryClearProjectFieldCalls: [],
579
+ expectedIssueRepositoryUpdateTextFieldCalls: [
580
+ [
581
+ basicProject,
582
+ 'fieldId',
583
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox', 'url-open'] },
584
+ 'url-open',
585
+ ],
586
+ ],
587
+ expectedIssueRepositoryCreateCommentCalls: [
588
+ [
589
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox', 'url-open'] },
590
+ 'Some depended issues are in Icebox, removed from dependency field:\n- url-icebox',
591
+ ],
592
+ ],
593
+ },
594
+ {
595
+ name: 'should call clearProjectField and both closed and Icebox comments when deps are mix of closed and Icebox',
596
+ input: {
597
+ project: basicProject,
598
+ issues: [
599
+ basicIssueOne,
600
+ {
601
+ ...mock<Issue>(),
602
+ url: 'url-icebox',
603
+ dependedIssueUrls: [],
604
+ isClosed: false,
605
+ status: ICEBOX_STATUS_NAME,
606
+ },
607
+ {
608
+ ...basicIssueTwo,
609
+ dependedIssueUrls: ['url1', 'url-icebox'],
610
+ },
611
+ ],
612
+ cacheUsed: false,
613
+ },
614
+ expectedIssueRepositoryClearProjectFieldCalls: [
615
+ [
616
+ basicProject,
617
+ 'fieldId',
618
+ { ...basicIssueTwo, dependedIssueUrls: ['url1', 'url-icebox'] },
619
+ ],
620
+ ],
621
+ expectedIssueRepositoryUpdateTextFieldCalls: [],
622
+ expectedIssueRepositoryCreateCommentCalls: [
623
+ [
624
+ { ...basicIssueTwo, dependedIssueUrls: ['url1', 'url-icebox'] },
625
+ 'Some depended issues are already closed, removed from dependency field:\n- url1',
626
+ ],
627
+ [
628
+ { ...basicIssueTwo, dependedIssueUrls: ['url1', 'url-icebox'] },
629
+ 'Some depended issues are in Icebox, removed from dependency field:\n- url-icebox',
630
+ ],
631
+ ],
632
+ },
633
+ {
634
+ name: 'should call clearProjectField and Icebox comment when cacheUsed is true and depended issue is Icebox',
635
+ input: {
636
+ project: basicProject,
637
+ issues: [
638
+ {
639
+ ...mock<Issue>(),
640
+ url: 'url-icebox',
641
+ dependedIssueUrls: [],
642
+ isClosed: false,
643
+ status: ICEBOX_STATUS_NAME,
644
+ },
645
+ {
646
+ ...basicIssueTwo,
647
+ dependedIssueUrls: ['url-icebox'],
648
+ },
649
+ ],
650
+ cacheUsed: true,
651
+ },
652
+ expectedIssueRepositoryClearProjectFieldCalls: [
653
+ [
654
+ basicProject,
655
+ 'fieldId',
656
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox'] },
657
+ ],
658
+ ],
659
+ expectedIssueRepositoryUpdateTextFieldCalls: [],
660
+ expectedIssueRepositoryCreateCommentCalls: [
661
+ [
662
+ { ...basicIssueTwo, dependedIssueUrls: ['url-icebox'] },
663
+ 'All depended issues are in Icebox, dependency field cleared:\n- url-icebox',
664
+ ],
665
+ ],
666
+ },
517
667
  ];
518
668
  testCases.forEach(
519
669
  ({
520
670
  name,
521
671
  input,
522
672
  expectedIssueRepositoryClearProjectFieldCalls,
673
+ expectedIssueRepositoryUpdateTextFieldCalls,
523
674
  expectedIssueRepositoryCreateCommentCalls,
524
675
  }) => {
525
676
  it(name, async () => {
@@ -529,6 +680,9 @@ describe('ClearDependedIssueURLUseCase', () => {
529
680
  expect(mockIssueRepository.clearProjectField.mock.calls).toEqual(
530
681
  expectedIssueRepositoryClearProjectFieldCalls,
531
682
  );
683
+ expect(mockIssueRepository.updateProjectTextField.mock.calls).toEqual(
684
+ expectedIssueRepositoryUpdateTextFieldCalls,
685
+ );
532
686
  expect(mockIssueRepository.createComment.mock.calls).toEqual(
533
687
  expectedIssueRepositoryCreateCommentCalls,
534
688
  );
package/src/domain/usecases/ClearDependedIssueURLUseCase.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { Issue } from '../entities/Issue';
2
2
  import { IssueRepository } from './adapter-interfaces/IssueRepository';
3
3
  import { Project } from '../entities/Project';
4
+ import { ICEBOX_STATUS_NAME } from '../entities/WorkflowStatus';
4
5
 
5
6
  export class ClearDependedIssueURLUseCase {
6
7
  constructor(
@@ -49,11 +50,22 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
49
50
  ),
50
51
  )
51
52
  : [];
53
+ const iceboxDependedIssueUrls = issue.dependedIssueUrls.filter(
54
+ (dependedIssueUrl) =>
55
+ input.issues.some(
56
+ (depIssue) =>
57
+ depIssue.url === dependedIssueUrl &&
58
+ !depIssue.isClosed &&
59
+ depIssue.status === ICEBOX_STATUS_NAME,
60
+ ),
61
+ );
52
62
  const openDependedIssueUrls = issue.dependedIssueUrls.filter(
53
63
  (dependedIssueUrl) =>
54
64
  input.issues.some(
55
65
  (depIssue) =>
56
- depIssue.url === dependedIssueUrl && !depIssue.isClosed,
66
+ depIssue.url === dependedIssueUrl &&
67
+ !depIssue.isClosed &&
68
+ depIssue.status !== ICEBOX_STATUS_NAME,
57
69
  ),
58
70
  );
59
71
  const closedDependedIssueUrls = issue.dependedIssueUrls.filter(
@@ -65,7 +77,8 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
65
77
  );
66
78
  if (
67
79
  notFoundDependedIssueUrls.length === 0 &&
68
- closedDependedIssueUrls.length === 0
80
+ closedDependedIssueUrls.length === 0 &&
81
+ iceboxDependedIssueUrls.length === 0
69
82
  ) {
70
83
  continue;
71
84
  }
@@ -73,7 +86,8 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
73
86
  ? openDependedIssueUrls
74
87
  : issue.dependedIssueUrls.filter(
75
88
  (dependedIssueUrl) =>
76
- !closedDependedIssueUrls.includes(dependedIssueUrl),
89
+ !closedDependedIssueUrls.includes(dependedIssueUrl) &&
90
+ !iceboxDependedIssueUrls.includes(dependedIssueUrl),
77
91
  );
78
92
  if (remainingDependedIssueUrls.length === 0) {
79
93
  await this.issueRepository.clearProjectField(
@@ -92,7 +106,8 @@ ${circularDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
92
106
  if (closedDependedIssueUrls.length > 0) {
93
107
  const allCleared =
94
108
  remainingDependedIssueUrls.length === 0 &&
95
- notFoundDependedIssueUrls.length === 0;
109
+ notFoundDependedIssueUrls.length === 0 &&
110
+ iceboxDependedIssueUrls.length === 0;
96
111
  await this.issueRepository.createComment(
97
112
  issue,
98
113
  `${allCleared ? 'All depended issues are already closed, dependency field cleared' : 'Some depended issues are already closed, removed from dependency field'}:
@@ -106,6 +121,16 @@ ${closedDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
106
121
  ${notFoundDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
107
122
  );
108
123
  }
124
+ if (iceboxDependedIssueUrls.length > 0) {
125
+ const iceboxAllCleared =
126
+ remainingDependedIssueUrls.length === 0 &&
127
+ closedDependedIssueUrls.length === 0 &&
128
+ notFoundDependedIssueUrls.length === 0;
129
+ await this.issueRepository.createComment(
130
+ issue,
131
+ `${iceboxAllCleared ? 'All depended issues are in Icebox, dependency field cleared' : 'Some depended issues are in Icebox, removed from dependency field'}:\n${iceboxDependedIssueUrls.map((url) => `- ${url}`).join('\n')}`,
132
+ );
133
+ }
109
134
  }
110
135
  };
111
136
 
package/src/domain/usecases/RevertOrphanedPreparationUseCase.test.ts CHANGED
@@ -809,7 +809,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
809
809
  );
810
810
  });
811
811
 
812
- it('should advance orphaned issue with non-developer agent field to Awaiting Quality Check without PR check', async () => {
812
+ it('should advance orphaned issue with non-developer agent field to Awaiting Quality Check when no conflicting PR exists', async () => {
813
813
  const stuckIssue = createMockIssue({
814
814
  url: 'https://github.com/user/repo/issues/10',
815
815
  status: 'Preparation',
@@ -840,11 +840,53 @@ describe('RevertOrphanedPreparationUseCase', () => {
840
840
  thresholdForAutoReject: 3,
841
841
  });
842
842
 
843
- expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(0);
843
+ expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(1);
844
844
  expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
845
845
  expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('4');
846
846
  });
847
847
 
848
+ it('should reject orphaned issue with non-developer agent field to Awaiting Workspace when PR is conflicted', async () => {
849
+ const stuckIssue = createMockIssue({
850
+ url: 'https://github.com/user/repo/issues/10',
851
+ status: 'Preparation',
852
+ labels: [],
853
+ agent: 'chore',
854
+ });
855
+ mockIssueRepository.getAllIssues.mockResolvedValue({
856
+ project: mockProject,
857
+ issues: [stuckIssue],
858
+ cacheUsed: false,
859
+ });
860
+ mockLocalCommandRunner.runCommand.mockResolvedValue({
861
+ stdout: '',
862
+ stderr: '',
863
+ exitCode: 1,
864
+ });
865
+ mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
866
+ {
867
+ author: 'bot',
868
+ content: 'From: :robot: agent report',
869
+ createdAt: new Date(),
870
+ },
871
+ ]);
872
+ mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
873
+ { ...createPassingPr(), isConflicted: true },
874
+ ]);
875
+
876
+ await useCase.run({
877
+ projectUrl: 'https://github.com/user/repo',
878
+ preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
879
+ thresholdForAutoReject: 3,
880
+ });
881
+
882
+ expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
883
+ expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
884
+ expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(1);
885
+ expect(mockIssueCommentRepository.createComment.mock.calls[0][1]).toContain(
886
+ 'Auto Status Check: REJECTED',
887
+ );
888
+ });
889
+
848
890
  it('should check PR for orphaned issue with developer agent field', async () => {
849
891
  const stuckIssue = createMockIssue({
850
892
  url: 'https://github.com/user/repo/issues/10',
@@ -881,7 +923,7 @@ describe('RevertOrphanedPreparationUseCase', () => {
881
923
  expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
882
924
  });
883
925
 
884
- it('should advance orphaned issue with a labelsAsLlmAgentName label (story) to Awaiting Quality Check without PR check', async () => {
926
+ it('should advance orphaned issue with a labelsAsLlmAgentName label (story) to Awaiting Quality Check when no conflicting PR exists', async () => {
885
927
  const stuckIssue = createMockIssue({
886
928
  url: 'https://github.com/user/repo/issues/10',
887
929
  status: 'Preparation',
@@ -912,12 +954,12 @@ describe('RevertOrphanedPreparationUseCase', () => {
912
954
  labelsAsLlmAgentName: ['story'],
913
955
  });
914
956
 
915
- expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(0);
957
+ expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(1);
916
958
  expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
917
959
  expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('4');
918
960
  });
919
961
 
920
- it('should advance an orphaned issue whose label is only in labelsNotRequiringPullRequest to Awaiting Quality Check without PR check', async () => {
962
+ it('should advance an orphaned issue whose label is only in labelsNotRequiringPullRequest to Awaiting Quality Check when no conflicting PR exists', async () => {
921
963
  const stuckIssue = createMockIssue({
922
964
  url: 'https://github.com/user/repo/issues/10',
923
965
  status: 'Preparation',
@@ -949,11 +991,131 @@ describe('RevertOrphanedPreparationUseCase', () => {
949
991
  labelsNotRequiringPullRequest: ['story'],
950
992
  });
951
993
 
952
- expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(0);
994
+ expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(1);
953
995
  expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
954
996
  expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('4');
955
997
  });
956
998
 
999
+ it('should reject orphaned issue with labelsNotRequiringPullRequest label to Awaiting Workspace when PR is conflicted', async () => {
1000
+ const stuckIssue = createMockIssue({
1001
+ url: 'https://github.com/user/repo/issues/10',
1002
+ status: 'Preparation',
1003
+ labels: ['story'],
1004
+ });
1005
+ mockIssueRepository.getAllIssues.mockResolvedValue({
1006
+ project: mockProject,
1007
+ issues: [stuckIssue],
1008
+ cacheUsed: false,
1009
+ });
1010
+ mockLocalCommandRunner.runCommand.mockResolvedValue({
1011
+ stdout: '',
1012
+ stderr: '',
1013
+ exitCode: 1,
1014
+ });
1015
+ mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
1016
+ {
1017
+ author: 'bot',
1018
+ content: 'From: :robot: agent report',
1019
+ createdAt: new Date(),
1020
+ },
1021
+ ]);
1022
+ mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
1023
+ { ...createPassingPr(), isConflicted: true },
1024
+ ]);
1025
+
1026
+ await useCase.run({
1027
+ projectUrl: 'https://github.com/user/repo',
1028
+ preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
1029
+ thresholdForAutoReject: 3,
1030
+ labelsAsLlmAgentName: ['chore'],
1031
+ labelsNotRequiringPullRequest: ['story'],
1032
+ });
1033
+
1034
+ expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
1035
+ expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
1036
+ expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(1);
1037
+ expect(mockIssueCommentRepository.createComment.mock.calls[0][1]).toContain(
1038
+ 'Auto Status Check: REJECTED',
1039
+ );
1040
+ });
1041
+
1042
+ it('should advance orphaned issue with non-e2e category label to Awaiting Quality Check when no conflicting PR exists', async () => {
1043
+ const stuckIssue = createMockIssue({
1044
+ url: 'https://github.com/user/repo/issues/10',
1045
+ status: 'Preparation',
1046
+ labels: ['category:bug'],
1047
+ });
1048
+ mockIssueRepository.getAllIssues.mockResolvedValue({
1049
+ project: mockProject,
1050
+ issues: [stuckIssue],
1051
+ cacheUsed: false,
1052
+ });
1053
+ mockLocalCommandRunner.runCommand.mockResolvedValue({
1054
+ stdout: '',
1055
+ stderr: '',
1056
+ exitCode: 1,
1057
+ });
1058
+ mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
1059
+ {
1060
+ author: 'bot',
1061
+ content: 'From: :robot: agent report',
1062
+ createdAt: new Date(),
1063
+ },
1064
+ ]);
1065
+
1066
+ await useCase.run({
1067
+ projectUrl: 'https://github.com/user/repo',
1068
+ preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
1069
+ thresholdForAutoReject: 3,
1070
+ });
1071
+
1072
+ expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(1);
1073
+ expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
1074
+ expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('4');
1075
+ });
1076
+
1077
+ it('should reject orphaned issue with non-e2e category label to Awaiting Workspace when PR is conflicted', async () => {
1078
+ const stuckIssue = createMockIssue({
1079
+ url: 'https://github.com/user/repo/issues/10',
1080
+ status: 'Preparation',
1081
+ labels: ['category:bug'],
1082
+ });
1083
+ mockIssueRepository.getAllIssues.mockResolvedValue({
1084
+ project: mockProject,
1085
+ issues: [stuckIssue],
1086
+ cacheUsed: false,
1087
+ });
1088
+ mockLocalCommandRunner.runCommand.mockResolvedValue({
1089
+ stdout: '',
1090
+ stderr: '',
1091
+ exitCode: 1,
1092
+ });
1093
+ mockIssueCommentRepository.getCommentsFromIssue.mockResolvedValue([
1094
+ {
1095
+ author: 'bot',
1096
+ content: 'From: :robot: agent report',
1097
+ createdAt: new Date(),
1098
+ },
1099
+ ]);
1100
+ mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
1101
+ { ...createPassingPr(), isConflicted: true },
1102
+ ]);
1103
+
1104
+ await useCase.run({
1105
+ projectUrl: 'https://github.com/user/repo',
1106
+ preparationProcessCheckCommand: 'pgrep -fa "claude-agent.*{URL}"',
1107
+ thresholdForAutoReject: 3,
1108
+ });
1109
+
1110
+ expect(mockIssueRepository.findRelatedOpenPRs.mock.calls).toHaveLength(1);
1111
+ expect(mockIssueRepository.updateStatus.mock.calls).toHaveLength(1);
1112
+ expect(mockIssueRepository.updateStatus.mock.calls[0][2]).toBe('1');
1113
+ expect(mockIssueCommentRepository.createComment.mock.calls).toHaveLength(1);
1114
+ expect(mockIssueCommentRepository.createComment.mock.calls[0][1]).toContain(
1115
+ 'Auto Status Check: REJECTED',
1116
+ );
1117
+ });
1118
+
957
1119
  it('should revert orphaned issue to Awaiting Workspace when its label is not in labelsAsLlmAgentName and no PR is found', async () => {
958
1120
  const stuckIssue = createMockIssue({
959
1121
  url: 'https://github.com/user/repo/issues/10',
package/src/domain/usecases/RevertOrphanedPreparationUseCase.ts CHANGED
@@ -355,6 +355,12 @@ export class RevertOrphanedPreparationUseCase {
355
355
  hasLabelNotRequiringPullRequest ||
356
356
  (categoryLabels.length > 0 && !categoryLabels.includes('category:e2e'))
357
357
  ) {
358
+ const prsToCheck = issue.isPr
359
+ ? await this.resolveOpenPrsForPrItem(issue.url)
360
+ : await this.issueRepository.findRelatedOpenPRs(issue.url);
361
+ if (prsToCheck.some((pr) => pr.isConflicted)) {
362
+ return { outcome: 'reject', comments };
363
+ }
358
364
  return { outcome: 'advanceToQualityCheck', comments };
359
365
  }
360
366
 
package/types/domain/usecases/ClearDependedIssueURLUseCase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClearDependedIssueURLUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/ClearDependedIssueURLUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,4BAA4B;IAErC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,mBAAmB,GAAG,eAAe,GAAG,wBAAwB,CACjE;gBAHQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,mBAAmB,GAAG,eAAe,GAAG,wBAAwB,CACjE;IAGH,GAAG,GAAU,OAAO;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;KACpB,KAAG,OAAO,CAAC,IAAI,CAAC,CA6Ff;IAEF,OAAO,CAAC,6BAA6B,CAuBhC;CACN"}
1
+ {"version":3,"file":"ClearDependedIssueURLUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/ClearDependedIssueURLUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,qBAAa,4BAA4B;IAErC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,mBAAmB,GAAG,eAAe,GAAG,wBAAwB,CACjE;gBAHQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACf,mBAAmB,GAAG,eAAe,GAAG,wBAAwB,CACjE;IAGH,GAAG,GAAU,OAAO;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,SAAS,EAAE,OAAO,CAAC;KACpB,KAAG,OAAO,CAAC,IAAI,CAAC,CAqHf;IAEF,OAAO,CAAC,6BAA6B,CAuBhC;CACN"}
package/types/domain/usecases/RevertOrphanedPreparationUseCase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RevertOrphanedPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AA8B7E,qBAAa,gCAAgC;IAEzC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACf,oBAAoB,GACpB,YAAY,GACZ,aAAa,GACb,UAAU,GACV,iBAAiB,CACpB;IACD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,KAAK,GACL,oBAAoB,CACvB;IACD,QAAQ,CAAC,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC;IACD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;gBArBtC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACf,oBAAoB,GACpB,YAAY,GACZ,aAAa,GACb,UAAU,GACV,iBAAiB,CACpB,EACQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,KAAK,GACL,oBAAoB,CACvB,EACQ,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC,EACQ,kBAAkB,EAAE,kBAAkB;IAGjD,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B,EAAE,MAAM,CAAC;QACvC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,oBAAoB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACvC,6BAA6B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC,IAAI,CAAC,CAyLf;IAEF,OAAO,CAAC,oBAAoB,CAqB1B;IAEF,OAAO,CAAC,eAAe,CA+FrB;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,qBAAqB,CAyB3B;IAEF,OAAO,CAAC,eAAe,CA6BrB;IAEF,OAAO,CAAC,YAAY,CA+BlB;CACH"}
1
+ {"version":3,"file":"RevertOrphanedPreparationUseCase.d.ts","sourceRoot":"","sources":["../../../src/domain/usecases/RevertOrphanedPreparationUseCase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AA8B7E,qBAAa,gCAAgC;IAEzC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACf,oBAAoB,GACpB,YAAY,GACZ,aAAa,GACb,UAAU,GACV,iBAAiB,CACpB;IACD,QAAQ,CAAC,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,KAAK,GACL,oBAAoB,CACvB;IACD,QAAQ,CAAC,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC;IACD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;gBArBtC,iBAAiB,EAAE,IAAI,CAC9B,iBAAiB,EACf,oBAAoB,GACpB,YAAY,GACZ,aAAa,GACb,UAAU,GACV,iBAAiB,CACpB,EACQ,eAAe,EAAE,IAAI,CAC5B,eAAe,EACb,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,GACpB,KAAK,GACL,oBAAoB,CACvB,EACQ,sBAAsB,EAAE,IAAI,CACnC,sBAAsB,EACtB,sBAAsB,GAAG,eAAe,CACzC,EACQ,kBAAkB,EAAE,kBAAkB;IAGjD,GAAG,GAAU,QAAQ;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B,EAAE,MAAM,CAAC;QACvC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,0BAA0B,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,oBAAoB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACvC,6BAA6B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAChD,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACvC,KAAG,OAAO,CAAC,IAAI,CAAC,CAyLf;IAEF,OAAO,CAAC,oBAAoB,CAqB1B;IAEF,OAAO,CAAC,eAAe,CAqGrB;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,qBAAqB,CAyB3B;IAEF,OAAO,CAAC,eAAe,CA6BrB;IAEF,OAAO,CAAC,YAAY,CA+BlB;CACH"}