@defend-tech/opencode-optima 0.1.21 → 0.1.23

package/dist/index.js

@@ -9088,16 +9088,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 };
   }
-  if (existing.webhookId && clickupClient?.deleteWebhook) {
-    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 (existing.webhookId && clickupClient?.deleteWebhook) {
+    await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
+    markClickUpWebhookInactive(worktree, existing, config);
+  }
   if (!clickupClient?.createWebhook) {
     return { active: false, valid: false, reason: "clickup_client_unavailable", state: existing };
   }
@@ -9382,11 +9382,12 @@ async function cleanupManagedClickUpWebhook(entry = {}, { timeoutMs = CLICKUP_WE
     clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_started", reason, key: entry.key, webhookId: entry.state?.webhookId });
     const closeResult = await closeClickUpWebhookServer(entry.listener?.server);
     if (entry.listenerRegistry && entry.listener?.key) entry.listenerRegistry.delete(entry.listener.key);
-    const deleteResult = await deleteClickUpWebhookBestEffort({ webhookId: entry.state?.webhookId, clickupClient: entry.clickupClient, worktree: entry.worktree, reason });
-    if (deleteResult.ok) markClickUpWebhookInactive(entry.worktree, entry.state, entry.config);
+    const preservedResult = { ok: true, skipped: true, reason: "remote_webhook_preserved" };
+    clickUpWebhookLifecycleLog(entry.worktree, { type: "remote_webhook_preserved", reason, webhookId: entry.state?.webhookId });
+    markClickUpWebhookInactive(entry.worktree, entry.state, entry.config);
     activeClickUpWebhookLifecycleRegistry.delete(entry.key);
-    clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_finished", reason, close_ok: closeResult.ok, delete_ok: deleteResult.ok, delete_reason: deleteResult.reason });
-    return { ok: closeResult.ok !== false && deleteResult.ok !== false, closeResult, deleteResult };
+    clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_finished", reason, close_ok: closeResult.ok, remote_webhook: "preserved" });
+    return { ok: closeResult.ok !== false, closeResult, deleteResult: preservedResult, preserveResult: preservedResult };
   })();
   const result = await promiseWithTimeout(cleanup, timeoutMs, { ok: false, timeout: true, reason: "cleanup_timeout" });
   if (result?.timeout) clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_timeout", reason, webhookId: entry.state?.webhookId });
@@ -10762,15 +10763,14 @@ async function OptimaPlugin(input = {}, pluginOptions = {}) {
         }, clickUpWebhookValidation.config);
         registerClickUpWebhookLifecycle({ config: clickUpWebhookValidation.config, state: activeState, worktree, clickupClient: lifecycleClickUpClient, listener: readyListener, listenerRegistry });
       } else {
-        await deleteClickUpWebhookBestEffort({ webhookId: listenerState.webhookId, clickupClient: lifecycleClickUpClient, worktree, reason: readyListener.reason || "listener_unavailable" });
+        clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: readyListener.reason || "listener_unavailable", webhookId: listenerState.webhookId });
         markClickUpWebhookInactive(worktree, listenerState, clickUpWebhookValidation.config);
         clickUpWebhookActive = false;
         clickUpWebhookRuntime = { ...clickUpWebhookRuntime, active: false, valid: false, reason: readyListener.reason || "listener_unavailable" };
       }
     } catch (error) {
       const failureState = clickUpWebhookRuntime.state || readClickUpWebhookState(worktree, clickUpWebhookValidation.config);
-      const failureClient = input.clickupClient || createClickUpApiClient(clickUpWebhookValidation.config, input.fetch);
-      await deleteClickUpWebhookBestEffort({ webhookId: failureState.webhookId, clickupClient: failureClient, worktree, reason: "listener_failed" });
+      clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: "listener_failed", webhookId: failureState.webhookId });
       markClickUpWebhookInactive(worktree, failureState, clickUpWebhookValidation.config);
       clickUpWebhookActive = false;
       clickUpWebhookRuntime = { ...clickUpWebhookRuntime, active: false, valid: false, reason: "listener_failed", error: error.message };

package/dist/sanitize_cli.js

@@ -9095,16 +9095,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 };
   }
