@makaio/framework 1.0.0-dev-1779051654000 → 1.0.0-dev-1781023871421

package/dist/{index-BnSQE7z7.d.mts → index-DBw-89vC2.d.mts}

@@ -1,18 +1,18 @@
-import { r as ExecutionTarget } from "./schemas-Ra8pz5M-.mjs";
-import { d as Turn$1 } from "./index-C_kS2aqV2.mjs";
-import { a as PipelineStep, o as SessionEditorAction, t as ActionCategory } from "./types-vNpkAe4Y.mjs";
-import { a as agents, o as sessions } from "./schema-B295yplx.mjs";
+import { r as ExecutionTarget } from "./schemas-C46QfKzv.mjs";
+import { d as Turn$1 } from "./index-DGBu6bHi2.mjs";
+import { a as PipelineStep, o as SessionEditorAction, t as ActionCategory } from "./types-C2Ob9zz_.mjs";
+import { a as agents, o as sessions } from "./schema-M5YTvSAG.mjs";
 import { z } from "zod";
 import * as _$_makaio_core0 from "@makaio/framework/core";
 import { ExtractSubjectPayload, SubjectDefinition } from "@makaio/framework/core";
 import { IMakaioBus } from "@makaio/framework/bus";
-import { AIReasoningLevel, AdapterRuntimeOptions, AdapterSessionStatusSchema, BranchKind, ContextWindowState, ExtensionContext, ForkOptions, ForkTransforms, IMakaioSession, MakaioSessionAgent, MakaioSessionEvent, Message, MessageBlock, MessageInput, ReasoningLevelMap, SessionContext, SessionExtensionContext, SessionLineageKind, SessionMessage, SessionMessageBlock, TurnInitiator } from "@makaio/framework/contracts";
+import { AIReasoningLevel, AdapterRuntimeOptions, BranchKind, ContextWindowState, ExtensionContext, ForkOptions, ForkTransforms, IMakaioSession, MakaioSessionAgent, MakaioSessionEvent, Message, MessageBlock, MessageInput, ReasoningLevelMap, SessionContext, SessionExtensionContext, SessionLineage, SessionLineageKind, SessionMessage, SessionMessageBlock, TurnInitiator } from "@makaio/framework/contracts";
 import { BaseService } from "@makaio/framework/service-base";
 import * as _$drizzle_orm_sqlite_core0 from "drizzle-orm/sqlite-core";
 import * as _$_makaio_storage_core0 from "@makaio/framework/storage";
 import { MakaioDatabase } from "@makaio/framework/storage/drizzle";
 
-//#region packages/services/core/src/session/session-service.d.ts
+//#region services/core/src/session/session-service.d.ts
 /**
  * Framework-core session service for managing makaio sessions.
  *
@@ -89,7 +89,7 @@ declare class MakaioSessionService extends BaseService {
   private reconcileOrphanedTurns;
 }
 //#endregion
-//#region packages/services/core/src/session/session-service-handlers-core.d.ts
+//#region services/core/src/session/session-service-handlers-core.d.ts
 /**
  * Dependencies required to register the framework-core session service handlers.
  *
@@ -119,7 +119,7 @@ interface CoreSessionServiceHandlerDeps {
  */
 declare function registerCoreSessionServiceHandlers(deps: CoreSessionServiceHandlerDeps): Array<() => void>;
 //#endregion
-//#region packages/services/core/src/session/session-orchestrator.d.ts
+//#region services/core/src/session/session-orchestrator.d.ts
 /**
  * Minimum public contract for a session orchestrator service.
  *
@@ -242,7 +242,7 @@ declare class SessionOrchestrator implements ISessionOrchestrator {
   private resolveCanonicalModelSelection;
 }
 //#endregion
-//#region packages/services/core/src/session/adapter-registry.d.ts
+//#region services/core/src/session/adapter-registry.d.ts
 /**
  * Resolves adapterName → adapterId mappings for the framework session
  * orchestrator.
@@ -290,7 +290,7 @@ declare class AdapterRegistry {
   destroy(): void;
 }
 //#endregion
-//#region packages/services/core/src/session/turn-context-enricher.d.ts
+//#region services/core/src/session/turn-context-enricher.d.ts
 /**
  * Enriches messageHistory with turn-so-far messages for immediate delivery.
  *
@@ -326,7 +326,7 @@ declare class TurnContextEnricher {
   private convertSessionMessagesToMessages;
 }
 //#endregion
-//#region packages/services/core/src/session/utils/message-utils.d.ts
+//#region services/core/src/session/utils/message-utils.d.ts
 /**
  * Extract plain text content from a MessageInput for FTS indexing.
  * @param message - The message input (string or structured)
@@ -341,7 +341,7 @@ declare function extractTextContent(message: MessageInput): string;
  */
 declare function normalizeToBlocks(message: MessageInput): SessionMessageBlock[];
 //#endregion
-//#region packages/services/core/src/session/utils/session-utils.d.ts
+//#region services/core/src/session/utils/session-utils.d.ts
 /**
  * Get existing session or create a new one.
  * @param bus - Makaio bus instance
@@ -369,7 +369,7 @@ declare function resolveTargetAgents(session: IMakaioSession, targetSpec: string
  */
 declare function findTurnByAgent(activeTurns: Map<string, Turn$1>, agentId: string): Turn$1 | undefined;
 //#endregion
-//#region packages/services/core/src/session/utils/resolution.d.ts
+//#region services/core/src/session/utils/resolution.d.ts
 /**
  * Resolve adapterName → adapterId for bus routing.
  * Queries the adapters table for a local enabled instance.
@@ -396,18 +396,16 @@ declare function resolveModelCapabilities(bus: IMakaioBus, providerConfigId: str
 } | undefined>;
 /**
  * Resolves the effective execution target for a session.
- * Priority: explicit executionTargetId → workstream default → system default (local).
+ * Priority: explicit executionTargetId → system default (local).
  * @param bus - Makaio bus instance
  * @param params - Resolution parameters from session context
  * @returns Resolved execution target
  */
 declare function resolveExecutionTarget(bus: IMakaioBus, params: {
   executionTargetId?: string;
-  workstreamId?: string;
-  projectId?: string;
 }): Promise<ExecutionTarget>;
 //#endregion
-//#region packages/services/core/src/session/utils/recovery-context.d.ts
+//#region services/core/src/session/utils/recovery-context.d.ts
 /**
  * Build sessionContext with messageHistory for a recovered agent.
  * Uses getFullConversation() to assemble history from stored messages.
@@ -420,7 +418,7 @@ declare function resolveExecutionTarget(bus: IMakaioBus, params: {
  */
 declare function buildRecoveryContext(bus: IMakaioBus, session: IMakaioSession): Promise<SessionContext>;
 //#endregion
-//#region packages/services/core/src/session/utils/agent-recovery.d.ts
+//#region services/core/src/session/utils/agent-recovery.d.ts
 /**
  * Configuration for recovering dead agents during liveness verification.
  */
