cc-usage-bar 0.1.0 → 0.4.1

package/dist/src/format.js

@@ -1,42 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FORMAT = exports.FORMAT_PRESETS = void 0;
+exports.DEFAULT_FORMAT = exports.DEFAULT_RAMP = exports.COLOR_NAMES = exports.COLOR_MAP = exports.FORMAT_PRESETS = void 0;
 exports.formatExpiry = formatExpiry;
+exports.formatCountdown = formatCountdown;
 exports.parseBarSpec = parseBarSpec;
+exports.hexToAnsi = hexToAnsi;
+exports.parseColorRamp = parseColorRamp;
+exports.colorFromRamp = colorFromRamp;
 exports.formatBar = formatBar;
 exports.renderSubscription = renderSubscription;
 exports.renderBalance = renderBalance;
 exports.renderUsage = renderUsage;
 exports.isValidPreset = isValidPreset;
 exports.shouldUseColor = shouldUseColor;
-exports.FORMAT_PRESETS = ['compact', 'numeric', 'time', 'bar', 'bar-time'];
+exports.FORMAT_PRESETS = [
+    'compact',
+    'numeric',
+    'time',
+    'countdown',
+    'bar',
+    'bar-time',
+    'bar-countdown',
+];
+const ANSI_RESET = '\x1b[0m';
+const ANSI_REVERSE = '\x1b[7m';
+exports.COLOR_MAP = {
+    none: '',
+    dim: '\x1b[2m',
+    black: '\x1b[30m',
+    red: '\x1b[31m',
+    green: '\x1b[32m',
+    yellow: '\x1b[33m',
+    blue: '\x1b[34m',
+    magenta: '\x1b[35m',
+    cyan: '\x1b[36m',
+    white: '\x1b[37m',
+    gray: '\x1b[90m',
+    boldRed: '\x1b[1;31m',
+    boldGreen: '\x1b[1;32m',
+    boldYellow: '\x1b[1;33m',
+    boldBlue: '\x1b[1;34m',
+    boldMagenta: '\x1b[1;35m',
+    boldCyan: '\x1b[1;36m',
+    boldWhite: '\x1b[1;37m',
+};
+exports.COLOR_NAMES = Object.keys(exports.COLOR_MAP);
+exports.DEFAULT_RAMP = [
+    { min: 0, ansi: exports.COLOR_MAP.green },
+    { min: 60, ansi: exports.COLOR_MAP.yellow },
+    { min: 85, ansi: exports.COLOR_MAP.red },
+];
 exports.DEFAULT_FORMAT = {
-    format: 'compact',
+    format: 'bar-countdown',
     barWidth: 10,
     color: true,
     showProviderName: true,
+    colorRamp5h: exports.DEFAULT_RAMP,
+    colorRampWk: exports.DEFAULT_RAMP,
+    colorRampBalance: exports.DEFAULT_RAMP,
 };
 const SUB_PRESET_TPL = {
     compact: '{label} {percent}%',
     numeric: '{percent}%',
     time: '{percent}% until {expiry}',
+    countdown: '{percent}% in {countdown}',
     bar: '[{bar}] {percent}%',
     'bar-time': '[{bar}] {percent}% until {expiry}',
+    'bar-countdown': '[{bar}] {percent}% in {countdown}',
 };
 const BAL_PRESET_TPL = {
     compact: '{amount}',
     numeric: '{amount}',
     time: '{amount}',
+    countdown: '{amount}',
     bar: '[{bar}] {amount}',
     'bar-time': '[{bar}] {amount}',
-};
-const ANSI = {
-    reset: '\x1b[0m',
-    dim: '\x1b[2m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    red: '\x1b[31m',
-    boldRed: '\x1b[1;31m',
+    'bar-countdown': '[{bar}] {amount}',
 };
 const pad2 = (n) => n.toString().padStart(2, '0');
 function formatExpiry(iso, now = new Date()) {
@@ -57,6 +96,26 @@ function formatExpiry(iso, now = new Date()) {
     }
     return `${target.getFullYear()}-${pad2(target.getMonth() + 1)}-${pad2(target.getDate())}`;
 }
+function formatCountdown(iso, now = new Date()) {
+    if (!iso)
+        return '?';
+    const target = new Date(iso);
+    if (Number.isNaN(target.getTime()))
+        return '?';
+    const secs = Math.max(0, Math.floor((target.getTime() - now.getTime()) / 1000));
+    if (secs < 60)
+        return `${secs}s`;
+    const mins = Math.floor(secs / 60);
+    if (mins < 60)
+        return `${mins}m`;
+    const hrs = Math.floor(mins / 60);
+    const remMin = mins % 60;
+    if (hrs < 24)
+        return remMin > 0 ? `${hrs}h${remMin}m` : `${hrs}h`;
+    const days = Math.floor(hrs / 24);
+    const remHr = hrs % 24;
+    return remHr > 0 ? `${days}d${remHr}h` : `${days}d`;
+}
 function isNonEmptyString(v) {
     return typeof v === 'string' && v.length > 0;
 }
@@ -88,6 +147,8 @@ function parseBarSpec(raw) {
         const out = { mode: 'tint', text: obj.text };
         if (obj.emptyStyle === 'plain' || obj.emptyStyle === 'dim')
             out.emptyStyle = obj.emptyStyle;
+        if (obj.style === 'fg' || obj.style === 'reverse')
+            out.style = obj.style;
         return out;
     }
     if (obj.mode === 'frames') {
@@ -100,6 +161,71 @@ function parseBarSpec(raw) {
     }
     return null;
 }
+function hexToAnsi(hex) {
+    const m = hex.match(/^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/);
+    if (!m)
+        return null;
+    const h = m[1];
+    let r;
+    let g;
+    let b;
+    if (h.length === 3) {
+        r = parseInt(h[0] + h[0], 16);
+        g = parseInt(h[1] + h[1], 16);
+        b = parseInt(h[2] + h[2], 16);
+    }
+    else {
+        r = parseInt(h.slice(0, 2), 16);
+        g = parseInt(h.slice(2, 4), 16);
+        b = parseInt(h.slice(4, 6), 16);
+    }
+    return `\x1b[38;2;${r};${g};${b}m`;
+}
+function parseColorRamp(spec) {
+    if (!spec)
+        return null;
+    const parts = spec.split(',').map((s) => s.trim()).filter(Boolean);
+    if (parts.length === 0)
+        return null;
+    const rules = [];
+    for (const p of parts) {
+        const m = p.match(/^(\d+(?:\.\d+)?):(\S+)$/);
+        if (!m)
+            return null;
+        const min = parseFloat(m[1]);
+        const token = m[2];
+        let ansi;
+        if (token === 'none') {
+            ansi = null;
+        }
+        else if (token.startsWith('#')) {
+            ansi = hexToAnsi(token);
+            if (ansi === null)
+                return null;
+        }
+        else if (token in exports.COLOR_MAP) {
+            ansi = exports.COLOR_MAP[token] || null;
+        }
+        else {
+            return null;
+        }
+        rules.push({ min, ansi });
+    }
+    rules.sort((a, b) => a.min - b.min);
+    return rules;
+}
+function colorFromRamp(util, ramp) {
+    if (!ramp || ramp.length === 0)
+        return null;
+    let picked = null;
+    for (const r of ramp) {
+        if (util >= r.min)
+            picked = r.ansi;
+        else
+            break;
+    }
+    return picked;
+}
 function splitText(s) {
     return Array.from(s);
 }
@@ -117,8 +243,9 @@ function formatBar(pct, width = 10, spec, activeColor = null, useColor = false)
         const inactive = chars.slice(filled).join('');
         if (!useColor)
             return active + inactive;
-        const activePart = activeColor && active ? paint(active, activeColor, true) : active;
-        const inactivePart = inactive && spec.emptyStyle !== 'plain' ? paint(inactive, ANSI.dim, true) : inactive;
+        const activeStyle = activeColor && spec.style === 'reverse' ? `${activeColor}${ANSI_REVERSE}` : activeColor;
+        const activePart = activeStyle && active ? paint(active, activeStyle, true) : active;
+        const inactivePart = inactive && spec.emptyStyle !== 'plain' ? paint(inactive, exports.COLOR_MAP.dim, true) : inactive;
         return activePart + inactivePart;
     }
     if (spec?.mode === 'frames') {
@@ -128,20 +255,30 @@ function formatBar(pct, width = 10, spec, activeColor = null, useColor = false)
     const filled = Math.round((clamped / 100) * width);
     return '█'.repeat(filled) + '░'.repeat(Math.max(0, width - filled));
 }
