metheus-governance-mcp-cli 0.2.280 → 0.2.282

package/cli.mjs

@@ -3111,20 +3111,25 @@ function normalizeBotRunnerRequests(rawRequests, nowMs = Date.now()) {
         entry.sourceMessageBotUsername,
       ]),
     });
-    normalized[requestKey] = {
-      request_key: requestKey,
-      project_id: String(entry.project_id || entry.projectID || "").trim(),
-      provider: String(entry.provider || "").trim(),
-      chat_id: firstNonEmptyString([
-        entry.chat_id,
-        entry.chatID,
-        normalizedSourceMessageEnvelope.chat_id,
-      ]),
-      source_message_id: intFromRawAllowZero(
-        entry.source_message_id
-        || entry.sourceMessageID
-        || normalizedSourceMessageEnvelope.message_id,
-        0,
+    normalized[requestKey] = {
+      request_key: requestKey,
+      project_id: String(entry.project_id || entry.projectID || "").trim(),
+      provider: String(entry.provider || "").trim(),
+      chat_id: firstNonEmptyString([
+        entry.chat_id,
+        entry.chatID,
+        normalizedSourceMessageEnvelope.chat_id,
+      ]),
+      canonical_human_message_key: firstNonEmptyString([
+        entry.canonical_human_message_key,
+        entry.canonicalHumanMessageKey,
+        normalizedSourceMessageEnvelope.canonical_human_message_key,
+      ]),
+      source_message_id: intFromRawAllowZero(
+        entry.source_message_id
+        || entry.sourceMessageID
+        || normalizedSourceMessageEnvelope.message_id,
+        0,
       ) || undefined,
       source_message_thread_id: intFromRawAllowZero(
         entry.source_message_thread_id
@@ -3813,18 +3818,35 @@ function shouldBypassRunnerStartupLoopForContractFollowup({
   return true;
 }
 
-function findRunnerRequestsForMessageID(state, normalizedRoute, selectors = {}) {
-  const chatID = String(selectors.chatID || "").trim();
-  const messageID = intFromRawAllowZero(selectors.messageID, 0);
-  if (!chatID || messageID <= 0) {
-    return [];
-  }
-  return findRunnerRequestsForScope(state, normalizedRoute, { chatID })
-    .filter((entry) => (
-      intFromRawAllowZero(entry.source_message_id, 0) === messageID
-      || intFromRawAllowZero(entry.last_source_message_id, 0) === messageID
-    ));
-}
+function findRunnerRequestsForMessageID(state, normalizedRoute, selectors = {}) {
+  const chatID = String(selectors.chatID || "").trim();
+  const messageID = intFromRawAllowZero(selectors.messageID, 0);
+  const canonicalHumanMessageKey = String(selectors.canonicalHumanMessageKey || "").trim();
+  if (!chatID || (messageID <= 0 && !canonicalHumanMessageKey)) {
+    return [];
+  }
+  return findRunnerRequestsForScope(state, normalizedRoute, { chatID })
+    .filter((entryRaw) => {
+      const entry = safeObject(entryRaw);
+      if (canonicalHumanMessageKey) {
+        const requestCanonicalHumanMessageKey = firstNonEmptyString([
+          entry.canonical_human_message_key,
+          safeObject(entry.source_message_envelope).canonical_human_message_key,
+          buildRunnerCanonicalHumanInboundKey(safeObject(entry.source_message_envelope)),
+        ]);
+        if (requestCanonicalHumanMessageKey === canonicalHumanMessageKey) {
+          return true;
+        }
+      }
+      return (
+        messageID > 0
+        && (
+          intFromRawAllowZero(entry.source_message_id, 0) === messageID
+          || intFromRawAllowZero(entry.last_source_message_id, 0) === messageID
+        )
+      );
+    });
+}
 
 function sortRunnerRequestEntriesNewestFirst(entries = []) {
   return ensureArray(entries).slice().sort((leftRaw, rightRaw) => {
@@ -3839,24 +3861,26 @@ function sortRunnerRequestEntriesNewestFirst(entries = []) {
   });
 }
 
-async function findServerRunnerRequestForMessageID({
-  normalizedRoute,
-  runtime,
-  chatID,
-  messageID,
-}) {
+async function findServerRunnerRequestForMessageID({
+  normalizedRoute,
+  runtime,
+  chatID,
+  messageID,
+  canonicalHumanMessageKey = "",
+}) {
   const projectID = String(normalizedRoute?.projectID || "").trim();
   const provider = String(normalizedRoute?.provider || "").trim();
-  const normalizedChatID = String(chatID || "").trim();
-  const normalizedMessageID = intFromRawAllowZero(messageID, 0);
-  if (
-    !projectID
-    || !provider
-    || !normalizedChatID
-    || normalizedMessageID <= 0
-    || !runtime?.baseURL
-    || !runtime?.token
-  ) {
+  const normalizedChatID = String(chatID || "").trim();
+  const normalizedMessageID = intFromRawAllowZero(messageID, 0);
+  const normalizedCanonicalHumanMessageKey = String(canonicalHumanMessageKey || "").trim();
+  if (
+    !projectID
+    || !provider
+    || !normalizedChatID
+    || (normalizedMessageID <= 0 && !normalizedCanonicalHumanMessageKey)
+    || !runtime?.baseURL
+    || !runtime?.token
+  ) {
     return null;
   }
   try {
@@ -3869,18 +3893,29 @@ async function findServerRunnerRequestForMessageID({
       limit: 500,
       offset: 0,
     });
-    const matched = sortRunnerRequestEntriesNewestFirst(serverRequests.filter((entryRaw) => {
-      const entry = safeObject(entryRaw);
-      return (
-        String(entry.project_id || "").trim() === projectID
-        && String(entry.provider || "").trim() === provider
-        && String(entry.chat_id || "").trim() === normalizedChatID
-        && (
-          intFromRawAllowZero(entry.source_message_id, 0) === normalizedMessageID
-          || intFromRawAllowZero(entry.last_source_message_id, 0) === normalizedMessageID
-        )
-      );
-    }));
+    const matched = sortRunnerRequestEntriesNewestFirst(serverRequests.filter((entryRaw) => {
+      const entry = safeObject(entryRaw);
+      const requestCanonicalHumanMessageKey = firstNonEmptyString([
+        entry.canonical_human_message_key,
+        safeObject(entry.source_message_envelope).canonical_human_message_key,
+        buildRunnerCanonicalHumanInboundKey(safeObject(entry.source_message_envelope)),
+      ]);
+      return (
+        String(entry.project_id || "").trim() === projectID
+        && String(entry.provider || "").trim() === provider
+        && String(entry.chat_id || "").trim() === normalizedChatID
+        && (
+          (normalizedCanonicalHumanMessageKey && requestCanonicalHumanMessageKey === normalizedCanonicalHumanMessageKey)
+          || (
+            normalizedMessageID > 0
+            && (
+              intFromRawAllowZero(entry.source_message_id, 0) === normalizedMessageID
+              || intFromRawAllowZero(entry.last_source_message_id, 0) === normalizedMessageID
+            )
+          )
+        )
+      );
+    }));
     return safeObject(matched[0]);
   } catch {
     return null;
@@ -3919,7 +3954,6 @@ function runnerRequestPreferredExecutionContractType(entryRaw) {
   return String(
     decisionBundle.execution_contract_type
       || entry.execution_contract_type
-      || entry.followup_execution_contract_type
       || entry.root_execution_contract_type
       || "",
   ).trim().toLowerCase();
@@ -3939,14 +3973,12 @@ function runnerRequestPreferredExecutionContractTargets(entryRaw) {
       ? decisionBundle.execution_contract_targets
       : ensureArray(entry.execution_contract_targets).length
       ? entry.execution_contract_targets
-      : ensureArray(entry.followup_execution_contract_targets).length
-        ? entry.followup_execution_contract_targets
-        : ensureArray(entry.root_execution_contract_targets).length
-          ? entry.root_execution_contract_targets
-          : [],
-    normalizeTelegramMentionUsername,
-  );
-}
+      : ensureArray(entry.root_execution_contract_targets).length
+        ? entry.root_execution_contract_targets
+        : [],
+    normalizeTelegramMentionUsername,
+  );
+}
 
 function runnerRequestPreferredNextExpectedResponders(entryRaw) {
   const entry = safeObject(entryRaw);
@@ -3956,14 +3988,12 @@ function runnerRequestPreferredNextExpectedResponders(entryRaw) {
       ? decisionBundle.next_expected_responders
       : ensureArray(entry.next_expected_responders).length
       ? entry.next_expected_responders
-      : ensureArray(entry.followup_next_expected_responders).length
-        ? entry.followup_next_expected_responders
-        : ensureArray(entry.root_next_expected_responders).length
-          ? entry.root_next_expected_responders
-          : [],
-    normalizeTelegramMentionUsername,
-  );
-}
+      : ensureArray(entry.root_next_expected_responders).length
+        ? entry.root_next_expected_responders
+        : [],
+    normalizeTelegramMentionUsername,
+  );
+}
 
 function runnerRequestPreferredAuthoritySelectedBotUsernames(entryRaw) {
   const entry = safeObject(entryRaw);
@@ -4326,25 +4356,27 @@ function pickRunnerSharedConversationSourceRequest(entries = [], excludeRequestK
   return safeObject(matched[0]);
 }
 
-async function findServerRunnerConversationSourceRequestForMessageID({
-  normalizedRoute,
-  runtime,
-  chatID,
-  messageID,
-  excludeRequestKey = "",
-}) {
+async function findServerRunnerConversationSourceRequestForMessageID({
+  normalizedRoute,
+  runtime,
+  chatID,
+  messageID,
+  canonicalHumanMessageKey = "",
+  excludeRequestKey = "",
+}) {
   const projectID = String(normalizedRoute?.projectID || "").trim();
   const provider = String(normalizedRoute?.provider || "").trim();
-  const normalizedChatID = String(chatID || "").trim();
-  const normalizedMessageID = intFromRawAllowZero(messageID, 0);
-  if (
-    !projectID
-    || !provider
-    || !normalizedChatID
-    || normalizedMessageID <= 0
-    || !runtime?.baseURL
-    || !runtime?.token
-  ) {
+  const normalizedChatID = String(chatID || "").trim();
+  const normalizedMessageID = intFromRawAllowZero(messageID, 0);
+  const normalizedCanonicalHumanMessageKey = String(canonicalHumanMessageKey || "").trim();
+  if (
+    !projectID
+    || !provider
+    || !normalizedChatID
+    || (normalizedMessageID <= 0 && !normalizedCanonicalHumanMessageKey)
+    || !runtime?.baseURL
+    || !runtime?.token
+  ) {
     return null;
   }
   try {
@@ -4357,18 +4389,29 @@ async function findServerRunnerConversationSourceRequestForMessageID({
       limit: 500,
       offset: 0,
     });
-    const matched = serverRequests.filter((entryRaw) => {
-      const entry = safeObject(entryRaw);
-      return (
-        String(entry.project_id || "").trim() === projectID
-        && String(entry.provider || "").trim() === provider
-        && String(entry.chat_id || "").trim() === normalizedChatID
-        && (
-          intFromRawAllowZero(entry.source_message_id, 0) === normalizedMessageID
-          || intFromRawAllowZero(entry.last_source_message_id, 0) === normalizedMessageID
-        )
-      );
-    });
+    const matched = serverRequests.filter((entryRaw) => {
+      const entry = safeObject(entryRaw);
+      const requestCanonicalHumanMessageKey = firstNonEmptyString([
+        entry.canonical_human_message_key,
+        safeObject(entry.source_message_envelope).canonical_human_message_key,
+        buildRunnerCanonicalHumanInboundKey(safeObject(entry.source_message_envelope)),
+      ]);
+      return (
+        String(entry.project_id || "").trim() === projectID
+        && String(entry.provider || "").trim() === provider
+        && String(entry.chat_id || "").trim() === normalizedChatID
+        && (
+          (normalizedCanonicalHumanMessageKey && requestCanonicalHumanMessageKey === normalizedCanonicalHumanMessageKey)
+          || (
+            normalizedMessageID > 0
+            && (
+              intFromRawAllowZero(entry.source_message_id, 0) === normalizedMessageID
+              || intFromRawAllowZero(entry.last_source_message_id, 0) === normalizedMessageID
+            )
+          )
+        )
+      );
+    });
     return pickRunnerSharedConversationSourceRequest(matched, excludeRequestKey);
   } catch {
     return null;
@@ -5031,13 +5074,14 @@ async function claimRunnerRequestForHumanComment({
     runtime,
     archiveThreadID,
   });
-  const replyChainContext = safeObject(replyChainResolution.replyChainContext);
+  const replyChainContext = safeObject(replyChainResolution.replyChainContext);
   const referencedRequest = safeObject(replyChainContext.referencedRequest);
   const resolvedNormalizedIntent = resolveRunnerRequestClaimIntent({
     normalizedIntent,
   });
-  let stateForClaim = safeObject(replyChainResolution.state);
-  const normalizedSharedHumanIntent = safeObject(sharedHumanIntent);
+  const canonicalHumanMessageKey = buildRunnerCanonicalHumanInboundKey(parsed);
+  let stateForClaim = safeObject(replyChainResolution.state);
+  const normalizedSharedHumanIntent = safeObject(sharedHumanIntent);
   const provisionalConversationID = String(
     parsed.conversationID
     || replyChainContext.conversationID
@@ -5072,29 +5116,31 @@ async function claimRunnerRequestForHumanComment({
     };
   }
   const currentMessageID = intFromRawAllowZero(parsed.messageID, 0);
-  let sharedConversationSource = currentMessageID > 0
-    ? pickRunnerSharedConversationSourceRequest(
-      findRunnerRequestsForMessageID(stateForClaim, normalizedRoute, {
-        chatID: String(parsed.chatID || parsed.chatId || "").trim(),
-        messageID: currentMessageID,
-      }),
-      provisionalRequestKey,
-    )
-    : {};
+  let sharedConversationSource = currentMessageID > 0
+    ? pickRunnerSharedConversationSourceRequest(
+      findRunnerRequestsForMessageID(stateForClaim, normalizedRoute, {
+        chatID: String(parsed.chatID || parsed.chatId || "").trim(),
+        messageID: currentMessageID,
+        canonicalHumanMessageKey,
+      }),
+      provisionalRequestKey,
+    )
+    : {};
   if (
     !Object.keys(sharedConversationSource).length
     && currentMessageID > 0
     && runtime?.baseURL
     && runtime?.token
   ) {
-    sharedConversationSource = safeObject(await findServerRunnerConversationSourceRequestForMessageID({
-      normalizedRoute,
-      runtime,
-      chatID: String(parsed.chatID || parsed.chatId || "").trim(),
-      messageID: currentMessageID,
-      excludeRequestKey: provisionalRequestKey,
-    }));
-  }
+    sharedConversationSource = safeObject(await findServerRunnerConversationSourceRequestForMessageID({
+      normalizedRoute,
+      runtime,
+      chatID: String(parsed.chatID || parsed.chatId || "").trim(),
+      messageID: currentMessageID,
+      canonicalHumanMessageKey,
+      excludeRequestKey: provisionalRequestKey,
+    }));
+  }
   const authorityContext = resolveRunnerHumanCommentAuthorityContext({
     normalizedRoute,
     selectedRecord,
@@ -5182,14 +5228,16 @@ async function claimRunnerRequestForHumanComment({
     ensureArray(authoritativeDecisionBundle.allowed_responders),
     normalizeTelegramMentionUsername,
   );
+  const hasAuthoritativeConversationDecision = Object.keys(authoritativeDecisionBundle).length > 0;
   const { requests: nextRequests, request } = upsertRunnerRequest(stateForClaim, requestKey, {
     project_id: String(normalizedRoute?.projectID || "").trim(),
     provider: String(normalizedRoute?.provider || "").trim(),
     chat_id: String(parsed.chatID || parsed.chatId || "").trim(),
     source_message_id: intFromRawAllowZero(parsed.messageID, 0) || undefined,
-    source_message_thread_id: intFromRawAllowZero(parsed.messageThreadID, 0) || undefined,
-    source_message_body: String(parsed.body || "").trim(),
-    source_message_origin: String(sourceMessageEnvelope.source_origin || "").trim().toLowerCase(),
+    source_message_thread_id: intFromRawAllowZero(parsed.messageThreadID, 0) || undefined,
+    source_message_body: String(parsed.body || "").trim(),
+    canonical_human_message_key: canonicalHumanMessageKey,
+    source_message_origin: String(sourceMessageEnvelope.source_origin || "").trim().toLowerCase(),
     source_message_route_key: String(sourceMessageEnvelope.source_route_key || "").trim(),
     source_message_bot_username: normalizeTelegramMentionUsername(sourceMessageEnvelope.source_bot_username),
     source_message_envelope: sourceMessageEnvelope,
@@ -5202,26 +5250,32 @@ async function claimRunnerRequestForHumanComment({
     decision_bundle_validation_status: String(decisionBundleValidation.status || "").trim(),
     decision_bundle_validation_reason: String(decisionBundleValidation.reason || "").trim(),
     conversation_intent_mode: String(
-      authoritativeDecisionBundle.conversation_intent_mode
+      (hasAuthoritativeConversationDecision
+        ? authoritativeDecisionBundle.conversation_intent_mode
+        : "")
         || normalizedSharedHumanIntent.intentMode
         || existing.conversation_intent_mode
         || authoritySource.conversation_intent_mode
         || "",
     ).trim().toLowerCase(),
     conversation_lead_bot: normalizeTelegramMentionUsername(
-      authoritativeDecisionBundle.conversation_lead_bot
+      (hasAuthoritativeConversationDecision
+        ? authoritativeDecisionBundle.conversation_lead_bot
+        : "")
         || normalizedSharedHumanIntent.leadBotSelector
         || existing.conversation_lead_bot
         || authoritySource.conversation_lead_bot,
     ),
     conversation_summary_bot: normalizeTelegramMentionUsername(
-      authoritativeDecisionBundle.conversation_summary_bot
+      (hasAuthoritativeConversationDecision
+        ? authoritativeDecisionBundle.conversation_summary_bot
+        : "")
         || normalizedSharedHumanIntent.summaryBotSelector
         || existing.conversation_summary_bot
         || authoritySource.conversation_summary_bot,
     ),
     conversation_participants: uniqueOrderedStrings(
-      decisionConversationParticipants.length
+      hasAuthoritativeConversationDecision && decisionConversationParticipants.length
         ? decisionConversationParticipants
         : ensureArray(normalizedSharedHumanIntent.participantSelectors).length
         ? normalizedSharedHumanIntent.participantSelectors
@@ -5233,7 +5287,7 @@ async function claimRunnerRequestForHumanComment({
       normalizeTelegramMentionUsername,
     ),
     conversation_initial_responders: uniqueOrderedStrings(
-      decisionInitialResponders.length
+      hasAuthoritativeConversationDecision && decisionInitialResponders.length
         ? decisionInitialResponders
         : ensureArray(normalizedSharedHumanIntent.initialResponderSelectors).length
         ? normalizedSharedHumanIntent.initialResponderSelectors
@@ -5245,7 +5299,7 @@ async function claimRunnerRequestForHumanComment({
       normalizeTelegramMentionUsername,
     ),
     conversation_allowed_responders: uniqueOrderedStrings(
-      decisionAllowedResponders.length
+      hasAuthoritativeConversationDecision && decisionAllowedResponders.length
         ? decisionAllowedResponders
         : ensureArray(normalizedSharedHumanIntent.allowedResponderSelectors).length
         ? normalizedSharedHumanIntent.allowedResponderSelectors
@@ -5254,30 +5308,38 @@ async function claimRunnerRequestForHumanComment({
           : ensureArray(authoritySource.conversation_allowed_responders).length
             ? authoritySource.conversation_allowed_responders
             : [],
-      normalizeTelegramMentionUsername,
+      normalizeTelegramMentionUsername,
     ),
-    conversation_allow_bot_to_bot: authoritativeDecisionBundle.allow_bot_to_bot === true
+    conversation_allow_bot_to_bot: (hasAuthoritativeConversationDecision
+      ? authoritativeDecisionBundle.allow_bot_to_bot === true
+      : false)
       || normalizedSharedHumanIntent.allowBotToBot === true
       || existing.conversation_allow_bot_to_bot === true
       || authoritySource.conversation_allow_bot_to_bot === true,
     conversation_reply_expectation: String(
-      authoritativeDecisionBundle.conversation_reply_expectation
+      (hasAuthoritativeConversationDecision
+        ? authoritativeDecisionBundle.conversation_reply_expectation
+        : "")
         || normalizedSharedHumanIntent.replyExpectation
         || existing.conversation_reply_expectation
         || authoritySource.conversation_reply_expectation
         || "",
     ).trim().toLowerCase(),
     execution_contract_type: String(
-      authoritativeDecisionBundle.execution_contract_type
+      (hasAuthoritativeConversationDecision
+        ? authoritativeDecisionBundle.execution_contract_type
+        : "")
         || runnerRequestPreferredExecutionContractType(existing)
         || runnerRequestPreferredExecutionContractType(authoritySource)
         || "",
     ).trim().toLowerCase(),
-    execution_contract_actionable: authoritativeDecisionBundle.execution_contract_actionable === true
+    execution_contract_actionable: (hasAuthoritativeConversationDecision
+      ? authoritativeDecisionBundle.execution_contract_actionable === true
+      : false)
       || runnerRequestPreferredExecutionContractActionable(existing)
       || runnerRequestPreferredExecutionContractActionable(authoritySource),
     execution_contract_targets: uniqueOrderedStrings(
-      ensureArray(authoritativeDecisionBundle.execution_contract_targets).length
+      hasAuthoritativeConversationDecision && ensureArray(authoritativeDecisionBundle.execution_contract_targets).length
         ? authoritativeDecisionBundle.execution_contract_targets
         : runnerRequestPreferredExecutionContractTargets(existing).length
         ? runnerRequestPreferredExecutionContractTargets(existing)
@@ -5285,7 +5347,7 @@ async function claimRunnerRequestForHumanComment({
       normalizeTelegramMentionUsername,
     ),
     next_expected_responders: uniqueOrderedStrings(
-      ensureArray(authoritativeDecisionBundle.next_expected_responders).length
+      hasAuthoritativeConversationDecision && ensureArray(authoritativeDecisionBundle.next_expected_responders).length
         ? authoritativeDecisionBundle.next_expected_responders
         : runnerRequestPreferredNextExpectedResponders(existing).length
         ? runnerRequestPreferredNextExpectedResponders(existing)
@@ -6428,23 +6490,33 @@ function markRunnerRequestLifecycle({
     ],
     normalizeTelegramMentionUsername,
   ).filter((selector) => selector && selector !== normalizedCurrentBotSelector);
+  const nextExecutionContractType = String(
+    authoritativeDecisionBundle.execution_contract_type
+    || executionContractType
+    || existing.execution_contract_type
+    || "",
+  ).trim().toLowerCase();
+  const normalizedOutcome = String(outcome || "").trim().toLowerCase();
   const shouldRemainRunningAfterReply = authoritativeDecisionBundle.should_close_after_reply === true
     ? false
     : authoritativeDecisionBundle.should_close_after_reply === false
       ? true
       : continuationSelectors.length > 0;
+  const shouldRemainRunningAfterSkip = normalizedOutcome === "skipped"
+    && parsedKind === "bot_reply"
+    && authoritativeDecisionBundle.should_close_after_reply !== true
+    && (
+      nextExecutionContractType === "delegation"
+      || rootEffectiveExecutionContractTargets.length > 0
+      || rootEffectiveNextExpectedResponders.length > 0
+      || continuationSelectors.length > 0
+    );
   const nextConversationIntentMode = String(
     authoritativeDecisionBundle.conversation_intent_mode
     || conversationIntentMode
     || existing.conversation_intent_mode
     || "",
   ).trim().toLowerCase();
-  const nextExecutionContractType = String(
-    authoritativeDecisionBundle.execution_contract_type
-    || executionContractType
-    || existing.execution_contract_type
-    || "",
-  ).trim().toLowerCase();
   const nextNormalizedIntent = (() => {
     const explicitIntent = String(
       authoritativeDecisionBundle.normalized_intent || normalizedIntent || "",
@@ -6454,10 +6526,9 @@ function markRunnerRequestLifecycle({
     }
     if (nextConversationIntentMode && !nextExecutionContractType) {
       return "";
-    }
-    return String(existing.normalized_intent || "").trim().toLowerCase();
-  })();
-  const normalizedOutcome = String(outcome || "").trim().toLowerCase();
+    }
+    return String(existing.normalized_intent || "").trim().toLowerCase();
+  })();
   const nextStatus = (() => {
     if (normalizedOutcome === "claimed") return "claimed";
     if (normalizedOutcome === "running") return "running";
@@ -6467,9 +6538,11 @@ function markRunnerRequestLifecycle({
     }
     if (normalizedOutcome === "loop_closed") return "loop_closed";
     if (normalizedOutcome === "expired") return "expired";
+    if (normalizedOutcome === "skipped") {
+      return shouldRemainRunningAfterSkip ? "running" : "closed";
+    }
     if (
       normalizedOutcome === "error"
-      || normalizedOutcome === "skipped"
       || normalizedOutcome === "closed"
       || normalizedOutcome === "execution_failed"
       || normalizedOutcome === "policy_violation"