@defend-tech/opencode-optima 0.1.69 → 0.1.71

package/dist/index.js

@@ -8530,6 +8530,7 @@ var CLICKUP_WEBHOOK_STARTUP_COMMENT_LIMIT = 100;
 var CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS = 3e4;
 var CLICKUP_WEBHOOK_STARTUP_COMMENT_LOOKBACK_MS = 6 * 60 * 60 * 1e3;
 var CLICKUP_ASSIGNMENT_WATCHDOG_INTERVAL_MS = 5 * 60 * 1e3;
+var CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS = 15 * 60 * 1e3;
 var CLICKUP_WORKTREE_FAILURE_COMMENT_DEDUPE_MS = 10 * 60 * 1e3;
 var CLICKUP_WEBHOOK_LOG_LEVELS = /* @__PURE__ */ new Set(["error", "info", "verbose"]);
 var CLICKUP_WEBHOOK_REDACTED = "[REDACTED]";
@@ -9816,6 +9817,10 @@ function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd
       assignmentWatchdogIntervalMs: normalizeNonNegativeInteger(
         opencode.assignment_watchdog_interval_ms ?? opencode.assignmentWatchdogIntervalMs ?? raw.assignment_watchdog_interval_ms ?? raw.assignmentWatchdogIntervalMs,
         CLICKUP_ASSIGNMENT_WATCHDOG_INTERVAL_MS
+      ),
+      assignmentWatchdogRunningGraceMs: normalizeNonNegativeInteger(
+        opencode.assignment_watchdog_running_grace_ms ?? opencode.assignmentWatchdogRunningGraceMs ?? raw.assignment_watchdog_running_grace_ms ?? raw.assignmentWatchdogRunningGraceMs,
+        CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS
       )
     },
     openchamber: {
@@ -10649,20 +10654,25 @@ function appendDirectoryQuery(url, directory) {
   const separator = url.includes("?") ? "&" : "?";
   return `${url}${separator}directory=${encodeURIComponent(value)}`;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function normalizeOpenCodePromptDelivery(value, fallback = "queue") {
+  const normalized = String(value || "").trim().toLowerCase();
+  return normalized === "steer" || normalized === "queue" ? normalized : fallback;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false, delivery = "queue" } = {}) {
   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.");
   const encodedSession = encodeURIComponent(sessionId);
+  const promptDelivery = normalizeOpenCodePromptDelivery(delivery, "queue");
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
       url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
-      body: { prompt: { text }, delivery: "queue", resume: true },
+      body: { prompt: { text }, delivery: promptDelivery, resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
         if (!openCodePromptAdmissionVerification(data, sessionId)) throw new Error("OpenCode v2 prompt response did not include a valid prompt admission.");
-        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, data: data.data, response: data };
+        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, delivery: promptDelivery, data: data.data, response: data };
       }
     },
     {
@@ -10718,7 +10728,7 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true, directDelivery = "queue" } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -10742,7 +10752,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly, delivery: directDelivery });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -10771,6 +10781,22 @@ async function readOpenCodeSessionMessages(client, { sessionId, directory, limit
   if (directory) query.directory = directory;
   return normalizeOpenCodeSessionMessages(await client.session.messages({ path: { id: sessionId }, query }));
 }
+async function readOpenCodeChildSessions(client, { sessionId, directory } = {}) {
+  if (typeof client?.session?.children !== "function") return [];
+  const attempts = [
+    { path: { id: sessionId }, query: directory ? { directory } : {} },
+    { path: { sessionID: sessionId }, query: directory ? { directory } : {} },
+    { sessionID: sessionId, ...directory ? { directory } : {} }
+  ];
+  for (const attempt of attempts) {
+    try {
+      const result = await client.session.children(attempt);
+      return normalizeOpenCodeSessionCollection(result?.data ?? result);
+    } catch {
+    }
+  }
+  return [];
+}
 function openCodeResultSummary(result) {
   const data = result?.data ?? result;
   return {
@@ -10831,13 +10857,28 @@ function openCodeMessageTimestampMs(message = {}, key = "updated") {
   const number = Number(value);
   return Number.isFinite(number) && number > 0 ? number : 0;
 }
-function isOpenCodeAssistantMessageRunning(message = {}) {
+function openCodeSessionTimestampMs(session = {}, key = "updated") {
+  const time = session?.time || session?.info?.time || {};
+  const value = key === "created" ? session.time_created ?? session.timeCreated ?? time.created : session.time_updated ?? session.timeUpdated ?? time.updated ?? session.time_created ?? session.timeCreated ?? time.created;
+  const number = Number(value);
+  return Number.isFinite(number) && number > 0 ? number : 0;
+}
+function openCodeNowMs(now = /* @__PURE__ */ new Date()) {
+  const value = typeof now === "function" ? now() : now;
+  const number = Number(value instanceof Date ? value.getTime() : new Date(value).getTime());
+  return Number.isFinite(number) && number > 0 ? number : 0;
+}
+function isOpenCodeAssistantMessageRunning(message = {}, { latestActivityAt = 0, now = /* @__PURE__ */ new Date(), runningGraceMs = CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS } = {}) {
   if (normalizeLooseToken(normalizeOpenCodeMessageRole(message)) !== "assistant") return false;
   const started = openCodeMessageTimestampMs(message, "created") > 0;
   if (!started) return false;
-  return openCodeMessageTimestampMs(message, "completed") === 0;
+  if (openCodeMessageTimestampMs(message, "completed") !== 0) return false;
+  const nowMs = openCodeNowMs(now);
+  const activityAt = Number(latestActivityAt) || openCodeMessageTimestampMs(message, "updated") || openCodeMessageTimestampMs(message, "created");
+  if (!Number.isFinite(nowMs) || nowMs <= 0 || !Number.isFinite(activityAt) || activityAt <= 0) return false;
+  return nowMs - activityAt <= Math.max(0, Number(runningGraceMs) || 0);
 }
-async function inspectOpenCodeSessionActivity(client, { sessionId, directory, limit = 10 } = {}) {
+async function inspectOpenCodeSessionActivity(client, { sessionId, directory, limit = 10, now = /* @__PURE__ */ new Date(), runningGraceMs = CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS } = {}) {
   const messages = await readOpenCodeSessionMessages(client, { sessionId, directory, limit });
   if (!messages) return { ok: false, reason: "message_inspection_unavailable", sessionId, directory };
   const enriched = messages.map((message, index) => ({
@@ -10847,20 +10888,45 @@ async function inspectOpenCodeSessionActivity(client, { sessionId, directory, li
     createdAt: openCodeMessageTimestampMs(message, "created"),
     completedAt: openCodeMessageTimestampMs(message, "completed")
   })).sort((a, b) => a.sortTime - b.sortTime || a.index - b.index);
+  const childSessions = await readOpenCodeChildSessions(client, { sessionId, directory });
+  const childActivities = childSessions.map((session, index) => ({
+    session,
+    index,
+    id: session.id || session.sessionID || session.sessionId || null,
+    agent: session.agent || session.mode?.agent || session.metadata?.agent || "",
+    updatedAt: openCodeSessionTimestampMs(session, "updated")
+  })).filter((entry) => entry.updatedAt > 0).sort((a, b) => a.updatedAt - b.updatedAt || a.index - b.index);
   const assistantMessages = enriched.filter((entry) => normalizeLooseToken(normalizeOpenCodeMessageRole(entry.message)) === "assistant");
   const latestAssistant = assistantMessages.at(-1) || null;
   const latest = enriched.at(-1) || null;
-  const running = latestAssistant ? isOpenCodeAssistantMessageRunning(latestAssistant.message) : false;
+  const latestChild = childActivities.at(-1) || null;
+  const latestMessageActivityAt = latest?.sortTime || 0;
+  const latestChildActivityAt = latestChild?.updatedAt || 0;
+  const latestActivityAt = Math.max(latestMessageActivityAt, latestChildActivityAt);
+  const nowMs = openCodeNowMs(now);
+  const latestActivityAgeMs = Number.isFinite(nowMs) && latestActivityAt > 0 ? Math.max(0, nowMs - latestActivityAt) : null;
+  const assistantRunning = latestAssistant ? isOpenCodeAssistantMessageRunning(latestAssistant.message, { latestActivityAt, now, runningGraceMs }) : false;
+  const childRunning = latestChildActivityAt > 0 && latestActivityAgeMs !== null && latestActivityAgeMs <= Math.max(0, Number(runningGraceMs) || 0);
+  const running = assistantRunning || childRunning;
+  const runningReason = running ? childRunning && latestChildActivityAt >= latestMessageActivityAt ? "recent_child_session_activity" : "recent_incomplete_assistant" : latestAssistant && latestAssistant.completedAt === 0 ? "stale_incomplete_assistant" : "not_running";
   return {
     ok: true,
     sessionId,
     directory,
     count: messages.length,
     running,
+    runningReason,
+    runningGraceMs,
+    latestActivityAt,
+    latestActivityAgeMs,
     latestMessageId: latest ? normalizeOpenCodeMessageId(latest.message) : null,
     latestAssistantMessageId: latestAssistant ? normalizeOpenCodeMessageId(latestAssistant.message) : null,
     latestAssistantCreatedAt: latestAssistant?.createdAt || 0,
-    latestAssistantCompletedAt: latestAssistant?.completedAt || 0
+    latestAssistantCompletedAt: latestAssistant?.completedAt || 0,
+    latestChildSessionId: latestChild?.id || null,
+    latestChildAgent: latestChild?.agent || null,
+    latestChildUpdatedAt: latestChild?.updatedAt || 0,
+    childSessionCount: childSessions.length
   };
 }
 function summarizeOpenCodeMessages(messages = [], { snippetLength = 160, maxMessages = 50 } = {}) {
@@ -11059,11 +11125,11 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   if (parts.length > 0 || messageId) return { ok: true, method: parts.length > 0 ? "blocking_prompt_parts" : "blocking_prompt_message", messageId: messageId ? String(messageId) : null, sessionId: deliveredSessionId ? String(deliveredSessionId) : String(sessionId), parts: parts.length };
   return null;
 }
-async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
+async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, directDelivery = "queue", acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   let sendResult;
   try {
-    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, allowDirectFallback: directPrompt });
+    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, directDelivery, allowDirectFallback: directPrompt });
   } catch (error) {
     const reason2 = error.message || "message_delivery_failed";
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: reason2, fallbackAttempted: false });
@@ -11086,7 +11152,13 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   if (admissionVerification && acceptPromptAdmission) {
-    return { ok: true, verification: admissionVerification, admissionVerification, fallback: false, admissionOnly: true };
+    appendClickUpWebhookLocalLog(worktree, {
+      type: "message_delivery_admission_not_sufficient",
+      taskId,
+      sessionId,
+      admission: admissionVerification,
+      policy: "clickup_routing_requires_visible_delivery"
+    });
   }
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
@@ -11489,10 +11561,9 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   const sessionId = String(existingSessionId);
   if (await sessionExists(openCodeClient, sessionId, { directory: taskRoute.worktree })) {
     if (typeof clickupClient?.updateTaskMetadata === "function") await clickupClient.updateTaskMetadata({ taskId, fieldId: config.routing.metadataFieldId, value: metadataWithRouting });
-    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
+    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", directDelivery: "steer", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
     if (!delivery.ok) {
-      const recovery2 = await recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId: sessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers: [taskId, eventType], deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, eventKey, createSession, verifySessionEventDelivery });
-      return finish(recovery2);
+      return finish({ ...delivery, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, replacementAttempted: false });
     }
     return finish({ ok: true, action: "sent_to_existing_session", taskId, sessionId, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, deliveryVerification: delivery.verification, deliveryAdmission: delivery.admissionVerification, deliveryFallback: delivery.fallback, deliveryAttempts: delivery.fallback ? 2 : 1 });
   }
