@walkhi/code-relax 0.1.0-beta.81 → 0.1.0-beta.83

package/dist/build-platform.json

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

package/dist/shared/server-requests.cjs

@@ -115,6 +115,38 @@
     } catch { return null; }
   }
   function elicitationResult(action, content = null) { return { action, content: action === 'accept' ? content : null, _meta: null }; }
+  function browserAuth(request) {
+    const p = request.params || {}, meta = p._meta || {};
+    if (request.method !== elicitation || p.mode !== 'form' || meta.codex_approval_kind !== 'browser_auth'
+      || p.requestedSchema?.type !== 'object' || !p.requestedSchema.properties || Object.keys(p.requestedSchema.properties).length
+      || !/^[A-Za-z0-9_-]{32,128}$/.test(meta.browser_auth_challenge_id || '')
+      || !Array.isArray(meta.fields) || !meta.fields.length || meta.fields.length > 6
+      || meta.options != null && (!Array.isArray(meta.options) || meta.options.length)
+      || meta.qrCode || meta.qrCodePayload || meta.qrCodeUrl || meta.webauthn != null) return null;
+    try {
+      const origin = new URL(meta.origin);
+      if (!['https:', 'http:'].includes(origin.protocol) || origin.origin !== meta.origin) return null;
+    } catch { return null; }
+    const ids = new Set();
+    for (const field of meta.fields) {
+      if (!field || typeof field.id !== 'string' || !/^[A-Za-z0-9_-]{1,48}$/.test(field.id) || ['__proto__', 'constructor', 'prototype'].includes(field.id)
+        || ids.has(field.id) || typeof field.label !== 'string' || typeof field.required !== 'boolean'
+        || !['email', 'number', 'password', 'search', 'tel', 'text', 'url'].includes(field.type)) return null;
+      ids.add(field.id);
+    }
+    return { origin: meta.origin, challengeId: meta.browser_auth_challenge_id, fields: meta.fields,
+      accountUsername: typeof meta.account_username === 'string' ? meta.account_username : null };
+  }
+  function validateBrowserAuthFields(auth, fields) {
+    if (!auth || !fields || typeof fields !== 'object' || Array.isArray(fields)
+      || !Object.keys(fields).length || Object.keys(fields).some(id => !auth.fields.some(field => field.id === id))) throw new Error('安全登录字段无效');
+    for (const field of auth.fields) {
+      const entry = fields[field.id];
+      if (entry === undefined && !field.required) continue;
+      if (!entry || Object.keys(entry).length !== 1 || typeof entry.value !== 'string'
+        || !entry.value.length) throw new Error('请填写有效的安全登录信息');
+    }
+  }
   function fieldOptions(field) {
     const schema = field.type === 'array' ? field.items : field;
     if (Array.isArray(schema?.enum)) return schema.enum.map((value, index) => ({ value, label: schema.enumNames?.[index] || value }));
@@ -191,6 +223,10 @@
   }
   function validate(request, result) {
     if (request.method === elicitation && equal(result, elicitationResult('cancel'))) return;
+    if (browserAuth(request)) {
+      if (!['decline', 'cancel'].some(action => equal(result, { action }))) throw new Error('安全登录必须通过专用输入入口提交');
+      return;
+    }
     if (externalAction(request)) {
       if (!['accept', 'decline'].some(action => equal(result, elicitationResult(action)))) throw new Error('外部操作结果无效');
       return;
@@ -307,5 +343,5 @@
       return { submitted: true };
     }
   }
-  return { Store, decisions, validate, command, file, input, elicitation, permissions, externalAction, elicitationResult, formSchema, fieldOptions, validateForm, permissionResult, blocksComposer, browserAccess, browserAction, browserActionResult, computerAppAccess, computerAppResult, mcpToolApproval, mcpToolResult, confirmation, confirmationResult };
+  return { Store, decisions, validate, command, file, input, elicitation, permissions, externalAction, elicitationResult, formSchema, fieldOptions, validateForm, permissionResult, blocksComposer, browserAccess, browserAction, browserActionResult, browserAuth, validateBrowserAuthFields, computerAppAccess, computerAppResult, mcpToolApproval, mcpToolResult, confirmation, confirmationResult };
 });

package/dist/src/browser-auth-operations.mjs

