agent-cli 0.95.5__tar.gz → 0.95.6__tar.gz

{agent_cli-0.95.5 → agent_cli-0.95.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.95.5
+Version: 0.95.6
 Summary: A suite of AI-powered command-line tools for text correction, audio transcription, and voice assistance.
 Project-URL: Homepage, https://github.com/basnijholt/agent-cli
 Author-email: Bas Nijholt <bas@nijho.lt>

{agent_cli-0.95.5 → agent_cli-0.95.6}/agent_cli/install/service_config.py

@@ -152,6 +152,12 @@ def build_service_command(
 
 def find_uv(extra_paths: list[Path] | None = None) -> Path | None:
     """Find uv executable, preferring system paths over virtualenv."""
+    explicit_uv = os.environ.get("AGENTCLI_UV_PATH")
+    if explicit_uv:
+        explicit_uv_path = Path(explicit_uv).expanduser()
+        if explicit_uv_path.is_file() and os.access(explicit_uv_path, os.X_OK):
+            return explicit_uv_path
+
     bundled_uv = os.environ.get("AGENTCLI_BUNDLED_UV")
     if bundled_uv:
         bundled_uv_path = Path(bundled_uv).expanduser()
@@ -187,7 +193,6 @@ def install_uv() -> tuple[bool, str]:
             ["sh"],  # noqa: S607
             input=result.stdout,
             capture_output=True,
-            text=True,
             check=True,
         )
         return True, "uv installed successfully"

{agent_cli-0.95.5 → agent_cli-0.95.6}/macos/AgentCLI/Sources/AgentCLI/AgentRuntime.swift

@@ -425,8 +425,12 @@ struct AgentRuntime {
         for key in Self.appPrivateEnvironmentKeys {
             environment.removeValue(forKey: key)
         }
+        // Preserve AGENTCLI_UV_PATH so GUI launches can point at a user-managed uv.
         let existingPATH = environment["PATH"] ?? "/usr/bin:/bin:/usr/sbin:/sbin"
-        environment["PATH"] = userInstalledCLIPath(existingPATH: existingPATH)
+        environment["PATH"] = userInstalledCLIPath(
+            existingPATH: existingPATH,
+            loginShellPATH: Self.loginShellPATH(environment: baseEnvironment)
+        )
         return environment
     }
 
@@ -460,15 +464,47 @@ struct AgentRuntime {
         return environment
     }
 
-    private func userInstalledCLIPath(existingPATH: String) -> String {
-        [
-            FileManager.default.homeDirectoryForCurrentUser
+    func userInstalledCLIPath(existingPATH: String, loginShellPATH: String? = nil) -> String {
+        let homeURL = FileManager.default.homeDirectoryForCurrentUser
+        var pathValues: [String] = []
+        if let loginShellPATH {
+            pathValues.append(loginShellPATH)
+        }
+        pathValues.append(contentsOf: [
+            homeURL
                 .appendingPathComponent(".local/bin", isDirectory: true)
                 .path,
+            homeURL
+                .appendingPathComponent(".cargo/bin", isDirectory: true)
+                .path,
             "/opt/homebrew/bin",
             "/usr/local/bin",
             existingPATH
-        ].joined(separator: ":")
+        ])
+
+        var seen = Set<String>()
+        return pathValues
+            .flatMap { $0.split(separator: ":").map(String.init) }
+            .filter { !$0.isEmpty }
+            .filter { seen.insert($0).inserted }
+            .joined(separator: ":")
+    }
+
+    private static func loginShellPATH(environment: [String: String]) -> String? {
+        let shellPath = environment["SHELL"].flatMap { $0.isEmpty ? nil : $0 } ?? "/bin/zsh"
+        guard FileManager.default.isExecutableFile(atPath: shellPath) else { return nil }
+
+        let result = runProcess(
+            executableURL: URL(fileURLWithPath: shellPath),
+            arguments: ["-lic", "printf '%s\\n' \"$PATH\""],
+            environment: environment
+        )
+        guard result.exitCode == 0 else { return nil }
+
+        return result.output
+            .split(separator: "\n")
+            .last
+            .map(String.init)
     }
 
     private func prepareDirectories(for mode: AgentCLIRuntimeMode = .bundled) throws {

{agent_cli-0.95.5 → agent_cli-0.95.6}/macos/AgentCLI/Sources/AgentCLI/ConfigurableHotkeyController.swift

@@ -22,18 +22,50 @@ final class ConfigurableHotkeyController {
         guard !registered else { return }
 
         self.runner = runner
+        registerStandardTranscriptionHotkeys(runner: runner)
         registerFunctionAwareTranscriptionHotkeys(runner: runner)
 
         KeyboardShortcuts.onKeyUp(for: .autocorrect) {
+            guard !ShortcutRecordingState.shared.isRecording else { return }
             Task { @MainActor in runner.run(.autocorrect) }
         }
         KeyboardShortcuts.onKeyUp(for: .voiceEdit) {
+            guard !ShortcutRecordingState.shared.isRecording else { return }
             Task { @MainActor in runner.run(.voiceEdit) }
         }
 
         registered = true
     }
 
+    private func registerStandardTranscriptionHotkeys(runner: AgentCommandRunner) {
+        KeyboardShortcuts.onKeyUp(for: .toggleTranscription) {
+            guard !ShortcutRecordingState.shared.isRecording,
+                  let shortcut = KeyboardShortcuts.getShortcut(for: .toggleTranscription),
+                  !self.usesFunctionShortcut(shortcut) else {
+                return
+            }
+            Task { @MainActor in runner.run(.toggleTranscription) }
+        }
+        KeyboardShortcuts.onKeyDown(for: .holdToTranscribe) {
+            guard !ShortcutRecordingState.shared.isRecording,
+                  let shortcut = KeyboardShortcuts.getShortcut(for: .holdToTranscribe),
+                  !self.usesFunctionShortcut(shortcut) else {
+                return
+            }
+            Task { @MainActor in
+                _ = runner.beginHoldToTranscribe()
+            }
+        }
+        KeyboardShortcuts.onKeyUp(for: .holdToTranscribe) {
+            guard !ShortcutRecordingState.shared.isRecording,
+                  let shortcut = KeyboardShortcuts.getShortcut(for: .holdToTranscribe),
+                  !self.usesFunctionShortcut(shortcut) else {
+                return
+            }
+            Task { @MainActor in runner.endHoldToTranscribe() }
+        }
+    }
+
     private func registerFunctionAwareTranscriptionHotkeys(runner: AgentCommandRunner) {
         let eventMask =
             CGEventMask(1 << CGEventType.keyDown.rawValue) |
@@ -84,6 +116,11 @@ final class ConfigurableHotkeyController {
             break
         }
 
+        if ShortcutRecordingState.shared.isRecording {
+            cancelPendingHoldToTranscribe()
+            return Unmanaged.passUnretained(event)
+        }
+
         if handleToggleTranscriptionShortcut(type: type, event: event) {
             return nil
         }
@@ -99,13 +136,14 @@ final class ConfigurableHotkeyController {
 
     private func handleToggleTranscriptionShortcut(type: CGEventType, event: CGEvent) -> Bool {
         guard let shortcut = KeyboardShortcuts.getShortcut(for: .toggleTranscription),
+              usesFunctionShortcut(shortcut),
               shortcutMatches(type: type, event: event, shortcut: shortcut) else {
             return false
         }
 
         if type == .keyDown {
             cancelPendingHoldToTranscribe()
-            suppressNextFunctionKeyRelease = usesFunctionModifier(shortcut)
+            suppressNextFunctionKeyRelease = usesFunctionShortcut(shortcut)
 
             if !isAutorepeat(event) && !holdToTranscribeIsRecording {
                 Task { @MainActor in
@@ -122,6 +160,7 @@ final class ConfigurableHotkeyController {
             return false
         }
         guard !isBareFunctionShortcut(shortcut),
+              usesFunctionShortcut(shortcut),
               shortcutMatches(type: type, event: event, shortcut: shortcut) else {
             return false
         }
@@ -237,8 +276,8 @@ final class ConfigurableHotkeyController {
         return carbonModifiers(from: event.flags) == shortcut.carbonModifiers
     }
 
-    private func usesFunctionModifier(_ shortcut: KeyboardShortcuts.Shortcut) -> Bool {
-        shortcut.carbonModifiers & kEventKeyModifierFnMask != 0
+    private func usesFunctionShortcut(_ shortcut: KeyboardShortcuts.Shortcut) -> Bool {
+        isBareFunctionShortcut(shortcut) || shortcut.carbonModifiers & kEventKeyModifierFnMask != 0
     }
 
     private func isBareFunctionShortcut(_ shortcut: KeyboardShortcuts.Shortcut) -> Bool {

{agent_cli-0.95.5 → agent_cli-0.95.6}/macos/AgentCLI/Sources/AgentCLI/Shortcuts.swift

@@ -23,6 +23,33 @@ extension KeyboardShortcuts.Name {
     )
 }
 
+final class ShortcutRecordingState {
+    static let shared = ShortcutRecordingState()
+
+    private let lock = NSLock()
+    private var activeRecorderCount = 0
+
+    var isRecording: Bool {
+        lock.lock()
+        defer { lock.unlock() }
+        return activeRecorderCount > 0
+    }
+
+    private init() {}
+
+    func beginRecording() {
+        lock.lock()
+        activeRecorderCount += 1
+        lock.unlock()
+    }
+
+    func endRecording() {
+        lock.lock()
+        activeRecorderCount = max(0, activeRecorderCount - 1)
+        lock.unlock()
+    }
+}
+
 final class ShortcutSummaryState: ObservableObject {
     static let shared = ShortcutSummaryState()
 
@@ -271,6 +298,7 @@ final class ShortcutRecorderButton: NSButton {
 
     private var isRecording = false
     private var eventMonitor: Any?
+    private var pendingFunctionShortcut = false
 
     init(name: KeyboardShortcuts.Name) {
         self.shortcutName = name
@@ -310,6 +338,7 @@ final class ShortcutRecorderButton: NSButton {
         }
 
         isRecording = true
+        ShortcutRecordingState.shared.beginRecording()
         title = "Press shortcut"
         window?.makeFirstResponder(self)
 
@@ -325,11 +354,16 @@ final class ShortcutRecorderButton: NSButton {
     private func capture(_ event: NSEvent) {
         switch Int(event.keyCode) {
         case kVK_Escape:
+            pendingFunctionShortcut = false
             stopRecording()
         case kVK_Delete, kVK_ForwardDelete:
+            pendingFunctionShortcut = false
             KeyboardShortcuts.setShortcut(nil, for: shortcutName)
             stopRecording()
+        case kVK_Function:
+            handleFunctionKeyChange(event)
         default:
+            pendingFunctionShortcut = false
             guard let shortcut = ShortcutDisplay.shortcut(from: event) else {
                 NSSound.beep()
                 return
@@ -339,12 +373,38 @@ final class ShortcutRecorderButton: NSButton {
         }
     }
 
+    private func handleFunctionKeyChange(_ event: NSEvent) {
+        guard event.type == .flagsChanged else {
+            return
+        }
+
+        if event.modifierFlags.contains(.function) {
+            pendingFunctionShortcut = true
+            return
+        }
+
+        if pendingFunctionShortcut {
+            captureBareFunctionShortcut()
+        }
+    }
+
+    private func captureBareFunctionShortcut() {
+        pendingFunctionShortcut = false
+        KeyboardShortcuts.setShortcut(KeyboardShortcuts.Shortcut(.function), for: shortcutName)
+        stopRecording()
+    }
+
     private func stopRecording() {
         if let eventMonitor {
             NSEvent.removeMonitor(eventMonitor)
             self.eventMonitor = nil
         }
+        pendingFunctionShortcut = false
+        let wasRecording = isRecording
         isRecording = false
+        if wasRecording {
+            ShortcutRecordingState.shared.endRecording()
+        }
         updateTitle()
         ShortcutSummaryState.shared.refresh()
     }

{agent_cli-0.95.5 → agent_cli-0.95.6}/macos/AgentCLI/Tests/AgentCLITests/AgentCommandTests.swift

@@ -80,8 +80,10 @@ final class AgentCommandTests: XCTestCase {
                 "AGENTCLI_PACKAGE_SOURCE": "agent-cli",
                 "AGENTCLI_AGENT_CLI": "/tmp/agentcli-test-support/bin/agent-cli",
                 "AGENT_CLI_CONFIG_HOME": "/tmp/agentcli-test-support/config",
+                "AGENTCLI_UV_PATH": "/custom/uv",
                 "UV_TOOL_BIN_DIR": "/tmp/agentcli-test-support/bin",
                 "PATH": "/custom/bin",
+                "SHELL": "/no/such/shell",
             ],
             userDefaults: defaults
         )
@@ -95,9 +97,37 @@ final class AgentCommandTests: XCTestCase {
         XCTAssertNil(runtime.commandEnvironment()["AGENTCLI_PACKAGE_SOURCE"])
         XCTAssertNil(runtime.commandEnvironment()["AGENT_CLI_CONFIG_HOME"])
         XCTAssertNil(runtime.commandEnvironment()["UV_TOOL_BIN_DIR"])
+        XCTAssertEqual(runtime.commandEnvironment()["AGENTCLI_UV_PATH"], "/custom/uv")
         XCTAssertTrue(runtime.commandEnvironment()["PATH"]?.contains("/custom/bin") == true)
     }
 
+    func testUserInstalledCLIPathUsesLoginShellPathAndCommonUvBins() {
+        let defaults = UserDefaults(suiteName: "AgentCLITests.user-runtime-path")!
+        defaults.removePersistentDomain(forName: "AgentCLITests.user-runtime-path")
+        defaults.set(true, forKey: RuntimeSettings.useUserInstalledAgentCLIKey)
+        let runtime = AgentRuntime(
+            environment: [
+                "AGENTCLI_APP_SUPPORT_DIR": "/tmp/agentcli-test-support",
+                "PATH": "/usr/bin:/bin",
+                "SHELL": "/no/such/shell",
+            ],
+            userDefaults: defaults
+        )
+
+        let shellPath = "/Users/example/.dotbins/macos/arm64/bin:/usr/bin"
+        let path = runtime.userInstalledCLIPath(
+            existingPATH: "/usr/bin:/bin",
+            loginShellPATH: shellPath
+        )
+        let components = path.split(separator: ":").map(String.init)
+        let home = FileManager.default.homeDirectoryForCurrentUser.path
+
+        XCTAssertEqual(components.first, "/Users/example/.dotbins/macos/arm64/bin")
+        XCTAssertTrue(components.contains("\(home)/.local/bin"))
+        XCTAssertTrue(components.contains("\(home)/.cargo/bin"))
+        XCTAssertEqual(components.filter { $0 == "/usr/bin" }.count, 1)
+    }
+
     @MainActor
     func testStartupWarmUpBootstrapsTranscriptionOnce() {
         let recorder = BootstrapRecorder()

{agent_cli-0.95.5 → agent_cli-0.95.6}/tests/test_daemon.py

@@ -209,6 +209,27 @@ class TestServiceConfig:
 
         assert result == bundled_uv
 
+    def test_find_uv_prefers_explicit_uv_path(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """Users can override uv discovery with AGENTCLI_UV_PATH."""
+        explicit_uv = tmp_path / "explicit" / "uv"
+        explicit_uv.parent.mkdir()
+        explicit_uv.touch()
+        explicit_uv.chmod(0o755)
+
+        bundled_uv = tmp_path / "bundled" / "uv"
+        bundled_uv.parent.mkdir()
+        bundled_uv.touch()
+        bundled_uv.chmod(0o755)
+
+        monkeypatch.setenv("AGENTCLI_UV_PATH", str(explicit_uv))
+        monkeypatch.setenv("AGENTCLI_BUNDLED_UV", str(bundled_uv))
+
+        result = find_uv()
+
+        assert result == explicit_uv
+
     def test_find_uv_not_found(self) -> None:
         """Test find_uv returns None when uv is not found."""
         # Use paths that definitely don't exist
@@ -225,6 +246,28 @@ class TestServiceConfig:
         assert success is True
         assert "successfully" in msg
 
+    @patch("subprocess.run")
+    def test_install_uv_pipes_binary_curl_output_to_shell(self, mock_run: MagicMock) -> None:
+        """Test uv installer output can be piped to sh as bytes."""
+
+        def fake_run(args: list[str], **kwargs: object) -> subprocess.CompletedProcess[bytes]:
+            if args[0] == "curl":
+                return subprocess.CompletedProcess(args, 0, stdout=b"echo installing uv\n")
+            if args == ["sh"]:
+                if kwargs.get("text") is True and isinstance(kwargs.get("input"), bytes):
+                    msg = "'bytes' object has no attribute 'encode'"
+                    raise AttributeError(msg)
+                return subprocess.CompletedProcess(args, 0, stdout=b"", stderr=b"")
+            msg = f"unexpected command: {args}"
+            raise AssertionError(msg)
+
+        mock_run.side_effect = fake_run
+
+        success, msg = install_uv()
+
+        assert success is True
+        assert "successfully" in msg
+
     @patch("subprocess.run")
     def test_install_uv_failure(self, mock_run: MagicMock) -> None:
         """Test failed uv installation."""

{agent_cli-0.95.5 → agent_cli-0.95.6}/tests/test_macos_app.py

@@ -184,6 +184,9 @@ def test_macos_app_can_use_user_installed_agent_cli() -> None:
     assert "private func userInstalledCLIEnvironment() -> [String: String]" in source
     assert "private static let appPrivateEnvironmentKeys" in source
     assert "environment.removeValue(forKey: key)" in source
+    assert "AGENTCLI_UV_PATH" in source
+    assert "loginShellPATH" in source
+    assert 'appendingPathComponent(".cargo/bin"' in source
     assert "private func bundledCLIEnvironment() -> [String: String]" in source
     assert "AGENT_CLI_CONFIG_HOME" in source
     assert "UV_TOOL_BIN_DIR" in source
@@ -542,9 +545,19 @@ def test_macos_app_uses_fn_aware_event_tap_for_transcription_shortcuts() -> None
     assert "CGEventType.flagsChanged" in source
     assert "CGEventFlags.maskSecondaryFn" in source
     assert "handleFunctionAwareHotkey" in source
-    assert "KeyboardShortcuts.onKeyUp(for: .toggleTranscription)" not in source
-    assert "KeyboardShortcuts.onKeyDown(for: .holdToTranscribe)" not in source
-    assert "KeyboardShortcuts.onKeyUp(for: .holdToTranscribe)" not in source
+    assert "usesFunctionShortcut(shortcut)" in source
+
+
+def test_macos_app_preserves_carbon_transcription_hotkeys_without_fn() -> None:
+    """Non-Fn transcription shortcuts should work without Accessibility event-tap permission."""
+    source = swift_source()
+
+    assert "registerStandardTranscriptionHotkeys(runner: runner)" in source
+    assert "KeyboardShortcuts.onKeyUp(for: .toggleTranscription)" in source
+    assert "KeyboardShortcuts.onKeyDown(for: .holdToTranscribe)" in source
+    assert "KeyboardShortcuts.onKeyUp(for: .holdToTranscribe)" in source
+    assert "guard let shortcut = KeyboardShortcuts.getShortcut(for: .toggleTranscription)" in source
+    assert "!self.usesFunctionShortcut(shortcut)" in source
 
 
 def test_macos_app_disambiguates_fn_hold_from_fn_space_toggle() -> None:
@@ -834,6 +847,28 @@ def test_macos_app_registers_configurable_native_global_hotkeys() -> None:
     assert ".voiceEdit" in source
 
 
+def test_macos_app_pauses_global_hotkeys_while_recording_shortcuts() -> None:
+    """Recording a shortcut should not dispatch any already-configured shortcuts."""
+    source = swift_source()
+
+    assert "ShortcutRecordingState.shared.beginRecording()" in source
+    assert "ShortcutRecordingState.shared.endRecording()" in source
+    assert "guard !ShortcutRecordingState.shared.isRecording else" in source
+    assert "if ShortcutRecordingState.shared.isRecording" in source
+    assert "cancelPendingHoldToTranscribe()" in source
+
+
+def test_macos_app_records_fn_chords_before_bare_fn() -> None:
+    """Fn should not be saved as a shortcut until the recorder knows no chord follows."""
+    source = swift_source()
+
+    assert "pendingFunctionShortcut = true" in source
+    assert "pendingFunctionShortcut = false" in source
+    assert "captureBareFunctionShortcut()" in source
+    assert "event.modifierFlags.contains(.function)" in source
+    assert "case kVK_Function:" in source
+
+
 def test_macos_app_shows_actual_persisted_shortcuts_and_can_reset_them() -> None:
     """The menu should reflect stored shortcuts instead of claiming static defaults."""
     source = swift_source()