@@ -11620,7 +11691,12 @@ async function reconcileClickUpStartup({ config, state = {}, worktree = process.
       const directory = String(getNestedMetadataValue(metadata, "task.worktree") || "").trim();
       if (sessionId) {
         try {
-          const activity = await inspectOpenCodeSessionActivity(openCodeClient, { sessionId, directory });
+          const activity = await inspectOpenCodeSessionActivity(openCodeClient, {
+            sessionId,
+            directory,
+            now,
+            runningGraceMs: config.opencode.assignmentWatchdogRunningGraceMs
+          });
           appendClickUpWebhookLocalLog(worktree, { type: "assignment_watchdog_session_activity", taskId, sessionId, directory: directory || null, ...activity });
           if (activity.running) {
             routed.ignored += 1;

package/dist/sanitize_cli.js

@@ -8537,6 +8537,7 @@ var CLICKUP_WEBHOOK_STARTUP_COMMENT_LIMIT = 100;
 var CLICKUP_WEBHOOK_STARTUP_RECONCILIATION_DELAY_MS = 3e4;
 var CLICKUP_WEBHOOK_STARTUP_COMMENT_LOOKBACK_MS = 6 * 60 * 60 * 1e3;
 var CLICKUP_ASSIGNMENT_WATCHDOG_INTERVAL_MS = 5 * 60 * 1e3;
+var CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS = 15 * 60 * 1e3;
 var CLICKUP_WORKTREE_FAILURE_COMMENT_DEDUPE_MS = 10 * 60 * 1e3;
 var CLICKUP_WEBHOOK_LOG_LEVELS = /* @__PURE__ */ new Set(["error", "info", "verbose"]);
 var CLICKUP_WEBHOOK_REDACTED = "[REDACTED]";
@@ -9823,6 +9824,10 @@ function normalizeClickUpWebhookConfig(rawClickUp = null, worktree = process.cwd
       assignmentWatchdogIntervalMs: normalizeNonNegativeInteger(
         opencode.assignment_watchdog_interval_ms ?? opencode.assignmentWatchdogIntervalMs ?? raw.assignment_watchdog_interval_ms ?? raw.assignmentWatchdogIntervalMs,
         CLICKUP_ASSIGNMENT_WATCHDOG_INTERVAL_MS
+      ),
+      assignmentWatchdogRunningGraceMs: normalizeNonNegativeInteger(
+        opencode.assignment_watchdog_running_grace_ms ?? opencode.assignmentWatchdogRunningGraceMs ?? raw.assignment_watchdog_running_grace_ms ?? raw.assignmentWatchdogRunningGraceMs,
+        CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS
       )
     },
     openchamber: {
@@ -10656,20 +10661,25 @@ function appendDirectoryQuery(url, directory) {
   const separator = url.includes("?") ? "&" : "?";
   return `${url}${separator}directory=${encodeURIComponent(value)}`;
 }
-async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false } = {}) {
+function normalizeOpenCodePromptDelivery(value, fallback = "queue") {
+  const normalized = String(value || "").trim().toLowerCase();
+  return normalized === "steer" || normalized === "queue" ? normalized : fallback;
+}
+async function sendOpenCodeSessionEventDirect({ baseUrl, sessionId, text, agent, directory, fetchImpl = globalThis.fetch, legacyOnly = false, delivery = "queue" } = {}) {
   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.");
   const encodedSession = encodeURIComponent(sessionId);
+  const promptDelivery = normalizeOpenCodePromptDelivery(delivery, "queue");
   const attempts = [
     legacyOnly ? null : {
       name: "v2 prompt",
       url: appendDirectoryQuery(`${root}/api/session/${encodedSession}/prompt`, directory),
-      body: { prompt: { text }, delivery: "queue", resume: true },
+      body: { prompt: { text }, delivery: promptDelivery, resume: true },
       accept: (response, data) => {
         if (!response.ok) return null;
         if (!openCodePromptAdmissionVerification(data, sessionId)) throw new Error("OpenCode v2 prompt response did not include a valid prompt admission.");
-        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, data: data.data, response: data };
+        return { ok: true, method: "http", endpoint: "/api/session/{sessionID}/prompt", status: response.status, delivery: promptDelivery, data: data.data, response: data };
       }
     },
     {
@@ -10725,7 +10735,7 @@ async function callOpenCodePromptWithFallbacks(method, sessionId, flatPayload, s
   }
   throw firstError;
 }
-async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true } = {}) {
+async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, directory, opencodeBaseUrl, baseUrl, fetchImpl, direct = false, legacyOnly = false, allowDirectFallback = true, directDelivery = "queue" } = {}) {
   const directBaseUrl = opencodeBaseUrl || baseUrl;
   const parts = [{ type: "text", text }];
   const flatPayload = { directory, agent, parts };
@@ -10749,7 +10759,7 @@ async function sendOpenCodeSessionEvent(client, { sessionId, agent, text, direct
       firstError ??= error;
     }
   }
-  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly });
+  if (allowDirectFallback && directBaseUrl) return sendOpenCodeSessionEventDirect({ baseUrl: directBaseUrl, sessionId, text, agent, directory, fetchImpl, legacyOnly, delivery: directDelivery });
   if (firstError) throw firstError;
   throw new Error("OpenCode client does not expose session.prompt or session.promptAsync.");
 }
@@ -10778,6 +10788,22 @@ async function readOpenCodeSessionMessages(client, { sessionId, directory, limit
   if (directory) query.directory = directory;
   return normalizeOpenCodeSessionMessages(await client.session.messages({ path: { id: sessionId }, query }));
 }
+async function readOpenCodeChildSessions(client, { sessionId, directory } = {}) {
+  if (typeof client?.session?.children !== "function") return [];
+  const attempts = [
+    { path: { id: sessionId }, query: directory ? { directory } : {} },
+    { path: { sessionID: sessionId }, query: directory ? { directory } : {} },
+    { sessionID: sessionId, ...directory ? { directory } : {} }
+  ];
+  for (const attempt of attempts) {
+    try {
+      const result = await client.session.children(attempt);
+      return normalizeOpenCodeSessionCollection(result?.data ?? result);
+    } catch {
+    }
+  }
+  return [];
+}
 function openCodeResultSummary(result) {
   const data = result?.data ?? result;
   return {
@@ -10838,13 +10864,28 @@ function openCodeMessageTimestampMs(message = {}, key = "updated") {
   const number = Number(value);
   return Number.isFinite(number) && number > 0 ? number : 0;
 }
-function isOpenCodeAssistantMessageRunning(message = {}) {
+function openCodeSessionTimestampMs(session = {}, key = "updated") {
+  const time = session?.time || session?.info?.time || {};
+  const value = key === "created" ? session.time_created ?? session.timeCreated ?? time.created : session.time_updated ?? session.timeUpdated ?? time.updated ?? session.time_created ?? session.timeCreated ?? time.created;
+  const number = Number(value);
+  return Number.isFinite(number) && number > 0 ? number : 0;
+}
+function openCodeNowMs(now = /* @__PURE__ */ new Date()) {
+  const value = typeof now === "function" ? now() : now;
+  const number = Number(value instanceof Date ? value.getTime() : new Date(value).getTime());
+  return Number.isFinite(number) && number > 0 ? number : 0;
+}
+function isOpenCodeAssistantMessageRunning(message = {}, { latestActivityAt = 0, now = /* @__PURE__ */ new Date(), runningGraceMs = CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS } = {}) {
   if (normalizeLooseToken(normalizeOpenCodeMessageRole(message)) !== "assistant") return false;
   const started = openCodeMessageTimestampMs(message, "created") > 0;
   if (!started) return false;
-  return openCodeMessageTimestampMs(message, "completed") === 0;
+  if (openCodeMessageTimestampMs(message, "completed") !== 0) return false;
+  const nowMs = openCodeNowMs(now);
+  const activityAt = Number(latestActivityAt) || openCodeMessageTimestampMs(message, "updated") || openCodeMessageTimestampMs(message, "created");
+  if (!Number.isFinite(nowMs) || nowMs <= 0 || !Number.isFinite(activityAt) || activityAt <= 0) return false;
+  return nowMs - activityAt <= Math.max(0, Number(runningGraceMs) || 0);
 }
-async function inspectOpenCodeSessionActivity(client, { sessionId, directory, limit = 10 } = {}) {
+async function inspectOpenCodeSessionActivity(client, { sessionId, directory, limit = 10, now = /* @__PURE__ */ new Date(), runningGraceMs = CLICKUP_ASSIGNMENT_WATCHDOG_RUNNING_GRACE_MS } = {}) {
   const messages = await readOpenCodeSessionMessages(client, { sessionId, directory, limit });
   if (!messages) return { ok: false, reason: "message_inspection_unavailable", sessionId, directory };
   const enriched = messages.map((message, index) => ({
@@ -10854,20 +10895,45 @@ async function inspectOpenCodeSessionActivity(client, { sessionId, directory, li
     createdAt: openCodeMessageTimestampMs(message, "created"),
     completedAt: openCodeMessageTimestampMs(message, "completed")
   })).sort((a, b) => a.sortTime - b.sortTime || a.index - b.index);
+  const childSessions = await readOpenCodeChildSessions(client, { sessionId, directory });
+  const childActivities = childSessions.map((session, index) => ({
+    session,
+    index,
+    id: session.id || session.sessionID || session.sessionId || null,
+    agent: session.agent || session.mode?.agent || session.metadata?.agent || "",
+    updatedAt: openCodeSessionTimestampMs(session, "updated")
+  })).filter((entry) => entry.updatedAt > 0).sort((a, b) => a.updatedAt - b.updatedAt || a.index - b.index);
   const assistantMessages = enriched.filter((entry) => normalizeLooseToken(normalizeOpenCodeMessageRole(entry.message)) === "assistant");
   const latestAssistant = assistantMessages.at(-1) || null;
   const latest = enriched.at(-1) || null;
-  const running = latestAssistant ? isOpenCodeAssistantMessageRunning(latestAssistant.message) : false;
+  const latestChild = childActivities.at(-1) || null;
+  const latestMessageActivityAt = latest?.sortTime || 0;
+  const latestChildActivityAt = latestChild?.updatedAt || 0;
+  const latestActivityAt = Math.max(latestMessageActivityAt, latestChildActivityAt);
+  const nowMs = openCodeNowMs(now);
+  const latestActivityAgeMs = Number.isFinite(nowMs) && latestActivityAt > 0 ? Math.max(0, nowMs - latestActivityAt) : null;
+  const assistantRunning = latestAssistant ? isOpenCodeAssistantMessageRunning(latestAssistant.message, { latestActivityAt, now, runningGraceMs }) : false;
+  const childRunning = latestChildActivityAt > 0 && latestActivityAgeMs !== null && latestActivityAgeMs <= Math.max(0, Number(runningGraceMs) || 0);
+  const running = assistantRunning || childRunning;
+  const runningReason = running ? childRunning && latestChildActivityAt >= latestMessageActivityAt ? "recent_child_session_activity" : "recent_incomplete_assistant" : latestAssistant && latestAssistant.completedAt === 0 ? "stale_incomplete_assistant" : "not_running";
   return {
     ok: true,
     sessionId,
     directory,
     count: messages.length,
     running,
+    runningReason,
+    runningGraceMs,
+    latestActivityAt,
+    latestActivityAgeMs,
     latestMessageId: latest ? normalizeOpenCodeMessageId(latest.message) : null,
     latestAssistantMessageId: latestAssistant ? normalizeOpenCodeMessageId(latestAssistant.message) : null,
     latestAssistantCreatedAt: latestAssistant?.createdAt || 0,
-    latestAssistantCompletedAt: latestAssistant?.completedAt || 0
+    latestAssistantCompletedAt: latestAssistant?.completedAt || 0,
+    latestChildSessionId: latestChild?.id || null,
+    latestChildAgent: latestChild?.agent || null,
+    latestChildUpdatedAt: latestChild?.updatedAt || 0,
+    childSessionCount: childSessions.length
   };
 }
 function summarizeOpenCodeMessages(messages = [], { snippetLength = 160, maxMessages = 50 } = {}) {
@@ -11066,11 +11132,11 @@ function openCodeBlockingPromptVerification(result, sessionId) {
   if (parts.length > 0 || messageId) return { ok: true, method: parts.length > 0 ? "blocking_prompt_parts" : "blocking_prompt_message", messageId: messageId ? String(messageId) : null, sessionId: deliveredSessionId ? String(deliveredSessionId) : String(sessionId), parts: parts.length };
   return null;
 }
-async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
+async function deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent, text, directory, opencodeBaseUrl, directPrompt = false, directDelivery = "queue", acceptPromptAdmission = false, eventMarkers = [], verifySessionEventDelivery = verifyOpenCodeSessionEventDelivery, applyBlockerOnFailure = true } = {}) {
   const beforeMessages = await readOpenCodeSessionMessages(openCodeClient, { sessionId, directory, limit: 50 }).catch(() => null);
   let sendResult;
   try {
-    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, allowDirectFallback: directPrompt });
+    sendResult = await sendSessionEvent(openCodeClient, { sessionId, agent, text, directory, opencodeBaseUrl, direct: directPrompt, directDelivery, allowDirectFallback: directPrompt });
   } catch (error) {
     const reason2 = error.message || "message_delivery_failed";
     appendClickUpWebhookLocalLog(worktree, { type: "message_delivery_failed", taskId, sessionId, reason: reason2, fallbackAttempted: false });
@@ -11093,7 +11159,13 @@ async function deliverClickUpSessionEventWithVerification({ openCodeClient, send
   }
   if (blockingPromptVerification) return { ok: true, verification: blockingPromptVerification, admissionVerification: null, fallback: false };
   if (admissionVerification && acceptPromptAdmission) {
-    return { ok: true, verification: admissionVerification, admissionVerification, fallback: false, admissionOnly: true };
+    appendClickUpWebhookLocalLog(worktree, {
+      type: "message_delivery_admission_not_sufficient",
+      taskId,
+      sessionId,
+      admission: admissionVerification,
+      policy: "clickup_routing_requires_visible_delivery"
+    });
   }
   let verification = await verifySessionEventDelivery(openCodeClient, { sessionId, directory, beforeMessages, expectedText: text, markers: eventMarkers });
   if (verification?.ok) return { ok: true, verification, admissionVerification, fallback: false };
@@ -11496,10 +11568,9 @@ async function routeClickUpWebhookEventUnlocked({ payload, config, state = {}, w
   const sessionId = String(existingSessionId);
   if (await sessionExists(openCodeClient, sessionId, { directory: taskRoute.worktree })) {
     if (typeof clickupClient?.updateTaskMetadata === "function") await clickupClient.updateTaskMetadata({ taskId, fieldId: config.routing.metadataFieldId, value: metadataWithRouting });
-    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
+    const delivery = await deliverClickUpSessionEventWithVerification({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, sessionId, agent: config.routing.targetAgent, text: prompt, directory: taskRoute.worktree, opencodeBaseUrl: config.opencode?.baseUrl, directPrompt: config.opencode?.promptDelivery === "http", directDelivery: "steer", acceptPromptAdmission: config.opencode?.acceptPromptAdmission === true, eventMarkers: [taskId, eventType], verifySessionEventDelivery, applyBlockerOnFailure: false });
     if (!delivery.ok) {
-      const recovery2 = await recoverClickUpPmSession({ openCodeClient, sendSessionEvent, clickupClient, worktree, taskId, staleSessionId: sessionId, sessionTitle, taskRoute, metadataWithRouting, config, prompt, eventMarkers: [taskId, eventType], deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, eventKey, createSession, verifySessionEventDelivery });
-      return finish(recovery2);
+      return finish({ ...delivery, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, replacementAttempted: false });
     }
     return finish({ ok: true, action: "sent_to_existing_session", taskId, sessionId, eventKey, branch: taskRoute.branch, worktree: taskRoute.worktree, deliveryEvidencePath, evidencePath: routingMetadata.evidence_path, deliveryVerification: delivery.verification, deliveryAdmission: delivery.admissionVerification, deliveryFallback: delivery.fallback, deliveryAttempts: delivery.fallback ? 2 : 1 });
   }
@@ -11627,7 +11698,12 @@ async function reconcileClickUpStartup({ config, state = {}, worktree = process.
       const directory = String(getNestedMetadataValue(metadata, "task.worktree") || "").trim();
       if (sessionId) {
         try {
-          const activity = await inspectOpenCodeSessionActivity(openCodeClient, { sessionId, directory });
+          const activity = await inspectOpenCodeSessionActivity(openCodeClient, {
+            sessionId,
+            directory,
+            now,
+            runningGraceMs: config.opencode.assignmentWatchdogRunningGraceMs
+          });
           appendClickUpWebhookLocalLog(worktree, { type: "assignment_watchdog_session_activity", taskId, sessionId, directory: directory || null, ...activity });
           if (activity.running) {
             routed.ignored += 1;

package/package.json

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