Skip to content

fix: harden provider account credential lifecycle #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cyq1017 wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

fix: harden provider account credential lifecycle #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9ef498
fix: isolate browser cookie import from XCTest
cyq1017 Aug 9, 2026
e588a23
fix: fail closed on ambiguous helper account attribution
cyq1017 Aug 9, 2026
dae987e
fix: make provider account saves recoverable
cyq1017 Aug 9, 2026
0882f2b
fix: retire legacy provider secrets on account deletion
cyq1017 Aug 9, 2026
f5b8134
fix: keep provider deletion retryable
cyq1017 Aug 9, 2026
7e67489
fix: preserve newer provider deletion intents
cyq1017 Aug 9, 2026
237d13e
fix: gate provider deletion on durable metadata
cyq1017 Aug 12, 2026
d9824bf
Merge remote-tracking branch 'origin/main' into fix/provider-account-…
cyq1017 Aug 12, 2026
3d4940b
test: isolate Claude helper state from XCTest
cyq1017 Aug 12, 2026
0b8a62c
fix: skip Claude keychain reads under XCTest
cyq1017 Aug 17, 2026
412fa95
fix: an unreadable credential must not brick the account (#435)
JasonYeYuhe Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 128 additions & 19 deletions CLI Pulse Bar/CLI Pulse Bar/ProviderConfigEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,28 @@ struct ProviderConfigEditor: View {

@discardableResult
private func save() -> Bool {
state.withProviderAccountPersistenceLock(or: false) {
saveAssumingProviderAccountPersistenceLock()
}
}

@discardableResult
private func saveAssumingProviderAccountPersistenceLock()
-> Bool
{
guard let idx = state.providerConfigs.firstIndex(
where: { $0.accountID == accountID }
) else {
return false
}
guard state.recoverPendingProviderAccountSave(accountID) else {
#if os(macOS)
testState = .failure(
"Could not restore the previous provider configuration. Please retry before saving new changes."
)
#endif
return false
}
guard
state.persistProviderAccountCredentialRecoveryAnchor(
accountID
Expand All @@ -852,22 +869,39 @@ struct ProviderConfigEditor: View {
#endif
return false
}
#if os(macOS)
if kind == .gemini && allowsLiveProviderActions {
let secretCheckpoint:
ProviderConfig.SecretPersistenceCheckpoint?
if allowsLiveProviderActions {
guard
geminiCredentialDraft.commit(
accountID: accountID
)
let captured =
state.providerConfigs[idx]
.makeSecretPersistenceCheckpoint()
else {
#if os(macOS)
testState = .failure(
GeminiOAuthError
.credentialPersistenceFailed
.localizedDescription
"Could not safely read existing provider credentials. Please retry."
)
#endif
return false
}
secretCheckpoint = captured
} else {
secretCheckpoint = nil
}
let secretRecoveryConfig = state.providerConfigs[idx]
guard
let persistenceCheckpoint =
state.makeProviderAccountPersistenceCheckpoint(
accountID
)
else {
#if os(macOS)
testState = .failure(
"Could not safely prepare provider configuration. Please retry."
)
#endif
return false
}
#endif
state.providerConfigs[idx].sourceMode = sourceMode
state.providerConfigs[idx].accountLabel = accountLabel.isEmpty ? nil : accountLabel
state.providerConfigs[idx].setPlanOverride(
Expand Down Expand Up @@ -899,24 +933,99 @@ struct ProviderConfigEditor: View {
? true
: nil
#endif
if allowsLiveProviderActions {
guard state.providerConfigs[idx].saveSecrets() else {
let transactionResult = ProviderAccountSaveTransaction.commit(
persistSecrets: {
guard allowsLiveProviderActions else {
return true
}
guard state.providerConfigs[idx].saveSecrets() else {
#if os(macOS)
testState = .failure(
"Could not safely save provider credentials. Please retry."
)
#endif
return false
}
return true
},
rollbackSecrets: {
guard allowsLiveProviderActions else {
return true
}
guard let secretCheckpoint else {
return false
}
return secretRecoveryConfig
.restoreSecrets(
from: secretCheckpoint
)
},
persistMetadata: {
guard state.persistProviderAccountDraftMetadata(accountID) else {
#if os(macOS)
testState = .failure(
"Could not safely save provider configuration. Please retry."
)
#endif
return false
}
return true
},
rollbackMetadata: {
persistenceCheckpoint.restore()
},
commitProviderCredential: {
#if os(macOS)
testState = .failure(
"Could not safely save provider credentials. Please retry."
)
guard kind == .gemini && allowsLiveProviderActions else {
return true
}
guard geminiCredentialDraft.commit(accountID: accountID) else {
testState = .failure(
GeminiOAuthError
.credentialPersistenceFailed
.localizedDescription
)
return false
}
#endif
return false
return true
},
finalize: {
state.finalizeProviderAccountDraft(accountID)
}
}
guard state.commitProviderAccountDraft(accountID) else {
)
switch transactionResult {
case .committed:
return true
case .failedRolledBack:
return false
case .failedRollbackIncomplete:
let recovery = ProviderAccountSaveRecovery(
restoreMetadata: {
persistenceCheckpoint.restore()
},
restoreSecrets: {
guard allowsLiveProviderActions else {
return true
}
guard let secretCheckpoint else {
return false
}
return secretRecoveryConfig.restoreSecrets(
from: secretCheckpoint
)
}
)
state.retainProviderAccountSaveRecovery(
recovery,
for: accountID
)
#if os(macOS)
testState = .failure(
"Could not safely save provider configuration. Please retry."
"Save failed and recovery is incomplete. Retry to restore the previous configuration before saving again."
)
#endif
return false
}
return true
}
}
Loading
Loading