@defend-tech/opencode-optima 0.1.52 → 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" });
@@ -9648,23 +9656,16 @@ function extractOpenCodeSessionId(result) {
   return data?.id || data?.sessionID || data?.sessionId || result?.id || result?.sessionID || result?.sessionId;
 }
 async function createOpenCodeSession(client, { title, directory, agent } = {}) {
-  const flatPayload = { directory, title };
-  if (agent) flatPayload.agent = agent;
   const body = { title };
   if (agent) body.agent = agent;
-  const attempts = [{ query: { directory }, body }, flatPayload];
-  let firstError = null;
-  for (const attempt of attempts) {
-    try {
-      const result = await client.session.create(attempt);
-      const sessionId = extractOpenCodeSessionId(result);
-      if (sessionId) return sessionId;
-      firstError ??= new Error("OpenCode session create response did not include a session id.");
-    } catch (error) {
-      firstError ??= error;
-    }
+  try {
+    const result = await client.session.create({ query: { directory }, body });
+    const sessionId = extractOpenCodeSessionId(result);
+    if (sessionId) return sessionId;
+    throw new Error("OpenCode session create response did not include a session id.");
+  } catch (error) {
+    throw error || new Error("OpenCode session create failed.");
   }
-  throw firstError || new Error("OpenCode session create failed.");
 }
 async function waitForOpenCodeReadiness(client, { worktree = process.cwd(), attempts = 10, delayMs = 500, now = () => /* @__PURE__ */ new Date() } = {}) {
   if (typeof client?.session?.create !== "function") return { ok: true, skipped: true, reason: "session_create_probe_unavailable" };
@@ -9778,8 +9779,8 @@ function tagOpenCodePromptResult(result, deliveryMethod) {
   return result;
 }
 async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload, deliveryMethod) {
-  const attempts = [
-    { ...structuredPayload, path: { id: sessionId } },
+  const attempts = deliveryMethod === "prompt" ? [structuredPayload] : [
+    structuredPayload,
     { ...structuredPayload, path: { sessionID: sessionId } },
     { sessionID: sessionId, ...flatPayload },
     { id: sessionId, ...flatPayload }
@@ -9829,23 +9830,11 @@ function normalizeOpenCodeSessionMessages(result) {
   if (Array.isArray(data?.items)) return [...data.items];
   return [];
 }
-async function readOpenCodeSessionMessages(client, { sessionId, limit = 20 } = {}) {
+async function readOpenCodeSessionMessages(client, { sessionId, directory, limit = 20 } = {}) {
   if (typeof client?.session?.messages !== "function") return null;
-  const attempts = [
-    { path: { id: sessionId }, query: { limit } },
-    { path: { sessionID: sessionId }, query: { limit } },
-    { sessionID: sessionId, limit },
-    { id: sessionId, limit }
-  ];
-  let firstError = null;
-  for (const attempt of attempts) {
-    try {
-      return normalizeOpenCodeSessionMessages(await client.session.messages(attempt));
-    } catch (error) {
-      firstError ??= error;
-    }
-  }
-  throw firstError;
+  const query = { limit };
+  if (directory) query.directory = directory;
+  return normalizeOpenCodeSessionMessages(await client.session.messages({ path: { id: sessionId }, query }));
 }
 function openCodeMessageText(message) {
   const parts = [message?.text, message?.content, message?.message, message?.body?.text, message?.data?.text];
@@ -9858,11 +9847,11 @@ function openCodeMessageStableKey(message, index = 0) {
   if (id) return `id:${id}`;
   return `idx:${index}:text:${openCodeMessageText(message)}`;
 }
-async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
+async function verifyOpenCodeSessionEventDelivery(client, { sessionId, directory, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
     try {
-      const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
+      const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, directory, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
       const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
@@ -9910,7 +9899,7 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   return null;
 }
 async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
-  const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => null);
+  const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, allowDirectFallback: false });
   let blockingPromptVerification = null;
   let admissionVerification = null;
@@ -9924,7 +9913,7 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
     return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker2 };
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
-  let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
+  let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
   if (admissionVerification) {
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_admitted_but_invisible", taskId, sessionId, admission: admissionVerification, reason: verification?.reason || "message_not_visible" });
@@ -11490,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" });
@@ -9655,23 +9663,16 @@ function extractOpenCodeSessionId(result) {
   return data?.id || data?.sessionID || data?.sessionId || result?.id || result?.sessionID || result?.sessionId;
 }
 async function createOpenCodeSession(client, { title, directory, agent } = {}) {
-  const flatPayload = { directory, title };
-  if (agent) flatPayload.agent = agent;
   const body = { title };
   if (agent) body.agent = agent;
-  const attempts = [{ query: { directory }, body }, flatPayload];
-  let firstError = null;
-  for (const attempt of attempts) {
-    try {
-      const result = await client.session.create(attempt);
-      const sessionId = extractOpenCodeSessionId(result);
-      if (sessionId) return sessionId;
-      firstError ??= new Error("OpenCode session create response did not include a session id.");
-    } catch (error) {
-      firstError ??= error;
-    }
+  try {
+    const result = await client.session.create({ query: { directory }, body });
+    const sessionId = extractOpenCodeSessionId(result);
+    if (sessionId) return sessionId;
+    throw new Error("OpenCode session create response did not include a session id.");
+  } catch (error) {
+    throw error || new Error("OpenCode session create failed.");
   }
-  throw firstError || new Error("OpenCode session create failed.");
 }
 async function waitForOpenCodeReadiness(client, { worktree = process.cwd(), attempts = 10, delayMs = 500, now = () => /* @__PURE__ */ new Date() } = {}) {
   if (typeof client?.session?.create !== "function") return { ok: true, skipped: true, reason: "session_create_probe_unavailable" };
@@ -9785,8 +9786,8 @@ function tagOpenCodePromptResult(result, deliveryMethod) {
   return result;
 }
 async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload, deliveryMethod) {
-  const attempts = [
-    { ...structuredPayload, path: { id: sessionId } },
+  const attempts = deliveryMethod === "prompt" ? [structuredPayload] : [
+    structuredPayload,
     { ...structuredPayload, path: { sessionID: sessionId } },
     { sessionID: sessionId, ...flatPayload },
     { id: sessionId, ...flatPayload }
@@ -9836,23 +9837,11 @@ function normalizeOpenCodeSessionMessages(result) {
   if (Array.isArray(data?.items)) return [...data.items];
   return [];
 }
-async function readOpenCodeSessionMessages(client, { sessionId, limit = 20 } = {}) {
+async function readOpenCodeSessionMessages(client, { sessionId, directory, limit = 20 } = {}) {
   if (typeof client?.session?.messages !== "function") return null;
-  const attempts = [
-    { path: { id: sessionId }, query: { limit } },
-    { path: { sessionID: sessionId }, query: { limit } },
-    { sessionID: sessionId, limit },
-    { id: sessionId, limit }
-  ];
-  let firstError = null;
-  for (const attempt of attempts) {
-    try {
-      return normalizeOpenCodeSessionMessages(await client.session.messages(attempt));
-    } catch (error) {
-      firstError ??= error;
-    }
-  }
-  throw firstError;
+  const query = { limit };
+  if (directory) query.directory = directory;
+  return normalizeOpenCodeSessionMessages(await client.session.messages({ path: { id: sessionId }, query }));
 }
 function openCodeMessageText(message) {
   const parts = [message?.text, message?.content, message?.message, message?.body?.text, message?.data?.text];
@@ -9865,11 +9854,11 @@ function openCodeMessageStableKey(message, index = 0) {
   if (id) return `id:${id}`;
   return `idx:${index}:text:${openCodeMessageText(message)}`;
 }
-async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
+async function verifyOpenCodeSessionEventDelivery(client, { sessionId, directory, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
     try {
-      const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
+      const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, directory, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
       const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
@@ -9917,7 +9906,7 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   return null;
 }
 async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
-  const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, limit: 50 }).catch(() => null);
+  const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   const sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, allowDirectFallback: false });
   let blockingPromptVerification = null;
   let admissionVerification = null;
@@ -9931,7 +9920,7 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
     return { ok: false, action: "message_delivery_failed", reason: error.message, taskId, sessionId, fallbackAttempted: false, blockerTag: blocker2 };
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
-  let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, beforeMessages, expectedText: text, markers: eventMarkers });
+  let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
   if (admissionVerification) {
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_admitted_but_invisible", taskId, sessionId, admission: admissionVerification, reason: verification?.reason || "message_not_visible" });
@@ -11497,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.52",
+  "version": "0.1.54",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/defend-tech/opencode-optima.git"