@defend-tech/opencode-optima 0.1.42 → 0.1.43

package/dist/index.js

@@ -9592,31 +9592,64 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchImpl = globalThis.fetch } = {}) {
+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 (!data?.data?.id) throw new Error("OpenCode v2 prompt response did not include data.id.");
+        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 +9665,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) {

package/dist/sanitize_cli.js

@@ -9599,31 +9599,64 @@ function assertOpenCodePromptAccepted(result) {
   }
   return result;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchImpl = globalThis.fetch } = {}) {
+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 (!data?.data?.id) throw new Error("OpenCode v2 prompt response did not include data.id.");
+        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 +9672,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) {

package/package.json

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