mirror of
https://github.com/wu736139669/hapi.git
synced 2026-10-13 20:09:55 +00:00
feat(settings): onboard hub provider credentials for dictation and voice (#1392)
* feat(settings): onboard hub transcription provider credentials in UI Env-only keys made dictation invisible; Settings can now add/edit/clear hub-side credentials (masked), with env still winning as override. Refs tiann/hapi#1384. Co-authored-by: Cursor <cursoragent@cursor.com> * feat(settings): onboard voice-assistant backends alongside dictation Same Settings credential surface now covers ElevenLabs, Gemini Live, and Qwen Realtime (alias env pairs), not only transcription providers. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): address PR #1392 Major credential onboard findings Alias env locks, non-destructive Save (omit empty fields), and owner-only settings.json permissions for hub-stored provider secrets. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): harden credential onboard for second-pass Majors Owner-namespace gate, stage-then-sync env after persist, and per-field OpenAI-compatible editability under mixed env locks. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): serialize settings RMW and clear partial compatible creds Per-file settings lock for concurrent credential PUTs, and Clear shown for partial OpenAI-compatible entries (key/url/model alone). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): serialize all settings writers via updateSettings Route credentials, relay auth, generators, server settings, and CLI token persistence through a locked RMW helper; reset Clear form state. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): share cross-process settings lock with CLI Extract withSettingsFileLock for hub+CLI, keep owner-only 0o600 rewrites, and race hub credential updates against CLI-style writers. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): keep UI secrets out of process.env; PID-own settings locks Settings-backed provider credentials now live in an in-memory overlay (getProviderEnvironment) so tunnel/ACP/Codex children do not inherit them. Settings file locks record pid+token and only reclaim dead or legacy locks. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): never reclaim ownerless settings lock sidecars wx creates the lock path before the owner JSON is visible; unlinking null owners let a waiter steal a live acquisition and collide on settings.json.tmp (CI ENOENT). Only reclaim parsed owners with dead PIDs. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): reclaim dead locks via rename; clean up failed publishes Stale reclaim renames the sidecar to a unique break path and re-verifies the expected dead owner before deleting it, so a loser cannot unlink a successor's live lock. Failed owner writes unlink the wx sidecar. Reclaim uses a sync owner read so contenders do not all observe one dead owner across an await and race the exclusive create. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): reclaim dead locks under exclusive reaper sidecar Stale reclaim now takes a fixed settings.json.lock.reap lock, re-validates pid+token, then unlinks — so a delayed contender cannot move a successor's live lock aside. Also document providerCredentials in settings.schema.json. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): fail closed on corrupt CLI settings; backoff busy reaper CLI updateSettings now uses a strict read that rejects invalid JSON instead of treating errors as {}, which could wipe providerCredentials. Settings lock reclaim sleeps when another process holds .reap so retries are not burned synchronously. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): publish locks via candidate+link; fix CLI vitest hoist Acquire settings locks by writing a complete candidate then linkSync to the fixed path so a crash cannot leave an empty live sidecar. Fix the CLI persistence regression test to create its temp dir inside vi.hoisted. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): replace bespoke lock with proper-lockfile; hide tenant creds UI Codex kept finding crash windows in hand-rolled lock sidecars. Switch the shared settings lock to proper-lockfile's mkdir + mtime lease. Hide the owner-only credentials editor from non-default namespaces on the voice page. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(settings): adapt sessionSummaryContract to outcome updateSettings Rebase onto main brought #1376 unique tmp + outcome-shaped writers; wire sessionSummaryContract and the write-failure credential test to match. Co-authored-by: Cursor <cursoragent@cursor.com> * chore: retrigger CI after rebase onto upstream/main Empty commit — Meta reported no checks on da0c6c258 after tip-forward rebase. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
/**
|
||||
* Cross-process exclusive lock for settings.json (and similar).
|
||||
* Shared by hub and CLI. Uses proper-lockfile (mkdir + mtime lease) so a
|
||||
* crash cannot leave an unreclaimable empty sidecar.
|
||||
*/
|
||||
|
||||
import lockfile from 'proper-lockfile'
|
||||
|
||||
const LOCK_RETRY_INTERVAL_MS = 100
|
||||
const MAX_LOCK_ATTEMPTS = 50
|
||||
const STALE_MS = 30_000
|
||||
const UPDATE_MS = 10_000
|
||||
|
||||
let maxLockAttemptsForTests: number | undefined
|
||||
let staleMsForTests: number | undefined
|
||||
|
||||
/** @internal test-only */
|
||||
export function setSettingsLockMaxAttemptsForTests(value: number | undefined): void {
|
||||
maxLockAttemptsForTests = value
|
||||
}
|
||||
|
||||
/** @internal test-only */
|
||||
export function setSettingsLockStaleMsForTests(value: number | undefined): void {
|
||||
staleMsForTests = value
|
||||
}
|
||||
|
||||
export async function withSettingsFileLock<T>(
|
||||
settingsFile: string,
|
||||
work: () => Promise<T>
|
||||
): Promise<T> {
|
||||
const retries = maxLockAttemptsForTests ?? MAX_LOCK_ATTEMPTS
|
||||
const stale = staleMsForTests ?? STALE_MS
|
||||
// Distinct from earlier file-shaped `*.lock` sidecars in this PR so a
|
||||
// leftover empty file cannot block mkdir-based acquisition.
|
||||
const lockfilePath = `${settingsFile}.hapi.lock`
|
||||
|
||||
const release = await lockfile.lock(settingsFile, {
|
||||
realpath: false,
|
||||
lockfilePath,
|
||||
stale,
|
||||
update: Math.min(UPDATE_MS, Math.floor(stale / 2)),
|
||||
retries: {
|
||||
retries,
|
||||
minTimeout: LOCK_RETRY_INTERVAL_MS,
|
||||
maxTimeout: LOCK_RETRY_INTERVAL_MS,
|
||||
},
|
||||
})
|
||||
|
||||
try {
|
||||
return await work()
|
||||
} finally {
|
||||
await release()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user