refactor: consolidate tape and store modules

src/bub/builtin/agent.py

@@ -22,12 +22,12 @@
     is_context_length_error,
 )
 from bub.builtin.settings import load_settings
-from bub.builtin.tape import Tape
 from bub.envelope import field_of
 from bub.framework import BubFramework
 from bub.skills import discover_skills, render_skills_prompt
+from bub.store import AsyncTapeStoreAdapter, InMemoryTapeStore, is_async_tape_store
 from bub.streaming import AsyncStreamEvents, StreamEvent, StreamState
-from bub.tape import AsyncTapeStoreAdapter, InMemoryTapeStore, is_async_tape_store
+from bub.tape import Tape
 from bub.tools import (
     REGISTRY,
     Tool,

src/bub/builtin/hook_impl.py

@@ -21,8 +21,9 @@
 from bub.hooks import hookimpl
 from bub.hooks.interception import ToolCall, ToolCallDecision
 from bub.model_selection import ModelChoice, ModelOptions
+from bub.store import TapeStore
 from bub.streaming import AsyncStreamEvents
-from bub.tape import TapeContext, TapeStore
+from bub.tape import TapeContext
 from bub.turn import TurnState
 
 AGENTS_FILE_NAME = "AGENTS.md"
@@ -357,7 +358,7 @@ def render_outbound(
     @hookimpl
     def provide_tape_store(self) -> TapeStore:
         import bub
-        from bub.builtin.store import FileTapeStore
+        from bub.store import FileTapeStore
 
         return FileTapeStore(directory=bub.home / "tapes")
 

src/bub/builtin/model_runner.py

@@ -28,7 +28,6 @@
 
 from bub.builtin.codex_provider import OpenaiCodexProvider, should_use_openai_codex_provider
 from bub.builtin.settings import AgentSettings, ModelCandidate
-from bub.builtin.tape import Tape
 from bub.errors import BubError, ErrorKind
 from bub.hooks.interception import (
     AgentHooks,
@@ -37,6 +36,7 @@
     LlmCallResult,
 )
 from bub.streaming import AsyncStreamEvents, StreamEvent, StreamState
+from bub.tape import Tape
 from bub.tools import Tool, ToolContext, ToolExecutor
 
 CONTEXT_LENGTH_PATTERNS = re.compile(