@@ -507,7 +505,7 @@ declare function buildRecoveryContextWithPipeline(bus: IMakaioBus, session: IMak
  */
 declare function recoverAgent(bus: IMakaioBus, deadAgent: MakaioSessionAgent, recoveryConfig: RecoveryConfig): Promise<MakaioSessionAgent>;
 //#endregion
-//#region packages/services/core/src/session/utils/turn-initiator.d.ts
+//#region services/core/src/session/utils/turn-initiator.d.ts
 /**
  * Builds turn initiator metadata from `sendMessage` source fields.
  *
@@ -520,7 +518,7 @@ declare function recoverAgent(bus: IMakaioBus, deadAgent: MakaioSessionAgent, re
  */
 declare function buildTurnInitiator(source: 'extension' | 'user' | 'system' | undefined, extensionId: string | undefined): TurnInitiator;
 //#endregion
-//#region packages/services/core/src/session/context-window/types.d.ts
+//#region services/core/src/session/context-window/types.d.ts
 /**
  * Context window tracking types for per-session aggregation.
  *
@@ -571,7 +569,7 @@ interface ContextWindowTrackerConfig {
   staleThresholdMs?: number;
 }
 //#endregion
-//#region packages/services/core/src/session/context-window/context-window-tracker.d.ts
+//#region services/core/src/session/context-window/context-window-tracker.d.ts
 /**
  * Tracks context window state per session, aggregating across agents.
  *
@@ -640,7 +638,7 @@ declare class ContextWindowTracker {
   private recomputeSessionState;
 }
 //#endregion
-//#region packages/services/core/src/session/handlers/lifecycle-handlers.d.ts
+//#region services/core/src/session/handlers/lifecycle-handlers.d.ts
 /**
  * Dependencies for session lifecycle handlers.
  */
@@ -661,7 +659,7 @@ declare function registerGetStatusCountsHandler(deps: SessionLifecycleDeps): ()
  */
 declare function registerResumeHandler(deps: SessionLifecycleDeps): () => void;
 //#endregion
-//#region packages/services/core/src/session/session-editor/action-registry.d.ts
+//#region services/core/src/session/session-editor/action-registry.d.ts
 /**
  * Registry for pipeline actions.
  * Actions are registered at startup and looked up during pipeline execution.
@@ -699,7 +697,7 @@ declare class ActionRegistry {
 /** Global action registry instance */
 declare const actionRegistry: ActionRegistry;
 //#endregion
-//#region packages/services/core/src/session/session-editor/actions/index.d.ts
+//#region services/core/src/session/session-editor/actions/index.d.ts
 /**
  * Register all built-in actions.
  * Call this at service startup. Safe to call multiple times.
@@ -719,7 +717,7 @@ declare function registerBuiltInActions(bus?: IMakaioBus): void;
  */
 declare function resetBuiltInActionsRegistration(): void;
 //#endregion
-//#region packages/services/core/src/session/session-editor/handlers.d.ts
+//#region services/core/src/session/session-editor/handlers.d.ts
 /**
  * Register handler for session-editor.listActions.
  *
@@ -730,7 +728,7 @@ declare function resetBuiltInActionsRegistration(): void;
  */
 declare function registerListActionsHandler(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/selection-utils.d.ts
+//#region services/core/src/session/selection-utils.d.ts
 /**
  * Normalize a selection string field by trimming whitespace and coercing
  * blank strings to `undefined`.
@@ -758,11 +756,11 @@ declare function normalizeSelectionString(value: string | undefined): string | u
  */
 declare function resolveAdapterNameById(bus: IMakaioBus, adapterId: string, explicitAdapterName: string | undefined, errorPrefix: string): Promise<string>;
 //#endregion
-//#region packages/services/core/src/session/constants.d.ts
+//#region services/core/src/session/constants.d.ts
 /** Default transform pipeline for connector-swap history injection. */
 declare const CONNECTOR_SWAP_DEFAULT_PIPELINE: PipelineStep[];
 //#endregion
-//#region packages/services/core/src/session/fallback-runtime-options.d.ts
+//#region services/core/src/session/fallback-runtime-options.d.ts
 /**
  * Runtime options preserved across a VirtualModel fallback hop.
  *
@@ -789,7 +787,7 @@ type FallbackRuntimeOptions = Pick<AdapterRuntimeOptions, 'cwd' | 'systemPrompt'
  */
 declare function pickFallbackRuntimeOptions(payload: Partial<Pick<AdapterRuntimeOptions, 'cwd' | 'systemPrompt' | 'allowedTools' | 'disallowedTools'>>): FallbackRuntimeOptions;
 //#endregion
-//#region packages/services/core/src/session/context/assemble-fork-context.d.ts
+//#region services/core/src/session/context/assemble-fork-context.d.ts
 /**
  * Assemble fork context for a session's first turn.
  *
@@ -810,88 +808,7 @@ declare function pickFallbackRuntimeOptions(payload: Partial<Pick<AdapterRuntime
  */
 declare function assembleForkContext(bus: IMakaioBus, session: IMakaioSession, sessionId: string, originalContext?: SessionContext, isNewTurn?: boolean): Promise<SessionContext | undefined>;
 //#endregion
-//#region packages/services/core/src/session/attachment-artifacts.d.ts
-/**
- * Minimal descriptor for a session-scoped attachment artifact.
- *
- * Defined here so the framework core remains independent of any host plugin.
- * The host (host layer) owns the full storage schema; this type covers only
- * the fields that `createAttachmentArtifacts` needs to populate.
- */
-/** Metadata linking an attachment artifact back to its originating message. */
-interface AttachmentArtifactMetadata extends Record<string, unknown> {
-  /** Message that contained the attachment. */
-  messageId: string;
-  /** Position of the attachment block within the message's blocks array. */
-  blockIndex: number;
-  /** Original file name of the attachment. */
-  fileName?: string;
-}
-interface AttachmentArtifactInput {
-  /** Unique artifact identifier. */
-  id: string;
-  /** Always 'session' for attachment artifacts created from message blocks. */
-  scope: 'session';
-  /** Session the artifact belongs to. */
-  sessionId: string;
-  /** Always 'user-upload' for attachment artifacts. */
-  type: 'user-upload';
-  /** MIME type of the attached file. */
-  mimeType: string;
-  /** Absolute file path on disk, when available. */
-  filePath?: string;
-  /** Base64-encoded content, when the source was base64 data. */
-  content?: string;
-  /** Structured metadata linking the artifact back to its origin. */
-  metadata: AttachmentArtifactMetadata;
-}
-/**
- * Result of a single artifact store attempt.
- *
- * Mirrors the optional-result discriminated-union shape returned by
- * `IMakaioBus.requestOptional` so the host can signal whether the artifacts
- * plugin was available without coupling the framework to the bus API.
- */
-type StoreArtifactResult = {
-  handled: true;
-  data: {
-    id: string;
-  };
-} | {
-  handled: false;
-};
-/**
- * Host-provided callback that persists one attachment artifact.
- *
- * Injected by the host layer so that `createAttachmentArtifacts` stays
- * free of host plugin imports.  Returning `{ handled: false }` signals
- * that the artifacts plugin is not loaded; the caller logs a warning but
- * never fails the parent request.
- * @param artifact - The artifact descriptor to store.
- * @returns A promise resolving to a {@link StoreArtifactResult}.
- */
-type StoreArtifactFn = (artifact: AttachmentArtifactInput) => Promise<StoreArtifactResult>;
-/**
- * Creates session-scoped artifacts for attachment blocks in a user message.
- *
- * Called after message storage. Delegates persistence to `storeArtifact` so
- * this function remains free of host plugin dependencies — the host
- * (host layer) owns the storage subject and wires the bus call.
- *
- * Breaking change: previously accepted `IMakaioBus` and relied on the
- * artifacts storage subject from `@makaio/contracts`. The callback signature
- * decouples the framework from that bus + subject wiring.
- *
- * Each attachment block becomes a `user-upload` artifact in the session scope,
- * with metadata linking it back to the originating message.
- * @param storeArtifact - Host-provided callback to persist one artifact
- * @param sessionId - Session containing the message
- * @param messageId - Message containing the attachments
- * @param blocks - Normalized message blocks (already stored)
- */
-declare function createAttachmentArtifacts(storeArtifact: StoreArtifactFn, sessionId: string, messageId: string, blocks: SessionMessageBlock[]): Promise<void>;
-//#endregion
-//#region packages/services/core/src/session/session-bridge.d.ts
+//#region services/core/src/session/session-bridge.d.ts
 declare class SessionBridge {
   private readonly bus;
   private readonly agentToSession;
@@ -919,6 +836,7 @@ declare class SessionBridge {
    * @param agentId - ID of the agent that produced the message
    * @param adapterSessionId - Optional adapter session ID
    * @param error - Optional error message if agent failed
+   * @param messageOverride - Optional validated terminal message to store instead of accumulated provider blocks
    */
   private storeAssistantMessage;
   /**
@@ -927,7 +845,7 @@ declare class SessionBridge {
   destroy(): void;
 }
 //#endregion
-//#region packages/services/core/src/session/extension-context.d.ts
+//#region services/core/src/session/extension-context.d.ts
 /**
  * Implementation of SessionExtensionContext.
  * Routes all actions through bus subjects.
@@ -971,7 +889,7 @@ declare class SessionExtensionContextImpl implements SessionExtensionContext {
  */
 declare function createSessionExtensionContext(bus: IMakaioBus, sessionId: string, extensionId: string, turnId?: string, parentSessionId?: string, contextTracker?: ContextWindowTracker): SessionExtensionContextImpl;
 //#endregion
-//#region packages/services/core/src/session/storage/agent-namespace.d.ts
+//#region services/core/src/session/storage/agent-namespace.d.ts
 /**
  * Agent storage namespace.
  *
@@ -1821,7 +1739,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
   };
 }>, "storage:agent">;
 //#endregion
-//#region packages/services/core/src/session/storage/memory-handler.d.ts
+//#region services/core/src/session/storage/memory-handler.d.ts
 /**
  * Register in-memory session storage handlers.
  *
@@ -1841,7 +1759,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
  */
 declare function registerMemorySessionStorage(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/storage/drizzle-handler.d.ts
+//#region services/core/src/session/storage/drizzle-handler.d.ts
 /**
  * Register Drizzle-based session storage handlers.
  *
@@ -1874,7 +1792,7 @@ declare function registerMemorySessionStorage(bus: IMakaioBus): () => void;
  */
 declare function registerDrizzleSessionStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/storage/agent-memory-handler.d.ts
+//#region services/core/src/session/storage/agent-memory-handler.d.ts
 /**
  * Register in-memory agent storage handlers.
  *
@@ -1884,7 +1802,7 @@ declare function registerDrizzleSessionStorage(bus: IMakaioBus, db: MakaioDataba
  */
 declare function registerMemoryAgentStorage(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/storage/agent-drizzle-handler.d.ts
+//#region services/core/src/session/storage/agent-drizzle-handler.d.ts
 /**
  * Register Drizzle-based agent storage handlers.
  *
@@ -1910,7 +1828,7 @@ declare function registerMemoryAgentStorage(bus: IMakaioBus): () => void;
  */
 declare function registerDrizzleAgentStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/storage/fts-search-handler.d.ts
+//#region services/core/src/session/storage/fts-search-handler.d.ts
 /**
  * Registers FTS-backed `storage:session.search` handler.
  * @param bus - Bus instance used for handler registration
@@ -1919,7 +1837,7 @@ declare function registerDrizzleAgentStorage(bus: IMakaioBus, db: MakaioDatabase
  */
 declare function registerFtsSearchHandler(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
-//#region packages/services/core/src/session/storage/fts-search-utils.d.ts
+//#region services/core/src/session/storage/fts-search-utils.d.ts
 /**
  * Row shape returned by FTS session search queries.
  *
@@ -2006,7 +1924,7 @@ declare function mapRowToSession(row: SearchSessionRow, sessionAgents: Array<typ
   };
 };
 //#endregion
-//#region packages/services/core/src/session/storage/drizzle-utils.d.ts
+//#region services/core/src/session/storage/drizzle-utils.d.ts
 type SessionRow = typeof sessions.$inferSelect;
 type AgentRow = typeof agents.$inferSelect;
 /**
@@ -2044,7 +1962,7 @@ declare function mapAgentsBySession(agentRows: AgentRow[]): Map<string, AgentRow
  */
 declare function fetchSessionPreviewMaps(db: MakaioDatabase, sessionIds: string[], includePreview: boolean): Promise<SessionPreviewMaps>;
 //#endregion
-//#region packages/services/core/src/session/session-events/schema.d.ts
+//#region services/core/src/session/session-events/schema.d.ts
 /**
  * Session events table schema.
  *
@@ -2305,7 +2223,7 @@ type InsertSessionEvent = typeof sessionEvents.$inferInsert;
  */
 type SelectSessionEvent = typeof sessionEvents.$inferSelect;
 //#endregion
-//#region packages/services/core/src/session/session-events/memory-handler.d.ts
+//#region services/core/src/session/session-events/memory-handler.d.ts
 /**
  * Register in-memory session event storage handlers.
  *
@@ -2333,7 +2251,7 @@ type SelectSessionEvent = typeof sessionEvents.$inferSelect;
  */
 declare function registerMemorySessionEventStorage(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/session-events/drizzle-handler.d.ts
+//#region services/core/src/session/session-events/drizzle-handler.d.ts
 /**
  * Register Drizzle-based session event storage handlers.
  *
@@ -2359,7 +2277,7 @@ declare function registerMemorySessionEventStorage(bus: IMakaioBus): () => void;
  */
 declare function registerDrizzleSessionEventStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/session-logger.d.ts
+//#region services/core/src/session/session-logger.d.ts
 /**
  * Transform function for event payloads before storage emission.
  * Use for redaction, PII filtering, or payload normalization.
@@ -2458,7 +2376,7 @@ declare class SessionLogger {
   destroy(): void;
 }
 //#endregion
-//#region packages/services/core/src/session/import-cursors/schema.d.ts
+//#region services/core/src/session/import-cursors/schema.d.ts
 /**
  * Import cursors table schema.
  *
@@ -2545,7 +2463,7 @@ declare const importCursors: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
   dialect: "sqlite";
 }>;
 //#endregion
-//#region packages/services/core/src/session/import-cursors/drizzle-handler.d.ts
+//#region services/core/src/session/import-cursors/drizzle-handler.d.ts
 /**
  * Register Drizzle-backed import cursor storage handlers.
  *
@@ -2567,7 +2485,7 @@ declare const importCursors: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
  */
 declare function registerDrizzleImportCursorStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/turns/drizzle-handler.d.ts
+//#region services/core/src/session/turns/drizzle-handler.d.ts
 /**
  * Register Drizzle-based turn storage handlers.
  *
@@ -2586,7 +2504,7 @@ declare function registerDrizzleImportCursorStorage(bus: IMakaioBus, db: MakaioD
  */
 declare function registerDrizzleTurnStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/turns/memory-handler.d.ts
+//#region services/core/src/session/turns/memory-handler.d.ts
 /**
  * Register in-memory turn storage handlers.
  *
@@ -2596,7 +2514,7 @@ declare function registerDrizzleTurnStorage(bus: IMakaioBus, db: MakaioDatabase,
  */
 declare function registerMemoryTurnStorage(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/turns/schema.d.ts
+//#region services/core/src/session/turns/schema.d.ts
 /**
  * Turns table schema.
  *
@@ -2706,7 +2624,7 @@ declare const turns: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
       tableName: "turns";
       dataType: "string";
       columnType: "SQLiteText";
-      data: "completed" | "error" | "active";
+      data: "error" | "active" | "completed";
       driverParam: string;
       notNull: true;
       hasDefault: false;
@@ -2770,7 +2688,7 @@ type InsertTurn = typeof turns.$inferInsert;
  */
 type SelectTurn = typeof turns.$inferSelect;
 //#endregion
-//#region packages/services/core/src/session/messages/drizzle-handler.d.ts
+//#region services/core/src/session/messages/drizzle-handler.d.ts
 /**
  * Register Drizzle-based message storage handlers.
  *
@@ -2782,7 +2700,7 @@ type SelectTurn = typeof turns.$inferSelect;
  */
 declare function registerDrizzleMessageStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/messages/memory-handler.d.ts
+//#region services/core/src/session/messages/memory-handler.d.ts
 /**
  * Register in-memory message storage handlers.
  *
@@ -2793,7 +2711,7 @@ declare function registerDrizzleMessageStorage(bus: IMakaioBus, db: MakaioDataba
  */
 declare function registerMemoryMessageStorage(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/messages/schema.d.ts
+//#region services/core/src/session/messages/schema.d.ts
 /**
  * Messages table schema.
  *
@@ -3049,7 +2967,7 @@ type InsertMessage = typeof messages.$inferInsert;
  */
 type SelectMessage = typeof messages.$inferSelect;
 //#endregion
-//#region packages/services/core/src/session/message-routing/namespace.d.ts
+//#region services/core/src/session/message-routing/namespace.d.ts
 /**
  * Message routing storage namespace.
  *
@@ -3321,7 +3239,7 @@ declare const MessageRoutingSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core
   };
 }>, "storage:messageRouting">;
 //#endregion
-//#region packages/services/core/src/session/message-routing/drizzle-handler.d.ts
+//#region services/core/src/session/message-routing/drizzle-handler.d.ts
 /**
  * Register Drizzle-based message routing storage handlers.
  *
@@ -3333,7 +3251,7 @@ declare const MessageRoutingSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core
  */
 declare function registerDrizzleMessageRoutingStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
 //#endregion
-//#region packages/services/core/src/session/message-routing/schema.d.ts
+//#region services/core/src/session/message-routing/schema.d.ts
 /**
  * Message routing table schema.
  *
@@ -3456,7 +3374,7 @@ type InsertMessageRouting = typeof messageRouting.$inferInsert;
  */
 type SelectMessageRouting = typeof messageRouting.$inferSelect;
 //#endregion
-//#region packages/services/core/src/session/entities/makaio-session.d.ts
+//#region services/core/src/session/entities/makaio-session.d.ts
 /**
  * Configuration for creating a MakaioSession.
  */
@@ -3539,1205 +3457,49 @@ declare class MakaioSession {
   protected emit<S extends SubjectDefinition>(subject: S, payload: Omit<ExtractSubjectPayload<S>, 'sessionId'>): Promise<void>;
 }
 //#endregion
-//#region packages/services/core/src/session/adapter-sessions/schema.d.ts
+//#region services/core/src/session/import/parent-resolver.d.ts
 /**
- * Adapter sessions table schema.
+ * Register handler to resolve parent relationships when sessions are imported.
  *
- * Tracks sessions discovered from external adapter logs (e.g., Claude Code).
- * Stores lineage information with soft parent references that resolve
- * when all sessions in a fork chain are imported.
- */
-declare const adapterSessions: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
-  name: "adapter_sessions";
-  schema: undefined;
-  columns: {
-    adapterSessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "adapter_session_id";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: true;
-      hasDefault: false;
-      isPrimaryKey: true;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    adapterName: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "adapter_name";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: true;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    parentAdapterSessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "parent_adapter_session_id";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    forkPointMessageId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "fork_point_message_id";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    sessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "session_id";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    model: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "model";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    cwd: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "cwd";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    logFilePath: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "log_file_path";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: string;
-      driverParam: string;
-      notNull: false;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: [string, ...string[]];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    kind: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "kind";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: "root" | "fork" | "subagent" | "compress";
-      driverParam: string;
-      notNull: true;
-      hasDefault: true;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: ["root", "fork", "subagent", "compress"];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-    discoveredAt: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "discovered_at";
-      tableName: "adapter_sessions";
-      dataType: "number";
-      columnType: "SQLiteInteger";
-      data: number;
-      driverParam: number;
-      notNull: true;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: undefined;
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {}>;
-    startedAt: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "started_at";
-      tableName: "adapter_sessions";
-      dataType: "number";
-      columnType: "SQLiteInteger";
-      data: number;
-      driverParam: number;
-      notNull: true;
-      hasDefault: false;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: undefined;
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {}>;
-    status: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-      name: "status";
-      tableName: "adapter_sessions";
-      dataType: "string";
-      columnType: "SQLiteText";
-      data: "imported" | "discovered" | "live" | "tracking";
-      driverParam: string;
-      notNull: true;
-      hasDefault: true;
-      isPrimaryKey: false;
-      isAutoincrement: false;
-      hasRuntimeDefault: false;
-      enumValues: ["discovered", "imported", "live", "tracking"];
-      baseColumn: never;
-      identity: undefined;
-      generated: undefined;
-    }, {}, {
-      length: number | undefined;
-    }>;
-  };
-  dialect: "sqlite";
-}>;
-/**
- * Type for inserting a new adapter session.
- */
-type InsertAdapterSession = typeof adapterSessions.$inferInsert;
-/**
- * Type for a selected adapter session row.
+ * When `session.import.completed` is emitted:
+ * 1. Query sessions for children whose `parentExternalSessionId` matches
+ *    the just-imported session's `adapterSessionId` and whose `parentSessionId`
+ *    is still null (unresolved).
+ * 2. For each unresolved child, update its `parentSessionId` and `rootSessionId`.
+ * 3. Cascade `rootSessionId` down the tree to any already-resolved grandchildren.
+ * @param bus - The bus instance to register handlers on
+ * @param db - The Drizzle database instance for direct queries
+ * @returns Cleanup function to unsubscribe the handler
+ * @example
+ * ```typescript
+ * import { registerParentResolver } from '@makaio/framework/services/session';
+ *
+ * const cleanup = registerParentResolver(bus, db);
+ *
+ * // Later, when shutting down:
+ * cleanup();
+ * ```
  */
-type SelectAdapterSession = typeof adapterSessions.$inferSelect;
+declare function registerParentResolver(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
-//#region packages/services/core/src/session/adapter-sessions/namespace.d.ts
+//#region services/core/src/session/import/compress-lineage-resolver.d.ts
 /**
- * Shared Zod schema for the adapter session response object.
+ * Re-parents post-compaction subagents from the parent session to the compress child.
  *
- * Used by `get`, `getByLogFilePath`, and `list` responses.
- */
-declare const AdapterSessionResponseSchema: z.ZodObject<{
-  adapterSessionId: z.ZodString;
-  adapterName: z.ZodString;
-  parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-  forkPointMessageId: z.ZodNullable<z.ZodString>;
-  sessionId: z.ZodNullable<z.ZodString>;
-  model: z.ZodNullable<z.ZodString>;
-  cwd: z.ZodNullable<z.ZodString>;
-  logFilePath: z.ZodNullable<z.ZodString>;
-  discoveredAt: z.ZodNumber;
-  startedAt: z.ZodNumber;
-  status: z.ZodEnum<{
-    imported: "imported";
-    discovered: "discovered";
-    live: "live";
-    tracking: "tracking";
-  }>;
-  kind: z.ZodEnum<{
-    root: "root";
-    fork: "fork";
-    subagent: "subagent";
-    compress: "compress";
-  }>;
-}, z.core.$strip>;
-declare const CreateAndLinkMetadataSchema: z.ZodIntersection<z.ZodUnion<readonly [z.ZodObject<{
-  parentAdapterSessionId: z.ZodNull;
-  forkPointMessageId: z.ZodNull;
-  kind: z.ZodNull;
-}, z.core.$strip>, z.ZodObject<{
-  kind: z.ZodLiteral<"fork">;
-  parentAdapterSessionId: z.ZodString;
-  forkPointMessageId: z.ZodString;
-}, z.core.$strip>, z.ZodObject<{
-  kind: z.ZodLiteral<"subagent">;
-  parentAdapterSessionId: z.ZodString;
-  forkPointMessageId: z.ZodNull;
-}, z.core.$strip>, z.ZodObject<{
-  kind: z.ZodLiteral<"compress">;
-  parentAdapterSessionId: z.ZodString;
-  forkPointMessageId: z.ZodNull;
-}, z.core.$strip>]>, z.ZodObject<{
-  model: z.ZodNullable<z.ZodString>;
-  cwd: z.ZodNullable<z.ZodString>;
-  title: z.ZodNullable<z.ZodString>;
-}, z.core.$strip>>;
-/**
- * Inferred type for an adapter session record.
+ * Handles two scenarios triggered by `session.import.completed`:
  *
- * Represents the full adapter session record as returned by `get`, `list`,
- * and `getByLogFilePath` bus subjects.
- */
-type AdapterSessionRecord = z.infer<typeof AdapterSessionResponseSchema>;
-type AdapterSessionStatus = z.infer<typeof AdapterSessionStatusSchema>;
-type CreateAndLinkMetadata = z.infer<typeof CreateAndLinkMetadataSchema>;
-/**
- * Adapter session storage namespace.
+ * **Path A — compress child imported first (batch import)**:
+ * When a compress child import completes, subagents spawned after compaction are
+ * already parented to the parent Makaio session (by the parent-resolver).
+ * This path scans the compress child's messages and re-parents matching subagents.
  *
- * Provides bus subjects for managing adapter session records.
- * Adapter sessions track sessions discovered from external adapter logs
- * (e.g., Claude Code) and maintain lineage information for fork detection.
- */
-declare const AdapterSessionStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDefinition<"adapterSession", {
-  /**
-   * Upsert an adapter session record.
-   *
-   * If the record exists, updates mutable fields (parent, forkPoint, model, cwd).
-   * If not, inserts with discoveredAt=Date.now() and status='discovered'.
-   *
-   * Subject: `storage:adapterSession.upsert`
-   * Type: Request (RPC)
-   */
-  upsert: {
-    request: z.ZodDiscriminatedUnion<[z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"root">;
-      parentAdapterSessionId: z.ZodNull;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"fork">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodString;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"subagent">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"compress">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>], "kind">;
-    response: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      sessionId: z.ZodNullable<z.ZodString>;
-      created: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Get an adapter session by ID.
-   *
-   * Subject: `storage:adapterSession.get`
-   * Type: Request (RPC)
-   */
-  get: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      session: z.ZodNullable<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * Update adapter session status.
-   *
-   * Subject: `storage:adapterSession.updateStatus`
-   * Type: Request (RPC)
-   */
-  updateStatus: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      status: z.ZodEnum<{
-        imported: "imported";
-        discovered: "discovered";
-        live: "live";
-        tracking: "tracking";
-      }>;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      success: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Link an adapter session to a Makaio session.
-   *
-   * Subject: `storage:adapterSession.linkSession`
-   * Type: Request (RPC)
-   */
-  linkSession: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      sessionId: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      success: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Get an adapter session by its source log file path.
-   *
-   * Subject: `storage:adapterSession.getByLogFilePath`
-   * Type: Request (RPC)
-   */
-  getByLogFilePath: {
-    request: z.ZodObject<{
-      logFilePath: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      session: z.ZodNullable<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * List all adapter sessions.
-   *
-   * Returns all adapter session records ordered by startedAt descending.
-   * Used by the entity cache to populate the reactive `adapterSessions` collection.
-   *
-   * Subject: `storage:adapterSession.list`
-   * Type: Request (RPC)
-   */
-  list: {
-    request: z.ZodObject<{}, z.core.$strip>;
-    response: z.ZodObject<{
-      sessions: z.ZodArray<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * Count adapter sessions grouped by status.
-   *
-   * Subject: `storage:adapterSession.countByAdapter`
-   * Type: Request (RPC)
-   */
-  countByAdapter: {
-    request: z.ZodObject<{
-      adapterName: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      total: z.ZodNumber;
-      imported: z.ZodNumber;
-      discovered: z.ZodNumber;
-    }, z.core.$strip>;
-  };
-  /**
-   * Create and link a Makaio session for an adapter session.
-   *
-   * Consolidates session creation, parent/scope resolution, linking,
-   * and event emission into a single idempotent bus request.
-   * The bus field is injected by the handler — callers must not pass it.
-   *
-   * Subject: `storage:adapterSession.createAndLink`
-   * Type: Request (RPC)
-   */
-  createAndLink: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      adapterId: z.ZodString;
-      metadata: z.ZodIntersection<z.ZodUnion<readonly [z.ZodObject<{
-        parentAdapterSessionId: z.ZodNull;
-        forkPointMessageId: z.ZodNull;
-        kind: z.ZodNull;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"fork">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodString;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"subagent">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodNull;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"compress">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodNull;
-      }, z.core.$strip>]>, z.ZodObject<{
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        title: z.ZodNullable<z.ZodString>;
-      }, z.core.$strip>>;
-      existingSessionId: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      sessionId: z.ZodString;
-      created: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-}, {
-  drizzle: {
-    adapterSessions: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
-      name: "adapter_sessions";
-      schema: undefined;
-      columns: {
-        adapterSessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "adapter_session_id";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: true;
-          hasDefault: false;
-          isPrimaryKey: true;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        adapterName: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "adapter_name";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: true;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        parentAdapterSessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "parent_adapter_session_id";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        forkPointMessageId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "fork_point_message_id";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        sessionId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "session_id";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        model: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "model";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        cwd: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "cwd";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        logFilePath: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "log_file_path";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: string;
-          driverParam: string;
-          notNull: false;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: [string, ...string[]];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        kind: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "kind";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: "root" | "fork" | "subagent" | "compress";
-          driverParam: string;
-          notNull: true;
-          hasDefault: true;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: ["root", "fork", "subagent", "compress"];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-        discoveredAt: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "discovered_at";
-          tableName: "adapter_sessions";
-          dataType: "number";
-          columnType: "SQLiteInteger";
-          data: number;
-          driverParam: number;
-          notNull: true;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: undefined;
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {}>;
-        startedAt: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "started_at";
-          tableName: "adapter_sessions";
-          dataType: "number";
-          columnType: "SQLiteInteger";
-          data: number;
-          driverParam: number;
-          notNull: true;
-          hasDefault: false;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: undefined;
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {}>;
-        status: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
-          name: "status";
-          tableName: "adapter_sessions";
-          dataType: "string";
-          columnType: "SQLiteText";
-          data: "imported" | "discovered" | "live" | "tracking";
-          driverParam: string;
-          notNull: true;
-          hasDefault: true;
-          isPrimaryKey: false;
-          isAutoincrement: false;
-          hasRuntimeDefault: false;
-          enumValues: ["discovered", "imported", "live", "tracking"];
-          baseColumn: never;
-          identity: undefined;
-          generated: undefined;
-        }, {}, {
-          length: number | undefined;
-        }>;
-      };
-      dialect: "sqlite";
-    }>;
-  };
-}>;
-/**
- * Typed subjects for adapter session storage operations.
- */
-declare const AdapterSessionStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.FlatSubjectDefinitions<"storage:adapterSession", {
-  /**
-   * Upsert an adapter session record.
-   *
-   * If the record exists, updates mutable fields (parent, forkPoint, model, cwd).
-   * If not, inserts with discoveredAt=Date.now() and status='discovered'.
-   *
-   * Subject: `storage:adapterSession.upsert`
-   * Type: Request (RPC)
-   */
-  upsert: {
-    request: z.ZodDiscriminatedUnion<[z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"root">;
-      parentAdapterSessionId: z.ZodNull;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"fork">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodString;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"subagent">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>, z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      model: z.ZodNullable<z.ZodString>;
-      cwd: z.ZodNullable<z.ZodString>;
-      logFilePath: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-      startedAt: z.ZodOptional<z.ZodNumber>;
-      kind: z.ZodLiteral<"compress">;
-      parentAdapterSessionId: z.ZodString;
-      forkPointMessageId: z.ZodNull;
-    }, z.core.$strip>], "kind">;
-    response: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      sessionId: z.ZodNullable<z.ZodString>;
-      created: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Get an adapter session by ID.
-   *
-   * Subject: `storage:adapterSession.get`
-   * Type: Request (RPC)
-   */
-  get: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      session: z.ZodNullable<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * Update adapter session status.
-   *
-   * Subject: `storage:adapterSession.updateStatus`
-   * Type: Request (RPC)
-   */
-  updateStatus: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      status: z.ZodEnum<{
-        imported: "imported";
-        discovered: "discovered";
-        live: "live";
-        tracking: "tracking";
-      }>;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      success: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Link an adapter session to a Makaio session.
-   *
-   * Subject: `storage:adapterSession.linkSession`
-   * Type: Request (RPC)
-   */
-  linkSession: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      sessionId: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      success: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-  /**
-   * Get an adapter session by its source log file path.
-   *
-   * Subject: `storage:adapterSession.getByLogFilePath`
-   * Type: Request (RPC)
-   */
-  getByLogFilePath: {
-    request: z.ZodObject<{
-      logFilePath: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      session: z.ZodNullable<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * List all adapter sessions.
-   *
-   * Returns all adapter session records ordered by startedAt descending.
-   * Used by the entity cache to populate the reactive `adapterSessions` collection.
-   *
-   * Subject: `storage:adapterSession.list`
-   * Type: Request (RPC)
-   */
-  list: {
-    request: z.ZodObject<{}, z.core.$strip>;
-    response: z.ZodObject<{
-      sessions: z.ZodArray<z.ZodObject<{
-        adapterSessionId: z.ZodString;
-        adapterName: z.ZodString;
-        parentAdapterSessionId: z.ZodNullable<z.ZodString>;
-        forkPointMessageId: z.ZodNullable<z.ZodString>;
-        sessionId: z.ZodNullable<z.ZodString>;
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        logFilePath: z.ZodNullable<z.ZodString>;
-        discoveredAt: z.ZodNumber;
-        startedAt: z.ZodNumber;
-        status: z.ZodEnum<{
-          imported: "imported";
-          discovered: "discovered";
-          live: "live";
-          tracking: "tracking";
-        }>;
-        kind: z.ZodEnum<{
-          root: "root";
-          fork: "fork";
-          subagent: "subagent";
-          compress: "compress";
-        }>;
-      }, z.core.$strip>>;
-    }, z.core.$strip>;
-  };
-  /**
-   * Count adapter sessions grouped by status.
-   *
-   * Subject: `storage:adapterSession.countByAdapter`
-   * Type: Request (RPC)
-   */
-  countByAdapter: {
-    request: z.ZodObject<{
-      adapterName: z.ZodString;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      total: z.ZodNumber;
-      imported: z.ZodNumber;
-      discovered: z.ZodNumber;
-    }, z.core.$strip>;
-  };
-  /**
-   * Create and link a Makaio session for an adapter session.
-   *
-   * Consolidates session creation, parent/scope resolution, linking,
-   * and event emission into a single idempotent bus request.
-   * The bus field is injected by the handler — callers must not pass it.
-   *
-   * Subject: `storage:adapterSession.createAndLink`
-   * Type: Request (RPC)
-   */
-  createAndLink: {
-    request: z.ZodObject<{
-      adapterSessionId: z.ZodString;
-      adapterName: z.ZodString;
-      adapterId: z.ZodString;
-      metadata: z.ZodIntersection<z.ZodUnion<readonly [z.ZodObject<{
-        parentAdapterSessionId: z.ZodNull;
-        forkPointMessageId: z.ZodNull;
-        kind: z.ZodNull;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"fork">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodString;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"subagent">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodNull;
-      }, z.core.$strip>, z.ZodObject<{
-        kind: z.ZodLiteral<"compress">;
-        parentAdapterSessionId: z.ZodString;
-        forkPointMessageId: z.ZodNull;
-      }, z.core.$strip>]>, z.ZodObject<{
-        model: z.ZodNullable<z.ZodString>;
-        cwd: z.ZodNullable<z.ZodString>;
-        title: z.ZodNullable<z.ZodString>;
-      }, z.core.$strip>>;
-      existingSessionId: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>;
-    response: z.ZodObject<{
-      sessionId: z.ZodString;
-      created: z.ZodBoolean;
-    }, z.core.$strip>;
-  };
-}>, "storage:adapterSession">;
-//#endregion
-//#region packages/services/core/src/session/adapter-sessions/drizzle-handler.d.ts
-/**
- * Register Drizzle-based adapter session storage handlers.
- *
- * Manages adapter session persistence in SQLite/libSQL via Drizzle ORM.
- * Adapter sessions track sessions discovered from external adapter logs
- * and maintain lineage information for fork detection.
- * @param bus - The bus instance to register handlers on
- * @param db - The Drizzle database instance
- * @param _ctx - Extension context (unused; reserved for future use)
- * @returns Cleanup function to unsubscribe all handlers
- */
-declare function registerDrizzleAdapterSessionStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
-//#endregion
-//#region packages/services/core/src/session/adapter-sessions/handlers.d.ts
-/**
- * Parameters for the unified session creation and linking helper.
- */
-interface CreateAndLinkParams {
-  /** Bus instance for storage writes and lifecycle emissions. */
-  bus: IMakaioBus;
-  /** Adapter-specific session identifier. */
-  adapterSessionId: string;
-  /** Adapter type name (e.g., 'claude-code'). */
-  adapterName: string;
-  /** Adapter instance ID (machine/installation specific). */
-  adapterId: string;
-  /** Session metadata from the adapter. */
-  metadata: CreateAndLinkMetadata;
-  /** Existing Makaio sessionId to reuse (e.g., from discovery stub). */
-  existingSessionId?: string;
-}
-/**
- * Result returned from {@link createAndLinkImportedSession}.
- */
-interface CreateAndLinkResult {
-  /** The Makaio session ID (either newly created or pre-existing). */
-  sessionId: string;
-  /** Whether a new session record was created during this call. */
-  created: boolean;
-}
-/**
- * Unified helper that creates and links a Makaio session for an adapter session.
- *
- * Consolidates both the discovery path (`registerSessionDiscoveredHandler`) and the
- * import path into a single authoritative flow:
- *
- * 1. Early-exit if the adapter session is already linked (idempotent).
- * 2. Eagerly resolve `parentSessionId`/`rootSessionId` via `resolveLineage`.
- * 3. Create the Makaio session record via `SessionStorageSubjects.set` with `ifAbsent`.
- * 4. Link, emit `SessionSubjects.created`, and clean up on failure via `linkAndEmit`.
- * @param params - Parameters for the unified session creation/linking flow.
- * @returns The session ID and whether a new record was created.
- */
-declare function createAndLinkImportedSession(params: CreateAndLinkParams): Promise<CreateAndLinkResult>;
-/**
- * Register a bus handler for the `createAndLink` subject.
- *
- * Exposes {@link createAndLinkImportedSession} as a bus RPC so cross-package
- * callers (e.g., `@makaio/services-log-import`) can invoke it without a
- * direct import dependency on `@makaio/services-core/session`.
- * @param bus - The bus instance to register the handler on
- * @returns Cleanup function to unsubscribe the handler
- */
-declare function registerCreateAndLinkHandler(bus: IMakaioBus): () => void;
-/**
- * Register handler for adapter.session.discovered events.
- *
- * When a session is discovered from log import:
- * 1. Upsert adapter_sessions record with lineage info and log file path
- * 2. Create and link a Makaio session with all available metadata via the unified helper
- * @param bus - The bus instance to register handlers on
- * @returns Cleanup function to unsubscribe the handler
- */
-declare function registerSessionDiscoveredHandler(bus: IMakaioBus): () => void;
-//#endregion
-//#region packages/services/core/src/session/adapter-sessions/parent-resolver.d.ts
-/**
- * Register handler to resolve parent relationships when sessions are linked.
- *
- * When `adapter.session.linked` is emitted:
- * 1. Query adapter_sessions for children referencing this adapterSessionId as parent
- * 2. For each child with a linked sessionId, update the child's Makaio session parentSessionId
- * @param bus - The bus instance to register handlers on
- * @param db - The Drizzle database instance for direct queries
- * @returns Cleanup function to unsubscribe the handler
- * @example
- * ```typescript
- * import { registerParentResolver } from '@makaio/framework/services/session';
- *
- * const cleanup = registerParentResolver(bus, db);
- *
- * // Later, when shutting down:
- * cleanup();
- * ```
- */
-declare function registerParentResolver(bus: IMakaioBus, db: MakaioDatabase): () => void;
-//#endregion
-//#region packages/services/core/src/session/adapter-sessions/compress-lineage-resolver.d.ts
-/**
- * Re-parents post-compaction subagents from the parent session to the compress child.
- *
- * Handles two scenarios triggered by `adapter.session.linked`:
- *
- * **Path A — compress child linked first (batch import)**:
- * When a compress child is linked, subagents spawned after compaction are
- * already parented to the parent Makaio session (by the parent-resolver).
- * This path scans the compress child's messages and re-parents matching subagents.
- *
- * **Path B — subagent linked after compress child (incremental / separate files)**:
- * When a subagent is linked and its parent has compress children, the compress
+ * **Path B — subagent imported after compress child (incremental / separate files)**:
+ * When a subagent import completes and its parent has compress children, the compress
  * children and their messages already exist. This path scans those compress
  * children for the subagent's spawning tool_call and re-parents when found.
  *
  * Must be registered BEFORE registerSpawningToolCallResolver so it runs
- * first on `adapter.session.linked` (bus handlers fire in registration order).
+ * first on `session.import.completed` (bus handlers fire in registration order).
  * @param bus - The bus instance to register handlers on
  * @returns Cleanup function to unsubscribe the handler
  * @example
@@ -4752,12 +3514,12 @@ declare function registerParentResolver(bus: IMakaioBus, db: MakaioDatabase): ()
  */
 declare function registerCompressLineageResolver(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/adapter-sessions/spawning-tool-call-resolver.d.ts
+//#region services/core/src/session/import/spawning-tool-call-resolver.d.ts
 /**
  * Register handler to backfill `spawningToolCallId` for imported subagent sessions.
  *
- * When `adapter.session.linked` is emitted:
- * 1. Fetch children of the newly linked parent session.
+ * When `session.import.completed` is emitted:
+ * 1. Fetch children of the newly imported parent session.
  * 2. Filter to subagent children with no `spawningToolCallId`.
  * 3. Fetch parent session messages and scan for Agent/spawn_subagent tool_call blocks.
  * 4. Match each unmatched child to a tool_call by tool_output content reference
@@ -4777,7 +3539,32 @@ declare function registerCompressLineageResolver(bus: IMakaioBus): () => void;
  */
 declare function registerSpawningToolCallResolver(bus: IMakaioBus): () => void;
 //#endregion
-//#region packages/services/core/src/session/adapter-sessions/lineage-utils.d.ts
+//#region services/core/src/session/import/session-discovered-handler.d.ts
+/**
+ * Register a bus handler for `adapter.session.discovered` events.
+ *
+ * When a session is discovered from a log watcher:
+ * 1. Validates the payload with `SessionDiscoveredSchema` (fail-fast on schema violations).
+ * 2. Calls `storage:session.importUpsert` to create or enrich the session record atomically.
+ *    - On first discovery: inserts a stub session with `importStatus='discovered'` and
+ *      eagerly resolves `parentSessionId` / `rootSessionId` when the parent is already imported.
+ *    - On re-discovery: COALESCE-merges enrichment fields (title, cwd, logFilePath)
+ *      so subsequent scans can supply previously-unknown values without overwriting existing data.
+ * @param bus - The bus instance to register the handler on
+ * @returns Cleanup function to unsubscribe the handler
+ * @example
+ * ```typescript
+ * import { registerSessionDiscoveredHandler } from '@makaio/framework/services/session';
+ *
+ * const cleanup = registerSessionDiscoveredHandler(bus);
+ *
+ * // Later, when shutting down:
+ * cleanup();
+ * ```
+ */
+declare function registerSessionDiscoveredHandler(bus: IMakaioBus): () => void;
+//#endregion
+//#region services/core/src/session/import/lineage-utils.d.ts
 /**
  * Maps adapter-level session lineage kind to Makaio session branch kind.
  * Root sessions have no branch kind (undefined).
@@ -4785,8 +3572,18 @@ declare function registerSpawningToolCallResolver(bus: IMakaioBus): () => void;
  * @returns The corresponding BranchKind, or undefined for root sessions
  */
 declare function kindToBranchKind(kind: SessionLineageKind): BranchKind | undefined;
+/**
+ * Convert lineage metadata to a canonical `SessionLineage` discriminated union.
+ * @param metadata - Object with kind, parentAdapterSessionId, and forkPointMessageId
+ * @returns Canonical lineage object matching session contracts
+ */
+declare function toSessionLineage(metadata: {
+  kind: SessionLineageKind;
+  parentAdapterSessionId: string | null;
+  forkPointMessageId: string | null;
+}): SessionLineage;
 //#endregion
-//#region packages/services/core/src/session/context/types.d.ts
+//#region services/core/src/session/context/types.d.ts
 /**
  * Options for building session context.
  */
@@ -4812,7 +3609,7 @@ interface ContextAssemblyResult {
   incomplete: boolean;
 }
 //#endregion
-//#region packages/services/core/src/session/context/build-context.d.ts
+//#region services/core/src/session/context/build-context.d.ts
 /**
  * Build context for a single session by walking session_events.
  *
@@ -4825,7 +3622,7 @@ interface ContextAssemblyResult {
  */
 declare function buildSessionContext(bus: IMakaioBus, options: BuildContextOptions): Promise<ContextAssemblyResult>;
 //#endregion
-//#region packages/services/core/src/session/context/get-full-conversation.d.ts
+//#region services/core/src/session/context/get-full-conversation.d.ts
 /**
  * Get full conversation for a session, traversing parent chain.
  *
@@ -4840,4 +3637,4 @@ declare function buildSessionContext(bus: IMakaioBus, options: BuildContextOptio
  */
 declare function getFullConversation(bus: IMakaioBus, sessionId: string): Promise<ContextAssemblyResult>;
 //#endregion
-export { mapAgentsBySession as $, extractTextContent as $t, MessageRoutingSubjects as A, registerBuiltInActions as At, registerDrizzleTurnStorage as B, RecoveryConfig as Bt, MakaioSessionConfig as C, assembleForkContext as Ct, messageRouting as D, normalizeSelectionString as Dt, SelectMessageRouting as E, CONNECTOR_SWAP_DEFAULT_PIPELINE as Et, registerDrizzleMessageStorage as F, ContextWindowTracker as Ft, SessionLoggerOptions as G, verifyAndRecoverAgents as Gt, importCursors as H, ensureAgentCwd as Ht, InsertTurn as I, AgentContextState as It, InsertSessionEvent as J, resolveExecutionTarget as Jt, registerDrizzleSessionEventStorage as K, buildRecoveryContext as Kt, SelectTurn as L, ContextWindowTrackerConfig as Lt, SelectMessage as M, actionRegistry as Mt, messages as N, registerGetStatusCountsHandler as Nt, registerDrizzleMessageRoutingStorage as O, resolveAdapterNameById as Ot, registerMemoryMessageStorage as P, registerResumeHandler as Pt, fetchSessionPreviewMaps as Q, resolveTargetAgents as Qt, turns as R, SessionContextWindowState as Rt, MakaioSession as S, createAttachmentArtifacts as St, InsertMessageRouting as T, pickFallbackRuntimeOptions as Tt, EventTransform as U, ensureAgentModel as Ut, registerDrizzleImportCursorStorage as V, buildRecoveryContextWithPipeline as Vt, SessionLogger as W, recoverAgent as Wt, sessionEvents as X, findTurnByAgent as Xt, SelectSessionEvent as Y, resolveModelCapabilities as Yt, SessionPreviewMaps as Z, getOrCreateSession as Zt, AdapterSessionStorageNamespace as _, SessionBridge as _t, kindToBranchKind as a, registerCoreSessionServiceHandlers as an, fetchPreviewBySession as at, SelectAdapterSession as b, StoreArtifactFn as bt, registerParentResolver as c, registerFtsSearchHandler as ct, createAndLinkImportedSession as d, registerDrizzleSessionStorage as dt, normalizeToBlocks as en, mapToSession as et, registerCreateAndLinkHandler as f, registerMemorySessionStorage as ft, AdapterSessionStatus as g, createSessionExtensionContext as gt, AdapterSessionRecord as h, SessionExtensionContextImpl as ht, ContextAssemblyResult as i, SessionOrchestrator as in, fetchMessageCountsBySession as it, InsertMessage as j, resetBuiltInActionsRegistration as jt, MessageRoutingNamespace as k, registerListActionsHandler as kt, CreateAndLinkParams as l, registerDrizzleAgentStorage as lt, registerDrizzleAdapterSessionStorage as m, AgentStorageSubjects as mt, buildSessionContext as n, AdapterRegistry as nn, SearchSessionRow as nt, registerSpawningToolCallResolver as o, MakaioSessionService as on, mapRowToSession as ot, registerSessionDiscoveredHandler as p, AgentStorageNamespace as pt, registerMemorySessionEventStorage as q, resolveAdapterId as qt, BuildContextOptions as r, ISessionOrchestrator as rn, fetchAgentsBySession as rt, registerCompressLineageResolver as s, parseForkTransforms as st, getFullConversation as t, TurnContextEnricher as tn, SearchFilters as tt, CreateAndLinkResult as u, registerMemoryAgentStorage as ut, AdapterSessionStorageSubjects as v, AttachmentArtifactInput as vt, StartTurnOptions as w, FallbackRuntimeOptions as wt, adapterSessions as x, StoreArtifactResult as xt, InsertAdapterSession as y, AttachmentArtifactMetadata as yt, registerMemoryTurnStorage as z, buildTurnInitiator as zt };
+export { registerMemoryAgentStorage as $, registerDrizzleImportCursorStorage as A, buildRecoveryContext as At, SessionPreviewMaps as B, AdapterRegistry as Bt, registerMemoryMessageStorage as C, buildTurnInitiator as Ct, turns as D, ensureAgentModel as Dt, SelectTurn as E, ensureAgentCwd as Et, registerDrizzleSessionEventStorage as F, getOrCreateSession as Ft, SearchSessionRow as G, mapAgentsBySession as H, SessionOrchestrator as Ht, registerMemorySessionEventStorage as I, resolveTargetAgents as It, fetchPreviewBySession as J, fetchAgentsBySession as K, InsertSessionEvent as L, extractTextContent as Lt, EventTransform as M, resolveExecutionTarget as Mt, SessionLogger as N, resolveModelCapabilities as Nt, registerMemoryTurnStorage as O, recoverAgent as Ot, SessionLoggerOptions as P, findTurnByAgent as Pt, registerDrizzleAgentStorage as Q, SelectSessionEvent as R, normalizeToBlocks as Rt, messages as S, SessionContextWindowState as St, InsertTurn as T, buildRecoveryContextWithPipeline as Tt, mapToSession as U, registerCoreSessionServiceHandlers as Ut, fetchSessionPreviewMaps as V, ISessionOrchestrator as Vt, SearchFilters as W, MakaioSessionService as Wt, parseForkTransforms as X, mapRowToSession as Y, registerFtsSearchHandler as Z, registerDrizzleMessageRoutingStorage as _, registerGetStatusCountsHandler as _t, kindToBranchKind as a, createSessionExtensionContext as at, InsertMessage as b, AgentContextState as bt, registerSpawningToolCallResolver as c, FallbackRuntimeOptions as ct, MakaioSession as d, normalizeSelectionString as dt, registerDrizzleSessionStorage as et, MakaioSessionConfig as f, resolveAdapterNameById as ft, messageRouting as g, actionRegistry as gt, SelectMessageRouting as h, resetBuiltInActionsRegistration as ht, ContextAssemblyResult as i, SessionExtensionContextImpl as it, importCursors as j, resolveAdapterId as jt, registerDrizzleTurnStorage as k, verifyAndRecoverAgents as kt, registerCompressLineageResolver as l, pickFallbackRuntimeOptions as lt, InsertMessageRouting as m, registerBuiltInActions as mt, buildSessionContext as n, AgentStorageNamespace as nt, toSessionLineage as o, SessionBridge as ot, StartTurnOptions as p, registerListActionsHandler as pt, fetchMessageCountsBySession as q, BuildContextOptions as r, AgentStorageSubjects as rt, registerSessionDiscoveredHandler as s, assembleForkContext as st, getFullConversation as t, registerMemorySessionStorage as tt, registerParentResolver as u, CONNECTOR_SWAP_DEFAULT_PIPELINE as ut, MessageRoutingNamespace as v, registerResumeHandler as vt, registerDrizzleMessageStorage as w, RecoveryConfig as wt, SelectMessage as x, ContextWindowTrackerConfig as xt, MessageRoutingSubjects as y, ContextWindowTracker as yt, sessionEvents as z, TurnContextEnricher as zt };