Skip to content

Open source Grok Bot alternative, Bring your own agent and subscription: message Claude Code, Codex, Gemini CLI, Cursor, Copilot and 40+ AI agents as bots on your own computer, from iPhone, Mac, Windows, Linux or terminal. Agent-agnostic and free. Also a Muse and Dots alternative. Built in Rust.

simplify model and token logic, remove dead code

libokaia2e575883517
diff --git a/Codync-macOS/Services/SessionStateManager.swift b/Codync-macOS/Services/SessionStateManager.swift
index cbb3a010..f9b3fd6f 100644
--- a/Codync-macOS/Services/SessionStateManager.swift
+++ b/Codync-macOS/Services/SessionStateManager.swift
@@ -98,7 +98,7 @@ final class SessionStateManager: ObservableObject {
projectName: projectName,
gitBranch: gitBranch,
status: status,
- model: formatModel(transcript?.model ?? "Unknown"),
+ model: ModelInfo.parse(transcript?.model ?? "Unknown").displayLabel,
summary: summary,
currentTask: currentTask,
lastEvent: lastEvent,
@@ -248,8 +248,4 @@ final class SessionStateManager: ObservableObject {
}
}
- private func formatModel(_ raw: String) -> String {
- if raw == "Unknown" || raw.contains("synthetic") { return "" }
- return ModelInfo.parse(raw).displayLabel
- }
}
diff --git a/Codync-macOS/Services/TranscriptWatcher.swift b/Codync-macOS/Services/TranscriptWatcher.swift
index 4b384028..65a70912 100644
--- a/Codync-macOS/Services/TranscriptWatcher.swift
+++ b/Codync-macOS/Services/TranscriptWatcher.swift
@@ -233,13 +233,9 @@ final class TranscriptWatcher {
tracker.state.model = model
}
if let usage = message.usage {
- // Total context = input + cache_creation + cache_read
- // (all three contribute to the model's context window usage)
- let inputTokens = usage.inputTokens ?? 0
- let cacheCreation = usage.cacheCreationInputTokens ?? 0
- let cacheRead = usage.cacheReadInputTokens ?? 0
- if inputTokens > 0 {
- tracker.state.latestInputTokens = inputTokens + cacheCreation + cacheRead
+ let contextTokens = usage.totalContextTokens
+ if contextTokens > 0 {
+ tracker.state.latestInputTokens = contextTokens
}
tracker.state.totalOutputTokens += usage.outputTokens ?? 0
}
diff --git a/Codync-macOS/Utilities/JSONLTailReader.swift b/Codync-macOS/Utilities/JSONLTailReader.swift
index 2fecbedb..3d1eb14d 100644
--- a/Codync-macOS/Utilities/JSONLTailReader.swift
+++ b/Codync-macOS/Utilities/JSONLTailReader.swift
@@ -1,5 +1,4 @@
import Foundation
-import CodyncShared
struct JSONLUsage: Codable {
let inputTokens: Int?
@@ -7,6 +6,13 @@ struct JSONLUsage: Codable {
let cacheCreationInputTokens: Int?
let cacheReadInputTokens: Int?
+ /// Total context window usage: input + cache_creation + cache_read
+ var totalContextTokens: Int {
+ let input = inputTokens ?? 0
+ guard input > 0 else { return 0 }
+ return input + (cacheCreationInputTokens ?? 0) + (cacheReadInputTokens ?? 0)
+ }
+
enum CodingKeys: String, CodingKey {
case inputTokens = "input_tokens"
case outputTokens = "output_tokens"
@@ -89,32 +95,8 @@ struct JSONLTranscriptEntry: Codable {
struct JSONLSessionInfo {
var model: String = "Unknown"
- var latestInputTokens: Int = 0 // Latest turn's input tokens (for context%)
- var totalOutputTokens: Int = 0 // Sum of all output tokens (for cost)
-
- var contextPct: Int {
- let contextWindowSize = modelContextSize
- guard contextWindowSize > 0, latestInputTokens > 0 else { return 0 }
- return min(100, (latestInputTokens * 100) / contextWindowSize)
- }
-
- var costUSD: Double {
- let (inputRate, outputRate) = modelPricing
- let inputCost = Double(latestInputTokens) * inputRate / 1_000_000
- let outputCost = Double(totalOutputTokens) * outputRate / 1_000_000
- return inputCost + outputCost
- }
-
- private var modelContextSize: Int {
- ModelInfo.parse(model).contextWindow
- }
-
- private var modelPricing: (Double, Double) {
- if model.contains("opus") { return (15.0, 75.0) }
- if model.contains("sonnet") { return (3.0, 15.0) }
- if model.contains("haiku") { return (0.25, 1.25) }
- return (3.0, 15.0)
- }
+ var latestInputTokens: Int = 0
+ var totalOutputTokens: Int = 0
}
enum JSONLTailReader {
@@ -151,14 +133,10 @@ enum JSONLTailReader {
info.model = model
}
if let usage = message.usage {
- // Context%: total context = input + cache_creation + cache_read
- let inputTokens = usage.inputTokens ?? 0
- let cacheCreation = usage.cacheCreationInputTokens ?? 0
- let cacheRead = usage.cacheReadInputTokens ?? 0
- if inputTokens > 0 {
- info.latestInputTokens = inputTokens + cacheCreation + cacheRead
+ let contextTokens = usage.totalContextTokens
+ if contextTokens > 0 {
+ info.latestInputTokens = contextTokens
}
- // Cost: accumulate output tokens
totalOutputTokens += usage.outputTokens ?? 0
}
}
diff --git a/CodyncShared/Sources/Models/ModelLabel.swift b/CodyncShared/Sources/Models/ModelLabel.swift
index 82021931..c78db0d7 100644
--- a/CodyncShared/Sources/Models/ModelLabel.swift
+++ b/CodyncShared/Sources/Models/ModelLabel.swift
@@ -12,6 +12,11 @@ public struct ModelInfo: Sendable {
public static func parse(_ model: String) -> ModelInfo {
let lower = model.lowercased()
+ // Skip placeholder values
+ if lower == "unknown" || lower.contains("synthetic") {
+ return ModelInfo(family: "", version: "", displayLabel: "", contextWindow: 200_000)
+ }
+
// Detect family
let family: String
if lower.contains("opus") { family = "Opus" }
@@ -86,8 +91,3 @@ public struct ModelInfo: Sendable {
}
}
-/// Simplify Claude model identifiers to display labels.
-/// Shared across main app and widget extension.
-public func modelDisplayLabel(_ model: String) -> String {
- ModelInfo.parse(model).displayLabel
-}
diff --git a/CodyncShared/Tests/ModelsTests.swift b/CodyncShared/Tests/ModelsTests.swift
index 0c8c4e79..07803320 100644
--- a/CodyncShared/Tests/ModelsTests.swift
+++ b/CodyncShared/Tests/ModelsTests.swift
@@ -63,12 +63,6 @@ final class ModelsTests: XCTestCase {
XCTAssertEqual(ModelInfo.parse("claude-opus-4-1-20250805[1m]").contextWindow, 1_000_000)
}
- func testModelDisplayLabelCompat() {
- // Existing function should delegate to ModelInfo
- XCTAssertEqual(modelDisplayLabel("claude-opus-4-6"), "Opus 4.6")
- XCTAssertEqual(modelDisplayLabel("claude-sonnet-4-6"), "Sonnet 4.6")
- }
-
func testTaskStatusDecoding() throws {
let json = #"{"id":"1","content":"test","status":"in_progress"}"#
let task = try JSONDecoder().decode(TaskItem.self, from: json.data(using: .utf8)!)