@moretea-labs/forge 1.8.0 → 1.8.1

package/src/runtime/control-plane/execution/repository-work-attribution.ts

@@ -1,7 +1,5 @@
 import { readExecutionSession } from './session-store';
-import { controllerSessionPrincipalId, getControllerSession, listControllerSessions } from '../../../../packages/kernel/controller/api/index';
-import { getWorkContract } from '../../../../packages/kernel/work/api/index';
-import { isTerminalWorkContractStatus } from '../facade/types';
+import { getWorkContract, semanticWorkState } from '../../../../packages/kernel/work/api/index';
 
 export interface RepositoryWorkAttributionCaller {
   sessionId?: string;
@@ -22,12 +20,7 @@ export function resolveExplicitClaimedRepositoryWork(
 ) {
   if (!caller?.principalId?.trim()) return undefined;
   const work = getWorkContract({ controllerHome, repoId: target.repoId }, workId);
-  if (!work || isTerminalWorkContractStatus(work.status)) throw new Error(`WORK_ATTRIBUTION_INVALID: ${workId}`);
-  const owner = getControllerSession({ controllerHome, repoId: target.repoId }, workId);
-  if (!owner) throw new Error(`WORK_CONTROLLER_CLAIM_REQUIRED: ${workId}`);
-  if (controllerSessionPrincipalId(owner) !== caller.principalId.trim()) {
-    throw new Error(`WORK_CONTROLLER_OWNERSHIP_MISMATCH: ${workId}`);
-  }
+  if (!work || semanticWorkState(work) !== 'open') throw new Error(`WORK_ATTRIBUTION_INVALID: ${workId}`);
   if (work.checkoutId && work.checkoutId !== target.activeCheckoutId) {
     throw new Error(
       `WORK_CHECKOUT_MISMATCH: work=${workId}; resolved_checkout=${target.activeCheckoutId}; expected_work_checkout=${work.checkoutId}; retry with checkout_id=${work.checkoutId} and the same work_id`,
@@ -51,8 +44,8 @@ export function assertNoBoundExecutionSessionMutation(
   if (!workId || executionSession?.activeRepositoryId !== target.repoId) return;
   const work = getWorkContract({ controllerHome, repoId: target.repoId }, workId);
   if (!work) throw new Error(`WORK_ATTRIBUTION_INVALID: ${workId}`);
-  if (isTerminalWorkContractStatus(work.status)) {
-    throw new Error(`WORK_ATTRIBUTION_TERMINAL: ${work.workId}:${work.status}`);
+  if (semanticWorkState(work) !== 'open') {
+    throw new Error(`WORK_ATTRIBUTION_TERMINAL: ${work.workId}:${work.semanticState}`);
   }
   throw new Error(`WORK_ATTRIBUTION_REQUIRED: ${work.workId}; active execution session mutations must pass work_id explicitly`);
 }
@@ -80,27 +73,11 @@ export function resolveClaimedRepositoryWorkId(
       && executionSession?.activeRepositoryId === target.repoId
       && (!executionSession.activeCheckoutId || executionSession.activeCheckoutId === target.activeCheckoutId)) {
       const work = getWorkContract({ controllerHome, repoId: target.repoId }, workId);
-      if (work && isTerminalWorkContractStatus(work.status)) {
-        throw new Error(`WORK_ATTRIBUTION_TERMINAL: ${work.workId}:${work.status}`);
-      }
-      const owner = getControllerSession({ controllerHome, repoId: target.repoId }, workId);
-      if (work && owner?.sessionId === caller.sessionId && controllerSessionPrincipalId(owner) === caller.principalId.trim()) {
-        return workId;
+      if (work && semanticWorkState(work) !== 'open') {
+        throw new Error(`WORK_ATTRIBUTION_TERMINAL: ${work.workId}:${work.semanticState}`);
       }
+      if (work) return workId;
     }
   }
-  const principal = caller.principalId.trim();
-  const candidates = listControllerSessions({ controllerHome, repoId: target.repoId })
-    .filter((owner) => controllerSessionPrincipalId(owner) === principal)
-    .map((owner) => ({ owner, work: getWorkContract({ controllerHome, repoId: target.repoId }, owner.workId) }))
-    .filter((entry): entry is { owner: ReturnType<typeof listControllerSessions>[number]; work: NonNullable<ReturnType<typeof getWorkContract>> } => Boolean(
-      entry.work
-      && !isTerminalWorkContractStatus(entry.work.status)
-      && (!entry.work.checkoutId || entry.work.checkoutId === target.activeCheckoutId),
-    ));
-  if (candidates.length === 1) return candidates[0].work.workId;
-  if (candidates.length > 1) {
-    throw new Error(`WORK_ATTRIBUTION_AMBIGUOUS: principal ${principal} owns ${candidates.length} active Works on checkout ${target.activeCheckoutId}`);
-  }
   return undefined;
 }