@defend-tech/opencode-optima 0.1.20 → 0.1.22

package/dist/index.js

@@ -9255,8 +9255,10 @@ async function openCodeSessionExists(client, sessionId) {
   }
   return false;
 }
-async function createOpenCodeSession(client, { title, directory } = {}) {
-  const result = await client.session.create({ query: { directory }, body: { title } });
+async function createOpenCodeSession(client, { title, directory, agent } = {}) {
+  const body = { title };
+  if (agent) body.agent = agent;
+  const result = await client.session.create({ query: { directory }, body });
   return result?.data?.id || result?.id;
 }
 function assertOpenCodePromptAccepted(result) {
@@ -9293,35 +9295,21 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchI
   if (!data?.data?.id) throw new Error("OpenCode prompt response did not include data.id.");
   return { ok: true, method: "http", status: response.status, data: data.data, response: data };
 }
-async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
-  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 assertOpenCodePromptAccepted(await method(attempt));
-    } catch (error) {
-      firstError ??= error;
-    }
-  }
-  throw firstError;
-}
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
   const parts = [{ type: "text", text }];
-  const flatPayload = { directory, agent, parts };
-  const structuredPayload = { query: { directory }, body: { agent, parts } };
-  if (typeof client?.session?.prompt === "function") {
-    return callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+  const structuredPayload = {
+    path: { id: sessionId },
+    query: { directory },
+    body: { agent, parts }
+  };
+  if (!direct && typeof client?.session?.promptAsync === "function") {
+    return assertOpenCodePromptAccepted(await client.session.promptAsync(structuredPayload));
   }
-  if (typeof client?.session?.promptAsync === "function") {
-    return callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+  if (!direct && typeof client?.session?.prompt === "function") {
+    return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
   }
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function formatClickUpWebhookPrompt({ eventType, taskId, payload }) {
@@ -9394,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 });
@@ -9550,7 +9539,7 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   if (!existingSessionId) {
     let pendingSessionId = getNestedMetadataValue(metadata, clickUpPendingSessionKey(config.routing.metadataKey)) || state.pendingSessions?.[taskId];
     if (!pendingSessionId) {
-      pendingSessionId = await createSession(openCodeClient, { title: `ClickUp PM: ${taskId}`, directory: config.basePath });
+      pendingSessionId = await createSession(openCodeClient, { title: `ClickUp PM: ${taskId}`, directory: config.basePath, agent: config.routing.targetAgent });
       if (!String(pendingSessionId || "").startsWith("ses_")) return { ok: false, action: "error", reason: "session_create_failed", taskId };
       if (saveState) {
         saveState({
@@ -10604,9 +10593,21 @@ function getModePromptFragment(agentId, operatingTeamMode, worktree) {
   if (!fragmentPath) return "";
   return readResolvedFile(fragmentPath, worktree, { preferCompactPromptDocs: true });
 }
+function isSameOrNestedPath(candidate, root) {
+  if (typeof candidate !== "string" || typeof root !== "string" || !candidate.trim() || !root.trim()) return false;
+  const resolvedCandidate = path2.resolve(candidate);
+  const resolvedRoot = path2.resolve(root);
+  const relative = path2.relative(resolvedRoot, resolvedCandidate);
+  return relative === "" || !!relative && !relative.startsWith("..") && !path2.isAbsolute(relative);
+}
+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);
+}
 function buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, options = {}) {
   const optimaActive = repoCfg && repoCfg.enabled === true;
-  const clickUpWebhookActive = options.clickUpWebhookActive === true;
+  const clickUpWebhookActive = shouldRegisterWorkflowProductManager(options, worktree);
   const repoAgentDefinitions = repoAgentsDir(worktree);
   const repoAgentAdditions = repoAgentAdditionsDir(worktree);
   const legacyAgentsDir = legacyRepoAgentsDir(worktree);
@@ -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 };
@@ -11308,7 +11308,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     },
     async config(cfg) {
       cfg.agent ??= {};
-      const ourAgents = buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, { clickUpWebhookActive });
+      const ourAgents = buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, { clickUpWebhookActive, clickUpWebhookValidation });
       const builtInAgents = ["build", "plan", "general", "explore"];
       const preserveExistingAgents = repoCfg.features?.preserve_existing_agents ?? DEFAULT_PRESERVE_EXISTING_AGENTS;
       const allToDisable = preserveExistingAgents ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([...builtInAgents, ...Object.keys(cfg.agent)]);

package/dist/sanitize_cli.js

@@ -9262,8 +9262,10 @@ async function openCodeSessionExists(client, sessionId) {
   }
   return false;
 }
