@makaio/framework 1.0.0-dev-1781260968078 → 1.0.0-dev-1781354548379

package/dist/{index-BQiHs8EF.d.mts → index-Da4ABgRq.d.mts}

@@ -19,9 +19,9 @@ import { ExtensionWarningEntry, ExtensionWarningEntrySchema } from "@makaio/fram
  */
 declare const ComponentStateSchema: z.ZodEnum<{
   failed: "failed";
+  discovered: "discovered";
   active: "active";
   stopped: "stopped";
-  discovered: "discovered";
   skipped: "skipped";
   initializing: "initializing";
 }>;
@@ -48,9 +48,9 @@ declare const ComponentInfoSchema: z.ZodObject<{
   displayName: z.ZodString;
   state: z.ZodEnum<{
     failed: "failed";
+    discovered: "discovered";
     active: "active";
     stopped: "stopped";
-    discovered: "discovered";
     skipped: "skipped";
     initializing: "initializing";
   }>;
@@ -69,9 +69,9 @@ declare const ServiceInfoSchema: z.ZodObject<{
   displayName: z.ZodString;
   state: z.ZodEnum<{
     failed: "failed";
+    discovered: "discovered";
     active: "active";
     stopped: "stopped";
-    discovered: "discovered";
     skipped: "skipped";
     initializing: "initializing";
   }>;
@@ -91,9 +91,9 @@ declare const ExtensionInfoSchema: z.ZodObject<{
   displayName: z.ZodString;
   state: z.ZodEnum<{
     failed: "failed";
+    discovered: "discovered";
     active: "active";
     stopped: "stopped";
-    discovered: "discovered";
     skipped: "skipped";
     initializing: "initializing";
   }>;
@@ -139,17 +139,17 @@ declare const ExtensionNamespace: _$_makaio_core0.BusNamespaceDefinition<"kernel
     displayName: z.ZodString;
     from: z.ZodEnum<{
       failed: "failed";
+      discovered: "discovered";
       active: "active";
       stopped: "stopped";
-      discovered: "discovered";
       skipped: "skipped";
       initializing: "initializing";
     }>;
     to: z.ZodEnum<{
       failed: "failed";
+      discovered: "discovered";
       active: "active";
       stopped: "stopped";
-      discovered: "discovered";
       skipped: "skipped";
       initializing: "initializing";
     }>;
@@ -182,9 +182,9 @@ declare const ExtensionNamespace: _$_makaio_core0.BusNamespaceDefinition<"kernel
         displayName: z.ZodString;
         state: z.ZodEnum<{
           failed: "failed";
+          discovered: "discovered";
           active: "active";
           stopped: "stopped";
-          discovered: "discovered";
           skipped: "skipped";
           initializing: "initializing";
         }>;
@@ -220,9 +220,9 @@ declare const ExtensionNamespace: _$_makaio_core0.BusNamespaceDefinition<"kernel
         displayName: z.ZodString;
         state: z.ZodEnum<{
           failed: "failed";
+          discovered: "discovered";
           active: "active";
           stopped: "stopped";
-          discovered: "discovered";
           skipped: "skipped";
           initializing: "initializing";
         }>;
@@ -593,17 +593,17 @@ declare const ExtensionSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.Fla
     displayName: z.ZodString;
     from: z.ZodEnum<{
       failed: "failed";
+      discovered: "discovered";
       active: "active";
       stopped: "stopped";
-      discovered: "discovered";
       skipped: "skipped";
       initializing: "initializing";
     }>;
     to: z.ZodEnum<{
       failed: "failed";
+      discovered: "discovered";
       active: "active";
       stopped: "stopped";
-      discovered: "discovered";
       skipped: "skipped";
       initializing: "initializing";
     }>;
@@ -636,9 +636,9 @@ declare const ExtensionSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.Fla
         displayName: z.ZodString;
         state: z.ZodEnum<{
           failed: "failed";
+          discovered: "discovered";
           active: "active";
           stopped: "stopped";
-          discovered: "discovered";
           skipped: "skipped";
           initializing: "initializing";
         }>;
@@ -674,9 +674,9 @@ declare const ExtensionSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.Fla
         displayName: z.ZodString;
         state: z.ZodEnum<{
           failed: "failed";
+          discovered: "discovered";
           active: "active";
           stopped: "stopped";
-          discovered: "discovered";
           skipped: "skipped";
           initializing: "initializing";
         }>;

package/dist/{index-BvSyOgTY.d.mts → index-DrGLAuZc.d.mts}

@@ -5,14 +5,14 @@ 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, BranchKind, ContextWindowState, ExtensionContext, ForkOptions, ForkTransforms, IMakaioSession, MakaioSessionAgent, MakaioSessionEvent, Message, MessageBlock, MessageInput, ReasoningLevelMap, SessionContext, SessionExtensionContext, SessionLineage, SessionLineageKind, SessionMessage, SessionMessageBlock, TurnInitiator } from "@makaio/framework/contracts";
+import { AIReasoningLevel, AdapterRuntimeOptions, BranchKind, ContextWindowState, 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 _$_makaio_storage_core0 from "@makaio/framework/storage";
 import * as _$drizzle_orm_sqlite_core0 from "drizzle-orm/sqlite-core";
 import * as _$drizzle_orm_pg_core0 from "drizzle-orm/pg-core";
 import * as _$_makaio_storage_drizzle0 from "@makaio/framework/storage/drizzle";
 import { MakaioDatabase } from "@makaio/framework/storage/drizzle";
 import * as _$drizzle_orm0 from "drizzle-orm";
-import * as _$_makaio_storage_core0 from "@makaio/framework/storage";
 
 //#region services/core/src/session/session-service.d.ts
 /**
@@ -20,7 +20,8 @@ import * as _$_makaio_storage_core0 from "@makaio/framework/storage";
  *
  * Registers the minimal, load-bearing session handlers that the framework SDK
  * requires: `session.create`, `session.get`, `session.list`, `session.close`,
- * `session.agent.added`, and `session.agent.removed`.
+ * `session.turn.await`, `session.restartAgents`, `session.agent.added`, and
+ * `session.agent.removed`.
  *
  * Host-specific handlers (search, update, resume, archive, purge, analytics,
  * context window, branching) are registered by the host session service which
@@ -66,7 +67,7 @@ declare class MakaioSessionService extends BaseService {
   /**
    * Initialize the service.
    *
-   * Registers the six framework-core session bus handlers, then performs
+   * Registers the framework-core session bus handlers, then performs
    * startup reconciliation to close any turns that were left `active` by a
    * prior process crash. Each orphaned turn is closed with status `'error'`
    * and a `'process-restart'` error message, and a `turn.completed` event is
@@ -105,8 +106,9 @@ interface CoreSessionServiceHandlerDeps {
 }
 /**
  * Registers the framework-core session service handlers:
- * `session.create`, `session.get`, `session.list`, `session.close`,
- * `session.update`, `session.archive`, `session.purge`,
+ * `session.create`, `session.get`, `session.list`, `session.turn.await`,
+ * `session.close`, `session.restartAgents`, `session.update`,
+ * `session.archive`, `session.purge`, `session.registerExternal`,
  * `session.agent.added`, and `session.agent.removed`.
  *
  * These handlers cover the minimal, load-bearing session contract for the
@@ -146,8 +148,8 @@ interface ISessionOrchestrator {
  * 1. Get or create session (via `getOrCreateSession`)
  * 2. Start agent if session has no agents — resolves the canonical
  *    `adapterName` from direct selections, uses `adapterId` directly when
- *    provided, otherwise resolves it via `AdapterRegistry`, then calls bare
- *    `AdapterSubjects.startAgent`
+ *    provided, otherwise resolves it via `AdapterRegistry`, resolves
+ *    provider credentials when selected, then calls `AdapterSubjects.startAgent`
  * 3. Resolve target agents (via `resolveTargetAgents`)
  * 4. Verify agent liveness and build recovery context for dead agents
  *    (requestOptional `AdapterSubjects.getAgent` + `buildRecoveryContext`)
@@ -188,7 +190,7 @@ declare class SessionOrchestrator implements ISessionOrchestrator {
    * Core flow:
    * 1. Get or create session
    * 2. Start agent if session has no agents (canonicalize direct selections,
-   *    resolve adapterId, bare startAgent)
+   *    resolve adapterId, resolve provider credentials, startAgent)
    * 3. Resolve target agents
    * 4. Verify agent liveness and build recovery context for dead agents
    * 5. Get or create turn (via SessionTurnManager)
@@ -924,6 +926,7 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -966,6 +969,7 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1034,6 +1038,7 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1078,6 +1083,7 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1147,8 +1153,10 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
   updateRuntime: {
     request: z.ZodObject<{
       agentId: z.ZodString;
+      adapterId: z.ZodOptional<z.ZodString>;
       cwd: z.ZodOptional<z.ZodString>;
       model: z.ZodOptional<z.ZodString>;
+      allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
       providerConfigId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
     response: z.ZodObject<{
@@ -1294,6 +1302,25 @@ declare const AgentStorageNamespace: _$_makaio_storage_core0.StorageNamespaceDef
         }, {}, {
           length: number | undefined;
         }>;
+        allowedDirectories: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
+          name: string;
+          tableName: "agents";
+          dataType: "json";
+          columnType: "SQLiteTextJson";
+          data: string[];
+          driverParam: string;
+          notNull: false;
+          hasDefault: false;
+          isPrimaryKey: false;
+          isAutoincrement: false;
+          hasRuntimeDefault: false;
+          enumValues: undefined;
+          baseColumn: never;
+          identity: undefined;
+          generated: undefined;
+        }, {}, {
+          $type: string[];
+        }>;
         providerConfigId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
           name: "provider_config_id";
           tableName: "agents";
@@ -1508,6 +1535,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1550,6 +1578,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1618,6 +1647,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1662,6 +1692,7 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
         adapterSessionId: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         cwd: z.ZodOptional<z.ZodString>;
+        allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerConfigId: z.ZodOptional<z.ZodString>;
         personaId: z.ZodOptional<z.ZodString>;
         profileId: z.ZodOptional<z.ZodString>;
@@ -1731,8 +1762,10 @@ declare const AgentStorageSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core0.
   updateRuntime: {
     request: z.ZodObject<{
       agentId: z.ZodString;
+      adapterId: z.ZodOptional<z.ZodString>;
       cwd: z.ZodOptional<z.ZodString>;
       model: z.ZodOptional<z.ZodString>;
+      allowedDirectories: z.ZodOptional<z.ZodArray<z.ZodString>>;
       providerConfigId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
     response: z.ZodObject<{
@@ -1776,7 +1809,6 @@ declare function registerMemorySessionStorage(bus: IMakaioBus): () => void;
  * via SQLite's busy_timeout + WAL mode.
  * @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
  * @example
  * ```typescript
@@ -1786,13 +1818,13 @@ declare function registerMemorySessionStorage(bus: IMakaioBus): () => void;
  *
  * const client = createClient({ url: 'file:./makaio.db' });
  * const db = drizzle(client);
- * const cleanup = registerDrizzleSessionStorage(bus, db, ctx);
+ * const cleanup = registerDrizzleSessionStorage(bus, db);
  *
  * // Later, when shutting down:
  * cleanup();
  * ```
  */
-declare function registerDrizzleSessionStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleSessionStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/storage/agent-memory-handler.d.ts
 /**
@@ -1869,7 +1901,7 @@ declare const sessionStorageSchema: _$_makaio_storage_drizzle0.DialectSchema<{
         tableName: "sessions";
         dataType: "string";
         columnType: "SQLiteText";
-        data: "closed" | "active" | "archived" | "discovered";
+        data: "closed" | "discovered" | "active" | "archived";
         driverParam: string;
         notNull: true;
         hasDefault: false;
@@ -1983,7 +2015,7 @@ declare const sessionStorageSchema: _$_makaio_storage_drizzle0.DialectSchema<{
         tableName: "sessions";
         dataType: "string";
         columnType: "SQLiteText";
-        data: "branch" | "fork" | "subagent" | "compress" | "rewrite" | "coordinator" | "aside";
+        data: "fork" | "subagent" | "compress" | "branch" | "rewrite" | "coordinator" | "aside";
         driverParam: string;
         notNull: false;
         hasDefault: false;
@@ -2528,6 +2560,25 @@ declare const sessionStorageSchema: _$_makaio_storage_drizzle0.DialectSchema<{
       }, {}, {
         length: number | undefined;
       }>;
+      allowedDirectories: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
+        name: string;
+        tableName: "agents";
+        dataType: "json";
+        columnType: "SQLiteTextJson";
+        data: string[];
+        driverParam: string;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+      }, {}, {
+        $type: string[];
+      }>;
       providerConfigId: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
         name: "provider_config_id";
         tableName: "agents";
@@ -2727,7 +2778,6 @@ declare const sessionStorageSchema: _$_makaio_storage_drizzle0.DialectSchema<{
  * Provides durable storage suitable for production deployments.
  * @param bus - The bus instance to register handlers on
  * @param db - The MakaioDatabase instance
- * @param _ctx - Extension context (unused; reserved for future use)
  * @returns Cleanup function to unsubscribe all handlers
  * @example
  * ```typescript
@@ -2737,13 +2787,13 @@ declare const sessionStorageSchema: _$_makaio_storage_drizzle0.DialectSchema<{
  *
  * const client = createClient({ url: 'file:./makaio.db' });
  * const db = drizzle(client);
- * const cleanup = registerDrizzleAgentStorage(bus, db, ctx);
+ * const cleanup = registerDrizzleAgentStorage(bus, db);
  *
  * // Later, when shutting down:
  * cleanup();
  * ```
  */
-declare function registerDrizzleAgentStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleAgentStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/storage/fts-search-handler.d.ts
 /**
@@ -3279,7 +3329,6 @@ declare function registerMemorySessionEventStorage(bus: IMakaioBus): () => void;
  * extraction for future FTS/embedding support.
  * @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
  * @example
  * ```typescript
@@ -3289,13 +3338,13 @@ declare function registerMemorySessionEventStorage(bus: IMakaioBus): () => void;
  *
  * const client = createClient({ url: 'file:./makaio.db' });
  * const db = drizzle(client);
- * const cleanup = registerDrizzleSessionEventStorage(bus, db, ctx);
+ * const cleanup = registerDrizzleSessionEventStorage(bus, db);
  *
  * // Later, when shutting down:
  * cleanup();
  * ```
  */
-declare function registerDrizzleSessionEventStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleSessionEventStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/session-logger.d.ts
 /**
@@ -3518,19 +3567,18 @@ declare const importCursors: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
  * On restart, import continues from the last processed byte offset.
  * @param bus - The bus instance to register handlers on
  * @param db - Drizzle database instance
- * @param _ctx - Extension context (unused; reserved for future use)
  * @returns Cleanup function to unsubscribe all handlers
  * @example
  * ```typescript
  * import { registerDrizzleImportCursorStorage } from '@makaio/framework/services/session';
  *
- * const cleanup = registerDrizzleImportCursorStorage(bus, db, ctx);
+ * const cleanup = registerDrizzleImportCursorStorage(bus, db);
  *
  * // Later, when shutting down:
  * cleanup();
  * ```
  */
-declare function registerDrizzleImportCursorStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleImportCursorStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/embeddings/index-manager.d.ts
 /**
@@ -3689,10 +3737,9 @@ declare class EmbeddingIndexManager {
  * via SQLite's busy_timeout + WAL mode.
  * @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 registerDrizzleTurnStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleTurnStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/turns/memory-handler.d.ts
 /**
@@ -3760,6 +3807,11 @@ declare const turnsDual: _$_makaio_storage_drizzle0.DualTable<"turns", {
    * @see TurnUsageSchema in libs/contracts for structure definition
    */
   usage: _$_makaio_storage_drizzle0.DualBuilder<_$drizzle_orm_sqlite_core0.SQLiteTextBuilderInitial<"usage", [string, ...string[]], number | undefined>, _$drizzle_orm_pg_core0.PgTextBuilderInitial<"usage", [string, ...string[]]>>;
+  /**
+   * Turn origin metadata for loop prevention and audit.
+   * Stored as hand-stringified JSON because turn.create uses a raw SQL CTE.
+   */
+  initiator: _$_makaio_storage_drizzle0.DualBuilder<_$drizzle_orm_sqlite_core0.SQLiteTextBuilderInitial<"initiator", [string, ...string[]], number | undefined>, _$drizzle_orm_pg_core0.PgTextBuilderInitial<"initiator", [string, ...string[]]>>;
 }>;
 /** SQLite face of the `turns` table (canonical schema). */
 declare const turns: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
@@ -3912,6 +3964,25 @@ declare const turns: _$drizzle_orm_sqlite_core0.SQLiteTableWithColumns<{
     }, {}, {
       length: number | undefined;
     }>;
+    initiator: _$drizzle_orm_sqlite_core0.SQLiteColumn<{
+      name: "initiator";
+      tableName: "turns";
+      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;
+    }>;
   };
   dialect: "sqlite";
 }>;
