Fix Claude widget freeze after sleep

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Build and Release
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: macos-15
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build Release
+        run: |
+          xcodebuild -scheme Barik -configuration Release \
+            -derivedDataPath build \
+            CODE_SIGNING_ALLOWED=NO
+
+      - name: Ad-hoc sign app
+        run: |
+          codesign --force --deep --sign - \
+            --entitlements Barik/Barik.entitlements \
+            --options runtime \
+            build/Build/Products/Release/Barik.app
+
+      - name: Zip app
+        run: ditto -c -k --keepParent build/Build/Products/Release/Barik.app Barik.zip
+
+      - name: Get version
+        id: version
+        run: |
+          VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" build/Build/Products/Release/Barik.app/Contents/Info.plist)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Update latest release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release delete latest --yes --cleanup-tag 2>/dev/null || true
+          gh release create latest Barik.zip \
+            --title "Latest Build (v${{ steps.version.outputs.version }})" \
+            --notes "Automated build from \`main\` branch ($(date -u +%Y-%m-%d)).
+
+          Built from commit ${{ github.sha }}." \
+            --target ${{ github.sha }} \
+            --prerelease

Barik/AppDelegate.swift

@@ -3,6 +3,8 @@ import SwiftUI
 final class AppDelegate: NSObject, NSApplicationDelegate {
     private var backgroundPanel: NSPanel?
     private var menuBarPanel: NSPanel?
+    private let contextMenu = MenuBarContextMenu()
+    private var eventMonitor: Any?
 
     func applicationDidFinishLaunching(_ notification: Notification) {
         if let error = ConfigManager.shared.initError {
@@ -21,6 +23,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         MenuBarPopup.setup()
         setupPanels()
+        setupContextMenuMonitor()
 
         NotificationCenter.default.addObserver(
             self,
@@ -72,6 +75,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         panel = newPanel
     }
 
+    private func setupContextMenuMonitor() {
+        eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .rightMouseDown) {
+            [weak self] event in
+            guard let self,
+                  let panel = self.menuBarPanel,
+                  event.window === panel,
+                  let contentView = panel.contentView
+            else {
+                return event
+            }
+            let locationInView = contentView.convert(event.locationInWindow, from: nil)
+            self.contextMenu.popUp(
+                positioning: nil, at: locationInView, in: contentView)
+            return nil
+        }
+    }
+
     private func showFatalConfigError(message: String) {
         let alert = NSAlert()
         alert.messageText = "Configuration Error"

Barik/Barik.entitlements

@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.security.personal-information.location</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

Barik/Config/ConfigManager.swift

@@ -11,6 +11,7 @@ final class ConfigManager: ObservableObject {
     private var fileWatchSource: DispatchSourceFileSystemObject?
     private var fileDescriptor: CInt = -1
     private var configFilePath: String?
+    private var suppressNextReload = false
 
     private init() {
         loadOrCreateConfigIfNeeded()
@@ -72,8 +73,11 @@ final class ConfigManager: ObservableObject {
             displayed = [ # widgets on menu bar
                 "default.spaces",
                 "spacer",
+                "default.claude-usage",
+                "default.nowplaying",
                 "default.network",
                 "default.battery",
+                "default.countdown",
                 "divider",
                 # { "default.time" = { time-zone = "America/Los_Angeles", format = "E d, hh:mm" } },
                 "default.time"
@@ -84,6 +88,11 @@ final class ConfigManager: ObservableObject {
             window.show-title = true
             window.title.max-length = 50
 
+            [widgets.default.claude-usage]
+            plan = "pro"
+            five-hour-limit = 80
+            weekly-limit = 500
+
             [widgets.default.battery]
             show-percentage = true
             warning-level = 30
@@ -116,6 +125,10 @@ final class ConfigManager: ObservableObject {
             guard let self = self, let path = self.configFilePath else {
                 return
             }
+            if self.suppressNextReload {
+                self.suppressNextReload = false
+                return
+            }
             self.parseConfigFile(at: path)
         }
         fileWatchSource?.setCancelHandler { [weak self] in
@@ -134,7 +147,26 @@ final class ConfigManager: ObservableObject {
         do {
             let currentText = try String(contentsOfFile: path, encoding: .utf8)
             let updatedText = updatedTOMLString(
-                original: currentText, key: key, newValue: newValue)
+                original: currentText, key: key, newValue: newValue, quoteValue: true)
+            try updatedText.write(
+                toFile: path, atomically: false, encoding: .utf8)
+            DispatchQueue.main.async {
+                self.parseConfigFile(at: path)
+            }
+        } catch {
+            print("Error updating config:", error)
+        }
+    }
+
+    func updateConfigValueRaw(key: String, newValue: String) {
+        guard let path = configFilePath else {
+            print("Config file path is not set")
+            return
+        }
+        do {
+            let currentText = try String(contentsOfFile: path, encoding: .utf8)
+            let updatedText = updatedTOMLString(
+                original: currentText, key: key, newValue: newValue, quoteValue: false)
             try updatedText.write(
                 toFile: path, atomically: false, encoding: .utf8)
             DispatchQueue.main.async {
@@ -146,8 +178,9 @@ final class ConfigManager: ObservableObject {
     }
 
     private func updatedTOMLString(
-        original: String, key: String, newValue: String
+        original: String, key: String, newValue: String, quoteValue: Bool = true
     ) -> String {
+        let formattedValue = quoteValue ? "\"\(newValue)\"" : newValue
         if key.contains(".") {
             let components = key.split(separator: ".").map(String.init)
             guard components.count >= 2 else {
@@ -168,7 +201,7 @@ final class ConfigManager: ObservableObject {
                 let trimmed = line.trimmingCharacters(in: .whitespaces)
                 if trimmed.hasPrefix("[") && trimmed.hasSuffix("]") {
                     if insideTargetTable && !updatedKey {
-                        newLines.append("\(actualKey) = \"\(newValue)\"")
+                        newLines.append("\(actualKey) = \(formattedValue)")
                         updatedKey = true
                     }
                     if trimmed == tableHeader {
@@ -185,7 +218,7 @@ final class ConfigManager: ObservableObject {
                         if line.range(of: pattern, options: .regularExpression)
                             != nil
                         {
-                            newLines.append("\(actualKey) = \"\(newValue)\"")
+                            newLines.append("\(actualKey) = \(formattedValue)")
                             updatedKey = true
                             continue
                         }
@@ -195,13 +228,13 @@ final class ConfigManager: ObservableObject {
             }
 
             if foundTable && insideTargetTable && !updatedKey {
-                newLines.append("\(actualKey) = \"\(newValue)\"")
+                newLines.append("\(actualKey) = \(formattedValue)")
             }
 
             if !foundTable {
                 newLines.append("")
                 newLines.append("[\(tablePath)]")
-                newLines.append("\(actualKey) = \"\(newValue)\"")
+                newLines.append("\(actualKey) = \(formattedValue)")
             }
             return newLines.joined(separator: "\n")
         } else {
@@ -217,20 +250,108 @@ final class ConfigManager: ObservableObject {
                     if line.range(of: pattern, options: .regularExpression)
                         != nil
                     {
-                        newLines.append("\(key) = \"\(newValue)\"")
+                        newLines.append("\(key) = \(formattedValue)")
                         updatedAtLeastOnce = true
                         continue
                     }
                 }
                 newLines.append(line)
             }
             if !updatedAtLeastOnce {
-                newLines.append("\(key) = \"\(newValue)\"")
+                newLines.append("\(key) = \(formattedValue)")
             }
             return newLines.joined(separator: "\n")
         }
     }
 
+    func updateDisplayedWidgets(_ items: [TomlWidgetItem]) {
+        guard let path = configFilePath else {
+            print("Config file path is not set")
+            return
+        }
+        do {
+            let currentText = try String(contentsOfFile: path, encoding: .utf8)
+            let updatedText = replaceDisplayedArray(in: currentText, with: items)
+            suppressNextReload = true
+            try updatedText.write(toFile: path, atomically: true, encoding: .utf8)
+            DispatchQueue.main.async {
+                self.parseConfigFile(at: path)
+            }
+        } catch {
+            suppressNextReload = false
+            print("Error updating displayed widgets:", error)
+        }
+    }
+
+    private func replaceDisplayedArray(in original: String, with items: [TomlWidgetItem]) -> String {
+        let lines = original.components(separatedBy: "\n")
+        var inWidgetsSection = false
+        var arrayStartLine: Int?
+        var arrayEndLine: Int?
+        var bracketDepth = 0
+        var foundStart = false
+
+        for (lineIndex, line) in lines.enumerated() {
+            let trimmed = line.trimmingCharacters(in: .whitespaces)
+
+            if trimmed.hasPrefix("[") && trimmed.hasSuffix("]") {
+                inWidgetsSection = (trimmed == "[widgets]")
+                if foundStart && !inWidgetsSection {
+                    break
+                }
+                continue
+            }
+
+            if inWidgetsSection && !foundStart {
+                if trimmed.hasPrefix("displayed") && trimmed.contains("=") {
+                    arrayStartLine = lineIndex
+                    foundStart = true
+                    for char in trimmed {
+                        if char == Character("[") { bracketDepth += 1 }
+                        if char == Character("]") { bracketDepth -= 1 }
+                    }
+                    if bracketDepth == 0 {
+                        arrayEndLine = lineIndex
+                        break
+                    }
+                }
+            } else if foundStart && arrayEndLine == nil {
+                for char in trimmed {
+                    if char == Character("[") { bracketDepth += 1 }
+                    if char == Character("]") { bracketDepth -= 1 }
+                }
+                if bracketDepth == 0 {
+                    arrayEndLine = lineIndex
+                    break
+                }
+            }
+        }
+
+        guard let start = arrayStartLine, let end = arrayEndLine else {
+            return original
+        }
+
+        let newArrayLines = "displayed = " + items.toTomlDisplayedArray()
+
+        var newLines = Array(lines[0..<start])
+        newLines.append(newArrayLines)
+        if end + 1 < lines.count {
+            newLines.append(contentsOf: lines[(end + 1)...])
+        }
+
+        return newLines.joined(separator: "\n")
+    }
+
+    func toggleWidget(_ widgetId: String) {
+        var items = config.rootToml.widgets.displayed
+        if let index = items.firstIndex(where: { $0.id == widgetId }) {
+            items.remove(at: index)
+        } else {
+            items.append(TomlWidgetItem(id: widgetId, inlineParams: [:]))
+        }
+        updateDisplayedWidgets(items)
+    }
+
     func globalWidgetConfig(for widgetId: String) -> ConfigData {
         config.rootToml.widgets.config(for: widgetId) ?? [:]
     }