@defend-tech/opencode-optima 0.1.53 → 0.1.54

package/dist/index.js

@@ -9256,17 +9256,20 @@ function clickUpWebhookLocationCompatible(webhook = {}, config = {}) {
   }
   return true;
 }
-async function findReusableClickUpWebhook(config, clickupClient = null) {
+async function findReusableClickUpWebhook(config, clickupClient = null, existingState = null) {
   if (!clickupClient?.listWebhooks) return null;
   const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
+  let secretlessMatch = null;
   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;
+    const existingSecret = existingState?.webhookId === remote.webhookId ? existingState.secret : "";
+    const reusable = remote.secret ? remote : { ...remote, secret: existingSecret };
+    if (isClickUpWebhookStateActive(reusable, config)) return reusable;
+    if (remote.webhookId && !secretlessMatch) secretlessMatch = { ...remote, active: false, reason: "remote_secret_unavailable" };
   }
-  return null;
+  return secretlessMatch;
 }
 async function validateClickUpWebhookState(state, config, clickupClient = null, { allowRemoteUnhealthyLocalRecovery = false } = {}) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
@@ -9311,11 +9314,16 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
     clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: existingValidation.mode });
     return { active: true, valid: true, mode: existingValidation.mode, limitation: existingValidation.limitation, state };
   }
-  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient);
+  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient, existing);
   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 (isClickUpWebhookStateActive(reusableRemote, config)) {
+      const state = writeClickUpWebhookState(worktree, { ...reusableRemote, recentEventKeys: existing.recentEventKeys || [] }, config);
+      const mode2 = reusableRemote.secret === existing.secret && existing.webhookId === reusableRemote.webhookId ? "remote_discovered_local_secret" : "remote_discovered";
+      clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: mode2 });
+      return { active: true, valid: true, mode: mode2, state };
+    }
+    clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", webhookId: reusableRemote.webhookId, reason: reusableRemote.reason || "remote_webhook_exists_without_secret" });
+    return { active: false, valid: false, reason: reusableRemote.reason || "remote_webhook_exists_without_secret", state: existing, remote: reusableRemote };
   }
   if (existing.webhookId && clickupClient?.deleteWebhook) {
     await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
@@ -11471,7 +11479,7 @@ function isSameOrNestedPath(candidate, root) {
 function shouldRegisterWorkflowProductManager(options = {}, worktree = process.cwd()) {
   if (options.clickUpWebhookActive === true) return true;
   const validation = options.clickUpWebhookValidation;
-  return validation?.complete === true && isSameOrNestedPath(worktree, validation.config?.basePath);
+  return validation?.complete === true && validation?.ok !== false && isSameOrNestedPath(worktree, validation.config?.basePath);
 }
 function buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, options = {}) {
   const optimaActive = repoCfg && repoCfg.enabled === true;

package/dist/sanitize_cli.js

@@ -9263,17 +9263,20 @@ function clickUpWebhookLocationCompatible(webhook = {}, config = {}) {
   }
   return true;
 }
-async function findReusableClickUpWebhook(config, clickupClient = null) {
+async function findReusableClickUpWebhook(config, clickupClient = null, existingState = null) {
   if (!clickupClient?.listWebhooks) return null;
   const listed = await clickupClient.listWebhooks({ teamId: config.teamId });
+  let secretlessMatch = null;
   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;
+    const existingSecret = existingState?.webhookId === remote.webhookId ? existingState.secret : "";
+    const reusable = remote.secret ? remote : { ...remote, secret: existingSecret };
+    if (isClickUpWebhookStateActive(reusable, config)) return reusable;
+    if (remote.webhookId && !secretlessMatch) secretlessMatch = { ...remote, active: false, reason: "remote_secret_unavailable" };
   }
-  return null;
+  return secretlessMatch;
 }
 async function validateClickUpWebhookState(state, config, clickupClient = null, { allowRemoteUnhealthyLocalRecovery = false } = {}) {
   if (!isClickUpWebhookStateActive(state, config)) return { valid: false, reason: "state_incomplete" };
@@ -9318,11 +9321,16 @@ async function ensureClickUpWebhookSubscription({ validation, worktree, clickupC
     clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: existingValidation.mode });
     return { active: true, valid: true, mode: existingValidation.mode, limitation: existingValidation.limitation, state };
   }
-  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient);
+  const reusableRemote = await findReusableClickUpWebhook(config, clickupClient, existing);
   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 (isClickUpWebhookStateActive(reusableRemote, config)) {
+      const state = writeClickUpWebhookState(worktree, { ...reusableRemote, recentEventKeys: existing.recentEventKeys || [] }, config);
+      const mode2 = reusableRemote.secret === existing.secret && existing.webhookId === reusableRemote.webhookId ? "remote_discovered_local_secret" : "remote_discovered";
+      clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_reused", webhookId: state.webhookId, mode: mode2 });
+      return { active: true, valid: true, mode: mode2, state };
+    }
+    clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", webhookId: reusableRemote.webhookId, reason: reusableRemote.reason || "remote_webhook_exists_without_secret" });
+    return { active: false, valid: false, reason: reusableRemote.reason || "remote_webhook_exists_without_secret", state: existing, remote: reusableRemote };
   }
   if (existing.webhookId && clickupClient?.deleteWebhook) {
     await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
@@ -11478,7 +11486,7 @@ function isSameOrNestedPath(candidate, root) {
 function shouldRegisterWorkflowProductManager(options = {}, worktree = process.cwd()) {
   if (options.clickUpWebhookActive === true) return true;
   const validation = options.clickUpWebhookValidation;
-  return validation?.complete === true && isSameOrNestedPath(worktree, validation.config?.basePath);
+  return validation?.complete === true && validation?.ok !== false && isSameOrNestedPath(worktree, validation.config?.basePath);
 }
 function buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, options = {}) {
   const optimaActive = repoCfg && repoCfg.enabled === true;

package/package.json

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