triflux 10.45.0 → 10.47.0

package/hud/providers/codex.mjs

@@ -38,6 +38,8 @@ export function classifyBucket(bucket) {
 
 // primary/secondary를 window_minutes 기준으로 정규화
 // HUD 규약: primary=5h, secondary=1w
+// window_minutes 가 비어 있으면 길이를 모르므로 보고된 칸에 둔다(app-server 스키마에서
+// windowDurationMins 는 선택 필드). 길이를 알지만 5h/1w 가 아닌 버킷은 버린다.
 export function normalizeBuckets(rl) {
   let primary = null;
   let secondary = null;
@@ -46,6 +48,12 @@ export function normalizeBuckets(rl) {
     if (kind === "five_hour") primary = bucket;
     else if (kind === "weekly") secondary = bucket;
   }
+  if (!primary && rl.primary && rl.primary.window_minutes == null) {
+    primary = rl.primary;
+  }
+  if (!secondary && rl.secondary && rl.secondary.window_minutes == null) {
+    secondary = rl.secondary;
+  }
   return { primary, secondary };
 }
 
@@ -104,7 +112,35 @@ function isNewerSnapshot(candidate, current) {
   );
 }
 
-function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
+function positiveWindowMinutes(bucket) {
+  const minutes = Number(bucket?.window_minutes);
+  return minutes > 0 ? minutes : null;
+}
+
+// 계정 하나에는 같은 종류의 창이 한 번에 하나만 열린다. 브로커 계정이 없으면
+// ~/.codex/sessions 와 HUD 라벨이 모두 ~/.codex/auth.json 계정 하나의 것이다. 그래서
+// 세션 로그에 더 늦게 리셋되는 창이 나타났고 옛 창이 그 창이 열리기 전에만 관측됐다면,
+// 옛 창은 조기 리셋(2026-09-23 실측)이나 계정 전환으로 끝난 창이다. 프로브로만 본 창은
+// 다른 계정일 수 있어 근거로 쓰지 않는다. 새 창이 열린 뒤에도 관측된 창은 함께 도는
+// 계정이므로 max-used 후보로 남긴다.
+function isReplacedWindowGroup(group, other) {
+  if (other === group || !other.seenInSessions) return false;
+  if (other.minResetAt <= group.maxResetAt || !other.windowMinutes) {
+    return false;
+  }
+  const lastSeenMs = Date.parse(group.latest.timestamp);
+  if (!Number.isFinite(lastSeenMs)) return false;
+  // resets_at 은 실측으로 아래로 약 30초, 위로 1초 흔들리므로 가장 늦은 값으로 개시 시각을 잡는다.
+  const otherOpenedAtMs = (other.maxResetAt - other.windowMinutes * 60) * 1000;
+  return lastSeenMs <= otherOpenedAtMs;
+}
+
+function selectCodexWindowSnapshot(
+  snapshots,
+  nowSec,
+  windowKey,
+  replaceEndedWindows,
+) {
   const groups = [];
   const ungrouped = [];
 
@@ -126,19 +162,29 @@ function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
         minResetAt: resetAt,
         maxResetAt: resetAt,
         latest: snapshot,
+        seenInSessions: !snapshot.probe,
+        windowMinutes: positiveWindowMinutes(snapshot[windowKey]),
       };
       groups.push(group);
       continue;
     }
 
+    if (!snapshot.probe) group.seenInSessions = true;
+    group.windowMinutes ??= positiveWindowMinutes(snapshot[windowKey]);
     group.minResetAt = Math.min(group.minResetAt, resetAt);
     group.maxResetAt = Math.max(group.maxResetAt, resetAt);
     if (isNewerSnapshot(snapshot, group.latest)) group.latest = snapshot;
   }
 
