@wrongstack/core 0.273.0 → 0.274.0

package/dist/tools/index.d.ts

@@ -1,5 +1,5 @@
-import { T as Tool } from '../context-Dw55zZ_Q.js';
-import { c as MCPServerConfig, C as Config } from '../config-C8IYxlO8.js';
+import { T as Tool } from '../context-DERiLofu.js';
+import { c as MCPServerConfig, C as Config } from '../config-BxcrDzri.js';
 import '../dispatcher-types.d-BBeXBQgS.js';
 import 'node:https';
 import 'undici';

package/dist/types/index.d.ts

@@ -1,34 +1,34 @@
-export { A as AgentError, p as CacheTtl, n as Capabilities, z as ConfigError, i as ContentBlock, C as Context, B as ContextEvidenceState, D as ContextFileEvidence, E as ContextInit, F as ContextIntentEvidence, G as ContextRepeatedReadEvidence, H as ERROR_CODES, I as ErrorCode, K as ErrorSeverity, L as ErrorSubsystem, N as FileSnapshot, O as FsError, Q as ImageBlock, J as JSONSchema, V as JsonSchemaSpec, M as Message, W as MessageRole, h as Permission, X as PluginError, P as Provider, g as ProviderError, Y as ProviderErrorBody, a as ReasoningConfig, o as ReasoningEffort, R as ReasoningRequest, c as Request, _ as RequestCacheControl, d as Response, $ as ResponseFormat, u as ResumedSession, a0 as RiskTier, t as RunOptions, a2 as SafetySetting, a3 as SddError, v as SessionData, a4 as SessionError, S as SessionEvent, j as SessionMetadata, k as SessionStore, w as SessionSummary, b as SessionWriter, a7 as StopReason, a8 as StreamEvent, a9 as StreamHangError, q as TextBlock, aa as ThinkingBlock, x as TodoItem, T as Tool, ab as ToolCallContext, ac as ToolError, ad as ToolErrorCategory, ae as ToolErrorInfo, af as ToolEvidenceStatus, ag as ToolFinalEvent, ah as ToolIconId, m as ToolOutputMetadata, l as ToolProgressEvent, s as ToolResultBlock, ai as ToolStreamEvent, r as ToolUseBlock, U as Usage, aj as WrongStackError, ak as asBlocks, al as asText, an as isAgentError, ao as isConfigError, ap as isFsError, aq as isImageBlock, ar as isPluginError, as as isSddError, at as isSessionError, au as isTextBlock, av as isThinkingBlock, aw as isToolError, ax as isToolResultBlock, ay as isToolUseBlock, az as isWrongStackError, aA as toWrongStackError } from '../context-Dw55zZ_Q.js';
-export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-BpM0mdBE.js';
-export { A as AdaptiveConcurrencyConfig, o as AutonomyConfig, p as CONTEXT_WINDOW_MODES, q as CircuitBreakerRuntimeConfig, C as Config, k as ConfigLoader, j as ConfigStore, r as ContextConfig, h as ContextWindowAggressiveOn, s as ContextWindowConfigLike, t as ContextWindowMode, u as ContextWindowModeId, i as ContextWindowPolicy, v as ContextWindowThresholds, w as CustomModelDefinition, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, x as DEFAULT_TUI_THINKING_WORD, F as FeaturesConfig, g as HookEntry, H as HookEvent, m as HookInput, f as HookMatcher, n as HookOutcome, y as HqClientConfig, I as InProcessHook, z as IndexingConfig, L as LaunchConfig, B as LogConfig, E as MAX_TUI_THINKING_WORD_LENGTH, c as MCPServerConfig, d as ModelMatrixEntry, G as ModelRuntimeCacheConfig, J as ModelRuntimeConfig, K as ModelRuntimeParametersConfig, N as ModelRuntimeReasoningConfig, e as ModelsDevModel, a as ModelsDevPayload, O as ModelsDevProvider, M as ModelsRegistry, Q as PluginConfig, U as ProviderApiKey, P as ProviderConfig, b as ResolvedModel, R as ResolvedProvider, V as SessionLoggingConfig, S as ShellHook, X as SyncCategory, l as SyncConfig, T as TokenSavingTier, Y as ToolDescriptionMode, Z as ToolDescriptionModeConfig, _ as ToolsConfig, W as WireFamily, $ as formatContextWindowModeList, a0 as getContextWindowMode, a1 as isContextWindowModeId, a2 as listContextWindowModes, a3 as normalizeTokenSavingTier, a4 as normalizeTuiThinkingWord, a5 as resolveContextWindowPolicy } from '../config-C8IYxlO8.js';
-export { a as CompactReport, C as Compactor } from '../compactor-72ug-ZRB.js';
-export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-CC7XFYWG.js';
+export { A as AgentError, p as CacheTtl, n as Capabilities, z as ConfigError, i as ContentBlock, C as Context, B as ContextEvidenceState, D as ContextFileEvidence, E as ContextInit, F as ContextIntentEvidence, G as ContextRepeatedReadEvidence, H as ERROR_CODES, I as ErrorCode, K as ErrorSeverity, L as ErrorSubsystem, N as FileSnapshot, O as FsError, Q as ImageBlock, J as JSONSchema, V as JsonSchemaSpec, M as Message, W as MessageRole, h as Permission, X as PluginError, P as Provider, g as ProviderError, Y as ProviderErrorBody, a as ReasoningConfig, o as ReasoningEffort, R as ReasoningRequest, c as Request, _ as RequestCacheControl, d as Response, $ as ResponseFormat, u as ResumedSession, a0 as RiskTier, t as RunOptions, a2 as SafetySetting, a3 as SddError, v as SessionData, a4 as SessionError, S as SessionEvent, j as SessionMetadata, k as SessionStore, w as SessionSummary, b as SessionWriter, a7 as StopReason, a8 as StreamEvent, a9 as StreamHangError, q as TextBlock, aa as ThinkingBlock, x as TodoItem, T as Tool, ab as ToolCallContext, ac as ToolError, ad as ToolErrorCategory, ae as ToolErrorInfo, af as ToolEvidenceStatus, ag as ToolFinalEvent, ah as ToolIconId, m as ToolOutputMetadata, l as ToolProgressEvent, s as ToolResultBlock, ai as ToolStreamEvent, r as ToolUseBlock, U as Usage, aj as WrongStackError, ak as asBlocks, al as asText, an as isAgentError, ao as isConfigError, ap as isFsError, aq as isImageBlock, ar as isPluginError, as as isSddError, at as isSessionError, au as isTextBlock, av as isThinkingBlock, aw as isToolError, ax as isToolResultBlock, ay as isToolUseBlock, az as isWrongStackError, aA as toWrongStackError } from '../context-DERiLofu.js';
+export { P as ProviderRunner, R as RunProviderOptions } from '../provider-runner-DrmpBE5l.js';
+export { A as AdaptiveConcurrencyConfig, o as AutonomyConfig, p as CONTEXT_WINDOW_MODES, q as CircuitBreakerRuntimeConfig, C as Config, k as ConfigLoader, j as ConfigStore, r as ContextConfig, h as ContextWindowAggressiveOn, s as ContextWindowConfigLike, t as ContextWindowMode, u as ContextWindowModeId, i as ContextWindowPolicy, v as ContextWindowThresholds, w as CustomModelDefinition, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, x as DEFAULT_TUI_THINKING_WORD, E as ExecToolConfig, F as FeaturesConfig, g as HookEntry, H as HookEvent, m as HookInput, f as HookMatcher, n as HookOutcome, y as HqClientConfig, I as InProcessHook, z as IndexingConfig, L as LaunchConfig, B as LogConfig, G as MAX_TUI_THINKING_WORD_LENGTH, c as MCPServerConfig, d as ModelMatrixEntry, J as ModelRuntimeCacheConfig, K as ModelRuntimeConfig, N as ModelRuntimeParametersConfig, O as ModelRuntimeReasoningConfig, e as ModelsDevModel, a as ModelsDevPayload, Q as ModelsDevProvider, M as ModelsRegistry, U as PluginConfig, V as ProviderApiKey, P as ProviderConfig, b as ResolvedModel, R as ResolvedProvider, X as SessionLoggingConfig, S as ShellHook, Y as SyncCategory, l as SyncConfig, T as TokenSavingTier, Z as ToolDescriptionMode, _ as ToolDescriptionModeConfig, $ as ToolsConfig, W as WireFamily, a0 as formatContextWindowModeList, a1 as getContextWindowMode, a2 as isContextWindowModeId, a3 as listContextWindowModes, a4 as normalizeTokenSavingTier, a5 as normalizeTuiThinkingWord, a6 as resolveContextWindowPolicy } from '../config-BxcrDzri.js';
+export { a as CompactReport, C as Compactor } from '../compactor-riTOds0f.js';
+export { a as PermissionDecision, P as PermissionPolicy, T as TrustPolicy } from '../permission-Dgs3v-Xq.js';
 export { C as CheckpointInfo, R as RewindResult, a as RewindResultExtended, S as SessionRewinder } from '../session-rewinder-C9HnMkhP.js';
