Merge pull request #48 from zmanian/fix/question-tool-version-write

Fix question tool version file written as null byte

Author: mcintyre94

Wisp/Services/ExecSession.swift

@@ -9,6 +9,8 @@ enum ExecEvent: Sendable {
     case data(Data)
     /// Exec session ID from the session_info control frame
     case sessionInfo(id: String)
+    /// Process exit code from the exec stream
+    case exit(code: Int)
 }
 
 final class ExecSession: Sendable {
@@ -79,6 +81,7 @@ final class ExecSession: Sendable {
                             case 3: // exit
                                 let exitCode = payload.first.map { Int($0) } ?? -1
                                 logger.info("Exit frame received, code=\(exitCode)")
+                                continuation.yield(.exit(code: exitCode))
                                 continuation.finish()
                                 return
                             default:

Wisp/Services/SpritesAPIClient.swift

@@ -122,7 +122,9 @@ final class SpritesAPIClient {
         // but Go's net/url (1.17+) silently drops query parameters containing literal
         // semicolons. Manually encode them so the server receives the full command.
         if let encoded = components.percentEncodedQuery {
-            components.percentEncodedQuery = encoded.replacingOccurrences(of: ";", with: "%3B")
+            components.percentEncodedQuery = encoded
+                .replacingOccurrences(of: ";", with: "%3B")
+                .replacingOccurrences(of: "+", with: "%2B")
         }
 
         return ExecSession(url: components.url!, token: spritesToken ?? "")
@@ -383,12 +385,13 @@ final class SpritesAPIClient {
     // MARK: - Exec Helpers
 
     /// Run a command on a sprite via exec WebSocket, collecting output.
-    /// Returns the accumulated stdout/stderr text and whether the command completed before timeout.
+    /// Returns the accumulated stdout/stderr text and whether the command exited successfully before timeout.
     func runExec(spriteName: String, command: String, env: [String: String] = [:], timeout: Int = 15) async -> (output: String, success: Bool) {
         let session = createExecSession(spriteName: spriteName, command: command, env: env)
         session.connect()
         var output = Data()
         var timedOut = false
+        var exitCode: Int?
 
         let timeoutTask = Task {
             try await Task.sleep(for: .seconds(timeout))
@@ -400,16 +403,19 @@ final class SpritesAPIClient {
             for try await event in session.events() {
                 if case .data(let chunk) = event {
                     output.append(chunk)
+                } else if case .exit(let code) = event {
+                    exitCode = code
                 }
             }
         } catch {
-            // Expected on timeout disconnect or command failure
+            // Expected on timeout disconnect
         }
 
         timeoutTask.cancel()
         session.disconnect()
         let text = String(data: output, encoding: .utf8) ?? ""
-        return (text, !timedOut)
+        let succeeded = !timedOut && (exitCode.map { $0 == 0 } ?? true)
+        return (text, succeeded)
     }
 
     // MARK: - Private

Wisp/ViewModels/ChatViewModel.swift

@@ -67,7 +67,7 @@ final class ChatViewModel {
     private var turnHasMutations = false
     private var pendingForkContext: String?
     private var apiClient: SpritesAPIClient?
-    private var mcpSetupTask: Task<Bool, Never>?
+
     /// UUIDs of Claude NDJSON events already processed.
     /// Used by reconnect to skip already-handled events instead of clearing content.
     private var processedEventUUIDs: Set<String> = []
@@ -173,12 +173,6 @@ final class ChatViewModel {
 
     func loadSession(apiClient: SpritesAPIClient, modelContext: ModelContext) {
         self.apiClient = apiClient
-        if UserDefaults.standard.bool(forKey: "claudeQuestionTool") {
-            mcpSetupTask = Task { [weak self] in
-                guard let self else { return false }
-                return await self.installClaudeQuestionToolIfNeeded(apiClient: apiClient)
-            }
-        }
         guard let chat = fetchChat(modelContext: modelContext) else { return }
 
         sessionId = chat.claudeSessionId
@@ -595,20 +589,20 @@ final class ChatViewModel {
     ) async {
         status = .connecting
 
-        // Wait for MCP setup to finish (no-op if setup task not running or already done)
+        // Delete old service, then use a fresh name so logs start clean
+        let oldServiceName = serviceName
+        serviceName = "wisp-claude-\(UUID().uuidString.prefix(8).lowercased())"
+        try? await apiClient.deleteService(spriteName: spriteName, serviceName: oldServiceName)
+
+        // Install question tool after service cleanup (sprite is awake at this point)
         if UserDefaults.standard.bool(forKey: "claudeQuestionTool") {
-            let toolReady = await mcpSetupTask?.value ?? false
+            let toolReady = await installClaudeQuestionToolIfNeeded(apiClient: apiClient)
             if !toolReady {
                 status = .error("Claude question tool failed to install — disable it in Settings or try again")
                 return
             }
         }
 
-        // Delete old service, then use a fresh name so logs start clean
-        let oldServiceName = serviceName
-        serviceName = "wisp-claude-\(UUID().uuidString.prefix(8).lowercased())"
-        try? await apiClient.deleteService(spriteName: spriteName, serviceName: oldServiceName)
-
         // Persist the new service name immediately for reconnect
         saveSession(modelContext: modelContext)
 
@@ -1457,22 +1451,38 @@ final class ChatViewModel {
                 remotePath: ClaudeQuestionTool.serverPyPath,
                 data: Data(ClaudeQuestionTool.serverScript.utf8)
             )
-            try await apiClient.uploadFile(
-                spriteName: spriteName,
-                remotePath: ClaudeQuestionTool.versionPath,
-                data: Data(ClaudeQuestionTool.version.utf8)
-            )
         } catch {
             logger.error("Claude question tool installation failed: \(error)")
             return false
         }
-        // Make server.py executable
-        _ = await apiClient.runExec(
+        // Make server.py executable and write version file via exec
+        // (the fs/write API corrupts very small payloads to null bytes)
+        let installCommand = "\(ClaudeQuestionTool.chmodCommand) && mkdir -p ~/.wisp/claude-question && echo -n '\(ClaudeQuestionTool.version)' > \(ClaudeQuestionTool.versionPath)"
+        let (installOutput, installSuccess) = await apiClient.runExec(
             spriteName: spriteName,
-            command: ClaudeQuestionTool.chmodCommand,
+            command: installCommand,
             timeout: 10
         )
+        guard installSuccess else {
+            let trimmedOutput = installOutput.trimmingCharacters(in: .whitespacesAndNewlines)
+            logger.error("Claude question tool install command failed: \(trimmedOutput)")
+            return false
+        }
+
+        let verificationCommand =
+            "if test -x \(ClaudeQuestionTool.serverPyPath) && [ \"$(cat \(ClaudeQuestionTool.versionPath) 2>/dev/null)\" = '\(ClaudeQuestionTool.version)' ]; then printf '\(ClaudeQuestionTool.version)'; else exit 1; fi"
+        let (verificationOutput, verificationSuccess) = await apiClient.runExec(
+            spriteName: spriteName,
+            command: verificationCommand,
+            timeout: 10
+        )
+        guard verificationSuccess,
+            verificationOutput.trimmingCharacters(in: .whitespacesAndNewlines) == ClaudeQuestionTool.version
+        else {
+            logger.error("Claude question tool verification failed: \(verificationOutput)")
+            return false
+        }
+
         return true
     }
 }
-