@walkhi/code-relax 0.1.0-beta.32 → 0.1.0-beta.34

package/dist/bin/codex-remote.mjs

@@ -23,6 +23,7 @@ import { controlRequest } from '../src/service-control.mjs';
 import { processAlive } from '../src/background-process.mjs';
 import { prepareNativePackage } from '../src/platform/native-package.mjs';
 import { managedAppServerUrl } from '../src/managed-app-server.mjs';
+import { powerConfigPath, powerEnabled } from '../src/service-power.mjs';
 import { readDotsTasks } from '../src/dots-task-catalog.mjs';
 import { installDesktopHelper, desktopHelperStatus, removeDesktopHelper } from '../src/platform/windows/desktop-helper.mjs';
 
@@ -45,6 +46,8 @@ const help = `Code Relax（Windows / macOS / Linux）
   desktop-helper-remove （Windows）移除桌面操作辅助服务，需要工作站 UAC 授权
   doctor  简单检查工作站是否正常
   diag 输出详细诊断报告，供客服或技术人员排查
+  keep-awake 默认保持电脑唤醒；查看状态
+  keep-awake on|off 开启或关闭保持唤醒，立即生效并记住选择；允许屏幕熄灭
   kernel-restart --confirm 重启 Codex 内核并启用已选更新；等待新内核就绪
   desktop-recover --confirm 重新打开 Desktop 并接入 Codex 内核；不强制重启已有内核
   uninstall 停止并移除固定目录服务和本包 Skill，清理自有 Desktop 环境变量，保留其他配置与附件
@@ -71,8 +74,10 @@ async function main() {
   const longPair = command === 'pair' && options.length === 2 && options[0] === '--expires';
   const revokeInvite = command === 'pair-revoke' && options.length === 1 && /^[\w-]{16,128}$/.test(options[0]);
   const revokeDevice = command === 'device-revoke' && options.length === 2 && /^[\w-]{16,128}$/.test(options[0]) && options[1] === '--confirm';
-  if (!['kernel-restart', 'desktop-recover', 'setup', 'doctor', 'diag', 'uninstall', 'start', 'pair', 'pair-list', 'pair-revoke', 'devices', 'device-revoke', 'dots-tasks', 'desktop-helper-install', 'desktop-helper-status', 'desktop-helper-remove'].includes(command)
-    || (!longPair && !revokeInvite && !revokeDevice && (['pair-revoke', 'device-revoke'].includes(command) || options.some(flag => !((['kernel-restart', 'desktop-recover'].includes(command) && flag === '--confirm') || (command === 'setup' && flag === '--desktop-helper')))))) {
+  const powerCommand = command === 'keep-awake';
+  if (powerCommand && !(options.length === 0 || options.length === 1 && ['on', 'off'].includes(options[0]))) throw new Error('用法：relax keep-awake [on|off]');
+  if (!['keep-awake', 'kernel-restart', 'desktop-recover', 'setup', 'doctor', 'diag', 'uninstall', 'start', 'pair', 'pair-list', 'pair-revoke', 'devices', 'device-revoke', 'dots-tasks', 'desktop-helper-install', 'desktop-helper-status', 'desktop-helper-remove'].includes(command)
+    || (!powerCommand && !longPair && !revokeInvite && !revokeDevice && (['pair-revoke', 'device-revoke'].includes(command) || options.some(flag => !((['kernel-restart', 'desktop-recover'].includes(command) && flag === '--confirm') || (command === 'setup' && flag === '--desktop-helper')))))) {
     throw new Error('无效命令或参数。使用 --help 查看用法。');
   }
   const inviteExpires = longPair ? Date.parse(options[1]) : undefined;
@@ -100,6 +105,25 @@ async function main() {
   }
   const paths = runtimePaths();
   const { stateRoot, serviceRoot } = paths;
+  if (powerCommand) {
+    const session = readRecord(path.join(stateRoot, 'bridge-session.json'));
+    let live = false;
+    if (session?.controlPort) {
+      try { await controlRequest(session); live = true; }
+      catch (error) { if (error.code !== 'ECONNREFUSED') throw error; }
+    }
+    let result;
+    if (live) {
+      const action = options[0] === 'on' ? 'enable' : options[0] === 'off' ? 'disable' : 'status';
+      result = await controlRequest(session, 'POST', `keep-awake-${action}`);
+    } else {
+      if (options.length) { fs.mkdirSync(stateRoot, { recursive: true }); writeRecord(powerConfigPath(stateRoot), { enabled: options[0] === 'on' }); }
+      result = { enabled: powerEnabled(stateRoot), active: false, error: '', serviceStopped: true };
+    }
+    console.log(json ? JSON.stringify(result) : `保持唤醒：${result.enabled ? '已开启' : '已关闭'}；${result.active ? '正在生效，允许屏幕熄灭' : result.serviceStopped ? '服务未运行，下次启动应用此设置' : result.error || '未生效'}`);
+    if (result.error) process.exitCode = 1;
+    return;
+  }
   const installedEntry = path.join(serviceRoot, 'dist/bin/codex-remote.mjs');
   const installationPath = path.join(serviceRoot, 'installation.json');
   const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(Number);

package/dist/build-platform.json

@@ -1 +1 @@
-{"layout":"npm-platform-packages","version":"0.1.0-beta.32"}
+{"layout":"npm-platform-packages","version":"0.1.0-beta.34"}

package/dist/src/platform/power-inhibitor.mjs

@@ -0,0 +1,22 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawn } from 'node:child_process';
+
+// stdin is a lifetime lease: even an abrupt service exit releases the assertion.
+export function launchPowerInhibitor() {
+  const lease = "process.stdin.resume();process.stdin.on('end',()=>process.exit(0));console.log('ready')";
+  let executable, args;
+  if (process.platform === 'darwin') {
+    executable = '/usr/bin/caffeinate';
+    args = ['-i', process.execPath, '-e', lease];
+  } else if (process.platform === 'win32') {
+    executable = path.join(process.env.SystemRoot || 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe');
+    args = ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File',
+      fileURLToPath(new URL('./windows/keep-awake.ps1', import.meta.url))];
+  } else if (process.platform === 'linux') {
+    executable = '/usr/bin/systemd-inhibit';
+    args = ['--what=idle', '--mode=block', '--who=Code Relax', '--why=Workstation remote access',
+      process.execPath, '-e', lease];
+  } else throw new Error(`保持唤醒不支持当前系统：${process.platform}`);
+  return spawn(executable, args, { stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });
+}

package/dist/src/platform/windows/keep-awake.ps1

@@ -0,0 +1,20 @@
+$ErrorActionPreference = 'Stop'
+Import-Module "$env:SystemRoot\System32\WindowsPowerShell\v1.0\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1"
+Add-Type -TypeDefinition @'
+using System;
+using System.Runtime.InteropServices;
+public static class CodeRelaxPowerLease {
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern uint SetThreadExecutionState(uint flags);
+    public static void Hold() {
+        if (SetThreadExecutionState(0x80000001u) == 0)
+            throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
+        try {
+            Console.WriteLine("ready");
+            Console.Out.Flush();
+            Console.In.ReadLine();
+        } finally { SetThreadExecutionState(0x80000000u); }
+    }
+}
+'@
+[CodeRelaxPowerLease]::Hold()

package/dist/src/server.mjs

@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
 import { RustDeskVideoProbe } from './platform/windows/rustdesk-video-probe.mjs';
 import fs from 'node:fs';
 import http from 'node:http';
+import { createPowerManager } from './service-power.mjs';
 import path from 'node:path';
 import os from 'node:os';
 import { fileURLToPath } from 'node:url';
@@ -307,6 +308,7 @@ async function handleRequest(request, response) {
       const executionReady = executionHealth.state.ready && sharedServer?.ready === true;
       sendJson(response, 200, {
         status: 'ok', resident: true, version: runtimeVersion,
+        keepAwake: powerManager.snapshot(),
         execution: { ...executionHealth.state, ready: executionReady, canWrite: executionReady,
           mode: executionMode },
         managedAppServer: managedAppServer.snapshot(),
@@ -975,6 +977,7 @@ const lanSocket = attachLanSocket(server, { token: options.token, dispatch: hand
 });
 
 let control;
+const powerManager = createPowerManager(stateRoot);
 void managedAppServer.start();
 executionHealth.start();
 runtimeDiscovery.start();
@@ -984,10 +987,14 @@ server.on('error', error => {
 });
 server.listen(options.port, options.lan ? '0.0.0.0' : '127.0.0.1', async () => {
   try {
+    await powerManager.start();
     if (process.env.CODEX_REMOTE_INSTANCE && process.env.CODEX_REMOTE_CONTROL_SECRET && process.env.CODEX_REMOTE_READY_PATH) {
       control = await openControl({ instanceId: process.env.CODEX_REMOTE_INSTANCE,
         secret: process.env.CODEX_REMOTE_CONTROL_SECRET, shutdown: shutDown, actions: {
           'refresh-execution': refreshExecution,
+          'keep-awake-status': () => powerManager.snapshot(),
+          'keep-awake-enable': () => powerManager.setEnabled(true),
+          'keep-awake-disable': () => powerManager.setEnabled(false),
           'relay-start': () => relayManager.run('relay-start'),
           'relay-status': () => relayManager.run('relay-status'),
           'relay-stop': () => relayManager.run('relay-stop'),
@@ -1021,6 +1028,7 @@ let shuttingDown = false;
 async function shutDown() {
   if (shuttingDown) return;
   shuttingDown = true;
+  await powerManager.close();
   desktopHelper?.release();
   lanSocket.close();
   server.close();

package/dist/src/service-doctor.mjs

@@ -38,6 +38,12 @@ export async function doctor({ paths, host, service, skillTarget, ensureAutostar
   await check('service', async () => {
     const state = await service.status();
     serviceState = state;
+    if (state.keepAwake) {
+      const power = state.keepAwake;
+      add('keep-awake', power.enabled && !power.active ? 'warning' : 'ok',
+        power.active ? '保持唤醒已生效，允许屏幕熄灭。' : !power.enabled ? '保持唤醒已由 CLI 关闭。'
+          : `保持唤醒未生效：${power.error || '未知原因'}；可执行 relax keep-awake on 重新申请。`);
+    }
     add('service', state.running ? 'ok' : 'error', state.running
       ? `本机服务正常：${state.mode}，端口 ${state.port}，运行版本：${state.version || '未知'}` : '服务未就绪；安装后执行 relax start。');
     if (state.running && installedVersion && state.version !== installedVersion) add('service-version', 'warning', state.version
@@ -78,7 +84,7 @@ export async function doctor({ paths, host, service, skillTarget, ensureAutostar
 }
 
 export function formatDoctorOutput(result, detail = false) {
-  const labels = { installation: '安装文件', 'bridge-runtime': '运行环境', network: '局域网',
+  const labels = { 'keep-awake': '保持唤醒', installation: '安装文件', 'bridge-runtime': '运行环境', network: '局域网',
     autostart: '登录自启动', service: '工作站服务', 'managed-app-server': 'Codex 内核',
     'service-version': '服务版本', 'managed-app-server-update': 'Codex 更新',
     'managed-app-server-launcher': '工作站更新', skill: 'Codex Skill' };

package/dist/src/service-lifecycle.mjs

@@ -57,6 +57,7 @@ export function lifecycle({ stateRoot, host }) {
     return { running: running && result?.status === 'ok', processRunning: running, pid: session?.pid,
       port: session?.port, mode: result?.transportMode, version: result?.version, execution: result?.execution,
       managedAppServer: result?.managedAppServer, desktop: result?.desktop,
+      keepAwake: result?.keepAwake,
       desktopRestartRecommended: result?.desktopRestartRecommended === true,
       resident: result?.resident === true };
   }

package/dist/src/service-power.mjs

@@ -0,0 +1,58 @@
+import path from 'node:path';
+import { readRecord, writeRecord } from './service-lifecycle.mjs';
+import { launchPowerInhibitor } from './platform/power-inhibitor.mjs';
+
+export const powerConfigPath = stateRoot => path.join(stateRoot, 'keep-awake.json');
+export const powerEnabled = stateRoot => readRecord(powerConfigPath(stateRoot))?.enabled !== false;
+
+export function createPowerManager(stateRoot, { launch = launchPowerInhibitor, report = console.error } = {}) {
+  let enabled = powerEnabled(stateRoot), active = false, error = '', child = null, closed, stopping = false;
+  let queue = Promise.resolve();
+  const snapshot = () => ({ enabled, active, error });
+  async function release() {
+    if (!child) return;
+    stopping = true;
+    child.stdin.end();
+    await closed;
+  }
+  async function acquire() {
+    if (child || !enabled) return;
+    error = '';
+    try {
+      const process = launch();
+      stopping = false;
+      child = process;
+      let stderr = '', output = '';
+      process.stderr.on('data', data => { stderr = (stderr + data).slice(-2048); });
+      process.stdin.on('error', cause => { if (cause.code !== 'EPIPE') report(`保持唤醒通道异常：${cause.message}`); });
+      closed = new Promise(resolve => process.once('close', code => {
+        if (active && !stopping) { error = stderr.trim() || `保持唤醒进程意外退出（${code}）`; report(error); }
+        child = null; active = false; resolve();
+      }));
+      await new Promise((resolve, reject) => {
+        const timer = setTimeout(() => { process.kill(); reject(new Error('保持唤醒申请超时')); }, 8000);
+        const finish = cause => { clearTimeout(timer); cause ? reject(cause) : resolve(); };
+        process.once('error', finish);
+        process.once('close', code => {
+          finish(new Error(stderr.trim() || `保持唤醒进程已退出（${code}）`));
+        });
+        process.stdout.on('data', data => {
+          output += data;
+          if (output.includes('ready\n') || output.includes('ready\r\n')) { active = true; finish(); }
+        });
+      });
+    } catch (cause) { error = cause.message; report(`保持唤醒未生效：${error}`); }
+  }
+  const serial = task => { const result = queue.then(task); queue = result.catch(() => {}); return result; };
+  return {
+    snapshot,
+    start: () => serial(async () => { await acquire(); return snapshot(); }),
+    setEnabled: value => serial(async () => {
+      writeRecord(powerConfigPath(stateRoot), { enabled: value });
+      enabled = value;
+      if (enabled) await acquire(); else { await release(); error = ''; }
+      return snapshot();
+    }),
+    close: () => serial(async () => { enabled = false; await release(); }),
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.32",
+  "version": "0.1.0-beta.34",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",
@@ -41,8 +41,8 @@
     "tag": "beta"
   },
   "optionalDependencies": {
-    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.32",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.32",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.32"
+    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.34",
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.34",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.34"
   }
 }

package/tools/postinstall.mjs

@@ -53,14 +53,52 @@ export function formatSetupOutput(output) {
   try {
     const result = JSON.parse(output);
     const migration = result.managedAppServerMigration || {};
-    return `Code Relax ${result.version || '未知版本'} 安装成功。\n`
+    return `Code Relax ${result.version || '未知版本'} 服务安装完成。\n`
       + '工作站服务和 Codex 内核已就绪，已启用登录自启。\n'
       + (migration.restarted ? 'Codex 内核已更新并重启；请检查安装前正在进行的任务。\n' : '')
-      + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '')
-      + '生成配对二维码：relax pair\n';
+      + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '');
   } catch { return output; }
 }
 
+// npm owns command links. Inspect them without changing the user's shell configuration.
+export function commandDiagnostics(entry, { prefix, env = process.env, platform = process.platform } = {}) {
+  const windows = platform === 'win32';
+  const bin = windows ? prefix : path.join(prefix, 'bin');
+  const command = path.join(bin, windows ? 'relax.cmd' : 'relax');
+  const lines = [`命令入口：${command}`];
+  let linkReady = false;
+  try {
+    if (windows) {
+      const shim = fs.readFileSync(command, 'utf8');
+      linkReady = shim.replaceAll('\\', '/').includes('node_modules/@walkhi/code-relax/dist/bin/codex-remote.mjs') && fs.existsSync(entry);
+    } else {
+      linkReady = fs.realpathSync(command) === fs.realpathSync(entry);
+      fs.accessSync(command, fs.constants.X_OK);
+    }
+    lines.push(linkReady ? '命令链接：正常' : '命令链接：目标与本次安装不一致');
+  } catch (error) {
+    linkReady = false;
+    lines.push(`命令链接：不可用（${error.code || error.message}）`);
+  }
+  const normalize = value => {
+    let resolved;
+    try { resolved = fs.realpathSync(value); } catch { resolved = path.resolve(value); }
+    return windows ? resolved.toLowerCase() : resolved;
+  };
+  const pathValue = Object.entries(env).find(([key]) => key.toLowerCase() === 'path')?.[1] || '';
+  const onPath = pathValue.split(windows ? ';' : ':').filter(Boolean)
+    .some(value => normalize(value.replace(/^"|"$/g, '')) === normalize(bin));
+  lines.push(`安装进程 PATH：${onPath ? '包含' : '未包含'}全局命令目录`);
+  lines.push('注：npm 会调整安装进程 PATH；当前终端能否直接找到命令仍以终端为准。');
+  if (!linkReady) lines.push('CLI 入口异常；服务状态请以上方健康检查为准，请保留本次诊断输出。');
+  else if (!onPath) lines.push('全局命令目录未在 PATH 中，可先使用下方完整路径命令。');
+  const quote = value => "'" + value.replaceAll("'", windows ? "''" : "'\"'\"'") + "'";
+  const direct = `${windows ? '& ' : ''}${quote(process.execPath)} ${quote(entry)}`;
+  lines.push(`无需依赖 relax 命令的检查入口${windows ? '（PowerShell）' : ''}：`, `${direct} doctor`);
+  lines.push('生成配对二维码：', `${direct} pair`);
+  return lines.join('\n') + '\n';
+}
+
 function installationSnapshot() {
   const recordPath = path.join(serviceRoot, 'installation.json');
   if (!fs.existsSync(serviceRoot)) return { exists: false, valid: false };
@@ -113,8 +151,13 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
     setupStarted = true;
     runStage(entry, 'setup', ['setup', '--json'], output => formatSetupOutput(output));
+    try { runStage(entry, 'doctor', ['doctor']); }
+    catch (error) {
+      console.error('服务安装已完成，但安装后健康检查未通过；请查看上方诊断与安装日志。');
+      process.exitCode = 1;
+    }
     console.log(`安装日志：${installLog}`);
-    appendLog('[postinstall] success');
+    appendLog(process.exitCode ? '[postinstall] failed stage=doctor' : '[postinstall] success');
   } catch (error) {
     const current = installationSnapshot();
     if (!setupStarted) console.error(`平台组件检查失败：${error.message}`);
@@ -123,5 +166,16 @@ if (invokedDirectly && process.env.npm_config_global === 'true') {
     console.error(`安装日志：${installLog}`);
     appendLog('[postinstall] failed stage=setup');
     process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
+  } finally {
+    try {
+      const prefix = execFileSync(process.execPath, [process.env.npm_execpath, 'prefix', '--global'],
+        { encoding: 'utf8', windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+      const output = commandDiagnostics(entry, { prefix });
+      process.stdout.write(output);
+      appendLog(`[command-diagnostics]\n${output}`);
+    } catch (error) {
+      console.error(`命令入口诊断失败：${error.message}`);
+      appendLog(`[command-diagnostics] failed: ${error.message}`);
+    }
   }
 }