bug fixes

ClayWarren · ClayWarren · commit c3bc61a8f0ce · 2025-08-09T23:31:40.000-05:00
diff --git a/Package.swift b/Package.swift
@@ -3,18 +3,31 @@ import PackageDescription
 
 let package = Package(
     name: "VibeCommit",
-    platforms: [.macOS(.v14)],  // macOS 14+ for stability
+    platforms: [.macOS(.v14)],
     products: [
         .executable(name: "VibeCommit", targets: ["VibeCommit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),  // Compatible with 6.2
+        .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
     ],
     targets: [
         .executableTarget(
             name: "VibeCommit",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ],
+            resources: [
+                .copy("summarize.py")
+            ],
+            linkerSettings: [
+                .linkedFramework("AVFoundation"),
+                .linkedFramework("Speech"),
+                .unsafeFlags([
+                    "-Xlinker", "-sectcreate",
+                    "-Xlinker", "__TEXT",
+                    "-Xlinker", "__info_plist",
+                    "-Xlinker", "Sources/VibeCommit/Info.plist"
+                ])
             ]
         ),
     ]
diff --git a/Sources/VibeCommit/Info.plist b/Sources/VibeCommit/Info.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>VibeCommit needs microphone access for voice dictation to input vibes.</string>
+    <key>NSSpeechRecognitionUsageDescription</key>
+    <string>VibeCommit needs speech recognition access to transcribe your voice input for vibes.</string>
+</dict>
+</plist>
diff --git a/Sources/VibeCommit/VibeCommit.swift b/Sources/VibeCommit/VibeCommit.swift
@@ -1,5 +1,28 @@
 import Foundation
 import ArgumentParser
+import AVFoundation
+import AVFAudio
+import Speech
+
+enum VibeCommitError: Error, LocalizedError {
+    case fileNotFound(String)
+    case aiExecutionFailed(Int, String)
+    case invalidOutput
+    case permissionDenied(String)
+
+    var errorDescription: String? {
+        switch self {
+        case .fileNotFound(let details):
+            return "File not found: \(details)"
+        case .aiExecutionFailed(let code, let details):
+            return "AI execution failed with code \(code): \(details)"
+        case .invalidOutput:
+            return "Invalid AI output"
+        case .permissionDenied(let details):
+            return "Permission denied: \(details)"
+        }
+    }
+}
 
 @main
 struct VibeCommit: ParsableCommand {
@@ -13,17 +36,44 @@ struct VibeCommit: ParsableCommand {
     @Flag(name: .shortAndLong, help: "Automatically commit using the generated summary.")
     var autoCommit: Bool = false
 
+    @Flag(name: .shortAndLong, help: "Use mock summary instead of real AI (for testing).")
+    var mock: Bool = false
+
+    @Flag(name: .shortAndLong, help: "Use voice dictation to input a vibe for the summary.")
+    var voice: Bool = false
+
     mutating func run() throws {
         guard isGitRepo() else {
             print("Error: Not a Git repository.")
             return
         }
 
         if summarize {
-            let commits = try getGitLog()
-            let summary = try aiSummarize(commits: commits)
-            print("AI Summary:\n\(summary)")
-            try vibeCheck(summary: summary)
+            do {
+                let commits = try getGitLog()
+                var vibe = ""
+                if voice {
+                    let analyzer = SpeechAnalyzer()
+                    vibe = try analyzer.dictate()
+                    print("Transcribed vibe: \(vibe)")
+                }
+                let summary = try aiSummarize(commits: commits, vibe: vibe)
+                print("AI Summary:\n\(summary)")
+                try vibeCheck(summary: summary)
+            } catch let error as VibeCommitError {
+                print("Error: \(error.localizedDescription)")
+                switch error {
+                case .fileNotFound(let details),
+                     .permissionDenied(let details):
+                    print("Details: \(details)")
+                case .aiExecutionFailed(_, let details):
+                    print("Details: \(details)")
+                case .invalidOutput:
+                    print("Details: Invalid AI output.")
+                }
+            } catch {
+                print("Unexpected error: \(error.localizedDescription)")
+            }
         } else {
             print("Run with --summarize to get started.")
         }
@@ -49,12 +99,23 @@ struct VibeCommit: ParsableCommand {
         return output
     }
 
-    // AI summary: Bridge to Python/HF for gpt-oss-20b
-    func aiSummarize(commits: String) throws -> String {
-        let scriptPath = "summarize.py"  // Assume in project root or adjust path
+    // AI summary: Bridge to Python/HF for gpt-oss-20b, or mock, with optional vibe
+    func aiSummarize(commits: String, vibe: String) throws -> String {
+        if mock {
+            return "Mock summary from commits with vibe '\(vibe)': Enhanced features and fixed bugs based on recent changes. (Commits: \(commits.prefix(50))...)"
+        }
+
+        guard let scriptURL = Bundle.main.url(forResource: "summarize", withExtension: "py") else {
+            throw VibeCommitError.fileNotFound("summarize.py not found in bundle. Check if it's in Sources/VibeCommit/ and Package.swift has .copy(\"summarize.py\"). Run rm -rf .build && swift build to clean.")
+        }
+        let scriptPath = scriptURL.path
+        print("Debug: Using script at \(scriptPath)")  // For debugging path
+
+        let prompt = vibe.isEmpty ? commits : "\(commits)\nVibe: \(vibe)"
+
         let process = Process()
         process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
-        process.arguments = ["python", scriptPath]
+        process.arguments = ["python3", scriptPath]  // Use python3 for macOS compatibility
 
         let inputPipe = Pipe()
         process.standardInput = inputPipe
@@ -65,8 +126,8 @@ struct VibeCommit: ParsableCommand {
 
         try process.run()
 
-        // Write commits to input
-        if let data = commits.data(using: .utf8) {
+        // Write prompt to input
+        if let data = prompt.data(using: .utf8) {
             try inputPipe.fileHandleForWriting.write(contentsOf: data)
         }
         try inputPipe.fileHandleForWriting.close()
@@ -76,12 +137,12 @@ struct VibeCommit: ParsableCommand {
         if process.terminationStatus != 0 {
             let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
             let errorOutput = String(data: errorData, encoding: .utf8) ?? "Unknown error"
-            throw NSError(domain: "AIError", code: Int(process.terminationStatus), userInfo: ["error": errorOutput])
+            throw VibeCommitError.aiExecutionFailed(Int(process.terminationStatus), errorOutput)
         }
 
         let data = outputPipe.fileHandleForReading.readDataToEndOfFile()
         guard let summary = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) else {
-            throw NSError(domain: "AIError", code: 1, userInfo: nil)
+            throw VibeCommitError.invalidOutput
         }
         return summary
     }
@@ -96,10 +157,11 @@ struct VibeCommit: ParsableCommand {
         print("Vibe check passed: \(summary)")
 
         if autoCommit {
-            let confirm = readLine(prompt: "Auto-commit with this summary? (y/n): ")
-            if confirm?.lowercased() == "y" {
-                try shell("git add .")
-                try shell("git commit -m '\(summary)'")
+            print("Auto-commit with this summary? (y/n): ", terminator: "")
+            let confirm = Swift.readLine()?.lowercased()
+            if confirm == "y" {
+                _ = try shell("git add .")
+                _ = try shell("git commit -m '\(summary)'")
                 print("Committed successfully!")
             } else {
                 print("Auto-commit canceled.")
@@ -128,10 +190,125 @@ struct VibeCommit: ParsableCommand {
     }
 }
 
-// Extension for readLine with prompt (for confirmation)
-extension String {
-    static func readLine(prompt: String) -> String? {
-        print(prompt, terminator: "")
-        return Swift.readLine()
+// SpeechAnalyzer for voice dictation (adapted from Apple docs)
+class SpeechAnalyzer: NSObject, SFSpeechRecognizerDelegate {
+    private let audioEngine = AVAudioEngine()
+    private var inputNode: AVAudioInputNode?
+    private var recognitionRequest: SFSpeechAudioBufferRecognitionRequest?
+    private var recognitionTask: SFSpeechRecognitionTask?
+    private var speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US")) // Change locale as needed
+    private var transcribedText = ""
+
+    override init() {
+        super.init()
+        speechRecognizer?.delegate = self
+    }
+
+    func dictate() throws -> String {
+        try requestSpeechPermissions()
+        try requestMicPermissions()
+        startRecognition()
+        print("Listening for voice... Press Enter to stop.")
+
+        _ = readLine()
+        stopRecognition()
+
+        return transcribedText
+    }
+
+    private func requestSpeechPermissions() throws {
+        var permissionGranted = false
+        var done = false
+
+        SFSpeechRecognizer.requestAuthorization { status in
+            permissionGranted = status == .authorized
+            done = true
+        }
+
+        let timeoutDate = Date(timeIntervalSinceNow: 10.0) // Prevent infinite loop
+        while !done && Date() < timeoutDate {
+            RunLoop.current.run(mode: .default, before: Date(timeIntervalSinceNow: 0.1))
+        }
+
+        if !done {
+            throw VibeCommitError.permissionDenied("Speech recognition permission request timed out.")
+        }
+
+        if !permissionGranted {
+            throw VibeCommitError.permissionDenied("Speech recognition permission denied.")
+        }
+    }
+
+    private func requestMicPermissions() throws {
+        var permissionGranted = false
+        var done = false
+
+        AVAudioApplication.requestRecordPermission { granted in
+            permissionGranted = granted
+            done = true
+        }
+
+        let timeoutDate = Date(timeIntervalSinceNow: 10.0) // Prevent infinite loop
+        while !done && Date() < timeoutDate {
+            RunLoop.current.run(mode: .default, before: Date(timeIntervalSinceNow: 0.1))
+        }
+
+        if !done {
+            throw VibeCommitError.permissionDenied("Microphone permission request timed out.")
+        }
+
+        if !permissionGranted {
+            throw VibeCommitError.permissionDenied("Microphone permission denied.")
+        }
+    }
+
+    private func startRecognition() {
+        inputNode = audioEngine.inputNode
+        recognitionRequest = SFSpeechAudioBufferRecognitionRequest()
+        recognitionRequest?.shouldReportPartialResults = true // For live updates
+
+        guard let recognitionRequest = recognitionRequest, let inputNode = inputNode else {
+            print("Unable to start recognition.")
+            return
+        }
+
+        recognitionTask = speechRecognizer?.recognitionTask(with: recognitionRequest) { result, error in
+            if let result = result {
+                self.transcribedText = result.bestTranscription.formattedString
+                print("Live: \(self.transcribedText)") // Print live updates
+            }
+            if error != nil || result?.isFinal == true {
+                self.stopRecognition()
+            }
+        }
+
+        let recordingFormat = inputNode.outputFormat(forBus: 0)
+        inputNode.installTap(onBus: 0, bufferSize: 1024, format: recordingFormat) { buffer, time in
+            recognitionRequest.append(buffer)
+        }
+
+        audioEngine.prepare()
+
+        do {
+            try audioEngine.start()
+        } catch {
+            print("Couldn't start audio engine: \(error.localizedDescription)")
+            print("If microphone access denied, grant permission in System Settings > Privacy & Security > Microphone for Terminal/Xcode.")
+            stopRecognition()
+        }
+    }
+
+    private func stopRecognition() {
+        audioEngine.stop()
+        inputNode?.removeTap(onBus: 0)
+        recognitionRequest?.endAudio()
+        recognitionTask?.cancel()
+    }
+
+    func speechRecognizer(_ speechRecognizer: SFSpeechRecognizer, availabilityDidChange available: Bool) {
+        if !available {
+            print("Speech recognition unavailable.")
+            stopRecognition()
+        }
     }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+transformers
+torch