-  if (existing.webhookId && clickupClient?.deleteWebhook) {
-    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 (existing.webhookId && clickupClient?.deleteWebhook) {
+    await deleteClickUpWebhookBestEffort({ webhookId: existing.webhookId, clickupClient, worktree, reason: existingValidation.reason || "startup_self_heal" });
+    markClickUpWebhookInactive(worktree, existing, config);
+  }
   if (!clickupClient?.createWebhook) {
     return { active: false, valid: false, reason: "clickup_client_unavailable", state: existing };
   }
@@ -9389,11 +9389,12 @@ async function cleanupManagedClickUpWebhook(entry = {}, { timeoutMs = CLICKUP_WE
     clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_started", reason, key: entry.key, webhookId: entry.state?.webhookId });
     const closeResult = await closeClickUpWebhookServer(entry.listener?.server);
     if (entry.listenerRegistry && entry.listener?.key) entry.listenerRegistry.delete(entry.listener.key);
-    const deleteResult = await deleteClickUpWebhookBestEffort({ webhookId: entry.state?.webhookId, clickupClient: entry.clickupClient, worktree: entry.worktree, reason });
-    if (deleteResult.ok) markClickUpWebhookInactive(entry.worktree, entry.state, entry.config);
+    const preservedResult = { ok: true, skipped: true, reason: "remote_webhook_preserved" };
+    clickUpWebhookLifecycleLog(entry.worktree, { type: "remote_webhook_preserved", reason, webhookId: entry.state?.webhookId });
+    markClickUpWebhookInactive(entry.worktree, entry.state, entry.config);
     activeClickUpWebhookLifecycleRegistry.delete(entry.key);
-    clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_finished", reason, close_ok: closeResult.ok, delete_ok: deleteResult.ok, delete_reason: deleteResult.reason });
-    return { ok: closeResult.ok !== false && deleteResult.ok !== false, closeResult, deleteResult };
+    clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_finished", reason, close_ok: closeResult.ok, remote_webhook: "preserved" });
+    return { ok: closeResult.ok !== false, closeResult, deleteResult: preservedResult, preserveResult: preservedResult };
   })();
   const result = await promiseWithTimeout(cleanup, timeoutMs, { ok: false, timeout: true, reason: "cleanup_timeout" });
   if (result?.timeout) clickUpWebhookLifecycleLog(entry.worktree, { type: "cleanup_timeout", reason, webhookId: entry.state?.webhookId });
@@ -10769,15 +10770,14 @@ async function OptimaPlugin(input = {}, pluginOptions = {}) {
         }, clickUpWebhookValidation.config);
         registerClickUpWebhookLifecycle({ config: clickUpWebhookValidation.config, state: activeState, worktree, clickupClient: lifecycleClickUpClient, listener: readyListener, listenerRegistry });
       } else {
-        await deleteClickUpWebhookBestEffort({ webhookId: listenerState.webhookId, clickupClient: lifecycleClickUpClient, worktree, reason: readyListener.reason || "listener_unavailable" });
+        clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: readyListener.reason || "listener_unavailable", webhookId: listenerState.webhookId });
         markClickUpWebhookInactive(worktree, listenerState, clickUpWebhookValidation.config);
         clickUpWebhookActive = false;
         clickUpWebhookRuntime = { ...clickUpWebhookRuntime, active: false, valid: false, reason: readyListener.reason || "listener_unavailable" };
       }
     } catch (error) {
       const failureState = clickUpWebhookRuntime.state || readClickUpWebhookState(worktree, clickUpWebhookValidation.config);
-      const failureClient = input.clickupClient || createClickUpApiClient(clickUpWebhookValidation.config, input.fetch);
-      await deleteClickUpWebhookBestEffort({ webhookId: failureState.webhookId, clickupClient: failureClient, worktree, reason: "listener_failed" });
+      clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: "listener_failed", webhookId: failureState.webhookId });
       markClickUpWebhookInactive(worktree, failureState, clickUpWebhookValidation.config);
       clickUpWebhookActive = false;
       clickUpWebhookRuntime = { ...clickUpWebhookRuntime, active: false, valid: false, reason: "listener_failed", error: error.message };

package/package.json

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