@walkhi/code-relax 0.1.0-beta.30 → 0.1.0-beta.31

package/dist/src/dots-task-files.mjs

@@ -1,52 +1,52 @@
-import { randomUUID } from 'node:crypto';
-import { readMessageUploads } from './message-upload-files.mjs';
-
-// Desktop 26.1007.9446.0 Dll/Uhn/pA: reserve, upload bytes, confirm,
-// then include an Uploaded file sediment pointer in the user message.
-export async function uploadTaskFiles(files, { uploadsRoot, client, current, fetchImpl = fetch }) {
-  const uploads = await readMessageUploads({ files }, uploadsRoot);
-  const references = [];
-  for (const file of uploads) {
-    current();
-    const reserved = await client.request('/files', { method: 'POST', body: {
-      file_name: file.name, file_size: file.bytes.length, mime_type: file.mimeType,
-      use_case: 'codex', store_in_library: false, timezone_offset_min: new Date().getTimezoneOffset(), reset_rate_limits: false,
-    } });
-    current();
-    if (reserved?.status === 'error' || !/^[A-Za-z0-9_-]{1,256}$/.test(reserved?.file_id || '')
-      || typeof reserved.upload_url !== 'string') throw new Error('云端文件上传地址未确认。');
-    const url = new URL(reserved.upload_url, 'https://chatgpt.com');
-    if (url.protocol !== 'https:' || url.username || url.password || url.port || url.hash) throw new Error('云端文件上传地址无效。');
-    if (url.origin === 'https://chatgpt.com' && url.pathname === '/backend-api/estuary/upload_content_bytes') {
-      const uploadUrl = url.searchParams.get('upload_url');
-      if (!uploadUrl) throw new Error('云端文件上传地址缺少参数。');
-      const boundary = `relax-${randomUUID()}`;
-      const name = file.name.replaceAll('"', '%22').replaceAll('\\', '%5C');
-      const body = Buffer.concat([Buffer.from(`--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="${name}"\r\nContent-Type: ${file.mimeType}\r\n\r\n`),
-        file.bytes, Buffer.from(`\r\n--${boundary}\r\nContent-Disposition: form-data; name="upload_url"\r\n\r\n${uploadUrl}\r\n--${boundary}--\r\n`)]);
-      await client.request(url.pathname.slice('/backend-api'.length) + url.search, {
-        method: 'POST', body, contentType: `multipart/form-data; boundary=${boundary}`, rawResponse: true,
-      });
-    } else {
-      if (!['.oaiusercontent.com', '.blob.core.windows.net', '.amazonaws.com'].some(suffix => url.hostname.endsWith(suffix))) {
-        throw new Error('云端文件上传地址不属于文件服务。');
-      }
-      const aws = [...url.searchParams.keys()].some(key => key.toLowerCase() === 'x-amz-algorithm');
-      const response = await fetchImpl(url, { method: 'PUT', body: file.bytes, redirect: 'error', signal: AbortSignal.timeout(60000),
-        headers: { 'Content-Type': file.mimeType, ...aws ? {} : { 'x-ms-blob-type': 'BlockBlob',
-          'x-ms-version': '2020-04-08', 'x-ms-blob-content-type': file.mimeType } } });
-      await response.body?.cancel();
-      if (!response.ok) throw new Error(`云端文件上传失败（${response.status}）。`);
-    }
-    current();
-    await client.request(`/files/${encodeURIComponent(reserved.file_id)}/uploaded`, { method: 'POST', body: {} });
-    current();
-    references.push({ pointer: `sediment://${reserved.file_id}`, fileName: file.name });
-  }
-  return references;
-}
-
-export function taskFilePrompt(text, references) {
-  if (!references.length) return text;
-  return `# Files mentioned by the user:\n${references.map(file => `\nUploaded file: ${JSON.stringify(file).replaceAll('#', '\\u0023')}\n`).join('')}\n## My request:\n${text || '请查看上述文件。'}`;
-}
+import { randomUUID } from 'node:crypto';
+import { readMessageUploads } from './message-upload-files.mjs';
+
+// Desktop 26.1007.9446.0 Dll/Uhn/pA: reserve, upload bytes, confirm,
+// then include an Uploaded file sediment pointer in the user message.
+export async function uploadTaskFiles(files, { uploadsRoot, client, current, fetchImpl = fetch }) {
+  const uploads = await readMessageUploads({ files }, uploadsRoot);
+  const references = [];
+  for (const file of uploads) {
+    current();
+    const reserved = await client.request('/files', { method: 'POST', body: {
+      file_name: file.name, file_size: file.bytes.length, mime_type: file.mimeType,
+      use_case: 'codex', store_in_library: false, timezone_offset_min: new Date().getTimezoneOffset(), reset_rate_limits: false,
+    } });
+    current();
+    if (reserved?.status === 'error' || !/^[A-Za-z0-9_-]{1,256}$/.test(reserved?.file_id || '')
+      || typeof reserved.upload_url !== 'string') throw new Error('云端文件上传地址未确认。');
+    const url = new URL(reserved.upload_url, 'https://chatgpt.com');
+    if (url.protocol !== 'https:' || url.username || url.password || url.port || url.hash) throw new Error('云端文件上传地址无效。');
+    if (url.origin === 'https://chatgpt.com' && url.pathname === '/backend-api/estuary/upload_content_bytes') {
+      const uploadUrl = url.searchParams.get('upload_url');
+      if (!uploadUrl) throw new Error('云端文件上传地址缺少参数。');
+      const boundary = `relax-${randomUUID()}`;
+      const name = file.name.replaceAll('"', '%22').replaceAll('\\', '%5C');
+      const body = Buffer.concat([Buffer.from(`--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="${name}"\r\nContent-Type: ${file.mimeType}\r\n\r\n`),
+        file.bytes, Buffer.from(`\r\n--${boundary}\r\nContent-Disposition: form-data; name="upload_url"\r\n\r\n${uploadUrl}\r\n--${boundary}--\r\n`)]);
+      await client.request(url.pathname.slice('/backend-api'.length) + url.search, {
+        method: 'POST', body, contentType: `multipart/form-data; boundary=${boundary}`, rawResponse: true,
+      });
+    } else {
+      if (!['.oaiusercontent.com', '.blob.core.windows.net', '.amazonaws.com'].some(suffix => url.hostname.endsWith(suffix))) {
+        throw new Error('云端文件上传地址不属于文件服务。');
+      }
+      const aws = [...url.searchParams.keys()].some(key => key.toLowerCase() === 'x-amz-algorithm');
+      const response = await fetchImpl(url, { method: 'PUT', body: file.bytes, redirect: 'error', signal: AbortSignal.timeout(60000),
+        headers: { 'Content-Type': file.mimeType, ...aws ? {} : { 'x-ms-blob-type': 'BlockBlob',
+          'x-ms-version': '2020-04-08', 'x-ms-blob-content-type': file.mimeType } } });
+      await response.body?.cancel();
+      if (!response.ok) throw new Error(`云端文件上传失败（${response.status}）。`);
+    }
+    current();
+    await client.request(`/files/${encodeURIComponent(reserved.file_id)}/uploaded`, { method: 'POST', body: {} });
+    current();
+    references.push({ pointer: `sediment://${reserved.file_id}`, fileName: file.name });
+  }
+  return references;
+}
+
+export function taskFilePrompt(text, references) {
+  if (!references.length) return text;
+  return `# Files mentioned by the user:\n${references.map(file => `\nUploaded file: ${JSON.stringify(file).replaceAll('#', '\\u0023')}\n`).join('')}\n## My request:\n${text || '请查看上述文件。'}`;
+}

