Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: retain GitLab delivery checks for related merge requests

[._.]/ Adam Eivyec03525f6e09
diff --git a/server/services/claimDisposition.js b/server/services/claimDisposition.js
index 0db32873d9..81d9d1df78 100644
--- a/server/services/claimDisposition.js
+++ b/server/services/claimDisposition.js
@@ -111,8 +111,11 @@ async function gitlabDisposition({ number, target, run }) {
changeRequest: mr.iid, mergeCommit: mr.merge_commit_sha, defaultBranch: repository.default_branch };
}
}
- // GitLab has no typed NOT_PLANNED reason. Verify the actual closer's project
- // write authority rather than treating labels or agent prose as a disposition.
+ // GitLab's issue response does not distinguish automatic MR closure. Related
+ // MRs with unproven delivery must not fall through to operator authority.
+ if (requests.length) return unverified('merged-delivery-unverified');
+ // Without a related MR, verify the actual closer's project write authority
+ // rather than treating labels or agent prose as a disposition.
const closerId = issue.closed_by?.id;
if (!Number.isSafeInteger(closerId) || closerId < 1) return unverified('closure-authority-unverified');
const member = await read(`${project}/members/all/${closerId}`);
diff --git a/server/services/claimDisposition.test.js b/server/services/claimDisposition.test.js
index b5c5044d43..6146ec370c 100644
--- a/server/services/claimDisposition.test.js
+++ b/server/services/claimDisposition.test.js
@@ -161,7 +161,7 @@ describe('GitLab selected claim delivery', () => {
expect(execGlab.mock.calls[0]).toEqual([expect.arrayContaining(['--hostname', target.webHost, '--method', 'GET']),
'/example/project', undefined, { env: { GITLAB_TOKEN: 'invented-token' } }]);
closes = [{ ...issue, project_id: 6 }];
- expect(await verify()).toMatchObject({ status: 'unverified', reason: 'closure-authority-unverified' });
+ expect(await verify()).toMatchObject({ status: 'unverified', reason: 'merged-delivery-unverified' });
closes = [];
expect(await verify()).toMatchObject({ status: 'unverified' });
});
@@ -170,10 +170,11 @@ describe('GitLab selected claim delivery', () => {
resolveAppForgeTarget.mockResolvedValue({ tracker: 'gitlab', target: { ...target, forge: 'gitlab' } });
resolveForgeForRepo.mockResolvedValue({ cli: 'glab' });
let member = { id: 9, access_level: 30 };
+ let requests = [];
execGlab.mockImplementation(async args => {
const endpoint = args.at(-1);
return JSON.stringify(endpoint.includes('/members/all/') ? member
- : endpoint.includes('related_merge_requests') ? [] : endpoint.endsWith('/42') ? { ...issue, closed_by: { id: 9 } } : project);
+ : endpoint.includes('related_merge_requests') ? requests : endpoint.endsWith('/42') ? { ...issue, closed_by: { id: 9 } } : project);
});
const result = await verify();
expect(result).toMatchObject({ status: 'verified', issues: [{ issue: 42, disposition: 'operator-closed' }] });
@@ -182,5 +183,8 @@ describe('GitLab selected claim delivery', () => {
expect(await verify()).toMatchObject({ status: 'unverified', reason: 'closure-authority-unverified' });
member = { id: 10, access_level: 50 };
expect(await verify()).toMatchObject({ status: 'unverified', reason: 'closure-authority-unverified' });
+ member = { id: 9, access_level: 40 };
+ requests = [{ ...mr, target_branch: 'release' }];
+ expect(await verify()).toMatchObject({ status: 'unverified', reason: 'merged-delivery-unverified' });
});
});