@deephaven-enterprise/query-utils 2026.1.40 → 2026.1.42

package/dist/ArgumentUtils.d.ts

@@ -11,3 +11,40 @@
  * @returns An array of tokens. Returns an empty array for empty/whitespace input.
  */
 export declare function tokenizeArgs(args: string): string[];
+/**
+ * Joins a flat alternating key/value array into a space-separated
+ * `KEY=VALUE` string. Values are shell-quoted as needed so the output can be
+ * round-tripped back through {@link splitEnvVarEntries}.
+ *
+ * @param entries Flat alternating array: `["KEY1", "VALUE1", "KEY2", "VALUE2", …]`
+ * @returns Shell-safe string: `"KEY1=VALUE1 KEY2='value with spaces'"`
+ */
+export declare function joinEnvVarEntries(entries: string[]): string;
+/**
+ * Parses a space-separated `KEY=VALUE` string into a flat alternating
+ * key/value array. Uses shell quoting rules so that quoted spans are
+ * stripped and values may contain spaces or `=` signs (e.g.
+ * `MY_VAR="value=with spaces"` → `["MY_VAR", "value=with spaces"]`).
+ * Each token must have a non-empty key; tokens with an empty key or shell
+ * operators throw an error.
+ *
+ * @param envVars Space-separated `KEY=VALUE` string.
+ * @returns Flat alternating array: `["KEY1", "VALUE1", "KEY2", "VALUE2", …]`
+ * @throws {Error} If any token has an empty key or is a shell operator/glob.
+ */
+export declare function splitEnvVarEntries(envVars: string): string[];
+/**
+ * Joins an array of classpath entries into a colon-separated string.
+ *
+ * @param entries Array of classpath entries, one path per element.
+ * @returns Colon-separated string: `"path1:path2:path3"`
+ */
+export declare function joinClasspathAdditions(entries: string[]): string;
+/**
+ * Splits a colon-separated classpath string into an array of entries,
+ * filtering out any empty segments.
+ *
+ * @param classpaths Colon-separated string: `"path1:path2:path3"`
+ * @returns Array of classpath entries, one path per element.
+ */
+export declare function splitClasspathAdditions(classpaths: string): string[];

package/dist/ArgumentUtils.js

@@ -1,3 +1,4 @@
+import ShellQuote from 'shell-quote';
 /**
  * Tokenizes a string of arguments by whitespace, respecting quoted spans.
  * Whitespace that appears inside `"..."` or `'...'` is treated as a literal
@@ -10,8 +11,77 @@
  * @param args The argument string to tokenize (e.g. JVM args or env vars).
  * @returns An array of tokens. Returns an empty array for empty/whitespace input.
  */
-// eslint-disable-next-line import/prefer-default-export
 export function tokenizeArgs(args) {
     var _a;
     return (_a = args.match(/(?:[^\s"']+|"[^"]*"|'[^']*'|["'])+/g)) !== null && _a !== void 0 ? _a : [];
 }