@@ -3931,10 +4002,9 @@ type SelectTurn = typeof turns.$inferSelect;
  * Manages message persistence via Drizzle ORM.
  * @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 registerDrizzleMessageStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleMessageStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/messages/memory-handler.d.ts
 /**
@@ -4482,10 +4552,9 @@ declare const MessageRoutingSubjects: _$_makaio_core0.BusSubjects<_$_makaio_core
  * Manages message delivery tracking via Drizzle ORM.
  * @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 registerDrizzleMessageRoutingStorage(bus: IMakaioBus, db: MakaioDatabase, _ctx: ExtensionContext): () => void;
+declare function registerDrizzleMessageRoutingStorage(bus: IMakaioBus, db: MakaioDatabase): () => void;
 //#endregion
 //#region services/core/src/session/message-routing/schema.d.ts
 /**

package/dist/{index-BKKNWqkP2.d.mts → index-zgm2j9V92.d.mts}

@@ -1,7 +1,7 @@
 import { TransportPeerContext } from "@makaio/framework/core";
 import { IMakaioBus } from "@makaio/framework/bus";
 import * as _$_makaio_contracts0 from "@makaio/framework/contracts";
-import { MakaioNodeExtension, PendingRequest, SubagentConfig, SubagentConstraints, SubagentStatus } from "@makaio/framework/contracts";
+import { CompletionMode, MakaioNodeExtension, PendingRequest, SubagentConfig, SubagentConstraints, SubagentStatus } from "@makaio/framework/contracts";
 import { BaseService } from "@makaio/framework/service-base";
 
 //#region services/core/src/subagent/spawn-delegation.d.ts
@@ -186,6 +186,33 @@ declare class SubagentService extends BaseService {
    * @param sessionId - The session ID reported by the adapter as closed
    */
   private handleAdapterSessionClosed;
+  /**
+   * Handle `agent.complete` events for turn-mode subagents.
+   *
+   * Scans non-terminal subagents for one whose `childSessionId` matches the
+   * event's `sessionId`. If found and the subagent was spawned with
+   * `completion: 'turn'`, terminalizes it based on the turn outcome:
+   *
+   * - `'completed'` or absent (legacy emitters) → marks completed; result is
+   *   `payload.message`.
+   * - `'error'` → marks failed with `payload.error`.
+   * - `'superseded'`, `'merged'`, `'cancelled'`, `'rejected'` → ignored; these
+   *   are not the subagent's final result.
+   *
+   * Guards applied before transitioning:
+   * - Skips when `sessionId` is absent (malformed event from legacy emitter).
+   * - Skips when the subagent is currently in `waiting_input` — the completed
+   *   turn is the question, not the result.
+   * - Skips when `manager.markCompleted` / `manager.markFailed` would throw
+   *   (subagent already terminal — first-terminal-wins).
+   *
+   * Both terminal branches emit `subagent.completed` (with `success` set
+   * accordingly), the same announcement `completeTask` makes. That event is
+   * what drives child-session cleanup (`handleCompleted`) — terminalizing
+   * only the manager state would leak the child session and its adapter.
+   * @param payload - Payload from the `agent.complete` bus event
+   */
+  private handleAgentComplete;
   /**
    * Return true when a handler may proceed.
    *
@@ -288,6 +315,13 @@ interface TrackedSubagent {
   summary?: string;
   /** Error message if failed. */
   error?: string;
+  /**
+   * Which mechanism terminalized this subagent.
+   * Present only when status is `'completed'`.
+   * - `'tool'` — child called `completeTask`.
+   * - `'turn'` — first completed agent turn was used as the result.
+   */
+  completionSource?: CompletionMode;
   /** Timestamp when the subagent was spawned. */
   startTime: number;
   /** Timestamp when the subagent reached a terminal state. */
@@ -314,6 +348,13 @@ interface AwaitResult {
   pendingRequest?: PendingRequest;
   /** Error message if failed. */
   error?: string;
+  /**
+   * Which mechanism terminalized the subagent.
+   * Present when status is `'completed'`.
+   * - `'tool'` — child called `completeTask`.
+   * - `'turn'` — first completed agent turn was used as the result.
+   */
+  completionSource?: CompletionMode;
 }
 //#endregion
 //#region services/core/src/subagent/manager/subagent-manager.d.ts
@@ -422,9 +463,10 @@ declare class SubagentManager {
    * @param subagentId - ID of the subagent
    * @param result - Result string
    * @param summary - Optional summary of the result
+   * @param completionSource - Which mechanism produced the completion (`'tool'` or `'turn'`)
    * @throws SubagentError if subagent not found or already in terminal state
    */
-  markCompleted(subagentId: string, result: string, summary?: string): void;
+  markCompleted(subagentId: string, result: string, summary?: string, completionSource?: CompletionMode): void;
   /**
    * Mark subagent as failed.
    * Does nothing if subagent not found or already in a terminal state.

package/dist/kernel/extension/index.d.mts

@@ -1,2 +1,2 @@
-import { a as ExtensionCoordinatorOptions, c as KernelMakaioExtension, i as ContributionProcessor, l as RuntimeCapability, n as filterEligibleExtensions, o as ExtensionRuntimeSurface, r as ExtensionCoordinator, s as KernelExtensionContext, t as coalesceExtensionOverrides, u as RuntimeEnvironment } from "../../index-DTdqGAfH2.mjs";
+import { a as ExtensionCoordinatorOptions, c as KernelMakaioExtension, i as ContributionProcessor, l as RuntimeCapability, n as filterEligibleExtensions, o as ExtensionRuntimeSurface, r as ExtensionCoordinator, s as KernelExtensionContext, t as coalesceExtensionOverrides, u as RuntimeEnvironment } from "../../index-CH5U3zSA2.mjs";
 export { ContributionProcessor, ExtensionCoordinator, ExtensionCoordinatorOptions, ExtensionRuntimeSurface, KernelExtensionContext, KernelMakaioExtension, RuntimeCapability, RuntimeEnvironment, coalesceExtensionOverrides, filterEligibleExtensions };

package/dist/kernel/index.d.mts

@@ -1,5 +1,5 @@
-import { c as ExtensionInfo, f as ServiceInfo, i as ComponentInfo, l as ExtensionInfoSchema, n as ExtensionSubjects, o as ComponentState, p as ServiceInfoSchema, s as ComponentStateSchema, t as ExtensionNamespace } from "../index-BQiHs8EF.mjs";
-import { c as KernelMakaioExtension, i as ContributionProcessor, l as RuntimeCapability, n as filterEligibleExtensions, o as ExtensionRuntimeSurface, r as ExtensionCoordinator, s as KernelExtensionContext, t as coalesceExtensionOverrides, u as RuntimeEnvironment } from "../index-DTdqGAfH2.mjs";
+import { c as ExtensionInfo, f as ServiceInfo, i as ComponentInfo, l as ExtensionInfoSchema, n as ExtensionSubjects, o as ComponentState, p as ServiceInfoSchema, s as ComponentStateSchema, t as ExtensionNamespace } from "../index-Da4ABgRq.mjs";
+import { c as KernelMakaioExtension, i as ContributionProcessor, l as RuntimeCapability, n as filterEligibleExtensions, o as ExtensionRuntimeSurface, r as ExtensionCoordinator, s as KernelExtensionContext, t as coalesceExtensionOverrides, u as RuntimeEnvironment } from "../index-CH5U3zSA2.mjs";
 import { i as WindowStyle, n as WindowRegistration, r as WindowRegistry, t as STYLE_DEFAULTS } from "../window-registry-CfEi_Ji4.mjs";
 import { a as KernelSchemas, i as setWorkflowTriggerTypeRegistry, n as KernelSubjects, r as getWorkflowTriggerTypeRegistry, t as KernelNamespace } from "../index-DOfq0qqv.mjs";
 import { a as MachineIdentity, c as StorageProvider, i as IdentityProvider, n as NoTransportProvider, o as TransportProvider, r as MemoryStorageProvider, s as StorageCleanup, t as EphemeralIdentityProvider } from "../index-BbCjtc3h.mjs";

package/dist/kernel/observability/index.d.mts

@@ -1,2 +1,2 @@
-import { a as ComponentInfoSchema, c as ExtensionInfo, d as ExtensionWarningEntrySchema, f as ServiceInfo, i as ComponentInfo, l as ExtensionInfoSchema, n as ExtensionSubjects, o as ComponentState, p as ServiceInfoSchema, r as ComponentIdentitySchema, s as ComponentStateSchema, t as ExtensionNamespace, u as ExtensionWarningEntry } from "../../index-BQiHs8EF.mjs";
+import { a as ComponentInfoSchema, c as ExtensionInfo, d as ExtensionWarningEntrySchema, f as ServiceInfo, i as ComponentInfo, l as ExtensionInfoSchema, n as ExtensionSubjects, o as ComponentState, p as ServiceInfoSchema, r as ComponentIdentitySchema, s as ComponentStateSchema, t as ExtensionNamespace, u as ExtensionWarningEntry } from "../../index-Da4ABgRq.mjs";
 export { ComponentIdentitySchema, ComponentInfo, ComponentInfoSchema, ComponentState, ComponentStateSchema, ExtensionInfo, ExtensionInfoSchema, ExtensionNamespace, ExtensionSubjects, ExtensionWarningEntry, ExtensionWarningEntrySchema, ServiceInfo, ServiceInfoSchema };