From 15ebb96f0f9641ef6a06ed7ab4d18286bac816f0 Mon Sep 17 00:00:00 2001
From: pi3123 <27499080+pi3123@users.noreply.github.com>
Date: Fri, 31 Jul 2026 23:41:08 -0700
Subject: [PATCH] Use centralized busy timeout in auth credential store
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SqliteAuthCredentialStore re-ran PRAGMA busy_timeout = 5000 on the
shared agent.db connection, overwriting the headless 1000ms bound set by
AgentStorage — so RPC/ACP/eval hosts could still stall synchronously for
five seconds per statement after auth-store initialization. Route it
through getDbBusyTimeoutMs() so the headless bound survives.
---
 packages/ai/src/auth-storage.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts
index 492cbc804..e043d2c25 100644
--- a/packages/ai/src/auth-storage.ts
+++ b/packages/ai/src/auth-storage.ts
@@ -12,7 +12,7 @@ import { createHash } from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { parseAlibabaTokenPlanCredential } from "@oh-my-pi/pi-catalog/wire/alibaba-token-plan";
-import { $env, getAgentDbPath, logger } from "@oh-my-pi/pi-utils";
+import { $env, getAgentDbPath, getDbBusyTimeoutMs, logger } from "@oh-my-pi/pi-utils";
 import type { ApiKeyResolver } from "./auth-retry";
 import * as AIError from "./error";
 import { isUsageLimitOutcome } from "./error/rate-limit";
@@ -6929,8 +6929,10 @@ export class SqliteAuthCredentialStore implements AuthCredentialStore {
 		// Install the busy handler BEFORE any lock-taking statement (incl.
 		// `PRAGMA journal_mode=WAL`, which acquires an exclusive lock during WAL
 		// recovery). Without this, concurrent omp startups can crash here with
-		// `SQLITE_BUSY` / `SQLITE_BUSY_RECOVERY`. See issue #2421.
-		this.#db.run("PRAGMA busy_timeout = 5000");
+		// `SQLITE_BUSY` / `SQLITE_BUSY_RECOVERY`. See issue #2421. Uses the
+		// centralized timeout so a headless host keeps its bounded busy wait
+		// instead of overwriting it with the interactive 5s value.
+		this.#db.run(`PRAGMA busy_timeout = ${getDbBusyTimeoutMs()}`);
 		this.#db.run(`
 			PRAGMA journal_mode=WAL;
 			PRAGMA synchronous=NORMAL;