@@ -0,0 +1,26 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { createHash, randomUUID } from 'node:crypto';
+
+// Only submission markers are durable. Credentials never enter this store.
+export class BrowserAuthOperations {
+  constructor(stateRoot) { this.directory = path.join(stateRoot, 'browser-auth-operations'); }
+  file(key) { return path.join(this.directory, createHash('sha256').update(JSON.stringify(key)).digest('hex') + '.json'); }
+  async read(key) {
+    try { return JSON.parse(await fs.readFile(this.file(key), 'utf8')).status; }
+    catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+  }
+  async claim(key) {
+    await fs.mkdir(this.directory, { recursive: true });
+    let handle;
+    try { handle = await fs.open(this.file(key), 'wx'); }
+    catch (error) { if (error.code === 'EEXIST') throw new Error('此安全登录已提交或结果待核对，请勿重复提交'); throw error; }
+    try { await handle.writeFile(JSON.stringify({ status: 'unknown' })); await handle.sync(); }
+    finally { await handle.close(); }
+  }
+  async complete(key, status) {
+    const file = this.file(key), temporary = file + '.' + randomUUID() + '.tmp';
+    await fs.writeFile(temporary, JSON.stringify({ status }));
+    await fs.rename(temporary, file);
+  }
+}

package/dist/src/desktop-launcher.mjs

