@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.
Files changed (204) hide show
  1. package/README.md +1 -0
  2. package/bin/p3.mjs +3 -2
  3. package/dist/web/assets/{CompletionReview-gZKZrDu_.js → CompletionReview-BD7d6Yzt.js} +1 -1
  4. package/dist/web/assets/ImprovementDialog-BoAZN1KR.js +1 -0
  5. package/dist/web/assets/{Outputs-BgHalMGb.js → Outputs-D-ZouoxF.js} +1 -1
  6. package/dist/web/assets/{RequestStatus-hZcBUUIu.js → RequestStatus-Bl3fdSbM.js} +1 -1
  7. package/dist/web/assets/{Tabs-C3NmwCc3.js → Tabs-CxeceOL-.js} +1 -1
  8. package/dist/web/assets/{TagInput-B2b862qn.js → TagInput-CeAbmGRR.js} +1 -1
  9. package/dist/web/assets/TaskDrawer-BCriSnhe.js +6 -0
  10. package/dist/web/assets/_requestId-CZKMe_mC.js +1 -0
  11. package/dist/web/assets/_requestId-Fx4lLkFo.js +1 -0
  12. package/dist/web/assets/appCtx-BdxbkSZa.js +1 -0
  13. package/dist/web/assets/archive-D5IIxcSV.js +1 -0
  14. package/dist/web/assets/board-p6R9KMqd.js +1 -0
  15. package/dist/web/assets/done-BTOF188x.js +1 -0
  16. package/dist/web/assets/{draft-BvGxfD7v.js → draft-BWYpm3PD.js} +2 -2
  17. package/dist/web/assets/index-DFbY8NAR.css +2 -0
  18. package/dist/web/assets/index-Dpqi2dcC.js +12 -0
  19. package/dist/web/assets/link-D481whDt.js +1 -0
  20. package/dist/web/assets/metrics-CAzP6V8I.js +1 -0
  21. package/dist/web/assets/new-C65IJJg3.js +1 -0
  22. package/dist/web/assets/preload-helper-_dAYMct_.js +1 -0
  23. package/dist/web/assets/{release-notes-Bpdi6RdY.js → release-notes-Dtif8xsQ.js} +4 -4
  24. package/dist/web/assets/{requestData-CbFxwW5w.js → requestData-SPc36t8Q.js} +1 -1
  25. package/dist/web/assets/routes-DJj8CWuk.js +6 -0
  26. package/dist/web/assets/settings-DKJd7CLe.js +1 -0
  27. package/dist/web/assets/ui-CbEOnPnF.js +1 -0
  28. package/dist/web/assets/{workTarget-CySfKyfB.js → workTarget-DavxMs-c.js} +3 -3
  29. package/dist/web/index.html +6 -4
  30. package/docs/architecture.md +165 -71
  31. package/docs/chatgpt-sign-in.md +2 -2
  32. package/docs/development.md +87 -54
  33. package/docs/feature-inventory.md +139 -0
  34. package/docs/how-to-use.md +10 -5
  35. package/docs/installation.md +31 -8
  36. package/docs/publishing.md +32 -13
  37. package/docs/refactoring.md +332 -0
  38. package/lib/cli/agentsStatus.js +2 -1
  39. package/lib/cli/guide.md +4 -1
  40. package/lib/cli/help.js +1 -1
  41. package/lib/cli/main.js +33 -238
  42. package/lib/cli/project.js +21 -267
  43. package/lib/core/projectRegistry.js +2 -2
  44. package/lib/kit/appInfo.js +13 -0
  45. package/lib/kit/usage.js +27 -0
  46. package/lib/server/api/projectsRoutes.js +5 -5
  47. package/lib/server/server.js +7 -4
  48. package/lib/{cli → tasks/cli}/args.js +2 -2
  49. package/lib/{cli → tasks/cli}/chatgpt.js +1 -1
  50. package/lib/{cli → tasks/cli}/codex.js +1 -1
  51. package/lib/{cli → tasks/cli}/output.js +2 -2
  52. package/lib/{cli → tasks/cli}/preflightCommands.js +1 -1
  53. package/lib/tasks/cli/readOnly.js +75 -0
  54. package/lib/{cli → tasks/cli}/render.js +1 -1
  55. package/lib/{cli → tasks/cli}/requestCommands.js +6 -6
  56. package/lib/{cli → tasks/cli}/showView.js +4 -4
  57. package/lib/{cli → tasks/cli}/taskCommands.js +16 -8
  58. package/lib/tasks/cli/tasksCli.js +149 -0
  59. package/lib/{core → tasks/core}/context.js +6 -9
  60. package/lib/tasks/core/errorOutcome.js +125 -0
  61. package/lib/{core → tasks/core}/hierarchy.js +1 -1
  62. package/lib/{core → tasks/core}/ops.js +6 -4
  63. package/lib/{core → tasks/core}/preflight/codexEngine.js +2 -11
  64. package/lib/{core → tasks/core}/preflight/hostPaths.js +39 -0
  65. package/lib/{core → tasks/core}/preflight/input.js +1 -1
  66. package/lib/{core → tasks/core}/preflight/instructions.js +2 -2
  67. package/lib/{core → tasks/core}/preflight/mockEngine.js +8 -7
  68. package/lib/{core → tasks/core}/preflight/service.js +38 -13
  69. package/lib/{core → tasks/core}/preflight/uiRender.js +2 -2
  70. package/lib/{core → tasks/core}/requestOps.js +19 -14
  71. package/lib/{core → tasks/core}/reviewRuns.js +127 -22
  72. package/lib/{core → tasks/core}/store/attachments.js +3 -2
  73. package/lib/{core → tasks/core}/store/collection.js +2 -2
  74. package/lib/tasks/core/store/fieldGroups.js +30 -0
  75. package/lib/tasks/core/store/jsonRecord.js +30 -0
  76. package/lib/{core → tasks/core}/store/normalize.js +13 -26
  77. package/lib/{core → tasks/core}/store/noteStore.js +2 -2
  78. package/lib/{core → tasks/core}/store/preflightStore.js +44 -21
  79. package/lib/{core → tasks/core}/store/projectFile.js +1 -1
  80. package/lib/{core → tasks/core}/store/workspace.js +11 -5
  81. package/lib/{core → tasks/core}/userConfig.js +1 -1
  82. package/lib/{core → tasks/core}/workTargets.js +1 -1
  83. package/lib/{cli → tasks/features/metrics/cli}/metricsCommands.js +3 -3
  84. package/lib/{core/metrics → tasks/features/metrics/core}/definitions.js +19 -8
  85. package/lib/{core/metrics → tasks/features/metrics/core}/index.js +41 -17
  86. package/lib/{core/metrics → tasks/features/metrics/core}/manual.js +27 -28
  87. package/lib/tasks/features/metrics/server/metricsRoutes.js +8 -0
  88. package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/code.js +2 -11
  89. package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/material.js +5 -6
  90. package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/review.js +2 -2
  91. package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/service.js +38 -100
  92. package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/store.js +3 -3
  93. package/lib/{server/api → tasks/features/milestoneReview/server}/milestoneReviewRoutes.js +7 -13
  94. package/lib/{cli → tasks/features/quality/cli}/qualityCommands.js +3 -3
  95. package/lib/{core → tasks/features/quality/core}/qualityImprovement.js +16 -15
  96. package/lib/{cli → tasks/features/records/cli}/revisitCommands.js +2 -2
  97. package/lib/{core → tasks/features/records/core}/reviewCandidates.js +26 -6
  98. package/lib/{shared → tasks/features/records/shared}/completionRecord.js +5 -3
  99. package/lib/{shared → tasks/features/records/shared}/reviewCandidate.js +13 -8
  100. package/lib/{shared → tasks/features/records/shared}/reworkHistory.js +5 -0
  101. package/lib/{cli → tasks/features/releaseNotes/cli}/releaseNotesCommands.js +7 -7
  102. package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/completeRequests.js +5 -6
  103. package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/generate.js +3 -14
  104. package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/material.js +3 -4
  105. package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/service.js +1 -1
  106. package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/store.js +2 -2
  107. package/lib/{server/api → tasks/features/releaseNotes/server}/releaseNoteRoutes.js +11 -20
  108. package/lib/{cli → tasks/features/requirements/cli}/requirementCommands.js +8 -7
  109. package/lib/{shared → tasks/features/requirements/shared}/acceptance.js +41 -7
  110. package/lib/{cli → tasks/features/retro/cli}/retroCommands.js +1 -1
  111. package/lib/{core → tasks/features/retro/core}/retrospective.js +42 -53
  112. package/lib/tasks/features/settings/cli/projectSettings.js +245 -0
  113. package/lib/{cli → tasks/features/settings/cli}/userConfig.js +5 -5
  114. package/lib/{core → tasks/features/settings/core}/machineSettingsEdit.js +2 -2
  115. package/lib/{core → tasks/features/settings/core}/repoAdmin.js +3 -3
  116. package/lib/{core → tasks/features/settings/core}/userTheme.js +2 -2
  117. package/lib/{server/api → tasks/features/settings/server}/repoRoutes.js +2 -2
  118. package/lib/{server/api → tasks/features/settings/server}/userThemeRoutes.js +3 -3
  119. package/lib/{cli → tasks/features/taskReview/cli}/taskReviewCommands.js +5 -5
  120. package/lib/{core/taskReview → tasks/features/taskReview/core}/material.js +7 -8
  121. package/lib/{core/taskReview → tasks/features/taskReview/core}/review.js +2 -2
  122. package/lib/{core/taskReview → tasks/features/taskReview/core}/service.js +24 -85
  123. package/lib/{core/taskReview → tasks/features/taskReview/core}/store.js +4 -4
  124. package/lib/{server/api → tasks/features/taskReview/server}/taskReviewRoutes.js +7 -14
  125. package/lib/{server → tasks/server}/api/routes.js +24 -75
  126. package/lib/tasks/shared/commitRefs.js +10 -0
  127. package/package.json +1 -44
  128. package/dist/web/assets/ImprovementDialog-Dno6dPnG.js +0 -1
  129. package/dist/web/assets/TaskDrawer-4BQBELXa.js +0 -6
  130. package/dist/web/assets/_requestId-BMAG1t3o.js +0 -1
  131. package/dist/web/assets/_requestId-tbg2pA2S.js +0 -1
  132. package/dist/web/assets/archive-DMl6WyOe.js +0 -1
  133. package/dist/web/assets/board-BMTcHKyt.js +0 -1
  134. package/dist/web/assets/done-CL6Nlsua.js +0 -1
  135. package/dist/web/assets/index-Dp7Fc4VI.css +0 -2
  136. package/dist/web/assets/index-KdlgMitg.js +0 -12
  137. package/dist/web/assets/metrics-Cu7gJ7Rk.js +0 -1
  138. package/dist/web/assets/new-DTXWHuFO.js +0 -1
  139. package/dist/web/assets/preload-helper-oLCrNCwz.js +0 -1
  140. package/dist/web/assets/routes-BIt8bExF.js +0 -6
  141. package/dist/web/assets/settings-CsCqF_1B.js +0 -1
  142. package/dist/web/assets/ui-BGK72r3u.js +0 -1
  143. package/lib/cli/readOnly.js +0 -53
  144. /package/lib/{core/store → kit}/frontmatter.js +0 -0
  145. /package/lib/{core/store → kit}/fsutil.js +0 -0
  146. /package/lib/{cli → tasks/cli}/format.js +0 -0
  147. /package/lib/{core → tasks/core}/chatgpt.js +0 -0
  148. /package/lib/{core → tasks/core}/machineSettings.js +0 -0
  149. /package/lib/{core → tasks/core}/preflight/carryover.js +0 -0
  150. /package/lib/{core → tasks/core}/preflight/codexImage.js +0 -0
  151. /package/lib/{core → tasks/core}/preflight/diagnose.js +0 -0
  152. /package/lib/{core → tasks/core}/preflight/docker.js +0 -0
  153. /package/lib/{core → tasks/core}/preflight/engine.js +0 -0
  154. /package/lib/{core → tasks/core}/preflight/launch.js +0 -0
  155. /package/lib/{core → tasks/core}/preflight/launcher.mjs +0 -0
  156. /package/lib/{core → tasks/core}/preflight/mock-ui.html +0 -0
  157. /package/lib/{core → tasks/core}/preflight/mock-ui.png +0 -0
  158. /package/lib/{core → tasks/core}/preflight/owner.js +0 -0
  159. /package/lib/{core → tasks/core}/preflight/render-image/Dockerfile +0 -0
  160. /package/lib/{core → tasks/core}/preflight/render-image/fonts-ja.conf +0 -0
  161. /package/lib/{core → tasks/core}/preflight/render-image/render.mjs +0 -0
  162. /package/lib/{core → tasks/core}/preflight/render.js +0 -0
  163. /package/lib/{core → tasks/core}/preflight/split.js +0 -0
  164. /package/lib/{core → tasks/core}/preflight/uiMaterials.js +0 -0
  165. /package/lib/{core → tasks/core}/preflight/wireframe.js +0 -0
  166. /package/lib/{core → tasks/core}/preflight/xlsx.js +0 -0
  167. /package/lib/{core → tasks/core}/redact.js +0 -0
  168. /package/lib/{core → tasks/core}/repoRefs.js +0 -0
  169. /package/lib/{core → tasks/core}/requestStatus.js +0 -0
  170. /package/lib/{core → tasks/core}/store/archivedTasks.js +0 -0
  171. /package/lib/{core → tasks/core}/store/dataWatcher.js +0 -0
  172. /package/lib/{core → tasks/core}/store/locate.js +0 -0
  173. /package/lib/{core → tasks/core}/supersede.js +0 -0
  174. /package/lib/{shared → tasks/features/metrics/shared}/metrics.js +0 -0
  175. /package/lib/{core/milestoneReview → tasks/features/milestoneReview/core}/mockReviewer.js +0 -0
  176. /package/lib/{shared → tasks/features/milestoneReview/shared}/milestoneReview.js +0 -0
  177. /package/lib/{core → tasks/features/quality/core}/quality.js +0 -0
  178. /package/lib/{shared → tasks/features/quality/shared}/quality.js +0 -0
  179. /package/lib/{shared → tasks/features/quality/shared}/qualityImprovement.js +0 -0
  180. /package/lib/{shared → tasks/features/quality/shared}/qualityTemplates.js +0 -0
  181. /package/lib/{core → tasks/features/records/core}/completionRefs.js +0 -0
  182. /package/lib/{core/releaseNotes → tasks/features/releaseNotes/core}/mockSummarizer.js +0 -0
  183. /package/lib/{shared → tasks/features/requirements/shared}/requirementSource.js +0 -0
  184. /package/lib/{shared → tasks/features/retro/shared}/retrospective.js +0 -0
  185. /package/lib/{core/taskReview → tasks/features/taskReview/core}/mockReviewer.js +0 -0
  186. /package/lib/{core/taskReview → tasks/features/taskReview/core}/paths.js +0 -0
  187. /package/lib/{shared → tasks/features/taskReview/shared}/taskReview.js +0 -0
  188. /package/lib/{server → tasks/server}/api/chatgptRoutes.js +0 -0
  189. /package/lib/{server → tasks/server}/api/local.js +0 -0
  190. /package/lib/{server → tasks/server}/api/manifest.js +0 -0
  191. /package/lib/{shared → tasks/shared}/dates.js +0 -0
  192. /package/lib/{shared → tasks/shared}/directTask.js +0 -0
  193. /package/lib/{shared → tasks/shared}/hierarchy.js +0 -0
  194. /package/lib/{shared → tasks/shared}/milestoneGoals.js +0 -0
  195. /package/lib/{shared → tasks/shared}/milestoneOrder.js +0 -0
  196. /package/lib/{shared → tasks/shared}/preflightInput.js +0 -0
  197. /package/lib/{shared → tasks/shared}/preflightRunner.js +0 -0
  198. /package/lib/{shared → tasks/shared}/refs.js +0 -0
  199. /package/lib/{shared → tasks/shared}/repos.js +0 -0
  200. /package/lib/{shared → tasks/shared}/scopeView.js +0 -0
  201. /package/lib/{shared → tasks/shared}/tags.js +0 -0
  202. /package/lib/{shared → tasks/shared}/taskBlock.js +0 -0
  203. /package/lib/{shared → tasks/shared}/types.js +0 -0
  204. /package/lib/{shared → tasks/shared}/workTarget.js +0 -0
