@defend-tech/opencode-optima 0.1.42 → 0.1.44

package/dist/index.js

@@ -9592,31 +9592,76 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchImpl = globalThis.fetch } = {}) {
+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);
+}
+async function readOpenCodeJsonResponse(response, endpointName) {
+  const contentType = response.headers?.get?.("content-type") || "";
+  const raw = await response.text();
+  if (responseLooksLikeHtml(contentType, raw)) {
+    throw new Error(`OpenCode ${endpointName} returned the HTML app shell instead of an API response.`);
+  }
+  if (!raw) return null;
+  try {
+    return JSON.parse(raw);
+  } catch (error) {
+    if (response.ok) throw new Error(`OpenCode ${endpointName} response was not JSON: ${error.message}`);
+    return { raw };
+  }
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch } = {}) {
   if (typeof fetchImpl !== "function") throw new Error("OpenCode direct prompt delivery requires fetch.");
   const root = normalizeOpenCodeBaseUrl(baseUrl, "");
   if (!root) throw new Error("OpenCode direct prompt delivery requires a base URL.");
-  const url = `${root}/api/session/${encodeURIComponent(sessionId)}/prompt`;
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ prompt: { text }, delivery: "queue", resume: true })
-  });
-  const raw = await response.text();
-  let data = null;
-  if (raw) {
-    try {
-      data = JSON.parse(raw);
-    } catch (error) {
-      if (response.ok) throw new Error(`OpenCode prompt response was not JSON: ${error.message}`);
+  const encodedSession = encodeURIComponent(sessionId);
+  const attempts = [
+    {
+      name: "v2 prompt",
+      url: `${root}/api/session/${encodedSession}/prompt`,
+      body: { prompt: { text }, delivery: "queue", resume: true },
+      accept: (response, data) => {
+        if (!response.ok) return null;
+        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 };
+      }
+    },
+    {
+      name: "legacy async prompt",
+      url: `${root}/session/${encodedSession}/prompt_async`,
+      body: { agent, parts: [{ type: "text", text }] },
+      accept: (response, data) => {
+        if (response.status !== 204 && !response.ok) return null;
+        return { ok: true, method: "http", endpoint: "/session/{sessionID}/prompt_async", status: response.status, data: data?.data || null, response: data };
+      }
     }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
+    const response = await fetchImpl(attempt.url, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(attempt.body)
+    });
+    const data = await readOpenCodeJsonResponse(response, attempt.name);
+    const accepted = attempt.accept(response, data);
+    if (accepted) return accepted;
+    const message = data?.error?.message || data?.message || data?.raw || `OpenCode ${attempt.name} request failed with status ${response.status}.`;
+    firstError ??= new Error(message);
+    if (![404, 405].includes(Number(response.status))) break;
   }
-  if (!response.ok) {
-    const message = data?.error?.message || data?.message || raw || `OpenCode prompt request failed with status ${response.status}.`;
-    throw new Error(message);
-  }
-  if (!data?.data?.id) throw new Error("OpenCode prompt response did not include data.id.");
-  return { ok: true, method: "http", status: response.status, data: data.data, response: data };
+  throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
@@ -9632,7 +9677,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
   if (!direct && typeof client?.session?.prompt === "function") {
     return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl });
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function normalizeOpenCodeSessionMessages(result) {
@@ -9702,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,31 +9599,76 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchImpl = globalThis.fetch } = {}) {
+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);
+}
+async function readOpenCodeJsonResponse(response, endpointName) {
+  const contentType = response.headers?.get?.("content-type") || "";
+  const raw = await response.text();
+  if (responseLooksLikeHtml(contentType, raw)) {
+    throw new Error(`OpenCode ${endpointName} returned the HTML app shell instead of an API response.`);
+  }
+  if (!raw) return null;
+  try {
+    return JSON.parse(raw);
+  } catch (error) {
+    if (response.ok) throw new Error(`OpenCode ${endpointName} response was not JSON: ${error.message}`);
+    return { raw };
+  }
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch } = {}) {
   if (typeof fetchImpl !== "function") throw new Error("OpenCode direct prompt delivery requires fetch.");
   const root = normalizeOpenCodeBaseUrl(baseUrl, "");
   if (!root) throw new Error("OpenCode direct prompt delivery requires a base URL.");
-  const url = `${root}/api/session/${encodeURIComponent(sessionId)}/prompt`;
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ prompt: { text }, delivery: "queue", resume: true })
-  });
-  const raw = await response.text();
-  let data = null;
-  if (raw) {
-    try {
-      data = JSON.parse(raw);
-    } catch (error) {
-      if (response.ok) throw new Error(`OpenCode prompt response was not JSON: ${error.message}`);
+  const encodedSession = encodeURIComponent(sessionId);
+  const attempts = [
+    {
+      name: "v2 prompt",
+      url: `${root}/api/session/${encodedSession}/prompt`,
+      body: { prompt: { text }, delivery: "queue", resume: true },
+      accept: (response, data) => {
+        if (!response.ok) return null;
+        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 };
+      }
+    },
+    {
+      name: "legacy async prompt",
+      url: `${root}/session/${encodedSession}/prompt_async`,
+      body: { agent, parts: [{ type: "text", text }] },
+      accept: (response, data) => {
+        if (response.status !== 204 && !response.ok) return null;
+        return { ok: true, method: "http", endpoint: "/session/{sessionID}/prompt_async", status: response.status, data: data?.data || null, response: data };
+      }
     }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
+    const response = await fetchImpl(attempt.url, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(attempt.body)
+    });
+    const data = await readOpenCodeJsonResponse(response, attempt.name);
+    const accepted = attempt.accept(response, data);
+    if (accepted) return accepted;
+    const message = data?.error?.message || data?.message || data?.raw || `OpenCode ${attempt.name} request failed with status ${response.status}.`;
+    firstError ??= new Error(message);
+    if (![404, 405].includes(Number(response.status))) break;
   }
-  if (!response.ok) {
-    const message = data?.error?.message || data?.message || raw || `OpenCode prompt request failed with status ${response.status}.`;
-    throw new Error(message);
-  }
-  if (!data?.data?.id) throw new Error("OpenCode prompt response did not include data.id.");
-  return { ok: true, method: "http", status: response.status, data: data.data, response: data };
+  throw firstError || new Error("OpenCode direct prompt delivery failed.");
 }
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
@@ -9639,7 +9684,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
   if (!direct && typeof client?.session?.prompt === "function") {
     return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl });
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function normalizeOpenCodeSessionMessages(result) {
@@ -9709,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.42",
+  "version": "0.1.44",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/defend-tech/opencode-optima.git"