@defend-tech/opencode-optima 0.1.49 → 0.1.51

package/dist/index.js

@@ -7938,6 +7938,7 @@ var CLICKUP_WEBHOOK_MAX_BODY_BYTES = 1024 * 1024;
 var CLICKUP_WEBHOOK_REQUEST_TIMEOUT_MS = 1e4;
 var CLICKUP_WEBHOOK_STARTUP_TASK_LIMIT = 50;
 var CLICKUP_WEBHOOK_STARTUP_COMMENT_LIMIT = 100;
+var CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS = 3e4;
 var CLICKUP_WEBHOOK_LOG_LEVELS = /* @__PURE__ */ new Set(["error", "info", "verbose"]);
 var CLICKUP_WEBHOOK_REDACTED = "[REDACTED]";
 var DISCUSSION_BACKFILL_FETCH_LIMIT = 100;
@@ -9013,6 +9014,11 @@ function normalizeOpenCodeBaseUrl(value, defaultValue = "http://127.0.0.1:3001")
     return candidate.replace(/\/+$/, "");
   }
 }
+function normalizeNonNegativeInteger(value, defaultValue) {
+  if (value === void 0 || value === null || value === "") return defaultValue;
+  const number = Number(value);
+  return Number.isInteger(number) && number >= 0 ? number : defaultValue;
+}
 function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd()) {
   const raw = isPlainObject(rawClickUp) ? rawClickUp : {};
   const webhook = isPlainObject(raw.webhook) ? raw.webhook : {};
@@ -9028,7 +9034,11 @@ function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd
     apiToken: String(raw.api_token || raw.apiToken || "").trim(),
     log: normalizeClickUpWebhookLogLevel(raw.log),
     opencode: {
-      baseUrl: normalizeOpenCodeBaseUrl(opencode.base_url || opencode.baseUrl || raw.opencode_base_url || raw.opencodeBaseUrl)
+      baseUrl: normalizeOpenCodeBaseUrl(opencode.base_url || opencode.baseUrl || raw.opencode_base_url || raw.opencodeBaseUrl),
+      startupReconciliationDelayMs: normalizeNonNegativeInteger(
+        opencode.startup_reconciliation_delay_ms ?? opencode.startupReconciliationDelayMs ?? raw.startup_reconciliation_delay_ms ?? raw.startupReconciliationDelayMs,
+        CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS
+      )
     },
     webhook: {
       publicUrl: String(webhook.public_url || webhook.publicUrl || "").trim(),
@@ -9709,7 +9719,13 @@ async function readOpenCodeJsonResponse(response, endpointName) {
     return { raw };
   }
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function appendDirectoryQuery(url, directory) {
+  const value = String(directory || "").trim();
+  if (!value) return url;
+  const separator = url.includes("?") ? "&" : "?";
+  return `${url}${separator}directory=${encodeURIComponent(value)}`;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
   if (typeof fetchImpl !== "function") throw new Error("OpenCode direct prompt delivery requires fetch.");
   const root = normalizeOpenCodeBaseUrl(baseUrl, "");
   if (!root) throw new Error("OpenCode direct prompt delivery requires a base URL.");
@@ -9717,7 +9733,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
-      url: `${root}/api/session/${encodedSession}/prompt`,
+      url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
@@ -9727,7 +9743,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
     },
     {
       name: "legacy async prompt",
-      url: `${root}/session/${encodedSession}/prompt_async`,
+      url: appendDirectoryQuery(`${root}/session/${encodedSession}/prompt_async`, directory),
       body: { agent, parts: [{ type: "text", text }] },
       accept: (response, data) => {
         if (response.status !== 204 && !response.ok) return null;
@@ -9792,7 +9808,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl, legacyOnly });
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -9827,6 +9843,11 @@ function openCodeMessageText(message) {
   for (const part of partList) parts.push(part?.text, part?.content);
   return parts.filter((value) => typeof value === "string").join("\n");
 }
+function openCodeMessageStableKey(message, index = 0) {
+  const id = message?.id || message?.messageID || message?.messageId || message?.data?.id || null;
+  if (id) return `id:${id}`;
+  return `idx:${index}:text:${openCodeMessageText(message)}`;
+}
 async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
@@ -9834,13 +9855,15 @@ async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMes
       const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
-      const lastMessage = afterMessages.at(-1) || null;
+      const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
+      const newMessages = beforeKeys ? afterMessages.filter((message, index) => !beforeKeys.has(openCodeMessageStableKey(message, index))) : afterMessages;
+      const lastMessage = newMessages.at(-1) || afterMessages.at(-1) || null;
       const lastMessageId = lastMessage?.id || lastMessage?.messageID || lastMessage?.messageId || null;
       if (beforeCount !== null && afterMessages.length > beforeCount) return { ok: true, method: "message_count", beforeCount, afterCount: afterMessages.length, lastMessageId };
       const textNeedles = [expectedText, ...markers].map((value) => String(value || "").trim()).filter(Boolean);
-      const haystack = afterMessages.slice(-20).map(openCodeMessageText).join("\n");
+      const haystack = newMessages.slice(-20).map(openCodeMessageText).join("\n");
       const matched = textNeedles.find((needle) => haystack.includes(needle));
-      if (matched) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
+      if (matched && (!beforeKeys || newMessages.length > 0)) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
       lastError = "message_not_visible";
     } catch (error) {
       lastError = error.message || "message_verification_failed";
@@ -10259,11 +10282,44 @@ async function routeClickUpWebhookEvent(options = {}) {
   const taskId = clickUpTaskIdFromPayload(options.payload || {});
   return withClickUpTaskRouteLock(taskId, () => routeClickUpWebhookEventUnlocked(options));
 }
+function defaultStartupReconciliationScheduler(run, delayMs) {
+  return setTimeout(run, delayMs);
+}
+function scheduleClickUpStartupReconciliation({ config, state = {}, worktree = process.cwd(), clickupClient, openCodeClient, scheduler = defaultStartupReconciliationScheduler, delayMs = config?.opencode?.startupReconciliationDelayMs ?? CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS, saveState = null, reconcile = reconcileClickUpStartup } = {}) {
+  const normalizedDelayMs = normalizeNonNegativeInteger(delayMs, CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS);
+  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_scheduled", delayMs: normalizedDelayMs, webhookId: state?.webhookId || null });
+  const run = () => {
+    Promise.resolve().then(() => reconcile({
+      config,
+      state,
+      worktree,
+      clickupClient,
+      openCodeClient,
+      saveState
+    })).catch((error) => {
+      clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
+      appendClickUpWebhookLocalLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
+    });
+  };
+  const timer = scheduler(run, normalizedDelayMs);
+  timer?.unref?.();
+  return { scheduled: true, delayMs: normalizedDelayMs, timer };
+}
 async function reconcileClickUpStartup({ config, state = {}, worktree = process.cwd(), clickupClient, openCodeClient, sessionExists = openCodeSessionExists, createSession = createOpenCodeSession, sendSessionEvent = sendOpenCodeSessionEvent, verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, waitForReadiness = waitForOpenCodeReadiness, saveState = null, now = () => /* @__PURE__ */ new Date(), limit = CLICKUP_WEBHOOK_STARTUP_TASK_LIMIT } = {}) {
-  if (!config || !clickupClient?.listAssignedTasks) return { ok: true, skipped: true, reason: "clickup_task_listing_unavailable", assigned: 0, comments: 0 };
+  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_started", lastWebhookAt: state.lastWebhookAt || null });
+  if (!config || !clickupClient?.listAssignedTasks) {
+    const skipped = { ok: true, skipped: true, reason: "clickup_task_listing_unavailable", assigned: 0, comments: 0 };
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_finished", ...skipped });
+    return skipped;
+  }
   const readiness = await waitForReadiness(openCodeClient, { worktree, now });
   appendClickUpWebhookLocalLog(worktree, { type: readiness.ok ? "startup_reconciliation_readiness_ready" : "startup_reconciliation_readiness_failed", ...readiness });
-  if (!readiness.ok) return { ok: false, skipped: true, reason: "opencode_not_ready", readiness, assigned: 0, comments: 0, ignored: 0, errors: 1, undelivered: 1, tasks: [], validation: { undelivered: 1, emptyPromptSessions: [] } };
+  if (!readiness.ok) {
+    const failed = { ok: false, skipped: true, reason: "opencode_not_ready", readiness, assigned: 0, comments: 0, ignored: 0, errors: 1, undelivered: 1, tasks: [], validation: { undelivered: 1, emptyPromptSessions: [] } };
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_failed", reason: failed.reason, readiness });
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_finished", ...failed });
+    return failed;
+  }
   let authorizedUserId = "";
   if (clickupClient?.getAuthorizedUser) {
     try {
@@ -10281,7 +10337,6 @@ async function reconcileClickUpStartup({ config, state = {}, worktree = process.
   const lastWebhookMs = clickUpTimestampMs(mutableState.lastWebhookAt);
   const ignored = new Set((config.routing?.ignoredStatuses || CLICKUP_WEBHOOK_TERMINAL_STATUSES).map(normalizeClickUpStatus));
   const routed = { assigned: 0, comments: 0, ignored: 0, errors: 0, undelivered: 0, tasks: [] };
-  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_started", lastWebhookAt: state.lastWebhookAt || null });
   const listed = await clickupClient.listAssignedTasks({ assigneeId: config.routing.productManagerAssigneeId, limit });
   const tasks = clickUpTaskListItems(listed).slice(0, limit);
   for (const task of tasks) {
@@ -11599,18 +11654,16 @@ async function OptimaPlugin(input = {}, pluginOptions = {}) {
           listener: { bindHost: clickUpWebhookValidation.config.webhook.bindHost, bindPort: clickUpWebhookValidation.config.webhook.bindPort, startedAt: (/* @__PURE__ */ new Date()).toISOString() }
         }, clickUpWebhookValidation.config);
         registerClickUpWebhookLifecycle({ config: clickUpWebhookValidation.config, state: activeState, worktree, clickupClient: lifecycleClickUpClient, listener: readyListener, listenerRegistry });
-        try {
-          await reconcileClickUpStartup({
-            config: clickUpWebhookValidation.config,
-            state: activeState,
-            worktree,
-            clickupClient: lifecycleClickUpClient,
-            openCodeClient: input.client,
-            saveState: (nextState) => writeClickUpWebhookState(worktree, nextState, clickUpWebhookValidation.config)
-          });
-        } catch (error) {
-          appendClickUpWebhookLocalLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
-        }
+        scheduleClickUpStartupReconciliation({
+          config: clickUpWebhookValidation.config,
+          state: activeState,
+          worktree,
+          clickupClient: lifecycleClickUpClient,
+          openCodeClient: input.client,
+          scheduler: input.startupReconciliationScheduler,
+          delayMs: input.startupReconciliationDelayMs,
+          saveState: (nextState) => writeClickUpWebhookState(worktree, nextState, clickUpWebhookValidation.config)
+        });
       } else {
         clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: readyListener.reason || "listener_unavailable", webhookId: listenerState.webhookId });
         markClickUpWebhookInactive(worktree, listenerState, clickUpWebhookValidation.config);
@@ -12185,7 +12238,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     }
   };
 }
-OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, waitForOpenCodeReadiness, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
+OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, scheduleClickUpStartupReconciliation, waitForOpenCodeReadiness, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
 export {
   OptimaPlugin as default
 };

package/dist/sanitize_cli.js

@@ -7945,6 +7945,7 @@ var CLICKUP_WEBHOOK_MAX_BODY_BYTES = 1024 * 1024;
 var CLICKUP_WEBHOOK_REQUEST_TIMEOUT_MS = 1e4;
 var CLICKUP_WEBHOOK_STARTUP_TASK_LIMIT = 50;
 var CLICKUP_WEBHOOK_STARTUP_COMMENT_LIMIT = 100;
+var CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS = 3e4;
 var CLICKUP_WEBHOOK_LOG_LEVELS = /* @__PURE__ */ new Set(["error", "info", "verbose"]);
 var CLICKUP_WEBHOOK_REDACTED = "[REDACTED]";
 var DISCUSSION_BACKFILL_FETCH_LIMIT = 100;
@@ -9020,6 +9021,11 @@ function normalizeOpenCodeBaseUrl(value, defaultValue = "http://127.0.0.1:3001")
     return candidate.replace(/\/+$/, "");
   }
 }
