@sassoftware/sas-score-mcp-serverjs 0.4.1-7 → 1.0.0

package/cli.js

@@ -23,9 +23,11 @@ import readCerts from './src/toolHelpers/readCerts.js';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import os from 'os';
+import setupSkills from './src/setupSkills.js';
 import { parseArgs } from "node:util";
 
 import NodeCache from 'node-cache';
+import { be } from 'zod/locales';
 //import getOpts from './src/toolHelpers/getOpts.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -45,15 +47,40 @@ const args = parseArgs({
       short: 'm',
       description: 'MCP server type (http or stdio)'
     },
+    https: {
+      type: 'boolean',
+      description: 'Use HTTPS for the server (default: FALSE)'
+    },
+    'skills-folder': {
+      type: 'string',
+      short: 'f',
+      description: 'Skills folder name'
+    },
+
     viya: {
       type: 'string',
       short: 'v',
       description: 'Viya server URL'
     },
+    mcphost: {
+      type: 'string',
+      short: 'm',
+      description: 'MCP server host (default: http://localhost:8080)'
+    },
     authflow: {
       type: 'string',
       short: 'a',
-      description: 'Authentication flow (sascli, code, token)'
+      description: 'Authentication flow (sascli, code, token, oauth, oauth,oauthclient)'
+    },
+    clientid: {
+      type: 'string',
+      short: 'c',
+      description: 'Client ID for authentication'
+    },
+    clientsecret: {
+      type: 'string',
+      short: 's',
+      description: 'Client Secret for authentication'
     },
     profile: {
       type: 'string',
@@ -63,10 +90,22 @@ const args = parseArgs({
       type: 'string',
       description: 'SAS CLI config directory'
     },
-    envfile: {
+    casserver: {
+      type: 'string',
+      description: 'CAS server name (default: cas-shared-default)'
+    },
+    computecontext: {
+      type: 'string',
+      description: 'Compute session name or context (default: SAS Job Execution compute context)'
+    },
+    env: {
       type: 'string',
       short: 'e',
-      description: 'Environment file path'
+      description: 'Environment file path (default: .env in current working directory)'
+    },
+    client: {
+      type: 'string',
+      description: 'MCP client name (github, claude...). Defaults to \'github\''
     },
     help: {
       type: 'boolean',
@@ -75,13 +114,9 @@ const args = parseArgs({
     },
     version: {
       type: 'boolean',
-      short: 'v',
       description: 'Show version'
     },
-    'install-skills': {
-      type: 'boolean',
-      description: 'Install bundled skills to ~/.claude/skills/'
-    }
+
   },
   strict: false,
   allowPositionals: false
@@ -90,27 +125,86 @@ const args = parseArgs({
 // Handle help flag
 if (args.values.help) {
   console.error(`
-Usage: sas-score-mcp-serverjs [options]
+                SAS Viya Scoring Expert Agent - Version: ${JSON.parse(pkg).version}
+
+Usage: npx @sassoftware/sas-score-mcp-serverjs@dev [options]
 
 Options:
-  -p, --port <port>           Port to run the server on (default: 8080)
-  -m, --mcptype <type>        MCP server type: http or stdio (default: http)
-  -v, --viya <url>            Viya server URL
-  -a, --authflow <flow>       Authentication flow: sascli, code, or token
-  --profile <name>            SAS CLI profile name
-  --config <path>             SAS CLI config directory
-  -e, --envfile <path>        Environment file path
-  -h, --help                  Show this help message
-  --version                   Show version
-  --install-skills            Install bundled skills to ~/.claude/skills/
+  Minimal options:
+    -v, --viya <url>               Viya server URL
+    -c, --clientid <id>            Client ID for oauth authentication(pkce preferred. default: vscodemcp)
+  
+  MCP server options:
+    -t, --mcptype <type>           MCP server type: http or stdio (default: http)
+    -m, --mcphost <host>           MCP server host - can be remote URL - (default: http://localhost:8080)
+    --client <name>                MCP client name (github, claude...). Defaults to 'github'.Use to install skills
+  Authentication options:
+    -a, --authflow <flow>          Authentication flow: oauth, oauthclient, sascli, code, token(default oauth)
+    -s, --clientsecret <secret>    Client Secret for authentication(if necessary). See clientid option as well.
+    --profile <name>               SAS CLI profile name for sascli flow (default: Default)
+    --config <path>                SAS CLI config directory for sascli flow (default: user home directory)
+
+  Other options:
+    -p, --port <port>              Port to run the server on (default: 8080)
+    --https                        Use HTTPS for the server (default: false)
+    --casserver <name>             CAS server name (default: cas-shared-default)
+    --computecontext <name>        Compute session name or context (default: SAS Job Execution compute context) 
+
+    -e, --envfile <path>           Environment file path
+    -h, --help                     Show this help message
+    --version                      Show version
+  
 
 Environment Variables:
   Use .env file or set environment variables for configuration.
+  A alternative to cmd line arguments, and in some cases required for sensitive information like client secrets.
   See README.md for more information.
   `);
   process.exit(0);
 }
 
+// read env file and then override with command line arguments
+if (args.values.env) {
+  console.error('Working Directory', process.cwd());
+  let envf = process.cwd() + '\\' + args.values.env;
+  //__dirname + '\\.env';
+  console.error('Env file:', envf);
+  if (fs.existsSync(envf)) {
+    console.error(`Loading environment variables from ${envf}...`);
+    let e = iconfig(envf); // avoid dotenv since it writes to console.error
+    console.error('[Note]: Environment variables loaded from .env file...');
+    console.error('Loaded env variables:', e);
+    // dotenvExpand.expand(e);
+  } else {
+    console.error(
+      '[Note]: No env file found, Using default environment variables...'
+    );
+  }
+}
+// Apply command line arguments to override environment variables
+
+process.env.PORT = process.env.PORT || '8080';
+process.env.HTTPS = (args.values.https) ? 'TRUE' : 'FALSE';
+process.env.MCPTYPE = args.values.mcptype || process.env.MCPTYPE || 'http';
+process.env.MCPHOST = args.values.mcphost || process.env.MCPHOST || 'http://localhost:8080';
+process.env.AUTHFLOW = args.values.authflow || process.env.AUTHFLOW || 'oauth';
+process.env.MCPCLIENT = args.values.client || process.env.MCPCLIENT || 'github';
+process.env.VIYA_SERVER = args.values.viya || process.env.VIYA_SERVER || null;
+process.env.CLIENTID = args.values.clientid || process.env.CLIENTID || 'vscodemcp';
+process.env.CLIENTSECRET = args.values.clientsecret || process.env.CLIENTSECRET || null;
+process.env.SAS_CLI_PROFILE = args.values.profile || process.env.SAS_CLI_PROFILE || 'Default';
+process.env.SAS_CLI_CONFIG = args.values.config || process.env.SAS_CLI_CONFIG || process.env.HOME; // default to user home directory
+process.env.CASSERVER = args.values.casserver || process.env.CASSERVER || 'cas-shared-default';
+process.env.COMPUTECONTEXT = args.values.computecontext || process.env.COMPUTECONTEXT || 'SAS Job Execution compute context';
+process.env.APPHOST = 'localhost';
+process.env.CLIENT = args.values.client || process.env.CLIENT || 'github';
+
+
+
+process.env.SAMESITE = 'Lax,secure';
+process.env.APPHOST = '0.0.0.0';
+process.env.APPNAME = 'sas-score-mcp-serverjs';
+
 // Handle version flag
 if (args.values.version) {
   let pkgJson = JSON.parse(pkg);
@@ -118,16 +212,29 @@ if (args.values.version) {
   process.exit(0);
 }
 
-// Handle install-skills flag
-if (args.values['install-skills']) {
-  const skillsSrc = join(__dirname, 'skills');
-  const skillsDest = join(os.homedir(), '.claude', 'skills');
+// copy the skills to  directory based on the client name, so that different MCP clients can have different sets of skills if needed
+// the -client indicates the current mcp client 
+console.error(`[Note] MCP client set to: ${process.env.CLIENT}`);
+
+
+let client = process.env.CLIENT;
+if (client !== 'none') {
+  console.error(`[Note] Setting up skills for client: ${client}...`);
+  setupSkills(client);
+} else {
+  console.error(`[Note] No client specified, skipping skill setup...`);
+}
 
+
+/*
+if (client !== 'none') {
+  let destdir = '.' + client;
+  let skillsDest = join(os.homedir(), destdir,'skills');
+  const skillsSrc = join(__dirname, '.github');
   if (!fs.existsSync(skillsSrc)) {
     console.error('No skills directory found in this package.');
     process.exit(1);
   }
-
   fs.mkdirSync(skillsDest, { recursive: true });
 
   const skills = fs.readdirSync(skillsSrc, { withFileTypes: true })
@@ -135,77 +242,26 @@ if (args.values['install-skills']) {
     .map(d => d.name);
 
   if (skills.length === 0) {
-    console.error('No skills found to install.');
-    process.exit(1);
-  }
-
-  for (const skill of skills) {
-    const src = join(skillsSrc, skill);
-    const dest = join(skillsDest, skill);
-    fs.cpSync(src, dest, { recursive: true });
-    console.error(`  installed: ${skill}`);
-  }
-
-  console.error(`\n${skills.length} skill(s) installed to ${skillsDest}`);
-  console.error('Restart Claude Code to activate the new skills.');
-  process.exit(0);
-}
-
-if (process.env.ENVFILE === 'FALSE') {
-  //use this when using remote mcp server and no .env file is desired
-  console.error('[Note]: Skipping .env file as ENVFILE is set to FALSE...');
-} else {
-  console.error('Working Directory', process.cwd());
-  let envf = process.env.ENVFILE || (process.cwd() + '\\.env');
-  //__dirname + '\\.env';
-  console.error('Env file:', envf); 
-  if (fs.existsSync(envf)) {
-    console.error(`Loading environment variables from ${envf}...`);
-    let e = iconfig(envf); // avoid dotenv since it writes to console.error
-    console.error('[Note]: Environment variables loaded from .env file...');
-    console.error('Loaded env variables:', e);
-    // dotenvExpand.expand(e);
+    console.error('[Note]No skills found to install.');
   } else {
-    console.error(
-      '[Note]: No .env file found, Using default environment variables...'
-    );
-  }
-}
-
-// Apply command line arguments to override environment variables
-if (args.values.port) {
-  process.env.PORT = args.values.port;
-  console.error(`[Note] PORT set from command line: ${args.values.port}`);
-}
-
-if (args.values.mcptype) {
-  process.env.MCPTYPE = args.values.mcptype;
-  console.error(`[Note] MCPTYPE set from command line: ${args.values.mcptype}`);
-}
+    console.error(`Installing ${skills.length} skill(s) to ${skillsDest}...`);
+    for (const skill of skills) {
+      const src = join(skillsSrc, skill);
+      const dest = join(skillsDest, skill);
+      fs.cpSync(src, dest, { recursive: true });
+      console.error(`  installed: ${skill}`);
+    }
+    console.error(`\n installed in cli. ${client}`);
+    console.error(`\n${skills.length} skill(s) installed to ${skillsDest}`);
+    console.error('[Note] Skills are ready for use.');
 
-if (args.values.viya) {
-  process.env.VIYA_SERVER = args.values.viya;
-  console.error(`[Note] VIYA_SERVER set from command line: ${args.values.viya}`);
+  }
 }
+  */
 
-if (args.values.authflow) {
-  process.env.AUTHFLOW = args.values.authflow;
-  console.error(`[Note] AUTHFLOW set from command line: ${args.values.authflow}`);
-}
 
-if (args.values.profile) {
-  process.env.SAS_CLI_PROFILE = args.values.profile;
-  console.error(`[Note] SAS_CLI_PROFILE set from command line: ${args.values.profile}`);
-}
 
-if (args.values.config) {
-  process.env.SAS_CLI_CONFIG = args.values.config;
-  console.error(`[Note] SAS_CLI_CONFIG set from command line: ${args.values.config}`);
-}
 
-if (process.env.APPHOST == null) {
-  process.env.APPHOST = 'localhost';
-} 
 /********************************* */
 const BRAND = 'sas-score'
 /********************************* */
@@ -214,16 +270,16 @@ let version = pkgJson.version;
 let mcpType = process.env.MCPTYPE || 'http';
 console.error(
   `\nStarting MCP ServerJS - Version: ${pkgJson.version} - ${new Date().toISOString()}\n
-     brand: ${process.env.BRAND || BRAND}\n
-     mcpType: ${mcpType}\n
-     viyaServer: ${process.env.VIYA_SERVER}\n`
+     brand: ${process.env.BRAND || BRAND}
+     mcpType: ${mcpType}
+     viyaServer: ${process.env.VIYA_SERVER}`
 );
 // session sessionCache
 // For more robust caching consider products like Redis
 // and storage provided by cloud providers
-console.error(process.env.COMPUTECONTEXT);
+
 debugger;
-let sessionCache = new NodeCache({ stdTTL: 24 *60*60, checkperiod: 2 * 60, useClones: false });
+let sessionCache = new NodeCache({ stdTTL: 24 * 60 * 60, checkperiod: 2 * 60, useClones: false });
 
 //
 // Load environment variables from .env file if present
@@ -231,35 +287,25 @@ let sessionCache = new NodeCache({ stdTTL: 24 *60*60, checkperiod: 2 * 60, useCl
 // stdio: set the env in the mcp config
 // http: use dotenv-cli to load env before starting the mcp server
 
-
-// need to tell core what transport to use(http or stdio)
-
-//  subclasses for sasQuery tool (special use case)
-// to be replaced by the planned adding external tool definition capability
-
-let subclassJson = [];
-if (process.env.SUBCLASS != null) {
-  console.error(`Using subclass: ${process.env.SUBCLASS}`);
-  let subclass = process.env.SUBCLASS;
-  if (fs.existsSync(subclass)) {
-    console.error(`Loading subclass information from ${subclass}...`);
-    let s = fs.readFileSync(subclass, 'utf8');
-    subclassJson = JSON.parse(s);
-    console.error(`Loaded subclass: ${JSON.stringify(subclassJson, null, 2)}`);
-  }
-}
 // setup base appEnv 
 // for stdio this is the _appContext
 // for http each session a copy of this as appEnvTemplate is created in corehttp
 
-// backward compability variables
-let clientID = process.env.CLIENTID || process.env.CLIENTIDPW || null;
-let clientSecret = process.env.CLIENTSECRET || process.env.CLIENTSECRETPW || null;
 let https = process.env.HTTPS != null ? process.env.HTTPS.toUpperCase() : "FALSE";
+let authExternal = false;
+let authFlow = process.env.AUTHFLOW;
+let mcpHost = process.env.MCPHOST;
+
+if (authFlow === 'oauth' || authFlow === 'oauthclient') {
+  authFlow = 'bearer';
+  authExternal = (authFlow === 'oauthclient') ? true : false;
+}
 let autoLogon = process.env.AUTOLOGON != null ? process.env.AUTOLOGON.toUpperCase() : "FALSE";
 const appEnvBase = {
   version: version,
-  mcpType: mcpType, 
+  mcpType: mcpType,
+  mcpClient: process.env.MCPCLIENT || 'github',
+  mcpHost: (process.env.MCPHOST == null) ? 'http://localhost:8080' : process.env.MCPHOST,
   brand: (process.env.BRAND == null) ? BRAND : process.env.BRAND,
   HTTPS: https,
   SAS_CLI_PROFILE: process.env.SAS_CLI_PROFILE || 'Default',
@@ -267,27 +313,25 @@ const appEnvBase = {
   SSLCERT: process.env.SSLCERT || null,
   VIYACERT: process.env.VIYACERT || null,
 
-  AUTHFLOW: process.env.AUTHFLOW || 'sascli',
+  AUTHFLOW: authFlow,
+  AUTHEXTERNAL: authExternal,
+  BEARERTOKEN: null,
   AUTOLOGON: autoLogon,
   VIYA_SERVER: process.env.VIYA_SERVER,
   PORT: process.env.PORT || 8080,
   USERNAME: process.env.USERNAME || null,
   PASSWORD: process.env.PASSWORD || null,
-  CLIENTID: clientID,
-  CLIENTSECRET: clientSecret,
+  CLIENTID: process.env.CLIENTID || null,
+  CLIENTSECRET: process.env.CLIENTSECRET || null,
   PKCE: process.env.PKCE || null,
 
   TOKEN: process.env.TOKEN || null,
   REFRESH_TOKEN: process.env.REFRESH_TOKEN || null,
   TOKENFILE: process.env.TOKENFILE || null,
   TLS_CREATE: process.env.TLS_CREATE || null,
-  SUBCLASS: process.env.SUBCLASS || null,
-  subclassJson: subclassJson,
-  // future use for controlling tool list using env variable
-  toolsets:
-    process.env.TOOLSETS != null
-      ? process.env.TOOLSETS.split(',')
-      : ['default'],
+  CASSERVER: process.env.CASSERVER,
+  COMPUTECONTEXT: process.env.COMPUTECONTEXT,
+
   // command line arguments
   cliArgs: args.values,
   // user defined tools
@@ -307,7 +351,8 @@ const appEnvBase = {
   tlsOpts: null,
   oauthInfo: null,
   contexts: {
-    AUTHFLOW: process.env.AUTHFLOW || 'sascli',
+    AUTHFLOW: authFlow,
+    AUTHEXTERNAL: authExternal,
     host: process.env.VIYA_SERVER,
     APPHOST: process.env.APPHOST || 'localhost',
     APPNAME: process.env.APPNAME || 'sas-score-mcp-serverjs',
@@ -316,8 +361,8 @@ const appEnvBase = {
     store: null, /* for restaf users */
     storeConfig: {},
     oauthInfo: null,
-    CLIENTID: clientID,
-    CLIENTSECRET: clientSecret,
+    CLIENTID: process.env.CLIENTID || null,
+    CLIENTSECRET: process.env.CLIENTSECRET || null,
     pkce: process.env.PKCE || null,
     casSession: null, /* restaf cas session object */
     computeSession: null, /* restaf compute session object */
@@ -332,15 +377,14 @@ const appEnvBase = {
   }
 };
 
-process.env.APPPORT=appEnvBase.PORT;
+process.env.APPPORT = appEnvBase.PORT;
+let useHapi = process.env.USEHAPI === 'TRUE' ? true : false;
+appEnvBase.useHapi = useHapi;
 
 // setup TLS options for viya calls
-console.error('[Note]Viya SSL dir set to: ' + appEnvBase.VIYACERT);
 appEnvBase.contexts.viyaCert = readCerts(appEnvBase.VIYACERT); /* appEnvBase.contexts.viyaCert is set here */
 
 // setup TLS options for app server (expressMcpServer or hapiMcpServer)
-
-console.error('[Note]App SSL dir set to: ' + appEnvBase.SSLCERT);
 appEnvBase.tlsOpts = readCerts(appEnvBase.SSLCERT);
 appEnvBase.contexts.appCert = appEnvBase.tlsOpts; /* just for completeness */
 
@@ -354,7 +398,7 @@ if (appEnvBase.TOKENFILE != null) {
     console.error(`[Note]Loading token from file: ${appEnvBase.TOKENFILE}...`);
     appEnvBase.TOKEN = fs.readFileSync(appEnvBase.TOKENFILE, { encoding: 'utf8' });
     appEnvBase.AUTHFLOW = 'token';
-    appEnvBase.appContexts.logonPayload = {
+    appEnvBase.contexts.logonPayload = {
       host: appEnvBase.VIYA_SERVER,
       authType: 'server',
       token: appEnvBase.TOKEN,
@@ -367,10 +411,6 @@ if (appEnvBase.TOKENFILE != null) {
 }
 
 
-
-// if authflow is cli or code, postpone getting logonPayload until needed
-
-
 // setup mcpServer (both http and stdio use this)
 // this is singleton - best practices recommend this
 
@@ -381,22 +421,64 @@ let appEnvTemplate = Object.assign({}, appEnvBase);
 
 sessionCache.set('appEnvTemplate', appEnvTemplate);
 
+// prime transport cache
 let transports = {
   "dummy": null
 };
 sessionCache.set('transports', transports);
+let tokenlist = {
+  dummy: null
+}
+sessionCache.set('tokenlist', tokenlist);
 
 // set this for stdio transport use
 // dummy sessionId for use in the tools  
-let useHapi = process.env.AUTHFLOW === 'code' ? true : false;
-console.error('[Note] appEnvBase is', JSON.stringify(appEnvBase, null,2));
+
 // creat a dummy sessionId for stdio since there is only one session and transport in that case, and tools need a sessionId to access the appEnvBase and contexts
 let sessionId = randomUUID();
 sessionCache.set(sessionId, appEnvBase);
 sessionCache.set('currentId', sessionId);
-useHapi = false;
-if (mcpType === 'stdio') {
 
+console.error('===================================================================');
+console.error(`MCP ServerJS - Version: ${pkgJson.version} - ${new Date().toISOString()}`);
+console.error(`
+Usage: sas-score-mcp-serverjs [options]
+
+Options:
+  Minimal options:
+    VIYA_SERVER                   ${appEnvBase.VIYA_SERVER}
+    CLIENTID                      ${appEnvBase.CLIENTID}
+
+  MCP server options:
+    MCPTYPE                       ${appEnvBase.mcpType}
+    MCPHOST                       ${appEnvBase.mcpHost}
+    PORT                          ${appEnvBase.PORT}
+    HTTPS                         ${appEnvBase.contexts.HTTPS}
+    CLIENT                        ${appEnvBase.mcpClient}
+
+  Authentication options:
+    AUTHFLOW                      ${process.env.AUTHFLOW}  
+    CLIENTSECRET                  ${appEnvBase.CLIENTSECRET}
+    PROFILE                       ${appEnvBase.SAS_CLI_PROFILE} 
+    CONFIG                        ${appEnvBase.SAS_CLI_CONFIG} 
+
+  Other options:
+    CASSERVER                     ${appEnvBase.CASSERVER} 
+    COMPUTECONTEXT                ${appEnvBase.COMPUTECONTEXT}
+    }
+
+`);
+
+console.error('===================================================================');
+console.error(`
+  [Note] The SAS Viya Scoring Expert agent has been installed successfully.
+    Depending on the client you are using, the agent might not be active
+    If the agent does not appear in the agent dropdown list your options are:
+      - use the /subagent command
+      - exit this app and issue the npx command to restart the server
+      `);
+
+if (mcpType === 'stdio') {
   console.error('[Note] Setting up stdio transport with sessionId:', sessionId);
   console.error('[Note] Used in setting up tools and some persistence(not all).');
   await coreSSE(mcpServer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/sas-score-mcp-serverjs",
-  "version": "0.4.1-7",
+  "version": "1.0.0",
   "description": "A mcp server for SAS Viya",
   "author": "Deva Kumar <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -18,7 +18,8 @@
     "deploy": "bash ./deploy.sh",
     "push2acr": "cd docker && bash ./push2acr.sh",
     "bump": "npm version prerelease",
-    "pub": "npm publish --tag dev --access public"
+    "pub": "npm publish --tag dev --access public",
+    "setup-skills": "node scripts/setup-skills.js"
   },
   "repository": "https://github.com/sassoftware/sas-score-mcp-serverjs",
   "keywords": [
@@ -40,7 +41,8 @@
     "cli.js",
     "openApi.json",
     "openApi.yaml",
-    "skills"
+    "scripts",
+    ".skills"
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -71,7 +73,6 @@
     "@babel/preset-env": "^7.28.5",
     "@types/debug": "^4.1.12",
     "@types/node": "^25.0.3",
-    "npm-check-updates": "^19.2.0",
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   }