let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-13 11:04:31 +00:00
parent 86d786cbc0 ec653b7b80
commit c48681b2f0
12 changed files with 1832 additions and 1773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift
View File

@@ -50,7 +50,7 @@ final class BridgeDiscoveryModel: ObservableObject {
self.bridges = results.compactMap { result -> DiscoveredBridge? in
switch result.endpoint {
case let .service(name, _, _, _):
let decodedName = BonjourEscapeDecoder.decode(name)
let decodedName = BonjourEscapes.decode(name)
return DiscoveredBridge(
name: decodedName,
endpoint: result.endpoint,
@@ -75,6 +75,6 @@ final class BridgeDiscoveryModel: ObservableObject {
}
private static func prettyEndpointDebugID(_ endpoint: NWEndpoint) -> String {
BonjourEscapeDecoder.decode(String(describing: endpoint))
BonjourEscapes.decode(String(describing: endpoint))
}
}

4
apps/ios/Sources/Bridge/BridgeSession.swift
View File

@@ -27,9 +27,9 @@ actor BridgeSession {
private static func prettyRemoteEndpoint(_ endpoint: NWEndpoint) -> String? {
switch endpoint {
case let .hostPort(host, port):
return "\(host):\(port)".replacingOccurrences(of: "::ffff:", with: "")
"\(host):\(port)".replacingOccurrences(of: "::ffff:", with: "")
default:
return String(describing: endpoint)
String(describing: endpoint)
}
}

9
apps/ios/Sources/Model/NodeAppModel.swift
View File

@@ -58,7 +58,7 @@ final class NodeAppModel: ObservableObject {
self.bridgeStatusText = "Connecting…"
self.bridgeServerName = nil
self.bridgeRemoteAddress = nil
self.connectedBridgeDebugID = BonjourEscapeDecoder.decode(String(describing: endpoint))
self.connectedBridgeDebugID = BonjourEscapes.decode(String(describing: endpoint))
self.bridgeTask = Task {
do {
@@ -71,13 +71,14 @@ final class NodeAppModel: ObservableObject {
platform: platform,
version: version),
onConnected: { [weak self] serverName in
guard let self else { return }
await MainActor.run {
self?.bridgeStatusText = "Connected"
self?.bridgeServerName = serverName
self.bridgeStatusText = "Connected"
self.bridgeServerName = serverName
}
if let addr = await self.bridge.currentRemoteAddress() {
await MainActor.run {
self?.bridgeRemoteAddress = addr
self.bridgeRemoteAddress = addr
}
}
},

4
apps/ios/Sources/Voice/VoiceWakeManager.swift
View File

@@ -28,8 +28,8 @@ private final class AudioBufferQueue: @unchecked Sendable {
}
}
private extension AVAudioPCMBuffer {
func deepCopy() -> AVAudioPCMBuffer? {
extension AVAudioPCMBuffer {
fileprivate func deepCopy() -> AVAudioPCMBuffer? {
let format = self.format
let frameLength = self.frameLength
guard let copy = AVAudioPCMBuffer(pcmFormat: format, frameCapacity: frameLength) else {

8
apps/macos/Sources/Clawdis/GeneralSettings.swift
View File

@@ -125,9 +125,6 @@ struct GeneralSettings: View {
TextField("user@host[:22]", text: self.$state.remoteTarget)
.textFieldStyle(.roundedBorder)
.frame(maxWidth: .infinity)
MasterDiscoveryMenu(discovery: self.masterDiscovery) { master in
self.applyDiscoveredMaster(master)
}
Button {
Task { await self.testRemote() }
} label: {
@@ -142,6 +139,11 @@ struct GeneralSettings: View {
.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
}
MasterDiscoveryInlineList(discovery: self.masterDiscovery) { master in
self.applyDiscoveredMaster(master)
}
.padding(.leading, 58)
self.remoteStatusView
.padding(.leading, 58)

50
apps/macos/Sources/Clawdis/MasterDiscoveryMenu.swift
View File

@@ -1,5 +1,55 @@
import SwiftUI
struct MasterDiscoveryInlineList: View {
@ObservedObject var discovery: MasterDiscoveryModel
var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void
var body: some View {
VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 6) {
Image(systemName: "dot.radiowaves.left.and.right")
.foregroundStyle(.secondary)
Text(self.discovery.statusText)
.font(.caption)
.foregroundStyle(.secondary)
Spacer()
}
if self.discovery.masters.isEmpty {
Text("No masters found yet.")
.font(.caption)
.foregroundStyle(.secondary)
} else {
VStack(alignment: .leading, spacing: 6) {
ForEach(self.discovery.masters.prefix(6)) { master in
Button {
self.onSelect(master)
} label: {
HStack(spacing: 8) {
Text(master.displayName)
.lineLimit(1)
Spacer()
if let host = master.tailnetDns ?? master.lanHost {
Text(host)
.font(.caption2)
.foregroundStyle(.secondary)
.lineLimit(1)
}
}
}
.buttonStyle(.plain)
}
}
.padding(10)
.background(
RoundedRectangle(cornerRadius: 10, style: .continuous)
.fill(Color(NSColor.controlBackgroundColor)))
}
}
.help("Discover Clawdis masters on your LAN")
}
}
struct MasterDiscoveryMenu: View {
@ObservedObject var discovery: MasterDiscoveryModel
var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void

6
apps/macos/Sources/Clawdis/Onboarding.swift
View File

@@ -154,13 +154,14 @@ struct OnboardingView: View {
if self.state.connectionMode == .remote {
VStack(alignment: .leading, spacing: 8) {
LabeledContent("SSH target") {
HStack(spacing: 8) {
VStack(alignment: .leading, spacing: 8) {
TextField("user@host[:22]", text: self.$state.remoteTarget)
.textFieldStyle(.roundedBorder)
.frame(width: 300)
MasterDiscoveryMenu(discovery: self.masterDiscovery) { master in
MasterDiscoveryInlineList(discovery: self.masterDiscovery) { master in
self.applyDiscoveredMaster(master)
}
.frame(width: 360)
}
}
@@ -487,6 +488,7 @@ struct OnboardingView: View {
.buttonStyle(.borderedProminent)
}
.padding(.horizontal, 20)
.padding(.bottom, 12)
.frame(height: 60)
}

3484
apps/macos/Sources/Clawdis/Resources/WebChat/webchat.bundle.js
View File

File diff suppressed because it is too large Load Diff

9
apps/ios/Sources/Bridge/BonjourEscapeDecoder.swift → apps/shared/ClawdisKit/Sources/ClawdisKit/BonjourEscapes.swift
View File

@@ -1,9 +1,9 @@
import Foundation
enum BonjourEscapeDecoder {
static func decode(_ input: String) -> String {
// mDNS / DNS-SD commonly escapes bytes in instance names as `\\DDD`
// (decimal-encoded), e.g. spaces are `\\032`.
public enum BonjourEscapes {
/// mDNS / DNS-SD commonly escapes bytes in instance names as `\DDD` (decimal-encoded),
/// e.g. spaces are `\032`.
public static func decode(_ input: String) -> String {
var out = ""
var i = input.startIndex
while i < input.endIndex {
@@ -31,4 +31,3 @@ enum BonjourEscapeDecoder {
return out
}
}