@openagents-org/agent-connector 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openagents-org/agent-connector",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Agent management CLI and library for OpenAgents — install, configure, and run AI coding agents",
   "main": "src/index.js",
   "bin": {

package/src/daemon.js

@@ -475,6 +475,35 @@ class Daemon {
    * Build workspace context preamble for CLI agents.
    * Teaches the agent about shared workspace APIs (browser, files).
    */
+  /**
+   * On Windows, resolve a .cmd shim to the underlying node script
+   * so we can spawn directly with node (avoiding cmd.exe argument limits).
+   */
+  _resolveWindowsBinary(binary, env) {
+    const { execSync } = require('child_process');
+    try {
+      // Find the .cmd shim
+      const cmdPath = execSync(`where ${binary}`, {
+        encoding: 'utf-8', timeout: 5000, env,
+      }).split(/\r?\n/)[0].trim();
+
+      if (cmdPath.endsWith('.cmd')) {
+        // Read the .cmd file to find the target JS script
+        const cmdContent = fs.readFileSync(cmdPath, 'utf-8');
+        // npm .cmd shims have: "%~dp0\node_modules\...\bin\cli.js" %*
+        // or: @IF EXIST "%~dp0\node.exe" ... "%~dp0\node_modules\...\cli.js" %*
+        const match = cmdContent.match(/"([^"]+\.js)"/);
+        if (match) {
+          const jsPath = match[1].replace('%~dp0\\', path.dirname(cmdPath) + '\\');
+          return { binary: process.execPath, prefix: [jsPath] };
+        }
+      }
+    } catch {}
+
+    // Fallback: use cmd.exe /C (may truncate long args)
+    return { binary: process.env.COMSPEC || 'cmd.exe', prefix: ['/C', binary] };
+  }
+
   _buildWorkspaceContext(agentCfg, network) {
     const baseUrl = 'https://workspace-endpoint.openagents.org';
     const h = `Authorization: Bearer ${network.token}`;
@@ -521,10 +550,25 @@ class Daemon {
         this._sessionContextSent.add(contextKey);
       }
 
-      const args = ['agent', '--local', '--agent', agentId,
-        '--session-id', sessionKey, '--message', fullMessage, '--json'];
-
-      this._log(`${agentCfg.name} CLI: ${binary} ${args.slice(0, 5).join(' ')} ...`);
+      // Write message to temp file to avoid cmd.exe argument length limits
+      const msgFile = path.join(this.config.configDir, `msg-${Date.now()}.tmp`);
+      fs.writeFileSync(msgFile, fullMessage, 'utf-8');
+
+      // Use a small node wrapper to read the message file and exec openclaw
+      // This avoids all cmd.exe quoting/length issues
+      const wrapperCode = [
+        `const msg = require("fs").readFileSync(${JSON.stringify(msgFile)}, "utf-8");`,
+        `const cp = require("child_process");`,
+        `const args = ${JSON.stringify(['agent', '--local', '--agent', agentId, '--session-id', sessionKey, '--json'])};`,
+        `args.push("--message", msg);`,
+        `const r = cp.spawnSync(${JSON.stringify(binary)}, args, { stdio: ["ignore", "pipe", "pipe"], env: process.env, shell: true, timeout: 600000 });`,
+        `try { require("fs").unlinkSync(${JSON.stringify(msgFile)}); } catch {}`,
+        `if (r.stdout) process.stdout.write(r.stdout);`,
+        `if (r.stderr) process.stderr.write(r.stderr);`,
+        `process.exit(r.status || 0);`,
+      ].join('\n');
+
+      this._log(`${agentCfg.name} CLI: ${binary} agent --local --agent ${agentId} ... (via wrapper, msg ${fullMessage.length} chars)`);
 
       const spawnEnv = { ...env };
       if (IS_WINDOWS) {
@@ -534,25 +578,14 @@ class Daemon {
         }
       }
 
-      // On Windows, .cmd shims need shell:true but that breaks argument
-      // quoting. Use execFileSync-style approach: resolve the .cmd to its
-      // target and run directly, or use spawn without shell and full path.
-      let spawnBinary = binary;
-      let spawnArgs = args;
+      const spawnBinary = process.execPath; // node
+      const spawnArgs = ['-e', wrapperCode];
       const spawnOpts = {
         stdio: ['ignore', 'pipe', 'pipe'],
         env: spawnEnv,
-        timeout: 600000,
+        timeout: 620000,
       };
 
-      if (IS_WINDOWS) {
-        // Find the actual .cmd shim and invoke via cmd.exe /C with proper quoting
-        spawnBinary = process.env.COMSPEC || 'cmd.exe';
-        // Wrap argument containing spaces in double quotes for cmd.exe
-        const quotedArgs = args.map((a) => a.includes(' ') ? `"${a}"` : a);
-        spawnArgs = ['/C', binary, ...quotedArgs];
-      }
-
       const proc = spawn(spawnBinary, spawnArgs, spawnOpts);
       let stdout = '';
       let stderr = '';