-export { a as AddAttachmentInput, c as Attachment, d as AttachmentKind, e as AttachmentMeta, b as AttachmentRef, A as AttachmentStore, D as DefaultSessionReader } from '../session-reader-BepLSnGL.js';
+export { a as AddAttachmentInput, c as Attachment, d as AttachmentKind, e as AttachmentMeta, b as AttachmentRef, A as AttachmentStore, D as DefaultSessionReader } from '../session-reader-CceH13Kq.js';
 export { D as DEFAULT_AUTONOMY_CONFIG, a as DEFAULT_CIRCUIT_BREAKER_CONFIG, b as DEFAULT_CONTEXT_CONFIG, c as DEFAULT_SESSION_LOGGING_CONFIG, d as DEFAULT_SESSION_PRUNE_DAYS, e as DEFAULT_TOOLS_CONFIG } from '../default-config-BbX4ojZs.js';
-export { a as DefaultSecretScrubber, D as DefaultSecretVault, S as SecretVaultOptions, d as decryptConfigSecrets, e as encryptConfigSecrets, i as isSecretField, m as migratePlaintextSecrets, r as rewriteConfigEncrypted, b as rotateConfigKeys } from '../secret-vault-eMBKfheR.js';
+export { a as DefaultSecretScrubber, D as DefaultSecretVault, S as SecretVaultOptions, d as decryptConfigSecrets, e as encryptConfigSecrets, i as isSecretField, m as migratePlaintextSecrets, r as rewriteConfigEncrypted, b as rotateConfigKeys } from '../secret-vault-DnqIFhPF.js';
 export { D as DefaultLogger, a as DefaultLoggerOptions, L as LogFormat, n as noOpLogger } from '../logger-DmmQhf4P.js';
