@defend-tech/opencode-optima 0.1.50 → 0.1.51

package/dist/index.js

@@ -9719,7 +9719,13 @@ async function readOpenCodeJsonResponse(response, endpointName) {
     return { raw };
   }
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function appendDirectoryQuery(url, directory) {
+  const value = String(directory || "").trim();
+  if (!value) return url;
+  const separator = url.includes("?") ? "&" : "?";
+  return `${url}${separator}directory=${encodeURIComponent(value)}`;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
   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.");
@@ -9727,7 +9733,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
-      url: `${root}/api/session/${encodedSession}/prompt`,
+      url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
@@ -9737,7 +9743,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
     },
     {
       name: "legacy async prompt",
-      url: `${root}/session/${encodedSession}/prompt_async`,
+      url: appendDirectoryQuery(`${root}/session/${encodedSession}/prompt_async`, directory),
       body: { agent, parts: [{ type: "text", text }] },
       accept: (response, data) => {
         if (response.status !== 204 && !response.ok) return null;
@@ -9802,7 +9808,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl, legacyOnly });
+  if (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.");
 }
@@ -9837,6 +9843,11 @@ function openCodeMessageText(message) {
   for (const part of partList) parts.push(part?.text, part?.content);
   return parts.filter((value) => typeof value === "string").join("\n");
 }
+function openCodeMessageStableKey(message, index = 0) {
+  const id = message?.id || message?.messageID || message?.messageId || message?.data?.id || null;
+  if (id) return `id:${id}`;
+  return `idx:${index}:text:${openCodeMessageText(message)}`;
+}
 async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
@@ -9844,13 +9855,15 @@ async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMes
       const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
-      const lastMessage = afterMessages.at(-1) || null;
+      const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
+      const newMessages = beforeKeys ? afterMessages.filter((message, index) => !beforeKeys.has(openCodeMessageStableKey(message, index))) : afterMessages;
+      const lastMessage = newMessages.at(-1) || afterMessages.at(-1) || null;
       const lastMessageId = lastMessage?.id || lastMessage?.messageID || lastMessage?.messageId || null;
       if (beforeCount !== null && afterMessages.length > beforeCount) return { ok: true, method: "message_count", beforeCount, afterCount: afterMessages.length, lastMessageId };
       const textNeedles = [expectedText, ...markers].map((value) => String(value || "").trim()).filter(Boolean);
-      const haystack = afterMessages.slice(-20).map(openCodeMessageText).join("\n");
+      const haystack = newMessages.slice(-20).map(openCodeMessageText).join("\n");
       const matched = textNeedles.find((needle) => haystack.includes(needle));
-      if (matched) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
+      if (matched && (!beforeKeys || newMessages.length > 0)) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
       lastError = "message_not_visible";
     } catch (error) {
       lastError = error.message || "message_verification_failed";

package/dist/sanitize_cli.js

@@ -9726,7 +9726,13 @@ async function readOpenCodeJsonResponse(response, endpointName) {
     return { raw };
   }
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function appendDirectoryQuery(url, directory) {
+  const value = String(directory || "").trim();
+  if (!value) return url;
+  const separator = url.includes("?") ? "&" : "?";
+  return `${url}${separator}directory=${encodeURIComponent(value)}`;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
   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.");
@@ -9734,7 +9740,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
-      url: `${root}/api/session/${encodedSession}/prompt`,
+      url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
@@ -9744,7 +9750,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
     },
     {
       name: "legacy async prompt",
-      url: `${root}/session/${encodedSession}/prompt_async`,
+      url: appendDirectoryQuery(`${root}/session/${encodedSession}/prompt_async`, directory),
       body: { agent, parts: [{ type: "text", text }] },
       accept: (response, data) => {
         if (response.status !== 204 && !response.ok) return null;
@@ -9809,7 +9815,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl, legacyOnly });
+  if (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.");
 }
@@ -9844,6 +9850,11 @@ function openCodeMessageText(message) {
   for (const part of partList) parts.push(part?.text, part?.content);
   return parts.filter((value) => typeof value === "string").join("\n");
 }
+function openCodeMessageStableKey(message, index = 0) {
+  const id = message?.id || message?.messageID || message?.messageId || message?.data?.id || null;
+  if (id) return `id:${id}`;
+  return `idx:${index}:text:${openCodeMessageText(message)}`;
+}
 async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
@@ -9851,13 +9862,15 @@ async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMes
       const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
-      const lastMessage = afterMessages.at(-1) || null;
+      const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
+      const newMessages = beforeKeys ? afterMessages.filter((message, index) => !beforeKeys.has(openCodeMessageStableKey(message, index))) : afterMessages;
+      const lastMessage = newMessages.at(-1) || afterMessages.at(-1) || null;
       const lastMessageId = lastMessage?.id || lastMessage?.messageID || lastMessage?.messageId || null;
       if (beforeCount !== null && afterMessages.length > beforeCount) return { ok: true, method: "message_count", beforeCount, afterCount: afterMessages.length, lastMessageId };
       const textNeedles = [expectedText, ...markers].map((value) => String(value || "").trim()).filter(Boolean);
-      const haystack = afterMessages.slice(-20).map(openCodeMessageText).join("\n");
+      const haystack = newMessages.slice(-20).map(openCodeMessageText).join("\n");
       const matched = textNeedles.find((needle) => haystack.includes(needle));
-      if (matched) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
+      if (matched && (!beforeKeys || newMessages.length > 0)) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
       lastError = "message_not_visible";
     } catch (error) {
       lastError = error.message || "message_verification_failed";

package/package.json

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