@atolis-hq/wake 0.2.92 → 0.2.93

package/dist/src/core/tick-runner.js

@@ -374,14 +374,12 @@ export function createTickRunner(deps) {
         const targetResourceUri = input.approvalResolution.targetResourceUri;
         const commentId = input.approvalResolution.triggeringCommentId.replace(/[^a-z0-9]+/gi, '-');
         const reviewBody = reviewerMessageFromApprovalComment(input.approvalResolution.triggeringCommentBody ?? '');
-        // Never enumerate specific rejection reasons (self-approval, merge-method
-        // restrictions, branch protection, ...) by string-matching the merge
-        // actor's error — there are too many, and Wake shouldn't need to know
-        // its provider's vocabulary. Any failure here is permanent enough not to
-        // retry blindly forever, so it becomes a policy block with the actor's
-        // own message attached. approve and autoMerge are independent: one
-        // failing doesn't stop the other from being attempted.
-        const blockedReasons = [];
+        // approve and autoMerge are independent: one failing doesn't stop the
+        // other from being attempted. If autoMerge succeeds, a failed approval is
+        // not a policy block on its own; GitHub can reject self-approval while
+        // still accepting auto-merge for repos that do not require review.
+        const approvalBlockedReasons = [];
+        const autoMergeBlockedReasons = [];
         const approvedEventId = `pr-merge-approved-${commentId}`;
         if (input.mergePolicy.approve &&
             (await deps.stateStore.readEventEnvelope(approvedEventId)) === null) {
@@ -408,10 +406,11 @@ export function createTickRunner(deps) {
                 }));
             }
             catch (error) {
-                blockedReasons.push(`Merge policy blocked the approval step: ${describeMergeActorError(error)}`);
+                approvalBlockedReasons.push(`Merge policy blocked the approval step: ${describeMergeActorError(error)}`);
             }
         }
         const autoMergeEventId = `pr-auto-merge-enabled-${commentId}`;
+        let autoMergeSucceeded = false;
         if (input.mergePolicy.autoMerge &&
             (await deps.stateStore.readEventEnvelope(autoMergeEventId)) === null) {
             try {
@@ -435,14 +434,52 @@ export function createTickRunner(deps) {
                         idempotencyKey: `${input.approvalResolution.triggeringCommentId}:pr-auto-merge`,
                     },
                 }));
+                autoMergeSucceeded = true;
             }
             catch (error) {
-                blockedReasons.push(`Merge policy blocked the auto-merge step: ${describeMergeActorError(error)}`);
+                autoMergeBlockedReasons.push(`Merge policy blocked the auto-merge step: ${describeMergeActorError(error)}`);
             }
         }
+        else if (input.mergePolicy.autoMerge) {
+            autoMergeSucceeded = true;
+        }
+        const blockedReasons = autoMergeSucceeded && input.mergePolicy.autoMerge
+            ? autoMergeBlockedReasons
+            : [...approvalBlockedReasons, ...autoMergeBlockedReasons];
         if (blockedReasons.length > 0) {
             return { blocked: true, reason: blockedReasons.join(' ') };
         }
+        // Approval failed but auto-merge covered it (e.g. GitHub rejecting
+        // self-approval on the bot's own PR) - not a policy block, but the
+        // failure should still leave a visible trail instead of vanishing
+        // silently, since it may also be a real permissions/config problem.
+        if (approvalBlockedReasons.length > 0) {
+            const occurredAt = eventStampNow();
+            await deliverOutboundEvent(createEventEnvelope({
+                eventId: `pr-merge-approval-note-${commentId}`,
+                workItemKey: input.projection.workItemKey,
+                streamScope: 'work-item',
+                direction: 'outbound',
+                sourceSystem: 'wake',
+                sourceEventType: PUBLISH_INTENT_REQUESTED_EVENT,
+                sourceRefs: {
+                    repo: input.projection.issue.repo,
+                    issueNumber: input.projection.issue.number,
+                    resourceUri: targetResourceUri,
+                },
+                occurredAt,
+                ingestedAt: occurredAt,
+                trigger: 'context-only',
+                payload: {
+                    kind: 'status-update',
+                    origin: input.projection.origin ?? 'github',
+                    body: `Approval step did not block the merge, but did not succeed on its own: ${approvalBlockedReasons.join(' ')}`,
+                    idempotencyKey: `${commentId}:pr-merge-approval-note`,
+                    deliveryState: 'PENDING',
+                },
+                derivedHints: { stage: input.projection.wake.stage },
+            }));
+        }
         return { blocked: false };
     }
     // The one deterministic approval transition: /approved, wake:auto, and a
@@ -2054,7 +2091,7 @@ export function createTickRunner(deps) {
                             },
                             payload: {
                                 ...publishIntent.payload,
-                                kind: sentinel === 'DONE' ? 'approval-request' : 'status-update',
+                                kind: 'status-update',
                                 body: sentinel === 'DONE'
                                     ? `${parsedRunnerResult.body}\n\n${prReviewApprovalMarker}`
                                     : `${parsedRunnerResult.body}\n\n<!-- wake:pr-review-changes-requested -->`,

package/dist/src/version.js

@@ -124,4 +124,4 @@ export function resolveWakeVersion(options = {}) {
     }
     return '0.1.0-dev';
 }
-export const wakeVersion = "g05424ba";
+export const wakeVersion = "g5c69d41";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atolis-hq/wake",
-  "version": "0.2.92",
+  "version": "0.2.93",
   "description": "Local autonomous agent control plane for software development",
   "license": "Apache-2.0",
   "repository": {