@walkhi/code-relax 0.1.0-beta.76 → 0.1.0-beta.78

package/dist/src/shared-app-server.mjs

@@ -118,9 +118,10 @@ export class SharedAppServer extends EventEmitter {
     await new Promise((resolve, reject) => { socket.once('open', resolve); socket.once('error', reject); });
     try {
       const initialized = await this.request('initialize', { clientInfo: { name: 'codex_remote_shared', version: '1.0.0' }, capabilities: { experimentalApi: true } });
-      // The first user-agent product reports the running server build, not the
-      // selected executable that may only take effect after a future restart.
-      this.serverVersion = String(initialized?.userAgent || '').match(/^[^\s/]+\/([^\s]+)/)?.[1] || '';
+      // The first user-agent product reports the running server build. Its name
+      // may contain spaces ("Codex Desktop"); the slash delimits the version.
+      // Do not substitute the selected executable's pending version.
+      this.serverVersion = String(initialized?.userAgent || '').match(/^[^/]+\/([^\s]+)/)?.[1] || '';
       socket.send(JSON.stringify({ method: 'initialized' }));
       this.ready = true;
       this.usageCache.read(() => this.request('account/rateLimits/read')).catch(error => this.emit('usage-error', error));

package/dist/src/workstation-downloads.mjs

@@ -1,120 +1,120 @@
-import fs from 'node:fs/promises';
-import { constants } from 'node:fs';
-import path from 'node:path';
-import crypto from 'node:crypto';
-import { fileRevision, FILE_PART_BYTES, FILE_READ_LIMIT } from './file-transfer-range.mjs';
-import { readRecord, writeRecord } from './service-lifecycle.mjs';
-
-const fail = (message, statusCode = 400) => { throw Object.assign(new Error(message), { statusCode }); };
-const pathKey = value => process.platform === 'win32' ? value.toLowerCase() : value;
-const validName = value => typeof value === 'string' && value.length > 0
-  && !/[<>:"/\\|?*\x00-\x1f]/.test(value) && !/[ .]$/.test(value) && !['.', '..'].includes(value)
-  && !/^(?:con|prn|aux|nul|com[1-9¹²³]|lpt[1-9¹²³])(?:\.|$)/i.test(value);
-
-// A saved copy belongs to the authorized external asset, rather than its current chat page.
-export class WorkstationDownloads {
-  constructor(stateRoot) {
-    this.recordPath = path.join(stateRoot, 'external-file-copies.json');
-    this.copies = readRecord(this.recordPath) || {};
-  }
-
-  async copy(sourceId) {
-    const record = this.copies[sourceId];
-    if (!record) return null;
-    try {
-      const stat = await fs.stat(record.path);
-      return stat.isFile() && fileRevision(stat) === record.revision && stat.size === record.size ? record : null;
-    } catch (error) { if (['ENOENT', 'ENOTDIR'].includes(error.code)) return null; throw error; }
-  }
-
-  async folder(rpc, locations, selection) {
-    let root;
-    if (selection.target === 'downloads') root = locations.downloads;
-    else if (selection.target === 'project' && typeof selection.projectId === 'string' && selection.projectId) {
-      const { project } = await rpc('project/read', { projectId: selection.projectId });
-      const selected = selection.root || project.roots[0]?.path;
-      root = project.roots.find(item => pathKey(item.path) === pathKey(selected))?.path;
-    }
-    if (!root || !path.isAbsolute(root)) fail('请选择电脑项目或下载目录。');
-    const relative = selection.path || '';
-    if (typeof relative !== 'string' || relative.split('/').some(part => part && !validName(part))) fail('子文件夹路径无效。');
-    const realRoot = await fs.realpath(root), target = path.join(realRoot, ...relative.split('/'));
-    const realTarget = await fs.realpath(target), difference = path.relative(realRoot, realTarget);
-    if (difference === '..' || difference.startsWith('..' + path.sep) || path.isAbsolute(difference)) fail('只能选择当前目录内的子文件夹。');
-    if (!(await fs.stat(realTarget)).isDirectory()) fail('所选路径不是文件夹。');
-    return { root, path: relative, absolutePath: target, realPath: realTarget,
-      parent: relative ? relative.split('/').slice(0, -1).join('/') : null };
-  }
-
-  async browse(rpc, locations, selection) {
-    const folder = await this.folder(rpc, locations, selection);
-    const entries = (await fs.readdir(folder.realPath, { withFileTypes: true })).filter(entry => entry.isDirectory())
-      .map(entry => ({ name: entry.name, path: [folder.path, entry.name].filter(Boolean).join('/') }))
-      .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN', { numeric: true }));
-    const { realPath, ...visible } = folder;
-    return { ...visible, entries };
-  }
-
-  async save(rpc, locations, selection, asset, readPart, signal) {
-    const folder = await this.folder(rpc, locations, selection);
-    const partial = path.join(folder.realPath, `.code-relax-${crypto.randomUUID()}.download.part`);
-    let handle, result, created = false;
-    try {
-      signal?.throwIfAborted();
-      handle = await fs.open(partial, 'wx', 0o600);
-      created = true;
-      let offset = 0, size, revision, name, mimeType;
-      do {
-        signal?.throwIfAborted();
-        const query = new URLSearchParams({ offset: String(offset), length: String(FILE_PART_BYTES) });
-        if (revision) query.set('revision', revision);
-        const part = await readPart(asset, query);
-        signal?.throwIfAborted();
-        if (offset === 0) {
-          size = part.size; revision = part.revision; name = part.name || asset.name; mimeType = part.mimeType || asset.mimeType;
-          if (!validName(name)) fail('文件名无效，请修正来源文件的名称。');
-          if (!Number.isSafeInteger(size) || size < 1 || size > FILE_READ_LIMIT || !revision) fail('文件大小无效或超过 20 MiB 上限。');
-        }
-        if (part.size !== size || part.revision !== revision || part.offset !== offset
-          || !part.bytes?.length || part.bytes.length > Math.min(FILE_PART_BYTES, size - offset)) fail('文件内容发生变化或分片不完整。', 409);
-        let written = 0;
-        while (written < part.bytes.length) {
-          const { bytesWritten } = await handle.write(part.bytes, written, part.bytes.length - written, offset + written);
-          if (!bytesWritten) fail('电脑文件写入不完整。', 502);
-          written += bytesWritten;
-        }
-        offset += part.bytes.length;
-      } while (offset < size);
-      await handle.close(); handle = null;
-      signal?.throwIfAborted();
-      // Recheck the destination after the remote read, before creating the final copy.
-      const current = await this.folder(rpc, locations, selection);
-      if (pathKey(current.realPath) !== pathKey(folder.realPath)) fail('目标目录发生变化，请重新选择。', 409);
-      const extension = path.extname(name), body = name.slice(0, name.length - extension.length);
-      for (let number = 0; ; number++) {
-        const filename = number ? `${body} (${number})${extension}` : name;
-        const destination = path.join(folder.realPath, filename);
-        try {
-          await fs.copyFile(partial, destination, constants.COPYFILE_EXCL);
-          const stat = await fs.stat(destination);
-          if (stat.size !== size) { await fs.unlink(destination); fail('电脑副本大小核对失败。', 502); }
-          result = { path: destination, name: filename, size, revision: fileRevision(stat), mimeType };
-          break;
-        } catch (error) { if (error.code !== 'EEXIST') throw error; }
-      }
-      this.copies[asset.id] = result;
-      try { writeRecord(this.recordPath, this.copies); }
-      catch (error) { result.warning = '文件已保存，副本记录未能持久保存；重启后请从原文件重新选择。'; console.error('电脑副本记录保存失败', error); }
-      return result;
-    } finally {
-      await handle?.close();
-      if (created) {
-        try { await fs.rm(partial, { force: true }); }
-        catch (error) {
-          if (!result) throw error;
-          result.warning = '文件已保存，下载临时文件未能清理。'; console.error('电脑下载临时文件清理失败', error);
-        }
-      }
-    }
-  }
-}
+import fs from 'node:fs/promises';
+import { constants } from 'node:fs';
+import path from 'node:path';
+import crypto from 'node:crypto';
+import { fileRevision, FILE_PART_BYTES } from './file-transfer-range.mjs';
+import { readRecord, writeRecord } from './service-lifecycle.mjs';
+
+const fail = (message, statusCode = 400) => { throw Object.assign(new Error(message), { statusCode }); };
+const pathKey = value => process.platform === 'win32' ? value.toLowerCase() : value;
+const validName = value => typeof value === 'string' && value.length > 0
+  && !/[<>:"/\\|?*\x00-\x1f]/.test(value) && !/[ .]$/.test(value) && !['.', '..'].includes(value)
+  && !/^(?:con|prn|aux|nul|com[1-9¹²³]|lpt[1-9¹²³])(?:\.|$)/i.test(value);
+
+// A saved copy belongs to the authorized external asset, rather than its current chat page.
+export class WorkstationDownloads {
+  constructor(stateRoot) {
+    this.recordPath = path.join(stateRoot, 'external-file-copies.json');
+    this.copies = readRecord(this.recordPath) || {};
+  }
+
+  async copy(sourceId) {
+    const record = this.copies[sourceId];
+    if (!record) return null;
+    try {
+      const stat = await fs.stat(record.path);
+      return stat.isFile() && fileRevision(stat) === record.revision && stat.size === record.size ? record : null;
+    } catch (error) { if (['ENOENT', 'ENOTDIR'].includes(error.code)) return null; throw error; }
+  }
+
+  async folder(rpc, locations, selection) {
+    let root;
+    if (selection.target === 'downloads') root = locations.downloads;
+    else if (selection.target === 'project' && typeof selection.projectId === 'string' && selection.projectId) {
+      const { project } = await rpc('project/read', { projectId: selection.projectId });
+      const selected = selection.root || project.roots[0]?.path;
+      root = project.roots.find(item => pathKey(item.path) === pathKey(selected))?.path;
+    }
+    if (!root || !path.isAbsolute(root)) fail('请选择电脑项目或下载目录。');
+    const relative = selection.path || '';
+    if (typeof relative !== 'string' || relative.split('/').some(part => part && !validName(part))) fail('子文件夹路径无效。');
+    const realRoot = await fs.realpath(root), target = path.join(realRoot, ...relative.split('/'));
+    const realTarget = await fs.realpath(target), difference = path.relative(realRoot, realTarget);
+    if (difference === '..' || difference.startsWith('..' + path.sep) || path.isAbsolute(difference)) fail('只能选择当前目录内的子文件夹。');
+    if (!(await fs.stat(realTarget)).isDirectory()) fail('所选路径不是文件夹。');
+    return { root, path: relative, absolutePath: target, realPath: realTarget,
+      parent: relative ? relative.split('/').slice(0, -1).join('/') : null };
+  }
+
+  async browse(rpc, locations, selection) {
+    const folder = await this.folder(rpc, locations, selection);
+    const entries = (await fs.readdir(folder.realPath, { withFileTypes: true })).filter(entry => entry.isDirectory())
+      .map(entry => ({ name: entry.name, path: [folder.path, entry.name].filter(Boolean).join('/') }))
+      .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN', { numeric: true }));
+    const { realPath, ...visible } = folder;
+    return { ...visible, entries };
+  }
+
+  async save(rpc, locations, selection, asset, readPart, signal) {
+    const folder = await this.folder(rpc, locations, selection);
+    const partial = path.join(folder.realPath, `.code-relax-${crypto.randomUUID()}.download.part`);
+    let handle, result, created = false;
+    try {
+      signal?.throwIfAborted();
+      handle = await fs.open(partial, 'wx', 0o600);
+      created = true;
+      let offset = 0, size, revision, name, mimeType;
+      do {
+        signal?.throwIfAborted();
+        const query = new URLSearchParams({ offset: String(offset), length: String(FILE_PART_BYTES) });
+        if (revision) query.set('revision', revision);
+        const part = await readPart(asset, query);
+        signal?.throwIfAborted();
+        if (offset === 0) {
+          size = part.size; revision = part.revision; name = part.name || asset.name; mimeType = part.mimeType || asset.mimeType;
+          if (!validName(name)) fail('文件名无效，请修正来源文件的名称。');
+          if (!Number.isSafeInteger(size) || size < 1 || !revision) fail('文件大小无效。');
+        }
+        if (part.size !== size || part.revision !== revision || part.offset !== offset
+          || !part.bytes?.length || part.bytes.length > Math.min(FILE_PART_BYTES, size - offset)) fail('文件内容发生变化或分片不完整。', 409);
+        let written = 0;
+        while (written < part.bytes.length) {
+          const { bytesWritten } = await handle.write(part.bytes, written, part.bytes.length - written, offset + written);
+          if (!bytesWritten) fail('电脑文件写入不完整。', 502);
+          written += bytesWritten;
+        }
+        offset += part.bytes.length;
+      } while (offset < size);
+      await handle.close(); handle = null;
+      signal?.throwIfAborted();
+      // Recheck the destination after the remote read, before creating the final copy.
+      const current = await this.folder(rpc, locations, selection);
+      if (pathKey(current.realPath) !== pathKey(folder.realPath)) fail('目标目录发生变化，请重新选择。', 409);
+      const extension = path.extname(name), body = name.slice(0, name.length - extension.length);
+      for (let number = 0; ; number++) {
+        const filename = number ? `${body} (${number})${extension}` : name;
+        const destination = path.join(folder.realPath, filename);
+        try {
+          await fs.copyFile(partial, destination, constants.COPYFILE_EXCL);
+          const stat = await fs.stat(destination);
+          if (stat.size !== size) { await fs.unlink(destination); fail('电脑副本大小核对失败。', 502); }
+          result = { path: destination, name: filename, size, revision: fileRevision(stat), mimeType };
+          break;
+        } catch (error) { if (error.code !== 'EEXIST') throw error; }
+      }
+      this.copies[asset.id] = result;
+      try { writeRecord(this.recordPath, this.copies); }
+      catch (error) { result.warning = '文件已保存，副本记录未能持久保存；重启后请从原文件重新选择。'; console.error('电脑副本记录保存失败', error); }
+      return result;
+    } finally {
+      await handle?.close();
+      if (created) {
+        try { await fs.rm(partial, { force: true }); }
+        catch (error) {
+          if (!result) throw error;
+          result.warning = '文件已保存，下载临时文件未能清理。'; console.error('电脑下载临时文件清理失败', error);
+        }
+      }
+    }
+  }
+}

package/package.json

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