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

webchat: load remote history from tau fallback and send to session

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-08 01:36:00 +01:00
parent a6e0ec38e7
commit 68d19d4717
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/macos/Sources/Clawdis/WebChatWindow.swift
View File

@@ -217,7 +217,7 @@ final class WebChatWindowController: NSWindowController, WKScriptMessageHandler,
thinking: "default", thinking: "default",
session: sessionKey, session: sessionKey,
deliver: false, deliver: false,
to: nil) to: sessionKey)
return (result.text, result.error) return (result.text, result.error)
} }
@@ -225,15 +225,26 @@ final class WebChatWindowController: NSWindowController, WKScriptMessageHandler,
// Prefer remote session log when running in remote mode; fall back to local files. // Prefer remote session log when running in remote mode; fall back to local files.
var content: String? var content: String?
if self.connectionModeIsRemote(), if self.connectionModeIsRemote(),
let sessionId = self.remoteSessionId(for: sessionKey), let sessionId = self.remoteSessionId(for: sessionKey)
let data = self.readRemoteFile("$HOME/.clawdis/sessions/\(sessionId).jsonl"),
let text = String(data: data, encoding: .utf8)
{ {
content = text if let data = self.readRemoteFile("$HOME/.clawdis/sessions/\(sessionId).jsonl"),
let text = String(data: data, encoding: .utf8)
{
content = text
} else if let data = self.readRemoteFile("$HOME/.tau/agent/sessions/clawdis/\(sessionId).jsonl"),
let text = String(data: data, encoding: .utf8)
{
content = text
}
} else if let sessionId = self.sessionId(for: sessionKey) { } else if let sessionId = self.sessionId(for: sessionKey) {
let path = self.expand("~/.clawdis/sessions/\(sessionId).jsonl") let primary = self.expand("~/.clawdis/sessions/\(sessionId).jsonl")
if FileManager.default.fileExists(atPath: path), let legacy = self.expand("~/.tau/agent/sessions/clawdis/\(sessionId).jsonl")
let text = try? String(contentsOfFile: path, encoding: .utf8) if FileManager.default.fileExists(atPath: primary),
let text = try? String(contentsOfFile: primary, encoding: .utf8)
{
content = text
} else if FileManager.default.fileExists(atPath: legacy),
let text = try? String(contentsOfFile: legacy, encoding: .utf8)
{ {
content = text content = text
} }
@@ -289,10 +300,21 @@ final class WebChatWindowController: NSWindowController, WKScriptMessageHandler,
} }
private static func remoteSessionId(for key: String) -> String? { private static func remoteSessionId(for key: String) -> String? {
guard let data = self.readRemoteFile("$HOME/.clawdis/sessions/sessions.json") else { return nil } if let data = self.readRemoteFile("$HOME/.clawdis/sessions/sessions.json"),
guard let decoded = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return nil } let decoded = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
guard let entry = decoded[key] as? [String: Any] else { return nil } let entry = decoded[key] as? [String: Any],
return entry["sessionId"] as? String let sessionId = entry["sessionId"] as? String
{
return sessionId
}
if let data = self.readRemoteFile("$HOME/.tau/agent/sessions/clawdis/sessions.json"),
let decoded = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let entry = decoded[key] as? [String: Any],
let sessionId = entry["sessionId"] as? String
{
return sessionId
}
return nil
} }
private static func readRemoteFile(_ path: String) -> Data? { private static func readRemoteFile(_ path: String) -> Data? {