-async function createOpenCodeSession(client, { title, directory } = {}) {
-  const result = await client.session.create({ query: { directory }, body: { title } });
+async function createOpenCodeSession(client, { title, directory, agent } = {}) {
+  const body = { title };
+  if (agent) body.agent = agent;
+  const result = await client.session.create({ query: { directory }, body });
   return result?.data?.id || result?.id;
 }
 function assertOpenCodePromptAccepted(result) {
@@ -9300,35 +9302,21 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, fetchI
   if (!data?.data?.id) throw new Error("OpenCode prompt response did not include data.id.");
   return { ok: true, method: "http", status: response.status, data: data.data, response: data };
 }
-async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, structuredPayload) {
-  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 assertOpenCodePromptAccepted(await method(attempt));
-    } catch (error) {
-      firstError ??= error;
-    }
-  }
-  throw firstError;
-}
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
   const parts = [{ type: "text", text }];
-  const flatPayload = { directory, agent, parts };
-  const structuredPayload = { query: { directory }, body: { agent, parts } };
-  if (typeof client?.session?.prompt === "function") {
-    return callOpenCodePromptWithFallbacks(client.session.prompt.bind(client.session), sessionId, flatPayload, structuredPayload);
+  const structuredPayload = {
+    path: { id: sessionId },
+    query: { directory },
+    body: { agent, parts }
+  };
+  if (!direct && typeof client?.session?.promptAsync === "function") {
+    return assertOpenCodePromptAccepted(await client.session.promptAsync(structuredPayload));
   }
-  if (typeof client?.session?.promptAsync === "function") {
-    return callOpenCodePromptWithFallbacks(client.session.promptAsync.bind(client.session), sessionId, flatPayload, structuredPayload);
+  if (!direct && typeof client?.session?.prompt === "function") {
+    return assertOpenCodePromptAccepted(await client.session.prompt(structuredPayload));
   }
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, fetchImpl });
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
 function formatClickUpWebhookPrompt({ eventType, taskId, payload }) {
@@ -9401,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 });
@@ -9557,7 +9546,7 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   if (!existingSessionId) {
     let pendingSessionId = getNestedMetadataValue(metadata, clickUpPendingSessionKey(config.routing.metadataKey)) || state.pendingSessions?.[taskId];
     if (!pendingSessionId) {
-      pendingSessionId = await createSession(openCodeClient, { title: `ClickUp PM: ${taskId}`, directory: config.basePath });
+      pendingSessionId = await createSession(openCodeClient, { title: `ClickUp PM: ${taskId}`, directory: config.basePath, agent: config.routing.targetAgent });
       if (!String(pendingSessionId || "").startsWith("ses_")) return { ok: false, action: "error", reason: "session_create_failed", taskId };
       if (saveState) {
         saveState({
@@ -10611,9 +10600,21 @@ function getModePromptFragment(agentId, operatingTeamMode, worktree) {
   if (!fragmentPath) return "";
   return readResolvedFile(fragmentPath, worktree, { preferCompactPromptDocs: true });
 }
+function isSameOrNestedPath(candidate, root) {
+  if (typeof candidate !== "string" || typeof root !== "string" || !candidate.trim() || !root.trim()) return false;
+  const resolvedCandidate = path2.resolve(candidate);
+  const resolvedRoot = path2.resolve(root);
+  const relative = path2.relative(resolvedRoot, resolvedCandidate);
+  return relative === "" || !!relative && !relative.startsWith("..") && !path2.isAbsolute(relative);
+}
+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);
+}
 function buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, options = {}) {
   const optimaActive = repoCfg && repoCfg.enabled === true;
-  const clickUpWebhookActive = options.clickUpWebhookActive === true;
+  const clickUpWebhookActive = shouldRegisterWorkflowProductManager(options, worktree);
   const repoAgentDefinitions = repoAgentsDir(worktree);
   const repoAgentAdditions = repoAgentAdditionsDir(worktree);
   const legacyAgentsDir = legacyRepoAgentsDir(worktree);
@@ -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 };
@@ -11315,7 +11315,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     },
     async config(cfg) {
       cfg.agent ??= {};
-      const ourAgents = buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, { clickUpWebhookActive });
+      const ourAgents = buildOptimaAgents(repoCfg, operatingTeamMode, worktree, debugDir, { clickUpWebhookActive, clickUpWebhookValidation });
       const builtInAgents = ["build", "plan", "general", "explore"];
       const preserveExistingAgents = repoCfg.features?.preserve_existing_agents ?? DEFAULT_PRESERVE_EXISTING_AGENTS;
       const allToDisable = preserveExistingAgents ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([...builtInAgents, ...Object.keys(cfg.agent)]);

package/package.json

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