Fix #4355: Make session write lock timeout configurable

- Increase default timeout from 10s to 60s to prevent premature
  termination when multiple subagents compete for session file locks
- Add sessionWriteLockTimeoutMs config option to agent defaults
- Update call sites to use config value when available
- Maintain backwards compatibility for explicit timeoutMs callers

This fixes the issue where subagents would terminate prematurely with
'terminated' error when session write lock timeout (10s) was exceeded
during concurrent subagent execution.
This commit is contained in:
spiceoogway committed 2026-01-29 23:39:31 -05:00
1 parent bf6ec64fd9
commit f1b866e854
5 files changed
+32 -28

No files matched your search

+1
View File
@@ -351,6 +351,7 @@ export async function compactEmbeddedPiSessionDirect(
const sessionLock = await acquireSessionWriteLock({
sessionFile: params.sessionFile,
timeoutMs: params.config?.agents?.defaults?.sessionWriteLockTimeoutMs,
});
try {
await prewarmSessionFile(params.sessionFile);
@@ -386,6 +386,7 @@ export async function runEmbeddedAttempt(
const sessionLock = await acquireSessionWriteLock({
sessionFile: params.sessionFile,
timeoutMs: params.config?.agents?.defaults?.sessionWriteLockTimeoutMs,
});
let sessionManager: ReturnType<typeof guardSessionManager> | undefined;
+3 -1
View File
@@ -107,7 +107,9 @@ export async function acquireSessionWriteLock(params: {
release: () => Promise<void>;
}> {
registerCleanupHandlers();
const timeoutMs = params.timeoutMs ?? 10_000;
// Default timeout increased from 10s to 60s to prevent premature termination
// when multiple subagents compete for session file locks (see issue #4355)
const timeoutMs = params.timeoutMs ?? 60_000;
const staleMs = params.staleMs ?? 30 * 60 * 1000;
const sessionFile = path.resolve(params.sessionFile);
const sessionDir = path.dirname(sessionFile);
+1
View File
@@ -123,6 +123,7 @@ export const AgentDefaultsSchema = z
blockStreamingCoalesce: BlockStreamingCoalesceSchema.optional(),
humanDelay: HumanDelaySchema.optional(),
timeoutSeconds: z.number().int().positive().optional(),
sessionWriteLockTimeoutMs: z.number().int().positive().optional(),
mediaMaxMb: z.number().positive().optional(),
typingIntervalSeconds: z.number().int().positive().optional(),
typingMode: z