@defend-tech/opencode-optima 0.1.43 → 0.1.45

package/dist/index.js

@@ -9564,25 +9564,60 @@ function clearClickUpPendingSessionMetadata(metadata, metadataKey) {
   return JSON.stringify(sortJsonValue(root), null, 2);
 }
 async function openCodeSessionExists(client, sessionId) {
-  try {
-    if (typeof client?.session?.get === "function") {
-      await client.session.get({ path: { id: sessionId } });
-      return true;
+  const getAttempts = [
+    { sessionID: sessionId },
+    { id: sessionId },
+    { path: { sessionID: sessionId } },
+    { path: { id: sessionId } }
+  ];
+  if (typeof client?.session?.get === "function") {
+    for (const attempt of getAttempts) {
+      try {
+        await client.session.get(attempt);
+        return true;
+      } catch {
+      }
     }
-    if (typeof client?.session?.messages === "function") {
-      await client.session.messages({ path: { id: sessionId }, query: { limit: 1 } });
-      return true;
+  }
+  const messageAttempts = [
+    { sessionID: sessionId, limit: 1 },
+    { id: sessionId, limit: 1 },
+    { path: { sessionID: sessionId }, query: { limit: 1 } },
+    { path: { id: sessionId }, query: { limit: 1 } }
+  ];
+  if (typeof client?.session?.messages === "function") {
+    for (const attempt of messageAttempts) {
+      try {
+        await client.session.messages(attempt);
+        return true;
+      } catch {
+      }
     }
-  } catch {
-    return false;
   }
   return false;
 }
+function extractOpenCodeSessionId(result) {
+  const data = result?.data ?? result;
+  return data?.id || data?.sessionID || data?.sessionId || result?.id || result?.sessionID || result?.sessionId;
+}
 async function createOpenCodeSession(client, { title, directory, agent } = {}) {
+  const flatPayload = { directory, title };
+  if (agent) flatPayload.agent = agent;
   const body = { title };
   if (agent) body.agent = agent;
-  const result = await client.session.create({ query: { directory }, body });
-  return result?.data?.id || result?.id;
+  const attempts = [flatPayload, { query: { directory }, body }];
+  let firstError = null;
+  for (const attempt of attempts) {
+    try {
+      const result = await client.session.create(attempt);
+      const sessionId = extractOpenCodeSessionId(result);
+      if (sessionId) return sessionId;
+      firstError ??= new Error("OpenCode session create response did not include a session id.");
+    } catch (error) {
+      firstError ??= error;
+    }
+  }
+  throw firstError || new Error("OpenCode session create failed.");
 }
 function assertOpenCodePromptAccepted(result) {
   const status = Number(result?.status || result?.response?.status || result?.error?.status || 0);
@@ -9592,6 +9627,18 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
+function openCodePromptAdmissionVerification(result, sessionId) {
+  const response = result?.response ?? result;
+  const data = response?.data ?? result?.data ?? null;
+  const promptId = data?.id ?? response?.id ?? result?.id;
+  const admittedSessionId = response?.sessionID ?? response?.sessionId ?? data?.sessionID ?? data?.sessionId ?? result?.sessionID ?? result?.sessionId;
+  const admittedSeq = response?.admittedSeq ?? data?.admittedSeq ?? result?.admittedSeq;
+  if (!promptId || admittedSeq === void 0 || admittedSeq === null || !admittedSessionId) return null;
+  if (String(admittedSessionId) !== String(sessionId)) {
+    throw new Error(`OpenCode prompt admission targeted foreign session ${admittedSessionId}.`);
+  }
+  return { ok: true, method: "prompt_admission", promptId: String(promptId), sessionId: String(admittedSessionId), admittedSeq };
+}
 function responseLooksLikeHtml(contentType = "", raw = "") {
   return String(contentType || "").toLowerCase().includes("text/html") || /^\s*<!doctype\s+html\b/i.test(raw) || /^\s*<html\b/i.test(raw);
 }
@@ -9621,7 +9668,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
-        if (!data?.data?.id) throw new Error("OpenCode v2 prompt response did not include data.id.");
+        if (!openCodePromptAdmissionVerification(data, sessionId)) throw new Error("OpenCode v2 prompt response did not include a valid prompt admission.");
         return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, data: data.data, response: data };
       }
     },
@@ -9651,21 +9698,49 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   }
   throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
+async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
+  const attempts = [
+    { sessionID: sessionId, ...flatPayload },
+    { id: sessionId, ...flatPayload },
+    { ...structuredPayload, path: { id: sessionId } },
+    { ...structuredPayload, path: { sessionID: sessionId } }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
+    try {
+      return assertOpenCodePromptAccepted(await method(attempt));
+    } catch (error) {
+      firstError ??= error;
+    }
+  }
+  throw firstError;
+}
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
+  const flatPayload = { directory, agent, parts };
   const structuredPayload = {
     path: { id: sessionId },
     query: { directory },
     body: { agent, parts }
   };
