@triflux/core 10.42.0 → 10.43.0

package/hub/router.mjs

@@ -1,6 +1,13 @@
 // hub/router.mjs — 실시간 라우팅/수신함 상태 관리자
 // SQLite는 감사 로그만 담당하고, 실제 배달 상태는 메모리에서 관리한다.
 import { EventEmitter, once } from "node:events";
+import {
+  clampDurationMs,
+  DEFAULT_ASSIGN_TIMEOUT_MS,
+  DEFAULT_ASSIGN_TTL_MS,
+  DEFAULT_HANDOFF_TTL_MS,
+  resolveHardCeilingMs,
+} from "./lib/timeout-defaults.mjs";
 import { uuidv7 } from "./lib/uuidv7.mjs";
 
 const ASSIGN_PENDING_STATUSES = new Set(["queued", "running"]);
@@ -49,17 +56,6 @@ function rolePriority(metadata = {}, roleName = "") {
   return 0;
 }
 
-function clampAssignDuration(
-  value,
-  fallback = 600000,
-  min = 1000,
-  max = 86400000,
-) {
-  const num = Number(value);
-  if (!Number.isFinite(num)) return fallback;
-  return Math.max(min, Math.min(Math.trunc(num), max));
-}
-
 function normalizeAssignTerminalStatus(input, metadata = {}) {
   const status = String(input || "")
     .trim()
@@ -606,11 +602,31 @@ export function createRouter(store) {
       record.message.status = "delivered";
       store.updateMessageStatus(messageId, "delivered");
       recordLatency(delivery.delivered_at_ms - record.message.created_at_ms);
+      rearmAssignDeadlineOnDispatch(record.message, delivery.delivered_at_ms);
       return true;
     }
     return false;
   }
 
