@triflux/remote 10.41.1 → 10.43.0

package/hub/store.mjs

@@ -5,6 +5,7 @@ import { mkdirSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { clampDurationMs, DEFAULT_ASSIGN_TIMEOUT_MS, DEFAULT_ASSIGN_TTL_MS } from "@triflux/core/hub/lib/timeout-defaults.mjs";
 import { uuidv7 } from "@triflux/core/hub/lib/uuidv7.mjs";
 import { recalcConfidence } from "@triflux/core/hub/reflexion.mjs";
 
@@ -111,7 +112,7 @@ export function createStore(dbPath, options = {}) {
   db.exec(
     "CREATE TABLE IF NOT EXISTS _meta (key TEXT PRIMARY KEY, value TEXT)",
   );
-  const SCHEMA_VERSION = "4";
+  const SCHEMA_VERSION = "5";
   const curVer = (() => {
     try {
       return db
@@ -143,6 +144,7 @@ export function createStore(dbPath, options = {}) {
     "type",
     "TEXT NOT NULL DEFAULT 'reflexion'",
   );
+  ensureColumn(db, "assign_jobs", "dispatched_at_ms", "INTEGER");
   ensureColumn(
     db,
     "reflexion_entries",
@@ -233,12 +235,12 @@ export function createStore(dbPath, options = {}) {
         job_id, supervisor_agent, worker_agent, topic, task, payload_json,
         status, attempt, retry_count, max_retries, priority, ttl_ms, timeout_ms, deadline_ms,
         trace_id, correlation_id, last_message_id, result_json, error_json,
-        created_at_ms, updated_at_ms, started_at_ms, completed_at_ms, last_retry_at_ms
+        created_at_ms, updated_at_ms, started_at_ms, dispatched_at_ms, completed_at_ms, last_retry_at_ms
       ) VALUES (
         @job_id, @supervisor_agent, @worker_agent, @topic, @task, @payload_json,
         @status, @attempt, @retry_count, @max_retries, @priority, @ttl_ms, @timeout_ms, @deadline_ms,
         @trace_id, @correlation_id, @last_message_id, @result_json, @error_json,
-        @created_at_ms, @updated_at_ms, @started_at_ms, @completed_at_ms, @last_retry_at_ms
+        @created_at_ms, @updated_at_ms, @started_at_ms, @dispatched_at_ms, @completed_at_ms, @last_retry_at_ms
       )`),
     getAssign: db.prepare("SELECT * FROM assign_jobs WHERE job_id = ?"),
     updateAssign: db.prepare(`
@@ -263,6 +265,7 @@ export function createStore(dbPath, options = {}) {
         error_json=@error_json,
         updated_at_ms=@updated_at_ms,
         started_at_ms=@started_at_ms,
+        dispatched_at_ms=@dispatched_at_ms,
         completed_at_ms=@completed_at_ms,
         last_retry_at_ms=@last_retry_at_ms
       WHERE job_id=@job_id`),
@@ -356,12 +359,6 @@ export function createStore(dbPath, options = {}) {
     return Math.max(1, Math.min(Math.trunc(num), 9));
   }
 
-  function clampDuration(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));
-  }
-
   const store = {
     db,
     uuidv7,
@@ -381,7 +378,8 @@ export function createStore(dbPath, options = {}) {
     }) {
       const now = Date.now();
       const leaseExpires = now + heartbeat_ttl_ms;
-      S.upsertAgent.run({
+      const leaseId = uuidv7();
+      const write = S.upsertAgent.run({
         agent_id,
         cli,
         pid: pid ?? null,
@@ -392,11 +390,23 @@ export function createStore(dbPath, options = {}) {
         status: "online",
         metadata_json: JSON.stringify(metadata),
       });
+      const persisted = parseAgentRow(S.getAgent.get(agent_id));
       return {
         agent_id,
-        lease_id: uuidv7(),
+        lease_id: leaseId,
         lease_expires_ms: leaseExpires,
         server_time_ms: now,
+        effective: {
+          updated: write.changes > 0,
+          online:
+            persisted?.status === "online" &&
+            Number(persisted.lease_expires_ms) === leaseExpires,
+          status: persisted?.status ?? null,
+          last_seen_ms: persisted?.last_seen_ms ?? null,
+          lease_expires_ms: persisted?.lease_expires_ms ?? null,
+          store_type: "sqlite",
+          db_path: dbPath ?? null,
+        },
       };
     },
 
@@ -406,11 +416,12 @@ export function createStore(dbPath, options = {}) {
 
     refreshLease(agentId, ttlMs = 30000) {
       const now = Date.now();
-      S.heartbeat.run(now, now + ttlMs, agentId);
+      const write = S.heartbeat.run(now, now + ttlMs, agentId);
       return {
         agent_id: agentId,
         lease_expires_ms: now + ttlMs,
         server_time_ms: now,
+        effective: { updated: write.changes > 0, store_type: "sqlite", db_path: dbPath ?? null },
       };
     },
 
@@ -616,9 +627,10 @@ export function createStore(dbPath, options = {}) {
       retry_count = 0,
       max_retries = 0,
       priority = 5,
-      ttl_ms = 600000,
-      timeout_ms = 600000,
+      ttl_ms = DEFAULT_ASSIGN_TTL_MS,
+      timeout_ms = DEFAULT_ASSIGN_TIMEOUT_MS,
       deadline_ms,
+      dispatched_at_ms = null,
       trace_id,
       correlation_id,
       last_message_id = null,
@@ -626,7 +638,7 @@ export function createStore(dbPath, options = {}) {
       error = null,
     }) {
       const now = Date.now();
-      const normalizedTimeout = clampDuration(timeout_ms, 600000);
+      const normalizedTimeout = clampDurationMs(timeout_ms, DEFAULT_ASSIGN_TIMEOUT_MS);
       const row = {
         job_id: job_id || uuidv7(),
         supervisor_agent,
@@ -639,7 +651,7 @@ export function createStore(dbPath, options = {}) {
         retry_count: Math.max(0, Number(retry_count) || 0),
         max_retries: Math.max(0, Number(max_retries) || 0),
         priority: clampPriority(priority, 5),
-        ttl_ms: clampDuration(ttl_ms, normalizedTimeout),
+        ttl_ms: clampDurationMs(ttl_ms, normalizedTimeout),
         timeout_ms: normalizedTimeout,
         deadline_ms: Number.isFinite(Number(deadline_ms))
           ? Math.trunc(Number(deadline_ms))
@@ -652,6 +664,10 @@ export function createStore(dbPath, options = {}) {
         created_at_ms: now,
         updated_at_ms: now,
         started_at_ms: status === "running" ? now : null,
+        dispatched_at_ms:
+          dispatched_at_ms == null || !Number.isFinite(Number(dispatched_at_ms))
+            ? null
+            : Math.trunc(Number(dispatched_at_ms)),
         completed_at_ms: ["succeeded", "failed", "timed_out"].includes(status)
           ? now
           : null,
@@ -676,7 +692,7 @@ export function createStore(dbPath, options = {}) {
       const isTerminal = ["succeeded", "failed", "timed_out"].includes(
         nextStatus,
       );
-      const nextTimeout = clampDuration(
+      const nextTimeout = clampDurationMs(
         patch.timeout_ms ?? current.timeout_ms,
         current.timeout_ms,
       );
@@ -704,7 +720,7 @@ export function createStore(dbPath, options = {}) {
           patch.priority ?? current.priority,
           current.priority || 5,
         ),
-        ttl_ms: clampDuration(
+        ttl_ms: clampDurationMs(
           patch.ttl_ms ?? current.ttl_ms,
           current.ttl_ms || nextTimeout,
         ),
@@ -745,6 +761,7 @@ export function createStore(dbPath, options = {}) {
           : nextStatus === "running"
             ? current.started_at_ms || now
             : current.started_at_ms,
+        dispatched_at_ms: Object.hasOwn(patch, "dispatched_at_ms") ? patch.dispatched_at_ms : current.dispatched_at_ms,
         completed_at_ms: Object.hasOwn(patch, "completed_at_ms")
           ? patch.completed_at_ms
           : isTerminal
@@ -836,7 +853,7 @@ export function createStore(dbPath, options = {}) {
         current.attempt + 1,
         Number(patch.attempt ?? current.attempt + 1) || 1,
       );
-      const nextTimeout = clampDuration(
+      const nextTimeout = clampDurationMs(
         patch.timeout_ms ?? current.timeout_ms,
         current.timeout_ms,
       );
@@ -848,6 +865,7 @@ export function createStore(dbPath, options = {}) {
         deadline_ms: Date.now() + nextTimeout,
         completed_at_ms: null,
         started_at_ms: null,
+        dispatched_at_ms: null,
         last_retry_at_ms: Date.now(),
         result: patch.result ?? null,
         error: Object.hasOwn(patch, "error") ? patch.error : current.error,

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

@@ -464,25 +464,46 @@ 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 } = {},
 ) {
-  try {
-    const key = await fs.readFile(
-      path.join(configDir, "daemon", "control.key"),
-      "utf8",
-    );
-    return key.trim() || undefined;
-  } catch {
-    return undefined;
+  if (!configDir) return undefined;
+
+  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;
 }
 
-export async function buildDaemonControlAuth(configDir) {
+export async function buildDaemonControlAuth(configDir, opts = {}) {
   if (!configDir) return {};
-  const auth = await readDaemonControlKey(configDir);
+  const auth = await readDaemonControlKey(configDir, opts);
   return auth ? { auth } : {};
 }
 

package/hub/team/cli/commands/start/parse-args.mjs

@@ -74,7 +74,7 @@ export function parseTeamArgs(args = []) {
   const assigns = []; // --assign "codex:프롬프트:역할" 형식
   let autoAttach = true;
   let progressive = true;
-  let timeoutSec = 300;
+  let timeoutSec = 0;
   let verbose = false;
   let dashboard = true;
   let dashboardLayout = "lite";
@@ -130,7 +130,7 @@ export function parseTeamArgs(args = []) {
     } else if (current === "--no-progressive") {
       progressive = false;
     } else if (current === "--timeout" && args[index + 1]) {
-      timeoutSec = Number(args[++index]) || 300;
+      timeoutSec = Number(args[++index]) || 0;
     } else if (current === "--mcp-profile" && args[index + 1]) {
       mcpProfile = args[++index].trim();
     } else if ((current === "--model" || current === "-m") && args[index + 1]) {