@defend-tech/opencode-optima 0.1.17 → 0.1.19

package/dist/index.js

@@ -9020,6 +9020,26 @@ function clickUpWebhookListItems(response = {}) {
   if (Array.isArray(response?.data?.webhooks)) return response.data.webhooks;
   return [];
 }
+function clickUpWebhookLocationCompatible(webhook = {}, config = {}) {
+  const location = config?.webhook?.location || {};
+  for (const key of ["space_id", "folder_id", "list_id"]) {
+    const expected = String(location[key] || "").trim();
+    if (expected && String(webhook[key] || webhook.location?.[key] || "").trim() !== expected) return false;
+  }
+  return true;
+}
+async function findReusableClickUpWebhook(config, clickupClient = null) {
+  if (!clickupClient?.listWebhooks) return null;
+  const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
+  for (const webhook of clickUpWebhookListItems(listed)) {
+    const remote = normalizeClickUpWebhookApiResponse(webhook, config);
+    if (remote.publicUrl !== config.webhook.publicUrl) continue;
+    if (!clickUpWebhookLocationCompatible(webhook, config)) continue;
+    if (!isClickUpWebhookStateActive(remote, config)) continue;
+    return remote;
+  }
+  return null;
+}
 async function validateClickUpWebhookState(state, config, clickupClient = null) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
   if (clickupClient?.listWebhooks) {
@@ -9051,6 +9071,12 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
     await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
     markClickUpWebhookInactive(worktree, existing, config);
   }
+  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient);
+  if (reusableRemote) {
+    const state = writeClickUpWebhookState(worktree, { ...reusableRemote, recentEventKeys: existing.recentEventKeys || [] }, config);
+    clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: "remote_discovered" });
+    return { active: true, valid: true, mode: "remote_discovered", state };
+  }
   if (!clickupClient?.createWebhook) {
     return { active: false, valid: false, reason: "clickup_client_unavailable", state: existing };
   }
@@ -9212,20 +9238,30 @@ async function createOpenCodeSession(client, { title, directory } = {}) {
   const result = await client.session.create({ query: { directory }, body: { title } });
   return result?.data?.id || result?.id;
 }
+function assertOpenCodePromptAccepted(result) {
+  const status = Number(result?.status || result?.response?.status || result?.error?.status || 0);
+  if (status >= 400 || result?.ok === false || result?.error) {
+    const message = result?.error?.message || result?.message || `OpenCode prompt request failed${status ? ` with status ${status}` : ""}.`;
+    throw new Error(message);
+  }
+  return result;
+}
 async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
-  try {
-    return await method({ sessionID: sessionId, ...flatPayload });
-  } catch (flatError) {
+  const attempts = [
+    { id: sessionId, ...flatPayload },
+    { sessionID: sessionId, ...flatPayload },
+    { ...structuredPayload, path: { sessionID: sessionId } },
+    { ...structuredPayload, path: { id: sessionId } }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
     try {
-      return await method({ ...structuredPayload, path: { sessionID: sessionId } });
-    } catch {
-      try {
-        return await method({ ...structuredPayload, path: { id: sessionId } });
-      } catch {
-        throw flatError;
-      }
+      return assertOpenCodePromptAccepted(await method(attempt));
+    } catch (error) {
+      firstError ??= error;
     }
   }
+  throw firstError;
 }
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory } = {}) {
   const parts = [{ type: "text", text }];

package/dist/sanitize_cli.js

@@ -9027,6 +9027,26 @@ function clickUpWebhookListItems(response = {}) {
   if (Array.isArray(response?.data?.webhooks)) return response.data.webhooks;
   return [];
 }
+function clickUpWebhookLocationCompatible(webhook = {}, config = {}) {
+  const location = config?.webhook?.location || {};
+  for (const key of ["space_id", "folder_id", "list_id"]) {
+    const expected = String(location[key] || "").trim();
+    if (expected && String(webhook[key] || webhook.location?.[key] || "").trim() !== expected) return false;
+  }
+  return true;
+}
+async function findReusableClickUpWebhook(config, clickupClient = null) {
+  if (!clickupClient?.listWebhooks) return null;
+  const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
+  for (const webhook of clickUpWebhookListItems(listed)) {
+    const remote = normalizeClickUpWebhookApiResponse(webhook, config);
+    if (remote.publicUrl !== config.webhook.publicUrl) continue;
+    if (!clickUpWebhookLocationCompatible(webhook, config)) continue;
+    if (!isClickUpWebhookStateActive(remote, config)) continue;
+    return remote;
+  }
+  return null;
+}
 async function validateClickUpWebhookState(state, config, clickupClient = null) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
   if (clickupClient?.listWebhooks) {
@@ -9058,6 +9078,12 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
     await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
     markClickUpWebhookInactive(worktree, existing, config);
   }
+  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient);
+  if (reusableRemote) {
+    const state = writeClickUpWebhookState(worktree, { ...reusableRemote, recentEventKeys: existing.recentEventKeys || [] }, config);
+    clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: "remote_discovered" });
+    return { active: true, valid: true, mode: "remote_discovered", state };
+  }
   if (!clickupClient?.createWebhook) {
     return { active: false, valid: false, reason: "clickup_client_unavailable", state: existing };
   }
@@ -9219,20 +9245,30 @@ async function createOpenCodeSession(client, { title, directory } = {}) {
   const result = await client.session.create({ query: { directory }, body: { title } });
   return result?.data?.id || result?.id;
 }
+function assertOpenCodePromptAccepted(result) {
+  const status = Number(result?.status || result?.response?.status || result?.error?.status || 0);
+  if (status >= 400 || result?.ok === false || result?.error) {
+    const message = result?.error?.message || result?.message || `OpenCode prompt request failed${status ? ` with status ${status}` : ""}.`;
+    throw new Error(message);
+  }
+  return result;
+}
 async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
-  try {
-    return await method({ sessionID: sessionId, ...flatPayload });
-  } catch (flatError) {
+  const attempts = [
+    { id: sessionId, ...flatPayload },
+    { sessionID: sessionId, ...flatPayload },
+    { ...structuredPayload, path: { sessionID: sessionId } },
+    { ...structuredPayload, path: { id: sessionId } }
+  ];
+  let firstError = null;
+  for (const attempt of attempts) {
     try {
-      return await method({ ...structuredPayload, path: { sessionID: sessionId } });
-    } catch {
-      try {
-        return await method({ ...structuredPayload, path: { id: sessionId } });
-      } catch {
-        throw flatError;
-      }
+      return assertOpenCodePromptAccepted(await method(attempt));
+    } catch (error) {
+      firstError ??= error;
     }
   }
+  throw firstError;
 }
 async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory } = {}) {
   const parts = [{ type: "text", text }];

package/package.json

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