@sassoftware/sas-score-mcp-serverjs 1.0.1-9 → 1.1.2

package/src/toolSet/readTable.js

@@ -1,63 +1,80 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { z } from 'zod';
-import debug from 'debug';
-
-import _readTable from  '../toolHelpers/_readTable.js';
-function readTable(_appContext) {
-   
-     let describe = `
-read-table — retrieve rows from a table in a CAS or SAS library.
-
-USE when: read table, show rows, read from library, filtered data with WHERE
-DO NOT USE for: list tables, table structure (use table-info), SQL queries (use sas-query), SAS programs
-
-PARAMETERS
-- table: string — table name (required)
-- lib: string — caslib or libref (required)
-- server: string (default: 'cas') — 'cas' or 'sas'
-- start: number (default: 1) — 1-based row index
-- limit: number (default: 10) — max rows (1-1000)
-- where: string — SQL WHERE clause filter
-- format: boolean (default: true) — formatted or raw values
-
-ROUTING RULES
-- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
-- "show 25 rows from customers" → { table: "customers", lib: "<lib>", limit: 25, start: 1 }
-- "read from mylib.orders where status='shipped'" → { table: "orders", lib: "mylib", where: "status='shipped'", start: 1, limit: 10 }
-
-EXAMPLES
-- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
-- "show 25 rows from customers" → { table: "customers", lib: "mylib", limit: 25, start: 1 }
-
-NEGATIVE EXAMPLES (do not route here)
-- "list tables in Samples" (use list-tables)
-- "what columns are in cars" (use table-info)
-- "execute SQL query" (use sas-query)
-- "run SAS code" (use run-sas-program)
-
-ERRORS
-Returns rows array, total count, filtered_count, columns metadata. Empty array if no matches.
-  `;
-  
-    let  specs = {
-      name: 'read-table',
-      description: describe,
-      inputSchema: z.object({
-        table: z.string(),
-        lib: z.string().optional(),
-        start: z.number().optional(),
-        limit: z.number().optional(),
-        server: z.string().optional(),
-        where: z.string().optional()
-      }),
-    handler: async (params) => {
-        let r = await _readTable(params,'query');
-        return r;
-      }
-    }
-    return specs;
-}
-export default readTable;
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import debug from 'debug';
+
+import _readTable from  '../toolHelpers/_readTable.js';
+function readTable(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+     let describe = isAgent ? `
+read-table — read rows from a CAS or SAS table.
+PARAMS: lib (string, required), table (string, required), server ('cas'|'sas', required), where (string, optional filter), start (number, default 1), limit (number, default 10)
+RETURNS: array of row objects
+` : `
+read-table -  retrieve rows from a table in a CAS or SAS library.
+
+USE when: read table, show rows, read from library, filtered data with WHERE
+DO NOT USE for: list tables, table structure (use table-describe), SQL queries (use sas-query), SAS programs
+
+PARAMETERS
+- table: string — table name (required)
+- lib: string — caslib or libref (required)
+- server: string (default: 'cas') — 'cas' or 'sas'
+- start: number (default: 1) — 1-based row index
+- limit: number (default: 10) — max rows (1-1000)
+- where: string — SQL WHERE clause filter
+- format: boolean (default: true) — formatted or raw values
+
+PARSING ROWS FROM USER INPUT
+"first N rows/records"        → start: 1, limit: N   ("first" = count from beginning, never an offset)
+"top N rows"                  → start: 1, limit: N
+"N rows" / "N records"        → start: 1, limit: N
+"read N rows from lib.table"  → lib: "lib", table: "table", start: 1, limit: N
+"rows N to M"                 → start: N, limit: M-N+1
+"starting from row N"         → start: N, limit: 10 (default)
+(no count specified)          → start: 1, limit: 10 (default)
+
+DOTTED FORMAT: "lib.table" → lib: "lib", table: "table" (split on first dot)
+
+ROUTING RULES
+- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
+- "show 25 rows from customers" → { table: "customers", lib: "<lib>", limit: 25, start: 1 }
+- "read from mylib.orders where status='shipped'" → { table: "orders", lib: "mylib", where: "status='shipped'", start: 1, limit: 10 }
+
+EXAMPLES
+- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
+- "show 25 rows from customers" → { table: "customers", lib: "mylib", limit: 25, start: 1 }
+
+NEGATIVE EXAMPLES (do not route here)
+- "list tables in Samples" (use list-tables)
+- "what columns are in cars" (use table-describe)
+- "execute SQL query" (use sas-query)
+- "run SAS code" (use program-score)
+
+ERRORS
+Returns rows array, total count, filtered_count, columns metadata. Empty array if no matches.
+  `;
+  
+    let  specs = {
+      name: 'read-table',
+      description: describe,
+      inputSchema: z.object({
+        table: z.string().min(1),
+        lib: z.string().min(1).optional(),
+        start: z.number().int().min(1).optional(),
+        limit: z.number().int().min(1).max(1000).optional(),
+        server: z.enum(['cas', 'sas']).optional(),
+        where: z.string().min(1).optional()
+      }),
+    handler: async (params) => {
+        let r = await _readTable(params,'query');
+        return r;
+      }
+    }
+    return specs;
+}
+export default readTable;
+