@@ -1,71 +1,73 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { setTimeout as delay } from 'node:timers/promises';
-import { readRecord, lifecycle } from './service-lifecycle.mjs';
-import * as serviceHost from './platform/service-host.mjs';
-import { managedPortAvailable as portAvailable } from './managed-app-server.mjs';
-import { readManagedEndpoint } from './managed-endpoint.mjs';
-export { portAvailable };
-function desktopEnvironment(stateRoot, environment) {
-  const childEnv = { ...environment };
-  for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
-  const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
-  if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
-  childEnv.CODEX_APP_SERVER_WS_URL = readManagedEndpoint(stateRoot);
-  return childEnv;
-}
-
-// Opening the optional UI does not start, restart or supervise the kernel.
-export async function startDesktop({ stateRoot, host, environment = process.env, restart = false }) {
-  let stage = 'inspect';
-  try {
-    const info = await host.inspect();
-    if (!info.desktop) throw new Error('未安装 Codex 桌面端。');
-    if (info.running && !restart) return { status: 'running', message: 'Codex 桌面端已启动。' };
-    if (info.running) { stage = 'close'; await host.closeDesktop(info.desktop); }
-    stage = 'activate';
-    await host.startDesktop(info.desktop, desktopEnvironment(stateRoot, environment));
-    return { status: 'accepted', message: restart ? '已提交 Codex 桌面端重启请求。' : '已提交 Codex 桌面端启动请求。' };
-  } catch (error) {
-    console.error(JSON.stringify({ time: new Date().toISOString(), event: 'desktop-operation-failed', restart, stage,
-      message: error.message, code: error.code, stderr: error.stderr }));
-    throw new Error(stage === 'close' ? '桌面端关闭失败，请查看工作站诊断日志。'
-      : stage === 'activate' ? '桌面端启动失败，请查看工作站诊断日志。' : '无法检查桌面端，请查看工作站诊断日志。', { cause: error });
-  }
-}
-
-export async function launchDesktop({ stateRoot, host, environment = process.env, wait = delay, timeout = 30000, recoveryId, progress = () => {}, service = lifecycle({ stateRoot, host: serviceHost }) }) {
-  fs.mkdirSync(stateRoot, { recursive: true });
-  const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
-  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
-  const lock = path.join(stateRoot, 'desktop-launch.lock');
-  let descriptor;
-  try { descriptor = fs.openSync(lock, 'wx'); }
-  catch (error) {
-    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
-    throw error;
-  }
-  try {
-    const info = await host.inspect();
-    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
-    const connected = await host.sharedServiceUrl();
-    if (info.running) {
-      if (connected) return { reused: true };
-      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
-    }
-    progress('starting-app-server');
-    const health = await service.status();
-    if (!health.running || !health.managedAppServer?.ready) throw new Error(health.managedAppServer?.error || '工作站 Codex 内核未就绪。');
-    const childEnv = desktopEnvironment(stateRoot, environment);
-    progress('starting-desktop');
-    await host.startDesktop(info.desktop, childEnv);
-    const deadline = Date.now() + timeout;
-    while (true) {
-      const ready = await host.desktopReady();
-      if (ready) break;
-      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
-      await wait(500);
-    }
-    return { reused: false };
-  } finally { fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
+import { readRecord, lifecycle } from './service-lifecycle.mjs';
+import * as serviceHost from './platform/service-host.mjs';
+import { managedPortAvailable as portAvailable } from './managed-app-server.mjs';
+import { readManagedEndpoint } from './managed-endpoint.mjs';
+export { portAvailable };
+function desktopEnvironment(stateRoot, environment) {
+  const childEnv = { ...environment };
+  for (const key of ['CODEX_APP_SERVER_WS_URL', 'CODEX_APP_SERVER_FORCE_CLI', 'CODEX_APP_TOOLS_PIPE_PATH']) delete childEnv[key];
+  const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
+  if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
+  childEnv.CODEX_APP_SERVER_WS_URL = readManagedEndpoint(stateRoot);
+  return childEnv;
+}
+
+// Opening the optional UI does not start, restart or supervise the kernel.
+export async function startDesktop({ stateRoot, host, environment = process.env, restart = false, progress = () => {} }) {
+  let stage = 'inspect';
+  progress(stage);
+  try {
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex 桌面端。');
+    if (info.running && !restart) return { status: 'running', message: 'Codex 桌面端已启动。' };
+    if (info.running) { stage = 'close'; progress(stage); await host.closeDesktop(info.desktop); }
+    stage = 'activate'; progress(stage);
+    await host.startDesktop(info.desktop, desktopEnvironment(stateRoot, environment));
+    return { status: 'accepted', message: restart ? '已提交 Codex 桌面端重启请求。' : '已提交 Codex 桌面端启动请求。' };
+  } catch (error) {
+    console.error(JSON.stringify({ time: new Date().toISOString(), event: 'desktop-operation-failed', restart, stage,
+      message: error.message, code: error.code, stderr: error.stderr }));
+    throw new Error(stage === 'close' && ['MAC_DESKTOP_CLOSE_TIMEOUT', 'MAC_DESKTOP_CLOSE_CHANGED'].includes(error.code) ? error.message
+      : stage === 'close' ? '桌面端关闭失败，请查看工作站诊断日志。'
+      : stage === 'activate' ? '桌面端启动失败，请查看工作站诊断日志。' : '无法检查桌面端，请查看工作站诊断日志。', { cause: error });
+  }
+}
+
+export async function launchDesktop({ stateRoot, host, environment = process.env, wait = delay, timeout = 30000, recoveryId, progress = () => {}, service = lifecycle({ stateRoot, host: serviceHost }) }) {
+  fs.mkdirSync(stateRoot, { recursive: true });
+  const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
+  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
+  const lock = path.join(stateRoot, 'desktop-launch.lock');
+  let descriptor;
+  try { descriptor = fs.openSync(lock, 'wx'); }
+  catch (error) {
+    if (error.code === 'EEXIST') throw new Error('另一个 Desktop 启动操作正在进行；若上次异常退出，请确认没有启动器运行后移除 desktop-launch.lock。');
+    throw error;
+  }
+  try {
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
+    const connected = await host.sharedServiceUrl();
+    if (info.running) {
+      if (connected) return { reused: true };
+      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
+    }
+    progress('starting-app-server');
+    const health = await service.status();
+    if (!health.running || !health.managedAppServer?.ready) throw new Error(health.managedAppServer?.error || '工作站 Codex 内核未就绪。');
+    const childEnv = desktopEnvironment(stateRoot, environment);
+    progress('starting-desktop');
+    await host.startDesktop(info.desktop, childEnv);
+    const deadline = Date.now() + timeout;
+    while (true) {
+      const ready = await host.desktopReady();
+      if (ready) break;
+      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
+      await wait(500);
+    }
+    return { reused: false };
+  } finally { fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
+}

package/dist/src/desktop-operation.mjs

@@ -1,41 +1,46 @@
-import { setTimeout as delay } from 'node:timers/promises';
-import { startDesktop } from './desktop-launcher.mjs';
-
-// The request is acknowledged before native close/start can outlive the phone's
-// request deadline. Health carries the same receipt; a lost reply is not a retry.
-export class DesktopOperation {
-  constructor({ stateRoot, host, sample, launch = startDesktop, wait = delay, now = Date.now, timeout = 30000 }) {
-    Object.assign(this, { stateRoot, host, sample, launch, wait, now, timeout });
-    this.record = null;
-  }
-  snapshot() { return this.record ? { ...this.record } : null; }
-  request({ operationId, restart }) {
-    if (this.record?.operationId === operationId) return this.snapshot();
-    if (this.record?.status === 'running') {
-      throw Object.assign(new Error('桌面端操作仍在进行，请刷新状态核对结果。'), { statusCode: 409 });
-    }
-    this.record = { operationId, restart, status: 'running', startedAt: new Date(this.now()).toISOString() };
-    this.completion = this.run(this.record);
-    return this.snapshot();
-  }
-  async run(record) {
-    let failure;
-    try {
-      await this.launch({ stateRoot: this.stateRoot, host: this.host, restart: record.restart });
-      const deadline = this.now() + this.timeout;
-      while (!await this.host.desktopReady()) {
-        if (this.now() >= deadline) throw new Error('桌面端启动请求已执行，但未确认接入共享内核，请查看工作站诊断日志。');
-        await this.wait(500);
-      }
-    } catch (error) { failure = error; }
-    // Publish the final receipt with a fresh desktop sample, including failures.
-    try { await this.sample(); }
-    catch (error) { failure ||= error; }
-    Object.assign(record, { status: failure ? 'failed' : 'completed', finishedAt: new Date(this.now()).toISOString() });
-    if (failure) {
-      record.error = failure.message;
-      console.warn(JSON.stringify({ event: 'desktop-operation-result', operationId: record.operationId,
-        status: record.status, message: failure.message }));
-    }
-  }
-}
+import { setTimeout as delay } from 'node:timers/promises';
+import { startDesktop } from './desktop-launcher.mjs';
+
+// The request is acknowledged before native close/start can outlive the phone's
+// request deadline. Health carries the same receipt; a lost reply is not a retry.
+export class DesktopOperation {
+  constructor({ stateRoot, host, sample, launch = startDesktop, wait = delay, now = Date.now, timeout = 30000 }) {
+    Object.assign(this, { stateRoot, host, sample, launch, wait, now, timeout });
+    this.record = null;
+  }
+  snapshot() { return this.record ? { ...this.record } : null; }
+  request({ operationId, restart }) {
+    if (this.record?.operationId === operationId) return this.snapshot();
+    if (this.record?.status === 'running') {
+      throw Object.assign(new Error('桌面端操作仍在进行，请刷新状态核对结果。'), { statusCode: 409 });
+    }
+    this.record = { operationId, restart, status: 'running', startedAt: new Date(this.now()).toISOString() };
+    this.completion = this.run(this.record);
+    return this.snapshot();
+  }
+  async run(record) {
+    let failure;
+    const progress = stage => {
+      Object.assign(record, { stage, updatedAt: new Date(this.now()).toISOString() });
+      console.info(JSON.stringify({ event: 'desktop-operation-stage', operationId: record.operationId,
+        restart: record.restart, stage, time: record.updatedAt }));
+    };
+    try {
+      await this.launch({ stateRoot: this.stateRoot, host: this.host, restart: record.restart, progress });
+      progress('connecting');
+      const deadline = this.now() + this.timeout;
+      while (!await this.host.desktopReady()) {
+        if (this.now() >= deadline) throw new Error('桌面端启动请求已执行，但未确认接入共享内核，请查看工作站诊断日志。');
+        await this.wait(500);
+      }
+    } catch (error) { failure = error; }
+    // Publish the final receipt with a fresh desktop sample, including failures.
+    if (!failure) progress('verifying');
+    try { await this.sample(); }
+    catch (error) { failure ||= error; }
+    Object.assign(record, { status: failure ? 'failed' : 'completed', finishedAt: new Date(this.now()).toISOString() });
+    if (failure) record.error = failure.message;
+    console.info(JSON.stringify({ event: 'desktop-operation-result', operationId: record.operationId,
+      time: record.finishedAt, stage: record.stage, status: record.status, message: record.error }));
+  }
+}