@defend-tech/opencode-optima 0.1.34 → 0.1.35

package/dist/index.js

@@ -9194,7 +9194,7 @@ async function findReusableClickUpWebhook(config, clickupClient = null) {
   }
   return null;
 }
-async function validateClickUpWebhookState(state, config, clickupClient = null) {
+async function validateClickUpWebhookState(state, config, clickupClient = null, { allowRemoteUnhealthyLocalRecovery = false } = {}) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
   if (clickupClient?.listWebhooks) {
     const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
@@ -9202,10 +9202,22 @@ async function validateClickUpWebhookState(state, config, clickupClient = null)
     if (!match) return { valid: false, reason: "remote_state_missing" };
     const remote = normalizeClickUpWebhookApiResponse(match, config);
     const remoteWithLocalSecret = { ...remote, secret: state.secret };
-    if (!isClickUpWebhookStateActive(remoteWithLocalSecret, config) || remote.webhookId !== state.webhookId) {
-      return { valid: false, reason: "remote_state_mismatch", remote };
+    if (isClickUpWebhookStateActive(remoteWithLocalSecret, config) && remote.webhookId === state.webhookId) {
+      return { valid: true, mode: "remote", state: { ...remoteWithLocalSecret, recentEventKeys: state.recentEventKeys || [], lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() } };
     }
-    return { valid: true, mode: "remote", state: { ...remoteWithLocalSecret, recentEventKeys: state.recentEventKeys || [], lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() } };
+    const localStateValidation = await validateClickUpWebhookState(state, config, null);
+    if (allowRemoteUnhealthyLocalRecovery && localStateValidation.valid && remote.webhookId === state.webhookId) {
+      const remoteConfigMatches = remote.publicUrl === config.webhook.publicUrl && [...new Set(config.webhook.events || [])].every((event) => new Set(remote.events || []).has(event));
+      if (remoteConfigMatches) {
+        return {
+          ...localStateValidation,
+          mode: "local_state_remote_unhealthy",
+          limitation: "ClickUp remote webhook is present but unhealthy; Optima starts the local listener from matching local id/secret/config so delivery can recover.",
+          remote
+        };
+      }
+    }
+    return { valid: false, reason: "remote_state_mismatch", remote };
   }
   return { valid: true, mode: "local_state", state: { ...state, lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() }, limitation: "ClickUp API validation unavailable; Optima trusts ignored local runtime state only after id/secret/config checks." };
 }
@@ -9215,7 +9227,7 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
   }
   const { config } = validation;
   const existing = readClickUpWebhookState(worktree, config);
-  const existingValidation = await validateClickUpWebhookState(existing, config, clickupClient);
+  const existingValidation = await validateClickUpWebhookState(existing, config, clickupClient, { allowRemoteUnhealthyLocalRecovery: true });
   if (existingValidation.valid) {
     const state = writeClickUpWebhookState(worktree, { ...existingValidation.state, recentEventKeys: existing.recentEventKeys || [] }, config);
     clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: existingValidation.mode });
@@ -9758,12 +9770,18 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   if (!taskId) return { ok: false, action: "error", reason: "missing_task_id" };
   let task = payload.task || (clickupClient?.getTask ? await clickupClient.getTask(taskId) : null);
   if (!task) return { ok: false, action: "error", reason: "task_unavailable", taskId };
