Best possible solution:

Keep #91947 as the canonical tracker and review #95347, or another manager-owned whole-search budget fix, instead of this branch.

Do we have a high-confidence way to reproduce the issue?

Yes. Current main and v2026.6.9 wrap memory_search in a fixed 15s deadline while the linked issue shows QMD query work exceeding that budget with a larger configured QMD timeout.

Is this the best way to solve the issue?

No. This PR is not the best fix because a single QMD command timeout plus 5s does not cover QMD's whole search lifecycle; the safer replacement is the manager-owned budget in #95347.

Security review:

Security review cleared: No concrete security or supply-chain concern found; the diff only changes memory-core timeout logic and tests without dependency, workflow, secret, package-resolution, or downloaded-code changes.

AGENTS.md: found and applied where relevant.

What I checked:

• Repository policy read: Root AGENTS.md and scoped extensions/AGENTS.md were read fully; their review-depth, bundled plugin, dependency-contract, proof, best-fix, and compatibility guidance applies to this memory-core PR. (AGENTS.md:1, 6daf9307e0b9)
• Current main behavior: Current main still defines a fixed 15,000ms memory_search wrapper and passes it directly to runMemorySearchToolWithDeadline, so the underlying issue is not implemented on main. (extensions/memory-core/src/tools.ts:415, 6daf9307e0b9)
• Latest release behavior: v2026.6.9 still has the same fixed 15s memory_search wrapper, so this timeout mismatch is not shipped as fixed. (extensions/memory-core/src/tools.ts:415, c645ec4555c0)
• PR implementation shape: This PR computes the outer tool timeout as Math.floor(qmdTimeoutMs) plus a fixed 5s overhead, which maps one QMD command budget onto a broader search lifecycle. (extensions/memory-core/src/tools.ts:97, 7b3ba582a297)
• QMD lifecycle evidence: QMD search can warm/sync/wait before search, group collections, retry fallback modes, and repair missing collections, so one timeout plus fixed overhead can still cut off valid configured searches. (extensions/memory-core/src/memory/qmd-manager.ts:1257, 6daf9307e0b9)
• Related maintainer review: A member closed the matching single-timeout approach in fix(memory-core): honor qmd search timeouts #92624 as unsafe for the same QMD lifecycle reasons, and left the canonical issue open for a manager-owned whole-search budget. (1407fefd74c7)

Likely related people:

• steipete: Commit 9e2bd8b added the fixed memory_search deadline wrapper this PR changes. (role: introduced timeout wrapper behavior; confidence: high; commits: 9e2bd8b2f7eb; files: extensions/memory-core/src/tools.ts, extensions/memory-core/src/tools.test.ts)
• dreamhunter2333: Commit 8d72cb9 added AbortSignal propagation through the same memory_search deadline path and SDK search contract. (role: recent timeout-path contributor; confidence: high; commits: 8d72cb9401e5; files: extensions/memory-core/src/tools.ts, packages/memory-host-sdk/src/host/types.ts)
• TurboTheTurtle: Commit ddacb7b changed transient QMD manager lifecycle handling in tools.ts and qmd-manager.ts, adjacent to this timeout fix path. (role: recent QMD lifecycle contributor; confidence: medium; commits: ddacb7ba39d4; files: extensions/memory-core/src/tools.ts, extensions/memory-core/src/memory/qmd-manager.ts)
• vincentkoc: Recent blame carries the affected wrapper through current main, and a member review on the related PR closed the same fixed-overhead approach as unsafe. (role: recent reviewer and area contributor; confidence: medium; commits: 63fdc57b3ac2, 5707038e6c5a; files: extensions/memory-core/src/tools.ts, extensions/memory-core/src/memory/qmd-manager.ts)
• osolmaz: Commit 0dbf174 touched QMD query/rerank config and docs related to the timeout contract reused by this PR. (role: recent QMD config contributor; confidence: medium; commits: 0dbf17471b41; files: extensions/memory-core/src/memory/qmd-manager.ts, packages/memory-host-sdk/src/host/backend-config.ts, docs/reference/memory-config.md)

Codex review notes: model internal, reasoning high; reviewed against 6daf9307e0b9.