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

Settings: move session store path to Debug

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-07 04:38:08 +00:00
parent 2714ed503b
commit ddf8aef4f7
2 changed files with 97 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/macos/Sources/Clawdis/ConfigSettings.swift
View File

@@ -4,7 +4,6 @@ import SwiftUI
struct ConfigSettings: View {
@State private var configModel: String = ""
@State private var customModel: String = ""
@State private var configStorePath: String = SessionLoader.defaultStorePath
@State private var configSaving = false
@State private var hasLoaded = false
@State private var models: [ModelChoice] = []
@@ -93,15 +92,6 @@ struct ConfigSettings: View {
}
}
LabeledContent("Session store") {
TextField("Path", text: self.$configStorePath)
.textFieldStyle(.roundedBorder)
.frame(width: 360)
.onChange(of: self.configStorePath) { _, _ in
self.autosaveConfig()
}
}
Spacer()
}
.frame(maxWidth: .infinity, alignment: .leading)
@@ -128,26 +118,13 @@ struct ConfigSettings: View {
}
private func loadConfig() {
let url = self.configURL()
guard let data = try? Data(contentsOf: url) else {
self.configModel = SessionLoader.fallbackModel
self.configStorePath = SessionLoader.defaultStorePath
return
}
guard
let parsed = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let inbound = parsed["inbound"] as? [String: Any],
let reply = inbound["reply"] as? [String: Any]
else {
return
}
let parsed = self.loadConfigDict()
let inbound = parsed["inbound"] as? [String: Any]
let reply = inbound?["reply"] as? [String: Any]
let agent = reply?["agent"] as? [String: Any]
let heartbeatMinutes = reply?["heartbeatMinutes"] as? Int
let heartbeatBody = reply?["heartbeatBody"] as? String
let session = reply["session"] as? [String: Any]
let agent = reply["agent"] as? [String: Any]
let heartbeatMinutes = reply["heartbeatMinutes"] as? Int
let heartbeatBody = reply["heartbeatBody"] as? String
self.configStorePath = (session?["store"] as? String) ?? SessionLoader.defaultStorePath
let loadedModel = (agent?["model"] as? String) ?? ""
if !loadedModel.isEmpty {
self.configModel = loadedModel
@@ -171,19 +148,16 @@ struct ConfigSettings: View {
self.configSaving = true
defer { self.configSaving = false }
var session: [String: Any] = [:]
var agent: [String: Any] = [:]
var reply: [String: Any] = [:]
let trimmedStore = self.configStorePath.trimmingCharacters(in: .whitespacesAndNewlines)
if !trimmedStore.isEmpty { session["store"] = trimmedStore }
var root = self.loadConfigDict()
var inbound = root["inbound"] as? [String: Any] ?? [:]
var reply = inbound["reply"] as? [String: Any] ?? [:]
var agent = reply["agent"] as? [String: Any] ?? [:]
let chosenModel = (self.configModel == "__custom__" ? self.customModel : self.configModel)
.trimmingCharacters(in: .whitespacesAndNewlines)
let trimmedModel = chosenModel
if !trimmedModel.isEmpty { agent["model"] = trimmedModel }
reply["session"] = session
reply["agent"] = agent
if let heartbeatMinutes {
@@ -195,8 +169,8 @@ struct ConfigSettings: View {
reply["heartbeatBody"] = trimmedBody
}
let inbound: [String: Any] = ["reply": reply]
let root: [String: Any] = ["inbound": inbound]
inbound["reply"] = reply
root["inbound"] = inbound
do {
let data = try JSONSerialization.data(withJSONObject: root, options: [.prettyPrinted, .sortedKeys])
@@ -208,6 +182,12 @@ struct ConfigSettings: View {
} catch {}
}
private func loadConfigDict() -> [String: Any] {
let url = self.configURL()
guard let data = try? Data(contentsOf: url) else { return [:] }
return (try? JSONSerialization.jsonObject(with: data) as? [String: Any]) ?? [:]
}
private func loadModels() async {
guard !self.modelsLoading else { return }
self.modelsLoading = true