claude-task-worker 0.142.0 → 0.142.2

package/README.md

@@ -140,7 +140,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 にも通知。以降は360秒（6分）ごとに取得し直して表示・RunCat 用スナップショットを更新し続ける（Ctrl-C で終了。Slack 通知は起動時のみ）。プランによって返らない窓（Ultra の5時間枠など）は省いて表示する |
+| `usage` | Claude API 使用状況（5時間/7日間の利用率とリセット時刻）を表示し、Slack にも通知。以降は600秒（10分）ごとに取得し直して表示・RunCat 用スナップショットを更新し続ける（Ctrl-C で終了。Slack 通知は起動時のみ）。プランによって返らない窓（Ultra の5時間枠など）は省いて表示する |
 | `version` | CLI のバージョンを表示（`--version` / `-v` も可） |
 
 ### `--epic <issue-number>`
@@ -430,7 +430,7 @@ export CLAUDE_TASK_WORKER_SLACK_WEBHOOK_URL=https://hooks.slack.com/services/xxx
 claude-task-worker all
 ```
 
-通知には Claude API の使用状況も含まれる。あわせて [RunCat Neo](https://kyome.io/runcat/) 用のスナップショットを `~/.claude/runcat-usage.json`（`RUNCAT_OUT_FILE` で変更可）へ書き出す。クラウド実行のタスクは通知の先頭行にセッションURLが入る。
+Claude API の使用状況はタスク通知には含めない（`usage` コマンドを実行したときだけ取得する）。[RunCat Neo](https://kyome.io/runcat/) 用のスナップショット `~/.claude/runcat-usage.json`（`RUNCAT_OUT_FILE` で変更可）も `usage` が書き出す。クラウド実行のタスクは通知の先頭行にセッションURLが入る。
 
 ## プロセス管理
 

package/dist/{chunk-725IRSKF.js → chunk-EYML7T7A.js}

@@ -2141,7 +2141,7 @@ function generateWorktreeName() {
 
 // src/slack.ts
 import { exec } from "node:child_process";
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { readFileSync as readFileSync2, renameSync as renameSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { join as join3 } from "node:path";
 import { promisify as promisify2 } from "node:util";
@@ -2234,9 +2234,9 @@ function writeRuncatUsage(usage, outFile = RUNCAT_OUT_FILE) {
 // src/slack.ts
 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;
+var USAGE_POLL_INTERVAL_SECONDS = 600;
+var USAGE_BACKOFF_PATH = "/tmp/claude-usage-backoff.json";
+var USAGE_RATE_LIMIT_DEFAULT_BACKOFF_SECONDS = 600;
 async function send(payload) {
   if (!WEBHOOK_URL) return;
   try {
@@ -2257,59 +2257,100 @@ function parseUsageResponse(body) {
     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 ?? "";
+function extractCredential(credentials) {
+  if (typeof credentials === "string") return { token: credentials };
+  return {
+    token: credentials.claudeAiOauth?.accessToken ?? credentials.oauth_token ?? credentials.access_token ?? "",
+    expiresAt: credentials.claudeAiOauth?.expiresAt
+  };
 }
-async function getOAuthToken() {
+async function getStoredCredential() {
   try {
     const { stdout } = await execAsync('security find-generic-password -s "Claude Code-credentials" -w');
-    return extractToken(JSON.parse(stdout.trim()));
+    return extractCredential(JSON.parse(stdout.trim()));
   } catch {
     const raw = readFileSync2(join3(homedir3(), ".claude", ".credentials.json"), "utf-8");
-    return extractToken(JSON.parse(raw));
+    return extractCredential(JSON.parse(raw));
+  }
+}
+function rateLimitBackoffMs(retryAfter, now = Date.now()) {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (Number.isFinite(seconds) && seconds > 0) return seconds * 1e3;
+    const date = Date.parse(retryAfter);
+    if (!Number.isNaN(date) && date > now) return date - now;
   }
+  return USAGE_RATE_LIMIT_DEFAULT_BACKOFF_SECONDS * 1e3;
 }
-function readUsageCache() {
+function readBackoffUntil() {
   try {
-    const raw = readFileSync2(USAGE_CACHE_PATH, "utf-8");
-    const cached = JSON.parse(raw);
-    if (Date.now() - cached.timestamp < USAGE_CACHE_TTL_SECONDS * 1e3) {
-      return cached.data;
-    }
+    return Number(JSON.parse(readFileSync2(USAGE_BACKOFF_PATH, "utf-8")).until) || 0;
   } catch {
+    return 0;
   }
-  return null;
 }
-function writeUsageCache(data) {
+function writeBackoffUntil(until) {
   try {
-    writeFileSync4(USAGE_CACHE_PATH, JSON.stringify({ timestamp: Date.now(), data }));
+    const tmp = `${USAGE_BACKOFF_PATH}.${process.pid}.tmp`;
+    writeFileSync4(tmp, JSON.stringify({ until: Math.max(until, readBackoffUntil()) }));
+    renameSync3(tmp, USAGE_BACKOFF_PATH);
   } catch {
   }
 }
-async function fetchUsageInfo(fresh) {
-  const cached = fresh ? null : readUsageCache();
-  if (cached) return cached;
+async function fetchUsageInfo() {
+  const backoffUntil = readBackoffUntil();
+  if (Date.now() < backoffUntil) {
+    console.error(`[slack] Usage API rate limited; skipping until ${new Date(backoffUntil).toISOString()}`);
+    return null;
+  }
   try {
-    const token = await getOAuthToken();
-    const res = await fetch("https://api.anthropic.com/api/oauth/usage", {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        "anthropic-beta": "oauth-2025-04-20"
-      }
-    });
-    if (!res.ok) {
-      console.error(`[slack] Usage API returned ${res.status}`);
+    const envToken = process.env.CLAUDE_CODE_OAUTH_TOKEN?.trim();
+    if (envToken) {
+      const res = await requestUsage(envToken);
+      if (res.status !== 401 && res.status !== 403) return await handleUsageResponse(res);
+      console.error(
+        `[slack] Usage API rejected CLAUDE_CODE_OAUTH_TOKEN (${res.status}); falling back to stored credentials`
+      );
+    }
+    const { token, expiresAt } = await getStoredCredential();
+    if (!token) {
+      console.error("[slack] No OAuth token found (set CLAUDE_CODE_OAUTH_TOKEN or sign in to Claude Code)");
       return null;
     }
-    const data = parseUsageResponse(await res.json());
-    writeUsageCache(data);
-    return data;
+    if (expiresAt !== void 0 && expiresAt <= Date.now()) {
+      console.error(
+        `[slack] OAuth token expired at ${new Date(expiresAt).toISOString()} (it is refreshed when claude runs)`
+      );
+      return null;
+    }
+    return await handleUsageResponse(await requestUsage(token));
   } catch (err) {
     console.error(`[slack] Failed to fetch usage info: ${err}`);
     return null;
   }
 }
+function requestUsage(token) {
+  return fetch("https://api.anthropic.com/api/oauth/usage", {
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "anthropic-beta": "oauth-2025-04-20"
+    }
+  });
+}
+async function handleUsageResponse(res) {
+  if (!res.ok) {
+    const body = (await res.text().catch(() => "")).slice(0, 500);
+    if (res.status === 429) {
+      const until = Date.now() + rateLimitBackoffMs(res.headers.get("retry-after"));
+      writeBackoffUntil(until);
+      console.error(`[slack] Usage API returned 429; backing off until ${new Date(until).toISOString()}: ${body}`);
+    } else {
+      console.error(`[slack] Usage API returned ${res.status}: ${body}`);
+    }
+    return null;
+  }
+  return parseUsageResponse(await res.json());
+}
 function utilizationEmoji(value) {
   if (value < 50) return "\u{1F7E2}";
   if (value < 80) return "\u{1F7E1}";
@@ -2339,8 +2380,8 @@ function formatTokenLimitText(usage) {
   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);
+async function buildTokenLimitText() {
+  const usage = await fetchUsageInfo();
   if (!usage) return null;
   writeRuncatUsage(usage);
   return formatTokenLimitText(usage);
@@ -2354,13 +2395,13 @@ function truncateOutputForNotification(output) {
   return `\u2026${output.slice(-1e3)}`;
 }
 function buildTaskNotificationText(params) {
-  const { status, workerName, repoName, id, title, url, tokenText, output, cloud } = params;
+  const { status, workerName, repoName, id, title, url, output, cloud } = params;
   const emoji = status === "completed" ? "\u2705" : "\u274C";
   const label = status === "completed" ? "completed" : "failed";
   const truncatedOutput = output ? truncateOutputForNotification(output) : output;
   const outputBlock = truncatedOutput ? `
 \`\`\`${truncatedOutput}\`\`\`` : "";
