@defend-tech/opencode-optima 0.1.69 → 0.1.70

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: {
@@ -10771,6 +10776,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 +10852,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 +10883,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 } = {}) {
@@ -11620,7 +11681,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: {
@@ -10778,6 +10783,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 +10859,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 +10890,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 } = {}) {
@@ -11627,7 +11688,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.70",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/defend-tech/opencode-optima.git"