package/dist/src/execution-health.mjs

@@ -1,26 +1,26 @@
-// Execution availability is sampled in the background. Health requests may
-// join the current sample so a reconnect cannot cache an initial false state.
-// Only connections are retried, not work.
-export class ExecutionHealth {
-  constructor(read, interval = 3000) { this.read = read; this.interval = interval; this.state = { state: 'checking', ready: false }; }
-  start() { this.stopped = false; void this.tick(); }
-  stop() { this.stopped = true; clearTimeout(this.timer); }
-  refresh() {
-    if (this.work) return this.work;
-    this.work = this.sample().finally(() => { this.work = null; });
-    return this.work;
-  }
-  async sample() {
-    try {
-      const result = await this.read();
-      this.state = result && typeof result === 'object'
-        ? { ...result, ready: Boolean(result.ready), checkedAt: new Date().toISOString() }
-        : { state: result ? 'ready' : 'unavailable', ready: Boolean(result), checkedAt: new Date().toISOString() };
-    } catch (error) { this.state = { state: 'unavailable', ready: false, error: error.message, checkedAt: new Date().toISOString() }; }
-    return this.state;
-  }
-  async tick() {
-    await this.refresh();
-    if (!this.stopped) { this.timer = setTimeout(() => this.tick(), this.interval); this.timer.unref?.(); }
-  }
-}
+// Execution availability is sampled in the background. Health requests may
+// join the current sample so a reconnect cannot cache an initial false state.
+// Only connections are retried, not work.
+export class ExecutionHealth {
+  constructor(read, interval = 3000) { this.read = read; this.interval = interval; this.state = { state: 'checking', ready: false }; }
+  start() { this.stopped = false; void this.tick(); }
+  stop() { this.stopped = true; clearTimeout(this.timer); }
+  refresh() {
+    if (this.work) return this.work;
+    this.work = this.sample().finally(() => { this.work = null; });
+    return this.work;
+  }
+  async sample() {
+    try {
+      const result = await this.read();
+      this.state = result && typeof result === 'object'
+        ? { ...result, ready: Boolean(result.ready), checkedAt: new Date().toISOString() }
+        : { state: result ? 'ready' : 'unavailable', ready: Boolean(result), checkedAt: new Date().toISOString() };
+    } catch (error) { this.state = { state: 'unavailable', ready: false, error: error.message, checkedAt: new Date().toISOString() }; }
+    return this.state;
+  }
+  async tick() {
+    await this.refresh();
+    if (!this.stopped) { this.timer = setTimeout(() => this.tick(), this.interval); this.timer.unref?.(); }
+  }
+}

