@infodb/p3 0.10.0 → 0.12.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 +6 -1
- package/dist/web/assets/ImprovementDialog-kQaVBGWH.js +1 -0
- package/dist/web/assets/Outputs-_nU_p3nu.js +1 -0
- package/dist/web/assets/{RequestStatus-DGaoQoIa.js → RequestStatus-RG-OVQYY.js} +1 -1
- package/dist/web/assets/{Tabs-D16MqQxu.js → Tabs-ew9i5SKX.js} +1 -1
- package/dist/web/assets/TagInput-BtlJTF7i.js +1 -0
- package/dist/web/assets/TaskDrawer-DW8GyJqI.js +6 -0
- package/dist/web/assets/_requestId-6Nb727dD.js +1 -0
- package/dist/web/assets/_requestId-BykTgPax.js +1 -0
- package/dist/web/assets/appCtx-CxDdXABS.js +1 -0
- package/dist/web/assets/archive-Ckh295Xe.js +1 -0
- package/dist/web/assets/board-BVAIjK-Y.js +1 -0
- package/dist/web/assets/done-BGfA-3MA.js +1 -0
- package/dist/web/assets/index-CgRU744I.css +2 -0
- package/dist/web/assets/index-DacQ0yl4.js +12 -0
- package/dist/web/assets/{new-ChFzBoL2.js → new-DVygWvVc.js} +1 -1
- package/dist/web/assets/outputs-B6xDsLZf.js +1 -0
- package/dist/web/assets/preload-helper-DyCqp21K.js +1 -0
- package/dist/web/assets/quality-Pu6EISAM.js +1 -0
- package/dist/web/assets/release-notes-CCpzyiNf.js +5 -0
- package/dist/web/assets/requestData-D5vBnuMh.js +1 -0
- package/dist/web/assets/routes-Q91zvNc0.js +4 -0
- package/dist/web/assets/settings-BzRgcmUm.js +1 -0
- package/dist/web/assets/taskReview-_WCgnQit.js +1 -0
- package/dist/web/assets/workTarget-C9c57JAO.js +30 -0
- package/dist/web/index.html +4 -4
- package/docs/architecture.md +392 -3
- package/docs/development.md +1 -1
- package/docs/how-to-use.md +261 -5
- package/docs/installation.md +5 -5
- package/lib/cli/args.js +45 -0
- package/lib/cli/help.js +43 -1
- package/lib/cli/main.js +42 -4
- package/lib/cli/output.js +9 -1
- package/lib/cli/preflightCommands.js +7 -1
- package/lib/cli/project.js +3 -0
- package/lib/cli/qualityCommands.js +163 -0
- package/lib/cli/readOnly.js +2 -0
- package/lib/cli/requestCommands.js +219 -14
- package/lib/cli/showView.js +69 -3
- package/lib/cli/taskCommands.js +312 -17
- package/lib/cli/taskReviewCommands.js +178 -0
- package/lib/core/context.js +7 -1
- package/lib/core/milestoneReview/code.js +129 -0
- package/lib/core/milestoneReview/material.js +148 -0
- package/lib/core/milestoneReview/mockReviewer.js +28 -0
- package/lib/core/milestoneReview/review.js +325 -0
- package/lib/core/milestoneReview/service.js +214 -0
- package/lib/core/milestoneReview/store.js +176 -0
- package/lib/core/ops.js +9 -2
- package/lib/core/preflight/carryover.js +1 -1
- package/lib/core/preflight/codexEngine.js +20 -6
- package/lib/core/preflight/engine.js +6 -0
- package/lib/core/preflight/instructions.js +18 -1
- package/lib/core/preflight/mockEngine.js +4 -0
- package/lib/core/preflight/service.js +45 -4
- package/lib/core/projectRegistry.js +3 -3
- package/lib/core/quality.js +21 -0
- package/lib/core/qualityImprovement.js +221 -0
- package/lib/core/requestOps.js +101 -6
- package/lib/core/reviewRuns.js +205 -0
- package/lib/core/store/archivedTasks.js +74 -0
- package/lib/core/store/collection.js +12 -2
- package/lib/core/store/normalize.js +43 -2
- package/lib/core/store/preflightStore.js +9 -1
- package/lib/core/store/projectFile.js +18 -1
- package/lib/core/store/workspace.js +122 -14
- package/lib/core/taskReview/material.js +452 -0
- package/lib/core/taskReview/mockReviewer.js +30 -0
- package/lib/core/taskReview/paths.js +15 -0
- package/lib/core/taskReview/review.js +305 -0
- package/lib/core/taskReview/service.js +187 -0
- package/lib/core/taskReview/store.js +214 -0
- package/lib/server/api/manifest.js +74 -5
- package/lib/server/api/milestoneReviewRoutes.js +70 -0
- package/lib/server/api/routes.js +164 -20
- package/lib/server/api/taskReviewRoutes.js +66 -0
- package/lib/server/server.js +2 -2
- package/lib/shared/acceptance.js +378 -0
- package/lib/shared/milestoneGoals.js +57 -0
- package/lib/shared/milestoneReview.js +27 -0
- package/lib/shared/quality.js +391 -0
- package/lib/shared/qualityImprovement.js +1 -0
- package/lib/shared/qualityTemplates.js +31 -0
- package/lib/shared/taskBlock.js +142 -0
- package/lib/shared/taskReview.js +56 -0
- package/package.json +1 -1
- package/skills/p3/SKILL.md +31 -2
- package/dist/web/assets/Outputs-B4Tr7JzU.js +0 -1
- package/dist/web/assets/TagInput-pSYxm4bz.js +0 -1
- package/dist/web/assets/TaskDrawer-1Ev3RpRV.js +0 -3
- package/dist/web/assets/_requestId-BKhn019m.js +0 -1
- package/dist/web/assets/_requestId-Btpvuu7-.js +0 -30
- package/dist/web/assets/appCtx-D_Iaoh2e.js +0 -1
- package/dist/web/assets/board-DeHdxbN4.js +0 -1
- package/dist/web/assets/done-BFaHGt03.js +0 -1
- package/dist/web/assets/index-BF1xMdJo.css +0 -2
- package/dist/web/assets/index-CDWcKy1L.js +0 -12
- package/dist/web/assets/preload-helper-hSId95YD.js +0 -1
- package/dist/web/assets/release-notes-BWNDFDkH.js +0 -3
- package/dist/web/assets/requestData-B_320uxL.js +0 -1
- package/dist/web/assets/routes-BBD464IS.js +0 -3
- package/dist/web/assets/settings-D7PPrGjT.js +0 -1
- package/dist/web/assets/workTarget-Cijqq4yH.js +0 -1
package/lib/server/api/routes.js
CHANGED
|
@@ -5,9 +5,15 @@ import { normalizeTaskId } from "../../shared/refs.js";
|
|
|
5
5
|
import { REQUEST_STATUSES, TASK_STATUSES } from "../../shared/types.js";
|
|
6
6
|
import { listTasks, progress, resolve } from "../../core/ops.js";
|
|
7
7
|
import { ConflictError, NotFoundError } from "../../core/store/collection.js";
|
|
8
|
+
import { ACCEPTANCE_RESULTS, AcceptanceInputError, acceptanceStatus } from "../../shared/acceptance.js";
|
|
9
|
+
import { BlockInputError } from "../../shared/taskBlock.js";
|
|
10
|
+
import { QualityInputError, taskQualityDiff } from "../../shared/quality.js";
|
|
11
|
+
import { qualityTemplate, qualityView, updateQuality } from "../../core/quality.js";
|
|
12
|
+
import { diagnoseQuality, ImprovementError, improvementDraft, registerImprovement } from "../../core/qualityImprovement.js";
|
|
8
13
|
import { ATTACHMENT_LIMITS, ATTACHMENT_TYPES, AttachmentError, safeFileName } from "../../core/store/attachments.js";
|
|
9
14
|
import { bodyLimit } from "hono/body-limit";
|
|
10
|
-
import { ReloadError } from "../../core/store/workspace.js";
|
|
15
|
+
import { MilestonesConflictError, ReloadError } from "../../core/store/workspace.js";
|
|
16
|
+
import { ArchivedTaskReadError, getArchivedTask, listArchivedTasks } from "../../core/store/archivedTasks.js";
|
|
11
17
|
import { completionCheckOf, hierarchyNow, resolvedIssue } from "../../core/requestStatus.js";
|
|
12
18
|
import { HierarchyError, hierarchyView } from "../../core/hierarchy.js";
|
|
13
19
|
import { supersededMarks } from "../../core/supersede.js";
|
|
@@ -17,7 +23,9 @@ import { UserConfigError } from "../../core/userConfig.js";
|
|
|
17
23
|
import { AI_MANIFEST } from "./manifest.js";
|
|
18
24
|
import { repoRoutes } from "./repoRoutes.js";
|
|
19
25
|
import { releaseNoteRoutes } from "./releaseNoteRoutes.js";
|
|
20
|
-
import {
|
|
26
|
+
import { milestoneReviewRoutes } from "./milestoneReviewRoutes.js";
|
|
27
|
+
import { taskReviewRoutes } from "./taskReviewRoutes.js";
|
|
28
|
+
import { archiveTask, checkMilestoneRemoval, createRequest, createTask, orderChildren, updateRequest, updateTask, importQuality } from "../../core/requestOps.js";
|
|
21
29
|
import { PREFLIGHT_RUNNERS } from "../../shared/preflightRunner.js";
|
|
22
30
|
import { StaleInputError } from "../../core/preflight/input.js";
|
|
23
31
|
import { CancelRefusedError, ChildConflictError, ChildDraftsChangedError, DraftConflictError, PulseInputError } from "../../core/preflight/service.js";
|
|
@@ -27,9 +35,12 @@ import { CancelRefusedError, ChildConflictError, ChildDraftsChangedError, DraftC
|
|
|
27
35
|
* /requests 要望(進捗つき)
|
|
28
36
|
* /requests/:rid 要望の詳細
|
|
29
37
|
* /requests/:rid/tasks[/:tid] 要望のタスク
|
|
38
|
+
* /requests/:rid/archived-tasks[/:tid] アーカイブしたタスク(読むだけ)
|
|
30
39
|
* /requests/:rid/preflight[/:run] Preflight
|
|
31
40
|
* /requests/:rid/notes Preflight へのメモ
|
|
32
41
|
* /release-notes[/:mid] マイルストーンのリリースノート(releaseNoteRoutes.ts)
|
|
42
|
+
* /milestones/:mid/review[s...] マイルストーンレビュー(milestoneReviewRoutes.ts)
|
|
43
|
+
* /requests/:rid/tasks/:tid/review[s...] タスクの AI レビュー(taskReviewRoutes.ts)
|
|
33
44
|
*/
|
|
34
45
|
const date = z.string().regex(/^\d{4}-\d{2}-\d{2}$/);
|
|
35
46
|
const taskInput = z.object({
|
|
@@ -45,8 +56,47 @@ const taskInput = z.object({
|
|
|
45
56
|
/** 変更の記録(Markdown。完了にするときに書く) */
|
|
46
57
|
record: z.string().nullable().optional(),
|
|
47
58
|
});
|
|
48
|
-
/**
|
|
49
|
-
const
|
|
59
|
+
/** 受け入れ基準・証拠への操作(規則は shared/acceptance.ts。CLI の criteria / evidence と同じ) */
|
|
60
|
+
const acceptanceOp = z.discriminatedUnion("op", [
|
|
61
|
+
z.object({ op: z.literal("add"), text: z.string() }),
|
|
62
|
+
z.object({ op: z.literal("edit"), id: z.string(), text: z.string() }),
|
|
63
|
+
z.object({ op: z.literal("remove"), id: z.string() }),
|
|
64
|
+
z.object({ op: z.literal("order"), ids: z.array(z.string()) }),
|
|
65
|
+
z.object({ op: z.literal("record"), id: z.string(), result: z.enum(ACCEPTANCE_RESULTS), evidence: z.string().default("") }),
|
|
66
|
+
z.object({ op: z.literal("unrecord"), id: z.string() }),
|
|
67
|
+
]);
|
|
68
|
+
/** 品質基準の操作(規則は shared/quality.ts。CLI の p3 quality と同じ) */
|
|
69
|
+
const qualityCheck = z.discriminatedUnion("kind", [
|
|
70
|
+
z.object({ kind: z.literal("machine"), command: z.string(), success: z.string() }),
|
|
71
|
+
z.object({ kind: z.literal("manual"), reference: z.string() }),
|
|
72
|
+
]);
|
|
73
|
+
const qualityInput = z.object({ text: z.string(), repos: z.array(z.string()).optional(), check: qualityCheck });
|
|
74
|
+
const qualityOp = z.discriminatedUnion("op", [
|
|
75
|
+
z.object({ op: z.literal("init") }),
|
|
76
|
+
z.object({ op: z.literal("adopt"), template: z.string(), version: z.number().int().optional() }),
|
|
77
|
+
z.object({ op: z.literal("upgrade"), template: z.string() }),
|
|
78
|
+
z.object({ op: z.literal("add"), standard: qualityInput }),
|
|
79
|
+
z.object({
|
|
80
|
+
op: z.literal("replace"),
|
|
81
|
+
standards: z.array(qualityInput.extend({ id: z.string().optional(), exemptReason: z.string().optional(), source: z.object({ template: z.string(), version: z.number().int(), key: z.string() }).optional() })).max(200),
|
|
82
|
+
templates: z.array(z.object({ id: z.string(), version: z.number().int() })).optional(),
|
|
83
|
+
}),
|
|
84
|
+
z.object({ op: z.literal("edit"), id: z.string(), standard: qualityInput.partial() }),
|
|
85
|
+
z.object({ op: z.literal("remove"), id: z.string() }),
|
|
86
|
+
z.object({ op: z.literal("exempt"), id: z.string(), reason: z.string() }),
|
|
87
|
+
z.object({ op: z.literal("unexempt"), id: z.string() }),
|
|
88
|
+
]);
|
|
89
|
+
/** 作るとき: 受け入れ基準は文の並び(ID は p3 が振る) */
|
|
90
|
+
const taskCreate = taskInput.extend({ criteria: z.array(z.string()).optional(), quality: z.union([z.enum(["auto", "none"]), z.array(z.string())]).optional() });
|
|
91
|
+
/** checked: 完了したタスクに人が「済み」を付ける / 外す。acceptance: 基準・証拠への操作(順に当て、1つでも合わなければ何も書かない) */
|
|
92
|
+
/** 停止の操作(規則は shared/taskBlock.ts。CLI の block / unblock と同じ。日時・履歴は受け付けない) */
|
|
93
|
+
const blockOp = z.discriminatedUnion("op", [
|
|
94
|
+
z.object({ op: z.literal("set"), reason: z.string(), decision: z.string().optional() }),
|
|
95
|
+
z.object({ op: z.literal("clear"), resolution: z.string() }),
|
|
96
|
+
]);
|
|
97
|
+
const taskPatch = taskInput
|
|
98
|
+
.partial()
|
|
99
|
+
.extend({ rev: z.number().int().optional(), checked: z.boolean().optional(), acceptance: z.array(acceptanceOp).optional(), blockOp: blockOp.optional() });
|
|
50
100
|
const requestInput = z.object({
|
|
51
101
|
title: z.string().min(1),
|
|
52
102
|
body: z.string().optional(),
|
|
@@ -71,10 +121,18 @@ const projectPatch = z
|
|
|
71
121
|
title: z.string().min(1),
|
|
72
122
|
due: date.optional(),
|
|
73
123
|
done: z.boolean().optional(),
|
|
124
|
+
// 目的・予定機能(キーを省くと今の値を残す。null・空で消す)。件数・文字数・空・重複の規則は保存の側(shared/milestoneGoals.ts)
|
|
125
|
+
purpose: z.string().nullish().transform((v) => (v === null ? "" : v)),
|
|
126
|
+
goals: z
|
|
127
|
+
.array(z.object({ id: z.string(), text: z.string() }))
|
|
128
|
+
.nullish()
|
|
129
|
+
.transform((v) => (v === null ? [] : v)),
|
|
74
130
|
})),
|
|
75
131
|
branchPattern: z.string().includes("{id}"),
|
|
76
132
|
// 担当(runner)は省ける(以前の形 { instructions } の更新でも、保存は項目ごとに重ねるので担当は残る)
|
|
77
133
|
preflight: z.object({ instructions: z.string().optional(), runner: z.enum(PREFLIGHT_RUNNERS).optional() }),
|
|
134
|
+
/** 編集を始めたときのマイルストーンの版(GET /api/project の milestonesVersion)。違えば 409 milestones_conflict */
|
|
135
|
+
milestonesVersion: z.string(),
|
|
78
136
|
})
|
|
79
137
|
.partial()
|
|
80
138
|
.superRefine((p, ctx) => {
|
|
@@ -126,14 +184,34 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
126
184
|
// 要望の親子(code: hierarchy_invalid・hierarchy_busy・has_children・has_parent。何も書いていない)
|
|
127
185
|
if (err instanceof HierarchyError)
|
|
128
186
|
return c.json({ error: err.message, code: err.code, ...err.detail }, 409);
|
|
187
|
+
// マイルストーンの版が違う(編集を始めた後に他で変わった。何も書いていない)
|
|
188
|
+
if (err instanceof MilestonesConflictError)
|
|
189
|
+
return c.json({ error: err.message, code: err.code, milestonesVersion: err.current }, 409);
|
|
129
190
|
if (err instanceof z.ZodError)
|
|
130
191
|
return c.json({ error: "invalid input", issues: err.issues }, 400);
|
|
192
|
+
// 受け入れ基準・証拠の操作が規則に合わない(何も書いていない)
|
|
193
|
+
if (err instanceof AcceptanceInputError)
|
|
194
|
+
return c.json({ error: err.message, code: err.code }, 400);
|
|
195
|
+
// 停止の操作が規則に合わない・止まったままの移動(何も書いていない)
|
|
196
|
+
if (err instanceof BlockInputError)
|
|
197
|
+
return c.json({ error: err.message, code: err.code }, err.code === "blocked" ? 409 : 400);
|
|
198
|
+
// 品質基準(版が違えば 409 quality_conflict。何も書いていない)
|
|
199
|
+
if (err instanceof QualityInputError)
|
|
200
|
+
return c.json({ error: err.message, code: err.code }, err.code === "quality_conflict" ? 409 : 400);
|
|
201
|
+
// 改善要望(診断が変わった・登録先がある → 409。作っていない)
|
|
202
|
+
if (err instanceof ImprovementError) {
|
|
203
|
+
const status = err.code === "not_found" ? 404 : err.code === "diagnosis_changed" || err.code === "existing" || err.code === "closed_existing" ? 409 : 400;
|
|
204
|
+
return c.json({ error: err.message, code: err.code, ...(err.existing ? { existing: err.existing } : {}) }, status);
|
|
205
|
+
}
|
|
131
206
|
// 個人設定のファイルが読めない・壊れている(ファイルは変えていない)
|
|
132
207
|
if (err instanceof UserConfigError)
|
|
133
208
|
return c.json({ error: err.message }, 500);
|
|
134
209
|
// データのフォルダが読めない(メモリ上の状態は変えていない)
|
|
135
210
|
if (err instanceof ReloadError)
|
|
136
211
|
return c.json({ error: err.message }, 503);
|
|
212
|
+
// アーカイブのフォルダ・ファイルが読めない(無いのは 404)
|
|
213
|
+
if (err instanceof ArchivedTaskReadError)
|
|
214
|
+
return c.json({ error: err.message, code: err.code }, 500);
|
|
137
215
|
console.error(err);
|
|
138
216
|
return c.json({ error: err.message }, 400);
|
|
139
217
|
});
|
|
@@ -144,17 +222,19 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
144
222
|
// --- meta ---------------------------------------------------------------
|
|
145
223
|
app.get("/project", (c) => c.json({
|
|
146
224
|
project: ws.project,
|
|
225
|
+
milestonesVersion: ws.milestonesVersion,
|
|
147
226
|
dataDir: ws.dataDir,
|
|
148
227
|
engines: preflight.availableEngines(),
|
|
149
228
|
defaultEngine: preflight.defaultEngine,
|
|
150
229
|
errors: ws.errors(),
|
|
151
230
|
}));
|
|
152
231
|
app.put("/project", async (c) => {
|
|
153
|
-
const patch = projectPatch.parse(await c.req.json());
|
|
232
|
+
const { milestonesVersion, ...patch } = projectPatch.parse(await c.req.json());
|
|
154
233
|
// 使っている要望・リリースノートのあるマイルストーンは消さない(CLI の milestone rm と同じ規則)
|
|
155
234
|
if (patch.milestones)
|
|
156
235
|
await checkMilestoneRemoval(ctx, patch.milestones.map((m) => m.id));
|
|
157
|
-
|
|
236
|
+
const milestones = patch.milestones?.map((m) => Object.fromEntries(Object.entries(m).filter(([, v]) => v !== undefined)));
|
|
237
|
+
return c.json(await ws.saveProject({ ...patch, ...(milestones ? { milestones } : {}) }, { milestonesVersion }));
|
|
158
238
|
});
|
|
159
239
|
app.get("/ai/manifest", (c) => c.json(AI_MANIFEST));
|
|
160
240
|
/** 参照先(設定画面。このマシンのパスはローカルの画面からだけ) */
|
|
@@ -171,6 +251,8 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
171
251
|
app.route("/user-theme.js", userThemeScriptRoute());
|
|
172
252
|
/** マイルストーンのリリースノート(材料・保存・出力・要約の生成) */
|
|
173
253
|
app.route("/", releaseNoteRoutes(ctx));
|
|
254
|
+
app.route("/", milestoneReviewRoutes(ctx));
|
|
255
|
+
app.route("/", taskReviewRoutes(ctx));
|
|
174
256
|
// --- requests -------------------------------------------------------------
|
|
175
257
|
app.get("/requests", (c) => {
|
|
176
258
|
// ?parent=<ID>: 直下の子だけを、親の表示順(子の一覧・詳細と同じ)で。省くと更新の新しい順
|
|
@@ -211,13 +293,42 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
211
293
|
const r = await orderChildren(ctx, id, children, { expectedRev: expectedRev(c, { rev }), actor: actorOf(c) });
|
|
212
294
|
return c.json({ request: r, children: hierarchyNow(ws).children(id).map((k) => k.id) });
|
|
213
295
|
});
|
|
296
|
+
// --- 品質基準(project.yaml の quality。core/quality.ts) ----------------------------
|
|
297
|
+
app.get("/quality", (c) => c.json(qualityView(ws)));
|
|
298
|
+
app.get("/quality/templates/:id", (c) => {
|
|
299
|
+
const v = c.req.query("version");
|
|
300
|
+
const t = qualityTemplate(c.req.param("id"), v ? Number(v) : undefined);
|
|
301
|
+
return t ? c.json(t) : c.json({ error: `テンプレートがありません: ${c.req.param("id")}`, code: "not_found" }, 404);
|
|
302
|
+
});
|
|
303
|
+
app.post("/quality", async (c) => {
|
|
304
|
+
const { ops, version } = z.object({ ops: z.array(qualityOp).min(1).max(200), version: z.string().optional() }).parse(await c.req.json());
|
|
305
|
+
return c.json(await updateQuality(ws, ops, { expectedVersion: version }));
|
|
306
|
+
});
|
|
307
|
+
// --- 品質の改善要望(core/qualityImprovement.ts。診断と原稿は読むだけ、登録は明示したときだけ) ------------
|
|
308
|
+
const improvementSource = z.discriminatedUnion("type", [
|
|
309
|
+
z.object({ type: z.literal("project") }),
|
|
310
|
+
z.object({ type: z.literal("task-review"), request: z.string(), task: z.string(), run: z.string() }),
|
|
311
|
+
z.object({ type: z.literal("milestone-review"), milestone: z.string(), run: z.string() }),
|
|
312
|
+
]);
|
|
313
|
+
app.post("/quality/improvements/preview", async (c) => {
|
|
314
|
+
const { source, keys } = z.object({ source: improvementSource, keys: z.array(z.string()).optional() }).parse(await c.req.json());
|
|
315
|
+
const d = await diagnoseQuality(ctx, source);
|
|
316
|
+
const picked = keys ?? d.findings.filter((f) => f.suggested).map((f) => f.key);
|
|
317
|
+
return c.json({ ...d, picked, ...(picked.length ? { draft: improvementDraft(d, picked) } : {}) });
|
|
318
|
+
});
|
|
319
|
+
app.post("/quality/improvements", async (c) => {
|
|
320
|
+
const body = z
|
|
321
|
+
.object({ source: improvementSource, keys: z.array(z.string()).min(1), title: z.string(), body: z.string(), hash: z.string(), reopenClosed: z.boolean().optional() })
|
|
322
|
+
.parse(await c.req.json());
|
|
323
|
+
return c.json(await registerImprovement(ctx, body, actorOf(c)), 201);
|
|
324
|
+
});
|
|
214
325
|
// --- tasks(要望の中) --------------------------------------------------------
|
|
215
326
|
app.get("/requests/:rid/tasks", (c) => {
|
|
216
|
-
const { status, area, q } = c.req.query();
|
|
217
|
-
return c.json(listTasks(ctx, { request: rid(c), status: status?.split(","), area, q }));
|
|
327
|
+
const { status, area, q, blocked } = c.req.query();
|
|
328
|
+
return c.json(listTasks(ctx, { request: rid(c), status: status?.split(","), area, q, blocked: blocked === "true" }));
|
|
218
329
|
});
|
|
219
330
|
app.post("/requests/:rid/tasks", async (c) => {
|
|
220
|
-
const raw =
|
|
331
|
+
const raw = taskCreate.parse(await c.req.json());
|
|
221
332
|
const { repo, ...b } = unnull(raw);
|
|
222
333
|
// 作業先は null(作業先なし)を残す。書かなければ既定(requestOps.createTask)
|
|
223
334
|
const input = { ...b, ...("repo" in raw ? { repo: raw.repo ?? null } : {}) };
|
|
@@ -226,19 +337,39 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
226
337
|
});
|
|
227
338
|
app.get("/requests/:rid/tasks/:tid", (c) => {
|
|
228
339
|
const task = ws.tasksOf(rid(c)).require(tid(c));
|
|
229
|
-
return c.json({ task, superseded: supersededMarks(ws).get(task.ref) ?? [] });
|
|
340
|
+
return c.json({ task, superseded: supersededMarks(ws).get(task.ref) ?? [], acceptance: acceptanceStatus(task) ?? null });
|
|
230
341
|
});
|
|
231
342
|
app.patch("/requests/:rid/tasks/:tid", async (c) => {
|
|
232
|
-
const { rev, checked, ...patch } = taskPatch.parse(await c.req.json());
|
|
233
|
-
const next = {
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
343
|
+
const { rev, checked, acceptance, blockOp: bop, ...patch } = taskPatch.parse(await c.req.json());
|
|
344
|
+
const next = {
|
|
345
|
+
...(bop ? { blockOp: bop } : {}),
|
|
346
|
+
...unnull(patch),
|
|
347
|
+
...("repo" in patch ? { repo: patch.repo ?? null } : {}),
|
|
348
|
+
...(checked !== undefined ? { checked } : {}),
|
|
349
|
+
...(acceptance?.length ? { acceptance } : {}),
|
|
350
|
+
};
|
|
351
|
+
// 置き換えられたタスクを作業中にしたら警告を添える(操作は続ける)。基準・証拠が変わって済みを外したら checkCleared
|
|
352
|
+
const { task, warnings, reopened, reopenedAncestors, checkCleared } = await updateTask(ctx, rid(c), tid(c), next, { expectedRev: expectedRev(c, { rev }), actor: actorOf(c) });
|
|
353
|
+
return c.json({ ...task, ...(warnings.length ? { warnings } : {}), ...(reopened ? { reopened } : {}), ...(reopenedAncestors ? { reopenedAncestors } : {}), ...(checkCleared ? { checkCleared } : {}) });
|
|
354
|
+
});
|
|
355
|
+
/** 今の品質基準との差分(読むだけ。タスクは書き換えない) */
|
|
356
|
+
app.get("/requests/:rid/tasks/:tid/quality-diff", (c) => {
|
|
357
|
+
const task = ws.tasksOf(rid(c)).require(tid(c));
|
|
358
|
+
return c.json({ quality: ws.project.quality?.state ?? "unset", version: ws.project.qualityVersion, diff: taskQualityDiff(task.acceptanceCriteria ?? [], ws.project.quality, task.repo) });
|
|
359
|
+
});
|
|
360
|
+
/** 差分を明示して取り込む(keys: "<kind>:<品質 ID>"。省くと「直した」以外の全部) */
|
|
361
|
+
app.post("/requests/:rid/tasks/:tid/quality-import", async (c) => {
|
|
362
|
+
const { keys, rev } = z.object({ keys: z.array(z.string()).optional(), rev: z.number().int().optional() }).parse(await c.req.json().catch(() => ({})));
|
|
363
|
+
const r = await importQuality(ctx, rid(c), tid(c), keys, { expectedRev: expectedRev(c, { rev }), actor: actorOf(c) });
|
|
364
|
+
return c.json({ ...r.task, applied: r.applied, ...(r.checkCleared ? { checkCleared: r.checkCleared } : {}) });
|
|
237
365
|
});
|
|
238
366
|
app.delete("/requests/:rid/tasks/:tid", async (c) => {
|
|
239
367
|
await archiveTask(ctx, rid(c), tid(c));
|
|
240
368
|
return c.json({ ok: true });
|
|
241
369
|
});
|
|
370
|
+
// --- アーカイブしたタスク(読むだけ。通常のタスクの道はアーカイブを探さない) ------------------------
|
|
371
|
+
app.get("/requests/:rid/archived-tasks", async (c) => c.json(await listArchivedTasks(ws, c.req.param("rid"))));
|
|
372
|
+
app.get("/requests/:rid/archived-tasks/:tid", async (c) => c.json({ task: await getArchivedTask(ws, c.req.param("rid"), tid(c)) }));
|
|
242
373
|
// --- preflight ----------------------------------------------------------
|
|
243
374
|
app.post("/requests/:rid/preflight", async (c) => {
|
|
244
375
|
const body = z
|
|
@@ -364,11 +495,24 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
364
495
|
});
|
|
365
496
|
app.patch("/requests/:rid/preflight/:run/drafts/:key", async (c) => {
|
|
366
497
|
// expectedTitle: 編集を始めたときの題(制御用。案には書かない)。今の題と違えば 409 で書かない
|
|
367
|
-
|
|
368
|
-
|
|
498
|
+
// acceptanceCriteria: 受け入れ基準の並び全体(id は残し、無い項目に振る)。expectedCriteria: 編集を始めたときの基準(違えば 409)
|
|
499
|
+
const criterion = z.object({ id: z.string().nullish(), text: z.string() });
|
|
500
|
+
const { expectedTitle, expectedCriteria, ...patch } = z
|
|
501
|
+
.object({
|
|
502
|
+
title: z.string(),
|
|
503
|
+
description: z.string(),
|
|
504
|
+
include: z.boolean(),
|
|
505
|
+
repo: z.string().nullable(),
|
|
506
|
+
acceptanceCriteria: z.array(criterion),
|
|
507
|
+
expectedTitle: z.string(),
|
|
508
|
+
expectedCriteria: z.array(z.object({ id: z.string(), text: z.string() })),
|
|
509
|
+
})
|
|
369
510
|
.partial()
|
|
370
511
|
.parse(await c.req.json());
|
|
371
|
-
|
|
512
|
+
if (patch.acceptanceCriteria !== undefined && expectedCriteria === undefined) {
|
|
513
|
+
return c.json({ error: "受け入れ基準を直すときは expectedCriteria(編集を始めたときの基準)を渡してください", code: "acceptance_invalid" }, 400);
|
|
514
|
+
}
|
|
515
|
+
return c.json(await preflight.updateDraft(rid(c), c.req.param("run"), c.req.param("key"), patch, { expectedTitle, expectedCriteria }));
|
|
372
516
|
});
|
|
373
517
|
/** 子の要望の案(分割の run)を直す。expectedTitle は上と同じ */
|
|
374
518
|
app.patch("/requests/:rid/preflight/:run/children/:key", async (c) => {
|
|
@@ -393,8 +537,8 @@ export function apiRoutes(ctx, opts = {}) {
|
|
|
393
537
|
});
|
|
394
538
|
// --- 横断 --------------------------------------------------------------
|
|
395
539
|
app.get("/tasks", (c) => {
|
|
396
|
-
const { status, area, q } = c.req.query();
|
|
397
|
-
return c.json(listTasks(ctx, { status: status?.split(","), area, q }));
|
|
540
|
+
const { status, area, q, blocked } = c.req.query();
|
|
541
|
+
return c.json(listTasks(ctx, { status: status?.split(","), area, q, blocked: blocked === "true" }));
|
|
398
542
|
});
|
|
399
543
|
/** 参照・タイトルから対象を特定する(?request= で今の要望を優先) */
|
|
400
544
|
app.get("/resolve", (c) => c.json(resolve(ctx, c.req.query("q") ?? "", c.req.query("request"))));
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { ReviewCancelRefused, ReviewStoreError } from "../../core/reviewRuns.js";
|
|
4
|
+
import { NotFoundError } from "../../core/store/collection.js";
|
|
5
|
+
import { TaskReviewRejected } from "../../core/taskReview/material.js";
|
|
6
|
+
import { previewOf } from "../../shared/taskReview.js";
|
|
7
|
+
/**
|
|
8
|
+
* タスクの AI レビュー(画面のため)。規則と保存は core/taskReview(CLI の p3 review と同じサービス)。
|
|
9
|
+
*
|
|
10
|
+
* POST /requests/:rid/tasks/:tid/review-preview 今の材料の要約と hash({targets?, viewpoint?}。何も書かない)
|
|
11
|
+
* GET /requests/:rid/tasks/:tid/reviews 履歴(新しい順。読めない記録も broken で出す。アーカイブしたタスクも読める)
|
|
12
|
+
* POST /requests/:rid/tasks/:tid/reviews 始める(202。{targets?, viewpoint?, engine?, expectedHash?})。
|
|
13
|
+
* 材料が変わっていれば 409 material_changed、実行中なら 409 running、Preflight の担当が agent で
|
|
14
|
+
* engine を明示していなければ 400 engine_required
|
|
15
|
+
* GET /requests/:rid/tasks/:tid/reviews/:run 1回分(固定した材料・結果。実行中は所有者の状態 owner)
|
|
16
|
+
* POST /requests/:rid/tasks/:tid/reviews/:run/cancel 取り消す({acknowledgeStopped?}。マイルストーンレビューと同じ)
|
|
17
|
+
*
|
|
18
|
+
* 結果を直す口は作らない(直すなら材料を直して別の run でレビューし直す)
|
|
19
|
+
*/
|
|
20
|
+
const actorOf = (c) => c.req.header("x-p3-actor") ?? "human:web";
|
|
21
|
+
const startBody = z.object({
|
|
22
|
+
targets: z.array(z.string().min(1)).max(50).optional(),
|
|
23
|
+
viewpoint: z.string().max(2000).optional(),
|
|
24
|
+
engine: z.enum(["codex", "mock"]).optional(),
|
|
25
|
+
expectedHash: z.string().optional(),
|
|
26
|
+
});
|
|
27
|
+
export function taskReviewRoutes(ctx) {
|
|
28
|
+
const app = new Hono();
|
|
29
|
+
const svc = () => ctx.taskReview;
|
|
30
|
+
app.onError((err, c) => {
|
|
31
|
+
if (err instanceof NotFoundError)
|
|
32
|
+
return c.json({ error: err.message, code: "not_found" }, 404);
|
|
33
|
+
if (err instanceof ReviewStoreError) {
|
|
34
|
+
const status = err.code === "not_found" ? 404 : err.code === "bad_id" ? 400 : err.code === "broken" ? 422 : 409;
|
|
35
|
+
return c.json({ error: err.message, code: err.code }, status);
|
|
36
|
+
}
|
|
37
|
+
if (err instanceof TaskReviewRejected) {
|
|
38
|
+
const status = err.code === "running" || err.code === "material_changed" ? 409 : 400;
|
|
39
|
+
return c.json({ error: err.message, code: err.code, ...(err.running ? { run: err.running } : {}) }, status);
|
|
40
|
+
}
|
|
41
|
+
if (err instanceof ReviewCancelRefused)
|
|
42
|
+
return c.json({ error: err.message, code: err.code }, 409);
|
|
43
|
+
if (err instanceof z.ZodError)
|
|
44
|
+
return c.json({ error: "invalid input", issues: err.issues }, 400);
|
|
45
|
+
console.error(err);
|
|
46
|
+
return c.json({ error: err.message }, 400);
|
|
47
|
+
});
|
|
48
|
+
const rid = (c) => c.req.param("rid");
|
|
49
|
+
const tid = (c) => c.req.param("tid");
|
|
50
|
+
app.post("/requests/:rid/tasks/:tid/review-preview", async (c) => {
|
|
51
|
+
const { targets, viewpoint } = startBody.parse(await c.req.json().catch(() => ({})));
|
|
52
|
+
const p = await svc().preview(rid(c), tid(c), { targets, viewpoint });
|
|
53
|
+
return c.json({ ...previewOf(p.input), engineRequired: p.engineRequired });
|
|
54
|
+
});
|
|
55
|
+
app.get("/requests/:rid/tasks/:tid/reviews", async (c) => c.json({ items: await svc().list(rid(c), tid(c)) }));
|
|
56
|
+
app.post("/requests/:rid/tasks/:tid/reviews", async (c) => {
|
|
57
|
+
const body = startBody.parse(await c.req.json().catch(() => ({})));
|
|
58
|
+
return c.json(await svc().start(rid(c), tid(c), actorOf(c), body), 202);
|
|
59
|
+
});
|
|
60
|
+
app.get("/requests/:rid/tasks/:tid/reviews/:run", async (c) => c.json(await svc().get(rid(c), tid(c), c.req.param("run"))));
|
|
61
|
+
app.post("/requests/:rid/tasks/:tid/reviews/:run/cancel", async (c) => {
|
|
62
|
+
const { acknowledgeStopped } = z.object({ acknowledgeStopped: z.boolean().optional() }).parse(await c.req.json().catch(() => ({})));
|
|
63
|
+
return c.json(await svc().cancel(rid(c), tid(c), c.req.param("run"), actorOf(c), { acknowledgeStopped }));
|
|
64
|
+
});
|
|
65
|
+
return app;
|
|
66
|
+
}
|
package/lib/server/server.js
CHANGED
|
@@ -75,10 +75,10 @@ export async function startServer(opts) {
|
|
|
75
75
|
pending = (await registry.close({ timeoutMs })).pending;
|
|
76
76
|
else if (ctx) {
|
|
77
77
|
const c = ctx;
|
|
78
|
-
const settle = Promise.all([c.preflight.settle({ cancel: true }), c.releaseGenerator.settle({ cancel: true })]).then(() => false);
|
|
78
|
+
const settle = Promise.all([c.preflight.settle({ cancel: true }), c.releaseGenerator.settle({ cancel: true }), c.milestoneReview.settle({ cancel: true }), c.taskReview.settle({ cancel: true })]).then(() => false);
|
|
79
79
|
const timedOut = await Promise.race([settle, new Promise((r) => setTimeout(() => r(true), timeoutMs).unref())]);
|
|
80
80
|
c.ws.close();
|
|
81
|
-
pending = timedOut ? c.preflight.running() + c.releaseGenerator.running() : 0;
|
|
81
|
+
pending = timedOut ? c.preflight.running() + c.releaseGenerator.running() + c.milestoneReview.running() + c.taskReview.running() : 0;
|
|
82
82
|
}
|
|
83
83
|
await Promise.race([closed, new Promise((r) => setTimeout(r, 1000).unref())]);
|
|
84
84
|
return { pending };
|