@ddtcorex/dsh-maestro-review 0.5.0 → 0.5.1

package/src/host/review-history.ts

@@ -64,10 +64,12 @@ function failStaleRunning(entries: ReviewHistoryEntry[]): boolean {
 
 /** Prepend a running entry; the oldest entries fall off past `HISTORY_CAP`. */
 export async function recordReviewStart(entry: Omit<ReviewHistoryEntry, 'status'>, dshHome?: string): Promise<void> {
-  const all = await readAll(dshHome)
-  if (failStaleRunning(all)) await writeAll(all, dshHome)
-  all.unshift({ ...entry, status: 'running' })
-  await writeAll(all.slice(0, HISTORY_CAP), dshHome)
+  return withHistoryLock(async () => {
+    const all = await readAll(dshHome)
+    if (failStaleRunning(all)) await writeAll(all, dshHome)
+    all.unshift({ ...entry, status: 'running' })
+    await writeAll(all.slice(0, HISTORY_CAP), dshHome)
+  })
 }
 
 /** Attach an outcome to the entry with this id; unknown ids are ignored. */
@@ -76,11 +78,13 @@ export async function recordReviewFinish(
   patch: { status: 'completed' | 'failed'; summary?: string; error?: string },
   dshHome?: string,
 ): Promise<void> {
-  const all = await readAll(dshHome)
-  const entry = all.find((candidate) => candidate.id === id)
-  if (entry === undefined) return
-  Object.assign(entry, patch, { finishedAt: Date.now() })
-  await writeAll(all, dshHome)
+  return withHistoryLock(async () => {
+    const all = await readAll(dshHome)
+    const entry = all.find((candidate) => candidate.id === id)
+    if (entry === undefined) return
+    Object.assign(entry, patch, { finishedAt: Date.now() })
+    await writeAll(all, dshHome)
+  })
 }
 
 /** Newest-first slice of the log. */
@@ -103,36 +107,62 @@ export async function lastCompletedReview(projectId: number, mrIid: number, dshH
 /**
  * Drop history entries and failed-report files older than `retentionDays`.
  * `0` disables pruning entirely. Maestro records only — DSH session
- * transcripts are never touched.
+ * transcripts are never touched. Entries still `running` are always kept:
+ * a prune must never delete a review that just started (see D3).
  */
 export async function pruneHistory(retentionDays: number, dshHome?: string): Promise<void> {
   if (!Number.isFinite(retentionDays) || retentionDays <= 0) return
-  const all = await readAll(dshHome)
-  failStaleRunning(all)
-  const cutoff = Date.now() - retentionDays * DAY_MS
-  const kept: ReviewHistoryEntry[] = []
-  for (const entry of all) {
-    if ((entry.finishedAt ?? entry.startedAt) < cutoff) continue
-    kept.push(entry)
-  }
-  await writeAll(kept, dshHome)
+  return withHistoryLock(async () => {
+    const all = await readAll(dshHome)
+    failStaleRunning(all)
+    const cutoff = Date.now() - retentionDays * DAY_MS
+    const kept: ReviewHistoryEntry[] = []
+    for (const entry of all) {
+      if (entry.status === 'running') {
+        kept.push(entry)
+        continue
+      }
+      if ((entry.finishedAt ?? entry.startedAt) < cutoff) continue
+      kept.push(entry)
+    }
+    await writeAll(kept, dshHome)
+  }).then(async () => {
+    const home = dshHome ?? process.env.DSH_HOME ?? join(homedir(), '.dsh')
+    const failedDir = join(home, 'maestro', 'failed-reports')
+    const cutoff = Date.now() - retentionDays * DAY_MS
+    let names: string[]
+    try {
+      names = await readdir(failedDir)
+    } catch {
+      return
+    }
+    await Promise.all(names.map(async (name) => {
+      // Failed reports are named `<mrIid>-<epoch-ms>.md`.
+      const match = /^-?\d+-(\d{13,})\.md$/.exec(name)
+      if (match === null) return
+      const stamp = Number(match[1])
+      if (!Number.isFinite(stamp) || stamp >= cutoff) return
+      await rm(join(failedDir, name), { force: true }).catch(() => {})
+    }))
+  })
+}
 
-  const home = dshHome ?? process.env.DSH_HOME ?? join(homedir(), '.dsh')
-  const failedDir = join(home, 'maestro', 'failed-reports')
-  let names: string[]
-  try {
-    names = await readdir(failedDir)
-  } catch {
-    return
-  }
-  await Promise.all(names.map(async (name) => {
-    // Failed reports are named `<mrIid>-<epoch-ms>.md`.
-    const match = /^-?\d+-(\d{13,})\.md$/.exec(name)
-    if (match === null) return
-    const stamp = Number(match[1])
-    if (!Number.isFinite(stamp) || stamp >= cutoff) return
-    await rm(join(failedDir, name), { force: true }).catch(() => {})
-  }))
+/**
+ * In-process promise-chain mutex serializing the read-modify-write cycles of
+ * `recordReviewStart` / `recordReviewFinish` / `pruneHistory`, so a
+ * fire-and-forget `void pruneHistory()` can no longer clobber an entry that
+ * started concurrently (last-writer-wins on a stale read). Two `dsh web`
+ * processes sharing one `DSH_HOME` is unsupported, so a cross-process file
+ * lock is deliberately out of scope.
+ */
+let historyMutex: Promise<void> = Promise.resolve()
+function withHistoryLock<T>(work: () => Promise<T>): Promise<T> {
+  const next = historyMutex.then(work, work)
+  historyMutex = next.then(
+    () => undefined,
+    () => undefined,
+  )
+  return next
 }
 
 const DAY_MS = 24 * 60 * 60_000

package/src/host/review-intake.ts

@@ -35,6 +35,19 @@ function isMentioned(text: string, botUsername: string): boolean {
   return new RegExp(`(^|[^A-Za-z0-9_.-])@${escaped}(?=$|[^A-Za-z0-9_.-])`, 'i').test(text)
 }
 
+/**
+ * Short head-sha hint for the in-flight key: prefers `last_commit.id`, falls
+ * back to `checkout_sha`. Returns `undefined` when the body carries no sha.
+ */
+function shortPushSha(attributes: JsonRecord): string | undefined {
+  const lastCommit = record(attributes.last_commit)
+  const raw = typeof lastCommit?.id === 'string' ? lastCommit.id
+    : typeof attributes.checkout_sha === 'string' ? attributes.checkout_sha
+    : undefined
+  if (raw === undefined || raw.trim() === '') return undefined
+  return raw.slice(0, 8)
+}
+
 function noteScope(attributes: JsonRecord): ReviewScope | undefined {
   const position = record(attributes.position)
   if (position === undefined) return { kind: 'mr' }
@@ -49,6 +62,28 @@ export interface RouteOptions {
   pushEnabled?: boolean
 }
 
+/** Actionable provider-layer drop reasons. Generic non-review GitLab noise
+ * (closes, label edits, ...) intentionally has no reason and stays silent. */
+export type DropReason = 'invalid-identity' | 'push-gate-off'
+
+/**
+ * Name why this webhook body will NOT route at the provider layer, or
+ * `undefined` when it routes (or is generic noise the provider ignores).
+ * Pure — the provider logs the returned reason with project/mr context.
+ */
+export function describeDrop(body: unknown, botUsername: string, options: RouteOptions = {}): DropReason | undefined {
+  const value = record(body)
+  if (value === undefined || botUsername.trim() === '') return 'invalid-identity'
+  const payload = mrPayload(value)
+  if (payload === undefined) return 'invalid-identity'
+  if (value.object_kind === 'merge_request') {
+    const attributes = record(value.object_attributes)
+    const hasNewCommits = typeof attributes?.oldrev === 'string' && attributes.oldrev !== ''
+    if (hasNewCommits && options.pushEnabled !== true) return 'push-gate-off'
+  }
+  return undefined
+}
+
 export function routeGitlabReviewRequest(body: unknown, botUsername: string, options: RouteOptions = {}): ReviewRequest | undefined {
   const value = record(body)
   if (value === undefined || botUsername.trim() === '') return undefined
@@ -65,7 +100,7 @@ export function routeGitlabReviewRequest(body: unknown, botUsername: string, opt
     if (options.pushEnabled === true) {
       const hasNewCommits = typeof attributes.oldrev === 'string' && attributes.oldrev !== ''
       if (hasNewCommits) {
-        return { ...payload, trigger: 'push', mode: 'quick', scope: { kind: 'mr' } }
+        return { ...payload, trigger: 'push', mode: 'quick', scope: { kind: 'mr' }, pushSha: shortPushSha(attributes) }
       }
     }
 

package/src/host/review-signals.ts

@@ -1,17 +1,19 @@
-import { gitlabAuthHeaders } from './gitlab-auth.js'
 /**
  * MR award-emoji acknowledgements: the MR shows "eyes" while a review runs and
  * a final marker when it completes or fails. Signalling is best-effort — any
  * GitLab error is swallowed so it can never fail the review itself.
  */
 
+import { gitlabAuthHeaders } from './gitlab-auth.js'
+import { fetchWithTimeout } from './gitlab-client.js'
+
 export interface ReviewSignals {
   start(): Promise<void>
   finish(outcome: 'completed' | 'failed'): Promise<void>
 }
 
 async function award(baseUrl: string, token: string, projectId: number, mrIid: number, name: string): Promise<void> {
-  await fetch(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
+  await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
     method: 'POST',
     headers: { ...gitlabAuthHeaders(token), 'Content-Type': 'application/json' },
     body: JSON.stringify({ name }),
@@ -20,14 +22,14 @@ async function award(baseUrl: string, token: string, projectId: number, mrIid: n
 
 /** Remove only this bot's stale running markers; other users' awards stay untouched. */
 async function unawardOwn(baseUrl: string, token: string, projectId: number, mrIid: number, botUsername: string): Promise<void> {
-  const response = await fetch(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
+  const response = await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
     headers: gitlabAuthHeaders(token),
   })
   if (!response.ok) return
   const awards = (await response.json()) as Array<{ id?: number; name?: string; user?: { username?: string } }>
   for (const awardItem of Array.isArray(awards) ? awards : []) {
     if (awardItem.name !== 'eyes' || awardItem.user?.username !== botUsername || typeof awardItem.id !== 'number') continue
-    await fetch(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji/${awardItem.id}`, {
+    await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji/${awardItem.id}`, {
       method: 'DELETE',
       headers: gitlabAuthHeaders(token),
     }).catch(() => {})

package/templates/source-project.gitlab-ci.yml

@@ -15,8 +15,7 @@ maestro:trigger-review:
     SOURCE_PROJECT_ID: $CI_PROJECT_ID
     MR_IID: $CI_MERGE_REQUEST_IID
     GITLAB_HOST: $CI_SERVER_HOST
-    SOURCE_SHA: $CI_COMMIT_SHA
-    REVIEW_MODE: "quick"                 # or "deep" for a govard audit
+    REVIEW_MODE: "quick"                 # or "deep" for a static-only audit (no govard runtime in CI)
     REVIEW_PROFILE: "generic"            # per-project skill profile: magento2 | laravel | symfony | wordpress | generic
     # REVIEW_ON_PUSH: "1"               # uncomment to re-review every push (default: only the opened review runs)