+  function rearmAssignDeadlineOnDispatch(message, deliveredAtMs) {
+    if (message?.payload?.kind !== "assign.job") return;
+    const jobId = message.payload.assign_job_id;
+    if (!jobId) return;
+    const job = store.getAssign(jobId);
+    if (
+      !job ||
+      !ASSIGN_PENDING_STATUSES.has(job.status) ||
+      job.dispatched_at_ms
+    )
+      return;
+    if (Number(message.payload.attempt) !== job.attempt) return;
+    store.updateAssignStatus(job.job_id, job.status, {
+      dispatched_at_ms: deliveredAtMs,
+      deadline_ms:
+        deliveredAtMs + clampDurationMs(job.timeout_ms, job.timeout_ms),
+    });
+  }
+
   function ackMessages(ids, agentId) {
     const now = Date.now();
     let count = 0;
@@ -706,7 +722,7 @@ export function createRouter(store) {
       to: job.supervisor_agent,
       topic: "assign.result",
       priority: Math.max(5, job.priority || 5),
-      ttl_ms: job.ttl_ms || job.timeout_ms || 600000,
+      ttl_ms: job.ttl_ms || job.timeout_ms || DEFAULT_ASSIGN_TTL_MS,
       payload: {
         event,
         ...buildAssignSnapshot(job),
@@ -725,7 +741,7 @@ export function createRouter(store) {
       to: job.worker_agent,
       topic: job.topic || "assign.job",
       priority: job.priority || 5,
-      ttl_ms: job.ttl_ms || job.timeout_ms || 600000,
+      ttl_ms: job.ttl_ms || job.timeout_ms || DEFAULT_ASSIGN_TTL_MS,
       payload: {
         kind: "assign.job",
         reason,
@@ -797,6 +813,24 @@ export function createRouter(store) {
     const timedOut = store.updateAssignStatus(job.job_id, "timed_out", {
       error: job.error ?? { message: "assign job timed out" },
     });
+    if (timedOut?.worker_agent) {
+      dispatchMessage({
+        type: "event",
+        from: "assign-router",
+        to: timedOut.worker_agent,
+        topic: "assign.cancel",
+        priority: 8,
+        ttl_ms: clampDurationMs(timedOut.ttl_ms, DEFAULT_ASSIGN_TTL_MS),
+        payload: {
+          kind: "assign.cancel",
+          assign_job_id: timedOut.job_id,
+          attempt: timedOut.attempt,
+          reason: "timed_out",
+        },
+        trace_id: timedOut.trace_id,
+        correlation_id: timedOut.correlation_id,
+      });
+    }
 
     if (timedOut.retry_count < timedOut.max_retries) {
       return scheduleAssignRetry(
@@ -1146,7 +1180,7 @@ export function createRouter(store) {
       acceptance_criteria,
       context_refs,
       priority = 5,
-      ttl_ms = 600000,
+      ttl_ms = DEFAULT_HANDOFF_TTL_MS,
       trace_id,
       correlation_id,
     }) {
@@ -1174,8 +1208,8 @@ export function createRouter(store) {
       task = "",
       payload = {},
       priority = 5,
-      ttl_ms = 600000,
-      timeout_ms = 600000,
+      ttl_ms = DEFAULT_ASSIGN_TTL_MS,
+      timeout_ms = DEFAULT_ASSIGN_TIMEOUT_MS,
       max_retries = 0,
       trace_id,
       correlation_id,
@@ -1232,16 +1266,6 @@ export function createRouter(store) {
           },
         };
       }
-      if (Number.isFinite(Number(attempt)) && Number(attempt) !== job.attempt) {
-        return {
-          ok: false,
-          error: {
-            code: "ASSIGN_ATTEMPT_MISMATCH",
-            message: `stale assign result for attempt ${attempt} (current ${job.attempt})`,
-          },
-        };
-      }
-
       const mergedMetadata = {
         ...(payload?.metadata || {}),
         ...(metadata || {}),
@@ -1255,11 +1279,37 @@ export function createRouter(store) {
         (Object.hasOwn(payload || {}, "result") ? payload.result : payload);
       const nextError = error ?? payload?.error ?? null;
 
+      if (Number.isFinite(Number(attempt)) && Number(attempt) !== job.attempt) {
+        const preserved = notifyAssignSupervisor(job, "late_result", {
+          stale_attempt: Number(attempt),
+          late_status: normalizedStatus,
+          late_result: nextResult,
+          late_error: nextError,
+          reported_by: worker_agent || job.worker_agent,
+        });
+        return {
+          ok: false,
+          error: {
+            code: "ASSIGN_ATTEMPT_MISMATCH",
+            message: `stale assign result for attempt ${attempt} (current ${job.attempt})`,
+            details: {
+              preserved: Boolean(preserved),
+              preserved_message_id: preserved?.id ?? null,
+            },
+          },
+        };
+      }
+
       if (normalizedStatus === "running") {
+        const nowMs = Date.now();
+        const ceilingAtMs =
+          (job.dispatched_at_ms || job.created_at_ms) + resolveHardCeilingMs();
         const running = store.updateAssignStatus(job.job_id, "running", {
-          started_at_ms: job.started_at_ms || Date.now(),
-          deadline_ms:
-            Date.now() + clampAssignDuration(job.timeout_ms, job.timeout_ms),
+          started_at_ms: job.started_at_ms || nowMs,
+          deadline_ms: Math.min(
+            nowMs + clampDurationMs(job.timeout_ms, job.timeout_ms),
+            ceilingAtMs,
+          ),
           result: nextResult,
           error: nextError,
         });
@@ -1328,12 +1378,44 @@ export function createRouter(store) {
     sweepExpired() {
       const now = Date.now();
       let expired = 0;
+      const deadLettered = [];
       for (const [messageId, record] of Array.from(liveMessages.entries())) {
         if (record.message.expires_at_ms > now) continue;
         store.moveToDeadLetter(messageId, "ttl_expired", null);
+        deadLettered.push(record.message);
         removeMessage(messageId);
         expired += 1;
       }
+      for (const message of deadLettered) {
+        if (
+          !["handoff", "request"].includes(message.type) ||
+          message.payload?.kind === "assign.job"
+        )
+          continue;
+        if (
+          !message.from_agent ||
+          String(message.from_agent).startsWith("topic:")
+        )
+          continue;
+        dispatchMessage({
+          type: "event",
+          from: "hub-sweeper",
+          to: message.from_agent,
+          topic: "handoff.dead_letter",
+          priority: 7,
+          ttl_ms: 300000,
+          payload: {
+            kind: "handoff.dead_letter",
+            message_id: message.id,
+            original_topic: message.topic,
+            original_to: message.to_agent,
+            reason: "ttl_expired",
+            task: message.payload?.task ?? null,
+          },
+          trace_id: message.trace_id,
+          correlation_id: message.correlation_id,
+        });
+      }
       return { messages: expired };
     },
 

package/hub/team/claude-daemon-control.mjs

@@ -464,28 +464,41 @@ export function sendClaudeControlRequest(
 
 // claude daemon 은 control.sock 의 mutating op(dispatch 등)에 control-key
 // 인증을 강제한다 (미제시 시 EAUTH "didn't present the daemon control key").
-// key 는 <configDir>/daemon/control.key (configDir 스코프별). 파일이 없으면
-// 인증 미강제 daemon 으로 보고 auth 필드를 생략한다 (fail-open — 구버전 호환).
+// OMC runtime config 는 .omc-launch-profile.json 의 sourceConfigDir 에서 key 를
+// 발급한다. control.sock 은 runtime config hash 를 쓰더라도 auth 는 발급 config
+// 에서 읽어야 한다. 일반 daemon 은 <configDir>/daemon/control.key 를 사용한다.
+// 어느 경로에도 파일이 없으면 인증 미강제 daemon 으로 보고 auth 를 생략한다
+// (fail-open — 구버전 호환).
 export async function readDaemonControlKey(
   configDir = resolveClaudeConfigDir(),
   { diagnostics } = {},
 ) {
   if (!configDir) return undefined;
-  const keyPath = path.join(configDir, "daemon", "control.key");
-  try {
-    const key = await fs.readFile(keyPath, "utf8");
-    return key.trim() || undefined;
-  } catch (error) {
-    if (error?.code === "ENOENT") return undefined;
-    if (Array.isArray(diagnostics)) {
-      diagnostics.push({
-        code: error?.code || "UNKNOWN",
-        path: keyPath,
-        message: error?.message || String(error),
-      });
+
+  const runtimeConfigDir = path.resolve(configDir);
+  const omcProfile = await readOmcLaunchProfile(runtimeConfigDir);
+  const keyConfigDirs = [omcProfile?.sourceConfigDir, runtimeConfigDir].filter(
+    (candidate, index, entries) =>
+      candidate && entries.indexOf(candidate) === index,
+  );
+
+  for (const keyConfigDir of keyConfigDirs) {
+    const keyPath = path.join(keyConfigDir, "daemon", "control.key");
+    try {
+      const key = await fs.readFile(keyPath, "utf8");
+      if (key.trim()) return key.trim();
+    } catch (error) {
+      if (error?.code === "ENOENT") continue;
+      if (Array.isArray(diagnostics)) {
+        diagnostics.push({
+          code: error?.code || "UNKNOWN",
+          path: keyPath,
+          message: error?.message || String(error),
+        });
+      }
     }
-    return undefined;
   }
+  return undefined;
 }
 
 export async function buildDaemonControlAuth(configDir, opts = {}) {