-function fiveHourColor(util) {
-    if (util < 60)
-        return ANSI.green;
-    if (util < 85)
-        return ANSI.yellow;
-    return ANSI.red;
-}
-function weekColor(util) {
-    return util >= 80 ? ANSI.boldRed : null;
-}
 function paint(text, color, useColor) {
     if (!useColor || !color)
         return text;
-    return `${color}${text}${ANSI.reset}`;
+    return `${color}${text}${ANSI_RESET}`;
+}
+function applyTierPaint(text, color, opts, tpl) {
+    return paint(text, color, opts.color);
+}
+function applyTintTemplate(tpl, vars, color, opts) {
+    if (!opts.color || !color)
+        return applyTemplate(tpl, vars);
+    return tpl
+        .split(/(\{bar\})/g)
+        .map((part) => (part === '{bar}' ? vars.bar ?? '{bar}' : paint(applyTemplate(part, vars), color, true)))
+        .join('');
+}
+function renderTemplate(tpl, vars, color, opts) {
+    if (opts.barSpec?.mode === 'tint' && tpl.includes('{bar}')) {
+        return applyTintTemplate(tpl, vars, color, opts);
+    }
+    return applyTierPaint(applyTemplate(tpl, vars), color, opts, tpl);
+}
+function prependProvider(text, planName, opts) {
+    return opts.showProviderName && planName ? `${planName} ${text}` : text;
 }
 function applyTemplate(tpl, vars) {
     return tpl.replace(/\{(\w+)\}/g, (_, k) => (k in vars ? vars[k] : `{${k}}`));
@@ -149,17 +286,17 @@ function applyTemplate(tpl, vars) {
 function renderTier(ctx, opts) {
     const pct = Math.round(ctx.tier.utilization);
     const tpl = opts.template ?? SUB_PRESET_TPL[opts.format];
-    const color = ctx.label === '5h' ? fiveHourColor(pct) : weekColor(pct);
-    const text = applyTemplate(tpl, {
+    const ramp = ctx.label === '5h' ? opts.colorRamp5h ?? exports.DEFAULT_RAMP : opts.colorRampWk ?? exports.DEFAULT_RAMP;
+    const color = colorFromRamp(pct, ramp);
+    const vars = {
         label: ctx.label,
         percent: String(pct),
         bar: formatBar(pct, opts.barWidth, opts.barSpec, color, opts.color),
         expiry: formatExpiry(ctx.tier.resets_at, opts.now),
+        countdown: formatCountdown(ctx.tier.resets_at, opts.now),
         provider: ctx.provider,
-    });
-    if (opts.barSpec?.mode === 'tint' && opts.color && tpl.includes('{bar}'))
-        return text;
-    return paint(text, color, opts.color);
+    };
+    return renderTemplate(tpl, vars, color, opts);
 }
 function currencySymbol(unit) {
     switch (unit.toUpperCase()) {
@@ -186,35 +323,35 @@ function renderSubscription(d, opts) {
     if (parts.length === 0)
         return '';
     const sep = opts.format === 'compact' && !opts.template ? ' ' : ' / ';
-    const body = parts.join(sep);
-    return opts.showProviderName && d.planName ? `${d.planName} ${body}` : body;
+    return prependProvider(parts.join(sep), d.planName, opts);
 }
 function renderBalance(d, opts) {
     if (d.isValid === false && d.invalidMessage) {
-        const msg = paint(d.invalidMessage, ANSI.red, opts.color);
-        return opts.showProviderName && d.planName ? `${d.planName} ${msg}` : msg;
-    }
-    const amount = typeof d.total === 'number'
-        ? `${fmtMoney(d.remaining, d.unit)}/${fmtMoney(d.total, d.unit)}`
-        : fmtMoney(d.remaining, d.unit);
-    const usedPct = typeof d.total === 'number' && d.total > 0
-        ? ((d.total - d.remaining) / d.total) * 100
-        : 0;
+        return prependProvider(paint(d.invalidMessage, exports.COLOR_MAP.red, opts.color), d.planName, opts);
+    }
+    if (typeof d.total !== 'number') {
+        const tpl = opts.template ?? BAL_PRESET_TPL.compact;
+        const vars = {
+            label: '', percent: '0', bar: '', expiry: '', countdown: '',
+            provider: d.planName ?? '',
+            amount: fmtMoney(d.remaining, d.unit),
+        };
+        return prependProvider(renderTemplate(tpl, vars, null, opts), d.planName, opts);
+    }
+    const total = d.total;
+    const usedPct = total > 0 ? ((total - d.remaining) / total) * 100 : 0;
     const tpl = opts.template ?? BAL_PRESET_TPL[opts.format];
-    const color = typeof d.total === 'number' ? fiveHourColor(usedPct) : null;
-    const text = applyTemplate(tpl, {
+    const color = colorFromRamp(usedPct, opts.colorRampBalance ?? exports.DEFAULT_RAMP);
+    const vars = {
         label: '',
         percent: String(Math.round(usedPct)),
-        bar: typeof d.total === 'number' ? formatBar(usedPct, opts.barWidth, opts.barSpec, color, opts.color) : '',
+        bar: formatBar(usedPct, opts.barWidth, opts.barSpec, color, opts.color),
         expiry: '',
+        countdown: '',
         provider: d.planName ?? '',
-        amount,
-    });
-    if (opts.barSpec?.mode === 'tint' && opts.color && tpl.includes('{bar}')) {
-        return opts.showProviderName && d.planName ? `${d.planName} ${text}` : text;
-    }
-    const colored = paint(text, color, opts.color);
-    return opts.showProviderName && d.planName ? `${d.planName} ${colored}` : colored;
+        amount: `${fmtMoney(d.remaining, d.unit)}/${fmtMoney(total, d.unit)}`,
+    };
+    return prependProvider(renderTemplate(tpl, vars, color, opts), d.planName, opts);
 }
 function renderUsage(data, opts) {
     if (!data)

package/dist/src/providers/anthropic.js

@@ -46,7 +46,7 @@ exports.anthropicAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseAnthropic(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/deepseek.js

@@ -46,7 +46,7 @@ exports.deepseekAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseDeepSeek(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/glm.js

@@ -48,7 +48,7 @@ exports.glmAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const parsed = parseGlm(res.body);
         if (!parsed)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/kimi.js

@@ -48,7 +48,7 @@ exports.kimiAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseKimi(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/minimax.js

@@ -55,7 +55,7 @@ exports.minimaxAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const parsed = parseMinimax(res.body);
         if (!parsed)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/novita.js

@@ -34,7 +34,7 @@ exports.novitaAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseNovita(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/openrouter.js

@@ -38,7 +38,7 @@ exports.openrouterAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseOpenRouter(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/siliconflow.js

@@ -46,7 +46,7 @@ exports.siliconflowAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseSiliconFlow(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/providers/stepfun.js

@@ -43,7 +43,7 @@ exports.stepfunAdapter = {
         if (res.authFailed)
             return { ok: false, authFailed: true, error: res.error };
         if (!res.ok || !res.body)
-            return { ok: false, error: res.error ?? 'request failed' };
+            return { ok: false, status: res.status, error: res.error ?? 'request failed' };
         const data = parseStepFun(res.body);
         if (!data)
             return { ok: false, error: 'invalid response shape' };

package/dist/src/render.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "shouldUseColor", { enumerable: true, get: functi
 function toFormatOptions(opts) {
     return {
         ...format_1.DEFAULT_FORMAT,
+        format: 'compact',
         color: opts.color,
         showProviderName: opts.showProviderName ?? false,
     };

package/dist/src/settings.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsError = exports.FETCH_BIN = exports.BACKUP_PREFIX = exports.SETTINGS_PATH = exports.CLAUDE_DIR = void 0;
+exports.SettingsError = exports.WRAP_BIN = exports.FETCH_BIN = exports.BACKUP_PREFIX = exports.SETTINGS_PATH = exports.CLAUDE_DIR = void 0;
 exports.claudeDirExists = claudeDirExists;
 exports.readSettings = readSettings;
 exports.writeSettings = writeSettings;
@@ -41,6 +41,7 @@ exports.backupSettings = backupSettings;
 exports.findBackups = findBackups;
 exports.findLatestBackup = findLatestBackup;
 exports.isInstalled = isInstalled;
+exports.shellQuoteForPlatform = shellQuoteForPlatform;
 exports.applyInstall = applyInstall;
 exports.applyUninstallSurgical = applyUninstallSurgical;
 exports.restoreFromBackup = restoreFromBackup;
@@ -52,6 +53,7 @@ exports.CLAUDE_DIR = path.join(os.homedir(), '.claude');
 exports.SETTINGS_PATH = path.join(exports.CLAUDE_DIR, 'settings.json');
 exports.BACKUP_PREFIX = 'settings.json.backup-cc-usage-';
 exports.FETCH_BIN = 'cc-usage-fetch';
+exports.WRAP_BIN = 'cc-usage-bar-wrap';
 class SettingsError extends Error {
     hint;
     constructor(message, hint) {
@@ -121,74 +123,98 @@ function unwrapPrior(existing) {
     }
     return undefined;
 }
-function shellQuote(s) {
+function shellQuotePosix(s) {
     return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-function buildFetchCommand(opts) {
-    const parts = [exports.FETCH_BIN];
+function shellQuoteWindows(s) {
+    return `"${s.replace(/"/g, '\\"')}"`;
+}
+function shellQuoteForPlatform(s, platform = process.platform) {
+    return platform === 'win32' ? shellQuoteWindows(s) : shellQuotePosix(s);
+}
+function buildFetchFlags(opts, platform) {
+    const parts = [];
     if (opts.format)
         parts.push(`--format=${opts.format}`);
     if (typeof opts.barWidth === 'number')
         parts.push(`--bar-width=${opts.barWidth}`);
     if (opts.barSpec)
-        parts.push(`--bar-spec=${shellQuote(opts.barSpec)}`);
+        parts.push(`--bar-spec=${shellQuoteForPlatform(opts.barSpec, platform)}`);
     return parts.join(' ');
 }
-function applyInstall(s, opts = {}) {
+function buildBareFetchCommand(opts, platform) {
+    const flags = buildFetchFlags(opts, platform);
+    return flags ? `${exports.FETCH_BIN} ${flags}` : exports.FETCH_BIN;
+}
+function buildWrapCommand(prefix, opts, platform) {
+    const flags = buildFetchFlags(opts, platform);
+    const head = `${exports.WRAP_BIN} --prefix=${shellQuoteForPlatform(prefix, platform)}`;
+    return flags ? `${head} ${flags}` : head;
+}
+function resolveBasePrefix(sl) {
+    if (!sl)
+        return undefined;
+    if (sl._ccUsageInstalled)
+        return unwrapPrior(sl);
+    if (sl.command && (sl.command.includes(exports.FETCH_BIN) || sl.command.includes(exports.WRAP_BIN))) {
+        return applyUninstallSurgical({ statusLine: sl }).statusLine;
+    }
+    return sl;
+}
+function applyInstall(s, opts = {}, platform = process.platform) {
     const next = { ...s };
-    const baseExisting = unwrapPrior(next.statusLine);
-    const fetchCmd = buildFetchCommand(opts);
+    const baseExisting = resolveBasePrefix(next.statusLine);
     if (!baseExisting || !baseExisting.command) {
         next.statusLine = {
             ...(baseExisting ?? {}),
             type: baseExisting?.type ?? 'command',
-            command: fetchCmd,
+            command: buildBareFetchCommand(opts, platform),
             refreshInterval: baseExisting?.refreshInterval ?? 30,
             _ccUsageInstalled: true,
         };
         return next;
     }
     const original = baseExisting.command;
-    const escaped = original.replace(/'/g, `'\\''`);
-    const escapedFetchCmd = fetchCmd.replace(/'/g, `'\\''`);
-    const wrapped = `sh -c 'printf "%s " "$(${escaped})"; ${escapedFetchCmd}'`;
     next.statusLine = {
         ...baseExisting,
-        command: wrapped,
+        command: buildWrapCommand(original, opts, platform),
         refreshInterval: baseExisting.refreshInterval ?? 30,
         _ccUsageInstalled: true,
         _ccUsageOriginal: original,
     };
     return next;
 }
+function restoreCommand(s, inner) {
+    const next = { ...s };
+    const sl = { ...s.statusLine, command: inner };
+    delete sl._ccUsageInstalled;
+    delete sl._ccUsageOriginal;
+    next.statusLine = sl;
+    return next;
+}
 function applyUninstallSurgical(s) {
     if (!s.statusLine?.command)
         return s;
     const cmd = s.statusLine.command;
-    if (!cmd.includes(exports.FETCH_BIN))
+    if (!cmd.includes(exports.FETCH_BIN) && !cmd.includes(exports.WRAP_BIN))
         return s;
-    const currentWrapMatch = cmd.match(/^sh -c 'printf "%s " "\$\((.*)\)"; cc-usage-fetch.*'$/s);
-    if (currentWrapMatch) {
-        const inner = currentWrapMatch[1].replace(/'\\''/g, "'");
-        const next = { ...s };
-        const sl = { ...s.statusLine, command: inner };
-        delete sl._ccUsageInstalled;
-        delete sl._ccUsageOriginal;
-        next.statusLine = sl;
-        return next;
-    }
-    const wrapMatch = cmd.match(/^sh -c '(.*); (?:echo -n|printf) " "; cc-usage-fetch[^']*'$/s);
-    if (wrapMatch) {
-        const inner = wrapMatch[1].replace(/'\\''/g, "'");
-        const next = { ...s };
-        const sl = { ...s.statusLine, command: inner };
-        delete sl._ccUsageInstalled;
-        delete sl._ccUsageOriginal;
-        next.statusLine = sl;
-        return next;
-    }
+    const wrapFormPosix = cmd.match(/^cc-usage-bar-wrap --prefix='((?:[^']|'\\'')*)'.*$/s);
+    if (wrapFormPosix)
+        return restoreCommand(s, wrapFormPosix[1].replace(/'\\''/g, "'"));
+    const wrapFormWin = cmd.match(/^cc-usage-bar-wrap --prefix="((?:\\.|[^"])*)".*$/s);
+    if (wrapFormWin)
+        return restoreCommand(s, wrapFormWin[1].replace(/\\"/g, '"'));
+    const printfDollarForm = cmd.match(/^sh -c 'printf "%s " "\$\((.*)\)"; cc-usage-fetch.*'$/s);
+    if (printfDollarForm)
+        return restoreCommand(s, printfDollarForm[1].replace(/'\\''/g, "'"));
+    const echoForm = cmd.match(/^sh -c '(.*); (?:echo -n|printf) " "; cc-usage-fetch[^']*'$/s);
+    if (echoForm)
+        return restoreCommand(s, echoForm[1].replace(/'\\''/g, "'"));
     const trimmed = cmd.trim();
-    if (trimmed === exports.FETCH_BIN || trimmed.startsWith(exports.FETCH_BIN + ' ')) {
+    if (trimmed === exports.FETCH_BIN ||
+        trimmed.startsWith(exports.FETCH_BIN + ' ') ||
+        trimmed === exports.WRAP_BIN ||
+        trimmed.startsWith(exports.WRAP_BIN + ' ')) {
         const next = { ...s };
         delete next.statusLine;
         return next;

package/dist/src/token.js

@@ -61,6 +61,57 @@ function tryKeychain() {
         return null;
     }
 }
+const WIN_CRED_TARGET = 'Claude Code-credentials';
+const WIN_PS_SCRIPT = `$ErrorActionPreference='Stop';try{$src=@'
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+public static class CcuCred {
+  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+  private struct CRED {
+    public uint Flags;
+    public uint Type;
+    public IntPtr TargetName;
+    public IntPtr Comment;
+    public long LastWritten;
+    public uint BlobSize;
+    public IntPtr Blob;
+    public uint Persist;
+    public uint AttributeCount;
+    public IntPtr Attributes;
+    public IntPtr TargetAlias;
+    public IntPtr UserName;
+  }
+  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
+  private static extern bool CredRead(string target, int type, int flag, out IntPtr cred);
+  [DllImport("advapi32.dll", SetLastError=true)]
+  private static extern void CredFree(IntPtr cred);
+  public static string Read(string target) {
+    IntPtr p;
+    if (!CredRead(target, 1, 0, out p)) return null;
+    try {
+      var c = (CRED)Marshal.PtrToStructure(p, typeof(CRED));
+      if (c.BlobSize == 0 || c.Blob == IntPtr.Zero) return null;
+      byte[] buf = new byte[c.BlobSize];
+      Marshal.Copy(c.Blob, buf, 0, (int)c.BlobSize);
+      return Encoding.Unicode.GetString(buf);
+    } finally {
+      CredFree(p);
+    }
+  }
+}
+'@;Add-Type -TypeDefinition $src -Language CSharp | Out-Null;$v=[CcuCred]::Read('${WIN_CRED_TARGET}');if($v){[Console]::Out.Write($v)}}catch{exit 1}`;
+function tryWinCredentialManager() {
+    if (process.platform !== 'win32')
+        return null;
+    try {
+        const out = (0, node_child_process_1.execFileSync)('powershell.exe', ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', WIN_PS_SCRIPT], { stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000, encoding: 'utf8', windowsHide: true });
+        return extractToken(out);
+    }
+    catch {
+        return null;
+    }
+}
 function tryFile() {
     const credPath = path.join(os.homedir(), '.claude', '.credentials.json');
     try {
@@ -74,6 +125,9 @@ function getToken() {
     const fromKeychain = tryKeychain();
     if (fromKeychain)
         return { token: fromKeychain, source: 'keychain' };
+    const fromWinCred = tryWinCredentialManager();
+    if (fromWinCred)
+        return { token: fromWinCred, source: 'wincred' };
     const fromFile = tryFile();
     if (fromFile)
         return { token: fromFile, source: 'file' };