MCP batch lookup, explicit task detail, and frozen cursor pagination.
query_tasks deliberately requires detail/comment/page options and returns a results object.Ready to push
All three review findings are fixed. Completed native result bundles confirm 1,291 iOS tests, 21 UI tests, and three affected macOS tests passed with zero failures; lint passes. CLI/MCP collection wrappers timed out, but native results recovered their completed outcomes. Review changes remain uncommitted.
a61f911 T-2379: record completed implementation phase 00fe0f6 T-2379: changelog for phase 1 c94ac9d T-2379: Report malformed continuation cursors consistently 7f46cb4 T-2379: Add bounded batch task queries working-tree Pre-push review fixes and implementation explanation The MCP task query now asks callers to choose summary or full detail, whether to include comments, and a page size from 1 to 100. It returns a results object with a next-page cursor and expiry instead of an array. Known task UUIDs or display IDs can be looked up in batches of up to 100.
An agent can retrieve 182 chore descriptions in two requests. Later pages preserve the values captured by the first request, even when tasks or comments change.
A snapshot is a temporary copy of the query results. A cursor is a random token that retrieves the next saved page; it expires five minutes after the initial query starts.
`MCPTaskQueryRequest` separates strict initial options from cursor-only continuation. The handler reuses existing filters and `IntentHelpers.taskToDict`, indexes one fetch for batches, and serializes each unique task and its requested comments once. Batch outcomes retain input indexes, including repeats and explicit missing/ambiguous-ID failures.
`encodeQueryPages` encodes every page before publication. `MCPTaskQuerySnapshotStore` retains immutable JSON text behind opaque tokens, with monotonic expiry and an eight-snapshot/16 MiB limit. No live SwiftData models are cached; cursor replay reads the same saved text without a fetch. One formatter is shared across task serialization within a query.
Compatibility with the old request defaults and array payload was explicitly waived. Batch lookup reads all tasks once rather than adding another service API. Snapshot capacity rejects new multi-page queries rather than evicting active traversals. These choices are recorded in Decisions 1–4.
Initial preparation is synchronous on MainActor, preventing app mutations from interleaving with selection and serialization. Requested-comment or storage failures abort publication; identifier failures stay local to batch outcomes. Lists sort by UUID, batches by input position, and comments by creation date then UUID. Continuation rejects extra options and never replaces an expired snapshot with current data.
The server closes query admission and clears snapshots before shutdown awaits, on generation-checked listener completion, and at replacement launch. Stale callbacks cannot clear a replacement listener's pages. Encoded byte accounting is conservative because it counts all prepared pages even though only continuation pages are retained; limits do not promise a bound on transient SwiftData fetch or dictionary preparation memory.
UUID-resolved tasks without allocated display IDs omit that field. Nil descriptions are JSON null; empty metadata is omitted. Repeated batch identities reuse serialization but preserve distinct result positions. Malformed, unknown, cleared, and expired cursors return explicit restart guidance.
Transit/Transit/MCP/MCPTaskQueryRequest.swift
Why it matters. Breaks the MCP API deliberately while preventing malformed options from broadening queries.
What to look at. MCPTaskQueryRequest.parse
Transit/Transit/MCP/MCPToolHandler+TaskQuery.swift
Why it matters. Inputs map to ordered success or not-found/ambiguity outcomes, including repeats.
What to look at. batchQueryResults and queryTaskDictionary
Transit/Transit/MCP/MCPTaskQuerySnapshotStore.swift
Why it matters. Continuation survives task/comment changes and returns byte-identical pages.
What to look at. publish, page(for:), purgeExpired
Transit/Transit/MCP/MCPServer.swift
Why it matters. Old cursors cannot survive stop/restart or unexpected listener exit; stale callbacks cannot clear new pages.
What to look at. tearDownCurrentServer, launchServer, setNotRunning
Transit/TransitTests/MCPTaskQueryFailureTests.swift
Why it matters. Tests now observe original copied comment values after the underlying inputs change.
What to look at. duplicateBatchIDsUseOneTaskAndCommentFetch
Decision 1 requires initial detail/comment/page options and replaces the array payload. Existing clients must update their calls and response parsing.
Decisions 2–3 retain immutable JSON pages behind random tokens, bounded to eight snapshots and 16 MiB. New queries fail at capacity; active pages remain available until expiry.
Decision 4 reuses the existing fetch interface and preserves duplicate-identity detection. A small batch still reads all tasks.
Q6 requires clearing snapshots during teardown and the current generation’s completion callback. Generation checks protect replacement listeners.
| Severity | Area | Finding | Resolution |
|---|---|---|---|
| minor | Task query date formatting | A formatter was initialized for every unique task. | Share one ISO8601DateFormatter per initial query. |
| minor | Comments documentation | The agent note claimed comments were always included. | Document includeComments, omission, sorting, and frozen pagination. |
| minor | Frozen-comment regression test | The continued page held only a missing-ID outcome, so the test never verified frozen comment values. | Put a resolved repeated task on a later page and assert original name/comment contents and IDs after edits, removal, creation, and unavailable fetchers. |
Source: local run at 2026-10-03T12:15:31.888077+10:00 · snapshot a61f911b34de508143751e6ecd3ec483c14f1588 (dirty working tree)
Baseline: none
Execution: passed · JUnit: none · Coverage: none · Baseline: absent
Coverage scope: as the project configures it
The test runner could not be detected.
Derived by declaration name, from the diff (no baseline run).
Files that import a changed file on the left, changed files in the centre, files a changed file imports on the right. Snapshot working-tree against base 93f1b1908f7724a97cabfb574e4171710dc58a07.
48 files: 39 code · 9 docs. Click to expand.
diff --git a/Transit/Transit/MCP/MCPServer.swift b/Transit/Transit/MCP/MCPServer.swiftindex 623dbfd..0d53cdd 100644--- a/Transit/Transit/MCP/MCPServer.swift+++ b/Transit/Transit/MCP/MCPServer.swift@@ -129,6 +129,7 @@ extension MCPServer { } private func tearDownCurrentServer() async {+ toolHandler.setTaskQueryAdmission(open: false) guard let currentServer = activeServer else { return } // Task cancellation only cancels ServiceGroup's child tasks; it does@@ -146,18 +147,23 @@ extension MCPServer { await currentServer.task.value } + /// Ignore completion from a listener replaced by a newer generation.+ func listenerDidExit(generation: Int, failure: String?) {+ guard serverGeneration == generation else { return }+ toolHandler.setTaskQueryAdmission(open: false)+ activeServer = nil+ if let failure { startError = failure }+ }+ private func launchServer(port: Int, runID: Int) { serverGeneration += 1 let currentGeneration = serverGeneration startError = nil + toolHandler.setTaskQueryAdmission(open: true) let handler = toolHandler let setNotRunning = { @MainActor [weak self] (failure: String?) in- guard let self, self.serverGeneration == currentGeneration else { return }- self.activeServer = nil- if let failure {- self.startError = failure- }+ self?.listenerDidExit(generation: currentGeneration, failure: failure) } let app = Application( router: Self.makeRouter(handler: handler),
diff --git a/Transit/Transit/MCP/MCPTaskQueryRequest.swift b/Transit/Transit/MCP/MCPTaskQueryRequest.swiftnew file mode 100644index 0000000..7c04b38--- /dev/null+++ b/Transit/Transit/MCP/MCPTaskQueryRequest.swift@@ -0,0 +1,95 @@+#if os(macOS)+import Foundation++struct MCPTaskQueryError: Error {+ let code: String+ let message: String++ static func invalid(_ message: String) -> Self { Self(code: "INVALID_INPUT", message: message) }+}++struct MCPTaskQueryRequest {+ enum Selector {+ case list+ case single(Int)+ case taskIDs([String])+ case displayIDs([Int])+ }++ let cursor: String?+ let detailLevel: String+ let includeComments: Bool+ let limit: Int+ let selector: Selector++ static let filterKeys: Set<String> = [+ "project", "projectId", "status", "not_status", "unfinished", "type", "priority",+ "milestone", "milestoneDisplayId", "search"+ ]++ // swiftlint:disable:next cyclomatic_complexity function_body_length+ static func parse(_ args: [String: Any]) throws -> Self {+ if let raw = args["cursor"] {+ guard args.count == 1 else {+ throw MCPTaskQueryError.invalid("Continuation requires only a cursor")+ }+ guard let cursor = raw as? String, UUID(uuidString: cursor) != nil else {+ throw MCPTaskQueryError(code: "INVALID_CURSOR", message: "Invalid cursor; start a new query")+ }+ return Self(cursor: cursor, detailLevel: "summary", includeComments: false, limit: 1, selector: .list)+ }+ let allowed = filterKeys.union([+ "detailLevel", "includeComments", "limit", "displayId", "taskIds", "displayIds"+ ])+ guard Set(args.keys).isSubset(of: allowed) else {+ throw MCPTaskQueryError.invalid("Unknown query field")+ }+ guard let detail = args["detailLevel"] as? String, ["summary", "full"].contains(detail) else {+ throw MCPTaskQueryError.invalid("detailLevel is required and must be summary or full")+ }+ guard let comments = IntentHelpers.parseBoolValue(args["includeComments"]) else {+ throw MCPTaskQueryError.invalid("includeComments is required and must be a boolean")+ }+ guard let limit = IntentHelpers.parseIntValue(args["limit"]), (1...100).contains(limit) else {+ throw MCPTaskQueryError.invalid("limit is required and must be an integer from 1 through 100")+ }+ let selectors = ["displayId", "taskIds", "displayIds"].filter { args[$0] != nil }+ guard selectors.count <= 1 else { throw MCPTaskQueryError.invalid("Use only one task selector") }+ if args["taskIds"] != nil || args["displayIds"] != nil {+ guard filterKeys.isDisjoint(with: args.keys) else {+ throw MCPTaskQueryError.invalid("Batch selectors cannot be combined with filters")+ }+ }+ let selector: Selector+ if let raw = args["displayId"] {+ guard let value = IntentHelpers.parseIntValue(raw) else {+ throw MCPTaskQueryError.invalid("displayId must be an integer")+ }+ selector = .single(value)+ } else if let raw = args["taskIds"] {+ let values = try batch(raw, key: "taskIds")+ guard let ids = values as? [String], ids.allSatisfy({ UUID(uuidString: $0) != nil }) else {+ throw MCPTaskQueryError.invalid("taskIds must contain valid UUID strings")+ }+ selector = .taskIDs(ids)+ } else if let raw = args["displayIds"] {+ let values = try batch(raw, key: "displayIds")+ let ids = values.compactMap { IntentHelpers.parseIntValue($0) }+ guard ids.count == values.count else {+ throw MCPTaskQueryError.invalid("displayIds must contain integers")+ }+ selector = .displayIDs(ids)+ } else {+ selector = .list+ }+ return Self(cursor: nil, detailLevel: detail, includeComments: comments, limit: limit, selector: selector)+ }++ private static func batch(_ raw: Any, key: String) throws -> [Any] {+ guard let values = raw as? [Any], (1...100).contains(values.count) else {+ throw MCPTaskQueryError.invalid("\(key) must contain 1 through 100 identifiers")+ }+ return values+ }+}+#endif
diff --git a/Transit/Transit/MCP/MCPTaskQuerySnapshotStore.swift b/Transit/Transit/MCP/MCPTaskQuerySnapshotStore.swiftnew file mode 100644index 0000000..d510a57--- /dev/null+++ b/Transit/Transit/MCP/MCPTaskQuerySnapshotStore.swift@@ -0,0 +1,80 @@+#if os(macOS)+import Foundation++@MainActor+final class MCPTaskQuerySnapshotStore {+ private struct Snapshot {+ let deadline: ContinuousClock.Instant+ let pages: [String: String]+ let byteCount: Int+ }++ let now: () -> ContinuousClock.Instant+ let wallNow: () -> Date+ let makeCursor: () -> String+ let maxBytes: Int+ private let maxSnapshots: Int+ private var snapshots: [Snapshot] = []+ private(set) var retainedBytes = 0++ init(+ now: @escaping () -> ContinuousClock.Instant = { .now },+ wallNow: @escaping () -> Date = Date.init,+ makeCursor: @escaping () -> String = { UUID().uuidString },+ maxSnapshots: Int = 8,+ maxBytes: Int = 16 * 1024 * 1024+ ) {+ self.now = now+ self.wallNow = wallNow+ self.makeCursor = makeCursor+ self.maxSnapshots = maxSnapshots+ self.maxBytes = maxBytes+ }++ func purgeExpired() {+ let instant = now()+ snapshots.removeAll { instant >= $0.deadline }+ retainedBytes = snapshots.reduce(0) { $0 + $1.byteCount }+ }++ func publish(pages: [String], cursors: [String], deadline: ContinuousClock.Instant) throws {+ purgeExpired()+ guard now() < deadline else {+ throw MCPTaskQueryError(code: "QUERY_EXPIRED",+ message: "Query expired during preparation; start a new query")+ }+ let bytes = pages.reduce(0) { $0 + $1.utf8.count }+ guard bytes <= maxBytes else { throw capacityError() }+ guard !pages.isEmpty, cursors.count == pages.count - 1,+ Set(cursors).count == cursors.count,+ cursors.allSatisfy({ token in+ UUID(uuidString: token) != nil && !snapshots.contains { $0.pages[token] != nil }+ }) else {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Could not publish query pages")+ }+ guard pages.count > 1 else { return }+ guard snapshots.count < maxSnapshots, retainedBytes <= maxBytes - bytes else { throw capacityError() }+ let mapping = Dictionary(uniqueKeysWithValues: zip(cursors, pages.dropFirst()))+ snapshots.append(Snapshot(deadline: deadline, pages: mapping, byteCount: bytes))+ retainedBytes += bytes+ }++ func page(for cursor: String) throws -> String {+ purgeExpired()+ guard let page = snapshots.lazy.compactMap({ $0.pages[cursor] }).first else {+ throw MCPTaskQueryError(code: "INVALID_CURSOR", message: "Unknown or expired cursor; start a new query")+ }+ return page+ }++ func clear() {+ snapshots.removeAll()+ retainedBytes = 0+ }++ func capacityError() -> MCPTaskQueryError {+ MCPTaskQueryError(code: "QUERY_CAPACITY_EXCEEDED",+ message: "Query capacity exceeded; reduce scope/comments or retry after expiry")+ }+}+#endif
diff --git a/Transit/Transit/MCP/MCPToolDefinitions.swift b/Transit/Transit/MCP/MCPToolDefinitions.swiftindex 500df1c..3d978b9 100644--- a/Transit/Transit/MCP/MCPToolDefinitions.swift+++ b/Transit/Transit/MCP/MCPToolDefinitions.swift@@ -2,7 +2,8 @@ // MARK: - Tool Definitions -nonisolated enum MCPToolDefinitions {+nonisolated // swiftlint:disable:next type_body_length+enum MCPToolDefinitions { static let coreTools: [MCPToolDefinition] = [ createTask, updateTaskStatus, queryTasks, addComment, getProjects, createProject, createMilestone, queryMilestones, updateMilestone, deleteMilestone, updateTask@@ -100,14 +101,27 @@ nonisolated enum MCPToolDefinitions { ) ) - // swiftlint:disable:next line_length- private static let queryTasksDescription = "Search and filter tasks. All filters are optional — omit all to return every task. Use displayId for single-task lookup with full details. Use project for case-insensitive name filtering. status accepts an array of statuses to include. not_status accepts an array of statuses to exclude. priority accepts an array of priorities to include. unfinished=true excludes done and abandoned tasks (merged with not_status if both provided). Use search for case-insensitive substring matching on task name and description."-- static let queryTasks = MCPToolDefinition(- name: "query_tasks",- description: queryTasksDescription,- inputSchema: .object(- properties: [+ private static let queryTasksDescription = """+ Query tasks with required detailLevel (summary/full), includeComments (boolean), and limit (1–100).+ Filters are optional; displayId accepts the same filters. Choose at most one selector: displayId,+ taskIds or displayIds (batches of 1–100 identifiers, no filters). Returns {results,nextCursor,expiresAt}.+ Lists sort by task UUID; batch outcomes retain input order/index, requested identity, and task or error+ (TASK_NOT_FOUND/AMBIGUOUS_TASK_ID). Full detail includes nullable description and nonempty metadata.+ Continue with only cursor. Results are frozen for five minutes; replay does not extend expiry.+ Whole-query errors are {error:{code,message}}: INVALID_INPUT, AMBIGUOUS_TASK_ID, AMBIGUOUS_FILTER,+ QUERY_FAILED, INVALID_CURSOR (start a new query), QUERY_EXPIRED, QUERY_UNAVAILABLE, or+ QUERY_CAPACITY_EXCEEDED (reduce scope/comments or retry after expiry). Unknown fields are rejected.+ status/not_status/priority accept arrays; unfinished excludes done/abandoned; search matches name/description.+ """++ private static let queryTaskProperties: [String: JSONSchemaProperty] = [+ "detailLevel": .stringEnum("Required task detail", values: ["summary", "full"]),+ "includeComments": .boolean("Required: include comments ordered by creation date and UUID"),+ "limit": .integer("Required page size, 1 through 100"),+ "taskIds": .array("Batch of 1 through 100 UUIDs; no filters or other selectors"),+ "displayIds": .array(+ "Batch of 1 through 100 integer IDs; no filters or other selectors", itemType: "integer"+ ), "displayId": .integer("Task display ID for single-task lookup (e.g. 42 for T-42)"), "status": .array( "Filter by status (include tasks matching any listed status)",@@ -131,9 +145,16 @@ nonisolated enum MCPToolDefinitions { "search": .string("Text search on task name and description (case-insensitive substring match)"), "milestone": .string("Filter by milestone name"), "milestoneDisplayId": .integer("Filter by milestone display ID (e.g. 3 for M-3)")- ],- required: []- )+ ]++ static let queryTasks = MCPToolDefinition(+ name: "query_tasks", description: queryTasksDescription,+ inputSchema: JSONSchema(type: "object", properties: nil, required: nil, oneOf: [+ JSONSchema(type: "object", properties: queryTaskProperties,+ required: ["detailLevel", "includeComments", "limit"], additionalProperties: false),+ JSONSchema(type: "object", properties: ["cursor": .string("Opaque next-page cursor; send alone")],+ required: ["cursor"], additionalProperties: false)+ ]) ) private static let addCommentDescription = "Add a comment to a task. Identify the task by displayId or taskId."
diff --git a/Transit/Transit/MCP/MCPToolHandler+TaskQuery.swift b/Transit/Transit/MCP/MCPToolHandler+TaskQuery.swiftnew file mode 100644index 0000000..54943b5--- /dev/null+++ b/Transit/Transit/MCP/MCPToolHandler+TaskQuery.swift@@ -0,0 +1,309 @@+#if os(macOS)+import Foundation++extension MCPToolHandler {+ func handleQueryTasks(_ args: [String: Any]) -> MCPToolResult {+ do {+ guard taskQueryAdmissionOpen else {+ throw MCPTaskQueryError(code: "QUERY_UNAVAILABLE",+ message: "Query unavailable; retry when server is running")+ }+ let request = try MCPTaskQueryRequest.parse(args)+ taskQuerySnapshots.purgeExpired()+ if let cursor = request.cursor { return textResult(try taskQuerySnapshots.page(for: cursor)) }+ let deadline = taskQuerySnapshots.now().advanced(by: .seconds(300))+ let expiry = taskQuerySnapshots.wallNow().addingTimeInterval(300)+ let results = try queryResults(request, args: args)+ return textResult(try encodeQueryPages(results, limit: request.limit, expiry: expiry, deadline: deadline))+ } catch let error as MCPTaskQueryError {+ return queryErrorResult(error)+ } catch {+ return queryErrorResult(MCPTaskQueryError(code: "QUERY_FAILED", message: "Query failed: \(error)"))+ }+ }++ private func queryErrorResult(_ error: MCPTaskQueryError) -> MCPToolResult {+ errorResult(IntentHelpers.encodeJSON(["error": ["code": error.code, "message": error.message]]))+ }++ private func queryResults(_ request: MCPTaskQueryRequest, args: [String: Any]) throws -> [[String: Any]] {+ let formatter = ISO8601DateFormatter()+ switch request.selector {+ case .taskIDs, .displayIDs:+ return try batchQueryResults(request, formatter: formatter)+ case .list, .single:+ guard let filters = try taskQueryFilters(args) else { return [] }+ let tasks: [TransitTask]+ switch request.selector {+ case .single(let displayId):+ do {+ tasks = [try taskService.findByDisplayID(displayId)]+ } catch TaskService.Error.taskNotFound {+ return []+ } catch TaskService.Error.duplicateDisplayID {+ throw MCPTaskQueryError(code: "AMBIGUOUS_TASK_ID",+ message: duplicateTaskIdentifierMessage(displayId: displayId))+ } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Lookup failed: \(error)")+ }+ default:+ do { tasks = try taskFetcher.fetchAllTasks() } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to fetch tasks: \(error)")+ }+ }+ return try tasks.filter { filters.matches($0) }.sorted { $0.id.uuidString < $1.id.uuidString }+ .map { try queryTaskDictionary($0, request: request, formatter: formatter) }+ }+ }++ private func batchQueryResults(+ _ request: MCPTaskQueryRequest, formatter: ISO8601DateFormatter+ ) throws -> [[String: Any]] {+ let tasks: [TransitTask]+ do { tasks = try taskFetcher.fetchAllTasks() } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to fetch tasks: \(error)")+ }+ let inputs: [(requested: [String: Any], key: String)]+ let index: [String: [TransitTask]]+ switch request.selector {+ case .taskIDs(let ids):+ inputs = ids.map { (["taskId": $0], UUID(uuidString: $0)!.uuidString) }+ index = Dictionary(grouping: tasks) { $0.id.uuidString }+ case .displayIDs(let ids):+ inputs = ids.map { (["displayId": $0], String($0)) }+ index = Dictionary(grouping: tasks.filter { $0.permanentDisplayId != nil }) {+ String($0.permanentDisplayId!)+ }+ default: return []+ }+ var serialized: [UUID: [String: Any]] = [:]+ return try inputs.enumerated().map { position, input in+ var outcome: [String: Any] = ["index": position, "requested": input.requested]+ let matches = index[input.key] ?? []+ if matches.count == 1, let task = matches.first {+ if serialized[task.id] == nil {+ serialized[task.id] = try queryTaskDictionary(task, request: request, formatter: formatter)+ }+ outcome["task"] = serialized[task.id]+ } else {+ let code = matches.isEmpty ? "TASK_NOT_FOUND" : "AMBIGUOUS_TASK_ID"+ let field = input.requested.keys.first ?? "identifier"+ let identifier = input.requested[field] ?? input.key+ let message = matches.isEmpty ? "No task matches \(field) \(identifier)"+ : "Multiple tasks match \(field) \(identifier)"+ outcome["error"] = ["code": code, "message": message]+ }+ return outcome+ }+ }++ private func queryTaskDictionary(+ _ task: TransitTask, request: MCPTaskQueryRequest, formatter: ISO8601DateFormatter+ ) throws -> [String: Any] {+ var dict = IntentHelpers.taskToDict(task, formatter: formatter, detailed: request.detailLevel == "full")+ if request.detailLevel == "full" {+ dict["description"] = task.taskDescription.map { $0 as Any } ?? NSNull()+ }+ if request.includeComments {+ let comments: [Comment]+ do { comments = try commentFetcher.fetchComments(for: task.id) } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to fetch comments: \(error)")+ }+ dict["comments"] = comments.sorted {+ if $0.creationDate == $1.creationDate { return $0.id.uuidString < $1.id.uuidString }+ return $0.creationDate < $1.creationDate+ }.map { [+ "id": $0.id.uuidString, "authorName": $0.authorName, "content": $0.content,+ "isAgent": $0.isAgent, "creationDate": formatter.string(from: $0.creationDate)+ ] as [String: Any] }+ }+ return dict+ }++ func encodeQueryPages(+ _ results: [[String: Any]], limit: Int, expiry: Date, deadline: ContinuousClock.Instant+ ) throws -> String {+ let count = max(1, (results.count + limit - 1) / limit)+ let cursors = (0..<(count - 1)).map { _ in taskQuerySnapshots.makeCursor() }+ let expiryText = ISO8601DateFormatter().string(from: expiry)+ var pages: [String] = []+ var bytes = 0+ for position in 0..<count {+ let start = position * limit+ let end = min(start + limit, results.count)+ let next: Any = position < cursors.count ? cursors[position] : NSNull()+ let payload: [String: Any] = ["results": Array(results[start..<end]),+ "nextCursor": next, "expiresAt": expiryText]+ let data = try JSONSerialization.data(withJSONObject: payload, options: [.sortedKeys])+ bytes += data.count+ guard bytes <= taskQuerySnapshots.maxBytes else { throw taskQuerySnapshots.capacityError() }+ guard let text = String(data: data, encoding: .utf8) else {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Could not encode query page")+ }+ pages.append(text)+ }+ try taskQuerySnapshots.publish(pages: pages, cursors: cursors, deadline: deadline)+ return pages[0]+ }++ private func projectQueryError(_ error: ProjectLookupError) -> MCPTaskQueryError {+ let code: String+ switch error {+ case .storageFailure: code = "QUERY_FAILED"+ case .ambiguous: code = "AMBIGUOUS_FILTER"+ default: code = "INVALID_INPUT"+ }+ return MCPTaskQueryError(code: code, message: IntentHelpers.mapProjectLookupError(error).hint)+ }++ // Preserve the established validation order and filter precedence.+ // swiftlint:disable:next cyclomatic_complexity function_body_length+ private func taskQueryFilters(_ args: [String: Any]) throws -> MCPQueryFilters? {+ // Reject malformed or non-string projectId when the key is present+ // [T-665, T-788].+ let parsedProjectId: UUID?+ switch parseProjectIdArgument(args) {+ case .failure(.message(let message)): throw MCPTaskQueryError.invalid(message)+ case .success(let parsed): parsedProjectId = parsed+ }+ // Reject non-string `project` filter [T-1116].+ if args["project"] != nil, !(args["project"] is String) {+ throw MCPTaskQueryError.invalid("project must be a string")+ }+ // Resolve a valid project ID to an existing project before filtering [T-1783].+ var projectFilter: UUID?+ var resolvedProject: Project?+ if let pid = parsedProjectId {+ // A valid UUID is still an invalid project filter when no matching+ // project exists. Resolve it before applying the in-memory filter so+ // MCP matches the project-name and QueryTasksIntent contracts.+ switch projectService.findProject(id: pid) {+ case .success(let found):+ resolvedProject = found+ projectFilter = found.id+ case .failure(let err): throw projectQueryError(err)+ }+ } else if let name = args["project"] as? String,+ !name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {+ switch projectService.findProject(id: nil, name: name) {+ case .success(let found):+ resolvedProject = found+ projectFilter = found.id+ case .failure(let err): throw projectQueryError(err)+ }+ }++ // Validate every remaining filter before resolving a milestone. A no-match or+ // storage failure must not let a malformed filter look like a valid empty result.+ // This also preserves validation when displayId would otherwise return early. [T-1608]+ // Reject non-integer milestoneDisplayId when key is present [T-613].+ if args["milestoneDisplayId"] != nil, IntentHelpers.parseIntValue(args["milestoneDisplayId"]) == nil {+ throw MCPTaskQueryError.invalid("milestoneDisplayId must be an integer")+ }+ // Reject non-string `milestone` name filter [T-1266]. Without this guard a+ // numeric/boolean/array milestone falls through the `as? String` cast below+ // to the "no milestone filter" branch, returning every task unfiltered.+ if args["milestone"] != nil, !(args["milestone"] is String) {+ throw MCPTaskQueryError.invalid("milestone must be a string")+ }+ // Validate enum filters before building MCPQueryFilters [T-732].+ if let error = validateEnumFilter(args, key: "status", type: TaskStatus.self) {+ throw MCPTaskQueryError.invalid(error.content.first?.text ?? "Invalid filter")+ }+ if let error = validateEnumFilter(args, key: "not_status", type: TaskStatus.self) {+ throw MCPTaskQueryError.invalid(error.content.first?.text ?? "Invalid filter")+ }+ // type is a single-value filter (schema declares a string enum; read back as+ // args["type"] as? String). Reject arrays so they aren't silently dropped. [T-1404]+ if let error = validateEnumFilter(args, key: "type", type: TaskType.self, allowArray: false) {+ throw MCPTaskQueryError.invalid(error.content.first?.text ?? "Invalid filter")+ }+ // priority is a multi-value filter (schema declares an array, mirroring status).+ if let error = validateEnumFilter(args, key: "priority", type: TaskPriority.self, allowArray: true) {+ throw MCPTaskQueryError.invalid(error.content.first?.text ?? "Invalid filter")+ }+ // Reject a present-but-non-boolean `unfinished` flag [T-1095]. A plain+ // `as? Bool` would silently coerce "true"/1/null to false, returning+ // done/abandoned tasks even though the caller requested unfinished-only.+ if let unfinishedArg = args["unfinished"], IntentHelpers.parseBoolValue(unfinishedArg) == nil {+ throw MCPTaskQueryError.invalid("unfinished must be a boolean")+ }+ // Reject non-string `search` filter [T-1156]. A present non-string value must not be+ // silently dropped by `as? String`, which would broaden results instead of erroring.+ if args["search"] != nil, !(args["search"] is String) {+ throw MCPTaskQueryError.invalid("search must be a string")+ }+ // Reject non-integer displayId before a milestone no-match or failure can return early [T-634].+ if args["displayId"] != nil, IntentHelpers.parseIntValue(args["displayId"]) == nil {+ throw MCPTaskQueryError.invalid("displayId must be an integer")+ }++ // Resolve milestone filter.+ var milestoneFilter: Set<UUID>?+ if let milestoneDisplayId = IntentHelpers.parseIntValue(args["milestoneDisplayId"]) {+ do {+ milestoneFilter = [try milestoneDisplayIDFinder.findByDisplayID(milestoneDisplayId).id]+ } catch MilestoneService.Error.milestoneNotFound {+ return nil+ } catch MilestoneService.Error.duplicateDisplayID {+ throw MCPTaskQueryError(+ code: "AMBIGUOUS_FILTER",+ message: "Duplicate milestone identifier detected for displayId \(milestoneDisplayId)"+ )+ } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to look up milestone: \(error)")+ }+ } else if let milestoneName = args["milestone"] as? String,+ !milestoneName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {+ if let projectFilter {+ // Scoped to a single project — at most one milestone matches.+ guard let project = resolvedProject else {+ return nil+ }+ do {+ guard let milestone = try milestoneService.findByName(milestoneName, in: project) else {+ return nil+ }+ milestoneFilter = [milestone.id]+ } catch MilestoneService.Error.ambiguousName {+ throw MCPTaskQueryError(code: "AMBIGUOUS_FILTER", message:+ "Multiple milestones named '\(milestoneName)' exist in project '\(project.name)'"+ )+ } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to look up milestone: \(error)")+ }+ } else {+ // No project filter — collect ALL milestones with this name across projects.+ // A storage failure must remain distinct from a valid no-match response. [T-1608]+ let allMilestones: [Milestone]+ do {+ allMilestones = try milestoneFetcher.fetchAllMilestones()+ } catch {+ throw MCPTaskQueryError(code: "QUERY_FAILED", message: "Failed to fetch milestones: \(error)")+ }+ let matchingIds = Set(+ allMilestones+ .filter {+ MilestoneNamePolicy.normalized($0.name)+ == MilestoneNamePolicy.normalized(milestoneName)+ }+ .map(\.id)+ )+ if matchingIds.isEmpty {+ return nil+ }+ milestoneFilter = matchingIds+ }+ }++ let search = (args["search"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)+ let filters = MCPQueryFilters.from(+ args: args, type: args["type"] as? String, projectId: projectFilter,+ search: search?.isEmpty == true ? nil : search,+ milestoneIds: milestoneFilter+ )++ return filters+ }+}+#endif
diff --git a/Transit/Transit/MCP/MCPToolHandler.swift b/Transit/Transit/MCP/MCPToolHandler.swiftindex 5e0c3b3..8729b36 100644--- a/Transit/Transit/MCP/MCPToolHandler.swift+++ b/Transit/Transit/MCP/MCPToolHandler.swift@@ -16,18 +16,28 @@ extension MilestoneService: MilestoneDisplayIDFinding {} // swiftlint:disable:next type_body_length final class MCPToolHandler { - private let taskService: TaskService- private let taskFetcher: any TaskFetching- private let projectService: ProjectService+ let taskService: TaskService+ let taskFetcher: any TaskFetching+ let projectService: ProjectService private let commentService: CommentService- private let commentFetcher: any CommentFetching- private let milestoneService: MilestoneService- private let milestoneFetcher: any MilestoneFetching- private let milestoneDisplayIDFinder: any MilestoneDisplayIDFinding+ let commentFetcher: any CommentFetching+ let milestoneService: MilestoneService+ let milestoneFetcher: any MilestoneFetching+ let milestoneDisplayIDFinder: any MilestoneDisplayIDFinding private let maintenanceService: DisplayIDMaintenanceService private let settings: MCPSettings private let persistence: PersistenceAvailability + let taskQuerySnapshots: MCPTaskQuerySnapshotStore+ private(set) var taskQueryAdmissionOpen = true++ func setTaskQueryAdmission(open: Bool) {+ taskQueryAdmissionOpen = open+ taskQuerySnapshots.clear()+ }++ func clearTaskQuerySnapshots() { taskQuerySnapshots.clear() }+ /// Tools that only read. private static let readOnlyToolNames: Set<String> = [ "query_tasks", "query_milestones", "get_projects", "scan_duplicate_display_ids"@@ -51,7 +61,8 @@ final class MCPToolHandler { taskFetcher: (any TaskFetching)? = nil, commentFetcher: (any CommentFetching)? = nil, milestoneFetcher: (any MilestoneFetching)? = nil,- milestoneDisplayIDFinder: (any MilestoneDisplayIDFinding)? = nil+ milestoneDisplayIDFinder: (any MilestoneDisplayIDFinding)? = nil,+ taskQuerySnapshots: MCPTaskQuerySnapshotStore? = nil ) { self.taskService = taskService self.taskFetcher = taskFetcher ?? taskService@@ -64,6 +75,7 @@ final class MCPToolHandler { self.maintenanceService = maintenanceService self.settings = settings self.persistence = persistence+ self.taskQuerySnapshots = taskQuerySnapshots ?? MCPTaskQuerySnapshotStore() } // MARK: - JSON-RPC Dispatch@@ -553,201 +565,6 @@ final class MCPToolHandler { return textResult(IntentHelpers.encodeJSON(response)) } - // MARK: - query_tasks-- // swiftlint:disable:next cyclomatic_complexity function_body_length- private func handleQueryTasks(_ args: [String: Any]) -> MCPToolResult {- // Reject malformed or non-string projectId when the key is present- // [T-665, T-788].- let parsedProjectId: UUID?- switch parseProjectIdArgument(args) {- case .failure(.message(let message)): return errorResult(message)- case .success(let parsed): parsedProjectId = parsed- }- // Reject non-string `project` filter [T-1116].- if args["project"] != nil, !(args["project"] is String) {- return errorResult("project must be a string")- }- // Resolve a valid project ID to an existing project before filtering [T-1783].- var projectFilter: UUID?- var resolvedProject: Project?- if let pid = parsedProjectId {- // A valid UUID is still an invalid project filter when no matching- // project exists. Resolve it before applying the in-memory filter so- // MCP matches the project-name and QueryTasksIntent contracts.- switch projectService.findProject(id: pid) {- case .success(let found):- resolvedProject = found- projectFilter = found.id- case .failure(let err): return errorResult(IntentHelpers.mapProjectLookupError(err).hint)- }- } else if let name = args["project"] as? String,- !name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {- switch projectService.findProject(id: nil, name: name) {- case .success(let found):- resolvedProject = found- projectFilter = found.id- case .failure(let err): return errorResult(IntentHelpers.mapProjectLookupError(err).hint)- }- }-- // Validate every remaining filter before resolving a milestone. A no-match or- // storage failure must not let a malformed filter look like a valid empty result.- // This also preserves validation when displayId would otherwise return early. [T-1608]- // Reject non-integer milestoneDisplayId when key is present [T-613].- if args["milestoneDisplayId"] != nil, IntentHelpers.parseIntValue(args["milestoneDisplayId"]) == nil {- return errorResult("milestoneDisplayId must be an integer")- }- // Reject non-string `milestone` name filter [T-1266]. Without this guard a- // numeric/boolean/array milestone falls through the `as? String` cast below- // to the "no milestone filter" branch, returning every task unfiltered.- if args["milestone"] != nil, !(args["milestone"] is String) {- return errorResult("milestone must be a string")- }- // Validate enum filters before building MCPQueryFilters [T-732].- if let error = validateEnumFilter(args, key: "status", type: TaskStatus.self) { return error }- if let error = validateEnumFilter(args, key: "not_status", type: TaskStatus.self) { return error }- // type is a single-value filter (schema declares a string enum; read back as- // args["type"] as? String). Reject arrays so they aren't silently dropped. [T-1404]- if let error = validateEnumFilter(args, key: "type", type: TaskType.self, allowArray: false) {- return error- }- // priority is a multi-value filter (schema declares an array, mirroring status).- if let error = validateEnumFilter(args, key: "priority", type: TaskPriority.self, allowArray: true) {- return error- }- // Reject a present-but-non-boolean `unfinished` flag [T-1095]. A plain- // `as? Bool` would silently coerce "true"/1/null to false, returning- // done/abandoned tasks even though the caller requested unfinished-only.- if let unfinishedArg = args["unfinished"], IntentHelpers.parseBoolValue(unfinishedArg) == nil {- return errorResult("unfinished must be a boolean")- }- // Reject non-string `search` filter [T-1156]. A present non-string value must not be- // silently dropped by `as? String`, which would broaden results instead of erroring.- if args["search"] != nil, !(args["search"] is String) {- return errorResult("search must be a string")- }- // Reject non-integer displayId before a milestone no-match or failure can return early [T-634].- if args["displayId"] != nil, IntentHelpers.parseIntValue(args["displayId"]) == nil {- return errorResult("displayId must be an integer")- }-- // Resolve milestone filter.- var milestoneFilter: Set<UUID>?- if let milestoneDisplayId = IntentHelpers.parseIntValue(args["milestoneDisplayId"]) {- do {- milestoneFilter = [try milestoneDisplayIDFinder.findByDisplayID(milestoneDisplayId).id]- } catch MilestoneService.Error.milestoneNotFound {- return textResult(IntentHelpers.encodeJSONArray([]))- } catch MilestoneService.Error.duplicateDisplayID {- return errorResult("Duplicate milestone identifier detected for displayId \(milestoneDisplayId)")- } catch {- return errorResult("Failed to look up milestone: \(error)")- }- } else if let milestoneName = args["milestone"] as? String,- !milestoneName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {- if let projectFilter {- // Scoped to a single project — at most one milestone matches.- guard let project = resolvedProject else {- return textResult(IntentHelpers.encodeJSONArray([]))- }- do {- guard let milestone = try milestoneService.findByName(milestoneName, in: project) else {- return textResult(IntentHelpers.encodeJSONArray([]))- }- milestoneFilter = [milestone.id]- } catch MilestoneService.Error.ambiguousName {- return errorResult(- "Multiple milestones named '\(milestoneName)' exist in project '\(project.name)'"- )- } catch {- return errorResult("Failed to look up milestone: \(error)")- }- } else {- // No project filter — collect ALL milestones with this name across projects.- // A storage failure must remain distinct from a valid no-match response. [T-1608]- let allMilestones: [Milestone]- do {- allMilestones = try milestoneFetcher.fetchAllMilestones()- } catch {- return errorResult("Failed to fetch milestones: \(error)")- }- let matchingIds = Set(- allMilestones- .filter {- MilestoneNamePolicy.normalized($0.name)- == MilestoneNamePolicy.normalized(milestoneName)- }- .map(\.id)- )- if matchingIds.isEmpty {- return textResult(IntentHelpers.encodeJSONArray([]))- }- milestoneFilter = matchingIds- }- }-- let search = (args["search"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)- let filters = MCPQueryFilters.from(- args: args, type: args["type"] as? String, projectId: projectFilter,- search: search?.isEmpty == true ? nil : search,- milestoneIds: milestoneFilter- )-- // Single-task lookup by displayId — returns early with detailed response.- if let displayId = IntentHelpers.parseIntValue(args["displayId"]) {- return handleDisplayIdLookup(displayId, filters: filters)- }-- // Full-table query.- let allTasks: [TransitTask]- do {- allTasks = try taskFetcher.fetchAllTasks()- } catch {- return errorResult("Failed to fetch tasks: \(error)")- }-- let filtered = allTasks.filter { filters.matches($0) }- let isoFormatter = ISO8601DateFormatter()- let results: [[String: Any]]- do {- results = try filtered.map { try taskToDict($0, formatter: isoFormatter) }- } catch {- return errorResult("Failed to fetch comments: \(error)")- }- return textResult(IntentHelpers.encodeJSONArray(results))- }-- private func handleDisplayIdLookup(- _ displayId: Int, filters: MCPQueryFilters- ) -> MCPToolResult {- let task: TransitTask- do {- task = try taskService.findByDisplayID(displayId)- } catch TaskService.Error.taskNotFound {- return textResult(IntentHelpers.encodeJSONArray([]))- } catch TaskService.Error.duplicateDisplayID {- // Name the duplicate explicitly rather than leaking the raw error, so- // query_tasks reports it the same way the mutation tools do. [T-1837]- return errorResult(duplicateTaskIdentifierMessage(displayId: displayId))- } catch {- return errorResult("Lookup failed: \(error)")- }-- guard filters.matches(task) else {- return textResult(IntentHelpers.encodeJSONArray([]))- }-- let isoFormatter = ISO8601DateFormatter()- let dict: [String: Any]- do {- dict = try taskToDict(task, formatter: isoFormatter, detailed: true)- } catch {- return errorResult("Failed to fetch comments: \(error)")- }- return textResult(IntentHelpers.encodeJSONArray([dict]))- }- } // MARK: - create_milestone@@ -1366,13 +1183,13 @@ extension MCPToolHandler { } /// Message for a display ID matched by more than one task. [T-1837]- private func duplicateTaskIdentifierMessage(displayId: Int?) -> String {+ func duplicateTaskIdentifierMessage(displayId: Int?) -> String { guard let displayId else { return "Duplicate task identifier detected" } return "Duplicate task identifier detected for displayId \(displayId)" } - private func textResult(_ text: String) -> MCPToolResult { MCPToolResult(content: [.text(text)], isError: nil) }- private func errorResult(_ message: String) -> MCPToolResult {+ func textResult(_ text: String) -> MCPToolResult { MCPToolResult(content: [.text(text)], isError: nil) }+ func errorResult(_ message: String) -> MCPToolResult { MCPToolResult(content: [.text(message)], isError: true) } @@ -1415,7 +1232,7 @@ extension MCPToolHandler { /// key is absent, `.success(uuid)` when the value is a valid UUID string, /// or `.failure(.message(...))` when the key is present but the value is not /// a valid UUID string (covers non-string types too) [T-743, T-788].- private func parseProjectIdArgument(_ args: [String: Any]) -> Result<UUID?, ResolveError> {+ func parseProjectIdArgument(_ args: [String: Any]) -> Result<UUID?, ResolveError> { guard args["projectId"] != nil else { return .success(nil) } guard let pidStr = args["projectId"] as? String, let pid = UUID(uuidString: pidStr) else { return .failure(.message("Invalid projectId: expected a UUID string"))@@ -1436,7 +1253,7 @@ extension MCPToolHandler { /// If the key is present but the value is neither a String nor a [String] (e.g. a number, /// boolean, dictionary, or array containing non-string elements), this returns a /// field-specific error so malformed shapes cannot be silently treated as absent. [T-809, T-830]- private func validateEnumFilter<E: RawRepresentable & CaseIterable>(+ func validateEnumFilter<E: RawRepresentable & CaseIterable>( _ args: [String: Any], key: String, type: E.Type, allowArray: Bool = true ) -> MCPToolResult? where E.RawValue == String { guard let raw = args[key] else { return nil }@@ -1548,17 +1365,6 @@ extension MCPToolHandler { return dict } - private func taskToDict(- _ task: TransitTask, formatter: ISO8601DateFormatter, detailed: Bool = false- ) throws -> [String: Any] {- var dict = IntentHelpers.taskToDict(task, formatter: formatter, detailed: detailed)- let comments = try commentFetcher.fetchComments(for: task.id)- dict["comments"] = comments.map { [- "id": $0.id.uuidString, "authorName": $0.authorName, "content": $0.content,- "isAgent": $0.isAgent, "creationDate": formatter.string(from: $0.creationDate)- ] as [String: Any] }- return dict- } } #endif
diff --git a/Transit/Transit/MCP/MCPTypes.swift b/Transit/Transit/MCP/MCPTypes.swiftindex 962b268..e6d3bb3 100644--- a/Transit/Transit/MCP/MCPTypes.swift+++ b/Transit/Transit/MCP/MCPTypes.swift@@ -206,6 +206,8 @@ nonisolated struct JSONSchema: Encodable, Sendable { let type: String let properties: [String: JSONSchemaProperty]? let required: [String]?+ var oneOf: [JSONSchema]?+ var additionalProperties: Bool? static func object( properties: [String: JSONSchemaProperty],
diff --git a/Transit/TransitTests/BoolAsIntIdRejectionTests.swift b/Transit/TransitTests/BoolAsIntIdRejectionTests.swiftindex 68f81c7..ae73fd9 100644--- a/Transit/TransitTests/BoolAsIntIdRejectionTests.swift+++ b/Transit/TransitTests/BoolAsIntIdRejectionTests.swift@@ -1,3 +1,4 @@+// swiftlint:disable file_length import Foundation import SwiftData import Testing@@ -229,11 +230,12 @@ struct BoolAsIntIdRejectionMCPTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": Self.trueNum]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "displayId": Self.trueNum] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("displayId must be an integer")) } @@ -246,11 +248,12 @@ struct BoolAsIntIdRejectionMCPTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": Self.falseNum]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "milestoneDisplayId": Self.falseNum] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("milestoneDisplayId must be an integer")) }
diff --git a/Transit/TransitTests/MCPCommentFetchFailureTests.swift b/Transit/TransitTests/MCPCommentFetchFailureTests.swiftindex c305826..117feef 100644--- a/Transit/TransitTests/MCPCommentFetchFailureTests.swift+++ b/Transit/TransitTests/MCPCommentFetchFailureTests.swift@@ -32,12 +32,13 @@ struct MCPCommentFetchFailureTests { let displayId = try #require(task.permanentDisplayId) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: ["displayId": displayId]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": displayId] )) #expect(try MCPTestHelpers.isError(response)) #expect(- try MCPTestHelpers.errorText(response)+ try MCPTestHelpers.queryErrorMessage(response) == "Failed to fetch comments: simulated comment fetch failure" ) }@@ -51,12 +52,12 @@ struct MCPCommentFetchFailureTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: [:]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) #expect(try MCPTestHelpers.isError(response)) #expect(- try MCPTestHelpers.errorText(response)+ try MCPTestHelpers.queryErrorMessage(response) == "Failed to fetch comments: simulated comment fetch failure" ) }@@ -70,11 +71,12 @@ struct MCPCommentFetchFailureTests { let displayId = try #require(task.permanentDisplayId) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: ["displayId": displayId]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": displayId] )) #expect(try !MCPTestHelpers.isError(response))- let result = try #require(MCPTestHelpers.decodeArrayResult(response).first)+ let result = try #require(MCPTestHelpers.decodeQueryResults(response).first) #expect((result["comments"] as? [[String: Any]])?.isEmpty == true) }
diff --git a/Transit/TransitTests/MCPCommentTests.swift b/Transit/TransitTests/MCPCommentTests.swiftindex 76cab71..cb861f3 100644--- a/Transit/TransitTests/MCPCommentTests.swift+++ b/Transit/TransitTests/MCPCommentTests.swift@@ -255,10 +255,10 @@ struct MCPCommentTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let first = try #require(results.first) let comments = try #require(first["comments"] as? [[String: Any]]) #expect(comments.count == 1)@@ -283,10 +283,10 @@ struct MCPCommentTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let first = try #require(results.first) let comments = try #require(first["comments"] as? [[String: Any]]) #expect(comments.count == 2)@@ -303,10 +303,10 @@ struct MCPCommentTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let first = try #require(results.first) let comments = try #require(first["comments"] as? [[String: Any]]) #expect(comments.isEmpty)
diff --git a/Transit/TransitTests/MCPDuplicateTaskDisplayIDTests.swift b/Transit/TransitTests/MCPDuplicateTaskDisplayIDTests.swiftindex de49ca1..9e02a23 100644--- a/Transit/TransitTests/MCPDuplicateTaskDisplayIDTests.swift+++ b/Transit/TransitTests/MCPDuplicateTaskDisplayIDTests.swift@@ -109,7 +109,8 @@ struct MCPDuplicateTaskDisplayIDTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 42]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 42] )) try expectDuplicateError(response, displayId: 42)
diff --git a/Transit/TransitTests/MCPFallbackStorageRejectionTests.swift b/Transit/TransitTests/MCPFallbackStorageRejectionTests.swiftindex c77e1b5..26fe780 100644--- a/Transit/TransitTests/MCPFallbackStorageRejectionTests.swift+++ b/Transit/TransitTests/MCPFallbackStorageRejectionTests.swift@@ -139,10 +139,11 @@ struct MCPFallbackStorageRejectionTests { seedProjectAndTask(in: env.context) let tasks = await env.handler.handle(- MCPTestHelpers.toolCallRequest(tool: "query_tasks", arguments: [:])+ MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100]) ) #expect(try MCPTestHelpers.isError(tasks) == false)- #expect(try MCPTestHelpers.decodeArrayResult(tasks).count == 1)+ #expect(try MCPTestHelpers.decodeQueryResults(tasks).count == 1) let projects = await env.handler.handle( MCPTestHelpers.toolCallRequest(tool: "get_projects", arguments: [:])
diff --git a/Transit/TransitTests/MCPMilestoneIntegrationTests.swift b/Transit/TransitTests/MCPMilestoneIntegrationTests.swiftindex 8c723d6..896d778 100644--- a/Transit/TransitTests/MCPMilestoneIntegrationTests.swift+++ b/Transit/TransitTests/MCPMilestoneIntegrationTests.swift@@ -258,10 +258,11 @@ struct MCPMilestoneIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": 1]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestoneDisplayId": 1] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "In Milestone") }@@ -279,10 +280,10 @@ struct MCPMilestoneIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let first = try #require(results.first) let milestoneInfo = try #require(first["milestone"] as? [String: Any]) #expect(milestoneInfo["name"] as? String == "v1.0")@@ -317,10 +318,11 @@ struct MCPMilestoneIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": "v1.0"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestone": "v1.0"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2, "Both tasks from identically-named milestones should be returned") let names = Set(results.compactMap { $0["name"] as? String }) #expect(names.contains("Task A"))@@ -350,10 +352,11 @@ struct MCPMilestoneIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": "v1.0", "project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestone": "v1.0", "project": "Alpha"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Task A") }
diff --git a/Transit/TransitTests/MCPNonIntegerDisplayIdTests.swift b/Transit/TransitTests/MCPNonIntegerDisplayIdTests.swiftindex 00d48b2..ad888a9 100644--- a/Transit/TransitTests/MCPNonIntegerDisplayIdTests.swift+++ b/Transit/TransitTests/MCPNonIntegerDisplayIdTests.swift@@ -19,11 +19,12 @@ struct MCPNonIntegerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": displayId]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": displayId] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("displayId must be an integer")) } @@ -36,11 +37,12 @@ struct MCPNonIntegerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1.5]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 1.5] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("displayId must be an integer")) } @@ -53,10 +55,11 @@ struct MCPNonIntegerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 1] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Task") }
diff --git a/Transit/TransitTests/MCPNonStringProjectNameTests.swift b/Transit/TransitTests/MCPNonStringProjectNameTests.swiftindex e82c9c9..11fe740 100644--- a/Transit/TransitTests/MCPNonStringProjectNameTests.swift+++ b/Transit/TransitTests/MCPNonStringProjectNameTests.swift@@ -24,11 +24,12 @@ struct MCPNonStringProjectNameTests { // Numeric `project` must not fall through to "no filter applied". let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": 123]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "project": 123] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("project") && errorMessage.contains("string")) } @@ -41,11 +42,12 @@ struct MCPNonStringProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "project": true] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("project") && errorMessage.contains("string")) } @@ -58,11 +60,12 @@ struct MCPNonStringProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": ["Alpha"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "project": ["Alpha"]] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("project") && errorMessage.contains("string")) } @@ -131,10 +134,11 @@ struct MCPNonStringProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": " "]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "project": " "] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } }
diff --git a/Transit/TransitTests/MCPNonStringSearchFilterTests.swift b/Transit/TransitTests/MCPNonStringSearchFilterTests.swiftindex 7530b1d..efb2f70 100644--- a/Transit/TransitTests/MCPNonStringSearchFilterTests.swift+++ b/Transit/TransitTests/MCPNonStringSearchFilterTests.swift@@ -24,11 +24,12 @@ struct MCPNonStringSearchFilterTests { // Numeric `search` must not fall through to "no filter applied" and return all tasks. let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": 42]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": 42] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -39,11 +40,12 @@ struct MCPNonStringSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": true] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -54,11 +56,12 @@ struct MCPNonStringSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": ["login"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": ["login"]] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -83,11 +86,12 @@ struct MCPNonStringSearchFilterTests { // return every task — it must be rejected. let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": 42]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestone": 42] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("milestone") && errorMessage.contains("string")) } @@ -98,11 +102,12 @@ struct MCPNonStringSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": false]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestone": false] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("milestone") && errorMessage.contains("string")) } @@ -113,11 +118,12 @@ struct MCPNonStringSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": ["v1.0"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestone": ["v1.0"]] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("milestone") && errorMessage.contains("string")) } @@ -166,10 +172,11 @@ struct MCPNonStringSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "login"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "login"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Fix login") }
diff --git a/Transit/TransitTests/MCPNonStringSearchTests.swift b/Transit/TransitTests/MCPNonStringSearchTests.swiftindex 7087d9d..bf8daa8 100644--- a/Transit/TransitTests/MCPNonStringSearchTests.swift+++ b/Transit/TransitTests/MCPNonStringSearchTests.swift@@ -24,11 +24,12 @@ struct MCPNonStringSearchTests { // Numeric `search` must not fall through to "no filter applied". let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": 123]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": 123] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -41,11 +42,12 @@ struct MCPNonStringSearchTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": true] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -58,11 +60,12 @@ struct MCPNonStringSearchTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": ["login"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": ["login"]] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -76,11 +79,12 @@ struct MCPNonStringSearchTests { // An object `search` (JSON `{}`) must be rejected, not silently dropped. let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": ["key": "value"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": ["key": "value"]] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("search") && errorMessage.contains("string")) } @@ -166,10 +170,11 @@ struct MCPNonStringSearchTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": " "]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": " "] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } }
diff --git a/Transit/TransitTests/MCPNotificationDispatchTests.swift b/Transit/TransitTests/MCPNotificationDispatchTests.swiftindex d7cecd8..447af36 100644--- a/Transit/TransitTests/MCPNotificationDispatchTests.swift+++ b/Transit/TransitTests/MCPNotificationDispatchTests.swift@@ -109,7 +109,7 @@ struct MCPNotificationDispatchTests { "method":"tools/call", "params":{ "name":"query_tasks",- "arguments":{"displayId":\(displayId)}+ "arguments":{"displayId":\(displayId),"detailLevel":"full","includeComments":false,"limit":100} } }, {@@ -133,7 +133,7 @@ struct MCPNotificationDispatchTests { let content = try #require(result["content"] as? [[String: Any]]) let text = try #require(content.first?["text"] as? String) let returnedTasks = try #require(- try JSONSerialization.jsonObject(with: Data(text.utf8)) as? [[String: Any]]+ (try JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any])?["results"] as? [[String: Any]] ) #expect(returnedTasks.map { $0["status"] as? String } == ["planning"]) #expect(task.status == .planning)
diff --git a/Transit/TransitTests/MCPPriorityTests.swift b/Transit/TransitTests/MCPPriorityTests.swiftindex 940b9b7..215b094 100644--- a/Transit/TransitTests/MCPPriorityTests.swift+++ b/Transit/TransitTests/MCPPriorityTests.swift@@ -81,10 +81,10 @@ struct MCPPriorityTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: [:]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let byName = Dictionary(uniqueKeysWithValues: results.compactMap { dict -> (String, String)? in guard let name = dict["name"] as? String, let priority = dict["priority"] as? String else { return nil@@ -108,10 +108,11 @@ struct MCPPriorityTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: ["priority": "high"]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "priority": "high"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "High") }@@ -130,10 +131,11 @@ struct MCPPriorityTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: ["priority": ["high", "low"]]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "priority": ["high", "low"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let names = Set(results.compactMap { $0["name"] as? String }) #expect(names == ["High", "Low"]) }@@ -149,10 +151,10 @@ struct MCPPriorityTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: [:]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } @@ -164,11 +166,12 @@ struct MCPPriorityTests { ) let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(- tool: "query_tasks", arguments: ["priority": "urgent"]+ tool: "query_tasks", arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "priority": "urgent"] )) #expect(try MCPTestHelpers.isError(response))- let message = try MCPTestHelpers.errorText(response)+ let message = try MCPTestHelpers.queryErrorMessage(response) #expect(message.contains("priority")) } }
diff --git a/Transit/TransitTests/MCPQueryProjectNameTests.swift b/Transit/TransitTests/MCPQueryProjectNameTests.swiftindex cd58b20..5771fbf 100644--- a/Transit/TransitTests/MCPQueryProjectNameTests.swift+++ b/Transit/TransitTests/MCPQueryProjectNameTests.swift@@ -5,6 +5,7 @@ import Testing @testable import Transit @MainActor @Suite(.serialized)+// swiftlint:disable:next type_body_length struct MCPQueryProjectNameTests { private struct FetchFailure: Swift.Error {}@@ -40,10 +41,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "Alpha"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "A1") }@@ -55,10 +57,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "myproject"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "myproject"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -67,11 +70,12 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "Nonexistent"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "Nonexistent"] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response) == "No project named \"Nonexistent\"")+ #expect(try MCPTestHelpers.queryErrorMessage(response) == "No project named \"Nonexistent\"") } @Test func queryByProjectIdReturnsMatchingTasks() async throws {@@ -83,10 +87,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": alpha.id.uuidString]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": alpha.id.uuidString] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "A1") }@@ -96,11 +101,12 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": "not-a-uuid"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": "not-a-uuid"] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response) == "Invalid projectId: expected a UUID string")+ #expect(try MCPTestHelpers.queryErrorMessage(response) == "Invalid projectId: expected a UUID string") } @Test func queryWithNullProjectIdReturnsValidationError() async throws {@@ -108,11 +114,12 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": NSNull()]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": NSNull()] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response) == "Invalid projectId: expected a UUID string")+ #expect(try MCPTestHelpers.queryErrorMessage(response) == "Invalid projectId: expected a UUID string") } @Test func queryProjectLookupFetchFailureReturnsInternalErrorEnvelope() async throws {@@ -121,11 +128,12 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": projectID.uuidString]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": projectID.uuidString] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response).hasPrefix("Failed to fetch project:"))+ #expect(try MCPTestHelpers.queryErrorMessage(response).hasPrefix("Failed to fetch project:")) } @Test func queryTaskFetchFailureReturnsErrorEnvelope() async throws {@@ -133,11 +141,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response).hasPrefix("Failed to fetch tasks:"))+ #expect(try MCPTestHelpers.queryErrorMessage(response).hasPrefix("Failed to fetch tasks:")) } @Test func queryMilestoneNameFetchFailureReturnsExactErrorInsteadOfEmptyArray() async throws {@@ -145,12 +153,13 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": "v1.0"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "milestone": "v1.0"] )) #expect(try MCPTestHelpers.isError(response), "A failed filter fetch must not look like no matches") #expect(- try MCPTestHelpers.errorText(response)+ try MCPTestHelpers.queryErrorMessage(response) == "Failed to fetch milestones: simulated milestone fetch failure" ) }@@ -162,10 +171,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": "v9.0"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "milestone": "v9.0"] )) - #expect(try MCPTestHelpers.decodeArrayResult(response).isEmpty)+ #expect(try MCPTestHelpers.decodeQueryResults(response).isEmpty) } @Test func queryMilestoneDisplayIDFetchFailureReturnsExactErrorInsteadOfEmptyArray() async throws {@@ -173,12 +183,13 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": 1]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "milestoneDisplayId": 1] )) #expect(try MCPTestHelpers.isError(response), "A failed lookup must not look like no matches") #expect(- try MCPTestHelpers.errorText(response)+ try MCPTestHelpers.queryErrorMessage(response) == "Failed to look up milestone: simulated milestone fetch failure" ) }@@ -188,11 +199,12 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestone": "v1.0", "status": "not-a-status"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "milestone": "v1.0", "status": "not-a-status"] )) #expect(try MCPTestHelpers.isError(response))- #expect(try MCPTestHelpers.errorText(response).contains("Invalid status: not-a-status"))+ #expect(try MCPTestHelpers.queryErrorMessage(response).contains("Invalid status: not-a-status")) } @Test func queryByNonexistentProjectIdMatchesIntentProjectNotFound() async throws {@@ -202,11 +214,12 @@ struct MCPQueryProjectNameTests { let mcpResponse = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": projectIDString]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": projectIDString] )) #expect(try MCPTestHelpers.isError(mcpResponse))- let mcpHint = try MCPTestHelpers.errorText(mcpResponse)+ let mcpHint = try MCPTestHelpers.queryErrorMessage(mcpResponse) let intentResponse = QueryTasksIntent.execute( input: "{\"projectId\":\"\(projectIDString)\"}",@@ -233,10 +246,11 @@ struct MCPQueryProjectNameTests { // projectId points to Beta, project name says "Alpha" — projectId wins let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": beta.id.uuidString, "project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "projectId": beta.id.uuidString, "project": "Alpha"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "B1") }@@ -249,10 +263,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": " "]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": " "] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } @@ -267,10 +282,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "Alpha", "status": "planning"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "Alpha", "status": "planning"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Planned") }@@ -285,7 +301,8 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "Alpha"] )) #expect(try MCPTestHelpers.isError(response))@@ -299,10 +316,11 @@ struct MCPQueryProjectNameTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["project": "Alpha", "type": "bug"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "project": "Alpha", "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Bug") }
diff --git a/Transit/TransitTests/MCPQueryTasksTypeArrayValidationTests.swift b/Transit/TransitTests/MCPQueryTasksTypeArrayValidationTests.swiftindex 92f5941..0c04bb0 100644--- a/Transit/TransitTests/MCPQueryTasksTypeArrayValidationTests.swift+++ b/Transit/TransitTests/MCPQueryTasksTypeArrayValidationTests.swift@@ -18,11 +18,12 @@ struct MCPQueryTasksTypeArrayValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": ["bug"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "type": ["bug"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("type")) #expect(text.contains("expected a string")) }@@ -32,11 +33,12 @@ struct MCPQueryTasksTypeArrayValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": ["bug", "feature"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "type": ["bug", "feature"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("type")) #expect(text.contains("expected a string")) }@@ -55,7 +57,8 @@ struct MCPQueryTasksTypeArrayValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": ["bug"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "type": ["bug"]] )) // Bug behaviour: array is dropped to nil and both tasks are returned.
diff --git a/Transit/TransitTests/MCPQueryTasksValidationPrecedenceTests.swift b/Transit/TransitTests/MCPQueryTasksValidationPrecedenceTests.swiftindex 25b2120..b40eb88 100644--- a/Transit/TransitTests/MCPQueryTasksValidationPrecedenceTests.swift+++ b/Transit/TransitTests/MCPQueryTasksValidationPrecedenceTests.swift@@ -42,12 +42,14 @@ struct MCPQueryTasksValidationPrecedenceTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: arguments+ arguments: arguments.merging([+ "detailLevel": "summary", "includeComments": true, "limit": 100+ ]) { _, new in new } )) #expect(try MCPTestHelpers.isError(response)) #expect(- try MCPTestHelpers.errorText(response).contains(malformedFilter.expectedError),+ try MCPTestHelpers.queryErrorMessage(response).contains(malformedFilter.expectedError), "Expected \(malformedFilter.expectedError) before resolving \(milestoneFilter)" ) }
diff --git a/Transit/TransitTests/MCPSearchFilterTests.swift b/Transit/TransitTests/MCPSearchFilterTests.swiftindex b4057a9..1bc9545 100644--- a/Transit/TransitTests/MCPSearchFilterTests.swift+++ b/Transit/TransitTests/MCPSearchFilterTests.swift@@ -19,10 +19,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "login"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "login"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Fix login bug") }@@ -39,10 +40,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "authentication"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "authentication"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Task A") }@@ -56,10 +58,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "fix login"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "fix login"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -75,10 +78,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "login", "type": "bug"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "login", "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Fix login bug") }@@ -96,10 +100,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "fix", "status": ["planning"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "fix", "status": ["planning"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Fix logout bug") }@@ -116,10 +121,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": " "]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": " "] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } @@ -132,10 +138,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "something"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "something"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -154,10 +161,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": "auth"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": "auth"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) let names = Set(results.compactMap { $0["name"] as? String }) #expect(names == ["Auth task", "Update docs"])@@ -172,10 +180,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1, "search": "login"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 1, "search": "login"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Fix login bug") }@@ -189,10 +198,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1, "search": "dashboard"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 1, "search": "dashboard"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -208,10 +218,11 @@ struct MCPSearchFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["search": ""]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "search": ""] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } }
diff --git a/Transit/TransitTests/MCPServerLifecycleTests.swift b/Transit/TransitTests/MCPServerLifecycleTests.swiftindex 75f1093..3d59c58 100644--- a/Transit/TransitTests/MCPServerLifecycleTests.swift+++ b/Transit/TransitTests/MCPServerLifecycleTests.swift@@ -14,8 +14,33 @@ import Testing /// task cancellation by cancelling children rather than invoking Hummingbird's /// listener-closing graceful-shutdown path. Both versions could race a rebind. @MainActor @Suite(.serialized)+// swiftlint:disable:next type_body_length struct MCPServerLifecycleTests { + @Test func stopAndRestartInvalidateQueryPages() async throws {+ let env = try MCPTestHelpers.makeEnv()+ let server = MCPServer(toolHandler: env.handler)+ let port = try availableLoopbackPort()+ await server.start(port: port)+ try #require(await waitUntilListening(port: port))+ let token = UUID().uuidString+ try env.handler.taskQuerySnapshots.publish(+ pages: ["first", "second"], cursors: [token],+ deadline: ContinuousClock.now.advanced(by: .seconds(300))+ )+ await server.restart(port: port)+ try #require(await waitUntilListening(port: port))+ #expect(throws: (any Error).self) { try env.handler.taskQuerySnapshots.page(for: token) }+ #expect(env.handler.taskQueryAdmissionOpen)+ await server.stop()+ #expect(!env.handler.taskQueryAdmissionOpen)+ let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: ["cursor": token]+ ))+ let result = try MCPTestHelpers.decodeResult(response)+ #expect((result["error"] as? [String: String])?["code"] == "QUERY_UNAVAILABLE")+ }+ @Test func stopReturnsOnlyAfterListenerReleasesPort() async throws { let env = try MCPTestHelpers.makeEnv() let server = MCPServer(toolHandler: env.handler)
diff --git a/Transit/TransitTests/MCPStatusFilterIntegrationTests.swift b/Transit/TransitTests/MCPStatusFilterIntegrationTests.swiftindex e624108..08f293e 100644--- a/Transit/TransitTests/MCPStatusFilterIntegrationTests.swift+++ b/Transit/TransitTests/MCPStatusFilterIntegrationTests.swift@@ -24,10 +24,11 @@ struct MCPStatusFilterIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea", "planning"], "project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": ["idea", "planning"], "project": "Alpha"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let names = Set(results.compactMap { $0["name"] as? String }) #expect(names == ["AlphaIdea", "AlphaPlanning"]) }@@ -52,10 +53,11 @@ struct MCPStatusFilterIntegrationTests { // Exclude done, filter to bugs only let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": ["done"], "type": "bug"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "not_status": ["done"], "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "ActiveBug") }@@ -70,10 +72,11 @@ struct MCPStatusFilterIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": displayId, "unfinished": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": displayId, "unfinished": true] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Active") }@@ -92,10 +95,11 @@ struct MCPStatusFilterIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": displayId, "unfinished": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": displayId, "unfinished": true] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -112,10 +116,11 @@ struct MCPStatusFilterIntegrationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": "planning", "project": "MyProject"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": "planning", "project": "MyProject"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Planning") }
diff --git a/Transit/TransitTests/MCPStatusFilterTests.swift b/Transit/TransitTests/MCPStatusFilterTests.swiftindex fae0729..dbf2623 100644--- a/Transit/TransitTests/MCPStatusFilterTests.swift+++ b/Transit/TransitTests/MCPStatusFilterTests.swift@@ -27,10 +27,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea", "planning"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": ["idea", "planning"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let names = Set(results.compactMap { $0["name"] as? String }) #expect(names == ["Idea", "Planning"]) }@@ -48,10 +49,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": "planning"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": "planning"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Planning") }@@ -74,10 +76,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": ["done", "abandoned"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "not_status": ["done", "abandoned"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Active") }@@ -104,10 +107,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": true] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Active") }@@ -126,10 +130,11 @@ struct MCPStatusFilterTests { // unfinished=true excludes done+abandoned, not_status adds planning to exclusion let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": true, "not_status": ["planning"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": true, "not_status": ["planning"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Idea") }@@ -150,10 +155,11 @@ struct MCPStatusFilterTests { // Include idea+planning, but exclude planning → only idea remains let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea", "planning"], "not_status": ["planning"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": ["idea", "planning"], "not_status": ["planning"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Idea") }@@ -174,10 +180,11 @@ struct MCPStatusFilterTests { // status=done + unfinished=true → contradictory, should return empty let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["done"], "unfinished": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": ["done"], "unfinished": true] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -198,10 +205,11 @@ struct MCPStatusFilterTests { // Empty status (treated as absent = all statuses) + not_status excludes done let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": [String](), "not_status": ["done"]]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": [String](), "not_status": ["done"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Idea") }@@ -222,10 +230,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": "done"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "not_status": "done"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Idea") }@@ -242,10 +251,11 @@ struct MCPStatusFilterTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": [String](), "not_status": [String]()]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": [String](), "not_status": [String]()] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) }
diff --git a/Transit/TransitTests/MCPTaskQueryFailureTests.swift b/Transit/TransitTests/MCPTaskQueryFailureTests.swiftnew file mode 100644index 0000000..9c10169--- /dev/null+++ b/Transit/TransitTests/MCPTaskQueryFailureTests.swift@@ -0,0 +1,125 @@+#if os(macOS)+import Foundation+import Testing+@testable import Transit++@MainActor @Suite(.serialized)+struct MCPTaskQueryFailureTests {+ private enum Failure: Error { case fetch }+ private final class Tasks: TaskFetching {+ var values: [TransitTask] = []+ var shouldFail = false+ var calls = 0+ func fetchAllTasks() throws -> [TransitTask] {+ calls += 1+ if shouldFail { throw Failure.fetch }+ return values+ }+ }+ private final class Comments: CommentFetching {+ var values: [Transit.Comment] = []+ var shouldFail = false+ var calls = 0+ func fetchComments(for taskID: UUID) throws -> [Transit.Comment] {+ calls += 1+ if shouldFail { throw Failure.fetch }+ return values+ }+ }++ @Test func duplicateBatchIDsUseOneTaskAndCommentFetch() async throws {+ let tasks = Tasks()+ let comments = Comments()+ let env = try MCPTestHelpers.makeEnv(taskFetcher: tasks, commentFetcher: comments)+ let project = MCPTestHelpers.makeProject(in: env.context)+ let task = TransitTask(name: "Task", type: .bug, project: project, displayID: .permanent(42))+ tasks.values = [task]+ let first = Transit.Comment(content: "First", authorName: "Agent", isAgent: true, task: task)+ let second = Transit.Comment(content: "Second", authorName: "Person", isAgent: false, task: task)+ first.creationDate = Date(timeIntervalSince1970: 0)+ second.creationDate = first.creationDate+ first.id = UUID(uuidString: "00000000-0000-0000-0000-000000000001")!+ second.id = UUID(uuidString: "00000000-0000-0000-0000-000000000002")!+ comments.values = [second, first]+ let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: [+ "displayIds": [42, 42, -1], "detailLevel": "summary", "includeComments": true, "limit": 1+ ]+ ))+ let page = try MCPTestHelpers.decodeResult(response)+ let results = try #require(page["results"] as? [[String: Any]])+ let data = try #require(results[0]["task"] as? [String: Any])+ #expect(data["description"] == nil)+ #expect(data["metadata"] == nil)+ let returnedComments = try #require(data["comments"] as? [[String: Any]])+ #expect(returnedComments.map { $0["content"] as? String } == ["First", "Second"])+ #expect(tasks.calls == 1)+ #expect(comments.calls == 1)+ let cursor = try #require(page["nextCursor"] as? String)+ task.name = "Edited"+ first.content = "Edited comment"+ let newComment = Transit.Comment(content: "New comment", authorName: "Agent", isAgent: true, task: task)+ comments.values = [first, newComment]+ comments.shouldFail = true+ tasks.shouldFail = true+ let next = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: ["cursor": cursor]+ ))+ #expect(try !MCPTestHelpers.isError(next))+ let nextResults = try MCPTestHelpers.decodeQueryResults(next)+ let frozenTask = try #require(nextResults[0]["task"] as? [String: Any])+ #expect(frozenTask["name"] as? String == "Task")+ let frozenComments = try #require(frozenTask["comments"] as? [[String: Any]])+ #expect(frozenComments.map { $0["content"] as? String } == ["First", "Second"])+ #expect(frozenComments.map { $0["id"] as? String } == [first.id.uuidString, second.id.uuidString])+ #expect(tasks.calls == 1)+ #expect(comments.calls == 1)+ }++ @Test func commentsOmittedDoNotFetchAndFailuresPublishNothing() async throws {+ let tasks = Tasks()+ let comments = Comments()+ let env = try MCPTestHelpers.makeEnv(taskFetcher: tasks, commentFetcher: comments)+ let project = MCPTestHelpers.makeProject(in: env.context)+ tasks.values = (0..<2).map {+ TransitTask(name: "Task \($0)", type: .chore, project: project, displayID: .provisional)+ }+ comments.shouldFail = true+ let noComments = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: ["detailLevel": "full", "includeComments": false, "limit": 1]+ ))+ #expect(try !MCPTestHelpers.isError(noComments))+ #expect(comments.calls == 0)+ env.handler.clearTaskQuerySnapshots()+ let failed = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: ["detailLevel": "full", "includeComments": true, "limit": 1]+ ))+ let errorPage = try MCPTestHelpers.decodeResult(failed)+ #expect((errorPage["error"] as? [String: String])?["code"] == "QUERY_FAILED")+ #expect(errorPage["results"] == nil)+ #expect(errorPage["nextCursor"] == nil)+ #expect(env.handler.taskQuerySnapshots.retainedBytes == 0)+ }++ @Test func ambiguousBatchIdentityDoesNotLoseOtherOutcomes() async throws {+ let tasks = Tasks()+ let env = try MCPTestHelpers.makeEnv(taskFetcher: tasks)+ let project = MCPTestHelpers.makeProject(in: env.context)+ tasks.values = [+ TransitTask(name: "A", type: .bug, project: project, displayID: .permanent(42)),+ TransitTask(name: "B", type: .bug, project: project, displayID: .permanent(42)),+ TransitTask(name: "C", type: .bug, project: project, displayID: .permanent(43))+ ]+ let response = await env.handler.handle(MCPTestHelpers.toolCallRequest(+ tool: "query_tasks", arguments: [+ "displayIds": [42, 43, 999], "detailLevel": "summary", "includeComments": false, "limit": 100+ ]+ ))+ let results = try MCPTestHelpers.decodeQueryResults(response)+ #expect((results[0]["error"] as? [String: String])?["code"] == "AMBIGUOUS_TASK_ID")+ #expect((results[1]["task"] as? [String: Any])?["name"] as? String == "C")+ #expect((results[2]["error"] as? [String: String])?["code"] == "TASK_NOT_FOUND")+ #expect(tasks.calls == 1)+ }+}+#endif
diff --git a/Transit/TransitTests/MCPTaskQueryRequestTests.swift b/Transit/TransitTests/MCPTaskQueryRequestTests.swiftnew file mode 100644index 0000000..9a12729--- /dev/null+++ b/Transit/TransitTests/MCPTaskQueryRequestTests.swift@@ -0,0 +1,82 @@+#if os(macOS)+import Foundation+import Testing+@testable import Transit++@MainActor+struct MCPTaskQueryRequestTests {+ private var options: [String: Any] {+ ["detailLevel": "full", "includeComments": false, "limit": 100]+ }++ @Test func initialAndContinuation() throws {+ _ = try MCPTaskQueryRequest.parse(options)+ _ = try MCPTaskQueryRequest.parse(["cursor": UUID().uuidString])+ #expect(throws: (any Error).self) { try MCPTaskQueryRequest.parse([:]) }+ }++ @Test func invalidOptionsAndSelectors() {+ let invalid: [[String: Any]] = [+ ["limit": 0], ["limit": 101], ["limit": true], ["limit": 1.5],+ ["detailLevel": "other"], ["detailLevel": NSNull()],+ ["includeComments": 1], ["includeComments": NSNull()],+ ["taskIds": []], ["taskIds": ["bad"]], ["displayIds": [true]],+ ["displayIds": [1.5]], ["displayIds": Array(repeating: 1, count: 101)],+ ["displayId": 1, "displayIds": [1]], ["taskIds": [UUID().uuidString], "search": ""],+ ["unknown": false], ["cursor": UUID().uuidString]+ ]+ for fields in invalid {+ #expect(throws: (any Error).self) {+ try MCPTaskQueryRequest.parse(options.merging(fields) { _, new in new })+ }+ }+ for key in options.keys {+ var missing = options+ missing.removeValue(forKey: key)+ #expect(throws: (any Error).self) { try MCPTaskQueryRequest.parse(missing) }+ }+ }++ @Test func integralIDsAndBoundaries() throws {+ for count in [1, 100] {+ _ = try MCPTaskQueryRequest.parse(options.merging([+ "displayIds": Array(repeating: -1.0, count: count)+ ]) { _, new in new })+ }+ _ = try MCPTaskQueryRequest.parse(options.merging(["limit": 1.0]) { _, new in new })+ }++ @Test func malformedCursorHasRestartGuidance() throws {+ for cursor: Any in [42, NSNull(), "", "bad"] {+ do {+ _ = try MCPTaskQueryRequest.parse(["cursor": cursor])+ Issue.record("Malformed cursor was accepted")+ } catch let error as MCPTaskQueryError {+ #expect(error.code == "INVALID_CURSOR")+ #expect(error.message.contains("start a new query"))+ }+ }+ }++ @Test func cursorWithOtherFieldsIsInvalidInput() throws {+ for cursor: Any in [UUID().uuidString, 42, NSNull()] {+ do {+ _ = try MCPTaskQueryRequest.parse(["cursor": cursor, "limit": 1])+ Issue.record("Cursor with query options was accepted")+ } catch let error as MCPTaskQueryError {+ #expect(error.code == "INVALID_INPUT")+ }+ }+ }++ @Test func advertisedBranches() throws {+ let data = try JSONEncoder().encode(MCPToolDefinitions.queryTasks.inputSchema)+ let schema = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])+ let branches = try #require(schema["oneOf"] as? [[String: Any]])+ #expect(branches.count == 2)+ #expect(branches.allSatisfy { $0["additionalProperties"] as? Bool == false })+ #expect(branches[0]["required"] as? [String] == ["detailLevel", "includeComments", "limit"])+ #expect(branches[1]["required"] as? [String] == ["cursor"])+ }+}+#endif
diff --git a/Transit/TransitTests/MCPTaskQuerySnapshotStoreTests.swift b/Transit/TransitTests/MCPTaskQuerySnapshotStoreTests.swiftnew file mode 100644index 0000000..efb910c--- /dev/null+++ b/Transit/TransitTests/MCPTaskQuerySnapshotStoreTests.swift@@ -0,0 +1,61 @@+#if os(macOS)+import Foundation+import Testing+@testable import Transit++@MainActor+struct MCPTaskQuerySnapshotStoreTests {+ @Test func replayExpiryAndCapacity() throws {+ var now = ContinuousClock.now+ let store = MCPTaskQuerySnapshotStore(now: { now }, maxSnapshots: 1, maxBytes: 100)+ let token = UUID().uuidString+ let deadline = now.advanced(by: .seconds(300))+ try store.publish(pages: ["first", "second"], cursors: [token], deadline: deadline)+ #expect(try store.page(for: token) == "second")+ #expect(try store.page(for: token) == "second")+ #expect(throws: (any Error).self) {+ try store.publish(pages: ["a", "b"], cursors: [UUID().uuidString], deadline: deadline)+ }+ #expect(try store.page(for: token) == "second")+ #expect(store.retainedBytes == 11)+ now = deadline+ #expect(throws: (any Error).self) { try store.page(for: token) }+ #expect(store.retainedBytes == 0)+ }++ @Test func atomicPublicationAndClear() throws {+ let now = ContinuousClock.now+ let store = MCPTaskQuerySnapshotStore(now: { now }, maxBytes: 3)+ #expect(throws: (any Error).self) {+ try store.publish(pages: ["1234"], cursors: [], deadline: now.advanced(by: .seconds(300)))+ }+ #expect(store.retainedBytes == 0)+ #expect(throws: (any Error).self) {+ try store.publish(pages: ["a", "b"], cursors: [UUID().uuidString], deadline: now)+ }+ let token = UUID().uuidString+ try store.publish(pages: ["a", "b"], cursors: [token], deadline: now.advanced(by: .seconds(300)))+ store.clear()+ #expect(store.retainedBytes == 0)+ #expect(throws: (any Error).self) { try store.page(for: token) }+ }++ @Test func staleListenerExitPreservesPagesButCurrentExitInvalidatesThem() throws {+ let env = try MCPTestHelpers.makeEnv()+ let server = MCPServer(toolHandler: env.handler)+ let token = UUID().uuidString+ try env.handler.taskQuerySnapshots.publish(+ pages: ["first", "second"], cursors: [token],+ deadline: ContinuousClock.now.advanced(by: .seconds(300))+ )+ server.listenerDidExit(generation: -1, failure: "stale")+ #expect(try env.handler.taskQuerySnapshots.page(for: token) == "second")+ #expect(env.handler.taskQueryAdmissionOpen)+ server.listenerDidExit(generation: 0, failure: "bind or listener failure")+ #expect(throws: (any Error).self) { try env.handler.taskQuerySnapshots.page(for: token) }+ #expect(!env.handler.taskQueryAdmissionOpen)+ #expect(server.startError == "bind or listener failure")+ }++}+#endif
diff --git a/Transit/TransitTests/MCPTaskQueryTests.swift b/Transit/TransitTests/MCPTaskQueryTests.swiftnew file mode 100644index 0000000..ebaa0b0--- /dev/null+++ b/Transit/TransitTests/MCPTaskQueryTests.swift@@ -0,0 +1,94 @@+#if os(macOS)+import Foundation+import SwiftData+import Testing+@testable import Transit++@MainActor @Suite(.serialized)+struct MCPTaskQueryTests {+ private func call(_ env: MCPTestEnv, _ fields: [String: Any]) async -> JSONRPCResponse? {+ await env.handler.handle(MCPTestHelpers.toolCallRequest(tool: "query_tasks", arguments: fields))+ }++ @Test func frozen182ChoresAndReplay() async throws {+ let env = try MCPTestHelpers.makeEnv()+ let project = MCPTestHelpers.makeProject(in: env.context)+ var tasks: [TransitTask] = []+ for index in 0..<182 {+ let task = TransitTask(name: "Chore \(index)", type: .chore, project: project, displayID: .provisional)+ task.taskDescription = "Description \(index)"+ env.context.insert(task)+ tasks.append(task)+ }+ try env.context.save()+ let expected = tasks.sorted { $0.id.uuidString < $1.id.uuidString }+ let first = try MCPTestHelpers.decodeResult(await call(env, [+ "type": "chore", "detailLevel": "full", "includeComments": false, "limit": 100+ ]))+ let cursor = try #require(first["nextCursor"] as? String)+ let firstResults = try #require(first["results"] as? [[String: Any]])+ #expect(firstResults.count == 100)+ let descriptions = expected.map(\.taskDescription)+ for task in tasks { task.taskDescription = "Edited" }+ env.context.delete(expected.last!)+ env.context.insert(TransitTask(name: "New", type: .chore, project: project, displayID: .provisional))+ try env.context.save()+ let continuation = await call(env, ["cursor": cursor])+ let page = try MCPTestHelpers.decodeResult(continuation)+ let secondResults = try #require(page["results"] as? [[String: Any]])+ #expect(secondResults.count == 82)+ #expect(page["nextCursor"] is NSNull)+ #expect(page["expiresAt"] as? String == first["expiresAt"] as? String)+ #expect((firstResults + secondResults).map { $0["description"] as? String } == descriptions)+ let replay = await call(env, ["cursor": cursor])+ #expect(try MCPTestHelpers.errorText(continuation) == MCPTestHelpers.errorText(replay))+ }++ @Test func batchInputPositionsAndDetails() async throws {+ let env = try MCPTestHelpers.makeEnv()+ let project = MCPTestHelpers.makeProject(in: env.context)+ let task = TransitTask(name: "Unallocated", type: .bug, project: project, displayID: .provisional)+ task.metadata = ["branch": "test"]+ env.context.insert(task)+ let rawID = task.id.uuidString.lowercased()+ let page = try MCPTestHelpers.decodeResult(await call(env, [+ "taskIds": [rawID, UUID().uuidString, rawID], "detailLevel": "full",+ "includeComments": false, "limit": 100+ ]))+ let results = try #require(page["results"] as? [[String: Any]])+ #expect(results.map { $0["index"] as? Int } == [0, 1, 2])+ let resolved = try #require(results[0]["task"] as? [String: Any])+ #expect(resolved["description"] is NSNull)+ #expect(resolved["displayId"] == nil)+ #expect(resolved["comments"] == nil)+ #expect(resolved["metadata"] as? [String: String] == ["branch": "test"])+ #expect((results[0]["requested"] as? [String: String])?["taskId"] == rawID)+ #expect((results[1]["error"] as? [String: String])?["code"] == "TASK_NOT_FOUND")+ }++ @Test func paginationInvariants() throws {+ let env = try MCPTestHelpers.makeEnv()+ for count in [0, 1, 99, 100, 101, 182, 500] {+ for limit in [1, 2, 50, 100] {+ env.handler.clearTaskQuerySnapshots()+ let expected = (0..<count).map { ["index": $0] as [String: Any] }+ var text = try env.handler.encodeQueryPages(+ expected, limit: limit, expiry: Date().addingTimeInterval(300),+ deadline: ContinuousClock.now.advanced(by: .seconds(300))+ )+ var actual: [Int] = []+ while true {+ let page = try #require(JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any])+ let results = try #require(page["results"] as? [[String: Int]])+ #expect(results.count <= limit)+ actual.append(contentsOf: results.compactMap { $0["index"] })+ guard let cursor = page["nextCursor"] as? String else { break }+ text = try env.handler.taskQuerySnapshots.page(for: cursor)+ #expect(try env.handler.taskQuerySnapshots.page(for: cursor) == text)+ }+ #expect(actual == Array(0..<count))+ }+ }+ }+}+#endif
diff --git a/Transit/TransitTests/MCPTestHelpers.swift b/Transit/TransitTests/MCPTestHelpers.swiftindex 1e78e28..4cd0922 100644--- a/Transit/TransitTests/MCPTestHelpers.swift+++ b/Transit/TransitTests/MCPTestHelpers.swift@@ -117,6 +117,15 @@ enum MCPTestHelpers { return try #require(try JSONSerialization.jsonObject(with: textData) as? [[String: Any]]) } + static func decodeQueryResults(_ response: JSONRPCResponse?) throws -> [[String: Any]] {+ try #require(decodeResult(response)["results"] as? [[String: Any]])+ }++ static func queryErrorMessage(_ response: JSONRPCResponse?) throws -> String {+ let error = try #require(decodeResult(response)["error"] as? [String: Any])+ return try #require(error["message"] as? String)+ }+ static func isError(_ response: JSONRPCResponse?) throws -> Bool { let unwrapped = try #require(response, "Expected a JSON-RPC response but got nil") let data = try JSONEncoder().encode(unwrapped)
diff --git a/Transit/TransitTests/MCPToolHandlerDisplayIdTests.swift b/Transit/TransitTests/MCPToolHandlerDisplayIdTests.swiftindex 625fa33..986be2b 100644--- a/Transit/TransitTests/MCPToolHandlerDisplayIdTests.swift+++ b/Transit/TransitTests/MCPToolHandlerDisplayIdTests.swift@@ -20,10 +20,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": 1] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) let task = try #require(results.first) #expect(task["name"] as? String == "Lookup Me")@@ -37,10 +38,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 999]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": 999] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -53,10 +55,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1, "status": "planning"]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": 1, "status": "planning"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -69,10 +72,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1, "type": "bug"]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": 1, "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Bug Task") }@@ -86,10 +90,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 1]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": 1] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let task = try #require(results.first) // description key should be present but null (serialized as NSNull) #expect(task["name"] as? String == "No Desc")@@ -107,10 +112,11 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": displayId]+ arguments: ["detailLevel": "full", "includeComments": true, "limit": 100,+ "displayId": displayId] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.isEmpty) } @@ -124,10 +130,10 @@ struct MCPToolHandlerDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let task = try #require(results.first) #expect(task["description"] == nil) #expect(task["metadata"] == nil)
diff --git a/Transit/TransitTests/MCPToolHandlerEnumValidationTests.swift b/Transit/TransitTests/MCPToolHandlerEnumValidationTests.swiftindex 9fe27fe..9ab8f9f 100644--- a/Transit/TransitTests/MCPToolHandlerEnumValidationTests.swift+++ b/Transit/TransitTests/MCPToolHandlerEnumValidationTests.swift@@ -5,6 +5,7 @@ import Testing @testable import Transit @MainActor @Suite(.serialized)+// swiftlint:disable:next type_body_length struct MCPToolHandlerEnumValidationTests { // MARK: - query_tasks: invalid status filter@@ -14,11 +15,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["not-a-status"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": ["not-a-status"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("Invalid status")) #expect(text.contains("not-a-status")) }@@ -28,11 +30,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": "bogus"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": "bogus"] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("Invalid status")) #expect(text.contains("bogus")) }@@ -42,11 +45,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea", "not-real"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": ["idea", "not-real"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("not-real")) } @@ -57,11 +61,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": ["fake-status"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "not_status": ["fake-status"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("Invalid not_status")) #expect(text.contains("fake-status")) }@@ -71,11 +76,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": "invalid"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "not_status": "invalid"] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("Invalid not_status")) } @@ -86,11 +92,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": "epic"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "type": "epic"] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("Invalid type")) #expect(text.contains("epic")) }@@ -106,10 +113,11 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": ["idea"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -122,10 +130,11 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": ["done", "abandoned"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "not_status": ["done", "abandoned"]] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -138,10 +147,11 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": "bug"]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -218,11 +228,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": 123]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": 123] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("status")) } @@ -231,11 +242,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": true]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "not_status": true] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("not_status")) } @@ -244,11 +256,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": 5]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "type": 5] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("type")) } @@ -257,11 +270,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["idea", 123] as [Any]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": ["idea", 123] as [Any]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("status")) } @@ -270,11 +284,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["not_status": ["done", true] as [Any]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "not_status": ["done", true] as [Any]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("not_status")) } @@ -283,11 +298,12 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": ["foo": "bar"]]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": ["foo": "bar"]] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("status")) } @@ -330,7 +346,8 @@ struct MCPToolHandlerEnumValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": 123]+ arguments: ["detailLevel": "summary", "includeComments": true,+ "limit": 100, "status": 123] )) // Bug behaviour: filter is silently treated as absent and all tasks are returned.
diff --git a/Transit/TransitTests/MCPToolHandlerTests.swift b/Transit/TransitTests/MCPToolHandlerTests.swiftindex 2eeb878..80e20b5 100644--- a/Transit/TransitTests/MCPToolHandlerTests.swift+++ b/Transit/TransitTests/MCPToolHandlerTests.swift@@ -212,11 +212,12 @@ struct MCPToolHandlerTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": 123, "project": "Alpha"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "projectId": 123, "project": "Alpha"] )) #expect(try MCPTestHelpers.isError(response))- let errorMessage = try MCPTestHelpers.errorText(response)+ let errorMessage = try MCPTestHelpers.queryErrorMessage(response) #expect(errorMessage.contains("projectId") && errorMessage.contains("UUID")) } @@ -314,10 +315,10 @@ struct MCPToolHandlerTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } @@ -332,10 +333,11 @@ struct MCPToolHandlerTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["status": "planning"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "status": "planning"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "A") }@@ -348,10 +350,11 @@ struct MCPToolHandlerTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["type": "bug"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "type": "bug"] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) #expect(results.first?["name"] as? String == "Bug") }@@ -363,10 +366,10 @@ struct MCPToolHandlerTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let first = try #require(results.first) #expect(first["projectName"] as? String == "Alpha") #expect(first["projectId"] is String)
diff --git a/Transit/TransitTests/MCPUnfinishedFlagValidationTests.swift b/Transit/TransitTests/MCPUnfinishedFlagValidationTests.swiftindex c654393..22e6655 100644--- a/Transit/TransitTests/MCPUnfinishedFlagValidationTests.swift+++ b/Transit/TransitTests/MCPUnfinishedFlagValidationTests.swift@@ -31,13 +31,14 @@ struct MCPUnfinishedFlagValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": "true"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": "true"] )) // Expected: error rejecting the malformed flag. // Previous (buggy) behaviour: silently treated as false, returning all tasks. #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("unfinished must be a boolean")) } @@ -46,11 +47,12 @@ struct MCPUnfinishedFlagValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": 1]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": 1] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("unfinished must be a boolean")) } @@ -59,11 +61,12 @@ struct MCPUnfinishedFlagValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": NSNull()]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": NSNull()] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("unfinished must be a boolean")) } @@ -72,11 +75,12 @@ struct MCPUnfinishedFlagValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["unfinished": true]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "unfinished": true] )) #expect(try MCPTestHelpers.isError(response) == false)- let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) let names = results.compactMap { $0["name"] as? String } #expect(names.contains("Open task")) #expect(!names.contains("Finished task"))@@ -87,11 +91,11 @@ struct MCPUnfinishedFlagValidationTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: [:]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100] )) #expect(try MCPTestHelpers.isError(response) == false)- let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 2) } }
diff --git a/Transit/TransitTests/MilestoneNameLookupStorageFailureSurfaceTests.swift b/Transit/TransitTests/MilestoneNameLookupStorageFailureSurfaceTests.swiftindex 26bc4e0..8a926b1 100644--- a/Transit/TransitTests/MilestoneNameLookupStorageFailureSurfaceTests.swift+++ b/Transit/TransitTests/MilestoneNameLookupStorageFailureSurfaceTests.swift@@ -136,13 +136,16 @@ struct MilestoneNameLookupFailureTests { )) let queryResponse = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": project.id.uuidString, "milestone": "Sprint"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "projectId": project.id.uuidString, "milestone": "Sprint"] )) - for response in [createResponse, updateResponse, queryResponse] {+ for response in [createResponse, updateResponse] { #expect(try MCPTestHelpers.isError(response)) #expect(try MCPTestHelpers.errorText(response) == expectedHint) }+ #expect(try MCPTestHelpers.isError(queryResponse))+ #expect(try MCPTestHelpers.queryErrorMessage(queryResponse) == expectedHint) #expect(try env.context.fetch(FetchDescriptor<TransitTask>()).count == 1) #expect(task.name == "Existing") #expect(task.milestone == nil)
diff --git a/Transit/TransitTests/NonIntegerMilestoneDisplayIdTests.swift b/Transit/TransitTests/NonIntegerMilestoneDisplayIdTests.swiftindex f790e5b..951be80 100644--- a/Transit/TransitTests/NonIntegerMilestoneDisplayIdTests.swift+++ b/Transit/TransitTests/NonIntegerMilestoneDisplayIdTests.swift@@ -132,11 +132,12 @@ struct NonIntegerMilestoneDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": "abc"]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestoneDisplayId": "abc"] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("milestoneDisplayId must be an integer")) } @@ -145,11 +146,12 @@ struct NonIntegerMilestoneDisplayIdTests { let response = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": 1.5]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestoneDisplayId": 1.5] )) #expect(try MCPTestHelpers.isError(response))- let text = try MCPTestHelpers.errorText(response)+ let text = try MCPTestHelpers.queryErrorMessage(response) #expect(text.contains("milestoneDisplayId must be an integer")) }
diff --git a/Transit/TransitTests/NumericDisplayIdParsingTests.swift b/Transit/TransitTests/NumericDisplayIdParsingTests.swiftindex 3e7d486..43d6868 100644--- a/Transit/TransitTests/NumericDisplayIdParsingTests.swift+++ b/Transit/TransitTests/NumericDisplayIdParsingTests.swift@@ -168,11 +168,12 @@ struct NumericDisplayIdMCPTests { let response = await env.handler.handle( MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["displayId": 10 as Double]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "displayId": 10 as Double] ) ) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } @@ -264,11 +265,12 @@ struct NumericDisplayIdMCPTests { let response = await env.handler.handle( MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["milestoneDisplayId": 2 as Double]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "milestoneDisplayId": 2 as Double] ) ) - let results = try MCPTestHelpers.decodeArrayResult(response)+ let results = try MCPTestHelpers.decodeQueryResults(response) #expect(results.count == 1) } }
diff --git a/Transit/TransitTests/ProjectLookupStorageFailureSurfaceTests.swift b/Transit/TransitTests/ProjectLookupStorageFailureSurfaceTests.swiftindex 96e21e1..0c4ef43 100644--- a/Transit/TransitTests/ProjectLookupStorageFailureSurfaceTests.swift+++ b/Transit/TransitTests/ProjectLookupStorageFailureSurfaceTests.swift@@ -88,7 +88,8 @@ struct ProjectLookupStorageFailureSurfaceTests { )) let queryTasks = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "query_tasks",- arguments: ["projectId": projectID]+ arguments: ["detailLevel": "summary", "includeComments": true, "limit": 100,+ "projectId": projectID] )) let createMilestone = await env.handler.handle(MCPTestHelpers.toolCallRequest( tool: "create_milestone",@@ -105,7 +106,7 @@ struct ProjectLookupStorageFailureSurfaceTests { let idLookupFailure = "Failed to fetch project: simulated project fetch failure" let nameLookupFailure = "Failed to fetch projects: simulated project fetch failure" #expect(try MCPTestHelpers.errorText(createTask) == idLookupFailure)- #expect(try MCPTestHelpers.errorText(queryTasks) == idLookupFailure)+ #expect(try MCPTestHelpers.queryErrorMessage(queryTasks) == idLookupFailure) #expect(try MCPTestHelpers.errorText(createMilestone) == idLookupFailure) #expect(try MCPTestHelpers.errorText(queryMilestones) == nameLookupFailure) #expect(try env.context.fetch(FetchDescriptor<TransitTask>()).isEmpty)
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 8465986..9d61e77 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Changed +- T-2379: MCP `query_tasks` requires explicit detail, comments, and page-size options and returns bounded pages over five-minute frozen results. Batch UUID/display-ID lookup reports ordered per-input outcomes, comments are optional, and opaque cursors expire or invalidate on server restart. Existing filters are preserved; the query response changes from an array to an object containing results, next cursor, and expiry.+ - Support Xcode 27 / Swift 6.4 with AsyncAlgorithms 1.1.3, explicit sendable counter-store isolation, and compiler-compatible test fixture conformances. - Validate the create-task project-description source literal through a CLI guard before lint/tests, avoiding host-checkout reads that stall GUI-launched test runners.
diff --git a/docs/agent-notes/comments.md b/docs/agent-notes/comments.mdindex 0337c5c..b46742a 100644--- a/docs/agent-notes/comments.md+++ b/docs/agent-notes/comments.md@@ -32,7 +32,7 @@ The app uses a separate `ModelContext` for services (created in `TransitApp.init - `MCPToolHandler` has `commentService` dependency (passed in init). - `add_comment` tool: resolves task by displayId or taskId, calls `addComment` with `isAgent: true`.-- `query_tasks` / display ID lookup: `taskToDict` includes a `comments` array in every task response.+- `query_tasks` / display ID lookup: `includeComments: true` includes a comments array ordered by creation date ascending, then comment UUID ascending. `includeComments: false` omits comments and skips comment fetching. Requested comments are frozen with the task values for cursor pagination. - `MCPToolHandler` uses a `resolveTask(from:)` helper (returns `Result<TransitTask, String>`) shared by `update_task_status` and `add_comment`. ### App Intents
diff --git a/docs/agent-notes/mcp-server.md b/docs/agent-notes/mcp-server.mdindex 1897929..63b9a4a 100644--- a/docs/agent-notes/mcp-server.md+++ b/docs/agent-notes/mcp-server.md@@ -48,9 +48,21 @@ Key challenge: Hummingbird runs on SwiftNIO event loops (nonisolated), but servi | `create_task` | Create a new task (name and type required; at least one of project / projectId required to identify the project; description, metadata, and priority optional — priority defaults to medium, invalid priority rejects with no task created) | | `update_task_status` | Change task status (by displayId or taskId) | | `update_task` | Update a task's mutable fields — any combination of `name`, `description`, `type`, `priority`, `metadata`, and milestone assignment (`milestone` / `milestoneDisplayId` / `clearMilestone`) — in a single atomic call. Priority is non-clearable: omit to leave unchanged. Identify task by displayId or taskId. |-| `query_tasks` | List tasks with optional status/type/priority/project filters (priority accepts an array of values to include); includes comments |+| `query_tasks` | Required detailLevel, includeComments, and limit (1–100); returns frozen {results,nextCursor,expiresAt} pages. Existing filters or single displayId; taskIds/displayIds batches reject filters. Continuations send only cursor. | | `add_comment` | Add a comment to a task (by displayId or taskId); always sets `isAgent: true` | +### Task query snapshots (T-2379)++`MCPTaskQueryRequest` validates initial options and cursor-only continuation.+`MCPToolHandler+TaskQuery` copies all selected task/comment values into JSON pages+synchronously on MainActor before publication. `MCPTaskQuerySnapshotStore` retains+encoded pages for five minutes with monotonic expiry, at most eight multi-page+snapshots and 16 MiB. Capacity rejection preserves existing cursors; reads do not+extend lifetime. One-page results are byte-limited but need no retained snapshot.+The listener closes query admission and clears snapshots before shutdown awaits,+on generation-checked current-listener exit, and before reopening on launch.+Whole-query tool errors contain a structured `{error:{code,message}}` object.+ ### Maintenance tools (gated, default off) `scan_duplicate_display_ids` and `reassign_duplicate_display_ids` are exposed only when `MCPSettings.maintenanceToolsEnabled` is true. The toggle is persisted under UserDefaults key `mcpMaintenanceToolsEnabled`.
diff --git a/specs/OVERVIEW.md b/specs/OVERVIEW.mdindex f20cf02..79029bb 100644--- a/specs/OVERVIEW.md+++ b/specs/OVERVIEW.md@@ -34,6 +34,7 @@ | [Search Empty State](#search-empty-state) | 2026-05-31 | Done | Show ContentUnavailableView.search empty state when dashboard text search has no matches | | [Task Priority](#task-priority) | 2026-06-06 | Done | Add a low/medium/high priority field with board glyph, filter, and MCP/Intent support | | [MCP Project Creation](#mcp-project-creation) | 2026-10-02 | Ready for Review | Create projects through MCP with validation and reusable project metadata |+| [Batch Task Queries](#batch-task-queries) | 2026-10-03 | Done | MCP task detail selection, batch lookup, and frozen cursor pagination | --- @@ -326,3 +327,13 @@ Create projects through MCP with validation and a returned UUID for task creatio - [implementation.md](mcp-project-creation/implementation.md) - [explanation.md](mcp-project-creation/explanation.md) - The generated `pre-push-review.html` is a local, ignored review deliverable.++## Batch Task Queries++Extend MCP `query_tasks` with explicit detail/comment options, batch identity lookup, and bounded pages over five-minute frozen results (T-2379).++- [requirements.md](batch-task-queries/requirements.md)+- [design.md](batch-task-queries/design.md)+- [decision_log.md](batch-task-queries/decision_log.md)+- [tasks.md](batch-task-queries/tasks.md)+- [implementation.md](batch-task-queries/implementation.md)
diff --git a/specs/batch-task-queries/decision_log.md b/specs/batch-task-queries/decision_log.mdnew file mode 100644index 0000000..b698bbb--- /dev/null+++ b/specs/batch-task-queries/decision_log.md@@ -0,0 +1,138 @@+# Decision Log: Batch Task Queries++## Quick Decisions++| ID | Date | Decision | Rationale |+|----|------|----------|-----------|+| Q1 | 2026-10-03 | Use the full spec workflow for T-2379. | User approved the scope assessment; query response compatibility and pagination consistency require explicit API decisions. |+| Q2 | 2026-10-03 | Name the feature `batch-task-queries`. | User approved the proposed name, covering both batch lookup and bounded detail queries. |+| Q3 | 2026-10-03 | Scope changes to the MCP tool only. | User explicitly excluded App Intent changes. |+| Q4 | 2026-10-03 | Specify query-wide storage/comment failure behavior and preserve optional display IDs. | Critic and two independent peer reviews identified implicit error behavior and UUID-resolved tasks without allocated display IDs; the requirements now distinguish these from per-input identifier failures. |+| Q5 | 2026-10-03 | Requirements approved with pages/batches of at most 100 and five-minute frozen results. | User explicitly approved the requirements and authorized the design phase. |+| Q6 | 2026-10-03 | Include unexpected listener exit in snapshot invalidation, and classify filter errors before formatting. | Critic and both peer reviews confirmed the retained handler and existing typed lookup failures require these paths to preserve restart and error semantics. |+| Q7 | 2026-10-03 | Design approved, including capacity rejection and one-fetch batch resolution. | User explicitly approved the design and authorized task planning. |+| Q8 | 2026-10-03 | Implementation task list approved. | User approved the four TDD pairs and final lint/macOS regression gate; implementation requires its separate workflow. |+| Q9 | 2026-10-03 | Use branch `T-2379/batch-task-queries`. | User requested this exact name and switched the worktree; the current branch was verified before handoff. |+| Q10 | 2026-10-03 | Implementation phase complete; all nine tasks and phase review passed. | macOS tests and lint passed; the malformed-cursor review finding was fixed and nine focused regression tests passed. Implementation is committed and ready for review. |+| Q11 | 2026-10-03 | Share a formatter per query and repair the frozen-comment regression assertion. | Pre-push review found repeated formatter setup and a continued page that contained no resolved task; the test now checks original comment values after changes, and the comments note reflects explicit inclusion. |++## Decision 1: Require Explicit Query Options Without Legacy Compatibility++**Date**: 2026-10-03+**Status**: accepted++### Context++Existing callers omit detail, comments, and pagination options and receive arrays. Preserving that contract would require maintaining separate legacy behavior.++### Decision++Require explicit options for initial queries and fail when required fields are missing. Backwards compatibility with the old query contract is not required.++### Rationale++The user chose the least-effort implementation and explicitly approved breaking existing calls. A single contract avoids maintaining legacy defaults and response paths.++### Alternatives Considered++- Preserve existing calls and opt into new behavior: rejected by the user because compatibility is unnecessary.+- Add a separate query tool: introduces another public surface without a requested need.++### Consequences++**Positive:** One query contract and explicit payload choices.++**Negative:** Existing MCP clients must update their calls and response parsing.++---++## Decision 2: Freeze Results For Short-Lived Pagination++**Date**: 2026-10-03+**Status**: accepted++### Context++Live task changes can shift page boundaries or change returned values during traversal. T-2379 requires no silent duplicates or omissions.++### Decision++Use frozen query results with a five-minute lifetime. Pages and batches contain at most 100 entries, as approved in the requirements.++### Rationale++The user selected frozen results after discussing live mutations. Freezing values provides predictable traversal without detecting every intervening change.++### Alternatives Considered++- Live pages with change detection: rejected in favor of simpler frozen traversal.+- Live pages without invalidation: cannot satisfy the ticket's consistency requirement.++### Consequences++**Positive:** Stable membership and values throughout traversal.++**Negative:** Results become stale during the lifetime; expired or lost snapshots require restarting the query.++---++## Decision 3: Cache Encoded Pages With Opaque Cursors++**Date**: 2026-10-03+**Status**: accepted++### Context++Frozen task and comment values must survive changes and deletion, and replayed cursors must return identical pages. The handler runs synchronously on the MainActor and is retained across listener restarts.++### Decision++Prepare all pages before publication, retain encoded strings in a handler-owned memory cache, and map random tokens directly to subsequent pages. Clear snapshots during listener teardown, unexpected current-listener exit, and listener launch. Limit retention to eight snapshots and 16 MiB of encoded page data; reject new queries rather than evict active snapshots.++### Rationale++Encoded pages avoid retaining SwiftData objects and eliminate continuation serialization or fetch failures. Direct token lookup avoids offset validation and signing. Capacity rejection preserves active pagination.++### Alternatives Considered++- Store copied dictionaries and serialize on continuation: retains more mutable structure and makes replay depend on another encoding step.+- Persist snapshots or encode offsets into signed tokens: adds storage or cryptographic machinery without a durability requirement.+- Evict oldest unexpired snapshots: permits new queries but interrupts active traversals.++### Consequences++**Positive:** Simple replay and fixed lifetime without model references or additional dependencies.++**Negative:** Initial calls prepare all result pages; large queries can exceed capacity, and retained page bytes require explicit accounting.++---++## Decision 4: Resolve Batches From One Task Fetch++**Date**: 2026-10-03+**Status**: accepted++### Context++The task fetch seam already exposes `fetchAllTasks`, while batches need ordered per-input outcomes and detection of duplicate identities.++### Decision++Fetch once and index matches by the batch identifier type. Do not add per-item fetch protocols or database batch predicates.++### Rationale++This is the least-effort path using the existing injectable interface and preserves duplicate detection. Fetch failures remain distinct from per-input not-found outcomes.++### Alternatives Considered++- Resolve each identifier through the service: creates up to 100 storage requests and new injection needs.+- Add predicate-based batch fetch APIs: narrows reads but adds service and predicate work without a measured need.++### Consequences++**Positive:** One fetch, deterministic input matching, and reuse of current test seams.++**Negative:** A small batch reads all tasks; this does not bound storage reads by batch size.++---
diff --git a/specs/batch-task-queries/design.md b/specs/batch-task-queries/design.mdnew file mode 100644index 0000000..b9cae4d--- /dev/null+++ b/specs/batch-task-queries/design.md@@ -0,0 +1,136 @@+# Batch Task Queries — Design++## Overview++Replace the MCP `query_tasks` array payload with a paginated object. Freeze encoded pages in a handler-owned cache; continuation reads cached text without accessing SwiftData.++## Architecture++All query preparation runs synchronously on `MCPToolHandler`'s MainActor, with no suspension between selection, comment fetches, serialization, and cache publication. This prevents UI mutations and sync callbacks from interleaving with snapshot construction. Store no live models in snapshots.++| File / component | Change |+|---|---|+| `MCP/MCPTaskQueryRequest.swift` | Parse initial versus continuation requests and validate options/selectors. |+| `MCP/MCPToolHandler+TaskQuery.swift` | Move `handleQueryTasks` and its lookup path into a focused extension; select tasks, serialize outcomes, and prepare pages. Expose only the handler dependencies and shared validation helpers needed by this extension at internal access. |+| `MCP/MCPTaskQuerySnapshotStore.swift` | MainActor cache of immutable page strings, expiry, byte accounting, and cursor lookup. |+| `MCP/MCPToolHandler.swift` | Own the store, dispatch queries, and expose `clearTaskQuerySnapshots()`. Keep the existing non-query tool paths unchanged. |+| `MCP/MCPToolDefinitions.swift` | Declare options, batch selectors, and cursor; document the response and limits. |+| `MCP/MCPTypes.swift` | Extend `JSONSchema` with optional `oneOf` and `additionalProperties`, preserving the factories used by other tools. |+| `MCP/MCPServer.swift` | Clear query snapshots and close admission in `tearDownCurrentServer` and the generation-checked `setNotRunning` callback; reset and reopen on listener launch. |+| `docs/agent-notes/mcp-server.md` | Update the query contract and snapshot lifecycle notes. |++Pattern / consumer audit:++| Existing call site | Needs equivalent? | Treatment |+|---|---|---|+| MCP list and display-ID paths call the handler's `taskToDict` | Yes | One query serializer uses explicit options and conditional comments. |+| Handler's serializer calls `IntentHelpers.taskToDict` | Yes | Reuse for summary/full fields; append comments only when requested. |+| `QueryTasksIntent` calls `IntentHelpers.taskToDict` twice | No | Preserve signatures and intent behavior; MCP envelope stays outside the shared helper. |+| `MCPServer` retains one handler through lifecycle changes | Yes | Clear cache and close admission on teardown or unexpected current-listener exit; reset and reopen on launch. |+| `MCPTestHelpers.decodeArrayResult` and MCP query tests | Yes | Add query-page decoding and explicit initial options; retain array decoding for unrelated tools. |+| Existing filter validation and `MCPQueryFilters.matches` | No new filter implementation | Extract existing validation/resolution without altering precedence or accepted values. |++## Components and Interfaces++### Request and response contract++Initial request:++```json+{"project":"Prism","type":"chore","detailLevel":"full","includeComments":false,"limit":100}+```++Continuation request:++```json+{"cursor":"<opaque token>"}+```++Successful list or single-ID response, inside the existing MCP text content:++```json+{"results":[{"taskId":"<uuid>","name":"Example","status":"idea","type":"chore","priority":"medium","lastStatusChangeDate":"<ISO8601>","description":null}],"nextCursor":"<opaque token>","expiresAt":"<ISO8601>"}+```++`results` contains task dictionaries for list/single lookup and outcome dictionaries for batches. The final or empty page has `nextCursor: null`. Dates retain existing ISO 8601 formatting. Summary and full task fields follow requirements 1.2–1.3, including the existing nested milestone shape.++Batch request and outcome examples:++```json+{"displayIds":[42,9999,42],"detailLevel":"full","includeComments":false,"limit":2}+```++```json+{"results":[{"index":0,"requested":{"displayId":42},"task":{"taskId":"<uuid>","displayId":42,"name":"Example","status":"idea","type":"chore","priority":"medium","lastStatusChangeDate":"<ISO8601>","description":null}},{"index":1,"requested":{"displayId":9999},"error":{"code":"TASK_NOT_FOUND","message":"No task matches displayId 9999"}}],"nextCursor":"<opaque token>","expiresAt":"<ISO8601>"}+```++UUID batch entries use `requested.taskId`; UUID text is preserved in `requested` for matching inputs, while returned task UUIDs use canonical uppercase `uuidString`. `index` is zero-based across the entire input, not per page. A repeated input produces another outcome at its own index. Success identity fields live in `task`, with `displayId` omitted when unallocated. Ambiguous identities use `AMBIGUOUS_TASK_ID`.++Parsing is presence-aware: JSON null is invalid for every provided selector/option. Only the existing filter keys plus the new options/selectors are accepted on initial calls; continuation accepts exactly `cursor`. Reject unknown keys. Reuse `IntentHelpers.parseIntValue` and `parseBoolValue` so booleans cannot become IDs or limits. Integers include exactly integral JSON numbers; strings and fractional numbers are rejected. Preserve existing zero/negative single-display-ID no-match behavior, and treat integer zero/negative batch display IDs as not-found outcomes.++At most one selector (`displayId`, `taskIds`, `displayIds`) is present. No selector means a filtered list. Batch selectors reject the presence of any list filter, including empty/null filter values. Validate all batch identifiers and the 1–100 length before accessing storage.++The schema's root contains `oneOf`: an initial object with required `detailLevel`, `includeComments`, and `limit`, and a continuation object requiring only `cursor`. Each branch has its own properties and `additionalProperties: false`. Initial branch property descriptions document the limit and selector/filter restrictions; runtime validation enforces them. Other tool schemas omit the new schema fields.++### Selection and serialization++For a list, use the injected `TaskFetching.fetchAllTasks`, apply existing resolved filters, and sort by uppercase task UUID string using ordinary lexicographic comparison. For single `displayId`, reuse `TaskService.findByDisplayID` and the same filters; not-found yields an empty page, duplicate display ID is a whole-query error.++For batches, fetch all tasks once through `TaskFetching`, build a UUID or permanent-display-ID index, and resolve inputs in order. Retain all matches per key so duplicate identities produce ambiguity outcomes instead of taking the first task. This uses the existing failure-injection seam and avoids adding fetch protocols or per-item database operations. No mutation or save occurs.++Serialize each unique resolved task once per query; repeated batch inputs reuse its dictionary. When comments are requested, fetch once per unique task, sort by `(creationDate, uppercase comment UUID)`, and copy comment fields into values. Comment omission never calls `CommentFetching`. Validate each page with `JSONSerialization.isValidJSONObject` and use throwing `data(withJSONObject:options:)` with no pretty printing. Do not use `IntentHelpers.encodeJSON`'s fallback for query pages. See [Foundation encoding API](https://developer.apple.com/documentation/foundation/jsonserialization/data%28withjsonobject%3Aoptions%3A%29).++### Snapshot cache++```swift+@MainActor final class MCPTaskQuerySnapshotStore {+ // Injectable monotonic and wall clocks, limits, and cursor generator.+ func publish(pages: [String], cursors: [String], deadline: ContinuousClock.Instant) throws+ func page(for cursor: String) throws -> String+ func clear()+}+```++At query start, capture a monotonic deadline of now + five minutes and wall-clock `expiresAt` of Date now + five minutes. Every page shares that expiry. Cursor strings are independent random UUIDs assigned to pages after the first; they are opaque dictionary keys, not encoded offsets. Pages embed their preallocated next cursor, so replay returns identical text. The first page is returned directly, while later pages stay cached until expiry even after the final page is read.++Prepare and encode every page before returning any result. Only after all task/comment reads, encoding, and capacity checks succeed is the snapshot published. If preparation reaches its deadline, fail without publication. An empty query still returns one empty page.++Limits: eight retained multi-page snapshots and 16 MiB total UTF-8 encoded page bytes. A query's encoded pages must also fit within 16 MiB even if it has only one page. Count encoded page bytes during construction and abort on overflow; cursor metadata is bounded separately by the encoded pages containing those tokens. One-page results need no retained snapshot. Purge expired entries before every initial query or continuation; expiry comparison is `now >= deadline` and reads do not extend it. Publish is atomic and capacity is rechecked after preparation.++Reject new multi-page queries when capacity is exhausted, without evicting unexpired snapshots. Store only encoded page strings and cursor mappings. `clear()` resets all accounting. Inject clocks and small capacity values for deterministic tests.++When an active listener tears down, close query admission and clear the cache synchronously before its first shutdown await. Requests already queued from that listener must fail while admission is closed. The `setNotRunning` callback also closes admission and clears snapshots after its existing generation check, covering unexpected exit and bind failure without letting a stale callback clear a replacement listener's cache. Listener launch clears snapshots before reopening admission. Direct handler tests start with admission open. No cursor survives a listener restart.++## Error Handling++Whole-query errors use `MCPToolResult.isError: true` and a JSON text object `{"error":{"code":"…","message":"…"}}`. Preserve typed failure categories during filter extraction, before formatting messages. Project lookup `storageFailure` and unexpected milestone fetch/lookup errors map to `QUERY_FAILED`; ambiguous project names and milestone names/display IDs map to `AMBIGUOUS_FILTER`. Project not-found or malformed filters map to `INVALID_INPUT`; milestone not-found keeps its existing empty-result behavior. Retain existing error messages. Existing unrelated tools keep their error format.++| Code | Trigger |+|---|---|+| `INVALID_INPUT` | Missing/invalid options, malformed selectors, conflicting selectors/filters, unknown fields, or cursor combined with any other field. |+| `AMBIGUOUS_TASK_ID` | Ambiguous single-display-ID lookup. In batches, ambiguity is an outcome error. |+| `AMBIGUOUS_FILTER` | Ambiguous project name or milestone name/display ID during filter resolution. |+| `QUERY_FAILED` | Storage, requested-comment, or JSON encoding failure; no results or cursor published. |+| `INVALID_CURSOR` | Malformed, unknown, expired, or cleared cursor; message instructs starting a new query. No tombstones needed to distinguish these causes. |+| `QUERY_CAPACITY_EXCEEDED` | Per-query byte limit or retained-cache limit reached; message suggests reducing scope/comments or retrying after expiry. |+| `QUERY_EXPIRED` | Initial preparation used the five-minute lifetime before publication; restart the query. |+| `QUERY_UNAVAILABLE` | Listener teardown has closed query admission; retry after server availability returns. |++Batch not-found and ambiguity are successful query outcomes. Failed task/comment reads fail the entire initial call. Continuations never refetch or silently replace a missing snapshot.++## Testing Strategy++Use Swift Testing, serialized MainActor suites, and `TestModelContainer` for integration fixtures. Add request parser, snapshot store, and handler query suites. Update existing query test calls to explicit options and decode `results`; preserve unrelated array tools and App Intent tests.++| Requirements | Checks |+|---|---|+| 1.1, 3.4–3.5, 4.3, 5.1 | Schema branches and parser agreement; missing/null/wrong-type options, boundaries, malformed arrays, mixed selectors, filters in batches, unknown keys, strict cursor-only requests. |+| 1.2–1.5 | Summary/full fields, nil description, empty/nonempty metadata, unallocated display ID, comments omission with throwing fetcher, comment order/ties/empty arrays, failures before publication. |+| 2.1–2.4 | Existing filters and validation with new options; single match, missing/nonmatching/duplicate ID; deterministic UUID ordering and empty page; typed project/milestone storage failures versus not-found and ambiguity. |+| 3.1–3.3 | UUID and display-ID batches, duplicates, original indexes across pages, missing/ambiguous matches, repeated task comment-fetch count. |+| 4.1–4.2, 5.2 | 182 full-detail chores in two pages; mutate/delete/create tasks and comments between pages, verifying frozen results. |+| 4.4–4.6 | Byte-identical cursor replay, fixed expiry/deadline boundary, malformed/unknown tokens, capacity rejection without eviction, atomic failed publication, initial expiry, accounting reset, stop/restart invalidation and admission fence; unexpected listener exit followed by restart rejects old cursors, while stale-generation callbacks preserve replacement snapshots. |++For pagination invariants, use deterministic generated result sets in Swift Testing across counts 0, 1, 99, 100, 101, 182, and 500 and limits 1, 2, 50, 100: concatenation equals input order, every page respects its limit, replay is identical, and repeated batch inputs remain distinct by index. No additional property-testing dependency is needed.++Run focused macOS suites during implementation using the Makefile's test tooling, then `make lint` and `make test-quick` at the implementation boundary. Full iOS/UI gates belong to pre-push review.
diff --git a/specs/batch-task-queries/requirements.md b/specs/batch-task-queries/requirements.mdnew file mode 100644index 0000000..3f5d8cf--- /dev/null+++ b/specs/batch-task-queries/requirements.md@@ -0,0 +1,69 @@+# Batch Task Queries — Requirements++## Introduction++T-2379 extends the MCP `query_tasks` tool so agents can retrieve task descriptions in bounded pages and look up several known tasks in one request. Callers explicitly choose detail level, comments, and page size. Short-lived frozen results keep multi-page reads consistent while tasks change.++## Non-Goals++- Changes to App Intents, the UI, or persisted task models.+- Compatibility with callers that omit the new required query options or expect the old array response.+- Configurable ordering or new activity/completion date filters.+- Cursors that survive MCP server restart or expiry.++### 1. Explicit Query Options and Detail++**User Story:** As an agent, I want explicit query options, so that I control result size and content.++**Acceptance Criteria:**++1. <a name="1.1"></a>WHEN starting a query, the tool SHALL require `detailLevel` (`summary` or `full`), `includeComments` (boolean), and `limit` (integer from 1 through 100); missing or invalid values SHALL return a tool error without query results. +2. <a name="1.2"></a>WHEN `detailLevel` is `summary`, each task SHALL contain `taskId`, `name`, `status`, `type`, `priority`, and `lastStatusChangeDate`, with `displayId`, `projectId`, `projectName`, `completionDate`, and `milestone` included only when present using their existing shapes; WHEN it is `full`, each task SHALL additionally contain `description` (string or null) and `metadata` (object when non-empty, omitted otherwise). +3. <a name="1.3"></a>WHEN `includeComments` is false, task results SHALL omit comments and SHALL succeed even if comment retrieval is unavailable; WHEN true, each task SHALL include a comments array (empty when there are none), with `id`, `authorName`, `content`, `isAgent`, and `creationDate` for each comment, ordered by creation date ascending with comment UUID ascending as the tie-breaker. +4. <a name="1.4"></a>WHEN a query succeeds, the tool SHALL return an object containing the bounded results, a next-page cursor or null, and the snapshot expiry time; it SHALL NOT return an unbounded array. +5. <a name="1.5"></a>WHEN any initial query encounters a storage or requested-comment retrieval failure, the tool SHALL return a tool error without partial results or a continuation cursor. ++### 2. Filtered Lists and Single-ID Lookup++**User Story:** As an agent, I want existing task selection behavior, so that I can retrieve the tasks relevant to my work.++**Acceptance Criteria:**++1. <a name="2.1"></a>WHEN querying a list, the tool SHALL preserve the existing project/projectId, status, not_status, unfinished, type, priority, milestone/milestoneDisplayId, and substring-search selection and validation behavior. +2. <a name="2.2"></a>WHEN `displayId` is supplied, the tool SHALL apply the existing filters conjunctively to that task, return an empty result for a missing or nonmatching task, and return a tool error for an ambiguous display ID or storage failure; explicit detail and comments options SHALL control its content. +3. <a name="2.3"></a>WHEN a filtered list is paginated, its task order SHALL be task UUID ascending, independent of task edits or display-ID allocation. +4. <a name="2.4"></a>WHEN a list has no matching tasks, the tool SHALL return an empty result and null next-page cursor. ++### 3. Batch Lookup++**User Story:** As an agent, I want to look up multiple task identities at once, so that I avoid one request per task.++**Acceptance Criteria:**++1. <a name="3.1"></a>WHEN a caller supplies `taskIds` (UUID strings) or `displayIds` (integers), the tool SHALL accept 1 through 100 identifiers and return one outcome per input position in input order, including repeated inputs. +2. <a name="3.2"></a>WHEN a batch item resolves uniquely, its outcome SHALL contain the requested identifier, input position, task UUID, and task data using the requested detail and comments options; its task display ID SHALL be included only when allocated. +3. <a name="3.3"></a>WHEN a batch identifier is missing or ambiguous, its outcome SHALL identify that input and distinguish not-found from ambiguous-ID failure; other resolvable items SHALL still be returned. +4. <a name="3.4"></a>WHEN identifier arrays are empty, oversized, or contain malformed identifiers, or a request combines multiple selectors (`displayId`, `taskIds`, `displayIds`), the tool SHALL reject the entire request with a tool error. +5. <a name="3.5"></a>WHEN batch selectors are combined with list filters, the tool SHALL reject the request with a tool error rather than silently omit requested identities. ++### 4. Frozen Pagination++**User Story:** As an agent, I want consistent pages, so that changes during retrieval do not silently skip or repeat results.++**Acceptance Criteria:**++1. <a name="4.1"></a>WHEN a query starts, its result membership, order, task values, batch outcomes, and requested comments SHALL be frozen for five minutes from creation; subsequent task or comment creation, edits, deletion, or sync SHALL NOT change its pages. +2. <a name="4.2"></a>WHEN a caller follows every next-page cursor before expiry, each page SHALL contain at most the original `limit` outcomes, and traversal SHALL return the complete frozen result exactly once per result position. +3. <a name="4.3"></a>WHEN continuing a query, the caller SHALL supply only the cursor; supplying filters, selectors, or query options alongside it SHALL return a tool error. +4. <a name="4.4"></a>WHEN a valid cursor is reused before expiry, it SHALL return the same page and next-page cursor without extending the snapshot lifetime. +5. <a name="4.5"></a>WHEN a cursor is malformed, unknown, expired, or invalidated by server restart, the tool SHALL return an explicit error instructing the caller to start a new query; it SHALL NOT silently query current data. +6. <a name="4.6"></a>IF resource limits prevent starting or retaining a snapshot, the tool SHALL reject a new query or explicitly invalidate affected cursors; it SHALL NOT truncate successful results or silently replace a snapshot. ++### 5. Discoverable Contract++**User Story:** As an agent, I want a discoverable query contract, so that I can call the tool correctly without trial and error.++**Acceptance Criteria:**++1. <a name="5.1"></a>The MCP tool schema and documentation SHALL describe required initial-query options, cursor-only continuation, selector/filter restrictions, response fields, ordering, identifier failures, page and batch limits, and the five-minute expiry. +2. <a name="5.2"></a>WHEN querying 182 matching chores with `detailLevel: full`, `includeComments: false`, and `limit: 100`, the tool SHALL return their identities and descriptions in two pages when continued before expiry, without individual detail requests.
diff --git a/specs/batch-task-queries/tasks.md b/specs/batch-task-queries/tasks.mdnew file mode 100644index 0000000..9aa9fb5--- /dev/null+++ b/specs/batch-task-queries/tasks.md@@ -0,0 +1,60 @@+---+references:+ - specs/batch-task-queries/requirements.md+ - specs/batch-task-queries/design.md+ - specs/batch-task-queries/decision_log.md+---+# Batch Task Queries — Implementation Tasks++- [x] 1. Red: test request validation and advertised schema <!-- id:whb9rf8 -->+ - Add MCPTaskQueryRequestTests and query-schema assertions. Cover initial/continuation branches, missing/null/wrong-type options, limit and batch boundaries, malformed UUIDs, integral versus fractional numbers, booleans as IDs, unknown fields, mixed selectors, batch filters, and cursor plus other fields.+ - Stream: 1+ - Requirements: [1.1](requirements.md#1.1), [3.4](requirements.md#3.4), [3.5](requirements.md#3.5), [4.3](requirements.md#4.3), [5.1](requirements.md#5.1)++- [x] 2. Green: implement request parsing and query schema <!-- id:whb9rf9 -->+ - Create MCP/MCPTaskQueryRequest.swift. Add optional oneOf/additionalProperties to JSONSchema without changing other schemas, and update queryTasks properties and descriptions. Wire validation into the query entry point; reuse strict integer/boolean helpers and preserve existing filter values and precedence.+ - Blocked-by: whb9rf8 (Red: test request validation and advertised schema)+ - Stream: 1+ - Requirements: [1.1](requirements.md#1.1), [3.4](requirements.md#3.4), [3.5](requirements.md#3.5), [4.3](requirements.md#4.3), [5.1](requirements.md#5.1)++- [x] 3. Red: test frozen page storage and pagination invariants <!-- id:whb9rfa -->+ - Add MCPTaskQuerySnapshotStoreTests with injected clocks, cursors, and small capacity limits. Verify replay, exact expiry boundary, no lifetime extension, unknown tokens, no eviction, byte accounting, clear, failed publication, and expired preparation. Generate counts 0/1/99/100/101/182/500 with limits 1/2/50/100; concatenation must equal input positions and page size must stay bounded.+ - Blocked-by: whb9rf9 (Green: implement request parsing and query schema)+ - Stream: 1+ - Requirements: [1.4](requirements.md#1.4), [4.1](requirements.md#4.1), [4.2](requirements.md#4.2), [4.4](requirements.md#4.4), [4.5](requirements.md#4.5), [4.6](requirements.md#4.6)++- [x] 4. Green: implement and attach the snapshot store <!-- id:whb9rfb -->+ - Create MCP/MCPTaskQuerySnapshotStore.swift and attach an injectable instance to MCPToolHandler. Publish immutable encoded pages atomically; retain at most eight snapshots/16 MiB, reject capacity exhaustion, use five-minute monotonic deadlines and fixed wall expiry, and expose cursor lookup/clear. Keep models out of the cache and guard preparation byte count and expiry.+ - Blocked-by: whb9rfa (Red: test frozen page storage and pagination invariants)+ - Stream: 1+ - Requirements: [1.4](requirements.md#1.4), [4.1](requirements.md#4.1), [4.2](requirements.md#4.2), [4.4](requirements.md#4.4), [4.5](requirements.md#4.5), [4.6](requirements.md#4.6)++- [x] 5. Red: test query pages, detail options, batches, and preserved filters <!-- id:whb9rfc -->+ - Add MCPTaskQueryTests with TestModelContainer and throwing/counting fetchers; add page decoding and explicit options to existing MCP query tests without auto-defaulting production requests. Cover full/summary fields, nullable descriptions, metadata, optional display IDs, comments order/omission, single lookup, existing filters, typed project/milestone errors, one-fetch batches, repeated inputs, per-ID failures, and failure without published pages. Exercise 182 chores and task/comment edits/deletions/creation between pages; preserve App Intent and unrelated array-tool assertions.+ - Blocked-by: whb9rfb (Green: implement and attach the snapshot store)+ - Stream: 1+ - Requirements: [1.2](requirements.md#1.2), [1.3](requirements.md#1.3), [1.4](requirements.md#1.4), [1.5](requirements.md#1.5), [2.1](requirements.md#2.1), [2.2](requirements.md#2.2), [2.3](requirements.md#2.3), [2.4](requirements.md#2.4), [3.1](requirements.md#3.1), [3.2](requirements.md#3.2), [3.3](requirements.md#3.3), [4.1](requirements.md#4.1), [4.2](requirements.md#4.2), [5.2](requirements.md#5.2)++- [x] 6. Green: implement paginated task queries and ordered batch outcomes <!-- id:whb9rfd -->+ - Extract MCPToolHandler+TaskQuery.swift, exposing only required dependencies/shared helpers. Preserve filter resolution and classify typed failures before formatting. Index one task fetch for batches, retain duplicate matches, order lists by UUID and batches by input index, serialize each unique task/comments once, and encode all pages with throwing Foundation JSON serialization before publication. Wire cursor-only reads, structured query errors, and exact results/nextCursor/expiresAt payloads; update tool descriptions with final response and error contract. Run the focused query suites through Makefile tooling.+ - Blocked-by: whb9rfc (Red: test query pages, detail options, batches, and preserved filters)+ - Stream: 1+ - Requirements: [1.2](requirements.md#1.2), [1.3](requirements.md#1.3), [1.4](requirements.md#1.4), [1.5](requirements.md#1.5), [2.1](requirements.md#2.1), [2.2](requirements.md#2.2), [2.3](requirements.md#2.3), [2.4](requirements.md#2.4), [3.1](requirements.md#3.1), [3.2](requirements.md#3.2), [3.3](requirements.md#3.3), [4.1](requirements.md#4.1), [4.2](requirements.md#4.2), [5.1](requirements.md#5.1), [5.2](requirements.md#5.2)++- [x] 7. Red: test snapshot invalidation across server lifecycle changes <!-- id:whb9rfe -->+ - Extend MCPServer lifecycle tests and handler admission tests. Verify stop/restart and unexpected current-listener exit clear snapshots, bind failure closes admission, queued requests fail while closed, launch starts with empty cache, and stale-generation callbacks do not clear replacement snapshots.+ - Blocked-by: whb9rfd (Green: implement paginated task queries and ordered batch outcomes)+ - Stream: 1+ - Requirements: [4.5](requirements.md#4.5), [4.6](requirements.md#4.6)++- [x] 8. Green: wire lifecycle cache invalidation and query admission <!-- id:whb9rff -->+ - Update MCPServer tearDownCurrentServer before shutdown awaits, generation-checked setNotRunning, and launchServer to close/clear/reset/reopen query admission. Add only the required handler lifecycle interface. Run focused lifecycle and cursor tests; no listener generation redesign.+ - Blocked-by: whb9rfe (Red: test snapshot invalidation across server lifecycle changes)+ - Stream: 1+ - Requirements: [4.5](requirements.md#4.5), [4.6](requirements.md#4.6)++- [x] 9. Run lint and macOS regression gates <!-- id:whb9rfg -->+ - Run run_silent make lint and run_silent make test-quick once after integration. Keep full logs on disk and inspect concise failure excerpts; repair feature regressions with focused reruns. Report inherited failures separately. Full iOS/UI gates remain in pre-push review.+ - Blocked-by: whb9rff (Green: wire lifecycle cache invalidation and query admission)+ - Stream: 1+ - Requirements: [1.1](requirements.md#1.1), [1.2](requirements.md#1.2), [1.3](requirements.md#1.3), [1.4](requirements.md#1.4), [1.5](requirements.md#1.5), [2.1](requirements.md#2.1), [2.2](requirements.md#2.2), [2.3](requirements.md#2.3), [2.4](requirements.md#2.4), [3.1](requirements.md#3.1), [3.2](requirements.md#3.2), [3.3](requirements.md#3.3), [3.4](requirements.md#3.4), [3.5](requirements.md#3.5), [4.1](requirements.md#4.1), [4.2](requirements.md#4.2), [4.3](requirements.md#4.3), [4.4](requirements.md#4.4), [4.5](requirements.md#4.5), [4.6](requirements.md#4.6), [5.1](requirements.md#5.1), [5.2](requirements.md#5.2)
diff --git a/specs/batch-task-queries/implementation.md b/specs/batch-task-queries/implementation.mdnew file mode 100644index 0000000..fced9b6--- /dev/null+++ b/specs/batch-task-queries/implementation.md@@ -0,0 +1,49 @@+# Batch Task Queries — Implementation++## Beginner Level++### What Changed++The MCP task query now asks callers to choose summary or full detail, whether to include comments, and a page size from 1 to 100. It returns a results object with a next-page cursor and expiry instead of an array. Known task UUIDs or display IDs can be looked up in batches of up to 100.++### Why It Matters++An agent can retrieve 182 chore descriptions in two requests. Later pages preserve the values captured by the first request, even when tasks or comments change.++### Key Concepts++A snapshot is a temporary copy of the query results. A cursor is a random token that retrieves the next saved page; it expires five minutes after the initial query starts.++## Intermediate Level++### Architecture++`MCPTaskQueryRequest` separates strict initial options from cursor-only continuation. The handler reuses existing filters and `IntentHelpers.taskToDict`, indexes one fetch for batches, and serializes each unique task and its requested comments once. Batch outcomes retain input indexes, including repeats and explicit missing/ambiguous-ID failures.++### Implementation Approach++`encodeQueryPages` encodes every page before publication. `MCPTaskQuerySnapshotStore` retains immutable JSON text behind opaque tokens, with monotonic expiry and an eight-snapshot/16 MiB limit. No live SwiftData models are cached; cursor replay reads the same saved text without a fetch. One formatter is shared across task serialization within a query.++### Trade-offs++Compatibility with the old request defaults and array payload was explicitly waived. Batch lookup reads all tasks once rather than adding another service API. Snapshot capacity rejects new multi-page queries rather than evicting active traversals. These choices are recorded in Decisions 1–4.++## Expert Level++### Contracts and Failure Boundaries++Initial preparation is synchronous on MainActor, preventing app mutations from interleaving with selection and serialization. Requested-comment or storage failures abort publication; identifier failures stay local to batch outcomes. Lists sort by UUID, batches by input position, and comments by creation date then UUID. Continuation rejects extra options and never replaces an expired snapshot with current data.++### Lifecycle and Memory++The server closes query admission and clears snapshots before shutdown awaits, on generation-checked listener completion, and at replacement launch. Stale callbacks cannot clear a replacement listener's pages. Encoded byte accounting is conservative because it counts all prepared pages even though only continuation pages are retained; limits do not promise a bound on transient SwiftData fetch or dictionary preparation memory.++### Edge Cases++UUID-resolved tasks without allocated display IDs omit that field. Nil descriptions are JSON null; empty metadata is omitted. Repeated batch identities reuse serialization but preserve distinct result positions. Malformed, unknown, cleared, and expired cursors return explicit restart guidance.++## Completeness Assessment++All approved requirements and nine tasks are implemented. Tests cover strict parsing, fields and filters, ordered batch failures, frozen task/comment values, replay, expiry/capacity, and server lifecycle invalidation. No partial or missing feature behavior was identified in the review. App Intents, persisted models, custom ordering/date filters, and durable cursors remain outside scope.++The pre-push test registry has no matching Xcode/JUnit runner, so the review page reports native project-gate outcomes without JUnit totals or coverage. Refer to the review page for the current verification verdict.
The initial make test wrapper and separate UI command timed out; Xcode RunSomeTests also exceeded the connector’s 300-second limit. Completed native bundles independently confirm the full iOS suite (1,291 tests), UI fallback (21 tests), and affected macOS suite (three tests) all passed with zero failures. Lint passes. No additional test suite was needed after these outcomes were recovered.
The configured ecosystem registry has a Swift Package runner but no matching Xcode runner. JUnit and coverage are unavailable for this review; their absence is not a zero-coverage result.
Initial requests must provide detailLevel, includeComments, and limit. Continuation accepts only cursor. Update array response parsing to the results/nextCursor/expiresAt envelope.