-  const body = `${emoji} [${workerName}] ${repoName} | Task ${label}: <${url}|#${id} ${title}>${tokenText}${outputBlock}`;
+  const body = `${emoji} [${workerName}] ${repoName} | Task ${label}: <${url}|#${id} ${title}>${outputBlock}`;
   let sessionUrlPrefix = "";
   if (cloud) {
     sessionUrlPrefix = cloud.sessionId?.trim() ? `https://claude.ai/code/${cloud.sessionId.trim()}
@@ -2369,7 +2410,6 @@ function buildTaskNotificationText(params) {
   return `${sessionUrlPrefix}${body}`;
 }
 async function notifyTaskCompleted(workerName, repoName, id, title, url, output, cloud) {
-  const tokenText = await buildTokenLimitText() ?? "";
   await send({
     text: buildTaskNotificationText({
       status: "completed",
@@ -2378,14 +2418,12 @@ async function notifyTaskCompleted(workerName, repoName, id, title, url, output,
       id,
       title,
       url,
-      tokenText,
       output,
       cloud
     })
   });
 }
 async function notifyTaskFailed(workerName, repoName, id, title, url, output, cloud) {
-  const tokenText = await buildTokenLimitText() ?? "";
   await send({
     text: buildTaskNotificationText({
       status: "failed",
@@ -2394,7 +2432,6 @@ async function notifyTaskFailed(workerName, repoName, id, title, url, output, cl
       id,
       title,
       url,
-      tokenText,
       output,
       cloud
     })

package/dist/index.js

@@ -65,7 +65,7 @@ import {
   shutdown,
   waitForAllProcesses,
   writeLastRun
-} from "./chunk-725IRSKF.js";
+} from "./chunk-EYML7T7A.js";
 import {
   UserConfigError,
   assertCloudCompatibleCommand,
@@ -1893,7 +1893,7 @@ if (hasProjectFilter()) {
   })();
 } else if (workerType === "usage") {
   const pollUsage = async (notify) => {
-    const text = await buildTokenLimitText(true);
+    const text = await buildTokenLimitText();
     if (text === null) {
       console.error(`[usage] ${(/* @__PURE__ */ new Date()).toISOString()} Failed to fetch usage info`);
       return;

package/dist/lib.js

@@ -55,7 +55,7 @@ import {
   removeWorktreeByBranch,
   run,
   syncDefaultBranch
-} from "./chunk-725IRSKF.js";
+} from "./chunk-EYML7T7A.js";
 import {
   getPermissionMode,
   getRunMode,

package/dist/slack.d.ts

@@ -1,5 +1,5 @@
 /** `usage` コマンドが利用状況をポーリングする間隔 */
-export declare const USAGE_POLL_INTERVAL_SECONDS = 360;
+export declare const USAGE_POLL_INTERVAL_SECONDS = 600;
 export declare function send(payload: Record<string, unknown>): Promise<void>;
 export interface UsageInfo {
     fiveHourUtilization: number | null;
@@ -16,15 +16,32 @@ export declare function parseUsageResponse(body: {
     five_hour?: UsageWindow | null;
     seven_day?: UsageWindow | null;
 }): UsageInfo;
+interface CredentialPayload {
+    claudeAiOauth?: {
+        accessToken?: string;
+        expiresAt?: number;
+    };
+    oauth_token?: string;
+    access_token?: string;
+}
+export interface OAuthCredential {
+    token: string;
+    expiresAt?: number;
+}
+export declare function extractCredential(credentials: CredentialPayload | string): OAuthCredential;
+/**
+ * 429 後に API を叩かない期間（ミリ秒）。Retry-After（秒 or HTTP-date）を優先し、
+ * 無い・読めないときは既定値。失敗のたびに叩き直すと制限が明けないため
+ */
+export declare function rateLimitBackoffMs(retryAfter: string | null, now?: number): number;
 /** 返ってきた窓だけを並べる。どちらも無ければ空文字 */
 export declare function formatTokenLimitText(usage: UsageInfo): string;
 /**
  * 現在の利用状況を取得し、RunCat Neo 用スナップショットを更新したうえで通知に添えるテキストを返す。
- * ワーカーの完了/失敗通知はすべてここを通るため、タスクが終わるたびに RunCat 側も最新化される
- * （Slack webhook 未設定でも通知が no-op になるだけで、スナップショットの更新は行われる）。
+ * 呼ぶのは `usage` コマンドだけ（ワーカーの通知からは呼ばない。usage API のレート制限をワーカーと分け合わないため）。
  * 取得に失敗したときだけ null を返す（どの枠も返らない正常応答は空文字）。
  */
-export declare function buildTokenLimitText(fresh?: boolean): Promise<string | null>;
+export declare function buildTokenLimitText(): Promise<string | null>;
 /**
  * 通知本文へ載せる output を末尾1000文字に切り詰める。
  * 案内文（CLOUD_FAILURE_GUIDANCE）は appendCloudFailureGuidance が output の先頭に
@@ -45,7 +62,6 @@ export declare function buildTaskNotificationText(params: {
     id: number;
     title: string;
     url: string;
-    tokenText: string;
     output?: string;
     cloud?: {
         sessionId?: string;

package/package.json

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