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.

Fix: Model display and context window calculation

Tweizh39eeb3c3aa4a
diff --git a/Codync-macOS/Services/SessionScanner.swift b/Codync-macOS/Services/SessionScanner.swift
index 780b02bc..e744decc 100644
--- a/Codync-macOS/Services/SessionScanner.swift
+++ b/Codync-macOS/Services/SessionScanner.swift
@@ -83,9 +83,16 @@ final class SessionScanner: ObservableObject {
return RawSessionFile(pid: file.pid, sessionId: hookSessionId, cwd: file.cwd, startedAt: file.startedAt)
}
- // 2. Original JSONL exists — use it
+ // 2. Original JSONL exists — but verify it's the most recent one.
+ // Claude Code can keep stale PID files pointing to old sessionIds
+ // while actively writing to a newer JSONL.
let originalJsonl = ClaudePaths.jsonlPath(cwd: file.cwd, sessionId: file.sessionId)
if FileManager.default.fileExists(atPath: originalJsonl.path) {
+ let resolved = resolveFromJsonlDirectory(file)
+ if resolved.sessionId != file.sessionId {
+ // A more recently modified JSONL exists — use it instead
+ return resolved
+ }
return file
}
diff --git a/Codync-macOS/Services/SessionStateManager.swift b/Codync-macOS/Services/SessionStateManager.swift
index 5263d161..cbb3a010 100644
--- a/Codync-macOS/Services/SessionStateManager.swift
+++ b/Codync-macOS/Services/SessionStateManager.swift
@@ -249,10 +249,7 @@ final class SessionStateManager: ObservableObject {
}
private func formatModel(_ raw: String) -> String {
- if raw.contains("opus") { return "Opus" }
- if raw.contains("sonnet") { return "Sonnet" }
- if raw.contains("haiku") { return "Haiku" }
if raw == "Unknown" || raw.contains("synthetic") { return "" }
- return raw
+ return ModelInfo.parse(raw).displayLabel
}
}
diff --git a/Codync-macOS/Services/TranscriptWatcher.swift b/Codync-macOS/Services/TranscriptWatcher.swift
index ac854bc9..4b384028 100644
--- a/Codync-macOS/Services/TranscriptWatcher.swift
+++ b/Codync-macOS/Services/TranscriptWatcher.swift
@@ -17,9 +17,12 @@ struct TranscriptState: Sendable {
var firstPrompt: String = ""
var lastPrompt: String = ""
+ /// Context usage as percentage. Window size derived from model ID
+ /// (e.g., 1M for Opus 4.6+, 200k for older models).
var contextPct: Int {
guard latestInputTokens > 0 else { return 0 }
- return min(100, (latestInputTokens * 100) / 200_000)
+ let contextWindow = ModelInfo.parse(model).contextWindow
+ return min(100, (latestInputTokens * 100) / contextWindow)
}
var costUSD: Double {
@@ -230,10 +233,13 @@ 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 + cacheRead
+ tracker.state.latestInputTokens = inputTokens + cacheCreation + cacheRead
}
tracker.state.totalOutputTokens += usage.outputTokens ?? 0
}
diff --git a/Codync-macOS/Utilities/JSONLTailReader.swift b/Codync-macOS/Utilities/JSONLTailReader.swift
index 144990b6..2fecbedb 100644
--- a/Codync-macOS/Utilities/JSONLTailReader.swift
+++ b/Codync-macOS/Utilities/JSONLTailReader.swift
@@ -1,4 +1,5 @@
import Foundation
+import CodyncShared
struct JSONLUsage: Codable {
let inputTokens: Int?
@@ -105,10 +106,7 @@ struct JSONLSessionInfo {
}
private var modelContextSize: Int {
- if model.contains("opus") { return 200_000 }
- if model.contains("sonnet") { return 200_000 }
- if model.contains("haiku") { return 200_000 }
- return 200_000
+ ModelInfo.parse(model).contextWindow
}
private var modelPricing: (Double, Double) {
@@ -127,7 +125,8 @@ enum JSONLTailReader {
let fileSize = fileHandle.seekToEndOfFile()
guard fileSize > 0 else { return [] }
- let chunkSize = min(fileSize, UInt64(lineCount * 500))
+ // ~4KB per line: JSONL entries with tool outputs average 3-5KB
+ let chunkSize = min(fileSize, UInt64(lineCount * 4000))
fileHandle.seek(toFileOffset: fileSize - chunkSize)
guard let data = try? fileHandle.readToEnd(),
@@ -152,11 +151,12 @@ enum JSONLTailReader {
info.model = model
}
if let usage = message.usage {
- // Context%: use latest input tokens (each turn includes full context)
+ // Context%: total context = input + cache_creation + cache_read
let inputTokens = usage.inputTokens ?? 0
- let cacheReadTokens = usage.cacheReadInputTokens ?? 0
+ let cacheCreation = usage.cacheCreationInputTokens ?? 0
+ let cacheRead = usage.cacheReadInputTokens ?? 0
if inputTokens > 0 {
- info.latestInputTokens = inputTokens + cacheReadTokens
+ info.latestInputTokens = inputTokens + cacheCreation + cacheRead
}
// Cost: accumulate output tokens
totalOutputTokens += usage.outputTokens ?? 0
diff --git a/CodyncShared/Sources/Models/ModelLabel.swift b/CodyncShared/Sources/Models/ModelLabel.swift
index 4e4995e2..82021931 100644
--- a/CodyncShared/Sources/Models/ModelLabel.swift
+++ b/CodyncShared/Sources/Models/ModelLabel.swift
@@ -1,11 +1,93 @@
import Foundation
+/// Parsed model metadata from a Claude model ID string.
+public struct ModelInfo: Sendable {
+ public let family: String // "Opus", "Sonnet", "Haiku"
+ public let version: String // "4.6", "3.5", "" if unknown
+ public let displayLabel: String // "Opus 4.6", "Sonnet", etc.
+ public let contextWindow: Int // 1_000_000 or 200_000
+
+ /// Parse a raw Claude model ID into structured info.
+ /// Examples: "claude-opus-4-6", "claude-3-5-sonnet-20241022", "claude-haiku-4-5-20251001"
+ public static func parse(_ model: String) -> ModelInfo {
+ let lower = model.lowercased()
+
+ // Detect family
+ let family: String
+ if lower.contains("opus") { family = "Opus" }
+ else if lower.contains("sonnet") { family = "Sonnet" }
+ else if lower.contains("haiku") { family = "Haiku" }
+ else {
+ return ModelInfo(family: "", version: "", displayLabel: model, contextWindow: 200_000)
+ }
+
+ // Extract version — try new format first: claude-{family}-{major}-{minor}
+ // then old format: claude-{major}-{minor}-{family}
+ let version = extractVersion(from: lower, family: family.lowercased())
+
+ let displayLabel = version.isEmpty ? family : "\(family) \(version)"
+
+ // Context window: 1M for version >= 4.6 or explicit [1m] suffix
+ let has1mSuffix = lower.contains("[1m]")
+ let isLargeContext = has1mSuffix || versionAtLeast(version, major: 4, minor: 6)
+ let contextWindow = isLargeContext ? 1_000_000 : 200_000
+
+ return ModelInfo(
+ family: family,
+ version: version,
+ displayLabel: displayLabel,
+ contextWindow: contextWindow
+ )
+ }
+
+ /// Extract version number from a model ID string.
+ /// Handles both new format (claude-opus-4-6) and legacy format (claude-3-5-sonnet-20241022).
+ private static func extractVersion(from lower: String, family: String) -> String {
+ // New format: claude-{family}-{major}-{minor}[-date]
+ // e.g., "claude-opus-4-6", "claude-haiku-4-5-20251001"
+ if let range = lower.range(of: "\(family)-") {
+ let afterFamily = lower[range.upperBound...]
+ let version = parseVersionDigits(String(afterFamily))
+ if !version.isEmpty { return version }
+ }
+
+ // Old format: claude-{major}-{minor}-{family}[-date]
+ // e.g., "claude-3-5-sonnet-20241022"
+ if let range = lower.range(of: "-\(family)") {
+ let beforeFamily = lower[lower.startIndex..<range.lowerBound]
+ let parts = beforeFamily.split(separator: "-")
+ if parts.count >= 2,
+ let major = Int(parts[parts.count - 2]),
+ let minor = Int(parts[parts.count - 1]) {
+ return "\(major).\(minor)"
+ }
+ }
+
+ return ""
+ }
+
+ /// Parse "4-6..." into "4.6", "4-5-20251001" into "4.5"
+ private static func parseVersionDigits(_ s: String) -> String {
+ let parts = s.split(separator: "-")
+ guard parts.count >= 2,
+ let major = Int(parts[0]) else { return "" }
+ // Minor part may have trailing non-numeric chars (e.g., "6[1m]")
+ let minorStr = String(parts[1]).prefix(while: \.isNumber)
+ guard let minor = Int(minorStr) else { return "" }
+ return "\(major).\(minor)"
+ }
+
+ private static func versionAtLeast(_ version: String, major: Int, minor: Int) -> Bool {
+ let parts = version.split(separator: ".")
+ guard parts.count == 2,
+ let vMajor = Int(parts[0]),
+ let vMinor = Int(parts[1]) else { return false }
+ return vMajor > major || (vMajor == major && vMinor >= minor)
+ }
+}
+
/// Simplify Claude model identifiers to display labels.
/// Shared across main app and widget extension.
public func modelDisplayLabel(_ model: String) -> String {
- let lower = model.lowercased()
- if lower.contains("opus") { return "Opus" }
- if lower.contains("sonnet") { return "Sonnet" }
- if lower.contains("haiku") { return "Haiku" }
- return model
+ ModelInfo.parse(model).displayLabel
}
diff --git a/CodyncShared/Tests/ModelsTests.swift b/CodyncShared/Tests/ModelsTests.swift
index 01ef2c2f..0c8c4e79 100644
--- a/CodyncShared/Tests/ModelsTests.swift
+++ b/CodyncShared/Tests/ModelsTests.swift
@@ -41,6 +41,34 @@ final class ModelsTests: XCTestCase {
XCTAssertEqual(session.truncatedTasks.first?.id, "6")
}
+ // MARK: - ModelInfo
+
+ func testModelDisplayLabel() {
+ XCTAssertEqual(ModelInfo.parse("claude-opus-4-6").displayLabel, "Opus 4.6")
+ XCTAssertEqual(ModelInfo.parse("claude-opus-4-6[1m]").displayLabel, "Opus 4.6")
+ XCTAssertEqual(ModelInfo.parse("claude-sonnet-4-6").displayLabel, "Sonnet 4.6")
+ XCTAssertEqual(ModelInfo.parse("claude-haiku-4-5-20251001").displayLabel, "Haiku 4.5")
+ XCTAssertEqual(ModelInfo.parse("claude-opus-4-1-20250805").displayLabel, "Opus 4.1")
+ XCTAssertEqual(ModelInfo.parse("claude-3-5-sonnet-20241022").displayLabel, "Sonnet 3.5")
+ XCTAssertEqual(ModelInfo.parse("unknown-model").displayLabel, "unknown-model")
+ }
+
+ func testModelContextWindow() {
+ XCTAssertEqual(ModelInfo.parse("claude-opus-4-6").contextWindow, 1_000_000)
+ XCTAssertEqual(ModelInfo.parse("claude-sonnet-4-6").contextWindow, 1_000_000)
+ XCTAssertEqual(ModelInfo.parse("claude-haiku-4-5-20251001").contextWindow, 200_000)
+ XCTAssertEqual(ModelInfo.parse("claude-opus-4-1-20250805").contextWindow, 200_000)
+ XCTAssertEqual(ModelInfo.parse("claude-3-5-sonnet-20241022").contextWindow, 200_000)
+ // [1m] suffix forces 1M even on older models
+ 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)!)