Merge branch 'master' of ssh://github.com/AvdLee/XCLogParser

AvdLee · AvdLee · commit 23e8073bc9e1 · 2026-01-14T13:38:27.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ jobs:
           args: --strict
 
   macOS:
-    runs-on: macos-13
+    runs-on: macos-26
     env:
-      XCODE_VERSION: ${{ '14.1' }}
+      XCODE_VERSION: ${{ '16.4' }}
     steps:
       - name: Select Xcode
         run: "sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,20 +2,31 @@ name: release_binaries
 on:
   release:
     types: created
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag (e.g., v0.2.40)'
+        required: true
+        type: string
 
 jobs:
   macOS:
     name: Add macOS binaries to release
-    runs-on: macos-13
+    runs-on: macos-26
     env:
-      XCODE_VERSION: ${{ '14.1' }}
+      XCODE_VERSION: ${{ '16.4' }}
     steps:
       - name: Select Xcode
         run: "sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app"
       - name: Checkout
         uses: actions/checkout@v1
       - name: Set tag name
-        run: echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
+        run: |
+          if [ -n "${{ inputs.tag }}" ]; then
+            echo "TAG_NAME=${{ inputs.tag }}" >> $GITHUB_ENV
+          else
+            echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
+          fi
       - name: Build x86_64-apple-macosx
         run: rake 'build[release, x86_64-apple-macosx]'
       - name: Zip x86_64-apple-macosx release
