claude-task-worker 0.136.0 → 0.138.0

package/README.md

@@ -139,7 +139,7 @@ claude-task-worker <command> [--epic <issue-number>]... [--label <label>]... [--
 | `install` / `update` | 上記「セットアップ」を参照 |
 | `cloud-setup [--force]` | クラウド VM 側の準備（下記「`--cloud`」を参照） |
 | `list-workers` | プリセットとカスタムの全ワーカーを名前・種別・有効/無効・ロード元で表示（`workerFiles` のロード失敗時は exit 1） |
-| `usage` | Claude API 使用状況（5時間/7日間の利用率とリセット時刻）を表示し、Slack にも通知 |
+| `usage` | Claude API 使用状況（5時間/7日間の利用率とリセット時刻）を表示し、Slack にも通知。以降は360秒（6分）ごとに取得し直して表示・RunCat 用スナップショットを更新し続ける（Ctrl-C で終了。Slack 通知は起動時のみ）。プランによって返らない窓（Ultra の5時間枠など）は省いて表示する |
 | `version` | CLI のバージョンを表示（`--version` / `-v` も可） |
 
 ### `--epic <issue-number>`

package/dist/{chunk-NWYH24MB.js → chunk-3WIASXSK.js}

@@ -361,8 +361,11 @@ async function fetchPRChecks(prNumber) {
   if (!output) return [];
   return JSON.parse(output);
 }
+function excludePrsByLabels(prs, excludeLabels) {
+  return prs.filter((pr) => !pr.labels.some((l) => excludeLabels.includes(l.name)));
+}
+var PR_LIST_FETCH_LIMIT = 50;
 async function listPullRequestsWithChecks(assignee, label, excludeLabels = [], limit = 5) {
-  const search = ["sort:created-asc", ...excludeLabels.map((l) => `-label:"${l}"`)].join(" ");
   const args = [
     "pr",
     "list",
@@ -371,9 +374,9 @@ async function listPullRequestsWithChecks(assignee, label, excludeLabels = [], l
     "--json",
     "number,title,labels,headRefName",
     "--search",
-    search,
+    "sort:created-asc",
     "--limit",
-    String(limit)
+    String(PR_LIST_FETCH_LIMIT)
   ];
   if (assignee) {
     args.push("--assignee", assignee);
@@ -382,7 +385,7 @@ async function listPullRequestsWithChecks(assignee, label, excludeLabels = [], l
     args.push("--label", label);
   }
   const output = await execGh(args);
-  const prs = JSON.parse(output);
+  const prs = excludePrsByLabels(JSON.parse(output), excludeLabels).slice(0, limit);
   const withChecks = await Promise.all(prs.map(async (pr) => ({ ...pr, checks: await fetchPRChecks(pr.number) })));
   return withChecks.filter((pr) => isCICompleted(pr.checks));
 }
@@ -2164,6 +2167,7 @@ function ceilToMinute(date) {
   return remainder === 0 ? date : new Date(date.getTime() + (MINUTE_MS - remainder));
 }
 function parseResetsAt(isoString) {
+  if (!isoString) return null;
   const date = new Date(isoString);
   return Number.isNaN(date.getTime()) ? null : ceilToMinute(date);
 }
@@ -2189,15 +2193,17 @@ function metric(title, pct, resetsAt, now) {
   };
 }
 function buildRuncatSnapshot(usage, now = /* @__PURE__ */ new Date()) {
-  const bar = `${formatG(usage.fiveHourUtilization)}/${formatG(usage.sevenDayUtilization)}`;
-  const stamp = resetHour(usage.fiveHourResetsAt);
+  const windows = [
+    ["5h", usage.fiveHourUtilization, usage.fiveHourResetsAt],
+    ["7d", usage.sevenDayUtilization, usage.sevenDayResetsAt]
+  ];
+  const present = windows.filter((w) => w[1] !== null);
+  const bar = present.map(([, pct]) => formatG(pct)).join("/");
+  const stamp = present.length > 0 ? resetHour(present[0][2]) : "";
   return {
     title: "Claude Code",
     symbol: "staroflife",
-    metrics: [
-      metric("5h", usage.fiveHourUtilization, usage.fiveHourResetsAt, now),
-      metric("7d", usage.sevenDayUtilization, usage.sevenDayResetsAt, now)
-    ],
+    metrics: present.map(([title, pct, resetsAt]) => metric(title, pct, resetsAt, now)),
     metricsBarValue: stamp ? `${bar} \u21BB${stamp}` : bar,
     lastUpdatedDate: now.toISOString().replace(/\.\d{3}Z$/, "Z")
   };
@@ -2211,7 +2217,10 @@ function writeRuncatUsage(usage, outFile = RUNCAT_OUT_FILE) {
     writeFileSync3(tmp, JSON.stringify(snapshot), "utf-8");
     renameSync2(tmp, outFile);
   } catch (err) {
-    rmSync(tmp, { force: true });
+    try {
+      rmSync(tmp, { force: true });
+    } catch {
+    }
     console.error(`[runcat] Failed to write ${outFile}: ${err}`);
   }
 }
@@ -2220,6 +2229,7 @@ function writeRuncatUsage(usage, outFile = RUNCAT_OUT_FILE) {
 var execAsync = promisify2(exec);
 var WEBHOOK_URL = process.env.CLAUDE_TASK_WORKER_SLACK_WEBHOOK_URL;
 var USAGE_CACHE_PATH = "/tmp/claude-usage-cache.json";
+var USAGE_POLL_INTERVAL_SECONDS = 360;
 var USAGE_CACHE_TTL_SECONDS = 360;
 async function send(payload) {
   if (!WEBHOOK_URL) return;
@@ -2233,6 +2243,14 @@ async function send(payload) {
     console.error(`[slack] Failed to send notification: ${err}`);
   }
 }
+function parseUsageResponse(body) {
+  return {
+    fiveHourUtilization: body.five_hour?.utilization ?? null,
+    fiveHourResetsAt: body.five_hour?.resets_at ?? null,
+    sevenDayUtilization: body.seven_day?.utilization ?? null,
+    sevenDayResetsAt: body.seven_day?.resets_at ?? null
+  };
+}
 function extractToken(credentials) {
   if (typeof credentials === "string") return credentials;
   return credentials.claudeAiOauth?.accessToken ?? credentials.oauth_token ?? credentials.access_token ?? "";
@@ -2263,8 +2281,8 @@ function writeUsageCache(data) {
   } catch {
   }
 }
-async function fetchUsageInfo() {
-  const cached = readUsageCache();
+async function fetchUsageInfo(fresh) {
+  const cached = fresh ? null : readUsageCache();
   if (cached) return cached;
   try {
     const token = await getOAuthToken();
@@ -2278,13 +2296,7 @@ async function fetchUsageInfo() {
       console.error(`[slack] Usage API returned ${res.status}`);
       return null;
     }
-    const body = await res.json();
-    const data = {
-      fiveHourUtilization: body.five_hour.utilization,
-      fiveHourResetsAt: body.five_hour.resets_at,
-      sevenDayUtilization: body.seven_day.utilization,
-      sevenDayResetsAt: body.seven_day.resets_at
-    };
+    const data = parseUsageResponse(await res.json());
     writeUsageCache(data);
     return data;
   } catch (err) {
@@ -2307,17 +2319,23 @@ function formatResetTimeJST(isoString) {
     minute: "2-digit"
   });
 }
+function formatWindow(label, utilization, resetsAt) {
+  if (utilization === null) return null;
+  const reset = resetsAt ? ` (reset: ${formatResetTimeJST(resetsAt)})` : "";
+  return `${label}: ${utilization.toFixed(1)}%${reset}`;
+}
 function formatTokenLimitText(usage) {
-  const fiveH = usage.fiveHourUtilization.toFixed(1);
-  const sevenD = usage.sevenDayUtilization.toFixed(1);
-  const emoji = utilizationEmoji(Math.max(usage.fiveHourUtilization, usage.sevenDayUtilization));
-  const fiveHReset = formatResetTimeJST(usage.fiveHourResetsAt);
-  const sevenDReset = formatResetTimeJST(usage.sevenDayResetsAt);
-  return ` | ${emoji} 5h: ${fiveH}% (reset: ${fiveHReset}) / 7d: ${sevenD}% (reset: ${sevenDReset})`;
-}
-async function buildTokenLimitText() {
-  const usage = await fetchUsageInfo();
-  if (!usage) return "";
+  const parts = [
+    formatWindow("5h", usage.fiveHourUtilization, usage.fiveHourResetsAt),
+    formatWindow("7d", usage.sevenDayUtilization, usage.sevenDayResetsAt)
+  ].filter((p) => p !== null);
+  if (parts.length === 0) return "";
+  const values = [usage.fiveHourUtilization, usage.sevenDayUtilization].filter((v) => v !== null);
+  return ` | ${utilizationEmoji(Math.max(...values))} ${parts.join(" / ")}`;
+}
+async function buildTokenLimitText(fresh = false) {
+  const usage = await fetchUsageInfo(fresh);
+  if (!usage) return null;
   writeRuncatUsage(usage);
   return formatTokenLimitText(usage);
 }
@@ -2345,7 +2363,7 @@ function buildTaskNotificationText(params) {
   return `${sessionUrlPrefix}${body}`;
 }
 async function notifyTaskCompleted(workerName, repoName, id, title, url, output, cloud) {
-  const tokenText = await buildTokenLimitText();
+  const tokenText = await buildTokenLimitText() ?? "";
   await send({
     text: buildTaskNotificationText({
       status: "completed",
@@ -2361,7 +2379,7 @@ async function notifyTaskCompleted(workerName, repoName, id, title, url, output,
   });
 }
 async function notifyTaskFailed(workerName, repoName, id, title, url, output, cloud) {
-  const tokenText = await buildTokenLimitText();
+  const tokenText = await buildTokenLimitText() ?? "";
   await send({
     text: buildTaskNotificationText({
       status: "failed",
@@ -3176,6 +3194,7 @@ export {
   waitForAllProcesses,
   shutdown,
   generateWorktreeName,
+  USAGE_POLL_INTERVAL_SECONDS,
   send,
   buildTokenLimitText,
   notifyTaskCompleted,

package/dist/gh.d.ts

@@ -85,6 +85,11 @@ export interface PullRequestWithChecks extends PullRequest {
     checks: PRCheck[];
 }
 export declare function isCICompleted(checks: PRCheck[]): boolean;
+export declare function excludePrsByLabels<T extends {
+    labels: {
+        name: string;
+    }[];
+}>(prs: T[], excludeLabels: string[]): T[];
 export declare function listPullRequestsWithChecks(assignee?: string, label?: string, excludeLabels?: string[], limit?: number): Promise<PullRequestWithChecks[]>;
 export declare function addLabel(type: "issue" | "pr", number: number, label: string): Promise<void>;
 export declare function addAssignee(type: "issue" | "pr", number: number, login: string): Promise<void>;

package/dist/index.js

@@ -7,6 +7,7 @@ import {
   INHERIT_CONFIG_KEY,
   LOCAL_CONFIG_PATH,
   SCHEDULED_WORKER_NAMES,
+  USAGE_POLL_INTERVAL_SECONDS,
   addAssignee,
   addLabel,
   bodyMentionsIssue,
@@ -64,7 +65,7 @@ import {
   shutdown,
   waitForAllProcesses,
   writeLastRun
-} from "./chunk-NWYH24MB.js";
+} from "./chunk-3WIASXSK.js";
 import {
   UserConfigError,
   assertCloudCompatibleCommand,
@@ -1822,15 +1823,18 @@ if (hasProjectFilter()) {
     await cloudSetup({ force: process.argv.slice(3).includes("--force") });
   })();
 } else if (workerType === "usage") {
-  (async () => {
-    const text = await buildTokenLimitText();
-    if (!text) {
-      console.error("Failed to fetch usage info");
-      process.exit(1);
+  const pollUsage = async (notify) => {
+    const text = await buildTokenLimitText(true);
+    if (text === null) {
+      console.error(`[usage] ${(/* @__PURE__ */ new Date()).toISOString()} Failed to fetch usage info`);
+      return;
     }
-    console.log(text.trim());
-    await send({ text: `\u{1F4CA} Usage${text}` });
-  })();
+    console.log(`[usage] ${(/* @__PURE__ */ new Date()).toISOString()}${text}`);
+    if (notify) await send({ text: `\u{1F4CA} Usage${text}` });
+  };
+  void pollUsage(true);
+  setInterval(() => void pollUsage(false), USAGE_POLL_INTERVAL_SECONDS * 1e3);
+  console.log(`[usage] polling every ${USAGE_POLL_INTERVAL_SECONDS}s (Ctrl-C to stop)`);
 } else if (workerType === "list-workers") {
   for (const e of PRESET_WORKERS) printWorkerRow(e.definition.name, "preset", "preset");
   for (const c of customWorkers) printWorkerRow(c.definition.name, "custom", c.source);

package/dist/lib.js

@@ -55,7 +55,7 @@ import {
   removeWorktreeByBranch,
   run,
   syncDefaultBranch
-} from "./chunk-NWYH24MB.js";
+} from "./chunk-3WIASXSK.js";
 import {
   getPermissionMode,
   getRunMode,

package/dist/runcat.d.ts

@@ -12,9 +12,9 @@ export interface RuncatSnapshot {
     lastUpdatedDate: string;
 }
 /** 'HH:MM' 形式。日を跨ぐ場合は 'MM/DD HH:MM' として日付も付ける。不正値は空文字。 */
-export declare function resetStamp(isoString: string, now?: Date): string;
+export declare function resetStamp(isoString: string | null, now?: Date): string;
 /** 'HH' のみ。バーのように幅が限られる用途向け。不正値は空文字。 */
-export declare function resetHour(isoString: string): string;
+export declare function resetHour(isoString: string | null): string;
 export declare function buildRuncatSnapshot(usage: UsageInfo, now?: Date): RuncatSnapshot;
 /**
  * RunCat Neo 用のスナップショットを書き出す。

package/dist/slack.d.ts

@@ -1,16 +1,30 @@
+/** `usage` コマンドが利用状況をポーリングする間隔 */
+export declare const USAGE_POLL_INTERVAL_SECONDS = 360;
 export declare function send(payload: Record<string, unknown>): Promise<void>;
 export interface UsageInfo {
-    fiveHourUtilization: number;
-    fiveHourResetsAt: string;
-    sevenDayUtilization: number;
-    sevenDayResetsAt: string;
+    fiveHourUtilization: number | null;
+    fiveHourResetsAt: string | null;
+    sevenDayUtilization: number | null;
+    sevenDayResetsAt: string | null;
 }
+interface UsageWindow {
+    utilization?: number | null;
+    resets_at?: string | null;
+}
+/** usage API のレスポンスを UsageInfo へ。欠けている窓は null にする（throw しない） */
+export declare function parseUsageResponse(body: {
+    five_hour?: UsageWindow | null;
+    seven_day?: UsageWindow | null;
+}): UsageInfo;
+/** 返ってきた窓だけを並べる。どちらも無ければ空文字 */
+export declare function formatTokenLimitText(usage: UsageInfo): string;
 /**
  * 現在の利用状況を取得し、RunCat Neo 用スナップショットを更新したうえで通知に添えるテキストを返す。
  * ワーカーの完了/失敗通知はすべてここを通るため、タスクが終わるたびに RunCat 側も最新化される
  * （Slack webhook 未設定でも通知が no-op になるだけで、スナップショットの更新は行われる）。
+ * 取得に失敗したときだけ null を返す（どの枠も返らない正常応答は空文字）。
  */
-export declare function buildTokenLimitText(): Promise<string>;
+export declare function buildTokenLimitText(fresh?: boolean): Promise<string | null>;
 /**
  * 通知本文へ載せる output を末尾1000文字に切り詰める。
  * 案内文（CLOUD_FAILURE_GUIDANCE）は appendCloudFailureGuidance が output の先頭に
@@ -44,3 +58,4 @@ export declare function notifyTaskFailed(workerName: string, repoName: string, i
     sessionId?: string;
 }): Promise<void>;
 export declare function notifyError(workerName: string, repoName: string, error: unknown): Promise<void>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-task-worker",
-  "version": "0.136.0",
+  "version": "0.138.0",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",