@infodb/p3 0.12.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 +33 -35
- package/bin/p3.mjs +3 -2
- package/dist/web/assets/CompletionReview-BD7d6Yzt.js +1 -0
- package/dist/web/assets/ImprovementDialog-BoAZN1KR.js +1 -0
- package/dist/web/assets/Outputs-D-ZouoxF.js +1 -0
- package/dist/web/assets/RequestStatus-Bl3fdSbM.js +1 -0
- package/dist/web/assets/Tabs-CxeceOL-.js +1 -0
- package/dist/web/assets/TagInput-CeAbmGRR.js +1 -0
- 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-BWYpm3PD.js +2 -0
- 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/outputs-CXqnjSqV.js +1 -0
- package/dist/web/assets/preflightInput-ClKwkp8R.js +2 -0
- package/dist/web/assets/preload-helper-_dAYMct_.js +1 -0
- package/dist/web/assets/{quality-Pu6EISAM.js → quality-RFd-7k3r.js} +1 -1
- package/dist/web/assets/release-notes-Dtif8xsQ.js +5 -0
- package/dist/web/assets/requestData-SPc36t8Q.js +1 -0
- 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-DavxMs-c.js +30 -0
- package/dist/web/index.html +6 -4
- package/docs/architecture.md +430 -72
- package/docs/chatgpt-sign-in.md +2 -2
- package/docs/development.md +141 -64
- package/docs/feature-inventory.md +139 -0
- package/docs/how-to-use.md +389 -31
- package/docs/installation.md +261 -147
- package/docs/publishing.md +33 -14
- package/docs/refactoring.md +332 -0
- package/lib/cli/agentsStatus.js +198 -0
- package/lib/cli/guide.js +27 -0
- package/lib/cli/guide.md +217 -0
- package/lib/cli/help.js +45 -7
- package/lib/cli/main.js +58 -207
- package/lib/cli/project.js +34 -294
- 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 +73 -9
- 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 +12 -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 +24 -7
- package/lib/tasks/cli/showView.js +279 -0
- package/lib/{cli → tasks/cli}/taskCommands.js +55 -21
- 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 +17 -2
- package/lib/{core → tasks/core}/preflight/carryover.js +5 -1
- package/lib/{core → tasks/core}/preflight/codexEngine.js +36 -28
- package/lib/{core → tasks/core}/preflight/diagnose.js +4 -9
- package/lib/{core → tasks/core}/preflight/engine.js +9 -0
- package/lib/tasks/core/preflight/hostPaths.js +299 -0
- package/lib/{core → tasks/core}/preflight/input.js +33 -5
- package/lib/{core → tasks/core}/preflight/instructions.js +19 -2
- package/lib/{core → tasks/core}/preflight/mockEngine.js +27 -8
- package/lib/{core → tasks/core}/preflight/render.js +22 -3
- package/lib/{core → tasks/core}/preflight/service.js +86 -11
- package/lib/{core → tasks/core}/preflight/uiRender.js +5 -2
- package/lib/{core → tasks/core}/requestOps.js +214 -17
- 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 +21 -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 +15 -10
- package/lib/{core → tasks/core}/store/noteStore.js +2 -2
- package/lib/{core → tasks/core}/store/preflightStore.js +59 -22
- package/lib/{core → tasks/core}/store/projectFile.js +1 -1
- package/lib/{core → tasks/core}/store/workspace.js +28 -6
- package/lib/{core → tasks/core}/userConfig.js +1 -1
- package/lib/{core → tasks/core}/workTargets.js +1 -1
- package/lib/tasks/features/metrics/cli/metricsCommands.js +77 -0
- package/lib/tasks/features/metrics/core/definitions.js +445 -0
- package/lib/tasks/features/metrics/core/index.js +112 -0
- package/lib/tasks/features/metrics/core/manual.js +179 -0
- package/lib/tasks/features/metrics/server/metricsRoutes.js +8 -0
- package/lib/tasks/features/metrics/shared/metrics.js +42 -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 +36 -11
- package/lib/{core → tasks/features/quality/core}/qualityImprovement.js +16 -15
- package/lib/tasks/features/records/cli/revisitCommands.js +73 -0
- package/lib/tasks/features/records/core/completionRefs.js +46 -0
- package/lib/tasks/features/records/core/reviewCandidates.js +76 -0
- package/lib/tasks/features/records/shared/completionRecord.js +329 -0
- package/lib/tasks/features/records/shared/reviewCandidate.js +313 -0
- package/lib/tasks/features/records/shared/reworkHistory.js +86 -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/tasks/features/requirements/cli/requirementCommands.js +289 -0
- package/lib/{shared → tasks/features/requirements/shared}/acceptance.js +292 -18
- package/lib/tasks/features/requirements/shared/requirementSource.js +635 -0
- package/lib/tasks/features/retro/cli/retroCommands.js +106 -0
- package/lib/tasks/features/retro/core/retrospective.js +197 -0
- package/lib/tasks/features/retro/shared/retrospective.js +286 -0
- package/lib/tasks/features/settings/cli/projectSettings.js +245 -0
- package/lib/{cli → tasks/features/settings/cli}/userConfig.js +50 -3
- 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 +13 -7
- package/lib/{core/taskReview → tasks/features/taskReview/core}/review.js +10 -3
- 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/manifest.js +51 -3
- package/lib/{server → tasks/server}/api/routes.js +134 -65
- package/lib/tasks/shared/commitRefs.js +10 -0
- package/lib/{shared → tasks/shared}/preflightInput.js +1 -1
- package/package.json +1 -43
- 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/cli/readOnly.js +0 -38
- package/lib/cli/showView.js +0 -166
- /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/codexImage.js +0 -0
- /package/lib/{core → tasks/core}/preflight/docker.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/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/{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/releaseNotes → tasks/features/releaseNotes/core}/mockSummarizer.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/{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}/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
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import { join } from "node:path";
|
|
2
|
+
import { MetricsError } from "../shared/metrics.js";
|
|
3
|
+
import { withFileLock } from "../../../../kit/fsutil.js";
|
|
4
|
+
import { readJsonRecord, writeJsonRecord } from "../../../core/store/jsonRecord.js";
|
|
5
|
+
import { METRIC_DEFINITIONS } from "./definitions.js";
|
|
6
|
+
/**
|
|
7
|
+
* 人が記録する指標の値(費用・リリース後の不具合など。記録から出せないもの)の保存。記録は CLI の p3 metrics record からだけ(API・画面は読むだけ)。
|
|
8
|
+
*
|
|
9
|
+
* <data>/metrics/manual.json {version: 1, seq, records: [...]}(プロジェクトのデータと一緒に共有する)
|
|
10
|
+
* <data>/metrics/.manual.lock 書くときのロック(同じマシンのプロセスの間)
|
|
11
|
+
*
|
|
12
|
+
* - 1件は 指標・範囲(project かマイルストーン ID)・観測期間(開始日・終了日)・単位 で決まる。同じ内容の再送は何も変えない。値・出典・メモを
|
|
13
|
+
* 変える訂正は、読んだ版(rev)を渡したときだけ(渡さない・違えば競合で何も書かない)。訂正の updatedBy はその訂正の主体で、主体が
|
|
14
|
+
* 分からない訂正では省く(前の更新者を残さない)。createdBy・createdAt は作ったときのまま
|
|
15
|
+
* - 値は0以上(不具合は整数)。費用は通貨コードごとで、通貨・期間の違う値を1つに合算しない。範囲の間(全体とマイルストーン)も合算しない
|
|
16
|
+
* - ロックの中で読み直してから書き、置き換えで書く(途中の状態を読ませない)。壊れたファイルは空とみなさず、読めないと知らせて書かない
|
|
17
|
+
* - 記録のあるマイルストーンは通常の削除で消さない(core/requestOps.ts の checkMilestoneRemoval)。直接編集で消えたら知らせる
|
|
18
|
+
*/
|
|
19
|
+
const DIR = "metrics";
|
|
20
|
+
const FILE = "manual.json";
|
|
21
|
+
const DATE = /^\d{4}-\d{2}-\d{2}$/;
|
|
22
|
+
const CURRENCY = /^[A-Z]{3}$/;
|
|
23
|
+
const SOURCE_MAX = 1000;
|
|
24
|
+
export const manualFile = (dataDir) => join(dataDir, DIR, FILE);
|
|
25
|
+
const lockFile = (dataDir) => join(dataDir, DIR, `.${FILE.replace(".json", "")}.lock`);
|
|
26
|
+
const validDate = (v) => DATE.test(v) && new Date(`${v}T00:00:00Z`).toISOString().slice(0, 10) === v;
|
|
27
|
+
function readRecord(raw, i) {
|
|
28
|
+
const o = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : undefined;
|
|
29
|
+
const at = `${i + 1} 件目`;
|
|
30
|
+
if (!o)
|
|
31
|
+
throw new Error(`${at} がオブジェクトではありません`);
|
|
32
|
+
const s = (k) => (typeof o[k] === "string" && o[k] ? o[k] : undefined);
|
|
33
|
+
const id = s("id");
|
|
34
|
+
if (!id || !/^M\d+$/.test(id))
|
|
35
|
+
throw new Error(`${at} の id が読めません(M1, M2, ...)`);
|
|
36
|
+
for (const k of ["metric", "scope", "from", "to", "unit", "source", "createdAt", "updatedAt"])
|
|
37
|
+
if (!s(k))
|
|
38
|
+
throw new Error(`${at}(${id})の ${k} がありません`);
|
|
39
|
+
if (typeof o.value !== "number" || !Number.isFinite(o.value) || o.value < 0)
|
|
40
|
+
throw new Error(`${at}(${id})の value が 0 以上の数ではありません`);
|
|
41
|
+
if (!Number.isInteger(o.rev) || o.rev < 1)
|
|
42
|
+
throw new Error(`${at}(${id})の rev が読めません`);
|
|
43
|
+
return {
|
|
44
|
+
id,
|
|
45
|
+
metric: s("metric"),
|
|
46
|
+
scope: s("scope"),
|
|
47
|
+
from: s("from"),
|
|
48
|
+
to: s("to"),
|
|
49
|
+
value: o.value,
|
|
50
|
+
unit: s("unit"),
|
|
51
|
+
source: s("source"),
|
|
52
|
+
...(s("note") ? { note: s("note") } : {}),
|
|
53
|
+
rev: o.rev,
|
|
54
|
+
createdAt: s("createdAt"),
|
|
55
|
+
...(s("createdBy") ? { createdBy: s("createdBy") } : {}),
|
|
56
|
+
updatedAt: s("updatedAt"),
|
|
57
|
+
...(s("updatedBy") ? { updatedBy: s("updatedBy") } : {}),
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
/** 記録を読む。無ければ空、壊れていれば problem(空とみなさない) */
|
|
61
|
+
export async function readManual(dataDir) {
|
|
62
|
+
const broken = (m) => ({ records: [], seq: 0, problem: `${DIR}/${FILE} が読めません(直してください。記録は書き足しません): ${m}` });
|
|
63
|
+
return readJsonRecord(manualFile(dataDir), {
|
|
64
|
+
missing: () => ({ records: [], seq: 0 }),
|
|
65
|
+
readFailed: (e) => ({ records: [], seq: 0, problem: `読めません: ${e.message}` }),
|
|
66
|
+
invalidJson: broken,
|
|
67
|
+
shape: (raw) => {
|
|
68
|
+
try {
|
|
69
|
+
const j = raw;
|
|
70
|
+
if (!j || typeof j !== "object" || j.version !== 1 || !Array.isArray(j.records))
|
|
71
|
+
throw new Error("{version: 1, records: [...]} の形ではありません");
|
|
72
|
+
const records = j.records.map(readRecord);
|
|
73
|
+
const seq = Math.max(Number.isInteger(j.seq) ? j.seq : 0, ...records.map((r) => Number(r.id.slice(1))));
|
|
74
|
+
return { records, seq };
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
return broken(e.message);
|
|
78
|
+
}
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
const manualSpec = (metric) => {
|
|
83
|
+
const d = METRIC_DEFINITIONS.find((x) => x.id === metric);
|
|
84
|
+
if (!d?.manual) {
|
|
85
|
+
const ids = METRIC_DEFINITIONS.filter((x) => x.manual).map((x) => x.id);
|
|
86
|
+
throw new MetricsError(`人が記録する指標ではありません: ${metric}(${ids.join(" / ")})`);
|
|
87
|
+
}
|
|
88
|
+
return d.manual;
|
|
89
|
+
};
|
|
90
|
+
/** 入力を確かめて、識別に使う値と保存する値にする(何も書かない) */
|
|
91
|
+
export function cleanManual(ctx, i) {
|
|
92
|
+
const spec = manualSpec(i.metric);
|
|
93
|
+
const scope = i.scope || "project";
|
|
94
|
+
if (scope !== "project" && !ctx.ws.project.milestones.some((m) => m.id === scope))
|
|
95
|
+
throw new MetricsError(`マイルストーン ${scope} は登録されていません(project か登録済みのマイルストーン ID)`);
|
|
96
|
+
if (!validDate(i.from) || !validDate(i.to))
|
|
97
|
+
throw new MetricsError(`観測期間は YYYY-MM-DD の日付で指定してください(--from ${i.from || "?"} --to ${i.to || "?"})`);
|
|
98
|
+
if (i.from > i.to)
|
|
99
|
+
throw new MetricsError(`観測期間の開始日 ${i.from} が終了日 ${i.to} より後です`);
|
|
100
|
+
const value = typeof i.value === "number" ? i.value : i.value.trim() === "" ? NaN : Number(i.value);
|
|
101
|
+
if (!Number.isFinite(value))
|
|
102
|
+
throw new MetricsError(`値が数ではありません: ${String(i.value)}`);
|
|
103
|
+
if (value < 0)
|
|
104
|
+
throw new MetricsError(`値は 0 以上です: ${value}`);
|
|
105
|
+
if (spec.value === "integer" && !Number.isInteger(value))
|
|
106
|
+
throw new MetricsError(`${i.metric} の値は 0 以上の整数です: ${value}`);
|
|
107
|
+
let unit;
|
|
108
|
+
if (spec.unit === "currency") {
|
|
109
|
+
unit = (i.unit ?? "").trim().toUpperCase();
|
|
110
|
+
if (!CURRENCY.test(unit))
|
|
111
|
+
throw new MetricsError(`${i.metric} は通貨コード(--unit JPY / USD など 3 文字)が要ります`);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
unit = spec.unit;
|
|
115
|
+
if (i.unit !== undefined && i.unit.trim() !== unit)
|
|
116
|
+
throw new MetricsError(`${i.metric} の単位は「${unit}」だけです(--unit は省いてください)`);
|
|
117
|
+
}
|
|
118
|
+
const source = i.source?.trim() ?? "";
|
|
119
|
+
if (!source)
|
|
120
|
+
throw new MetricsError("出典(--source 請求書・課金の画面・不具合の管理表など)が要ります");
|
|
121
|
+
if (source.length > SOURCE_MAX)
|
|
122
|
+
throw new MetricsError(`出典は ${SOURCE_MAX} 文字までです`);
|
|
123
|
+
const note = i.note?.trim();
|
|
124
|
+
return { metric: i.metric, scope, from: i.from, to: i.to, value, unit, source, ...(note ? { note } : {}) };
|
|
125
|
+
}
|
|
126
|
+
const sameKey = (a, b) => a.metric === b.metric && a.scope === b.scope && a.from === b.from && a.to === b.to && a.unit === b.unit;
|
|
127
|
+
const writeManual = (dataDir, f) => writeJsonRecord(manualFile(dataDir), f);
|
|
128
|
+
async function locked(dataDir, fn) {
|
|
129
|
+
return withFileLock(lockFile(dataDir), async () => {
|
|
130
|
+
const cur = await readManual(dataDir);
|
|
131
|
+
if (cur.problem)
|
|
132
|
+
throw new MetricsError(cur.problem, "metrics_unreadable");
|
|
133
|
+
return fn(cur);
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* 記録する。同じ識別(指標・範囲・期間・単位)が無ければ足す。あって値・出典・メモが同じなら何もしない(changed: false)。
|
|
138
|
+
* 違えば訂正で、expectedRev がその記録の rev と同じときだけ書く(無い・違う → metrics_conflict)
|
|
139
|
+
*/
|
|
140
|
+
export async function recordManual(ctx, input, opts = {}) {
|
|
141
|
+
const v = cleanManual(ctx, input);
|
|
142
|
+
const dataDir = ctx.ws.dataDir;
|
|
143
|
+
return locked(dataDir, async (cur) => {
|
|
144
|
+
const now = new Date().toISOString();
|
|
145
|
+
const hit = cur.records.find((r) => sameKey(r, v));
|
|
146
|
+
if (!hit) {
|
|
147
|
+
if (opts.expectedRev !== undefined && opts.expectedRev !== 0)
|
|
148
|
+
throw new MetricsError(`同じ指標・範囲・期間・単位の記録はありません(--rev ${opts.expectedRev} は使えません)`, "metrics_conflict");
|
|
149
|
+
const record = { id: `M${cur.seq + 1}`, ...v, rev: 1, createdAt: now, ...(opts.actor ? { createdBy: opts.actor } : {}), updatedAt: now, ...(opts.actor ? { updatedBy: opts.actor } : {}) };
|
|
150
|
+
await writeManual(dataDir, { version: 1, seq: cur.seq + 1, records: [...cur.records, record] });
|
|
151
|
+
return { record, changed: true, created: true };
|
|
152
|
+
}
|
|
153
|
+
if (hit.value === v.value && hit.source === v.source && (hit.note ?? "") === (v.note ?? ""))
|
|
154
|
+
return { record: hit, changed: false, created: false };
|
|
155
|
+
if (opts.expectedRev === undefined) {
|
|
156
|
+
throw new MetricsError(`${hit.id} に同じ指標・範囲・期間・単位の記録があります(値 ${hit.value} ${hit.unit}・版 ${hit.rev})。訂正するなら --rev ${hit.rev} を付けてください`, "metrics_conflict");
|
|
157
|
+
}
|
|
158
|
+
if (opts.expectedRev !== hit.rev)
|
|
159
|
+
throw new MetricsError(`${hit.id} は他で変わりました(読んだ版 ${opts.expectedRev}・今の版 ${hit.rev})。p3 metrics で確かめてからやり直してください`, "metrics_conflict");
|
|
160
|
+
// 更新者はこの訂正をした人だけ(主体が分からない訂正では前の人を残さず省く)。作った人・日時は残す
|
|
161
|
+
const { note: _n, updatedBy: _u, ...rest } = hit;
|
|
162
|
+
const record = { ...rest, value: v.value, source: v.source, ...(v.note ? { note: v.note } : {}), rev: hit.rev + 1, updatedAt: now, ...(opts.actor ? { updatedBy: opts.actor } : {}) };
|
|
163
|
+
await writeManual(dataDir, { version: 1, seq: cur.seq, records: cur.records.map((r) => (r.id === hit.id ? record : r)) });
|
|
164
|
+
return { record, changed: true, created: false };
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
/** 記録を消す(ID は使い直さない)。expectedRev を渡せば照らす */
|
|
168
|
+
export async function removeManual(ctx, id, opts = {}) {
|
|
169
|
+
const dataDir = ctx.ws.dataDir;
|
|
170
|
+
return locked(dataDir, async (cur) => {
|
|
171
|
+
const hit = cur.records.find((r) => r.id === id);
|
|
172
|
+
if (!hit)
|
|
173
|
+
throw new MetricsError(`人の記録 ${id} はありません(p3 metrics records で確かめてください)`);
|
|
174
|
+
if (opts.expectedRev !== undefined && opts.expectedRev !== hit.rev)
|
|
175
|
+
throw new MetricsError(`${id} は他で変わりました(読んだ版 ${opts.expectedRev}・今の版 ${hit.rev})`, "metrics_conflict");
|
|
176
|
+
await writeManual(dataDir, { version: 1, seq: cur.seq, records: cur.records.filter((r) => r.id !== id) });
|
|
177
|
+
return hit;
|
|
178
|
+
});
|
|
179
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import { metricScopeOf, metricsReport } from "../core/index.js";
|
|
3
|
+
/** 開発の指標の API(読むだけ)。GET /metrics[?milestone=<ID>]。API の組み立て(server/api/routes.ts)がつなぐ */
|
|
4
|
+
export function metricsRoutes(ctx) {
|
|
5
|
+
const app = new Hono();
|
|
6
|
+
app.get("/metrics", async (c) => c.json(await metricsReport(ctx, metricScopeOf(ctx, c.req.query("milestone")))));
|
|
7
|
+
return app;
|
|
8
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 開発の指標(記録から出す値と、人が記録する値)の型。CLI・API・画面で同じものを使う。
|
|
3
|
+
* 定義(何から・どう数えるか)と集計は core/metrics/definitions.ts の1か所にある(指標を足すときはそこに1件足す)。
|
|
4
|
+
*
|
|
5
|
+
* - 指標は改善の材料で、人や AI の成績の評価には使わない(個人・エージェントごとの値や順位は出さない)
|
|
6
|
+
* - 値の無い理由を数値の 0 と区別する: 対象なし(no_targets)・記録の欠損だけ(no_data)・まだ到達していない(not_reached)
|
|
7
|
+
* - 古い記録で欠けている値は欠損として数え、0 や推測(updatedAt など)で埋めない
|
|
8
|
+
*/
|
|
9
|
+
export const METRIC_UNITS = ["hours", "count", "amount"];
|
|
10
|
+
/** amount は通貨ごとの金額(単位は記録ごとの通貨コード) */
|
|
11
|
+
export const METRIC_UNIT_LABEL = { hours: "時間", count: "件", amount: "金額" };
|
|
12
|
+
/**
|
|
13
|
+
* 値の状態。ok: 値あり / no_targets: 数える対象が無い / no_data: 対象はあるが記録が欠けて値を出せない /
|
|
14
|
+
* not_reached: 対象はあるがまだどれも到達していない(所要時間の指標) / unrecorded: 対象はあるが記録がまだ無い(レビューをしていない・値を記録していない)
|
|
15
|
+
*/
|
|
16
|
+
export const METRIC_STATES = ["ok", "no_targets", "no_data", "not_reached", "unrecorded"];
|
|
17
|
+
export const METRIC_STATE_LABEL = {
|
|
18
|
+
ok: "値あり",
|
|
19
|
+
no_targets: "対象なし",
|
|
20
|
+
no_data: "記録の欠損で出せない",
|
|
21
|
+
not_reached: "まだ到達していない",
|
|
22
|
+
unrecorded: "記録なし",
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* metrics_invalid: 入力が規則に合わない(知らない指標・範囲・負の値・不正な期間など。CLI は 1、API は 400)/
|
|
26
|
+
* metrics_conflict: 読んだ版と違う・版を照らさない訂正(CLI は 3)/ metrics_unreadable: 記録のファイルが読めない(CLI は 1)。どれも何も書いていない
|
|
27
|
+
*/
|
|
28
|
+
export class MetricsError extends Error {
|
|
29
|
+
code;
|
|
30
|
+
constructor(message, code = "metrics_invalid") {
|
|
31
|
+
super(message);
|
|
32
|
+
this.code = code;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
/** 中央値(空なら undefined) */
|
|
36
|
+
export function median(values) {
|
|
37
|
+
if (!values.length)
|
|
38
|
+
return undefined;
|
|
39
|
+
const s = [...values].sort((a, b) => a - b);
|
|
40
|
+
const mid = Math.floor(s.length / 2);
|
|
41
|
+
return s.length % 2 ? s[mid] : (s[mid - 1] + s[mid]) / 2;
|
|
42
|
+
}
|
|
@@ -2,23 +2,14 @@ import { execFile } from "node:child_process";
|
|
|
2
2
|
import { createHash } from "node:crypto";
|
|
3
3
|
import { isAbsolute, relative } from "node:path";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
|
-
import { gitHistory } from "
|
|
5
|
+
import { gitHistory } from "../../../core/repoRefs.js";
|
|
6
6
|
const run = promisify(execFile);
|
|
7
7
|
/**
|
|
8
8
|
* マイルストーンレビューのコードの材料。Codex には参照先を読むだけでマウントして、コードと git の履歴を読ませる。
|
|
9
9
|
* ここでは、そのとき読んだものが後から分かるように、参照先ごとの状態・HEAD・ブランチ・未コミットの変更の数と、
|
|
10
10
|
* タスクの成果物に残したコミット(参照先の履歴にあるか)を取り出す。コードの中身は保存しない。git は読むだけの操作だけ。
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
export function commitsInOutput(output) {
|
|
14
|
-
const out = new Set();
|
|
15
|
-
for (const m of output.matchAll(/\/commit\/([0-9a-f]{7,40})\b/gi))
|
|
16
|
-
out.add(m[1].toLowerCase());
|
|
17
|
-
const bare = output.trim();
|
|
18
|
-
if (/^[0-9a-f]{7,40}$/i.test(bare))
|
|
19
|
-
out.add(bare.toLowerCase());
|
|
20
|
-
return [...out];
|
|
21
|
-
}
|
|
12
|
+
import { commitsInOutput } from "../../../shared/commitRefs.js";
|
|
22
13
|
const git = async (local, args) => (await run("git", ["-C", local, ...args], { timeout: 10_000, maxBuffer: 4 * 1024 * 1024 })).stdout.trim();
|
|
23
14
|
const tryGit = (local, args) => git(local, args).catch(() => undefined);
|
|
24
15
|
/** git を動かして標準出力を返す(標準入力を渡せる。大きな差分も読む) */
|
|
@@ -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
|
});
|