mcp-for-i 0.1.2 → 0.1.4

package/dist/controlplane/runtimeService.js

@@ -274,14 +274,13 @@ export class RuntimeService {
         return normalizedRoot.includes(marker);
     }
     async scheduleWindowsSelfUpdate(push, action) {
-        const npm = await resolveNpmLaunch();
         const controlPlaneScript = path.join(path.dirname(fileURLToPath(import.meta.url)), "index.js");
         const jobId = `${Date.now()}-${process.pid}`;
         const logPath = path.join(os.tmpdir(), `${PACKAGE_NAME}-${action}-${jobId}.log`);
         const scriptPath = path.join(os.tmpdir(), `${PACKAGE_NAME}-${action}-${jobId}.cmd`);
-        const installCommand = npm.mode === "node-cli"
-            ? `"${process.execPath}" "${npm.path}" install -g ${PACKAGE_NAME}@latest`
-            : `"${npm.path}" install -g ${PACKAGE_NAME}@latest`;
+        const npmCmdPath = path.join(path.dirname(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+        const npmCommand = await pathExists(npmCmdPath) ? `"${npmCmdPath}"` : "npm.cmd";
+        const installCommand = `${npmCommand} install -g ${PACKAGE_NAME}@latest`;
         const script = [
             "@echo off",
             "setlocal",

package/dist/ibmi/client.js

@@ -4,6 +4,7 @@ import path from "path";
 import { Tools } from "./Tools.js";
 import { IBMiContent } from "./IBMiContent.js";
 const LOCALE = "LC_ALL=EN_US.UTF-8";
+const SQL_HEREDOC_TAG = "__MCP_FOR_I_SQL__";
 export class IBMiClient {
     client;
     content;
@@ -110,16 +111,26 @@ export class IBMiClient {
         };
     }
     async runSQL(statements) {
-        const input = Tools.fixSQL(statements, true);
+        const input = Tools.fixSQL(statements, true).trim();
+        if (!input)
+            return [];
         const ccsid = this.config.sqlJobCcsid ?? 1208;
-        const command = `${LOCALE} system "CHGJOB CCSID(${ccsid})" ; ${LOCALE} system "call QSYS/QZDFMDB2 PARM('-d' '-i' '-t')"`;
-        const output = await this.sendCommand({ command, stdin: input, env: { QIBM_PASE_CCSID: String(ccsid) } });
-        if (output.stderr && output.stderr.trim()) {
-            // QZDFMDB2 tends to emit errors in stdout, but keep stderr for debugging
-        }
-        if (output.stdout) {
+        const command = [
+            `system "CHGJOB CCSID(${ccsid})"`,
+            `cat <<'${SQL_HEREDOC_TAG}' | system "call QSYS/QZDFMDB2 PARM('-d' '-i' '-t')"`,
+            input,
+            SQL_HEREDOC_TAG
+        ].join("\n");
+        const output = await this.sendQsh({
+            command,
+            env: { QIBM_PASE_CCSID: String(ccsid) }
+        });
+        if (output.stdout && output.stdout.trim()) {
             return Tools.db2Parse(output.stdout, input);
         }
+        if (hasSqlError(output.stderr || "")) {
+            throw new Tools.SqlError(normalizeSqlError(output.stderr || ""));
+        }
         return [];
     }
     async loadDefaultLibraryList() {
@@ -211,3 +222,13 @@ export class IBMiClient {
         this.remoteFeatures["QZDFMDB2.PGM"] = "/QSYS.LIB/QZDFMDB2.PGM";
     }
 }
+function hasSqlError(stderr) {
+    return /(SQL\d{4}|SQLSTATE|CLI ERROR)/i.test(stderr);
+}
+function normalizeSqlError(stderr) {
+    return stderr
+        .split(/\r?\n/)
+        .map(line => line.trim())
+        .filter(line => line && !line.includes("Object is EN_US.UTF-8"))
+        .join(" ");
+}

package/dist/index.js

@@ -6,7 +6,7 @@ import { getTools, handleTool } from "./mcp/tools.js";
 import { McpContext } from "./mcp/context.js";
 import { log } from "./mcp/logger.js";
 import { validateToolInput } from "./mcp/validation.js";
-const server = new Server({ name: "mcp-for-i", version: "0.1.2" }, { capabilities: { tools: {} } });
+const server = new Server({ name: "mcp-for-i", version: "0.1.4" }, { capabilities: { tools: {} } });
 const ctx = new McpContext();
 const tools = getTools();
 const toolMap = new Map(tools.map(tool => [tool.name, tool]));

package/dist/mcp/tools.js

@@ -2,13 +2,12 @@ import { LocalLanguageActions } from "../ibmi/LocalLanguageActions.js";
 import { CompileTools } from "../ibmi/CompileTools.js";
 import { Search } from "../ibmi/Search.js";
 import { Tools } from "../ibmi/Tools.js";
-import { IBMiClient } from "../ibmi/client.js";
 import { ConnectionService } from "../controlplane/connectionService.js";
 import { log } from "./logger.js";
 import fs from "fs/promises";
 import path from "path";
 export function getTools() {
-    return [
+    const tools = [
         {
             name: "ibmi.connect",
             description: "Connect to a saved IBM i connection by name.",
@@ -563,6 +562,7 @@ export function getTools() {
             inputSchema: { type: "object", properties: {} }
         }
     ];
+    return tools.map(withGuardedApprovalHint);
 }
 export async function handleTool(ctx, name, args) {
     const connections = new ConnectionService(ctx.store);
@@ -685,13 +685,15 @@ export async function handleTool(ctx, name, args) {
         }
         case "ibmi.ifs.write": {
             const conn = ctx.ensureActive(args?.connectionName);
-            enforceWritable(ctx, conn, "ifs.write", args);
+            const op = resolveIfsWriteOperation(args.path);
+            enforceWritable(ctx, conn, op, args);
             await conn.content.writeStreamfileRaw(args.path, args.content);
             return result("OK");
         }
         case "ibmi.ifs.mkdir": {
             const conn = ctx.ensureActive(args?.connectionName);
-            enforceWritable(ctx, conn, "ifs.write", args);
+            const op = resolveIfsWriteOperation(args.path);
+            enforceWritable(ctx, conn, op, args);
             await conn.sendCommand({ command: `mkdir -p ${Tools.escapePath(args.path)}` });
             return result("OK");
         }
@@ -704,7 +706,8 @@ export async function handleTool(ctx, name, args) {
         }
         case "ibmi.ifs.upload": {
             const conn = ctx.ensureActive(args?.connectionName);
-            enforceWritable(ctx, conn, "ifs.write", args);
+            const op = resolveIfsWriteOperation(args.remotePath);
+            enforceWritable(ctx, conn, op, args);
             await conn.client.putFile(args.localPath, args.remotePath);
             return result("OK");
         }
@@ -1125,7 +1128,13 @@ export async function handleTool(ctx, name, args) {
                 cmdResult = await conn.sendQsh({ command, directory: cwd });
             }
             else {
-                cmdResult = await conn.sendQsh({ command: `system \"${IBMiClient.escapeForShell(command)}\"`, directory: cwd });
+                try {
+                    await conn.runSQL(`CALL QSYS2.QCMDEXC(${Tools.sqlString(command)})`);
+                    cmdResult = { code: 0, signal: null, stdout: "", stderr: "", command };
+                }
+                catch (err) {
+                    cmdResult = { code: 1, signal: null, stdout: "", stderr: err?.message || String(err), command };
+                }
             }
             log("info", "audit.cl.run", { connectionName: args?.connectionName || ctx.activeName, environment });
             return json(cmdResult);
@@ -1311,6 +1320,47 @@ function isDeniedByPolicy(policy, operation, args) {
     }
     return false;
 }
+const APPROVAL_HINT_TOOLS = new Set([
+    "ibmi.qsys.members.write",
+    "ibmi.qsys.members.create",
+    "ibmi.qsys.members.rename",
+    "ibmi.qsys.members.delete",
+    "ibmi.qsys.sourcefiles.create",
+    "ibmi.qsys.libraries.create",
+    "ibmi.ifs.write",
+    "ibmi.ifs.mkdir",
+    "ibmi.ifs.delete",
+    "ibmi.ifs.upload",
+    "ibmi.actions.run",
+    "ibmi.profiles.activate",
+    "ibmi.deploy.uploadDirectory",
+    "ibmi.deploy.uploadFiles",
+    "ibmi.deploy.setCcsid",
+    "ibmi.deploy.sync",
+    "ibmi.sql.execute",
+    "ibmi.cl.run"
+]);
+function withGuardedApprovalHint(tool) {
+    if (!APPROVAL_HINT_TOOLS.has(tool.name))
+        return tool;
+    const schema = tool.inputSchema || { type: "object", properties: {} };
+    if (!schema.properties)
+        schema.properties = {};
+    if (!schema.properties.approve) {
+        schema.properties.approve = {
+            type: "boolean",
+            description: "Set true to approve guarded-policy operations."
+        };
+    }
+    return { ...tool, inputSchema: schema };
+}
+function resolveIfsWriteOperation(pathValue) {
+    const target = String(pathValue || "");
+    if (/^\/qsys\.lib\//i.test(target)) {
+        return "qsys.write";
+    }
+    return "ifs.write";
+}
 function parseEvfevent(content) {
     const diagnostics = [];
     for (const rawLine of content.split(/\r?\n/)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-for-i",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": false,
   "description": "Local MCP server and control plane for IBM i workflows",
   "type": "module",
@@ -28,7 +28,7 @@
     "start:controlplane": "node dist/controlplane/index.js",
     "dev": "ts-node src/index.ts",
     "dev:controlplane": "ts-node src/controlplane/index.ts",
-    "test": "npm run build && node --test test/tools.test.mjs test/variables.test.mjs test/validation.test.mjs test/config.migration.test.mjs",
+    "test": "npm run build && node --test test/tools.test.mjs test/variables.test.mjs test/validation.test.mjs test/config.migration.test.mjs test/sql.parse.test.mjs",
     "test:all": "npm run build && node --test test/*.mjs",
     "test:ibmi": "npm run build && node --test test/ibmi.integration.test.mjs",
     "test:mcp": "npm run build && node --test test/mcp.integration.test.mjs"