@@ -38,7 +49,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: releases/*
           file_glob: true
-          tag: ${{ github.ref }}
+          tag: ${{ inputs.tag || github.ref }}
           overwrite: true
 
   linux:
@@ -54,7 +65,12 @@ jobs:
       - name: Build
         run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake build[release]
       - name: Set tag name
-        run: echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
+        run: |
+          if [ -n "${{ inputs.tag }}" ]; then
+            echo "TAG_NAME=${{ inputs.tag }}" >> $GITHUB_ENV
+          else
+            echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
+          fi
       - name: Zip release
         uses: montudor/action-zip@v0.1.0
         with:
@@ -67,5 +83,5 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: releases/*
           file_glob: true
-          tag: ${{ github.ref }}
+          tag: ${{ inputs.tag || github.ref }}
           overwrite: true
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ DerivedData/
 
 # Xcode 11
 .swiftpm/
+
+.claude
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM swift:5.5
+FROM swift:6.0
 RUN apt-get update && apt-get install -y zlib1g-dev ruby
 CMD cd xclogparser && swift build
diff --git a/README.md b/README.md
@@ -513,8 +513,8 @@ xclogparser parse --file path/to/log.xcactivitylog --reporter html --output buil
 
 | Environment | Version     |
 | ----------- |-------------|
-| 🛠 Xcode    | 13.0        |
-| 🐦 Language | Swift 5.5   |
+| 🛠 Xcode    | 16.4        |
+| 🐦 Language | Swift 6.0   |
 
 ## Status
 
diff --git a/Rakefile b/Rakefile
@@ -58,7 +58,7 @@ end
 
 desc 'Create a release zip'
 task :archive do
-  Rake::Task["build"].invoke('release', ['macos'], 'true')
+  Rake::Task["build"].invoke('release', nil, ['macos'], 'true')
 end
 
 desc 'Generates a Swift class with the file content from Resources'
diff --git a/Sources/XCLogParser/activityparser/ActivityParser.swift b/Sources/XCLogParser/activityparser/ActivityParser.swift
@@ -96,28 +96,63 @@ public class ActivityParser {
                                      additionalDescription: try parseAsString(token: iterator.next()))
     }
 
-    public func parseIDEActivityLogSection(iterator: inout IndexingIterator<[Token]>)
-        throws -> IDEActivityLogSection {
-        return IDEActivityLogSection(sectionType: Int8(try parseAsInt(token: iterator.next())),
-                                     domainType: try parseAsString(token: iterator.next()),
-                                     title: try parseAsString(token: iterator.next()),
-                                     signature: try parseAsString(token: iterator.next()),
-                                     timeStartedRecording: try parseAsDouble(token: iterator.next()),
-                                     timeStoppedRecording: try parseAsDouble(token: iterator.next()),
-                                     subSections: try parseIDEActivityLogSections(iterator: &iterator),
-                                     text: try parseAsString(token: iterator.next()),
-                                     messages: try parseMessages(iterator: &iterator),
-                                     wasCancelled: try parseBoolean(token: iterator.next()),
-                                     isQuiet: try parseBoolean(token: iterator.next()),
-                                     wasFetchedFromCache: try parseBoolean(token: iterator.next()),
-                                     subtitle: try parseAsString(token: iterator.next()),
-                                     location: try parseDocumentLocation(iterator: &iterator),
-                                     commandDetailDesc: try parseAsString(token: iterator.next()),
-                                     uniqueIdentifier: try parseAsString(token: iterator.next()),
-                                     localizedResultString: try parseAsString(token: iterator.next()),
-                                     xcbuildSignature: try parseAsString(token: iterator.next()),
-                                     attachments: try parseIDEActivityLogSectionAttachments(iterator: &iterator),
-                                     unknown: isCommandLineLog ? Int(try parseAsInt(token: iterator.next())) : 0)
+    // swiftlint:disable:next function_body_length
+    public func parseIDEActivityLogSection(iterator: inout IndexingIterator<[Token]>) throws -> IDEActivityLogSection {
+        let sectionType = Int8(try parseAsInt(token: iterator.next()))
+        let domainType = try parseAsString(token: iterator.next())
+        let title = try parseAsString(token: iterator.next())
+        let signature = try parseAsString(token: iterator.next())
+        let timeStartedRecording = try parseAsDouble(token: iterator.next())
+        let timeStoppedRecording = try parseAsDouble(token: iterator.next())
+        let subSections = try parseIDEActivityLogSections(iterator: &iterator)
+        let text = try parseAsString(token: iterator.next())
+        let messages = try parseMessages(iterator: &iterator)
+        let wasCancelled = try parseBoolean(token: iterator.next())
+        let isQuiet = try parseBoolean(token: iterator.next())
+        let wasFetchedFromCache = try parseBoolean(token: iterator.next())
+        let nextToken = iterator.next()
+        var unknown: Int?
+        let subtitle: String
+        // On Xcode 26.2+, the unknown integer appears before subtitle
+        switch nextToken {
+        case let .some(.int(integer)):
+            unknown = Int(integer)
+            subtitle = try String(parseAsString(token: iterator.next()))
+        default:
+            subtitle = String(try parseAsString(token: nextToken))
+        }
+        let location = try parseDocumentLocation(iterator: &iterator)
+        let commandDetailDesc = try parseAsString(token: iterator.next())
+        let uniqueIdentifier = try parseAsString(token: iterator.next())
+        let localizedResultString = try parseAsString(token: iterator.next())
+        let xcbuildSignature = try parseAsString(token: iterator.next())
+        let attachments = try parseIDEActivityLogSectionAttachments(iterator: &iterator)
+        if unknown == nil {
+            unknown = isCommandLineLog ? Int(try parseAsInt(token: iterator.next())) : 0
+        }
+
+        return IDEActivityLogSection(
+            sectionType: sectionType,
+            domainType: domainType,
+            title: title,
+            signature: signature,
+            timeStartedRecording: timeStartedRecording,
+            timeStoppedRecording: timeStoppedRecording,
+            subSections: subSections,
+            text: text,
+            messages: messages,
+            wasCancelled: wasCancelled,
+            isQuiet: isQuiet,
+            wasFetchedFromCache: wasFetchedFromCache,
+            subtitle: subtitle,
+            location: location,
+            commandDetailDesc: commandDetailDesc,
+            uniqueIdentifier: uniqueIdentifier,
+            localizedResultString: localizedResultString,
+            xcbuildSignature: xcbuildSignature,
+            attachments: attachments,
+            unknown: unknown ?? 0
+        )
     }
 
     public func parseIDEActivityLogUnitTestSection(iterator: inout IndexingIterator<[Token]>)
@@ -389,15 +424,28 @@ public class ActivityParser {
                                                                minorVersion: try parseAsInt(token: iterator.next()),
                                                                metrics: try parseAsJson(token: iterator.next(),
                                                                                          type: jsonType),
+                                                               buildOperationMetrics: nil,
                                                                 backtrace: nil)
                 case .some("TaskBacktrace"):
                     let jsonType = IDEActivityLogSectionAttachment.BuildOperationTaskBacktrace.self
                     return try IDEActivityLogSectionAttachment(identifier: identifier,
                                                                majorVersion: try parseAsInt(token: iterator.next()),
                                                                minorVersion: try parseAsInt(token: iterator.next()),
                                                                metrics: nil,
+                                                               buildOperationMetrics: nil,
                                                                backtrace: try parseAsJson(token: iterator.next(),
                                                                                          type: jsonType))
+                case .some("BuildOperationMetrics"):
+                    let jsonType = IDEActivityLogSectionAttachment.BuildOperationMetrics.self
+                    return try IDEActivityLogSectionAttachment(identifier: identifier,
+                                                               majorVersion: try parseAsInt(token: iterator.next()),
+                                                               minorVersion: try parseAsInt(token: iterator.next()),
+                                                               metrics: nil,
+                                                               buildOperationMetrics: try parseAsJson(
+                                                                   token: iterator.next(),
+                                                                   type: jsonType
+                                                               ),
+                                                               backtrace: nil)
                 default:
                     throw XCLogParserError.parseError("Unexpected attachment identifier \(identifier)")
                 }
diff --git a/Sources/XCLogParser/activityparser/IDEActivityModel.swift b/Sources/XCLogParser/activityparser/IDEActivityModel.swift
@@ -658,19 +658,22 @@ public class IDEActivityLogSectionAttachment: Encodable {
     public let majorVersion: UInt64
     public let minorVersion: UInt64
     public let metrics: BuildOperationTaskMetrics?
+    public let buildOperationMetrics: BuildOperationMetrics?
     public let backtrace: BuildOperationTaskBacktrace?
 
     public init(
         identifier: String,
         majorVersion: UInt64,
         minorVersion: UInt64,
         metrics: BuildOperationTaskMetrics?,
+        buildOperationMetrics: BuildOperationMetrics?,
         backtrace: BuildOperationTaskBacktrace?
     ) throws {
         self.identifier = identifier
         self.majorVersion = majorVersion
         self.minorVersion = minorVersion
         self.metrics = metrics
+        self.buildOperationMetrics = buildOperationMetrics
         self.backtrace = backtrace
     }
 
@@ -769,4 +772,23 @@ public class IDEActivityLogSectionAttachment: Encodable {
     private struct EmptyObject: Codable {
         // Empty struct for objects with no properties
     }
+
+    public struct BuildOperationMetrics: Codable {
+        public let clangCacheHits: Int
+        public let clangCacheMisses: Int
+        public let swiftCacheHits: Int
+        public let swiftCacheMisses: Int
+
+        public init(
+            clangCacheHits: Int,
+            clangCacheMisses: Int,
+            swiftCacheHits: Int,
+            swiftCacheMisses: Int
+        ) {
+            self.clangCacheHits = clangCacheHits
+            self.clangCacheMisses = clangCacheMisses
+            self.swiftCacheHits = swiftCacheHits
+            self.swiftCacheMisses = swiftCacheMisses
+        }
+    }
 }
diff --git a/Sources/XCLogParser/commands/Version.swift b/Sources/XCLogParser/commands/Version.swift
@@ -21,6 +21,6 @@ import Foundation
 
 public struct Version {
 
-    public static let current = "0.2.43"
+    public static let current = "0.2.45"
 
 }
diff --git a/Tests/XCLogParserTests/ActivityParserTests.swift b/Tests/XCLogParserTests/ActivityParserTests.swift
@@ -97,14 +97,20 @@ class ActivityParserTests: XCTestCase {
                          Token.string("501796C4-6BE4-4F80-9F9D-3269617ECC17"),
                          Token.string("localizedResultString"),
                          Token.string("xcbuildSignature"),
-                         Token.list(2),
+                         Token.list(3),
                          Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
                          Token.string("com.apple.dt.ActivityLogSectionAttachment.TaskBacktrace"),
                          Token.int(1),
                          Token.int(0),
                          // swiftlint:disable:next line_length
                          Token.json(#"[{"description":"'Planning Swift module ConcurrencyExtras (arm64)' had never run","category":{"ruleNeverBuilt":{}},"identifier":{"storage":{"task":{"_0":[0,80,50,58,116,97,114,103,101,116,45,67,111,110,99,117,114,114,101,110,99,121,69,120,116,114,97,115,45,101,102,52,50,51,48,52,53,57,52,98,102,56,53,50,102,52,51,56,101,102,55,99,51,97,49,51,54,98,50,99,57,48,100,102,56,55,49,56,97,102,50,98,57,100,51,97,97,99,48,100,48,100,99,97,50,50,98,52,99,50,57,99,50,45,58,66,101,116,97,32,68,101,98,117,103,58,51,99,57,97,99,57,53,50,98,52,99,56,49,100,57,99,99,49,55,100,49,97,102,52,55,49,97,48,52,53,101,56]}}},"frameKind":{"genericTask":{}}}]"#),
                          Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
+                         Token.string("com.apple.dt.ActivityLogSectionAttachment.BuildOperationMetrics"),
+                         Token.int(1),
+                         Token.int(0),
+                         // swiftlint:disable:next line_length
+                         Token.json(#"{"clangCacheHits":0,"clangCacheMisses":2,"swiftCacheHits":0,"swiftCacheMisses":8}"#),
+                         Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
                          Token.string("com.apple.dt.ActivityLogSectionAttachment.TaskMetrics"),
                          Token.int(1),
                          Token.int(0),
@@ -142,6 +148,36 @@ class ActivityParserTests: XCTestCase {
         return startTokens + logMessageTokens + endTokens
     }()
 
+    // Xcode 26.2 format: unknown integer appears before subtitle
+    lazy var IDEActivityLogSectionTokensXcode262: [Token] = {
+        let startTokens = [Token.int(2),
+                           Token.string("com.apple.dt.IDE.BuildLogSection"),
+                           Token.string("Prepare build"),
+                           Token.string("Prepare build"),
+                           Token.double(575479851.278759),
+                           Token.double(575479851.778325),
+                           Token.null,
+                           Token.string("note: Using legacy build system"),
+                           Token.list(1),
+                           Token.className("IDEActivityLogMessage"),
+                           Token.classNameRef("IDEActivityLogMessage"),
+        ]
+        let logMessageTokens = IDEActivityLogMessageTokens
+        let endTokens = [Token.int(1),
+                         Token.int(0),
+                         Token.int(1),
+                         Token.int(42),  // unknown integer before subtitle (Xcode 26.2+)
+                         Token.string("subtitle"),
+                         Token.null,
+                         Token.string("commandDetailDesc"),
+                         Token.string("501796C4-6BE4-4F80-9F9D-3269617ECC17"),
+                         Token.string("localizedResultString"),
+                         Token.string("xcbuildSignature"),
+                         Token.list(0),  // attachments
+        ]
+        return startTokens + logMessageTokens + endTokens
+    }()
+
     let IDEConsoleItemTokens: [Token] = [
         Token.className("IDEConsoleItem"),
         Token.classNameRef("IDEConsoleItem"),
@@ -345,9 +381,11 @@ class ActivityParserTests: XCTestCase {
         XCTAssertEqual("501796C4-6BE4-4F80-9F9D-3269617ECC17", logSection.uniqueIdentifier)
         XCTAssertEqual("localizedResultString", logSection.localizedResultString)
         XCTAssertEqual("xcbuildSignature", logSection.xcbuildSignature)
-        XCTAssertEqual(2, logSection.attachments.count)
+        XCTAssertEqual(3, logSection.attachments.count)
         XCTAssertEqual(logSection.attachments[0].backtrace?.frames.first?.category, .ruleNeverBuilt)
-        XCTAssertEqual(logSection.attachments[1].metrics?.wcDuration, 1)
+        print(logSection.attachments)
+        XCTAssertEqual(logSection.attachments[1].buildOperationMetrics?.clangCacheMisses, 2)
+        XCTAssertEqual(logSection.attachments[2].metrics?.wcDuration, 1)
         XCTAssertEqual(0, logSection.unknown)
     }
 
@@ -379,6 +417,34 @@ class ActivityParserTests: XCTestCase {
         XCTAssertEqual(0, logSection.unknown)
     }
 
+    func testParseIDEActivityLogSectionXcode262() throws {
+        parser.logVersion = 12
+        let tokens = IDEActivityLogSectionTokensXcode262
+        var iterator = tokens.makeIterator()
+        let logSection = try parser.parseIDEActivityLogSection(iterator: &iterator)
+        XCTAssertEqual(2, logSection.sectionType)
+        XCTAssertEqual("com.apple.dt.IDE.BuildLogSection", logSection.domainType)
+        XCTAssertEqual("Prepare build", logSection.title)
+        XCTAssertEqual("Prepare build", logSection.signature)
+        XCTAssertEqual(575479851.278759, logSection.timeStartedRecording)
+        XCTAssertEqual(575479851.778325, logSection.timeStoppedRecording)
+        XCTAssertEqual(0, logSection.subSections.count)
+        XCTAssertEqual("note: Using legacy build system", logSection.text)
+        XCTAssertEqual(1, logSection.messages.count)
+        XCTAssertTrue(logSection.wasCancelled)
+        XCTAssertFalse(logSection.isQuiet)
+        XCTAssertTrue(logSection.wasFetchedFromCache)
+        XCTAssertEqual("subtitle", logSection.subtitle)
+        XCTAssertEqual("", logSection.location.documentURLString)
+        XCTAssertEqual(0, logSection.location.timestamp)
+        XCTAssertEqual("commandDetailDesc", logSection.commandDetailDesc)
+        XCTAssertEqual("501796C4-6BE4-4F80-9F9D-3269617ECC17", logSection.uniqueIdentifier)
+        XCTAssertEqual("localizedResultString", logSection.localizedResultString)
+        XCTAssertEqual("xcbuildSignature", logSection.xcbuildSignature)
+        XCTAssertEqual(0, logSection.attachments.count)
+        XCTAssertEqual(42, logSection.unknown)
+    }
+
     func testParseActivityLog() throws {
         let activityLog = try parser.parseIDEActiviyLogFromTokens(IDEActivityLogTokens)
         XCTAssertEqual(10, activityLog.version)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ import Foundation`
`21`	`21`
`22`	`22`	`public struct Version {`
`23`	`23`
`24`		`- public static let current = "0.2.43"`
	`24`	`+ public static let current = "0.2.45"`
`25`	`25`
`26`	`26`	`}`