@khirby/plugin-pokelo 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khirby/plugin-pokelo",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Khirby — Pokelo RAG knowledge base context for AI Compose",
   "main": "src/index.ts",
   "keywords": [
@@ -21,4 +21,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   }
-}
+}

package/src/pokelo-context.service.ts

@@ -9,6 +9,7 @@ const SNIPPET_MAX_CHARS = 800;
 type McpToolResult = {
   result?: {
     content?: Array<{ type?: string; text?: string }>;
+    isError?: boolean;
   };
   error?: { message?: string };
 };
@@ -177,6 +178,11 @@ export class PokeloContextService implements PokeloContextServiceLike {
     if (envelope.error) {
       throw new Error(envelope.error.message ?? 'Pokelo MCP tool error');
     }
+    // Pokelo maps tool failures to CallToolResult.isError (HTTP 200), not JSON-RPC error.
+    if (envelope.result?.isError) {
+      const msg = envelope.result.content?.[0]?.text?.trim() || 'Pokelo MCP tool error';
+      throw new Error(msg);
+    }
 
     return envelope.result?.content?.[0]?.text ?? '';
   }
@@ -223,12 +229,19 @@ export function parseProjectList(text: string): Array<{ id: string; name: string
   if (!text.trim()) return [];
   try {
     const parsed = JSON.parse(text) as {
-      items?: Array<{ id?: string; name?: string }>;
+      items?: Array<{ id?: string; projectId?: string; name?: string }>;
     };
     if (Array.isArray(parsed.items)) {
       return parsed.items
-        .filter((p): p is { id: string; name: string } => !!p.id && !!p.name)
-        .map((p) => ({ id: p.id, name: p.name }));
+        .map((p) => {
+          const id =
+            (typeof p.projectId === 'string' && p.projectId.trim()) ||
+            (typeof p.id === 'string' && p.id.trim()) ||
+            '';
+          const name = typeof p.name === 'string' ? p.name.trim() : '';
+          return { id, name };
+        })
+        .filter((p) => p.id && p.name);
     }
   } catch {
     // ignore

package/src/pokelo.spec.ts

@@ -50,12 +50,28 @@ describe('parseSseJsonRpc / parseSearchMatches / parseProjectList', () => {
     expect(matches).toEqual(['Snippet A', 'Snippet B']);
   });
 
-  it('parses project list JSON', () => {
+  it('parses project list JSON with current MCP projectId', () => {
+    const projects = parseProjectList(
+      JSON.stringify({
+        items: [{ projectId: 'p1', name: 'Bearly CRM', slug: 'bearly-crm-p1' }, { name: 'x' }],
+      }),
+    );
+    expect(projects).toEqual([{ id: 'p1', name: 'Bearly CRM' }]);
+  });
+
+  it('parses legacy project list JSON with id', () => {
     const projects = parseProjectList(
       JSON.stringify({ items: [{ id: 'p1', name: 'Bearly CRM' }, { id: 'x' }] }),
     );
     expect(projects).toEqual([{ id: 'p1', name: 'Bearly CRM' }]);
   });
+
+  it('prefers projectId over id when both are present', () => {
+    const projects = parseProjectList(
+      JSON.stringify({ items: [{ id: 'legacy', projectId: 'current', name: 'CRM' }] }),
+    );
+    expect(projects).toEqual([{ id: 'current', name: 'CRM' }]);
+  });
 });
 
 function makeSelectChain(returnValue: unknown[]) {
@@ -197,7 +213,7 @@ describe('PokeloContextService.fetchContext', () => {
         content: [
           {
             type: 'text',
-            text: JSON.stringify({ items: [{ id: 'proj-uuid', name: 'Bearly CRM' }] }),
+            text: JSON.stringify({ items: [{ projectId: 'proj-uuid', name: 'Bearly CRM' }] }),
           },
         ],
       },
@@ -264,8 +280,8 @@ describe('PokeloContextService.fetchContext', () => {
             type: 'text',
             text: JSON.stringify({
               items: [
-                { id: 'a', name: 'CRM' },
-                { id: 'b', name: 'Finsly' },
+                { projectId: 'a', name: 'CRM' },
+                { projectId: 'b', name: 'Finsly' },
               ],
             }),
           },
@@ -319,4 +335,33 @@ describe('PokeloContextService.fetchContext', () => {
     const ctx = new PokeloContextService(settings);
     expect(await ctx.fetchContext('pricing')).toBe('');
   });
+
+  it('returns empty string on MCP tool isError instead of using the error as a snippet', async () => {
+    const settings = new PokeloSettingsService(
+      makeMockDb({
+        encryptedToken: encrypt('mcp_tok'),
+        projectIds: ['proj-uuid'],
+        projectId: 'proj-uuid',
+        baseUrl: 'https://rag.bearly.pro/v1',
+      }) as any,
+      makeMockRegistry(true) as any,
+    );
+
+    (global.fetch as jest.Mock).mockResolvedValue({
+      ok: true,
+      headers: { get: () => 'application/json' },
+      text: async () =>
+        JSON.stringify({
+          jsonrpc: '2.0',
+          id: 1,
+          result: {
+            isError: true,
+            content: [{ type: 'text', text: 'Project not found' }],
+          },
+        }),
+    });
+
+    const ctx = new PokeloContextService(settings);
+    expect(await ctx.fetchContext('pricing')).toBe('');
+  });
 });

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Khirby Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.