@walkhi/code-relax 0.1.0-beta.79 → 0.1.0-beta.80

package/dist/build-platform.json

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

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

@@ -1,9 +1,31 @@
-import { managedEndpointUrl } from '../../managed-endpoint.mjs';
-// Only the new Desktop process receives the managed connection settings.
-// Do not mutate shell profiles or the login session's global environment.
+import os from 'node:os';
+import path from 'node:path';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { managedUserEnvironment, managedEnvironmentName } from '../managed-user-environment.mjs';
+import { installedDesktop } from './desktop-installation.mjs';
+
+const exec = promisify(execFile);
+const systemctl = async args => (await exec('/usr/bin/systemctl', ['--user', ...args], { timeout: 5000 })).stdout;
+const config = path.isAbsolute(process.env.XDG_CONFIG_HOME || '') ? process.env.XDG_CONFIG_HOME : path.join(os.homedir(), '.config');
+export const environmentConfig = url => `# Managed by Code Relax\n${managedEnvironmentName}=${url}\n`;
+const adapter = managedUserEnvironment({
+  file: path.join(config, 'environment.d/60-code-relax.conf'),
+  render: environmentConfig, scope: 'systemd-user',
+  read: async () => {
+    if (process.getuid() === 0) throw new Error('请以普通 Linux 用户配置内核环境，不使用 sudo。');
+    const lines = (await systemctl(['show-environment'])).split('\n');
+    const value = name => {
+      const raw = lines.find(line => line.startsWith(`${name}=`))?.slice(name.length + 1) || '';
+      return raw.startsWith('"') ? JSON.parse(raw) : raw;
+    };
+    return { value: value(managedEnvironmentName), forceCli: value('CODEX_APP_SERVER_FORCE_CLI') };
+  },
+  set: url => systemctl(['set-environment', `${managedEnvironmentName}=${url}`]),
+  unset: () => systemctl(['unset-environment', managedEnvironmentName]),
+});
 export async function configureManagedEnvironment(stateRoot, url) {
-  if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址。');
-  return { configured: true, changed: false, owned: false, persistent: false,
-    scope: 'application-launch', value: url };
+  if (!installedDesktop()) return { configured: false, reason: 'desktop-not-installed' };
+  return adapter.configureManagedEnvironment(stateRoot, url);
 }
-export async function clearManagedEnvironment() { return { removed: false, preserved: false, reason: 'application-launch-only' }; }
+export const { clearManagedEnvironment } = adapter;

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

@@ -1,9 +1,31 @@
-import { managedEndpointUrl } from '../../managed-endpoint.mjs';
-// Launch Services receives these settings for one new application instance.
-// Do not mutate shell profiles or the login session's global environment.
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { managedUserEnvironment, managedEnvironmentName } from '../managed-user-environment.mjs';
+import { systemRequest } from './system.mjs';
+
+const exec = promisify(execFile);
+const launchctl = async args => (await exec('/bin/launchctl', args, { timeout: 5000 })).stdout.trim();
+const readVariable = async name => {
+  try { return await launchctl(['getenv', name]); }
+  catch (error) { if (error.code === 1 && !error.stdout && !error.stderr) return ''; throw error; }
+};
+const adapter = managedUserEnvironment({
+  // The existing login service restores this only after the kernel is verified.
+  // A second static setenv LaunchAgent could race a newly selected dynamic port.
+  scope: 'user-launchd',
+  read: async () => {
+    if (process.getuid() === 0) throw new Error('请以普通 Mac 用户配置内核环境，不使用 sudo。');
+    await launchctl(['print-disabled', `gui/${process.getuid()}`]);
+    if (await launchctl(['managername']) !== 'Aqua')
+      throw new Error('请在当前 Mac 图形登录会话的终端运行 relax setup，以配置 Desktop 的用户环境。');
+    return { value: await readVariable(managedEnvironmentName), forceCli: await readVariable('CODEX_APP_SERVER_FORCE_CLI') };
+  },
+  set: url => launchctl(['setenv', managedEnvironmentName, url]),
+  unset: () => launchctl(['unsetenv', managedEnvironmentName]),
+});
 export async function configureManagedEnvironment(stateRoot, url) {
-  if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址。');
-  return { configured: true, changed: false, owned: false, persistent: false,
-    scope: 'application-launch', value: url };
+  if (!(await systemRequest({ operation: 'desktop-info', url })).desktop)
+    return { configured: false, reason: 'desktop-not-installed' };
+  return adapter.configureManagedEnvironment(stateRoot, url);
 }
