@aryacode/dsh-plugin-arya-computer-use 1.0.2 → 1.0.3

package/index.js

@@ -19,7 +19,7 @@
 import z from '@deepseek-ai/schemastery';
 import os from 'node:os';
 import { readFile, readFileSync, readdirSync, statSync } from 'node:fs';
-import { execFileSync } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -33,6 +33,7 @@ export const inject = ['tools'];
 const HERE = dirname(fileURLToPath(import.meta.url));
 const SKILL_DIR = join(HERE, 'skills', 'arya-desktop');
 const SKILL_FILE = join(SKILL_DIR, 'SKILL.md');
+const CONSOLE_HIDER_SCRIPT = join(HERE, 'scripts', 'hide-consoles.ps1');
 const PROVIDER_NAME = 'arya-computer-use';
 const RANK = 350;
 const STATUS_PATH = '/plugins/arya/status';
@@ -295,7 +296,47 @@ export { ensureMarketSource as __ensureMarketSource };
 
 /* -------------------------------------------------------------------- main */
 
+// Windows gives a console window titled after its executable to any console
+// child that was not created with CREATE_NO_WINDOW. Both engines ship a JS shim
+// (agent-browser/bin/agent-browser.js, agent-desktop/bin/agent-desktop) that
+// runs the native helper with `stdio: 'inherit'` and `windowsHide: false`, so a
+// black console stays on the desktop for as long as the helper lives - the
+// browser daemon keeps it for the whole session - and closing it kills the
+// helper, which is why it comes straight back. The plugin spawns the natives
+// itself wherever the call site allows it; this watcher covers whatever else
+// starts them (a lane restart, an older launcher, a helper started outside the
+// plugin). It hides only classic console windows whose title or image names one
+// of the two engine helpers, and hiding leaves stdio alone, so the helper keeps
+// working.
+function startConsoleHider(ctx) {
+  if (process.platform !== 'win32') return () => {};
+  try {
+    if (!statSync(CONSOLE_HIDER_SCRIPT).isFile()) return () => {};
+  } catch {
+    return () => {};
+  }
+  let child;
+  try {
+    child = spawn(
+      'powershell.exe',
+      ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', CONSOLE_HIDER_SCRIPT, '-ParentPid', String(process.pid)],
+      { stdio: 'ignore', windowsHide: true },
+    );
+  } catch (error) {
+    ctx.logger.warn('dsh-arya-computer-use: could not start the console watcher: %s', error?.message ?? String(error));
+    return () => {};
+  }
+  child.on('error', error => {
+    ctx.logger.warn('dsh-arya-computer-use: console watcher stopped: %s', error?.message ?? String(error));
+  });
+  child.unref?.();
+  return () => {
+    try { child.kill(); } catch { /* already gone */ }
+  };
+}
+
 export async function apply(ctx, config) {
+  const stopConsoleHider = startConsoleHider(ctx);
   registerSkillProvider(ctx);
   ensureMarketSource(ctx);
   void (async () => {
@@ -438,7 +479,9 @@ export async function apply(ctx, config) {
       state: readJson(runtime.stateFile),
     });
   }
-  return () => {};
+  return () => {
+    stopConsoleHider();
+  };
 }
 
 function isLoopbackAddress(address) {

package/mcp/adapter-server.mjs

@@ -25,6 +25,25 @@ const require = createRequire(import.meta.url);
 const CLI_BIN = require.resolve('agent-desktop/bin/agent-desktop');
 const OCR_PS1 = join(HERE, '..', 'scripts', 'ocr.ps1');
 
+// Windows console-window trap, the same one browser-launcher.mjs documents and
+// avoids: bin/agent-desktop (the npm shim) spawns the native exe with
+// stdio:'inherit' + windowsHide:false, so every tool call pops a console window
+// on the user's desktop. Spawn the native binary directly instead; stdio stays
+// piped and windowsHide holds. Null when the platform has no released binary,
+// in which case the shim is the only way to run the CLI.
+const NATIVE_BIN = (() => {
+  try {
+    const pkgDir = dirname(require.resolve('agent-desktop/package.json'));
+    const { resolve } = require('agent-desktop/lib/platform');
+    const entry = resolve(process.platform, process.arch);
+    if (!entry || !entry.released || !entry.binaryName) return null;
+    const bin = join(pkgDir, 'bin', entry.binaryName);
+    return existsSync(bin) ? bin : null;
+  } catch {
+    return null;
+  }
+})();
+
 // Engine state root: the engine's own default (~/.agent-desktop) — it creates
 // that root with its protected DACL and passes its private-file checks.
 // Do NOT point AGENT_DESKTOP_HOME at AppData\Local: inherited AppContainer ACEs
@@ -179,11 +198,17 @@ function runCli(args, { headed = effectiveHeaded() } = {}) {
   const env = { ...process.env };
   if (state.sessionStarted) env.AGENT_DESKTOP_SESSION = state.sessionId;
   return new Promise((resolve) => {
-    const child = spawn(process.execPath, [CLI_BIN, ...argv], {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      windowsHide: true,
-      env,
-    });
+    const child = NATIVE_BIN
+      ? spawn(NATIVE_BIN, argv, {
+          stdio: ['ignore', 'pipe', 'pipe'],
+          windowsHide: true,
+          env,
+        })
+      : spawn(process.execPath, [CLI_BIN, ...argv], {
+          stdio: ['ignore', 'pipe', 'pipe'],
+          windowsHide: true,
+          env,
+        });
     let stdout = '';
     let stderr = '';
     child.stdout.on('data', (d) => (stdout += d));

package/mcp/browser-launcher.mjs

@@ -3,18 +3,41 @@
 // DSH launches this file instead of agent-browser itself so the browser lane can
 // follow the plugin's settings (tool surface, Chrome profile, session, CDP
 // endpoint, headed window) without editing the Cordis patch by hand. The real
-// server's stdio is inherited, so this process is a transparent pipe: stdin and
+// server's stdio is piped through this process, a transparent relay: stdin and
 // stdout carry the MCP protocol untouched, and settings changes are picked up on
 // the next MCP restart.
+//
+// Two window traps on Windows, both avoided here:
+//  - Node ignores windowsHide when stdio is 'inherit', so stdio is piped.
+//  - bin/agent-browser.js (the npm CLI shim) spawns the native exe with
+//    stdio:'inherit' + windowsHide:false, which pops a console window for the
+//    grandchild on the user's desktop. We skip the shim and spawn the native
+//    exe directly; it speaks MCP over stdio itself.
 
 import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { homedir, platform, arch } from 'node:os';
+import { dirname, join } from 'node:path';
 
 const require = createRequire(import.meta.url);
-const BIN = require.resolve('agent-browser/bin/agent-browser.js');
+const SHIM = require.resolve('agent-browser/bin/agent-browser.js');
+
+// Resolve the platform native binary shipped inside the agent-browser package,
+// mirroring bin/agent-browser.js's naming (with the win32-arm64 → x64 fallback).
+function nativeBin() {
+  const dir = dirname(require.resolve('agent-browser/package.json'));
+  const osKey = { darwin: 'darwin', linux: 'linux', win32: 'win32' }[platform()];
+  const archKey = { x64: 'x64', arm64: 'arm64' }[arch()];
+  if (!osKey || !archKey) return null;
+  const ext = osKey === 'win32' ? '.exe' : '';
+  let name = `agent-browser-${osKey}-${archKey}${ext}`;
+  if (osKey === 'win32' && archKey === 'arm64' && !existsSync(join(dir, name))) {
+    name = 'agent-browser-win32-x64.exe';
+  }
+  const bin = join(dir, name);
+  return existsSync(bin) ? bin : null;
+}
 
 function controlDir() {
   const local = process.env.LOCALAPPDATA || join(homedir(), 'AppData', 'Local');
@@ -35,7 +58,7 @@ function readSettings() {
 const text = (value) => (typeof value === 'string' ? value.trim() : '');
 
 export function browserArgs(settings = {}) {
-  const args = [BIN, 'mcp'];
+  const args = [SHIM, 'mcp'];
   const tools = text(settings.browserTools);
   if (tools) args.push('--tools', tools);
   const cdp = text(settings.browserCdp);
@@ -52,12 +75,19 @@ export function browserArgs(settings = {}) {
 
 function main() {
   const args = browserArgs(readSettings());
-  const child = spawn(process.execPath, args, { stdio: 'inherit', windowsHide: true });
+  const native = nativeBin();
+  const child = native
+    ? spawn(native, args.slice(1), { stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true })
+    : spawn(process.execPath, args, { stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });
   child.on('error', (error) => {
     process.stderr.write(`arya browser lane: could not start agent-browser: ${error.message}\n`);
     process.exit(1);
   });
   child.on('exit', (code, signal) => process.exit(code ?? (signal ? 1 : 0)));
+  process.stdin.pipe(child.stdin);
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
+  child.stdin.on('error', () => { /* child gone mid-write; the exit handler ends us */ });
   for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
     process.on(signal, () => { try { child.kill(signal); } catch { /* already gone */ } });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aryacode/dsh-plugin-arya-computer-use",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Computer use for DSH/AryaCode: agent-desktop UIA engine, agent-browser web lane, takeover UI with a ghost cursor",
   "license": "MIT",
   "type": "module",
@@ -29,6 +29,7 @@
     "scripts/windows-takeover.ps1",
     "scripts/windows-takeover.cs",
     "scripts/ocr.ps1",
+    "scripts/hide-consoles.ps1",
     "skills/arya-desktop/SKILL.md",
     "locale/en.json",
     "icon.svg",

package/scripts/hide-consoles.ps1

@@ -0,0 +1,120 @@
+# Arya Computer Use - hide the console windows the automation sidecars hand to
+# the desktop.
+#
+# Windows gives a console window named after the executable to any console
+# process that was not started with CREATE_NO_WINDOW. Both engines ship a JS
+# shim (agent-browser/bin/agent-browser.js, agent-desktop/bin/agent-desktop)
+# that runs the native helper with `stdio: 'inherit'` and `windowsHide: false`,
+# and a native helper that outlives the call (the browser daemon) keeps its
+# console for the whole session. The plugin starts the natives itself wherever
+# it can, so the shim never runs, but a lane restart or a helper started by
+# something else still puts a black console on screen - and closing it kills the
+# helper, which is why it comes back.
+#
+# This watcher hides those windows instead of closing them. Hiding only removes
+# the chrome: stdio is piped, the helper keeps running and stays reachable.
+# Nothing else is touched - the window must be a classic console AND its title
+# or its image path must name one of the two engine helpers.
+#
+# Started hidden by index.js for the lifetime of the host process
+# (-ParentPid). -Once -Report prints what would be hidden and changes nothing.
+
+param(
+  [int]$ParentPid = 0,
+  [int]$IntervalMs = 600,
+  [switch]$Once,
+  [switch]$Report
+)
+
+$ErrorActionPreference = 'Stop'
+
+# Console window titles on Windows default to the application path, and the
+# vendor shim does not overwrite them. A few releases rename the helper, so the
+# match stays on the package name plus its bin directory.
+$script:TitlePattern = 'agent-(browser|desktop)(-win32-(x64|arm64))?\.exe'
+$script:PathPattern = '\\node_modules\\(agent-browser|agent-desktop)\\bin\\'
+
+Add-Type -Namespace AryaCU -Name Win32 -MemberDefinition @'
+    public delegate bool EnumWindowsProc(System.IntPtr hWnd, System.IntPtr lParam);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll")]
+    public static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, System.IntPtr lParam);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
+    public static extern int GetWindowTextW(System.IntPtr hWnd, System.Text.StringBuilder lpString, int nMaxCount);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
+    public static extern int GetClassNameW(System.IntPtr hWnd, System.Text.StringBuilder lpClassName, int nMaxCount);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll")]
+    public static extern bool IsWindowVisible(System.IntPtr hWnd);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll")]
+    public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
+
+    [System.Runtime.InteropServices.DllImport("user32.dll")]
+    public static extern uint GetWindowThreadProcessId(System.IntPtr hWnd, out uint lpdwProcessId);
+'@
+
+# Returns the visible console windows that belong to one of the engine helpers.
+function Get-EngineConsoles {
+  $found = New-Object System.Collections.ArrayList
+
+  $callback = [AryaCU.Win32+EnumWindowsProc] {
+    param([IntPtr]$hWnd, [IntPtr]$lParam)
+
+    if (-not [AryaCU.Win32]::IsWindowVisible($hWnd)) { return $true }
+
+    $class = New-Object System.Text.StringBuilder 256
+    [void][AryaCU.Win32]::GetClassNameW($hWnd, $class, 256)
+    # ConPTY terminals and Windows Terminal use their own classes; only the
+    # classic console host is a candidate.
+    if ($class.ToString() -ne 'ConsoleWindowClass') { return $true }
+
+    $title = New-Object System.Text.StringBuilder 1024
+    [void][AryaCU.Win32]::GetWindowTextW($hWnd, $title, 1024)
+    $text = $title.ToString()
+
+    $ownerPid = 0
+    [void][AryaCU.Win32]::GetWindowThreadProcessId($hWnd, [ref]$ownerPid)
+
+    $hit = $text -match $script:TitlePattern
+    if (-not $hit -and $ownerPid -gt 0) {
+      # The title can be blanked by the shim's parent; fall back to the image
+      # path when the process is readable (the host runs elevated, so it is).
+      try {
+        $path = (Get-Process -Id $ownerPid -ErrorAction Stop).Path
+        if ($path -and $path -match $script:PathPattern) { $hit = $true }
+      } catch { }
+    }
+
+    if ($hit) {
+      [void]$found.Add([pscustomobject]@{ Handle = $hWnd; Title = $text; OwnerPid = $ownerPid })
+    }
+    return $true
+  }
+
+  [void][AryaCU.Win32]::EnumWindows($callback, [IntPtr]::Zero)
+  return @($found.ToArray())
+}
+
+while ($true) {
+  try {
+    foreach ($window in Get-EngineConsoles) {
+      if ($Report) {
+        '{0} {1} {2}' -f $window.OwnerPid, $window.Handle, $window.Title
+      } else {
+        [void][AryaCU.Win32]::ShowWindow($window.Handle, 0) # SW_HIDE
+      }
+    }
+  } catch {
+    if ($Once) { throw }
+  }
+
+  if ($Once) { break }
+
+  Start-Sleep -Milliseconds ([Math]::Max(200, $IntervalMs))
+
+  # Leave with the host: an orphaned watcher would keep polling forever.
+  if ($ParentPid -gt 0 -and -not (Get-Process -Id $ParentPid -ErrorAction SilentlyContinue)) { break }
+}