-  const activeGroups = groups.filter(
+  const openGroups = groups.filter(
     (group) => Number(group.latest[windowKey]?.resets_at) > nowSec,
   );
+  const activeGroups = replaceEndedWindows
+    ? openGroups.filter(
+        (group) =>
+          !openGroups.some((other) => isReplacedWindowGroup(group, other)),
+      )
+    : openGroups;
   let selected = null;
   if (activeGroups.length > 0) {
     selected = activeGroups
@@ -168,16 +214,18 @@ function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
   return { snapshot: selected, activeGroupCount: activeGroups.length };
 }
 
-function selectCodexSnapshot(snapshots, nowSec) {
+function selectCodexSnapshot(snapshots, nowSec, replaceEndedWindows) {
   const primarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "primary",
+    replaceEndedWindows,
   );
   const secondarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "secondary",
+    replaceEndedWindows,
   );
   const primarySnapshot = primarySelection.snapshot;
   if (!primarySnapshot) return null;
@@ -198,7 +246,7 @@ function selectCodexSnapshot(snapshots, nowSec) {
   return selected;
 }
 
-function mergeRateLimitSnapshots(snapshots, nowSec) {
+function mergeRateLimitSnapshots(snapshots, nowSec, replaceEndedWindows) {
   const merged = {};
   const codexSnapshots = [];
   for (const snapshot of snapshots) {
@@ -211,7 +259,11 @@ function mergeRateLimitSnapshots(snapshots, nowSec) {
     }
   }
 
-  const codex = selectCodexSnapshot(codexSnapshots, nowSec);
+  const codex = selectCodexSnapshot(
+    codexSnapshots,
+    nowSec,
+    replaceEndedWindows,
+  );
   if (codex) merged.codex = codex;
   return merged;
 }
@@ -227,9 +279,16 @@ export function getCodexRateLimits({
   now = new Date(),
   maxLinesPerFile = 800,
   extraSnapshots = [],
+  // 교체된 창 판정(isReplacedWindowGroup). 브로커 Codex 계정이 있으면 끈다.
+  replaceEndedWindows = true,
 } = {}) {
   let syntheticBucket = null; // 최근 token_count에서 합성 (행 활성화 + 토큰 데이터용)
-  const recentSnapshots = [...extraSnapshots];
+  // 프로브도 세션 로그와 같은 window_minutes 기준으로 5h/1w 슬롯을 정한다.
+  // app-server 는 5h 창이 없으면 주간 창을 primary 로 보낸다(2026-09-23 실측).
+  const recentSnapshots = extraSnapshots.map((snapshot) => ({
+    ...snapshot,
+    ...normalizeBuckets(snapshot),
+  }));
   const nowSec = Math.floor(now.getTime() / 1000);
 
   // 7일간 스캔: 실제 rate_limits 우선, 합성 버킷은 폴백
@@ -313,7 +372,11 @@ export function getCodexRateLimits({
     }
 
     const snapshots = dayOffset <= 1 ? recentSnapshots : daySnapshots;
-    const mergedBuckets = mergeRateLimitSnapshots(snapshots, nowSec);
+    const mergedBuckets = mergeRateLimitSnapshots(
+      snapshots,
+      nowSec,
+      replaceEndedWindows,
+    );
     if (Object.keys(mergedBuckets).length > 0) {
       if (syntheticBucket) {
         const main =
@@ -369,10 +432,30 @@ export async function collectProbeSnapshots(now = new Date()) {
   );
 }
 
+// 브로커 계정은 자기 CODEX_HOME 에서 돌기 때문에, 옛 창이 전환 전 계정의 창이어도 그
+// 계정이 아직 쓰이고 있을 수 있다. accounts.json 의 codex 항목과 프로브용 인증 캐시로 판정한다.
+export function hasBrokerCodexAccounts({
+  brokerDir = CODEX_BROKER_AUTH_CACHE_DIR,
+} = {}) {
+  const accounts = readJson(join(brokerDir, "accounts.json"), null);
+  if (Array.isArray(accounts?.codex) && accounts.codex.length > 0) return true;
+  try {
+    return readdirSync(brokerDir).some((file) =>
+      /^codex-auth-.+\.json$/.test(file),
+    );
+  } catch {
+    return false;
+  }
+}
+
 export async function refreshCodexRateLimitsCache() {
   const now = new Date();
   const extraSnapshots = await collectProbeSnapshots(now);
-  const buckets = getCodexRateLimits({ now, extraSnapshots });
+  const buckets = getCodexRateLimits({
+    now,
+    extraSnapshots,
+    replaceEndedWindows: !hasBrokerCodexAccounts(),
+  });
   // buckets가 null이어도 캐시 갱신 (stale 데이터 제거)
   writeJsonSafe(CODEX_QUOTA_CACHE_PATH, { timestamp: Date.now(), buckets });
   return buckets;

package/hud/providers/cto.mjs

@@ -1,5 +1,6 @@
 import { readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { resolveRoleControlSnapshot } from "../../hub/lib/cto-env.mjs";
 import {
   CTO_LAKE_CURRENT_RELATIVE_PATH,
   CTO_STATUS_LINE_MAX_CHARS,
@@ -53,6 +54,8 @@ function extractStatusLine(lines) {
 }
 
 export function readCtoStatus(options = {}) {
+  if (!resolveRoleControlSnapshot(options.env).auto_collect_enabled)
+    return null;
   try {
     const currentPath = resolveCurrentPath(options);
     const stat = statSync(currentPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "10.45.0",
+  "version": "10.47.0",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Antigravity, and Claude",
   "type": "module",
   "bin": {

package/scripts/__tests__/release-governance.test.mjs

@@ -1,4 +1,5 @@
 import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
 import { mkdirSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -279,15 +280,15 @@ describe("release governance scripts", () => {
       releaseWorkflow,
       /TFX_MACHINE_PROFILE_PATH:\s*\$\{\{ runner\.temp \}\}\/triflux-release-ci-machine-profile\.env/,
     );
-    assert.match(releaseWorkflow, /publish\.mjs.*--skip-npm.*--allow-existing/);
-    assert.match(releaseWorkflow, /publish\.mjs.*--tag-only/);
+    assert.match(releaseWorkflow, /--skip-npm.*--allow-existing/);
+    assert.match(releaseWorkflow, /--tag-only/);
     assert.match(
       releaseWorkflow,
-      /gh workflow run npm-publish\.yml --ref \$\{\{ github\.ref_name \}\}/,
+      /gh workflow run npm-publish\.yml --ref "v\$RELEASE_VERSION"/,
     );
     assert.match(releaseWorkflow, /npm-publish\.yml/);
     assert.match(releaseWorkflow, /workflow_dispatch/);
-    assert.match(releaseWorkflow, /publish_ref="\$\{\{ github\.ref_name \}\}"/);
+    assert.match(releaseWorkflow, /publish_ref="v\$RELEASE_VERSION"/);
     assert.match(releaseWorkflow, /gh run list/);
     assert.doesNotMatch(
       releaseWorkflow,
@@ -299,26 +300,98 @@ describe("release governance scripts", () => {
       "utf8",
     );
     assert.match(npmPublishWorkflow, /npm view "\$name@\$version" version/);
-    assert.doesNotMatch(npmPublishWorkflow, /NODE_AUTH_TOKEN:\s*\$\{\{/);
+    assert.doesNotMatch(npmPublishWorkflow, /NPM_TOKEN|NODE_AUTH_TOKEN/);
+    assert.match(npmPublishWorkflow, /id-token:\s*write/);
+    assert.match(npmPublishWorkflow, /workflow_dispatch:\s+inputs:\s+npm_tag:/);
     assert.equal(
       (
         npmPublishWorkflow.match(
-          /NPM_TOKEN:\s*\$\{\{\s*secrets\.NPM_TOKEN\s*\}\}/g,
+          /npm publish --provenance --access public --tag "\$NPM_TAG"/g,
         ) || []
       ).length,
       3,
     );
-    assert.equal(
-      (npmPublishWorkflow.match(/export NODE_AUTH_TOKEN="\$NPM_TOKEN"/g) || [])
-        .length,
-      3,
-    );
     assert.equal(
       (npmPublishWorkflow.match(/already published; skipping/g) || []).length,
       3,
     );
   });
 
+  it("auto releases only successful main push CI from this repository", () => {
+    const workflow = readFileSync(
+      new URL("../../.github/workflows/release.yml", import.meta.url),
+      "utf8",
+    );
+    assert.match(
+      workflow,
+      /workflow_run:\s+workflows: \[ci\]\s+types: \[completed\]\s+branches: \[main\]/,
+    );
+    assert.match(workflow, /github\.event_name == 'workflow_dispatch'/);
+    assert.match(
+      workflow,
+      /github\.event\.workflow_run\.conclusion == 'success'/,
+    );
+    assert.match(workflow, /github\.event\.workflow_run\.event == 'push'/);
+    assert.match(
+      workflow,
+      /github\.event\.workflow_run\.head_repository\.full_name == github\.repository/,
+    );
+    assert.match(
+      workflow,
+      /concurrency:\s+group: release\s+cancel-in-progress: false/,
+    );
+    assert.match(workflow, /ref:.*workflow_run\.head_sha.*github\.sha/);
+    assert.doesNotMatch(workflow, /^concurrency:/m);
+    assert.match(workflow, /^ {2}resolve:/m);
+    assert.match(
+      workflow,
+      /^ {2}release:\n {4}needs: resolve\n {4}if: needs\.resolve\.outputs\.release == 'true'/m,
+    );
+    assert.match(workflow, /ref: \$\{\{ needs\.resolve\.outputs\.sha \}\}/);
+    for (const output of [
+      "release",
+      "version",
+      "channel",
+      "mode",
+      "npm_tag",
+      "sha",
+    ]) {
+      assert.ok(
+        workflow.includes(`${output}: \${{ steps.resolve.outputs.${output} }}`),
+      );
+    }
+    assert.match(
+      workflow,
+      /if \[\[ "\$RELEASE_MODE" == "auto" \]\]; then\s+args\+=\(--allow-ancestor\)/,
+    );
+    assert.match(workflow, /fetch-depth: 0/);
+    assert.match(workflow, /fetch-tags: true/);
+    assert.match(workflow, /id: resolve/);
+    assert.match(workflow, /resolve-auto-release\.mjs/);
+    assert.match(
+      workflow,
+      /if \[\[ "\$RELEASE_MODE" == "auto" \]\]; then\s+args\+=\(--skip-tests\)/,
+    );
+    assert.match(workflow, /git rev-parse "\$publish_ref\^\{commit\}"/);
+    assert.match(workflow, /\.headBranch == \$publish_ref/);
+    assert.match(workflow, /\.headSha == \$sha/);
+    assert.match(workflow, /id: dispatch/);
+    assert.doesNotMatch(workflow, /started_at|createdAt|-120 seconds/);
+    assert.match(workflow, /BASH_REMATCH\[1\]/);
+    assert.match(workflow, /gh run view "\$run_id" --json status,conclusion/);
+    assert.match(workflow, /previous_ids/);
+    assert.match(workflow, /index\(\$id\)/);
+    assert.match(workflow, /gh workflow run npm-publish\.yml.*-f npm_tag=/);
+    assert.match(
+      workflow,
+      /NPM_TAG: \$\{\{ needs\.resolve\.outputs\.npm_tag \}\}/,
+    );
+    assert.match(
+      workflow,
+      /verify\.mjs.*--npm-wait-seconds 900 --npm-pending-ok/,
+    );
+  });
+
   it("verify reports explicit npm package/version failures", async () => {
     const root = makeRepo();
     try {
@@ -507,3 +580,154 @@ describe("release governance scripts", () => {
     }
   });
 });
+
+function workflowStep(file, name) {
+  const workflow = readFileSync(
+    new URL(`../../.github/workflows/${file}`, import.meta.url),
+    "utf8",
+  );
+  const step = workflow
+    .split(`      - name: ${name}\n`)[1]
+    ?.split(/\n {6}- name: /)[0];
+  assert.ok(step, `missing workflow step: ${name}`);
+  const script = step.split("        run: |\n")[1];
+  assert.ok(script, `missing shell script: ${name}`);
+  return script.replace(/^ {10}/gm, "");
+}
+
+it("waits for the dispatched run ID and excludes previous runs in the URL-less fallback", () => {
+  const root = mkdtempSync(join(tmpdir(), "tfx-dispatch-"));
+  const output = join(root, "output");
+  const calls = join(root, "calls");
+  const fakeCommands = `
+    gh() {
+      printf '%s\\n' "$*" >> "$GH_CALLS"
+      case "$1 $2" in
+        'api --paginate') printf '41\\n' ;;
+        'workflow run') printf '%s\\n' "$DISPATCH_REPLY" ;;
+        'run list') printf '%s\\n' '[{"databaseId":41,"headBranch":"v1.2.3","headSha":"head"},{"databaseId":42,"headBranch":"v1.2.3","headSha":"head"},{"databaseId":43,"headBranch":"v1.2.3","headSha":"other"}]' ;;
+        'run view')
+          [[ "$3" == 42 ]] || return 91
+          [[ "$4" == --log-failed ]] && return 0
+          printf '{"status":"completed","conclusion":"%s"}\\n' "$CONCLUSION" ;;
+        *) return 92 ;;
+      esac
+    }
+    git() { printf 'head\\n'; }
+    sleep() { return 93; }
+  `;
+  try {
+    for (const [reply, conclusion, status] of [
+      ["Created https://github.com/test/repo/actions/runs/42", "success", 0],
+      ["", "success", 0],
+      ["Created https://github.com/test/repo/actions/runs/42", "failure", 1],
+    ]) {
+      rmSync(output, { force: true });
+      rmSync(calls, { force: true });
+      const env = {
+        ...process.env,
+        GITHUB_OUTPUT: output,
+        GH_CALLS: calls,
+        GITHUB_REPOSITORY: "test/repo",
+        RELEASE_VERSION: "1.2.3",
+        NPM_TAG: "canary",
+        DISPATCH_REPLY: reply,
+        CONCLUSION: conclusion,
+      };
+      const dispatch = spawnSync(
+        "bash",
+        [
+          "-e",
+          "-o",
+          "pipefail",
+          "-c",
+          fakeCommands + workflowStep("release.yml", "Dispatch npm publish"),
+        ],
+        { env, encoding: "utf8" },
+      );
+      assert.equal(dispatch.status, 0, dispatch.stderr);
+      const outputs = Object.fromEntries(
+        readFileSync(output, "utf8")
+          .trim()
+          .split("\n")
+          .map((line) => [
+            line.slice(0, line.indexOf("=")),
+            line.slice(line.indexOf("=") + 1),
+          ]),
+      );
+      assert.deepEqual(JSON.parse(outputs.previous_ids), [41]);
+      assert.equal(outputs.run_id || "", reply ? "42" : "");
+      const wait = spawnSync(
+        "bash",
+        [
+          "-e",
+          "-o",
+          "pipefail",
+          "-c",
+          fakeCommands + workflowStep("release.yml", "Wait for npm publish"),
+        ],
+        {
+          env: {
+            ...env,
+            DISPATCH_RUN_ID: outputs.run_id || "",
+            PREVIOUS_RUN_IDS: outputs.previous_ids,
+          },
+          encoding: "utf8",
+        },
+      );
+      assert.equal(wait.status, status, wait.stderr);
+      const log = readFileSync(calls, "utf8");
+      assert.match(
+        log,
+        /workflow run npm-publish.yml --ref v1.2.3 -f npm_tag=canary/,
+      );
+      assert.match(log, /run view 42 --json status,conclusion/);
+      assert.doesNotMatch(log, /run view 41/);
+      assert.equal(log.includes("run list"), !reply);
+      assert.equal(log.includes("--log-failed"), conclusion === "failure");
+    }
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+it("resolves npm tags for dispatch and tag pushes and rejects unknown tags", () => {
+  const root = mkdtempSync(join(tmpdir(), "tfx-npm-tag-"));
+  const output = join(root, "env");
+  try {
+    for (const [input, version, expected] of [
+      ["", "1.2.3", "latest"],
+      ["", "1.2.3-rc.1", "canary"],
+      ["canary", "1.2.3", "canary"],
+      ["latest", "1.2.3-rc.1", "latest"],
+      ["invalid", "1.2.3", null],
+    ]) {
+      rmSync(output, { force: true });
+      const result = spawnSync(
+        "bash",
+        [
+          "-e",
+          "-o",
+          "pipefail",
+          "-c",
+          `node() { printf '%s\\n' "$TEST_VERSION"; }\n${workflowStep("npm-publish.yml", "Resolve npm tag")}`,
+        ],
+        {
+          env: {
+            ...process.env,
+            INPUT_NPM_TAG: input,
+            TEST_VERSION: version,
+            GITHUB_ENV: output,
+          },
+          encoding: "utf8",
+        },
+      );
+      assert.equal(result.status, expected ? 0 : 1, result.stderr);
+      if (expected)
+        assert.equal(readFileSync(output, "utf8"), `NPM_TAG=${expected}\n`);
+      else assert.match(result.stdout + result.stderr, /Invalid npm tag/);
+    }
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});

package/scripts/__tests__/release-publish-ancestor.test.mjs

@@ -0,0 +1,67 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+import { publishRelease } from "../release/publish.mjs";
+
+function commandStub({ ancestor = true } = {}) {
+  const commands = [];
+  const execFileSyncFn = (command, args) => {
+    commands.push([command, ...args].join(" "));
+    if (command === "git" && args[0] === "rev-parse") {
+      return args[1] === "HEAD" ? "older\n" : "newer\n";
+    }
+    if (command === "git" && args[0] === "merge-base") {
+      if (!ancestor) throw new Error("not an ancestor");
+      return "";
+    }
+    return "";
+  };
+  return { commands, execFileSyncFn };
+}
+
+function publishOptions(execFileSyncFn, allowAncestor) {
+  return {
+    rootDir: process.cwd(),
+    dryRun: false,
+    publishNpm: false,
+    pushBranch: false,
+    createGithubRelease: false,
+    execFileSyncFn,
+    allowAncestor,
+  };
+}
+
+describe("tag-only ancestor guard", () => {
+  it("allows a release commit that is an ancestor of the current branch", async () => {
+    const { commands, execFileSyncFn } = commandStub();
+    await publishRelease(publishOptions(execFileSyncFn, true));
+
+    assert.ok(
+      commands.some((command) =>
+        command.startsWith("git merge-base --is-ancestor HEAD origin/"),
+      ),
+    );
+    assert.ok(commands.some((command) => /^git push origin v\d/.test(command)));
+  });
+
+  it("rejects a release commit outside the current branch ancestry", async () => {
+    const { commands, execFileSyncFn } = commandStub({ ancestor: false });
+    await assert.rejects(
+      publishRelease(publishOptions(execFileSyncFn, true)),
+      /Refusing tag-only publish/,
+    );
+    assert.ok(!commands.some((command) => command.startsWith("git push")));
+  });
+
+  it("keeps the exact HEAD comparison without --allow-ancestor", async () => {
+    const { commands, execFileSyncFn } = commandStub();
+    await assert.rejects(
+      publishRelease(publishOptions(execFileSyncFn, false)),
+      /Refusing tag-only publish/,
+    );
+    assert.ok(
+      !commands.some((command) => command.startsWith("git merge-base")),
+    );
+    assert.ok(!commands.some((command) => command.startsWith("git push")));
+  });
+});