@@ -2,7 +2,7 @@ import { readdir } from "node:fs/promises";
2
2
  import { join } from "node:path";
3
3
  import { Hierarchy } from "../shared/hierarchy.js";
4
4
  import { REQUEST_ID } from "../shared/refs.js";
5
- import { withFileLock } from "./store/fsutil.js";
5
+ import { withFileLock } from "../../kit/fsutil.js";
6
6
  /** 親子の規則に合わない・ロックを取れない(何も書いていない) */
7
7
  export class HierarchyError extends Error {
8
8
  code;
@@ -1,8 +1,8 @@
1
- import { evidenceSummary } from "../shared/acceptance.js";
1
+ import { evidenceSummary } from "../features/requirements/shared/acceptance.js";
2
2
  import { normalizeTaskId } from "../shared/refs.js";
3
3
  import { REQUEST_STATUSES, TASK_STATUSES } from "../shared/types.js";
4
4
  import { hierarchyNow } from "./requestStatus.js";
5
- import { requestReviewCounts, taskReview } from "./reviewCandidates.js";
5
+ import { requestReviewCounts, reviewMemo, taskReview } from "../features/records/core/reviewCandidates.js";
6
6
  export function listTasks(ctx, f = {}) {
7
7
  const { ws } = ctx;
8
8
  let tasks = f.request ? ws.tasksOf(f.request).list() : ws.allTasks();
@@ -82,6 +82,8 @@ export function titleOf({ ws }, ref) {
82
82
  */
83
83
  export function progress(ctx) {
84
84
  const h = hierarchyNow(ctx.ws);
85
+ // 見直しの診断はこの呼び出しの中で使い回す(タスク行と、要望の自身・自分のタスク・配下の件数で同じ結果を使う)
86
+ const memo = reviewMemo(ctx);
85
87
  const zero = () => Object.fromEntries(TASK_STATUSES.map((s) => [s, 0]));
86
88
  return ctx.ws.requests
87
89
  .list()
@@ -120,7 +122,7 @@ export function progress(ctx) {
120
122
  // 証拠の小さな概要(本文は載せない。規則は shared/acceptance.ts)
121
123
  const evidence = evidenceSummary(t);
122
124
  // 完了したタスクの見直しの診断の状態(理由は詳細で読む)
123
- const review = taskReview(ctx, t)?.state;
125
+ const review = memo.task(t)?.state;
124
126
  return { id, ref, title, status, createdAt, startedAt, doneAt, checkedAt, ...(block ? { block } : {}), ...(evidence ? { evidence } : {}), ...(review ? { review } : {}) };
125
127
  }),
126
128
  counts,
@@ -131,7 +133,7 @@ export function progress(ctx) {
131
133
  children: h.children(request.id).map((c) => c.id),
132
134
  subtree: sub,
133
135
  hierarchyIssues: h.issuesAround(request.id),
134
- review: requestReviewCounts(ctx, request, h),
136
+ review: requestReviewCounts(ctx, request, h, memo),
135
137
  };
136
138
  })
137
139
  .sort((a, b) => b.updatedAt.localeCompare(a.updatedAt) || byId(a.request.id, b.request.id));
@@ -51,7 +51,6 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
51
51
  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
52
52
  });
