A tiny friend in your Mac's notch and on your iPhone that keeps an eye on your AI coding agents: Claude Code, Codex, Cursor, Gemini CLI, Antigravity and more. Approve from the notch or your Lock Screen.
Swift ai-agentsanthropicantigravityclaudeclaude-codecodexcursordynamic-islandgemini-cliiosiphonlinuxmacosmacos-appmenubar-appnotchopen-sourceswiftswiftuiwindows
Preserve all Claude response text and block boundaries
Ramzi Alashmaliefc80c3f5946
diff --git a/.github/workflows/build.yml b/.github/workflows/build.ymlindex 04f54a91..dd1bbc65 100644--- a/.github/workflows/build.yml+++ b/.github/workflows/build.yml@@ -24,6 +24,9 @@ jobs:- name: Test link filterrun: bash scripts/test-safe-links.sh+ - name: Test Claude response text+ run: bash scripts/test-claude-response.sh+- name: Test chat parsingrun: bash scripts/test-chat-parsing.shdiff --git a/CHANGELOG.md b/CHANGELOG.mdindex 35e67936..d35f16ea 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,9 @@# Changelog+## Unreleased++- Claude chat and structured search keep all response text without adding line breaks between text blocks.+## 0.2.0 — October 6, 2026- GitHub Copilot CLI and Muse Code sessions show up in the notch: see every step live and approve or deny permissions right from the island. Install from Settings → Agents → Copilot CLI / Muse Code, which shows what will change in your config and backs it up before writing *(GitHub build)* (#263)diff --git a/NotchBuddy/Sources/App/ClaudeResponseText.swift b/NotchBuddy/Sources/App/ClaudeResponseText.swiftnew file mode 100644index 00000000..dd6f4af4--- /dev/null+++ b/NotchBuddy/Sources/App/ClaudeResponseText.swift@@ -0,0 +1,16 @@+import Foundation++/// Extracts the assistant's full text from an Anthropic Messages API content array.+/// Web-search responses interleave text with tool blocks, and citations can+/// split a sentence across adjacent text blocks. Keep the original text and+/// whitespace without inserting separators, then trim only the complete result.+/// Returns nil when the response carries no assistant text at all.+func claudeResponseText(fromContent content: [[String: Any]]) -> String? {+ let text = content.compactMap { block -> String? in+ guard block["type"] as? String == "text" else { return nil }+ return block["text"] as? String+ }+ .joined()+ .trimmingCharacters(in: .whitespacesAndNewlines)+ return text.isEmpty ? nil : text+}diff --git a/NotchBuddy/Sources/App/ClaudeService.swift b/NotchBuddy/Sources/App/ClaudeService.swiftindex 08b7a923..6eb6905b 100644--- a/NotchBuddy/Sources/App/ClaudeService.swift+++ b/NotchBuddy/Sources/App/ClaudeService.swift@@ -547,14 +547,13 @@ final class ClaudeService {// Store full content (includes tool_use/tool_result blocks) for correct multi-turn contextconversationMessages.append(["role": "assistant", "content": content])- guard let textBlock = content.first(where: { $0["type"] as? String == "text" }),- let text = textBlock["text"] as? String, !text.isEmpty else {+ guard let text = claudeResponseText(fromContent: content) else {await showError("No response text.", state: state)return}// Add to display history- state.chatHistory.append(ChatMessage(role: .assistant, content: text.trimmingCharacters(in: .whitespacesAndNewlines)))+ state.chatHistory.append(ChatMessage(role: .assistant, content: text))state.stateOverride = nilstate.view = .prompt@@ -567,8 +566,7 @@ final class ClaudeService {// Extract text from Anthropic response (may contain tool_use / web_search_tool_result blocks)guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],let content = json["content"] as? [[String: Any]],- let textBlock = content.first(where: { $0["type"] as? String == "text" }),- let text = textBlock["text"] as? String else {+ let text = claudeResponseText(fromContent: content) else {await showError("Unexpected API response.", state: state)return}diff --git a/scripts/test-claude-response.sh b/scripts/test-claude-response.shnew file mode 100755index 00000000..20a5cbd3--- /dev/null+++ b/scripts/test-claude-response.sh@@ -0,0 +1,9 @@+#!/usr/bin/env bash+set -euo pipefail+cd "$(dirname "$0")/.."+TEST_DIR="$(mktemp -d "${TMPDIR:-/tmp}/coucou-claude-response.XXXXXX")"+trap 'rm -rf "$TEST_DIR"' EXIT+swiftc -swift-version 6 -warnings-as-errors \+ NotchBuddy/Sources/App/ClaudeResponseText.swift \+ tests/ClaudeResponseTextTests.swift -o "$TEST_DIR/claude-response-tests"+"$TEST_DIR/claude-response-tests"diff --git a/tests/ClaudeResponseTextTests.swift b/tests/ClaudeResponseTextTests.swiftnew file mode 100644index 00000000..94aa52b0--- /dev/null+++ b/tests/ClaudeResponseTextTests.swift@@ -0,0 +1,164 @@+import Foundation++@main+enum ClaudeResponseTextTests {+ static func main() {+ var executedCaseCount = 0++ @discardableResult+ func expectText(_ name: String, content: [[String: Any]], expected: String?) -> String? {+ let actual = claudeResponseText(fromContent: content)+ precondition(actual == expected,+ "\(name): expected \(String(reflecting: expected)), got \(String(reflecting: actual))")+ executedCaseCount += 1+ return actual+ }++ func expectJSON(_ name: String, fragments: [String], expected: String) -> [String: Any] {+ let content = fragments.map { ["type": "text", "text": $0] }+ let text = expectText(name, content: content, expected: expected)!+ guard let parsed = try? JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any] else {+ preconditionFailure("\(name): combined text must remain valid JSON")+ }+ return parsed+ }++ expectText("single text block", content: [+ ["type": "text", "text": "Simple answer."]+ ], expected: "Simple answer.")++ // Separators belong to the response text, not to content-block boundaries.+ expectText("web search keeps preamble and answer", content: [+ ["type": "text", "text": "I'll look that up.\n"],+ ["type": "server_tool_use", "id": "srvtoolu_01", "name": "web_search", "input": ["query": "test"]],+ ["type": "web_search_tool_result", "tool_use_id": "srvtoolu_01", "content": []],+ ["type": "text", "text": "The answer is 42."]+ ], expected: "I'll look that up.\nThe answer is 42.")++ expectText("empty leading block does not hide the answer", content: [+ ["type": "text", "text": ""],+ ["type": "server_tool_use", "id": "srvtoolu_02", "name": "web_search"],+ ["type": "web_search_tool_result", "tool_use_id": "srvtoolu_02", "content": []],+ ["type": "text", "text": "Here is the actual answer."]+ ], expected: "Here is the actual answer.")++ expectText("several search rounds preserve text order", content: [+ ["type": "text", "text": "First.\n"],+ ["type": "web_search_tool_result", "tool_use_id": "a", "content": []],+ ["type": "text", "text": "Second.\n"],+ ["type": "web_search_tool_result", "tool_use_id": "b", "content": []],+ ["type": "text", "text": "Third."]+ ], expected: "First.\nSecond.\nThird.")++ expectText("search result content does not leak into the answer", content: [+ ["type": "text", "text": "Answer."],+ ["type": "web_search_tool_result", "tool_use_id": "a", "content": [+ ["type": "web_search_result", "title": "Some page", "text": "Search result text."]+ ]]+ ], expected: "Answer.")++ expectText("tool-only response", content: [+ ["type": "server_tool_use", "id": "x", "name": "web_search"]+ ], expected: nil)+ expectText("empty response", content: [], expected: nil)++ expectText("whitespace-only text", content: [+ ["type": "text", "text": " \n\t "]+ ], expected: nil)+ expectText("several empty or whitespace-only blocks", content: [+ ["type": "text", "text": ""],+ ["type": "text", "text": " "]+ ], expected: nil)++ expectText("outer whitespace is trimmed", content: [+ ["type": "text", "text": " padded "]+ ], expected: "padded")+ expectText("internal newlines are preserved", content: [+ ["type": "text", "text": " keep\ninner\nspaces "]+ ], expected: "keep\ninner\nspaces")++ expectText("missing text value is skipped", content: [+ ["type": "text"],+ ["type": "text", "text": "Real one."]+ ], expected: "Real one.")+ expectText("non-string text value is skipped", content: [+ ["type": "text", "text": 42],+ ["type": "text", "text": "After."]+ ], expected: "After.")++ expectText("Unicode survives concatenation", content: [+ ["type": "text", "text": "Café ☕ — "],+ ["type": "text", "text": "مرحبا"]+ ], expected: "Café ☕ — مرحبا")++ // handleResult extracts the outer braces before parsing the final JSON answer.+ let json = expectText("JSON after a search remains extractable", content: [+ ["type": "text", "text": "Let me check.\n"],+ ["type": "web_search_tool_result", "tool_use_id": "x", "content": []],+ ["type": "text", "text": "{\"title\":\"Release notes\",\"items\":[]}"]+ ], expected: "Let me check.\n{\"title\":\"Release notes\",\"items\":[]}")!+ let braces = json.firstIndex(of: "{")!...json.lastIndex(of: "}")!+ let parsed = try? JSONSerialization.jsonObject(with: Data(String(json[braces]).utf8)) as? [String: Any]+ precondition(parsed?["title"] as? String == "Release notes",+ "JSON after a search: brace-extracted title must remain parseable")++ // Anthropic's web-search response example has adjacent sentence fragments,+ // with citations attached to one text block rather than a paragraph break.+ expectText("citation boundary does not insert a line break", content: [+ ["type": "text", "text": "Based on the search results, "],+ ["type": "text", "text": "the release is available.", "citations": [+ ["type": "web_search_result_location", "url": "https://example.com/release", "title": "Release"]+ ]]+ ], expected: "Based on the search results, the release is available.")++ expectText("a word split across blocks is reconstructed", content: [+ ["type": "text", "text": "Concate"],+ ["type": "text", "text": "nation works."]+ ], expected: "Concatenation works.")++ // Defensive synthetic cases: no live API occurrence is claimed for these JSON splits.+ let splitString = expectJSON("synthetic split JSON string", fragments: [+ "{\"title\":\"Release ", "notes\",\"items\":[]}"+ ], expected: "{\"title\":\"Release notes\",\"items\":[]}")+ precondition(splitString["title"] as? String == "Release notes",+ "synthetic split JSON string: title must be reconstructed")++ let splitEscape = expectJSON("synthetic split JSON escape sequence", fragments: [+ "{\"title\":\"Line\\", "nBreak\"}"+ ], expected: #"{"title":"Line\nBreak"}"#)+ precondition(splitEscape["title"] as? String == "Line\nBreak",+ "synthetic split JSON escape sequence: escape must decode to a newline")++ let splitNumber = expectJSON("synthetic split JSON number", fragments: [+ "{\"value\":12", ".5}"+ ], expected: "{\"value\":12.5}")+ precondition(splitNumber["value"] as? Double == 12.5,+ "synthetic split JSON number: value must remain 12.5")++ expectText("a whitespace-only interior block is retained", content: [+ ["type": "text", "text": "First"],+ ["type": "text", "text": " \n\t "],+ ["type": "text", "text": "Second"]+ ], expected: "First \n\t Second")++ expectText("only the combined text's outer edges are trimmed", content: [+ ["type": "text", "text": " \nFirst "],+ ["type": "text", "text": " second\t "]+ ], expected: "First second")++ expectText("markdown formatting survives block boundaries", content: [+ ["type": "text", "text": "# Heading\n\n```sw"],+ ["type": "text", "text": "ift\nlet answer = 42\n"],+ ["type": "text", "text": "```\n\n- Item"]+ ], expected: "# Heading\n\n```swift\nlet answer = 42\n```\n\n- Item")++ expectText("non-text blocks with a text field are ignored", content: [+ ["type": "server_tool_use", "text": "Tool metadata."],+ ["type": "thinking", "text": "Thinking metadata."],+ ["text": "Missing type."],+ ["type": "text", "text": "Answer."]+ ], expected: "Answer.")++ print("Claude response text: \(executedCaseCount) cases passed")+ }+}