mcp-for-i 0.1.13 → 0.3.0

package/dist/ibmi/LocalLanguageActions.js

@@ -1,6 +1,13 @@
+/**
+ * Built-in actions. Streamfile actions compile an IFS source file
+ * (&RELATIVEPATH / &FULLPATH); member actions compile a source member
+ * (&OPENLIB / &OPENSPF / &OPENMBR). Running an action against the other kind
+ * of target is refused.
+ */
 export const LocalLanguageActions = {
     RPGLE: [
         {
+            type: `streamfile`,
             name: `Create RPGLE Program`,
             command: `CRTBNDRPG PGM(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -8,6 +15,7 @@ export const LocalLanguageActions = {
             extensions: [`RPGLE`]
         },
         {
+            type: `streamfile`,
             name: `Create RPGLE Module`,
             command: `CRTRPGMOD MODULE(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -15,6 +23,7 @@ export const LocalLanguageActions = {
             extensions: [`RPGLE`]
         },
         {
+            type: `streamfile`,
             name: `Create SQLRPGLE Program`,
             command: `CRTSQLRPGI OBJ(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) CLOSQLCSR(*ENDMOD) CVTCCSID(*JOB) COMPILEOPT('TGTCCSID(*JOB)') RPGPPOPT(*LVL2)`,
             deployFirst: true,
@@ -22,6 +31,7 @@ export const LocalLanguageActions = {
             extensions: [`SQLRPGLE`]
         },
         {
+            type: `streamfile`,
             name: `Create SQLRPGLE Module`,
             command: `CRTSQLRPGI OBJ(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OBJTYPE(*MODULE) OPTION(*EVENTF) DBGVIEW(*SOURCE) CLOSQLCSR(*ENDMOD) CVTCCSID(*JOB) COMPILEOPT('TGTCCSID(*JOB)') RPGPPOPT(*LVL2)`,
             deployFirst: true,
@@ -31,6 +41,7 @@ export const LocalLanguageActions = {
     ],
     COBOL: [
         {
+            type: `streamfile`,
             name: `Create COBOL Program (SQL)`,
             command: `CRTSQLCBLI OBJ(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) CLOSQLCSR(*ENDMOD) CVTCCSID(*JOB) TOSRCFILE(&CURLIB/QSQLTEMP)`,
             deployFirst: true,
@@ -38,6 +49,7 @@ export const LocalLanguageActions = {
             extensions: [`SQLCBL`, `SQLCBBLE`, `SQLCBLLE`, `COB`, `CBLLE`, `CBL`, `CBBLE`]
         },
         {
+            type: `streamfile`,
             name: `Create COBOL Module (SQL)`,
             command: `CRTSQLCBLI OBJ(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OBJTYPE(*MODULE) OPTION(*EVENTF) DBGVIEW(*SOURCE) CLOSQLCSR(*ENDMOD) CVTCCSID(*JOB) TOSRCFILE(&CURLIB/QSQLTEMP)`,
             deployFirst: true,
@@ -47,6 +59,7 @@ export const LocalLanguageActions = {
     ],
     C: [
         {
+            type: `streamfile`,
             name: `Create C Program`,
             command: `CRTBNDC PGM(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -54,6 +67,7 @@ export const LocalLanguageActions = {
             extensions: [`C`]
         },
         {
+            type: `streamfile`,
             name: `Create C Module`,
             command: `CRTCMOD MODULE(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -63,6 +77,7 @@ export const LocalLanguageActions = {
     ],
     CPP: [
         {
+            type: `streamfile`,
             name: `Create CPP Program`,
             command: `CRTBNDCPP PGM(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -70,6 +85,7 @@ export const LocalLanguageActions = {
             extensions: [`CPP`]
         },
         {
+            type: `streamfile`,
             name: `Create CPP Module`,
             command: `CRTCPPMOD MODULE(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTCCSID(*JOB)`,
             deployFirst: true,
@@ -79,6 +95,7 @@ export const LocalLanguageActions = {
     ],
     CLLE: [
         {
+            type: `streamfile`,
             extensions: [`CLP`, `CLLE`],
             name: `Create Bound CL Program`,
             command: `CRTBNDCL PGM(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
@@ -88,6 +105,7 @@ export const LocalLanguageActions = {
     ],
     CMD: [
         {
+            type: `streamfile`,
             extensions: [`cmd`],
             name: `Create Command`,
             command: `CRTCMD CMD(&CURLIB/&NAME) PGM(&CURLIB/&NAME) SRCSTMF('&RELATIVEPATH') OPTION(*EVENTF)`,
@@ -97,6 +115,7 @@ export const LocalLanguageActions = {
     ],
     SQL: [
         {
+            type: `streamfile`,
             extensions: [`SQL`, `TABLE`, `VIEW`, `SQLPRC`, `SQLUDF`, `SQLUDT`, `SQLTRG`, `SQLALIAS`, `SQLSEQ`],
             name: `Run SQL Statements (RUNSQLSTM)`,
             command: `RUNSQLSTM SRCSTMF('&FULLPATH') COMMIT(*NONE) NAMING(*SQL)`,
@@ -106,11 +125,11 @@ export const LocalLanguageActions = {
     ],
     DSPF: [
         {
+            type: "member",
             name: "Create DSPF",
-            command: "CRTDSPF FILE(&CURLIB/&NAME) SRCFILE(&SRCFILE) RSTDSP(*NO) OPTION(*EVENTF)",
+            command: "CRTDSPF FILE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) RSTDSP(*NO) OPTION(*EVENTF)",
             environment: "ile",
-            deployFirst: true,
-            extensions: ["dspf"]
+            extensions: ["DSPF"]
         }
     ],
     "Service Programs": [
@@ -121,6 +140,7 @@ export const LocalLanguageActions = {
             environment: `ile`
         },
         {
+            type: `streamfile`,
             extensions: ["BND", "BINDER"],
             deployFirst: true,
             name: "Create Service Program (CRTSRVPGM with source)",
@@ -130,6 +150,7 @@ export const LocalLanguageActions = {
     ],
     "GNU Make": [
         {
+            type: `streamfile`,
             extensions: [`GLOBAL`],
             name: `Build all with gmake`,
             command: `/QOpenSys/pkgs/bin/gmake BUILDLIB=&CURLIB ERR=*EVENTF`,
@@ -137,6 +158,7 @@ export const LocalLanguageActions = {
             deployFirst: true
         },
         {
+            type: `streamfile`,
             extensions: [`GLOBAL`],
             name: `Build current with gmake`,
             command: `/QOpenSys/pkgs/bin/gmake &BASENAME BUILDLIB=&CURLIB ERR=*EVENTF`,
@@ -146,6 +168,7 @@ export const LocalLanguageActions = {
     ],
     "The Object Builder for i (TOBi)": [
         {
+            type: `streamfile`,
             extensions: [`GLOBAL`],
             name: `Build all with TOBi`,
             command: `OPT=*EVENTF BUILDLIB=&CURLIB /QOpenSys/pkgs/bin/makei build`,
@@ -154,6 +177,7 @@ export const LocalLanguageActions = {
             postDownload: [".logs", ".evfevent"]
         },
         {
+            type: `streamfile`,
             extensions: [`GLOBAL`],
             name: `Build current with TOBi`,
             command: `OPT=*EVENTF BUILDLIB=&CURLIB /QOpenSys/pkgs/bin/makei compile -f &BASENAME`,
@@ -164,6 +188,7 @@ export const LocalLanguageActions = {
     ],
     "Source Orbit": [
         {
+            type: `streamfile`,
             name: "Build current with Source Orbit",
             command: "so -bf make -s &RELATIVEPATH && /QOpenSys/pkgs/bin/gmake LIBL='&LIBLS' BIN_LIB=&CURLIB OPT=*EVENTF",
             environment: "pase",
@@ -172,6 +197,7 @@ export const LocalLanguageActions = {
             postDownload: [".evfevent/"]
         },
         {
+            type: `streamfile`,
             name: "Build entire project with Source Orbit",
             command: "so -bf make && /QOpenSys/pkgs/bin/gmake LIBL='&LIBLS' BIN_LIB=&CURLIB OPT=*EVENTF",
             environment: "pase",
@@ -179,5 +205,105 @@ export const LocalLanguageActions = {
             extensions: ["GLOBAL"],
             postDownload: [".evfevent/"]
         }
+    ],
+    "Source Members": [
+        {
+            type: `member`,
+            name: `Create Bound RPG Program (CRTBNDRPG)`,
+            command: `CRTBNDRPG PGM(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`RPGLE`, `RPG`]
+        },
+        {
+            type: `member`,
+            name: `Create RPG Module (CRTRPGMOD)`,
+            command: `CRTRPGMOD MODULE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`RPGLE`, `RPG`]
+        },
+        {
+            type: `member`,
+            name: `Create SQL ILE RPG Program (CRTSQLRPGI)`,
+            command: `CRTSQLRPGI OBJ(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) CLOSQLCSR(*ENDMOD) OPTION(*EVENTF) DBGVIEW(*SOURCE) CVTCCSID(*JOB)`,
+            environment: `ile`,
+            extensions: [`SQLRPGLE`]
+        },
+        {
+            type: `member`,
+            name: `Create SQL ILE RPG Module (CRTSQLRPGI)`,
+            command: `CRTSQLRPGI OBJ(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OBJTYPE(*MODULE) CLOSQLCSR(*ENDMOD) OPTION(*EVENTF) DBGVIEW(*SOURCE) CVTCCSID(*JOB)`,
+            environment: `ile`,
+            extensions: [`SQLRPGLE`]
+        },
+        {
+            type: `member`,
+            name: `Create Bound COBOL Program (CRTBNDCBL)`,
+            command: `CRTBNDCBL PGM(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`CBLLE`]
+        },
+        {
+            type: `member`,
+            name: `Create SQL ILE COBOL Program (CRTSQLCBLI)`,
+            command: `CRTSQLCBLI OBJ(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) CLOSQLCSR(*ENDMOD) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`SQLCBLLE`]
+        },
+        {
+            type: `member`,
+            name: `Create Bound C Program (CRTBNDC)`,
+            command: `CRTBNDC PGM(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`C`]
+        },
+        {
+            type: `member`,
+            name: `Create Bound CL Program (CRTBNDCL)`,
+            command: `CRTBNDCL PGM(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`CLLE`]
+        },
+        {
+            type: `member`,
+            name: `Create CL Module (CRTCLMOD)`,
+            command: `CRTCLMOD MODULE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF) DBGVIEW(*SOURCE)`,
+            environment: `ile`,
+            extensions: [`CLLE`]
+        },
+        {
+            type: `member`,
+            name: `Create Command (CRTCMD)`,
+            command: `CRTCMD CMD(&OPENLIB/&OPENMBR) PGM(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF)`,
+            environment: `ile`,
+            extensions: [`CMD`]
+        },
+        {
+            type: `member`,
+            name: `Create Physical File (CRTPF)`,
+            command: `CRTPF FILE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF)`,
+            environment: `ile`,
+            extensions: [`PF`]
+        },
+        {
+            type: `member`,
+            name: `Create Logical File (CRTLF)`,
+            command: `CRTLF FILE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF)`,
+            environment: `ile`,
+            extensions: [`LF`]
+        },
+        {
+            type: `member`,
+            name: `Create Printer File (CRTPRTF)`,
+            command: `CRTPRTF FILE(&OPENLIB/&OPENMBR) SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) OPTION(*EVENTF)`,
+            environment: `ile`,
+            extensions: [`PRTF`]
+        },
+        {
+            type: `member`,
+            name: `Run SQL Statements from member (RUNSQLSTM)`,
+            command: `RUNSQLSTM SRCFILE(&OPENLIB/&OPENSPF) SRCMBR(&OPENMBR) COMMIT(*NONE) NAMING(*SQL)`,
+            environment: `ile`,
+            extensions: [`SQL`]
+        }
     ]
 };

package/dist/ibmi/Search.js

@@ -14,6 +14,12 @@ export var Search;
         };
     }
     async function searchMembers(connection, library, sourceFile, searchTerm, members, readOnly) {
+        return searchMembersTerms(connection, library, sourceFile, [searchTerm], members, readOnly);
+    }
+    Search.searchMembers = searchMembers;
+    Search.MEMBER_SEARCH_DEFAULT_MAX_MATCHES = 100;
+    Search.MEMBER_SEARCH_MAX_MATCHES = 1_000;
+    async function searchMembersTerms(connection, library, sourceFile, searchTerms, members, readOnly, options) {
         const lib = String(library || "").trim().toUpperCase();
         const src = String(sourceFile || "").trim().toUpperCase();
         if (!connection.validQsysName(lib)) {
@@ -22,6 +28,11 @@ export var Search;
         if (!connection.validQsysName(src)) {
             throw new Error(`Invalid source file: ${sourceFile}`);
         }
+        const terms = searchTerms.map(term => String(term || "")).filter(term => term.length > 0);
+        if (terms.length < 1 || terms.length > 20)
+            throw new Error("Provide between 1 and 20 search terms");
+        if (terms.some(term => term.includes("\n") || term.includes("\r")))
+            throw new Error("Search terms may not contain newlines");
         let detailedMembers;
         let memberFilter;
         const pfgrep = connection.remoteFeatures.pfgrep;
@@ -29,42 +40,127 @@ export var Search;
             if (!isSafeMemberToken(members)) {
                 throw new Error(`Invalid members filter: ${members}`);
             }
-            memberFilter = `${members}.MBR`;
+            memberFilter = memberGlobToken(members);
         }
         else if (Array.isArray(members)) {
+            const normalizedMembers = members.map(member => typeof member === "string"
+                ? { library: lib, file: src, name: member, extension: "" }
+                : member);
             if (members.length > 1000) {
-                detailedMembers = members;
+                detailedMembers = normalizedMembers;
                 memberFilter = "*.MBR";
             }
             else {
-                members.forEach(member => {
+                normalizedMembers.forEach(member => {
                     if (!isSafeMemberToken(member.name)) {
                         throw new Error(`Invalid member name in filter: ${member.name}`);
                     }
                 });
-                memberFilter = members.map(member => `${member.name}.MBR`).join(` `);
+                memberFilter = normalizedMembers.map(member => memberGlobToken(member.name)).join(` `);
             }
         }
-        const command = pfgrep
-            ? `${pfgrep} -inHr -F "${sanitizeSearchTerm(searchTerm)}" ${memberFilter}`
-            : `/usr/bin/grep -inHR -F "${sanitizeSearchTerm(searchTerm)}" ${memberFilter}`;
+        // pfgrep only supports after-context (-A); before-context needs grep.
+        const requestedBefore = clampCount(options?.before, 0, 50, 0);
+        const before = pfgrep ? 0 : requestedBefore;
+        const after = clampCount(options?.after, 0, 50, 0);
+        const maxMatches = clampCount(options?.maxMatches, 1, Search.MEMBER_SEARCH_MAX_MATCHES, Search.MEMBER_SEARCH_DEFAULT_MAX_MATCHES);
+        const contextFlags = [
+            before ? `-B ${before}` : "",
+            after ? `-A ${after}` : ""
+        ].filter(Boolean).join(" ");
+        // pfgrep documents -F (literal), -f - (patterns from stdin, one per line),
+        // -m (matches per member), -A (after-context; it has no -B), -n, -H, -i and -r, all with
+        // grep semantics. Patterns go over stdin so terms never reach the shell.
+        // -m stops each member early; one extra match per member reveals whether
+        // the cap cut anything off. The total across members is bounded by head,
+        // which ends the grep as soon as enough lines have been produced.
+        const flags = `-F -m ${maxMatches + 1} -f -`;
+        const modeFlags = options?.caseSensitive ? "-nHr" : "-inHr";
+        const outputLineLimit = (maxMatches + 1) * (before + after + 2);
+        const grep = connection.remoteFeatures.grep || "/usr/bin/grep";
+        const searchCommand = pfgrep
+            ? `${pfgrep} ${modeFlags} ${contextFlags} ${flags} ${memberFilter}`
+            : `${grep} ${options?.caseSensitive ? "-nHR" : "-inHR"} ${contextFlags} ${flags} ${memberFilter}`;
+        const command = `${searchCommand.replace(/\s+/g, " ")} | /QOpenSys/usr/bin/head -n ${outputLineLimit}`;
         const result = await connection.sendCommand({
             command,
-            directory: `/QSYS.LIB/${lib}.LIB/${src}.FILE`
+            directory: `/QSYS.LIB/${lib}.LIB/${src}.FILE`,
+            stdin: terms.join("\n")
         });
-        if (!result.stderr) {
-            let hits = parseGrepOutput(result.stdout || '', readOnly);
-            if (detailedMembers) {
-                hits = hits.filter(hit => {
-                    const hitMember = parseHitPath(hit);
-                    return detailedMembers.some(member => member.name === hitMember.name && member.library === hitMember.library && member.file === hitMember.file);
-                });
+        const stdout = result.stdout || "";
+        if (result.stderr && !stdout.trim()) {
+            throw new Error(result.stderr || "Search failed");
+        }
+        const outputLines = stdout.split("\n").filter(line => line.length > 0);
+        // pfgrep prints after-context lines with ":" like matches, so tell them
+        // apart by whether the line contains one of the (literal) terms.
+        const isMatch = pfgrep && after > 0
+            ? (content) => terms.some(term => options?.caseSensitive ? content.includes(term) : content.toLowerCase().includes(term.toLowerCase()))
+            : undefined;
+        const parsed = parseMemberGrepOutput(stdout, maxMatches, readOnly, isMatch);
+        let hits = parsed.hits;
+        if (detailedMembers) {
+            hits = hits.filter(hit => {
+                const hitMember = parseHitPath(hit);
+                return detailedMembers.some(member => member.name === hitMember.name && member.library === hitMember.library && member.file === hitMember.file);
+            });
+        }
+        const warnings = [];
+        if (pfgrep && requestedBefore > 0)
+            warnings.push("pfgrep does not support before-context lines, so only after-context lines are returned.");
+        if (result.stderr)
+            warnings.push(String(result.stderr).trim());
+        const outputLimited = outputLines.length >= outputLineLimit;
+        const truncated = parsed.truncated || outputLimited;
+        return {
+            term: terms[0],
+            terms,
+            hits,
+            matchCount: parsed.matchCount,
+            maxMatches,
+            truncated,
+            ...(truncated ? { truncatedReason: parsed.truncated ? "max-matches" : "output-limit" } : {}),
+            ...(warnings.length ? { warnings } : {})
+        };
+    }
+    Search.searchMembersTerms = searchMembersTerms;
+    // Parses grep-style output where matching lines use "path:line:text" and
+    // context lines use "path-line-text". Keeps at most maxMatches matches and
+    // the context that belongs to them.
+    function parseMemberGrepOutput(output, maxMatches, readonly, isMatch) {
+        const hits = [];
+        let matchCount = 0;
+        let truncated = false;
+        for (const line of output.split("\n")) {
+            if (!line || line === "--" || line.startsWith("Binary"))
+                continue;
+            const parsed = /^(.*?)([:-])(\d+)\2(.*)$/.exec(line);
+            if (!parsed)
+                continue;
+            const kind = parsed[2] === ":" && (!isMatch || isMatch(parsed[4])) ? "match" : "context";
+            if (kind === "match") {
+                if (matchCount >= maxMatches) {
+                    truncated = true;
+                    break;
+                }
+                matchCount++;
             }
-            return { term: searchTerm, hits };
+            const path = parsed[1];
+            let hit = hits.find(entry => entry.path === path);
+            if (!hit) {
+                hit = { path, lines: [], readonly };
+                hits.push(hit);
+            }
+            hit.lines.push({ number: Number(parsed[3]), content: parsed[4], kind });
         }
-        throw new Error(result.stderr || "Search failed");
+        return { hits, matchCount, truncated };
+    }
+    function clampCount(value, minimum, maximum, fallback) {
+        const parsed = Number(value);
+        if (value === undefined || value === null || !Number.isFinite(parsed))
+            return fallback;
+        return Math.max(minimum, Math.min(maximum, Math.floor(parsed)));
     }
-    Search.searchMembers = searchMembers;
     async function searchIFS(connection, path, searchTerm) {
         const grep = connection.remoteFeatures.grep;
         if (!grep)
@@ -73,13 +169,10 @@ export var Search;
             command: `${grep} -inr -F -f - ${Tools.escapePath(path)}`,
             stdin: searchTerm
         });
-        if (grepRes.code === 0) {
-            return { term: searchTerm, hits: parseGrepOutput(grepRes.stdout) };
-        }
-        // grep returns exit code 1 when no matches are found
-        if (grepRes.code === 1 && !grepRes.stderr) {
-            return { term: searchTerm, hits: [] };
-        }
+        // grep exits 1 when nothing matched and 2 when any file or directory could
+        // not be read, even if other files matched. Keep whatever was printed and
+        // report the problems as warnings instead of discarding every hit.
+        return withIfsWarnings({ term: searchTerm, hits: parseGrepOutput(grepRes.stdout || ""), exitCode: grepRes.code ?? 0 }, grepRes.stderr);
     }
     Search.searchIFS = searchIFS;
     async function findIFS(connection, path, findTerm) {
@@ -89,55 +182,68 @@ export var Search;
         const findRes = await connection.sendCommand({
             command: `${find} ${Tools.escapePath(path)} -type f -iname ${Tools.shellQuote(`*${findTerm}*`)} -print`
         });
-        if (findRes.code === 0) {
-            if (findRes.stdout) {
-                return { term: findTerm, hits: parseFindOutput(findRes.stdout) };
+        // find exits 1 when a single directory is unreadable; the paths it did
+        // print are still valid results.
+        return withIfsWarnings({ term: findTerm, hits: parseFindOutput(findRes.stdout || ""), exitCode: findRes.code ?? 0 }, findRes.stderr);
+    }
+    Search.findIFS = findIFS;
+    const MAX_IFS_WARNINGS = 50;
+    function withIfsWarnings(results, stderr) {
+        const lines = String(stderr || "")
+            .split(/\r?\n/)
+            .map(line => line.trim())
+            .filter(line => line.length > 0);
+        if (lines.length > 0) {
+            const warnings = lines.slice(0, MAX_IFS_WARNINGS);
+            if (lines.length > MAX_IFS_WARNINGS) {
+                warnings.push(`${lines.length - MAX_IFS_WARNINGS} more warning line(s) omitted`);
             }
-            return { term: findTerm, hits: [] };
+            results.warnings = warnings;
         }
+        return results;
     }
-    Search.findIFS = findIFS;
     function parseFindOutput(output, readonly, pathTransformer) {
         const results = [];
-        for (const line of output.split('\n')) {
+        const seen = new Set();
+        for (const rawLine of output.split('\n')) {
+            const line = rawLine.replace(/\r$/, "");
+            if (!line.trim())
+                continue;
             const path = pathTransformer?.(line) || line;
-            results.push(results.find(r => r.path === path) || { path, readonly, lines: [] });
+            if (seen.has(path))
+                continue;
+            seen.add(path);
+            results.push({ path, readonly, lines: [] });
         }
         return results;
     }
     function parseGrepOutput(output, readonly, pathTransformer) {
         const results = [];
         for (const line of output.split('\n')) {
-            if (line && !line.startsWith(`Binary`)) {
-                const parts = line.split(`:`);
-                const path = pathTransformer?.(parts[0]) || parts[0];
+            if (line && line !== "--" && !line.startsWith(`Binary`)) {
+                const parsed = /^(.*?)([:-])(\d+)\2(.*)$/.exec(line);
+                if (!parsed)
+                    continue;
+                const path = pathTransformer?.(parsed[1]) || parsed[1];
                 let result = results.find(r => r.path === path);
                 if (!result) {
                     result = { path, lines: [], readonly };
                     results.push(result);
                 }
-                const contentIndex = nthIndex(line, `:`, 2);
-                if (contentIndex >= 0) {
-                    const curContent = line.substring(contentIndex + 1);
-                    result.lines.push({ number: Number(parts[1]), content: curContent });
-                }
+                result.lines.push({ number: Number(parsed[3]), content: parsed[4] });
             }
         }
         return results;
     }
-    function sanitizeSearchTerm(searchTerm) {
-        return searchTerm.replace(/\\/g, `\\\\`).replace(/"/g, `\\"`);
-    }
     function isSafeMemberToken(name) {
-        return /^[A-Za-z0-9_*#]+$/.test(name);
+        // IBM i names may contain $, # and @ (and . or _ after the first
+        // character); '*' is kept for generic filters such as ABC*.
+        return /^[A-Za-z0-9_.*#@$]{1,11}$/.test(name);
     }
-    function nthIndex(aString, pattern, n) {
-        let index = -1;
-        while (n-- && index++ < aString.length) {
-            index = aString.indexOf(pattern, index);
-            if (index < 0)
-                break;
-        }
-        return index;
+    // Builds the shell word for a member glob. A leading '#' would start a shell
+    // comment and '$' would expand a variable, so both are escaped; '*' stays
+    // unescaped so generic names still expand.
+    function memberGlobToken(name) {
+        return `${name.replace(/[#$]/g, c => `\\${c}`)}.MBR`;
     }
 })(Search || (Search = {}));

package/dist/ibmi/Tools.js

@@ -1,4 +1,5 @@
 import path from "path";
+import { rewriteSqlForQzdfmdb2 } from "./sqlParse.js";
 export var Tools;
 (function (Tools) {
     class SqlError extends Error {
@@ -185,17 +186,13 @@ export var Tools;
         return { library: parts[0], name: parts[1] };
     }
     Tools.parseQSysPath = parseQSysPath;
+    /**
+     * Prepares SQL for QZDFMDB2: lines starting with `@` become QCMDEXC calls and,
+     * with removeComments, `--` comments are dropped. Quote-aware: `--` inside a
+     * string literal, delimited identifier or block comment is kept.
+     */
     function fixSQL(statement, removeComments = false) {
-        let statements = statement.split("\n").map(line => {
-            if (line.startsWith('@')) {
-                line = `Call QSYS2.QCMDEXC('${line.substring(1, line.endsWith(";") ? line.length - 1 : undefined).replaceAll("'", "''")}');`;
-            }
-            return line.replaceAll("--", "\n--");
-        }).join(`\n`);
-        if (removeComments) {
-            statements = statements.split(`\n`).filter(l => !l.trim().startsWith(`--`)).join(`\n`);
-        }
-        return statements;
+        return rewriteSqlForQzdfmdb2(statement, removeComments);
     }
     Tools.fixSQL = fixSQL;
     function upperCaseName(value) {