-export async function clearManagedEnvironment() { return { removed: false, preserved: false, reason: 'application-launch-only' }; }
+export const { clearManagedEnvironment } = adapter;

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

@@ -0,0 +1,78 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { readRecord, writeRecord } from '../service-lifecycle.mjs';
+import { managedEndpointUrl } from '../managed-endpoint.mjs';
+import { assertPlainPath } from '../skill-install.mjs';
+
+export const managedEnvironmentName = 'CODEX_APP_SERVER_WS_URL';
+const readText = file => {
+  try { return fs.readFileSync(file, 'utf8'); }
+  catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+};
+
+// Platform adapters own the session mechanism; ownership and file updates are shared.
+export function managedUserEnvironment({ file = null, render, read, set, unset, scope, environment = process.env }) {
+  const values = record => record?.file === file && record?.scope === scope && record?.name === managedEnvironmentName ? record.values || [] : [];
+  const ownedValue = (record, value) => !!value && values(record).some(item => managedEndpointUrl(item) === value);
+  const ownedFile = (record, text) => !!file && text !== null && values(record)
+    .some(value => managedEndpointUrl(value) && text === render(value));
+  return {
+    async configureManagedEnvironment(stateRoot, url) {
+      if (!managedEndpointUrl(url)) throw new Error('未确认 Codex 内核地址，未修改环境变量。');
+      const ownershipPath = path.join(stateRoot, 'managed-environment.json');
+      if (file) assertPlainPath(file);
+      assertPlainPath(ownershipPath);
+      const record = readRecord(ownershipPath), text = file ? readText(file) : null, current = await read();
+      if (environment.CODEX_APP_SERVER_FORCE_CLI === '1' || current.forceCli === '1')
+        throw new Error('CODEX_APP_SERVER_FORCE_CLI=1 会让 Codex 忽略当前内核地址；未修改该配置。');
+      if (current.value && (current.value !== url || record) && !ownedValue(record, current.value))
+        throw new Error('用户已有其他 CODEX_APP_SERVER_WS_URL；未覆盖该配置。');
+      if (text !== null && !ownedFile(record, text))
+        throw new Error('同名用户环境文件不属于此安装或已被修改，未覆盖。');
+      if (!record && text === null && current.value === url)
+        return { configured: true, changed: false, owned: false, persistent: false, scope, value: url };
+      const expected = file ? render(url) : null, changed = text !== expected || current.value !== url;
+      // Journal owned endpoints before mutation so interrupted updates remain recoverable.
+      const ownership = { name: managedEnvironmentName, value: url, file, scope,
+        values: [...new Set([url, ...values(record).filter(value => value === current.value || (file && render(value) === text))])],
+        configuredAt: new Date().toISOString() };
+      writeRecord(ownershipPath, ownership);
+      if (text !== expected) {
+        fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
+        const temporary = `${file}.${randomUUID()}.tmp`;
+        try {
+          fs.writeFileSync(temporary, expected, { flag: 'wx', mode: 0o600 });
+          fs.renameSync(temporary, file);
+        } finally { fs.rmSync(temporary, { force: true }); }
+      }
+      if (current.value !== url) await set(url);
+      if ((await read()).value !== url) throw new Error('CODEX_APP_SERVER_WS_URL 写入后读回不一致。');
+      ownership.values = [url];
+      writeRecord(ownershipPath, ownership);
+      return { configured: true, changed, owned: true, persistent: !!file, restoredAtServiceStart: true, scope, value: url };
+    },
+    async clearManagedEnvironment(stateRoot) {
+      const ownershipPath = path.join(stateRoot, 'managed-environment.json');
+      if (file) assertPlainPath(file);
+      assertPlainPath(ownershipPath);
+      const record = readRecord(ownershipPath), text = file ? readText(file) : null;
+      if (!record && text === null) return { removed: false, preserved: false, reason: 'not-owned' };
+      const current = await read();
+      let removed = false, preserved = false;
+      if (text !== null) {
+        if (ownedFile(record, text)) { fs.unlinkSync(file); removed = true; }
+        else preserved = true;
+      }
+      if (current.value) {
+        if (ownedValue(record, current.value)) {
+          await unset();
+          if ((await read()).value) throw new Error('CODEX_APP_SERVER_WS_URL 清理后读回仍不为空。');
+          removed = true;
+        } else preserved = true;
+      }
+      fs.rmSync(ownershipPath, { force: true });
+      return { removed, preserved, reason: preserved ? 'user-modified-or-not-owned' : removed ? 'removed' : 'already-empty' };
+    },
+  };
+}

package/package.json

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