@walkhi/code-relax 0.1.0-beta.50 → 0.1.0-beta.51

package/dist/src/platform/windows/user-environment.mjs

@@ -1,52 +1,52 @@
-import path from 'node:path';
-import fs from 'node:fs';
-import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
-import { runScript } from './desktop-host.mjs';
-import { managedEndpointUrl } from '../../managed-endpoint.mjs';
-
-const ownershipFile = 'managed-environment.json';
-
-export async function readManagedEnvironment() {
-  return JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Read']));
-}
-
-export async function configureManagedEnvironment(stateRoot, url) {
-  const current = await readManagedEnvironment();
-  if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址，未修改环境变量。');
-  const ownershipPath = path.join(stateRoot, ownershipFile);
-  const ownership = readRecord(ownershipPath);
-  if (current.forceCliUser === '1' || current.forceCliMachine === '1') {
-    throw new Error('CODEX_APP_SERVER_FORCE_CLI=1 会让 Codex 忽略当前内核地址；未修改该配置。');
-  }
-  if (current.userValue && current.userValue !== url && current.userValue !== ownership?.value) {
-    throw new Error(`用户已有 CODEX_APP_SERVER_WS_URL=${current.userValue}；未覆盖该配置。`);
-  }
-  if (current.userValue === url) {
-    const owned = ownership?.value === url;
-    return { configured: true, value: current.userValue, changed: false, owned };
-  }
-  const applied = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Set', '-Value', url]));
-  if (applied.userValue !== url) throw new Error('CODEX_APP_SERVER_WS_URL 写入后读回不一致。');
-  writeRecord(ownershipPath, { name: 'CODEX_APP_SERVER_WS_URL', value: url,
-    configuredAt: new Date().toISOString() });
-  return { configured: true, value: applied.userValue, changed: true, owned: true };
-}
-
-export async function clearManagedEnvironment(stateRoot) {
-  const ownershipPath = path.join(stateRoot, ownershipFile);
-  const ownership = readRecord(ownershipPath);
-  const current = await readManagedEnvironment();
-  if (!current.userValue) {
-    fs.rmSync(ownershipPath, { force: true });
-    return { removed: false, preserved: false, reason: 'already-empty' };
-  }
-  if (!managedEndpointUrl(ownership?.value) || current.userValue !== ownership.value) {
-    fs.rmSync(ownershipPath, { force: true });
-    return { removed: false, preserved: true, value: current.userValue,
-      reason: managedEndpointUrl(ownership?.value) ? 'user-modified' : 'not-owned' };
-  }
-  const result = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Clear']));
-  if (result.userValue) throw new Error('CODEX_APP_SERVER_WS_URL 清理后读回仍不为空。');
-  fs.rmSync(ownershipPath, { force: true });
-  return { removed: true, preserved: false, reason: 'removed' };
-}
+import path from 'node:path';
+import fs from 'node:fs';
+import { readRecord, writeRecord } from '../../service-lifecycle.mjs';
+import { runScript } from './desktop-host.mjs';
+import { managedEndpointUrl } from '../../managed-endpoint.mjs';
+
+const ownershipFile = 'managed-environment.json';
+
+export async function readManagedEnvironment() {
+  return JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Read']));
+}
+
+export async function configureManagedEnvironment(stateRoot, url) {
+  const current = await readManagedEnvironment();
+  if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址，未修改环境变量。');
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  const ownership = readRecord(ownershipPath);
+  if (current.forceCliUser === '1' || current.forceCliMachine === '1') {
+    throw new Error('CODEX_APP_SERVER_FORCE_CLI=1 会让 Codex 忽略当前内核地址；未修改该配置。');
+  }
+  if (current.userValue && current.userValue !== url && current.userValue !== ownership?.value) {
+    throw new Error(`用户已有 CODEX_APP_SERVER_WS_URL=${current.userValue}；未覆盖该配置。`);
+  }
+  if (current.userValue === url) {
+    const owned = ownership?.value === url;
+    return { configured: true, value: current.userValue, changed: false, owned };
+  }
+  const applied = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Set', '-Value', url]));
+  if (applied.userValue !== url) throw new Error('CODEX_APP_SERVER_WS_URL 写入后读回不一致。');
+  writeRecord(ownershipPath, { name: 'CODEX_APP_SERVER_WS_URL', value: url,
+    configuredAt: new Date().toISOString() });
+  return { configured: true, value: applied.userValue, changed: true, owned: true };
+}
+
+export async function clearManagedEnvironment(stateRoot) {
+  const ownershipPath = path.join(stateRoot, ownershipFile);
+  const ownership = readRecord(ownershipPath);
+  const current = await readManagedEnvironment();
+  if (!current.userValue) {
+    fs.rmSync(ownershipPath, { force: true });
+    return { removed: false, preserved: false, reason: 'already-empty' };
+  }
+  if (!managedEndpointUrl(ownership?.value) || current.userValue !== ownership.value) {
+    fs.rmSync(ownershipPath, { force: true });
+    return { removed: false, preserved: true, value: current.userValue,
+      reason: managedEndpointUrl(ownership?.value) ? 'user-modified' : 'not-owned' };
+  }
+  const result = JSON.parse(await runScript('user-environment.ps1', ['-Action', 'Clear']));
+  if (result.userValue) throw new Error('CODEX_APP_SERVER_WS_URL 清理后读回仍不为空。');
+  fs.rmSync(ownershipPath, { force: true });
+  return { removed: true, preserved: false, reason: 'removed' };
+}

