@infodb/p3 0.12.0 → 0.13.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/README.md +32 -35
- package/dist/web/assets/CompletionReview-gZKZrDu_.js +1 -0
- package/dist/web/assets/ImprovementDialog-Dno6dPnG.js +1 -0
- package/dist/web/assets/Outputs-BgHalMGb.js +1 -0
- package/dist/web/assets/RequestStatus-hZcBUUIu.js +1 -0
- package/dist/web/assets/Tabs-C3NmwCc3.js +1 -0
- package/dist/web/assets/TagInput-B2b862qn.js +1 -0
- package/dist/web/assets/TaskDrawer-4BQBELXa.js +6 -0
- package/dist/web/assets/_requestId-BMAG1t3o.js +1 -0
- package/dist/web/assets/_requestId-tbg2pA2S.js +1 -0
- package/dist/web/assets/archive-DMl6WyOe.js +1 -0
- package/dist/web/assets/board-BMTcHKyt.js +1 -0
- package/dist/web/assets/done-CL6Nlsua.js +1 -0
- package/dist/web/assets/draft-BvGxfD7v.js +2 -0
- package/dist/web/assets/index-Dp7Fc4VI.css +2 -0
- package/dist/web/assets/index-KdlgMitg.js +12 -0
- package/dist/web/assets/metrics-Cu7gJ7Rk.js +1 -0
- package/dist/web/assets/new-DTXWHuFO.js +1 -0
- package/dist/web/assets/outputs-CXqnjSqV.js +1 -0
- package/dist/web/assets/preflightInput-ClKwkp8R.js +2 -0
- package/dist/web/assets/preload-helper-oLCrNCwz.js +1 -0
- package/dist/web/assets/{quality-Pu6EISAM.js → quality-RFd-7k3r.js} +1 -1
- package/dist/web/assets/release-notes-Bpdi6RdY.js +5 -0
- package/dist/web/assets/requestData-CbFxwW5w.js +1 -0
- package/dist/web/assets/routes-BIt8bExF.js +6 -0
- package/dist/web/assets/settings-CsCqF_1B.js +1 -0
- package/dist/web/assets/ui-BGK72r3u.js +1 -0
- package/dist/web/assets/workTarget-CySfKyfB.js +30 -0
- package/dist/web/index.html +4 -4
- package/docs/architecture.md +300 -36
- package/docs/development.md +60 -16
- package/docs/how-to-use.md +381 -28
- package/docs/installation.md +235 -144
- package/docs/publishing.md +1 -1
- package/lib/cli/agentsStatus.js +197 -0
- package/lib/cli/args.js +72 -8
- package/lib/cli/guide.js +27 -0
- package/lib/cli/guide.md +214 -0
- package/lib/cli/help.js +44 -6
- package/lib/cli/main.js +76 -20
- package/lib/cli/metricsCommands.js +77 -0
- package/lib/cli/output.js +12 -2
- package/lib/cli/project.js +13 -27
- package/lib/cli/qualityCommands.js +33 -8
- package/lib/cli/readOnly.js +15 -0
- package/lib/cli/requestCommands.js +21 -4
- package/lib/cli/requirementCommands.js +288 -0
- package/lib/cli/retroCommands.js +106 -0
- package/lib/cli/revisitCommands.js +73 -0
- package/lib/cli/showView.js +119 -6
- package/lib/cli/taskCommands.js +42 -16
- package/lib/cli/userConfig.js +47 -0
- package/lib/core/completionRefs.js +46 -0
- package/lib/core/metrics/definitions.js +434 -0
- package/lib/core/metrics/index.js +88 -0
- package/lib/core/metrics/manual.js +180 -0
- package/lib/core/ops.js +15 -2
- package/lib/core/preflight/carryover.js +5 -1
- package/lib/core/preflight/codexEngine.js +34 -17
- package/lib/core/preflight/diagnose.js +4 -9
- package/lib/core/preflight/engine.js +9 -0
- package/lib/core/preflight/hostPaths.js +260 -0
- package/lib/core/preflight/input.js +33 -5
- package/lib/core/preflight/instructions.js +18 -1
- package/lib/core/preflight/mockEngine.js +20 -2
- package/lib/core/preflight/render.js +22 -3
- package/lib/core/preflight/service.js +59 -9
- package/lib/core/preflight/uiRender.js +3 -0
- package/lib/core/requestOps.js +206 -14
- package/lib/core/retrospective.js +208 -0
- package/lib/core/reviewCandidates.js +56 -0
- package/lib/core/store/collection.js +20 -1
- package/lib/core/store/normalize.js +22 -4
- package/lib/core/store/preflightStore.js +19 -5
- package/lib/core/store/workspace.js +17 -1
- package/lib/core/taskReview/material.js +7 -0
- package/lib/core/taskReview/review.js +9 -2
- package/lib/server/api/manifest.js +51 -3
- package/lib/server/api/routes.js +131 -11
- package/lib/shared/acceptance.js +258 -18
- package/lib/shared/completionRecord.js +327 -0
- package/lib/shared/metrics.js +42 -0
- package/lib/shared/preflightInput.js +1 -1
- package/lib/shared/requirementSource.js +635 -0
- package/lib/shared/retrospective.js +286 -0
- package/lib/shared/reviewCandidate.js +308 -0
- package/lib/shared/reworkHistory.js +81 -0
- package/package.json +3 -2
- package/skills/p3/SKILL.md +9 -181
- package/dist/web/assets/ImprovementDialog-kQaVBGWH.js +0 -1
- package/dist/web/assets/Outputs-_nU_p3nu.js +0 -1
- package/dist/web/assets/RequestStatus-RG-OVQYY.js +0 -1
- package/dist/web/assets/Tabs-ew9i5SKX.js +0 -1
- package/dist/web/assets/TagInput-BtlJTF7i.js +0 -1
- package/dist/web/assets/TaskDrawer-DW8GyJqI.js +0 -6
- package/dist/web/assets/_requestId-6Nb727dD.js +0 -1
- package/dist/web/assets/_requestId-BykTgPax.js +0 -1
- package/dist/web/assets/appCtx-CxDdXABS.js +0 -1
- package/dist/web/assets/archive-Ckh295Xe.js +0 -1
- package/dist/web/assets/board-BVAIjK-Y.js +0 -1
- package/dist/web/assets/done-BGfA-3MA.js +0 -1
- package/dist/web/assets/draft-CfJeyLOl.js +0 -1
- package/dist/web/assets/index-CgRU744I.css +0 -2
- package/dist/web/assets/index-DacQ0yl4.js +0 -12
- package/dist/web/assets/new-DVygWvVc.js +0 -1
- package/dist/web/assets/outputs-B6xDsLZf.js +0 -1
- package/dist/web/assets/preflightInput-BAeEJYUK.js +0 -2
- package/dist/web/assets/preload-helper-DyCqp21K.js +0 -1
- package/dist/web/assets/release-notes-CCpzyiNf.js +0 -5
- package/dist/web/assets/requestData-D5vBnuMh.js +0 -1
- package/dist/web/assets/routes-Q91zvNc0.js +0 -4
- package/dist/web/assets/settings-BzRgcmUm.js +0 -1
- package/dist/web/assets/workTarget-C9c57JAO.js +0 -30
package/lib/core/requestOps.js
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { acceptanceChanged, applyAcceptanceOps } from "../shared/acceptance.js";
|
|
2
|
+
import { readManual } from "./metrics/manual.js";
|
|
2
3
|
import { applyBlockOp, checkBlockedStatus } from "../shared/taskBlock.js";
|
|
3
4
|
import { qualityCriteria, standardHash, taskQualityDiff } from "../shared/quality.js";
|
|
5
|
+
import { answersKey, applySourceOps, makeAnswer, putAnswer, requestSubject, RequirementInputError, settleSources, sourceSeq, sourcesKey, } from "../shared/requirementSource.js";
|
|
4
6
|
import { defaultRepo } from "../shared/workTarget.js";
|
|
7
|
+
import { appendCompletion, COMPLETION_SKIPPED, requestCompletionRecord, requestTriggers, taskCompletionRecord, taskTriggers } from "../shared/completionRecord.js";
|
|
8
|
+
import { captureRefs } from "./completionRefs.js";
|
|
9
|
+
import { appendRework, reworkOf, REWORK_SKIPPED } from "../shared/reworkHistory.js";
|
|
10
|
+
import { applyPremiseOp, PremiseInputError } from "../shared/reviewCandidate.js";
|
|
5
11
|
import { withArchiveCheck, withChildOrder, withNewChild, withParentChange } from "./hierarchy.js";
|
|
6
12
|
import { checkStatusChange, reopenAncestors, reopenIfNeeded } from "./requestStatus.js";
|
|
7
13
|
import { startWarnings } from "./supersede.js";
|
|
@@ -59,6 +65,33 @@ class NoChange extends Error {
|
|
|
59
65
|
}
|
|
60
66
|
/** 済みを外した理由(基準・証拠の中身が変わった) */
|
|
61
67
|
export const CHECK_CLEARED_BY_ACCEPTANCE = "受け入れ基準か証拠の中身が変わったため、人の「済み」を外しました(もう一度確かめてください)";
|
|
68
|
+
/** 完了の記録を作るときの周りの値(品質は今の project.yaml、参照先は書く前に取ったもの) */
|
|
69
|
+
const completionContext = (ctx, at, by, refs) => ({
|
|
70
|
+
at,
|
|
71
|
+
...(by ? { by } : {}),
|
|
72
|
+
quality: ctx.ws.project.quality,
|
|
73
|
+
qualityVersion: ctx.ws.project.qualityVersion,
|
|
74
|
+
...(refs ? { refs } : {}),
|
|
75
|
+
});
|
|
76
|
+
/**
|
|
77
|
+
* タスクを書いた後の値(final)に、足すべき完了の記録を足した patch の部分(無ければ空)。rev は書いた後の rev。
|
|
78
|
+
* 記録が壊れていて足せなければ skipped に理由を入れ、記録の項目には触れない(元の値のまま書き戻す)
|
|
79
|
+
*/
|
|
80
|
+
function taskCompletionPatch(ctx, rid, prev, final, rev, acceptanceChanged, c) {
|
|
81
|
+
const triggers = taskTriggers(prev, final, acceptanceChanged);
|
|
82
|
+
if (!triggers.length)
|
|
83
|
+
return { patch: {} };
|
|
84
|
+
const request = ctx.ws.requests.get(rid);
|
|
85
|
+
const cc = completionContext(ctx, c.at, c.by, c.refs);
|
|
86
|
+
let state = final;
|
|
87
|
+
for (const trigger of triggers) {
|
|
88
|
+
const list = appendCompletion(state, (id) => taskCompletionRecord(id, trigger, final, rev, request, cc));
|
|
89
|
+
if (!list)
|
|
90
|
+
return { patch: {}, skipped: COMPLETION_SKIPPED };
|
|
91
|
+
state = { completionRecords: list };
|
|
92
|
+
}
|
|
93
|
+
return { patch: { completionRecords: state.completionRecords } };
|
|
94
|
+
}
|
|
62
95
|
function changed(ctx, kind, request, ref) {
|
|
63
96
|
ctx.ws.emit({ type: "changed", kind, request, ref });
|
|
64
97
|
}
|
|
@@ -90,6 +123,14 @@ export async function checkMilestoneRemoval(ctx, next) {
|
|
|
90
123
|
if (reviewed.length) {
|
|
91
124
|
throw new OpRuleError(`レビューの履歴のあるマイルストーンは消せません(ID も変えられません): ${reviewed.join(", ")}(milestone-reviews/<ID>/ に残っています)`);
|
|
92
125
|
}
|
|
126
|
+
// 人が記録した指標の値(読めなければ参照があるか分からないので消さない)
|
|
127
|
+
const manual = await readManual(ctx.ws.dataDir);
|
|
128
|
+
if (manual.problem)
|
|
129
|
+
throw new OpRuleError(`指標の記録(metrics/manual.json)が読めないため、マイルストーンを消せるか分かりません: ${manual.problem}`);
|
|
130
|
+
const measured = [...new Set(manual.records.filter((r) => removed.includes(r.scope)).map((r) => r.scope))];
|
|
131
|
+
if (measured.length) {
|
|
132
|
+
throw new OpRuleError(`指標の値を記録したマイルストーンは消せません(ID も変えられません): ${measured.join(", ")}(p3 metrics --milestone <ID> で確かめ、要らなければ p3 metrics rm で消してから)`);
|
|
133
|
+
}
|
|
93
134
|
}
|
|
94
135
|
/** 要望を変えた後: 配下に未完了ができたら対応済の祖先を進行中に戻し(変更通知も)、完了済の祖先は警告にする */
|
|
95
136
|
async function afterRequestWrite(ctx, rid, actor) {
|
|
@@ -126,12 +167,19 @@ export async function createTask(ctx, rid, { criteria, quality, ...input }, acto
|
|
|
126
167
|
checkRepoTarget(ctx.ws, o.repo);
|
|
127
168
|
// 受け入れ基準は文の並びで受け取り、ID(A1, A2, ...)はここで振る(基準・証拠をそのまま渡す道は持たない)
|
|
128
169
|
// 停止は作るときには付けない(作業中にしてから block で付ける)
|
|
129
|
-
|
|
170
|
+
// 完了の記録は p3 が作る(値をそのまま書く道は持たない)
|
|
171
|
+
const { acceptanceCriteria: _c, acceptanceEvidence: _e, acceptanceSeq: _s, acceptanceSources: _as, acceptanceProblems: _p, block: _b, blockHistory: _bh, blockProblems: _bp, completionRecords: _cr, completionProblems: _cp, reworkHistory: _rh, reworkProblems: _rp, ...plain } = input;
|
|
130
172
|
// 品質基準: 作業先があれば当てはまるものを取り込む(auto)。作業先なしは明示したものだけ。none は取り込まない
|
|
131
173
|
const fromQuality = qualityOpsFor(ctx, repo, quality ?? "auto");
|
|
132
174
|
const ops = [...(criteria ?? []).map((text) => ({ op: "add", text })), ...fromQuality];
|
|
133
|
-
const
|
|
134
|
-
const
|
|
175
|
+
const now = new Date().toISOString();
|
|
176
|
+
const acceptance = ops.length ? applyAcceptanceOps({}, ops, { now, actor }) : {};
|
|
177
|
+
const status = input.status ?? "todo";
|
|
178
|
+
// 完了で作るなら、完了の記録を最初の記録として足す(参照先は書く前に取る)
|
|
179
|
+
const refs = status === "done" ? await captureRefs(ctx.ws.refs()) : undefined;
|
|
180
|
+
const draft = { ...plain, ...acceptance, repo, status };
|
|
181
|
+
const { patch: records } = taskCompletionPatch(ctx, rid, undefined, draft, 1, false, { at: now, by: actor, refs });
|
|
182
|
+
const task = await ctx.ws.tasksOf(rid).create({ ...plain, ...acceptance, repo, status, ...records }, actor);
|
|
135
183
|
const { ancestorWarnings, ...after } = await afterTaskWrite(ctx, rid, task, repo, actor);
|
|
136
184
|
return { task, warnings: ancestorWarnings, ...after };
|
|
137
185
|
}
|
|
@@ -146,7 +194,8 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
|
|
|
146
194
|
const cur = col.require(tid);
|
|
147
195
|
const { checked, acceptance, blockOp, ...rest } = patch;
|
|
148
196
|
// 基準・証拠は操作(acceptance)、停止は操作(blockOp)でだけ変える(値・履歴をそのまま書く道は持たない)
|
|
149
|
-
|
|
197
|
+
// 完了の記録は p3 が作る(値をそのまま書く道は持たない)
|
|
198
|
+
const { acceptanceCriteria: _c, acceptanceEvidence: _e, acceptanceSeq: _s, acceptanceSources: _as, acceptanceProblems: _p, block: _b, blockHistory: _bh, blockProblems: _bp, completionRecords: _cr, completionProblems: _cp, reworkHistory: _rh, reworkProblems: _rp, ...plain } = rest;
|
|
150
199
|
const next = { ...plain };
|
|
151
200
|
if ("repo" in patch) {
|
|
152
201
|
checkRepoTarget(ctx.ws, patch.repo);
|
|
@@ -161,6 +210,10 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
|
|
|
161
210
|
}
|
|
162
211
|
const warnings = startWarnings(ctx.ws, cur.ref, cur.status, next.status);
|
|
163
212
|
let checkCleared;
|
|
213
|
+
let completionSkipped;
|
|
214
|
+
let reworkSkipped;
|
|
215
|
+
// 完了・済みになりうる更新なら、参照先を書く前に取る(ロックの外。取得時刻を残す)
|
|
216
|
+
const refs = next.status === "done" || checked === true ? await captureRefs(ctx.ws.refs()) : undefined;
|
|
164
217
|
// 停止の操作だけで何も変わらない(同じ内容の付け直し・付いていない解除)なら書かない(rev を上げない)
|
|
165
218
|
const onlyBlock = !!blockOp && !acceptance?.length && Object.keys(next).length === 0;
|
|
166
219
|
let unchanged;
|
|
@@ -177,16 +230,35 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
|
|
|
177
230
|
if (blockTo)
|
|
178
231
|
out = { ...out, ...blockTo };
|
|
179
232
|
checkBlockedStatus(fresh.status, status, blockTo ? blockTo.block : fresh.block, fresh.ref);
|
|
233
|
+
// 書いた後の値で完了の記録を足す(同時に変えた基準・証拠は変えた後の内容を写す)
|
|
234
|
+
const withRecords = (o, contentChanged) => {
|
|
235
|
+
const final = { ...fresh, ...o };
|
|
236
|
+
if (final.status !== "done")
|
|
237
|
+
final.checkedAt = undefined;
|
|
238
|
+
const r = taskCompletionPatch(ctx, rid, fresh, final, fresh.rev + 1, contentChanged, { at: now, by: opts.actor, refs });
|
|
239
|
+
completionSkipped = r.skipped;
|
|
240
|
+
// 手戻り(済みの解除・完了からの再開)。書く直前の値と保存する値で決める
|
|
241
|
+
const rw = reworkOf(fresh, final, { explicitUncheck: checked === false, acceptanceChanged: contentChanged });
|
|
242
|
+
let history = {};
|
|
243
|
+
if (rw) {
|
|
244
|
+
const list = appendRework(fresh, { at: now, ...(opts.actor ? { by: opts.actor } : {}), rev: fresh.rev + 1, ...rw });
|
|
245
|
+
if (list)
|
|
246
|
+
history = { reworkHistory: list };
|
|
247
|
+
else
|
|
248
|
+
reworkSkipped = REWORK_SKIPPED;
|
|
249
|
+
}
|
|
250
|
+
return { ...o, ...r.patch, ...history };
|
|
251
|
+
};
|
|
180
252
|
if (!acceptance?.length)
|
|
181
|
-
return out;
|
|
182
|
-
const changedTo = applyAcceptanceOps(fresh, acceptance, { now, actor: opts.actor });
|
|
253
|
+
return withRecords(out, false);
|
|
254
|
+
const changedTo = applyAcceptanceOps(fresh, acceptance, { now, actor: opts.actor, requestSources: ctx.ws.requests.get(rid)?.requirementSources ?? [] });
|
|
183
255
|
if (!acceptanceChanged(fresh, changedTo))
|
|
184
|
-
return out;
|
|
256
|
+
return withRecords(out, false);
|
|
185
257
|
// 済みの後に中身が変わった(同じ操作で済みを付け直すときは外さない)
|
|
186
258
|
const clear = !!fresh.checkedAt && !("checkedAt" in next);
|
|
187
259
|
if (clear)
|
|
188
260
|
checkCleared = CHECK_CLEARED_BY_ACCEPTANCE;
|
|
189
|
-
return { ...out, ...changedTo, ...(clear ? { checkedAt: undefined } : {}) };
|
|
261
|
+
return withRecords({ ...out, ...changedTo, ...(clear ? { checkedAt: undefined } : {}) }, true);
|
|
190
262
|
}, opts);
|
|
191
263
|
const task = await write().catch((e) => {
|
|
192
264
|
if (e instanceof NoChange && unchanged)
|
|
@@ -196,7 +268,7 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
|
|
|
196
268
|
if (unchanged && task === unchanged)
|
|
197
269
|
return { task, warnings };
|
|
198
270
|
const { ancestorWarnings, ...after } = await afterTaskWrite(ctx, rid, task, patch.repo, opts.actor);
|
|
199
|
-
return { task, warnings: [...warnings, ...ancestorWarnings], ...after, ...(checkCleared ? { checkCleared } : {}) };
|
|
271
|
+
return { task, warnings: [...warnings, ...ancestorWarnings], ...after, ...(checkCleared ? { checkCleared } : {}), ...(completionSkipped ? { completionSkipped } : {}), ...(reworkSkipped ? { reworkSkipped } : {}) };
|
|
200
272
|
}
|
|
201
273
|
/** タスクをアーカイブする(.archive/ へ移す。消さない) */
|
|
202
274
|
export async function archiveTask(ctx, rid, tid) {
|
|
@@ -224,23 +296,124 @@ export async function createRequest(ctx, input, actor) {
|
|
|
224
296
|
* 要望を変える。対応済にするのは全タスクが完了のときだけ(requestStatus.ts)。
|
|
225
297
|
* parent を含むなら親の付け替え(undefined で外す)を関係のロックの中で確かめてから書く(hierarchy.ts)
|
|
226
298
|
*/
|
|
227
|
-
export async function updateRequest(ctx, rid,
|
|
299
|
+
export async function updateRequest(ctx, rid, input, opts = {}) {
|
|
300
|
+
// 要求の根拠・回答は操作(updateRequirement・answerClarification)でだけ変える(値をそのまま書く道は持たない)
|
|
301
|
+
// 完了の記録も p3 が作る
|
|
302
|
+
const { requirementSources: _rs, requirementSeq: _sq, clarifyAnswers: _ca, requirementProblems: _rp, completionRecords: _cr, completionProblems: _cp, premiseChanges: _pc, premiseProblems: _pp, ...patch } = input;
|
|
228
303
|
checkMilestone(ctx, patch.milestone);
|
|
229
304
|
await checkStatusChange(ctx.ws, rid, patch.status);
|
|
305
|
+
// 対応済・完了済になりうる更新なら、参照先を書く前に取る
|
|
306
|
+
const refs = patch.status === "resolved" || patch.status === "done" ? await captureRefs(ctx.ws.refs()) : undefined;
|
|
307
|
+
let completionSkipped;
|
|
230
308
|
// 状態か親が変わったら、未完了になった配下の分だけ祖先を戻す
|
|
231
309
|
const after = async (r) => (patch.status !== undefined || "parent" in patch ? withAncestors(r, await afterRequestWrite(ctx, r.id, opts.actor)) : r);
|
|
310
|
+
// 題・本文を変えたら、要望の根拠の記録の確認は効かなくなる(書く直前に読み直した値で、履歴へ移す)
|
|
311
|
+
// 対応済・完了済にしたら、書いた後の値で完了の記録を足す(判定に使ったタスクと子の要望を写す)
|
|
312
|
+
const write = () => ctx.ws.requests.update(rid, (fresh) => {
|
|
313
|
+
const p = withSettledSources(fresh, patch);
|
|
314
|
+
const final = { ...fresh, ...p };
|
|
315
|
+
const triggers = requestTriggers(fresh.status, final.status);
|
|
316
|
+
if (!triggers.length)
|
|
317
|
+
return p;
|
|
318
|
+
const at = new Date().toISOString();
|
|
319
|
+
const parts = { tasks: ctx.ws.tasksOf(rid).list(), children: ctx.ws.requests.list().filter((r) => r.parent === rid) };
|
|
320
|
+
const list = appendCompletion(fresh, (id) => requestCompletionRecord(id, triggers[0], final, fresh.rev + 1, parts, completionContext(ctx, at, opts.actor, refs)));
|
|
321
|
+
if (!list) {
|
|
322
|
+
completionSkipped = COMPLETION_SKIPPED;
|
|
323
|
+
return p;
|
|
324
|
+
}
|
|
325
|
+
return { ...p, completionRecords: list };
|
|
326
|
+
}, opts);
|
|
327
|
+
const skipped = (r) => (completionSkipped ? { ...r, completionSkipped } : r);
|
|
232
328
|
if (!("parent" in patch)) {
|
|
233
|
-
const r = await
|
|
329
|
+
const r = await write();
|
|
234
330
|
changed(ctx, "request", r.id);
|
|
235
|
-
return after(r);
|
|
331
|
+
return skipped(await after(r));
|
|
236
332
|
}
|
|
237
|
-
const { result: r, previous } = await withParentChange(ctx.ws, rid, patch.parent,
|
|
333
|
+
const { result: r, previous } = await withParentChange(ctx.ws, rid, patch.parent, write);
|
|
238
334
|
changed(ctx, "request", r.id);
|
|
239
335
|
// 前と今の親の子の一覧も変わる
|
|
240
336
|
for (const p of new Set([previous, r.parent]))
|
|
241
337
|
if (p && p !== r.id)
|
|
242
338
|
changed(ctx, "request", p);
|
|
243
|
-
return after(r);
|
|
339
|
+
return skipped(await after(r));
|
|
340
|
+
}
|
|
341
|
+
/** 題・本文の変更で効かなくなった要望の根拠の確認を履歴へ移した patch(変わらなければ patch のまま) */
|
|
342
|
+
function withSettledSources(fresh, patch) {
|
|
343
|
+
if ((patch.title === undefined && patch.body === undefined) || !fresh.requirementSources?.length || fresh.requirementProblems?.length)
|
|
344
|
+
return patch;
|
|
345
|
+
const subject = requestSubject({ title: patch.title ?? fresh.title, body: patch.body ?? fresh.body });
|
|
346
|
+
const settled = settleSources(fresh.requirementSources, () => subject, new Date().toISOString());
|
|
347
|
+
return sourcesKey(settled) === sourcesKey(fresh.requirementSources) ? patch : { ...patch, requirementSources: settled };
|
|
348
|
+
}
|
|
349
|
+
/** 要望の根拠・回答が読めないときは変えない */
|
|
350
|
+
function checkRequirementReadable(r) {
|
|
351
|
+
if (r.requirementProblems?.length)
|
|
352
|
+
throw new RequirementInputError(`${r.id} の要求の根拠・回答のファイルの値が読めないため変えられません。request.md を直してください: ${r.requirementProblems.join(" / ")}`);
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* 要望の要求の根拠の記録を変える(shared/requirementSource.ts の操作。書く直前に読み直した値に当て、規則に合わなければ何も書かない)。
|
|
356
|
+
* 同じ値の再保存では書かない(rev を上げない)。expectedRev で競合を見る
|
|
357
|
+
*/
|
|
358
|
+
export async function updateRequirement(ctx, rid, ops, opts = {}) {
|
|
359
|
+
if (!ops.length)
|
|
360
|
+
throw new RequirementInputError("根拠の記録への操作がありません");
|
|
361
|
+
let unchanged;
|
|
362
|
+
const r = await ctx.ws.requests
|
|
363
|
+
.update(rid, (fresh) => {
|
|
364
|
+
checkRequirementReadable(fresh);
|
|
365
|
+
const before = fresh.requirementSources ?? [];
|
|
366
|
+
const subject = requestSubject(fresh);
|
|
367
|
+
const { list, seq } = applySourceOps(before, ops, { now: new Date().toISOString(), actor: opts.actor, subjectOf: () => subject, seq: fresh.requirementSeq });
|
|
368
|
+
if (sourcesKey(list) === sourcesKey(before) && seq === (fresh.requirementSeq ?? sourceSeq(before))) {
|
|
369
|
+
unchanged = fresh;
|
|
370
|
+
throw new NoChange();
|
|
371
|
+
}
|
|
372
|
+
return { requirementSources: list.length ? list : undefined, requirementSeq: seq > 0 ? seq : undefined };
|
|
373
|
+
}, opts)
|
|
374
|
+
.catch((e) => {
|
|
375
|
+
if (e instanceof NoChange && unchanged)
|
|
376
|
+
return unchanged;
|
|
377
|
+
throw e;
|
|
378
|
+
});
|
|
379
|
+
if (r !== unchanged)
|
|
380
|
+
changed(ctx, "request", rid);
|
|
381
|
+
return r;
|
|
382
|
+
}
|
|
383
|
+
/**
|
|
384
|
+
* Preflight の確認事項に回答する(要望の clarifyAnswers に残す。過去の run と評価は書き換えない)。clarification は元の run の確認事項
|
|
385
|
+
* (呼ぶ側が run から取り出す)。回答しただけでは根拠の記録を確認記録ありにしない。answer が null なら回答を消す
|
|
386
|
+
*/
|
|
387
|
+
export async function saveClarifyAnswer(ctx, rid, runId, q, input, opts = {}) {
|
|
388
|
+
let unchanged;
|
|
389
|
+
let saved;
|
|
390
|
+
const r = await ctx.ws.requests
|
|
391
|
+
.update(rid, (fresh) => {
|
|
392
|
+
checkRequirementReadable(fresh);
|
|
393
|
+
const cur = fresh.clarifyAnswers ?? [];
|
|
394
|
+
if (input === null) {
|
|
395
|
+
if (!cur.some((a) => a.run === runId && a.question === q.id))
|
|
396
|
+
throw new RequirementInputError(`${runId}/${q.id} への回答はありません`);
|
|
397
|
+
const next = cur.filter((a) => !(a.run === runId && a.question === q.id));
|
|
398
|
+
return { clarifyAnswers: next.length ? next : undefined };
|
|
399
|
+
}
|
|
400
|
+
saved = makeAnswer(runId, q, input, fresh.requirementSources ?? [], { now: new Date().toISOString(), actor: opts.actor });
|
|
401
|
+
const next = putAnswer(cur, saved);
|
|
402
|
+
if (answersKey(next) === answersKey(cur)) {
|
|
403
|
+
saved = cur.find((a) => a.run === runId && a.question === q.id);
|
|
404
|
+
unchanged = fresh;
|
|
405
|
+
throw new NoChange();
|
|
406
|
+
}
|
|
407
|
+
return { clarifyAnswers: next };
|
|
408
|
+
}, opts)
|
|
409
|
+
.catch((e) => {
|
|
410
|
+
if (e instanceof NoChange && unchanged)
|
|
411
|
+
return unchanged;
|
|
412
|
+
throw e;
|
|
413
|
+
});
|
|
414
|
+
if (r !== unchanged)
|
|
415
|
+
changed(ctx, "request", rid);
|
|
416
|
+
return { request: r, ...(saved ? { answer: saved } : {}) };
|
|
244
417
|
}
|
|
245
418
|
/**
|
|
246
419
|
* 子の表示順を保存する(親の request.md の childOrder だけを書く。子・タスク・親子の所属は変えない)。ids は今の直下の子の完全な並び。
|
|
@@ -257,3 +430,22 @@ export async function archiveRequest(ctx, rid) {
|
|
|
257
430
|
await withArchiveCheck(ctx.ws, rid, () => ctx.ws.requests.archive(rid));
|
|
258
431
|
changed(ctx, "request", rid);
|
|
259
432
|
}
|
|
433
|
+
/**
|
|
434
|
+
* 前提の変更を記録する(外部の規則の変更など。要望の premiseChanges に追記。shared/reviewCandidate.ts)。add: 対象(要望 ID・この要望の
|
|
435
|
+
* タスク ID・要望の根拠の ID)と理由・新しい条件 / ack: 変更を確かめたことを対象と条件の版つきで残す。過去の完了の記録・状態・済み・
|
|
436
|
+
* 基準・証拠は変えない。対象が無い・規則に合わない・rev の競合では何も書かない
|
|
437
|
+
*/
|
|
438
|
+
export async function recordPremise(ctx, rid, op, opts = {}) {
|
|
439
|
+
let change;
|
|
440
|
+
const r = await ctx.ws.requests.update(rid, (fresh) => {
|
|
441
|
+
if (fresh.premiseProblems?.length)
|
|
442
|
+
throw new PremiseInputError(`${rid} の前提の変更の記録が読めないため足せません。request.md を直してください: ${fresh.premiseProblems.join(" / ")}`);
|
|
443
|
+
const tasks = ctx.ws.tasksOf(rid);
|
|
444
|
+
const exists = (t) => t === rid || !!tasks.get(t) || !!fresh.requirementSources?.some((s) => s.id === t);
|
|
445
|
+
const list = applyPremiseOp(fresh.premiseChanges ?? [], op, { now: new Date().toISOString(), actor: opts.actor, exists });
|
|
446
|
+
change = op.op === "add" ? list.at(-1) : list.find((c) => c.id === op.id);
|
|
447
|
+
return { premiseChanges: list };
|
|
448
|
+
}, opts);
|
|
449
|
+
changed(ctx, "request", rid);
|
|
450
|
+
return { request: r, change: change };
|
|
451
|
+
}
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { reworkLine } from "../shared/reworkHistory.js";
|
|
4
|
+
import { addJudgment, assessmentVersion, JUDGMENT_LIMITS, latestJudgment, MILESTONE_REVIEW_SECTIONS, riskCounts, TASK_REVIEW_SECTIONS, confirmTarget, currentTarget, readRetrospective, retroCandidates, RetrospectiveError, } from "../shared/retrospective.js";
|
|
5
|
+
import { getArchivedTask, listArchivedTasks } from "./store/archivedTasks.js";
|
|
6
|
+
import { NotFoundError } from "./store/collection.js";
|
|
7
|
+
import { withFileLock, writeFileAtomic } from "./store/fsutil.js";
|
|
8
|
+
/**
|
|
9
|
+
* 要望の振り返りの保存と読み取り(規則は shared/retrospective.ts)。記録は requests/<要望ID>/retrospective.json で、要望のロック
|
|
10
|
+
* (requestLock。要望・タスクの保存と同じ)の中で、読み直してから版を照らして書く。読み取りはファイルを書かない
|
|
11
|
+
*/
|
|
12
|
+
export const RETRO_FILE = "retrospective.json";
|
|
13
|
+
const pathOf = (ctx, rid) => join(ctx.ws.requestsDir, rid, RETRO_FILE);
|
|
14
|
+
/** 記録を読む(無ければ空。壊れていれば retro_unreadable) */
|
|
15
|
+
export async function loadRetrospective(ctx, rid) {
|
|
16
|
+
let text;
|
|
17
|
+
try {
|
|
18
|
+
text = await readFile(pathOf(ctx, rid), "utf8");
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
if (e.code === "ENOENT")
|
|
22
|
+
return { version: 0, targets: [] };
|
|
23
|
+
throw e;
|
|
24
|
+
}
|
|
25
|
+
let raw;
|
|
26
|
+
try {
|
|
27
|
+
raw = JSON.parse(text);
|
|
28
|
+
}
|
|
29
|
+
catch (e) {
|
|
30
|
+
throw new RetrospectiveError("retro_unreadable", `retrospective.json が JSON として読めません: ${e.message}(ファイルを直してください)`);
|
|
31
|
+
}
|
|
32
|
+
return readRetrospective(raw);
|
|
33
|
+
}
|
|
34
|
+
/** 候補(新しい順)。runs と照らすタスク・子の要望はディスクと読み込んだ値から */
|
|
35
|
+
export async function retrospectiveCandidates(ctx, rid) {
|
|
36
|
+
const request = ctx.ws.requests.require(rid);
|
|
37
|
+
const runs = await ctx.preflight.list(rid);
|
|
38
|
+
const archived = new Set((await listArchivedTasks(ctx.ws, rid)).tasks.map((t) => t.id));
|
|
39
|
+
const tasks = ctx.ws.tasksOf(rid);
|
|
40
|
+
const lookup = {
|
|
41
|
+
task: (tid) => (tasks.get(tid) ? "present" : archived.has(tid) ? "archived" : "missing"),
|
|
42
|
+
child: (id) => {
|
|
43
|
+
const c = ctx.ws.requests.get(id);
|
|
44
|
+
return c ? { splitFrom: c.splitFrom, parent: c.parent } : undefined;
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
return { ...retroCandidates(rid, request.status, runs, lookup), runs };
|
|
48
|
+
}
|
|
49
|
+
export async function retrospectiveView(ctx, rid) {
|
|
50
|
+
const file = await loadRetrospective(ctx, rid);
|
|
51
|
+
const { candidates, none } = await retrospectiveCandidates(ctx, rid);
|
|
52
|
+
const target = currentTarget(file);
|
|
53
|
+
const judgments = file.judgments ?? [];
|
|
54
|
+
const risks = (target?.risks ?? []).map((r) => {
|
|
55
|
+
const j = latestJudgment(file, target.id, r.index);
|
|
56
|
+
return { index: r.index, text: r.text, state: j?.state ?? "unchecked", ...(j ? { judgment: j } : {}), history: judgments.filter((x) => x.target === target.id && x.risk === r.index) };
|
|
57
|
+
});
|
|
58
|
+
const checks = {};
|
|
59
|
+
for (const j of judgments)
|
|
60
|
+
checks[j.id] = await Promise.all(j.evidence.map((e) => checkEvidence(ctx, e)));
|
|
61
|
+
return { version: file.version, ...(target ? { target } : {}), targets: file.targets, candidates, ...(none ? { none } : {}), risks, counts: riskCounts(file), judgments, checks };
|
|
62
|
+
}
|
|
63
|
+
// --- リスクの確認の根拠 -----------------------------------------------------------
|
|
64
|
+
const bad = (m) => new RetrospectiveError("retro_invalid", m);
|
|
65
|
+
const clip = (s) => (s.length > JUDGMENT_LIMITS.excerpt ? `${s.slice(0, JUDGMENT_LIMITS.excerpt)}…` : s);
|
|
66
|
+
/** 結果の項目と位置から所見の文を取り出す(無ければ undefined) */
|
|
67
|
+
function findingOf(result, section, index) {
|
|
68
|
+
if (section === "overall")
|
|
69
|
+
return index === 0 && typeof result.overall === "string" ? result.overall : undefined;
|
|
70
|
+
const list = result[section];
|
|
71
|
+
if (!Array.isArray(list) || index < 0 || index >= list.length)
|
|
72
|
+
return undefined;
|
|
73
|
+
const x = list[index];
|
|
74
|
+
if (typeof x === "string")
|
|
75
|
+
return x;
|
|
76
|
+
const head = [x.item ?? x.unit ?? x.standard, x.verdict].filter((v) => typeof v === "string").join(": ");
|
|
77
|
+
return [head, typeof x.reason === "string" ? x.reason : typeof x.text === "string" ? x.text : ""].filter(Boolean).join(" ");
|
|
78
|
+
}
|
|
79
|
+
/** 所見がこの要望を根拠に挙げているか(マイルストーンレビューの所見の evidence に要望 ID かそのタスクの参照がある) */
|
|
80
|
+
function citesRequest(result, section, index, rid) {
|
|
81
|
+
const list = result[section];
|
|
82
|
+
const x = Array.isArray(list) ? list[index] : undefined;
|
|
83
|
+
const ev = x && Array.isArray(x.evidence) ? x.evidence : [];
|
|
84
|
+
return ev.some((e) => typeof e === "string" && (e === rid || e.startsWith(`${rid}/`)));
|
|
85
|
+
}
|
|
86
|
+
/** タスクを今の・アーカイブから引く(無ければ undefined) */
|
|
87
|
+
async function taskOf(ctx, rid, tid) {
|
|
88
|
+
return ctx.ws.tasksOf(rid).get(tid) ?? (await getArchivedTask(ctx.ws, rid, tid).catch(() => undefined));
|
|
89
|
+
}
|
|
90
|
+
/** 根拠の指定を今の記録と照らして、保存する根拠にする(範囲外・見つからない・所見が無いなどは retro_invalid) */
|
|
91
|
+
export async function resolveEvidence(ctx, rid, ref) {
|
|
92
|
+
if (ref.kind === "manual") {
|
|
93
|
+
const reference = ref.reference?.trim();
|
|
94
|
+
if (!reference)
|
|
95
|
+
throw bad("人が書く参照(reference)が空です");
|
|
96
|
+
return { kind: "manual", reference: clip(reference), ...(ref.note?.trim() ? { note: clip(ref.note.trim()) } : {}) };
|
|
97
|
+
}
|
|
98
|
+
if (ref.kind === "rework") {
|
|
99
|
+
const t = await taskOf(ctx, rid, ref.task);
|
|
100
|
+
if (!t)
|
|
101
|
+
throw bad(`${rid}/${ref.task} はこの要望のタスクにありません`);
|
|
102
|
+
const h = t.reworkHistory?.find((e) => e.id === ref.history);
|
|
103
|
+
if (!h)
|
|
104
|
+
throw bad(`${t.id} の手戻りの履歴に ${ref.history} はありません`);
|
|
105
|
+
return { kind: "rework", request: rid, task: t.id, history: h.id, excerpt: clip(reworkLine(h)) };
|
|
106
|
+
}
|
|
107
|
+
const index = ref.index ?? 0;
|
|
108
|
+
if (ref.kind === "task_review") {
|
|
109
|
+
if (!TASK_REVIEW_SECTIONS.includes(ref.section))
|
|
110
|
+
throw bad(`タスクレビューの所見の項目は ${TASK_REVIEW_SECTIONS.join(" / ")} です`);
|
|
111
|
+
if (!(await taskOf(ctx, rid, ref.task)))
|
|
112
|
+
throw bad(`${rid}/${ref.task} はこの要望のタスクにありません(ほかの要望のレビューは結び付けられません)`);
|
|
113
|
+
const rec = await ctx.ws.taskReviews.get(`${rid}/${ref.task}`, ref.run).catch(() => undefined);
|
|
114
|
+
if (!rec?.result)
|
|
115
|
+
throw bad(`${rid}/${ref.task} のレビュー ${ref.run} の結果がありません`);
|
|
116
|
+
const text = findingOf(rec.result, ref.section, index);
|
|
117
|
+
if (text === undefined)
|
|
118
|
+
throw bad(`レビュー ${ref.run} の ${ref.section}[${index}] に所見がありません`);
|
|
119
|
+
return { kind: "task_review", request: rid, task: ref.task, run: ref.run, section: ref.section, index, resultVersion: assessmentVersion(rec.result), excerpt: clip(text) };
|
|
120
|
+
}
|
|
121
|
+
if (!MILESTONE_REVIEW_SECTIONS.includes(ref.section))
|
|
122
|
+
throw bad(`マイルストーンレビューの所見の項目は ${MILESTONE_REVIEW_SECTIONS.join(" / ")} です`);
|
|
123
|
+
const rec = await ctx.ws.milestoneReviews.get(ref.milestone, ref.run).catch(() => undefined);
|
|
124
|
+
if (!rec?.result || !rec.input)
|
|
125
|
+
throw bad(`マイルストーン ${ref.milestone} のレビュー ${ref.run} の結果がありません`);
|
|
126
|
+
if (!rec.input.requests.some((r) => r.id === rid))
|
|
127
|
+
throw bad(`レビュー ${ref.run} の材料で、${rid} は直接の対象ではありません(範囲外の所見は結び付けられません)`);
|
|
128
|
+
const result = rec.result;
|
|
129
|
+
const text = findingOf(result, ref.section, index);
|
|
130
|
+
if (text === undefined)
|
|
131
|
+
throw bad(`レビュー ${ref.run} の ${ref.section}[${index}] に所見がありません`);
|
|
132
|
+
const reason = ref.reason?.trim();
|
|
133
|
+
if (!citesRequest(result, ref.section, index, rid) && !reason)
|
|
134
|
+
throw bad(`この所見は ${rid} を根拠に挙げていません。全体に関わる所見を結び付けるには、この要望と結び付く理由(reason)を書いてください`);
|
|
135
|
+
return {
|
|
136
|
+
kind: "milestone_review",
|
|
137
|
+
milestone: ref.milestone,
|
|
138
|
+
run: ref.run,
|
|
139
|
+
section: ref.section,
|
|
140
|
+
index,
|
|
141
|
+
resultVersion: assessmentVersion(rec.result),
|
|
142
|
+
excerpt: clip(text),
|
|
143
|
+
...(rec.run.inputChanged ? { inputChanged: true } : {}),
|
|
144
|
+
...(reason ? { reason: clip(reason) } : {}),
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
/** 保存した根拠を今の記録と照らす(ファイルは書かない) */
|
|
148
|
+
export async function checkEvidence(ctx, e) {
|
|
149
|
+
if (e.kind === "manual")
|
|
150
|
+
return "manual";
|
|
151
|
+
if (e.kind === "rework")
|
|
152
|
+
return (await taskOf(ctx, e.request, e.task))?.reworkHistory?.some((h) => h.id === e.history) ? "ok" : "missing";
|
|
153
|
+
const rec = e.kind === "task_review" ? await ctx.ws.taskReviews.get(`${e.request}/${e.task}`, e.run).catch(() => undefined) : await ctx.ws.milestoneReviews.get(e.milestone, e.run).catch(() => undefined);
|
|
154
|
+
if (!rec?.result)
|
|
155
|
+
return "missing";
|
|
156
|
+
return assessmentVersion(rec.result) === e.resultVersion ? "ok" : "changed";
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* リスクの確認を記録する(追記。今の確定した対象のリスクだけ)。根拠は保存するときに照らして抜粋と版を写す。
|
|
160
|
+
* expectedVersion が違えば retro_conflict、規則に合わない・範囲外の根拠は retro_invalid(どちらも何も書かない)
|
|
161
|
+
*/
|
|
162
|
+
export async function judgeRisk(ctx, rid, input, opts = {}) {
|
|
163
|
+
ctx.ws.requests.require(rid);
|
|
164
|
+
await withFileLock(ctx.ws.requestLock(rid), async () => {
|
|
165
|
+
if ("missing" in (await ctx.ws.requests.peek(rid)))
|
|
166
|
+
throw new NotFoundError(rid);
|
|
167
|
+
const file = await loadRetrospective(ctx, rid);
|
|
168
|
+
if (opts.expectedVersion !== undefined && opts.expectedVersion !== file.version) {
|
|
169
|
+
throw new RetrospectiveError("retro_conflict", `振り返りの記録が他で変わりました(版 ${opts.expectedVersion} → ${file.version})。読み直してからやり直してください`);
|
|
170
|
+
}
|
|
171
|
+
const evidence = [];
|
|
172
|
+
for (const ref of input.evidence)
|
|
173
|
+
evidence.push(await resolveEvidence(ctx, rid, ref));
|
|
174
|
+
const next = addJudgment(file, { ...input, evidence }, { now: new Date().toISOString(), actor: opts.actor });
|
|
175
|
+
await writeFileAtomic(pathOf(ctx, rid), `${JSON.stringify(next, null, 2)}\n`);
|
|
176
|
+
}, { busyMessage: "別のプロセスがこの要望を保存中です。少し待ってやり直してください" });
|
|
177
|
+
ctx.ws.emit({ type: "changed", kind: "request", request: rid });
|
|
178
|
+
return retrospectiveView(ctx, rid);
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* 振り返りの対象を確定する(訂正は理由つきで追記)。expectedVersion が今の版と違えば retro_conflict、候補でない・評価が無いなどは
|
|
182
|
+
* retro_invalid(どちらも何も書かない)
|
|
183
|
+
*/
|
|
184
|
+
export async function confirmRetrospectiveTarget(ctx, rid, input, opts = {}) {
|
|
185
|
+
ctx.ws.requests.require(rid);
|
|
186
|
+
await withFileLock(ctx.ws.requestLock(rid), async () => {
|
|
187
|
+
// ロックの中で要望があることを確かめる(アーカイブで移した後のフォルダに書き戻さない)
|
|
188
|
+
if ("missing" in (await ctx.ws.requests.peek(rid)))
|
|
189
|
+
throw new NotFoundError(rid);
|
|
190
|
+
const file = await loadRetrospective(ctx, rid);
|
|
191
|
+
if (opts.expectedVersion !== undefined && opts.expectedVersion !== file.version) {
|
|
192
|
+
throw new RetrospectiveError("retro_conflict", `振り返りの記録が他で変わりました(版 ${opts.expectedVersion} → ${file.version})。読み直してからやり直してください`);
|
|
193
|
+
}
|
|
194
|
+
const { candidates, none, runs } = await retrospectiveCandidates(ctx, rid);
|
|
195
|
+
const runOf = (id) => runs.find((r) => r.id === id);
|
|
196
|
+
const next = confirmTarget(file, input, {
|
|
197
|
+
candidates,
|
|
198
|
+
none,
|
|
199
|
+
risksOf: (id) => runOf(id)?.assessment?.risks,
|
|
200
|
+
assessmentOf: (id) => runOf(id)?.assessment,
|
|
201
|
+
now: new Date().toISOString(),
|
|
202
|
+
actor: opts.actor,
|
|
203
|
+
});
|
|
204
|
+
await writeFileAtomic(pathOf(ctx, rid), `${JSON.stringify(next, null, 2)}\n`);
|
|
205
|
+
}, { busyMessage: "別のプロセスがこの要望を保存中です。少し待ってやり直してください" });
|
|
206
|
+
ctx.ws.emit({ type: "changed", kind: "request", request: rid });
|
|
207
|
+
return retrospectiveView(ctx, rid);
|
|
208
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { diagnoseRequest, diagnoseTask, isReviewTarget, reviewSummary } from "../shared/reviewCandidate.js";
|
|
2
|
+
import { hierarchyNow } from "./requestStatus.js";
|
|
3
|
+
/**
|
|
4
|
+
* 見直し候補の読み取り(規則は shared/reviewCandidate.ts)。読み込んだ値だけで診断し、ファイルは書かない・git も実行しない。
|
|
5
|
+
* アーカイブした要望・タスクは見ない
|
|
6
|
+
*/
|
|
7
|
+
const nowOf = (ctx) => ({ quality: ctx.ws.project.quality, qualityVersion: ctx.ws.project.qualityVersion });
|
|
8
|
+
/** タスクの診断(完了していなければ undefined) */
|
|
9
|
+
export function taskReview(ctx, task) {
|
|
10
|
+
return diagnoseTask(task, ctx.ws.requests.get(task.request), nowOf(ctx));
|
|
11
|
+
}
|
|
12
|
+
/** 要望自身の診断(対応済・完了済でなければ undefined) */
|
|
13
|
+
export function requestSelfReview(ctx, r) {
|
|
14
|
+
return diagnoseRequest(r, nowOf(ctx));
|
|
15
|
+
}
|
|
16
|
+
const isCandidate = (d) => d?.state === "candidate";
|
|
17
|
+
/** 要望の概要(自身・自分のタスク・自分を除く配下)。配下は子孫の要望とそのタスクを1回ずつ数える */
|
|
18
|
+
export function requestReviewCounts(ctx, r, h = hierarchyNow(ctx.ws)) {
|
|
19
|
+
const self = requestSelfReview(ctx, r);
|
|
20
|
+
const tasksOf = (id) => ctx.ws.tasksOf(id).list().filter((t) => isCandidate(taskReview(ctx, t))).length;
|
|
21
|
+
let below = 0;
|
|
22
|
+
for (const d of h.descendants(r.id))
|
|
23
|
+
below += tasksOf(d.id) + (isCandidate(requestSelfReview(ctx, d)) ? 1 : 0);
|
|
24
|
+
return { ...(self ? { self: reviewSummary(self) } : {}), tasks: tasksOf(r.id), below };
|
|
25
|
+
}
|
|
26
|
+
/** 要望の詳細に添える診断(自身・タスクごとの概要・配下の件数) */
|
|
27
|
+
export function requestReview(ctx, rid) {
|
|
28
|
+
const r = ctx.ws.requests.require(rid);
|
|
29
|
+
const self = requestSelfReview(ctx, r);
|
|
30
|
+
const tasks = Object.fromEntries(ctx.ws
|
|
31
|
+
.tasksOf(rid)
|
|
32
|
+
.list()
|
|
33
|
+
.flatMap((t) => {
|
|
34
|
+
const d = taskReview(ctx, t);
|
|
35
|
+
return d ? [[t.id, reviewSummary(d)]] : [];
|
|
36
|
+
}));
|
|
37
|
+
return { ...(self ? { self } : {}), tasks, counts: requestReviewCounts(ctx, r) };
|
|
38
|
+
}
|
|
39
|
+
/** 見直し候補の一覧(タスクと要望。完了済みも含む)。request を渡すとその要望だけ */
|
|
40
|
+
export function reviewCandidates(ctx, opts = {}) {
|
|
41
|
+
const requests = opts.request ? [ctx.ws.requests.require(opts.request)] : ctx.ws.requests.list();
|
|
42
|
+
const out = [];
|
|
43
|
+
for (const r of requests) {
|
|
44
|
+
const self = requestSelfReview(ctx, r);
|
|
45
|
+
if (isCandidate(self))
|
|
46
|
+
out.push(self);
|
|
47
|
+
for (const t of ctx.ws.tasksOf(r.id).list()) {
|
|
48
|
+
if (!isReviewTarget(t))
|
|
49
|
+
continue;
|
|
50
|
+
const d = taskReview(ctx, t);
|
|
51
|
+
if (isCandidate(d))
|
|
52
|
+
out.push(d);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return out;
|
|
56
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { access, mkdir, readFile, readdir, rename } from "node:fs/promises";
|
|
2
2
|
import { dirname, join } from "node:path";
|
|
3
3
|
import { parseFrontmatter, stringifyFrontmatter } from "./frontmatter.js";
|
|
4
|
-
import { createExclusive, nowIso, writeFileAtomic } from "./fsutil.js";
|
|
4
|
+
import { createExclusive, nowIso, withFileLock, writeFileAtomic } from "./fsutil.js";
|
|
5
5
|
export class ConflictError extends Error {
|
|
6
6
|
id;
|
|
7
7
|
expected;
|
|
@@ -20,6 +20,8 @@ export class NotFoundError extends Error {
|
|
|
20
20
|
this.id = id;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
+
/** ロックを待ちきれなかったときの案内 */
|
|
24
|
+
const LOCK_BUSY = "別のプロセスがこの要望を保存中です。少し待ってやり直してください";
|
|
23
25
|
/**
|
|
24
26
|
* 1エンティティ = 1 Markdown ファイル(YAML frontmatter + 本文)のコレクション。
|
|
25
27
|
* メモリ上にキャッシュし、ファイル変更(人手・AI・Codex・git pull)は reload() で取り込む。
|
|
@@ -168,6 +170,10 @@ export class MarkdownCollection {
|
|
|
168
170
|
}
|
|
169
171
|
/** 作る。省いた項目は normalize の既定値になる */
|
|
170
172
|
async create(input, actor) {
|
|
173
|
+
// タスクは要望のロックの中で作る(要望のアーカイブと重なって、移した後のフォルダに作らない)。要望(ID は新しく作る)は取らない
|
|
174
|
+
return this.locked("", () => this.createUnlocked(input, actor));
|
|
175
|
+
}
|
|
176
|
+
async createUnlocked(input, actor) {
|
|
171
177
|
// アーカイブ済みの ID も使わない(アーカイブしたタスクへの関係が新しいタスクを指さないように)
|
|
172
178
|
const existing = [...new Set([...this.items.keys(), ...(await this.layout.scan()), ...((await this.layout.reserved?.()) ?? [])])];
|
|
173
179
|
// 別のプロセス(CLI・AI)と同時に作っても、排他作成で衝突を検出して次の ID にする
|
|
@@ -203,6 +209,14 @@ export class MarkdownCollection {
|
|
|
203
209
|
* patch に関数を渡すと、直前に読み直した今の値から patch を作る(基準の操作のように、今の値に当てる変更)。関数が投げたら書かない
|
|
204
210
|
*/
|
|
205
211
|
async update(id, patch, opts = {}) {
|
|
212
|
+
return this.locked(id, () => this.updateUnlocked(id, patch, opts));
|
|
213
|
+
}
|
|
214
|
+
/** ロックの中で動かす(ロックを持たないコレクションはそのまま) */
|
|
215
|
+
locked(id, fn) {
|
|
216
|
+
const lock = this.opts.lock?.(id);
|
|
217
|
+
return lock ? withFileLock(lock, fn, { busyMessage: LOCK_BUSY }) : fn();
|
|
218
|
+
}
|
|
219
|
+
async updateUnlocked(id, patch, opts) {
|
|
206
220
|
// 外部での編集を取りこぼさないよう、更新の直前にディスクから読み直す。
|
|
207
221
|
// この版が知らない項目(新しい版の p3 が書いた項目)は消さずに書き戻す(古い版の更新で親子などが消えないように)
|
|
208
222
|
const r = await this.read(id);
|
|
@@ -233,6 +247,11 @@ export class MarkdownCollection {
|
|
|
233
247
|
}
|
|
234
248
|
/** 物理削除はせず .archive/ へ移す */
|
|
235
249
|
async archive(id) {
|
|
250
|
+
return this.locked(id, () => this.archiveUnlocked(id));
|
|
251
|
+
}
|
|
252
|
+
async archiveUnlocked(id) {
|
|
253
|
+
// ロックの中で読み直す(別のプロセスが先に移した・消したなら無い)
|
|
254
|
+
this.apply(id, await this.read(id));
|
|
236
255
|
this.require(id);
|
|
237
256
|
const { from, to } = this.layout.archive(id);
|
|
238
257
|
// 既にアーカイブに同じ ID があれば上書きしない(rename は黙って置き換えるので先に確かめる)
|