53
53
  import { execFile } from "node:child_process";
54
- import { readFileSync } from "node:fs";
55
54
  import { join } from "node:path";
56
55
  import { promisify } from "node:util";
57
56
  import { ACCESS_TOKEN_ENV, CONTAINER_WORKSPACE, DEFAULT_IMAGE, UsageLimitError, WorkspaceSession, dockerCommand, } from "@infodb/codex-workspace";
@@ -65,17 +64,9 @@ import { resolveHostPaths, unresolvedMessage } from "./hostPaths.js";
65
64
  import { prepareLaunch } from "./launch.js";
66
65
  import { hideConfigPath } from "../userConfig.js";
67
66
  import { CONTAINER_DATA, containerEnv, developerInstructions, entryMissing, preflightPrompt } from "./instructions.js";
67
+ import { appVersion } from "../../../kit/appInfo.js";
68
68
  import {} from "./engine.js";
69
69
  const run = promisify(execFile);
70
- /** initialize で名乗る版(P3 の package.json) */
71
- const P3_VERSION = (() => {
72
- try {
73
- return JSON.parse(readFileSync(new URL("../../../package.json", import.meta.url), "utf8")).version ?? "0.0.0";
74
- }
75
- catch {
76
- return "0.0.0";
77
- }
78
- })();
79
70
  /** マシンごとの設定(環境変数と個人設定。→ machineSettings.ts)から */
80
71
  export function codexConfig({ codex }) {
81
72
  return {
@@ -442,7 +433,7 @@ export class CodexWorkspaceEngine {
442
433
  effort: cfg.effort,
443
434
  env,
444
435
  // ChatGPT プランでは、登録のときの agent_name_hint と同じ名前で名乗る
445
- clientInfo: { name: APP_NAME, title: "infodb p3", version: P3_VERSION },
436
+ clientInfo: { name: APP_NAME, title: "infodb p3", version: appVersion() },
446
437
  onEvent: (e) => logEvent(e, log),
447
438
  });
448
439
  }