+/**
+ * Joins a flat alternating key/value array into a space-separated
+ * `KEY=VALUE` string. Values are shell-quoted as needed so the output can be
+ * round-tripped back through {@link splitEnvVarEntries}.
+ *
+ * @param entries Flat alternating array: `["KEY1", "VALUE1", "KEY2", "VALUE2", …]`
+ * @returns Shell-safe string: `"KEY1=VALUE1 KEY2='value with spaces'"`
+ */
+export function joinEnvVarEntries(entries) {
+    const pairs = [];
+    for (let i = 0; i + 1 < entries.length; i += 2) {
+        const key = entries[i];
+        const value = entries[i + 1];
+        const quotedValue = ShellQuote.quote([value]);
+        pairs.push(`${key}=${quotedValue}`);
+    }
+    return pairs.join(' ');
+}
+/**
+ * Parses a space-separated `KEY=VALUE` string into a flat alternating
+ * key/value array. Uses shell quoting rules so that quoted spans are
+ * stripped and values may contain spaces or `=` signs (e.g.
+ * `MY_VAR="value=with spaces"` → `["MY_VAR", "value=with spaces"]`).
+ * Each token must have a non-empty key; tokens with an empty key or shell
+ * operators throw an error.
+ *
+ * @param envVars Space-separated `KEY=VALUE` string.
+ * @returns Flat alternating array: `["KEY1", "VALUE1", "KEY2", "VALUE2", …]`
+ * @throws {Error} If any token has an empty key or is a shell operator/glob.
+ */
+export function splitEnvVarEntries(envVars) {
+    const parsed = ShellQuote.parse(envVars);
+    const entries = [];
+    for (let i = 0; i < parsed.length; i += 1) {
+        const token = parsed[i];
+        if (typeof token !== 'string') {
+            throw new Error(`Invalid environment variable entry: "${JSON.stringify(token)}"`);
+        }
+        const eqIndex = token.indexOf('=');
+        if (eqIndex === 0) {
+            throw new Error(`Invalid environment variable entry: "${token}"`);
+        }
+        if (eqIndex === -1) {
+            entries.push(token, '');
+        }
+        else {
+            entries.push(token.slice(0, eqIndex), token.slice(eqIndex + 1));
+        }
+    }
+    return entries;
+}
+/**
+ * Joins an array of classpath entries into a colon-separated string.
+ *
+ * @param entries Array of classpath entries, one path per element.
+ * @returns Colon-separated string: `"path1:path2:path3"`
+ */
+export function joinClasspathAdditions(entries) {
+    return entries.join(':');
+}
+/**
+ * Splits a colon-separated classpath string into an array of entries,
+ * filtering out any empty segments.
+ *
+ * @param classpaths Colon-separated string: `"path1:path2:path3"`
+ * @returns Array of classpath entries, one path per element.
+ */
+export function splitClasspathAdditions(classpaths) {
+    return classpaths.split(':').filter(Boolean);
+}

package/dist/DraftQuery.d.ts

