@defend-tech/opencode-optima 0.1.70 → 0.1.71

package/dist/index.js

@@ -10654,20 +10654,25 @@ function appendDirectoryQuery(url, directory) {
   const separator = url.includes("?") ? "&" : "?";
   return `${url}${separator}directory=${encodeURIComponent(value)}`;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function normalizeOpenCodePromptDelivery(value, fallback = "queue") {
+  const normalized = String(value || "").trim().toLowerCase();
+  return normalized === "steer" || normalized === "queue" ? normalized : fallback;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false, delivery = "queue" } = {}) {
   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 encodedSession = encodeURIComponent(sessionId);
+  const promptDelivery = normalizeOpenCodePromptDelivery(delivery, "queue");
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
       url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
-      body: { prompt: { text }, delivery: "queue", resume: true },
+      body: { prompt: { text }, delivery: promptDelivery, 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 };
+        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, delivery: promptDelivery, data: data.data, response: data };
       }
     },
     {
@@ -10723,7 +10728,7 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true, directDelivery = "queue" } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -10747,7 +10752,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly, delivery: directDelivery });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -11120,11 +11125,11 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   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, directPrompt = false, acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
+async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, directDelivery = "queue", acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   let sendResult;
   try {
-    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, allowDirectFallback: directPrompt });
+    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, directDelivery, allowDirectFallback: directPrompt });
   } catch (error) {
     const reason2 = error.message || "message_delivery_failed";
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: reason2, fallbackAttempted: false });
@@ -11147,7 +11152,13 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   if (admissionVerification && acceptPromptAdmission) {
-    return { ok: true, verification: admissionVerification, admissionVerification, fallback: false, admissionOnly: true };
+    appendClickUpWebhookLocalLog(worktree, {
+      type: "message_delivery_admission_not_sufficient",
+      taskId,
+      sessionId,
+      admission: admissionVerification,
+      policy: "clickup_routing_requires_visible_delivery"
+    });
   }
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
@@ -11550,10 +11561,9 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   const sessionId = String(existingSessionId);
   if (await sessionExists(openCodeClient, sessionId, { directory: taskRoute.worktree })) {
     if (typeof clickupClient?.updateTaskMetadata === "function") await clickupClient.updateTaskMetadata({ taskId, fieldId: config.routing.metadataFieldId, value: metadataWithRouting });
-    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
+    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", directDelivery: "steer", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
     if (!delivery.ok) {
-      const recovery2 = await recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId: sessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers: [taskId, eventType], deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, eventKey, createSession, verifySessionEventDelivery });
-      return finish(recovery2);
+      return finish({ ...delivery, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, replacementAttempted: false });
     }
     return finish({ ok: true, action: "sent_to_existing_session", taskId, sessionId, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, deliveryVerification: delivery.verification, deliveryAdmission: delivery.admissionVerification, deliveryFallback: delivery.fallback, deliveryAttempts: delivery.fallback ? 2 : 1 });
   }

package/dist/sanitize_cli.js

@@ -10661,20 +10661,25 @@ function appendDirectoryQuery(url, directory) {
   const separator = url.includes("?") ? "&" : "?";
   return `${url}${separator}directory=${encodeURIComponent(value)}`;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function normalizeOpenCodePromptDelivery(value, fallback = "queue") {
+  const normalized = String(value || "").trim().toLowerCase();
+  return normalized === "steer" || normalized === "queue" ? normalized : fallback;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false, delivery = "queue" } = {}) {
   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 encodedSession = encodeURIComponent(sessionId);
+  const promptDelivery = normalizeOpenCodePromptDelivery(delivery, "queue");
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
       url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
-      body: { prompt: { text }, delivery: "queue", resume: true },
+      body: { prompt: { text }, delivery: promptDelivery, 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 };
+        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, delivery: promptDelivery, data: data.data, response: data };
       }
     },
     {
@@ -10730,7 +10735,7 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true, directDelivery = "queue" } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -10754,7 +10759,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly, delivery: directDelivery });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -11127,11 +11132,11 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   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, directPrompt = false, acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
+async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, directDelivery = "queue", acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   let sendResult;
   try {
-    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, allowDirectFallback: directPrompt });
+    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, directDelivery, allowDirectFallback: directPrompt });
   } catch (error) {
     const reason2 = error.message || "message_delivery_failed";
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: reason2, fallbackAttempted: false });
@@ -11154,7 +11159,13 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   if (admissionVerification && acceptPromptAdmission) {
-    return { ok: true, verification: admissionVerification, admissionVerification, fallback: false, admissionOnly: true };
+    appendClickUpWebhookLocalLog(worktree, {
+      type: "message_delivery_admission_not_sufficient",
+      taskId,
+      sessionId,
+      admission: admissionVerification,
+      policy: "clickup_routing_requires_visible_delivery"
+    });
   }
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
@@ -11557,10 +11568,9 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   const sessionId = String(existingSessionId);
   if (await sessionExists(openCodeClient, sessionId, { directory: taskRoute.worktree })) {
     if (typeof clickupClient?.updateTaskMetadata === "function") await clickupClient.updateTaskMetadata({ taskId, fieldId: config.routing.metadataFieldId, value: metadataWithRouting });
-    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
+    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", directDelivery: "steer", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
     if (!delivery.ok) {
-      const recovery2 = await recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId: sessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers: [taskId, eventType], deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, eventKey, createSession, verifySessionEventDelivery });
-      return finish(recovery2);
+      return finish({ ...delivery, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, replacementAttempted: false });
     }
     return finish({ ok: true, action: "sent_to_existing_session", taskId, sessionId, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, deliveryVerification: delivery.verification, deliveryAdmission: delivery.admissionVerification, deliveryFallback: delivery.fallback, deliveryAttempts: delivery.fallback ? 2 : 1 });
   }

package/package.json

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