package/dist/src/file-transfer-range.mjs

@@ -1,22 +1,22 @@
-export const FILE_READ_LIMIT = 20 * 1024 * 1024;
-export const FILE_PART_BYTES = 256 * 1024;
-export class FileRangeError extends Error {
-  constructor(statusCode, message) { super(message); this.statusCode = statusCode; }
-}
-
-export function fileRange(query, size, revision) {
-  const offset = Number(query.get('offset') || 0);
-  const length = Number(query.get('length') || FILE_PART_BYTES);
-  if (!Number.isSafeInteger(offset) || offset < 0 || offset >= size ||
-      !Number.isSafeInteger(length) || length < 1 || length > FILE_PART_BYTES) {
-    throw new FileRangeError(400, '无效的文件读取范围。');
-  }
-  if ((offset && !query.get('revision')) || (query.has('revision') && query.get('revision') !== revision)) {
-    throw new FileRangeError(409, '文件已变化，请重新打开。');
-  }
-  return { offset, length: Math.min(length, size - offset) };
-}
-
-export function fileRevision(stat) {
-  return `${stat.dev}:${stat.ino}:${stat.size}:${stat.mtimeMs}:${stat.ctimeMs}`;
-}
+export const FILE_READ_LIMIT = 20 * 1024 * 1024;
+export const FILE_PART_BYTES = 256 * 1024;
+export class FileRangeError extends Error {
+  constructor(statusCode, message) { super(message); this.statusCode = statusCode; }
+}
+
+export function fileRange(query, size, revision) {
+  const offset = Number(query.get('offset') || 0);
+  const length = Number(query.get('length') || FILE_PART_BYTES);
+  if (!Number.isSafeInteger(offset) || offset < 0 || offset >= size ||
+      !Number.isSafeInteger(length) || length < 1 || length > FILE_PART_BYTES) {
+    throw new FileRangeError(400, '无效的文件读取范围。');
+  }
+  if ((offset && !query.get('revision')) || (query.has('revision') && query.get('revision') !== revision)) {
+    throw new FileRangeError(409, '文件已变化，请重新打开。');
+  }
+  return { offset, length: Math.min(length, size - offset) };
+}
+
+export function fileRevision(stat) {
+  return `${stat.dev}:${stat.ino}:${stat.size}:${stat.mtimeMs}:${stat.ctimeMs}`;
+}