+  if (clickupClient?.getTask) {
+    const latestTask = await clickupClient.getTask(taskId);
+    if (latestTask) task = latestTask;
+  }
   const isCommentEvent = eventType === "taskCommentPosted" || eventType === "taskCommentUpdated";
   if (isCommentEvent) {
     const comment = clickUpCommentFromPayload(payload);
     const authorId = clickUpCommentAuthorId(comment);
     if (authorId && authorId === config.routing.ignoredCommentAuthorId) return finish({ ok: true, action: "ignored", reason: "self_authored_comment", taskId });
-    if (!clickUpCommentMentionsProductManager(comment, config.routing)) return finish({ ok: true, action: "ignored", reason: "missing_product_manager_mention", taskId });
+    const mentionsProductManager = clickUpCommentMentionsProductManager(comment, config.routing);
+    const assignedToProductManager = isClickUpTaskAssignedToProductManager(task, config.routing.productManagerAssigneeId);
+    if (!mentionsProductManager && !assignedToProductManager) return finish({ ok: true, action: "ignored", reason: "missing_product_manager_mention_or_assignment", taskId });
     commentLedgerKey = clickUpCommentLedgerKey({ taskId, eventType, payload });
     try {
       if (isClickUpCommentVersionProcessed({ ledgerPath: commentLedgerPath, key: commentLedgerKey, worktree })) {
@@ -9775,10 +9793,6 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   }
   if (!isCommentEvent && !isClickUpTaskAssignedToProductManager(task, config.routing.productManagerAssigneeId)) return finish({ ok: true, action: "ignored", reason: "not_assigned_to_product_manager", taskId });
   if (isClickUpTaskTerminal(task, payload, config.routing.ignoredStatuses)) return finish({ ok: true, action: "ignored", reason: "terminal_status", taskId });
-  if (clickupClient?.getTask) {
-    const latestTask = await clickupClient.getTask(taskId);
-    if (latestTask) task = latestTask;
-  }
   const sessionTitle = formatClickUpSessionTitle({ taskId, payloadTask: payload.task, task });
   const existingMetadata = clickUpTaskAgentMetadata(task, config.routing.metadataFieldId);
   const metadata = normalizeAgentMetadataJson(existingMetadata);

package/dist/sanitize_cli.js

@@ -9201,7 +9201,7 @@ async function findReusableClickUpWebhook(config, clickupClient = null) {
   }
   return null;
 }
-async function validateClickUpWebhookState(state, config, clickupClient = null) {
+async function validateClickUpWebhookState(state, config, clickupClient = null, { allowRemoteUnhealthyLocalRecovery = false } = {}) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
   if (clickupClient?.listWebhooks) {
     const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
@@ -9209,10 +9209,22 @@ async function validateClickUpWebhookState(state, config, clickupClient = null)
     if (!match) return { valid: false, reason: "remote_state_missing" };
     const remote = normalizeClickUpWebhookApiResponse(match, config);
     const remoteWithLocalSecret = { ...remote, secret: state.secret };
-    if (!isClickUpWebhookStateActive(remoteWithLocalSecret, config) || remote.webhookId !== state.webhookId) {
-      return { valid: false, reason: "remote_state_mismatch", remote };
+    if (isClickUpWebhookStateActive(remoteWithLocalSecret, config) && remote.webhookId === state.webhookId) {
+      return { valid: true, mode: "remote", state: { ...remoteWithLocalSecret, recentEventKeys: state.recentEventKeys || [], lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() } };
     }
-    return { valid: true, mode: "remote", state: { ...remoteWithLocalSecret, recentEventKeys: state.recentEventKeys || [], lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() } };
+    const localStateValidation = await validateClickUpWebhookState(state, config, null);
+    if (allowRemoteUnhealthyLocalRecovery && localStateValidation.valid && remote.webhookId === state.webhookId) {
+      const remoteConfigMatches = remote.publicUrl === config.webhook.publicUrl && [...new Set(config.webhook.events || [])].every((event) => new Set(remote.events || []).has(event));
+      if (remoteConfigMatches) {
+        return {
+          ...localStateValidation,
+          mode: "local_state_remote_unhealthy",
+          limitation: "ClickUp remote webhook is present but unhealthy; Optima starts the local listener from matching local id/secret/config so delivery can recover.",
+          remote
+        };
+      }
+    }
+    return { valid: false, reason: "remote_state_mismatch", remote };
   }
   return { valid: true, mode: "local_state", state: { ...state, lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString() }, limitation: "ClickUp API validation unavailable; Optima trusts ignored local runtime state only after id/secret/config checks." };
 }
@@ -9222,7 +9234,7 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
   }
   const { config } = validation;
   const existing = readClickUpWebhookState(worktree, config);
-  const existingValidation = await validateClickUpWebhookState(existing, config, clickupClient);
+  const existingValidation = await validateClickUpWebhookState(existing, config, clickupClient, { allowRemoteUnhealthyLocalRecovery: true });
   if (existingValidation.valid) {
     const state = writeClickUpWebhookState(worktree, { ...existingValidation.state, recentEventKeys: existing.recentEventKeys || [] }, config);
     clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: existingValidation.mode });
@@ -9765,12 +9777,18 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   if (!taskId) return { ok: false, action: "error", reason: "missing_task_id" };
   let task = payload.task || (clickupClient?.getTask ? await clickupClient.getTask(taskId) : null);
   if (!task) return { ok: false, action: "error", reason: "task_unavailable", taskId };
+  if (clickupClient?.getTask) {
+    const latestTask = await clickupClient.getTask(taskId);
+    if (latestTask) task = latestTask;
+  }
   const isCommentEvent = eventType === "taskCommentPosted" || eventType === "taskCommentUpdated";
   if (isCommentEvent) {
     const comment = clickUpCommentFromPayload(payload);
     const authorId = clickUpCommentAuthorId(comment);
     if (authorId && authorId === config.routing.ignoredCommentAuthorId) return finish({ ok: true, action: "ignored", reason: "self_authored_comment", taskId });
-    if (!clickUpCommentMentionsProductManager(comment, config.routing)) return finish({ ok: true, action: "ignored", reason: "missing_product_manager_mention", taskId });
+    const mentionsProductManager = clickUpCommentMentionsProductManager(comment, config.routing);
+    const assignedToProductManager = isClickUpTaskAssignedToProductManager(task, config.routing.productManagerAssigneeId);
+    if (!mentionsProductManager && !assignedToProductManager) return finish({ ok: true, action: "ignored", reason: "missing_product_manager_mention_or_assignment", taskId });
     commentLedgerKey = clickUpCommentLedgerKey({ taskId, eventType, payload });
     try {
       if (isClickUpCommentVersionProcessed({ ledgerPath: commentLedgerPath, key: commentLedgerKey, worktree })) {
@@ -9782,10 +9800,6 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   }
   if (!isCommentEvent && !isClickUpTaskAssignedToProductManager(task, config.routing.productManagerAssigneeId)) return finish({ ok: true, action: "ignored", reason: "not_assigned_to_product_manager", taskId });
   if (isClickUpTaskTerminal(task, payload, config.routing.ignoredStatuses)) return finish({ ok: true, action: "ignored", reason: "terminal_status", taskId });
-  if (clickupClient?.getTask) {
-    const latestTask = await clickupClient.getTask(taskId);
-    if (latestTask) task = latestTask;
-  }
   const sessionTitle = formatClickUpSessionTitle({ taskId, payloadTask: payload.task, task });
   const existingMetadata = clickUpTaskAgentMetadata(task, config.routing.metadataFieldId);
   const metadata = normalizeAgentMetadataJson(existingMetadata);

package/package.json

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