@@ -26,6 +26,7 @@ export type DraftQueryConstructorObject = Partial<IDraftQuery> & Pick<IDraftQuer
  * A Draft Query is a client side object that contains mutable data for a Peristent Query along with some metadata.
  */
 export declare class DraftQuery implements IDraftQuery {
+    #private;
     static NO_SERIAL: null;
     static INVALID_SCRIPT_PATH: string;
     static RESTART_MODE: Readonly<{
@@ -40,11 +41,14 @@ export declare class DraftQuery implements IDraftQuery {
         readonly TYPE: "type";
         readonly ENABLED: "enabled";
         readonly ENABLED_GC_LOGS: "enableGcLogs";
+        /** @deprecated Use ENV_VAR_ENTRIES */
         readonly ENV_VARS: "envVars";
         readonly HEAP_SIZE: "heapSize";
         readonly ADDITIONAL_MEMORY: "additionalMemory";
         readonly DATA_MEMORY_RATIO: "dataMemoryRatio";
+        /** @deprecated Use JVM_ARGUMENTS */
         readonly JVM_ARGS: "jvmArgs";
+        /** @deprecated Use CLASSPATH_ADDITIONS */
         readonly EXTRA_CLASSPATHS: "extraClasspaths";
         readonly JVM_PROFILE: "jvmProfile";
         readonly DB_SERVER_NAME: "dbServerName";
@@ -68,6 +72,9 @@ export declare class DraftQuery implements IDraftQuery {
         readonly INITIALIZATION_THREADS: "initializationThreads";
         readonly UPDATE_THREADS: "updateThreads";
         readonly DEFAULTS: "defaults";
+        readonly ENV_VAR_ENTRIES: "envVarEntries";
+        readonly JVM_ARGUMENTS: "jvmArguments";
+        readonly CLASSPATH_ADDITIONS: "classpathAdditions";
     }>;
     /**
      * Checks if a serial id from the server is actually a draft id
@@ -81,7 +88,13 @@ export declare class DraftQuery implements IDraftQuery {
      * @param serial a serial that contains a draft id
      */
     static serialToDraftId(serial: string): string;
-    constructor({ isModified, isClientSide, draftOwner, serial, name, owner, type, enabled, enableGcLogs, envVars, heapSize, additionalMemory, dataMemoryRatio, jvmArgs, extraClasspaths, jvmProfile, dbServerName, scriptLanguage, scriptPath, scriptCode, scheduling, adminGroups, viewerGroups, restartUsers, timeout, workerKind, kubernetesControl, pythonControl, genericWorkerControl, typeSpecificFields, replicaCount, spareCount, assignmentPolicy, assignmentPolicyParams, initializationThreads, updateThreads, defaults, }: DraftQueryConstructorObject);
+    constructor({ isModified, isClientSide, draftOwner, serial, name, owner, type, enabled, enableGcLogs, 
+    /** @deprecated Use envVarEntries */
+    envVars, heapSize, additionalMemory, dataMemoryRatio, 
+    /** @deprecated Use jvmArguments */
+    jvmArgs, 
+    /** @deprecated Use classpathAdditions */
+    extraClasspaths, jvmProfile, dbServerName, scriptLanguage, scriptPath, scriptCode, scheduling, adminGroups, viewerGroups, restartUsers, timeout, workerKind, kubernetesControl, pythonControl, genericWorkerControl, typeSpecificFields, replicaCount, spareCount, assignmentPolicy, assignmentPolicyParams, initializationThreads, updateThreads, defaults, envVarEntries, jvmArguments, classpathAdditions, }: DraftQueryConstructorObject);
     id: string;
     isModified: boolean;
     isClientSide: boolean;
@@ -92,12 +105,21 @@ export declare class DraftQuery implements IDraftQuery {
     type: string;
     enabled: boolean;
     enableGcLogs: boolean;
+    get envVarEntries(): string[];
+    set envVarEntries(value: string[]);
+    get jvmArguments(): string[];
+    set jvmArguments(value: string[]);
+    get classpathAdditions(): string[];
+    set classpathAdditions(value: string[]);
+    /** @deprecated Use `envVarEntries` instead. */
     envVars: string;
+    /** @deprecated Use `jvmArguments` instead. */
+    jvmArgs: string;
+    /** @deprecated Use `classpathAdditions` instead. */
+    extraClasspaths: string;
     heapSize: number;
     additionalMemory: number;
     dataMemoryRatio: number;
-    jvmArgs: string;
-    extraClasspaths: string;
     jvmProfile: string;
     dbServerName: string;
     scriptLanguage: string | null;

package/dist/DraftQuery.js

@@ -1,5 +1,18 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _DraftQuery_envVarEntries, _DraftQuery_jvmArguments, _DraftQuery_classpathAdditions;
 /* eslint-disable no-param-reassign */
 import { nanoid } from 'nanoid';
+import { joinClasspathAdditions, joinEnvVarEntries, splitClasspathAdditions, splitEnvVarEntries, tokenizeArgs, } from './ArgumentUtils';
 import QueryColumns from './QueryColumns';
 import QueryScheduler from './QueryScheduler';
 import { QueryType } from './QueryType';
@@ -26,7 +39,22 @@ export class DraftQuery {
         // Remove the 'Draft ID: ' marking
         return serial === null || serial === void 0 ? void 0 : serial.substring(DRAFT_SERIAL_PREFIX.length);
     }
-    constructor({ isModified = false, isClientSide = false, draftOwner, serial = DraftQuery.NO_SERIAL, name, owner, type = QueryType.SCRIPT, enabled = true, enableGcLogs = true, envVars = '', heapSize = 4.0, additionalMemory = 0.0, dataMemoryRatio = 0.25, jvmArgs = '', extraClasspaths = '', jvmProfile = 'Default', dbServerName, scriptLanguage = 'Groovy', scriptPath = null, scriptCode = '', scheduling, adminGroups = [], viewerGroups = [], restartUsers = DraftQuery.RESTART_MODE.ADMIN, timeout = 0, workerKind = null, kubernetesControl = null, pythonControl = null, genericWorkerControl = null, typeSpecificFields = null, replicaCount = 1, spareCount = 0, assignmentPolicy = null, assignmentPolicyParams = null, initializationThreads = undefined, updateThreads = undefined, defaults = undefined, }) {
+    constructor({ isModified = false, isClientSide = false, draftOwner, serial = DraftQuery.NO_SERIAL, name, owner, type = QueryType.SCRIPT, enabled = true, enableGcLogs = true, 
+    /** @deprecated Use envVarEntries */
+    envVars = '', heapSize = 4.0, additionalMemory = 0.0, dataMemoryRatio = 0.25, 
+    /** @deprecated Use jvmArguments */
+    jvmArgs = '', 
+    /** @deprecated Use classpathAdditions */
+    extraClasspaths = '', jvmProfile = 'Default', dbServerName, scriptLanguage = 'Groovy', scriptPath = null, scriptCode = '', scheduling, adminGroups = [], viewerGroups = [], restartUsers = DraftQuery.RESTART_MODE.ADMIN, timeout = 0, workerKind = null, kubernetesControl = null, pythonControl = null, genericWorkerControl = null, typeSpecificFields = null, replicaCount = 1, spareCount = 0, assignmentPolicy = null, assignmentPolicyParams = null, initializationThreads = undefined, updateThreads = undefined, defaults = undefined, envVarEntries = undefined, jvmArguments = undefined, classpathAdditions = undefined, }) {
+        _DraftQuery_envVarEntries.set(this, []);
+        _DraftQuery_jvmArguments.set(this, []);
+        _DraftQuery_classpathAdditions.set(this, []);
+        /** @deprecated Use `envVarEntries` instead. */
+        this.envVars = '';
+        /** @deprecated Use `jvmArguments` instead. */
+        this.jvmArgs = '';
+        /** @deprecated Use `classpathAdditions` instead. */
+        this.extraClasspaths = '';
         this.scheduling = [];
         // Meta Data
         this.id = nanoid();
@@ -40,13 +68,26 @@ export class DraftQuery {
         this.type = type;
         this.enabled = enabled;
         this.enableGcLogs = enableGcLogs;
-        this.envVars = envVars;
+        if (envVarEntries != null) {
+            this.envVarEntries = envVarEntries.slice();
+        }
+        else {
+            try {
+                this.envVarEntries = splitEnvVarEntries(envVars);
+            }
+            catch (e) {
+                this.envVarEntries = [];
+            }
+        }
         this.heapSize = heapSize;
         this.replicaCount = replicaCount;
         this.spareCount = spareCount;
         this.additionalMemory = additionalMemory;
         this.dataMemoryRatio = dataMemoryRatio;
-        this.extraClasspaths = extraClasspaths;
+        this.classpathAdditions =
+            classpathAdditions != null
+                ? classpathAdditions.slice()
+                : splitClasspathAdditions(extraClasspaths);
         this.jvmProfile = jvmProfile;
         this.dbServerName = dbServerName;
         this.scriptLanguage = scriptLanguage;
@@ -66,12 +107,13 @@ export class DraftQuery {
         this.assignmentPolicyParams = assignmentPolicyParams;
         // If the thread counts are not provided, they are read from the JVM args
         // And they need to be removed from the JVM args
+        const jvmArgsArray = jvmArguments !== null && jvmArguments !== void 0 ? jvmArguments : tokenizeArgs(jvmArgs);
         this.initializationThreads =
-            initializationThreads !== null && initializationThreads !== void 0 ? initializationThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgs, WorkerThreadUtils.INITIALIZATION_THREADS_ARG);
+            initializationThreads !== null && initializationThreads !== void 0 ? initializationThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgsArray, WorkerThreadUtils.INITIALIZATION_THREADS_ARG);
         this.updateThreads =
-            updateThreads !== null && updateThreads !== void 0 ? updateThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgs, WorkerThreadUtils.UPDATE_THREADS_ARG);
+            updateThreads !== null && updateThreads !== void 0 ? updateThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgsArray, WorkerThreadUtils.UPDATE_THREADS_ARG);
         // The thread count args should always be removed from the JVM args as they are stored in the DraftQuery
-        this.jvmArgs = WorkerThreadUtils.removeArgs(jvmArgs);
+        this.jvmArguments = WorkerThreadUtils.removeArgs(jvmArgsArray);
         // The scheduling array is parsed into a scheduler object
         this.scheduling = [];
         this.scheduler = new QueryScheduler(scheduling);
@@ -80,6 +122,31 @@ export class DraftQuery {
         // A copy should have defaults that need to be instantiated as a new DraftQuery
         this.defaults = defaults == null ? undefined : new DraftQuery(defaults);
     }
+    // The setters below keep the deprecated string fields in sync with their array replacements.
+    // This is for backwards compatibility with the old JS API which uses the deprecated fields.
+    // When the deprecated fields (envVars, jvmArgs, extraClasspaths) are removed, these can be
+    // replaced with plain properties.
+    get envVarEntries() {
+        return __classPrivateFieldGet(this, _DraftQuery_envVarEntries, "f");
+    }
+    set envVarEntries(value) {
+        __classPrivateFieldSet(this, _DraftQuery_envVarEntries, value, "f");
+        this.envVars = joinEnvVarEntries(value);
+    }
+    get jvmArguments() {
+        return __classPrivateFieldGet(this, _DraftQuery_jvmArguments, "f");
+    }
+    set jvmArguments(value) {
+        __classPrivateFieldSet(this, _DraftQuery_jvmArguments, value, "f");
+        this.jvmArgs = value.join(' ');
+    }
+    get classpathAdditions() {
+        return __classPrivateFieldGet(this, _DraftQuery_classpathAdditions, "f");
+    }
+    set classpathAdditions(value) {
+        __classPrivateFieldSet(this, _DraftQuery_classpathAdditions, value, "f");
+        this.extraClasspaths = joinClasspathAdditions(value);
+    }
     updateSchedule() {
         if (this.scheduler != null) {
             this.scheduling = this.scheduler.toStringArray();
@@ -117,12 +184,12 @@ export class DraftQuery {
             type: this.type,
             enabled: this.enabled,
             enableGcLogs: this.enableGcLogs,
-            envVars: this.envVars,
+            envVarEntries: this.envVarEntries,
             heapSize: this.heapSize,
             dataMemoryRatio: this.dataMemoryRatio,
             additionalMemory: this.additionalMemory,
-            jvmArgs: this.jvmArgs,
-            extraClasspaths: this.extraClasspaths,
+            jvmArguments: this.jvmArguments,
+            classpathAdditions: this.classpathAdditions,
             jvmProfile: this.jvmProfile,
             dbServerName: this.dbServerName,
             scriptLanguage: this.scriptLanguage,
@@ -155,7 +222,7 @@ export class DraftQuery {
      */
     addThreadCountToJVMArgs() {
         const { initializationThreads, updateThreads } = this;
-        this.jvmArgs = WorkerThreadUtils.addArgs(this.jvmArgs, initializationThreads, updateThreads);
+        this.jvmArguments = WorkerThreadUtils.addArgs(this.jvmArguments, initializationThreads, updateThreads);
     }
     /**
      * Get a PlainEditableQueryInfo object populated from this DraftQuery
@@ -194,6 +261,7 @@ export class DraftQuery {
         return `${DRAFT_SERIAL_PREFIX}${this.id}`;
     }
 }
+_DraftQuery_envVarEntries = new WeakMap(), _DraftQuery_jvmArguments = new WeakMap(), _DraftQuery_classpathAdditions = new WeakMap();
 DraftQuery.NO_SERIAL = null;
 DraftQuery.INVALID_SCRIPT_PATH = '';
 DraftQuery.RESTART_MODE = Object.freeze({
@@ -208,11 +276,14 @@ DraftQuery.FIELDS = Object.freeze({
     TYPE: 'type',
     ENABLED: 'enabled',
     ENABLED_GC_LOGS: 'enableGcLogs',
+    /** @deprecated Use ENV_VAR_ENTRIES */
     ENV_VARS: 'envVars',
     HEAP_SIZE: 'heapSize',
     ADDITIONAL_MEMORY: 'additionalMemory',
     DATA_MEMORY_RATIO: 'dataMemoryRatio',
+    /** @deprecated Use JVM_ARGUMENTS */
     JVM_ARGS: 'jvmArgs',
+    /** @deprecated Use CLASSPATH_ADDITIONS */
     EXTRA_CLASSPATHS: 'extraClasspaths',
     JVM_PROFILE: 'jvmProfile',
     DB_SERVER_NAME: 'dbServerName',
@@ -236,5 +307,8 @@ DraftQuery.FIELDS = Object.freeze({
     INITIALIZATION_THREADS: 'initializationThreads',
     UPDATE_THREADS: 'updateThreads',
     DEFAULTS: 'defaults',
+    ENV_VAR_ENTRIES: 'envVarEntries',
+    JVM_ARGUMENTS: 'jvmArguments',
+    CLASSPATH_ADDITIONS: 'classpathAdditions',
 });
 export default DraftQuery;

package/dist/EditableQueryInfoUtils.js

@@ -20,11 +20,11 @@ export function getPlainEditableQueryInfo(query) {
         dbServerName: query.dbServerName,
         enabled: query.enabled,
         enableGcLogs: query.enableGcLogs,
-        envVars: query.envVars,
-        extraClasspaths: query.extraClasspaths,
+        envVarEntries: [...query.envVarEntries],
+        classpathAdditions: [...query.classpathAdditions],
         heapSize: query.heapSize,
         additionalMemory: query.additionalMemory,
-        jvmArgs: query.jvmArgs,
+        jvmArguments: [...query.jvmArguments],
         jvmProfile: query.jvmProfile,
         name: query.name,
         owner: query.owner,

package/dist/QueryUtils.js

@@ -14,7 +14,6 @@ import Log from '@deephaven/log';
 import { nanoid } from 'nanoid';
 import QueryScheduler from './QueryScheduler';
 import DraftQuery from './DraftQuery';
-import { WorkerThreadUtils } from './WorkerThreadUtils';
 import { QueryStatus } from './QueryStatus';
 const log = Log.module('QueryUtils');
 // 600 seconds is based on default `auto_delete_timeout` in
@@ -71,16 +70,9 @@ export function createTemporaryDraftQuery(_a) {
         heapSize,
         isClientSide,
         scheduling,
-        timeout, workerKind: engine, 
-        // TODO: DH-22081: createTemporaryDraftQuery converts initializationThreads/
-        // updateThreads with WorkerThreadUtils.getValue(...) before storing them on
-        // the DraftQuery. DraftQuery later calls WorkerThreadUtils.addArgs, which
-        // expects display strings
-        initializationThreads: isCommunityWorker && initializationThreads != null
-            ? WorkerThreadUtils.getValue(initializationThreads)
-            : undefined, updateThreads: isCommunityWorker && updateThreads != null
-            ? WorkerThreadUtils.getValue(updateThreads)
-            : undefined }));
+        timeout, workerKind: engine, initializationThreads: isCommunityWorker
+            ? initializationThreads
+            : undefined, updateThreads: isCommunityWorker ? updateThreads : undefined }));
     draftQuery.addThreadCountToJVMArgs();
     draftQuery.updateSchedule();
     return draftQuery;

package/dist/WorkerThreadUtils.d.ts

@@ -21,27 +21,27 @@ export declare abstract class WorkerThreadUtils {
     /**
      * Gets the display string for the provided JVM arguments and argument name.
      *
-     * @param jvmArgs the JVM arguments
+     * @param jvmArgs the JVM arguments array
      * @param argName the name of the argument to search for
      * @returns the display string or the system default string if not found
      */
-    static getDisplayStringFromJvmArgs(jvmArgs: string, argName: string): string;
+    static getDisplayStringFromJvmArgs(jvmArgs: string[], argName: string): string;
     /**
-     * Removes the thread count arguments from the provided jvmArgs string.
+     * Removes the thread count arguments from the provided jvmArgs array.
      *
-     * @param jvmArgs the string containing JVM arguments
-     * @returns a new string with the thread count arguments removed
+     * @param jvmArgs the array of JVM arguments
+     * @returns a new array with the thread count arguments removed
      */
-    static removeArgs(jvmArgs: string): string;
+    static removeArgs(jvmArgs: string[]): string[];
     /**
-     * Adds the thread count arguments to the provided jvmArgs string.
+     * Adds the thread count arguments to the provided jvmArgs array.
      *
-     * @param jvmArgs the string containing JVM arguments
+     * @param jvmArgs the array of JVM arguments
      * @param initializationThreads the display string for the initialization threads
      * @param updateThreads the display string for the update threads
-     * @returns the new string with the thread count arguments added
+     * @returns a new array with the thread count arguments added
      */
-    static addArgs(jvmArgs: string, initializationThreads: string, updateThreads: string): string;
+    static addArgs(jvmArgs: string[], initializationThreads: string, updateThreads: string): string[];
     /**
      * Gets the display string for the provided value.
      *

package/dist/WorkerThreadUtils.js

@@ -1,4 +1,3 @@
-import { tokenizeArgs } from './ArgumentUtils';
 /**
  * Utility class for managing worker thread configuration arguments.
  */
@@ -18,50 +17,48 @@ export class WorkerThreadUtils {
     /**
      * Gets the display string for the provided JVM arguments and argument name.
      *
-     * @param jvmArgs the JVM arguments
+     * @param jvmArgs the JVM arguments array
      * @param argName the name of the argument to search for
      * @returns the display string or the system default string if not found
      */
     static getDisplayStringFromJvmArgs(jvmArgs, argName) {
-        const args = tokenizeArgs(jvmArgs);
-        for (let i = 0; i < args.length; i += 1) {
-            if (args[i].startsWith(`-D${argName}=`)) {
-                return WorkerThreadUtils.getDisplayString(args[i].split('=')[1]);
+        for (let i = 0; i < jvmArgs.length; i += 1) {
+            if (jvmArgs[i].startsWith(`-D${argName}=`)) {
+                return WorkerThreadUtils.getDisplayString(jvmArgs[i].split('=')[1]);
             }
         }
         // If the value is not found, return the system default string
         return WorkerThreadUtils.SYSTEM_DEFAULT_STRING;
     }
     /**
-     * Removes the thread count arguments from the provided jvmArgs string.
+     * Removes the thread count arguments from the provided jvmArgs array.
      *
-     * @param jvmArgs the string containing JVM arguments
-     * @returns a new string with the thread count arguments removed
+     * @param jvmArgs the array of JVM arguments
+     * @returns a new array with the thread count arguments removed
      */
     static removeArgs(jvmArgs) {
-        const args = tokenizeArgs(jvmArgs);
-        const filteredArgs = args.filter(arg => !WorkerThreadUtils.ALL_ARGS.some(argName => arg.startsWith(`-D${argName}=`)));
-        return filteredArgs.join(' ');
+        return jvmArgs.filter(arg => !WorkerThreadUtils.ALL_ARGS.some(argName => arg.startsWith(`-D${argName}=`)));
     }
     /**
-     * Adds the thread count arguments to the provided jvmArgs string.
+     * Adds the thread count arguments to the provided jvmArgs array.
      *
-     * @param jvmArgs the string containing JVM arguments
+     * @param jvmArgs the array of JVM arguments
      * @param initializationThreads the display string for the initialization threads
      * @param updateThreads the display string for the update threads
-     * @returns the new string with the thread count arguments added
+     * @returns a new array with the thread count arguments added
      */
     static addArgs(jvmArgs, initializationThreads, updateThreads) {
+        const result = [...jvmArgs];
         // The default value means "do not set an extra JVM arg"
         if (WorkerThreadUtils.isValidThreadCount(initializationThreads) &&
             initializationThreads !== WorkerThreadUtils.SYSTEM_DEFAULT_STRING) {
-            jvmArgs += ` -D${WorkerThreadUtils.INITIALIZATION_THREADS_ARG}=${WorkerThreadUtils.getValue(initializationThreads)}`;
+            result.push(`-D${WorkerThreadUtils.INITIALIZATION_THREADS_ARG}=${WorkerThreadUtils.getValue(initializationThreads)}`);
         }
         if (WorkerThreadUtils.isValidThreadCount(updateThreads) &&
             updateThreads !== WorkerThreadUtils.SYSTEM_DEFAULT_STRING) {
-            jvmArgs += ` -D${WorkerThreadUtils.UPDATE_THREADS_ARG}=${WorkerThreadUtils.getValue(updateThreads)}`;
+            result.push(`-D${WorkerThreadUtils.UPDATE_THREADS_ARG}=${WorkerThreadUtils.getValue(updateThreads)}`);
         }
-        return jvmArgs.trim();
+        return result;
     }
     /**
      * Gets the display string for the provided value.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven-enterprise/query-utils",
-  "version": "2026.1.40",
+  "version": "2026.1.42",
   "description": "Deephaven Enterprise Query Utils",
   "author": "Deephaven Data Labs LLC",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -17,14 +17,18 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@deephaven/jsapi-types": "^1.0.0-dev0.36.1",
     "@deephaven-enterprise/jsapi-types": "file:../jsapi-types",
+    "@deephaven/jsapi-types": "^1.0.0-dev0.36.1",
     "@deephaven/log": "^0.97.0",
     "@deephaven/utils": "^0.97.0",
     "@internationalized/date": "^3.12.2",
-    "nanoid": "^5.1.6"
+    "nanoid": "^5.1.6",
+    "shell-quote": "^1.8.4"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "@types/shell-quote": "^1.7.5"
   }
 }