claude-threads 1.6.3 → 1.7.1

package/dist/mcp/permission-server.js

@@ -53500,6 +53500,69 @@ import { fileURLToPath as fileURLToPath3 } from "url";
 import { existsSync as existsSync4, readFileSync as readFileSync3, watchFile, unwatchFile, unlinkSync, statSync, readdirSync } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
+
+// src/claude/rate-limit-detector.ts
+var RATE_LIMIT_PHRASES = [
+  /usage limit reached/i,
+  /rate[_\s-]?limit[_\s-]?error/i,
+  /you have hit the rate limit/i,
+  /quota (has been )?exceeded/i,
+  /\b429\b.*(rate|limit|quota)/i
+];
+var DEFAULT_COOLDOWN_MS = 60 * 60 * 1000;
+function detectRateLimit(text, now = Date.now()) {
+  if (!text)
+    return { detected: false };
+  let matched;
+  for (const phrase of RATE_LIMIT_PHRASES) {
+    const m = text.match(phrase);
+    if (m) {
+      matched = m[0];
+      break;
+    }
+  }
+  if (!matched)
+    return { detected: false };
+  const resetAtEpochMs = extractResetAt(text, now);
+  return { detected: true, matched, resetAtEpochMs };
+}
+function cooldownDeadline(hit, now = Date.now()) {
+  if (!hit.detected)
+    return now;
+  return hit.resetAtEpochMs ?? now + DEFAULT_COOLDOWN_MS;
+}
+function extractResetAt(text, now) {
+  const relative = text.match(/(?:retry[_\s-]?after|resets?\s+in)\s+(\d+)\s*(second|minute|hour|day)s?/i);
+  if (relative) {
+    const value = parseInt(relative[1], 10);
+    const unit = relative[2].toLowerCase();
+    const unitMs = {
+      second: 1000,
+      minute: 60000,
+      hour: 3600000,
+      day: 86400000
+    };
+    return now + value * unitMs[unit];
+  }
+  const unix = text.match(/\breset(?:_at)?\b\s*["']?\s*[:=]\s*(\d{10,13})/);
+  if (unix) {
+    const raw = parseInt(unix[1], 10);
+    return unix[1].length === 13 ? raw : raw * 1000;
+  }
+  const clock = text.match(/resets?\s+at\s+(\d{1,2}):(\d{2})\s*(utc|gmt)?/i);
+  if (clock) {
+    const hh = parseInt(clock[1], 10);
+    const mm = parseInt(clock[2], 10);
+    if (hh < 24 && mm < 60) {
+      const reference = new Date(now);
+      const target = new Date(Date.UTC(reference.getUTCFullYear(), reference.getUTCMonth(), reference.getUTCDate(), hh, mm)).getTime();
+      return target > now ? target : target + 86400000;
+    }
+  }
+  return;
+}
+
+// src/claude/cli.ts
 var log7 = createLogger("claude");
 function cleanupBrowserBridgeSockets() {
   try {
@@ -53521,6 +53584,14 @@ function cleanupBrowserBridgeSockets() {
     log7.debug(`Browser bridge cleanup failed: ${err}`);
   }
 }
+function isErrorResultEvent(event) {
+  const ev = event;
+  if (typeof ev.subtype === "string" && ev.subtype.startsWith("error"))
+    return true;
+  if (ev.is_error === true)
+    return true;
+  return false;
+}
 
 class ClaudeCli extends EventEmitter2 {
   process = null;
@@ -53530,6 +53601,7 @@ class ClaudeCli extends EventEmitter2 {
   statusFilePath = null;
   lastStatusData = null;
   stderrBuffer = "";
+  lastEmittedRateLimitDeadline = 0;
   log;
   constructor(options2) {
     super();
@@ -53581,6 +53653,7 @@ class ClaudeCli extends EventEmitter2 {
     if (this.process)
       throw new Error("Already running");
     this.stderrBuffer = "";
+    this.lastEmittedRateLimitDeadline = 0;
     cleanupBrowserBridgeSockets();
     const claudePath = getClaudePath();
     const args = [
@@ -53650,9 +53723,13 @@ class ClaudeCli extends EventEmitter2 {
       args.push("--settings", JSON.stringify(statusLineSettings));
     }
     this.log.debug(`Starting: ${claudePath} ${args.slice(0, 5).join(" ")}...`);
+    const childEnv = this.buildChildEnv();
+    if (this.options.account) {
+      this.log.debug(`Spawning under Claude account "${this.options.account.id}"`);
+    }
     this.process = crossSpawn(claudePath, args, {
       cwd: this.options.workingDir,
-      env: process.env,
+      env: childEnv,
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.log.debug(`Claude process spawned: pid=${this.process.pid}`);
@@ -53666,6 +53743,7 @@ class ClaudeCli extends EventEmitter2 {
         this.stderrBuffer = this.stderrBuffer.slice(-10240);
       }
       this.log.debug(`stderr: ${text.trim()}`);
+      this.maybeEmitRateLimit(text);
     });
     this.process.on("error", (err) => {
       this.log.error(`Claude error: ${err}`);
@@ -53720,9 +53798,24 @@ class ClaudeCli extends EventEmitter2 {
       try {
         const event = JSON.parse(trimmed);
         this.emit("event", event);
+        if (event.type === "result" && isErrorResultEvent(event)) {
+          this.maybeEmitRateLimit(trimmed);
+        }
       } catch {}
     }
   }
+  maybeEmitRateLimit(text) {
+    const hit = detectRateLimit(text);
+    if (!hit.detected)
+      return;
+    const newDeadline = cooldownDeadline(hit);
+    const MIN_ADVANCE_MS = 60000;
+    if (newDeadline - this.lastEmittedRateLimitDeadline < MIN_ADVANCE_MS)
+      return;
+    this.lastEmittedRateLimitDeadline = newDeadline;
+    this.log.warn(`Rate limit detected: ${hit.matched ?? "(no match text)"}`);
+    this.emit("rate-limit", hit);
+  }
   isRunning() {
     return this.process !== null;
   }
@@ -53791,6 +53884,22 @@ class ClaudeCli extends EventEmitter2 {
     this.process.kill("SIGINT");
     return true;
   }
+  buildChildEnv() {
+    const account = this.options.account;
+    if (!account)
+      return process.env;
+    const env = { ...process.env };
+    if (account.home) {
+      env.HOME = account.home;
+      env.USERPROFILE = account.home;
+      delete env.ANTHROPIC_API_KEY;
+      delete env.CLAUDE_CODE_OAUTH_TOKEN;
+    } else if (account.apiKey) {
+      env.ANTHROPIC_API_KEY = account.apiKey;
+      delete env.CLAUDE_CODE_OAUTH_TOKEN;
+    }
+    return env;
+  }
   getMcpServerPath() {
     const __filename2 = fileURLToPath3(import.meta.url);
     const __dirname4 = dirname4(__filename2);
@@ -53811,42 +53920,6 @@ class ClaudeCli extends EventEmitter2 {
   }
 }
 
-// src/update-notifier.ts
-var import_semver2 = __toESM(require_semver2(), 1);
-
-// src/operations/commands/handler.ts
-init_emoji();
-
-// src/utils/error-handler/index.ts
-var log8 = createLogger("error");
-
-// src/utils/session-log.ts
-function createSessionLog(baseLog) {
-  return (session) => {
-    if (session?.sessionId) {
-      return baseLog.forSession(session.sessionId);
-    }
-    return baseLog;
-  };
-}
-
-// src/operations/post-helpers/index.ts
-init_emoji();
-
-// src/git/worktree.ts
-import * as path from "path";
-import { homedir as homedir2 } from "os";
-var log9 = createLogger("git-wt");
-var WORKTREES_DIR = path.join(homedir2(), ".claude-threads", "worktrees");
-var METADATA_STORE_PATH = path.join(homedir2(), ".claude-threads", "worktree-metadata.json");
-
-// src/operations/post-helpers/index.ts
-var log10 = createLogger("helpers");
-var sessionLog = createSessionLog(log10);
-
-// src/claude/quick-query.ts
-var log11 = createLogger("query");
-
 // src/commands/registry.ts
 var COMMAND_REGISTRY = [
   {
@@ -54399,6 +54472,36 @@ ${avoidCommands.map((c) => `- \`!${c.command}\` - ${c.reason}`).join(`
 `)}
 `.trim();
 }
+// src/utils/error-handler/index.ts
+var log8 = createLogger("error");
+
+// src/utils/session-log.ts
+function createSessionLog(baseLog) {
+  return (session) => {
+    if (session?.sessionId) {
+      return baseLog.forSession(session.sessionId);
+    }
+    return baseLog;
+  };
+}
+
+// src/operations/post-helpers/index.ts
+init_emoji();
+
+// src/git/worktree.ts
+import * as path from "path";
+import { homedir as homedir2 } from "os";
+var log9 = createLogger("git-wt");
+var WORKTREES_DIR = path.join(homedir2(), ".claude-threads", "worktrees");
+var METADATA_STORE_PATH = path.join(homedir2(), ".claude-threads", "worktree-metadata.json");
+
+// src/operations/post-helpers/index.ts
+var log10 = createLogger("helpers");
+var sessionLog = createSessionLog(log10);
+
+// src/claude/quick-query.ts
+var log11 = createLogger("query");
+
 // src/operations/suggestions/title.ts
 var log12 = createLogger("title");
 
@@ -54416,7 +54519,11 @@ var log15 = createLogger("lifecycle");
 var sessionLog3 = createSessionLog(log15);
 var CHAT_PLATFORM_PROMPT = generateChatPlatformPrompt();
 
+// src/update-notifier.ts
+var import_semver2 = __toESM(require_semver2(), 1);
+
 // src/operations/commands/handler.ts
+init_emoji();
 var log16 = createLogger("commands");
 var sessionLog4 = createSessionLog(log16);
 // src/operations/suggestions/branch.ts

package/docs/CONFIGURATION.md

@@ -72,6 +72,33 @@ platforms:
 | `allowedUsers` | No | List of Slack usernames |
 | `skipPermissions` | No | Auto-approve actions (default: `false`) |
 
+## Claude Accounts (optional, multi-account mode)
+
+By default every session spawns `claude` with the bot's own `process.env`, so they all share one subscription's token budget. Add a `claudeAccounts` block to spread load across multiple accounts — the bot round-robins new sessions across the pool and automatically skips accounts in rate-limit cooldown. Omit the block entirely to stay in single-account mode (unchanged behavior).
+
+```yaml
+claudeAccounts:
+  # OAuth accounts — prepare each HOME first with `HOME=<path> claude login`
+  - id: primary
+    home: /home/bot/.claude-accounts/primary
+  - id: backup
+    displayName: Backup (Pro)
+    home: /home/bot/.claude-accounts/backup
+
+  # API-key billed
+  - id: shared-api
+    apiKey: sk-ant-api03-xxxxxxxx...
+```
+
+| Setting | Required | Description |
+|---------|----------|-------------|
+| `id` | Yes | Stable identifier used in logs, UI, and persisted session state |
+| `home` | One of | Alternate `$HOME` containing `.claude/.credentials.json` from a prior `HOME=<path> claude login`. For OAuth Pro/Max subscriptions. Session history also lives here, so resumed sessions pick the same account. |
+| `apiKey` | One of | Anthropic API key. Billed against that key; session history stays under the bot's default `HOME`. |
+| `displayName` | No | Human-readable label in UI (defaults to `id`) |
+
+Exactly one of `home` or `apiKey` should be set per account. Persisted sessions record which account they ran under and resume on the same one.
+
 ## Environment Variables
 
 | Variable | Description | Default |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-threads",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "description": "Share Claude Code sessions live in a Mattermost channel with interactive features",
   "main": "dist/index.js",
   "type": "module",