@miphamai/cli 0.85.1 → 0.85.3

package/src/workflow/journal.ts

@@ -1,12 +1,7 @@
-import {
-  mkdirSync,
-  writeFileSync,
-  readFileSync,
-  existsSync,
-  appendFileSync,
-  readdirSync,
-} from 'node:fs'
+import { mkdirSync, existsSync, readdirSync } from 'node:fs'
 import { join } from 'node:path'
+import { atomicWriteFileSync } from '../shared/atomic-write'
+import { appendRegularFileSync, readRegularFileSync } from '../shared/regular-file'
 import { miphamHome } from '../core/paths.ts'
 
 const WORKFLOW_DIR = miphamHome('workflows')
@@ -33,15 +28,23 @@ export function createJournal(runId: string, script: string): string {
   const dir = join(WORKFLOW_DIR, runId)
   mkdirSync(dir, { recursive: true })
 
-  writeFileSync(join(dir, 'script.js'), script, 'utf-8')
-  writeFileSync(join(dir, 'journal.jsonl'), '', 'utf-8')
-  writeFileSync(join(dir, 'state.json'), JSON.stringify({ seq: 0, phases: [] }), 'utf-8')
+  // 三份都走助手：新建 run 目录里本来没有旧内容可丢，但**路径上可能被放了个 FIFO**
+  // （`writeFileSync` 会打开它写 ⇒ 干等到有读者为止）。`atomicWriteFileSync` 的 rename
+  // 与 `appendRegularFileSync` 的类型闸都不打开目标，于是在这里也一并关掉。
+  atomicWriteFileSync(join(dir, 'script.js'), script, { mode: 0o644 })
+  if (!appendRegularFileSync(join(dir, 'journal.jsonl'), '')) {
+    throw new Error(`workflow journal for run "${runId}" is not appendable`)
+  }
+  atomicWriteFileSync(join(dir, 'state.json'), JSON.stringify({ seq: 0, phases: [] }))
 
   return dir
 }
 
 /**
  * Append an agent call to the journal. Returns the new sequence number.
+ *
+ * 先 append journal（权威记录）、后写 state（它的影子）—— 顺序有意义：中途被打断时
+ * 唯一的后果是影子落后，而不是记录丢失。
  */
 export function appendJournal(runId: string, entry: Omit<JournalEntry, 'seq'>): number {
   const dir = join(WORKFLOW_DIR, runId)
@@ -50,32 +53,84 @@ export function appendJournal(runId: string, entry: Omit<JournalEntry, 'seq'>):
   const seq = state.seq + 1
   const fullEntry: JournalEntry = { seq, ...entry }
 
-  appendFileSync(join(dir, 'journal.jsonl'), JSON.stringify(fullEntry) + '\n', 'utf-8')
+  // 权威记录写不进去 = 这个 run 没法记账（含路径上是个 FIFO）：**不做影子**、当场说清，
+  // 好过把 state 推进到一个 journal 里不存在的 seq 上。
+  if (!appendRegularFileSync(join(dir, 'journal.jsonl'), JSON.stringify(fullEntry) + '\n')) {
+    throw new Error(`workflow journal for run "${runId}" is not appendable`)
+  }
 
   state.seq = seq
-  writeFileSync(join(dir, 'state.json'), JSON.stringify(state), 'utf-8')
+  atomicWriteFileSync(join(dir, 'state.json'), JSON.stringify(state))
 
   return seq
 }
 
 /**
  * Load all journal entries for a run. Returns empty array if run not found.
+ *
+ * **逐行**解析：`appendFileSync` 被打断会在尾部留下半截行，而从前一个半截行让整份
+ * 读取抛 `SyntaxError`（`/workflow` 那条链上没有兜它）。坏行丢掉、其余全留 —— 一份
+ * 日志里少一行，好过整份读不出来。
  */
 export function loadJournal(runId: string): JournalEntry[] {
-  const journalPath = join(WORKFLOW_DIR, runId, 'journal.jsonl')
-  if (!existsSync(journalPath)) return []
-
-  const raw = readFileSync(journalPath, 'utf-8')
-  return raw
-    .split('\n')
-    .filter((line) => line.trim())
-    .map((line) => JSON.parse(line) as JournalEntry)
+  const raw = readRegularFileSync(join(WORKFLOW_DIR, runId, 'journal.jsonl'))
+  if (raw === null) return []
+
+  const entries: JournalEntry[] = []
+  for (const line of raw.split('\n')) {
+    if (!line.trim()) continue
+    try {
+      const parsed: unknown = JSON.parse(line)
+      if (isJournalEntry(parsed)) entries.push(parsed)
+    } catch {
+      // 半截行（append 被打断）/坏行 —— 只丢这一行
+    }
+  }
+  return entries
 }
 
+function isJournalEntry(e: unknown): e is JournalEntry {
+  if (!e || typeof e !== 'object' || Array.isArray(e)) return false
+  const ev = e as Record<string, unknown>
+  return (
+    typeof ev.seq === 'number' && (ev.type === 'agent' || ev.type === 'phase' || ev.type === 'log')
+  )
+}
+
+/**
+ * 读 state.json。
+ *
+ * 从前这里是**裸**的 `JSON.parse(readFileSync(...))`：state.json 是非原子写的，半截写
+ * 会让 `appendJournal` 当场抛 `SyntaxError`，整个 run 停摆 —— 而 state 只是**派生**信息。
+ * 所以坏掉/缺字段时把 `seq` 从 journal 尾行**重新推出来**，而不是归零：归零会让后续
+ * append 复用已经在用的序号，而那正是这份文件存在的意义。
+ */
 function readState(runId: string): JournalState {
-  const statePath = join(WORKFLOW_DIR, runId, 'state.json')
-  if (!existsSync(statePath)) return { seq: 0, phases: [] }
-  return JSON.parse(readFileSync(statePath, 'utf-8'))
+  const raw = readRegularFileSync(join(WORKFLOW_DIR, runId, 'state.json'))
+  if (raw !== null) {
+    try {
+      const parsed: unknown = JSON.parse(raw)
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        const { seq, phases } = parsed as { seq?: unknown; phases?: unknown }
+        if (typeof seq === 'number' && Number.isFinite(seq)) {
+          return {
+            seq,
+            phases: Array.isArray(phases)
+              ? phases.filter((p): p is string => typeof p === 'string')
+              : [],
+          }
+        }
+      }
+    } catch {
+      // 半截写/坏形状 —— 落到下面按 journal 推。
+    }
+  }
+  return { seq: lastJournalSeq(runId), phases: [] }
+}
+
+/** journal 尾行的 seq —— 权威记录在 journal.jsonl，state.json 只是它的影子。 */
+function lastJournalSeq(runId: string): number {
+  return loadJournal(runId).reduce((max, e) => (e.seq > max ? e.seq : max), 0)
 }
 
 /**
@@ -83,8 +138,7 @@ function readState(runId: string): JournalState {
  */
 export function loadScript(runId: string): string {
   const scriptPath = join(WORKFLOW_DIR, runId, 'script.js')
-  if (!existsSync(scriptPath)) return ''
-  return readFileSync(scriptPath, 'utf-8')
+  return readRegularFileSync(scriptPath) ?? ''
 }
 
 /**