+  let firstError = null;
   if (!direct && typeof client?.session?.promptAsync === "function") {
-    return assertOpenCodePromptAccepted(await client.session.promptAsync(structuredPayload));
+    try {
+      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+    } catch (error) {
+      firstError ??= error;
+    }
   }
   if (!direct && typeof client?.session?.prompt === "function") {
-    return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
+    try {
+      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+    } catch (error) {
+      firstError ??= error;
+    }
   }
   if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl });
+  if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function normalizeOpenCodeSessionMessages(result) {
@@ -9678,10 +9753,10 @@ function normalizeOpenCodeSessionMessages(result) {
 async function readOpenCodeSessionMessages(client, { sessionId, limit = 20 } = {}) {
   if (typeof client?.session?.messages !== "function") return null;
   const attempts = [
-    { path: { id: sessionId }, query: { limit } },
-    { path: { sessionID: sessionId }, query: { limit } },
+    { sessionID: sessionId, limit },
     { id: sessionId, limit },
-    { sessionID: sessionId, limit }
+    { path: { id: sessionId }, query: { limit } },
+    { path: { sessionID: sessionId }, query: { limit } }
   ];
   let firstError = null;
   for (const attempt of attempts) {
@@ -9735,13 +9810,29 @@ async function applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason,
 }
 async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => null);
-  await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  let admissionVerification = null;
+  try {
+    admissionVerification = openCodePromptAdmissionVerification(sendResult, sessionId);
+  } catch (error) {
+    appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: error.message, fallbackAttempted: false });
+    if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false };
+    const blocker2 = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason: error.message, source: "delivery_admission_failed" });
+    return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker2 };
+  }
+  if (admissionVerification) return { ok: true, verification: admissionVerification, fallback: false };
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, fallback: false };
   const canFallbackDirect = Boolean(opencodeBaseUrl);
   if (canFallbackDirect) {
     const retryBeforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => beforeMessages);
-    await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true });
+    const retrySendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true });
+    try {
+      admissionVerification = openCodePromptAdmissionVerification(retrySendResult, sessionId);
+    } catch (error) {
+      verification = { ok: false, reason: error.message };
+    }
+    if (admissionVerification) return { ok: true, verification: admissionVerification, fallback: true };
     verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages: retryBeforeMessages, expectedText: text, markers: eventMarkers });
     if (verification?.ok) return { ok: true, verification, fallback: true };
   }
@@ -11979,7 +12070,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     }
   };
 }
-OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, readClickUpCommentLedger, readClickUpWebhookState, reconcileClickUpStartup, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
+OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
 export {
   OptimaPlugin as default
 };

package/dist/sanitize_cli.js

@@ -9571,25 +9571,60 @@ function clearClickUpPendingSessionMetadata(metadata, metadataKey) {
   return JSON.stringify(sortJsonValue(root), null, 2);
 }
 async function openCodeSessionExists(client, sessionId) {
-  try {
-    if (typeof client?.session?.get === "function") {
-      await client.session.get({ path: { id: sessionId } });
-      return true;
+  const getAttempts = [
+    { sessionID: sessionId },
+    { id: sessionId },
+    { path: { sessionID: sessionId } },
+    { path: { id: sessionId } }
+  ];
+  if (typeof client?.session?.get === "function") {
+    for (const attempt of getAttempts) {
+      try {
+        await client.session.get(attempt);
+        return true;
+      } catch {
+      }
     }
-    if (typeof client?.session?.messages === "function") {
-      await client.session.messages({ path: { id: sessionId }, query: { limit: 1 } });
-      return true;
+  }
+  const messageAttempts = [
+    { sessionID: sessionId, limit: 1 },
+    { id: sessionId, limit: 1 },
+    { path: { sessionID: sessionId }, query: { limit: 1 } },
+    { path: { id: sessionId }, query: { limit: 1 } }
+  ];
+  if (typeof client?.session?.messages === "function") {
+    for (const attempt of messageAttempts) {
+      try {
+        await client.session.messages(attempt);
+        return true;
+      } catch {
+      }
     }
-  } catch {
-    return false;
   }
   return false;
 }
+function extractOpenCodeSessionId(result) {
+  const data = result?.data ?? result;
+  return data?.id || data?.sessionID || data?.sessionId || result?.id || result?.sessionID || result?.sessionId;
+}
 async function createOpenCodeSession(client, { title, directory, agent } = {}) {
+  const flatPayload = { directory, title };
+  if (agent) flatPayload.agent = agent;
   const body = { title };
   if (agent) body.agent = agent;
-  const result = await client.session.create({ query: { directory }, body });
-  return result?.data?.id || result?.id;
+  const attempts = [flatPayload, { query: { directory }, body }];
+  let firstError = null;
+  for (const attempt of attempts) {
+    try {
+      const result = await client.session.create(attempt);
+      const sessionId = extractOpenCodeSessionId(result);
+      if (sessionId) return sessionId;
+      firstError ??= new Error("OpenCode session create response did not include a session id.");
+    } catch (error) {
+      firstError ??= error;
+    }
+  }
+  throw firstError || new Error("OpenCode session create failed.");
 }
 function assertOpenCodePromptAccepted(result) {
   const status = Number(result?.status || result?.response?.status || result?.error?.status || 0);
@@ -9599,6 +9634,18 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
+function openCodePromptAdmissionVerification(result, sessionId) {
+  const response = result?.response ?? result;
+  const data = response?.data ?? result?.data ?? null;
+  const promptId = data?.id ?? response?.id ?? result?.id;
+  const admittedSessionId = response?.sessionID ?? response?.sessionId ?? data?.sessionID ?? data?.sessionId ?? result?.sessionID ?? result?.sessionId;
+  const admittedSeq = response?.admittedSeq ?? data?.admittedSeq ?? result?.admittedSeq;
+  if (!promptId || admittedSeq === void 0 || admittedSeq === null || !admittedSessionId) return null;
+  if (String(admittedSessionId) !== String(sessionId)) {
+    throw new Error(`OpenCode prompt admission targeted foreign session ${admittedSessionId}.`);
+  }
+  return { ok: true, method: "prompt_admission", promptId: String(promptId), sessionId: String(admittedSessionId), admittedSeq };
+}
 function responseLooksLikeHtml(contentType = "", raw = "") {
   return String(contentType || "").toLowerCase().includes("text/html") || /^\s*<!doctype\s+html\b/i.test(raw) || /^\s*<html\b/i.test(raw);
 }
@@ -9628,7 +9675,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
-        if (!data?.data?.id) throw new Error("OpenCode v2 prompt response did not include data.id.");
+        if (!openCodePromptAdmissionVerification(data, sessionId)) throw new Error("OpenCode v2 prompt response did not include a valid prompt admission.");
         return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, data: data.data, response: data };
       }
     },
@@ -9658,21 +9705,49 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   }
   throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
