CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 修复普通消息未收起异步提问等待的问题
Bob22cc843ae4aa
diff --git a/CodexBar/Models/ActivityInput.swift b/CodexBar/Models/ActivityInput.swiftindex ff7922c..ec1a22d 100644--- a/CodexBar/Models/ActivityInput.swift+++ b/CodexBar/Models/ActivityInput.swift@@ -143,9 +143,10 @@ nonisolated struct ActivityItem {var success: Bool?var agentsStates: [String: AgentState]?var asyncQuestionCount = 0- var answeredQuestions: [QuestionReply] = []+ /// 仅完整且格式正确的回应才为非 nil, 空列表不视为普通消息+ var questionReplies: [QuestionReply]?var affectsInputWait: Bool {- asyncQuestionCount > 0 || !answeredQuestions.isEmpty+ asyncQuestionCount > 0 || type == .userMessage}var isToolCall: Bool {diff --git a/CodexBar/Services/Activity/ActivityLivePresentation.swift b/CodexBar/Services/Activity/ActivityLivePresentation.swiftindex f0e3531..1d49aca 100644--- a/CodexBar/Services/Activity/ActivityLivePresentation.swift+++ b/CodexBar/Services/Activity/ActivityLivePresentation.swift@@ -195,11 +195,17 @@ nonisolated struct ActivityLivePresentation {private mutating func consumeQuestions(_ item: ActivityItem, at date: Date) {if item.asyncQuestionCount > 0, questions[item.id] == nil {- // item/completed 只表示提问已发送, 等待持续到对应问题收到回应+ // item/completed 只表示提问已发送, 不能据此结束等待questions[item.id] = PendingQuestions(since: date, count: item.asyncQuestionCount)}var resolved = false- for reply in item.answeredQuestions {+ if item.type == .userMessage, item.questionReplies == nil {+ // 普通消息表示用户已继续对话, 只收起异步提问的等待展示+ resolved = !questions.isEmpty || requests.values.contains { $0.isBlocking == false }+ questions.removeAll()+ requests = requests.filter { $0.value.isBlocking != false }+ }+ for reply in item.questionReplies ?? [] {guard let pending = questions[reply.itemID], reply.index < pending.count,questions[reply.itemID]?.answered.insert(reply.index).inserted == true else { continue }resolved = truediff --git a/CodexBar/Services/Activity/AppServerActivityModels.swift b/CodexBar/Services/Activity/AppServerActivityModels.swiftindex 2c9150f..48499c0 100644--- a/CodexBar/Services/Activity/AppServerActivityModels.swift+++ b/CodexBar/Services/Activity/AppServerActivityModels.swift@@ -372,29 +372,36 @@ private nonisolated extension WireActivityItem {success: success,agentsStates: agentsStates?.mapValues { .init(status: $0.status) },asyncQuestionCount: type == "agentMessage" && delivery == "async" ? questions?.count ?? 0 : 0,- answeredQuestions: answeredQuestions+ questionReplies: questionReplies)}- private var answeredQuestions: [ActivityItem.QuestionReply] {- guard type == "userMessage" else { return [] }- return (content ?? []).filter { $0.type == "text" }.flatMap { content -> [ActivityItem.QuestionReply] in+ private var questionReplies: [ActivityItem.QuestionReply]? {+ guard type == "userMessage" else { return nil }+ let opening = "<send_user_message_question_reply>"+ let closing = "</send_user_message_question_reply>"+ var result: [ActivityItem.QuestionReply]?+ for content in content ?? [] where content.type == "text" {let text = content.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""- let opening = "<send_user_message_question_reply>"- let closing = "</send_user_message_question_reply>"- // 异步回应通过用户消息携带问题标识, 仅解析完整信封, 不根据自然语言推断回应+ // 普通消息也可能讨论这些标签, 仅识别完整且问题标识格式正确的回应guard text.hasPrefix(opening), text.hasSuffix(closing), text.count >= opening.count + closing.count,let replies = try? JSONDecoder().decode([QuestionReply].self, from: Data(text.dropFirst(opening.count).dropLast(closing.count).utf8)- ) else { return [] }- return replies.compactMap { reply in+ ) else { continue }+ let parsedReplies: [ActivityItem.QuestionReply] = replies.compactMap { reply inguard let value = try? JSONDecoder().decode(ActivityJSONValue.self, from: Data(reply.questionItemId.utf8)),case let .array(parts) = value, parts.count == 3,parts[0].string == "request_user_input_async", let itemID = parts[1].string, !itemID.isEmpty,let number = parts[2].number, let index = Int(exactly: number), index >= 0 else { return nil }return .init(itemID: itemID, index: index)}+ guard parsedReplies.count == replies.count else { continue }+ if result == nil {+ result = []+ }+ result?.append(contentsOf: parsedReplies)}+ return result}}diff --git a/Tests/App/Activity/ActivityLivePresentationTests.swift b/Tests/App/Activity/ActivityLivePresentationTests.swiftindex 5f33cc2..b048721 100644--- a/Tests/App/Activity/ActivityLivePresentationTests.swift+++ b/Tests/App/Activity/ActivityLivePresentationTests.swift@@ -38,10 +38,10 @@ struct ActivityLivePresentationTests {#expect(reducer.states.values.first?.isWaitingApproval == false)}- private func userMessage(_ text: String) throws -> ActivityInput {+ private func userMessage(_ text: String, threadID: String = "thread-a", turnID: String = "turn-a") throws -> ActivityInput {try JSONDecoder().decode(ActivityInput.self, from: JSONSerialization.data(withJSONObject: ["method": "item/completed", "params": [- "threadId": "thread-a", "turnId": "turn-a",+ "threadId": threadID, "turnId": turnID,"item": ["id": "reply", "type": "userMessage", "content": [["type": "text", "text": text]]]]]))@@ -65,7 +65,7 @@ struct ActivityLivePresentationTests {#expect(reducer.consume(unknown, now: now.addingTimeInterval(1)).isEmpty)for id in ["first", "second"] {let reply = try questionReply(id, index: 0)- #expect(reply.params.item?.answeredQuestions == [.init(itemID: id, index: 0)])+ #expect(reply.params.item?.questionReplies == [.init(itemID: id, index: 0)])#expect(reducer.consume(reply, now: now.addingTimeInterval(2)).isEmpty)_ = reducer.consume(reply, now: now.addingTimeInterval(3))#expect(try summary(reducer).waiting?.since == now)@@ -93,21 +93,120 @@ struct ActivityLivePresentationTests {}@Test(arguments: [- "Yes", "<send_user_message_question_reply>invalid</send_user_message_question_reply>",- #"<send_user_message_question_reply>[{"questionItemId":"[\"other_tool\",\"question\",0]"}]</send_user_message_question_reply>"#,- #"<send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"question\",-1]"}]</send_user_message_question_reply>"#,- #"<send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"question\",0.5]"}]</send_user_message_question_reply>"#,- #"Quoted: <send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"question\",0]"}]</send_user_message_question_reply>"#+ "Yes", "现在左右切斜的时候抬头低头也在同步变化",+ #"Quoted: <send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"question\",0]"}]</send_user_message_question_reply>"#,+ "<send_user_message_question_reply>",+ " <send_user_message_question_reply> 这个是啥呀\n",+ "<send_user_message_question_reply>invalid</send_user_message_question_reply>",+ "<send_user_message_question_reply>[{}]</send_user_message_question_reply>",+ "<send_user_message_question_reply>[]</send_user_message_question_reply> 这个是啥呀",+ #"<send_user_message_question_reply>[{"questionItemId":"[\"other_tool\",\"first\",0]"}]</send_user_message_question_reply>"#,+ #"<send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"\",0]"}]</send_user_message_question_reply>"#,+ #"<send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"first\",-1]"}]</send_user_message_question_reply>"#,+ #"<send_user_message_question_reply>[{"questionItemId":"[\"request_user_input_async\",\"first\",0.5]"}]</send_user_message_question_reply>"#,+ #"""+ <send_user_message_question_reply>[+ {"questionItemId":"[\"request_user_input_async\",\"first\",0]"},+ {"questionItemId":"invalid"}+ ]</send_user_message_question_reply>+ """#])- func unrelatedOrMalformedUserMessagesDoNotClearAsyncQuestions(text: String) throws {+ func ordinaryUserMessagesClearAsyncQuestionsAndAllowNewWaits(text: String) throws {var reducer = try prepared()- _ = try reducer.consume(message("item/completed", #""item":{"id":"question","type":"agentMessage","delivery":"async","questions":[{"title":"Question?"}]}"#), now: now)+ for id in ["first", "second"] {+ _ = try reducer.consume(message("item/completed", """+ "item":{"id":"\(id)","type":"agentMessage","delivery":"async","questions":[{"title":"Question?"}]}+ """), now: now)+ }+ _ = try reducer.consume(message("item/tool/requestUserInput", #""isBlocking":false"#, id: 9), now: now)+ _ = try reducer.consume(message("item/started", #""item":{"id":"cmd","type":"commandExecution"}"#), now: now.addingTimeInterval(1))+ #expect(try summary(reducer).current.key == "waiting-input")+ let progress = reducer.states.values.first?.lastProgressAtlet reply = try userMessage(text)- #expect(reply.params.item?.answeredQuestions.isEmpty == true)+ #expect(reply.params.item?.questionReplies == nil)+ #expect(reply.params.item?.affectsInputWait == true)+ #expect(reducer.consume(reply, now: now.addingTimeInterval(2)).isEmpty)+ #expect(try summary(reducer).waiting == nil)+ #expect(try summary(reducer).current.key == "command")+ #expect(reducer.states.values.first?.lastProgressAt == progress)+ #expect(reducer.states.values.first?.isWaitingApproval == false)++ _ = try reducer.consume(message("item/completed", """+ "item":{"id":"third","type":"agentMessage","delivery":"async","questions":[{"title":"Next?"}]}+ """), now: now.addingTimeInterval(3))+ #expect(try summary(reducer).waiting?.since == now.addingTimeInterval(3))+ _ = try reducer.consume(questionReply("third", index: 0), now: now.addingTimeInterval(4))+ #expect(try summary(reducer).waiting == nil)+ }++ @Test(arguments: ["item/tool/requestUserInput", "item/commandExecution/requestApproval"], [+ "Continue working", "<send_user_message_question_reply> 这个是啥呀"+ ])+ func ordinaryUserMessagesPreserveBlockingInputAndApproval(method: String, text: String) throws {+ var reducer = try prepared()+ _ = try reducer.consume(message("item/completed", #""item":{"id":"question","type":"agentMessage","delivery":"async","questions":[{"title":"Question?"}]}"#), now: now)+ _ = try reducer.consume(message(method, #""itemId":"request","startedAtMs":1789459201000,"isBlocking":true"#, id: 7), now: now.addingTimeInterval(1))+ let approval = reducer.states.values.first?.isWaitingApproval+ _ = try reducer.consume(userMessage(text), now: now.addingTimeInterval(2))+ #expect(try summary(reducer).waiting?.since == now.addingTimeInterval(1))+ #expect(try summary(reducer).current.key == (method == "item/tool/requestUserInput" ? "waiting-input" : "waiting-approval"))+ #expect(try summary(reducer).hasBlockingInputRequest == (method == "item/tool/requestUserInput"))+ #expect(reducer.states.values.first?.isWaitingApproval == approval)+ _ = try reducer.consume(message("serverRequest/resolved", #""requestId":7"#, turn: false), now: now.addingTimeInterval(3))+ #expect(try summary(reducer).waiting == nil)+ }++ @Test(arguments: ["thread-a", "thread-b"])+ func ordinaryUserMessagesOnlyClearTheirOwnTurn(threadID: String) throws {+ var reducer = try prepared()+ _ = try reducer.consume(message("item/completed", #""item":{"id":"question","type":"agentMessage","delivery":"async","questions":[{"title":"Question?"}]}"#), now: now)+ let otherThread = ActivityThread(id: threadID, status: ActivityThreadStatus(type: .active, activeFlags: []))+ _ = reducer.reconcile(thread: otherThread, turns: [ActivityTurn(id: "turn-b", status: .running)], now: now)+ _ = try reducer.consume(userMessage("Continue", threadID: threadID, turnID: "turn-b"), now: now.addingTimeInterval(1))+ let key = ActivityTurnReference(threadID: "thread-a", turnID: "turn-a")+ #expect(reducer.states[key]?.presentation?.summary.waiting?.since == now)+ _ = try reducer.consume(userMessage("Continue"), now: now.addingTimeInterval(2))+ #expect(reducer.states[key]?.presentation?.summary.waiting == nil)+ }++ @Test(arguments: [+ "[]",+ #"[{"questionItemId":"[\"request_user_input_async\",\"unknown\",0]"}]"#,+ #"[{"questionItemId":"[\"request_user_input_async\",\"question\",1]"}]"#+ ])+ func unmatchedQuestionRepliesDoNotClearAsyncQuestions(body: String) throws {+ var reducer = try prepared()+ _ = try reducer.consume(message("item/completed", #""item":{"id":"question","type":"agentMessage","delivery":"async","questions":[{"title":"Question?"}]}"#), now: now)+ let reply = try userMessage("<send_user_message_question_reply>\(body)</send_user_message_question_reply>")+ #expect(reply.params.item?.questionReplies != nil)_ = reducer.consume(reply, now: now.addingTimeInterval(1))#expect(try summary(reducer).waiting?.since == now)}+ @Test func mixedContentQuestionRepliesOnlyResolveMatchingQuestions() throws {+ var reducer = try prepared()+ _ = try reducer.consume(message("item/completed", """+ "item":{"id":"question","type":"agentMessage","delivery":"async","questions":[{"title":"One?"},{"title":"Two?"}]}+ """), now: now)+ _ = try reducer.consume(message("item/completed", """+ "item":{"id":"other","type":"agentMessage","delivery":"async","questions":[{"title":"Other?"}]}+ """), now: now.addingTimeInterval(1))+ let reply = try message("item/completed", #"""+ "item":{"id":"reply","type":"userMessage","content":[+ {"type":"text","text":"Continue"},+ {"type":"text",+ "text":"<send_user_message_question_reply>[{\"questionItemId\":\"[\\\"request_user_input_async\\\",\\\"question\\\",0]\"}]</send_user_message_question_reply>"},+ {"type":"text","text":"<send_user_message_question_reply>invalid</send_user_message_question_reply>"},+ {"type":"text",+ "text":"<send_user_message_question_reply>[{\"questionItemId\":\"[\\\"request_user_input_async\\\",\\\"question\\\",1]\"}]</send_user_message_question_reply>"}+ ]}+ """#)+ _ = reducer.consume(reply, now: now.addingTimeInterval(2))+ #expect(try summary(reducer).waiting?.since == now.addingTimeInterval(1))+ _ = try reducer.consume(questionReply("other", index: 0), now: now.addingTimeInterval(3))+ #expect(try summary(reducer).waiting == nil)+ }+@Test(arguments: ["idle", "completed", "reconnect"])func asyncQuestionWaitsEndWithTheirTurnOrConnection(ending: String) throws {var reducer = try prepared()