@walkhi/code-relax 0.1.0-beta.29 → 0.1.0-beta.30

package/dist/src/shared-recovery.mjs

@@ -1,144 +1,146 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-import { setTimeout as delay } from 'node:timers/promises';
-import { fileURLToPath } from 'node:url';
-import { readRecord, writeRecord, lifecycle } from './service-lifecycle.mjs';
-import { startBackground } from './background-process.mjs';
-import { desktopHost } from './platform/windows/desktop-host.mjs';
-import * as serviceHost from './platform/windows/service-host.mjs';
-import { launchDesktop, portAvailable } from './desktop-launcher.mjs';
-import { configureManagedEnvironment } from './platform/windows/user-environment.mjs';
-
-const script = fileURLToPath(import.meta.url);
-const recordPath = root => path.join(root, 'shared-recovery.json');
-const lockPath = root => path.join(root, 'shared-recovery.lock');
-const sameProcess = (a, b) => a && b && a.pid === b.pid && a.created === b.created && a.executable === b.executable;
-const active = value => value && ['scheduled', 'running'].includes(value.status);
-const recoverySteps = () => [
-  ['checking', '检查启动条件'], ['stopping-desktop', '关闭当前 Codex'],
-  ['starting-app-server', '确认 Codex 内核'], ['starting-desktop', '重新打开 Codex'],
-  ['checking-execution', '确认移动端控制就绪'],
-].map(([id, label]) => ({ id, label, status: 'pending' }));
-export const recoveryWarning = 'Codex Desktop 需要重新打开，才能接入同一个 Codex 内核。移动端连接和 Codex 内核会保持运行；旧 Desktop 实例中的任务可能中断，未发送内容请先保存。切换不会清空项目、对话历史、设置或设备授权。';
-
-export async function recoveryStatus(stateRoot, host = desktopHost) {
-  const record = readRecord(recordPath(stateRoot));
-  if (!record) return { status: 'none', message: '尚未执行 Desktop 接入流程。' };
-  const lostWorker = active(record) && (record.worker
-    ? !sameProcess(record.worker, await host.process(record.worker.pid))
-    : Date.now() - Date.parse(record.startedAt) > 30000);
-  if (lostWorker) {
-    record.status = 'failed'; record.error = '独立恢复进程已退出，恢复未完成。';
-    record.steps = record.steps?.map(step => ({ ...step, status: step.status === 'running' ? 'failed' : step.status }));
-    writeRecord(recordPath(stateRoot), record);
-    if (readRecord(lockPath(stateRoot))?.operationId === record.operationId) fs.rmSync(lockPath(stateRoot));
-  }
-  const { worker, oldService, desktop, ...publicRecord } = record;
-  return publicRecord;
-}
-
-export async function planRecovery(stateRoot, host, available = portAvailable) {
-  const info = await host.inspect();
-  const action = await host.sharedServiceUrl() ? 'restart' : 'switch';
-  if (!info.desktop) throw new Error('未找到 Codex Desktop；CLI 用户无需执行 Desktop 接入。');
-  const record = readRecord(path.join(stateRoot, 'managed-app-server.json'));
-  const actual = record ? await host.process(record.pid) : null;
-  if (actual && (!sameProcess(record, actual) || !actual.command?.includes('app-server') || !actual.command.includes('ws://127.0.0.1:45839'))) {
-    throw new Error('Codex 内核进程身份与记录不符，未结束任何进程。');
-  }
-  if (!actual && !await available()) throw new Error('45839 被未识别进程占用，未关闭 Desktop 或结束任何进程。');
-  return { desktop: info.desktop, action };
-}
-
-export async function requestRecovery(stateRoot, { confirmed, operationId = randomUUID() } = {}, host = desktopHost) {
-  if (confirmed !== true) throw new Error(recoveryWarning + ' 请明确确认后再执行。');
-  if (!/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(operationId)) throw new Error('无效的恢复操作编号。');
-  fs.mkdirSync(stateRoot, { recursive: true });
-  const previous = await recoveryStatus(stateRoot, host);
-  if (previous.operationId === operationId) return previous;
-  if (active(previous)) throw new Error('已有恢复操作正在执行，请查看恢复状态。');
-  const planned = await planRecovery(stateRoot, host);
-  let lock;
-  try { lock = fs.openSync(lockPath(stateRoot), 'wx'); }
-  catch (error) { if (error.code === 'EEXIST') throw new Error('已有恢复操作，请先查看恢复状态。'); throw error; }
-  fs.writeFileSync(lock, JSON.stringify({ operationId })); fs.closeSync(lock);
-  const record = { operationId, status: 'scheduled', stage: 'prepared', startedAt: new Date().toISOString(),
-    message: 'Codex 连接请求已接受，电脑管理连接保持运行。', steps: recoverySteps(), ...planned };
-  try {
-    writeRecord(recordPath(stateRoot), record);
-    const log = path.join(stateRoot, 'shared-recovery.log');
-    const pid = await startBackground(process.execPath, [script, '--worker', stateRoot, operationId], process.env, [log, log]);
-    const worker = await host.process(pid);
-    if (!worker) throw new Error('独立恢复进程未启动，请查看 shared-recovery.log。');
-    // Publish the process identity before allowing the worker to begin disruption.
-    writeRecord(recordPath(stateRoot), { ...record, worker });
-    return { operationId, status: record.status, message: record.message };
-  } catch (error) {
-    writeRecord(recordPath(stateRoot), { ...record, status: 'failed', error: error.message });
-    fs.rmSync(lockPath(stateRoot), { force: true }); throw error;
-  }
-}
-
-export async function runRecovery(stateRoot, operationId, dependencies = {}) {
-  const host = dependencies.host || desktopHost;
-  const service = dependencies.service || lifecycle({ stateRoot, host: serviceHost });
-  const available = dependencies.available || portAvailable;
-  const start = dependencies.launch || launchDesktop;
-  let record = readRecord(recordPath(stateRoot));
-  if (record?.operationId !== operationId || readRecord(lockPath(stateRoot))?.operationId !== operationId) throw new Error('恢复实例已失效。');
-  record.steps ||= recoverySteps();
-  const stage = name => {
-    record = { ...record, status: 'running', stage: name, steps: record.steps.map(step => ({ ...step,
-      status: step.id === name ? 'running' : step.status === 'running' ? 'completed' : step.status })) };
-    writeRecord(recordPath(stateRoot), record);
-  };
-  const waitFor = async (check, message) => {
-    const deadline = Date.now() + (dependencies.timeout ?? 10000);
-    while (!await check()) { if (Date.now() >= deadline) throw new Error(message); await delay(100); }
-  };
-  try {
-    stage('checking');
-    const planned = await planRecovery(stateRoot, host, available);
-    await configureManagedEnvironment(stateRoot);
-    record = { ...record, ...planned };
-    if (fs.existsSync(path.join(stateRoot, 'desktop-launch.lock'))) throw new Error('Desktop 正在启动，未与启动操作并行恢复。');
-    stage('stopping-desktop'); await host.closeDesktop(record.desktop);
-    await waitFor(async () => !(await host.inspect()).running, '当前 Codex Desktop 未退出，未继续接入 Codex 内核。');
-    stage('starting-app-server'); await start({ stateRoot, host, recoveryId: operationId, progress: stage });
-    stage('checking-execution');
-    await service.start(); // Refresh the execution adapter; resident Bridge retains its PID and sockets.
-    await waitFor(async () => {
-      const health = await service.status();
-      return health.running && health.mode === 'lan-shared' && health.execution?.ready === true;
-    }, 'Codex 内核未就绪；桌面服务和中继连接仍保留。');
-    record = { ...record, status: 'completed', stage: 'ready', steps: record.steps.map(step => ({ ...step, status: 'completed' })),
-      message: 'Codex Desktop 已接入 Codex 内核；移动端控制保持就绪，原任务未自动重发。' };
-  } catch (error) { record = { ...record, status: 'failed', error: error.message,
-    steps: record.steps.map(step => ({ ...step, status: step.status === 'running' ? 'failed' : step.status })),
-    message: 'Codex Desktop 未完成接入，已停止后续步骤。' }; }
-  finally {
-    record.finishedAt = new Date().toISOString(); writeRecord(recordPath(stateRoot), record);
-    if (readRecord(lockPath(stateRoot))?.operationId === operationId) fs.rmSync(lockPath(stateRoot));
-  }
-  return record;
-}
-
-if (process.argv[1] && path.resolve(process.argv[1]) === script && process.argv[2] === '--worker') {
-  const [stateRoot, operationId] = process.argv.slice(3);
-  (async () => {
-    const deadline = Date.now() + 15000;
-    while (true) {
-      const record = readRecord(recordPath(stateRoot));
-      if (record?.operationId !== operationId || record.status !== 'scheduled') throw new Error('恢复调度已失效。');
-      if (record.worker?.pid === process.pid) break;
-      if (Date.now() >= deadline) throw new Error('恢复启动交接超时。');
-      await delay(100);
-    }
-    // A deliberate handoff window lets the caller display the accepted operation ID.
-    await delay(3000);
-    const result = await runRecovery(stateRoot, operationId);
-    console.log(JSON.stringify({ operationId, status: result.status, stage: result.stage, error: result.error }));
-    process.exit(result.status === 'completed' ? 0 : 1);
-  })().catch(error => { console.error(error.message); process.exit(1); });
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { setTimeout as delay } from 'node:timers/promises';
+import { fileURLToPath } from 'node:url';
+import { readRecord, writeRecord, lifecycle } from './service-lifecycle.mjs';
+import { startBackground } from './background-process.mjs';
+import { desktopHost } from './platform/desktop-host.mjs';
+import * as serviceHost from './platform/service-host.mjs';
+import { launchDesktop, portAvailable } from './desktop-launcher.mjs';
+import { configureManagedEnvironment } from './platform/user-environment.mjs';
+
+const script = fileURLToPath(import.meta.url);
+const recordPath = root => path.join(root, 'shared-recovery.json');
+const lockPath = root => path.join(root, 'shared-recovery.lock');
+const sameProcess = (a, b) => a && b && a.pid === b.pid && a.created === b.created && a.executable === b.executable;
+const active = value => value && ['scheduled', 'running'].includes(value.status);
+const recoverySteps = () => [
+  ['checking', '检查启动条件'], ['stopping-desktop', '关闭当前 Codex'],
+  ['starting-app-server', '确认 Codex 内核'], ['starting-desktop', '重新打开 Codex'],
+  ['checking-execution', '确认移动端控制就绪'],
+].map(([id, label]) => ({ id, label, status: 'pending' }));
+export const recoveryWarning = 'Codex Desktop 需要重新打开，才能接入同一个 Codex 内核。移动端连接和 Codex 内核会保持运行；旧 Desktop 实例中的任务可能中断，未发送内容请先保存。切换不会清空项目、对话历史、设置或设备授权。';
+
+export async function recoveryStatus(stateRoot, host = desktopHost) {
+  if (host.desktopIntegration === false) return { status: 'unsupported', message: '此平台尚不支持 Desktop 自动接入。' };
+  const record = readRecord(recordPath(stateRoot));
+  if (!record) return { status: 'none', message: '尚未执行 Desktop 接入流程。' };
+  const lostWorker = active(record) && (record.worker
+    ? !sameProcess(record.worker, await host.process(record.worker.pid))
+    : Date.now() - Date.parse(record.startedAt) > 30000);
+  if (lostWorker) {
+    record.status = 'failed'; record.error = '独立恢复进程已退出，恢复未完成。';
+    record.steps = record.steps?.map(step => ({ ...step, status: step.status === 'running' ? 'failed' : step.status }));
+    writeRecord(recordPath(stateRoot), record);
+    if (readRecord(lockPath(stateRoot))?.operationId === record.operationId) fs.rmSync(lockPath(stateRoot));
+  }
+  const { worker, oldService, desktop, ...publicRecord } = record;
+  return publicRecord;
+}
+
+export async function planRecovery(stateRoot, host, available = portAvailable) {
+  const info = await host.inspect();
+  const action = await host.sharedServiceUrl() ? 'restart' : 'switch';
+  if (!info.desktop) throw new Error('未找到 Codex Desktop；CLI 用户无需执行 Desktop 接入。');
+  const record = readRecord(path.join(stateRoot, 'managed-app-server.json'));
+  const actual = record ? await host.process(record.pid) : null;
+  if (actual && (!sameProcess(record, actual) || !actual.command?.includes('app-server') || !actual.command.includes('ws://127.0.0.1:45839'))) {
+    throw new Error('Codex 内核进程身份与记录不符，未结束任何进程。');
+  }
+  if (!actual && !await available()) throw new Error('45839 被未识别进程占用，未关闭 Desktop 或结束任何进程。');
+  return { desktop: info.desktop, action };
+}
+
+export async function requestRecovery(stateRoot, { confirmed, operationId = randomUUID() } = {}, host = desktopHost) {
+  if (host.desktopIntegration === false) throw new Error('此平台尚不支持 Desktop 自动接入。');
+  if (confirmed !== true) throw new Error(recoveryWarning + ' 请明确确认后再执行。');
+  if (!/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(operationId)) throw new Error('无效的恢复操作编号。');
+  fs.mkdirSync(stateRoot, { recursive: true });
+  const previous = await recoveryStatus(stateRoot, host);
+  if (previous.operationId === operationId) return previous;
+  if (active(previous)) throw new Error('已有恢复操作正在执行，请查看恢复状态。');
+  const planned = await planRecovery(stateRoot, host);
+  let lock;
+  try { lock = fs.openSync(lockPath(stateRoot), 'wx'); }
+  catch (error) { if (error.code === 'EEXIST') throw new Error('已有恢复操作，请先查看恢复状态。'); throw error; }
+  fs.writeFileSync(lock, JSON.stringify({ operationId })); fs.closeSync(lock);
+  const record = { operationId, status: 'scheduled', stage: 'prepared', startedAt: new Date().toISOString(),
+    message: 'Codex 连接请求已接受，电脑管理连接保持运行。', steps: recoverySteps(), ...planned };
+  try {
+    writeRecord(recordPath(stateRoot), record);
+    const log = path.join(stateRoot, 'shared-recovery.log');
+    const pid = await startBackground(process.execPath, [script, '--worker', stateRoot, operationId], process.env, [log, log]);
+    const worker = await host.process(pid);
+    if (!worker) throw new Error('独立恢复进程未启动，请查看 shared-recovery.log。');
+    // Publish the process identity before allowing the worker to begin disruption.
+    writeRecord(recordPath(stateRoot), { ...record, worker });
+    return { operationId, status: record.status, message: record.message };
+  } catch (error) {
+    writeRecord(recordPath(stateRoot), { ...record, status: 'failed', error: error.message });
+    fs.rmSync(lockPath(stateRoot), { force: true }); throw error;
+  }
+}
+
+export async function runRecovery(stateRoot, operationId, dependencies = {}) {
+  const host = dependencies.host || desktopHost;
+  const service = dependencies.service || lifecycle({ stateRoot, host: serviceHost });
+  const available = dependencies.available || portAvailable;
+  const start = dependencies.launch || launchDesktop;
+  let record = readRecord(recordPath(stateRoot));
+  if (record?.operationId !== operationId || readRecord(lockPath(stateRoot))?.operationId !== operationId) throw new Error('恢复实例已失效。');
+  record.steps ||= recoverySteps();
+  const stage = name => {
+    record = { ...record, status: 'running', stage: name, steps: record.steps.map(step => ({ ...step,
+      status: step.id === name ? 'running' : step.status === 'running' ? 'completed' : step.status })) };
+    writeRecord(recordPath(stateRoot), record);
+  };
+  const waitFor = async (check, message) => {
+    const deadline = Date.now() + (dependencies.timeout ?? 10000);
+    while (!await check()) { if (Date.now() >= deadline) throw new Error(message); await delay(100); }
+  };
+  try {
+    stage('checking');
+    const planned = await planRecovery(stateRoot, host, available);
+    await configureManagedEnvironment(stateRoot);
+    record = { ...record, ...planned };
+    if (fs.existsSync(path.join(stateRoot, 'desktop-launch.lock'))) throw new Error('Desktop 正在启动，未与启动操作并行恢复。');
+    stage('stopping-desktop'); await host.closeDesktop(record.desktop);
+    await waitFor(async () => !(await host.inspect()).running, '当前 Codex Desktop 未退出，未继续接入 Codex 内核。');
+    stage('starting-app-server'); await start({ stateRoot, host, recoveryId: operationId, progress: stage });
+    stage('checking-execution');
+    await service.start(); // Refresh the execution adapter; resident Bridge retains its PID and sockets.
+    await waitFor(async () => {
+      const health = await service.status();
+      return health.running && health.mode === 'lan-shared' && health.execution?.ready === true;
+    }, 'Codex 内核未就绪；桌面服务和中继连接仍保留。');
+    record = { ...record, status: 'completed', stage: 'ready', steps: record.steps.map(step => ({ ...step, status: 'completed' })),
+      message: 'Codex Desktop 已接入 Codex 内核；移动端控制保持就绪，原任务未自动重发。' };
+  } catch (error) { record = { ...record, status: 'failed', error: error.message,
+    steps: record.steps.map(step => ({ ...step, status: step.status === 'running' ? 'failed' : step.status })),
+    message: 'Codex Desktop 未完成接入，已停止后续步骤。' }; }
+  finally {
+    record.finishedAt = new Date().toISOString(); writeRecord(recordPath(stateRoot), record);
+    if (readRecord(lockPath(stateRoot))?.operationId === operationId) fs.rmSync(lockPath(stateRoot));
+  }
+  return record;
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === script && process.argv[2] === '--worker') {
+  const [stateRoot, operationId] = process.argv.slice(3);
+  (async () => {
+    const deadline = Date.now() + 15000;
+    while (true) {
+      const record = readRecord(recordPath(stateRoot));
+      if (record?.operationId !== operationId || record.status !== 'scheduled') throw new Error('恢复调度已失效。');
+      if (record.worker?.pid === process.pid) break;
+      if (Date.now() >= deadline) throw new Error('恢复启动交接超时。');
+      await delay(100);
+    }
+    // A deliberate handoff window lets the caller display the accepted operation ID.
+    await delay(3000);
+    const result = await runRecovery(stateRoot, operationId);
+    console.log(JSON.stringify({ operationId, status: result.status, stage: result.stage, error: result.error }));
+    process.exit(result.status === 'completed' ? 0 : 1);
+  })().catch(error => { console.error(error.message); process.exit(1); });
+}

package/dist/src/skill-install.mjs

@@ -1,51 +1,51 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { createHash } from 'node:crypto';
-import { readRecord, writeRecord } from './service-lifecycle.mjs';
-
-const owner = '@walkhi/code-relax';
-const markerName = '.code-relax-install.json';
-const digest = value => createHash('sha256').update(value).digest('hex');
-export const skillDirectory = (home = os.homedir()) => path.join(home, '.agents/skills/code-relax');
-
-// Refuse junctions/symlinks along managed paths before writing or removing files.
-export function assertPlainPath(target) {
-  for (let item = path.resolve(target); ; item = path.dirname(item)) {
-    try { if (fs.lstatSync(item).isSymbolicLink()) throw new Error(`不自动修改链接路径：${item}`); }
-    catch (error) { if (error.code !== 'ENOENT') throw error; }
-    if (path.dirname(item) === item) break;
-  }
-}
-
-export function inspectSkill(target = skillDirectory()) {
-  assertPlainPath(target);
-  if (!fs.existsSync(target)) return { installed: false, managed: false, target };
-  const markerPath = path.join(target, markerName), file = path.join(target, 'SKILL.md');
-  assertPlainPath(markerPath); assertPlainPath(file);
-  const marker = readRecord(markerPath);
-  const managed = marker?.owner === owner && fs.existsSync(file)
-    && marker.sha256 === digest(fs.readFileSync(file))
-    && fs.readdirSync(target).every(name => ['SKILL.md', markerName].includes(name));
-  return { installed: true, managed, target };
-}
-
-export function installSkill(source, target = skillDirectory()) {
-  const state = inspectSkill(target);
-  if (state.installed && !state.managed) throw new Error(`同名 Skill 非本包管理或已被修改，请保留并手动处理：${target}`);
-  const content = fs.readFileSync(source);
-  fs.mkdirSync(target, { recursive: true });
-  fs.writeFileSync(path.join(target, 'SKILL.md'), content);
-  writeRecord(path.join(target, markerName), { owner, sha256: digest(content) });
-  return { installed: true, target, message: 'Skill 已安装/更新；若 Codex 尚未显示，请重新打开 Codex。' };
-}
-
-export function removeSkill(target = skillDirectory()) {
-  const state = inspectSkill(target);
-  if (!state.installed) return { removed: false, target, message: 'Skill 未安装。' };
-  if (!state.managed) throw new Error(`同名 Skill 非本包管理或已被修改，未删除：${target}`);
-  fs.unlinkSync(path.join(target, 'SKILL.md'));
-  fs.unlinkSync(path.join(target, markerName));
-  fs.rmdirSync(target);
-  return { removed: true, target, message: '已移除本包安装的 Skill。' };
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+import { createHash } from 'node:crypto';
+import { readRecord, writeRecord } from './service-lifecycle.mjs';
+
+const owner = '@walkhi/code-relax';
+const markerName = '.code-relax-install.json';
+const digest = value => createHash('sha256').update(value).digest('hex');
+export const skillDirectory = (home = os.homedir()) => path.join(home, '.agents/skills/code-relax');
+
+// Refuse junctions/symlinks along managed paths before writing or removing files.
+export function assertPlainPath(target) {
+  for (let item = path.resolve(target); ; item = path.dirname(item)) {
+    try { if (fs.lstatSync(item).isSymbolicLink()) throw new Error(`不自动修改链接路径：${item}`); }
+    catch (error) { if (error.code !== 'ENOENT') throw error; }
+    if (path.dirname(item) === item) break;
+  }
+}
+
+export function inspectSkill(target = skillDirectory()) {
+  assertPlainPath(target);
+  if (!fs.existsSync(target)) return { installed: false, managed: false, target };
+  const markerPath = path.join(target, markerName), file = path.join(target, 'SKILL.md');
+  assertPlainPath(markerPath); assertPlainPath(file);
+  const marker = readRecord(markerPath);
+  const managed = marker?.owner === owner && fs.existsSync(file)
+    && marker.sha256 === digest(fs.readFileSync(file))
+    && fs.readdirSync(target).every(name => ['SKILL.md', markerName].includes(name));
+  return { installed: true, managed, target };
+}
+
+export function installSkill(source, target = skillDirectory()) {
+  const state = inspectSkill(target);
+  if (state.installed && !state.managed) throw new Error(`同名 Skill 非本包管理或已被修改，请保留并手动处理：${target}`);
+  const content = fs.readFileSync(source);
+  fs.mkdirSync(target, { recursive: true });
+  fs.writeFileSync(path.join(target, 'SKILL.md'), content);
+  writeRecord(path.join(target, markerName), { owner, sha256: digest(content) });
+  return { installed: true, target, message: 'Skill 已安装/更新；若 Codex 尚未显示，请重新打开 Codex。' };
+}
+
+export function removeSkill(target = skillDirectory()) {
+  const state = inspectSkill(target);
+  if (!state.installed) return { removed: false, target, message: 'Skill 未安装。' };
+  if (!state.managed) throw new Error(`同名 Skill 非本包管理或已被修改，未删除：${target}`);
+  fs.unlinkSync(path.join(target, 'SKILL.md'));
+  fs.unlinkSync(path.join(target, markerName));
+  fs.rmdirSync(target);
+  return { removed: true, target, message: '已移除本包安装的 Skill。' };
+}