+async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
+  const attempts = [
+    { sessionID: sessionId, ...flatPayload },
+    { id: sessionId, ...flatPayload },
+    { ...structuredPayload, path: { id: sessionId } },
+    { ...structuredPayload, path: { sessionID: sessionId } }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
+    try {
+      return assertOpenCodePromptAccepted(await method(attempt));
+    } catch (error) {
+      firstError ??= error;
+    }
+  }
+  throw firstError;
+}
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
+  const flatPayload = { directory, agent, parts };
   const structuredPayload = {
     path: { id: sessionId },
     query: { directory },
     body: { agent, parts }
   };
+  let firstError = null;
   if (!direct && typeof client?.session?.promptAsync === "function") {
-    return assertOpenCodePromptAccepted(await client.session.promptAsync(structuredPayload));
+    try {
+      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+    } catch (error) {
+      firstError ??= error;
+    }
   }
   if (!direct && typeof client?.session?.prompt === "function") {
-    return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
+    try {
+      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+    } catch (error) {
+      firstError ??= error;
+    }
   }
   if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl });
+  if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function normalizeOpenCodeSessionMessages(result) {
@@ -9685,10 +9760,10 @@ function normalizeOpenCodeSessionMessages(result) {
 async function readOpenCodeSessionMessages(client, { sessionId, limit = 20 } = {}) {
   if (typeof client?.session?.messages !== "function") return null;
   const attempts = [
-    { path: { id: sessionId }, query: { limit } },
-    { path: { sessionID: sessionId }, query: { limit } },
+    { sessionID: sessionId, limit },
     { id: sessionId, limit },
-    { sessionID: sessionId, limit }
+    { path: { id: sessionId }, query: { limit } },
+    { path: { sessionID: sessionId }, query: { limit } }
   ];
   let firstError = null;
   for (const attempt of attempts) {
@@ -9742,13 +9817,29 @@ async function applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason,
 }
 async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => null);
-  await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  let admissionVerification = null;
+  try {
+    admissionVerification = openCodePromptAdmissionVerification(sendResult, sessionId);
+  } catch (error) {
+    appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: error.message, fallbackAttempted: false });
+    if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false };
+    const blocker2 = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason: error.message, source: "delivery_admission_failed" });
+    return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker2 };
+  }
+  if (admissionVerification) return { ok: true, verification: admissionVerification, fallback: false };
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, fallback: false };
   const canFallbackDirect = Boolean(opencodeBaseUrl);
   if (canFallbackDirect) {
     const retryBeforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => beforeMessages);
-    await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true });
+    const retrySendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true });
+    try {
+      admissionVerification = openCodePromptAdmissionVerification(retrySendResult, sessionId);
+    } catch (error) {
+      verification = { ok: false, reason: error.message };
+    }
+    if (admissionVerification) return { ok: true, verification: admissionVerification, fallback: true };
     verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages: retryBeforeMessages, expectedText: text, markers: eventMarkers });
     if (verification?.ok) return { ok: true, verification, fallback: true };
   }
@@ -11986,7 +12077,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     }
   };
 }
-OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, readClickUpCommentLedger, readClickUpWebhookState, reconcileClickUpStartup, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
+OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
 
 // src/sanitize_cli.js
 var { migrateLegacyOptimaLayout: migrateLegacyOptimaLayout2 } = OptimaPlugin.__internals;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defend-tech/opencode-optima",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/defend-tech/opencode-optima.git"