@@ -155,8 +155,40 @@ async function identify(probe, signal) {
155
155
  return {
156
156
  env: { kind: "container-unknown", reason: "self-mismatch", detail: "docker inspect で見つけたコンテナのホスト名が、このマシンのホスト名と合いません" },
157
157
  };
158
+ if (mountsDisagree(c, parseMountinfo(mountinfo ?? ""), probe))
159
+ return {
160
+ env: {
161
+ kind: "container-unknown",
162
+ reason: "self-mismatch",
163
+ detail: `docker inspect で見つけたコンテナのマウントの元が、このマシンのマウントと合いません(${SHARED_HINT})`,
164
+ },
165
+ };
158
166
  return { env: { kind: "container", containerId: c.Id }, container: c };
159
167
  }
168
+ /** ネットワークを共有する構成の説明(止める理由に添える) */
169
+ const SHARED_HINT = "Compose の network_mode: service:・--network container: でネットワークを共有するコンテナでは、共有元を自分と取り違えることがあります";
170
+ /**
171
+ * 見つけたコンテナの bind が、このマシンのマウントと合わないか。mountinfo の root(マウントの元のファイルシステムの中のパス)は、
172
+ * bind の Source の末尾と一致するはず(ファイルシステムの丸ごとの bind は root が / なので比べない)。マウント先が mountinfo に
173
+ * 無いもの(/var/run → /run のようにリンクを辿っても見つからないもの)は比べない。ホストでシンボリックリンクを通して bind すると
174
+ * Source はリンクのまま・root は実体になり、合わないと判定する(自動では決めず、手で書いてもらう。取り違えて別のフォルダを
175
+ * マウントするより安全な側に倒す)
176
+ */
177
+ function mountsDisagree(c, mounts, probe) {
178
+ for (const m of c.Mounts ?? []) {
179
+ if (m.Type !== "bind" || !m.Destination || !m.Source?.startsWith("/"))
180
+ continue;
181
+ const at = probe.realpath(trimSlash(m.Destination));
182
+ const mine = mounts.findLast((x) => x.mountPoint === at);
183
+ if (!mine || mine.root === "/")
184
+ continue;
185
+ const root = trimSlash(mine.root);
186
+ const src = trimSlash(m.Source);
187
+ if (src !== root && !src.endsWith(root))
188
+ return true;
189
+ }
190
+ return false;
191
+ }
160
192
  /** 自分のコンテナのマウントから1つのパスを求める */
