claude-code-discord-presence 1.0.1 → 1.0.3

package/README.md

@@ -9,9 +9,7 @@ Cross-platform Discord Rich Presence for Claude Code Desktop and Claude Code CLI
 model, effort, usage limits, reset countdowns, tools, agents, token usage, cost, context, plan mode,
 Fast mode, and secure remote SSH sessions on Windows, macOS, and Linux.
 
-<p align="center">
-  <img src="assets/claude-code.png" width="180" alt="Claude Code Discord Presence icon">
-</p>
+![Claude Code Discord Rich Presence with plan limits, model, effort, activity status, usage statistics, and session timer](https://raw.githubusercontent.com/dayfinggg/claude-code-discord-presence/main/assets/claude-code-presence-cover.png)
 
 ## Quick start — no manual hook setup
 
@@ -44,6 +42,8 @@ required. Existing unrelated Claude settings and hooks are preserved.
 
 The account usage endpoint is preferred over placeholder statusline zeroes. This prevents the false
 `100% left` display that some Claude clients emit while keeping statusline data as an offline fallback.
+On macOS, the service reads the same OAuth metadata from the encrypted macOS Keychain that Claude
+Code uses; Linux and Windows use Claude's protected `.credentials.json` file.
 
 ## Hooks and statusline
 
@@ -59,6 +59,11 @@ user-level `settings.json` used by Claude Code CLI and Desktop.
 - Existing settings are backed up under `~/.claude/backups/claude-code-presence/`; only five backups
   are retained.
 
+If `settings.json` already contains a statusline that is not managed by this package, the installer
+leaves it unchanged. Claude Code supports one `statusLine` command, so the presence statusline is not
+installed in that case: hooks and basic activity still work, but statusline-only fields may be
+unavailable until the user chooses which statusline to keep or combines the commands manually.
+
 Run the installer explicitly at any time with `claude-code-presence setup`.
 
 ## Desktop, CLI, and platforms

package/dist/claude/plan-info.js

@@ -1,10 +1,14 @@
 import { join } from "node:path";
+import { execFile } from "node:child_process";
 import { readFile, writeFile } from "node:fs/promises";
+import { promisify } from "node:util";
 import { createLogger } from "../util/logger.js";
 import { claudeConfigDir } from "./paths.js";
 const log = createLogger("plan-info");
+const execFileAsync = promisify(execFile);
 const CLAUDE_DIR = claudeConfigDir();
 export const CREDENTIALS_PATH = join(CLAUDE_DIR, ".credentials.json");
+const MACOS_KEYCHAIN_SERVICES = ["Claude Code-credentials", "Claude Code"];
 const SETTINGS_PATH = join(CLAUDE_DIR, "settings.json");
 const CACHE_TTL_MS = 60 * 60 * 1000;
 const EFFORT_LEVELS = new Set(["low", "medium", "high", "xhigh", "max"]);
@@ -34,11 +38,50 @@ export function planNameFrom(subscriptionType, rateLimitTier) {
         return sub.charAt(0).toUpperCase() + sub.slice(1);
     return "Claude";
 }
+const runSecurity = async (file, args, options) => execFileAsync(file, args, options);
+function parseCredentials(raw) {
+    try {
+        const parsed = JSON.parse(raw);
+        return parsed && typeof parsed === "object" ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function readMacosKeychainCredentials(run = runSecurity) {
+    for (const service of MACOS_KEYCHAIN_SERVICES) {
+        try {
+            const { stdout } = await run("/usr/bin/security", ["find-generic-password", "-s", service, "-w"], { encoding: "utf8", timeout: 10_000, maxBuffer: 512 * 1024 });
+            if (stdout.trim())
+                return stdout.trim();
+        }
+        catch {
+            // Try the legacy service name before falling back to the credentials file.
+        }
+    }
+    return undefined;
+}
+export async function readCredentialsForPlatform(platform, readCredentialsFile, readKeychain) {
+    if (platform === "darwin") {
+        const keychainRaw = await readKeychain();
+        const keychainCredentials = keychainRaw ? parseCredentials(keychainRaw) : undefined;
+        if (keychainCredentials)
+            return keychainCredentials;
+    }
+    try {
+        return parseCredentials(await readCredentialsFile(CREDENTIALS_PATH, "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+}
 async function readCredentials() {
     for (let attempt = 0; attempt < 3; attempt++) {
         try {
-            const raw = await readFile(CREDENTIALS_PATH, "utf8");
-            return JSON.parse(raw);
+            const credentials = await readCredentialsForPlatform(process.platform, readFile, readMacosKeychainCredentials);
+            if (credentials)
+                return credentials;
+            throw Object.assign(new Error("Claude Code credentials were not found"), { code: "ENOENT" });
         }
         catch (err) {
             if (attempt === 2) {
@@ -68,6 +111,10 @@ export async function readOauthCredentials() {
     };
 }
 export async function saveRefreshedCredentials(accessToken, refreshToken, expiresInS) {
+    if (process.platform === "darwin") {
+        log.warn("token refresh cannot update macOS Keychain; Claude Code will refresh its credentials");
+        return false;
+    }
     try {
         const raw = await readFile(CREDENTIALS_PATH, "utf8");
         const parsed = JSON.parse(raw);

package/dist/claude/session-store.js

@@ -290,6 +290,7 @@ export class SessionStore {
             case "PostToolUse":
                 break;
             case "Stop":
+            case "StopFailure":
                 session.status = "idle";
                 session.action = "Idle";
                 break;
@@ -329,9 +330,10 @@ export class SessionStore {
         else if (session.transcriptPath) {
             if (!this.effectiveModel(session) || turnBoundary)
                 void this.refreshModelFromTranscript(session);
-            const statsEvent = event === "Stop" || event === "UserPromptSubmit" || event === "PostToolUse" || event === "SessionStart";
+            const statsEvent = event === "Stop" || event === "StopFailure" || event === "UserPromptSubmit" ||
+                event === "PostToolUse" || event === "SessionStart";
             if (statsEvent && !fromAgent) {
-                void this.refreshStatsFromTranscript(session, event === "Stop" || event === "SessionStart");
+                void this.refreshStatsFromTranscript(session, event === "Stop" || event === "StopFailure" || event === "SessionStart");
             }
         }
         this.onChange();

package/dist/claude/usage-poller.js

@@ -59,6 +59,8 @@ export class UsagePoller {
         return base + Math.floor((0.5 - Math.abs((Date.now() % 1000) / 1000 - 0.5)) * spread);
     }
     watchCredentials() {
+        if (process.platform === "darwin")
+            return;
         try {
             this.watcher = watch(CREDENTIALS_PATH, () => {
                 if (this.watchDebounce)

package/dist/cli.js

@@ -96,7 +96,7 @@ function setupInstalled() {
     try {
         const config = JSON.parse(readFileSync(join(claudeDir(), "discord-presence", "config.json"), "utf8"));
         const settings = readFileSync(join(claudeDir(), "settings.json"), "utf8");
-        return config.installerVersion === 1 && /discord-presence[\\/]hook\.mjs/i.test(settings) &&
+        return config.installerVersion === 2 && /discord-presence[\\/]hook\.mjs/i.test(settings) &&
             /discord-presence[\\/]statusline\.mjs/i.test(settings);
     }
     catch {

package/dist/discord/presence-builder.js

@@ -1,13 +1,6 @@
 const MIN = 2;
 const MAX = 128;
 const SEP = " • ";
-const MODEL_NAMES = {
-    "claude-fable-5": "Fable 5",
-    "claude-opus-4-8": "Opus 4.8",
-    "claude-opus-4-7": "Opus 4.7",
-    "claude-sonnet-5": "Sonnet 5",
-    "claude-haiku-4-5": "Haiku 4.5",
-};
 const EFFORT_LABELS = {
     minimal: "Minimal",
     low: "Light",
@@ -21,12 +14,42 @@ export function effortLabel(level) {
     return EFFORT_LABELS[level];
 }
 export function modelDisplayName(id, fallback) {
-    if (id && MODEL_NAMES[id])
-        return MODEL_NAMES[id];
-    if (fallback && fallback.trim() !== "")
-        return fallback;
-    if (id && id.trim() !== "")
-        return id;
+    const fallbackName = fallback?.trim();
+    if (fallbackName && !/[-_[\]]/.test(fallbackName))
+        return fallbackName;
+    const raw = fallbackName || id?.trim();
+    if (raw) {
+        const normalized = raw
+            .replace(/^claude[-_\s]+/i, "")
+            .replace(/\s*\[[^\]]*\]\s*$/g, "")
+            .replace(/[_\s]+/g, "-")
+            .replace(/-(?:latest|\d+[km]|\d{8})$/i, "")
+            .replace(/-+/g, "-")
+            .replace(/^-|-$/g, "");
+        const tokens = normalized.split("-").filter(Boolean);
+        const title = (value) => value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
+        if (/^\d/.test(tokens[0] ?? "")) {
+            const version = [];
+            while (tokens.length > 0 && /^\d+(?:\.\d+)?$/.test(tokens[0]))
+                version.push(tokens.shift());
+            const family = tokens.shift();
+            if (family)
+                return `${title(family)} ${version.join(".")}`.trim();
+        }
+        else {
+            const family = [];
+            while (tokens.length > 0 && !/^\d+(?:\.\d+)?$/.test(tokens[0]))
+                family.push(tokens.shift());
+            const version = [];
+            while (tokens.length > 0 && /^\d+(?:\.\d+)?$/.test(tokens[0]))
+                version.push(tokens.shift());
+            if (family.length > 0) {
+                return `${family.map(title).join(" ")}${version.length > 0 ? ` ${version.join(".")}` : ""}`;
+            }
+        }
+        if (normalized)
+            return normalized;
+    }
     return "Claude";
 }
 function pctLeft(usedPercentage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-discord-presence",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Cross-platform Discord Rich Presence for Claude Code Desktop and CLI with live models, limits, costs, tools, agents, statusline, and secure SSH remotes.",
   "main": "dist/index.js",
   "type": "module",

package/scripts/setup-claude.mjs

@@ -23,6 +23,7 @@ const events = [
   "PostToolUse",
   "PostToolUseFailure",
   "Stop",
+  "StopFailure",
   "SubagentStart",
   "SubagentStop",
   "Notification",
@@ -82,7 +83,7 @@ await copyFile(join(scriptsDir, "hook.mjs"), hookTarget);
 await copyFile(join(scriptsDir, "statusline.mjs"), statuslineTarget);
 await writeFile(
   join(installDir, "config.json"),
-  `${JSON.stringify({ port, remote: false, installerVersion: 1 }, null, 2)}\n`,
+  `${JSON.stringify({ port, remote: false, installerVersion: 2 }, null, 2)}\n`,
   { mode: 0o600 },
 );
 

package/scripts/setup-remote.mjs

@@ -21,7 +21,7 @@ const hookTarget = join(installDir, "hook.mjs");
 const statuslineTarget = join(installDir, "statusline.mjs");
 const events = [
   "SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "PostToolUseFailure",
-  "Stop", "SubagentStart", "SubagentStop", "Notification", "SessionEnd",
+  "Stop", "StopFailure", "SubagentStart", "SubagentStop", "Notification", "SessionEnd",
 ];
 const matcherEvents = new Set(["PreToolUse", "PostToolUse", "PostToolUseFailure"]);
 const quote = (value) => `"${value.replaceAll("\\", "/").replaceAll('"', '\\"')}"`;
@@ -60,7 +60,7 @@ await writeFile(hookTarget, hookSource, { mode: 0o700 });
 await writeFile(statuslineTarget, statuslineSource, { mode: 0o700 });
 await writeFile(
   join(installDir, "config.json"),
-  `${JSON.stringify({ port, remote: true, installerVersion: 1 }, null, 2)}\n`,
+  `${JSON.stringify({ port, remote: true, installerVersion: 2 }, null, 2)}\n`,
   { mode: 0o600 },
 );