package/dist/src/project-management.mjs

@@ -1,59 +1,59 @@
-import path from 'node:path';
-
-const fail = (message, statusCode = 400) => { throw Object.assign(new Error(message), { statusCode }); };
-const pathKey = value => process.platform === 'win32' ? value.toLowerCase() : value;
-
-function absoluteDirectory(value) {
-  if (typeof value !== 'string' || !value.trim() || !path.isAbsolute(value.trim())) fail('请输入电脑上的绝对文件夹路径。');
-  return path.normalize(value.trim());
-}
-
-async function directory(rpc, value) {
-  const target = absoluteDirectory(value);
-  const stat = await rpc('fs/getMetadata', { path: target });
-  if (!stat.isDirectory) fail(`此路径不是文件夹：${target}`);
-  return target;
-}
-
-function folderName(value) {
-  if (typeof value !== 'string' || !value.trim() || /[<>:"/\\|?*\x00-\x1f]/.test(value) || /[ .]$/.test(value)
-    || /^(?:con|prn|aux|nul|com[1-9¹²³]|lpt[1-9¹²³])(?:\.|$)/i.test(value) || ['.', '..'].includes(value)) {
-    fail('文件夹名称无效，请勿使用路径分隔符或系统保留名称。');
-  }
-  return value;
-}
-
-export async function projectRoots(rpc, roots) {
-  if (!Array.isArray(roots)) fail('项目文件夹列表无效。');
-  const result = [], seen = new Set();
-  for (const root of roots) {
-    const target = await directory(rpc, root?.path);
-    const key = pathKey(target);
-    if (seen.has(key)) fail(`重复的项目文件夹：${target}`);
-    seen.add(key); result.push({ path: target });
-  }
-  return result;
-}
-
-export function projectSummary(project) {
-  return { projectId: project.id, name: project.name, label: project.name, roots: project.roots,
-    path: project.roots[0]?.path || '', cwd: project.roots[0]?.path || '', hostId: 'local' };
-}
-
-export async function browseProjectFolders(rpc, locations, value) {
-  const target = absoluteDirectory(value || locations?.home);
-  const entries = (await rpc('fs/readDirectory', { path: target })).entries
-    .filter(entry => entry.isDirectory).map(entry => ({ name: entry.fileName, path: path.join(target, entry.fileName) }))
-    .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN', { numeric: true }));
-  return { path: target, parent: path.dirname(target) === target ? null : path.dirname(target), entries, ...(locations || {}) };
-}
-
-export async function createProjectFolder(rpc, body) {
-  const parent = await directory(rpc, body.parent);
-  const name = folderName(body.name);
-  const entries = (await rpc('fs/readDirectory', { path: parent })).entries;
-  if (entries.some(entry => pathKey(entry.fileName) === pathKey(name))) fail('同名文件夹已存在，请选择它或使用其他名称。', 409);
-  const target = path.join(parent, name);
-  await rpc('fs/createDirectory', { path: target, recursive: false });
-  return { path: target };
+import path from 'node:path';
+
+const fail = (message, statusCode = 400) => { throw Object.assign(new Error(message), { statusCode }); };
+const pathKey = value => process.platform === 'win32' ? value.toLowerCase() : value;
+
+function absoluteDirectory(value) {
+  if (typeof value !== 'string' || !value.trim() || !path.isAbsolute(value.trim())) fail('请输入电脑上的绝对文件夹路径。');
+  return path.normalize(value.trim());
+}
+
+async function directory(rpc, value) {
+  const target = absoluteDirectory(value);
+  const stat = await rpc('fs/getMetadata', { path: target });
+  if (!stat.isDirectory) fail(`此路径不是文件夹：${target}`);
+  return target;
+}
+
+function folderName(value) {
+  if (typeof value !== 'string' || !value.trim() || /[<>:"/\\|?*\x00-\x1f]/.test(value) || /[ .]$/.test(value)
+    || /^(?:con|prn|aux|nul|com[1-9¹²³]|lpt[1-9¹²³])(?:\.|$)/i.test(value) || ['.', '..'].includes(value)) {
+    fail('文件夹名称无效，请勿使用路径分隔符或系统保留名称。');
+  }
+  return value;
+}
+
+export async function projectRoots(rpc, roots) {
+  if (!Array.isArray(roots)) fail('项目文件夹列表无效。');
+  const result = [], seen = new Set();
+  for (const root of roots) {
+    const target = await directory(rpc, root?.path);
+    const key = pathKey(target);
+    if (seen.has(key)) fail(`重复的项目文件夹：${target}`);
+    seen.add(key); result.push({ path: target });
+  }
+  return result;
+}
+
+export function projectSummary(project) {
+  return { projectId: project.id, name: project.name, label: project.name, roots: project.roots,
+    path: project.roots[0]?.path || '', cwd: project.roots[0]?.path || '', hostId: 'local' };
+}
+
+export async function browseProjectFolders(rpc, locations, value) {
+  const target = absoluteDirectory(value || locations?.home);
+  const entries = (await rpc('fs/readDirectory', { path: target })).entries
+    .filter(entry => entry.isDirectory).map(entry => ({ name: entry.fileName, path: path.join(target, entry.fileName) }))
+    .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN', { numeric: true }));
+  return { path: target, parent: path.dirname(target) === target ? null : path.dirname(target), entries, ...(locations || {}) };
+}
+
+export async function createProjectFolder(rpc, body) {
+  const parent = await directory(rpc, body.parent);
+  const name = folderName(body.name);
+  const entries = (await rpc('fs/readDirectory', { path: parent })).entries;
+  if (entries.some(entry => pathKey(entry.fileName) === pathKey(name))) fail('同名文件夹已存在，请选择它或使用其他名称。', 409);
+  const target = path.join(parent, name);
+  await rpc('fs/createDirectory', { path: target, recursive: false });
+  return { path: target };
 }

package/dist/src/runtime-discovery.mjs

@@ -1,47 +1,47 @@
-import { discoverCodex, resolveCodexRuntime, runtimeFingerprint } from './platform/codex-runtime.mjs';
-
-// Advisory discovery is independent of execution health. Failure here must never
-// disable an already running app-server or cause an automatic process restart.
-export class RuntimeDiscovery {
-  constructor({ stateRoot, host, url, interval = 60000 }) {
-    Object.assign(this, { stateRoot, host, url, interval });
-    this.state = {};
-  }
-  start() { this.stopped = false; void this.tick(); }
-  stop() { this.stopped = true; clearTimeout(this.timer); }
-  async sample() {
-    const errors = [];
-    try {
-      const candidates = discoverCodex();
-      const signature = JSON.stringify(candidates.map(candidate => {
-        try { return [candidate.executable, runtimeFingerprint(candidate.executable)]; }
-        catch (error) { return [candidate.executable, error.message]; }
-      }));
-      if (signature !== this.signature) {
-        await resolveCodexRuntime(this.stateRoot, { refresh: true });
-        this.signature = signature;
-      }
-    } catch (error) { errors.push(error.message); }
-    try {
-      if (this.host.desktopIntegration === false) {
-        this.state = { desktop: { state: 'unsupported', integrationSupported: false }, checkedAt: new Date().toISOString() };
-        if (errors.length) this.state.discoveryError = errors.join('\n');
-        return this.state;
-      }
-      const desktop = await this.host.inspect();
-      const attached = desktop.running && await this.host.sharedServiceUrl() === (typeof this.url === 'function' ? this.url() : this.url);
-      this.state = { desktop: { state: !desktop.running ? 'stopped' : attached ? 'managed' : 'ordinary',
-        installed: Boolean(desktop.desktop), version: desktop.version || '', attachedToManagedServer: Boolean(attached) },
-        desktopRestartRecommended: Boolean(desktop.running && !attached), checkedAt: new Date().toISOString() };
-    } catch (error) {
-      errors.push(error.message);
-      this.state = { checkedAt: new Date().toISOString() };
-    }
-    if (errors.length) this.state.discoveryError = errors.join('\n');
-    return this.state;
-  }
-  async tick() {
-    await this.sample();
-    if (!this.stopped) { this.timer = setTimeout(() => this.tick(), this.interval); this.timer.unref?.(); }
-  }
-}
+import { discoverCodex, resolveCodexRuntime, runtimeFingerprint } from './platform/codex-runtime.mjs';
+
+// Advisory discovery is independent of execution health. Failure here must never
+// disable an already running app-server or cause an automatic process restart.
+export class RuntimeDiscovery {
+  constructor({ stateRoot, host, url, interval = 60000 }) {
+    Object.assign(this, { stateRoot, host, url, interval });
+    this.state = {};
+  }
+  start() { this.stopped = false; void this.tick(); }
+  stop() { this.stopped = true; clearTimeout(this.timer); }
+  async sample() {
+    const errors = [];
+    try {
+      const candidates = discoverCodex();
+      const signature = JSON.stringify(candidates.map(candidate => {
+        try { return [candidate.executable, runtimeFingerprint(candidate.executable)]; }
+        catch (error) { return [candidate.executable, error.message]; }
+      }));
+      if (signature !== this.signature) {
+        await resolveCodexRuntime(this.stateRoot, { refresh: true });
+        this.signature = signature;
+      }
+    } catch (error) { errors.push(error.message); }
+    try {
+      if (this.host.desktopIntegration === false) {
+        this.state = { desktop: { state: 'unsupported', integrationSupported: false }, checkedAt: new Date().toISOString() };
+        if (errors.length) this.state.discoveryError = errors.join('\n');
+        return this.state;
+      }
+      const desktop = await this.host.inspect();
+      const attached = desktop.running && await this.host.sharedServiceUrl() === (typeof this.url === 'function' ? this.url() : this.url);
+      this.state = { desktop: { state: !desktop.running ? 'stopped' : attached ? 'managed' : 'ordinary',
+        installed: Boolean(desktop.desktop), version: desktop.version || '', hasWindow: desktop.hasWindow, attachedToManagedServer: Boolean(attached) },
+        desktopRestartRecommended: Boolean(desktop.running && !attached), checkedAt: new Date().toISOString() };
+    } catch (error) {
+      errors.push(error.message);
+      this.state = { checkedAt: new Date().toISOString() };
+    }
+    if (errors.length) this.state.discoveryError = errors.join('\n');
+    return this.state;
+  }
+  async tick() {
+    await this.sample();
+    if (!this.stopped) { this.timer = setTimeout(() => this.tick(), this.interval); this.timer.unref?.(); }
+  }
+}

package/dist/src/self-relay/account-cleanup.mjs

@@ -1,30 +1,30 @@
-// Process one account per transaction; foreign keys keep incomplete deletion atomic.
-export async function purgeCancelledAccounts(pool, scopeHash) {
-  let purged = 0;
-  for (;;) {
-    const db = await pool.getConnection();
-    try {
-      await db.beginTransaction();
-      const [rows] = await db.query(`SELECT id FROM users WHERE status='cancelled'
-        AND cancelled_at <= UTC_TIMESTAMP(3) - INTERVAL 1 DAY
-        ORDER BY cancelled_at LIMIT 1 FOR UPDATE`);
-      if (!rows.length) { await db.commit(); return purged; }
-      const id = rows[0].id;
-      const [identities] = await db.execute("SELECT normalized_value FROM user_login_identities WHERE user_id=? AND kind='email'", [id]);
-      for (const { normalized_value: email } of identities) {
-        await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
-        await db.execute('DELETE FROM email_send_limits WHERE scope_hash=?', [scopeHash(`email:${email}`)]);
-        await db.execute('DELETE FROM relay_admin_emails WHERE email=?', [email]);
-      }
-      for (const table of ['user_sessions', 'relay_usage_actions', 'relay_usage_sessions',
-        'relay_usage_user_days', 'relay_usage_budgets', 'relay_usage_entitlements',
-        'relay_usage_totals', 'user_login_identities']) {
-        await db.execute(`DELETE FROM ${table} WHERE user_id=?`, [id]);
-      }
-      await db.execute('UPDATE computers SET owner_user_id=NULL WHERE owner_user_id=?', [id]);
-      await db.execute('DELETE FROM users WHERE id=?', [id]);
-      await db.commit(); purged++;
-    } catch (error) { await db.rollback(); throw error; }
-    finally { db.release(); }
-  }
-}
+// Process one account per transaction; foreign keys keep incomplete deletion atomic.
+export async function purgeCancelledAccounts(pool, scopeHash) {
+  let purged = 0;
+  for (;;) {
+    const db = await pool.getConnection();
+    try {
+      await db.beginTransaction();
+      const [rows] = await db.query(`SELECT id FROM users WHERE status='cancelled'
+        AND cancelled_at <= UTC_TIMESTAMP(3) - INTERVAL 1 DAY
+        ORDER BY cancelled_at LIMIT 1 FOR UPDATE`);
+      if (!rows.length) { await db.commit(); return purged; }
+      const id = rows[0].id;
+      const [identities] = await db.execute("SELECT normalized_value FROM user_login_identities WHERE user_id=? AND kind='email'", [id]);
+      for (const { normalized_value: email } of identities) {
+        await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
+        await db.execute('DELETE FROM email_send_limits WHERE scope_hash=?', [scopeHash(`email:${email}`)]);
+        await db.execute('DELETE FROM relay_admin_emails WHERE email=?', [email]);
+      }
+      for (const table of ['user_sessions', 'relay_usage_actions', 'relay_usage_sessions',
+        'relay_usage_user_days', 'relay_usage_budgets', 'relay_usage_entitlements',
+        'relay_usage_totals', 'user_login_identities']) {
+        await db.execute(`DELETE FROM ${table} WHERE user_id=?`, [id]);
+      }
+      await db.execute('UPDATE computers SET owner_user_id=NULL WHERE owner_user_id=?', [id]);
+      await db.execute('DELETE FROM users WHERE id=?', [id]);
+      await db.commit(); purged++;
+    } catch (error) { await db.rollback(); throw error; }
+    finally { db.release(); }
+  }
+}