claude-task-worker 0.142.2 → 0.142.4

package/dist/{chunk-EYML7T7A.js → chunk-WTY7GTRT.js}

@@ -2140,9 +2140,9 @@ function generateWorktreeName() {
 }
 
 // src/slack.ts
-import { exec } from "node:child_process";
+import { exec, execFile as execFile2 } from "node:child_process";
 import { readFileSync as readFileSync2, renameSync as renameSync3, writeFileSync as writeFileSync4 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir3, tmpdir } from "node:os";
 import { join as join3 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 
@@ -2233,10 +2233,13 @@ function writeRuncatUsage(usage, outFile = RUNCAT_OUT_FILE) {
 
 // src/slack.ts
 var execAsync = promisify2(exec);
+var execFileAsync2 = promisify2(execFile2);
 var WEBHOOK_URL = process.env.CLAUDE_TASK_WORKER_SLACK_WEBHOOK_URL;
 var USAGE_POLL_INTERVAL_SECONDS = 600;
 var USAGE_BACKOFF_PATH = "/tmp/claude-usage-backoff.json";
 var USAGE_RATE_LIMIT_DEFAULT_BACKOFF_SECONDS = 600;
+var USAGE_CACHE_PATH = "/tmp/claude-usage-cache.json";
+var USAGE_CACHE_TTL_SECONDS = 600;
 async function send(payload) {
   if (!WEBHOOK_URL) return;
   try {
@@ -2297,38 +2300,66 @@ function writeBackoffUntil(until) {
   } catch {
   }
 }
+function readUsageCache(now = Date.now()) {
+  try {
+    const { fetchedAt, usage } = JSON.parse(readFileSync2(USAGE_CACHE_PATH, "utf-8"));
+    return now - Number(fetchedAt) < USAGE_CACHE_TTL_SECONDS * 1e3 ? usage : null;
+  } catch {
+    return null;
+  }
+}
+function writeUsageCache(usage) {
+  try {
+    const tmp = `${USAGE_CACHE_PATH}.${process.pid}.tmp`;
+    writeFileSync4(tmp, JSON.stringify({ fetchedAt: Date.now(), usage }));
+    renameSync3(tmp, USAGE_CACHE_PATH);
+  } catch {
+  }
+}
 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;
   }
+  const cached = readUsageCache();
+  if (cached) return cached;
   try {
-    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();
+    let { token, expiresAt } = await getStoredCredential();
     if (!token) {
-      console.error("[slack] No OAuth token found (set CLAUDE_CODE_OAUTH_TOKEN or sign in to Claude Code)");
+      console.error("[slack] No OAuth token found (sign in to Claude Code)");
       return null;
     }
-    if (expiresAt !== void 0 && expiresAt <= Date.now()) {
+    if (isExpired(expiresAt)) {
       console.error(
-        `[slack] OAuth token expired at ${new Date(expiresAt).toISOString()} (it is refreshed when claude runs)`
+        `[slack] OAuth token expired at ${new Date(expiresAt).toISOString()}; running claude to refresh it`
       );
-      return null;
+      await refreshTokenByRunningClaude();
+      ({ token, expiresAt } = await getStoredCredential());
+      if (!token || isExpired(expiresAt)) {
+        console.error("[slack] OAuth token is still expired after running claude");
+        return null;
+      }
     }
-    return await handleUsageResponse(await requestUsage(token));
+    const usage = await handleUsageResponse(await requestUsage(token));
+    if (usage) writeUsageCache(usage);
+    return usage;
   } catch (err) {
     console.error(`[slack] Failed to fetch usage info: ${err}`);
     return null;
   }
 }
+function isExpired(expiresAt) {
+  return expiresAt !== void 0 && expiresAt <= Date.now();
+}
+async function refreshTokenByRunningClaude() {
+  const { CLAUDE_CODE_OAUTH_TOKEN: _ignored, ...env } = process.env;
+  try {
+    await execFileAsync2("claude", ["-p", "/exit"], { cwd: tmpdir(), env, timeout: 12e4 });
+  } catch (err) {
+    console.error(`[slack] Failed to run claude for token refresh: ${err}`);
+  }
+}
 function requestUsage(token) {
   return fetch("https://api.anthropic.com/api/oauth/usage", {
     headers: {
@@ -2450,7 +2481,7 @@ import { promisify as promisify3 } from "node:util";
 import { rm, stat } from "node:fs/promises";
 import { basename as basename2, resolve as resolve2, sep } from "node:path";
 var childProcess2 = createRequire2(import.meta.url)("node:child_process");
-var execFileAsync2 = (command, args) => promisify3(childProcess2.execFile)(command, args);
+var execFileAsync3 = (command, args) => promisify3(childProcess2.execFile)(command, args);
 var WORKTREES_DIR = ".claude/worktrees";
 function isManagedWorktreePath(path2) {
   return resolve2(path2).startsWith(resolve2(WORKTREES_DIR) + sep);
@@ -2477,7 +2508,7 @@ async function forceRemoveIfExists(path2) {
   }
 }
 async function listWorktreeEntries() {
-  const { stdout } = await execFileAsync2("git", ["worktree", "list", "--porcelain"]);
+  const { stdout } = await execFileAsync3("git", ["worktree", "list", "--porcelain"]);
   return stdout.replace(/\r\n/g, "\n").trim().split("\n\n").filter(Boolean).map((entry) => {
     const lines = entry.split("\n");
     const worktreeLine = lines.find((l) => l.startsWith("worktree "));
@@ -2491,7 +2522,7 @@ async function listWorktreeEntries() {
 }
 async function removeRegisteredWorktree(worktreePath) {
   try {
-    await execFileAsync2("git", ["worktree", "remove", "--force", "--force", worktreePath]);
+    await execFileAsync3("git", ["worktree", "remove", "--force", "--force", worktreePath]);
   } catch (error) {
     console.error(`[worktree] Failed to remove worktree ${worktreePath}:`, error);
   }
@@ -2500,7 +2531,7 @@ async function removeRegisteredWorktree(worktreePath) {
 var PROTECTED_BRANCHES = /* @__PURE__ */ new Set(["main", "master", "develop"]);
 async function getDefaultBranchName() {
   try {
-    const { stdout } = await execFileAsync2("git", ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
+    const { stdout } = await execFileAsync3("git", ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
     return stdout.trim().replace(/^origin\//, "");
   } catch {
     return void 0;
@@ -2513,7 +2544,7 @@ async function deleteLocalBranch(branchName) {
     return;
   }
   try {
-    await execFileAsync2("git", ["branch", "-D", branchName]);
+    await execFileAsync3("git", ["branch", "-D", branchName]);
     console.log(`[worktree] Deleted local branch: ${branchName}`);
   } catch (error) {
     const stderr = String(error?.stderr ?? "");
@@ -2523,7 +2554,7 @@ async function deleteLocalBranch(branchName) {
 }
 async function localBranchExists(branchName) {
   try {
-    await execFileAsync2("git", ["rev-parse", "--verify", "--quiet", `refs/heads/${branchName}`]);
+    await execFileAsync3("git", ["rev-parse", "--verify", "--quiet", `refs/heads/${branchName}`]);
     return true;
   } catch {
     return false;
@@ -2541,7 +2572,7 @@ function createWorktreeFromBranch(worktreeId, baseBranch) {
 }
 async function addWorktree(worktreeId, baseBranch) {
   const worktreePath = getWorktreePath(worktreeId);
-  await execFileAsync2("git", ["worktree", "add", "--track", "-B", worktreeId, worktreePath, `origin/${baseBranch}`]);
+  await execFileAsync3("git", ["worktree", "add", "--track", "-B", worktreeId, worktreePath, `origin/${baseBranch}`]);
 }
 async function removeWorktree(worktreeId) {
   const worktreePath = getWorktreePath(worktreeId);
@@ -2987,7 +3018,7 @@ function createPrPollingWorker(config) {
 import { createRequire as createRequire3 } from "node:module";
 import { promisify as promisify4 } from "node:util";
 var childProcess3 = createRequire3(import.meta.url)("node:child_process");
-var execFileAsync3 = (command, args) => promisify4(childProcess3.execFile)(command, args);
+var execFileAsync4 = (command, args) => promisify4(childProcess3.execFile)(command, args);
 var CONFIG_FILE = "claude-task-worker.json";
 var LABEL_TRIAGE_SCOPE2 = "cc-triage-scope";
 function lastRunBranchName(workerName) {
@@ -3010,7 +3041,7 @@ function lastRunPrBody(workerName, at) {
   ].join("\n");
 }
 async function git(cwd, args) {
-  const { stdout } = await execFileAsync3("git", ["-C", cwd, ...args]);
+  const { stdout } = await execFileAsync4("git", ["-C", cwd, ...args]);
   return stdout;
 }
 async function publishLastRunPr(workerName, defaultBranch, at) {

package/dist/index.js

@@ -65,7 +65,7 @@ import {
   shutdown,
   waitForAllProcesses,
   writeLastRun
-} from "./chunk-EYML7T7A.js";
+} from "./chunk-WTY7GTRT.js";
 import {
   UserConfigError,
   assertCloudCompatibleCommand,

package/dist/lib.js

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

package/dist/slack.d.ts

@@ -1,5 +1,7 @@
 /** `usage` コマンドが利用状況をポーリングする間隔 */
 export declare const USAGE_POLL_INTERVAL_SECONDS = 600;
+/** 取得結果を使い回す期間。この間は usage API を叩かない */
+export declare const USAGE_CACHE_TTL_SECONDS = 600;
 export declare function send(payload: Record<string, unknown>): Promise<void>;
 export interface UsageInfo {
     fiveHourUtilization: number | null;

package/package.json

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