@defend-tech/opencode-optima 0.1.43 → 0.1.44

package/dist/index.js

@@ -9592,6 +9592,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 +9633,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 };
       }
     },
@@ -9735,13 +9747,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 };
   }

package/dist/sanitize_cli.js

@@ -9599,6 +9599,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 +9640,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 };
       }
     },
@@ -9742,13 +9754,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 };
   }

package/package.json

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