@triflux/remote 10.33.1 → 10.35.0

package/cto/status.mjs

@@ -29,7 +29,61 @@ function toIsoTime(value) {
   return null;
 }
 
+function shortHash(value) {
+  const str = String(value ?? "");
+  let h = 5381;
+  for (let i = 0; i < str.length; i++) {
+    h = (h * 33) ^ str.charCodeAt(i);
+  }
+  return (h >>> 0).toString(36);
+}
+
+function pathLabel(value) {
+  const str = String(value ?? "").replace(/[/\\]+$/u, "");
+  if (!str) return "";
+  const segments = str.split(/[/\\]+/u);
+  return segments[segments.length - 1] || "";
+}
+
+export function deriveRepoRootFromCwd(cwd) {
+  if (typeof cwd !== "string" || !cwd) return "";
+  if (cwd.includes("\\") || /^[A-Za-z]:/u.test(cwd)) return cwd;
+
+  const normalized = cwd.replace(/\/+$/u, "");
+  const claudeMarker = "/.claude/worktrees/";
+  const claudeIndex = normalized.indexOf(claudeMarker);
+  if (claudeIndex > 0) {
+    const suffix = normalized.slice(claudeIndex + claudeMarker.length);
+    if (/^[^/]+(?:\/|$)/u.test(suffix)) {
+      return normalized.slice(0, claudeIndex);
+    }
+  }
+
+  const codexMarker = "/.codex-swarm/";
+  const codexIndex = normalized.indexOf(codexMarker);
+  if (codexIndex > 0) {
+    const suffix = normalized.slice(codexIndex + codexMarker.length);
+    if (/^wt-[^/]+(?:\/|$)/u.test(suffix)) {
+      return normalized.slice(0, codexIndex);
+    }
+  }
+
+  return cwd;
+}
+
+function redactedCwdFields(cwd) {
+  if (typeof cwd !== "string" || !cwd) return {};
+  const repoRoot = deriveRepoRootFromCwd(cwd);
+  return {
+    cwdLabel: pathLabel(cwd),
+    cwdHash: shortHash(cwd),
+    repoRootLabel: pathLabel(repoRoot),
+    repoRootHash: shortHash(repoRoot),
+  };
+}
+
 function normalizeLiveSession(session) {
+  const cwd = typeof session?.cwd === "string" ? session.cwd : "";
   return {
     sessionId: String(session?.sessionId || ""),
     host: typeof session?.host === "string" ? session.host : "local",
@@ -48,6 +102,7 @@ function normalizeLiveSession(session) {
     started_at: toIsoTime(
       session?.started_at ?? session?.startedAt ?? session?.lastHeartbeat,
     ),
+    ...redactedCwdFields(cwd),
   };
 }
 
@@ -164,7 +219,27 @@ function deriveActiveShards(current, overlay) {
   return shards.map(normalizeActiveShard).filter((shard) => shard.shard_name);
 }
 
+function deriveLiveSessionGroups(liveSessions) {
+  const groups = new Map();
+  for (const session of liveSessions || []) {
+    if (!session?.repoRootHash) continue;
+    if (!groups.has(session.repoRootHash)) {
+      groups.set(session.repoRootHash, {
+        repoRootLabel: session.repoRootLabel || "",
+        repoRootHash: session.repoRootHash,
+        session_count: 0,
+        sessions: [],
+      });
+    }
+    const group = groups.get(session.repoRootHash);
+    group.session_count += 1;
+    group.sessions.push(session.sessionId);
+  }
+  return [...groups.values()];
+}
+
 function projectStatus(current, overlay) {
+  const liveSessions = overlay.live_sessions;
   return {
     schema_version: current?.schema_version || SCHEMA_VERSION,
     generated_at: current?.generated_at || null,
@@ -172,7 +247,8 @@ function projectStatus(current, overlay) {
     sources: current?.sources || {},
     summary: current?.summary || {},
     ledger_tail: Array.isArray(current?.ledger_tail) ? current.ledger_tail : [],
-    live_sessions: overlay.live_sessions,
+    live_sessions: liveSessions,
+    live_session_groups: deriveLiveSessionGroups(liveSessions),
     active_shards: deriveActiveShards(current, overlay),
   };
 }

package/hub/hub-lifecycle.mjs

@@ -15,15 +15,21 @@ const EPHEMERAL_ENV_KEYS = [
   "TFX_TEAM_AGENT_NAME",
   "TFX_EPHEMERAL",
 ];
+const WORKTREE_CWD_PATTERNS = [
+  /\/\.claude\/worktrees\//u,
+  /\/\.worktrees\//u,
+  /\/\.codex-swarm\/wt-[^/]+(?:\/|$)/u,
+  /(^|\/)wt-[^/]+(?:\/|$)/u,
+];
 
-function parsePositiveInt(value) {
+function parsePositivePort(value) {
   const parsed = Number.parseInt(String(value ?? ""), 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
 }
 
-function parsePortFromUrl(value) {
+function parsePortFromHubUrl(value) {
   try {
-    return parsePositiveInt(new URL(String(value)).port);
+    return parsePositivePort(new URL(String(value)).port);
   } catch {
     return null;
   }
@@ -40,12 +46,7 @@ export function isWorktreeOrEphemeralHubContext({
   env = process.env,
 } = {}) {
   const normalizedCwd = String(cwd || "").replace(/\\/g, "/");
-  if (
-    normalizedCwd.includes("/.claude/worktrees/") ||
-    normalizedCwd.includes("/.worktrees/") ||
-    normalizedCwd.includes("/.codex-swarm/wt-") ||
-    /(^|\/)wt-[^/]+(?:\/|$)/u.test(normalizedCwd)
-  ) {
+  if (WORKTREE_CWD_PATTERNS.some((pattern) => pattern.test(normalizedCwd))) {
     return true;
   }
   return EPHEMERAL_ENV_KEYS.some((key) => String(env?.[key] || "").length > 0);
@@ -57,11 +58,16 @@ export function resolveHubPortForContext({
   cwd = process.cwd(),
   defaultPort = HUB_DEFAULT_PORT,
 } = {}) {
-  const envPort = parsePositiveInt(port) ?? parsePositiveInt(env?.TFX_HUB_PORT);
-  const urlPort = parsePortFromUrl(env?.TFX_HUB_URL);
+  const envPort =
+    parsePositivePort(port) ?? parsePositivePort(env?.TFX_HUB_PORT);
+  const urlPort = parsePortFromHubUrl(env?.TFX_HUB_URL);
   const resolvedPort = envPort ?? urlPort ?? defaultPort;
   if (
     resolvedPort !== defaultPort &&
+    // Test-only opt-in seam: TFX_HUB_ALLOW_EPHEMERAL_PORT=1 lets an ephemeral
+    // context (worktree cwd / TFX_TEAM_* env) honor the resolved port instead
+    // of clamping to the canonical default. Default-off — production unchanged.
+    String(env?.TFX_HUB_ALLOW_EPHEMERAL_PORT ?? "") !== "1" &&
     isWorktreeOrEphemeralHubContext({ cwd, env })
   ) {
     return defaultPort;
@@ -181,7 +187,7 @@ export async function reapExistingHubProcesses({
     typeof readPidFileFn === "function"
       ? readPidFileFn()
       : { pid: readPidFilePid({ pidFilePath }) };
-  const pidFilePid = parsePositiveInt(pidFileInfo?.pid);
+  const pidFilePid = parsePositivePort(pidFileInfo?.pid);
   const defaultPortPids = [
     ...new Set(
       (typeof findListeningPidsForPortFn === "function"

package/hub/server.mjs

@@ -246,7 +246,9 @@ async function parseBody(req) {
   return JSON.parse(Buffer.concat(chunks).toString());
 }
 
-const PID_DIR = join(homedir(), ".claude", "cache", "tfx-hub");
+const PID_DIR =
+  process.env.TFX_HUB_PID_DIR?.trim() ||
+  join(homedir(), ".claude", "cache", "tfx-hub");
 const PID_FILE = join(PID_DIR, "hub.pid");
 const TOKEN_FILE = join(homedir(), ".claude", ".tfx-hub-token");
 
@@ -1004,7 +1006,7 @@ export async function startHub({
     // DB를 npm 패키지 밖에 저장하여 npm update 시 EBUSY 방지
     // 기존: PROJECT_ROOT/.tfx/state/state.db (패키지 내부 → 락 충돌)
     // 변경: ~/.claude/cache/tfx-hub/state.db (패키지 외부 → 안전)
-    const hubCacheDir = join(homedir(), ".claude", "cache", "tfx-hub");
+    const hubCacheDir = PID_DIR;
     mkdirSync(hubCacheDir, { recursive: true });
     dbPath = join(hubCacheDir, "state.db");
   }
@@ -2461,6 +2463,7 @@ export async function startHub({
                   hubLog.warn(
                     {
                       failed: failed.length,
+                      failedCount: failed.length,
                       processes: failed,
                       caller: "startup",
                     },

package/hub/team/build-worker-prompt.mjs

@@ -22,10 +22,23 @@ function formatLeaseFiles(leaseFiles) {
   return normalized.map((file) => `- ${file}`).join("\n");
 }
 
-export function buildLeaseScopedAcceptanceAppendix({ leaseFiles = [] } = {}) {
+function normalizeWorktreePath(worktreePath) {
+  return typeof worktreePath === "string" ? worktreePath.trim() : "";
+}
+
+export function buildLeaseScopedAcceptanceAppendix({
+  leaseFiles = [],
+  worktreePath,
+} = {}) {
+  const normalizedWorktreePath = normalizeWorktreePath(worktreePath);
+  const rootLine = normalizedWorktreePath
+    ? `작업 루트(절대경로): ${normalizedWorktreePath} — 아래 lease 경로와 모든 상대경로는 이 루트 기준으로만 해석한다.\n`
+    : "";
+
   return `
 
 ## Lease-scoped Acceptance / Lint Guard (자동 삽입됨)
+${rootLine}- 위 PRD 본문의 모든 제약과 acceptance 기준은 이 appendix 이후에도 그대로 유효하다.
 - 이 shard 의 파일 lease:
 ${formatLeaseFiles(leaseFiles)}
 - Acceptance, lint, and format checks are scoped to files changed by this shard; if that set is unclear, use only the lease list above.
@@ -51,7 +64,10 @@ ${SENTINEL_END}
 규약:
 - 두 sentinel 마커는 각자 자기 줄에 단독으로 출력 (앞뒤 newline)
 - 마커 사이 본문은 단일 JSON object (배열/primitive 금지)
-- commits_made 가 비어 있어도 됨 (no-op shard)
+- status 값은 ok | failed | blocked 중 하나
+- payload 출력 직전 \`git log -1 --format=%H\` 로 보고할 sha 가 실재하는지 검증하라
+- 코드 변경이 기대되는 shard 에서 변경/커밋을 못 했으면 status:failed 와 함께 reason 필드로 사유를 보고하라 — 그 경우 빈 commits_made 에 status:ok 는 금지
+- no-op shard 는 status:ok + 빈 commits_made 배열 허용
 - 마커 쌍은 stdout 에 정확히 한 번만 출력해야 함. 재emit 시 conductor 는 첫 BEGIN..END 한 쌍만 채택하며, 이후 stdout 은 무시한다.
 - ${SENTINEL_BEGIN} 만 출력하고 ${SENTINEL_END} 누락 시 conductor 가 truncation 으로 명확히 reject
 `;
@@ -60,14 +76,17 @@ ${SENTINEL_END}
  * Append the Completion Protocol section to a PRD prompt.
  *
  * @param {string|null|undefined} prdPrompt — original PRD body
- * @param {{ leaseFiles?: string[] }} [opts] — shard file lease for scoped acceptance
+ * @param {{ leaseFiles?: string[], worktreePath?: string }} [opts] — shard file lease and absolute worktree root for scoped acceptance
  * @returns {string} prompt with appendix
  */
 export function buildWorkerPrompt(prdPrompt, opts = {}) {
   const body = typeof prdPrompt === "string" ? prdPrompt : "";
   return (
     body +
-    buildLeaseScopedAcceptanceAppendix({ leaseFiles: opts.leaseFiles }) +
+    buildLeaseScopedAcceptanceAppendix({
+      leaseFiles: opts.leaseFiles,
+      worktreePath: opts.worktreePath,
+    }) +
     COMPLETION_PROTOCOL_APPENDIX
   );
 }