mirror of
https://github.com/wu736139669/hapi.git
synced 2026-11-22 04:17:05 +00:00
feat(codex): share sessions across terminal and web
Use one native app-server for terminal, Web and phone clients while retaining the existing CLI and Runner lifecycle. Synchronize native queues, permissions, question history and steering state; preserve explicit permission precedence and per-turn usage models. Resume inactive clear commands through Runner and reject independent child cold resumes. Add shared-runtime regression tests, generated protocol fixtures and lifecycle documentation.
This commit is contained in:
@@ -276,9 +276,11 @@ public func buildSessionConfigState(
|
||||
return SessionConfigState(
|
||||
flavor: flavor,
|
||||
active: detail?.active ?? summary?.active ?? false,
|
||||
controlledByUser: detail?.agentState?.controlledByUser == true,
|
||||
controlledByUser: detail?.agentState?.controlledByUser == true && detail?.metadata?.capabilities?.concurrentClients != true,
|
||||
permissionMode: detail?.permissionMode,
|
||||
permissionModes: permissionModeOptions(forFlavor: flavor),
|
||||
permissionModes: permissionModeOptions(forFlavor: flavor).filter {
|
||||
detail?.metadata?.capabilities?.concurrentClients != true || $0.mode.rawValue != "safe-yolo"
|
||||
},
|
||||
model: model,
|
||||
modelOptions: modelOptions,
|
||||
modelOptionsLoading: modelOptionsLoading,
|
||||
|
||||
@@ -202,6 +202,19 @@ public final class ChatInteractor {
|
||||
Task { [weak self] in
|
||||
guard let self else { return }
|
||||
self.drafts?.clear(sessionId: self.sessionId)
|
||||
if attachmentMetadata == nil && (text == "/clear" || text == "/new")
|
||||
&& self.sessionStore.detail(for: self.sessionId)?.metadata?.capabilities?.concurrentClients == true {
|
||||
defer { self.isSending = false }
|
||||
do {
|
||||
let result = try await self.api.clearConversation(id: self.sessionId)
|
||||
self.sessionStore.scheduleRefresh()
|
||||
self.emit(.sessionSuperseded(sessionId: result.sessionId))
|
||||
} catch {
|
||||
self.setComposerText(text)
|
||||
self.emit(.notice(Self.errorMessage(error, fallback: "Failed to create conversation")))
|
||||
}
|
||||
return
|
||||
}
|
||||
await self.performSend(
|
||||
text: text,
|
||||
localId: localId,
|
||||
|
||||
@@ -63,6 +63,11 @@ extension APIClient {
|
||||
)
|
||||
}
|
||||
|
||||
/// Create a new shared root; only the caller follows the returned ID.
|
||||
public func clearConversation(id: String) async throws -> ResumeSessionResponse {
|
||||
try await request(.post, "/api/sessions/\(encodePathComponent(id))/clear", body: EmptyRequestBody())
|
||||
}
|
||||
|
||||
/// `POST /api/sessions/:id/abort` (active sessions only).
|
||||
public func abortSession(id: String) async throws {
|
||||
try await requestVoid(
|
||||
|
||||
@@ -386,7 +386,7 @@ public enum NewSessionLogic {
|
||||
sessionType: draft.sessionType,
|
||||
worktreeName: draft.worktreeName
|
||||
)
|
||||
if !base.agent.permissionModes.contains(base.permissionMode) {
|
||||
if !base.agent.launchPermissionModes.contains(base.permissionMode) {
|
||||
base.permissionMode = .default
|
||||
}
|
||||
return base
|
||||
|
||||
Reference in New Issue
Block a user