Compare commits
189
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3796139178 | ||
|
|
554eb80c0c | ||
|
|
a22bf3a309 | ||
|
|
eaab3eb539 | ||
|
|
323aa174da | ||
|
|
3803cf37f6 | ||
|
|
1977b51b74 | ||
|
|
64a3f15ac5 | ||
|
|
8fbd1c42c3 | ||
|
|
0bf19c3dc8 | ||
|
|
d56a714bb9 | ||
|
|
88f409971a | ||
|
|
9bac2540e8 | ||
|
|
792c5a26e9 | ||
|
|
421727bfb5 | ||
|
|
21b2905bcf | ||
|
|
38d6f2a582 | ||
|
|
7ea5554506 | ||
|
|
87c5992889 | ||
|
|
034e196214 | ||
|
|
2235a627b5 | ||
|
|
d6c138f1a2 | ||
|
|
432819639e | ||
|
|
52db469c13 | ||
|
|
40c86aaaf2 | ||
|
|
46b09934d7 | ||
|
|
a79a23ac24 | ||
|
|
3785629ee4 | ||
|
|
a338f4e5fe | ||
|
|
88e7d684c0 | ||
|
|
9af0d6401c | ||
|
|
7cb2159b4c | ||
|
|
206e97780d | ||
|
|
2b79ba4ae0 | ||
|
|
60b6c60c0a | ||
|
|
8140831236 | ||
|
|
9ed8916075 | ||
|
|
2ab2d913ce | ||
|
|
30ad89e458 | ||
|
|
3e4bfca2df | ||
|
|
4378463600 | ||
|
|
2cfd7d56a1 | ||
|
|
84bdfbd786 | ||
|
|
beba7586f9 | ||
|
|
a4dff4bde9 | ||
|
|
d0b33e8f43 | ||
|
|
6a5a3c9cd1 | ||
|
|
15e225439b | ||
|
|
91829b0ed9 | ||
|
|
caffc996ff | ||
|
|
cd13a6d124 | ||
|
|
566258e9c8 | ||
|
|
dc2a8e2307 | ||
|
|
f48b53fd8e | ||
|
|
ccfee938b7 | ||
|
|
28d952bcbd | ||
|
|
9bc023d239 | ||
|
|
fd82177a7d | ||
|
|
112210a99b | ||
|
|
f4a83940b1 | ||
|
|
377888a427 | ||
|
|
e24113a78b | ||
|
|
3baab91f70 | ||
|
|
0aa8837b2f | ||
|
|
373ca1dc14 | ||
|
|
7a4c21768f | ||
|
|
7b26629dc7 | ||
|
|
e446ea97f9 | ||
|
|
36af325e2d | ||
|
|
e2ef8b6f2a | ||
|
|
7a4975fa3e | ||
|
|
c9912f8463 | ||
|
|
238614a94b | ||
|
|
b11507221f | ||
|
|
b6fef53264 | ||
|
|
ec6ae6621a | ||
|
|
105a7706fa | ||
|
|
a950392a6f | ||
|
|
8087cc029d | ||
|
|
11f9e0c9b6 | ||
|
|
cc835ee2b0 | ||
|
|
8e7328b2c5 | ||
|
|
709eb12382 | ||
|
|
e866324a48 | ||
|
|
a62584221b | ||
|
|
fc7fd19652 | ||
|
|
58b947e515 | ||
|
|
88252e4d59 | ||
|
|
ad2ff3a7b6 | ||
|
|
1a9d9cd22a | ||
|
|
b8826ace9b | ||
|
|
2a0de269ff | ||
|
|
ac7ffe81af | ||
|
|
f28f7b8a5a | ||
|
|
aaed64484c | ||
|
|
2e3ee350ca | ||
|
|
e939bdb88b | ||
|
|
6749c5f158 | ||
|
|
de71ec2794 | ||
|
|
ac17ce154f | ||
|
|
d2eac62897 | ||
|
|
8c64fc50ad | ||
|
|
b2c138f665 | ||
|
|
aa6c299e2a | ||
|
|
ecbae7d7ca | ||
|
|
37a039e1d3 | ||
|
|
8f3ead2f65 | ||
|
|
734670bb3f | ||
|
|
94430e00ba | ||
|
|
7b0368b001 | ||
|
|
4629aeffbc | ||
|
|
2cb4ddfe97 | ||
|
|
73b251a1e9 | ||
|
|
7bab6a0df0 | ||
|
|
db6380fa66 | ||
|
|
47a148fa67 | ||
|
|
85ac329d36 | ||
|
|
a0fb6eabcf | ||
|
|
b778d03323 | ||
|
|
13387888b2 | ||
|
|
44be1649a1 | ||
|
|
1160712e1b | ||
|
|
e4f55c80ee | ||
|
|
526752dc36 | ||
|
|
a2d983b555 | ||
|
|
0d807c2285 | ||
|
|
1c42433145 | ||
|
|
c0ac2e5a66 | ||
|
|
405e65f9f7 | ||
|
|
1c7433ebea | ||
|
|
a39ef800e8 | ||
|
|
76dec8b85d | ||
|
|
2f04f8581c | ||
|
|
788c066a1e | ||
|
|
31280d4ab2 | ||
|
|
7b1c5bbf8e | ||
|
|
f2ba44bbaa | ||
|
|
de1fffe0e3 | ||
|
|
e80f07d1b9 | ||
|
|
e9ca8a7efc | ||
|
|
63ef2005a4 | ||
|
|
5ad7bb26f0 | ||
|
|
132a2a8f8d | ||
|
|
debd1c1850 | ||
|
|
9bcbb2ae7d | ||
|
|
c9384f6424 | ||
|
|
e4693fc18f | ||
|
|
84a8592bae | ||
|
|
bdd2038364 | ||
|
|
fd61face77 | ||
|
|
1f58a81a26 | ||
|
|
7f6da51860 | ||
|
|
b49ac23863 | ||
|
|
01d268c3e5 | ||
|
|
871d5245ac | ||
|
|
0524f9b791 | ||
|
|
d68d564351 | ||
|
|
d55bad01db | ||
|
|
7bc72e240b | ||
|
|
d77ed23d09 | ||
|
|
6136b0ded0 | ||
|
|
aba7168448 | ||
|
|
a8c2083397 | ||
|
|
ad23446ed4 | ||
|
|
d8b75d279c | ||
|
|
2658ff7f6a | ||
|
|
e10d79e5a6 | ||
|
|
88daa27630 | ||
|
|
b7c4958a74 | ||
|
|
f46b13d967 | ||
|
|
c449882ec6 | ||
|
|
3c1a2ef1be | ||
|
|
c238db963b | ||
|
|
63c9a8582d | ||
|
|
6f256b3308 | ||
|
|
2761b31a12 | ||
|
|
f9d8abebd5 | ||
|
|
66ee233b1b | ||
|
|
a12c664bde | ||
|
|
c7251d8785 | ||
|
|
7a95b100ef | ||
|
|
fb98c69c34 | ||
|
|
5629c6b61e | ||
|
|
4709f5b0f5 | ||
|
|
5f8aeaa6e9 | ||
|
|
27f1f45109 | ||
|
|
7a5512cc28 | ||
|
|
8c89ce4636 | ||
|
|
3a964dc2f8 |
@@ -18,12 +18,18 @@ Steps to reproduce the behaviour:
|
|||||||
**Expected behaviour**
|
**Expected behaviour**
|
||||||
What you expected to happen.
|
What you expected to happen.
|
||||||
|
|
||||||
|
**Diagnostics**
|
||||||
|
Open the app → Settings → Diagnostics, then click "Copy All" and paste the output here.
|
||||||
|
This shows the error, request state, and cookie info. Email and org IDs are automatically redacted when you click Copy All.
|
||||||
|
|
||||||
**Screenshots**
|
**Screenshots**
|
||||||
If applicable, add screenshots to help explain your problem.
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
**Environment**
|
**Environment**
|
||||||
- macOS version: [e.g. Sequoia 15.4]
|
- Platform: [macOS / Windows]
|
||||||
- ClaudeChecker version: [e.g. 1.1.3]
|
- macOS version: [e.g. Sequoia 15.4] *(if applicable)*
|
||||||
|
- Windows version: [e.g. Windows 11 24H2] *(if applicable)*
|
||||||
|
- ClaudeChecker version: [e.g. 1.3.2]
|
||||||
- Claude plan: [e.g. Pro, Max]
|
- Claude plan: [e.g. Pro, Max]
|
||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
|
shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
|
||||||
tag="${{ github.ref_name }}"
|
tag="${{ github.ref_name }}"
|
||||||
export BADGE="[](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
|
export BADGE="[](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
|
||||||
python3 -c "
|
python3 -c "
|
||||||
import os
|
import os
|
||||||
badge = os.environ['BADGE']
|
badge = os.environ['BADGE']
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
name: Release Windows Beta
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'win-v*-beta*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release-windows-beta:
|
|
||||||
runs-on: windows-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup .NET
|
|
||||||
uses: actions/setup-dotnet@v4
|
|
||||||
with:
|
|
||||||
dotnet-version: '8.0.x'
|
|
||||||
|
|
||||||
- name: Get version from tag
|
|
||||||
id: version
|
|
||||||
shell: bash
|
|
||||||
run: echo "version=${GITHUB_REF_NAME#win-v}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Publish
|
|
||||||
run: |
|
|
||||||
dotnet publish windows/ClaudeCheckerWindows.csproj `
|
|
||||||
-c Release -r win-x64 `
|
|
||||||
--self-contained true `
|
|
||||||
-p:PublishSingleFile=true `
|
|
||||||
-p:Version=${{ steps.version.outputs.version }} `
|
|
||||||
-o publish
|
|
||||||
|
|
||||||
- name: Zip
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
Copy-Item -Recurse windows/Assets publish/Assets
|
|
||||||
Compress-Archive -Path publish/* -DestinationPath ClaudeChecker-Windows.zip
|
|
||||||
|
|
||||||
- name: Create GitHub pre-release
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
|
|
||||||
gh release create "$GITHUB_REF_NAME" ClaudeChecker-Windows.zip \
|
|
||||||
--title "$GITHUB_REF_NAME" \
|
|
||||||
--prerelease \
|
|
||||||
--notes "$notes"
|
|
||||||
|
|
||||||
- name: Update version-windows-beta.json on main
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
|
|
||||||
content=$(jq -n \
|
|
||||||
--arg version "${{ steps.version.outputs.version }}" \
|
|
||||||
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
|
|
||||||
--arg notes "$notes" \
|
|
||||||
'{version: $version, url: $url, notes: $notes}' | base64 -w0)
|
|
||||||
sha=$(gh api "repos/${{ github.repository }}/contents/version-windows-beta.json?ref=main" --jq .sha 2>/dev/null || echo "")
|
|
||||||
if [ -n "$sha" ]; then
|
|
||||||
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
|
|
||||||
--field "message=Windows beta release ${{ github.ref_name }}" \
|
|
||||||
--field "content=$content" \
|
|
||||||
--field "branch=main" \
|
|
||||||
--field "sha=$sha"
|
|
||||||
else
|
|
||||||
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
|
|
||||||
--field "message=Windows beta release ${{ github.ref_name }}" \
|
|
||||||
--field "content=$content" \
|
|
||||||
--field "branch=main"
|
|
||||||
fi
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
name: Release Windows
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'win-v[0-9]*'
|
|
||||||
- '!win-v*-*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release-windows:
|
|
||||||
runs-on: windows-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup .NET
|
|
||||||
uses: actions/setup-dotnet@v4
|
|
||||||
with:
|
|
||||||
dotnet-version: '8.0.x'
|
|
||||||
|
|
||||||
- name: Get version from tag
|
|
||||||
id: version
|
|
||||||
shell: bash
|
|
||||||
run: echo "version=${GITHUB_REF_NAME#win-v}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Publish
|
|
||||||
run: |
|
|
||||||
dotnet publish windows/ClaudeCheckerWindows.csproj `
|
|
||||||
-c Release -r win-x64 `
|
|
||||||
--self-contained true `
|
|
||||||
-p:PublishSingleFile=true `
|
|
||||||
-p:Version=${{ steps.version.outputs.version }} `
|
|
||||||
-o publish
|
|
||||||
|
|
||||||
- name: Zip
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
Copy-Item -Recurse windows/Assets publish/Assets
|
|
||||||
Compress-Archive -Path publish/* -DestinationPath ClaudeChecker-Windows.zip
|
|
||||||
|
|
||||||
- name: Create GitHub release
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
|
|
||||||
gh release create "$GITHUB_REF_NAME" ClaudeChecker-Windows.zip \
|
|
||||||
--title "$GITHUB_REF_NAME" \
|
|
||||||
--notes "$notes"
|
|
||||||
|
|
||||||
- name: Update version-windows.json on main
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
|
|
||||||
content=$(jq -n \
|
|
||||||
--arg version "${{ steps.version.outputs.version }}" \
|
|
||||||
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
|
|
||||||
--arg notes "$notes" \
|
|
||||||
'{version: $version, url: $url, notes: $notes}' | base64 -w0)
|
|
||||||
sha=$(gh api "repos/${{ github.repository }}/contents/version-windows.json?ref=main" --jq .sha 2>/dev/null || echo "")
|
|
||||||
if [ -n "$sha" ]; then
|
|
||||||
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
|
|
||||||
--field "message=Windows release ${{ github.ref_name }}" \
|
|
||||||
--field "content=$content" \
|
|
||||||
--field "branch=main" \
|
|
||||||
--field "sha=$sha"
|
|
||||||
else
|
|
||||||
gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
|
|
||||||
--field "message=Windows release ${{ github.ref_name }}" \
|
|
||||||
--field "content=$content" \
|
|
||||||
--field "branch=main"
|
|
||||||
fi
|
|
||||||
@@ -73,15 +73,9 @@ jobs:
|
|||||||
import os, re
|
import os, re
|
||||||
v = os.environ['NEW_VERSION']
|
v = os.environ['NEW_VERSION']
|
||||||
content = open('README.md').read()
|
content = open('README.md').read()
|
||||||
content = re.sub(r'version-[0-9][^-]*-orange', 'version-' + v + '-orange', content)
|
content = re.sub(r'macOS_Stable-[^-]+-orange', 'macOS_Stable-' + v + '-orange', content)
|
||||||
lines = content.splitlines(keepends=True)
|
lines = content.splitlines(keepends=True)
|
||||||
out = []
|
out = ['<!-- BETA_BADGE -->' + chr(10) if '<!-- BETA_BADGE -->' in line else line for line in lines]
|
||||||
for line in lines:
|
|
||||||
if '<!-- BETA_BADGE -->' in line:
|
|
||||||
continue
|
|
||||||
out.append(line)
|
|
||||||
if 'license-MIT-blue' in line:
|
|
||||||
out.append('<!-- BETA_BADGE -->' + chr(10))
|
|
||||||
open('README.md', 'w').writelines(out)
|
open('README.md', 'w').writelines(out)
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,13 @@
|
|||||||
<string>77</string>
|
<string>77</string>
|
||||||
<key>objects</key>
|
<key>objects</key>
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>AAAAAA009</key>
|
||||||
|
<dict>
|
||||||
|
<key>isa</key>
|
||||||
|
<string>PBXBuildFile</string>
|
||||||
|
<key>fileRef</key>
|
||||||
|
<string>AAAAAA109</string>
|
||||||
|
</dict>
|
||||||
<key>AAAAAA007</key>
|
<key>AAAAAA007</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>isa</key>
|
<key>isa</key>
|
||||||
@@ -88,6 +95,17 @@
|
|||||||
<key>sourceTree</key>
|
<key>sourceTree</key>
|
||||||
<string><group></string>
|
<string><group></string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>AAAAAA109</key>
|
||||||
|
<dict>
|
||||||
|
<key>isa</key>
|
||||||
|
<string>PBXFileReference</string>
|
||||||
|
<key>lastKnownFileType</key>
|
||||||
|
<string>sourcecode.swift</string>
|
||||||
|
<key>path</key>
|
||||||
|
<string>DiagnosticsView.swift</string>
|
||||||
|
<key>sourceTree</key>
|
||||||
|
<string><group></string>
|
||||||
|
</dict>
|
||||||
<key>AAAAAA101</key>
|
<key>AAAAAA101</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>isa</key>
|
<key>isa</key>
|
||||||
@@ -179,6 +197,7 @@
|
|||||||
<string>AAAAAA106</string>
|
<string>AAAAAA106</string>
|
||||||
<string>AAAAAA107</string>
|
<string>AAAAAA107</string>
|
||||||
<string>AAAAAA108</string>
|
<string>AAAAAA108</string>
|
||||||
|
<string>AAAAAA109</string>
|
||||||
</array>
|
</array>
|
||||||
<key>path</key>
|
<key>path</key>
|
||||||
<string>ClaudeChecker</string>
|
<string>ClaudeChecker</string>
|
||||||
@@ -292,6 +311,7 @@
|
|||||||
<string>AAAAAA005</string>
|
<string>AAAAAA005</string>
|
||||||
<string>AAAAAA007</string>
|
<string>AAAAAA007</string>
|
||||||
<string>AAAAAA008</string>
|
<string>AAAAAA008</string>
|
||||||
|
<string>AAAAAA009</string>
|
||||||
</array>
|
</array>
|
||||||
<key>runOnlyForDeploymentPostprocessing</key>
|
<key>runOnlyForDeploymentPostprocessing</key>
|
||||||
<string>0</string>
|
<string>0</string>
|
||||||
|
|||||||
@@ -18,16 +18,43 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
var updateManager = UpdateManager()
|
var updateManager = UpdateManager()
|
||||||
var refreshTimer: Timer?
|
var refreshTimer: Timer?
|
||||||
var cookiePrimerView: WKWebView?
|
var cookiePrimerView: WKWebView?
|
||||||
|
var cookiePrimerWindow: NSWindow?
|
||||||
|
var primerNavDelegate: PrimerNavDelegate?
|
||||||
var cancellables = Set<AnyCancellable>()
|
var cancellables = Set<AnyCancellable>()
|
||||||
|
|
||||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||||
NSApp.setActivationPolicy(.accessory)
|
NSApp.setActivationPolicy(.accessory)
|
||||||
|
|
||||||
// Hidden WKWebView to prime the shared cookie store
|
// Background WebView that loads claude.ai on every launch.
|
||||||
|
// Anchored in a real (off-screen, invisible) NSWindow so WebKit doesn't throttle
|
||||||
|
// JS execution. When the page finishes loading the nav delegate calls
|
||||||
|
// adoptPrimerWebView, which sets it as the API WebView and runs the first fetch.
|
||||||
let config = WKWebViewConfiguration()
|
let config = WKWebViewConfiguration()
|
||||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
config.websiteDataStore = WKWebsiteDataStore.default()
|
||||||
cookiePrimerView = WKWebView(frame: .zero, configuration: config)
|
let wv = WKWebView(frame: CGRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
||||||
cookiePrimerView?.load(URLRequest(url: URL(string: "https://claude.ai/api/organizations/\(UsageViewModel.orgId)/usage")!))
|
let win = NSWindow(
|
||||||
|
contentRect: NSRect(x: -9999, y: -9999, width: 1, height: 1),
|
||||||
|
styleMask: [],
|
||||||
|
backing: .buffered,
|
||||||
|
defer: false
|
||||||
|
)
|
||||||
|
win.contentView = wv
|
||||||
|
win.alphaValue = 0
|
||||||
|
win.orderFront(nil)
|
||||||
|
cookiePrimerWindow = win
|
||||||
|
cookiePrimerView = wv
|
||||||
|
|
||||||
|
let delegate = PrimerNavDelegate { [weak self] in
|
||||||
|
guard let self, let wv = self.cookiePrimerView else { return }
|
||||||
|
Task { @MainActor [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
await self.usageViewModel.adoptPrimerWebView(wv)
|
||||||
|
await self.updateManager.checkForUpdates()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
primerNavDelegate = delegate
|
||||||
|
wv.navigationDelegate = delegate
|
||||||
|
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||||
|
|
||||||
// Status item
|
// Status item
|
||||||
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||||
@@ -134,12 +161,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initial fetch after cookie primer + update check
|
|
||||||
Task {
|
|
||||||
try? await Task.sleep(nanoseconds: 1_500_000_000)
|
|
||||||
await usageViewModel.refresh()
|
|
||||||
await updateManager.checkForUpdates()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func setMenubarIcon(button: NSStatusBarButton) {
|
private func setMenubarIcon(button: NSStatusBarButton) {
|
||||||
@@ -240,4 +261,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// One-shot WKNavigationDelegate: fires onDone on first finish or error, then goes silent.
|
||||||
|
final class PrimerNavDelegate: NSObject, WKNavigationDelegate {
|
||||||
|
private var done = false
|
||||||
|
private let onDone: () -> Void
|
||||||
|
init(_ onDone: @escaping () -> Void) { self.onDone = onDone }
|
||||||
|
private func finish() { guard !done else { return }; done = true; onDone() }
|
||||||
|
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { finish() }
|
||||||
|
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) { finish() }
|
||||||
|
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { finish() }
|
||||||
|
}
|
||||||
|
|||||||
@@ -40,8 +40,7 @@ struct ContentView: View {
|
|||||||
.environmentObject(updater)
|
.environmentObject(updater)
|
||||||
.transition(.move(edge: .trailing).combined(with: .opacity))
|
.transition(.move(edge: .trailing).combined(with: .opacity))
|
||||||
} else {
|
} else {
|
||||||
ScrollView(.vertical, showsIndicators: false) {
|
VStack(spacing: 0) {
|
||||||
VStack(spacing: 0) {
|
|
||||||
// Cards grid
|
// Cards grid
|
||||||
if vm.limits.isEmpty {
|
if vm.limits.isEmpty {
|
||||||
EmptyStateView()
|
EmptyStateView()
|
||||||
@@ -96,7 +95,6 @@ struct ContentView: View {
|
|||||||
.padding(.bottom, 8)
|
.padding(.bottom, 8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.transition(.opacity)
|
.transition(.opacity)
|
||||||
|
|
||||||
@@ -118,8 +116,8 @@ struct ContentView: View {
|
|||||||
showUpdateSheet = true
|
showUpdateSheet = true
|
||||||
}
|
}
|
||||||
.sheet(isPresented: $showLogin) {
|
.sheet(isPresented: $showLogin) {
|
||||||
LoginSheetView(isPresented: $showLogin) {
|
LoginSheetView(isPresented: $showLogin) { webView in
|
||||||
Task { await vm.refresh() }
|
Task { await vm.adoptAndRefresh(webView) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(isPresented: $showUpdateSheet) {
|
.sheet(isPresented: $showUpdateSheet) {
|
||||||
@@ -398,12 +396,11 @@ struct DiaryRow: View {
|
|||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: 5) {
|
VStack(alignment: .leading, spacing: 5) {
|
||||||
HStack {
|
HStack {
|
||||||
AgentIconView(agent: .claude, size: 12)
|
Text("\(totalSaved) samples")
|
||||||
Text("Claude")
|
.font(.system(size: 10.5))
|
||||||
.font(.system(size: 12, weight: .medium))
|
.foregroundColor(.secondary)
|
||||||
.foregroundColor(color)
|
|
||||||
Spacer()
|
Spacer()
|
||||||
Text("\(totalSaved) samples · Avg Burn Rate: +\(String(format: "%.1f", burnRate))%/h")
|
Text("Avg burn rate: \(String(format: "%.1f", burnRate))%/h")
|
||||||
.font(.system(size: 10.5))
|
.font(.system(size: 10.5))
|
||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
}
|
}
|
||||||
@@ -587,6 +584,7 @@ struct SettingsView: View {
|
|||||||
@Binding var showSettings: Bool
|
@Binding var showSettings: Bool
|
||||||
@Binding var showUpdateSheet: Bool
|
@Binding var showUpdateSheet: Bool
|
||||||
@State private var checkingForUpdates = false
|
@State private var checkingForUpdates = false
|
||||||
|
@State private var showDiagnostics = false
|
||||||
|
|
||||||
let refreshOptions: [(label: String, seconds: TimeInterval)] = [
|
let refreshOptions: [(label: String, seconds: TimeInterval)] = [
|
||||||
("1 min", 60),
|
("1 min", 60),
|
||||||
@@ -773,6 +771,23 @@ struct SettingsView: View {
|
|||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|
||||||
|
// Diagnostics
|
||||||
|
HStack {
|
||||||
|
Label("Diagnostics", systemImage: "stethoscope")
|
||||||
|
.font(.system(size: 12, weight: .medium))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
Spacer()
|
||||||
|
Button("Open") { showDiagnostics = true }
|
||||||
|
.buttonStyle(.bordered)
|
||||||
|
.controlSize(.small)
|
||||||
|
}
|
||||||
|
.sheet(isPresented: $showDiagnostics) {
|
||||||
|
DiagnosticsView(isPresented: $showDiagnostics)
|
||||||
|
.environmentObject(vm)
|
||||||
|
}
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
// About
|
// About
|
||||||
HStack(spacing: 12) {
|
HStack(spacing: 12) {
|
||||||
Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
|
Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
|
||||||
@@ -914,12 +929,12 @@ struct ErrorBanner: View {
|
|||||||
struct EmptyStateView: View {
|
struct EmptyStateView: View {
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(spacing: 10) {
|
VStack(spacing: 10) {
|
||||||
Image(systemName: "key.slash")
|
Image(systemName: "person.crop.circle.badge.questionmark")
|
||||||
.font(.system(size: 28))
|
.font(.system(size: 28))
|
||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
Text("No API key configured")
|
Text("Not signed in")
|
||||||
.font(.system(size: 13, weight: .medium))
|
.font(.system(size: 13, weight: .medium))
|
||||||
Text("Open Settings to add your Anthropic API key.")
|
Text("Sign in to claude.ai to see your usage.")
|
||||||
.font(.system(size: 11.5))
|
.font(.system(size: 11.5))
|
||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
.multilineTextAlignment(.center)
|
.multilineTextAlignment(.center)
|
||||||
|
|||||||
@@ -0,0 +1,209 @@
|
|||||||
|
import SwiftUI
|
||||||
|
import WebKit
|
||||||
|
|
||||||
|
struct DiagnosticsView: View {
|
||||||
|
@EnvironmentObject var vm: UsageViewModel
|
||||||
|
@Binding var isPresented: Bool
|
||||||
|
@State private var liveAllCookies: [HTTPCookie] = []
|
||||||
|
@State private var loadingCookies = false
|
||||||
|
@State private var copied = false
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(spacing: 0) {
|
||||||
|
// Header
|
||||||
|
HStack {
|
||||||
|
Text("Diagnostics")
|
||||||
|
.font(.system(size: 13, weight: .semibold))
|
||||||
|
Spacer()
|
||||||
|
Button("Copy All") {
|
||||||
|
NSPasteboard.general.clearContents()
|
||||||
|
NSPasteboard.general.setString(fullDiagText, forType: .string)
|
||||||
|
copied = true
|
||||||
|
DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { copied = false }
|
||||||
|
}
|
||||||
|
.buttonStyle(.bordered)
|
||||||
|
.controlSize(.small)
|
||||||
|
if copied {
|
||||||
|
Text("Copied! (IDs redacted)")
|
||||||
|
.font(.system(size: 11))
|
||||||
|
.foregroundColor(.green)
|
||||||
|
}
|
||||||
|
Button("Close") { isPresented = false }
|
||||||
|
.buttonStyle(.bordered)
|
||||||
|
.controlSize(.small)
|
||||||
|
}
|
||||||
|
.padding(.horizontal, 14)
|
||||||
|
.padding(.vertical, 10)
|
||||||
|
.background(Color(nsColor: .windowBackgroundColor))
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
|
Text("Email and org IDs are redacted when copied.")
|
||||||
|
.font(.system(size: 10))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.padding(.horizontal, 14)
|
||||||
|
.padding(.vertical, 6)
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
|
ScrollView {
|
||||||
|
VStack(alignment: .leading, spacing: 14) {
|
||||||
|
|
||||||
|
// App info
|
||||||
|
DiagSection(title: "App") {
|
||||||
|
DiagRow("Version", Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?")
|
||||||
|
DiagRow("Build", Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?")
|
||||||
|
DiagRow("Signed in", vm.isSignedIn ? "Yes" : "No")
|
||||||
|
DiagRow("Org ID", UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")
|
||||||
|
DiagRow("lastActiveOrg", vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)
|
||||||
|
DiagRow("Error", vm.errorMessage ?? "(none)")
|
||||||
|
}
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
|
// Last request
|
||||||
|
DiagSection(title: "Last Request") {
|
||||||
|
DiagRow("Path", vm.diagLastPath.isEmpty ? "(none)" : vm.diagLastPath)
|
||||||
|
DiagRow("Status", vm.diagLastStatus == 0 ? "(none)" : "\(vm.diagLastStatus)")
|
||||||
|
DiagRow("Error", vm.diagLastError.isEmpty ? "(none)" : vm.diagLastError)
|
||||||
|
if let t = vm.diagLastFetch {
|
||||||
|
DiagRow("Time", t.formatted(date: .omitted, time: .standard))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
|
// Live cookie list
|
||||||
|
DiagSection(title: "Live Cookie Names (WKWebsiteDataStore.default)") {
|
||||||
|
if loadingCookies {
|
||||||
|
ProgressView().scaleEffect(0.7)
|
||||||
|
} else if liveAllCookies.isEmpty {
|
||||||
|
Text("No cookies found")
|
||||||
|
.font(.system(size: 11))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
} else {
|
||||||
|
let claudeCookies = liveAllCookies.filter {
|
||||||
|
$0.domain.contains("claude.ai") || $0.domain.contains("anthropic.com")
|
||||||
|
}
|
||||||
|
let otherCookies = liveAllCookies.filter {
|
||||||
|
!$0.domain.contains("claude.ai") && !$0.domain.contains("anthropic.com")
|
||||||
|
}
|
||||||
|
if !claudeCookies.isEmpty {
|
||||||
|
Text("claude.ai / anthropic.com (\(claudeCookies.count))")
|
||||||
|
.font(.system(size: 10, weight: .medium))
|
||||||
|
.foregroundColor(.orange)
|
||||||
|
ForEach(claudeCookies, id: \.name) { c in
|
||||||
|
Text("• \(c.domain) \(c.name)")
|
||||||
|
.font(.system(size: 10, design: .monospaced))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !otherCookies.isEmpty {
|
||||||
|
Text("Other domains (\(otherCookies.count))")
|
||||||
|
.font(.system(size: 10, weight: .medium))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.padding(.top, 4)
|
||||||
|
ForEach(otherCookies.prefix(10), id: \.name) { c in
|
||||||
|
Text("• \(c.domain) \(c.name)")
|
||||||
|
.font(.system(size: 10, design: .monospaced))
|
||||||
|
.foregroundColor(Color.secondary.opacity(0.6))
|
||||||
|
}
|
||||||
|
if otherCookies.count > 10 {
|
||||||
|
Text("… and \(otherCookies.count - 10) more")
|
||||||
|
.font(.system(size: 10))
|
||||||
|
.foregroundColor(Color.secondary.opacity(0.5))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Button("Refresh cookies") { loadLiveCookies() }
|
||||||
|
.buttonStyle(.bordered)
|
||||||
|
.controlSize(.small)
|
||||||
|
.padding(.top, 4)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(14)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.frame(width: 480, height: 560)
|
||||||
|
.onAppear { loadLiveCookies() }
|
||||||
|
}
|
||||||
|
|
||||||
|
private func loadLiveCookies() {
|
||||||
|
loadingCookies = true
|
||||||
|
WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
liveAllCookies = cookies.sorted { $0.domain < $1.domain }
|
||||||
|
loadingCookies = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var fullDiagText: String {
|
||||||
|
var lines: [String] = []
|
||||||
|
lines.append("=== ClaudeChecker Diagnostics ===")
|
||||||
|
lines.append("Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?") (\(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"))")
|
||||||
|
lines.append("Signed in: \(vm.isSignedIn ? "Yes" : "No")")
|
||||||
|
lines.append("Error: \(vm.errorMessage ?? "(none)")")
|
||||||
|
lines.append("")
|
||||||
|
lines.append("Last path: \(vm.diagLastPath)")
|
||||||
|
lines.append("Last status: \(vm.diagLastStatus)")
|
||||||
|
lines.append("Last error: \(vm.diagLastError)")
|
||||||
|
lines.append("")
|
||||||
|
lines.append("")
|
||||||
|
lines.append("Live cookies:")
|
||||||
|
for c in liveAllCookies {
|
||||||
|
lines.append(" \(c.domain) \(c.name) httpOnly=\(c.isHTTPOnly) secure=\(c.isSecure)")
|
||||||
|
}
|
||||||
|
return redactUUIDs(lines.joined(separator: "\n"))
|
||||||
|
}
|
||||||
|
|
||||||
|
private func redactUUIDs(_ text: String) -> String {
|
||||||
|
let pattern = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
|
||||||
|
guard let regex = try? NSRegularExpression(pattern: pattern) else { return text }
|
||||||
|
let range = NSRange(text.startIndex..., in: text)
|
||||||
|
return regex.stringByReplacingMatches(in: text, range: range, withTemplate: "****")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Helpers
|
||||||
|
|
||||||
|
private struct DiagSection<Content: View>: View {
|
||||||
|
let title: String
|
||||||
|
@ViewBuilder let content: () -> Content
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
|
Text(title)
|
||||||
|
.font(.system(size: 11, weight: .semibold))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.textCase(.uppercase)
|
||||||
|
content()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct DiagRow: View {
|
||||||
|
let label: String
|
||||||
|
let value: String
|
||||||
|
|
||||||
|
init(_ label: String, _ value: String) {
|
||||||
|
self.label = label
|
||||||
|
self.value = value
|
||||||
|
}
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
HStack(alignment: .top, spacing: 8) {
|
||||||
|
Text(label)
|
||||||
|
.font(.system(size: 11))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.frame(width: 100, alignment: .leading)
|
||||||
|
Text(value)
|
||||||
|
.font(.system(size: 11, design: .monospaced))
|
||||||
|
.foregroundColor(.primary)
|
||||||
|
.textSelection(.enabled)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,9 +15,9 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.1.3</string>
|
<string>1.3.3-beta.3</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>40</string>
|
<string>79</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>13.0</string>
|
<string>13.0</string>
|
||||||
<key>LSUIElement</key>
|
<key>LSUIElement</key>
|
||||||
@@ -45,7 +45,3 @@
|
|||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import WebKit
|
|||||||
// MARK: - Login Web View
|
// MARK: - Login Web View
|
||||||
|
|
||||||
struct LoginWebView: NSViewRepresentable {
|
struct LoginWebView: NSViewRepresentable {
|
||||||
let onAuthenticated: () -> Void
|
let onAuthenticated: (WKWebView) -> Void
|
||||||
|
|
||||||
func makeNSView(context: Context) -> WKWebView {
|
func makeNSView(context: Context) -> WKWebView {
|
||||||
let config = WKWebViewConfiguration()
|
let config = WKWebViewConfiguration()
|
||||||
@@ -12,6 +12,13 @@ struct LoginWebView: NSViewRepresentable {
|
|||||||
|
|
||||||
let webView = WKWebView(frame: .zero, configuration: config)
|
let webView = WKWebView(frame: .zero, configuration: config)
|
||||||
webView.navigationDelegate = context.coordinator
|
webView.navigationDelegate = context.coordinator
|
||||||
|
context.coordinator.webView = webView
|
||||||
|
|
||||||
|
// KVO on url catches SPA pushState navigations that don't fire didFinish
|
||||||
|
context.coordinator.urlObservation = webView.observe(\.url, options: [.new]) { [weak coordinator = context.coordinator] wv, _ in
|
||||||
|
coordinator?.checkCurrentURL(wv.url?.absoluteString)
|
||||||
|
}
|
||||||
|
|
||||||
webView.load(URLRequest(url: URL(string: "https://claude.ai/login")!))
|
webView.load(URLRequest(url: URL(string: "https://claude.ai/login")!))
|
||||||
return webView
|
return webView
|
||||||
}
|
}
|
||||||
@@ -23,31 +30,31 @@ struct LoginWebView: NSViewRepresentable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class Coordinator: NSObject, WKNavigationDelegate {
|
class Coordinator: NSObject, WKNavigationDelegate {
|
||||||
let onAuthenticated: () -> Void
|
let onAuthenticated: (WKWebView) -> Void
|
||||||
|
weak var webView: WKWebView?
|
||||||
var didAuthenticate = false
|
var didAuthenticate = false
|
||||||
|
var urlObservation: NSKeyValueObservation?
|
||||||
|
|
||||||
init(onAuthenticated: @escaping () -> Void) {
|
init(onAuthenticated: @escaping (WKWebView) -> Void) {
|
||||||
self.onAuthenticated = onAuthenticated
|
self.onAuthenticated = onAuthenticated
|
||||||
}
|
}
|
||||||
|
|
||||||
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
func checkCurrentURL(_ url: String?) {
|
||||||
guard !didAuthenticate else { return }
|
guard !didAuthenticate, let url, let wv = webView else { return }
|
||||||
// Don't fire on the login/auth pages themselves
|
// Ignore navigations to external OAuth providers (Google, etc.) —
|
||||||
if let url = webView.url?.absoluteString,
|
// only consider auth complete when we land back on claude.ai/anthropic.com
|
||||||
url.contains("/login") || url.contains("/auth") { return }
|
guard url.contains("claude.ai") || url.contains("anthropic.com") else { return }
|
||||||
|
if url.contains("/login") || url.contains("/auth") { return }
|
||||||
WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
|
didAuthenticate = true
|
||||||
let hasSession = cookies.contains {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||||
$0.domain.contains("claude.ai") &&
|
self.onAuthenticated(wv)
|
||||||
($0.name == "sessionKey" || $0.name == "__Secure-next-auth.session-token")
|
|
||||||
}
|
|
||||||
guard hasSession, !self.didAuthenticate else { return }
|
|
||||||
self.didAuthenticate = true
|
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
|
||||||
self.onAuthenticated()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Covers full cross-document navigations
|
||||||
|
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
||||||
|
checkCurrentURL(webView.url?.absoluteString)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +62,7 @@ struct LoginWebView: NSViewRepresentable {
|
|||||||
|
|
||||||
struct LoginSheetView: View {
|
struct LoginSheetView: View {
|
||||||
@Binding var isPresented: Bool
|
@Binding var isPresented: Bool
|
||||||
let onDone: () -> Void
|
let onDone: (WKWebView) -> Void
|
||||||
@State private var authenticated = false
|
@State private var authenticated = false
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
@@ -65,12 +72,9 @@ struct LoginSheetView: View {
|
|||||||
.font(.system(size: 13, weight: .semibold))
|
.font(.system(size: 13, weight: .semibold))
|
||||||
Spacer()
|
Spacer()
|
||||||
if authenticated {
|
if authenticated {
|
||||||
Button("Done") {
|
Button("Done") { isPresented = false }
|
||||||
isPresented = false
|
.buttonStyle(.borderedProminent)
|
||||||
onDone()
|
.controlSize(.small)
|
||||||
}
|
|
||||||
.buttonStyle(.borderedProminent)
|
|
||||||
.controlSize(.small)
|
|
||||||
} else {
|
} else {
|
||||||
Button("Cancel") { isPresented = false }
|
Button("Cancel") { isPresented = false }
|
||||||
.buttonStyle(.bordered)
|
.buttonStyle(.bordered)
|
||||||
@@ -83,12 +87,13 @@ struct LoginSheetView: View {
|
|||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|
||||||
LoginWebView {
|
LoginWebView { webView in
|
||||||
authenticated = true
|
authenticated = true
|
||||||
// Auto-dismiss and refresh after brief delay
|
// Adopt the authenticated WebView immediately (before sheet tears it down),
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {
|
// then auto-dismiss after a moment so the user sees confirmation.
|
||||||
|
onDone(webView)
|
||||||
|
DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
|
||||||
isPresented = false
|
isPresented = false
|
||||||
onDone()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import WebKit
|
|||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
class UsageViewModel: ObservableObject {
|
class UsageViewModel: ObservableObject {
|
||||||
static let orgId = "daf626a9-4924-4ff3-ba98-23b523062f8e"
|
|
||||||
@Published var limits: [AgentLimit] = []
|
@Published var limits: [AgentLimit] = []
|
||||||
@Published var isLoading = false
|
@Published var isLoading = false
|
||||||
@Published var lastUpdated: Date?
|
@Published var lastUpdated: Date?
|
||||||
@@ -28,12 +27,23 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
private var burnHistoryStore: [String: [Double]] = [:]
|
private var burnHistoryStore: [String: [Double]] = [:]
|
||||||
private let maxHistorySamples = 24
|
private let maxHistorySamples = 24
|
||||||
private var cachedOrgId: String?
|
|
||||||
private var previousPercents: [String: Double] = [:]
|
private var previousPercents: [String: Double] = [:]
|
||||||
private var firedThresholds: [String: Set<Int>] = [:]
|
private var firedThresholds: [String: Set<Int>] = [:]
|
||||||
|
|
||||||
|
// WebView used for JS-based API calls (avoids URLSession 403 fingerprinting issues)
|
||||||
|
private var apiWebView: WKWebView?
|
||||||
|
|
||||||
|
// Diagnostics
|
||||||
|
@Published var diagCookieCount: Int = 0
|
||||||
|
@Published var diagClaudeCookieCount: Int = 0
|
||||||
|
@Published var diagCookieDomains: [String] = []
|
||||||
|
@Published var diagLastPath: String = ""
|
||||||
|
@Published var diagLastStatus: Int = 0
|
||||||
|
@Published var diagLastError: String = ""
|
||||||
|
@Published var diagLastActiveOrg: String = "" // lastActiveOrg cookie value from JS
|
||||||
|
@Published var diagLastFetch: Date? = nil
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
cachedOrgId = UserDefaults.standard.string(forKey: "claude_org_id") ?? Self.orgId
|
|
||||||
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
||||||
refreshInterval = saved > 0 ? saved : 60
|
refreshInterval = saved > 0 ? saved : 60
|
||||||
showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
|
showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
|
||||||
@@ -41,14 +51,146 @@ class UsageViewModel: ObservableObject {
|
|||||||
burnHistoryStore = saved
|
burnHistoryStore = saved
|
||||||
}
|
}
|
||||||
loadPlaceholderData()
|
loadPlaceholderData()
|
||||||
|
Task { await checkInitialSignInState() }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called by AppDelegate once the primer WebView has loaded claude.ai.
|
||||||
|
// Sets it as the API WebView and triggers the first data fetch.
|
||||||
|
func adoptPrimerWebView(_ wv: WKWebView) async {
|
||||||
|
apiWebView = wv
|
||||||
|
await refresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called after login: store the login WebView (already on claude.ai) so jsFetch can use it.
|
||||||
|
func adoptAndRefresh(_ loginWebView: WKWebView) async {
|
||||||
|
for _ in 0..<30 {
|
||||||
|
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
||||||
|
if cookies.contains(where: { $0.domain.contains("claude.ai") }) { break }
|
||||||
|
try? await Task.sleep(nanoseconds: 300_000_000)
|
||||||
|
}
|
||||||
|
apiWebView = loginWebView
|
||||||
|
await refresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Runs a fetch() inside the live claude.ai WebView — same browser context as the frontend,
|
||||||
|
// so no CORS/fingerprinting issues that URLSession hits.
|
||||||
|
private func jsFetch(_ path: String) async throws -> (Int, String) {
|
||||||
|
guard let wv = apiWebView else { throw AppError.networkError }
|
||||||
|
let js = """
|
||||||
|
const r = await fetch('\(path)', {
|
||||||
|
credentials: 'include',
|
||||||
|
headers: { 'Accept': 'application/json' }
|
||||||
|
});
|
||||||
|
const body = await r.text();
|
||||||
|
return {status: r.status, body: body};
|
||||||
|
"""
|
||||||
|
let result: Any? = try await withCheckedThrowingContinuation { cont in
|
||||||
|
wv.callAsyncJavaScript(js, arguments: [:], in: nil, in: .defaultClient) { res in
|
||||||
|
switch res {
|
||||||
|
case .success(let val): cont.resume(returning: val)
|
||||||
|
case .failure(let err): cont.resume(throwing: err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
guard let dict = result as? [String: Any],
|
||||||
|
let status = dict["status"] as? Int,
|
||||||
|
let body = dict["body"] as? String else {
|
||||||
|
throw AppError.networkError
|
||||||
|
}
|
||||||
|
diagLastPath = path
|
||||||
|
diagLastFetch = Date()
|
||||||
|
diagLastStatus = status
|
||||||
|
diagLastError = status != 200 ? "JS HTTP \(status)" : ""
|
||||||
|
return (status, body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use JS fetch when apiWebView is ready on claude.ai, otherwise fall back to URLSession.
|
||||||
|
private func apiFetch(_ path: String) async throws -> (Int, String) {
|
||||||
|
if let wv = apiWebView, wv.url?.host?.hasSuffix("claude.ai") == true {
|
||||||
|
return try await jsFetch(path)
|
||||||
|
}
|
||||||
|
return try await urlFetch(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetches an API path via URLSession with browser-like headers.
|
||||||
|
// Claude.ai's API requires sec-fetch-*, Origin, Referer, and a browser User-Agent
|
||||||
|
// to avoid 401 — matching how the Windows version (HttpClient) handles this.
|
||||||
|
private func urlFetch(_ path: String) async throws -> (Int, String) {
|
||||||
|
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
||||||
|
let claudeCookies = cookies.filter {
|
||||||
|
$0.domain.contains("claude.ai") || $0.domain.contains("anthropic.com")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record cookie diagnostics
|
||||||
|
diagCookieCount = cookies.count
|
||||||
|
diagClaudeCookieCount = claudeCookies.count
|
||||||
|
diagCookieDomains = Array(Set(cookies.map { $0.domain })).sorted()
|
||||||
|
diagLastPath = path
|
||||||
|
diagLastFetch = Date()
|
||||||
|
diagLastError = ""
|
||||||
|
|
||||||
|
guard !claudeCookies.isEmpty else {
|
||||||
|
let msg = "No claude.ai cookies (\(cookies.count) total in store)"
|
||||||
|
diagLastError = msg
|
||||||
|
throw AppError.detail(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
var req = URLRequest(url: URL(string: "https://claude.ai\(path)")!)
|
||||||
|
req.httpShouldHandleCookies = false
|
||||||
|
// Build cookie header manually (same format as Windows HttpClient) to avoid
|
||||||
|
// any encoding differences from HTTPCookie.requestHeaderFields(with:)
|
||||||
|
let cookieHeader = claudeCookies.map { "\($0.name)=\($0.value)" }.joined(separator: "; ")
|
||||||
|
req.setValue(cookieHeader, forHTTPHeaderField: "Cookie")
|
||||||
|
req.setValue("application/json", forHTTPHeaderField: "Accept")
|
||||||
|
req.setValue("https://claude.ai", forHTTPHeaderField: "Origin")
|
||||||
|
req.setValue("https://claude.ai/", forHTTPHeaderField: "Referer")
|
||||||
|
req.setValue("empty", forHTTPHeaderField: "sec-fetch-dest")
|
||||||
|
req.setValue("cors", forHTTPHeaderField: "sec-fetch-mode")
|
||||||
|
req.setValue("same-origin", forHTTPHeaderField: "sec-fetch-site")
|
||||||
|
req.setValue(
|
||||||
|
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
|
||||||
|
forHTTPHeaderField: "User-Agent")
|
||||||
|
req.setValue(
|
||||||
|
"\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\", \"Not-A.Brand\";v=\"99\"",
|
||||||
|
forHTTPHeaderField: "sec-ch-ua")
|
||||||
|
req.setValue("?0", forHTTPHeaderField: "sec-ch-ua-mobile")
|
||||||
|
req.setValue("\"macOS\"", forHTTPHeaderField: "sec-ch-ua-platform")
|
||||||
|
req.setValue("web", forHTTPHeaderField: "anthropic-client-platform")
|
||||||
|
|
||||||
|
let session = URLSession(configuration: .ephemeral)
|
||||||
|
do {
|
||||||
|
let (data, response) = try await session.data(for: req)
|
||||||
|
guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
|
||||||
|
let body = String(data: data, encoding: .utf8) ?? ""
|
||||||
|
diagLastStatus = http.statusCode
|
||||||
|
if http.statusCode != 200 {
|
||||||
|
diagLastError = "HTTP \(http.statusCode)"
|
||||||
|
}
|
||||||
|
return (http.statusCode, body)
|
||||||
|
} catch let e as AppError { throw e }
|
||||||
|
catch {
|
||||||
|
let msg = error.localizedDescription
|
||||||
|
diagLastError = msg
|
||||||
|
throw AppError.detail(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func checkInitialSignInState() async {
|
||||||
|
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
||||||
|
guard cookies.contains(where: { $0.domain.contains("claude.ai") }) else { return }
|
||||||
|
isSignedIn = true
|
||||||
|
// AppDelegate's primer WebView will call adoptPrimerWebView once it loads,
|
||||||
|
// which triggers the first real data fetch.
|
||||||
}
|
}
|
||||||
|
|
||||||
func signOut() async {
|
func signOut() async {
|
||||||
let store = WKWebsiteDataStore.default()
|
let store = WKWebsiteDataStore.default()
|
||||||
let types = WKWebsiteDataStore.allWebsiteDataTypes()
|
let types = WKWebsiteDataStore.allWebsiteDataTypes()
|
||||||
let records = await store.dataRecords(ofTypes: types)
|
let records = await store.dataRecords(ofTypes: types)
|
||||||
let claudeRecords = records.filter { $0.displayName.contains("claude.ai") }
|
let claudeRecords = records.filter { $0.displayName.contains("claude.ai") || $0.displayName.contains("anthropic.com") }
|
||||||
await store.removeData(ofTypes: types, for: claudeRecords)
|
await store.removeData(ofTypes: types, for: claudeRecords)
|
||||||
|
UserDefaults.standard.removeObject(forKey: "claude_org_id")
|
||||||
|
apiWebView = nil
|
||||||
isSignedIn = false
|
isSignedIn = false
|
||||||
isNotAuthenticated = true
|
isNotAuthenticated = true
|
||||||
lastUpdated = nil
|
lastUpdated = nil
|
||||||
@@ -66,18 +208,50 @@ class UsageViewModel: ObservableObject {
|
|||||||
defer { isLoading = false }
|
defer { isLoading = false }
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let orgId = cachedOrgId!
|
// Read lastActiveOrg cookie from JS — most reliable org source since it's
|
||||||
async let usageFetch = fetchUsage(orgId: orgId)
|
// set by the claude.ai frontend to whichever org is currently active.
|
||||||
async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
|
var cookieOrgId: String? = nil
|
||||||
async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
|
if let wv = apiWebView, wv.url?.host?.hasSuffix("claude.ai") == true {
|
||||||
async let emailFetch = fetchUserEmail()
|
let js = """
|
||||||
let (usage, prepaid, overage, email) = try await (usageFetch, prepaidFetch, overageFetch, emailFetch)
|
return document.cookie.split(';')
|
||||||
if let email { userEmail = email }
|
.map(c => c.trim().split('='))
|
||||||
|
.filter(p => p[0] === 'lastActiveOrg')
|
||||||
|
.map(p => p.slice(1).join('='))[0] || null;
|
||||||
|
"""
|
||||||
|
let raw: Any? = try? await withCheckedThrowingContinuation { cont in
|
||||||
|
wv.callAsyncJavaScript(js, arguments: [:], in: nil, in: .defaultClient) { r in
|
||||||
|
cont.resume(returning: (try? r.get()) ?? nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let v = raw as? String, !v.isEmpty {
|
||||||
|
cookieOrgId = v
|
||||||
|
diagLastActiveOrg = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap(preferredOrgId: cookieOrgId)
|
||||||
|
|
||||||
|
let orgId: String
|
||||||
|
if let id = cookieOrgId ?? fetchedOrgId {
|
||||||
|
UserDefaults.standard.set(id, forKey: "claude_org_id")
|
||||||
|
orgId = id
|
||||||
|
} else if let cached = UserDefaults.standard.string(forKey: "claude_org_id") {
|
||||||
|
orgId = cached
|
||||||
|
} else {
|
||||||
|
throw AppError.notAuthenticated
|
||||||
|
}
|
||||||
|
|
||||||
|
if let email = fetchedEmail { userEmail = email }
|
||||||
|
if let plan = fetchedPlan { planLabel = plan }
|
||||||
|
|
||||||
|
async let usageFetch = fetchUsage(orgId: orgId)
|
||||||
|
async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
|
||||||
|
async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
|
||||||
|
let (usage, prepaid, overage) = try await (usageFetch, prepaidFetch, overageFetch)
|
||||||
limits = buildLimits(from: usage)
|
limits = buildLimits(from: usage)
|
||||||
extraUsage = usage.extraUsage
|
extraUsage = usage.extraUsage
|
||||||
prepaidCredits = prepaid
|
prepaidCredits = prepaid
|
||||||
overageSpendLimit = overage
|
overageSpendLimit = overage
|
||||||
planLabel = "Pro"
|
|
||||||
lastUpdated = Date()
|
lastUpdated = Date()
|
||||||
isSignedIn = true
|
isSignedIn = true
|
||||||
|
|
||||||
@@ -93,6 +267,7 @@ class UsageViewModel: ObservableObject {
|
|||||||
checkLimitNotifications(for: limits)
|
checkLimitNotifications(for: limits)
|
||||||
} catch AppError.notAuthenticated {
|
} catch AppError.notAuthenticated {
|
||||||
isNotAuthenticated = true
|
isNotAuthenticated = true
|
||||||
|
isSignedIn = false
|
||||||
errorMessage = "Not signed in"
|
errorMessage = "Not signed in"
|
||||||
} catch let error as DecodingError {
|
} catch let error as DecodingError {
|
||||||
switch error {
|
switch error {
|
||||||
@@ -110,70 +285,75 @@ class UsageViewModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MARK: - Bootstrap
|
||||||
|
|
||||||
|
private func fetchBootstrap(preferredOrgId: String? = nil) async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
||||||
|
let (status, body) = try await apiFetch("/api/bootstrap")
|
||||||
|
if status == 401 || status == 403 {
|
||||||
|
throw AppError.detail("HTTP \(status) — \(body.prefix(120))")
|
||||||
|
}
|
||||||
|
guard status == 200 else { throw AppError.detail("HTTP \(status): \(body.prefix(80))") }
|
||||||
|
guard body.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("{") else {
|
||||||
|
throw AppError.detail("Non-JSON response (HTML?): \(body.prefix(80))")
|
||||||
|
}
|
||||||
|
guard let data = body.data(using: .utf8),
|
||||||
|
let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
||||||
|
return (nil, nil, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
let account = json["account"] as? [String: Any]
|
||||||
|
let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]]
|
||||||
|
let allOrgs = memberships?.compactMap { $0["organization"] as? [String: Any] } ?? []
|
||||||
|
let firstOrg = allOrgs.first
|
||||||
|
|
||||||
|
var orgId: String? = firstOrg?["uuid"] as? String
|
||||||
|
if orgId == nil {
|
||||||
|
orgId = (json["organizations"] as? [[String: Any]])?.first?["uuid"] as? String
|
||||||
|
}
|
||||||
|
if orgId == nil {
|
||||||
|
if let (orgsStatus, orgsBody) = try? await apiFetch("/api/organizations"),
|
||||||
|
orgsStatus == 200,
|
||||||
|
let orgsData = orgsBody.data(using: .utf8),
|
||||||
|
let orgs = try? JSONSerialization.jsonObject(with: orgsData) as? [[String: Any]] {
|
||||||
|
orgId = orgs.first?["uuid"] as? String
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let email = account?["email_address"] as? String
|
||||||
|
|
||||||
|
// Read capabilities from the preferred (active) org, falling back to first org.
|
||||||
|
let capOrg = preferredOrgId.flatMap { id in allOrgs.first(where: { $0["uuid"] as? String == id }) } ?? firstOrg
|
||||||
|
var planLabel: String? = nil
|
||||||
|
if let caps = capOrg?["capabilities"] as? [String],
|
||||||
|
let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
|
||||||
|
let name = String(cap.dropFirst("claude_".count))
|
||||||
|
planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()
|
||||||
|
}
|
||||||
|
|
||||||
|
return (orgId, email, planLabel)
|
||||||
|
}
|
||||||
|
|
||||||
// MARK: - Fetch usage
|
// MARK: - Fetch usage
|
||||||
|
|
||||||
private func fetchUsage(orgId: String) async throws -> UsageResponse {
|
private func fetchUsage(orgId: String) async throws -> UsageResponse {
|
||||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/usage")!
|
let (status, body) = try await apiFetch("/api/organizations/\(orgId)/usage")
|
||||||
var req = URLRequest(url: url)
|
if status == 401 || status == 403 { throw AppError.detail("usage \(status): \(body.prefix(200))") }
|
||||||
req.setValue("application/json", forHTTPHeaderField: "accept")
|
guard status == 200 else { throw AppError.networkError }
|
||||||
|
guard let data = body.data(using: .utf8) else { throw AppError.networkError }
|
||||||
// Inject cookies from WKWebsiteDataStore (shared with browser/Claude app)
|
|
||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
|
||||||
let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
|
|
||||||
if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
|
|
||||||
req.setValue(header, forHTTPHeaderField: "Cookie")
|
|
||||||
}
|
|
||||||
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: req)
|
|
||||||
guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
|
|
||||||
if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
|
|
||||||
guard http.statusCode == 200 else { throw AppError.networkError }
|
|
||||||
|
|
||||||
return try JSONDecoder().decode(UsageResponse.self, from: data)
|
return try JSONDecoder().decode(UsageResponse.self, from: data)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func fetchUserEmail() async throws -> String? {
|
|
||||||
let url = URL(string: "https://claude.ai/api/bootstrap")!
|
|
||||||
var req = URLRequest(url: url)
|
|
||||||
req.setValue("application/json", forHTTPHeaderField: "accept")
|
|
||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
|
||||||
let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
|
|
||||||
if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
|
|
||||||
req.setValue(header, forHTTPHeaderField: "Cookie")
|
|
||||||
}
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: req)
|
|
||||||
guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
|
|
||||||
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
|
||||||
let account = json["account"] as? [String: Any],
|
|
||||||
let email = account["email_address"] as? String else { return nil }
|
|
||||||
return email
|
|
||||||
}
|
|
||||||
|
|
||||||
private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? {
|
private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? {
|
||||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/prepaid/credits")!
|
guard let (status, body) = try? await apiFetch("/api/organizations/\(orgId)/prepaid/credits"),
|
||||||
var req = URLRequest(url: url)
|
status == 200,
|
||||||
req.setValue("application/json", forHTTPHeaderField: "accept")
|
let data = body.data(using: .utf8) else { return nil }
|
||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
|
||||||
let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
|
|
||||||
if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
|
|
||||||
req.setValue(header, forHTTPHeaderField: "Cookie")
|
|
||||||
}
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: req)
|
|
||||||
guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
|
|
||||||
return try? JSONDecoder().decode(PrepaidCredits.self, from: data)
|
return try? JSONDecoder().decode(PrepaidCredits.self, from: data)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func fetchOverageSpendLimit(orgId: String) async throws -> OverageSpendLimit? {
|
private func fetchOverageSpendLimit(orgId: String) async throws -> OverageSpendLimit? {
|
||||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/overage_spend_limit")!
|
guard let (status, body) = try? await apiFetch("/api/organizations/\(orgId)/overage_spend_limit"),
|
||||||
var req = URLRequest(url: url)
|
status == 200,
|
||||||
req.setValue("application/json", forHTTPHeaderField: "accept")
|
let data = body.data(using: .utf8) else { return nil }
|
||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
|
||||||
let claudeCookies = cookies.filter { $0.domain.contains("claude.ai") }
|
|
||||||
if let header = HTTPCookie.requestHeaderFields(with: claudeCookies)["Cookie"] {
|
|
||||||
req.setValue(header, forHTTPHeaderField: "Cookie")
|
|
||||||
}
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: req)
|
|
||||||
guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
|
|
||||||
return try? JSONDecoder().decode(OverageSpendLimit.self, from: data)
|
return try? JSONDecoder().decode(OverageSpendLimit.self, from: data)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,14 +425,11 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
private func checkLimitNotifications(for limits: [AgentLimit]) {
|
private func checkLimitNotifications(for limits: [AgentLimit]) {
|
||||||
let thresholds = [80, 95]
|
let thresholds = [80, 95]
|
||||||
|
|
||||||
for limit in limits {
|
for limit in limits {
|
||||||
let key = limit.window.rawValue
|
let key = limit.window.rawValue
|
||||||
let curr = limit.usedPercent
|
let curr = limit.usedPercent
|
||||||
let prev = previousPercents[key]
|
let prev = previousPercents[key]
|
||||||
var fired = firedThresholds[key] ?? []
|
var fired = firedThresholds[key] ?? []
|
||||||
|
|
||||||
// Threshold warnings (80% and 95%)
|
|
||||||
for t in thresholds {
|
for t in thresholds {
|
||||||
let threshold = Double(t)
|
let threshold = Double(t)
|
||||||
guard curr >= threshold, prev ?? threshold < threshold, !fired.contains(t) else { continue }
|
guard curr >= threshold, prev ?? threshold < threshold, !fired.contains(t) else { continue }
|
||||||
@@ -263,8 +440,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
userInfo: ["windowName": limit.window.displayName, "percent": t]
|
userInfo: ["windowName": limit.window.displayName, "percent": t]
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset detection: was high, now low
|
|
||||||
if let prev, prev > 50, curr < 20 {
|
if let prev, prev > 50, curr < 20 {
|
||||||
fired.removeAll()
|
fired.removeAll()
|
||||||
NotificationCenter.default.post(
|
NotificationCenter.default.post(
|
||||||
@@ -273,7 +448,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
userInfo: ["windowName": limit.window.displayName]
|
userInfo: ["windowName": limit.window.displayName]
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
firedThresholds[key] = fired
|
firedThresholds[key] = fired
|
||||||
previousPercents[key] = curr
|
previousPercents[key] = curr
|
||||||
}
|
}
|
||||||
@@ -296,13 +470,17 @@ class UsageViewModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
enum AppError: LocalizedError {
|
enum AppError: LocalizedError {
|
||||||
case notAuthenticated
|
case notAuthenticated
|
||||||
case networkError
|
case networkError
|
||||||
|
case detail(String)
|
||||||
var errorDescription: String? {
|
var errorDescription: String? {
|
||||||
switch self {
|
switch self {
|
||||||
case .notAuthenticated: return "Not signed into claude.ai — open claude.ai in your browser first."
|
case .notAuthenticated: return "Not signed into claude.ai — open claude.ai in your browser first."
|
||||||
case .networkError: return "Network error fetching usage data."
|
case .networkError: return "Network error fetching usage data."
|
||||||
|
case .detail(let msg): return msg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -317,4 +495,3 @@ extension Notification.Name {
|
|||||||
static let limitReset = Notification.Name("limitReset")
|
static let limitReset = Notification.Name("limitReset")
|
||||||
static let openUpdateSheet = Notification.Name("openUpdateSheet")
|
static let openUpdateSheet = Notification.Name("openUpdateSheet")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,13 @@
|
|||||||
**A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
|
**A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
|
||||||
|
|
||||||
[](https://www.apple.com/macos/)
|
[](https://www.apple.com/macos/)
|
||||||
|
[](https://www.microsoft.com/windows/)
|
||||||
[](https://swift.org)
|
[](https://swift.org)
|
||||||
[](https://github.com/superdooper86/claudechecker/releases)
|
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
<!-- BETA_BADGE -->
|
<br/>
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases)
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases/tag/v1.3.3-beta.2) <!-- BETA_BADGE -->
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases/tag/win-v0.0.1-beta.53) <!-- WIN_BETA_BADGE -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
+3
-11
@@ -1,12 +1,4 @@
|
|||||||
## What's new in v1.1.3
|
## What's new in v1.3.2
|
||||||
|
|
||||||
### UI polish
|
### Reliability
|
||||||
- Limit headers now read "5 Hour Limit" and "7 Day Limit"
|
- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution.
|
||||||
- Tapping anywhere on the blue update banner opens the update window
|
|
||||||
|
|
||||||
### Session Diary fix
|
|
||||||
- Burn history is persisted across app launches — the sparkline populates immediately on first open instead of requiring a manual refresh
|
|
||||||
|
|
||||||
### Window sizing fixes
|
|
||||||
- The popover now resizes correctly when switching between the main view and settings
|
|
||||||
- Background colour no longer shows through during the resize animation
|
|
||||||
|
|||||||
+4
-4
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "1.1.3-beta.5",
|
"version": "1.3.3-beta.2",
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3-beta.5/ClaudeChecker.zip",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.3-beta.2/ClaudeChecker.zip",
|
||||||
"notes": "## What's new in v1.1.3\n\n### UI polish\n- Limit headers now read \"5 Hour Limit\" and \"7 Day Limit\" instead of \"5hr\"\n- Tapping anywhere on the blue update banner opens the update window\n\n### Session Diary fix\n- Burn history is persisted across app launches \u2014 the sparkline populates immediately on first open instead of requiring a manual refresh\n\n### Window sizing fixes\n- The popover now resizes correctly when switching between the main view and settings\n- Background colour no longer shows through during the resize animation"
|
"notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "0.0.0",
|
"version": "0.0.1-beta.53",
|
||||||
"url": "",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/win-v0.0.1-beta.53/ClaudeChecker-Windows.zip",
|
||||||
"notes": ""
|
"notes": "## What's new in beta.49\r\n\r\n### Architecture\r\n- All data (usage, plan, overage, prepaid credits) now fetched via the persistent background WebView2 — the same always-live session as the macOS app, so Cloudflare cookies never expire between refreshes\r\n- HttpClient path kept only as a brief startup fallback before the browser is ready\r\n- Settings file simplified: only stores session signal, burn history, and user preferences — no more cached API responses\r\n\r\n### Bug fixes\r\n- Plan label (e.g. \"Pro\") now updates on every refresh, not just at login\r\n- Extra Usage Credits values now correct (were 100× too large)\r\n- Limit and balance now update live on every refresh\r\n- Refresh interval dropdown now shows \"1 min\", \"2 min\" etc. correctly\r\n- ComboBox no longer flashes bright blue when clicked\r\n- Buttons now show a visible pressed state\r\n- Footer \"Updated X ago\" counter now ticks every second; shows \"X min, Y sec ago\" past 60 s\r\n- Removed stray sparkline bars from the 5 h and 7 d limit cards\r\n- App window now shown on launch\r\n\r\n### UI improvements\r\n- Gauge percentage larger, \"used\" label removed\r\n- Each limit card now shows an \"after reset\" or \"today HH:MM\" badge\r\n- Session Diary card redesigned to match macOS layout (stats row + sparkline, no Claude header)\r\n- Reset date moved inline with time remaining"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "0.0.0",
|
|
||||||
"url": "",
|
|
||||||
"notes": ""
|
|
||||||
}
|
|
||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "1.1.3",
|
"version": "1.3.2",
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3/ClaudeChecker.zip",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.2/ClaudeChecker.zip",
|
||||||
"notes": "## What's new in v1.1.3\n\n### UI polish\n- Limit headers now read \"5 Hour Limit\" and \"7 Day Limit\"\n- Tapping anywhere on the blue update banner opens the update window\n\n### Session Diary fix\n- Burn history is persisted across app launches — the sparkline populates immediately on first open instead of requiring a manual refresh\n\n### Window sizing fixes\n- The popover now resizes correctly when switching between the main view and settings\n- Background colour no longer shows through during the resize animation"
|
"notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
<Application x:Class="ClaudeCheckerWindows.App"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
ShutdownMode="OnExplicitShutdown">
|
|
||||||
<Application.Resources>
|
|
||||||
<SolidColorBrush x:Key="BackgroundBrush" Color="#1C1C1E"/>
|
|
||||||
<SolidColorBrush x:Key="CardBrush" Color="#2C2C2E"/>
|
|
||||||
<SolidColorBrush x:Key="AccentBrush" Color="#F97316"/>
|
|
||||||
<SolidColorBrush x:Key="SecondaryBrush" Color="#888888"/>
|
|
||||||
<SolidColorBrush x:Key="BorderBrush" Color="#38383A"/>
|
|
||||||
<SolidColorBrush x:Key="BlueBrush" Color="#3B82F6"/>
|
|
||||||
|
|
||||||
<Style x:Key="HeaderText" TargetType="TextBlock">
|
|
||||||
<Setter Property="FontSize" Value="10"/>
|
|
||||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
|
||||||
<Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style x:Key="IconButton" TargetType="Button">
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
|
||||||
<Setter Property="BorderBrush" Value="#33FFFFFF"/>
|
|
||||||
<Setter Property="BorderThickness" Value="0.5"/>
|
|
||||||
<Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
|
|
||||||
<Setter Property="Width" Value="26"/>
|
|
||||||
<Setter Property="Height" Value="26"/>
|
|
||||||
<Setter Property="Cursor" Value="Hand"/>
|
|
||||||
<Setter Property="Template">
|
|
||||||
<Setter.Value>
|
|
||||||
<ControlTemplate TargetType="Button">
|
|
||||||
<Border Background="{TemplateBinding Background}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
|
||||||
CornerRadius="5">
|
|
||||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
|
||||||
</Border>
|
|
||||||
<ControlTemplate.Triggers>
|
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
|
||||||
<Setter Property="Background" Value="#1AFFFFFF"/>
|
|
||||||
</Trigger>
|
|
||||||
</ControlTemplate.Triggers>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style x:Key="PrimaryButton" TargetType="Button">
|
|
||||||
<Setter Property="Background" Value="{StaticResource BlueBrush}"/>
|
|
||||||
<Setter Property="Foreground" Value="White"/>
|
|
||||||
<Setter Property="BorderThickness" Value="0"/>
|
|
||||||
<Setter Property="Padding" Value="14,6"/>
|
|
||||||
<Setter Property="FontSize" Value="12"/>
|
|
||||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
|
||||||
<Setter Property="Cursor" Value="Hand"/>
|
|
||||||
<Setter Property="Template">
|
|
||||||
<Setter.Value>
|
|
||||||
<ControlTemplate TargetType="Button">
|
|
||||||
<Border Background="{TemplateBinding Background}" CornerRadius="6"
|
|
||||||
Padding="{TemplateBinding Padding}">
|
|
||||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
|
||||||
</Border>
|
|
||||||
<ControlTemplate.Triggers>
|
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
|
||||||
<Setter Property="Background" Value="#2563EB"/>
|
|
||||||
</Trigger>
|
|
||||||
</ControlTemplate.Triggers>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style x:Key="SmallButton" TargetType="Button">
|
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
|
||||||
<Setter Property="BorderBrush" Value="#33FFFFFF"/>
|
|
||||||
<Setter Property="BorderThickness" Value="0.5"/>
|
|
||||||
<Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
|
|
||||||
<Setter Property="Padding" Value="8,4"/>
|
|
||||||
<Setter Property="FontSize" Value="11"/>
|
|
||||||
<Setter Property="Cursor" Value="Hand"/>
|
|
||||||
<Setter Property="Template">
|
|
||||||
<Setter.Value>
|
|
||||||
<ControlTemplate TargetType="Button">
|
|
||||||
<Border Background="{TemplateBinding Background}"
|
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
|
||||||
CornerRadius="5" Padding="{TemplateBinding Padding}">
|
|
||||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
|
||||||
</Border>
|
|
||||||
<ControlTemplate.Triggers>
|
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
|
||||||
<Setter Property="Background" Value="#1AFFFFFF"/>
|
|
||||||
</Trigger>
|
|
||||||
</ControlTemplate.Triggers>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style TargetType="ScrollViewer">
|
|
||||||
<Setter Property="VerticalScrollBarVisibility" Value="Hidden"/>
|
|
||||||
</Style>
|
|
||||||
</Application.Resources>
|
|
||||||
</Application>
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Threading;
|
|
||||||
using Forms = System.Windows.Forms;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public partial class App : Application
|
|
||||||
{
|
|
||||||
public static UsageViewModel ViewModel { get; } = new();
|
|
||||||
public static UpdateManager Updater { get; } = new();
|
|
||||||
|
|
||||||
private Forms.NotifyIcon? _tray;
|
|
||||||
private PopupWindow? _popup;
|
|
||||||
private DispatcherTimer? _timer;
|
|
||||||
|
|
||||||
protected override void OnStartup(StartupEventArgs e)
|
|
||||||
{
|
|
||||||
base.OnStartup(e);
|
|
||||||
SetupTray();
|
|
||||||
ScheduleTimer(ViewModel.RefreshInterval);
|
|
||||||
|
|
||||||
_ = Task.Run(async () =>
|
|
||||||
{
|
|
||||||
await Task.Delay(1000);
|
|
||||||
await ViewModel.RefreshAsync();
|
|
||||||
await Updater.CheckForUpdatesAsync();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetupTray()
|
|
||||||
{
|
|
||||||
_tray = new Forms.NotifyIcon
|
|
||||||
{
|
|
||||||
Text = "ClaudeChecker",
|
|
||||||
Visible = true,
|
|
||||||
Icon = LoadIcon(),
|
|
||||||
};
|
|
||||||
|
|
||||||
_tray.MouseClick += (_, e) =>
|
|
||||||
{
|
|
||||||
if (e.Button == Forms.MouseButtons.Left)
|
|
||||||
Dispatcher.InvokeAsync(TogglePopup);
|
|
||||||
};
|
|
||||||
|
|
||||||
_tray.ContextMenuStrip = BuildContextMenu();
|
|
||||||
|
|
||||||
ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
|
|
||||||
Updater.PropertyChanged += (_, _) => UpdateTrayText();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static System.Drawing.Icon LoadIcon()
|
|
||||||
{
|
|
||||||
try { return new System.Drawing.Icon("Assets/icon.ico"); }
|
|
||||||
catch { return System.Drawing.SystemIcons.Application; }
|
|
||||||
}
|
|
||||||
|
|
||||||
private Forms.ContextMenuStrip BuildContextMenu()
|
|
||||||
{
|
|
||||||
var menu = new Forms.ContextMenuStrip();
|
|
||||||
menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
|
|
||||||
menu.Items.Add(new Forms.ToolStripSeparator());
|
|
||||||
menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
|
|
||||||
return menu;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void TogglePopup()
|
|
||||||
{
|
|
||||||
if (_popup == null || !_popup.IsVisible)
|
|
||||||
ShowPopup();
|
|
||||||
else
|
|
||||||
_popup.Hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ShowPopup()
|
|
||||||
{
|
|
||||||
if (_popup == null)
|
|
||||||
{
|
|
||||||
_popup = new PopupWindow();
|
|
||||||
_popup.Closed += (_, _) => _popup = null;
|
|
||||||
}
|
|
||||||
PositionPopup();
|
|
||||||
_popup.Show();
|
|
||||||
_popup.Activate();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void PositionPopup()
|
|
||||||
{
|
|
||||||
if (_popup == null) return;
|
|
||||||
var workArea = SystemParameters.WorkArea;
|
|
||||||
_popup.Left = workArea.Right - _popup.Width - 8;
|
|
||||||
_popup.Top = workArea.Bottom - _popup.Height - 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ScheduleTimer(int seconds)
|
|
||||||
{
|
|
||||||
_timer?.Stop();
|
|
||||||
_timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(seconds) };
|
|
||||||
_timer.Tick += async (_, _) =>
|
|
||||||
{
|
|
||||||
await ViewModel.RefreshAsync();
|
|
||||||
await Updater.CheckForUpdatesAsync();
|
|
||||||
};
|
|
||||||
_timer.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdateTrayText()
|
|
||||||
{
|
|
||||||
if (_tray == null) return;
|
|
||||||
var limits = ViewModel.Limits;
|
|
||||||
if (ViewModel.ShowInTaskbar && limits.Count >= 2)
|
|
||||||
{
|
|
||||||
var fh = limits.Find(l => l.Window == WindowKind.FiveHour);
|
|
||||||
var sd = limits.Find(l => l.Window == WindowKind.SevenDay);
|
|
||||||
if (fh != null && sd != null && fh.IsLive)
|
|
||||||
{
|
|
||||||
_tray.Text = $"ClaudeChecker {(int)fh.UsedPercent}% {(int)sd.UsedPercent}%";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_tray.Text = "ClaudeChecker";
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Quit()
|
|
||||||
{
|
|
||||||
_tray?.Dispose();
|
|
||||||
Shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnExit(ExitEventArgs e)
|
|
||||||
{
|
|
||||||
_tray?.Dispose();
|
|
||||||
base.OnExit(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public class AppSettings
|
|
||||||
{
|
|
||||||
public string CookieStore { get; set; } = "";
|
|
||||||
public string BurnHistory { get; set; } = "";
|
|
||||||
public int RefreshInterval { get; set; } = 120;
|
|
||||||
public bool ShowInTaskbar { get; set; } = true;
|
|
||||||
public bool BetaChannel { get; set; } = false;
|
|
||||||
|
|
||||||
private static readonly string FilePath = Path.Combine(
|
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
|
||||||
"ClaudeChecker", "settings.json");
|
|
||||||
|
|
||||||
private static AppSettings? _instance;
|
|
||||||
public static AppSettings Default => _instance ??= Load();
|
|
||||||
|
|
||||||
private static AppSettings Load()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (File.Exists(FilePath))
|
|
||||||
return JsonSerializer.Deserialize<AppSettings>(File.ReadAllText(FilePath)) ?? new();
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
return new();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Save()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(FilePath)!);
|
|
||||||
File.WriteAllText(FilePath, JsonSerializer.Serialize(this,
|
|
||||||
new JsonSerializerOptions { WriteIndented = true }));
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
@@ -1,34 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>WinExe</OutputType>
|
|
||||||
<TargetFramework>net8.0-windows</TargetFramework>
|
|
||||||
<UseWPF>true</UseWPF>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<AssemblyName>ClaudeChecker</AssemblyName>
|
|
||||||
<RootNamespace>ClaudeCheckerWindows</RootNamespace>
|
|
||||||
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
|
|
||||||
<Version>1.0.0</Version>
|
|
||||||
<Platforms>x64</Platforms>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
|
|
||||||
<ItemGroup>
|
|
||||||
<FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64"/>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="Assets\icon.ico">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
<None Update="Assets\icon.png">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
using Brush = System.Windows.Media.Brush;
|
|
||||||
using Pen = System.Windows.Media.Pen;
|
|
||||||
using Point = System.Windows.Point;
|
|
||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Media;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows.Controls;
|
|
||||||
|
|
||||||
public class GaugeControl : FrameworkElement
|
|
||||||
{
|
|
||||||
public static readonly DependencyProperty PercentProperty =
|
|
||||||
DependencyProperty.Register(nameof(Percent), typeof(double), typeof(GaugeControl),
|
|
||||||
new FrameworkPropertyMetadata(0.0, FrameworkPropertyMetadataOptions.AffectsRender));
|
|
||||||
|
|
||||||
public static readonly DependencyProperty AccentProperty =
|
|
||||||
DependencyProperty.Register(nameof(Accent), typeof(Brush), typeof(GaugeControl),
|
|
||||||
new FrameworkPropertyMetadata(Brushes.Orange, FrameworkPropertyMetadataOptions.AffectsRender));
|
|
||||||
|
|
||||||
public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
|
|
||||||
public Brush Accent { get => (Brush)GetValue(AccentProperty); set => SetValue(AccentProperty, value); }
|
|
||||||
|
|
||||||
private const double StartAngleDeg = 135;
|
|
||||||
private const double SweepDeg = 270;
|
|
||||||
private const double StrokeWidth = 6;
|
|
||||||
|
|
||||||
protected override void OnRender(DrawingContext dc)
|
|
||||||
{
|
|
||||||
var cx = RenderSize.Width / 2;
|
|
||||||
var cy = RenderSize.Height / 2;
|
|
||||||
var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
|
|
||||||
|
|
||||||
DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
|
|
||||||
new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
|
|
||||||
|
|
||||||
if (Percent > 0)
|
|
||||||
DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
|
|
||||||
new Pen(Accent, StrokeWidth));
|
|
||||||
|
|
||||||
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
|
||||||
|
|
||||||
var pctText = new FormattedText(
|
|
||||||
$"{(int)Math.Round(Percent)}%",
|
|
||||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
|
||||||
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
|
|
||||||
14, Brushes.White, dpi);
|
|
||||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
|
|
||||||
|
|
||||||
var sub = new FormattedText(
|
|
||||||
"Updated\nnow",
|
|
||||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
|
||||||
new Typeface("Segoe UI"), 7,
|
|
||||||
new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
|
|
||||||
{
|
|
||||||
TextAlignment = TextAlignment.Center
|
|
||||||
};
|
|
||||||
dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void DrawArc(DrawingContext dc, double cx, double cy, double r,
|
|
||||||
double startDeg, double sweepDeg, Pen pen)
|
|
||||||
{
|
|
||||||
if (sweepDeg <= 0) return;
|
|
||||||
var start = PointOnCircle(cx, cy, r, startDeg);
|
|
||||||
var end = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
|
|
||||||
var isLarge = sweepDeg > 180;
|
|
||||||
|
|
||||||
var geo = new StreamGeometry();
|
|
||||||
using (var ctx = geo.Open())
|
|
||||||
{
|
|
||||||
ctx.BeginFigure(start, false, false);
|
|
||||||
ctx.ArcTo(end, new Size(r, r), 0, isLarge, SweepDirection.Clockwise, true, false);
|
|
||||||
}
|
|
||||||
geo.Freeze();
|
|
||||||
dc.DrawGeometry(null, pen, geo);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Point PointOnCircle(double cx, double cy, double r, double deg)
|
|
||||||
{
|
|
||||||
var rad = deg * Math.PI / 180;
|
|
||||||
return new Point(cx + r * Math.Cos(rad), cy + r * Math.Sin(rad));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
using Point = System.Windows.Point;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Media;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows.Controls;
|
|
||||||
|
|
||||||
public class SparklineControl : FrameworkElement
|
|
||||||
{
|
|
||||||
public static readonly DependencyProperty DataProperty =
|
|
||||||
DependencyProperty.Register(nameof(Data), typeof(IList<double>), typeof(SparklineControl),
|
|
||||||
new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
|
|
||||||
|
|
||||||
public static readonly DependencyProperty LineColorProperty =
|
|
||||||
DependencyProperty.Register(nameof(LineColor), typeof(Color), typeof(SparklineControl),
|
|
||||||
new FrameworkPropertyMetadata(Colors.Orange, FrameworkPropertyMetadataOptions.AffectsRender));
|
|
||||||
|
|
||||||
public IList<double>? Data { get => (IList<double>?)GetValue(DataProperty); set => SetValue(DataProperty, value); }
|
|
||||||
public Color LineColor { get => (Color)GetValue(LineColorProperty); set => SetValue(LineColorProperty, value); }
|
|
||||||
|
|
||||||
protected override void OnRender(DrawingContext dc)
|
|
||||||
{
|
|
||||||
var data = Data;
|
|
||||||
if (data == null || data.Count < 1) return;
|
|
||||||
|
|
||||||
var plot = data.Count == 1 ? new[] { data[0], data[0] } : [.. data];
|
|
||||||
|
|
||||||
var w = RenderSize.Width;
|
|
||||||
var h = RenderSize.Height;
|
|
||||||
var minV = double.MaxValue;
|
|
||||||
var maxV = double.MinValue;
|
|
||||||
foreach (var v in plot) { if (v < minV) minV = v; if (v > maxV) maxV = v; }
|
|
||||||
var range = System.Math.Max(maxV - minV, 1);
|
|
||||||
|
|
||||||
Point Pt(int i) => new(
|
|
||||||
i / (double)(plot.Length - 1) * w,
|
|
||||||
h - (plot[i] - minV) / range * (h - 6) - 3);
|
|
||||||
|
|
||||||
var fill = new StreamGeometry();
|
|
||||||
using (var ctx = fill.Open())
|
|
||||||
{
|
|
||||||
ctx.BeginFigure(new Point(0, h), true, true);
|
|
||||||
for (var i = 0; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
|
|
||||||
ctx.LineTo(new Point(w, h), true, false);
|
|
||||||
}
|
|
||||||
fill.Freeze();
|
|
||||||
dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill);
|
|
||||||
|
|
||||||
var line = new StreamGeometry();
|
|
||||||
using (var ctx = line.Open())
|
|
||||||
{
|
|
||||||
ctx.BeginFigure(Pt(0), false, false);
|
|
||||||
for (var i = 1; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
|
|
||||||
}
|
|
||||||
line.Freeze();
|
|
||||||
dc.DrawGeometry(null,
|
|
||||||
new System.Windows.Media.Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round },
|
|
||||||
line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
// Global aliases to resolve ambiguities between System.Windows.* and System.Drawing.*
|
|
||||||
global using Application = System.Windows.Application;
|
|
||||||
global using Brushes = System.Windows.Media.Brushes;
|
|
||||||
global using Color = System.Windows.Media.Color;
|
|
||||||
global using FlowDirection = System.Windows.FlowDirection;
|
|
||||||
global using FontFamily = System.Windows.Media.FontFamily;
|
|
||||||
global using Orientation = System.Windows.Controls.Orientation;
|
|
||||||
global using ProgressBar = System.Windows.Controls.ProgressBar;
|
|
||||||
global using Size = System.Windows.Size;
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
<Window x:Class="ClaudeCheckerWindows.LoginWindow"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
|
|
||||||
Title="Sign in to claude.ai"
|
|
||||||
Width="520" Height="680"
|
|
||||||
WindowStartupLocation="CenterOwner"
|
|
||||||
Background="#1C1C1E">
|
|
||||||
|
|
||||||
<Grid>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="*"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
|
|
||||||
<Border Grid.Row="0" Background="#2C2C2E" Padding="16,12">
|
|
||||||
<StackPanel>
|
|
||||||
<TextBlock Text="Sign in to claude.ai" FontSize="14" FontWeight="SemiBold"
|
|
||||||
Foreground="White"/>
|
|
||||||
<TextBlock Text="Sign in below. ClaudeChecker will save your session cookies to fetch usage data."
|
|
||||||
FontSize="11" Foreground="#888888" TextWrapping="Wrap" Margin="0,4,0,0"/>
|
|
||||||
</StackPanel>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<wv2:WebView2 x:Name="Browser" Grid.Row="1"/>
|
|
||||||
|
|
||||||
<Border Grid.Row="2" Background="#2C2C2E" Padding="16,10">
|
|
||||||
<Grid>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock x:Name="StatusText" FontSize="11" Foreground="#888888"
|
|
||||||
VerticalAlignment="Center" Text="Waiting for sign-in…"/>
|
|
||||||
<Button Grid.Column="1" Content="Done — I'm signed in"
|
|
||||||
Style="{StaticResource PrimaryButton}" Click="Done_Click"
|
|
||||||
x:Name="DoneButton" IsEnabled="False"/>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
using Microsoft.Web.WebView2.Core;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public partial class LoginWindow : Window
|
|
||||||
{
|
|
||||||
public LoginWindow()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
Loaded += async (_, _) => await InitBrowserAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task InitBrowserAsync()
|
|
||||||
{
|
|
||||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
|
|
||||||
System.IO.Path.Combine(
|
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
|
||||||
"ClaudeChecker", "WebView2"));
|
|
||||||
|
|
||||||
await Browser.EnsureCoreWebView2Async(env);
|
|
||||||
Browser.CoreWebView2.Navigate("https://claude.ai");
|
|
||||||
|
|
||||||
Browser.CoreWebView2.NavigationCompleted += async (_, e) =>
|
|
||||||
{
|
|
||||||
if (!e.IsSuccess) return;
|
|
||||||
var uri = Browser.CoreWebView2.Source;
|
|
||||||
if (!uri.Contains("claude.ai")) return;
|
|
||||||
|
|
||||||
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
|
|
||||||
var signedIn = cookies.Any(c =>
|
|
||||||
c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
|
|
||||||
c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
|
|
||||||
|
|
||||||
await Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
|
|
||||||
StatusText.Text = signedIn
|
|
||||||
? "Signed in — click Done to continue."
|
|
||||||
: "Complete sign-in, then click Done.";
|
|
||||||
});
|
|
||||||
|
|
||||||
// Auto-close once clearly on the main app page
|
|
||||||
if (signedIn && (uri.Contains("/chats") || uri.Contains("/new") || uri == "https://claude.ai/"))
|
|
||||||
{
|
|
||||||
await SaveAndClose(cookies);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void Done_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
|
|
||||||
await SaveAndClose(cookies);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
|
|
||||||
{
|
|
||||||
UsageViewModel.SaveCookies(cookies);
|
|
||||||
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public enum WindowKind { FiveHour, SevenDay }
|
|
||||||
|
|
||||||
public class AgentLimit
|
|
||||||
{
|
|
||||||
public WindowKind Window { get; init; }
|
|
||||||
public double UsedPercent { get; set; }
|
|
||||||
public string TimeRemaining { get; set; } = "";
|
|
||||||
public DateTime ResetDate { get; set; }
|
|
||||||
public double BurnRate { get; set; }
|
|
||||||
public List<double> BurnHistory { get; set; } = [];
|
|
||||||
public bool IsLive { get; set; }
|
|
||||||
public string UsageLabel => UsedPercent switch { < 33 => "low", < 66 => "med", _ => "high" };
|
|
||||||
public string WindowLabel => Window == WindowKind.FiveHour ? "5 HOUR LIMIT" : "7 DAY LIMIT";
|
|
||||||
}
|
|
||||||
|
|
||||||
public class UsageResponse
|
|
||||||
{
|
|
||||||
[JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
|
|
||||||
[JsonPropertyName("claude_ai_default")] public WindowData? SevenDay { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WindowData
|
|
||||||
{
|
|
||||||
[JsonPropertyName("utilization")] public double Utilization { get; set; }
|
|
||||||
[JsonPropertyName("resets_at")] public string? ResetsAt { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class BootstrapResponse
|
|
||||||
{
|
|
||||||
[JsonPropertyName("account")] public AccountInfo? Account { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class AccountInfo
|
|
||||||
{
|
|
||||||
[JsonPropertyName("email_address")] public string? EmailAddress { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class OverageSpendLimit
|
|
||||||
{
|
|
||||||
[JsonPropertyName("monthly_credit_limit")] public double? MonthlyCreditLimit { get; set; }
|
|
||||||
[JsonPropertyName("used_credits")] public double? UsedCredits { get; set; }
|
|
||||||
[JsonPropertyName("currency")] public string? Currency { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class PrepaidCredits
|
|
||||||
{
|
|
||||||
[JsonPropertyName("amount")] public double? Amount { get; set; }
|
|
||||||
[JsonPropertyName("currency")] public string? Currency { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class VersionInfo
|
|
||||||
{
|
|
||||||
[JsonPropertyName("version")] public string Version { get; set; } = "";
|
|
||||||
[JsonPropertyName("url")] public string Url { get; set; } = "";
|
|
||||||
[JsonPropertyName("notes")] public string? Notes { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,251 +0,0 @@
|
|||||||
<Window x:Class="ClaudeCheckerWindows.PopupWindow"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:ctrl="clr-namespace:ClaudeCheckerWindows.Controls"
|
|
||||||
Title="ClaudeChecker"
|
|
||||||
Width="480"
|
|
||||||
SizeToContent="Height"
|
|
||||||
WindowStyle="None"
|
|
||||||
AllowsTransparency="True"
|
|
||||||
Background="Transparent"
|
|
||||||
ShowInTaskbar="False"
|
|
||||||
Topmost="True"
|
|
||||||
ResizeMode="NoResize">
|
|
||||||
|
|
||||||
<Border Background="{StaticResource BackgroundBrush}"
|
|
||||||
CornerRadius="12"
|
|
||||||
BorderBrush="{StaticResource BorderBrush}"
|
|
||||||
BorderThickness="0.5">
|
|
||||||
<Border.Effect>
|
|
||||||
<DropShadowEffect BlurRadius="24" ShadowDepth="4" Opacity="0.5" Color="Black"/>
|
|
||||||
</Border.Effect>
|
|
||||||
|
|
||||||
<Grid>
|
|
||||||
<!-- Main panel -->
|
|
||||||
<StackPanel x:Name="MainPanel">
|
|
||||||
|
|
||||||
<!-- Header -->
|
|
||||||
<Grid Margin="16,11">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="6"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<Image Grid.Column="0" Width="24" Height="24"
|
|
||||||
Source="Assets/icon.png" RenderOptions.BitmapScalingMode="HighQuality"/>
|
|
||||||
|
|
||||||
<TextBlock Grid.Column="1" Text="ClaudeChecker"
|
|
||||||
FontSize="14" FontWeight="SemiBold" Foreground="White"
|
|
||||||
VerticalAlignment="Center" Margin="10,0,0,0"/>
|
|
||||||
|
|
||||||
<Button Grid.Column="2" Style="{StaticResource IconButton}"
|
|
||||||
Click="Settings_Click" x:Name="SettingsButton">
|
|
||||||
<TextBlock Text="⚙" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
</Button>
|
|
||||||
<Button Grid.Column="4" Style="{StaticResource IconButton}"
|
|
||||||
Click="Close_Click">
|
|
||||||
<TextBlock Text="✕" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
</Button>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.4"/>
|
|
||||||
|
|
||||||
<!-- Update banner -->
|
|
||||||
<Border x:Name="UpdateBanner" Visibility="Collapsed"
|
|
||||||
Background="#0A3B82F6" Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
|
|
||||||
<Grid Margin="16,10">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock Grid.Column="0" Text="⬇" FontSize="14"
|
|
||||||
Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
|
|
||||||
<StackPanel Grid.Column="1" Margin="10,0">
|
|
||||||
<TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
|
|
||||||
<TextBlock Text="Tap to view what's new & install."
|
|
||||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
</StackPanel>
|
|
||||||
<Button Grid.Column="2" Content="Update"
|
|
||||||
Style="{StaticResource SmallButton}"
|
|
||||||
Background="{StaticResource BlueBrush}"
|
|
||||||
Foreground="White" Click="UpdateBanner_Click"/>
|
|
||||||
</Grid>
|
|
||||||
<Border.Effect>
|
|
||||||
<DropShadowEffect ShadowDepth="0" BlurRadius="0" Opacity="0"/>
|
|
||||||
</Border.Effect>
|
|
||||||
</Border>
|
|
||||||
<Rectangle x:Name="UpdateBannerDiv" Height="0.5" Fill="{StaticResource BorderBrush}"
|
|
||||||
Opacity="0.3" Visibility="Collapsed"/>
|
|
||||||
|
|
||||||
<!-- Limit cards -->
|
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Hidden" MaxHeight="600">
|
|
||||||
<StackPanel x:Name="CardsPanel" Margin="0,0,0,4"/>
|
|
||||||
</ScrollViewer>
|
|
||||||
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.3"/>
|
|
||||||
|
|
||||||
<!-- Footer -->
|
|
||||||
<Grid Margin="16,9">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="8"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock x:Name="LastUpdatedText" Grid.Column="0"
|
|
||||||
FontSize="10" Foreground="#60888888" VerticalAlignment="Center"/>
|
|
||||||
<ProgressBar x:Name="LoadingBar" Grid.Column="1"
|
|
||||||
IsIndeterminate="True" Width="14" Height="14"
|
|
||||||
Visibility="Collapsed" Style="{x:Null}"/>
|
|
||||||
<Button Grid.Column="3" Content="↻ Refresh"
|
|
||||||
Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
|
|
||||||
</Grid>
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<!-- Settings panel -->
|
|
||||||
<Border x:Name="SettingsPanel" Visibility="Collapsed"
|
|
||||||
Background="{StaticResource BackgroundBrush}" CornerRadius="12">
|
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto" MaxHeight="700">
|
|
||||||
<StackPanel Margin="16">
|
|
||||||
|
|
||||||
<Button Content="← Back" HorizontalAlignment="Left"
|
|
||||||
Style="{StaticResource SmallButton}"
|
|
||||||
BorderThickness="0" Foreground="{StaticResource BlueBrush}"
|
|
||||||
Click="BackFromSettings_Click" Margin="0,0,0,12"/>
|
|
||||||
|
|
||||||
<TextBlock Text="Settings" FontSize="16" FontWeight="SemiBold"
|
|
||||||
Foreground="White" Margin="0,0,0,16"/>
|
|
||||||
|
|
||||||
<!-- Auth -->
|
|
||||||
<TextBlock Text="🔐 Authentication" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
|
||||||
<StackPanel x:Name="AuthPanel" Margin="0,0,0,8"/>
|
|
||||||
<TextBlock Text="Your session is stored locally and persists across restarts."
|
|
||||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
|
||||||
TextWrapping="Wrap" Margin="0,0,0,8"/>
|
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,16">
|
|
||||||
<Button x:Name="SignInButton" Content="Sign In"
|
|
||||||
Style="{StaticResource SmallButton}" Click="SignIn_Click" Margin="0,0,8,0"/>
|
|
||||||
<Button x:Name="SignOutButton" Content="Sign Out"
|
|
||||||
Style="{StaticResource SmallButton}" Click="SignOut_Click"
|
|
||||||
Foreground="#EF4444" Visibility="Collapsed"/>
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
|
|
||||||
|
|
||||||
<!-- Beta channel -->
|
|
||||||
<TextBlock Text="📡 Update channel" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
|
||||||
<Grid Margin="0,0,0,16">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<StackPanel>
|
|
||||||
<TextBlock Text="Beta updates" FontSize="12" Foreground="White"/>
|
|
||||||
<TextBlock Text="Receive early access builds — may be less stable"
|
|
||||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
</StackPanel>
|
|
||||||
<CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
|
|
||||||
Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
|
|
||||||
|
|
||||||
<!-- Refresh interval -->
|
|
||||||
<TextBlock Text="⏱ Auto-refresh interval" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
|
||||||
<ComboBox x:Name="RefreshPicker" SelectionChanged="RefreshPicker_Changed"
|
|
||||||
Margin="0,0,0,16" FontSize="12"/>
|
|
||||||
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
|
|
||||||
|
|
||||||
<!-- About -->
|
|
||||||
<Grid>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Image Width="36" Height="36" Source="Assets/icon.png"
|
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
|
|
||||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
|
|
||||||
<Border Background="#0FFFFFFF" CornerRadius="4" Margin="6,0,0,0" Padding="5,1">
|
|
||||||
<TextBlock x:Name="VersionLabel" FontSize="11"
|
|
||||||
Foreground="{StaticResource SecondaryBrush}"
|
|
||||||
FontFamily="Consolas"/>
|
|
||||||
</Border>
|
|
||||||
</StackPanel>
|
|
||||||
<TextBlock Text="Built by superdooper86 & claude"
|
|
||||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
</StackPanel>
|
|
||||||
<Button Grid.Column="2" x:Name="CheckUpdateButton"
|
|
||||||
Style="{StaticResource SmallButton}" Click="CheckUpdate_Click"
|
|
||||||
VerticalAlignment="Center"/>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
</StackPanel>
|
|
||||||
</ScrollViewer>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<!-- Update sheet -->
|
|
||||||
<Border x:Name="UpdatePanel" Visibility="Collapsed"
|
|
||||||
Background="{StaticResource BackgroundBrush}" CornerRadius="12">
|
|
||||||
<StackPanel>
|
|
||||||
<Grid Margin="16,12">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock Text="Update ClaudeChecker" FontSize="14" FontWeight="SemiBold"
|
|
||||||
Foreground="White" VerticalAlignment="Center"/>
|
|
||||||
<Button Grid.Column="1" Content="Not Now" Style="{StaticResource SmallButton}"
|
|
||||||
Click="CloseUpdate_Click" x:Name="NotNowButton"/>
|
|
||||||
</Grid>
|
|
||||||
<Rectangle Height="0.5" Fill="{StaticResource BorderBrush}"/>
|
|
||||||
<StackPanel Margin="20">
|
|
||||||
<Grid Margin="0,0,0,16">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Image Width="48" Height="48" Source="Assets/icon.png"
|
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,14,0"/>
|
|
||||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
|
|
||||||
Foreground="{StaticResource SecondaryBrush}"/>
|
|
||||||
<TextBlock Text=" → " FontSize="10"
|
|
||||||
Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
|
|
||||||
<TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
|
|
||||||
FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"/>
|
|
||||||
</StackPanel>
|
|
||||||
<TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
|
|
||||||
Foreground="{StaticResource SecondaryBrush}" Margin="0,4,0,0"
|
|
||||||
MaxHeight="180"/>
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
|
|
||||||
FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
|
|
||||||
Visibility="Collapsed" Margin="0,0,0,10"/>
|
|
||||||
|
|
||||||
<ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
|
|
||||||
Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
|
|
||||||
|
|
||||||
<TextBlock Text="ClaudeChecker will download the update, replace itself, and relaunch automatically."
|
|
||||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
|
||||||
TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
|
|
||||||
|
|
||||||
<Button x:Name="InstallButton" Content="⬇ Install Update"
|
|
||||||
Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
|
|
||||||
Click="Install_Click"/>
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</Border>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</Window>
|
|
||||||
@@ -1,338 +0,0 @@
|
|||||||
using ClaudeCheckerWindows.Controls;
|
|
||||||
using System;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Threading;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public partial class PopupWindow : Window
|
|
||||||
{
|
|
||||||
private static readonly UsageViewModel VM = App.ViewModel;
|
|
||||||
private static readonly UpdateManager Updater = App.Updater;
|
|
||||||
private readonly DispatcherTimer _clockTimer;
|
|
||||||
|
|
||||||
public PopupWindow()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
VM.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
|
|
||||||
Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
|
|
||||||
|
|
||||||
_clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
|
|
||||||
_clockTimer.Tick += (_, _) => UpdateFooter();
|
|
||||||
_clockTimer.Start();
|
|
||||||
|
|
||||||
InitSettings();
|
|
||||||
RebuildCards();
|
|
||||||
UpdateBannerState();
|
|
||||||
UpdateFooter();
|
|
||||||
|
|
||||||
Deactivated += (_, _) => Hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Card rendering ───────────────────────────────────────────────
|
|
||||||
|
|
||||||
private void RebuildCards()
|
|
||||||
{
|
|
||||||
CardsPanel.Children.Clear();
|
|
||||||
foreach (var limit in VM.Limits)
|
|
||||||
CardsPanel.Children.Add(BuildCard(limit));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static UIElement BuildCard(AgentLimit limit)
|
|
||||||
{
|
|
||||||
var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
|
|
||||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
|
||||||
|
|
||||||
// Gauge
|
|
||||||
var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
|
|
||||||
|
|
||||||
// Live badge
|
|
||||||
var liveBadge = new Border
|
|
||||||
{
|
|
||||||
Background = new SolidColorBrush(Color.FromArgb(26, 0, 200, 0)),
|
|
||||||
CornerRadius = new CornerRadius(4),
|
|
||||||
Padding = new Thickness(6, 2, 6, 2),
|
|
||||||
Margin = new Thickness(0, 0, 6, 0),
|
|
||||||
Visibility = limit.IsLive ? Visibility.Visible : Visibility.Collapsed,
|
|
||||||
Child = new TextBlock { Text = "Live", FontSize = 10, FontWeight = FontWeights.Medium,
|
|
||||||
Foreground = new SolidColorBrush(Colors.LightGreen) }
|
|
||||||
};
|
|
||||||
|
|
||||||
// Usage badge
|
|
||||||
var usageBadge = new Border
|
|
||||||
{
|
|
||||||
Background = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
|
|
||||||
CornerRadius = new CornerRadius(4),
|
|
||||||
Padding = new Thickness(6, 2, 6, 2),
|
|
||||||
Child = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
|
|
||||||
FontWeight = FontWeights.Medium, Foreground = secondary }
|
|
||||||
};
|
|
||||||
|
|
||||||
// Header row: Claude · Pro | [Live] [Usg]
|
|
||||||
var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
|
|
||||||
badgeStack.Children.Add(liveBadge);
|
|
||||||
badgeStack.Children.Add(usageBadge);
|
|
||||||
|
|
||||||
var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
|
|
||||||
nameStack.Children.Add(new TextBlock { Text = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
|
|
||||||
nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
|
|
||||||
Foreground = Brushes.White, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
|
|
||||||
nameStack.Children.Add(new TextBlock { Text = $"· {VM.PlanLabel}", FontSize = 11,
|
|
||||||
Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
|
|
||||||
|
|
||||||
var headerRow = new Grid();
|
|
||||||
headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
|
||||||
headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
|
||||||
Grid.SetColumn(nameStack, 0);
|
|
||||||
Grid.SetColumn(badgeStack, 1);
|
|
||||||
headerRow.Children.Add(nameStack);
|
|
||||||
headerRow.Children.Add(badgeStack);
|
|
||||||
|
|
||||||
// Progress bar
|
|
||||||
var progress = new ProgressBar
|
|
||||||
{
|
|
||||||
Value = limit.UsedPercent, Maximum = 100, Height = 4,
|
|
||||||
Margin = new Thickness(0, 4, 0, 4),
|
|
||||||
Foreground = accent,
|
|
||||||
Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
|
|
||||||
BorderThickness = new Thickness(0),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Time row
|
|
||||||
var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
|
|
||||||
timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
|
||||||
timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
|
|
||||||
FontWeight = FontWeights.Medium, Foreground = Brushes.White, VerticalAlignment = VerticalAlignment.Center });
|
|
||||||
|
|
||||||
var resetText = new TextBlock
|
|
||||||
{
|
|
||||||
Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
|
|
||||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
|
||||||
};
|
|
||||||
|
|
||||||
var timeRow = new Grid();
|
|
||||||
timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
|
||||||
timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
|
||||||
Grid.SetColumn(timeStack, 0);
|
|
||||||
Grid.SetColumn(resetText, 1);
|
|
||||||
timeRow.Children.Add(timeStack);
|
|
||||||
timeRow.Children.Add(resetText);
|
|
||||||
|
|
||||||
// Sparkline
|
|
||||||
var sparkline = new SparklineControl
|
|
||||||
{
|
|
||||||
Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
|
|
||||||
Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Info panel
|
|
||||||
var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
|
|
||||||
infoPanel.Children.Add(headerRow);
|
|
||||||
infoPanel.Children.Add(progress);
|
|
||||||
infoPanel.Children.Add(timeRow);
|
|
||||||
infoPanel.Children.Add(sparkline);
|
|
||||||
|
|
||||||
// Card content grid
|
|
||||||
var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
|
|
||||||
cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
|
||||||
cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
|
|
||||||
cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
|
||||||
Grid.SetColumn(gauge, 0);
|
|
||||||
Grid.SetColumn(infoPanel, 2);
|
|
||||||
cardGrid.Children.Add(gauge);
|
|
||||||
cardGrid.Children.Add(infoPanel);
|
|
||||||
|
|
||||||
var card = new Border
|
|
||||||
{
|
|
||||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
|
||||||
CornerRadius = new CornerRadius(8),
|
|
||||||
BorderBrush = new SolidColorBrush(Color.FromArgb(20, 255, 255, 255)),
|
|
||||||
BorderThickness = new Thickness(0.5),
|
|
||||||
Margin = new Thickness(8, 0, 8, 0),
|
|
||||||
Child = cardGrid,
|
|
||||||
};
|
|
||||||
|
|
||||||
var sectionLabel = new TextBlock
|
|
||||||
{
|
|
||||||
Text = limit.WindowLabel,
|
|
||||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
|
||||||
Margin = new Thickness(16, 10, 16, 4),
|
|
||||||
};
|
|
||||||
|
|
||||||
var section = new StackPanel();
|
|
||||||
section.Children.Add(sectionLabel);
|
|
||||||
section.Children.Add(card);
|
|
||||||
return section;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── State updates ────────────────────────────────────────────────
|
|
||||||
|
|
||||||
private void OnVmChanged(string? prop)
|
|
||||||
{
|
|
||||||
if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
|
|
||||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
|
|
||||||
{
|
|
||||||
RebuildCards();
|
|
||||||
UpdateFooter();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnUpdaterChanged(string? prop)
|
|
||||||
{
|
|
||||||
if (prop is nameof(UpdateManager.UpdateAvailable) or nameof(UpdateManager.LatestVersion))
|
|
||||||
UpdateBannerState();
|
|
||||||
if (prop is nameof(UpdateManager.DownloadProgress))
|
|
||||||
UpdateProgress.Value = Updater.DownloadProgress * 100;
|
|
||||||
if (prop is nameof(UpdateManager.StatusMessage))
|
|
||||||
UpdateStatusText.Text = Updater.StatusMessage;
|
|
||||||
if (prop is nameof(UpdateManager.UpdateComplete) && Updater.UpdateComplete)
|
|
||||||
InstallButton.Visibility = Visibility.Collapsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdateBannerState()
|
|
||||||
{
|
|
||||||
var visible = Updater.UpdateAvailable;
|
|
||||||
UpdateBanner.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
|
|
||||||
UpdateBannerDiv.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
|
|
||||||
if (visible) UpdateBannerTitle.Text = $"Update available — v{Updater.LatestVersion}";
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdateFooter()
|
|
||||||
{
|
|
||||||
if (VM.LastUpdated.HasValue)
|
|
||||||
{
|
|
||||||
var diff = DateTime.Now - VM.LastUpdated.Value;
|
|
||||||
LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
|
|
||||||
: $"Updated {(int)diff.TotalSeconds}s ago";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LastUpdatedText.Text = "Not yet updated";
|
|
||||||
}
|
|
||||||
LoadingBar.Visibility = VM.IsLoading ? Visibility.Visible : Visibility.Collapsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Settings ─────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
private void InitSettings()
|
|
||||||
{
|
|
||||||
VersionLabel.Text = $"v{Updater.CurrentVersion}";
|
|
||||||
BetaToggle.IsChecked = Updater.BetaChannel;
|
|
||||||
CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
|
|
||||||
|
|
||||||
var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
|
|
||||||
("4 min", 240), ("5 min", 300), ("10 min", 600) };
|
|
||||||
RefreshPicker.ItemsSource = intervals;
|
|
||||||
RefreshPicker.DisplayMemberPath = "Item1";
|
|
||||||
var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
|
|
||||||
RefreshPicker.SelectedIndex = idx < 0 ? 1 : idx;
|
|
||||||
|
|
||||||
AuthPanel.Children.Clear();
|
|
||||||
var dot = new System.Windows.Shapes.Ellipse
|
|
||||||
{
|
|
||||||
Width = 7, Height = 7, Margin = new Thickness(0, 0, 6, 0),
|
|
||||||
Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
|
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
|
||||||
};
|
|
||||||
var label = new TextBlock
|
|
||||||
{
|
|
||||||
Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
|
|
||||||
FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
|
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
|
||||||
};
|
|
||||||
var authRow = new StackPanel { Orientation = Orientation.Horizontal };
|
|
||||||
authRow.Children.Add(dot);
|
|
||||||
authRow.Children.Add(label);
|
|
||||||
AuthPanel.Children.Add(authRow);
|
|
||||||
|
|
||||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
|
||||||
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Event handlers ───────────────────────────────────────────────
|
|
||||||
|
|
||||||
private void Settings_Click(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
InitSettings();
|
|
||||||
MainPanel.Visibility = Visibility.Collapsed;
|
|
||||||
SettingsPanel.Visibility = Visibility.Visible;
|
|
||||||
UpdatePanel.Visibility = Visibility.Collapsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
|
|
||||||
|
|
||||||
private void ShowMain()
|
|
||||||
{
|
|
||||||
MainPanel.Visibility = Visibility.Visible;
|
|
||||||
SettingsPanel.Visibility = Visibility.Collapsed;
|
|
||||||
UpdatePanel.Visibility = Visibility.Collapsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Close_Click(object s, RoutedEventArgs e) => Hide();
|
|
||||||
|
|
||||||
private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
|
|
||||||
|
|
||||||
private void UpdateBanner_Click(object s, RoutedEventArgs e) => ShowUpdatePanel();
|
|
||||||
|
|
||||||
private void ShowUpdatePanel()
|
|
||||||
{
|
|
||||||
CurrentVerLabel.Text = $"v{Updater.CurrentVersion}";
|
|
||||||
NewVerLabel.Text = $"v{Updater.LatestVersion}";
|
|
||||||
ReleaseNotesText.Text = Updater.ReleaseNotes;
|
|
||||||
MainPanel.Visibility = Visibility.Collapsed;
|
|
||||||
SettingsPanel.Visibility = Visibility.Collapsed;
|
|
||||||
UpdatePanel.Visibility = Visibility.Visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
|
|
||||||
|
|
||||||
private async void Install_Click(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
NotNowButton.Visibility = Visibility.Collapsed;
|
|
||||||
UpdateStatusText.Visibility = Visibility.Visible;
|
|
||||||
UpdateProgress.Visibility = Visibility.Visible;
|
|
||||||
await Updater.DownloadAndInstallAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SignIn_Click(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var login = new LoginWindow { Owner = this };
|
|
||||||
if (login.ShowDialog() == true)
|
|
||||||
{
|
|
||||||
_ = VM.RefreshAsync();
|
|
||||||
InitSettings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void SignOut_Click(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await VM.SignOutAsync();
|
|
||||||
InitSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void BetaToggle_Changed(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
Updater.BetaChannel = BetaToggle.IsChecked == true;
|
|
||||||
_ = Updater.CheckForUpdatesAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
|
|
||||||
{
|
|
||||||
if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
|
|
||||||
{
|
|
||||||
VM.RefreshInterval = selected.Item2;
|
|
||||||
((App)Application.Current).ScheduleTimer(selected.Item2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void CheckUpdate_Click(object s, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (Updater.UpdateAvailable) { ShowUpdatePanel(); return; }
|
|
||||||
CheckUpdateButton.Content = "…";
|
|
||||||
await Updater.CheckForUpdatesAsync();
|
|
||||||
CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
|
|
||||||
<Profiles>
|
|
||||||
<Profile Name="(Default)"/>
|
|
||||||
</Profiles>
|
|
||||||
<Settings>
|
|
||||||
<Setting Name="CookieStore" Type="System.String" Scope="User">
|
|
||||||
<Value Profile="(Default)"></Value>
|
|
||||||
</Setting>
|
|
||||||
<Setting Name="BurnHistory" Type="System.String" Scope="User">
|
|
||||||
<Value Profile="(Default)"></Value>
|
|
||||||
</Setting>
|
|
||||||
<Setting Name="RefreshInterval" Type="System.Int32" Scope="User">
|
|
||||||
<Value Profile="(Default)">120</Value>
|
|
||||||
</Setting>
|
|
||||||
<Setting Name="ShowInTaskbar" Type="System.Boolean" Scope="User">
|
|
||||||
<Value Profile="(Default)">True</Value>
|
|
||||||
</Setting>
|
|
||||||
<Setting Name="BetaChannel" Type="System.Boolean" Scope="User">
|
|
||||||
<Value Profile="(Default)">False</Value>
|
|
||||||
</Setting>
|
|
||||||
</Settings>
|
|
||||||
</SettingsFile>
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
# ClaudeChecker for Windows
|
|
||||||
|
|
||||||
A native Windows port of ClaudeChecker — a system tray app for monitoring your Claude AI usage limits in real time.
|
|
||||||
|
|
||||||
## Requirements
|
|
||||||
|
|
||||||
- Windows 10 / 11 (x64)
|
|
||||||
- [.NET 8 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
|
|
||||||
- [WebView2 Runtime](https://developer.microsoft.com/microsoft-edge/webview2/) (usually pre-installed on Windows 11)
|
|
||||||
|
|
||||||
## Building
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
cd windows
|
|
||||||
dotnet build -c Release
|
|
||||||
```
|
|
||||||
|
|
||||||
The output is a single `ClaudeChecker.exe` in `bin\Release\net8.0-windows\`.
|
|
||||||
|
|
||||||
> **Assets:** You need to supply `Assets/icon.ico` and `Assets/icon.png` (128×128) before building.
|
|
||||||
> Copy them from the macOS project's `ClaudeChecker/Assets.xcassets/AppIcon.appiconset/`.
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- System tray icon — left-click to show/hide the popup
|
|
||||||
- 5-hour and 7-day usage gauges with burn rate sparklines
|
|
||||||
- Cookie-based auth via embedded WebView2 browser (sign in once, session persists)
|
|
||||||
- Auto-refresh on a configurable interval (1–10 min)
|
|
||||||
- Update checking against the same `version.json` / `version-beta.json` as the macOS app
|
|
||||||
- Beta channel toggle
|
|
||||||
- Settings panel (auth, refresh interval, update channel)
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
| File | Purpose |
|
|
||||||
|---|---|
|
|
||||||
| `App.xaml.cs` | Tray icon, popup lifecycle, refresh timer |
|
|
||||||
| `PopupWindow.xaml/cs` | Main UI — limit cards, settings, update sheet |
|
|
||||||
| `LoginWindow.xaml/cs` | WebView2 browser for claude.ai auth |
|
|
||||||
| `UsageViewModel.cs` | Data fetching, cookie handling, state |
|
|
||||||
| `UpdateManager.cs` | Version checking, download and install |
|
|
||||||
| `Models.cs` | Data models |
|
|
||||||
| `Controls/GaugeControl.cs` | Custom circular gauge |
|
|
||||||
| `Controls/SparklineControl.cs` | Burn history sparkline |
|
|
||||||
|
|
||||||
## Notes
|
|
||||||
|
|
||||||
- Cookies are stored in user settings (via `Properties.Settings`), not the WebView2 profile, so they survive WebView2 cache clears.
|
|
||||||
- Updates download a `.zip`, extract, and run a `.bat` script that replaces the exe after the app exits.
|
|
||||||
- The popup positions itself in the bottom-right corner near the system tray.
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
## What's new
|
|
||||||
|
|
||||||
Initial Windows release.
|
|
||||||
@@ -1,260 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.IO;
|
|
||||||
using System.IO.Compression;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Windows;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public class UpdateManager : INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
private const string StableUrl = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version-windows.json";
|
|
||||||
private const string BetaUrl = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version-windows-beta.json";
|
|
||||||
|
|
||||||
private bool _updateAvailable;
|
|
||||||
private string _latestVersion = "";
|
|
||||||
private string _releaseNotes = "";
|
|
||||||
private string _downloadUrl = "";
|
|
||||||
private bool _betaAvailable;
|
|
||||||
private string _latestBetaVersion = "";
|
|
||||||
private bool _isDownloading;
|
|
||||||
private double _downloadProgress;
|
|
||||||
private string _statusMessage = "";
|
|
||||||
private string? _updateError;
|
|
||||||
private bool _updateComplete;
|
|
||||||
|
|
||||||
public bool UpdateAvailable { get => _updateAvailable; set => Set(ref _updateAvailable, value); }
|
|
||||||
public string LatestVersion { get => _latestVersion; set => Set(ref _latestVersion, value); }
|
|
||||||
public string ReleaseNotes { get => _releaseNotes; set => Set(ref _releaseNotes, value); }
|
|
||||||
public string DownloadUrl { get => _downloadUrl; set => Set(ref _downloadUrl, value); }
|
|
||||||
public bool BetaAvailable { get => _betaAvailable; set => Set(ref _betaAvailable, value); }
|
|
||||||
public string LatestBetaVersion { get => _latestBetaVersion; set => Set(ref _latestBetaVersion, value); }
|
|
||||||
public bool IsDownloading { get => _isDownloading; set => Set(ref _isDownloading, value); }
|
|
||||||
public double DownloadProgress { get => _downloadProgress; set => Set(ref _downloadProgress, value); }
|
|
||||||
public string StatusMessage { get => _statusMessage; set => Set(ref _statusMessage, value); }
|
|
||||||
public string? UpdateError { get => _updateError; set => Set(ref _updateError, value); }
|
|
||||||
public bool UpdateComplete { get => _updateComplete; set => Set(ref _updateComplete, value); }
|
|
||||||
|
|
||||||
private bool _betaChannel;
|
|
||||||
public bool BetaChannel
|
|
||||||
{
|
|
||||||
get => _betaChannel;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
Set(ref _betaChannel, value);
|
|
||||||
AppSettings.Default.BetaChannel = value;
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string CurrentVersion =>
|
|
||||||
System.Reflection.Assembly.GetExecutingAssembly()
|
|
||||||
.GetName().Version?.ToString(3) ?? "1.0.0";
|
|
||||||
|
|
||||||
public UpdateManager()
|
|
||||||
{
|
|
||||||
_betaChannel = AppSettings.Default.BetaChannel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task CheckForUpdatesAsync()
|
|
||||||
{
|
|
||||||
using var http = new HttpClient();
|
|
||||||
http.DefaultRequestHeaders.CacheControl =
|
|
||||||
new System.Net.Http.Headers.CacheControlHeaderValue { NoCache = true };
|
|
||||||
|
|
||||||
var stable = await FetchVersionAsync(http, StableUrl);
|
|
||||||
var beta = await FetchVersionAsync(http, BetaUrl);
|
|
||||||
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
if (stable != null && IsNewer(stable.Version, CurrentVersion))
|
|
||||||
{
|
|
||||||
LatestVersion = stable.Version;
|
|
||||||
ReleaseNotes = stable.Notes ?? "";
|
|
||||||
DownloadUrl = stable.Url;
|
|
||||||
UpdateAvailable = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
UpdateAvailable = false;
|
|
||||||
LatestVersion = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (beta != null && IsNewer(beta.Version, CurrentVersion))
|
|
||||||
{
|
|
||||||
LatestBetaVersion = beta.Version;
|
|
||||||
BetaAvailable = true;
|
|
||||||
|
|
||||||
if (BetaChannel && IsNewer(beta.Version, LatestVersion))
|
|
||||||
{
|
|
||||||
LatestVersion = beta.Version;
|
|
||||||
ReleaseNotes = beta.Notes ?? "";
|
|
||||||
DownloadUrl = beta.Url;
|
|
||||||
UpdateAvailable = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
BetaAvailable = false;
|
|
||||||
LatestBetaVersion = "";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<VersionInfo?> FetchVersionAsync(HttpClient http, string url)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var bust = $"{url}?t={DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
|
|
||||||
var json = await http.GetStringAsync(bust);
|
|
||||||
return JsonSerializer.Deserialize<VersionInfo>(json,
|
|
||||||
new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
|
|
||||||
}
|
|
||||||
catch { return null; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task DownloadAndInstallAsync()
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(DownloadUrl)) return;
|
|
||||||
|
|
||||||
IsDownloading = true;
|
|
||||||
UpdateError = null;
|
|
||||||
UpdateComplete = false;
|
|
||||||
StatusMessage = "Downloading…";
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var tmpDir = Path.Combine(Path.GetTempPath(), $"CCUpdate_{Guid.NewGuid():N}");
|
|
||||||
Directory.CreateDirectory(tmpDir);
|
|
||||||
var zipPath = Path.Combine(tmpDir, "ClaudeChecker.zip");
|
|
||||||
|
|
||||||
using var http = new HttpClient();
|
|
||||||
var response = await http.GetAsync(DownloadUrl, HttpCompletionOption.ResponseHeadersRead);
|
|
||||||
response.EnsureSuccessStatusCode();
|
|
||||||
|
|
||||||
var total = response.Content.Headers.ContentLength ?? 0;
|
|
||||||
var received = 0L;
|
|
||||||
|
|
||||||
await using (var stream = await response.Content.ReadAsStreamAsync())
|
|
||||||
await using (var file = File.Create(zipPath))
|
|
||||||
{
|
|
||||||
var buffer = new byte[81920];
|
|
||||||
int read;
|
|
||||||
while ((read = await stream.ReadAsync(buffer)) > 0)
|
|
||||||
{
|
|
||||||
await file.WriteAsync(buffer.AsMemory(0, read));
|
|
||||||
received += read;
|
|
||||||
if (total > 0)
|
|
||||||
DownloadProgress = (double)received / total * 0.8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StatusMessage = "Unpacking…";
|
|
||||||
DownloadProgress = 0.85;
|
|
||||||
|
|
||||||
var extractDir = Path.Combine(tmpDir, "extracted");
|
|
||||||
ZipFile.ExtractToDirectory(zipPath, extractDir, overwriteFiles: true);
|
|
||||||
|
|
||||||
// Find the installer exe
|
|
||||||
var newExe = FindExe(extractDir);
|
|
||||||
if (newExe == null) throw new Exception("ClaudeChecker.exe not found in update package.");
|
|
||||||
|
|
||||||
DownloadProgress = 0.95;
|
|
||||||
StatusMessage = "Installing…";
|
|
||||||
|
|
||||||
// Write a batch script to replace the exe after we exit
|
|
||||||
var currentExe = Process.GetCurrentProcess().MainModule!.FileName;
|
|
||||||
var script = $"""
|
|
||||||
@echo off
|
|
||||||
timeout /t 2 /nobreak > nul
|
|
||||||
copy /Y "{newExe}" "{currentExe}"
|
|
||||||
start "" "{currentExe}"
|
|
||||||
rmdir /S /Q "{tmpDir}"
|
|
||||||
""";
|
|
||||||
|
|
||||||
var scriptPath = Path.Combine(Path.GetTempPath(), "claudechecker_update.bat");
|
|
||||||
await File.WriteAllTextAsync(scriptPath, script);
|
|
||||||
|
|
||||||
DownloadProgress = 1.0;
|
|
||||||
StatusMessage = "Installed! Relaunching…";
|
|
||||||
UpdateComplete = true;
|
|
||||||
|
|
||||||
await Task.Delay(800);
|
|
||||||
|
|
||||||
Process.Start(new ProcessStartInfo
|
|
||||||
{
|
|
||||||
FileName = "cmd.exe",
|
|
||||||
Arguments = $"/C \"{scriptPath}\"",
|
|
||||||
CreateNoWindow = true,
|
|
||||||
UseShellExecute = false,
|
|
||||||
});
|
|
||||||
|
|
||||||
Application.Current.Dispatcher.Invoke(() => Application.Current.Shutdown());
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
UpdateError = ex.Message;
|
|
||||||
IsDownloading = false;
|
|
||||||
StatusMessage = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? FindExe(string dir)
|
|
||||||
{
|
|
||||||
foreach (var f in Directory.EnumerateFiles(dir, "ClaudeChecker.exe", SearchOption.AllDirectories))
|
|
||||||
return f;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static bool IsNewer(string version, string current)
|
|
||||||
{
|
|
||||||
static (int[] Base, int[]? Pre) Parse(string v)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(v)) return ([], null);
|
|
||||||
var halves = v.Split('-', 2);
|
|
||||||
var baseP = Array.ConvertAll(halves[0].Split('.'), p => int.TryParse(p, out var n) ? n : 0);
|
|
||||||
int[]? pre = halves.Length > 1
|
|
||||||
? Array.ConvertAll(halves[1].Split('.'), p => int.TryParse(p, out var n) ? n : 0)
|
|
||||||
: null;
|
|
||||||
return (baseP, pre);
|
|
||||||
}
|
|
||||||
|
|
||||||
var (ab, ap) = Parse(version);
|
|
||||||
var (bb, bp) = Parse(current);
|
|
||||||
|
|
||||||
for (var i = 0; i < Math.Max(ab.Length, bb.Length); i++)
|
|
||||||
{
|
|
||||||
var av = i < ab.Length ? ab[i] : 0;
|
|
||||||
var bv = i < bb.Length ? bb[i] : 0;
|
|
||||||
if (av != bv) return av > bv;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ap == null && bp != null) return true;
|
|
||||||
if (ap != null && bp == null) return false;
|
|
||||||
if (ap != null && bp != null)
|
|
||||||
{
|
|
||||||
for (var i = 0; i < Math.Max(ap.Length, bp.Length); i++)
|
|
||||||
{
|
|
||||||
var av = i < ap.Length ? ap[i] : 0;
|
|
||||||
var bv = i < bp.Length ? bp[i] : 0;
|
|
||||||
if (av != bv) return av > bv;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler? PropertyChanged;
|
|
||||||
private void Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
|
|
||||||
{
|
|
||||||
if (EqualityComparer<T>.Default.Equals(field, value)) return;
|
|
||||||
field = value;
|
|
||||||
Application.Current.Dispatcher.InvokeAsync(()
|
|
||||||
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,310 +0,0 @@
|
|||||||
using Microsoft.Web.WebView2.Core;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
|
|
||||||
namespace ClaudeCheckerWindows;
|
|
||||||
|
|
||||||
public class UsageViewModel : INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
private static readonly string OrgId = "daf626a9-4924-4ff3-ba98-23b523062f8e";
|
|
||||||
private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
|
|
||||||
|
|
||||||
private List<AgentLimit> _limits = [];
|
|
||||||
private bool _isLoading;
|
|
||||||
private string? _errorMessage;
|
|
||||||
private bool _isSignedIn;
|
|
||||||
private string _userEmail = "";
|
|
||||||
private string _planLabel = "Pro";
|
|
||||||
private DateTime? _lastUpdated;
|
|
||||||
private OverageSpendLimit? _overage;
|
|
||||||
private PrepaidCredits? _prepaid;
|
|
||||||
|
|
||||||
private readonly Dictionary<string, List<double>> _burnHistory = [];
|
|
||||||
private const int MaxHistorySamples = 24;
|
|
||||||
|
|
||||||
public List<AgentLimit> Limits { get => _limits; set => Set(ref _limits, value); }
|
|
||||||
public bool IsLoading { get => _isLoading; set => Set(ref _isLoading, value); }
|
|
||||||
public string? ErrorMessage { get => _errorMessage; set => Set(ref _errorMessage, value); }
|
|
||||||
public bool IsSignedIn { get => _isSignedIn; set => Set(ref _isSignedIn, value); }
|
|
||||||
public string UserEmail { get => _userEmail; set => Set(ref _userEmail, value); }
|
|
||||||
public string PlanLabel { get => _planLabel; set => Set(ref _planLabel, value); }
|
|
||||||
public DateTime? LastUpdated { get => _lastUpdated; set => Set(ref _lastUpdated, value); }
|
|
||||||
public OverageSpendLimit? Overage { get => _overage; set => Set(ref _overage, value); }
|
|
||||||
public PrepaidCredits? Prepaid { get => _prepaid; set => Set(ref _prepaid, value); }
|
|
||||||
|
|
||||||
private int _refreshInterval = 120;
|
|
||||||
public int RefreshInterval
|
|
||||||
{
|
|
||||||
get => _refreshInterval;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
Set(ref _refreshInterval, value);
|
|
||||||
AppSettings.Default.RefreshInterval = value;
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool _showInTaskbar = true;
|
|
||||||
public bool ShowInTaskbar
|
|
||||||
{
|
|
||||||
get => _showInTaskbar;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
Set(ref _showInTaskbar, value);
|
|
||||||
AppSettings.Default.ShowInTaskbar = value;
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public UsageViewModel()
|
|
||||||
{
|
|
||||||
_refreshInterval = AppSettings.Default.RefreshInterval > 0
|
|
||||||
? AppSettings.Default.RefreshInterval : 120;
|
|
||||||
_showInTaskbar = AppSettings.Default.ShowInTaskbar;
|
|
||||||
LoadBurnHistory();
|
|
||||||
LoadPlaceholders();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task RefreshAsync()
|
|
||||||
{
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() => IsLoading = true);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var cookies = await GetCookiesAsync();
|
|
||||||
if (cookies.Count == 0)
|
|
||||||
{
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
IsSignedIn = false;
|
|
||||||
ErrorMessage = "Not signed in — click Sign In to authenticate.";
|
|
||||||
IsLoading = false;
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
using var http = BuildClient(cookies);
|
|
||||||
|
|
||||||
var usageTask = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
|
|
||||||
var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
|
|
||||||
var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
|
|
||||||
var emailTask = FetchEmailAsync(http);
|
|
||||||
|
|
||||||
await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
|
|
||||||
|
|
||||||
var usage = usageTask.Result;
|
|
||||||
var limits = BuildLimits(usage);
|
|
||||||
|
|
||||||
foreach (var limit in limits)
|
|
||||||
{
|
|
||||||
var key = limit.Window.ToString();
|
|
||||||
if (!_burnHistory.ContainsKey(key)) _burnHistory[key] = [];
|
|
||||||
_burnHistory[key].Add(limit.UsedPercent);
|
|
||||||
if (_burnHistory[key].Count > MaxHistorySamples)
|
|
||||||
_burnHistory[key].RemoveAt(0);
|
|
||||||
limit.BurnHistory = [.. _burnHistory[key]];
|
|
||||||
}
|
|
||||||
SaveBurnHistory();
|
|
||||||
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
Limits = limits;
|
|
||||||
Overage = overageTask.Result;
|
|
||||||
Prepaid = prepaidTask.Result;
|
|
||||||
UserEmail = emailTask.Result ?? UserEmail;
|
|
||||||
IsSignedIn = true;
|
|
||||||
ErrorMessage = null;
|
|
||||||
LastUpdated = DateTime.Now;
|
|
||||||
IsLoading = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
ErrorMessage = ex.Message;
|
|
||||||
IsLoading = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task SignOutAsync()
|
|
||||||
{
|
|
||||||
AppSettings.Default.CookieStore = "";
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
|
|
||||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
IsSignedIn = false;
|
|
||||||
UserEmail = "";
|
|
||||||
ErrorMessage = "Signed out.";
|
|
||||||
Limits = [];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cookie store: we persist cookies as JSON in settings after login
|
|
||||||
public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
|
|
||||||
{
|
|
||||||
var raw = AppSettings.Default.CookieStore;
|
|
||||||
if (string.IsNullOrEmpty(raw)) return [];
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return JsonSerializer.Deserialize<List<CookieEntry>>(raw)
|
|
||||||
?.Select(c => (c.Name, c.Value, c.Domain, c.Path))
|
|
||||||
.ToList() ?? [];
|
|
||||||
}
|
|
||||||
catch { return []; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
|
|
||||||
{
|
|
||||||
var entries = cookies
|
|
||||||
.Where(c => c.Domain.Contains("claude.ai"))
|
|
||||||
.Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
|
|
||||||
.ToList();
|
|
||||||
AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
|
|
||||||
{
|
|
||||||
var handler = new HttpClientHandler { UseCookies = false };
|
|
||||||
var http = new HttpClient(handler);
|
|
||||||
http.DefaultRequestHeaders.Add("accept", "application/json");
|
|
||||||
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
|
||||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
|
||||||
return http;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<T?> FetchAsync<T>(HttpClient http, string url) where T : class
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var resp = await http.GetAsync(url);
|
|
||||||
if (!resp.IsSuccessStatusCode) return null;
|
|
||||||
var json = await resp.Content.ReadAsStringAsync();
|
|
||||||
return JsonSerializer.Deserialize<T>(json, JsonOpts);
|
|
||||||
}
|
|
||||||
catch { return null; }
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<string?> FetchEmailAsync(HttpClient http)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
|
||||||
if (!resp.IsSuccessStatusCode) return null;
|
|
||||||
var json = await resp.Content.ReadAsStringAsync();
|
|
||||||
var boot = JsonSerializer.Deserialize<BootstrapResponse>(json, JsonOpts);
|
|
||||||
return boot?.Account?.EmailAddress;
|
|
||||||
}
|
|
||||||
catch { return null; }
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<AgentLimit> BuildLimits(UsageResponse? usage)
|
|
||||||
{
|
|
||||||
if (usage == null) return [];
|
|
||||||
var now = DateTime.Now;
|
|
||||||
var result = new List<AgentLimit>();
|
|
||||||
|
|
||||||
if (usage.FiveHour != null)
|
|
||||||
{
|
|
||||||
var reset = ParseDate(usage.FiveHour.ResetsAt, now);
|
|
||||||
var pct = Math.Clamp(usage.FiveHour.Utilization, 0, 100);
|
|
||||||
result.Add(new AgentLimit
|
|
||||||
{
|
|
||||||
Window = WindowKind.FiveHour,
|
|
||||||
UsedPercent = pct,
|
|
||||||
TimeRemaining = TimeLeft(reset, now),
|
|
||||||
ResetDate = reset,
|
|
||||||
BurnRate = pct / 5.0,
|
|
||||||
IsLive = true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (usage.SevenDay != null)
|
|
||||||
{
|
|
||||||
var reset = ParseDate(usage.SevenDay.ResetsAt, now);
|
|
||||||
var pct = Math.Clamp(usage.SevenDay.Utilization, 0, 100);
|
|
||||||
result.Add(new AgentLimit
|
|
||||||
{
|
|
||||||
Window = WindowKind.SevenDay,
|
|
||||||
UsedPercent = pct,
|
|
||||||
TimeRemaining = TimeLeft(reset, now),
|
|
||||||
ResetDate = reset,
|
|
||||||
BurnRate = pct / (7 * 24.0),
|
|
||||||
IsLive = true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static DateTime ParseDate(string? s, DateTime fallback)
|
|
||||||
{
|
|
||||||
if (s == null) return fallback.AddHours(1);
|
|
||||||
return DateTime.TryParse(s, null, System.Globalization.DateTimeStyles.RoundtripKind, out var d)
|
|
||||||
? d.ToLocalTime() : fallback.AddHours(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string TimeLeft(DateTime reset, DateTime now)
|
|
||||||
{
|
|
||||||
var diff = reset - now;
|
|
||||||
if (diff <= TimeSpan.Zero) return "resetting...";
|
|
||||||
if (diff.TotalDays >= 1)
|
|
||||||
return $"{(int)diff.TotalDays}d {diff.Hours}h";
|
|
||||||
return $"{diff.Hours}h {diff.Minutes}m";
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LoadPlaceholders()
|
|
||||||
{
|
|
||||||
var now = DateTime.Now;
|
|
||||||
Limits =
|
|
||||||
[
|
|
||||||
new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
|
|
||||||
new() { Window = WindowKind.SevenDay, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LoadBurnHistory()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var raw = AppSettings.Default.BurnHistory;
|
|
||||||
if (string.IsNullOrEmpty(raw)) return;
|
|
||||||
var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
|
|
||||||
if (saved != null)
|
|
||||||
foreach (var kv in saved) _burnHistory[kv.Key] = kv.Value;
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SaveBurnHistory()
|
|
||||||
{
|
|
||||||
AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
|
|
||||||
AppSettings.Default.Save();
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler? PropertyChanged;
|
|
||||||
private void Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
|
|
||||||
{
|
|
||||||
if (EqualityComparer<T>.Default.Equals(field, value)) return;
|
|
||||||
field = value;
|
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
private class CookieEntry
|
|
||||||
{
|
|
||||||
public string Name { get; set; } = "";
|
|
||||||
public string Value { get; set; } = "";
|
|
||||||
public string Domain { get; set; } = "";
|
|
||||||
public string Path { get; set; } = "/";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user