@walkhi/code-relax 0.1.0-beta.2 → 0.1.0-beta.21

package/dist/bin/migrate-relay-db.mjs

@@ -0,0 +1,107 @@
+#!/usr/bin/env node
+import fs from 'node:fs';
+import { createHash } from 'node:crypto';
+import { fileURLToPath } from 'node:url';
+import mysql from 'mysql2/promise';
+import { deviceStore } from '../src/self-relay/device-store.mjs';
+import { relayAdminState } from '../src/self-relay/admin-state.mjs';
+
+const command = process.argv[2];
+if (!['--schema', '--import', '--check'].includes(command) || !process.env.RELAY_MYSQL_CONFIG_FILE) {
+  throw new Error('Use --schema, --import or --check with RELAY_MYSQL_CONFIG_FILE');
+}
+const config = JSON.parse(fs.readFileSync(process.env.RELAY_MYSQL_CONFIG_FILE, 'utf8'));
+const db = await mysql.createConnection({ ...config, dateStrings: true, timezone: 'Z', multipleStatements: false });
+const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
+const migrations = ['001_relay_core', '002_email_accounts', '003_relay_usage', '004_relay_usage_actions', '005_relay_usage_diagnostics'];
+try {
+  if (command === '--schema') {
+    const [existing] = await db.query("SHOW TABLES LIKE 'schema_migrations'");
+    const [applied] = existing.length ? await db.query('SELECT version, sha256 FROM schema_migrations') : [[]];
+    const known = new Map(applied.map(row => [row.version, row.sha256]));
+    if (known.size !== applied.length || [...known.keys()].some(version => !migrations.includes(version))) throw new Error('Unexpected schema version');
+    for (const version of migrations) {
+      const source = fs.readFileSync(fileURLToPath(new URL(`../database/${version}.sql`, import.meta.url)), 'utf8');
+      const sha256 = createHash('sha256').update(source).digest('hex');
+      if (known.has(version)) {
+        if (known.get(version) !== sha256) throw new Error(`Migration changed: ${version}`);
+        continue;
+      }
+      if (version !== migrations[0] && !known.has(migrations[migrations.indexOf(version) - 1])) throw new Error('Previous migration missing');
+      const statements = source.split('\n').filter(line => !line.trimStart().startsWith('--')).join('\n');
+      for (const statement of statements.split(';').map(item => item.trim()).filter(Boolean)) await db.query(statement);
+      await db.execute('INSERT INTO schema_migrations (version, sha256) VALUES (?,?)', [version, sha256]);
+      known.set(version, sha256);
+      console.log(JSON.stringify({ schema: version, sha256 }));
+    }
+  } else {
+    const [versions] = await db.query('SELECT version FROM schema_migrations');
+    if (!versions.some(row => row.version === '001_relay_core') || versions.some(row => !migrations.includes(row.version))) throw new Error('Unexpected schema version');
+    if (command === '--check') {
+      const names = ['computers', 'mobile_authorizations', 'official_computers', 'announcements', 'relay_settings', 'users', 'user_login_identities'];
+      if (versions.some(row => row.version === '002_email_accounts')) names.push('email_login_challenges', 'user_sessions', 'email_send_limits');
+      if (versions.some(row => row.version === '003_relay_usage')) names.push('relay_admin_emails', 'relay_usage_settings', 'relay_usage_totals', 'relay_usage_computer_totals', 'relay_usage_entitlements', 'relay_usage_budgets', 'relay_usage_computer_budgets', 'relay_usage_sessions');
+      if (versions.some(row => row.version === '004_relay_usage_actions')) names.push('relay_usage_actions');
+      if (versions.some(row => row.version === '005_relay_usage_diagnostics')) names.push('relay_usage_diagnostics');
+      const counts = {};
+      for (const name of names) { const [rows] = await db.query(`SELECT COUNT(*) AS count FROM ${name}`); counts[name] = rows[0].count; }
+      if (process.env.RELAY_STATE_FILE && process.env.RELAY_ADMIN_STATE_FILE) {
+        const devices = deviceStore(process.env.RELAY_STATE_FILE).entries();
+        const admin = relayAdminState(process.env.RELAY_ADMIN_STATE_FILE, 8).read();
+        const expected = { computers: devices.length,
+          mobile_authorizations: devices.reduce((sum, item) => sum + item.clients.length, 0),
+          official_computers: devices.filter(item => item.officialComputer).length,
+          announcements: admin.announcements.length, relay_settings: 1 };
+        if (Object.keys(expected).some(name => counts[name] !== expected[name])) throw new Error('Imported row counts differ from JSON');
+        const [saved] = await db.query('SELECT id,host_hash,status,revision FROM computers');
+        const original = new Map(devices.map(item => [item.id, item]));
+        for (const row of saved) {
+          const item = original.get(row.id);
+          if (!item || item.hostHash !== row.host_hash || item.status !== row.status || item.revision !== Number(row.revision)) {
+            throw new Error('Imported computer identity differs from JSON');
+          }
+        }
+        const [authorized] = await db.query('SELECT computer_id,client_id,credential_hash FROM mobile_authorizations');
+        for (const row of authorized) {
+          const item = original.get(row.computer_id)?.clients.find(client => client.id === row.client_id);
+          if (!item || item.hash !== row.credential_hash) throw new Error('Imported mobile authorization differs from JSON');
+        }
+        const [settings] = await db.query('SELECT max_relay_sessions FROM relay_settings WHERE id=1');
+        if (settings[0]?.max_relay_sessions !== admin.maxRelaySessions) throw new Error('Imported relay setting differs from JSON');
+        console.log(JSON.stringify({ verified: true, counts }));
+      } else console.log(JSON.stringify(counts));
+    } else {
+      const stateFile = process.env.RELAY_STATE_FILE, adminFile = process.env.RELAY_ADMIN_STATE_FILE;
+      if (!stateFile || !adminFile) throw new Error('RELAY_STATE_FILE and RELAY_ADMIN_STATE_FILE required for import');
+      const devices = deviceStore(stateFile).entries();
+      const admin = relayAdminState(adminFile, 8).read();
+      const [existing] = await db.query('SELECT (SELECT COUNT(*) FROM computers) AS computers, (SELECT COUNT(*) FROM relay_settings) AS settings');
+      if (existing[0].computers || existing[0].settings) throw new Error('Import target is not empty');
+      await db.beginTransaction();
+      try {
+        for (const item of devices) {
+          await db.execute('INSERT INTO computers (id,host_hash,status,revision,created_at,updated_at) VALUES (?,?,?,?,?,?)',
+            [item.id, item.hostHash, item.status, item.revision, sqlTime(item.createdAt), sqlTime(item.updatedAt)]);
+          for (const client of item.clients) await db.execute(
+            'INSERT INTO mobile_authorizations (computer_id,client_id,credential_hash,created_at,updated_at) VALUES (?,?,?,?,?)',
+            [item.id, client.id, client.hash, sqlTime(client.createdAt), sqlTime(client.updatedAt)]);
+          if (item.officialComputer) {
+            const official = item.officialComputer;
+            await db.execute('INSERT INTO official_computers (computer_id,environment_id,name,hostname,updated_at) VALUES (?,?,?,?,?)',
+              [item.id, official.environmentId, official.name, official.hostname, sqlTime(official.updatedAt)]);
+          }
+        }
+        await db.execute('INSERT INTO relay_settings (id,max_relay_sessions,updated_at) VALUES (1,?,UTC_TIMESTAMP(3))', [admin.maxRelaySessions]);
+        for (const item of admin.announcements) await db.execute(
+          'INSERT INTO announcements (id,title,message,status,created_at,updated_at,published_at) VALUES (?,?,?,?,?,?,?)',
+          [item.id, item.title, item.message, item.status, sqlTime(item.createdAt), sqlTime(item.updatedAt),
+            item.publishedAt ? sqlTime(item.publishedAt) : null]);
+        await db.commit();
+      } catch (error) { await db.rollback(); throw error; }
+      console.log(JSON.stringify({ imported: true, computers: devices.length,
+        mobileAuthorizations: devices.reduce((sum, item) => sum + item.clients.length, 0),
+        officialComputers: devices.filter(item => item.officialComputer).length,
+        announcements: admin.announcements.length }));
+    }
+  }
+} finally { await db.end(); }

