Refine menu bar icon with terminal prompt

Author: kakadais

Resources/Info.plist

@@ -19,9 +19,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.1</string>
+    <string>1.0.2</string>
     <key>CFBundleVersion</key>
-    <string>2</string>
+    <string>3</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

Sources/CodexUsageMenuBar/CodexAppServerClient.swift

@@ -138,7 +138,7 @@ private final class AppServerSession: @unchecked Sendable {
           "clientInfo": [
             "name": "codex_usage_menubar",
             "title": "Codex Usage",
-            "version": "1.0.1",
+            "version": "1.0.2",
           ],
           "capabilities": ["experimentalApi": true],
         ],

Sources/CodexUsageMenuBar/CodexAuthenticationClient.swift

@@ -104,7 +104,7 @@ private final class DeviceLoginSession: @unchecked Sendable {
           "clientInfo": [
             "name": "codex_usage_menubar",
             "title": "Codex Usage",
-            "version": "1.0.1",
+            "version": "1.0.2",
           ],
           "capabilities": ["experimentalApi": true],
         ],

Sources/CodexUsageMenuBar/MenuBarUsageLabel.swift

@@ -17,6 +17,13 @@ enum MenuBarIndicator: Equatable {
     }
   }
 
+  var terminalText: String { "> \(text)" }
+
+  var usageUnderlineRange: NSRange? {
+    guard case .remaining = self else { return nil }
+    return NSRange(location: 2, length: (text as NSString).length)
+  }
+
   var accessibilityLabel: String {
     switch self {
     case .remaining(let percent):
@@ -43,8 +50,8 @@ struct MenuBarUsageLabel: View {
 /// them in one image prevents macOS menu bar label simplification from dropping
 /// the custom outline while preserving the text.
 enum CodexMenuBarIconRenderer {
-  static let size = NSSize(width: 42, height: 22)
-  static let outlineLineWidth: CGFloat = 1.35
+  static let size = NSSize(width: 46, height: 22)
+  static let outlineLineWidth: CGFloat = 1.2
 
   static func image(for indicator: MenuBarIndicator) -> NSImage {
     let image = NSImage(size: size, flipped: false) { rect in
@@ -57,19 +64,12 @@ enum CodexMenuBarIconRenderer {
       NSColor.black.setStroke()
       outline.stroke()
 
-      let paragraph = NSMutableParagraphStyle()
-      paragraph.alignment = .center
-      let attributes: [NSAttributedString.Key: Any] = [
-        .font: NSFont.monospacedDigitSystemFont(ofSize: 9, weight: .bold),
-        .foregroundColor: NSColor.black,
-        .paragraphStyle: paragraph,
-      ]
-      let text = NSAttributedString(string: indicator.text, attributes: attributes)
+      let text = attributedText(for: indicator)
       let textSize = text.size()
       let textRect = NSRect(
-        x: 5,
+        x: 4,
         y: ((rect.height - textSize.height) / 2) + 0.5,
-        width: rect.width - 10,
+        width: rect.width - 8,
         height: textSize.height
       )
       text.draw(in: textRect)
@@ -79,8 +79,31 @@ enum CodexMenuBarIconRenderer {
     return image
   }
 
+  static func attributedText(for indicator: MenuBarIndicator) -> NSAttributedString {
+    let paragraph = NSMutableParagraphStyle()
+    paragraph.alignment = .center
+    let text = NSMutableAttributedString(
+      string: indicator.terminalText,
+      attributes: [
+        .font: NSFont.monospacedSystemFont(ofSize: 8.5, weight: .semibold),
+        .foregroundColor: NSColor.black,
+        .paragraphStyle: paragraph,
+      ]
+    )
+    if let range = indicator.usageUnderlineRange {
+      text.addAttributes(
+        [
+          .underlineStyle: NSUnderlineStyle.single.rawValue,
+          .underlineColor: NSColor.black,
+        ],
+        range: range
+      )
+    }
+    return text
+  }
+
   static func outlinePath(in rect: NSRect) -> NSBezierPath {
-    let drawingRect = rect.insetBy(dx: 2.5, dy: 2.5)
+    let drawingRect = rect.insetBy(dx: 2, dy: 2)
     let center = CGPoint(x: drawingRect.midX, y: drawingRect.midY)
     let radiusX = drawingRect.width / 2
     let radiusY = drawingRect.height / 2
@@ -89,7 +112,7 @@ enum CodexMenuBarIconRenderer {
 
     for index in 0...sampleCount {
       let angle = (Double(index) / Double(sampleCount)) * 2 * Double.pi
-      let lobe = 1 + 0.07 * cos(8 * angle)
+      let lobe = 1 + 0.04 * cos(8 * angle)
       let point = CGPoint(
         x: center.x + CGFloat(cos(angle) * lobe) * radiusX,
         y: center.y + CGFloat(sin(angle) * lobe) * radiusY

Tests/CodexUsageMenuBarTests/MenuBarUsageLabelTests.swift

@@ -10,10 +10,24 @@ struct MenuBarUsageLabelTests {
   @Test("Shows the remaining percentage inside the outline")
   func remainingPercentageText() {
     #expect(MenuBarIndicator.remaining(18).text == "18%")
+    #expect(MenuBarIndicator.remaining(18).terminalText == "> 18%")
     #expect(MenuBarIndicator.remaining(100).text == "100%")
     #expect(MenuBarIndicator.remaining(-2).text == "0%")
   }
 
+  @Test("Underlines only the remaining usage value after the terminal prompt")
+  func terminalPromptUnderline() throws {
+    let text = CodexMenuBarIconRenderer.attributedText(for: .remaining(18))
+    let underlineRange = try #require(MenuBarIndicator.remaining(18).usageUnderlineRange)
+
+    #expect(text.string == "> 18%")
+    #expect(
+      text.attribute(.underlineStyle, at: underlineRange.location, effectiveRange: nil) as? Int
+        == NSUnderlineStyle.single.rawValue
+    )
+    #expect(text.attribute(.underlineStyle, at: 0, effectiveRange: nil) == nil)
+  }
+
   @Test("Renders the compact Codex-inspired indicator")
   func rendersIndicator() throws {
     let nativeImage = CodexMenuBarIconRenderer.image(for: .remaining(18))
@@ -28,7 +42,7 @@ struct MenuBarUsageLabelTests {
     renderer.scale = 2
 
     let image = try #require(renderer.nsImage)
-    #expect(image.size.width == 62)
+    #expect(image.size.width == 66)
     #expect(image.size.height == 42)
 
     if let outputPath = ProcessInfo.processInfo.environment["CODEX_ICON_PREVIEW_PATH"],
@@ -42,7 +56,7 @@ struct MenuBarUsageLabelTests {
 
   @Test("Keeps the cloud outline inside its menu bar bounds")
   func outlineBounds() {
-    let target = CGRect(x: 0, y: 0, width: 42, height: 22)
+    let target = CGRect(origin: .zero, size: CodexMenuBarIconRenderer.size)
     let bounds = CodexMenuBarIconRenderer.outlinePath(in: target).bounds
     let strokeInset = CodexMenuBarIconRenderer.outlineLineWidth / 2