package/src/toolSet/sasQuery.js

@@ -1,77 +1,83 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import {z} from 'zod';
-import _jobSubmit from '../toolHelpers/_jobSubmit.js';
-
-function sasQuery() {
- 
-    let description = `
-sas-query — convert natural language questions into SQL queries and execute them.
-
-USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
-DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-info), SAS programs (use run-sas-program), jobs/jobdefs
-
-PARAMETERS
-- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
-- query: string — natural language question (required)
-- sql: string — pre-generated SQL SELECT (optional, LLM generates)
-- job: string (default: 'program') — job name to execute
-
-ROUTING RULES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
-
-EXAMPLES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "read table cars" (use read-table)
-- "show 10 rows" (use read-table)
-- "table structure" (use table-info)
-- "run SAS code" (use run-sas-program)
-- "run job/macro" (use run-job/run-macro)
-
-ERRORS
-Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
-  `;
-
-
-    let spec = {
-    name: 'sas-query',
-    description: description,
-        inputSchema: z.object({
-      query: z.string(),
-      table: z.string(),
-      sql: z.string().optional()
-    }),
-    handler: async (params) => {
-            let {table,query, sql, job, _appContext} = params;
-            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
-            
-            let iparams = {
-                scenario: {
-                    table: table,
-                    prompt: query,
-                    sql: sqlinput
-                },
-                name: (job == null) ? 'program' : job,
-                type: 'job',
-                query: true,
-                _appContext: _appContext
-            };
-            if (sql == null || sql.trim().length === 0) {
-                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
-            }
-         
-            let r = await _jobSubmit(iparams);
-            return r;
-            
-           }
-        }
-    return spec;
-}
-export default sasQuery;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {z} from 'zod';
+import _jobSubmit from '../toolHelpers/_jobSubmit.js';
+
+function sasQuery(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+    let description = isAgent ? `
+sas-query — run a SQL aggregation query against a table.
+PARAMS: table (string as lib.table, required), query (string, SQL WHERE/aggregation clause, required)
+RETURNS: aggregated query result rows
+` : `
+sas-query -  convert natural language questions into SQL queries and execute them.
+
+USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
+DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-describe), SAS programs (use program-score), jobs/jobdefs
+
+PARAMETERS
+- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
+- query: string — natural language question (required)
+- sql: string — pre-generated SQL SELECT (optional, LLM generates)
+- job: string (default: 'program') — job name to execute
+
+ROUTING RULES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
+
+EXAMPLES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "read table cars" (use read-table)
+- "show 10 rows" (use read-table)
+- "table structure" (use table-describe)
+- "run SAS code" (use program-score)
+- "score job/macro" (use job-score/macro-score)
+
+ERRORS
+Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
+  `;
+
+
+    let spec = {
+    name: 'sas-query',
+    description: description,
+        inputSchema: z.object({
+      query: z.string(),
+      table: z.string(),
+      sql: z.string().optional()
+    }),
+    handler: async (params) => {
+            let {table,query, sql, job, _appContext} = params;
+            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
+            
+            let iparams = {
+                scenario: {
+                    table: table,
+                    prompt: query,
+                    sql: sqlinput
+                },
+                name: (job == null) ? 'program' : job,
+                type: 'job',
+                query: true,
+                _appContext: _appContext
+            };
+            if (sql == null || sql.trim().length === 0) {
+                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
+            }
+         
+            let r = await _jobSubmit(iparams);
+            return r;
+            
+           }
+        }
+    return spec;
+}
+export default sasQuery;
+
+

package/src/toolSet/scrDescribe.js

