@infersec/conduit 1.92.1 → 1.92.2

package/dist/cli.js

@@ -112706,6 +112706,88 @@ function requireExpressPromiseRouter () {
 var expressPromiseRouterExports = requireExpressPromiseRouter();
 var createRouter = /*@__PURE__*/getDefaultExportFromCjs(expressPromiseRouterExports);
 
+const SECRET_FLAGS = new Set([
+    "api-key",
+    "auth-token",
+    "hf-token",
+    "key",
+    "password",
+    "secret",
+    "token"
+]);
+function redactSecretArgs(args) {
+    return args.map((arg, index) => {
+        const equalsIndex = arg.indexOf("=");
+        if (arg.startsWith("--") && equalsIndex > 0) {
+            const flag = arg.slice(2, equalsIndex);
+            if (SECRET_FLAGS.has(flag)) {
+                return `${arg.slice(0, equalsIndex + 1)}***`;
+            }
+        }
+        const previous = args[index - 1];
+        if (previous &&
+            previous.startsWith("--") &&
+            !previous.includes("=") &&
+            SECRET_FLAGS.has(previous.slice(2))) {
+            return "***";
+        }
+        return arg;
+    });
+}
+async function createEngineProcess({ args, bin, logger }) {
+    logger.info("Starting engine process", {
+        command: { args: redactSecretArgs(args), bin }
+    });
+    const processManager = new ProcessManager({ args, command: bin });
+    await processManager.start();
+    return processManager;
+}
+
+function parseExtraArgs(extraArgs) {
+    if (!Array.isArray(extraArgs) ||
+        !extraArgs.every((value) => typeof value === "string")) {
+        return [];
+    }
+    return extraArgs.flatMap(tokenizeShellLine);
+}
+function tokenizeShellLine(input) {
+    const tokens = [];
+    let buffer = "";
+    let inQuote = null;
+    let hasBuffer = false;
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index];
+        if (inQuote) {
+            if (char === inQuote) {
+                inQuote = null;
+            }
+            else {
+                buffer += char;
+            }
+            hasBuffer = true;
+        }
+        else if (char === '"' || char === "'") {
+            inQuote = char;
+            hasBuffer = true;
+        }
+        else if (char === " " || char === "\t") {
+            if (hasBuffer) {
+                tokens.push(buffer);
+                buffer = "";
+                hasBuffer = false;
+            }
+        }
+        else {
+            buffer += char;
+            hasBuffer = true;
+        }
+    }
+    if (hasBuffer) {
+        tokens.push(buffer);
+    }
+    return tokens;
+}
+
 const balanced = (a, b, str) => {
     const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
     const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
@@ -121134,22 +121216,14 @@ async function startVLLM({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         args.push("--limit-mm-per-prompt", process.env.VLLM_MM_LIMIT ?? '{"image":5}');
     }
     if (process.env.VLLM_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const processManager = new ProcessManager({
-        command: VLLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: VLLM_EXECUTABLE, logger: this.logger });
 }
 
 // src/lib/cache-management.ts
@@ -122776,16 +122850,8 @@ async function startExllamav3({ enginePort, targetDirectory }) {
     if (gpuSplit) {
         args.push("--gpu-split", gpuSplit);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: EXLLAMAV3_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: EXLLAMAV3_EXECUTABLE, logger: this.logger });
 }
 
 const DEFAULT_LLAMACPP_GPU_LAYERS = 999;
@@ -122861,10 +122927,7 @@ async function startLlamacpp({ enginePort, targetDirectory }) {
     if (mainGpu !== null) {
         args.push("--main-gpu", String(mainGpu));
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         const projector = await findMultimodalProjector({ path: targetDirectory });
         if (projector) {
@@ -122879,12 +122942,7 @@ async function startLlamacpp({ enginePort, targetDirectory }) {
     if (process.env.LLAMACPP_REASONING === "off") {
         args.push("--reasoning", "off");
     }
-    const processManager = new ProcessManager({
-        command: LLAMACPP_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: LLAMACPP_EXECUTABLE, logger: this.logger });
 }
 
 const MLXLM_EXECUTABLE = process.env.MLXLM_EXECUTABLE ?? "python3";
@@ -122915,16 +122973,8 @@ async function startMLXLM({ enginePort, targetDirectory }) {
     if (trustRemoteCode || process.env.MLXLM_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: MLXLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: MLXLM_EXECUTABLE, logger: this.logger });
 }
 
 const SAFE_CHARS = /[a-zA-Z0-9\-_.]/;
@@ -122982,22 +123032,14 @@ async function startSGLang({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         args.push("--limit-mm-per-prompt", process.env.SGLANG_MM_LIMIT ?? '{"image":5}');
     }
     if (process.env.SGLANG_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const processManager = new ProcessManager({
-        command: SGLANG_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: SGLANG_EXECUTABLE, logger: this.logger });
 }
 
 const TRTLLM_EXECUTABLE = process.env.TRTLLM_EXECUTABLE ?? "trtllm-serve";
@@ -123028,16 +123070,8 @@ async function startTensorRTLLM({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: TRTLLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: TRTLLM_EXECUTABLE, logger: this.logger });
 }
 
 const ENGINE_FETCH_TIMEOUT_MS$1 = 7200000;

package/dist/cli.sea.cjs

@@ -112721,6 +112721,88 @@ function requireExpressPromiseRouter () {
 var expressPromiseRouterExports = requireExpressPromiseRouter();
 var createRouter = /*@__PURE__*/getDefaultExportFromCjs(expressPromiseRouterExports);
 
+const SECRET_FLAGS = new Set([
+    "api-key",
+    "auth-token",
+    "hf-token",
+    "key",
+    "password",
+    "secret",
+    "token"
+]);
+function redactSecretArgs(args) {
+    return args.map((arg, index) => {
+        const equalsIndex = arg.indexOf("=");
+        if (arg.startsWith("--") && equalsIndex > 0) {
+            const flag = arg.slice(2, equalsIndex);
+            if (SECRET_FLAGS.has(flag)) {
+                return `${arg.slice(0, equalsIndex + 1)}***`;
+            }
+        }
+        const previous = args[index - 1];
+        if (previous &&
+            previous.startsWith("--") &&
+            !previous.includes("=") &&
+            SECRET_FLAGS.has(previous.slice(2))) {
+            return "***";
+        }
+        return arg;
+    });
+}
+async function createEngineProcess({ args, bin, logger }) {
+    logger.info("Starting engine process", {
+        command: { args: redactSecretArgs(args), bin }
+    });
+    const processManager = new ProcessManager({ args, command: bin });
+    await processManager.start();
+    return processManager;
+}
+
+function parseExtraArgs(extraArgs) {
+    if (!Array.isArray(extraArgs) ||
+        !extraArgs.every((value) => typeof value === "string")) {
+        return [];
+    }
+    return extraArgs.flatMap(tokenizeShellLine);
+}
+function tokenizeShellLine(input) {
+    const tokens = [];
+    let buffer = "";
+    let inQuote = null;
+    let hasBuffer = false;
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index];
+        if (inQuote) {
+            if (char === inQuote) {
+                inQuote = null;
+            }
+            else {
+                buffer += char;
+            }
+            hasBuffer = true;
+        }
+        else if (char === '"' || char === "'") {
+            inQuote = char;
+            hasBuffer = true;
+        }
+        else if (char === " " || char === "\t") {
+            if (hasBuffer) {
+                tokens.push(buffer);
+                buffer = "";
+                hasBuffer = false;
+            }
+        }
+        else {
+            buffer += char;
+            hasBuffer = true;
+        }
+    }
+    if (hasBuffer) {
+        tokens.push(buffer);
+    }
+    return tokens;
+}
+
 const balanced = (a, b, str) => {
     const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
     const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
@@ -121149,22 +121231,14 @@ async function startVLLM({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         args.push("--limit-mm-per-prompt", process.env.VLLM_MM_LIMIT ?? '{"image":5}');
     }
     if (process.env.VLLM_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const processManager = new ProcessManager({
-        command: VLLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: VLLM_EXECUTABLE, logger: this.logger });
 }
 
 // src/lib/cache-management.ts
@@ -122791,16 +122865,8 @@ async function startExllamav3({ enginePort, targetDirectory }) {
     if (gpuSplit) {
         args.push("--gpu-split", gpuSplit);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: EXLLAMAV3_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: EXLLAMAV3_EXECUTABLE, logger: this.logger });
 }
 
 const DEFAULT_LLAMACPP_GPU_LAYERS = 999;
@@ -122876,10 +122942,7 @@ async function startLlamacpp({ enginePort, targetDirectory }) {
     if (mainGpu !== null) {
         args.push("--main-gpu", String(mainGpu));
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         const projector = await findMultimodalProjector({ path: targetDirectory });
         if (projector) {
@@ -122894,12 +122957,7 @@ async function startLlamacpp({ enginePort, targetDirectory }) {
     if (process.env.LLAMACPP_REASONING === "off") {
         args.push("--reasoning", "off");
     }
-    const processManager = new ProcessManager({
-        command: LLAMACPP_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: LLAMACPP_EXECUTABLE, logger: this.logger });
 }
 
 const MLXLM_EXECUTABLE = process.env.MLXLM_EXECUTABLE ?? "python3";
@@ -122930,16 +122988,8 @@ async function startMLXLM({ enginePort, targetDirectory }) {
     if (trustRemoteCode || process.env.MLXLM_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: MLXLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: MLXLM_EXECUTABLE, logger: this.logger });
 }
 
 const SAFE_CHARS = /[a-zA-Z0-9\-_.]/;
@@ -122997,22 +123047,14 @@ async function startSGLang({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
     if (this.model.multimodalEnabled) {
         args.push("--limit-mm-per-prompt", process.env.SGLANG_MM_LIMIT ?? '{"image":5}');
     }
     if (process.env.SGLANG_TRUST_REMOTE_CODE === "true") {
         args.push("--trust-remote-code");
     }
-    const processManager = new ProcessManager({
-        command: SGLANG_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    return createEngineProcess({ args, bin: SGLANG_EXECUTABLE, logger: this.logger });
 }
 
 const TRTLLM_EXECUTABLE = process.env.TRTLLM_EXECUTABLE ?? "trtllm-serve";
@@ -123043,16 +123085,8 @@ async function startTensorRTLLM({ enginePort, targetDirectory }) {
     if (dtype) {
         args.push("--dtype", dtype);
     }
-    const extraArgs = engineConfig?.extraArgs;
-    if (Array.isArray(extraArgs) && extraArgs.every((v) => typeof v === "string")) {
-        args.push(...extraArgs);
-    }
-    const processManager = new ProcessManager({
-        command: TRTLLM_EXECUTABLE,
-        args
-    });
-    await processManager.start();
-    return processManager;
+    args.push(...parseExtraArgs(engineConfig?.extraArgs));
+    return createEngineProcess({ args, bin: TRTLLM_EXECUTABLE, logger: this.logger });
 }
 
 const ENGINE_FETCH_TIMEOUT_MS$1 = 7200000;

package/dist/modelManagement/createEngineProcess.d.ts

@@ -0,0 +1,8 @@
+import type { Logger } from "@infersec/logger";
+import { ProcessManager } from "@infersec/utils";
+export declare function redactSecretArgs(args: Array<string>): Array<string>;
+export declare function createEngineProcess({ args, bin, logger }: {
+    args: Array<string>;
+    bin: string;
+    logger: Logger;
+}): Promise<ProcessManager>;

package/dist/modelManagement/exllamav3/index.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import type { ModelManager } from "../ModelManager.js";
 export declare function startExllamav3(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/dist/modelManagement/extraArgs.d.ts

@@ -0,0 +1 @@
+export declare function parseExtraArgs(extraArgs: unknown): Array<string>;

package/dist/modelManagement/llamacpp.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import { ModelManager } from "./ModelManager.js";
 export declare function startLlamacpp(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/dist/modelManagement/mlxlm.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import type { ModelManager } from "./ModelManager.js";
 export declare function startMLXLM(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/dist/modelManagement/sglang.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import type { ModelManager } from "./ModelManager.js";
 export declare function startSGLang(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/dist/modelManagement/tensorrtllm.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import type { ModelManager } from "./ModelManager.js";
 export declare function startTensorRTLLM(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/dist/modelManagement/vllm.d.ts

@@ -1,4 +1,4 @@
-import { ProcessManager } from "@infersec/utils";
+import type { ProcessManager } from "@infersec/utils";
 import type { ModelManager } from "./ModelManager.js";
 export declare function startVLLM(this: ModelManager, { enginePort, targetDirectory }: {
     enginePort: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infersec/conduit",
   "description": "End user conduit agent for connecting local LLMs to the cloud.",
-  "version": "1.92.1",
+  "version": "1.92.2",
   "bin": {
     "infersec-conduit": "./dist/cli.js"
   },