@defend-tech/opencode-optima 0.1.51 → 0.1.52

package/dist/index.js

@@ -9767,7 +9767,17 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   }
   throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
-async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
+function tagOpenCodePromptResult(result, deliveryMethod) {
+  if (result && typeof result === "object") {
+    try {
+      Object.defineProperty(result, "__optimaPromptDelivery", { value: deliveryMethod, enumerable: false, configurable: true });
+    } catch {
+      return { result, __optimaPromptDelivery: deliveryMethod };
+    }
+  }
+  return result;
+}
+async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload, deliveryMethod) {
   const attempts = [
     { ...structuredPayload, path: { id: sessionId } },
     { ...structuredPayload, path: { sessionID: sessionId } },
@@ -9777,14 +9787,14 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   let firstError = null;
   for (const attempt of attempts) {
     try {
-      return assertOpenCodePromptAccepted(await method(attempt));
+      return tagOpenCodePromptResult(assertOpenCodePromptAccepted(await method(attempt)), deliveryMethod);
     } catch (error) {
       firstError ??= error;
     }
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -9794,21 +9804,21 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
     body: { agent, parts }
   };
   let firstError = null;
-  if (!direct && typeof client?.session?.promptAsync === "function") {
+  if (!direct && typeof client?.session?.prompt === "function") {
     try {
-      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload, "prompt");
     } catch (error) {
       firstError ??= error;
     }
   }
-  if (!direct && typeof client?.session?.prompt === "function") {
+  if (!direct && typeof client?.session?.promptAsync === "function") {
     try {
-      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload, "prompt_async");
     } catch (error) {
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -9886,46 +9896,44 @@ async function applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason,
     return { ok: false, error: error.message, tagName };
   }
 }
+function openCodeBlockingPromptVerification(result, sessionId) {
+  if (result?.__optimaPromptDelivery !== "prompt") return null;
+  const response = result?.response ?? result;
+  const data = response?.data ?? result?.data ?? null;
+  const parts = normalizePromptResponseParts(result);
+  const messageId = data?.id ?? response?.id ?? result?.id ?? data?.messageID ?? response?.messageID ?? result?.messageID;
+  const deliveredSessionId = response?.sessionID ?? response?.sessionId ?? data?.sessionID ?? data?.sessionId ?? result?.sessionID ?? result?.sessionId;
+  if (deliveredSessionId && String(deliveredSessionId) !== String(sessionId)) {
+    throw new Error(`OpenCode blocking prompt targeted foreign session ${deliveredSessionId}.`);
+  }
+  if (parts.length > 0 || messageId) return { ok: true, method: parts.length > 0 ? "blocking_prompt_parts" : "blocking_prompt_message", messageId: messageId ? String(messageId) : null, sessionId: deliveredSessionId ? String(deliveredSessionId) : String(sessionId), parts: parts.length };
+  return null;
+}
 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);
-  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, allowDirectFallback: false });
+  let blockingPromptVerification = null;
   let admissionVerification = null;
   try {
-    admissionVerification = openCodePromptAdmissionVerification(sendResult, sessionId);
+    blockingPromptVerification = openCodeBlockingPromptVerification(sendResult, sessionId);
+    if (!blockingPromptVerification) 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 (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
-  if (verification?.reason === "message_verification_unavailable" && !admissionVerification) {
-    return { ok: true, verification: { ok: true, method: "legacy_prompt_accepted", skipped: true }, fallback: false };
-  }
   if (admissionVerification) {
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_admitted_but_invisible", taskId, sessionId, admission: admissionVerification, reason: verification?.reason || "message_not_visible" });
   }
-  const canFallbackDirect = Boolean(opencodeBaseUrl);
-  if (canFallbackDirect) {
-    const retryBeforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => beforeMessages);
-    const retrySendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true, legacyOnly: Boolean(admissionVerification) });
-    try {
-      admissionVerification = openCodePromptAdmissionVerification(retrySendResult, sessionId);
-    } catch (error) {
-      verification = { ok: false, reason: error.message };
-    }
-    verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages: retryBeforeMessages, expectedText: text, markers: eventMarkers });
-    if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: true };
-    if (verification?.reason === "message_verification_unavailable" && !admissionVerification) {
-      return { ok: true, verification: { ok: true, method: "legacy_prompt_accepted", skipped: true }, fallback: true };
-    }
-  }
-  const reason = verification?.reason || "message_delivery_failed";
-  appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason, fallbackAttempted: canFallbackDirect });
-  if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: canFallbackDirect };
-  const blocker = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason, source: canFallbackDirect ? "delivery_fallback_failed" : "delivery_verification_failed" });
-  return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: canFallbackDirect, blockerTag: blocker };
+  const reason = verification?.reason || (admissionVerification ? "prompt_admission_not_delivered" : "message_delivery_failed");
+  appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason, fallbackAttempted: false, httpFallbackDisabled: Boolean(opencodeBaseUrl) });
+  if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: false };
+  const blocker = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason, source: "delivery_verification_failed" });
+  return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker };
 }
 async function recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers = [], deliveryEvidencePath, evidencePath, eventKey, createSession, verifySessionEventDelivery } = {}) {
   appendClickUpWebhookLocalLog(worktree, { type: "pm_session_recovery_started", taskId, staleSessionId, worktree: taskRoute?.worktree });

package/dist/sanitize_cli.js

@@ -9774,7 +9774,17 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   }
   throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
