Compare commits
97
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a74d0cece5 | ||
|
|
b5cd7b1bc9 | ||
|
|
3249dbd4aa | ||
|
|
189c513677 | ||
|
|
05e66b22d1 | ||
|
|
48e6f64c9a | ||
|
|
d55a92623c | ||
|
|
c70a090983 | ||
|
|
cc0270326e | ||
|
|
7601452f93 | ||
|
|
5a78a021cb | ||
|
|
7d465c13d8 | ||
|
|
ca67039e3e | ||
|
|
1e4cdc09b3 | ||
|
|
4e154bcaa7 | ||
|
|
ea784384c1 | ||
|
|
4e813995c9 | ||
|
|
0ffd690098 | ||
|
|
c083256882 | ||
|
|
fd94c96d83 | ||
|
|
d22eb7381c | ||
|
|
dd59f4565c | ||
|
|
f548210387 | ||
|
|
89659322ac | ||
|
|
bfa476a276 | ||
|
|
7f7024d976 | ||
|
|
f6dc91f38c | ||
|
|
721075d969 | ||
|
|
87ce720a31 | ||
|
|
1172fd8f4e | ||
|
|
11f097b969 | ||
|
|
6e992d56af | ||
|
|
49a0a8c9dd | ||
|
|
f63de02861 | ||
|
|
acabb0e101 | ||
|
|
4945097e8b | ||
|
|
2d478be0ad | ||
|
|
0096199334 | ||
|
|
01f28cf044 | ||
|
|
37939b84ac | ||
|
|
9c8e0dcdb6 | ||
|
|
0010051ede | ||
|
|
98bd736a66 | ||
|
|
251efdbb0b | ||
|
|
f219b65650 | ||
|
|
b0907d17b5 | ||
|
|
d3aa3dc6bd | ||
|
|
797bf702cd | ||
|
|
58a09e8701 | ||
|
|
01e16e3abe | ||
|
|
8e4b23d4de | ||
|
|
708b55d919 | ||
|
|
59c8c390b6 | ||
|
|
ad525ef8d1 | ||
|
|
e6fa66bc73 | ||
|
|
2d000bca5e | ||
|
|
c7a663c42b | ||
|
|
a182b7ca59 | ||
|
|
182acb1f21 | ||
|
|
3ff5067d49 | ||
|
|
2816a5cedb | ||
|
|
a4a4d70530 | ||
|
|
073d3b14ef | ||
|
|
5603b94f8a | ||
|
|
28a449b060 | ||
|
|
d2ba7365b0 | ||
|
|
93862686b6 | ||
|
|
8170f3a1b3 | ||
|
|
5fbdaab2d0 | ||
|
|
7db17fb53d | ||
|
|
f6f1982390 | ||
|
|
de61499bab | ||
|
|
6e95221e0b | ||
|
|
12ce671205 | ||
|
|
7a74e19a20 | ||
|
|
4c1ed861ed | ||
|
|
a1df7cd38a | ||
|
|
311385a716 | ||
|
|
3abe5e4c9b | ||
|
|
5457e00ef0 | ||
|
|
00bd5884db | ||
|
|
a3ce649946 | ||
|
|
c97943bfa0 | ||
|
|
e89df508bd | ||
|
|
de247e545b | ||
|
|
4f481a06c3 | ||
|
|
c223bfba72 | ||
|
|
b388191191 | ||
|
|
4896d28c8c | ||
|
|
0e248dc331 | ||
|
|
2277a29a3e | ||
|
|
605b11e849 | ||
|
|
bb4c28c751 | ||
|
|
e0c73211a0 | ||
|
|
ceb5951f24 | ||
|
|
c0ed68d023 | ||
|
|
f3d8a50dc6 |
@@ -1,29 +0,0 @@
|
||||
name: Build
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
macos:
|
||||
runs-on: claudechecker-macos-arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build universal macOS app
|
||||
run: bash scripts/build-macos.sh
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ClaudeChecker-macOS
|
||||
path: ClaudeChecker.zip
|
||||
windows:
|
||||
runs-on: claudechecker-windows-x64
|
||||
defaults:
|
||||
run:
|
||||
shell: powershell
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build Windows installer
|
||||
run: ./scripts/build-windows.ps1
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ClaudeChecker-Windows
|
||||
path: ClaudeChecker-Installer.exe
|
||||
@@ -1,26 +0,0 @@
|
||||
name: Release Windows Beta
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version, e.g. 0.0.1-beta.64'
|
||||
required: true
|
||||
type: string
|
||||
jobs:
|
||||
release:
|
||||
if: github.ref == 'refs/heads/main'
|
||||
runs-on: claudechecker-windows-x64
|
||||
defaults:
|
||||
run:
|
||||
shell: powershell
|
||||
env:
|
||||
VERSION: ${{ inputs.version }}
|
||||
CHANNEL: windows-beta
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build Windows installer
|
||||
run: ./scripts/build-windows.ps1 -Version $env:VERSION
|
||||
- name: Publish release and update feed
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: python scripts/publish-release.py
|
||||
@@ -1,29 +0,0 @@
|
||||
name: Release macOS
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version, e.g. 1.3.3 or 1.3.4-beta.1'
|
||||
required: true
|
||||
type: string
|
||||
channel:
|
||||
description: Release channel
|
||||
required: true
|
||||
default: stable
|
||||
type: choice
|
||||
options: [stable, beta]
|
||||
jobs:
|
||||
release:
|
||||
if: github.ref == 'refs/heads/main'
|
||||
runs-on: claudechecker-macos-arm64
|
||||
env:
|
||||
VERSION: ${{ inputs.version }}
|
||||
CHANNEL: ${{ inputs.channel }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build universal macOS app
|
||||
run: bash scripts/build-macos.sh
|
||||
- name: Publish release and update feed
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: python3 scripts/publish-release.py
|
||||
@@ -18,18 +18,12 @@ Steps to reproduce the behaviour:
|
||||
**Expected behaviour**
|
||||
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**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**Environment**
|
||||
- Platform: [macOS / Windows]
|
||||
- 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]
|
||||
- macOS version: [e.g. Sequoia 15.4]
|
||||
- ClaudeChecker version: [e.g. 1.1.3]
|
||||
- Claude plan: [e.g. Pro, Max]
|
||||
|
||||
**Additional context**
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
name: Release Beta
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*-beta*'
|
||||
|
||||
jobs:
|
||||
release-beta:
|
||||
runs-on: macos-latest
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Get version from tag
|
||||
id: version
|
||||
run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
xcodebuild \
|
||||
-project ClaudeChecker.xcodeproj \
|
||||
-scheme ClaudeChecker \
|
||||
-configuration Release \
|
||||
-derivedDataPath build \
|
||||
clean build
|
||||
|
||||
- name: Zip app
|
||||
run: |
|
||||
ditto -c -k --keepParent \
|
||||
build/Build/Products/Release/ClaudeChecker.app \
|
||||
ClaudeChecker.zip
|
||||
|
||||
- name: Create GitHub pre-release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
gh release create "$GITHUB_REF_NAME" ClaudeChecker.zip \
|
||||
--title "$GITHUB_REF_NAME" \
|
||||
--prerelease \
|
||||
--notes "$(cat RELEASE_NOTES.md 2>/dev/null || echo 'Beta release ${{ steps.version.outputs.version }}')"
|
||||
|
||||
- name: Update version-beta.json
|
||||
run: |
|
||||
notes=$(cat RELEASE_NOTES.md 2>/dev/null || echo "Beta release ${{ steps.version.outputs.version }}")
|
||||
jq -n \
|
||||
--arg version "${{ steps.version.outputs.version }}" \
|
||||
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker.zip" \
|
||||
--arg notes "$notes" \
|
||||
'{version: $version, url: $url, notes: $notes}' > version-beta.json
|
||||
|
||||
- name: Update beta badge in README
|
||||
run: |
|
||||
shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
|
||||
tag="${{ github.ref_name }}"
|
||||
export BADGE="[](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
|
||||
python3 -c "
|
||||
import os
|
||||
badge = os.environ['BADGE']
|
||||
lines = open('README.md').readlines()
|
||||
out = []
|
||||
for line in lines:
|
||||
out.append(badge + chr(10) if '<!-- BETA_BADGE -->' in line else line)
|
||||
open('README.md', 'w').writelines(out)
|
||||
"
|
||||
|
||||
- name: Commit version-beta.json and README
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add version-beta.json README.md
|
||||
git commit -m "Beta release ${{ github.ref_name }}"
|
||||
git pull --rebase origin main
|
||||
git push origin HEAD:main
|
||||
@@ -0,0 +1,77 @@
|
||||
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
|
||||
@@ -0,0 +1,77 @@
|
||||
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
|
||||
@@ -0,0 +1,111 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
release:
|
||||
if: ${{ !contains(github.ref_name, '-') }}
|
||||
runs-on: macos-latest
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Get version from tag
|
||||
id: version
|
||||
run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
xcodebuild \
|
||||
-project ClaudeChecker.xcodeproj \
|
||||
-scheme ClaudeChecker \
|
||||
-configuration Release \
|
||||
-derivedDataPath build \
|
||||
clean build
|
||||
|
||||
- name: Zip app
|
||||
run: |
|
||||
ditto -c -k --keepParent \
|
||||
build/Build/Products/Release/ClaudeChecker.app \
|
||||
ClaudeChecker.zip
|
||||
|
||||
- name: Compute SHA256
|
||||
id: sha
|
||||
run: echo "sha256=$(shasum -a 256 ClaudeChecker.zip | awk '{print $1}')" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create GitHub release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
gh release create "$GITHUB_REF_NAME" ClaudeChecker.zip \
|
||||
--title "$GITHUB_REF_NAME" \
|
||||
--notes "$(cat RELEASE_NOTES.md 2>/dev/null || echo 'Release ${{ steps.version.outputs.version }}')"
|
||||
|
||||
- name: Update version.json
|
||||
run: |
|
||||
notes=$(cat RELEASE_NOTES.md 2>/dev/null || echo "Release ${{ steps.version.outputs.version }}")
|
||||
jq -n \
|
||||
--arg version "${{ steps.version.outputs.version }}" \
|
||||
--arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker.zip" \
|
||||
--arg notes "$notes" \
|
||||
'{version: $version, url: $url, notes: $notes}' > version.json
|
||||
|
||||
- name: Update Homebrew cask
|
||||
run: |
|
||||
sed -i '' \
|
||||
-e 's/version "[^"]*"/version "${{ steps.version.outputs.version }}"/' \
|
||||
-e 's/sha256 "[^"]*"/sha256 "${{ steps.sha.outputs.sha256 }}"/' \
|
||||
../homebrew-tap/Casks/claudechecker.rb 2>/dev/null || true
|
||||
|
||||
- name: Update README badge
|
||||
env:
|
||||
NEW_VERSION: ${{ steps.version.outputs.version }}
|
||||
run: |
|
||||
python3 -c "
|
||||
import os, re
|
||||
v = os.environ['NEW_VERSION']
|
||||
content = open('README.md').read()
|
||||
content = re.sub(r'version-[0-9][^-]*-orange', 'version-' + v + '-orange', content)
|
||||
lines = content.splitlines(keepends=True)
|
||||
out = []
|
||||
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)
|
||||
"
|
||||
|
||||
- name: Commit version.json and README
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add version.json README.md
|
||||
git commit -m "Release ${{ github.ref_name }}"
|
||||
git pull --rebase origin main
|
||||
git push origin HEAD:main
|
||||
|
||||
- name: Update Homebrew tap
|
||||
env:
|
||||
TAP_TOKEN: ${{ secrets.TAP_TOKEN }}
|
||||
run: |
|
||||
git clone https://x-access-token:${{ secrets.TAP_TOKEN }}@github.com/${{ github.repository_owner }}/homebrew-tap /tmp/homebrew-tap
|
||||
sed -i '' \
|
||||
-e 's/version "[^"]*"/version "${{ steps.version.outputs.version }}"/' \
|
||||
-e 's/sha256 "[^"]*"/sha256 "${{ steps.sha.outputs.sha256 }}"/' \
|
||||
/tmp/homebrew-tap/Casks/claudechecker.rb
|
||||
cd /tmp/homebrew-tap
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add Casks/claudechecker.rb
|
||||
git commit -m "Update claudechecker to ${{ github.ref_name }}"
|
||||
git push
|
||||
@@ -1,7 +0,0 @@
|
||||
/build/
|
||||
/publish/
|
||||
/ClaudeChecker.zip
|
||||
/ClaudeChecker-Installer.exe
|
||||
/windows/bin/
|
||||
/windows/obj/
|
||||
__pycache__/
|
||||
+1
-1
@@ -4,7 +4,7 @@ Thanks for your interest in ClaudeChecker!
|
||||
|
||||
## Reporting bugs & requesting features
|
||||
|
||||
Please use the [issue templates](https://git.jamesbone.net/coder/claudechecker/issues/new/choose) — they keep reports consistent and easy to act on.
|
||||
Please use the [issue templates](https://github.com/superdooper86/claudechecker/issues/new/choose) — they keep reports consistent and easy to act on.
|
||||
|
||||
## Pull requests
|
||||
|
||||
|
||||
@@ -10,13 +10,6 @@
|
||||
<string>77</string>
|
||||
<key>objects</key>
|
||||
<dict>
|
||||
<key>AAAAAA009</key>
|
||||
<dict>
|
||||
<key>isa</key>
|
||||
<string>PBXBuildFile</string>
|
||||
<key>fileRef</key>
|
||||
<string>AAAAAA109</string>
|
||||
</dict>
|
||||
<key>AAAAAA007</key>
|
||||
<dict>
|
||||
<key>isa</key>
|
||||
@@ -95,17 +88,6 @@
|
||||
<key>sourceTree</key>
|
||||
<string><group></string>
|
||||
</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>
|
||||
<dict>
|
||||
<key>isa</key>
|
||||
@@ -197,7 +179,6 @@
|
||||
<string>AAAAAA106</string>
|
||||
<string>AAAAAA107</string>
|
||||
<string>AAAAAA108</string>
|
||||
<string>AAAAAA109</string>
|
||||
</array>
|
||||
<key>path</key>
|
||||
<string>ClaudeChecker</string>
|
||||
@@ -311,7 +292,6 @@
|
||||
<string>AAAAAA005</string>
|
||||
<string>AAAAAA007</string>
|
||||
<string>AAAAAA008</string>
|
||||
<string>AAAAAA009</string>
|
||||
</array>
|
||||
<key>runOnlyForDeploymentPostprocessing</key>
|
||||
<string>0</string>
|
||||
|
||||
@@ -18,43 +18,16 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
var updateManager = UpdateManager()
|
||||
var refreshTimer: Timer?
|
||||
var cookiePrimerView: WKWebView?
|
||||
var cookiePrimerWindow: NSWindow?
|
||||
var primerNavDelegate: PrimerNavDelegate?
|
||||
var cancellables = Set<AnyCancellable>()
|
||||
|
||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||
NSApp.setActivationPolicy(.accessory)
|
||||
|
||||
// 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.
|
||||
// Hidden WKWebView to prime the shared cookie store
|
||||
let config = WKWebViewConfiguration()
|
||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
||||
let wv = WKWebView(frame: CGRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
||||
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")!))
|
||||
cookiePrimerView = WKWebView(frame: .zero, configuration: config)
|
||||
cookiePrimerView?.load(URLRequest(url: URL(string: "https://claude.ai/api/organizations/\(UsageViewModel.orgId)/usage")!))
|
||||
|
||||
// Status item
|
||||
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||
@@ -161,6 +134,12 @@ 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) {
|
||||
@@ -261,13 +240,4 @@ 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,7 +40,8 @@ struct ContentView: View {
|
||||
.environmentObject(updater)
|
||||
.transition(.move(edge: .trailing).combined(with: .opacity))
|
||||
} else {
|
||||
VStack(spacing: 0) {
|
||||
ScrollView(.vertical, showsIndicators: false) {
|
||||
VStack(spacing: 0) {
|
||||
// Cards grid
|
||||
if vm.limits.isEmpty {
|
||||
EmptyStateView()
|
||||
@@ -95,6 +96,7 @@ struct ContentView: View {
|
||||
.padding(.bottom, 8)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.transition(.opacity)
|
||||
|
||||
@@ -116,8 +118,8 @@ struct ContentView: View {
|
||||
showUpdateSheet = true
|
||||
}
|
||||
.sheet(isPresented: $showLogin) {
|
||||
LoginSheetView(isPresented: $showLogin) { webView in
|
||||
Task { await vm.adoptAndRefresh(webView) }
|
||||
LoginSheetView(isPresented: $showLogin) {
|
||||
Task { await vm.refresh() }
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $showUpdateSheet) {
|
||||
@@ -396,11 +398,12 @@ struct DiaryRow: View {
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack {
|
||||
Text("\(totalSaved) samples")
|
||||
.font(.system(size: 10.5))
|
||||
.foregroundColor(.secondary)
|
||||
AgentIconView(agent: .claude, size: 12)
|
||||
Text("Claude")
|
||||
.font(.system(size: 12, weight: .medium))
|
||||
.foregroundColor(color)
|
||||
Spacer()
|
||||
Text("Avg burn rate: \(String(format: "%.1f", burnRate))%/h")
|
||||
Text("\(totalSaved) samples · Avg Burn Rate: +\(String(format: "%.1f", burnRate))%/h")
|
||||
.font(.system(size: 10.5))
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
@@ -584,7 +587,6 @@ struct SettingsView: View {
|
||||
@Binding var showSettings: Bool
|
||||
@Binding var showUpdateSheet: Bool
|
||||
@State private var checkingForUpdates = false
|
||||
@State private var showDiagnostics = false
|
||||
|
||||
let refreshOptions: [(label: String, seconds: TimeInterval)] = [
|
||||
("1 min", 60),
|
||||
@@ -771,23 +773,6 @@ struct SettingsView: View {
|
||||
|
||||
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
|
||||
HStack(spacing: 12) {
|
||||
Image(nsImage: NSImage(named: "AppIcon") ?? NSImage())
|
||||
@@ -929,12 +914,12 @@ struct ErrorBanner: View {
|
||||
struct EmptyStateView: View {
|
||||
var body: some View {
|
||||
VStack(spacing: 10) {
|
||||
Image(systemName: "person.crop.circle.badge.questionmark")
|
||||
Image(systemName: "key.slash")
|
||||
.font(.system(size: 28))
|
||||
.foregroundColor(.secondary)
|
||||
Text("Not signed in")
|
||||
Text("No API key configured")
|
||||
.font(.system(size: 13, weight: .medium))
|
||||
Text("Sign in to claude.ai to see your usage.")
|
||||
Text("Open Settings to add your Anthropic API key.")
|
||||
.font(.system(size: 11.5))
|
||||
.foregroundColor(.secondary)
|
||||
.multilineTextAlignment(.center)
|
||||
|
||||
@@ -1,219 +0,0 @@
|
||||
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("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 {
|
||||
let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?"
|
||||
let build = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"
|
||||
let orgId = UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)"
|
||||
let lastOrg = vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg
|
||||
let lastErr = vm.diagLastError.isEmpty ? "(none)" : vm.diagLastError
|
||||
var lines: [String] = []
|
||||
lines.append("=== ClaudeChecker Diagnostics ===")
|
||||
lines.append("Version: \(version) (\(build))")
|
||||
lines.append("Signed in: \(vm.isSignedIn ? "Yes" : "No")")
|
||||
lines.append("Org ID: \(orgId)")
|
||||
lines.append("lastActiveOrg: \(lastOrg)")
|
||||
lines.append("Error: \(vm.errorMessage ?? "(none)")")
|
||||
lines.append("")
|
||||
lines.append("Last path: \(vm.diagLastPath)")
|
||||
lines.append("Last status: \(vm.diagLastStatus)")
|
||||
lines.append("Last error: \(lastErr)")
|
||||
if let t = vm.diagLastFetch {
|
||||
lines.append("Time: \(t.formatted(date: .omitted, time: .standard))")
|
||||
}
|
||||
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>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.3.3</string>
|
||||
<string>1.1.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>82</string>
|
||||
<string>40</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>13.0</string>
|
||||
<key>LSUIElement</key>
|
||||
@@ -45,3 +45,7 @@
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import WebKit
|
||||
// MARK: - Login Web View
|
||||
|
||||
struct LoginWebView: NSViewRepresentable {
|
||||
let onAuthenticated: (WKWebView) -> Void
|
||||
let onAuthenticated: () -> Void
|
||||
|
||||
func makeNSView(context: Context) -> WKWebView {
|
||||
let config = WKWebViewConfiguration()
|
||||
@@ -12,13 +12,6 @@ struct LoginWebView: NSViewRepresentable {
|
||||
|
||||
let webView = WKWebView(frame: .zero, configuration: config)
|
||||
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")!))
|
||||
return webView
|
||||
}
|
||||
@@ -30,30 +23,30 @@ struct LoginWebView: NSViewRepresentable {
|
||||
}
|
||||
|
||||
class Coordinator: NSObject, WKNavigationDelegate {
|
||||
let onAuthenticated: (WKWebView) -> Void
|
||||
weak var webView: WKWebView?
|
||||
let onAuthenticated: () -> Void
|
||||
var didAuthenticate = false
|
||||
var urlObservation: NSKeyValueObservation?
|
||||
|
||||
init(onAuthenticated: @escaping (WKWebView) -> Void) {
|
||||
init(onAuthenticated: @escaping () -> Void) {
|
||||
self.onAuthenticated = onAuthenticated
|
||||
}
|
||||
|
||||
func checkCurrentURL(_ url: String?) {
|
||||
guard !didAuthenticate, let url, let wv = webView else { return }
|
||||
// Ignore navigations to external OAuth providers (Google, etc.) —
|
||||
// only consider auth complete when we land back on claude.ai/anthropic.com
|
||||
guard url.contains("claude.ai") || url.contains("anthropic.com") else { return }
|
||||
if url.contains("/login") || url.contains("/auth") { return }
|
||||
didAuthenticate = true
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||
self.onAuthenticated(wv)
|
||||
}
|
||||
}
|
||||
|
||||
// Covers full cross-document navigations
|
||||
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
||||
checkCurrentURL(webView.url?.absoluteString)
|
||||
guard !didAuthenticate else { return }
|
||||
// Don't fire on the login/auth pages themselves
|
||||
if let url = webView.url?.absoluteString,
|
||||
url.contains("/login") || url.contains("/auth") { return }
|
||||
|
||||
WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
|
||||
let hasSession = cookies.contains {
|
||||
$0.domain.contains("claude.ai") &&
|
||||
($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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -62,7 +55,7 @@ struct LoginWebView: NSViewRepresentable {
|
||||
|
||||
struct LoginSheetView: View {
|
||||
@Binding var isPresented: Bool
|
||||
let onDone: (WKWebView) -> Void
|
||||
let onDone: () -> Void
|
||||
@State private var authenticated = false
|
||||
|
||||
var body: some View {
|
||||
@@ -72,9 +65,12 @@ struct LoginSheetView: View {
|
||||
.font(.system(size: 13, weight: .semibold))
|
||||
Spacer()
|
||||
if authenticated {
|
||||
Button("Done") { isPresented = false }
|
||||
.buttonStyle(.borderedProminent)
|
||||
.controlSize(.small)
|
||||
Button("Done") {
|
||||
isPresented = false
|
||||
onDone()
|
||||
}
|
||||
.buttonStyle(.borderedProminent)
|
||||
.controlSize(.small)
|
||||
} else {
|
||||
Button("Cancel") { isPresented = false }
|
||||
.buttonStyle(.bordered)
|
||||
@@ -87,13 +83,12 @@ struct LoginSheetView: View {
|
||||
|
||||
Divider()
|
||||
|
||||
LoginWebView { webView in
|
||||
LoginWebView {
|
||||
authenticated = true
|
||||
// Adopt the authenticated WebView immediately (before sheet tears it down),
|
||||
// then auto-dismiss after a moment so the user sees confirmation.
|
||||
onDone(webView)
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
|
||||
// Auto-dismiss and refresh after brief delay
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) {
|
||||
isPresented = false
|
||||
onDone()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,8 +30,8 @@ enum UpdateError: LocalizedError {
|
||||
@MainActor
|
||||
class UpdateManager: ObservableObject {
|
||||
|
||||
static let versionURL = "https://git.jamesbone.net/coder/claudechecker/raw/branch/main/version.json"
|
||||
static let betaVersionURL = "https://git.jamesbone.net/coder/claudechecker/raw/branch/main/version-beta.json"
|
||||
static let versionURL = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version.json"
|
||||
static let betaVersionURL = "https://raw.githubusercontent.com/superdooper86/claudechecker/refs/heads/main/version-beta.json"
|
||||
|
||||
@Published var updateAvailable = false
|
||||
@Published var latestVersion = ""
|
||||
@@ -118,7 +118,7 @@ class UpdateManager: ObservableObject {
|
||||
}
|
||||
|
||||
private func fetchVersion(from urlString: String) async -> VersionInfo? {
|
||||
// Add timestamp to bust cached update metadata
|
||||
// Add timestamp to bust GitHub's 5-minute CDN cache
|
||||
let cacheBusted = urlString + "?t=\(Int(Date().timeIntervalSince1970))"
|
||||
guard let url = URL(string: cacheBusted) else {
|
||||
print("[UpdateManager] Invalid URL: \(urlString)")
|
||||
|
||||
@@ -3,6 +3,7 @@ import WebKit
|
||||
|
||||
@MainActor
|
||||
class UsageViewModel: ObservableObject {
|
||||
static let orgId = "daf626a9-4924-4ff3-ba98-23b523062f8e"
|
||||
@Published var limits: [AgentLimit] = []
|
||||
@Published var isLoading = false
|
||||
@Published var lastUpdated: Date?
|
||||
@@ -27,23 +28,12 @@ class UsageViewModel: ObservableObject {
|
||||
|
||||
private var burnHistoryStore: [String: [Double]] = [:]
|
||||
private let maxHistorySamples = 24
|
||||
private var cachedOrgId: String?
|
||||
private var previousPercents: [String: Double] = [:]
|
||||
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() {
|
||||
cachedOrgId = UserDefaults.standard.string(forKey: "claude_org_id") ?? Self.orgId
|
||||
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
||||
refreshInterval = saved > 0 ? saved : 60
|
||||
showInMenuBar = UserDefaults.standard.object(forKey: "show_in_menubar") as? Bool ?? true
|
||||
@@ -51,146 +41,14 @@ class UsageViewModel: ObservableObject {
|
||||
burnHistoryStore = saved
|
||||
}
|
||||
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 {
|
||||
let store = WKWebsiteDataStore.default()
|
||||
let types = WKWebsiteDataStore.allWebsiteDataTypes()
|
||||
let records = await store.dataRecords(ofTypes: types)
|
||||
let claudeRecords = records.filter { $0.displayName.contains("claude.ai") || $0.displayName.contains("anthropic.com") }
|
||||
let claudeRecords = records.filter { $0.displayName.contains("claude.ai") }
|
||||
await store.removeData(ofTypes: types, for: claudeRecords)
|
||||
UserDefaults.standard.removeObject(forKey: "claude_org_id")
|
||||
apiWebView = nil
|
||||
isSignedIn = false
|
||||
isNotAuthenticated = true
|
||||
lastUpdated = nil
|
||||
@@ -208,50 +66,18 @@ class UsageViewModel: ObservableObject {
|
||||
defer { isLoading = false }
|
||||
|
||||
do {
|
||||
// Read lastActiveOrg cookie from JS — most reliable org source since it's
|
||||
// set by the claude.ai frontend to whichever org is currently active.
|
||||
var cookieOrgId: String? = nil
|
||||
if let wv = apiWebView, wv.url?.host?.hasSuffix("claude.ai") == true {
|
||||
let js = """
|
||||
return document.cookie.split(';')
|
||||
.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)
|
||||
let orgId = cachedOrgId!
|
||||
async let usageFetch = fetchUsage(orgId: orgId)
|
||||
async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
|
||||
async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
|
||||
async let emailFetch = fetchUserEmail()
|
||||
let (usage, prepaid, overage, email) = try await (usageFetch, prepaidFetch, overageFetch, emailFetch)
|
||||
if let email { userEmail = email }
|
||||
limits = buildLimits(from: usage)
|
||||
extraUsage = usage.extraUsage
|
||||
prepaidCredits = prepaid
|
||||
extraUsage = usage.extraUsage
|
||||
prepaidCredits = prepaid
|
||||
overageSpendLimit = overage
|
||||
planLabel = "Pro"
|
||||
lastUpdated = Date()
|
||||
isSignedIn = true
|
||||
|
||||
@@ -267,7 +93,6 @@ class UsageViewModel: ObservableObject {
|
||||
checkLimitNotifications(for: limits)
|
||||
} catch AppError.notAuthenticated {
|
||||
isNotAuthenticated = true
|
||||
isSignedIn = false
|
||||
errorMessage = "Not signed in"
|
||||
} catch let error as DecodingError {
|
||||
switch error {
|
||||
@@ -285,75 +110,70 @@ 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
|
||||
|
||||
private func fetchUsage(orgId: String) async throws -> UsageResponse {
|
||||
let (status, body) = try await apiFetch("/api/organizations/\(orgId)/usage")
|
||||
if status == 401 || status == 403 { throw AppError.detail("usage \(status): \(body.prefix(200))") }
|
||||
guard status == 200 else { throw AppError.networkError }
|
||||
guard let data = body.data(using: .utf8) else { throw AppError.networkError }
|
||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/usage")!
|
||||
var req = URLRequest(url: url)
|
||||
req.setValue("application/json", forHTTPHeaderField: "accept")
|
||||
|
||||
// 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)
|
||||
}
|
||||
|
||||
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? {
|
||||
guard let (status, body) = try? await apiFetch("/api/organizations/\(orgId)/prepaid/credits"),
|
||||
status == 200,
|
||||
let data = body.data(using: .utf8) else { return nil }
|
||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/prepaid/credits")!
|
||||
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 }
|
||||
return try? JSONDecoder().decode(PrepaidCredits.self, from: data)
|
||||
}
|
||||
|
||||
private func fetchOverageSpendLimit(orgId: String) async throws -> OverageSpendLimit? {
|
||||
guard let (status, body) = try? await apiFetch("/api/organizations/\(orgId)/overage_spend_limit"),
|
||||
status == 200,
|
||||
let data = body.data(using: .utf8) else { return nil }
|
||||
let url = URL(string: "https://claude.ai/api/organizations/\(orgId)/overage_spend_limit")!
|
||||
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 }
|
||||
return try? JSONDecoder().decode(OverageSpendLimit.self, from: data)
|
||||
}
|
||||
|
||||
@@ -425,11 +245,14 @@ class UsageViewModel: ObservableObject {
|
||||
|
||||
private func checkLimitNotifications(for limits: [AgentLimit]) {
|
||||
let thresholds = [80, 95]
|
||||
|
||||
for limit in limits {
|
||||
let key = limit.window.rawValue
|
||||
let curr = limit.usedPercent
|
||||
let prev = previousPercents[key]
|
||||
var fired = firedThresholds[key] ?? []
|
||||
|
||||
// Threshold warnings (80% and 95%)
|
||||
for t in thresholds {
|
||||
let threshold = Double(t)
|
||||
guard curr >= threshold, prev ?? threshold < threshold, !fired.contains(t) else { continue }
|
||||
@@ -440,6 +263,8 @@ class UsageViewModel: ObservableObject {
|
||||
userInfo: ["windowName": limit.window.displayName, "percent": t]
|
||||
)
|
||||
}
|
||||
|
||||
// Reset detection: was high, now low
|
||||
if let prev, prev > 50, curr < 20 {
|
||||
fired.removeAll()
|
||||
NotificationCenter.default.post(
|
||||
@@ -448,6 +273,7 @@ class UsageViewModel: ObservableObject {
|
||||
userInfo: ["windowName": limit.window.displayName]
|
||||
)
|
||||
}
|
||||
|
||||
firedThresholds[key] = fired
|
||||
previousPercents[key] = curr
|
||||
}
|
||||
@@ -470,17 +296,13 @@ class UsageViewModel: ObservableObject {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
enum AppError: LocalizedError {
|
||||
case notAuthenticated
|
||||
case networkError
|
||||
case detail(String)
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .notAuthenticated: return "Not signed into claude.ai — open claude.ai in your browser first."
|
||||
case .networkError: return "Network error fetching usage data."
|
||||
case .detail(let msg): return msg
|
||||
case .notAuthenticated: return "Not signed into claude.ai — open claude.ai in your browser first."
|
||||
case .networkError: return "Network error fetching usage data."
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -495,3 +317,4 @@ extension Notification.Name {
|
||||
static let limitReset = Notification.Name("limitReset")
|
||||
static let openUpdateSheet = Notification.Name("openUpdateSheet")
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
<div align="center">
|
||||
|
||||
<img src="https://git.jamesbone.net/coder/claudechecker/raw/branch/main/ClaudeChecker/Assets.xcassets/AppIcon.appiconset/icon_128@2x.png" width="128" height="128" alt="ClaudeChecker icon" />
|
||||
<img src="https://raw.githubusercontent.com/superdooper86/claudechecker/main/ClaudeChecker/Assets.xcassets/AppIcon.appiconset/icon_128@2x.png" width="128" height="128" alt="ClaudeChecker icon" />
|
||||
|
||||
# ClaudeChecker
|
||||
|
||||
**A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
|
||||
|
||||
[](https://www.apple.com/macos/)
|
||||
[](https://www.microsoft.com/windows/)
|
||||
[](https://swift.org)
|
||||
[](https://github.com/superdooper86/claudechecker/releases)
|
||||
[](LICENSE)
|
||||
<br/>
|
||||
[](https://git.jamesbone.net/coder/claudechecker/releases)
|
||||
[](https://git.jamesbone.net/coder/claudechecker/releases/tag/v1.3.3-beta.5) <!-- BETA_BADGE -->
|
||||
[](https://git.jamesbone.net/coder/claudechecker/releases/tag/win-v0.0.1-beta.63) <!-- WIN_BETA_BADGE -->
|
||||
<!-- BETA_BADGE -->
|
||||
|
||||
</div>
|
||||
|
||||
@@ -130,7 +127,7 @@ brew install --cask claudechecker
|
||||
```
|
||||
|
||||
### Download
|
||||
1. Go to [Releases](https://git.jamesbone.net/coder/claudechecker/releases)
|
||||
1. Go to [Releases](https://github.com/superdooper86/claudechecker/releases)
|
||||
2. Download `ClaudeChecker.zip` from the latest release
|
||||
3. Unzip and drag `ClaudeChecker.app` to `/Applications`
|
||||
4. Open from Applications — it will appear in your menubar
|
||||
@@ -166,7 +163,7 @@ ClaudeChecker reads from the following `claude.ai` API endpoints (authenticated
|
||||
|
||||
## Privacy
|
||||
|
||||
- No data leaves your machine except to `claude.ai` (your own session) and `git.jamesbone.net` (version check)
|
||||
- No data leaves your machine except to `claude.ai` (your own session) and `raw.githubusercontent.com` (version check)
|
||||
- Session stored in macOS `WKWebsiteDataStore.default()` — same as Safari
|
||||
- No analytics, no tracking, no ads
|
||||
|
||||
@@ -181,31 +178,3 @@ ClaudeChecker reads from the following `claude.ai` API endpoints (authenticated
|
||||
<div align="center">
|
||||
<sub>ClaudeChecker is not affiliated with or endorsed by Anthropic.</sub>
|
||||
</div>
|
||||
|
||||
## Building and releasing
|
||||
|
||||
The canonical repository is https://git.jamesbone.net/coder/claudechecker.
|
||||
Both macOS and Windows source live on `main`; the original Windows feature
|
||||
branch and all historical tags/releases are retained.
|
||||
|
||||
Gitea **Build** validates every push to `main` on two shared account-scoped host runners (one service and one job slot per host):
|
||||
`mac-mini` (label `claudechecker-macos-arm64`, Xcode) and `jamespc` (label `claudechecker-windows-x64`)
|
||||
(Windows host, .NET 8, Inno Setup). Each run uploads its app/installer artifact.
|
||||
|
||||
Use **Release macOS** or **Release Windows Beta**, select `main`, and supply a version
|
||||
(and macOS channel). Stable versions use `X.Y.Z`; beta versions use `X.Y.Z-beta.N`.
|
||||
The workflow builds that main revision, creates the release and uploads the asset
|
||||
before advancing the corresponding `version*.json` feed on main. Releases are
|
||||
never overwritten. macOS builds retain the existing ad-hoc signing model; this
|
||||
project does not currently perform Developer ID signing or notarization.
|
||||
|
||||
Existing installs still check the old GitHub `version*.json` URLs. Those files
|
||||
are kept as a migration bridge advertising the first Gitea-hosted update. Keep
|
||||
the GitHub repository accessible for those clients; subsequent updates use Gitea.
|
||||
GitHub workflows were removed after the Gitea builds passed. Windows releases
|
||||
remain prereleases, so `/releases/download/latest/ClaudeChecker.zip` always serves
|
||||
the stable macOS release. The Homebrew tap downloads that Gitea URL and enables
|
||||
app-managed updates; it no longer needs a tap commit for every release.
|
||||
|
||||
Local build commands are `bash scripts/build-macos.sh` and, on Windows,
|
||||
`./scripts/build-windows.ps1` with `INNO_SETUP_COMPILER` pointing to `ISCC.exe`.
|
||||
|
||||
+11
-3
@@ -1,4 +1,12 @@
|
||||
## What's new in v1.3.3
|
||||
## What's new in v1.1.3
|
||||
|
||||
- Updates and release downloads now come from git.jamesbone.net.
|
||||
- macOS and Windows builds are managed by Gitea Actions from main.
|
||||
### UI polish
|
||||
- Limit headers now read "5 Hour Limit" and "7 Day Limit"
|
||||
- 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
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
if [[ -n "${VERSION:-}" ]]; then
|
||||
[[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-beta\.[0-9]+)?$ ]] || exit 2
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $VERSION" ClaudeChecker/Info.plist
|
||||
fi
|
||||
xcodebuild -project ClaudeChecker.xcodeproj -scheme ClaudeChecker \
|
||||
-configuration Release -derivedDataPath build \
|
||||
ARCHS="arm64 x86_64" ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY=- clean build
|
||||
codesign --verify --deep --strict build/Build/Products/Release/ClaudeChecker.app
|
||||
for arch in arm64 x86_64; do
|
||||
lipo build/Build/Products/Release/ClaudeChecker.app/Contents/MacOS/ClaudeChecker -verify_arch "$arch"
|
||||
done
|
||||
ditto -c -k --keepParent build/Build/Products/Release/ClaudeChecker.app ClaudeChecker.zip
|
||||
@@ -1,10 +0,0 @@
|
||||
param([string]$Version = '0.0.1-beta.64')
|
||||
$ErrorActionPreference = 'Stop'
|
||||
if ($Version -notmatch '^\d+\.\d+\.\d+(-beta\.\d+)?$') { throw 'Invalid version' }
|
||||
dotnet publish windows/ClaudeCheckerWindows.csproj -c Release -r win-x64 --self-contained true "-p:Version=$Version" -o publish
|
||||
if ($LASTEXITCODE -ne 0) { throw 'dotnet publish failed' }
|
||||
Copy-Item -Recurse -Force windows/Assets publish/Assets
|
||||
& $env:INNO_SETUP_COMPILER "/DAppVersion=$Version" windows/installer.iss
|
||||
if ($LASTEXITCODE -ne 0) { throw 'Inno Setup failed' }
|
||||
if (!(Test-Path ClaudeChecker-Installer.exe)) { throw 'Installer missing' }
|
||||
Get-FileHash ClaudeChecker-Installer.exe -Algorithm SHA256
|
||||
@@ -1,76 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Publish a completed main build, then advance its update channel."""
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import subprocess
|
||||
import urllib.error
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
|
||||
|
||||
class NoRedirect(urllib.request.HTTPRedirectHandler):
|
||||
def redirect_request(self, *args, **kwargs):
|
||||
return None
|
||||
|
||||
|
||||
def main():
|
||||
version = os.environ['VERSION']
|
||||
channel = os.environ['CHANNEL']
|
||||
if channel not in ('stable', 'beta', 'windows-beta'):
|
||||
raise ValueError('Unknown release channel')
|
||||
if not re.fullmatch(r'\d+\.\d+\.\d+(-beta\.\d+)?', version):
|
||||
raise ValueError('Invalid release version')
|
||||
if ('beta' in channel) != ('-beta.' in version):
|
||||
raise ValueError('Version must match release channel')
|
||||
if os.environ.get('GITHUB_REF') != 'refs/heads/main':
|
||||
raise ValueError('Releases must build from main')
|
||||
revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], text=True).strip()
|
||||
windows = channel.startswith('windows-')
|
||||
tag = ('win-v' if windows else 'v') + version
|
||||
artifact = Path('ClaudeChecker-Installer.exe' if windows else 'ClaudeChecker.zip')
|
||||
notes = Path('windows/RELEASE_NOTES.md' if windows else 'RELEASE_NOTES.md').read_text()
|
||||
feed = {'stable': 'version.json', 'beta': 'version-beta.json',
|
||||
'windows-beta': 'version-windows-beta.json'}[channel]
|
||||
server = os.environ['GITHUB_SERVER_URL'].rstrip('/')
|
||||
repo = os.environ['GITHUB_REPOSITORY']
|
||||
opener = urllib.request.build_opener(NoRedirect)
|
||||
|
||||
def api(path, method='GET', data=None, binary=False):
|
||||
body = data if binary else (json.dumps(data).encode() if data is not None else None)
|
||||
request = urllib.request.Request(f'{server}/api/v1/repos/{repo}{path}', data=body, method=method,
|
||||
headers={'Authorization': 'token ' + os.environ['GITEA_TOKEN'],
|
||||
'Content-Type': 'application/octet-stream' if binary else 'application/json'})
|
||||
with opener.open(request, timeout=600) as response:
|
||||
return json.load(response)
|
||||
|
||||
# Never replace an existing release or advertise a partially uploaded asset.
|
||||
release = api('/releases', 'POST', {'tag_name': tag, 'target_commitish': revision,
|
||||
'name': tag, 'body': notes + '\n\nBuilt from main: ' + revision,
|
||||
'draft': True, 'prerelease': 'beta' in channel})
|
||||
asset = api(f"/releases/{release['id']}/assets?name={urllib.parse.quote(artifact.name)}",
|
||||
'POST', artifact.read_bytes(), binary=True)
|
||||
if asset['size'] != artifact.stat().st_size:
|
||||
raise ValueError('Uploaded asset size mismatch')
|
||||
api(f"/releases/{release['id']}", 'PATCH', {'draft': False})
|
||||
content = json.dumps({'version': version,
|
||||
'url': f'https://git.jamesbone.net/{repo}/releases/download/{tag}/{artifact.name}',
|
||||
'notes': notes}, indent=2) + '\n'
|
||||
try:
|
||||
current = api(f'/contents/{feed}?ref=main')
|
||||
except urllib.error.HTTPError as error:
|
||||
if error.code != 404:
|
||||
raise
|
||||
current = None
|
||||
payload = {'branch': 'main', 'message': f'Update {channel} feed to {tag}',
|
||||
'content': base64.b64encode(content.encode()).decode()}
|
||||
if current:
|
||||
payload['sha'] = current['sha']
|
||||
api(f'/contents/{feed}', 'PUT' if current else 'POST', payload)
|
||||
print(f'Published {tag} and {feed} from {revision}')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.3.3-beta.5",
|
||||
"url": "https://git.jamesbone.net/coder/claudechecker/releases/download/v1.3.3-beta.5/ClaudeChecker.zip",
|
||||
"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."
|
||||
}
|
||||
"version": "1.1.3-beta.5",
|
||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3-beta.5/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"
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "0.0.1-beta.64",
|
||||
"url": "https://git.jamesbone.net/coder/claudechecker/releases/download/win-v0.0.1-beta.64/ClaudeChecker-Installer.exe",
|
||||
"notes": "## What's new in beta.64\n\n- Updates and release downloads now come from git.jamesbone.net.\n- Windows installers now build through Gitea Actions from main.\n"
|
||||
}
|
||||
"version": "0.0.0",
|
||||
"url": "",
|
||||
"notes": ""
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"version": "0.0.0",
|
||||
"url": "",
|
||||
"notes": ""
|
||||
}
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.3.3",
|
||||
"url": "https://git.jamesbone.net/coder/claudechecker/releases/download/v1.3.3/ClaudeChecker.zip",
|
||||
"notes": "## What's new in v1.3.3\n\n- Updates and release downloads now come from git.jamesbone.net.\n- macOS and Windows builds are managed by Gitea Actions from main.\n"
|
||||
"version": "1.1.3",
|
||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3/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"
|
||||
}
|
||||
|
||||
+37
-65
@@ -15,8 +15,7 @@
|
||||
<SolidColorBrush x:Key="SurfaceBrush" Color="#FAFAFA" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBgBrush" Color="#E8F2FB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="HoverBrush" Color="#EBEBEB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="PressedBrush" Color="#D6D6D6" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="HoverBrush" Color="#EBEBEB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BadgeBrush" Color="#F0F0F0" po:Freeze="False"/>
|
||||
|
||||
<Style x:Key="HeaderText" TargetType="TextBlock">
|
||||
@@ -27,31 +26,27 @@
|
||||
</Style>
|
||||
|
||||
<Style x:Key="PrimaryButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{DynamicResource 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="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource 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="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="Button">
|
||||
<Border x:Name="Bd" Background="{TemplateBinding Background}"
|
||||
CornerRadius="4" Padding="{TemplateBinding Padding}">
|
||||
<Border Background="{TemplateBinding Background}" CornerRadius="4"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="#106EBE"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="#005A9E"/>
|
||||
<Setter Property="Background" Value="#106EBE"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter TargetName="Bd" Property="Background" Value="#BDBDBD"/>
|
||||
<Setter Property="Background" Value="#BDBDBD"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -60,20 +55,18 @@
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SmallButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Padding" Value="10,4"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Padding" Value="10,4"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="Button">
|
||||
<Border x:Name="Bd"
|
||||
Background="{TemplateBinding Background}"
|
||||
<Border Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="4" Padding="{TemplateBinding Padding}">
|
||||
@@ -81,10 +74,7 @@
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource PressedBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -93,19 +83,18 @@
|
||||
</Style>
|
||||
|
||||
<Style TargetType="ComboBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Padding" Value="8,4"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Padding" Value="8,4"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBox">
|
||||
<Grid>
|
||||
<Border x:Name="Bd"
|
||||
<Border x:Name="Border"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
@@ -117,21 +106,14 @@
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
||||
<TextBlock Text="▾" FontSize="10"
|
||||
<TextBlock Text="▾" FontSize="10"
|
||||
Foreground="{DynamicResource SecondaryBrush}"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||
Margin="0,0,8,0" IsHitTestVisible="False"/>
|
||||
<!-- Fully transparent toggle — no system chrome bleeds through -->
|
||||
<ToggleButton Focusable="False" ClickMode="Press"
|
||||
FocusVisualStyle="{x:Null}"
|
||||
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
|
||||
RelativeSource={RelativeSource TemplatedParent}}">
|
||||
<ToggleButton.Template>
|
||||
<ControlTemplate TargetType="ToggleButton">
|
||||
<Border Background="Transparent"/>
|
||||
</ControlTemplate>
|
||||
</ToggleButton.Template>
|
||||
</ToggleButton>
|
||||
RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Background="Transparent" BorderThickness="0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Popup x:Name="Popup" Placement="Bottom"
|
||||
@@ -150,21 +132,15 @@
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="ItemContainerStyle">
|
||||
<Setter.Value>
|
||||
<Style TargetType="ComboBoxItem">
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Padding" Value="10,5"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Padding" Value="10,5"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBoxItem">
|
||||
@@ -178,10 +154,6 @@
|
||||
<Setter TargetName="Bd" Property="Background"
|
||||
Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background"
|
||||
Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
|
||||
+3
-14
@@ -8,12 +8,8 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public partial class App : Application
|
||||
{
|
||||
public static UsageViewModel ViewModel { get; } = new();
|
||||
public static UpdateManager Updater { get; } = new();
|
||||
// Persistent hidden WebView2 — shares the same user data folder as LoginWindow
|
||||
// so its cookies (including cf_clearance) are always live. Used on every refresh
|
||||
// for endpoints that need a real browser session (overage, prepaid).
|
||||
public static WebViewFetchWindow BackgroundBrowser { get; } = new();
|
||||
public static UsageViewModel ViewModel { get; } = new();
|
||||
public static UpdateManager Updater { get; } = new();
|
||||
|
||||
private Forms.NotifyIcon? _tray;
|
||||
private PopupWindow? _popup;
|
||||
@@ -37,18 +33,11 @@ public partial class App : Application
|
||||
base.OnStartup(e);
|
||||
ThemeManager.Initialize();
|
||||
SetupTray();
|
||||
ShowPopup();
|
||||
ScheduleTimer(ViewModel.RefreshInterval);
|
||||
|
||||
// Show background browser window on the UI thread before Task.Run
|
||||
BackgroundBrowser.Show();
|
||||
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
await ViewModel.LoadFromCacheAsync();
|
||||
// Initialize the persistent background browser (navigates to claude.ai once)
|
||||
await Application.Current.Dispatcher.InvokeAsync(
|
||||
() => BackgroundBrowser.InitAsync()).Task.Unwrap();
|
||||
await Task.Delay(1000);
|
||||
await ViewModel.RefreshAsync();
|
||||
await Updater.CheckForUpdatesAsync();
|
||||
});
|
||||
|
||||
@@ -6,17 +6,15 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public class AppSettings
|
||||
{
|
||||
// Auth signal — non-empty means the user has completed sign-in at least once.
|
||||
// The WebView2 user-data folder holds the live session; this is only for startup.
|
||||
public string CookieStore { get; set; } = "";
|
||||
|
||||
// Accumulated sparkline data — built up over multiple refreshes.
|
||||
public string BurnHistory { get; set; } = "";
|
||||
|
||||
// User preferences
|
||||
public string OrgId { get; set; } = "";
|
||||
public string Email { get; set; } = "";
|
||||
public string UsageJson { get; set; } = "";
|
||||
public int RefreshInterval { get; set; } = 120;
|
||||
public bool ShowInTaskbar { get; set; } = true;
|
||||
public bool BetaChannel { get; set; } = false;
|
||||
public string DebugInfo { get; set; } = "";
|
||||
|
||||
private static readonly string FilePath = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
|
||||
@@ -46,16 +46,27 @@ public class GaugeControl : FrameworkElement
|
||||
DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
|
||||
new Pen(Accent, StrokeWidth));
|
||||
|
||||
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
||||
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
||||
|
||||
var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
|
||||
var subColor = Color.FromRgb(0x9E, 0x9E, 0x9E);
|
||||
|
||||
var pctText = new FormattedText(
|
||||
$"{(int)Math.Round(Percent)}%",
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
|
||||
18, new SolidColorBrush(textColor), dpi);
|
||||
14, new SolidColorBrush(textColor), dpi);
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
|
||||
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
|
||||
var sub = new FormattedText(
|
||||
"Updated\nnow",
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface("Segoe UI"), 7,
|
||||
new SolidColorBrush(subColor), 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,
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
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"/>
|
||||
x:Name="DoneButton" IsEnabled="False"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
@@ -19,7 +22,7 @@ public partial class LoginWindow : Window
|
||||
{
|
||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
|
||||
System.IO.Path.Combine(
|
||||
System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData),
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "WebView2"));
|
||||
|
||||
await Browser.EnsureCoreWebView2Async(env);
|
||||
@@ -32,16 +35,19 @@ public partial class LoginWindow : Window
|
||||
if (!uri.Contains("claude.ai")) return;
|
||||
|
||||
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
|
||||
var signedIn = System.Linq.Enumerable.Any(cookies, c =>
|
||||
c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"));
|
||||
var signedIn = cookies.Any(c =>
|
||||
c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
|
||||
c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
await Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
StatusText.Text = signedIn && !uri.Contains("/login") && !uri.Contains("/signin")
|
||||
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 we land on any claude.ai page that isn't the login flow
|
||||
if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
|
||||
await SaveAndClose(cookies);
|
||||
};
|
||||
@@ -59,10 +65,58 @@ public partial class LoginWindow : Window
|
||||
if (_closing) return;
|
||||
_closing = true;
|
||||
|
||||
// Persist cookies so the app knows the user is signed in on next startup.
|
||||
// All live data is fetched by the background WebView2 on the next refresh.
|
||||
UsageViewModel.SaveCookies(cookies);
|
||||
|
||||
// Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
|
||||
try
|
||||
{
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
const bkeys=Object.keys(b||{}).join(',');
|
||||
const akeys=Object.keys(b?.account||{}).join(',');
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
||b?.default_organization?.uuid||null;
|
||||
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
let orgSrc='bootstrap';
|
||||
if(!id){
|
||||
try{const ol=await(await fetch('/api/organizations',h)).json();
|
||||
if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
|
||||
}
|
||||
if(!id){
|
||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
||||
if(pu&&!pu.error)return{email:e,orgId:null,usage:pu,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};}catch(e3){}
|
||||
return{email:e,orgId:null,usage:null,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
return{email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||
}catch(ex){return{error:String(ex)};}})()";
|
||||
|
||||
var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||
if (json != "null" && !string.IsNullOrEmpty(json))
|
||||
{
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
|
||||
if (root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String)
|
||||
AppSettings.Default.Email = em.GetString() ?? "";
|
||||
|
||||
if (root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String)
|
||||
AppSettings.Default.OrgId = oi.GetString() ?? "";
|
||||
|
||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
||||
AppSettings.Default.UsageJson = us.GetRawText();
|
||||
|
||||
if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
|
||||
AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
|
||||
else if (root.TryGetProperty("error", out var err))
|
||||
AppSettings.Default.DebugInfo = "error:" + err.GetRawText();
|
||||
|
||||
AppSettings.Default.Save();
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-11
@@ -21,9 +21,8 @@ public class AgentLimit
|
||||
|
||||
public class UsageResponse
|
||||
{
|
||||
[JsonPropertyName("five_hour")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("seven_day")] public WindowData? SevenDay { get; set; }
|
||||
[JsonPropertyName("extra_usage")] public ExtraUsage? ExtraUsage { get; set; }
|
||||
[JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("claude_ai_default")] public WindowData? SevenDay { get; set; }
|
||||
}
|
||||
|
||||
public class WindowData
|
||||
@@ -32,14 +31,6 @@ public class WindowData
|
||||
[JsonPropertyName("resets_at")] public string? ResetsAt { get; set; }
|
||||
}
|
||||
|
||||
public class ExtraUsage
|
||||
{
|
||||
[JsonPropertyName("is_enabled")] public bool IsEnabled { get; set; }
|
||||
[JsonPropertyName("currency")] public string? Currency { get; set; }
|
||||
[JsonPropertyName("used_credits")] public double? UsedCredits { get; set; }
|
||||
[JsonPropertyName("monthly_limit")] public double? MonthlyLimit { get; set; }
|
||||
}
|
||||
|
||||
public class BootstrapResponse
|
||||
{
|
||||
[JsonPropertyName("account")] public AccountInfo? Account { get; set; }
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
<TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
Padding="14,12">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
@@ -185,18 +185,9 @@
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="DIAGNOSTICS" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12">
|
||||
<StackPanel>
|
||||
<TextBlock Text="View app state, last request details, and stored cookies."
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" Margin="0,0,0,10"/>
|
||||
<Button Content="Open diagnostics" Style="{StaticResource SmallButton}"
|
||||
HorizontalAlignment="Left" Click="Diagnostics_Click"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
|
||||
Visibility="Collapsed"/>
|
||||
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
@@ -263,33 +254,5 @@
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
</Border>
|
||||
|
||||
<!-- Diagnostics panel -->
|
||||
<Border x:Name="DiagnosticsPanel" Visibility="Collapsed"
|
||||
Background="{DynamicResource BackgroundBrush}">
|
||||
<DockPanel>
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
|
||||
<Grid>
|
||||
<Button Content="← Back" HorizontalAlignment="Left"
|
||||
Style="{StaticResource SmallButton}" BorderThickness="0"
|
||||
Foreground="{DynamicResource BlueBrush}" Background="Transparent"
|
||||
Click="BackFromDiag_Click"/>
|
||||
<TextBlock Text="Diagnostics" FontSize="14" FontWeight="SemiBold"
|
||||
Foreground="{DynamicResource TextBrush}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<Button x:Name="CopyDiagButton" Content="Copy All" HorizontalAlignment="Right"
|
||||
Style="{StaticResource SmallButton}" Click="CopyDiag_Click"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<TextBlock DockPanel.Dock="Top" Text="Org IDs are redacted when copied."
|
||||
FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
|
||||
Margin="14,6,14,6"/>
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel x:Name="DiagContentPanel" Margin="16,4,16,16"/>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
</Window>
|
||||
|
||||
+56
-414
@@ -1,11 +1,6 @@
|
||||
using ClaudeCheckerWindows.Controls;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Text.Json;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Interop;
|
||||
@@ -20,6 +15,7 @@ public partial class PopupWindow : Window
|
||||
private static readonly UpdateManager Updater = App.Updater;
|
||||
private readonly DispatcherTimer _clockTimer;
|
||||
|
||||
|
||||
[DllImport("dwmapi.dll")]
|
||||
private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
|
||||
|
||||
@@ -38,7 +34,7 @@ public partial class PopupWindow : Window
|
||||
VM.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
|
||||
Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
|
||||
|
||||
_clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1) };
|
||||
_clockTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
|
||||
_clockTimer.Tick += (_, _) => UpdateFooter();
|
||||
_clockTimer.Start();
|
||||
|
||||
@@ -59,13 +55,6 @@ public partial class PopupWindow : Window
|
||||
CardsPanel.Children.Clear();
|
||||
foreach (var limit in VM.Limits)
|
||||
CardsPanel.Children.Add(BuildCard(limit));
|
||||
|
||||
if (VM.ExtraUsage?.IsEnabled == true)
|
||||
CardsPanel.Children.Add(BuildExtraUsageSection());
|
||||
|
||||
var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
|
||||
if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
|
||||
CardsPanel.Children.Add(BuildDiarySection(fiveHour));
|
||||
}
|
||||
|
||||
private static UIElement BuildCard(AgentLimit limit)
|
||||
@@ -75,8 +64,10 @@ public partial class PopupWindow : Window
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
|
||||
// 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(30, 0, 160, 0)),
|
||||
@@ -88,6 +79,7 @@ public partial class PopupWindow : Window
|
||||
Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
|
||||
};
|
||||
|
||||
// Usage badge
|
||||
var usageBadge = new Border
|
||||
{
|
||||
Background = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
|
||||
@@ -102,7 +94,7 @@ public partial class PopupWindow : Window
|
||||
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 = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
|
||||
nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
|
||||
Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
|
||||
nameStack.Children.Add(new TextBlock { Text = $"· {VM.PlanLabel}", FontSize = 11,
|
||||
@@ -125,64 +117,36 @@ public partial class PopupWindow : Window
|
||||
BorderThickness = new Thickness(0),
|
||||
};
|
||||
|
||||
// Left: time remaining + reset date inline
|
||||
var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
|
||||
timeLeft.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeLeft.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
|
||||
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 = text, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeLeft.Children.Add(new TextBlock
|
||||
{
|
||||
Text = $" Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
|
||||
FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
});
|
||||
|
||||
// Right: projected limit-hit time, or "after reset" if burn rate won't reach 100% before reset.
|
||||
// BurnRate is stored as usedPercent / windowHours, so hoursToFull = remainingPercent / BurnRate.
|
||||
string? refreshLabel;
|
||||
if (limit.BurnRate <= 0)
|
||||
refreshLabel = "after reset";
|
||||
else
|
||||
var resetText = new TextBlock
|
||||
{
|
||||
var projectedHit = DateTime.Now.AddHours((100.0 - limit.UsedPercent) / limit.BurnRate);
|
||||
refreshLabel = projectedHit > limit.ResetDate
|
||||
? "after reset"
|
||||
: projectedHit.Date == DateTime.Today
|
||||
? projectedHit.ToString("h:mm tt")
|
||||
: projectedHit.ToString("d MMM h:mm tt");
|
||||
}
|
||||
|
||||
UIElement timeRight;
|
||||
if (refreshLabel != null)
|
||||
{
|
||||
var inner = new StackPanel { Orientation = Orientation.Horizontal };
|
||||
inner.Children.Add(new TextBlock { Text = "↗ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
inner.Children.Add(new TextBlock { Text = refreshLabel, FontSize = 10, FontWeight = FontWeights.Medium,
|
||||
Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeRight = new Border
|
||||
{
|
||||
Background = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
|
||||
CornerRadius = new CornerRadius(4),
|
||||
Padding = new Thickness(6, 2, 6, 2),
|
||||
Child = inner
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
timeRight = 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(timeLeft, 0);
|
||||
Grid.SetColumn(timeRight, 1);
|
||||
timeRow.Children.Add(timeLeft);
|
||||
timeRow.Children.Add(timeRight);
|
||||
Grid.SetColumn(timeStack, 0);
|
||||
Grid.SetColumn(resetText, 1);
|
||||
timeRow.Children.Add(timeStack);
|
||||
timeRow.Children.Add(resetText);
|
||||
|
||||
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,
|
||||
};
|
||||
|
||||
var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
|
||||
infoPanel.Children.Add(headerRow);
|
||||
infoPanel.Children.Add(progress);
|
||||
infoPanel.Children.Add(timeRow);
|
||||
infoPanel.Children.Add(sparkline);
|
||||
|
||||
var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
|
||||
cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
@@ -216,145 +180,12 @@ public partial class PopupWindow : Window
|
||||
return section;
|
||||
}
|
||||
|
||||
private static UIElement BuildDiarySection(AgentLimit limit)
|
||||
{
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
|
||||
var statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
|
||||
statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
var samplesText = new TextBlock
|
||||
{
|
||||
Text = $"{limit.BurnHistory.Count} samples",
|
||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
};
|
||||
var burnText = new TextBlock
|
||||
{
|
||||
Text = $"Avg burn rate: {limit.BurnRate:F1}%/h",
|
||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
};
|
||||
Grid.SetColumn(samplesText, 0);
|
||||
Grid.SetColumn(burnText, 1);
|
||||
statsRow.Children.Add(samplesText);
|
||||
statsRow.Children.Add(burnText);
|
||||
|
||||
var sparkline = new SparklineControl
|
||||
{
|
||||
Height = 40,
|
||||
Margin = new Thickness(8, 0, 8, 8),
|
||||
LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
|
||||
Data = limit.BurnHistory,
|
||||
};
|
||||
|
||||
var cardContent = new StackPanel();
|
||||
cardContent.Children.Add(statsRow);
|
||||
cardContent.Children.Add(sparkline);
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = cardContent,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "SESSION DIARY",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
var section = new StackPanel();
|
||||
section.Children.Add(sectionLabel);
|
||||
section.Children.Add(card);
|
||||
return section;
|
||||
}
|
||||
|
||||
private UIElement BuildExtraUsageSection()
|
||||
{
|
||||
var text = (SolidColorBrush)Application.Current.Resources["TextBrush"];
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
|
||||
|
||||
var overage = VM.Overage;
|
||||
var prepaid = VM.Prepaid;
|
||||
var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
|
||||
|
||||
var spent = (overage?.UsedCredits / 100.0) ?? (VM.ExtraUsage?.UsedCredits / 100.0) ?? 0;
|
||||
var limit = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
|
||||
var balance = (prepaid?.Amount / 100.0) ?? 0;
|
||||
|
||||
bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
|
||||
|
||||
UIElement MakeRow(string label, string value, bool highlight = false)
|
||||
{
|
||||
var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
|
||||
row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
|
||||
var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium,
|
||||
Foreground = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : text };
|
||||
Grid.SetColumn(lbl, 0);
|
||||
Grid.SetColumn(val, 1);
|
||||
row.Children.Add(lbl);
|
||||
row.Children.Add(val);
|
||||
return row;
|
||||
}
|
||||
|
||||
var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
|
||||
contentPanel.Children.Add(MakeRow("Spent", $"{currency} {spent:F2}", spent > 0));
|
||||
if (unlimited) contentPanel.Children.Add(MakeRow("Limit", "Unlimited"));
|
||||
else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit", $"{currency} {limit:F2}"));
|
||||
if (balance > 0) contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
|
||||
|
||||
if (limit > 0)
|
||||
{
|
||||
var pct = Math.Min(spent / limit * 100, 100);
|
||||
contentPanel.Children.Add(new ProgressBar
|
||||
{
|
||||
Value = pct, Maximum = 100, Height = 4,
|
||||
Margin = new Thickness(0, 6, 0, 0),
|
||||
Foreground = accent,
|
||||
Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
|
||||
BorderThickness = new Thickness(0),
|
||||
});
|
||||
}
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = contentPanel,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "EXTRA USAGE CREDITS",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
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)
|
||||
or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
|
||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
|
||||
{
|
||||
RebuildCards();
|
||||
UpdateFooter();
|
||||
@@ -407,14 +238,8 @@ public partial class PopupWindow : Window
|
||||
if (VM.LastUpdated.HasValue)
|
||||
{
|
||||
var diff = DateTime.Now - VM.LastUpdated.Value;
|
||||
string age;
|
||||
if (diff.TotalSeconds < 10)
|
||||
age = "just now";
|
||||
else if (diff.TotalMinutes < 1)
|
||||
age = $"{(int)diff.TotalSeconds} sec ago";
|
||||
else
|
||||
age = $"{(int)diff.TotalMinutes} min, {diff.Seconds} sec ago";
|
||||
LastUpdatedText.Text = $"Updated {age}";
|
||||
LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
|
||||
: $"Updated {(int)diff.TotalSeconds}s ago";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -425,33 +250,18 @@ public partial class PopupWindow : Window
|
||||
|
||||
// ── Settings ─────────────────────────────────────────────────────
|
||||
|
||||
private static readonly (string Label, int Seconds)[] RefreshIntervals =
|
||||
[
|
||||
("1 min", 60),
|
||||
("2 min", 120),
|
||||
("3 min", 180),
|
||||
("4 min", 240),
|
||||
("5 min", 300),
|
||||
("10 min", 600),
|
||||
];
|
||||
|
||||
private void InitSettings()
|
||||
{
|
||||
VersionLabel.Text = $"v{Updater.CurrentVersion}";
|
||||
BetaToggle.IsChecked = Updater.BetaChannel;
|
||||
UpdateAboutSection();
|
||||
|
||||
RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
|
||||
RefreshPicker.Items.Clear();
|
||||
int selectIdx = 1;
|
||||
for (int i = 0; i < RefreshIntervals.Length; i++)
|
||||
{
|
||||
var (label, seconds) = RefreshIntervals[i];
|
||||
RefreshPicker.Items.Add(new ComboBoxItem { Content = label, Tag = seconds });
|
||||
if (seconds == VM.RefreshInterval) selectIdx = i;
|
||||
}
|
||||
RefreshPicker.SelectedIndex = selectIdx;
|
||||
RefreshPicker.SelectionChanged += RefreshPicker_Changed;
|
||||
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
|
||||
@@ -460,216 +270,49 @@ public partial class PopupWindow : Window
|
||||
Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
};
|
||||
var label2 = new TextBlock
|
||||
var label = new TextBlock
|
||||
{
|
||||
Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold,
|
||||
Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
};
|
||||
var authRow = new StackPanel { Orientation = Orientation.Horizontal };
|
||||
authRow.Children.Add(dot);
|
||||
authRow.Children.Add(label2);
|
||||
authRow.Children.Add(label);
|
||||
AuthPanel.Children.Add(authRow);
|
||||
|
||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
||||
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
||||
}
|
||||
|
||||
// ── Diagnostics ──────────────────────────────────────────────────
|
||||
|
||||
private void Diagnostics_Click(object s, RoutedEventArgs e)
|
||||
{
|
||||
RebuildDiag();
|
||||
MainPanel.Visibility = Visibility.Collapsed;
|
||||
SettingsPanel.Visibility = Visibility.Collapsed;
|
||||
UpdatePanel.Visibility = Visibility.Collapsed;
|
||||
DiagnosticsPanel.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
private void BackFromDiag_Click(object s, RoutedEventArgs e)
|
||||
{
|
||||
DiagnosticsPanel.Visibility = Visibility.Collapsed;
|
||||
SettingsPanel.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
private void CopyDiag_Click(object s, RoutedEventArgs e)
|
||||
{
|
||||
try
|
||||
var dbg = AppSettings.Default.DebugInfo;
|
||||
if (!string.IsNullOrEmpty(dbg))
|
||||
{
|
||||
// SetDataObject(data, false) skips Flush() — avoids CLIPBRD_E_CANT_OPEN crash
|
||||
var diagText = BuildDiagText();
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
try { Clipboard.SetDataObject(diagText, false); break; }
|
||||
catch (Exception) { System.Threading.Thread.Sleep(100); }
|
||||
}
|
||||
CopyDiagButton.Content = "Copied! (IDs redacted)";
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
CopyDiagButton.Content = "Copy failed";
|
||||
}
|
||||
var t = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1.5) };
|
||||
t.Tick += (_, _) => { CopyDiagButton.Content = "Copy All"; t.Stop(); };
|
||||
t.Start();
|
||||
}
|
||||
|
||||
private void RebuildDiag()
|
||||
{
|
||||
DiagContentPanel.Children.Clear();
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
var text = (SolidColorBrush)Application.Current.Resources["TextBrush"];
|
||||
|
||||
FrameworkElement MakeRow(string label, string value)
|
||||
{
|
||||
var grid = new Grid { Margin = new Thickness(0, 3, 0, 3) };
|
||||
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(110) });
|
||||
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
var lbl = new TextBlock
|
||||
{
|
||||
Text = label, FontSize = 11, Foreground = secondary,
|
||||
VerticalAlignment = VerticalAlignment.Top,
|
||||
};
|
||||
var val = new TextBlock
|
||||
{
|
||||
Text = value, FontSize = 11, FontFamily = new FontFamily("Consolas"),
|
||||
Foreground = text, TextWrapping = TextWrapping.Wrap,
|
||||
};
|
||||
Grid.SetColumn(lbl, 0);
|
||||
Grid.SetColumn(val, 1);
|
||||
grid.Children.Add(lbl);
|
||||
grid.Children.Add(val);
|
||||
return grid;
|
||||
}
|
||||
|
||||
void AddSection(string title, IEnumerable<FrameworkElement> rows)
|
||||
{
|
||||
DiagContentPanel.Children.Add(new TextBlock
|
||||
{
|
||||
Text = title, Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(0, 12, 0, 6),
|
||||
});
|
||||
var panel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
|
||||
foreach (var row in rows) panel.Children.Add(row);
|
||||
DiagContentPanel.Children.Add(new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border, BorderThickness = new Thickness(1),
|
||||
Child = panel,
|
||||
});
|
||||
}
|
||||
|
||||
// APP
|
||||
AddSection("APP",
|
||||
[
|
||||
MakeRow("Version", Updater.CurrentVersion),
|
||||
MakeRow("Signed in", VM.IsSignedIn ? "Yes" : "No"),
|
||||
MakeRow("Org ID", string.IsNullOrEmpty(VM.DiagOrgId) ? "(none)" : VM.DiagOrgId),
|
||||
MakeRow("lastActiveOrg", string.IsNullOrEmpty(VM.DiagLastActiveOrg) ? "(not read)" : VM.DiagLastActiveOrg),
|
||||
MakeRow("Error", VM.ErrorMessage ?? "(none)"),
|
||||
]);
|
||||
|
||||
// LAST REQUEST
|
||||
var reqRows = new List<FrameworkElement>
|
||||
{
|
||||
MakeRow("Path", string.IsNullOrEmpty(VM.DiagLastPath) ? "(none)" : VM.DiagLastPath),
|
||||
MakeRow("Status", VM.DiagLastStatus == 0 ? "(none)" : VM.DiagLastStatus.ToString()),
|
||||
MakeRow("Error", string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError),
|
||||
};
|
||||
if (VM.DiagLastFetch.HasValue)
|
||||
reqRows.Add(MakeRow("Time", VM.DiagLastFetch.Value.ToString("HH:mm:ss")));
|
||||
AddSection("LAST REQUEST", reqRows);
|
||||
|
||||
// STORED COOKIE NAMES
|
||||
var storedNames = GetStoredCookieNames();
|
||||
var nameRows = new List<FrameworkElement>();
|
||||
if (storedNames.Count == 0)
|
||||
{
|
||||
nameRows.Add(MakeRow("(none)", ""));
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
{
|
||||
var claudeC = storedNames.Where(c =>
|
||||
c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com")).ToList();
|
||||
var otherC = storedNames.Where(c =>
|
||||
!c.Domain.Contains("claude.ai") && !c.Domain.Contains("anthropic.com")).ToList();
|
||||
foreach (var c in claudeC)
|
||||
nameRows.Add(MakeRow(c.Domain, c.Name));
|
||||
if (otherC.Count > 0)
|
||||
nameRows.Add(MakeRow($"other ({otherC.Count})",
|
||||
string.Join(", ", otherC.Take(5).Select(c => c.Name))));
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
AddSection("STORED COOKIE NAMES", nameRows);
|
||||
}
|
||||
|
||||
private static List<(string Name, string Domain)> GetStoredCookieNames()
|
||||
{
|
||||
try
|
||||
{
|
||||
var raw = AppSettings.Default.CookieStore;
|
||||
if (string.IsNullOrEmpty(raw)) return [];
|
||||
using var doc = JsonDocument.Parse(raw);
|
||||
var list = new List<(string Name, string Domain)>();
|
||||
foreach (var elem in doc.RootElement.EnumerateArray())
|
||||
{
|
||||
var name = elem.TryGetProperty("Name", out var n) ? n.GetString() ?? "" : "";
|
||||
var domain = elem.TryGetProperty("Domain", out var d) ? d.GetString() ?? "" : "";
|
||||
list.Add((name, domain));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
catch { return []; }
|
||||
}
|
||||
|
||||
private static string BuildDiagText()
|
||||
{
|
||||
var storedNames = GetStoredCookieNames();
|
||||
var sb = new StringBuilder();
|
||||
sb.AppendLine("=== ClaudeChecker Diagnostics (Windows) ===");
|
||||
sb.AppendLine($"Version: {Updater.CurrentVersion}");
|
||||
sb.AppendLine($"Signed in: {(VM.IsSignedIn ? "Yes" : "No")}");
|
||||
sb.AppendLine($"Org ID: {(string.IsNullOrEmpty(VM.DiagOrgId) ? "(none)" : VM.DiagOrgId)}");
|
||||
sb.AppendLine($"lastActiveOrg: {(string.IsNullOrEmpty(VM.DiagLastActiveOrg) ? "(not read)" : VM.DiagLastActiveOrg)}");
|
||||
sb.AppendLine($"Error: {VM.ErrorMessage ?? "(none)"}");
|
||||
sb.AppendLine();
|
||||
sb.AppendLine($"Last path: {VM.DiagLastPath}");
|
||||
sb.AppendLine($"Last status: {VM.DiagLastStatus}");
|
||||
sb.AppendLine($"Last error: {(string.IsNullOrEmpty(VM.DiagLastError) ? "(none)" : VM.DiagLastError)}");
|
||||
if (VM.DiagLastFetch.HasValue)
|
||||
sb.AppendLine($"Last fetch: {VM.DiagLastFetch.Value:HH:mm:ss}");
|
||||
sb.AppendLine();
|
||||
sb.AppendLine();
|
||||
sb.AppendLine("Stored cookies:");
|
||||
foreach (var c in storedNames)
|
||||
sb.AppendLine($" {c.Domain} {c.Name}");
|
||||
return RedactUUIDs(sb.ToString());
|
||||
}
|
||||
|
||||
private static string RedactUUIDs(string text) =>
|
||||
Regex.Replace(text, @"[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}", "****");
|
||||
|
||||
// ── Event handlers ───────────────────────────────────────────────
|
||||
|
||||
private void Settings_Click(object s, RoutedEventArgs e)
|
||||
{
|
||||
InitSettings();
|
||||
MainPanel.Visibility = Visibility.Collapsed;
|
||||
SettingsPanel.Visibility = Visibility.Visible;
|
||||
UpdatePanel.Visibility = Visibility.Collapsed;
|
||||
DiagnosticsPanel.Visibility = Visibility.Collapsed;
|
||||
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;
|
||||
DiagnosticsPanel.Visibility = Visibility.Collapsed;
|
||||
MainPanel.Visibility = Visibility.Visible;
|
||||
SettingsPanel.Visibility = Visibility.Collapsed;
|
||||
UpdatePanel.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
|
||||
@@ -681,10 +324,9 @@ public partial class PopupWindow : Window
|
||||
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;
|
||||
DiagnosticsPanel.Visibility = Visibility.Collapsed;
|
||||
MainPanel.Visibility = Visibility.Collapsed;
|
||||
SettingsPanel.Visibility = Visibility.Collapsed;
|
||||
UpdatePanel.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
|
||||
@@ -702,15 +344,15 @@ public partial class PopupWindow : Window
|
||||
var login = new LoginWindow { Owner = this };
|
||||
if (login.ShowDialog() == true)
|
||||
{
|
||||
// Show cached data from SaveAndClose immediately (no WebView2 needed)
|
||||
await VM.LoadFromCacheAsync();
|
||||
InitSettings();
|
||||
ShowMain();
|
||||
|
||||
// Full refresh in background after WebView2 folder is definitely released
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
// Re-navigate background browser with fresh session, then refresh immediately
|
||||
await Application.Current.Dispatcher.InvokeAsync(
|
||||
() => App.BackgroundBrowser.ReloadAsync()).Task.Unwrap();
|
||||
await Task.Delay(3000);
|
||||
await VM.RefreshAsync();
|
||||
await Application.Current.Dispatcher.InvokeAsync(InitSettings);
|
||||
});
|
||||
@@ -733,10 +375,10 @@ public partial class PopupWindow : Window
|
||||
|
||||
private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (RefreshPicker.SelectedItem is ComboBoxItem item && item.Tag is int seconds)
|
||||
if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
|
||||
{
|
||||
VM.RefreshInterval = seconds;
|
||||
((App)Application.Current).ScheduleTimer(seconds);
|
||||
VM.RefreshInterval = selected.Item2;
|
||||
((App)Application.Current).ScheduleTimer(selected.Item2);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
## What's new in beta.64
|
||||
## What's new in beta.25
|
||||
|
||||
- Updates and release downloads now come from git.jamesbone.net.
|
||||
- Windows installers now build through Gitea Actions from main.
|
||||
- Debug: Settings panel now shows bootstrap diagnostic info after sign-in (helps diagnose missing data)
|
||||
|
||||
+47
-10
@@ -2,6 +2,7 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using System.Reflection;
|
||||
using System.IO;
|
||||
using System.IO.Compression;
|
||||
using System.Net.Http;
|
||||
using System.Text.Json;
|
||||
using System.Threading.Tasks;
|
||||
@@ -14,8 +15,8 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public class UpdateManager : INotifyPropertyChanged
|
||||
{
|
||||
private const string StableUrl = "https://git.jamesbone.net/coder/claudechecker/raw/branch/main/version-windows.json";
|
||||
private const string BetaUrl = "https://git.jamesbone.net/coder/claudechecker/raw/branch/main/version-windows-beta.json";
|
||||
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 = "";
|
||||
@@ -135,7 +136,9 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
|
||||
try
|
||||
{
|
||||
var installerPath = Path.Combine(Path.GetTempPath(), $"ClaudeCheckerInstaller_{Guid.NewGuid():N}.exe");
|
||||
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);
|
||||
@@ -145,7 +148,7 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
var received = 0L;
|
||||
|
||||
await using (var stream = await response.Content.ReadAsStreamAsync())
|
||||
await using (var file = File.Create(installerPath))
|
||||
await using (var file = File.Create(zipPath))
|
||||
{
|
||||
var buffer = new byte[81920];
|
||||
int read;
|
||||
@@ -154,21 +157,48 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
await file.WriteAsync(buffer.AsMemory(0, read));
|
||||
received += read;
|
||||
if (total > 0)
|
||||
DownloadProgress = (double)received / total;
|
||||
DownloadProgress = (double)received / total * 0.8;
|
||||
}
|
||||
}
|
||||
|
||||
DownloadProgress = 1.0;
|
||||
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(500);
|
||||
await Task.Delay(800);
|
||||
|
||||
Process.Start(new ProcessStartInfo
|
||||
{
|
||||
FileName = installerPath,
|
||||
Arguments = "/SILENT /CLOSEAPPLICATIONS",
|
||||
UseShellExecute = true,
|
||||
FileName = "cmd.exe",
|
||||
Arguments = $"/C \"{scriptPath}\"",
|
||||
CreateNoWindow = true,
|
||||
UseShellExecute = false,
|
||||
});
|
||||
|
||||
Application.Current.Dispatcher.Invoke(() => Application.Current.Shutdown());
|
||||
@@ -181,6 +211,13 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
+155
-262
@@ -20,11 +20,10 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
private string? _errorMessage;
|
||||
private bool _isSignedIn;
|
||||
private string _userEmail = "";
|
||||
private string _planLabel = "Claude";
|
||||
private string _planLabel = "Pro";
|
||||
private DateTime? _lastUpdated;
|
||||
private OverageSpendLimit? _overage;
|
||||
private PrepaidCredits? _prepaid;
|
||||
private ExtraUsage? _extraUsage;
|
||||
|
||||
private readonly Dictionary<string, List<double>> _burnHistory = [];
|
||||
private const int MaxHistorySamples = 24;
|
||||
@@ -38,18 +37,6 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
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); }
|
||||
public ExtraUsage? ExtraUsage { get => _extraUsage; set => Set(ref _extraUsage, value); }
|
||||
|
||||
// Diagnostics — updated after each refresh, read by DiagnosticsPanel on demand
|
||||
public string DiagLastActiveOrg { get; private set; } = "";
|
||||
public string DiagOrgId { get; private set; } = "";
|
||||
public string DiagLastPath { get; private set; } = "";
|
||||
public int DiagLastStatus { get; private set; }
|
||||
public string DiagLastError { get; private set; } = "";
|
||||
public int DiagCookieCount { get; private set; }
|
||||
public int DiagClaudeCookieCount { get; private set; }
|
||||
public List<string> DiagCookieDomains { get; private set; } = [];
|
||||
public DateTime? DiagLastFetch { get; private set; }
|
||||
|
||||
private int _refreshInterval = 120;
|
||||
public int RefreshInterval
|
||||
@@ -88,13 +75,16 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
{
|
||||
await Application.Current.Dispatcher.InvokeAsync(() => IsLoading = true);
|
||||
|
||||
// Snapshot stored cookies once — used for both diag and HttpClient fallback path.
|
||||
var storedCookies = await GetCookiesAsync();
|
||||
|
||||
try
|
||||
{
|
||||
// CookieStore being non-empty is our signal that the user has signed in.
|
||||
if (string.IsNullOrEmpty(AppSettings.Default.CookieStore))
|
||||
var cookies = await GetCookiesAsync();
|
||||
|
||||
// Check if we have any persistent proof that the user authenticated
|
||||
bool hasCookies = cookies.Count > 0;
|
||||
bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
|
||||
!string.IsNullOrEmpty(AppSettings.Default.OrgId);
|
||||
|
||||
if (!hasCookies && !hasCachedAuth)
|
||||
{
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
@@ -105,42 +95,27 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
return;
|
||||
}
|
||||
|
||||
List<AgentLimit> limits = [];
|
||||
OverageSpendLimit? overage = null;
|
||||
PrepaidCredits? prepaid = null;
|
||||
ExtraUsage? extraUsage = null;
|
||||
string? email = null, orgId = null, planLabel = null;
|
||||
string? refreshError = null;
|
||||
// Try HttpClient first (fast path) — may be rejected by server CORS/header checks
|
||||
var (limits, overage, prepaid, email, orgId, ok) = hasCookies
|
||||
? await TryHttpRefreshAsync(cookies)
|
||||
: ([], null, null, null, null, false);
|
||||
|
||||
// Primary: persistent background WebView2 — always-live cookies, same as macOS.
|
||||
// Fallback: HttpClient with saved cookies, only if the browser isn't ready yet
|
||||
// (the brief window while InitAsync is still navigating at startup).
|
||||
if (App.BackgroundBrowser.IsReady)
|
||||
// Fall back to WebView2 (uses the shared browser session, not HttpClient)
|
||||
if (!ok)
|
||||
(limits, email, orgId) = await TryWebView2RefreshAsync();
|
||||
|
||||
// Fill in any blanks from cached values saved at login time
|
||||
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
|
||||
if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
|
||||
if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
|
||||
{
|
||||
try
|
||||
{
|
||||
(limits, overage, prepaid, extraUsage, email, orgId, planLabel) =
|
||||
await TryBrowserRefreshAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
refreshError = ex.Message;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (storedCookies.Count > 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
(limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
|
||||
await TryHttpRefreshAsync(storedCookies);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
refreshError = ex.Message;
|
||||
}
|
||||
var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
|
||||
AppSettings.Default.UsageJson, JsonOpts);
|
||||
limits = BuildLimits(cached);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
foreach (var limit in limits)
|
||||
@@ -156,29 +131,16 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
if (limits.Count > 0)
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
if (extraUsage != null) ExtraUsage = extraUsage;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
// Trust that cookies / cached auth mean the user IS signed in,
|
||||
// even if the live fetch failed this cycle.
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = refreshError;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = DateTime.Now;
|
||||
IsLoading = false;
|
||||
|
||||
// Update diagnostics
|
||||
if (!string.IsNullOrEmpty(orgId)) DiagOrgId = orgId;
|
||||
DiagLastFetch = DateTime.Now;
|
||||
DiagLastError = refreshError ?? "";
|
||||
DiagCookieCount = storedCookies.Count;
|
||||
DiagClaudeCookieCount = storedCookies.Count(c =>
|
||||
c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"));
|
||||
DiagCookieDomains = storedCookies
|
||||
.Select(c => c.Domain).Distinct().OrderBy(d => d).ToList();
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -191,157 +153,143 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
}
|
||||
}
|
||||
|
||||
// ── Browser-based refresh (primary) ───────────────────────────────────────
|
||||
// Runs JS on the persistent claude.ai page. Same live cookies as macOS WKWebView.
|
||||
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?)>
|
||||
TryBrowserRefreshAsync()
|
||||
{
|
||||
// Read lastActiveOrg from document.cookie — the only reliable org source when the
|
||||
// user belongs to multiple orgs. memberships[0] is always the "Individual Org" and
|
||||
// would return 403 on usage endpoints if the paid plan is on a different org.
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
if(b?.error_type==='authentication_error'){window.chrome.webview.postMessage({authError:true});return;}
|
||||
const lastActiveOrg=(document.cookie.split(';').map(c=>c.trim().split('=')).find(p=>p[0]==='lastActiveOrg')||[])[1]||null;
|
||||
const allOrgs=(b?.account?.memberships||b?.memberships||[]).map(m=>m?.organization).filter(Boolean);
|
||||
const activeOrg=(lastActiveOrg?allOrgs.find(o=>o?.uuid===lastActiveOrg):null)||allOrgs[0];
|
||||
let id=activeOrg?.uuid||b?.organizations?.[0]?.uuid||null;
|
||||
const email=b?.account?.email_address||b?.account?.email||null;
|
||||
const caps=activeOrg?.capabilities||[];
|
||||
const capStr=caps.find(c=>typeof c==='string'&&c.startsWith('claude_'))||null;
|
||||
const planLabel=capStr?(capStr.slice(7,8).toUpperCase()+capStr.slice(8).toLowerCase()):null;
|
||||
if(!id){
|
||||
try{const ol=await(await fetch('/api/organizations',h)).json();
|
||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
||||
}
|
||||
if(!id){window.chrome.webview.postMessage({noOrg:true,email});return;}
|
||||
const [u,ov,pp]=await Promise.all([
|
||||
fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()),
|
||||
fetch('/api/organizations/'+id+'/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
|
||||
fetch('/api/organizations/'+id+'/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
|
||||
]);
|
||||
window.chrome.webview.postMessage({email,orgId:id,planLabel,lastActiveOrg,usage:u,overage:ov,prepaid:pp});
|
||||
}catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
|
||||
|
||||
var json = await Application.Current.Dispatcher.InvokeAsync(
|
||||
() => App.BackgroundBrowser.RunScriptAsync(script)).Task.Unwrap();
|
||||
|
||||
if (string.IsNullOrEmpty(json) || json == "null")
|
||||
throw new Exception("Browser refresh returned no data.");
|
||||
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
|
||||
if (root.TryGetProperty("authError", out _))
|
||||
throw new Exception("Session expired — please re-authenticate.");
|
||||
if (root.TryGetProperty("error", out var errEl))
|
||||
throw new Exception("Browser script error: " + errEl.GetString());
|
||||
if (root.TryGetProperty("noOrg", out _))
|
||||
throw new Exception("Could not determine organization ID.");
|
||||
|
||||
string? email = root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String ? em.GetString() : null;
|
||||
string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String ? oi.GetString() : null;
|
||||
string? planLabel = root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String ? pl.GetString() : null;
|
||||
string? lao = root.TryGetProperty("lastActiveOrg", out var laoProp) && laoProp.ValueKind == JsonValueKind.String ? laoProp.GetString() : null;
|
||||
|
||||
DiagLastActiveOrg = lao ?? "";
|
||||
DiagLastPath = $"/api/bootstrap + /api/organizations/…/usage (browser)";
|
||||
DiagLastStatus = 200;
|
||||
|
||||
UsageResponse? usage = null;
|
||||
OverageSpendLimit? overage = null;
|
||||
PrepaidCredits? prepaid = null;
|
||||
|
||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
||||
usage = JsonSerializer.Deserialize<UsageResponse>(us.GetRawText(), JsonOpts);
|
||||
if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
|
||||
overage = JsonSerializer.Deserialize<OverageSpendLimit>(ov.GetRawText(), JsonOpts);
|
||||
if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
|
||||
prepaid = JsonSerializer.Deserialize<PrepaidCredits>(pp.GetRawText(), JsonOpts);
|
||||
|
||||
return (BuildLimits(usage), overage, prepaid, usage?.ExtraUsage, email, orgId, planLabel);
|
||||
}
|
||||
|
||||
// ── HttpClient refresh (fallback — before browser is ready) ──────────────
|
||||
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?, bool)>
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
|
||||
TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
|
||||
{
|
||||
// Prefer the org the user last had active, not necessarily memberships[0].
|
||||
var lastActiveOrg = cookies.FirstOrDefault(c => c.Name == "lastActiveOrg").Value;
|
||||
DiagLastActiveOrg = lastActiveOrg ?? "";
|
||||
try
|
||||
{
|
||||
using var http = BuildClient(cookies);
|
||||
var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
if (!bootstrapResp.IsSuccessStatusCode)
|
||||
return ([], null, null, null, null, false);
|
||||
|
||||
using var http = BuildClient(cookies);
|
||||
var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
|
||||
|
||||
var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
DiagLastPath = "/api/bootstrap";
|
||||
DiagLastStatus = (int)bootstrapResp.StatusCode;
|
||||
if ((int)bootstrapResp.StatusCode is 401 or 403)
|
||||
throw new Exception("Session expired — please re-authenticate.");
|
||||
if (!bootstrapResp.IsSuccessStatusCode)
|
||||
throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
orgId = await FetchOrgIdFromListAsync(http);
|
||||
if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
|
||||
orgId = AppSettings.Default.OrgId;
|
||||
|
||||
var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
|
||||
var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson, lastActiveOrg);
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
return ([], null, null, email, orgId, true);
|
||||
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
orgId = await FetchOrgIdFromListAsync(http);
|
||||
AppSettings.Default.OrgId = orgId;
|
||||
AppSettings.Default.Save();
|
||||
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
return ([], null, null, null, email, orgId, planLabel, true);
|
||||
var ut = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
|
||||
var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
|
||||
var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
|
||||
await Task.WhenAll(ut, ot, pt);
|
||||
|
||||
var ut = http.GetAsync($"https://claude.ai/api/organizations/{orgId}/usage");
|
||||
var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
|
||||
var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
|
||||
await Task.WhenAll(ut, ot, pt);
|
||||
|
||||
var usageResp = ut.Result;
|
||||
DiagLastPath = $"/api/organizations/{orgId}/usage";
|
||||
DiagLastStatus = (int)usageResp.StatusCode;
|
||||
if (!usageResp.IsSuccessStatusCode)
|
||||
throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
|
||||
|
||||
var usageJson = await usageResp.Content.ReadAsStringAsync();
|
||||
var usage = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
|
||||
|
||||
return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
|
||||
return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
|
||||
}
|
||||
catch { return ([], null, null, null, null, false); }
|
||||
}
|
||||
|
||||
// ── Startup cache ─────────────────────────────────────────────────────────
|
||||
// Called before the browser is ready. Sets sign-in state and shows placeholders
|
||||
// with any previously accumulated burn history so the popup isn't blank.
|
||||
private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
||b?.default_organization?.uuid||null;
|
||||
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
if(!id){
|
||||
try{const ol=await(await fetch('/api/organizations',h)).json();
|
||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
||||
}
|
||||
if(!id){
|
||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
||||
if(pu&&!pu.error)return{email:em,orgId:null,usage:pu};}catch(e3){}
|
||||
return{email:em,orgId:null,usage:null};
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
return{email:em,orgId:id,usage:u};
|
||||
}catch(ex){return null;}})()";
|
||||
|
||||
var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
|
||||
{
|
||||
var host = new WebViewFetchWindow();
|
||||
host.Show();
|
||||
try { return await host.FetchAsync("https://claude.ai", script); }
|
||||
finally { host.Close(); }
|
||||
}).Task.Unwrap();
|
||||
|
||||
if (resultJson == null || resultJson == "null") return ([], null, null);
|
||||
|
||||
using var doc = System.Text.Json.JsonDocument.Parse(resultJson);
|
||||
var root = doc.RootElement;
|
||||
|
||||
string? email = root.TryGetProperty("email", out var em) && em.ValueKind == System.Text.Json.JsonValueKind.String
|
||||
? em.GetString() : null;
|
||||
string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == System.Text.Json.JsonValueKind.String
|
||||
? oi.GetString() : null;
|
||||
|
||||
List<AgentLimit> limits = [];
|
||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == System.Text.Json.JsonValueKind.Object)
|
||||
{
|
||||
var usage = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
|
||||
us.GetRawText(), new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true });
|
||||
limits = BuildLimits(usage);
|
||||
|
||||
// Cache for next time
|
||||
AppSettings.Default.UsageJson = us.GetRawText();
|
||||
if (!string.IsNullOrEmpty(orgId)) AppSettings.Default.OrgId = orgId;
|
||||
if (!string.IsNullOrEmpty(email)) AppSettings.Default.Email = email;
|
||||
AppSettings.Default.Save();
|
||||
}
|
||||
|
||||
return (limits, email, orgId);
|
||||
}
|
||||
catch { return ([], null, null); }
|
||||
}
|
||||
|
||||
public async Task LoadFromCacheAsync()
|
||||
{
|
||||
if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
|
||||
var email = AppSettings.Default.Email;
|
||||
var orgId = AppSettings.Default.OrgId;
|
||||
var cookie = AppSettings.Default.CookieStore;
|
||||
|
||||
var placeholders = LoadPlaceholderLimits();
|
||||
foreach (var limit in placeholders)
|
||||
bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId)
|
||||
|| !string.IsNullOrEmpty(cookie);
|
||||
if (!isAuth) return;
|
||||
|
||||
List<AgentLimit> limits = [];
|
||||
if (!string.IsNullOrEmpty(AppSettings.Default.UsageJson))
|
||||
{
|
||||
var key = limit.Window.ToString();
|
||||
if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
|
||||
limit.BurnHistory = [.. hist];
|
||||
try
|
||||
{
|
||||
var cached = JsonSerializer.Deserialize<UsageResponse>(
|
||||
AppSettings.Default.UsageJson, JsonOpts);
|
||||
limits = BuildLimits(cached);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = placeholders;
|
||||
IsSignedIn = true;
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
if (limits.Count > 0) Limits = limits;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
|
||||
LastUpdated = limits.Count > 0 ? DateTime.Now : LastUpdated;
|
||||
});
|
||||
}
|
||||
|
||||
public async Task SignOutAsync()
|
||||
{
|
||||
AppSettings.Default.CookieStore = "";
|
||||
AppSettings.Default.OrgId = "";
|
||||
AppSettings.Default.Email = "";
|
||||
AppSettings.Default.UsageJson = "";
|
||||
AppSettings.Default.Save();
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
IsSignedIn = false;
|
||||
UserEmail = "";
|
||||
PlanLabel = "Claude";
|
||||
ErrorMessage = "Signed out.";
|
||||
Limits = [];
|
||||
});
|
||||
@@ -378,14 +326,6 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
http.DefaultRequestHeaders.Add("User-Agent",
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
|
||||
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
|
||||
http.DefaultRequestHeaders.Add("Origin", "https://claude.ai");
|
||||
http.DefaultRequestHeaders.Add("Referer", "https://claude.ai/");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-dest", "empty");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-mode", "cors");
|
||||
http.DefaultRequestHeaders.Add("sec-fetch-site", "same-origin");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua", "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
|
||||
http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
|
||||
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
||||
return http;
|
||||
@@ -403,11 +343,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
// Parses bootstrap JSON and returns email, org ID, and plan label.
|
||||
// preferredOrgId (from the lastActiveOrg cookie) selects the correct org when the
|
||||
// user belongs to multiple — memberships[0] is always the "Individual Org" which
|
||||
// returns 403 on usage endpoints if the paid plan is on a different org.
|
||||
private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json, string? preferredOrgId = null)
|
||||
// Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
|
||||
private static (string? Email, string? OrgId) ParseBootstrap(string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -415,74 +352,32 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
var root = doc.RootElement;
|
||||
|
||||
string? email = null;
|
||||
string? orgId = null;
|
||||
|
||||
if (root.TryGetProperty("account", out var acct) &&
|
||||
acct.TryGetProperty("email_address", out var em))
|
||||
email = em.GetString();
|
||||
|
||||
// Collect all org objects from memberships
|
||||
var allOrgs = new List<JsonElement>();
|
||||
if (root.TryGetProperty("account", out var acctNode) &&
|
||||
acctNode.TryGetProperty("memberships", out var mems))
|
||||
// Path 1: memberships[0].organization.uuid
|
||||
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
{
|
||||
foreach (var mem in mems.EnumerateArray())
|
||||
if (mem.TryGetProperty("organization", out var org))
|
||||
allOrgs.Add(org);
|
||||
}
|
||||
if (allOrgs.Count == 0 && root.TryGetProperty("memberships", out var rootMems))
|
||||
{
|
||||
foreach (var mem in rootMems.EnumerateArray())
|
||||
if (mem.TryGetProperty("organization", out var org))
|
||||
allOrgs.Add(org);
|
||||
var first = mems[0];
|
||||
if (first.TryGetProperty("organization", out var org) &&
|
||||
org.TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
// Prefer the org matching preferredOrgId, fall back to first
|
||||
JsonElement activeOrg = default;
|
||||
if (!string.IsNullOrEmpty(preferredOrgId))
|
||||
{
|
||||
foreach (var org in allOrgs)
|
||||
{
|
||||
if (org.TryGetProperty("uuid", out var u) && u.GetString() == preferredOrgId)
|
||||
{
|
||||
activeOrg = org;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (activeOrg.ValueKind == JsonValueKind.Undefined && allOrgs.Count > 0)
|
||||
activeOrg = allOrgs[0];
|
||||
|
||||
string? orgId = null;
|
||||
if (activeOrg.ValueKind != JsonValueKind.Undefined &&
|
||||
activeOrg.TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
|
||||
// Path 2: organizations[0].uuid (flat list on root)
|
||||
if (string.IsNullOrEmpty(orgId) &&
|
||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||
{
|
||||
if (orgs[0].TryGetProperty("uuid", out var u))
|
||||
orgId = u.GetString();
|
||||
if (orgs[0].TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
string? planLabel = null;
|
||||
if (activeOrg.ValueKind != JsonValueKind.Undefined &&
|
||||
activeOrg.TryGetProperty("capabilities", out var caps) &&
|
||||
caps.ValueKind == JsonValueKind.Array)
|
||||
{
|
||||
foreach (var cap in caps.EnumerateArray())
|
||||
{
|
||||
var s = cap.GetString() ?? "";
|
||||
if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var name = s.Substring("claude_".Length);
|
||||
if (name.Length > 0)
|
||||
planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return (email, orgId, planLabel);
|
||||
return (email, orgId);
|
||||
}
|
||||
catch { return (null, null, null); }
|
||||
catch { return (null, null); }
|
||||
}
|
||||
|
||||
private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
|
||||
@@ -560,18 +455,16 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
return $"{diff.Hours}h {diff.Minutes}m";
|
||||
}
|
||||
|
||||
private static List<AgentLimit> LoadPlaceholderLimits()
|
||||
private void LoadPlaceholders()
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
return
|
||||
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 LoadPlaceholders() => Limits = LoadPlaceholderLimits();
|
||||
|
||||
private void LoadBurnHistory()
|
||||
{
|
||||
try
|
||||
|
||||
+27
-127
@@ -2,158 +2,58 @@ using Microsoft.Web.WebView2.Core;
|
||||
using Microsoft.Web.WebView2.Wpf;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
namespace ClaudeCheckerWindows;
|
||||
|
||||
// Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
|
||||
// Uses the same user data folder as LoginWindow so the session (including
|
||||
// cf_clearance) is always shared and fresh — equivalent to macOS's WKWebsiteDataStore.
|
||||
//
|
||||
// Two usage modes:
|
||||
// • Persistent (App.BackgroundBrowser): created once at startup, navigates to
|
||||
// claude.ai once, then scripts run directly on the live page every refresh.
|
||||
// No re-navigation = no memory accumulation.
|
||||
// • One-shot (LoginWindow): created, used, closed — same as before.
|
||||
public sealed class WebViewFetchWindow : Window
|
||||
// Uses the same user data folder as LoginWindow so the session is shared.
|
||||
internal sealed class WebViewFetchWindow : Window
|
||||
{
|
||||
private readonly WebView2 _wv = new();
|
||||
private bool _initialized;
|
||||
private bool _readyForScript; // true after first navigation to claude.ai completes
|
||||
|
||||
private static readonly string UserDataFolder =
|
||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "WebView2");
|
||||
|
||||
public bool IsReady => _readyForScript;
|
||||
|
||||
public WebViewFetchWindow()
|
||||
{
|
||||
Width = 1;
|
||||
Height = 1;
|
||||
Left = -9999;
|
||||
Top = -9999;
|
||||
ShowInTaskbar = false;
|
||||
WindowStyle = WindowStyle.None;
|
||||
Width = 1;
|
||||
Height = 1;
|
||||
Left = -9999;
|
||||
Top = -9999;
|
||||
ShowInTaskbar = false;
|
||||
WindowStyle = WindowStyle.None;
|
||||
AllowsTransparency = true;
|
||||
Opacity = 0;
|
||||
Content = _wv;
|
||||
Opacity = 0;
|
||||
Content = _wv;
|
||||
}
|
||||
|
||||
// ── Persistent-mode init ──────────────────────────────────────────────────
|
||||
|
||||
// Call once at startup. Navigates to claude.ai so the session/cookies are
|
||||
// established and cf_clearance is fresh. Subsequent RunScriptAsync calls
|
||||
// skip navigation and just execute JS on the live page.
|
||||
public async Task InitAsync()
|
||||
{
|
||||
await EnsureInitAsync();
|
||||
|
||||
var navDone = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? h = null;
|
||||
h = (_, e) => { _wv.CoreWebView2.NavigationCompleted -= h; navDone.TrySetResult(e.IsSuccess); };
|
||||
_wv.CoreWebView2.NavigationCompleted += h;
|
||||
_wv.CoreWebView2.Navigate("https://claude.ai");
|
||||
|
||||
// Wait up to 15 s for initial navigation
|
||||
await Task.WhenAny(navDone.Task, Task.Delay(15000));
|
||||
_readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
|
||||
}
|
||||
|
||||
// Run a JS script on the already-loaded claude.ai page.
|
||||
// The script must call window.chrome.webview.postMessage(result).
|
||||
public async Task<string?> RunScriptAsync(string script, int timeoutMs = 10000)
|
||||
{
|
||||
if (!_readyForScript) return null;
|
||||
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||
catch
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
return null;
|
||||
}
|
||||
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(null);
|
||||
});
|
||||
|
||||
return await tcs.Task;
|
||||
}
|
||||
|
||||
// ── One-shot mode (LoginWindow) ───────────────────────────────────────────
|
||||
|
||||
public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
|
||||
{
|
||||
await EnsureInitAsync();
|
||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
|
||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "WebView2"));
|
||||
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
await _wv.EnsureCoreWebView2Async(env);
|
||||
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
var tcs = new TaskCompletionSource<string?>();
|
||||
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
|
||||
handler = async (_, e) =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? navHandler = null;
|
||||
navHandler = async (_, e) =>
|
||||
{
|
||||
_wv.CoreWebView2.NavigationCompleted -= navHandler;
|
||||
_wv.CoreWebView2.NavigationCompleted -= handler;
|
||||
if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
|
||||
try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||
try
|
||||
{
|
||||
var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
|
||||
tcs.TrySetResult(result);
|
||||
}
|
||||
catch { tcs.TrySetResult(null); }
|
||||
};
|
||||
_wv.CoreWebView2.NavigationCompleted += navHandler;
|
||||
|
||||
_wv.CoreWebView2.NavigationCompleted += handler;
|
||||
_wv.CoreWebView2.Navigate(navigateUrl);
|
||||
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(null);
|
||||
});
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
|
||||
|
||||
return await tcs.Task;
|
||||
}
|
||||
|
||||
// Re-navigate to claude.ai with the current session (call after sign-in).
|
||||
public async Task ReloadAsync()
|
||||
{
|
||||
if (_wv.CoreWebView2 == null) { await InitAsync(); return; }
|
||||
_readyForScript = false;
|
||||
var navDone = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? h = null;
|
||||
h = (_, e) => { _wv.CoreWebView2.NavigationCompleted -= h; navDone.TrySetResult(e.IsSuccess); };
|
||||
_wv.CoreWebView2.NavigationCompleted += h;
|
||||
_wv.CoreWebView2.Navigate("https://claude.ai");
|
||||
await Task.WhenAny(navDone.Task, Task.Delay(15000));
|
||||
_readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
|
||||
}
|
||||
|
||||
// ── Shared init ───────────────────────────────────────────────────────────
|
||||
|
||||
private int _initGuard;
|
||||
|
||||
private async Task EnsureInitAsync()
|
||||
{
|
||||
if (_initialized) return;
|
||||
if (Interlocked.Exchange(ref _initGuard, 1) != 0) return;
|
||||
|
||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder: UserDataFolder);
|
||||
await _wv.EnsureCoreWebView2Async(env);
|
||||
_initialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
#ifndef AppVersion
|
||||
#define AppVersion "0.0.1"
|
||||
#endif
|
||||
|
||||
[Setup]
|
||||
AppName=ClaudeChecker
|
||||
AppVersion={#AppVersion}
|
||||
AppPublisher=superdooper86
|
||||
AppPublisherURL=https://git.jamesbone.net/coder/claudechecker
|
||||
AppSupportURL=https://git.jamesbone.net/coder/claudechecker/issues
|
||||
AppUpdatesURL=https://git.jamesbone.net/coder/claudechecker/releases
|
||||
DefaultDirName={localappdata}\ClaudeChecker
|
||||
DefaultGroupName=ClaudeChecker
|
||||
DisableProgramGroupPage=yes
|
||||
PrivilegesRequired=lowest
|
||||
OutputDir=.
|
||||
OutputBaseFilename=ClaudeChecker-Installer
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
WizardStyle=modern
|
||||
UninstallDisplayIcon={app}\ClaudeChecker.exe
|
||||
SourceDir=..
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "publish\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
|
||||
|
||||
[Icons]
|
||||
Name: "{group}\ClaudeChecker"; Filename: "{app}\ClaudeChecker.exe"
|
||||
Name: "{userdesktop}\ClaudeChecker"; Filename: "{app}\ClaudeChecker.exe"; Tasks: desktopicon
|
||||
|
||||
[Run]
|
||||
; Silent install (auto-update): launch automatically
|
||||
Filename: "{app}\ClaudeChecker.exe"; Flags: nowait; Check: WizardSilent
|
||||
; Manual install: show launch checkbox on final page
|
||||
Filename: "{app}\ClaudeChecker.exe"; Description: "{cm:LaunchProgram,ClaudeChecker}"; Flags: nowait postinstall skipifsilent
|
||||
Reference in New Issue
Block a user