+function normalizeNonNegativeInteger(value, defaultValue) {
+  if (value === void 0 || value === null || value === "") return defaultValue;
+  const number = Number(value);
+  return Number.isInteger(number) && number >= 0 ? number : defaultValue;
+}
 function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd()) {
   const raw = isPlainObject(rawClickUp) ? rawClickUp : {};
   const webhook = isPlainObject(raw.webhook) ? raw.webhook : {};
@@ -9035,7 +9041,11 @@ function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd
     apiToken: String(raw.api_token || raw.apiToken || "").trim(),
     log: normalizeClickUpWebhookLogLevel(raw.log),
     opencode: {
-      baseUrl: normalizeOpenCodeBaseUrl(opencode.base_url || opencode.baseUrl || raw.opencode_base_url || raw.opencodeBaseUrl)
+      baseUrl: normalizeOpenCodeBaseUrl(opencode.base_url || opencode.baseUrl || raw.opencode_base_url || raw.opencodeBaseUrl),
+      startupReconciliationDelayMs: normalizeNonNegativeInteger(
+        opencode.startup_reconciliation_delay_ms ?? opencode.startupReconciliationDelayMs ?? raw.startup_reconciliation_delay_ms ?? raw.startupReconciliationDelayMs,
+        CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS
+      )
     },
     webhook: {
       publicUrl: String(webhook.public_url || webhook.publicUrl || "").trim(),
@@ -9716,7 +9726,13 @@ async function readOpenCodeJsonResponse(response, endpointName) {
     return { raw };
   }
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function appendDirectoryQuery(url, directory) {
+  const value = String(directory || "").trim();
+  if (!value) return url;
+  const separator = url.includes("?") ? "&" : "?";
+  return `${url}${separator}directory=${encodeURIComponent(value)}`;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
   if (typeof fetchImpl !== "function") throw new Error("OpenCode direct prompt delivery requires fetch.");
   const root = normalizeOpenCodeBaseUrl(baseUrl, "");
   if (!root) throw new Error("OpenCode direct prompt delivery requires a base URL.");
@@ -9724,7 +9740,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
-      url: `${root}/api/session/${encodedSession}/prompt`,
+      url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
       body: { prompt: { text }, delivery: "queue", resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
@@ -9734,7 +9750,7 @@ async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent,
     },
     {
       name: "legacy async prompt",
-      url: `${root}/session/${encodedSession}/prompt_async`,
+      url: appendDirectoryQuery(`${root}/session/${encodedSession}/prompt_async`, directory),
       body: { agent, parts: [{ type: "text", text }] },
       accept: (response, data) => {
         if (response.status !== 204 && !response.ok) return null;
@@ -9799,7 +9815,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, fetchImpl, legacyOnly });
+  if (directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -9834,6 +9850,11 @@ function openCodeMessageText(message) {
   for (const part of partList) parts.push(part?.text, part?.content);
   return parts.filter((value) => typeof value === "string").join("\n");
 }
+function openCodeMessageStableKey(message, index = 0) {
+  const id = message?.id || message?.messageID || message?.messageId || message?.data?.id || null;
+  if (id) return `id:${id}`;
+  return `idx:${index}:text:${openCodeMessageText(message)}`;
+}
 async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMessages = null, expectedText = "", markers = [], attempts = 8, delayMs = 250 } = {}) {
   let lastError = "message_verification_unavailable";
   for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
@@ -9841,13 +9862,15 @@ async function verifyOpenCodeSessionEventDelivery(client, { sessionId, beforeMes
       const afterMessages = await readOpenCodeSessionMessages(client, { sessionId, limit: 50 });
       if (!afterMessages) return { ok: false, reason: "message_verification_unavailable" };
       const beforeCount = Array.isArray(beforeMessages) ? beforeMessages.length : null;
-      const lastMessage = afterMessages.at(-1) || null;
+      const beforeKeys = Array.isArray(beforeMessages) ? new Set(beforeMessages.map(openCodeMessageStableKey)) : null;
+      const newMessages = beforeKeys ? afterMessages.filter((message, index) => !beforeKeys.has(openCodeMessageStableKey(message, index))) : afterMessages;
+      const lastMessage = newMessages.at(-1) || afterMessages.at(-1) || null;
       const lastMessageId = lastMessage?.id || lastMessage?.messageID || lastMessage?.messageId || null;
       if (beforeCount !== null && afterMessages.length > beforeCount) return { ok: true, method: "message_count", beforeCount, afterCount: afterMessages.length, lastMessageId };
       const textNeedles = [expectedText, ...markers].map((value) => String(value || "").trim()).filter(Boolean);
-      const haystack = afterMessages.slice(-20).map(openCodeMessageText).join("\n");
+      const haystack = newMessages.slice(-20).map(openCodeMessageText).join("\n");
       const matched = textNeedles.find((needle) => haystack.includes(needle));
-      if (matched) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
+      if (matched && (!beforeKeys || newMessages.length > 0)) return { ok: true, method: "message_text", marker: matched, beforeCount, afterCount: afterMessages.length, lastMessageId };
       lastError = "message_not_visible";
     } catch (error) {
       lastError = error.message || "message_verification_failed";
@@ -10266,11 +10289,44 @@ async function routeClickUpWebhookEvent(options = {}) {
   const taskId = clickUpTaskIdFromPayload(options.payload || {});
   return withClickUpTaskRouteLock(taskId, () => routeClickUpWebhookEventUnlocked(options));
 }
+function defaultStartupReconciliationScheduler(run, delayMs) {
+  return setTimeout(run, delayMs);
+}
+function scheduleClickUpStartupReconciliation({ config, state = {}, worktree = process.cwd(), clickupClient, openCodeClient, scheduler = defaultStartupReconciliationScheduler, delayMs = config?.opencode?.startupReconciliationDelayMs ?? CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS, saveState = null, reconcile = reconcileClickUpStartup } = {}) {
+  const normalizedDelayMs = normalizeNonNegativeInteger(delayMs, CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS);
+  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_scheduled", delayMs: normalizedDelayMs, webhookId: state?.webhookId || null });
+  const run = () => {
+    Promise.resolve().then(() => reconcile({
+      config,
+      state,
+      worktree,
+      clickupClient,
+      openCodeClient,
+      saveState
+    })).catch((error) => {
+      clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
+      appendClickUpWebhookLocalLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
+    });
+  };
+  const timer = scheduler(run, normalizedDelayMs);
+  timer?.unref?.();
+  return { scheduled: true, delayMs: normalizedDelayMs, timer };
+}
 async function reconcileClickUpStartup({ config, state = {}, worktree = process.cwd(), clickupClient, openCodeClient, sessionExists = openCodeSessionExists, createSession = createOpenCodeSession, sendSessionEvent = sendOpenCodeSessionEvent, verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, waitForReadiness = waitForOpenCodeReadiness, saveState = null, now = () => /* @__PURE__ */ new Date(), limit = CLICKUP_WEBHOOK_STARTUP_TASK_LIMIT } = {}) {
-  if (!config || !clickupClient?.listAssignedTasks) return { ok: true, skipped: true, reason: "clickup_task_listing_unavailable", assigned: 0, comments: 0 };
+  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_started", lastWebhookAt: state.lastWebhookAt || null });
+  if (!config || !clickupClient?.listAssignedTasks) {
+    const skipped = { ok: true, skipped: true, reason: "clickup_task_listing_unavailable", assigned: 0, comments: 0 };
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_finished", ...skipped });
+    return skipped;
+  }
   const readiness = await waitForReadiness(openCodeClient, { worktree, now });
   appendClickUpWebhookLocalLog(worktree, { type: readiness.ok ? "startup_reconciliation_readiness_ready" : "startup_reconciliation_readiness_failed", ...readiness });
-  if (!readiness.ok) return { ok: false, skipped: true, reason: "opencode_not_ready", readiness, assigned: 0, comments: 0, ignored: 0, errors: 1, undelivered: 1, tasks: [], validation: { undelivered: 1, emptyPromptSessions: [] } };
+  if (!readiness.ok) {
+    const failed = { ok: false, skipped: true, reason: "opencode_not_ready", readiness, assigned: 0, comments: 0, ignored: 0, errors: 1, undelivered: 1, tasks: [], validation: { undelivered: 1, emptyPromptSessions: [] } };
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_failed", reason: failed.reason, readiness });
+    clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_finished", ...failed });
+    return failed;
+  }
   let authorizedUserId = "";
   if (clickupClient?.getAuthorizedUser) {
     try {
@@ -10288,7 +10344,6 @@ async function reconcileClickUpStartup({ config, state = {}, worktree = process.
   const lastWebhookMs = clickUpTimestampMs(mutableState.lastWebhookAt);
   const ignored = new Set((config.routing?.ignoredStatuses || CLICKUP_WEBHOOK_TERMINAL_STATUSES).map(normalizeClickUpStatus));
   const routed = { assigned: 0, comments: 0, ignored: 0, errors: 0, undelivered: 0, tasks: [] };
-  clickUpWebhookLifecycleLog(worktree, { type: "startup_reconciliation_started", lastWebhookAt: state.lastWebhookAt || null });
   const listed = await clickupClient.listAssignedTasks({ assigneeId: config.routing.productManagerAssigneeId, limit });
   const tasks = clickUpTaskListItems(listed).slice(0, limit);
   for (const task of tasks) {
@@ -11606,18 +11661,16 @@ async function OptimaPlugin(input = {}, pluginOptions = {}) {
           listener: { bindHost: clickUpWebhookValidation.config.webhook.bindHost, bindPort: clickUpWebhookValidation.config.webhook.bindPort, startedAt: (/* @__PURE__ */ new Date()).toISOString() }
         }, clickUpWebhookValidation.config);
         registerClickUpWebhookLifecycle({ config: clickUpWebhookValidation.config, state: activeState, worktree, clickupClient: lifecycleClickUpClient, listener: readyListener, listenerRegistry });
-        try {
-          await reconcileClickUpStartup({
-            config: clickUpWebhookValidation.config,
-            state: activeState,
-            worktree,
-            clickupClient: lifecycleClickUpClient,
-            openCodeClient: input.client,
-            saveState: (nextState) => writeClickUpWebhookState(worktree, nextState, clickUpWebhookValidation.config)
-          });
-        } catch (error) {
-          appendClickUpWebhookLocalLog(worktree, { type: "startup_reconciliation_failed", message: error.message });
-        }
+        scheduleClickUpStartupReconciliation({
+          config: clickUpWebhookValidation.config,
+          state: activeState,
+          worktree,
+          clickupClient: lifecycleClickUpClient,
+          openCodeClient: input.client,
+          scheduler: input.startupReconciliationScheduler,
+          delayMs: input.startupReconciliationDelayMs,
+          saveState: (nextState) => writeClickUpWebhookState(worktree, nextState, clickUpWebhookValidation.config)
+        });
       } else {
         clickUpWebhookLifecycleLog(worktree, { type: "remote_webhook_preserved", reason: readyListener.reason || "listener_unavailable", webhookId: listenerState.webhookId });
         markClickUpWebhookInactive(worktree, listenerState, clickUpWebhookValidation.config);
@@ -12192,7 +12245,7 @@ Follow-up: use optima_prompt_workflow with session_id '${sessionId}' to check in
     }
   };
 }
-OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, waitForOpenCodeReadiness, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
+OptimaPlugin.__internals = { BUNDLE_AGENTS_DIR, BUNDLE_ASSETS_DIR, CLICKUP_DEFINITION_DOC_PARENT, activeClickUpWebhookLifecycleRegistry, cleanupManagedClickUpWebhook, deleteClickUpWebhookBestEffort, BUNDLE_POLICIES_DIR, buildClickUpApplyPayloadResult, buildClickUpCreateSubtasksPayload, buildClickUpStartTaskPayload, buildClickUpSummaryPayload, buildClickUpTransitionPayload, buildOptimaAgents, clickUpCommentLedgerKey, clickUpCommentMentionsProductManager, clickUpWebhookAuditLogDir, clickUpWebhookAuditLogPath, createClickUpApiClient, createOpenCodeSession, deliveryEvidencePathForClickUpTask, ensureClickUpTaskWorktree, ensureClickUpWebhookSubscription, handleClickUpWebhookRequest, isClickUpWebhookStateActive, normalizeClickUpWebhookConfig, normalizeClickUpWebhookLogLevel, normalizeOpenCodeBaseUrl, openCodeSessionExists, readClickUpCommentLedger, readClickUpWebhookState, readOpenCodeSessionMessages, reconcileClickUpStartup, scheduleClickUpStartupReconciliation, waitForOpenCodeReadiness, recordClickUpCommentVersionProcessed, resyncClickUpWebhookForSignatureDrift, resolveOptimaPluginOptions, resolveSecretReference, routeClickUpWebhookEvent, sendOpenCodeSessionEvent, sendOpenCodeSessionEventDirect, verifyOpenCodeSessionEventDelivery, stableClickUpCommentVersionMarker, startClickUpWebhookListener, validateClickUpWebhookState, verifyClickUpSignature, writeClickUpWebhookState, decideClickUpStatusAction, deriveClickUpBranchName, deriveClickUpPendingSubtaskBranch, deriveClickUpPrTarget, deriveClickUpWorktree, determineClickUpMergeAuthority, ensureOptimaGitignoreRules, explicitSafeInputWorktree, finalApprovalAssignees, formatValidationResult, isIgnoredClickUpTaskType, isOptimaPluginPackageWorktree, isSafeWritableDirectory, loadHumansRegistry, mergeClickUpAgentMetadata, mergeClickUpSessionMetadata, migrateLegacyOptimaLayout, normalizeAgentMetadataJson, normalizeClickUpStatus, normalizeClickUpTaskType, normalizePromptResponseParts, normalizeWorkflowTaskPath, parseClickUpSubtasksMarkdown, parseHumansRegistry, parseMarkdownArtifact, parseMarkdownSections, preEstimateClickUpWork, readMarkdownArtifact, resolveHumanRoles, resolveSafeWorktree, safeWorktreeOrFailure, stripRawLogSections, validateMainWorkspaceBranchSafety, workflowFinalMessageFromPromptResponse };
 
 // src/sanitize_cli.js
 var { migrateLegacyOptimaLayout: migrateLegacyOptimaLayout2 } = OptimaPlugin.__internals;

package/package.json

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