-async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
+function tagOpenCodePromptResult(result, deliveryMethod) {
+  if (result && typeof result === "object") {
+    try {
+      Object.defineProperty(result, "__optimaPromptDelivery", { value: deliveryMethod, enumerable: false, configurable: true });
+    } catch {
+      return { result, __optimaPromptDelivery: deliveryMethod };
+    }
+  }
+  return result;
+}
+async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload, deliveryMethod) {
   const attempts = [
     { ...structuredPayload, path: { id: sessionId } },
     { ...structuredPayload, path: { sessionID: sessionId } },
@@ -9784,14 +9794,14 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   let firstError = null;
   for (const attempt of attempts) {
     try {
-      return assertOpenCodePromptAccepted(await method(attempt));
+      return tagOpenCodePromptResult(assertOpenCodePromptAccepted(await method(attempt)), deliveryMethod);
     } catch (error) {
       firstError ??= error;
     }
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -9801,21 +9811,21 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
     body: { agent, parts }
   };
   let firstError = null;
-  if (!direct && typeof client?.session?.promptAsync === "function") {
+  if (!direct && typeof client?.session?.prompt === "function") {
     try {
-      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload, "prompt");
     } catch (error) {
       firstError ??= error;
     }
   }
-  if (!direct && typeof client?.session?.prompt === "function") {
+  if (!direct && typeof client?.session?.promptAsync === "function") {
     try {
-      return await callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+      return await callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload, "prompt_async");
     } catch (error) {
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -9893,46 +9903,44 @@ async function applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason,
     return { ok: false, error: error.message, tagName };
   }
 }
+function openCodeBlockingPromptVerification(result, sessionId) {
+  if (result?.__optimaPromptDelivery !== "prompt") return null;
+  const response = result?.response ?? result;
+  const data = response?.data ?? result?.data ?? null;
+  const parts = normalizePromptResponseParts(result);
+  const messageId = data?.id ?? response?.id ?? result?.id ?? data?.messageID ?? response?.messageID ?? result?.messageID;
+  const deliveredSessionId = response?.sessionID ?? response?.sessionId ?? data?.sessionID ?? data?.sessionId ?? result?.sessionID ?? result?.sessionId;
+  if (deliveredSessionId && String(deliveredSessionId) !== String(sessionId)) {
+    throw new Error(`OpenCode blocking prompt targeted foreign session ${deliveredSessionId}.`);
+  }
+  if (parts.length > 0 || messageId) return { ok: true, method: parts.length > 0 ? "blocking_prompt_parts" : "blocking_prompt_message", messageId: messageId ? String(messageId) : null, sessionId: deliveredSessionId ? String(deliveredSessionId) : String(sessionId), parts: parts.length };
+  return null;
+}
 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);
-  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl });
+  const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, allowDirectFallback: false });
+  let blockingPromptVerification = null;
   let admissionVerification = null;
   try {
-    admissionVerification = openCodePromptAdmissionVerification(sendResult, sessionId);
+    blockingPromptVerification = openCodeBlockingPromptVerification(sendResult, sessionId);
+    if (!blockingPromptVerification) 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 (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
-  if (verification?.reason === "message_verification_unavailable" && !admissionVerification) {
-    return { ok: true, verification: { ok: true, method: "legacy_prompt_accepted", skipped: true }, fallback: false };
-  }
   if (admissionVerification) {
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_admitted_but_invisible", taskId, sessionId, admission: admissionVerification, reason: verification?.reason || "message_not_visible" });
   }
-  const canFallbackDirect = Boolean(opencodeBaseUrl);
-  if (canFallbackDirect) {
-    const retryBeforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => beforeMessages);
-    const retrySendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: true, legacyOnly: Boolean(admissionVerification) });
-    try {
-      admissionVerification = openCodePromptAdmissionVerification(retrySendResult, sessionId);
-    } catch (error) {
-      verification = { ok: false, reason: error.message };
-    }
-    verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages: retryBeforeMessages, expectedText: text, markers: eventMarkers });
-    if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: true };
-    if (verification?.reason === "message_verification_unavailable" && !admissionVerification) {
-      return { ok: true, verification: { ok: true, method: "legacy_prompt_accepted", skipped: true }, fallback: true };
-    }
-  }
-  const reason = verification?.reason || "message_delivery_failed";
-  appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason, fallbackAttempted: canFallbackDirect });
-  if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: canFallbackDirect };
-  const blocker = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason, source: canFallbackDirect ? "delivery_fallback_failed" : "delivery_verification_failed" });
-  return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: canFallbackDirect, blockerTag: blocker };
+  const reason = verification?.reason || (admissionVerification ? "prompt_admission_not_delivered" : "message_delivery_failed");
+  appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason, fallbackAttempted: false, httpFallbackDisabled: Boolean(opencodeBaseUrl) });
+  if (!applyBlockerOnFailure) return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: false };
+  const blocker = await applyClickUpBlockerTag({ clickupClient, worktree, taskId, reason, source: "delivery_verification_failed" });
+  return { ok: false, action: "message_delivery_failed", reason, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker };
 }
 async function recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers = [], deliveryEvidencePath, evidencePath, eventKey, createSession, verifySessionEventDelivery } = {}) {
   appendClickUpWebhookLocalLog(worktree, { type: "pm_session_recovery_started", taskId, staleSessionId, worktree: taskRoute?.worktree });

package/package.json

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