@walkhi/code-relax 0.1.0-beta.33 → 0.1.0-beta.35

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.33"}
+{"layout":"npm-platform-packages","version":"0.1.0-beta.35"}

package/dist/src/managed-app-server.mjs

@@ -35,6 +35,7 @@ export class ManagedAppServer extends EventEmitter {
     this.recordPath = path.join(stateRoot, 'managed-app-server.json');
     this.client = client;
     this.state = { state: 'absent', ready: false, error: null };
+    this.client.diagnosticIdentity = () => ({ kernelPid: this.state.pid ?? null, kernelCreated: this.state.created ?? null });
     this.restartStatus = null;
     this.stopped = true;
     this.restarting = false;

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/dist/src/shared-app-server.mjs

@@ -13,7 +13,7 @@ const writerConflictMessages = ['already has an active writer', 'already has a l
 
 export class ThreadWriterConflictError extends Error {
   constructor(threadId, message) {
-    super('该对话正在另一个 Codex 实例中使用。');
+    super('该对话存在写入冲突，请稍后重试。');
     this.name = 'ThreadWriterConflictError';
     this.code = 'thread_writer_owned_elsewhere';
     this.threadId = threadId;
@@ -37,6 +37,7 @@ export class SharedAppServer extends EventEmitter {
     this.serverVersion = '';
     this.epoch = randomUUID();
     this.sequence = 0;
+    this.connectionId = null;
     this.pending = new Map();
     this.serverRequests = new serverRequests.Store(randomUUID(), id => {
       this.emit('requests-changed', id);
@@ -64,6 +65,7 @@ export class SharedAppServer extends EventEmitter {
   async open() {
     const socket = await this.openSocket();
     this.socket = socket;
+    this.connectionId = randomUUID();
     this.ready = false;
     this.serverVersion = '';
     this.serverRequests.reset(randomUUID());
@@ -78,12 +80,16 @@ export class SharedAppServer extends EventEmitter {
       clearTimeout(pending.timer);
       if (message.error) {
         const text = String(message.error.message || 'app-server 请求失败');
+        this.traceLifecycle('error', pending, { rpcCode: message.error.code,
+          writerError: writerConflictMessages.find(value => text.toLowerCase().includes(value)) || null });
         pending.reject(writerConflictMessages.some(value => text.toLowerCase().includes(value))
           ? new ThreadWriterConflictError(pending.threadId, text)
           : Object.assign(new Error(text), { rpcCode: message.error.code, details: message.error.data,
             ...(/^invalid cursor:/i.test(text) ? { code: 'history_cursor_expired' } : {}) }));
       }
       else {
+        this.traceLifecycle('complete', pending, { status: message.result?.status,
+          resultThreadId: message.result?.thread?.id });
         try { pending.resolve(pending.transform(message.result)); }
         catch (error) { pending.reject(error); }
       }
@@ -93,6 +99,7 @@ export class SharedAppServer extends EventEmitter {
       this.serverVersion = '';
       for (const pending of this.pending.values()) {
         clearTimeout(pending.timer);
+        this.traceLifecycle('disconnected', pending);
         pending.reject(new Error('Codex 内核连接断开；发送结果可能未确认，请检查对话后再操作。'));
       }
       this.pending.clear();
@@ -121,24 +128,44 @@ export class SharedAppServer extends EventEmitter {
 
   request(method, params, transform = value => value) {
     const id = ++this.sequence;
+    const diagnostic = { method, requestId: id, threadId: params?.threadId, connectionId: this.connectionId,
+      ...(method === 'thread/settings/update' && params?.serviceTier !== undefined ? { serviceTier: params.serviceTier } : {}) };
+    this.traceLifecycle('begin', diagnostic);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         const error = Object.assign(new Error(`${method} 超时；不会自动重发，请先检查对话。`),
           { code: 'app_server_request_timeout' });
+        this.traceLifecycle('timeout', diagnostic);
         if ((method === 'turn/start' || method === 'turn/steer') && this.pending.has(id)) {
           messageDelivery.retainLateResult(this.pending.get(id), error);
         } else { this.pending.delete(id); reject(error); }
       }, 30000);
-      this.pending.set(id, { resolve, reject, timer, transform, threadId: params?.threadId });
+      this.pending.set(id, { resolve, reject, timer, transform, ...diagnostic });
       this.socket.send(JSON.stringify({ id, method, params }), error => {
         const pending = this.pending.get(id);
         if (!error || !pending) return;
+        this.traceLifecycle('send-error', diagnostic);
         this.pending.delete(id);
         clearTimeout(timer); pending.reject(error);
       });
     });
   }
 
+  traceLifecycle(phase, request, extra = {}) {
+    if (!['thread/start', 'thread/resume', 'thread/unsubscribe', 'thread/settings/update', 'thread/settings/updated'].includes(request.method)) return;
+    const threadId = value => typeof value === 'string' && /^[\w-]{1,80}$/.test(value) ? value : null;
+    const identity = this.diagnosticIdentity?.() || {};
+    console.info('[thread-lifecycle]', JSON.stringify({ time: new Date().toISOString(), bridgePid: process.pid,
+      kernelPid: identity.kernelPid ?? null, kernelCreated: identity.kernelCreated ?? null,
+      connectionId: request.connectionId, serverVersion: this.serverVersion, phase,
+      method: request.method, requestId: request.requestId, threadId: threadId(request.threadId),
+      ...([null, 'default', 'priority', 'fast'].includes(request.serviceTier) ? { serviceTier: request.serviceTier } : {}),
+      ...(extra.resultThreadId ? { resultThreadId: threadId(extra.resultThreadId) } : {}),
+      ...(typeof extra.status === 'string' && /^[\w-]{1,40}$/.test(extra.status) ? { status: extra.status } : {}),
+      ...(typeof extra.rpcCode === 'number' ? { rpcCode: extra.rpcCode } : {}),
+      ...(extra.writerError ? { writerError: extra.writerError } : {}) }));
+  }
+
   async projects() {
     await this.connect();
     return events.readProjects((method, params) => this.request(method, params));
@@ -190,6 +217,7 @@ export class SharedAppServer extends EventEmitter {
     const id = params.threadId;
     if (method === 'thread/settings/updated') {
       const settings = params.threadSettings;
+      this.traceLifecycle('notification', { method, threadId: id, connectionId: this.connectionId, serviceTier: settings.serviceTier ?? null });
       this.contexts.set(id, { ...this.contexts.get(id), model: settings.model, thinking: settings.effort, serviceTier: settings.serviceTier ?? null,
         cwd: settings.cwd, ...events.permissionState(settings) });
       this.settingsNotifications.set(id, settings);
@@ -315,7 +343,7 @@ export class SharedAppServer extends EventEmitter {
         } catch (error) {
           snapshot?.close();
           if (!isThreadWriterConflict(error)) throw error;
-          record = await this.readOnlyRecord(threadId, pageOptions, '该对话正在另一个 Codex 实例中使用。');
+          record = await this.readOnlyRecord(threadId, pageOptions, '该对话存在写入冲突，请稍后重试。');
           result = null;
         }
         if (result) try {
@@ -390,11 +418,18 @@ export class SharedAppServer extends EventEmitter {
     slot.tail = slot.tail.then(async () => {
       if (this.subscriptions.get(threadId) !== slot) return;
       if (slot.users || slot.readers || this.threads.get(threadId)?.tokens.size || this.keepThreadLoaded(threadId, this.threads.get(threadId))) return;
-      this.threads.delete(threadId); this.contexts.delete(threadId); this.permissionOptions.delete(threadId);
-      this.subscriptions.delete(threadId); clearTimeout(slot.expiry);
       if (this.ready && !record?.readOnly) await this.unsubscribeThread(threadId);
+      // Keep this queue registered until unsubscribe completes. A returning reader
+      // must enqueue its resume behind it, rather than creating a second queue.
+      if (this.subscriptions.get(threadId) !== slot) return;
+      this.threads.delete(threadId); this.contexts.delete(threadId); this.permissionOptions.delete(threadId);
+      if (!slot.users && !slot.readers) this.subscriptions.delete(threadId);
+      clearTimeout(slot.expiry);
       this.serverRequests.forget(threadId);
-    }).catch(error => this.emit('subscription-error', error));
+    }).catch(error => {
+      if (this.subscriptions.get(threadId) === slot && this.threads.get(threadId) === record && record) record.needsReload = true;
+      this.emit('subscription-error', error);
+    });
   }
 
   keepThreadLoaded(threadId, record) {

package/package.json

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