-export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-Bim6G5Jz.js';
-export { o as MEMORY_TYPE_LABELS, p as MemoryClearedPayload, q as MemoryConsolidatedPayload, b as MemoryEntry, r as MemoryForgottenPayload, s as MemoryPriority, d as MemoryRelevanceContext, t as MemoryRememberedPayload, M as MemoryScope, c as MemoryStore, u as MemoryType, S as ScoredEntry } from '../brain-BxN2k2HP.js';
-import { I as IterationStage, g as ParallelIterationStage } from '../parallel-eternal-engine-CtXly2Sf.js';
-export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-CtXly2Sf.js';
+export { D as DefaultPathResolver, a as DefaultTokenCounter } from '../path-resolver-BqU-fwzD.js';
+export { o as MEMORY_TYPE_LABELS, p as MemoryClearedPayload, q as MemoryConsolidatedPayload, b as MemoryEntry, r as MemoryForgottenPayload, s as MemoryPriority, d as MemoryRelevanceContext, t as MemoryRememberedPayload, M as MemoryScope, c as MemoryStore, u as MemoryType, S as ScoredEntry } from '../brain-gfZX3the.js';
+import { I as IterationStage, g as ParallelIterationStage } from '../parallel-eternal-engine-rsIclDqO.js';
+export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, h as buildRecoveryStrategies } from '../parallel-eternal-engine-rsIclDqO.js';
 export { b as SkillEntry, S as SkillLoader, a as SkillManifest } from '../skill-DGIXCtdv.js';