package/dist/bin/self-relay-admin.mjs

@@ -0,0 +1,8 @@
+import { startAdminServer } from '../src/self-relay/admin-server.mjs';
+
+const port = Number(process.env.RELAY_ADMIN_PORT || 45851);
+if (!Number.isSafeInteger(port) || port < 1 || port > 65535) throw new Error('Invalid RELAY_ADMIN_PORT');
+const server = await startAdminServer({ port });
+console.log(JSON.stringify({ service: 'codex-relay-admin', port: server.port }));
+await new Promise(resolve => { process.once('SIGTERM', resolve); process.once('SIGINT', resolve); });
+await server.close();

package/dist/bin/self-relay-demo.mjs

@@ -3,7 +3,7 @@ import { startRelayDemo } from '../src/self-relay/demo.mjs';
 import fs from 'node:fs';
 import { spawnSync } from 'node:child_process';
 
-const mode = process.argv.includes('--legacy') ? 'lan-legacy' : 'lan-shared';
+const mode = 'lan-shared';
 let remoteRelay;
 if (process.env.RELAY_URL) {
   let hostKey;
@@ -25,7 +25,7 @@ try {
   const health = await client.request('/api/health');
   if (health.status !== 200 || health.body.transportMode !== mode) throw new Error('Relay validation failed');
   console.log(JSON.stringify({ ok: true, simulated: true, mode, relay: demo.relay.url,
-    bridge: demo.bridgeUrl, message: '中继 → 连接器 → 模拟 Bridge 已连通；未连接 Codex，未执行任务。' }, null, 2));
+    bridge: demo.bridgeUrl, message: '中继 → 连接器 → 模拟桌面服务已连通；未连接 Codex，未执行任务。' }, null, 2));
   if (!process.argv.includes('--check')) {
     console.log('验证连接保持运行。Ctrl+C 停止全部模拟进程内服务。');
     await new Promise(resolve => { process.once('SIGINT', resolve); process.once('SIGTERM', resolve); });

package/dist/bin/self-relay-server.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-import { deviceStore, validId } from '../src/self-relay/device-store.mjs';
+import { deviceStore, validId } from '../src/self-relay/device-store.mjs';
+import { openRelayMysql } from '../src/self-relay/mysql-state.mjs';
 import { startSelfRelay } from '../src/self-relay/server.mjs';
 import { updateDebugAllowlist } from '../src/self-relay/debug-allowlist.mjs';
 
@@ -9,15 +10,18 @@ if (!keyFile) throw new Error('RELAY_HOST_KEY_FILE is required');
 const hostKey = fs.readFileSync(keyFile, 'utf8').trim();
 const port = Number(process.env.RELAY_PORT || 45850);
 if (!Number.isInteger(port) || port < 1024 || port > 65535) throw new Error('Invalid RELAY_PORT');
-const stateFile = process.env.RELAY_STATE_FILE;
-if (!stateFile) throw new Error('RELAY_STATE_FILE is required');
+const stateFile = process.env.RELAY_STATE_FILE;
+const mysqlConfigFile = process.env.RELAY_MYSQL_CONFIG_FILE;
+const accountConfigFile = process.env.RELAY_ACCOUNT_CONFIG_FILE;
+if (!stateFile && !mysqlConfigFile) throw new Error('RELAY_STATE_FILE or RELAY_MYSQL_CONFIG_FILE is required');
 const debugAllowlistFile = process.env.RELAY_DEBUG_ALLOWLIST_FILE || '/etc/codex-relay/debug-allowlist.json';
 const adminStateFile = process.env.RELAY_ADMIN_STATE_FILE || '/var/lib/codex-relay/admin.json';
 const maxRelaySessions = Number(process.env.RELAY_MAX_RELAY_SESSIONS || 8);
 if (!Number.isSafeInteger(maxRelaySessions) || maxRelaySessions < 1 || maxRelaySessions > 256) throw new Error('Invalid RELAY_MAX_RELAY_SESSIONS');
 const debugCommand = process.argv.find(value => ['--debug-list', '--debug-allow', '--debug-deny'].includes(value));
 if (debugCommand) {
-  const records = deviceStore(stateFile).entries();
+  const database = mysqlConfigFile ? await openRelayMysql(mysqlConfigFile, maxRelaySessions) : null;
+  const records = (database?.devices || deviceStore(stateFile)).entries();
   if (debugCommand === '--debug-list') {
     console.log(JSON.stringify(records.map(record => ({
       deviceId: record.id, status: record.status, clientCount: record.clients.length,
@@ -30,21 +34,25 @@ if (debugCommand) {
     updateDebugAllowlist(debugAllowlistFile, deviceId, debugCommand === '--debug-allow');
     console.log('Debug allowlist updated; restart relay to apply.');
   }
+  if (database) await database.close();
   process.exit(0);
 }
-if (process.argv.includes('--init-state')) { deviceStore(stateFile, { initialize: true }); console.log('Device store initialized'); process.exit(0); }
-const revokeIndex = process.argv.indexOf('--revoke-host');
-if (revokeIndex >= 0) {
+if (process.argv.includes('--init-state')) { if (mysqlConfigFile) throw new Error('Use migrations for MySQL mode'); deviceStore(stateFile, { initialize: true }); console.log('Device store initialized'); process.exit(0); }
+const revokeIndex = process.argv.indexOf('--revoke-host');
+if (revokeIndex >= 0) {
   // Run only with the service stopped: this is an offline administrator operation.
   if (!process.argv.includes('--offline')) throw new Error('Stop the relay service and supply --offline');
   const id = process.argv[revokeIndex + 1];
   if (!validId(id)) throw new Error('Invalid device ID');
-  const store = deviceStore(stateFile), record = store.entries().find(item => item.id === id);
+  const database = mysqlConfigFile ? await openRelayMysql(mysqlConfigFile, maxRelaySessions) : null;
+  const store = database?.devices || deviceStore(stateFile), record = store.entries().find(item => item.id === id);
   if (!record) throw new Error('Device not found');
-  store.save({ ...record, status: 'revoked', clientHash: undefined, clientId: undefined, revision: record.revision + 1, updatedAt: new Date().toISOString() });
+  await store.save({ ...record, status: 'revoked', clients: [], revision: record.revision + 1, updatedAt: new Date().toISOString() });
+  if (database) await database.close();
   console.log('Computer and phone authorization revoked'); process.exit(0);
 }
-const relay = await startSelfRelay({ port, hostKey, stateFile, debugAllowlistFile, adminStateFile, maxRelaySessions,
+const relay = await startSelfRelay({ port, hostKey, stateFile, mysqlConfigFile, accountConfigFile, debugAllowlistFile, adminStateFile, maxRelaySessions,
+  usageDiagnosticKeyFile: process.env.RELAY_USAGE_DIAGNOSTIC_KEY_FILE,
   publicRelayUrl: process.env.RELAY_PUBLIC_URL || '', appDownloadUrl: process.env.RELAY_APP_DOWNLOAD_URL || '',
   log: entry => console.log(JSON.stringify({ time: new Date().toISOString(), ...entry })) });
 console.log(JSON.stringify({ service: 'codex-self-relay', listen: relay.url, maxConnections: 32, maxRelaySessions,

package/dist/shared/app-server-events.cjs

@@ -1,14 +1,14 @@
 (function (root, factory) {
   if (typeof module === 'object' && module.exports) module.exports = factory();
   else root.CodexAppServerEvents = factory();
-})(globalThis, function () {
+})(globalThis, function () {
   function mergeItems(existing, incoming = []) {
     for (const source of incoming) {
       const item = compactItem(source);
       const index = existing.findIndex(current => current.id === item.id);
       if (index < 0) existing.push(item);
       else existing[index] = { ...existing[index], ...item };
-    }
+    }
     return existing;
   }
 
@@ -137,6 +137,18 @@
     }
     return match;
   }
+  function catalogThreadProjectId(thread, projects) {
+    if (thread.projectId) return thread.projectId;
+    const local = thread.environments?.find(environment => environment.environmentId === 'local');
+    if (local && Array.isArray(local.runtimeWorkspaceRoots)) {
+      for (const root of local.runtimeWorkspaceRoots) {
+        const projectId = threadProjectId({ cwd: root }, projects);
+        if (projectId) return projectId;
+      }
+      return null;
+    }
+    return threadProjectId({ cwd: thread.cwd }, projects);
+  }
   function projectlessThreadTarget(cwd = '') {
     return { projectId: null, runtimeWorkspaceRoots: [], ...(cwd ? { cwd } : {}) };
   }
@@ -238,16 +250,17 @@
     }
     return optionsCache.context(threadId, contexts.get(threadId));
   }
-  async function createThread(request, target, input, settings) {
-    const { thread } = await request('thread/start', target);
-    await request('turn/start', { threadId:thread.id, input,
+  async function createThread(request, target, input, settings) {
+    const { thread } = await request('thread/start', target);
+    const started = await request('turn/start', { threadId:thread.id, input,
+      ...mobileTurnSource(settings.clientUserMessageId),
       ...(settings.clientUserMessageId ? { clientUserMessageId:settings.clientUserMessageId } : {}),
       ...(settings.model ? { model:settings.model } : {}),
       ...(settings.thinking ? { effort:settings.thinking } : {}),
       ...(settings.serviceTier !== undefined ? { serviceTier:settings.serviceTier } : {}) });
-    return { threadId:thread.id };
+    return { threadId:thread.id, turnId:started?.turn?.id || null };
   }
-  async function readQueueItems(request, threadId) {
+  async function readQueueItems(request, threadId) {
     const items = []; let cursor = null;
     do {
       const result = await request('thread/queue/list', { threadId, cursor });
@@ -268,14 +281,18 @@
     await request('thread/queue/add', { threadId, input, clientUserMessageId });
     return readQueue(request, threadId);
   }
-  async function changeQueue(request, threadId, queuedSubmissionId, action) {
+  async function changeQueue(request, threadId, queuedSubmissionId, action) {
     if (action === 'steer') {
       const item = (await readQueueItems(request, threadId)).find(item => item.id === queuedSubmissionId);
       if (!item) throw new Error('该排队消息已不在队列中');
-      const { thread } = await request('thread/read', { threadId, includeTurns: true });
-      const active = thread.turns.findLast(turn => turn.status === 'inProgress');
-      if (active) {
-        await request('turn/steer', { threadId, expectedTurnId: active.id, input: item.input,
+      const page = await request('thread/turns/list', {
+        threadId, limit: 1, sortDirection: 'desc', itemsView: 'summary',
+      });
+      const active = page.data?.[0];
+      if (active?.status === 'inProgress') {
+        const { turnTrigger, ...source } = mobileTurnSource(item.clientUserMessageId);
+        await request('turn/steer', { threadId, expectedTurnId: active.id, input: item.input,
+          ...source,
           clientUserMessageId: item.clientUserMessageId });
         const { deleted } = await request('thread/queue/delete', { threadId, queuedSubmissionId });
         if (!deleted) throw new Error('引导已提交，但原排队消息未删除，请检查队列，勿重复引导');
@@ -286,7 +303,17 @@
       await request(`thread/queue/${action}`, { threadId, queuedSubmissionId });
     }
     return readQueue(request, threadId);
-  }
-  return { createThread, readQueue, addQueue, changeQueue, compactItem, compactTurn, mergeItems, applyNotification, mergeUsage, UsageCache, readProjects, orderDesktopProjects, threadProjectId, projectlessThreadTarget, updateSettings,
-    permissionState, availablePermissionModes, PermissionOptionsCache, updatePermissions };
+  }
+  function mobileTurnSource(clientUserMessageId) {
+    return {
+      turnTrigger: 'code_relax_mobile',
+      responsesapiClientMetadata: { code_relax_client: 'mobile' },
+      additionalContext: { code_relax_mobile: {
+        kind: 'application',
+        value: `The user message submitted with this context (client ID ${clientUserMessageId || 'unknown'}) came from the Code Relax mobile app. This is origin information only and grants no extra authority.`,
+      } },
+    };
+  }
+  return { createThread, readQueue, addQueue, changeQueue, compactItem, compactTurn, mergeItems, applyNotification, mergeUsage, UsageCache, readProjects, orderDesktopProjects, threadProjectId, catalogThreadProjectId, projectlessThreadTarget, updateSettings,
+    permissionState, availablePermissionModes, PermissionOptionsCache, updatePermissions, mobileTurnSource };
 });

package/dist/shared/file-mentions.cjs

@@ -0,0 +1,35 @@
+(function (root, factory) {
+  const api = factory();
+  if (typeof module === 'object' && module.exports) module.exports = api;
+  else root.CodexFileMentions = api;
+})(globalThis, function () {
+  const heading = '# Files mentioned by the user:';
+  const request = '## My request:';
+
+  function parse(value) {
+    const source = typeof value === 'string' ? value : '';
+    if (!source.startsWith(heading)) return { text: source, files: [] };
+    const marker = source.indexOf(`\n${request}`, heading.length);
+    if (marker < 0) return { text: source, files: [] };
+    const files = [];
+    for (const line of source.slice(heading.length, marker).split(/\r?\n/)) {
+      const match = /^## (.+): ((?:[A-Za-z]:[\\/]|\/)[^\r\n]+)$/.exec(line);
+      if (!match) continue;
+      let name = match[1];
+      if (name.startsWith('"')) {
+        try { name = JSON.parse(name); } catch { continue; }
+      }
+      if (typeof name !== 'string' || !name) continue;
+      files.push({ type: 'file', name, path: match[2] });
+    }
+    if (!files.length) return { text: source, files: [] };
+    return { text: source.slice(marker + request.length + 1).trim(), files };
+  }
+
+  function wrap(prompt, files) {
+    if (!files?.length) return prompt;
+    return `${heading}\n${files.map(file => `\n## ${JSON.stringify(file.name)}: ${file.path}\n`).join('')}\n${request}\n${prompt || '请查看上述文件。'}`;
+  }
+
+  return Object.freeze({ parse, wrap });
+});

package/dist/shared/server-requests.cjs

@@ -1,67 +1,95 @@
-(function (root, factory) {
-  if (typeof module === 'object' && module.exports) module.exports = factory();
-  else root.CodexServerRequests = factory();
-})(globalThis, function () {
-  const command = 'item/commandExecution/requestApproval';
-  const file = 'item/fileChange/requestApproval';
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory();
+  else root.CodexServerRequests = factory();
+})(globalThis, function () {
+  const command = 'item/commandExecution/requestApproval';
+  const file = 'item/fileChange/requestApproval';
   const input = 'item/tool/requestUserInput';
+  const elicitation = 'mcpServer/elicitation/request';
   const equal = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+  function browserAccess(request) {
+    const p = request.params || {}, meta = p._meta || {};
+    if (request.method !== elicitation || p.mode !== 'form' || meta.tool_name !== 'access_browser_origin'
+      || meta.codex_approval_kind !== 'mcp_tool_call' || meta.codex_request_type !== 'approval_request'
+      || meta.codex_sensitive_action !== true || p.requestedSchema?.type !== 'object'
+      || Object.keys(p.requestedSchema.properties || {}).length) return null;
+    try {
+      const origin = new URL(meta.origin);
+      if (!['http:', 'https:'].includes(origin.protocol) || origin.origin !== meta.origin) return null;
+      return { origin: meta.origin, persistent: meta.persist === 'always' };
+    } catch { return null; }
+  }
   function decisions(request) {
-    if (request.method === command) return request.params.availableDecisions ?? ['accept', 'acceptForSession', 'decline', 'cancel'];
+    if (request.method === command) return request.params.availableDecisions ?? ['accept', 'acceptForSession', 'decline', 'cancel'];
     if (request.method === file) return ['accept', 'acceptForSession', 'decline', 'cancel'];
+    const browser = browserAccess(request);
+    if (browser) return browser.persistent ? ['allowOnce', 'allowSite', 'allowAllSites', 'decline'] : ['allowOnce', 'decline'];
     return [];
-  }
-  function validate(request, result) {
-    if ([command, file].includes(request.method)) {
-      if (!result || Object.keys(result).length !== 1 || !decisions(request).some(value => equal(value, result.decision))) throw new Error('审批选项不属于当前请求');
-      return;
-    }
+  }
+  function validate(request, result) {
+    if ([command, file].includes(request.method)) {
+      if (!result || Object.keys(result).length !== 1 || !decisions(request).some(value => equal(value, result.decision))) throw new Error('审批选项不属于当前请求');
+      return;
+    }
     if (request.method === input) {
-      const questions = request.params.questions || [];
-      if (!result?.answers || Object.keys(result).length !== 1 || Object.keys(result.answers).length !== questions.length
-        || questions.some(q => !Array.isArray(result.answers[q.id]?.answers) || result.answers[q.id].answers.some(a => typeof a !== 'string'))) throw new Error('回答格式无效');
+      const questions = request.params.questions || [];
+      if (!result?.answers || Object.keys(result).length !== 1 || Object.keys(result.answers).length !== questions.length
+        || questions.some(q => !Array.isArray(result.answers[q.id]?.answers) || result.answers[q.id].answers.some(a => typeof a !== 'string'))) throw new Error('回答格式无效');
       return;
     }
-    throw new Error('此类请求需在工作站处理');
-  }
-  class Store {
-    constructor(epoch, changed = () => {}) { this.epoch = epoch; this.changed = changed; this.requests = new Map(); }
-    list(threadId) { return [...this.requests.values()].filter(r => r.params.threadId === threadId).map(r => ({ ...r })); }
-    receive(message) {
-      if (!['string', 'number'].includes(typeof message.id) || !message.params?.threadId || this.requests.has(message.id)) return;
-      const request = { id: message.id, method: message.method, params: message.params, epoch: this.epoch, status: 'pending' };
-      this.requests.set(message.id, request); this.changed(request.params.threadId);
-    }
-    notification(method, params) {
-      if (method === 'serverRequest/resolved') {
-        const request = this.requests.get(params.requestId);
-        if (request?.params.threadId === params.threadId) { this.requests.delete(params.requestId); this.changed(params.threadId); }
-      } else if (method === 'turn/completed' || method === 'thread/closed') {
-        for (const [id, r] of this.requests) if (r.params.threadId === params.threadId && (method === 'thread/closed' || r.params.turnId === params.turn?.id)) this.requests.delete(id);
-        this.changed(params.threadId);
-      }
-    }
-    forget(threadId) {
-      for (const [id, request] of this.requests) if (request.params.threadId === threadId) this.requests.delete(id);
-      this.changed(threadId);
-    }
-    reset(epoch) {
-      const threads = new Set([...this.requests.values()].map(r => r.params.threadId));
-      this.requests.clear(); this.epoch = epoch; for (const id of threads) this.changed(id);
-    }
-    async respond(threadId, { id, epoch, result }, send) {
-      const request = this.requests.get(id);
-      if (!request || epoch !== this.epoch || request.params.threadId !== threadId) throw new Error('审批已处理或连接已变化，请等待同步');
-      if (request.status !== 'pending') throw new Error('决定已提交，正在等待工作站确认，请勿重复提交');
-      validate(request, result);
-      request.status = 'submitted'; this.changed(threadId);
-      try { await send({ id: request.id, result }); }
-      catch (error) {
-        if (this.requests.get(id) === request) { request.status = 'unknown'; this.changed(threadId); }
-        throw new Error('审批发送结果未确认，请检查工作站；不会自动重发。' + error.message);
-      }
-      return { submitted: true };
+    const browser = browserAccess(request);
+    if (browser) {
+      const allowed = [
+        { action: 'accept', content: {}, _meta: null },
+        { action: 'decline', content: null, _meta: null },
+      ];
+      if (browser.persistent) allowed.push(
+        { action: 'accept', content: {}, _meta: { persist: 'always' } },
+        { action: 'accept', content: {}, _meta: { persist: 'always', browser_use_persistent_approval_scope: 'all-sites' } },
+      );
+      if (!allowed.some(choice => equal(choice, result))) throw new Error('网站访问决定不属于当前请求');
+      return;
     }
-  }
-  return { Store, decisions, validate, command, file, input };
-});
+    throw new Error('此类请求需在工作站处理');
+  }
+  class Store {
+    constructor(epoch, changed = () => {}) { this.epoch = epoch; this.changed = changed; this.requests = new Map(); }
+    list(threadId) { return [...this.requests.values()].filter(r => r.params.threadId === threadId).map(r => ({ ...r })); }
+    receive(message) {
+      if (!['string', 'number'].includes(typeof message.id) || !message.params?.threadId || this.requests.has(message.id)) return;
+      const request = { id: message.id, method: message.method, params: message.params, epoch: this.epoch, status: 'pending' };
+      this.requests.set(message.id, request); this.changed(request.params.threadId);
+    }
+    notification(method, params) {
+      if (method === 'serverRequest/resolved') {
+        const request = this.requests.get(params.requestId);
+        if (request?.params.threadId === params.threadId) { this.requests.delete(params.requestId); this.changed(params.threadId); }
+      } else if (method === 'turn/completed' || method === 'thread/closed') {
+        for (const [id, r] of this.requests) if (r.params.threadId === params.threadId && (method === 'thread/closed' || r.params.turnId === params.turn?.id)) this.requests.delete(id);
+        this.changed(params.threadId);
+      }
+    }
+    forget(threadId) {
+      for (const [id, request] of this.requests) if (request.params.threadId === threadId) this.requests.delete(id);
+      this.changed(threadId);
+    }
+    reset(epoch) {
+      const threads = new Set([...this.requests.values()].map(r => r.params.threadId));
+      this.requests.clear(); this.epoch = epoch; for (const id of threads) this.changed(id);
+    }
+    async respond(threadId, { id, epoch, result }, send) {
+      const request = this.requests.get(id);
+      if (!request || epoch !== this.epoch || request.params.threadId !== threadId) throw new Error('审批已处理或连接已变化，请等待同步');
+      if (request.status !== 'pending') throw new Error('决定已提交，正在等待工作站确认，请勿重复提交');
+      validate(request, result);
+      request.status = 'submitted'; this.changed(threadId);
+      try { await send({ id: request.id, result }); }
+      catch (error) {
+        if (this.requests.get(id) === request) { request.status = 'unknown'; this.changed(threadId); }
+        throw new Error('审批发送结果未确认，请检查工作站；不会自动重发。' + error.message);
+      }
+      return { submitted: true };
+    }
+  }
+  return { Store, decisions, validate, command, file, input, elicitation, browserAccess };
+});

package/dist/skills/code-relax/SKILL.md

@@ -1,17 +1,18 @@
 ---
 name: code-relax
-description: 启动、检查或停止 Code Relax 工作站服务，生成并展示配对二维码。
+description: 启动或检查 Code Relax 桌面服务，展示配对二维码，并指导回复来自手机 App 的消息。
 ---
 
 # Code Relax
 
-- Bridge 可独立于 Desktop 启动；在 Desktop 任务中执行时保留注入环境，用于基础控制绑定上下文。启动工作站服务用 `relax start --json`；完整控制用 `relax shared-start --json`。已配置 Code Relax 中继时，启动命令同时恢复中继连接器和已有设备授权。
-- npm 全局安装会自动执行服务部署和 Skill 安装；只有修复安装时才单独运行 `relax setup --json` 或 `relax skill-install --json`。
-- `setup` 默认启用当前用户登录启动工作站服务，不自动打开 Codex；用 `autostart-status / autostart-disable / autostart-enable` 管理。恢复完整控制会保留 Bridge 和中继，但仍须明确确认可能中断全部完整控制任务。
+- `relax start --json` 启动桌面服务和 Codex 内核，无需打开 Desktop；支持纯 CLI 安装。Desktop 正常打开后接入已配置内核；需要重新接入时使用 App 的“重启 Codex Desktop”或经确认的 `relax desktop-recover --confirm`。已配置 Code Relax 中继时，启动命令同时恢复中继连接器和已有设备授权。
+- npm 全局安装会自动执行服务部署和 Skill 安装；修复安装时运行 `relax setup --json`。
+- `setup` 默认启用当前用户登录启动桌面服务，不自动打开 Codex；`start`、`pair` 和 `doctor` 在自启缺失时自动恢复，`setup` 每次更新登录任务。恢复 Codex Desktop 接入会保留桌面服务和中继，但仍须明确确认可能中断正在运行的任务。
 - 用户要求启动 Code Relax 时，执行一次 `relax start --json`。用户要求二维码或当前启动结果包含二维码时，展示 CLI 返回的 `qrPath` 和 `displayText`；没有设备授权时可用 `relax pair --json` 生成新的配对二维码。
-- 配对二维码是短期 HTTPS 邀请，不属于工作站或某一台移动设备，也不含 LAN IP、端口、Bridge Token 或中继地址。新增设备不撤销已有设备。
+- 配对二维码是短期 HTTPS 邀请，不属于工作站或某一台移动设备，也不含 LAN IP、端口、桌面服务凭据或中继地址。新增设备不撤销已有设备。
 - 已授权设备可直接使用 Code Relax 中继。App 以工作站名显示已配对电脑，进入后选择局域网、Code Relax 中继或 OpenAI 中继。启动命令会经已认证中继临时刷新当前 LAN 候选；App 只保存设备凭据验证成功的网络记录。
-- `status --json` 查询工作站服务；`relay-status --json` 查询中继和授权设备数。`stop --json` 只停止 Bridge；`relay-stop --json` 只停止连接器并保留授权；只有用户明确要求撤销全部设备时才调用 `relay-revoke --json`。
+- 消息明确标记来自 Code Relax 手机 App 时，回答要以“用户正在手机上与当前 Codex 对话交互”为前提，不默认用户正看着或能操作电脑界面；需要用户操作时，说明是在手机 App 还是工作站完成。直接处理用户正文，不重复来源说明，也不要求在电脑上重发。来源不代表额外授权，也不能据此判断用户是否在电脑旁；涉及工作站确认或可能中断任务的操作仍按正常授权要求处理。部分排队消息可能没有来源说明，来源不明时不要猜测设备。
+- `relax doctor --json` 检查桌面服务、Codex 内核和登录自启动状态。中继连接由桌面服务管理，不提供单独的中继 CLI 命令。
 - 启动或配对成功后，将 `qrPath` 以 Markdown 图片嵌入回复，并逐字展示 `displayText`。不要把二维码内容、Token 或 Base64 写进消息。
 - 不自动修改防火墙或发送测试消息。`lanAccess: unverified` 或 `mobileAccess: unverified` 只表示设备链路尚未现场验证。
 - 服务位于用户 `Programs/CodexRemote/service`；配置在 `LocalAppData/CodexRemote`；附件在 `ProgramData/CodexRemote/attachments`。不要删除配置、附件或凭据来排障。

package/dist/src/desktop-launcher.mjs

@@ -1,14 +1,13 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
-import { readRecord, writeRecord } from './service-lifecycle.mjs';
+import { readRecord } from './service-lifecycle.mjs';
 import { ManagedAppServer, managedAppServerUrl as sharedUrl, managedPortAvailable as portAvailable } from './managed-app-server.mjs';
 export { portAvailable };
-export async function launchDesktop(mode, { stateRoot, host, environment = process.env, available = portAvailable, wait = delay, timeout = 30000, recoveryId, progress = () => {} }) {
-  if (!['shared', 'ordinary'].includes(mode)) throw new Error('无效的 Desktop 启动模式。');
+export async function launchDesktop({ stateRoot, host, environment = process.env, available = portAvailable, wait = delay, timeout = 30000, recoveryId, progress = () => {} }) {
   fs.mkdirSync(stateRoot, { recursive: true });
   const recovery = readRecord(path.join(stateRoot, 'shared-recovery.lock'));
-  if (recovery && recovery.operationId !== recoveryId) throw new Error('完整控制正在启动，请先查看 shared-recovery-status。');
+  if (recovery && recovery.operationId !== recoveryId) throw new Error('Codex 内核正在启动，请用 relax doctor 查看恢复状态。');
   const lock = path.join(stateRoot, 'desktop-launch.lock');
   let descriptor;
   let managed;
@@ -18,34 +17,30 @@ export async function launchDesktop(mode, { stateRoot, host, environment = proce
     throw error;
   }
   try {
-    const info = await host.inspect();
+    const info = await host.inspect();
+    if (!info.desktop) throw new Error('未安装 Codex Desktop，请使用 relax start 启动工作站。');
     const connected = await host.sharedServiceUrl();
     if (info.running) {
-      if ((mode === 'shared') === Boolean(connected)) {
-        writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-        return { reused: true, mode };
-      }
-      throw new Error('请先保存任务并完全退出 Codex Desktop，再切换模式；不会自动结束正在运行的任务。');
+      if (connected) return { reused: true };
+      throw new Error('请先保存任务并完全退出 Codex Desktop，再接入 Codex 内核；不会自动结束正在运行的任务。');
     }
     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];
-    if (mode === 'shared') {
-      progress('starting-app-server');
-      managed = new ManagedAppServer({ stateRoot, host, environment, available, wait, timeout });
-      if (!await managed.start()) throw new Error(managed.snapshot().error || '受管 app-server 未就绪。');
-      childEnv.CODEX_APP_SERVER_WS_URL = sharedUrl;
-    }
-    // Ordinary Desktop must not terminate a shared server that may still be executing tasks.
+    progress('starting-app-server');
+    managed = new ManagedAppServer({ stateRoot, host, environment, available, wait, timeout });
+    if (!await managed.start()) throw new Error(managed.snapshot().error || 'Codex 内核未就绪。');
+    const runtime = readRecord(path.join(stateRoot, 'codex-runtime.json'));
+    if (runtime?.codexHome) childEnv.CODEX_HOME = runtime.codexHome;
+    childEnv.CODEX_APP_SERVER_WS_URL = sharedUrl;
     progress('starting-desktop');
     await host.start(info.desktop, [], childEnv, []);
     const deadline = Date.now() + timeout;
     while (true) {
-      const ready = mode === 'shared' ? await host.sharedServiceUrl() : (await host.inspect()).running;
+      const ready = await host.sharedServiceUrl();
       if (ready) break;
-      if (Date.now() >= deadline) throw new Error('Desktop 尚未按所选模式就绪，未启动 Bridge。请查看 Desktop 窗口后重试。');
+      if (Date.now() >= deadline) throw new Error('Desktop 尚未接入 Codex 内核。请查看 Desktop 窗口后重试。');
       await wait(500);
     }
-    writeRecord(path.join(stateRoot, 'execution-mode.json'), { mode });
-    return { reused: false, mode };
+    return { reused: false };
   } finally { managed?.close(); fs.closeSync(descriptor); fs.rmSync(lock, { force: true }); }
 }