@jian-ai/remote-control 0.8.0 → 0.8.2

package/bin/jian-remote.mjs

@@ -21,7 +21,7 @@ const option = (name) => {
  * Stamped to the release tag on npm publish and when the gateway serves this script.
  * Compatibility with the gateway requires the same major.minor (see versionsCompatible).
  */
-export const PACKAGE_VERSION = '0.8.0';
+export const PACKAGE_VERSION = '0.8.2';
 
 /** Soft stdout/stderr caps while capturing a command (chars). Gateway schema matches these. */
 const STDOUT_CAP = 400_000;
@@ -136,6 +136,9 @@ export function buildMacosAppInfoPlist() {
 }
 
 export function buildLaunchAgentPlist({ label, executable, script, logPath }) {
+  // ProcessType=Interactive opts the worker out of App Nap. Without it, macOS can freeze the
+  // Node poll loop while the screen is locked or idle; lastSeenAt ages out and the gateway
+  // shows Offline even though the process is still "running".
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
@@ -148,6 +151,7 @@ export function buildLaunchAgentPlist({ label, executable, script, logPath }) {
 <string>${xmlEscape(script)}</string>
 <string>run</string>
 </array>
+<key>ProcessType</key><string>Interactive</string>
 <key>RunAtLoad</key><true/>
 <key>KeepAlive</key><true/>
 <key>StandardOutPath</key><string>${xmlEscape(logPath)}</string>
@@ -486,19 +490,26 @@ async function materializeWorkerScript(sourceBytes) {
     if (source !== installedScript) await copyFile(source, installedScript);
   }
   if (process.platform !== 'win32') await chmod(installedScript, 0o700);
-  // Companion modules + macOS helper source (computer use). Best-effort beside the worker.
+  // Companion modules + OS helpers (computer use). Best-effort beside the worker.
   try {
     const here = dirname(fileURLToPath(import.meta.url));
-    const computerSrc = join(here, 'computer-macos.mjs');
-    const computerDest = join(configDir, 'computer-macos.mjs');
-    if (existsSync(computerSrc) && computerSrc !== computerDest) {
-      await copyFile(computerSrc, computerDest);
-      if (process.platform !== 'win32') await chmod(computerDest, 0o700);
-    }
-    if (process.platform === 'darwin') {
-      const { materializeComputerHelperSources } = await import('./computer-macos.mjs');
-      await materializeComputerHelperSources(configDir);
+    const companions = [
+      'computer.mjs',
+      'computer-shared.mjs',
+      'computer-macos.mjs',
+      'computer-linux.mjs',
+      'computer-windows.mjs',
+    ];
+    for (const name of companions) {
+      const src = join(here, name);
+      const dest = join(configDir, name);
+      if (existsSync(src) && src !== dest) {
+        await copyFile(src, dest);
+        if (process.platform !== 'win32') await chmod(dest, 0o700);
+      }
     }
+    const { materializeComputerHelperSources } = await import('./computer.mjs');
+    await materializeComputerHelperSources(configDir);
   } catch {
     // Install still succeeds; computer-use probe will explain if the helper is missing.
   }
@@ -816,17 +827,7 @@ async function executeShell(task) {
 
 async function execute(task) {
   if (task.kind === 'computer') {
-    if (process.platform !== 'darwin') {
-      return {
-        taskId: task.id,
-        exitCode: 1,
-        stdout: '',
-        stderr: 'Computer use is supported on macOS Jian Remote only.',
-        timedOut: false,
-        computer: { ok: false, error: 'Computer use is supported on macOS Jian Remote only.' },
-      };
-    }
-    const { executeComputerTask } = await import('./computer-macos.mjs');
+    const { executeComputerTask } = await import('./computer.mjs');
     return executeComputerTask(task);
   }
   return executeShell(task);
@@ -940,20 +941,35 @@ async function postResult(base, headers, result) {
 async function run() {
   const config = await loadConfig();
   const capabilities = [];
+  let probeMacUiState = () => 'unknown';
+  try {
+    const { probeComputerCapability, computerCapabilityName } = await import('./computer.mjs');
+    const name = computerCapabilityName();
+    if (name && (await probeComputerCapability())) capabilities.push(name);
+  } catch {
+    // Computer use unavailable until helper is ready; shell tasks still work.
+  }
   if (process.platform === 'darwin') {
     try {
-      const { probeComputerCapability, COMPUTER_CAPABILITY } = await import('./computer-macos.mjs');
-      if (await probeComputerCapability()) capabilities.push(COMPUTER_CAPABILITY);
+      const mac = await import('./computer-macos.mjs');
+      mac.startWorkerIdleAssertion(process.pid);
+      probeMacUiState = () => mac.probeMacUiState();
+      for (const signal of ['SIGINT', 'SIGTERM']) {
+        process.once(signal, () => {
+          mac.stopWorkerIdleAssertion();
+        });
+      }
     } catch {
-      // Computer use unavailable until helper builds; shell tasks still work.
+      // Idle assertion / uiState probe optional; shell still works.
     }
   }
-  const headers = {
+  const pollHeaders = () => ({
     authorization: `Bearer ${config.token}`,
     'x-jian-platform': `${process.platform}-${process.arch}`,
     'x-jian-remote-version': PACKAGE_VERSION,
+    'x-jian-remote-ui-state': probeMacUiState(),
     ...(capabilities.length ? { 'x-jian-remote-capabilities': capabilities.join(',') } : {}),
-  };
+  });
   const base = `${config.gateway}/v1/remote/worker/${config.machineId}`;
   // Fail fast before the poll loop so an incompatible build does not look "online then stuck".
   const gatewayVersion = await assertCompatibleWithGateway(config.gateway);
@@ -978,6 +994,7 @@ async function run() {
   };
   while (true) {
     try {
+      const headers = pollHeaders();
       if (Date.now() >= nextUpdateCheck) {
         await ensureCompatible();
         await updateIfNeeded(base, headers);