-export { B as BuildContext, b as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-CNVKuQDQ.js';
+export { B as BuildContext, b as ModelCapabilities, a as Renderer, S as SystemPromptBuilder } from '../pipeline-B-dpCFYS.js';
 export { I as InputReader, P as PromptOption } from '../input-reader-E-ffP2ee.js';
-export { K as CoordinatorEvents, C as CoordinatorStatus, D as DoneCondition, o as MCPRegistryView, r as MetricsSinkView, c as MultiAgentConfig, M as MultiAgentCoordinator, u as Plugin, P as PluginAPI, s as PluginCapabilities, t as PluginDependency, l as PluginPipelines, a1 as ProviderFactory, n as ProviderRegistryView, q as SessionWriterView, k as SlashCommand, p as SlashCommandRegistryView, e as SpawnResult, S as SubagentConfig, R as SubagentContext, U as SubagentError, V as SubagentErrorKind, W as SubagentRunContext, X as SubagentRunOutcome, d as SubagentRunner, _ as TaskDelegation, f as TaskResult, T as TaskSpec, m as ToolRegistryView } from '../agent-subagent-runner-ehb4xGvd.js';
-export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-4C6Wr91w.js';
+export { K as CoordinatorEvents, C as CoordinatorStatus, D as DoneCondition, o as MCPRegistryView, r as MetricsSinkView, c as MultiAgentConfig, M as MultiAgentCoordinator, u as Plugin, P as PluginAPI, s as PluginCapabilities, t as PluginDependency, l as PluginPipelines, a1 as ProviderFactory, n as ProviderRegistryView, q as SessionWriterView, k as SlashCommand, p as SlashCommandRegistryView, e as SpawnResult, S as SubagentConfig, R as SubagentContext, U as SubagentError, V as SubagentErrorKind, W as SubagentRunContext, X as SubagentRunOutcome, d as SubagentRunner, _ as TaskDelegation, f as TaskResult, T as TaskSpec, m as ToolRegistryView } from '../agent-subagent-runner-BwmkIDEd.js';
+export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from '../models-registry-8OorW51H.js';
 export { D as DEFAULT_MODES, b as Mode, a as ModeConfig, c as ModeManifest, M as ModeStore } from '../mode-CZlO9iU1.js';
-export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-BZ2enORi.js';
+export { I as InMemoryAgentBridge, a as InMemoryBridgeTransport, c as createMessage } from '../agent-bridge-DFo21wmY.js';
 export { D as DEFAULT_SPEC_TEMPLATE, S as SpecAnalysis, a as SpecApiEndpoint, b as SpecRequirement, c as SpecSection, d as SpecSectionType, e as SpecStatus, f as SpecTemplate, g as SpecValidationResult, h as Specification } from '../spec-TBi3Jr6T.js';
 export { C as CriticalPathResult, f as TaskAssignment, g as TaskDependency, h as TaskEdge, i as TaskFilter, d as TaskGraph, e as TaskNode, a as TaskPriority, c as TaskProgress, j as TaskSort, b as TaskStatus, T as TaskType, k as computeTaskProgress, l as findCriticalPath, t as topologicalSort } from '../task-graph-u1q9Jkyk.js';
 export { A as AggregateHealth, a as HealthCheck, b as HealthCheckResult, H as HealthRegistry, c as HealthStatus, d as MetricLabels, e as MetricSeries, M as MetricsSink, f as MetricsSnapshot, S as Span, T as Tracer } from '../observability-D-HZN_mF.js';
-export { S as SystemPromptContributor } from '../index-B7fHDt0B.js';
+export { S as SystemPromptContributor } from '../index-00KPKAlm.js';
 import '../logger-B63L5bTg.js';
-import '../retry-policy-BV7nzeAd.js';
+import '../retry-policy-hYxsm10a.js';
 import '../secret-vault-BAKpgFw_.js';
 import '../path-resolver-CPRj4bFY.js';
-import '../goal-store-Cx363x7Z.js';
-import '../multi-agent-coordinator-q1skFeNP.js';
+import '../goal-store-xNSVxmpV.js';
+import '../multi-agent-coordinator-CNx48Zoz.js';
 import 'node:events';
 import '../mailbox-types-Ct2hJq0P.js';
 

package/dist/types/index.js

@@ -60,8 +60,8 @@ async function atomicWrite(targetPath, content, opts = {}) {
     }
     let mode;
     try {
-      const stat2 = await fs.stat(targetPath);
-      mode = stat2.mode & 511;
+      const stat3 = await fs.stat(targetPath);
+      mode = stat3.mode & 511;
     } catch {
       mode = opts.mode;
     }
@@ -299,11 +299,11 @@ function validateAgainstSchema(value, schema) {
   walk(value, schema, "", errors);
   return { ok: errors.length === 0, errors };
 }
-function walk(value, schema, path10, errors) {
+function walk(value, schema, path11, errors) {
   if (schema.enum !== void 0) {
     if (!schema.enum.some((e) => deepEqual(e, value))) {
       errors.push({
-        path: path10 || "<root>",
+        path: path11 || "<root>",
         message: `expected one of ${JSON.stringify(schema.enum)}, got ${JSON.stringify(value)}`
       });
       return;
@@ -312,7 +312,7 @@ function walk(value, schema, path10, errors) {
   if (typeof schema.type === "string") {
     if (!checkType(value, schema.type)) {
       errors.push({
-        path: path10 || "<root>",
+        path: path11 || "<root>",
         message: `expected ${schema.type}, got ${describeType(value)}`
       });
       return;
@@ -322,20 +322,20 @@ function walk(value, schema, path10, errors) {
     const obj = value;
     for (const req of schema.required ?? []) {
       if (!(req in obj)) {
-        errors.push({ path: joinPath(path10, req), message: "required property missing" });
+        errors.push({ path: joinPath(path11, req), message: "required property missing" });
       }
     }
     if (schema.properties) {
       for (const [key, subSchema] of Object.entries(schema.properties)) {
         if (key in obj) {
-          walk(obj[key], subSchema, joinPath(path10, key), errors);
+          walk(obj[key], subSchema, joinPath(path11, key), errors);
         }
       }
     }
   }
   if (schema.type === "array" && Array.isArray(value) && schema.items) {
     for (let i = 0; i < value.length; i++) {
-      walk(value[i], schema.items, `${path10}[${i}]`, errors);
+      walk(value[i], schema.items, `${path11}[${i}]`, errors);
     }
   }
 }
@@ -1947,8 +1947,8 @@ function unwrapDataKey(buf, keyFile) {
 function checkKeyFilePermissions(keyFile) {
   if (process.platform === "win32") return;
   try {
-    const stat2 = fs2.statSync(keyFile);
-    const actualMode = stat2.mode & 511;
+    const stat3 = fs2.statSync(keyFile);
+    const actualMode = stat3.mode & 511;
     if (actualMode !== KEY_FILE_MODE) {
       console.warn(JSON.stringify({
         level: "warn",
@@ -4750,7 +4750,7 @@ ${errorDetails}`,
         "tool.name": tool.name,
         "tool.mutating": tool.mutating,
         "tool.permission": tool.permission,
-        "tool.capabilities": JSON.stringify(tool.capabilities ?? []),
+        "tool.capabilities": toolCapsForAudit.length > 0 ? JSON.stringify(tool.capabilities ?? []) : "[]",
         "tool.has_dangerous_capabilities": toolCapsForAudit.length > 0
       });
       try {
@@ -5162,6 +5162,28 @@ var ConversationState = class {
     this.ctx.messages.splice(this.ctx.messages.length, 0, message);
     this.emit({ kind: "message_appended", message });
   }
+  /**
+   * Append a content block to the trailing user message's content array.
+   * Mutates only that one message (a single indexed assignment) — avoids
+   * the O(n) array copy + token-cache re-walk that `replaceMessages()`
+   * would do for a single-message edit. Used by the agent loop to fold
+   * btw-notes / queued-mailbox blocks into the conversation.
+   *
+   * The block is folded only into a *user* message (preserves
+   * user/assistant alternation between tool batches). Returns false when
+   * there is no trailing user message to fold into — callers should
+   * `appendMessage({ role: 'user', content: [block] })` instead.
+   */
+  appendBlockToLastUserMessage(block) {
+    const arr = this.ctx.messages;
+    const last = arr[arr.length - 1];
+    if (!last || last.role !== "user") return false;
+    const content = typeof last.content === "string" ? [{ type: "text", text: last.content }, block] : [...last.content, block];
+    const updated = { ...last, content, _estTokens: computeMessageTokens({ ...last, content }) };
+    arr[arr.length - 1] = updated;
+    this.emit({ kind: "message_updated", index: arr.length - 1, message: updated });
+    return true;
+  }
   replaceMessages(messages) {
     let hasToolBlock = false;
     for (const m of messages) {
@@ -5404,26 +5426,82 @@ var Context = class {
     return this.tokenCounter.total();
   }
 };
-
-// src/storage/session-reader.ts
-var DefaultSessionReader = class {
+var DefaultSessionReader = class _DefaultSessionReader {
   store;
+  eventCache = /* @__PURE__ */ new Map();
+  eventCacheMtimes = /* @__PURE__ */ new Map();
+  static EVENT_CACHE_MAX_ENTRIES = 32;
   constructor(opts) {
     this.store = opts.store;
   }
+  async loadCachedSessionData(sessionId) {
+    const storeWithPath = this.store;
+    const rootDir = storeWithPath.dir;
+    if (!rootDir) {
+      return await this.store.load(sessionId);
+    }
+    const sessionPath = path6.join(rootDir, `${sessionId}.jsonl`);
+    let mtimeMs = null;
+    try {
+      const stat3 = await fs.stat(sessionPath);
+      mtimeMs = stat3.mtimeMs;
+    } catch {
+      this.eventCache.delete(sessionId);
+      this.eventCacheMtimes.delete(sessionId);
+      return await this.store.load(sessionId);
+    }
+    const cachedMtime = this.eventCacheMtimes.get(sessionId);
+    const cachedData = this.eventCache.get(sessionId);
+    if (cachedData && cachedMtime === mtimeMs) {
+      this.eventCache.delete(sessionId);
+      this.eventCacheMtimes.delete(sessionId);
+      this.eventCache.set(sessionId, cachedData);
+      this.eventCacheMtimes.set(sessionId, mtimeMs);
+      return cachedData;
+    }
+    const data = await this.store.load(sessionId);
+    this.eventCache.delete(sessionId);
+    this.eventCacheMtimes.delete(sessionId);
+    this.eventCache.set(sessionId, data);
+    this.eventCacheMtimes.set(sessionId, mtimeMs);
+    while (this.eventCache.size > _DefaultSessionReader.EVENT_CACHE_MAX_ENTRIES) {
+      const oldest = this.eventCache.keys().next().value;
+      if (oldest === void 0) break;
+      this.eventCache.delete(oldest);
+      this.eventCacheMtimes.delete(oldest);
+    }
+    if (data.metadata.endedAt) {
+      storeWithPath.clearLoadCache?.(sessionId);
+    }
+    return data;
+  }
   async query(q = {}) {
-    const raw = await this.store.list(q.limit ? Math.max(q.limit, 100) : 1e3);
-    const titleNeedle = q.titleContains?.toLowerCase();
-    const filtered = raw.filter((s) => {
-      if (q.since && s.startedAt < q.since) return false;
-      if (q.until && s.startedAt > q.until) return false;
-      if (q.provider && s.provider !== q.provider) return false;
-      if (q.model && s.model !== q.model) return false;
-      if (q.minTokens !== void 0 && s.tokenTotal < q.minTokens) return false;
-      if (titleNeedle && !s.title.toLowerCase().includes(titleNeedle)) return false;
-      return true;
-    });
-    const out = filtered.map((s) => ({
+    const storeWithFilter = this.store;
+    let raw;
+    if (typeof storeWithFilter.listFiltered === "function") {
+      raw = await storeWithFilter.listFiltered({
+        since: q.since,
+        until: q.until,
+        provider: q.provider,
+        model: q.model,
+        minTokens: q.minTokens,
+        titleContains: q.titleContains,
+        limit: q.limit
+      });
+    } else {
+      const fetched = await this.store.list(q.limit ? Math.max(q.limit, 100) : 1e3);
+      const titleNeedle = q.titleContains?.toLowerCase();
+      raw = fetched.filter((s) => {
+        if (q.since && s.startedAt < q.since) return false;
+        if (q.until && s.startedAt > q.until) return false;
+        if (q.provider && s.provider !== q.provider) return false;
+        if (q.model && s.model !== q.model) return false;
+        if (q.minTokens !== void 0 && s.tokenTotal < q.minTokens) return false;
+        if (titleNeedle && !s.title.toLowerCase().includes(titleNeedle)) return false;
+        return true;
+      });
+    }
+    const out = raw.map((s) => ({
       id: s.id,
       title: s.title,
       startedAt: s.startedAt,
@@ -5434,7 +5512,7 @@ var DefaultSessionReader = class {
     return q.limit ? out.slice(0, q.limit) : out;
   }
   async *replay(sessionId) {
-    const data = await this.store.load(sessionId);
+    const data = await this.loadCachedSessionData(sessionId);
     for (const e of data.events) yield e;
   }
   async search(q, sessionId, sessionQuery) {
@@ -5445,24 +5523,66 @@ var DefaultSessionReader = class {
     if (sessionId) {
       ids = [sessionId];
     } else {
-      const sessions = await this.store.list(1e3);
-      const titleNeedle = sessionQuery?.titleContains?.toLowerCase();
-      const filtered = sessions.filter((s) => {
-        if (sessionQuery?.since && s.startedAt < sessionQuery.since) return false;
-        if (sessionQuery?.until && s.startedAt > sessionQuery.until) return false;
-        if (sessionQuery?.provider && s.provider !== sessionQuery.provider) return false;
-        if (sessionQuery?.model && s.model !== sessionQuery.model) return false;
-        if (sessionQuery?.minTokens !== void 0 && s.tokenTotal < sessionQuery.minTokens) return false;
-        if (titleNeedle && !s.title.toLowerCase().includes(titleNeedle)) return false;
-        return true;
-      });
-      ids = filtered.map((s) => s.id);
+      const storeWithFilter = this.store;
+      let sessions;
+      if (typeof storeWithFilter.listFiltered === "function") {
+        sessions = await storeWithFilter.listFiltered({
+          since: sessionQuery?.since,
+          until: sessionQuery?.until,
+          provider: sessionQuery?.provider,
+          model: sessionQuery?.model,
+          minTokens: sessionQuery?.minTokens,
+          titleContains: sessionQuery?.titleContains,
+          limit: 1e3
+        });
+      } else {
+        sessions = await this.store.list(1e3);
+        const titleNeedle = sessionQuery?.titleContains?.toLowerCase();
+        sessions = sessions.filter((s) => {
+          if (sessionQuery?.since && s.startedAt < sessionQuery.since) return false;
+          if (sessionQuery?.until && s.startedAt > sessionQuery.until) return false;
+          if (sessionQuery?.provider && s.provider !== sessionQuery.provider) return false;
+          if (sessionQuery?.model && s.model !== sessionQuery.model) return false;
+          if (sessionQuery?.minTokens !== void 0 && s.tokenTotal < sessionQuery.minTokens) return false;
+          if (titleNeedle && !s.title.toLowerCase().includes(titleNeedle)) return false;
+          return true;
+        });
+      }
+      ids = sessions.map((s) => s.id);
     }
     const hits = [];
+    const streaming = this.store.searchEvents?.bind(this.store);
+    if (streaming) {
+      for (const id of ids) {
+        const matched = await streaming(
+          id,
+          (ev) => {
+            if (allowedTypes && !allowedTypes.has(ev.type)) return false;
+            const text = eventText(ev);
+            if (text === null) return false;
+            return matcher(text) !== null;
+          },
+          { limit: limit - hits.length }
+        );
+        for (const m of matched) {
+          const text = expectDefined(eventText(m.event));
+          const hit = expectDefined(matcher(text));
+          hits.push({
+            sessionId: id,
+            eventIndex: m.eventIndex,
+            ts: m.ts,
+            type: m.event.type,
+            snippet: snippetOf(text, hit.start, hit.end)
+          });
+          if (hits.length >= limit) return hits;
+        }
+      }
+      return hits;
+    }
     for (const id of ids) {
       let data;
       try {
-        data = await this.store.load(id);
+        data = await this.loadCachedSessionData(id);
       } catch {
         continue;
       }
@@ -5486,7 +5606,7 @@ var DefaultSessionReader = class {
     return hits;
   }
   async export(sessionId, opts) {
-    const data = await this.store.load(sessionId);
+    const data = await this.loadCachedSessionData(sessionId);
     const includeTools = opts.includeTools ?? true;
     const includeDiagnostics = opts.includeDiagnostics ?? true;
     const filtered = data.events.filter((e) => {
@@ -5507,7 +5627,7 @@ var DefaultSessionReader = class {
     return renderMarkdown(data.metadata, filtered);
   }
   async metadata(sessionId) {
-    const data = await this.store.load(sessionId);
+    const data = await this.loadCachedSessionData(sessionId);
     return data.metadata;
   }
 };