@dinoxx/dinox-cli 2.8.0 → 2.8.1

package/dist/gateway/adapters/acp.js

@@ -7,6 +7,7 @@ import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION, } from '@agentcli
 import { generateId } from '../../utils/id.js';
 import { getPackageVersion } from '../../utils/version.js';
 import { codexGeneratedImagesDir, codexImagesSince } from './codexImages.js';
+import { agentLaunch } from '../spawnAgent.js';
 const TOOL_STATUS = {
     pending: 'pending',
     in_progress: 'running',
@@ -278,13 +279,14 @@ export class AcpGatewayAdapter {
         const command = this.gateway.command;
         if (!command)
             throw new Error(`Gateway ${this.gateway.name} has no ACP command`);
-        const child = spawn(command, this.gateway.args ?? [], {
+        const launch = agentLaunch(command, this.gateway.args ?? [], {
             cwd: this.gateway.cwd ?? os.homedir(),
             env: { ...process.env, ...(this.gateway.env ?? {}) },
             stdio: ['pipe', 'pipe', 'pipe'],
             // The daemon runs without a visible console on Windows; keep agents that way.
             windowsHide: true,
         });
+        const child = spawn(launch.command, launch.args, launch.options);
         child.stderr.on('data', (chunk) => this.log('agent stderr', { text: chunk.toString('utf8').slice(0, 2000) }));
         const exited = new Promise((_, reject) => {
             child.once('error', reject);

package/dist/gateway/detect.js

@@ -3,6 +3,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { Readable, Writable } from 'node:stream';
 import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION } from '@agentclientprotocol/sdk';
+import { agentLaunch } from './spawnAgent.js';
 import { getPackageVersion } from '../utils/version.js';
 /**
  * Known agents that speak ACP over stdio. Each lists launch variants in order;
@@ -70,7 +71,10 @@ export async function findExecutable(name, envPath = process.env.PATH ?? '') {
 }
 /** Starts the agent, runs `initialize`, and stops it. Never leaves the process running. */
 export async function probeAcpAgent(command, args, timeoutMs = PROBE_TIMEOUT_MS) {
-    const child = spawn(command, args, { stdio: ['pipe', 'pipe', 'ignore'], env: process.env, windowsHide: true });
+    const launch = agentLaunch(command, args, { stdio: ['pipe', 'pipe', 'ignore'], env: process.env, windowsHide: true });
+    const child = spawn(launch.command, launch.args, launch.options);
+    if (!child.stdin || !child.stdout)
+        throw new Error('ACP probe stdio was not piped');
     let timer;
     try {
         const exited = new Promise((_, reject) => {
@@ -97,7 +101,7 @@ export async function probeAcpAgent(command, args, timeoutMs = PROBE_TIMEOUT_MS)
     }
     finally {
         clearTimeout(timer);
-        child.stdin.destroy();
+        child.stdin?.destroy();
         child.kill('SIGTERM');
     }
 }

package/dist/gateway/spawnAgent.d.ts

@@ -0,0 +1,12 @@
+import type { SpawnOptions } from 'node:child_process';
+export type AgentLaunch = {
+    command: string;
+    args: readonly string[];
+    options: SpawnOptions;
+};
+/**
+ * Node's `spawn` cannot execute a Windows `.cmd` / `.bat` directly: CreateProcess
+ * returns EINVAL. npm global shims are those files (`claude-agent-acp.CMD`).
+ * Launch them through `cmd.exe /d /s /c`, with the same argument array everywhere else.
+ */
+export declare function agentLaunch(command: string, args: readonly string[], options: SpawnOptions, platform?: NodeJS.Platform): AgentLaunch;

package/dist/gateway/spawnAgent.js

@@ -0,0 +1,32 @@
+const WINDOWS_BATCH = /\.(?:cmd|bat)$/i;
+/** Characters cmd.exe would interpret if a batch path or argument reached the shell unquoted. */
+const CMD_METACHARACTERS = /[\0\r\n"&|<>^%]/;
+/**
+ * Node's `spawn` cannot execute a Windows `.cmd` / `.bat` directly: CreateProcess
+ * returns EINVAL. npm global shims are those files (`claude-agent-acp.CMD`).
+ * Launch them through `cmd.exe /d /s /c`, with the same argument array everywhere else.
+ */
+export function agentLaunch(command, args, options, platform = process.platform) {
+    if (platform !== 'win32' || !WINDOWS_BATCH.test(command)) {
+        return { command, args, options };
+    }
+    for (const part of [command, ...args]) {
+        if (CMD_METACHARACTERS.test(part)) {
+            throw new Error(`Cannot launch a Windows batch file containing shell metacharacters (${part})`);
+        }
+    }
+    const inner = [quoteCmdArg(command), ...args.map(quoteCmdArg)].join(' ');
+    return {
+        command: process.env.ComSpec || 'cmd.exe',
+        args: ['/d', '/s', '/c', `"${inner}"`],
+        options: { ...options, windowsVerbatimArguments: true },
+    };
+}
+/** Quote one argv token for CommandLineToArgvW. Tokens without spaces stay bare. */
+function quoteCmdArg(value) {
+    if (value.length === 0)
+        return '""';
+    if (!/[\s"]/.test(value))
+        return value;
+    return `"${value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, '$1$1')}"`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dinoxx/dinox-cli",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Dinox CLI",
   "main": "dist/dinox.js",
   "scripts": {