@rsconcept/rstool 1.7.1 → 2.0.0

package/src/wrapper/stdio-handler.test.ts

@@ -98,4 +98,47 @@ describe('handleStdioRequest', () => {
     expect((all.result as unknown[]).length).toBeGreaterThan(0);
     expect(filtered.result).toEqual(all.result);
   });
+
+  it('filters diagnostics by flat kind and severity params', async () => {
+    const sessionTool = new RSToolAgent();
+    const created = await handleStdioRequest(sessionTool, { id: 30, method: 'createSession' });
+    const sessionId = (created.result as { sessionId: string }).sessionId;
+    // X1 without convention → schema diagnostic; D1 with broken formula → expression diagnostic
+    await handleStdioRequest(sessionTool, {
+      id: 31,
+      method: 'applySchemaPatch',
+      params: {
+        sessionId,
+        mode: 'best_effort',
+        items: [{ alias: 'X1' }, { alias: 'D1', definitionFormal: 'Pr1(' }]
+      }
+    });
+
+    const all = await handleStdioRequest(sessionTool, { id: 32, method: 'listDiagnostics', params: { sessionId } });
+    const kinds = new Set((all.result as { kind: string }[]).map(item => item.kind));
+    expect(kinds.has('schema')).toBe(true);
+    expect(kinds.has('expression')).toBe(true);
+
+    const schemaOnly = await handleStdioRequest(sessionTool, {
+      id: 33,
+      method: 'listDiagnostics',
+      params: { sessionId, kind: 'schema' }
+    });
+    expect((schemaOnly.result as { kind: string }[]).every(item => item.kind === 'schema')).toBe(true);
+    expect((schemaOnly.result as unknown[]).length).toBeLessThan((all.result as unknown[]).length);
+
+    const warningsOnly = await handleStdioRequest(sessionTool, {
+      id: 34,
+      method: 'listDiagnostics',
+      params: { sessionId, severity: 'warning' }
+    });
+    expect((warningsOnly.result as { severity: string }[]).every(item => item.severity === 'warning')).toBe(true);
+
+    const legacy = await handleStdioRequest(sessionTool, {
+      id: 35,
+      method: 'listDiagnostics',
+      params: { sessionId, filters: { kind: 'schema' } }
+    });
+    expect(legacy.result).toEqual(schemaOnly.result);
+  });
 });

package/src/wrapper/stdio-handler.ts

@@ -1,3 +1,4 @@
+import type { ListDiagnosticsFilters } from '../models/diagnostic';
 import type { RSToolAgent } from '../models/rstool-agent';
 
 export interface StdioRequest {
@@ -63,6 +64,22 @@ function omitSessionId(input: Record<string, unknown>): Record<string, unknown>
   return rest;
 }
 
+/** Flat `constituentId` / `kind` / `severity` params; legacy nested `filters` object is still accepted. */
+function diagnosticsFilters(input: Record<string, unknown>): ListDiagnosticsFilters | undefined {
+  const source = { ...asObject(input.filters), ...omitSessionId(input) };
+  const filters: ListDiagnosticsFilters = {};
+  if (typeof source.constituentId === 'number') {
+    filters.constituentId = source.constituentId;
+  }
+  if (source.kind === 'expression' || source.kind === 'schema' || source.kind === 'model') {
+    filters.kind = source.kind;
+  }
+  if (source.severity === 'error' || source.severity === 'warning') {
+    filters.severity = source.severity;
+  }
+  return Object.keys(filters).length > 0 ? filters : undefined;
+}
+
 export async function handleStdioRequest(tool: RSToolAgent, request: StdioRequest): Promise<StdioResponse> {
   try {
     const params = asObject(request.params);
@@ -110,15 +127,12 @@ export async function handleStdioRequest(tool: RSToolAgent, request: StdioReques
             optionalSessionId(params)
           )
         };
-      case 'listDiagnostics': {
-        const constituentId = params.constituentId;
-        const filters = typeof constituentId === 'number' ? { constituentId } : (params.filters as never);
+      case 'listDiagnostics':
         return {
           id: request.id,
           ok: true,
-          result: tool.listDiagnostics(filters, optionalSessionId(params))
+          result: tool.listDiagnostics(diagnosticsFilters(params), optionalSessionId(params))
         };
-      }
       case 'analyzeExpression':
         return {
           id: request.id,