@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _scrDescribe from '../toolHelpers/_scrDescribe.js';
+
+function scrDescribe(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+scr-describe — return input/output schema for a SCR model.
+PARAMS: intent ('describe', required), name (string, required)
+RETURNS: input/output schema and model metadata
+` : `
+scr-describe -  return the input/output schema and metadata for an SCR (Score Code Runtime) model.
+
+Inputs
+- intent: must be 'describe' — only pass if user explicitly asked to describe/inspect an SCR model. Do NOT use for find or verify existence.
+- name (string): The SCR model identifier.
+What it returns
+- A JSON object describing the model's interface, typically including:
+  - Input variables (names, types, required/optional)
+  - Output variables (predictions, probabilities, scores)
+
+
+Usage notes
+- Ensure network connectivity and credentials for the remote SCR service when needed.
+- Use scr-score to score data after inspecting the schema.
+
+Examples
+- describe scr model "loan"
+- info for scr model "loan"
+`;
+
+  let spec = {
+    name: 'scr-describe',
+    description: description,
+    inputSchema: z.object({
+      intent: z.literal('describe'),
+      name: z.string()
+    }),
+    handler: async (params) => {
+      const { intent, name, _appContext } = params;
+      if (name === null) {
+        return { status: { statusCode: 2, msg: `SCR model ${name} not found` }, results: {} };
+      }
+      let r = await _scrDescribe({name, _appContext});
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default scrDescribe;

package/src/toolSet/scrScore.js

@@ -1,70 +1,63 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _scrScore from '../toolHelpers/_scrScore.js';
-
-function scrScore(_appContext) {
-  let description = `
-## scr-score
-
-Purpose
-Score a scenario using a model deployed as a SCR container  in Azure or another host).
-
-Inputs
-- url (string, required): SCR model identifier (URL)
-- scenario (string | object | array, optional): Input values to score. Accepts:
-  - a comma-separated key=value string (e.g. "x=1, y=2"),
-  - a JSON object with field names and values (recommended for typed inputs),
-  - an array of objects for batch scoring. If omitted, the tool will return the model's input variable definitions.
-
-What it returns
-- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
-- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
-
-Usage notes
-- Run \`scr-info\` first to inspect the expected input variables and types.
-- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
-- Ensure network connectivity and any required credentials for the target SCR service.
-
-Examples
-- scrScore with url="loan" and scenario="age=45, income=60000"
-- scrScore with url="https://scr-host/models/loan" and scenario={age:45, income:60000}
-`;
-
-  let spec = {
-    name: 'scr-score',
-    description: description,
-    inputSchema: z.object({
-      url: z.string(),
-      scenario: z.string().optional()
-    }),
-    
-    handler: async (params) => {
-      let {url, scenario,_appContext} = params;
-  
-      if (url === null) {
-        return { status: { statusCode: 2, msg: `SCR model ${url} was not specified` }, results: {} };
-      }
-
-      // Normalize simple string scenarios like "x=1, y=2" into an object
-      if (typeof scenario === 'string' && scenario.includes('=')) {
-        scenario = scenario.split(',').reduce((acc, pair) => {
-          const [k, ...rest] = pair.split('=');
-          if (!k) return acc;
-          acc[k.trim()] = rest.join('=').trim();
-          return acc;
-        }, {});
-      }
-
-      let r = await _scrScore({ url: url, scenario: scenario , _appContext: _appContext});
-      return r;
-    }
-  }
-
-  return spec;
-}
-
-export default scrScore;
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _scrScore from '../toolHelpers/_scrScore.js';
+
+function scrScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+scr-score — score a scenario using a SCR model endpoint.
+PARAMS: name (string, required), scenario (object, optional)
+RETURNS: SCR endpoint response with predictions merged with inputs
+` : `
+scr-score -  score a scenario using a model deployed as a SCR container in Azure or another host.
+
+Inputs
+- name (string, required): SCR model identifier (URL)
+- scenario (object, optional): Input values to score as a JSON object (e.g. {age:45, income:60000}). If omitted, defaults to {} and the tool will return the model's input variable definitions.
+
+What it returns
+- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
+- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
+
+Usage notes
+- Run \`scr-describe\` first to inspect the expected input variables and types.
+- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
+- Ensure network connectivity and any required credentials for the target SCR service.
+
+Examples
+- scrScore with name="loan" and scenario={age:45, income:60000}
+`;
+
+  let spec = {
+    name: 'scr-score',
+    description: description,
+    inputSchema: z.object({
+      name: z.string(),
+      scenario: z.union([z.record(z.any()), z.string()]).optional()
+    }),
+    
+    handler: async (params) => {
+      let {name, _appContext} = params;
+      let scenario = params.scenario;
+      if (typeof scenario === 'string') {
+        try { scenario = JSON.parse(scenario); } catch { scenario = {}; }
+      }
+      if (name === null) {
+        return { status: { statusCode: 2, msg: `SCR model ${name} was not specified` }, results: {} };
+      }
+
+      const scenarioObj = (scenario != null && typeof scenario === 'object') ? scenario : {};
+
+      let r = await _scrScore({ name: name, scenario: scenarioObj, _appContext: _appContext});
+      return r;
+    }
+  }
+
+  return spec;
+}
+
+export default scrScore;

package/src/toolSet/searchAssets.js

@@ -11,7 +11,7 @@ function searchAssets(_appContext) {
   const log = debug('tools');
 
   let description = `
-## searchAssets: Search the SAS Catalog for assets using a flexible search string.
+search-assets -  Search the SAS Catalog for assets using a flexible search string.
 
 - Supports searching for various asset types (e.g., datasets, dataflows, models).
  - the default asset type is 'datasets'.