@infodb/p3 0.13.0 → 0.14.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 +1 -0
- package/bin/p3.mjs +3 -2
- package/dist/web/assets/{CompletionReview-gZKZrDu_.js → CompletionReview-BD7d6Yzt.js} +1 -1
- package/dist/web/assets/ImprovementDialog-BoAZN1KR.js +1 -0
- package/dist/web/assets/{Outputs-BgHalMGb.js → Outputs-D-ZouoxF.js} +1 -1
- package/dist/web/assets/{RequestStatus-hZcBUUIu.js → RequestStatus-Bl3fdSbM.js} +1 -1
- package/dist/web/assets/{Tabs-C3NmwCc3.js → Tabs-CxeceOL-.js} +1 -1
- package/dist/web/assets/{TagInput-B2b862qn.js → TagInput-CeAbmGRR.js} +1 -1
- package/dist/web/assets/TaskDrawer-BCriSnhe.js +6 -0
- package/dist/web/assets/_requestId-CZKMe_mC.js +1 -0
- package/dist/web/assets/_requestId-Fx4lLkFo.js +1 -0
- package/dist/web/assets/appCtx-BdxbkSZa.js +1 -0
- package/dist/web/assets/archive-D5IIxcSV.js +1 -0
- package/dist/web/assets/board-p6R9KMqd.js +1 -0
- package/dist/web/assets/done-BTOF188x.js +1 -0
- package/dist/web/assets/{draft-BvGxfD7v.js → draft-BWYpm3PD.js} +2 -2
- package/dist/web/assets/index-DFbY8NAR.css +2 -0
- package/dist/web/assets/index-Dpqi2dcC.js +12 -0
- package/dist/web/assets/link-D481whDt.js +1 -0
- package/dist/web/assets/metrics-CAzP6V8I.js +1 -0
- package/dist/web/assets/new-C65IJJg3.js +1 -0
- package/dist/web/assets/preload-helper-_dAYMct_.js +1 -0
- package/dist/web/assets/{release-notes-Bpdi6RdY.js → release-notes-Dtif8xsQ.js} +4 -4
- package/dist/web/assets/{requestData-CbFxwW5w.js → requestData-SPc36t8Q.js} +1 -1
- package/dist/web/assets/routes-DJj8CWuk.js +6 -0
- package/dist/web/assets/settings-DKJd7CLe.js +1 -0
- package/dist/web/assets/ui-CbEOnPnF.js +1 -0
- package/dist/web/assets/{workTarget-CySfKyfB.js → workTarget-DavxMs-c.js} +3 -3
- package/dist/web/index.html +6 -4
- package/docs/architecture.md +165 -71
- package/docs/chatgpt-sign-in.md +2 -2
- package/docs/development.md +87 -54
- package/docs/feature-inventory.md +139 -0
- package/docs/how-to-use.md +10 -5
- package/docs/installation.md +31 -8
- package/docs/publishing.md +32 -13
- package/docs/refactoring.md +332 -0
- package/lib/cli/agentsStatus.js +2 -1
- package/lib/cli/guide.md +4 -1
- package/lib/cli/help.js +1 -1
- package/lib/cli/main.js +33 -238
- package/lib/cli/project.js +21 -267
- package/lib/core/projectRegistry.js +2 -2
- package/lib/kit/appInfo.js +13 -0
- package/lib/kit/usage.js +27 -0
- package/lib/server/api/projectsRoutes.js +5 -5
- package/lib/server/server.js +7 -4
- package/lib/{cli → tasks/cli}/args.js +2 -2
- package/lib/{cli → tasks/cli}/chatgpt.js +1 -1
- package/lib/{cli → tasks/cli}/codex.js +1 -1
- package/lib/{cli → tasks/cli}/output.js +2 -2
- package/lib/{cli → tasks/cli}/preflightCommands.js +1 -1
- package/lib/tasks/cli/readOnly.js +75 -0
- package/lib/{cli → tasks/cli}/render.js +1 -1
- package/lib/{cli → tasks/cli}/requestCommands.js +6 -6
- package/lib/{cli → tasks/cli}/showView.js +4 -4
- package/lib/{cli → tasks/cli}/taskCommands.js +16 -8
- package/lib/tasks/cli/tasksCli.js +149 -0
- package/lib/{core → tasks/core}/context.js +6 -9
- package/lib/tasks/core/errorOutcome.js +125 -0
- package/lib/{core → tasks/core}/hierarchy.js +1 -1
- package/lib/{core → tasks/core}/ops.js +6 -4
- package/lib/{core → tasks/core}/preflight/codexEngine.js +2 -11
- package/lib/{core → tasks/core}/preflight/hostPaths.js +39 -0
- package/lib/{core → tasks/core}/preflight/input.js +1 -1
- package/lib/{core → tasks/core}/preflight/instructions.js +2 -2
- package/lib/{core → tasks/core}/preflight/mockEngine.js +8 -7
- package/lib/{core → tasks/core}/preflight/service.js +38 -13
- package/lib/{core → tasks/core}/preflight/uiRender.js +2 -2
- package/lib/{core → tasks/core}/requestOps.js +19 -14
- package/lib/{core → tasks/core}/reviewRuns.js +127 -22
- package/lib/{core → tasks/core}/store/attachments.js +3 -2
- package/lib/{core → tasks/core}/store/collection.js +2 -2
- package/lib/tasks/core/store/fieldGroups.js +30 -0
- package/lib/tasks/core/store/jsonRecord.js +30 -0
- package/lib/{core → tasks/core}/store/normalize.js +13 -26
- package/lib/{core → tasks/core}/store/noteStore.js +2 -2
- package/lib/{core → tasks/core}/store/preflightStore.js +44 -21
- package/lib/{core → tasks/core}/store/projectFile.js +1 -1
- package/lib/{core → tasks/core}/store/workspace.js +11 -5
- package/lib/{core → tasks/core}/userConfig.js +1 -1
- package/lib/{core → tasks/core}/workTargets.js +1 -1
- package/lib/{cli → tasks/features/metrics/cli}/metricsCommands.js +3 -3
- package/lib/{core/metrics → tasks/features/metrics/core}/definitions.js +19 -8
- package/lib/{core/metrics → tasks/features/metrics/core}/index.js +41 -17
- package/lib/{core/metrics → tasks/features/metrics/core}/manual.js +27 -28
- package/lib/tasks/features/metrics/server/metricsRoutes.js +8 -0
- package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/code.js +2 -11
- package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/material.js +5 -6
- package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/review.js +2 -2
- package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/service.js +38 -100
- package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/store.js +3 -3
- package/lib/{server/api → tasks/features/milestoneReview/server}/milestoneReviewRoutes.js +7 -13
- package/lib/{cli → tasks/features/quality/cli}/qualityCommands.js +3 -3
- package/lib/{core → tasks/features/quality/core}/qualityImprovement.js +16 -15
- package/lib/{cli → tasks/features/records/cli}/revisitCommands.js +2 -2
- package/lib/{core → tasks/features/records/core}/reviewCandidates.js +26 -6
- package/lib/{shared → tasks/features/records/shared}/completionRecord.js +5 -3
- package/lib/{shared → tasks/features/records/shared}/reviewCandidate.js +13 -8
- package/lib/{shared → tasks/features/records/shared}/reworkHistory.js +5 -0
- package/lib/{cli → tasks/features/releaseNotes/cli}/releaseNotesCommands.js +7 -7
- package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/completeRequests.js +5 -6
- package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/generate.js +3 -14
- package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/material.js +3 -4
- package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/service.js +1 -1
- package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/store.js +2 -2
- package/lib/{server/api → tasks/features/releaseNotes/server}/releaseNoteRoutes.js +11 -20
- package/lib/{cli → tasks/features/requirements/cli}/requirementCommands.js +8 -7
- package/lib/{shared → tasks/features/requirements/shared}/acceptance.js +41 -7
- package/lib/{cli → tasks/features/retro/cli}/retroCommands.js +1 -1
- package/lib/{core → tasks/features/retro/core}/retrospective.js +42 -53
- package/lib/tasks/features/settings/cli/projectSettings.js +245 -0
- package/lib/{cli → tasks/features/settings/cli}/userConfig.js +5 -5
- package/lib/{core → tasks/features/settings/core}/machineSettingsEdit.js +2 -2
- package/lib/{core → tasks/features/settings/core}/repoAdmin.js +3 -3
- package/lib/{core → tasks/features/settings/core}/userTheme.js +2 -2
- package/lib/{server/api → tasks/features/settings/server}/repoRoutes.js +2 -2
- package/lib/{server/api → tasks/features/settings/server}/userThemeRoutes.js +3 -3
- package/lib/{cli → tasks/features/taskReview/cli}/taskReviewCommands.js +5 -5
- package/lib/{core/taskReview → tasks/features/taskReview/core}/material.js +7 -8
- package/lib/{core/taskReview → tasks/features/taskReview/core}/review.js +2 -2
- package/lib/{core/taskReview → tasks/features/taskReview/core}/service.js +24 -85
- package/lib/{core/taskReview → tasks/features/taskReview/core}/store.js +4 -4
- package/lib/{server/api → tasks/features/taskReview/server}/taskReviewRoutes.js +7 -14
- package/lib/{server → tasks/server}/api/routes.js +24 -75
- package/lib/tasks/shared/commitRefs.js +10 -0
- package/package.json +1 -44
- package/dist/web/assets/ImprovementDialog-Dno6dPnG.js +0 -1
- package/dist/web/assets/TaskDrawer-4BQBELXa.js +0 -6
- package/dist/web/assets/_requestId-BMAG1t3o.js +0 -1
- package/dist/web/assets/_requestId-tbg2pA2S.js +0 -1
- package/dist/web/assets/archive-DMl6WyOe.js +0 -1
- package/dist/web/assets/board-BMTcHKyt.js +0 -1
- package/dist/web/assets/done-CL6Nlsua.js +0 -1
- package/dist/web/assets/index-Dp7Fc4VI.css +0 -2
- package/dist/web/assets/index-KdlgMitg.js +0 -12
- package/dist/web/assets/metrics-Cu7gJ7Rk.js +0 -1
- package/dist/web/assets/new-DTXWHuFO.js +0 -1
- package/dist/web/assets/preload-helper-oLCrNCwz.js +0 -1
- package/dist/web/assets/routes-BIt8bExF.js +0 -6
- package/dist/web/assets/settings-CsCqF_1B.js +0 -1
- package/dist/web/assets/ui-BGK72r3u.js +0 -1
- package/lib/cli/readOnly.js +0 -53
- /package/lib/{core/store → kit}/frontmatter.js +0 -0
- /package/lib/{core/store → kit}/fsutil.js +0 -0
- /package/lib/{cli → tasks/cli}/format.js +0 -0
- /package/lib/{core → tasks/core}/chatgpt.js +0 -0
- /package/lib/{core → tasks/core}/machineSettings.js +0 -0
- /package/lib/{core → tasks/core}/preflight/carryover.js +0 -0
- /package/lib/{core → tasks/core}/preflight/codexImage.js +0 -0
- /package/lib/{core → tasks/core}/preflight/diagnose.js +0 -0
- /package/lib/{core → tasks/core}/preflight/docker.js +0 -0
- /package/lib/{core → tasks/core}/preflight/engine.js +0 -0
- /package/lib/{core → tasks/core}/preflight/launch.js +0 -0
- /package/lib/{core → tasks/core}/preflight/launcher.mjs +0 -0
- /package/lib/{core → tasks/core}/preflight/mock-ui.html +0 -0
- /package/lib/{core → tasks/core}/preflight/mock-ui.png +0 -0
- /package/lib/{core → tasks/core}/preflight/owner.js +0 -0
- /package/lib/{core → tasks/core}/preflight/render-image/Dockerfile +0 -0
- /package/lib/{core → tasks/core}/preflight/render-image/fonts-ja.conf +0 -0
- /package/lib/{core → tasks/core}/preflight/render-image/render.mjs +0 -0
- /package/lib/{core → tasks/core}/preflight/render.js +0 -0
- /package/lib/{core → tasks/core}/preflight/split.js +0 -0
- /package/lib/{core → tasks/core}/preflight/uiMaterials.js +0 -0
- /package/lib/{core → tasks/core}/preflight/wireframe.js +0 -0
- /package/lib/{core → tasks/core}/preflight/xlsx.js +0 -0
- /package/lib/{core → tasks/core}/redact.js +0 -0
- /package/lib/{core → tasks/core}/repoRefs.js +0 -0
- /package/lib/{core → tasks/core}/requestStatus.js +0 -0
- /package/lib/{core → tasks/core}/store/archivedTasks.js +0 -0
- /package/lib/{core → tasks/core}/store/dataWatcher.js +0 -0
- /package/lib/{core → tasks/core}/store/locate.js +0 -0
- /package/lib/{core → tasks/core}/supersede.js +0 -0
- /package/lib/{shared → tasks/features/metrics/shared}/metrics.js +0 -0
- /package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/mockReviewer.js +0 -0
- /package/lib/{shared → tasks/features/milestoneReview/shared}/milestoneReview.js +0 -0
- /package/lib/{core → tasks/features/quality/core}/quality.js +0 -0
- /package/lib/{shared → tasks/features/quality/shared}/quality.js +0 -0
- /package/lib/{shared → tasks/features/quality/shared}/qualityImprovement.js +0 -0
- /package/lib/{shared → tasks/features/quality/shared}/qualityTemplates.js +0 -0
- /package/lib/{core → tasks/features/records/core}/completionRefs.js +0 -0
- /package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/mockSummarizer.js +0 -0
- /package/lib/{shared → tasks/features/requirements/shared}/requirementSource.js +0 -0
- /package/lib/{shared → tasks/features/retro/shared}/retrospective.js +0 -0
- /package/lib/{core/taskReview → tasks/features/taskReview/core}/mockReviewer.js +0 -0
- /package/lib/{core/taskReview → tasks/features/taskReview/core}/paths.js +0 -0
- /package/lib/{shared → tasks/features/taskReview/shared}/taskReview.js +0 -0
- /package/lib/{server → tasks/server}/api/chatgptRoutes.js +0 -0
- /package/lib/{server → tasks/server}/api/local.js +0 -0
- /package/lib/{server → tasks/server}/api/manifest.js +0 -0
- /package/lib/{shared → tasks/shared}/dates.js +0 -0
- /package/lib/{shared → tasks/shared}/directTask.js +0 -0
- /package/lib/{shared → tasks/shared}/hierarchy.js +0 -0
- /package/lib/{shared → tasks/shared}/milestoneGoals.js +0 -0
- /package/lib/{shared → tasks/shared}/milestoneOrder.js +0 -0
- /package/lib/{shared → tasks/shared}/preflightInput.js +0 -0
- /package/lib/{shared → tasks/shared}/preflightRunner.js +0 -0
- /package/lib/{shared → tasks/shared}/refs.js +0 -0
- /package/lib/{shared → tasks/shared}/repos.js +0 -0
- /package/lib/{shared → tasks/shared}/scopeView.js +0 -0
- /package/lib/{shared → tasks/shared}/tags.js +0 -0
- /package/lib/{shared → tasks/shared}/taskBlock.js +0 -0
- /package/lib/{shared → tasks/shared}/types.js +0 -0
- /package/lib/{shared → tasks/shared}/workTarget.js +0 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
-
import { PURPOSE_UNIT_ID, REVIEW_SCOPE, REVIEW_SCOPE_RECORDS_ONLY, } from "
|
|
3
|
-
import { qualitySnapshot } from "../../shared/quality.js";
|
|
4
|
-
import { hierarchyNow } from "
|
|
5
|
-
import { Workspace } from "
|
|
2
|
+
import { PURPOSE_UNIT_ID, REVIEW_SCOPE, REVIEW_SCOPE_RECORDS_ONLY, } from "../shared/milestoneReview.js";
|
|
3
|
+
import { qualitySnapshot } from "../../quality/shared/quality.js";
|
|
4
|
+
import { hierarchyNow } from "../../../core/requestStatus.js";
|
|
5
|
+
import { Workspace } from "../../../core/store/workspace.js";
|
|
6
6
|
import { reviewCode } from "./code.js";
|
|
7
7
|
/**
|
|
8
8
|
* マイルストーンレビューの比較材料を取り出す。リリースノートの材料(releaseNotes/material.ts)とは別の規則で、あちらの収録の
|
|
@@ -23,8 +23,7 @@ import { reviewCode } from "./code.js";
|
|
|
23
23
|
*/
|
|
24
24
|
export async function extractReviewInput(dataDir, mid, refs = []) {
|
|
25
25
|
const extractedAt = new Date().toISOString();
|
|
26
|
-
const snap =
|
|
27
|
-
await snap.load();
|
|
26
|
+
const snap = await Workspace.snapshot(dataDir);
|
|
28
27
|
const records = reviewInputOf(snap, mid, extractedAt);
|
|
29
28
|
const { code, warnings } = await reviewCode(refs, records.requests, dataDir);
|
|
30
29
|
return withCode(records, code, warnings);
|
|
@@ -2,8 +2,8 @@ import { spawnSync } from "node:child_process";
|
|
|
2
2
|
import { existsSync } from "node:fs";
|
|
3
3
|
import { isAbsolute, join, normalize } from "node:path";
|
|
4
4
|
import { CONTAINER_WORKSPACE } from "@infodb/codex-workspace";
|
|
5
|
-
import { QUALITY_VERDICTS } from "../../shared/taskReview.js";
|
|
6
|
-
import { REVIEW_VERDICTS, } from "
|
|
5
|
+
import { QUALITY_VERDICTS } from "../../taskReview/shared/taskReview.js";
|
|
6
|
+
import { REVIEW_VERDICTS, } from "../shared/milestoneReview.js";
|
|
7
7
|
/**
|
|
8
8
|
* レビューの依頼文と、結果の確かめ方(Codex にもテストの偽物にも同じものを使う)。
|
|
9
9
|
*
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { currentOwner } from "../preflight/owner.js";
|
|
4
|
-
import { ReviewCancelRefused, RunControl, startedNow } from "../reviewRuns.js";
|
|
1
|
+
import { currentOwner } from "../../../core/preflight/owner.js";
|
|
2
|
+
import { classifyAiFailure, pickReviewer, ReviewCancelRefused, ReviewRunner, startedNow } from "../../../core/reviewRuns.js";
|
|
5
3
|
import { extractReviewInput } from "./material.js";
|
|
6
4
|
import { InvalidReview, parseReview, REVIEW_INPUT_LIMIT, reviewPrompt } from "./review.js";
|
|
7
5
|
import { checkReviewMilestoneId, newReviewRunId } from "./store.js";
|
|
@@ -38,21 +36,17 @@ export class MilestoneReviewService {
|
|
|
38
36
|
ws;
|
|
39
37
|
reviewers;
|
|
40
38
|
opts;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
control;
|
|
39
|
+
/** 実行の骨組み(二重の開始・時間切れ・取消・回復・遅れた結果の拒否)は reviewRuns.ts の ReviewRunner(タスクの AI レビューと共通) */
|
|
40
|
+
runner;
|
|
44
41
|
constructor(ws, reviewers, opts = {}) {
|
|
45
42
|
this.ws = ws;
|
|
46
43
|
this.reviewers = reviewers;
|
|
47
44
|
this.opts = opts;
|
|
48
|
-
this.
|
|
45
|
+
this.runner = new ReviewRunner(ws.milestoneReviews, { timeoutMs: opts.timeoutMs ?? REVIEW_TIMEOUT_MS, probe: opts.probe, pollMs: opts.pollMs, emit: (r) => this.emit(r) });
|
|
49
46
|
}
|
|
50
47
|
get store() {
|
|
51
48
|
return this.ws.milestoneReviews;
|
|
52
49
|
}
|
|
53
|
-
ownerOf(r) {
|
|
54
|
-
return this.control.ownerOf(r);
|
|
55
|
-
}
|
|
56
50
|
/** 始める(終わるのは wait で待つ)。材料はここで固定する */
|
|
57
51
|
async start(mid, actor, engine, opts = {}) {
|
|
58
52
|
checkReviewMilestoneId(mid);
|
|
@@ -71,8 +65,7 @@ export class MilestoneReviewService {
|
|
|
71
65
|
if (size > REVIEW_INPUT_LIMIT) {
|
|
72
66
|
throw new ReviewRejected("too_large", `材料が上限を超えています(${size} 文字 / 上限 ${REVIEW_INPUT_LIMIT} 文字)。切り詰めずに断ります。マイルストーンを分けるか、要望の本文を整理してください`);
|
|
73
67
|
}
|
|
74
|
-
const name
|
|
75
|
-
const reviewer = this.reviewers[name];
|
|
68
|
+
const { name, reviewer } = await pickReviewer(this.reviewers, engine, this.opts.engine);
|
|
76
69
|
if (!reviewer)
|
|
77
70
|
throw new ReviewRejected("unavailable", `レビューを頼む先(${name})がありません`);
|
|
78
71
|
const run = {
|
|
@@ -86,93 +79,53 @@ export class MilestoneReviewService {
|
|
|
86
79
|
inputHash: input.hash,
|
|
87
80
|
log: [],
|
|
88
81
|
};
|
|
89
|
-
await this.
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
? `。実行しているプロセスを確かめられません(${o.reason})。止まっていると確かめたら p3 milestone review-cancel ${mid} ${r.id} --acknowledge-stopped で中断できます`
|
|
95
|
-
: "。終わるのを待つか取り消してください";
|
|
96
|
-
throw new ReviewRejected("running", `${mid} のレビューは実行中です(${r.id})${hint}`, r.id);
|
|
97
|
-
}
|
|
98
|
-
await this.store.create(input, run);
|
|
82
|
+
await this.runner.begin(mid, () => this.store.create(input, run), ({ run: r, owner: o }) => {
|
|
83
|
+
const hint = o.state === "unknown"
|
|
84
|
+
? `。実行しているプロセスを確かめられません(${o.reason})。止まっていると確かめたら p3 milestone review-cancel ${mid} ${r.id} --acknowledge-stopped で中断できます`
|
|
85
|
+
: "。終わるのを待つか取り消してください";
|
|
86
|
+
return new ReviewRejected("running", `${mid} のレビューは実行中です(${r.id})${hint}`, r.id);
|
|
99
87
|
});
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
this.
|
|
104
|
-
job.done = this.execute(run, input, { instructions, prompt, refs }, reviewer, abort).finally(() => this.local.delete(run.id));
|
|
105
|
-
return run;
|
|
106
|
-
}
|
|
107
|
-
emit(r) {
|
|
108
|
-
this.ws.emit({ type: "milestone-review", id: r.id, milestone: r.milestone, status: r.status });
|
|
109
|
-
}
|
|
110
|
-
async execute(run, input, ask, reviewer, abort) {
|
|
111
|
-
const { milestone: mid, id } = run;
|
|
112
|
-
const log = [];
|
|
113
|
-
const push = (e) => log.push({ at: new Date().toISOString(), ...e });
|
|
114
|
-
const timeoutMs = this.opts.timeoutMs ?? REVIEW_TIMEOUT_MS;
|
|
115
|
-
const timeout = AbortSignal.timeout(timeoutMs);
|
|
116
|
-
const signal = AbortSignal.any([abort.signal, timeout]);
|
|
117
|
-
// ほかのプロセスからの取消の要求を見つけ、ログを run.json に書き足す
|
|
118
|
-
const stopWatch = this.control.watch(mid, id, log, abort, this.opts.pollMs ?? 1000);
|
|
119
|
-
let end;
|
|
120
|
-
let result;
|
|
121
|
-
try {
|
|
122
|
-
const code = (input.code ?? []).filter((c) => c.status === "ok");
|
|
88
|
+
const code = (input.code ?? []).filter((c) => c.status === "ok");
|
|
89
|
+
// マウントするのは、材料を取り出したときに読めた参照先だけ
|
|
90
|
+
const readable = refs.filter((r) => r.status === "ok" && r.local && code.some((c) => c.name === r.name));
|
|
91
|
+
this.runner.launch(mid, run, async (push, signal) => {
|
|
123
92
|
push({
|
|
124
93
|
kind: "info",
|
|
125
94
|
text: `材料: 比較単位 ${input.units.length} 件・要望 ${input.requests.length} 件・タスク ${input.requests.reduce((n, r) => n + r.tasks.length, 0)} 件・参照先 ${code.length ? code.map((c) => `${c.name}${c.head ? `@${c.head.slice(0, 7)}` : ""}`).join(", ") : "なし(記録だけの点検)"}`,
|
|
126
95
|
});
|
|
127
|
-
|
|
128
|
-
const readable = ask.refs.filter((r) => r.status === "ok" && r.local && code.some((c) => c.name === r.name));
|
|
129
|
-
const r = await reviewer.ask({ instructions: ask.instructions, prompt: ask.prompt, refs: readable, label: "マイルストーンのレビュー" }, push, signal);
|
|
96
|
+
const r = await reviewer.ask({ instructions, prompt, refs: readable, label: "マイルストーンのレビュー" }, push, signal);
|
|
130
97
|
if (signal.aborted)
|
|
131
98
|
throw signal.reason;
|
|
132
99
|
const locals = Object.fromEntries(readable.map((x) => [x.name, x.local]));
|
|
133
|
-
result
|
|
134
|
-
|
|
135
|
-
}
|
|
136
|
-
catch (e) {
|
|
137
|
-
if (abort.signal.aborted)
|
|
138
|
-
end = { status: "cancelled", error: "取り消しました" };
|
|
139
|
-
else if (timeout.aborted)
|
|
140
|
-
end = { status: "failed", failure: "timeout", error: `時間切れです(${Math.round(timeoutMs / 1000)} 秒)` };
|
|
141
|
-
else {
|
|
142
|
-
const [failure, error] = classify(e);
|
|
143
|
-
end = { status: "failed", failure, error };
|
|
144
|
-
}
|
|
145
|
-
push({ kind: "error", text: end.error });
|
|
146
|
-
}
|
|
147
|
-
finally {
|
|
148
|
-
stopWatch();
|
|
149
|
-
}
|
|
100
|
+
return { result: parseReview(r.message, input, r.model, locals) };
|
|
101
|
+
}, (e) => classifyAiFailure(e, (x) => x instanceof InvalidReview),
|
|
150
102
|
// 実行中に材料が変わったか(要望・タスク・コード・品質基準)。結果は始めたときの材料に対するもの
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
103
|
+
async (end, push) => {
|
|
104
|
+
if (end.status !== "completed")
|
|
105
|
+
return end;
|
|
106
|
+
const now = await extractReviewInput(this.ws.dataDir, mid, refs).catch(() => undefined);
|
|
107
|
+
if (!now || now.hash === input.hash)
|
|
108
|
+
return end;
|
|
109
|
+
push({ kind: "info", text: "実行中に材料が変わりました(結果は始めたときの材料に対するものです)" });
|
|
110
|
+
return { ...end, inputChanged: true };
|
|
111
|
+
});
|
|
112
|
+
return run;
|
|
113
|
+
}
|
|
114
|
+
emit(r) {
|
|
115
|
+
this.ws.emit({ type: "milestone-review", id: r.id, milestone: r.milestone, status: r.status });
|
|
160
116
|
}
|
|
161
117
|
/** 死んだ所有者の run を回復する(一覧・取得の前に) */
|
|
162
118
|
async recover(mid) {
|
|
163
119
|
checkReviewMilestoneId(mid);
|
|
164
|
-
|
|
165
|
-
return;
|
|
166
|
-
await this.store.withLock(mid, () => this.control.recoverLocked(mid));
|
|
120
|
+
await this.runner.recover(mid);
|
|
167
121
|
}
|
|
168
122
|
async list(mid) {
|
|
169
123
|
await this.recover(mid);
|
|
170
124
|
return this.store.list(mid);
|
|
171
125
|
}
|
|
172
126
|
async get(mid, run) {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
return { ...rec, ...(rec.run.status === "running" ? { owner: this.ownerOf(rec.run) } : {}) };
|
|
127
|
+
checkReviewMilestoneId(mid);
|
|
128
|
+
return this.runner.get(mid, run);
|
|
176
129
|
}
|
|
177
130
|
/**
|
|
178
131
|
* 取り消す。このプロセスの run は止め、ほかのプロセスの run は要求を書く(所有者が見つけて止める)。
|
|
@@ -181,34 +134,19 @@ export class MilestoneReviewService {
|
|
|
181
134
|
*/
|
|
182
135
|
async cancel(mid, run, by, opts = {}) {
|
|
183
136
|
checkReviewMilestoneId(mid);
|
|
184
|
-
|
|
185
|
-
return this.control.cancel(mid, run, by, { ...opts, label: `${mid}/${run}`, abortLocal: () => local?.abort.abort(new Error("cancelled")) });
|
|
137
|
+
return this.runner.cancel(mid, run, by, opts);
|
|
186
138
|
}
|
|
187
139
|
/** 終わるまで待つ(このプロセスの run だけ) */
|
|
188
140
|
async wait(mid, run) {
|
|
189
|
-
await this.
|
|
141
|
+
await this.runner.waitLocal(run);
|
|
190
142
|
return this.get(mid, run);
|
|
191
143
|
}
|
|
192
144
|
/** このプロセスで実行中の数 */
|
|
193
145
|
running() {
|
|
194
|
-
return this.
|
|
146
|
+
return this.runner.running();
|
|
195
147
|
}
|
|
196
148
|
/** このプロセスの実行が全部終わるまで待つ(cancel: 先に全部を取り消す) */
|
|
197
149
|
async settle(opts = {}) {
|
|
198
|
-
|
|
199
|
-
if (opts.cancel)
|
|
200
|
-
for (const j of jobs)
|
|
201
|
-
j.abort.abort(new Error("cancelled"));
|
|
202
|
-
await Promise.allSettled(jobs.map((j) => j.done));
|
|
150
|
+
await this.runner.settle(opts);
|
|
203
151
|
}
|
|
204
152
|
}
|
|
205
|
-
function classify(e) {
|
|
206
|
-
const msg = e?.message ?? String(e);
|
|
207
|
-
if (e instanceof CodexUnavailableError || e instanceof ChatGptAuthError)
|
|
208
|
-
return ["unavailable", msg];
|
|
209
|
-
if (e instanceof CodexUsageLimitError)
|
|
210
|
-
return ["usage_limit", msg];
|
|
211
|
-
if (e instanceof InvalidReview)
|
|
212
|
-
return ["invalid_output", msg];
|
|
213
|
-
return ["error", msg];
|
|
214
|
-
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
2
|
import { mkdir } from "node:fs/promises";
|
|
3
3
|
import { join, resolve, sep } from "node:path";
|
|
4
|
-
import { REVIEW_STATUSES, REVIEW_VERDICTS, } from "
|
|
5
|
-
import { dirs, finishRunFile, readJson, ReviewStoreError, runStamp, updateRunFile, writeJson } from "
|
|
6
|
-
import { withFileLock } from "
|
|
4
|
+
import { REVIEW_STATUSES, REVIEW_VERDICTS, } from "../shared/milestoneReview.js";
|
|
5
|
+
import { dirs, finishRunFile, readJson, ReviewStoreError, runStamp, updateRunFile, writeJson } from "../../../core/reviewRuns.js";
|
|
6
|
+
import { withFileLock } from "../../../../kit/fsutil.js";
|
|
7
7
|
export { ReviewStoreError };
|
|
8
8
|
/**
|
|
9
9
|
* マイルストーンレビューの履歴。
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { apiError } from "../../../core/errorOutcome.js";
|
|
1
2
|
import { Hono } from "hono";
|
|
2
3
|
import { z } from "zod";
|
|
3
|
-
import { extractReviewInput } from "
|
|
4
|
-
import {
|
|
5
|
-
import { checkReviewMilestoneId, ReviewStoreError } from "../../core/milestoneReview/store.js";
|
|
4
|
+
import { extractReviewInput } from "../core/material.js";
|
|
5
|
+
import { checkReviewMilestoneId } from "../core/store.js";
|
|
6
6
|
/**
|
|
7
7
|
* マイルストーンレビュー(画面のため)。規則と保存は core/milestoneReview(CLI の p3 milestone review と同じ)。
|
|
8
8
|
*
|
|
@@ -18,19 +18,13 @@ const actorOf = (c) => c.req.header("x-p3-actor") ?? "human:web";
|
|
|
18
18
|
export function milestoneReviewRoutes(ctx) {
|
|
19
19
|
const app = new Hono();
|
|
20
20
|
const svc = () => ctx.milestoneReview;
|
|
21
|
+
// エラーの状態と code は core/errorOutcome.ts の表
|
|
21
22
|
app.onError((err, c) => {
|
|
22
|
-
if (err instanceof ReviewStoreError) {
|
|
23
|
-
const status = err.code === "not_found" ? 404 : err.code === "bad_id" ? 400 : err.code === "broken" ? 422 : 409;
|
|
24
|
-
return c.json({ error: err.message, code: err.code }, status);
|
|
25
|
-
}
|
|
26
|
-
if (err instanceof ReviewRejected) {
|
|
27
|
-
const status = err.code === "running" || err.code === "material_changed" ? 409 : err.code === "unknown_milestone" ? 404 : 400;
|
|
28
|
-
return c.json({ error: err.message, code: err.code, ...(err.running ? { run: err.running } : {}) }, status);
|
|
29
|
-
}
|
|
30
|
-
if (err instanceof ReviewCancelRefused)
|
|
31
|
-
return c.json({ error: err.message, code: err.code }, 409);
|
|
32
23
|
if (err instanceof z.ZodError)
|
|
33
24
|
return c.json({ error: "invalid input", issues: err.issues }, 400);
|
|
25
|
+
const r = apiError(err);
|
|
26
|
+
if (r)
|
|
27
|
+
return c.json(r.body, r.status);
|
|
34
28
|
console.error(err);
|
|
35
29
|
return c.json({ error: err.message }, 400);
|
|
36
30
|
});
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { qualityTemplate, qualityView, updateQuality } from "../core/quality.js";
|
|
2
2
|
import { checkLine } from "../shared/quality.js";
|
|
3
3
|
import { diagnoseQuality, improvementDraft, registerImprovement } from "../core/qualityImprovement.js";
|
|
4
|
-
import { readBody } from "
|
|
5
|
-
import { table } from "
|
|
6
|
-
import { UsageError } from "
|
|
4
|
+
import { readBody } from "../../../cli/args.js";
|
|
5
|
+
import { table } from "../../../cli/format.js";
|
|
6
|
+
import { UsageError } from "../../../../kit/usage.js";
|
|
7
7
|
/**
|
|
8
8
|
* 品質基準(core/quality.ts。画面の設定の「品質基準」と同じ)。
|
|
9
9
|
* quality 今の設定(未設定・設定済み・読めない)とテンプレートの改版の差分
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { createHash, randomBytes } from "node:crypto";
|
|
2
|
-
import { readFile } from "node:fs/promises";
|
|
3
2
|
import { join } from "node:path";
|
|
4
3
|
import { checkLine } from "../shared/quality.js";
|
|
5
|
-
import { createRequest } from "
|
|
6
|
-
import { withFileLock
|
|
4
|
+
import { createRequest } from "../../../core/requestOps.js";
|
|
5
|
+
import { withFileLock } from "../../../../kit/fsutil.js";
|
|
6
|
+
import { readJsonRecord, writeJsonRecord } from "../../../core/store/jsonRecord.js";
|
|
7
7
|
/**
|
|
8
8
|
* 品質の不足から改善要望を作る(CLI の p3 quality improve・API の /quality/improvements)。
|
|
9
9
|
*
|
|
@@ -150,19 +150,20 @@ export function improvementDraft(d, keys) {
|
|
|
150
150
|
}
|
|
151
151
|
const ledgerPath = (dataDir) => join(dataDir, "quality-improvements.json");
|
|
152
152
|
export const tokenTag = (token) => `quality-improvement:${token}`;
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
153
|
+
/** 登録の記録を読む。無い・読めない(readFile の失敗)・空のファイル・形が違うものは空とみなし、JSON として読めなければ断る(今の扱い。docs/refactoring.md) */
|
|
154
|
+
function readLedger(dataDir) {
|
|
155
|
+
const empty = () => ({ version: 1, entries: {} });
|
|
156
|
+
return readJsonRecord(ledgerPath(dataDir), {
|
|
157
|
+
missing: empty,
|
|
158
|
+
readFailed: empty,
|
|
159
|
+
blank: empty,
|
|
160
|
+
invalidJson: () => {
|
|
161
|
+
throw new ImprovementError("invalid", `quality-improvements.json が読めません(${ledgerPath(dataDir)})。直すか退けてからやり直してください`);
|
|
162
|
+
},
|
|
163
|
+
shape: (v) => (v && typeof v.entries === "object" ? v : empty()),
|
|
164
|
+
});
|
|
164
165
|
}
|
|
165
|
-
const writeLedger = (dataDir, l) =>
|
|
166
|
+
const writeLedger = (dataDir, l) => writeJsonRecord(ledgerPath(dataDir), l);
|
|
166
167
|
const CLOSED = ["done", "rejected"];
|
|
167
168
|
/**
|
|
168
169
|
* 明示して登録する。hash は原稿を作った診断の版。reopenClosed: 閉じた要望が登録先の不足から作り直す。
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { REVIEW_CODE_LABEL, REVIEW_STATE_HINT, REVIEW_STATE_LABEL } from "../shared/reviewCandidate.js";
|
|
2
|
-
import { recordPremise } from "
|
|
2
|
+
import { recordPremise } from "../../../core/requestOps.js";
|
|
3
3
|
import { reviewCandidates } from "../core/reviewCandidates.js";
|
|
4
|
-
import { UsageError } from "
|
|
4
|
+
import { UsageError } from "../../../../kit/usage.js";
|
|
5
5
|
/**
|
|
6
6
|
* 見直しが必要(候補)と前提の変更のコマンド(規則は shared/reviewCandidate.ts)。
|
|
7
7
|
*
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { diagnoseRequest, diagnoseTask, isReviewTarget, reviewSummary } from "../shared/reviewCandidate.js";
|
|
2
|
-
import { hierarchyNow } from "
|
|
2
|
+
import { hierarchyNow } from "../../../core/requestStatus.js";
|
|
3
3
|
/**
|
|
4
4
|
* 見直し候補の読み取り(規則は shared/reviewCandidate.ts)。読み込んだ値だけで診断し、ファイルは書かない・git も実行しない。
|
|
5
5
|
* アーカイブした要望・タスクは見ない
|
|
@@ -14,13 +14,33 @@ export function requestSelfReview(ctx, r) {
|
|
|
14
14
|
return diagnoseRequest(r, nowOf(ctx));
|
|
15
15
|
}
|
|
16
16
|
const isCandidate = (d) => d?.state === "candidate";
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const
|
|
20
|
-
const
|
|
17
|
+
export function reviewMemo(ctx) {
|
|
18
|
+
const now = nowOf(ctx);
|
|
19
|
+
const tasks = new Map();
|
|
20
|
+
const requests = new Map();
|
|
21
|
+
return {
|
|
22
|
+
task: (t) => {
|
|
23
|
+
if (!tasks.has(t.ref))
|
|
24
|
+
tasks.set(t.ref, diagnoseTask(t, ctx.ws.requests.get(t.request), now));
|
|
25
|
+
return tasks.get(t.ref);
|
|
26
|
+
},
|
|
27
|
+
request: (r) => {
|
|
28
|
+
if (!requests.has(r.id))
|
|
29
|
+
requests.set(r.id, diagnoseRequest(r, now));
|
|
30
|
+
return requests.get(r.id);
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* 要望の概要(自身・自分のタスク・自分を除く配下)。配下は子孫の要望自身とそのタスクを1回ずつ数える。
|
|
36
|
+
* memo を渡すと診断を使い回す(進捗は全部の要望で1つの memo を使う)
|
|
37
|
+
*/
|
|
38
|
+
export function requestReviewCounts(ctx, r, h = hierarchyNow(ctx.ws), memo = reviewMemo(ctx)) {
|
|
39
|
+
const self = memo.request(r);
|
|
40
|
+
const tasksOf = (id) => ctx.ws.tasksOf(id).list().filter((t) => isCandidate(memo.task(t))).length;
|
|
21
41
|
let below = 0;
|
|
22
42
|
for (const d of h.descendants(r.id))
|
|
23
|
-
below += tasksOf(d.id) + (isCandidate(
|
|
43
|
+
below += tasksOf(d.id) + (isCandidate(memo.request(d)) ? 1 : 0);
|
|
24
44
|
return { ...(self ? { self: reviewSummary(self) } : {}), tasks: tasksOf(r.id), below };
|
|
25
45
|
}
|
|
26
46
|
/** 要望の詳細に添える診断(自身・タスクごとの概要・配下の件数) */
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { readAcceptance } from "
|
|
2
|
-
import { qualityPlain, readQuality, standardsFor } from "
|
|
3
|
-
import { readRequirement, requestSubject } from "
|
|
1
|
+
import { readAcceptance } from "../../requirements/shared/acceptance.js";
|
|
2
|
+
import { qualityPlain, readQuality, standardsFor } from "../../quality/shared/quality.js";
|
|
3
|
+
import { readRequirement, requestSubject } from "../../requirements/shared/requirementSource.js";
|
|
4
4
|
/**
|
|
5
5
|
* 完了の記録(完了・人の済み・対応済・完了済にしたときの条件の写し)の規則。CLI・API・画面で同じものを使う
|
|
6
6
|
* (保存は core/requestOps.ts の createTask / updateTask / updateRequest がこれで作る)。
|
|
@@ -220,6 +220,8 @@ export function nextCompletionId(list) {
|
|
|
220
220
|
return `C${max + 1}`;
|
|
221
221
|
}
|
|
222
222
|
/** 最新の記録(無ければ undefined) */
|
|
223
|
+
/** 契機ごとの最初の記録(開発の指標の到達の時点など。無ければ undefined) */
|
|
224
|
+
export const firstCompletion = (records, trigger) => (records ?? []).find((c) => c.trigger === trigger);
|
|
223
225
|
export const latestCompletion = (list) => list?.at(-1);
|
|
224
226
|
/**
|
|
225
227
|
* タスクの書く前(prev。作るときは無い)と書いた後(next)から、足す記録の契機を決める。
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { latestCompletion } from "./completionRecord.js";
|
|
2
|
-
import { checkLine, standardHash, standardsFor } from "
|
|
3
|
-
import { criterionSubject, requestSubject, sourceState } from "
|
|
2
|
+
import { checkLine, standardHash, standardsFor } from "../../quality/shared/quality.js";
|
|
3
|
+
import { criterionSubject, requestSubject, sourceState } from "../../requirements/shared/requirementSource.js";
|
|
4
4
|
export const REVIEW_STATE_LABEL = {
|
|
5
5
|
no_record: "記録なし",
|
|
6
6
|
unreadable: "比較不能",
|
|
@@ -141,7 +141,12 @@ const short = (s, n = 200) => (s === undefined ? undefined : s.length > n ? `${s
|
|
|
141
141
|
const stdLine = (s) => `${s.text}(${checkLine(s.check)})${s.repos?.length ? `(対象: ${s.repos.join(", ")})` : ""}${s.exempt ? `(除外: ${s.exempt.reason})` : ""}`;
|
|
142
142
|
const sourceLine = (s) => [s.target, s.source, s.basis].filter(Boolean).join(" / ");
|
|
143
143
|
const sourceKey = (s) => JSON.stringify([s.target ?? "", s.source ?? "", s.basis ?? ""]);
|
|
144
|
-
|
|
144
|
+
/**
|
|
145
|
+
* 品質の理由。subject は診断の対象: タスク(task。作業先 repo に当てはまる項目を比べる)か要望自身(request。状態だけを比べる)。
|
|
146
|
+
* 要望の記録は品質の項目を写さないので、要望自身は「設定済 → 未設定・読めない」の変化だけを理由にし、未設定 → 設定(初回設定)では
|
|
147
|
+
* 候補にしない(後から品質基準を導入しただけで、過去の要望が一括して候補になるのを避ける)。タスクは未設定の記録でも項目なしとして比べる
|
|
148
|
+
*/
|
|
149
|
+
function qualityReasons(rec, now, subject, out, unreadable) {
|
|
145
150
|
const q = rec.quality;
|
|
146
151
|
const st = now ?? { state: "unset" };
|
|
147
152
|
if (q.state === "invalid") {
|
|
@@ -157,13 +162,13 @@ function qualityReasons(rec, now, repo, out, unreadable) {
|
|
|
157
162
|
out.push({ code: "quality_state", target: "quality", was: "設定済", now: "未設定" });
|
|
158
163
|
return;
|
|
159
164
|
}
|
|
160
|
-
//
|
|
161
|
-
if (
|
|
165
|
+
// 要望自身は項目を比べない(状態だけ)。未設定 → 設定も候補にしない
|
|
166
|
+
if (subject.kind === "request")
|
|
162
167
|
return;
|
|
163
168
|
if (st.state !== "set")
|
|
164
169
|
return;
|
|
165
170
|
const then = q.standards ?? [];
|
|
166
|
-
const { applies, exempt } = standardsFor(st.config, repo);
|
|
171
|
+
const { applies, exempt } = standardsFor(st.config, subject.repo);
|
|
167
172
|
for (const s of applies) {
|
|
168
173
|
const was = then.find((x) => x.id === s.id);
|
|
169
174
|
if (!was || was.exempt)
|
|
@@ -231,7 +236,7 @@ export function diagnoseTask(task, request, now) {
|
|
|
231
236
|
return { target: task.ref, state: "no_record", reasons: [] };
|
|
232
237
|
const reasons = [];
|
|
233
238
|
const unreadable = [];
|
|
234
|
-
qualityReasons(rec, now.quality, task.repo, reasons, unreadable);
|
|
239
|
+
qualityReasons(rec, now.quality, { kind: "task", repo: task.repo }, reasons, unreadable);
|
|
235
240
|
// 基準
|
|
236
241
|
if (rec.acceptance?.problems)
|
|
237
242
|
unreadable.push("完了したときの受け入れ基準が読めなかったため、基準は比べられません");
|
|
@@ -290,7 +295,7 @@ export function diagnoseRequest(request, now) {
|
|
|
290
295
|
return { target: request.id, state: "no_record", reasons: [] };
|
|
291
296
|
const reasons = [];
|
|
292
297
|
const unreadable = [];
|
|
293
|
-
qualityReasons(rec, now.quality,
|
|
298
|
+
qualityReasons(rec, now.quality, { kind: "request" }, reasons, unreadable);
|
|
294
299
|
if (rec.requirement?.problems)
|
|
295
300
|
unreadable.push("完了したときの要望の根拠が読めなかったため、根拠は比べられません");
|
|
296
301
|
else if (request.requirementProblems?.length)
|
|
@@ -27,6 +27,11 @@ function readState(v) {
|
|
|
27
27
|
return undefined;
|
|
28
28
|
return { status: o.status, checked: o.checked };
|
|
29
29
|
}
|
|
30
|
+
/** 1 つの更新(rev)に 1 件として数える履歴(直接編集で同じ rev が重なっても 1 件。開発の指標) */
|
|
31
|
+
export function reworkPerRev(list) {
|
|
32
|
+
const seen = new Set();
|
|
33
|
+
return (list ?? []).filter((e) => !seen.has(e.rev) && seen.add(e.rev));
|
|
34
|
+
}
|
|
30
35
|
/** frontmatter の reworkHistory を読む(無ければ何も足さない。古いタスクは移行しない) */
|
|
31
36
|
export function readRework(d) {
|
|
32
37
|
if (d.reworkHistory === undefined || d.reworkHistory === null)
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { readFile } from "node:fs/promises";
|
|
2
2
|
import { resolve as resolvePath } from "node:path";
|
|
3
|
-
import { exportReleaseNote, releaseNoteDetail, releaseOverview, saveReleaseNote, startGeneration } from "../core/
|
|
4
|
-
import { readBody } from "
|
|
5
|
-
import { table } from "
|
|
6
|
-
import { UsageError } from "
|
|
7
|
-
import { shellArg } from "
|
|
8
|
-
import { GenerationRejected } from "../core/
|
|
9
|
-
import { completeMilestoneRequests, CompletionRejected } from "../core/
|
|
3
|
+
import { exportReleaseNote, releaseNoteDetail, releaseOverview, saveReleaseNote, startGeneration } from "../core/service.js";
|
|
4
|
+
import { readBody } from "../../../cli/args.js";
|
|
5
|
+
import { table } from "../../../cli/format.js";
|
|
6
|
+
import { UsageError } from "../../../../kit/usage.js";
|
|
7
|
+
import { shellArg } from "../../../cli/output.js";
|
|
8
|
+
import { GenerationRejected } from "../core/generate.js";
|
|
9
|
+
import { completeMilestoneRequests, CompletionRejected } from "../core/completeRequests.js";
|
|
10
10
|
/**
|
|
11
11
|
* p3 release-notes ... マイルストーンごとのリリースノート(規則と保存は core/releaseNotes)
|
|
12
12
|
*
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { updateRequest } from "
|
|
2
|
-
import { hierarchyNow, resolveBlocker } from "
|
|
3
|
-
import { ConflictError } from "
|
|
4
|
-
import { Workspace } from "
|
|
1
|
+
import { updateRequest } from "../../../core/requestOps.js";
|
|
2
|
+
import { hierarchyNow, resolveBlocker } from "../../../core/requestStatus.js";
|
|
3
|
+
import { ConflictError } from "../../../core/store/collection.js";
|
|
4
|
+
import { Workspace } from "../../../core/store/workspace.js";
|
|
5
5
|
import { materialOf } from "./material.js";
|
|
6
6
|
import { checkMilestoneId, ReleaseNoteError } from "./store.js";
|
|
7
7
|
/**
|
|
@@ -96,8 +96,7 @@ export async function completeMilestoneRequests(ctx, mid, basedOn, actor) {
|
|
|
96
96
|
/** ディスクから読み直した状態で、材料と判定を作る。project.yaml に無く、ノートも無いマイルストーンは not_found */
|
|
97
97
|
async function snapshot(ctx, mid) {
|
|
98
98
|
checkMilestoneId(mid);
|
|
99
|
-
const snap =
|
|
100
|
-
await snap.load();
|
|
99
|
+
const snap = await Workspace.snapshot(ctx.ws.dataDir);
|
|
101
100
|
const material = materialOf(snap, mid);
|
|
102
101
|
if (!material.milestone.known && !(await ctx.ws.releaseNotes.ids()).includes(mid)) {
|
|
103
102
|
throw new ReleaseNoteError("not_found", mid, `マイルストーンがありません: ${mid}`);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
|
-
import {
|
|
3
|
-
import { ChatGptAuthError } from "../chatgpt.js";
|
|
2
|
+
import { classifyAiFailure, pickReviewer } from "../../../core/reviewRuns.js";
|
|
4
3
|
import { extractMaterial } from "./material.js";
|
|
5
4
|
/**
|
|
6
5
|
* リリースノートの機能の要約を Codex に頼む。保存とは分ける(結果は案で、人が確かめてから保存する)。
|
|
@@ -50,8 +49,7 @@ export class ReleaseGenerator {
|
|
|
50
49
|
throw new GenerationRejected("running", `${mid} の要約は生成中です(終わるのを待つか取り消してください)`);
|
|
51
50
|
}
|
|
52
51
|
const input = summaryInput(material);
|
|
53
|
-
const name
|
|
54
|
-
const summarizer = this.summarizers[name];
|
|
52
|
+
const { name, reviewer: summarizer } = await pickReviewer(this.summarizers, engine, this.opts.engine);
|
|
55
53
|
if (!summarizer)
|
|
56
54
|
throw new GenerationRejected("unavailable", `要約を頼む先(${name})がありません`);
|
|
57
55
|
const job = {
|
|
@@ -151,16 +149,7 @@ export class ReleaseGenerator {
|
|
|
151
149
|
return job;
|
|
152
150
|
}
|
|
153
151
|
}
|
|
154
|
-
|
|
155
|
-
const msg = e?.message ?? String(e);
|
|
156
|
-
if (e instanceof CodexUnavailableError || e instanceof ChatGptAuthError)
|
|
157
|
-
return ["unavailable", msg];
|
|
158
|
-
if (e instanceof CodexUsageLimitError)
|
|
159
|
-
return ["usage_limit", msg];
|
|
160
|
-
if (e instanceof InvalidSummary)
|
|
161
|
-
return ["invalid_output", msg];
|
|
162
|
-
return ["error", msg];
|
|
163
|
-
}
|
|
152
|
+
const classify = (e) => classifyAiFailure(e, (x) => x instanceof InvalidSummary);
|
|
164
153
|
/** 結果が使えない(形が違う・出典が材料に無い・長すぎる) */
|
|
165
154
|
export class InvalidSummary extends Error {
|
|
166
155
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
-
import { completionCheckOf, hierarchyNow } from "
|
|
3
|
-
import { Workspace } from "
|
|
2
|
+
import { completionCheckOf, hierarchyNow } from "../../../core/requestStatus.js";
|
|
3
|
+
import { Workspace } from "../../../core/store/workspace.js";
|
|
4
4
|
/**
|
|
5
5
|
* マイルストーンのリリースノートの材料を取り出す。規則はここだけに置く(CLI・API・画面は結果を見せるだけ)。
|
|
6
6
|
*
|
|
@@ -18,8 +18,7 @@ import { Workspace } from "../store/workspace.js";
|
|
|
18
18
|
* 抽出のたびにディスクから読み直した別の Workspace を使い、その時点の状態を固定して返す(画面・CLI のキャッシュに左右されない)。
|
|
19
19
|
*/
|
|
20
20
|
export async function extractMaterial(dataDir, milestone) {
|
|
21
|
-
const snap =
|
|
22
|
-
await snap.load();
|
|
21
|
+
const snap = await Workspace.snapshot(dataDir);
|
|
23
22
|
return materialOf(snap, milestone);
|
|
24
23
|
}
|
|
25
24
|
const byId = (a, b) => a.localeCompare(b, undefined, { numeric: true });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { extractMaterial } from "./material.js";
|
|
2
2
|
import { checkMilestoneId, ReleaseNoteError } from "./store.js";
|
|
3
|
-
import { compareMilestoneIds, sortMilestones } from "
|
|
3
|
+
import { compareMilestoneIds, sortMilestones } from "../../../shared/milestoneOrder.js";
|
|
4
4
|
import { completionPlanOf } from "./completeRequests.js";
|
|
5
5
|
/**
|
|
6
6
|
* リリースノートの操作(CLI と API はここを呼ぶ)。材料の規則は material.ts、保存の形は store.ts。
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { readdir, readFile } from "node:fs/promises";
|
|
3
3
|
import { join, resolve, sep } from "node:path";
|
|
4
|
-
import { parseFrontmatter, stringifyFrontmatter } from "
|
|
5
|
-
import { createExclusive, nowIso, withFileLock, writeFileAtomic } from "
|
|
4
|
+
import { parseFrontmatter, stringifyFrontmatter } from "../../../../kit/frontmatter.js";
|
|
5
|
+
import { createExclusive, nowIso, withFileLock, writeFileAtomic } from "../../../../kit/fsutil.js";
|
|
6
6
|
/**
|
|
7
7
|
* <data>/release-notes/<マイルストーンID>.md リリースノート(マイルストーンごとに1件)
|
|
8
8
|
*
|