161
193
  function fromMounts(local, mounts, c, probe) {
162
194
  const real = probe.realpath(local);
@@ -164,6 +196,13 @@ function fromMounts(local, mounts, c, probe) {
164
196
  if (!m || m.mountPoint === "/")
165
197
  return { ok: false, reason: "container-layer", detail: "このフォルダはホストのフォルダ(bind マウント)の下にありません(コンテナの中だけにある)" };
166
198
  const mount = (c.Mounts ?? []).find((x) => x.Destination && trimSlash(x.Destination) === m.mountPoint);
199
+ // ファイルシステムの一部を付けたマウント(bind の形)なのに、自分のコンテナの Mounts に無い: 共有元を自分と取り違えている
200
+ if (!mount && m.root !== "/")
201
+ return {
202
+ ok: false,
203
+ reason: "self-mismatch",
204
+ detail: `このフォルダのマウントが、docker inspect で見つけたコンテナのマウントにありません(${SHARED_HINT})`,
205
+ };
167
206
  if (!mount)
168
207
  return {
169
208
  ok: false,
@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
2
2
  import { readFile } from "node:fs/promises";
3
3
  import { join } from "node:path";
4
4
  import { changedLabel, normalizeInput } from "../../shared/preflightInput.js";
5
- import { readRequirement, renderRequirement, requestSubject, requirementInputKey, requirementInputOf } from "../../shared/requirementSource.js";
5
+ import { readRequirement, renderRequirement, requestSubject, requirementInputKey, requirementInputOf } from "../../features/requirements/shared/requirementSource.js";
6
6
  export { normalizeInput };
7
7
  /**
8
8
  * Preflight の評価対象(要望のタイトルと本文)の固定と比較。正規化の規則は shared/preflightInput.ts。
@@ -6,8 +6,8 @@ import { gitHistory, refScope } from "../repoRefs.js";
6
6
  import { writableRepos } from "../../shared/workTarget.js";
7
7
  import { SPLIT_HINT_TASKS } from "../../shared/hierarchy.js";
8
8
  import { ASSESSMENT_SPEC, CHILD_SPEC, DRAFT_SPEC, SPLIT_GUIDE } from "./engine.js";
9
- import { checkLine } from "../../shared/quality.js";
10
- import { renderRequirement, requestSubject, requirementInputOf } from "../../shared/requirementSource.js";
9
+ import { checkLine } from "../../features/quality/shared/quality.js";
10
+ import { renderRequirement, requestSubject, requirementInputOf } from "../../features/requirements/shared/requirementSource.js";
11
11
  /** コンテナの中でデータディレクトリをマウントする場所 */
12
12
  export const CONTAINER_DATA = "/data";
13
13
  /** Codex(コンテナの中)から見たパス */
@@ -1,10 +1,11 @@
1
- import { ASK_UNKNOWN } from "../../shared/requirementSource.js";
1
+ import { ASK_UNKNOWN } from "../../features/requirements/shared/requirementSource.js";
2
2
  import { writableRepos } from "../../shared/workTarget.js";
3
3
  import { mkdir, readFile, writeFile } from "node:fs/promises";
4
4
  import { join, relative } from "node:path";
5
5
  import { SPLIT_HINT_TASKS } from "../../shared/hierarchy.js";
6
- import { stringifyFrontmatter } from "../store/frontmatter.js";
7
- import { writeFileAtomic } from "../store/fsutil.js";
6
+ import { stringifyFrontmatter } from "../../../kit/frontmatter.js";
7
+ import { writeFileAtomic } from "../../../kit/fsutil.js";
8
+ import { writeJsonRecord } from "../store/jsonRecord.js";
8
9
  const wait = (ms, signal) => new Promise((res, rej) => {
9
10
  const t = setTimeout(res, ms);
10
11
  signal.addEventListener("abort", () => (clearTimeout(t), rej(new Error("aborted"))), { once: true });
@@ -126,14 +127,14 @@ export class MockEngine {
126
127
  reasons: [split ? `mock: 箇条書きが ${SPLIT_HINT_TASKS} 件以上` : `mock: 箇条書きが ${SPLIT_HINT_TASKS} 件未満`],
127
128
  },
128
129
  };
129
- await writeFileAtomic(join(job.runDir, "assessment.json"), JSON.stringify(assessment, null, 2) + "\n");
130
+ await writeJsonRecord(join(job.runDir, "assessment.json"), assessment);
130
131
  if (split) {
131
132
  for (const c of children) {
132
133
  const { description, ...meta } = c;
133
134
  await writeFileAtomic(join(job.runDir, "children", `${c.key}.md`), stringifyFrontmatter(meta, description));
134
135
  log({ kind: "info", text: `✎ ${relative(job.dataDir, join(job.runDir, "children", `${c.key}.md`))}` });
135
136
  }
136
- await writeFileAtomic(join(job.runDir, "ui", "index.json"), JSON.stringify({ needed: false, reason: "mock: 子の要望に分けたので、画面イメージは子の Preflight で作ります" }, null, 2) + "\n");
137
+ await writeJsonRecord(join(job.runDir, "ui", "index.json"), { needed: false, reason: "mock: 子の要望に分けたので、画面イメージは子の Preflight で作ります" });
137
138
  log({ kind: "message", text: assessment.summary });
138
139
  return { changed: [join(job.runDir, "assessment.json"), ...children.map((c) => join(job.runDir, "children", `${c.key}.md`)), join(job.runDir, "ui", "index.json")] };
139
140
  }
@@ -161,7 +162,7 @@ async function writeMockUi(job, drafts) {
161
162
  const ui = join(job.runDir, "ui");
162
163
  const r = job.request;
163
164
  if (!drafts.length || !UI_WORDS.test(`${r.title}\n${r.body}`)) {
164
- await writeFileAtomic(join(ui, "index.json"), JSON.stringify({ needed: false, reason: "mock: 要望に画面に関わる語が無いので、画面を伴わない変更とみなしました" }, null, 2) + "\n");
165
+ await writeJsonRecord(join(ui, "index.json"), { needed: false, reason: "mock: 要望に画面に関わる語が無いので、画面を伴わない変更とみなしました" });
165
166
  return [];
166
167
  }
167
168
  const target = drafts[0].key;
@@ -184,7 +185,7 @@ async function writeMockUi(job, drafts) {
184
185
  },
185
186
  ],
186
187
  };
187
- await writeFileAtomic(join(ui, "index.json"), JSON.stringify(index, null, 2) + "\n");
188
+ await writeJsonRecord(join(ui, "index.json"), index);
188
189
  return [join(ui, "U1.png"), join(ui, "src", "U1.html"), join(ui, "index.json")];
189
190
  }
190
191
  const MOCK_HTML = new URL("./mock-ui.html", import.meta.url);
@@ -4,10 +4,10 @@ import { isAbsolute, join, relative } from "node:path";
4
4
  import { createHash, randomBytes } from "node:crypto";
5
5
  import {} from "../../shared/types.js";
6
6
  import { normalizeTaskId, REQUEST_ID } from "../../shared/refs.js";
7
- import { AcceptanceInputError, applyAcceptanceOps, applyDraftSourceOps, criteriaForTask, sameCriteria, sameSources, settleDraftSources, tidyDraftCriteria } from "../../shared/acceptance.js";
8
- import { readClarifications, readCriterionSources, RequirementInputError, requirementInputOf } from "../../shared/requirementSource.js";
9
- import { qualityCriteria, qualitySnapshot } from "../../shared/quality.js";
10
- import { newRequestId, nowIso, withFileLock, writeFileAtomic } from "../store/fsutil.js";
7
+ import { AcceptanceInputError, applyAcceptanceOps, applyDraftSourceOps, criteriaForTask, readDraftCriteria, readSourceSeq, sameCriteria, sameSources, settleDraftSources, tidyDraftCriteria } from "../../features/requirements/shared/acceptance.js";
8
+ import { readClarifications, readCriterionSources, RequirementInputError, requirementInputOf } from "../../features/requirements/shared/requirementSource.js";
9
+ import { qualityCriteria, qualitySnapshot } from "../../features/quality/shared/quality.js";
10
+ import { newRequestId, nowIso, withFileLock, writeFileAtomic } from "../../../kit/fsutil.js";
11
11
  import { ConflictError, NotFoundError } from "../store/collection.js";
12
12
  import { supersedeCandidates } from "../supersede.js";
13
13
  import { hierarchyNow, reopenAncestors } from "../requestStatus.js";
@@ -829,6 +829,10 @@ export class PreflightService {
829
829
  * (その場合は確かめない)。期待値はファイルに書かない。読んでから書くまでの間に外のプロセスが書くことまでは防げない
830
830
  */
831
831
  async updateDraft(requestId, runId, key, patch, opts = {}) {
832
+ // 読み直し・競合の確認・根拠の採番・保存を同じ排他の中で行う
833
+ return this.ws.preflight.withDraftLock(requestId, runId, key, () => this.updateDraftLocked(requestId, runId, key, patch, opts));
834
+ }
835
+ async updateDraftLocked(requestId, runId, key, patch, opts = {}) {
832
836
  const run = await this.ws.preflight.get(requestId, runId);
833
837
  const draft = run?.drafts.find((d) => d.key === key);
834
838
  if (!run || !draft)
@@ -845,19 +849,27 @@ export class PreflightService {
845
849
  if ("repo" in patch)
846
850
  checkRepoTarget(this.ws, patch.repo);
847
851
  // 基準は並び全体の置き換え(id は残し、無い項目に振る。空の並びは基準なし)。直せば読めなかった理由も消える
848
- const { acceptanceCriteria: rawCriteria, acceptanceProblems: _p, sourceOps, ...rest } = patch;
852
+ // 根拠の採番(acceptanceSourceSeq)は p3 が振る。patch から上書きしない
853
+ const { acceptanceCriteria: rawCriteria, acceptanceProblems: _p, acceptanceSourceSeq: _sq, sourceOps, ...rest } = patch;
849
854
  const criteria = rawCriteria !== undefined ? tidyDraftCriteria(rawCriteria) : undefined;
850
- // 根拠の記録が読めないとき: 操作は断り、関係のない更新ではファイルの元の値のまま書き戻す
855
+ // 根拠の記録が読めないとき: 操作は断り、関係のない更新ではファイルの元の値のまま書き戻す(基準も、置き換えないなら同じ)
856
+ const rawCriteriaFile = await this.ws.preflight.rawDraftField(requestId, runId, key, "acceptanceCriteria");
851
857
  const rawSources = await this.ws.preflight.rawDraftField(requestId, runId, key, "acceptanceSources");
858
+ const rawSourceSeq = await this.ws.preflight.rawDraftField(requestId, runId, key, "acceptanceSourceSeq");
852
859
  const sourceProblems = [];
853
860
  readCriterionSources(rawSources, sourceProblems);
861
+ readSourceSeq(rawSourceSeq, sourceProblems);
854
862
  if (sourceProblems.length && sourceOps?.length)
855
863
  throw new AcceptanceInputError(`${key} の要求の根拠の記録が読めないため変えられません。ファイルを直してください: ${sourceProblems.join(" / ")}`);
856
864
  const now = new Date().toISOString();
857
865
  const finalCriteria = rawCriteria !== undefined ? (criteria.length ? criteria : undefined) : draft.acceptanceCriteria;
858
866
  let sources = draft.acceptanceSources;
859
- if (sourceOps?.length)
860
- sources = applyDraftSourceOps(finalCriteria, sources, sourceOps, { now, actor: opts.actor, requestSources: this.ws.requests.get(requestId)?.requirementSources ?? [] });
867
+ let sourceSeqNext = draft.acceptanceSourceSeq;
868
+ if (sourceOps?.length) {
869
+ const r = applyDraftSourceOps(finalCriteria, sources, sourceOps, { now, actor: opts.actor, requestSources: this.ws.requests.get(requestId)?.requirementSources ?? [] }, draft.acceptanceSourceSeq);
870
+ sources = r.sources;
871
+ sourceSeqNext = r.seq > 0 ? r.seq : undefined;
872
+ }
861
873
  else if (rawCriteria !== undefined)
862
874
  sources = settleDraftSources(finalCriteria, sources, now);
863
875
  const next = {
@@ -866,12 +878,21 @@ export class PreflightService {
866
878
  key,
867
879
  ...(rawCriteria !== undefined ? { acceptanceCriteria: finalCriteria, acceptanceProblems: undefined } : {}),
868
880
  acceptanceSources: sources?.length ? sources : undefined,
881
+ acceptanceSourceSeq: sourceSeqNext,
882
+ };
883
+ const keep = {
884
+ ...(rawCriteria === undefined && readDraftCriteria(rawCriteriaFile).problems ? { acceptanceCriteria: rawCriteriaFile } : {}),
885
+ ...(sourceProblems.length ? { acceptanceSources: rawSources, acceptanceSourceSeq: rawSourceSeq } : {}),
869
886
  };
870
- if (sourceProblems.length)
871
- await this.ws.preflight.saveDraftRaw(requestId, runId, next, { acceptanceSources: rawSources });
887
+ if (Object.keys(keep).length)
888
+ await this.ws.preflight.saveDraftRaw(requestId, runId, next, keep);
872
889
  else
873
890
  await this.ws.preflight.saveDraft(requestId, runId, next);
874
- return sourceProblems.length ? { ...next, acceptanceSources: undefined, acceptanceProblems: [...(next.acceptanceProblems ?? []), ...sourceProblems] } : next;
891
+ // 応答は保存したファイルを再読込と同じ規則で読み直したもの(読めない理由を二重にせず、読めた値も再読込と揃える)
892
+ const saved = await this.ws.preflight.loadDraft(requestId, runId, key);
893
+ if (!saved)
894
+ throw new Error(`${runId}/${key} not found`);
895
+ return saved;
875
896
  }
876
897
  /**
877
898
  * run の評価対象と今の要望が同じか。fresh: 要望をディスクから読み直してから比べる(タスク化の直前など)。
@@ -1144,7 +1165,7 @@ export class PreflightService {
1144
1165
  outputs: [],
1145
1166
  relations: supersedes(d),
1146
1167
  // 案の受け入れ基準を ID ごと写し、作業先に当てはまる品質基準(始めたときの版)を出典つきで足す(採用した案だけ。やり直しで作ったタスクは上書きしない)
1147
- ...withQuality(criteriaForTask(d.acceptanceCriteria, d.acceptanceSources, request.requirementSources), run.quality, draftRepo(d)),
1168
+ ...withQuality(criteriaForTask(d.acceptanceCriteria, d.acceptanceSources, request.requirementSources, undefined, d.acceptanceSourceSeq), run.quality, draftRepo(d)),
1148
1169
  body: `${d.description}\n\n${marker}`,
1149
1170
  }, actor));
1150
1171
  if (state.created[d.key] !== t.id) {
@@ -1377,7 +1398,11 @@ function verifiedProblem(ev, refs) {
1377
1398
  return `${ev.repo}:${file} がありません`;
1378
1399
  return undefined;
1379
1400
  }
1380
- /** 構造化した確認事項(壊れた項目は黙って捨てず clarificationProblems に理由を残す。Codex・手元のエージェントで同じ) */
1401
+ /**
1402
+ * 構造化した確認事項を読む(壊れた項目は黙って捨てず clarificationProblems に理由を残す)。この読み取りは Codex・手元のエージェントで
1403
+ * 共通だが、確定の規則はエンジンで違う: Codex の取り込み(ingest)は理由をログにも残して取り込み、手元のエージェント(localProblems)は
1404
+ * 直すまで確定を断る
1405
+ */
1381
1406
  function clarificationsOf(v) {
1382
1407
  const { clarifications, problems } = readClarifications(v);
1383
1408
  return { ...(clarifications ? { clarifications } : {}), ...(problems ? { clarificationProblems: problems } : {}) };
@@ -1,6 +1,6 @@
1
1
  import { lstat, readFile } from "node:fs/promises";
2
2
  import { join } from "node:path";
3
- import { writeFileAtomic } from "../store/fsutil.js";
3
+ import { writeJsonRecord } from "../store/jsonRecord.js";
4
4
  import { RENDER_LIMITS, RenderError, renderHtml } from "./render.js";
5
5
  import { safeRelative, UI_DIR, UI_INDEX } from "./uiMaterials.js";
6
6
  /**
@@ -88,5 +88,5 @@ export async function renderManuscripts(runDir, opts) {
88
88
  }
89
89
  }
90
90
  if (forged || jobs.length || items.some((x) => x.renderError))
91
- await writeFileAtomic(indexFile, JSON.stringify(index, null, 2) + "\n");
91
+ await writeJsonRecord(indexFile, index);
92
92
  }
@@ -1,13 +1,14 @@
1
- import { acceptanceChanged, applyAcceptanceOps } from "../shared/acceptance.js";
2
- import { readManual } from "./metrics/manual.js";
1
+ import { REQUEST_FIELD_GROUPS, TASK_FIELD_GROUPS, withoutManaged } from "./store/fieldGroups.js";
2
+ import { acceptanceChanged, acceptanceSeqChanged, applyAcceptanceOps, recordedSourceSeq } from "../features/requirements/shared/acceptance.js";
3
+ import { readManual } from "../features/metrics/core/manual.js";
3
4
  import { applyBlockOp, checkBlockedStatus } from "../shared/taskBlock.js";
4
- import { qualityCriteria, standardHash, taskQualityDiff } from "../shared/quality.js";
5
- import { answersKey, applySourceOps, makeAnswer, putAnswer, requestSubject, RequirementInputError, settleSources, sourceSeq, sourcesKey, } from "../shared/requirementSource.js";
5
+ import { qualityCriteria, standardHash, taskQualityDiff } from "../features/quality/shared/quality.js";
6
+ import { answersKey, applySourceOps, makeAnswer, putAnswer, requestSubject, RequirementInputError, settleSources, sourceSeq, sourcesKey, } from "../features/requirements/shared/requirementSource.js";
6
7
  import { defaultRepo } from "../shared/workTarget.js";
7
- import { appendCompletion, COMPLETION_SKIPPED, requestCompletionRecord, requestTriggers, taskCompletionRecord, taskTriggers } from "../shared/completionRecord.js";
8
- import { captureRefs } from "./completionRefs.js";
9
- import { appendRework, reworkOf, REWORK_SKIPPED } from "../shared/reworkHistory.js";
10
- import { applyPremiseOp, PremiseInputError } from "../shared/reviewCandidate.js";
8
+ import { appendCompletion, COMPLETION_SKIPPED, requestCompletionRecord, requestTriggers, taskCompletionRecord, taskTriggers } from "../features/records/shared/completionRecord.js";
9
+ import { captureRefs } from "../features/records/core/completionRefs.js";
10
+ import { appendRework, reworkOf, REWORK_SKIPPED } from "../features/records/shared/reworkHistory.js";
11
+ import { applyPremiseOp, PremiseInputError } from "../features/records/shared/reviewCandidate.js";
11
12
  import { withArchiveCheck, withChildOrder, withNewChild, withParentChange } from "./hierarchy.js";
12
13
  import { checkStatusChange, reopenAncestors, reopenIfNeeded } from "./requestStatus.js";
13
14
  import { startWarnings } from "./supersede.js";
@@ -168,7 +169,7 @@ export async function createTask(ctx, rid, { criteria, quality, ...input }, acto
168
169
  // 受け入れ基準は文の並びで受け取り、ID(A1, A2, ...)はここで振る(基準・証拠をそのまま渡す道は持たない)
169
170
  // 停止は作るときには付けない(作業中にしてから block で付ける)
170
171
  // 完了の記録は p3 が作る(値をそのまま書く道は持たない)
171
- const { acceptanceCriteria: _c, acceptanceEvidence: _e, acceptanceSeq: _s, acceptanceSources: _as, acceptanceProblems: _p, block: _b, blockHistory: _bh, blockProblems: _bp, completionRecords: _cr, completionProblems: _cp, reworkHistory: _rh, reworkProblems: _rp, ...plain } = input;
172
+ const plain = withoutManaged(input, TASK_FIELD_GROUPS);
172
173
  // 品質基準: 作業先があれば当てはまるものを取り込む(auto)。作業先なしは明示したものだけ。none は取り込まない
173
174
  const fromQuality = qualityOpsFor(ctx, repo, quality ?? "auto");
174
175
  const ops = [...(criteria ?? []).map((text) => ({ op: "add", text })), ...fromQuality];
@@ -195,7 +196,7 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
195
196
  const { checked, acceptance, blockOp, ...rest } = patch;
196
197
  // 基準・証拠は操作(acceptance)、停止は操作(blockOp)でだけ変える(値・履歴をそのまま書く道は持たない)
197
198
  // 完了の記録は p3 が作る(値をそのまま書く道は持たない)
198
- const { acceptanceCriteria: _c, acceptanceEvidence: _e, acceptanceSeq: _s, acceptanceSources: _as, acceptanceProblems: _p, block: _b, blockHistory: _bh, blockProblems: _bp, completionRecords: _cr, completionProblems: _cp, reworkHistory: _rh, reworkProblems: _rp, ...plain } = rest;
199
+ const plain = withoutManaged(rest, TASK_FIELD_GROUPS);
199
200
  const next = { ...plain };
200
201
  if ("repo" in patch) {
201
202
  checkRepoTarget(ctx.ws, patch.repo);
@@ -251,9 +252,13 @@ export async function updateTask(ctx, rid, tid, patch, opts = {}) {
251
252
  };
252
253
  if (!acceptance?.length)
253
254
  return withRecords(out, false);
254
- const changedTo = applyAcceptanceOps(fresh, acceptance, { now, actor: opts.actor, requestSources: ctx.ws.requests.get(rid)?.requirementSources ?? [] });
255
- if (!acceptanceChanged(fresh, changedTo))
256
- return withRecords(out, false);
255
+ // 根拠の番号は、保存した番号・今ある記録・完了の記録の写しに残る番号の続き(旧データでも写しに残る番号は使い直さない)
256
+ const changedTo = applyAcceptanceOps(fresh, acceptance, { now, actor: opts.actor, requestSources: ctx.ws.requests.get(rid)?.requirementSources ?? [], sourceSeqFloor: recordedSourceSeq(fresh.completionRecords) });
257
+ if (!acceptanceChanged(fresh, changedTo)) {
258
+ // 中身は同じでも(同じ操作の中で足して消したなど)採番が進んだら、採番だけを書く(済み・完了の記録・手戻りは中身の変化として扱わない)
259
+ const seqOnly = acceptanceSeqChanged(fresh, changedTo) ? { acceptanceSeq: changedTo.acceptanceSeq, acceptanceSourceSeq: changedTo.acceptanceSourceSeq } : {};
260
+ return withRecords({ ...out, ...seqOnly }, false);
261
+ }
257
262
  // 済みの後に中身が変わった(同じ操作で済みを付け直すときは外さない)
258
263
  const clear = !!fresh.checkedAt && !("checkedAt" in next);
259
264
  if (clear)
@@ -299,7 +304,7 @@ export async function createRequest(ctx, input, actor) {
299
304
  export async function updateRequest(ctx, rid, input, opts = {}) {
300
305
  // 要求の根拠・回答は操作(updateRequirement・answerClarification)でだけ変える(値をそのまま書く道は持たない)
301
306
  // 完了の記録も p3 が作る
302
- const { requirementSources: _rs, requirementSeq: _sq, clarifyAnswers: _ca, requirementProblems: _rp, completionRecords: _cr, completionProblems: _cp, premiseChanges: _pc, premiseProblems: _pp, ...patch } = input;
307
+ const patch = withoutManaged(input, REQUEST_FIELD_GROUPS);
303
308
  checkMilestone(ctx, patch.milestone);
304
309
  await checkStatusChange(ctx.ws, rid, patch.status);
305
310
  // 対応済・完了済になりうる更新なら、参照先を書く前に取る
@@ -1,6 +1,8 @@
1
- import { readdir, readFile } from "node:fs/promises";
1
+ import { readdir } from "node:fs/promises";
2
2
  import { ownerState, systemProbe } from "./preflight/owner.js";
3
- import { writeFileAtomic } from "./store/fsutil.js";
3
+ import { readJsonRecord, writeJsonRecord } from "./store/jsonRecord.js";
4
+ import { ChatGptAuthError } from "./chatgpt.js";
5
+ import { CodexUnavailableError, CodexUsageLimitError } from "./preflight/codexEngine.js";
4
6
  /**
5
7
  * レビューの実行の記録の共通部分(マイルストーンレビュー・タスクの AI レビュー)。比較材料と結果の形は各レビューに残し、ここには
6
8
  * 「保存の仕方」と「実行中の run の扱い」だけを置く。
@@ -27,27 +29,27 @@ export class ReviewCancelRefused extends Error {
27
29
  this.code = code;
28
30
  }
29
31
  }
30
- export async function writeJson(path, v) {
31
- await writeFileAtomic(path, `${JSON.stringify(v, null, 2)}\n`);
32
- }
33
- export async function readJson(path, label, check) {
34
- let text;
35
- try {
36
- text = await readFile(path, "utf8");
37
- }
38
- catch (e) {
39
- if (e.code === "ENOENT")
32
+ export const writeJson = writeJsonRecord;
33
+ /** run の記録を読む(無ければ not_found、JSON として読めない・形が違えば broken) */
34
+ export function readJson(path, label, check) {
35
+ const broken = (m) => new ReviewStoreError("broken", `レビューの記録を読めません: ${label}(${m})`);
36
+ return readJsonRecord(path, {
37
+ missing: () => {
40
38
  throw new ReviewStoreError("not_found", `レビューの記録がありません: ${label}`);
41
- throw e;
42
- }
43
- try {
44
- const v = JSON.parse(text);
45
- check(v);
46
- return v;
47
- }
48
- catch (e) {
49
- throw new ReviewStoreError("broken", `レビューの記録を読めません: ${label}(${e.message})`);
50
- }
39
+ },
40
+ invalidJson: (m) => {
41
+ throw broken(m);
42
+ },
43
+ shape: (v) => {
44
+ try {
45
+ check(v);
46
+ }
47
+ catch (e) {
48
+ throw broken(e.message);
49
+ }
50
+ return v;
51
+ },
52
+ });
51
53
  }
52
54
  /** フォルダの中のフォルダ(無ければ空。シンボリックリンクは含めない) */
53
55
  export async function dirs(path) {
@@ -203,3 +205,106 @@ export class RunControl {
203
205
  }
204
206
  }
205
207
  }
208
+ /** AI の実行の失敗の分類(レビュー 2 つとリリースノートの要約で共通)。invalid は「結果を読めない」のエラー */
209
+ export function classifyAiFailure(e, invalid) {
210
+ const msg = e?.message ?? String(e);
211
+ const kind = e instanceof CodexUnavailableError || e instanceof ChatGptAuthError ? "unavailable" : e instanceof CodexUsageLimitError ? "usage_limit" : invalid(e) ? "invalid_output" : "error";
212
+ return [kind, msg];
213
+ }
214
+ /** 頼む先を選ぶ(明示 → preflight.engine の設定 → codex)。無ければ reviewer は undefined(各機能が unavailable で断る) */
215
+ export async function pickReviewer(reviewers, explicit, configured) {
216
+ const name = explicit ?? (await configured?.().catch(() => "codex")) ?? "codex";
217
+ return { name, reviewer: reviewers[name] };
218
+ }
219
+ /**
220
+ * レビューの実行の骨組み: このプロセスの実行・二重の開始の確かめ・実行(ログ・時間切れ・取り消し・ほかのプロセスの取消の要求・失敗の分類・
221
+ * 遅れた結果の拒否)・回復・取り消し・待つ。材料・依頼文・結果の読み方・終わる前の確かめ(after。材料の変化など)は各レビュー
222
+ */
223
+ export class ReviewRunner {
224
+ store;
225
+ opts;
226
+ local = new Map();
227
+ control;
228
+ constructor(store, opts) {
229
+ this.store = store;
230
+ this.opts = opts;
231
+ this.control = new RunControl(store, this.local, opts.probe, (_k, r) => opts.emit(r));
232
+ }
233
+ /** キーのロックの中で、実行中の run が無いことを確かめてから create を呼ぶ(あれば busy が返すエラーを投げ、何も作らない) */
234
+ begin(key, create, busy) {
235
+ return this.store.withLock(key, async () => {
236
+ const b = await this.control.runningLocked(key);
237
+ if (b)
238
+ throw busy(b);
239
+ await create();
240
+ });
241
+ }
242
+ /** このプロセスで実行する(終わるのは waitLocal で待つ) */
243
+ launch(key, run, work, classify, after) {
244
+ const abort = new AbortController();
245
+ const job = { key, abort, done: Promise.resolve() };
246
+ this.local.set(run.id, job);
247
+ this.opts.emit(run);
248
+ const exec = async () => {
249
+ const log = [];
250
+ const push = (e) => log.push({ at: new Date().toISOString(), ...e });
251
+ const { timeoutMs } = this.opts;
252
+ const timeout = AbortSignal.timeout(timeoutMs);
253
+ const signal = AbortSignal.any([abort.signal, timeout]);
254
+ // ほかのプロセスからの取消の要求を見つけ、ログを run.json に書き足す
255
+ const stopWatch = this.control.watch(key, run.id, log, abort, this.opts.pollMs ?? 1000);
256
+ let end;
257
+ let result;
258
+ try {
259
+ const r = await work(push, signal);
260
+ if (signal.aborted)
261
+ throw signal.reason;
262
+ result = r.result;
263
+ end = { ...r.end, status: "completed" };
264
+ }
265
+ catch (e) {
266
+ const [failure, error] = abort.signal.aborted ? [undefined, "取り消しました"] : timeout.aborted ? ["timeout", `時間切れです(${Math.round(timeoutMs / 1000)} 秒)`] : classify(e);
267
+ end = (abort.signal.aborted ? { status: "cancelled", error } : { status: "failed", failure, error });
268
+ push({ kind: "error", text: error });
269
+ }
270
+ finally {
271
+ stopWatch();
272
+ }
273
+ if (after)
274
+ end = await after(end, push);
275
+ // 既に終わっていた(人が中断した・回復した)なら、遅れて届いた結果は取り込まない
276
+ await this.control.end(key, run.id, { ...end, log: [...log] }, result);
277
+ };
278
+ job.done = exec().finally(() => this.local.delete(run.id));
279
+ }
280
+ /** 死んだ所有者の run を回復する(一覧・取得の前に) */
281
+ async recover(key) {
282
+ if (await this.store.hasHistory(key))
283
+ await this.store.withLock(key, () => this.control.recoverLocked(key));
284
+ }
285
+ /** 記録(実行中なら所有者の状態を添える) */
286
+ async get(key, run) {
287
+ await this.recover(key);
288
+ const rec = await this.store.get(key, run);
289
+ return { ...rec, ...(rec.run.status === "running" ? { owner: this.control.ownerOf(rec.run) } : {}) };
290
+ }
291
+ /** 取り消す(このプロセスの run は止め、ほかのプロセスの run は要求を書く。acknowledgeStopped は人が止まっていると確かめた run を記録の上で中断にする) */
292
+ cancel(key, run, by, opts = {}) {
293
+ const local = this.local.get(run);
294
+ return this.control.cancel(key, run, by, { ...opts, label: `${key}/${run}`, abortLocal: () => local?.abort.abort(new Error("cancelled")) });
295
+ }
296
+ async waitLocal(run) {
297
+ await this.local.get(run)?.done;
298
+ }
299
+ running() {
300
+ return this.local.size;
301
+ }
302
+ /** このプロセスの実行が全部終わるまで待つ(cancel: 先に全部を取り消す) */
303
+ async settle(opts = {}) {
304
+ const jobs = [...this.local.values()];
305
+ if (opts.cancel)
306
+ for (const j of jobs)
307
+ j.abort.abort(new Error("cancelled"));
308
+ await Promise.allSettled(jobs.map((j) => j.done));
309
+ }
310
+ }
@@ -3,7 +3,8 @@ import { lstat, mkdir, readdir, readFile, rename, rm, writeFile } from "node:fs/
3
3
  import { join } from "node:path";
4
4
  import { ATTACHMENT_FILE_LIMITS } from "../../shared/types.js";
5
5
  import { imageInfo, UI_LIMITS } from "../preflight/uiMaterials.js";
6
- import { nowIso, writeFileAtomic } from "./fsutil.js";
6
+ import { nowIso } from "../../../kit/fsutil.js";
7
+ import { writeJsonRecord } from "./jsonRecord.js";
7
8
  export const ATTACHMENT_ID = /^A-\d{8}-\d{6}-[0-9a-f]{4}$/;
8
9
  /** 上限(1つの要望あたり) */
9
10
  export const ATTACHMENT_LIMITS = {
@@ -235,7 +236,7 @@ export class AttachmentStore {
235
236
  fixed.push({ ...rest, path });
236
237
  }
237
238
  if (fixed.length)
238
- await writeFileAtomic(join(runDir, "attachments.json"), JSON.stringify(fixed, null, 2) + "\n");
239
+ await writeJsonRecord(join(runDir, "attachments.json"), fixed);
239
240
  return fixed;
240
241
  }
241
242
  }
@@ -1,7 +1,7 @@
1
1
  import { access, mkdir, readFile, readdir, rename } from "node:fs/promises";
2
2
  import { dirname, join } from "node:path";
3
- import { parseFrontmatter, stringifyFrontmatter } from "./frontmatter.js";
4
- import { createExclusive, nowIso, withFileLock, writeFileAtomic } from "./fsutil.js";
3
+ import { parseFrontmatter, stringifyFrontmatter } from "../../../kit/frontmatter.js";
4
+ import { createExclusive, nowIso, withFileLock, writeFileAtomic } from "../../../kit/fsutil.js";
5
5
  export class ConflictError extends Error {
6
6
  id;
7
7
  expected;