thePR0M3TH3AN/TORCH
1
0 Fork 0
mirror of https://github.com/PR0M3TH3AN/TORCH.git synced 2026-11-11 07:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(integration): bind private intake to adoption

Browse Source 
TASK-f40126ee-2485-45c8-a67b-4279e4e8704a
This commit is contained in:
thePR0M3TH3AN committed 2026-10-03 17:34:09 -04:00
1 parent 63dd032b7f
commit 530afb3b67
4 files changed
+32 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/integration/adoption.mjs
+2 -1
View File
@@ -335,7 +335,8 @@ export class AdoptionService {
requestApprovalId: text(input.approvalId, 'approvalId'), requestApprovalRevision: input.approvalRevision, requestStartedAt: this.clock().toISOString() };
if (record.state !== 'requesting') this.#append(record.id, record.revision, requesting, 'integration.adoption.request-started');
const request = findIntegrationRequest?.({ candidateRef: requesting.candidateRef, commit: requesting.candidateSha })
?? requestIntegration({ areaId: requesting.contributorArea, commit: requesting.candidateSha, candidateRef: requesting.candidateRef });
?? requestIntegration({ adoptionId: requesting.id, areaId: requesting.contributorArea,
commit: requesting.candidateSha, candidateRef: requesting.candidateRef });
const requested = { ...requesting, revision: requesting.revision + 1, state: 'requested', integrationRequestId: request.id, requestedAt: this.clock().toISOString() };
this.#append(requesting.id, requesting.revision, requested, 'integration.adoption.request');
return { ...requested, integrationRequest: request, mutationPerformed: true };
src/integration/service.mjs
+14 -1
View File
@@ -106,12 +106,25 @@ export class IntegrationService {
}
requestCandidate({ areaId, commit, candidateRef } = {}) {
throw new TorchError('Private candidate intake requires an authenticated finalized adoption', {
code: 'INTEGRATION_ADOPTED_INTAKE_INTERNAL_ONLY', details: { areaId, commit, candidateRef },
});
}
#requestFinalizedCandidate({ adoptionId, areaId, commit, candidateRef } = {}) {
const area = this.controlPlane.assertIdentity(areaId);
if (area === 'session-manager') {
throw new TorchError('Session Manager does not own a feature worktree by default', {
code: 'INTEGRATION_SOURCE_INVALID',
});
}
const adoption = this.adoption.getPrepared(text(adoptionId, 'adoptionId'));
if (adoption.state !== 'requesting' || adoption.contributorArea !== area
|| adoption.candidateSha !== commit || adoption.candidateRef !== candidateRef) {
throw new TorchError('Private candidate does not match an authenticated finalized adoption', {
code: 'INTEGRATION_ADOPTED_BINDING_INVALID', details: { adoptionId, state: adoption.state },
});
}
const ref = text(candidateRef, 'candidateRef');
if (!/^refs\/torch\/integration-candidates\/[A-Za-z0-9._-]+$/.test(ref)) {
throw new TorchError('Adopted candidates must use a private integration candidate ref', {
@@ -185,7 +198,7 @@ export class IntegrationService {
requestAdoptedCandidate(input = {}) {
return this.adoption.requestAdoptedCandidate(input, {
requestIntegration: ({ areaId, commit, candidateRef }) => this.requestCandidate({ areaId, commit, candidateRef }),
requestIntegration: ({ adoptionId, areaId, commit, candidateRef }) => this.#requestFinalizedCandidate({ adoptionId, areaId, commit, candidateRef }),
findIntegrationRequest: ({ candidateRef, commit }) => this.findCandidateRequest({ candidateRef, commit }),
});
}