package/dist/src/file-upload-session.mjs

@@ -1,130 +1,130 @@
-import crypto from 'node:crypto';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-
-export const MAX_FILE_BYTES = 20 * 1024 * 1024;
-export const MAX_FILE_COUNT = 4;
-export const MAX_TOTAL_BYTES = 40 * 1024 * 1024;
-export const FILE_CHUNK_BYTES = 256 * 1024;
-
-function validName(value) {
-  return typeof value === 'string' && value.length > 0 && value.length <= 180 &&
-    value !== '.' && value !== '..' && !/[\\/:*?"<>|\x00-\x1f]/.test(value) && !/[. ]$/.test(value) &&
-    !/^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(?:\.|$)/i.test(value);
-}
-
-async function uniqueDestination(directory, name, partial) {
-  const dot = name.lastIndexOf('.');
-  const stem = dot > 0 ? name.slice(0, dot) : name;
-  const extension = dot > 0 ? name.slice(dot) : '';
-  for (let index = 0; ; index++) {
-    const suffix = index ? ` (${index})` : '';
-    const candidate = index ? `${stem.slice(0, 180 - extension.length - suffix.length)}${suffix}${extension}` : name;
-    if (!candidate || candidate.length > 180) throw new Error('同名文件过多，文件名无法继续编号');
-    const destination = path.join(directory, candidate);
-    try {
-      await fs.link(partial, destination);
-      await fs.unlink(partial);
-      return { name: candidate, path: destination };
-    } catch (error) {
-      if (error.code !== 'EEXIST') throw error;
-    }
-  }
-}
-
-export function createFileUploadSession(root) {
-  let upload;
-  const completed = new Map();
-  let completedBytes = 0;
-  const directory = path.join(root, 'incoming');
-  const clearActive = async () => {
-    const current = upload;
-    upload = undefined;
-    if (!current) return;
-    await current.handle.close().catch(() => {});
-    await fs.unlink(current.partial).catch(() => {});
-  };
-  const clear = async () => {
-    await clearActive();
-    for (const file of completed.values()) {
-      await fs.unlink(file.path).catch(() => {});
-      if (file.preview) await fs.unlink(file.preview.path).catch(() => {});
-    }
-    completed.clear(); completedBytes = 0;
-  };
-  return {
-    async receive(message) {
-      if (!message || typeof message !== 'object') throw new Error('无效的文件上传请求');
-      if (message.type === 'cancel') { await clear(); return { type: 'cancelled' }; }
-      if (message.type === 'commit') {
-        if (upload) throw new Error('文件尚未上传完成');
-        completed.clear(); completedBytes = 0;
-        return { type: 'committed' };
-      }
-      if (message.type === 'remove') {
-        if (upload) throw new Error('请等待当前文件上传完成');
-        const file = completed.get(message.id);
-        if (!file) throw new Error('文件上传会话已失效');
-        await fs.unlink(file.path);
-        if (file.preview) await fs.unlink(file.preview.path);
-        completed.delete(message.id); completedBytes -= file.size;
-        return { type: 'removed', id: message.id };
-      }
-      if (message.type === 'start') {
-        if (upload) throw new Error('已有文件正在上传');
-        if (!validName(message.name)) throw new Error('文件名无效');
-        if (!Number.isSafeInteger(message.size) || message.size < 1 || message.size > MAX_FILE_BYTES) {
-          throw new Error('单个文件不得超过 20 MiB');
-        }
-        const parent = message.previewOf ? completed.get(message.previewOf) : null;
-        if (message.previewOf && (!parent || parent.preview || message.size > FILE_CHUNK_BYTES)) throw new Error('预览图关联无效或超过 256 KiB');
-        if (!parent && (completed.size >= MAX_FILE_COUNT || completedBytes + message.size > MAX_TOTAL_BYTES)) {
-          throw new Error('每条消息最多 4 个文件，合计不超过 40 MiB');
-        }
-        if (!/^[a-f0-9]{64}$/i.test(message.sha256 || '')) throw new Error('文件校验值无效');
-        const id = crypto.randomUUID();
-        await fs.mkdir(directory, { recursive: true });
-        const partial = path.join(directory, `.upload-${id}`);
-        const handle = await fs.open(partial, 'wx');
-        upload = { id, partial, handle, name: parent ? `${id}.preview.jpg` : message.name, size: message.size, parent,
-          expected: message.sha256.toLowerCase(), hash: crypto.createHash('sha256'), offset: 0 };
-        return { type: 'started', id, offset: 0, chunkBytes: FILE_CHUNK_BYTES };
-      }
-      const current = upload;
-      if (!current || message.id !== current.id) throw new Error('文件上传会话已失效');
-      if (message.type === 'chunk') {
-        if (!Number.isSafeInteger(message.offset) || message.offset !== current.offset) {
-          return { type: 'offset', id: current.id, offset: current.offset };
-        }
-        if (!Buffer.isBuffer(message.data)) {
-          throw new Error('文件分片格式无效');
-        }
-        const bytes = message.data;
-        if (!bytes.length || bytes.length > FILE_CHUNK_BYTES || current.offset + bytes.length > current.size) {
-          throw new Error('文件分片大小无效');
-        }
-        await current.handle.writeFile(bytes);
-        current.hash.update(bytes);
-        current.offset += bytes.length;
-        return { type: 'offset', id: current.id, offset: current.offset };
-      }
-      if (message.type === 'finish') {
-        if (current.offset !== current.size || current.hash.digest('hex') !== current.expected) {
-          await clear(); throw new Error('文件大小或 SHA-256 校验失败');
-        }
-        await current.handle.sync();
-        await current.handle.close();
-        upload = undefined;
-        let saved;
-        try { saved = await uniqueDestination(directory, current.name, current.partial); }
-        catch (error) { await fs.unlink(current.partial).catch(() => {}); throw error; }
-        const result = { type: 'completed', id: current.id, ...saved, size: current.size, sha256: current.expected };
-        if (current.parent) current.parent.preview = result;
-        else { completed.set(current.id, result); completedBytes += current.size; }
-        return result;
-      }
-      throw new Error('不支持的文件上传操作');
-    },
-    close: clear,
-  };
-}
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+export const MAX_FILE_BYTES = 20 * 1024 * 1024;
+export const MAX_FILE_COUNT = 4;
+export const MAX_TOTAL_BYTES = 40 * 1024 * 1024;
+export const FILE_CHUNK_BYTES = 256 * 1024;
+
+function validName(value) {
+  return typeof value === 'string' && value.length > 0 && value.length <= 180 &&
+    value !== '.' && value !== '..' && !/[\\/:*?"<>|\x00-\x1f]/.test(value) && !/[. ]$/.test(value) &&
+    !/^(?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(?:\.|$)/i.test(value);
+}
+
+async function uniqueDestination(directory, name, partial) {
+  const dot = name.lastIndexOf('.');
+  const stem = dot > 0 ? name.slice(0, dot) : name;
+  const extension = dot > 0 ? name.slice(dot) : '';
+  for (let index = 0; ; index++) {
+    const suffix = index ? ` (${index})` : '';
+    const candidate = index ? `${stem.slice(0, 180 - extension.length - suffix.length)}${suffix}${extension}` : name;
+    if (!candidate || candidate.length > 180) throw new Error('同名文件过多，文件名无法继续编号');
+    const destination = path.join(directory, candidate);
+    try {
+      await fs.link(partial, destination);
+      await fs.unlink(partial);
+      return { name: candidate, path: destination };
+    } catch (error) {
+      if (error.code !== 'EEXIST') throw error;
+    }
+  }
+}
+
+export function createFileUploadSession(root) {
+  let upload;
+  const completed = new Map();
+  let completedBytes = 0;
+  const directory = path.join(root, 'incoming');
+  const clearActive = async () => {
+    const current = upload;
+    upload = undefined;
+    if (!current) return;
+    await current.handle.close().catch(() => {});
+    await fs.unlink(current.partial).catch(() => {});
+  };
+  const clear = async () => {
+    await clearActive();
+    for (const file of completed.values()) {
+      await fs.unlink(file.path).catch(() => {});
+      if (file.preview) await fs.unlink(file.preview.path).catch(() => {});
+    }
+    completed.clear(); completedBytes = 0;
+  };
+  return {
+    async receive(message) {
+      if (!message || typeof message !== 'object') throw new Error('无效的文件上传请求');
+      if (message.type === 'cancel') { await clear(); return { type: 'cancelled' }; }
+      if (message.type === 'commit') {
+        if (upload) throw new Error('文件尚未上传完成');
+        completed.clear(); completedBytes = 0;
+        return { type: 'committed' };
+      }
+      if (message.type === 'remove') {
+        if (upload) throw new Error('请等待当前文件上传完成');
+        const file = completed.get(message.id);
+        if (!file) throw new Error('文件上传会话已失效');
+        await fs.unlink(file.path);
+        if (file.preview) await fs.unlink(file.preview.path);
+        completed.delete(message.id); completedBytes -= file.size;
+        return { type: 'removed', id: message.id };
+      }
+      if (message.type === 'start') {
+        if (upload) throw new Error('已有文件正在上传');
+        if (!validName(message.name)) throw new Error('文件名无效');
+        if (!Number.isSafeInteger(message.size) || message.size < 1 || message.size > MAX_FILE_BYTES) {
+          throw new Error('单个文件不得超过 20 MiB');
+        }
+        const parent = message.previewOf ? completed.get(message.previewOf) : null;
+        if (message.previewOf && (!parent || parent.preview || message.size > FILE_CHUNK_BYTES)) throw new Error('预览图关联无效或超过 256 KiB');
+        if (!parent && (completed.size >= MAX_FILE_COUNT || completedBytes + message.size > MAX_TOTAL_BYTES)) {
+          throw new Error('每条消息最多 4 个文件，合计不超过 40 MiB');
+        }
+        if (!/^[a-f0-9]{64}$/i.test(message.sha256 || '')) throw new Error('文件校验值无效');
+        const id = crypto.randomUUID();
+        await fs.mkdir(directory, { recursive: true });
+        const partial = path.join(directory, `.upload-${id}`);
+        const handle = await fs.open(partial, 'wx');
+        upload = { id, partial, handle, name: parent ? `${id}.preview.jpg` : message.name, size: message.size, parent,
+          expected: message.sha256.toLowerCase(), hash: crypto.createHash('sha256'), offset: 0 };
+        return { type: 'started', id, offset: 0, chunkBytes: FILE_CHUNK_BYTES };
+      }
+      const current = upload;
+      if (!current || message.id !== current.id) throw new Error('文件上传会话已失效');
+      if (message.type === 'chunk') {
+        if (!Number.isSafeInteger(message.offset) || message.offset !== current.offset) {
+          return { type: 'offset', id: current.id, offset: current.offset };
+        }
+        if (!Buffer.isBuffer(message.data)) {
+          throw new Error('文件分片格式无效');
+        }
+        const bytes = message.data;
+        if (!bytes.length || bytes.length > FILE_CHUNK_BYTES || current.offset + bytes.length > current.size) {
+          throw new Error('文件分片大小无效');
+        }
+        await current.handle.writeFile(bytes);
+        current.hash.update(bytes);
+        current.offset += bytes.length;
+        return { type: 'offset', id: current.id, offset: current.offset };
+      }
+      if (message.type === 'finish') {
+        if (current.offset !== current.size || current.hash.digest('hex') !== current.expected) {
+          await clear(); throw new Error('文件大小或 SHA-256 校验失败');
+        }
+        await current.handle.sync();
+        await current.handle.close();
+        upload = undefined;
+        let saved;
+        try { saved = await uniqueDestination(directory, current.name, current.partial); }
+        catch (error) { await fs.unlink(current.partial).catch(() => {}); throw error; }
+        const result = { type: 'completed', id: current.id, ...saved, size: current.size, sha256: current.expected };
+        if (current.parent) current.parent.preview = result;
+        else { completed.set(current.id, result); completedBytes += current.size; }
+        return result;
+      }
+      throw new Error('不支持的文件上传操作');
+    },
+    close: clear,
+  };
+}