@pecot/workflow-mcp 8.0.1-dev.43 → 8.0.1-dev.46

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.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pecot-w",
3
- "version": "8.0.1-dev.43",
3
+ "version": "8.0.1-dev.46",
4
4
  "description": "pecot-w (pecot-workflow) workflow automation plugin for Claude Code - skills, hooks, agents, and commands for AI-assisted development",
5
5
  "author": {
6
6
  "name": "pecot"
@@ -37,7 +37,7 @@ export interface Prerequisite {
37
37
  readonly reason: string | undefined;
38
38
  }
39
39
  export type PrerequisiteList = readonly Prerequisite[] | 'read-failed';
40
- export type NotInReviewState = 'started-without-pr' | 'not-started' | 'multiple-prs' | 'fork-pr' | 'pending';
40
+ export type NotInReviewState = 'merged-open' | 'started-without-pr' | 'not-started' | 'multiple-prs' | 'fork-pr' | 'pending';
41
41
  export type ReadinessReason = {
42
42
  readonly code: 'unreadable';
43
43
  } | {
@@ -100,6 +100,10 @@ export declare function isDone(issue: IssueFacts): boolean;
100
100
  open で、open の PR がちょうど 1 本あり、fork からでない。ドラフトも含む
101
101
  */
102
102
  export declare function isInReview(issue: IssueFacts): boolean;
103
+ /**
104
+ 前提の状態が `merged-open` になり、Issue を閉じれば済む。列が Pending なら `pending` を先に出すので含めない
105
+ */
106
+ export declare function isAwaitingCloseAfterMerge(issue: IssueFacts): boolean;
103
107
  export declare function hasStarted(issue: IssueFacts): boolean;
104
108
  /**
105
109
  data-model.md の 3 の表を上から当てはめる。Epic と Tracker には判定を出さず undefined を返す
@@ -18,6 +18,18 @@ export function isInReview(issue) {
18
18
  const open = openPullRequests(issue);
19
19
  return issue.state === 'open' && open.length === 1 && open[0]?.isCrossRepository === false;
20
20
  }
21
+ /**
22
+ open で、open の PR が無く、merged の PR がある。マージから `Closes` で閉じるまでの間と、`Closes` の無いマージで起きる
23
+ */
24
+ function isMergedOpen(issue) {
25
+ return issue.state === 'open' && openPullRequests(issue).length === 0 && issue.pullRequests.some(pullRequest => pullRequest.state === 'merged');
26
+ }
27
+ /**
28
+ 前提の状態が `merged-open` になり、Issue を閉じれば済む。列が Pending なら `pending` を先に出すので含めない
29
+ */
30
+ export function isAwaitingCloseAfterMerge(issue) {
31
+ return isMergedOpen(issue) && !isPending(issue);
32
+ }
21
33
  export function hasStarted(issue) {
22
34
  return issue.branches.length > 0 || issue.pullRequests.length > 0;
23
35
  }
@@ -39,6 +51,8 @@ function notInReviewState(issue) {
39
51
  return 'multiple-prs';
40
52
  if (open.length === 1)
41
53
  return 'fork-pr';
54
+ if (isMergedOpen(issue))
55
+ return 'merged-open';
42
56
  return hasStarted(issue) ? 'started-without-pr' : 'not-started';
43
57
  }
44
58
  // 開発ブランチに届かない(途切れる・輪になる)列は undefined
@@ -95,7 +109,8 @@ export function judgeReadiness(input) {
95
109
  return blocked({ code: 'cycle', cycle });
96
110
  if (isNeedsReview)
97
111
  return blocked({ code: 'closed-unmerged', issues: closedUnmerged.map(({ issue }) => issue.ref) });
98
- const waitsMerge = unfinished.filter(({ wait }) => wait === 'merge');
112
+ // PR がマージ済みなら、マージを待つ前提でも待つものが無いので、順 7 の状態で示す
113
+ const waitsMerge = unfinished.filter(({ issue, wait }) => wait === 'merge' && !isMergedOpen(issue));
99
114
  if (waitsMerge.length > 0) {
100
115
  return blocked({ code: 'waits-merge', issues: waitsMerge.map(({ issue, reason }) => ({ issue: issue.ref, reason })) });
101
116
  }
@@ -253,6 +268,7 @@ export function displayReference(reference, home) {
253
268
  }
254
269
  const NOT_IN_REVIEW_TEXT = new Map([
255
270
  ['not-started', 'not started'],
271
+ ['merged-open', 'PR merged, Issue open'],
256
272
  ['started-without-pr', 'no PR'],
257
273
  ['multiple-prs', 'multiple PRs'],
258
274
  ['fork-pr', 'PR from fork'],
@@ -267,7 +283,7 @@ export function describePrerequisiteState(prerequisite) {
267
283
  return 'done';
268
284
  if (issue.state === 'closed')
269
285
  return 'closed without merge';
270
- if (wait === 'merge')
286
+ if (wait === 'merge' && !isMergedOpen(issue))
271
287
  return reason === undefined ? 'wait: merge' : `wait: merge — ${reason}`;
272
288
  const state = notInReviewState(issue);
273
289
  return isStackable(issue) ? 'in review' : (NOT_IN_REVIEW_TEXT.get(state) ?? state);
@@ -1,15 +1,17 @@
1
1
  // 着手の判定から、base の選び方・止める文・積んだ先の表示を決める。I/O を持たない。
2
2
  import { commandHint, hinted, inputHint, joinHinted } from './command-hint.js';
3
- import { describePrerequisiteState, describeReadiness, displayReference, isDone } from './readiness.js';
3
+ import { isAwaitingCloseAfterMerge, describePrerequisiteState, describeReadiness, displayReference, isDone } from './readiness.js';
4
4
  import { issueReferenceToCliReference } from './reference-parser.js';
5
5
  function blockedMessage(target, readiness, prerequisites) {
6
6
  const home = target.repository;
7
7
  const unfinished = prerequisites.filter(({ issue }) => !isDone(issue));
8
8
  const subject = issueReferenceToCliReference(target);
9
+ const mergedOpen = unfinished.filter(({ issue }) => isAwaitingCloseAfterMerge(issue)).map(({ issue }) => issue.ref);
9
10
  const waitsMerge = readiness.reason?.code === 'waits-merge' ? readiness.reason.issues : [];
10
11
  return joinHinted([
11
12
  `${displayReference(target, home)} is ${describeReadiness(readiness, prerequisites, home)}`,
12
13
  ...unfinished.map(prerequisite => `- ${displayReference(prerequisite.issue.ref, home)}: ${describePrerequisiteState(prerequisite)}`),
14
+ ...mergedOpen.map(issue => displayReference(issue, home)).map(shown => `${shown} has a merged PR: close ${shown}, or retry once it closes`),
13
15
  ...unfinished.map(({ issue }) => hinted `to remove the prerequisite: ${commandHint(['issue', 'unblock'], { issue_ref: subject, by: issueReferenceToCliReference(issue.ref) })}`),
14
16
  ...waitsMerge.map(({ issue }) => hinted `to stack on it instead of waiting for merge: ${commandHint(['issue', 'block'], { issue_ref: subject, by: issueReferenceToCliReference(issue), wait: 'stack' })}`),
15
17
  ]);
@@ -104,10 +104,6 @@ export interface NextSetNameOptions {
104
104
  */
105
105
  readonly prefix?: string | undefined;
106
106
  /**
107
- 最大番号。既定は 9
108
- */
109
- readonly maxNumber?: number | undefined;
110
- /**
111
107
  使用中の名前(claimedSetNames の結果)。ディレクトリが無くても、参加せず max にも数える
112
108
  */
113
109
  readonly claimed?: Iterable<string> | undefined;
@@ -119,8 +115,6 @@ export interface NextSetNameOptions {
119
115
  2. 各 wtN について `wtN/<repositoryDirectoryName>` が存在しないものを先頭から探す。見つかったら既存セットに参加させる形でその名前を返す。
120
116
  3. 全ての既存 wtN に該当リポが既にあるなら、max(N)+1 で新セット `wt<N+1>` を返す。
121
117
  4. 既存セットが無ければ `wt1` を返す。
122
-
123
- 全セットに参加済みで maxNumber を超えるなら WorktreeRuntimeError
124
118
  */
125
119
  export declare function getNextSetName(projectRoot: string, repositoryDirectoryName: string, options?: Readonly<NextSetNameOptions>): string;
126
120
  /**
@@ -261,12 +261,9 @@ function existingSetNumbers(projectRoot, prefix) {
261
261
  2. 各 wtN について `wtN/<repositoryDirectoryName>` が存在しないものを先頭から探す。見つかったら既存セットに参加させる形でその名前を返す。
262
262
  3. 全ての既存 wtN に該当リポが既にあるなら、max(N)+1 で新セット `wt<N+1>` を返す。
263
263
  4. 既存セットが無ければ `wt1` を返す。
264
-
265
- 全セットに参加済みで maxNumber を超えるなら WorktreeRuntimeError
266
264
  */
267
265
  export function getNextSetName(projectRoot, repositoryDirectoryName, options = {}) {
268
266
  const prefix = options.prefix ?? 'wt';
269
- const maxNumber = options.maxNumber ?? 9;
270
267
  const claimed = new Set();
271
268
  const claimedNames = [...options.claimed ?? []];
272
269
  for (const claimedName of claimedNames) {
@@ -277,14 +274,9 @@ export function getNextSetName(projectRoot, repositoryDirectoryName, options = {
277
274
  const last = numbers.at(-1);
278
275
  if (last === undefined)
279
276
  return `${prefix}1`;
280
- // 既存セットで該当リポが未登場のものがあればそこに参加
277
+ // 既存セットで該当リポが未登場のものに参加し、全セットに参加済みなら新セット
281
278
  const joinable = numbers.find(number => !claimed.has(number) && !existsSync(path.join(projectRoot, `${prefix}${String(number)}`, repositoryDirectoryName)));
282
- if (joinable !== undefined)
283
- return `${prefix}${String(joinable)}`;
284
- // 全セットに参加済み → 新セット
285
- if (last + 1 > maxNumber)
286
- throw new WorktreeRuntimeError(`all of ${prefix}1 to ${prefix}${String(maxNumber)} are in use: no free set`);
287
- return `${prefix}${String(last + 1)}`;
279
+ return `${prefix}${String(joinable ?? last + 1)}`;
288
280
  }
289
281
  // 未追跡ファイル操作
290
282
  /**
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@pecot/workflow-mcp",
3
- "version": "8.0.1-dev.43",
3
+ "version": "8.0.1-dev.46",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@pecot/workflow-mcp",
9
- "version": "8.0.1-dev.43",
9
+ "version": "8.0.1-dev.46",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
12
  "@modelcontextprotocol/server": "^2.4.0",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pecot/workflow-mcp",
3
- "version": "8.0.1-dev.43",
3
+ "version": "8.0.1-dev.46",
4
4
  "type": "module",
5
5
  "description": "pecot-workflow MCP server (standalone distribution)",
6
6
  "license": "MIT",