mirror of
https://github.com/wu736139669/hapi.git
synced 2026-10-24 22:10:59 +00:00
Port of the tested Android NEW SESSION reference (B-M3d) to iOS: - HapiProtocol: NewSessionCatalogs (static claude models/efforts + codex reasoning-effort fallback, exact Android data) in Catalog/; CodexModelSummary + CodexModelsResponse wire types (shared/src/apiTypes.ts). - HapiClient: machineCodexModels endpoint (GET /api/machines/:id/codex-models, rpc_target_missing surfaces as APIError); NewSession/NewSessionForm.swift — typed Codable draft (tolerant decode) + NewSessionLogic: exact spawn body per SpawnSessionRequestSchema (yolo incl. false for non-grok/non-codex-family, permissionMode incl. 'default' for grok+codex-family, sessionType always, trimmed-or-absent worktreeName, serviceTier only while fast tier visible, collaborationMode only when plan, model only claude/codex), parent-path derivation, suggestion filtering, recent-path LRU(8), worktree-name validation, codex catalog helpers, draft sanitization. - App: Features/NewSession (NewSessionModel @Observable orchestration — machine preselect last-used, 250 ms debounced list-directory autocomplete with per-parent cache, exists probe with worktree-blocking / simple two-tap-create, codex catalog fetch + selection reconcile, UserDefaults draft/prefs per hub; NewSessionView Form UI with per-flavor option matrix); session-list "+" toolbar button on HomeView presents the sheet, success dismisses and pushes the chat. - Tests: spawn-body exactness (4 configs, canonical JSON), parent query, suggestions, LRU, worktree validation, fast-tier detection, reasoning-effort normalization, draft sanitize + tolerant decode; codex-models endpoint request/error construction.
172 lines
7.2 KiB
Swift
172 lines
7.2 KiB
Swift
import Foundation
|
|
import HapiClient
|
|
import HapiProtocol
|
|
import Testing
|
|
|
|
private let emptyPageJSON = """
|
|
{"messages":[],"page":{"direction":"before","limit":200,"epoch":0,"reset":false,\
|
|
"nextBeforeSeq":null,"nextBeforeAt":null,"nextAfterSeq":null,"nextAfterAt":null,\
|
|
"snapshotHeadSeq":null,"snapshotHeadAt":null,"hasMore":false}}
|
|
"""
|
|
|
|
@Suite("Endpoint request construction")
|
|
struct EndpointRequestTests {
|
|
private func bodyString(_ request: URLRequest?) -> String? {
|
|
request?.httpBody.flatMap { String(data: $0, encoding: .utf8) }
|
|
}
|
|
|
|
@Test func messagesPageWithBeforeCursor() async throws {
|
|
let token = freshJWT()
|
|
let harness = try makeHarness(jwt: token)
|
|
await harness.performer.enqueue(json: emptyPageJSON)
|
|
|
|
let response = try await harness.client.messages(
|
|
sessionId: "s 1",
|
|
query: .before(seq: 42, at: 170, limit: 200)
|
|
)
|
|
#expect(response.messages.isEmpty)
|
|
#expect(response.page.direction == .before)
|
|
|
|
let request = await harness.performer.requests.first
|
|
#expect(
|
|
request?.url?.absoluteString
|
|
== "\(testHubURLString)/api/sessions/s%201/messages?beforeAt=170&beforeSeq=42&limit=200"
|
|
)
|
|
#expect(request?.httpMethod == "GET")
|
|
#expect(request?.value(forHTTPHeaderField: "Authorization") == "Bearer \(token)")
|
|
}
|
|
|
|
@Test func messagesPageWithAfterCursorAndEpoch() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: emptyPageJSON)
|
|
|
|
_ = try await harness.client.messages(
|
|
sessionId: "abc",
|
|
query: .after(seq: 10, at: 99, epoch: 3)
|
|
)
|
|
let request = await harness.performer.requests.first
|
|
#expect(
|
|
request?.url?.absoluteString
|
|
== "\(testHubURLString)/api/sessions/abc/messages?afterAt=99&afterSeq=10&epoch=3"
|
|
)
|
|
}
|
|
|
|
@Test func sendMessageWithDeliveryMode() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: "{\"ok\":true}")
|
|
|
|
try await harness.client.sendMessage(
|
|
sessionId: "abc",
|
|
text: "hi",
|
|
localId: "L1",
|
|
deliveryMode: .steer
|
|
)
|
|
let request = await harness.performer.requests.first
|
|
#expect(request?.url?.absoluteString == "\(testHubURLString)/api/sessions/abc/messages")
|
|
#expect(request?.httpMethod == "POST")
|
|
#expect(request?.value(forHTTPHeaderField: "Content-Type") == "application/json")
|
|
#expect(bodyString(request) == "{\"deliveryMode\":\"steer\",\"localId\":\"L1\",\"text\":\"hi\"}")
|
|
}
|
|
|
|
@Test func approveWithNestedAnswers() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: "{\"ok\":true}")
|
|
|
|
try await harness.client.approvePermission(
|
|
sessionId: "abc",
|
|
requestId: "r/1",
|
|
PermissionApproveRequest(answers: ["q1": ["answers": ["a", "b"]]])
|
|
)
|
|
let request = await harness.performer.requests.first
|
|
#expect(
|
|
request?.url?.absoluteString
|
|
== "\(testHubURLString)/api/sessions/abc/permissions/r%2F1/approve"
|
|
)
|
|
#expect(bodyString(request) == "{\"answers\":{\"q1\":{\"answers\":[\"a\",\"b\"]}}}")
|
|
}
|
|
|
|
@Test func approveWithFlatAnswersAndModeSwitch() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: "{\"ok\":true}")
|
|
|
|
try await harness.client.approvePermission(
|
|
sessionId: "abc",
|
|
requestId: "r1",
|
|
PermissionApproveRequest(mode: .acceptEdits, answers: ["q1": ["a", "b"]])
|
|
)
|
|
let request = await harness.performer.requests.first
|
|
#expect(
|
|
bodyString(request)
|
|
== "{\"answers\":{\"q1\":[\"a\",\"b\"]},\"mode\":\"acceptEdits\"}"
|
|
)
|
|
}
|
|
|
|
@Test func setModelEncodesExplicitNull() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: "{\"ok\":true}")
|
|
try await harness.client.setModel(sessionId: "abc", model: nil)
|
|
let first = await harness.performer.requests.first
|
|
#expect(bodyString(first) == "{\"model\":null}")
|
|
|
|
await harness.performer.enqueue(json: "{\"ok\":true}")
|
|
try await harness.client.setModel(
|
|
sessionId: "abc",
|
|
model: .catalogReference(provider: "openai", modelId: "gpt-5")
|
|
)
|
|
let second = await harness.performer.requests.last
|
|
#expect(bodyString(second) == "{\"model\":{\"modelId\":\"gpt-5\",\"provider\":\"openai\"}}")
|
|
}
|
|
|
|
@Test func spawnDiscriminatesOnType() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(json: "{\"type\":\"success\",\"sessionId\":\"new-id\"}")
|
|
let spawned = try await harness.client.spawnSession(
|
|
machineId: "m1",
|
|
SpawnRequest(directory: "/work/repo", agent: .claude, sessionType: .worktree, worktreeName: "wt")
|
|
)
|
|
#expect(spawned == .success(sessionId: "new-id"))
|
|
let request = await harness.performer.requests.first
|
|
#expect(request?.url?.absoluteString == "\(testHubURLString)/api/machines/m1/spawn")
|
|
#expect(
|
|
bodyString(request)
|
|
== "{\"agent\":\"claude\",\"directory\":\"/work/repo\",\"sessionType\":\"worktree\",\"worktreeName\":\"wt\"}"
|
|
)
|
|
|
|
await harness.performer.enqueue(json: "{\"type\":\"error\",\"message\":\"no runner\"}")
|
|
let failed = try await harness.client.spawnSession(machineId: "m1", SpawnRequest(directory: "/x"))
|
|
#expect(failed == .error(message: "no runner"))
|
|
}
|
|
|
|
@Test func machineCodexModelsRequestAndRpcTargetMissing() async throws {
|
|
let harness = try makeHarness(jwt: freshJWT())
|
|
await harness.performer.enqueue(
|
|
json: "{\"success\":true,\"models\":[{\"id\":\"gpt-5.2-codex\","
|
|
+ "\"displayName\":\"GPT-5.2 Codex\",\"isDefault\":true,"
|
|
+ "\"supportedReasoningEfforts\":[\"low\",\"medium\"],"
|
|
+ "\"serviceTiers\":[\"standard\",\"fast\"]}]}"
|
|
)
|
|
let response = try await harness.client.machineCodexModels(machineId: "m 1")
|
|
#expect(response.success)
|
|
#expect(response.models?.first?.id == "gpt-5.2-codex")
|
|
#expect(response.models?.first?.serviceTiers == ["standard", "fast"])
|
|
let request = await harness.performer.requests.first
|
|
#expect(
|
|
request?.url?.absoluteString
|
|
== "\(testHubURLString)/api/machines/m%201/codex-models"
|
|
)
|
|
#expect(request?.httpMethod == "GET")
|
|
|
|
// Old runner without the machine RPC: 503 with the stable code the
|
|
// new-session form keys off to hide the codex model picker.
|
|
await harness.performer.enqueue(
|
|
status: 503,
|
|
json: "{\"success\":false,\"code\":\"rpc_target_missing\"}"
|
|
)
|
|
let error = await capturedError {
|
|
try await harness.client.machineCodexModels(machineId: "m1")
|
|
}
|
|
#expect((error as? APIError)?.status == 503)
|
|
#expect((error as? APIError)?.code == "rpc_target_missing")
|
|
}
|
|
}
|