@ddtcorex/dsh-maestro-review 0.6.0 → 0.6.1

package/src/host/orchestrator.ts

@@ -250,6 +250,25 @@ export function assertTurnSucceeded(handle: unknown): void {
   }
 }
 
+/**
+ * Like assertTurnSucceeded, but only throws when there is nothing left to
+ * salvage. A turn can error AFTER already producing real output — findings
+ * reported via the tool, or audit text written — when only the turn's own
+ * closing step fails afterward (a trailing rate-limit/auth hiccup). Throwing
+ * unconditionally there discarded already-produced, real work for no
+ * benefit; this only fails closed when the turn errored AND there is
+ * nothing usable to fall back on. Either way the turn error is never
+ * silent: logged as a warning when salvaging, thrown when not.
+ */
+export function assertTurnSucceededOrSalvage(handle: unknown, hasSalvageableOutput: boolean, label: string): void {
+  const turnMsg = getTurnErrorMessage(handle)
+  if (turnMsg === undefined) return
+  if (!hasSalvageableOutput) {
+    throw new Error(`Review turn failed before completing: ${turnMsg}`)
+  }
+  console.warn(`maestro-orchestrator: ${label} turn ended with an error after already producing usable output — using it anyway: ${turnMsg}`)
+}
+
 /**
  * Resolve the model to use for an automated review. Priority: per-project
  * override > global reviewModel (Maestro Settings) > row-config reviewModel
@@ -1097,7 +1116,7 @@ export function apply(ctx: Context, config: Config): void {
           source: { kind: 'user' },
         }))
         await whenIdleWithTimeout(handle, effectiveAgentTimeoutMs)
-        assertTurnSucceeded(handle)
+        assertTurnSucceededOrSalvage(handle, capturedFindings.length > 0, 'reviewer')
         if (reviewProfile !== undefined && (reviewerContext === undefined || loadedReviewProfile(reviewerContext) !== reviewProfile)) {
           throw new Error(`reviewer did not successfully load the required ${reviewProfile} review skill profile; no findings were posted`)
         }
@@ -1195,9 +1214,9 @@ export function apply(ctx: Context, config: Config): void {
       const prompt = buildAuditorPrompt({ staticOnly: opts?.staticOnly === true })
       handle.agent.followup(createUserMessage({ content: [{ type: 'text', text: prompt }], source: { kind: 'user' } }))
       await whenIdleWithTimeout(handle, effectiveAgentTimeoutMs)
-      assertTurnSucceeded(handle)
       const output = auditorOutputFromSession(handle.agent.session)
       const text = output.map(block => ('text' in block ? block.text : '')).join('')
+      assertTurnSucceededOrSalvage(handle, text.trim() !== '', 'auditor')
       return `## Maestro Performance Audit\n\n${text}`
     } finally {
       await handle.dispose()

package/src/host/review-signals.ts

@@ -13,11 +13,15 @@ export interface ReviewSignals {
 }
 
 async function award(baseUrl: string, token: string, projectId: number, mrIid: number, name: string): Promise<void> {
-  await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
+  const response = 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 }),
   })
+  // fetchWithTimeout only throws on a network/abort failure; a non-2xx status
+  // (expired token, missing scope, rate-limited) resolves normally and must
+  // be checked explicitly, or the caller's failure logging never fires.
+  if (!response.ok) throw new Error(`GitLab API error ${response.status} awarding "${name}": ${await response.text()}`)
 }
 
 /** Remove only this bot's stale running markers; other users' awards stay untouched. */
@@ -25,14 +29,20 @@ async function unawardOwn(baseUrl: string, token: string, projectId: number, mrI
   const response = await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji`, {
     headers: gitlabAuthHeaders(token),
   })
-  if (!response.ok) return
+  if (!response.ok) throw new Error(`GitLab API error ${response.status} listing award emoji: ${await response.text()}`)
   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 fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji/${awardItem.id}`, {
+    const deleteResponse = await fetchWithTimeout(`${baseUrl}/api/v4/projects/${projectId}/merge_requests/${mrIid}/award_emoji/${awardItem.id}`, {
       method: 'DELETE',
       headers: gitlabAuthHeaders(token),
-    }).catch(() => {})
+    }).catch((err: unknown) => {
+      console.error(`review-signals: failed to delete stale eyes marker ${awardItem.id} on MR !${mrIid}`, err)
+      return undefined
+    })
+    if (deleteResponse !== undefined && !deleteResponse.ok) {
+      console.error(`review-signals: GitLab API error ${deleteResponse.status} deleting stale eyes marker ${awardItem.id} on MR !${mrIid}`)
+    }
   }
 }
 
@@ -43,13 +53,21 @@ export function createReviewSignals(options: { baseUrl: string; token: string; p
       try {
         await unawardOwn(baseUrl, token, projectId, mrIid, botUsername)
         await award(baseUrl, token, projectId, mrIid, 'eyes')
-      } catch { /* signalling must never break the review */ }
+      } catch (err) {
+        // Signalling must never break the review, but a swallowed failure
+        // here is exactly what leaves a stale "eyes" marker stuck on the MR
+        // forever (blocking the push-gate's 👀-running check for both the
+        // webhook and CI flows) with zero trace of why — log it.
+        console.error(`review-signals: failed to set the running marker on MR !${mrIid}`, err)
+      }
     },
     async finish(outcome) {
       try {
         await unawardOwn(baseUrl, token, projectId, mrIid, botUsername)
         await award(baseUrl, token, projectId, mrIid, outcome === 'completed' ? 'white_check_mark' : 'warning')
-      } catch { /* signalling must never break the review */ }
+      } catch (err) {
+        console.error(`review-signals: failed to clear the running marker / award the final marker on MR !${mrIid}`, err)
+      }
     },
   }
 }

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

@@ -3,7 +3,7 @@ stages: [review]
 
 variables:
   # Image registry — pin the SHA for reproducibility
-  REVIEWER_IMAGE: "ddtcorex/maestro-reviewer:0.1.0"
+  REVIEWER_IMAGE: "ddtcorex/maestro-reviewer:0.6.1"
   # Or use $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA when building the image in the same project
 
 review: