@khirby/plugin-ai-compose 1.2.0 → 1.3.1

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@khirby/plugin-ai-compose",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Khirby — AI-powered reply draft suggestions (BYOK, OpenAI-compatible)",
   "main": "src/index.ts",
   "keywords": [
     "khirby-plugin"
   ],
   "peerDependencies": {
-    "@khirby/plugin-host": "^1.0.0",
+    "@khirby/plugin-host": "^1.2.0",
     "@khirby/plugin-sdk": "^1.0.0",
     "@nestjs/common": "*",
+    "@nestjs/core": "*",
     "@nestjs/swagger": "*",
     "drizzle-orm": "*"
   },

package/src/ai-compose-crypto.ts

@@ -2,4 +2,4 @@ export {
   decrypt,
   encrypt,
   isInstanceSecretsKeyConfigured as isAiComposeSecretsKeyConfigured,
-} from '../../../packages/plugin-host/src/instance-secrets';
+} from '@khirby/plugin-host';

package/src/ai-compose-generate.controller.ts

@@ -6,7 +6,7 @@ import {
   RequireAnyPermission,
   RequirePluginEnabled,
   PluginEnabledGuard,
-} from '../../../packages/plugin-host/src';
+} from '@khirby/plugin-host';
 import { AiComposeSuggestService, type NewsletterContentType } from './ai-compose-suggest.service';
 import { AI_COMPOSE_PLUGIN_NAME } from './ai-compose-settings.service';
 

package/src/ai-compose-llm.service.ts

@@ -3,7 +3,7 @@ import {
   AppException,
   isReasoningEffort,
   type AiComposeLlmLike,
-} from '../../../packages/plugin-host/src';
+} from '@khirby/plugin-host';
 import { AiComposeSettingsService } from './ai-compose-settings.service';
 import { AiComposeSuggestService } from './ai-compose-suggest.service';
 

package/src/ai-compose-settings.controller.ts

@@ -6,7 +6,7 @@ import {
   RequirePermission,
   RequirePluginEnabled,
   PluginEnabledGuard,
-} from '../../../packages/plugin-host/src';
+} from '@khirby/plugin-host';
 import { AiComposeSettingsService } from './ai-compose-settings.service';
 import { AiComposeSuggestService } from './ai-compose-suggest.service';
 import { AI_COMPOSE_PLUGIN_NAME } from './ai-compose-settings.service';

package/src/ai-compose-settings.service.ts

@@ -8,7 +8,7 @@ import {
   AppException,
   isReasoningEffort,
   type ReasoningEffort,
-} from '../../../packages/plugin-host/src';
+} from '@khirby/plugin-host';
 import { aiComposeSettings } from './schema';
 import { encrypt, decrypt, isAiComposeSecretsKeyConfigured } from './ai-compose-crypto';
 

package/src/ai-compose-suggest.controller.ts

@@ -6,7 +6,7 @@ import {
   RequireAnyPermission,
   RequirePluginEnabled,
   PluginEnabledGuard,
-} from '../../../packages/plugin-host/src';
+} from '@khirby/plugin-host';
 import { AiComposeSuggestService } from './ai-compose-suggest.service';
 import { AI_COMPOSE_PLUGIN_NAME } from './ai-compose-settings.service';
 

package/src/ai-compose-suggest.service.ts

@@ -1,4 +1,5 @@
-import { Injectable, Inject, Logger, Optional } from '@nestjs/common';
+import { Injectable, Inject, Logger } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import {
   LEADS_SERVICE,
   MAIL_THREAD_SERVICE,
@@ -9,7 +10,8 @@ import {
   applyReasoningEffort,
   isReasoningEffort,
   parseModelReasoningSupport,
-} from '../../../packages/plugin-host/src';
+  resolveLoadedProvider,
+} from '@khirby/plugin-host';
 import { AiComposeSettingsService } from './ai-compose-settings.service';
 
 const CHAR_BUDGET = 14_000;
@@ -44,11 +46,14 @@ export class AiComposeSuggestService {
     private readonly settings: AiComposeSettingsService,
     @Inject(MAIL_THREAD_SERVICE) private readonly mailThreads: MailThreadServiceLike,
     @Inject(LEADS_SERVICE) private readonly leads: LeadsServiceLike,
-    @Optional()
-    @Inject(KNOWLEDGE_CONTEXT)
-    private readonly knowledge: KnowledgeContextLike | null,
+    private readonly moduleRef: ModuleRef,
   ) {}
 
+  /** Volume Pokelo may bind after this service is constructed (ADR-0048 / ADR-0050). */
+  private knowledge(): KnowledgeContextLike | null {
+    return resolveLoadedProvider<KnowledgeContextLike>(this.moduleRef, KNOWLEDGE_CONTEXT);
+  }
+
   async availability(): Promise<{ available: boolean; defaultModel: string | null }> {
     const defaultModel = await this.settings.getDefaultModel();
     try {
@@ -342,8 +347,9 @@ export class AiComposeSuggestService {
     const { apiKey, baseUrl } = await this.settings.getDecryptedApiKey();
 
     const knowledgeQuery = (input.ragQuery ?? input.userContent).slice(0, 800);
-    const knowledgeSnippets = this.knowledge
-      ? await this.knowledge.fetchContext(knowledgeQuery).catch(() => '')
+    const knowledge = this.knowledge();
+    const knowledgeSnippets = knowledge
+      ? await knowledge.fetchContext(knowledgeQuery).catch(() => '')
       : '';
 
     const systemContent = [input.systemContent, knowledgeSnippets].filter(Boolean).join('\n\n');

package/src/ai-compose.module.ts

@@ -1,5 +1,5 @@
 import { Global, Module } from '@nestjs/common';
-import { AI_COMPOSE_LLM } from '../../../packages/plugin-host/src';
+import { AI_COMPOSE_LLM } from '@khirby/plugin-host';
 import { AiComposeSettingsService } from './ai-compose-settings.service';
 import { AiComposeSuggestService } from './ai-compose-suggest.service';
 import { AiComposeLlmService } from './ai-compose-llm.service';

package/src/ai-compose.spec.ts

@@ -5,7 +5,7 @@ import {
   AiComposeSuggestService,
   stripCodeFences,
 } from './ai-compose-suggest.service';
-import { AppException } from '../../../packages/plugin-host/src';
+import { AppException } from '@khirby/plugin-host';
 
 // ──────────────────────────────────────────────────────────────────────────────
 // Crypto round-trip
@@ -255,6 +255,13 @@ const MOCK_THREAD = {
   ],
 };
 
+
+function mockModuleRef(knowledge: unknown = null) {
+  return {
+    get: jest.fn().mockReturnValue(knowledge),
+  } as any;
+}
+
 describe('AiComposeSuggestService', () => {
   const mockMailThreads = {
     getThread: jest.fn().mockResolvedValue(MOCK_THREAD),
@@ -302,7 +309,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     const result = await service.suggest({ threadId: 'thread-1', leadId: 'l-1' });
@@ -333,7 +340,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
     await service.suggest({ threadId: 'thread-1' });
     const body = chatBodyFromFetch();
@@ -356,7 +363,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
     await service.suggest({ threadId: 'thread-1' });
     const body = chatBodyFromFetch();
@@ -387,7 +394,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
     await service.suggest({ threadId: 'thread-1' });
     expect(completions).toBe(2);
@@ -411,7 +418,7 @@ describe('AiComposeSuggestService', () => {
       makeSettingsService() as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
     await expect(
       service.fetchModels('https://api.openai.com/v1', 'sk-test'),
@@ -428,7 +435,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await expect(service.suggest({ threadId: 'thread-1', model: 'claude-3' })).rejects.toThrow();
@@ -445,7 +452,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await expect(service.suggest({ threadId: 'thread-1' })).rejects.toThrow(
@@ -465,7 +472,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await expect(service.suggest({ threadId: 'thread-1' })).rejects.toThrow();
@@ -482,7 +489,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await service.suggest({ threadId: 'thread-1', instruction: 'Be formal' });
@@ -506,7 +513,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     const result = await service.suggest({ leadId: 'l-1' });
@@ -530,7 +537,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await expect(service.suggest({})).rejects.toThrow('Either threadId or leadId is required');
@@ -550,7 +557,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      knowledge as any,
+      mockModuleRef(knowledge),
     );
 
     await service.suggest({ threadId: 'thread-1', leadId: 'l-1', instruction: 'Be brief' });
@@ -574,7 +581,7 @@ describe('AiComposeSuggestService', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
 
     await service.suggest({ threadId: 'thread-1' });
@@ -602,7 +609,7 @@ describe('AiComposeSuggestService.generateNewsletter', () => {
       settings as any,
       mockMailThreads as any,
       mockLeads as any,
-      null,
+      mockModuleRef(),
     );
   }
 
@@ -704,7 +711,7 @@ describe('AiComposeSuggestService.generateNewsletter', () => {
       makeSettingsService() as any,
       mockMailThreads as any,
       mockLeads as any,
-      knowledge as any,
+      mockModuleRef(knowledge),
     );
 
     await svc.generateNewsletter({