@walkhi/code-relax 0.1.0-beta.39 → 0.1.0-beta.40

package/dist/build-platform.json

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

package/dist/shared/message-delivery.cjs

@@ -26,10 +26,36 @@
       return entry ? { state: entry.state, ...(entry.result ? { result: entry.result } : {}),
         ...(entry.error ? { error: entry.error.message } : {}) } : { state: 'unknown' };
     }
+    async reconcile(scope, clientId, inspect) {
+      const key = this.key(scope, clientId);
+      let entry = this.entries.get(key);
+      if (entry?.state === 'accepted' || entry?.state === 'not_sent') return this.status(scope, clientId);
+      if (entry?.checking) return entry.checking;
+      if (!entry) {
+        // Fence a request which never arrived before checking history. A delayed
+        // transport frame with this admission must not execute after a replacement.
+        entry = { state: 'unknown', fenced: true };
+        this.entries.set(key, entry);
+      }
+      const target = entry;
+      target.checking = (async () => {
+        if (target.work) await target.work.catch(() => {});
+        if (target.lateWork) await target.lateWork;
+        if (target.state === 'accepted' || target.state === 'not_sent') return this.status(scope, clientId);
+        const result = await inspect();
+        target.state = result ? 'accepted' : 'not_sent';
+        target.fenced = true;
+        if (result) target.result = result;
+        delete target.error;
+        return this.status(scope, clientId);
+      })().finally(() => { delete target.checking; });
+      return target.checking;
+    }
     submit(scope, clientId, operation) {
       if (!/^[a-f0-9]{32}$/i.test(clientId || '')) return Promise.reject(Object.assign(new Error('消息确认标识无效'), { deliveryUnknown: false }));
       const key = this.key(scope, clientId), previous = this.entries.get(key);
       if (previous?.state === 'accepted') return Promise.resolve(previous.result);
+      if (previous?.fenced) return Promise.reject(Object.assign(new Error('原发送请求已结束，请使用新的发送标识'), { deliveryUnknown: false }));
       if (previous?.state === 'sending') return previous.work;
       if (previous?.state === 'unknown') return Promise.reject(Object.assign(new Error(previous.error?.message || '原发送结果仍未确认'), { deliveryUnknown: true }));
       const entry = { state: 'sending' };
@@ -39,7 +65,7 @@
       }, error => {
         entry.state = error.deliveryUnknown === false || error.details?.deliveryUnknown === false ? 'not_sent' : 'unknown';
         error.deliveryUnknown = entry.state !== 'not_sent';
-        if (error.deliveryResult) error.deliveryResult.then(result => {
+        if (error.deliveryResult) entry.lateWork = error.deliveryResult.then(result => {
           entry.state = 'accepted'; entry.result = result; delete entry.error;
         }, lateError => {
           entry.state = rejectedBeforeSubmission(lateError) || lateError.deliveryUnknown === false ? 'not_sent' : 'unknown';
@@ -50,5 +76,25 @@
       return entry.work;
     }
   }
-  return Object.freeze({ Store, rejectedBeforeSubmission, retainLateResult });
+  const normalizeId = value => String(value || '').replace(/-/g, '').toLowerCase();
+  async function findMessage(request, threadId, clientId, anchorItemId = '') {
+    let cursor;
+    const seen = new Set();
+    do {
+      const page = await request('thread/items/list', { threadId, limit: 100, sortDirection: 'desc', ...(cursor ? { cursor } : {}) });
+      if (!Array.isArray(page?.data)) throw new Error('发送核对失败：未取得权威历史');
+      for (const entry of page.data) {
+        const item = entry.item;
+        if (item?.type === 'userMessage' && normalizeId(item.clientId) === normalizeId(clientId)) {
+          return { data: { messageId: item.id, turnId: entry.turnId } };
+        }
+        if (anchorItemId && item?.id === anchorItemId) return null;
+      }
+      cursor = page.nextCursor;
+      if (cursor && seen.has(cursor)) throw new Error('发送核对失败：历史游标未推进');
+      if (cursor) seen.add(cursor);
+    } while (cursor);
+    return null;
+  }
+  return Object.freeze({ Store, rejectedBeforeSubmission, retainLateResult, findMessage, normalizeId });
 });

package/dist/shared/p2p-file-channel.cjs

@@ -32,17 +32,23 @@
       const frames = binary ? [JSON.stringify({ type: 'rtc-file-bytes', length: size })] : [];
       if (binary) for (let i = 0; i < size; i += PART) frames.push(data.slice(i, i + PART));
       else frames.push(data);
-      this.outbound.push({ frames, size, index: 0 }); this.queued += size; this.pump();
+      const sizes = frames.map(frame => typeof frame === 'string' ? new TextEncoder().encode(frame).length : frame.byteLength);
+      const framedSize = sizes.reduce((total, length) => total + length, 0);
+      if (this.bufferedAmount + framedSize > LIMIT) throw new Error('文件直连队列超限');
+      this.outbound.push({ frames, sizes, index: 0 }); this.queued += framedSize; this.pump();
     }
     pump() {
       if (this.readyState !== 1) return;
       try {
         while (this.outbound.length && this.io.buffered() < MAX) {
           const item = this.outbound[0];
-          if (this.io.send(item.frames[item.index]) === false) throw new Error('文件直连发送失败');
-          if (++item.index === item.frames.length) { this.outbound.shift(); this.queued -= item.size; }
+          // libdatachannel returns false when it accepted the frame into its buffer.
+          // Only an exception rejects a send; replaying a buffered frame duplicates bytes.
+          this.io.send(item.frames[item.index]);
+          this.queued -= item.sizes[item.index];
+          if (++item.index === item.frames.length) this.outbound.shift();
         }
-      } catch { this.close(1011, 'send-failed'); }
+      } catch (error) { this.close(1011, `send-failed:${String(error?.name || 'Error').slice(0, 40)}`); }
     }
     waitForPartial() {
       clearTimeout(this.timer);

package/dist/shared/plan-pricing.cjs

@@ -25,7 +25,7 @@
     if (!value) return '';
     const digits = Number.isInteger(value.minorUnitExponent) && value.minorUnitExponent >= 0 && value.minorUnitExponent <= 4
       ? value.minorUnitExponent : undefined;
-    return new Intl.NumberFormat('zh-CN', { style: 'currency', currency: value.currency, currencyDisplay: 'narrowSymbol',
+    return new Intl.NumberFormat('zh-CN', { style: 'currency', currency: value.currency, currencyDisplay: 'code',
       minimumFractionDigits: 0, maximumFractionDigits: digits }).format(value.amount);
   }
   return { read, format };

package/dist/src/dots-chat-server.mjs

@@ -9,6 +9,7 @@ import { dotsRoomTurns } from './dots-room-projection.mjs';
 import { dotsChatRevision, dotsChatMessageRevision, projectDotsChatItem } from './dots-chat-projection.mjs';
 import timelineSync from '../shared/timeline-sync.cjs';
 import serverRequests from '../shared/server-requests.cjs';
+import messageDelivery from '../shared/message-delivery.cjs';
 
 const pageSize = 20;
 const mergeTurns = (older, newer) => timelineSync.mergeOrderedEntries(older, newer, (old, fresh) => ({ ...fresh,
@@ -347,6 +348,26 @@ export class DotsChatServer extends HostedHistoryAppServer {
     try { return await this.sendMessage(args); }
     catch (error) { if (error.deliveryUnknown === undefined) error.deliveryUnknown = false; throw error; }
   }
+  async findSentMessage(threadId, clientId, anchorItemId) {
+    await this.connect();
+    const room = this.bindings.get(threadId) || await this.room(threadId);
+    let before;
+    const seen = new Set();
+    do {
+      const page = await this.rooms.messages(room.id, { before, limit: pageSize });
+      if (!Array.isArray(page?.items)) throw new Error('发送核对失败：未取得房间历史');
+      for (const message of page.items) {
+        if (messageDelivery.normalizeId(message.request_id) === messageDelivery.normalizeId(clientId)) {
+          return { data: { messageId: message.id } };
+        }
+      }
+      if (anchorItemId && page.items.some(message => message.id === anchorItemId)) return null;
+      before = page.before;
+      if (before && seen.has(before)) throw new Error('发送核对失败：房间历史游标未推进');
+      if (before) seen.add(before);
+    } while (before);
+    return null;
+  }
   async sendMessage(args) {
     await this.connect(); this.requireWritable(args.threadId);
     const record = this.threads.get(args.threadId), room = this.bindings.get(args.threadId), epoch = this.epoch;

package/dist/src/lan-socket-server.mjs

@@ -58,7 +58,8 @@ export function attachLanSocket(server, { token, dispatch, authorizeDevice = ()
     ws.on('close', stop);
     ws.on('message', (bytes, binary) => {
       if (stopped || ws.readyState !== WebSocket.OPEN) return;
-      if (++queued > 4) { stop(); ws.close(1013, 'File request queue exceeded'); return; }
+      // Three upload chunks may be in flight, each with a header and binary frame.
+      if (++queued > 8) { stop(); ws.close(1013, 'File request queue exceeded'); return; }
       pending = pending.then(async () => {
         if (stopped || ws.readyState !== WebSocket.OPEN) return;
         if (binary) {

package/dist/src/message-upload-files.mjs

@@ -1,9 +1,11 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import sharp from 'sharp';
 import media from '../shared/code-browser.cjs';
 import { validateInlineImage } from './message-images.mjs';
-import { MAX_FILE_BYTES, MAX_FILE_COUNT, MAX_TOTAL_BYTES } from './file-upload-session.mjs';
+import { createFileUploadSession, FILE_CHUNK_BYTES, MAX_FILE_BYTES, MAX_FILE_COUNT, MAX_TOTAL_BYTES } from './file-upload-session.mjs';
+import { fileRevision } from './file-transfer-range.mjs';
 
 const mimeTypes = { pdf: 'application/pdf', txt: 'text/plain', md: 'text/markdown', csv: 'text/csv',
   json: 'application/json', zip: 'application/zip', doc: 'application/msword',
@@ -11,6 +13,39 @@ const mimeTypes = { pdf: 'application/pdf', txt: 'text/plain', md: 'text/markdow
   xls: 'application/vnd.ms-excel', xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   ppt: 'application/vnd.ms-powerpoint', pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation' };
 
+// Reuse the incoming-file contract without sending workstation bytes to the phone.
+export async function stageWorkstationMessageFile(file, uploadsRoot) {
+  const handle = await fs.open(file.path, 'r');
+  const session = createFileUploadSession(uploadsRoot);
+  try {
+    const stat = await handle.stat();
+    if (!stat.isFile() || stat.size < 1 || stat.size > MAX_FILE_BYTES) throw new Error('附件为空或超过 20 MiB。');
+    const validate = async () => {
+      if (fileRevision(await handle.stat()) !== file.revision || fileRevision(await fs.stat(file.path)) !== file.revision) {
+        throw new Error('电脑文件已变化，请重新添加。');
+      }
+    };
+    await validate();
+    const bytes = Buffer.alloc(stat.size);
+    for (let offset = 0; offset < bytes.length;) {
+      const { bytesRead } = await handle.read(bytes, offset, bytes.length - offset, offset);
+      if (!bytesRead) throw new Error('电脑文件读取不完整，请重新添加。');
+      offset += bytesRead;
+    }
+    await validate();
+    const sha256 = crypto.createHash('sha256').update(bytes).digest('hex');
+    const started = await session.receive({ type: 'start', name: file.name, size: bytes.length, sha256 });
+    for (let offset = 0; offset < bytes.length; offset += FILE_CHUNK_BYTES) {
+      await session.receive({ type: 'chunk', id: started.id, offset, data: bytes.subarray(offset, offset + FILE_CHUNK_BYTES) });
+    }
+    await validate();
+    const result = await session.receive({ type: 'finish', id: started.id });
+    await session.receive({ type: 'commit' });
+    return { ...result, mediaKind: media.mediaKind(file),
+      mimeType: media.mediaMime(file) || mimeTypes[path.extname(file.name).slice(1).toLowerCase()] || 'application/octet-stream' };
+  } finally { await handle.close(); await session.close(); }
+}
+
 async function localFile(file, directory) {
   if (typeof file?.path !== 'string' || typeof file.name !== 'string' || !file.name || /[\r\n\0]/.test(file.name)) {
     throw new Error('附件信息无效，请重新选择。');

package/dist/src/project-update.mjs

@@ -34,6 +34,9 @@ export async function updateWorkstationProject(server, stateRoot, codexDataRoot,
         operationId: body.idempotencyKey, operation: 'update', confirmed: body.confirmDesktopRestart === true, serverUrl: server.url }, async desktop => {
         const current = (await rpc('project/read', { projectId })).project;
         if (current.id !== projectId) fail('项目身份不一致。');
+        if (current.roots.length && rootKey(current.roots.slice(0, 1)) !== rootKey(target.roots.slice(0, 1))) {
+          fail('编辑项目不能修改或移除主目录。');
+        }
         operation.previousProject ||= current;
         if (!same(current, operation.previousProject) && !same(current, target)) fail('项目已被其他操作修改，请刷新后重新编辑。');
         let project = current;

package/dist/src/server.mjs

@@ -47,10 +47,10 @@ import { browseProjectFolders, createProjectFolder } from './project-management.
 import { projectLocations } from './platform/project-locations.mjs';
 import { createWorkstationProject } from './project-create.mjs';
 import { removeWorkstationProject } from './project-remove.mjs';
-import { projectArchiveCandidates } from './project-archive.mjs';
 import { archivedThreadsPage } from './archived-threads.mjs';
 import { updateWorkstationProject } from './project-update.mjs';
 import { WorkstationDownloads } from './workstation-downloads.mjs';
+import { stageWorkstationMessageFile } from './message-upload-files.mjs';
 import { consumeUsageReset } from './usage-reset.mjs';
 import { DesktopHelper } from './platform/windows/desktop-helper.mjs';
 
@@ -511,6 +511,18 @@ async function handleRequest(request, response) {
       return;
     }
 
+    if (request.method === 'POST' && url.pathname === '/api/workstation-file-attachments') {
+      await requireExecutionWritable();
+      const body = await readJsonBody(request);
+      const source = body.source;
+      const file = typeof source === 'string' && /^[a-z]:[\\/]/i.test(source) ? describeLocalFile(source)
+        : typeof source === 'string' && /^[a-f0-9]{64}$/.test(source) ? fileCache.get(source) : null;
+      if (!file) throw new RequestError(404, '电脑文件不可用，请从原文件入口重新添加。');
+      if (file.externalIdentity) await dotsImages.authorization(file.externalIdentity);
+      sendJson(response, 201, { file: await stageWorkstationMessageFile(file, uploadsRoot) });
+      return;
+    }
+
     if (request.method === 'GET' && url.pathname === '/api/file-save-locations') {
       await requireExecutionWritable();
       const locations = await projectLocations();
@@ -557,7 +569,7 @@ async function handleRequest(request, response) {
       return;
     }
 
-    const projectActionMatch = /^\/api\/projects\/([^/]+)\/(archive-candidates|remove|move)$/.exec(url.pathname);
+    const projectActionMatch = /^\/api\/projects\/([^/]+)\/(remove|move)$/.exec(url.pathname);
     if (projectActionMatch) {
       await requireExecutionWritable();
       const projectId = decodeURIComponent(projectActionMatch[1]);
@@ -570,10 +582,6 @@ async function handleRequest(request, response) {
         sendJson(response, 200, await sharedCatalog.projects().then(({ projects }) => ({ projects })));
         return;
       }
-      if (request.method === 'GET' && projectActionMatch[2] === 'archive-candidates') {
-        sendJson(response, 200, await projectArchiveCandidates(sharedServer, dotsServer, projectId));
-        return;
-      }
       if (request.method === 'POST' && projectActionMatch[2] === 'remove') {
         const result = await removeWorkstationProject(sharedServer, stateRoot, codexDataRoot, projectId, await readJsonBody(request));
         sendJson(response, 200, result);
@@ -930,7 +938,16 @@ async function handleRequest(request, response) {
 
     const messageStatusMatch = /^\/api\/threads\/([^/]+)\/messages\/([a-f0-9]{32})\/status$/.exec(url.pathname);
     if (request.method === 'GET' && messageStatusMatch) {
-      sendJson(response, 200, messageReceipts.status([hostId, decodeURIComponent(messageStatusMatch[1])], messageStatusMatch[2]));
+      const threadId = decodeURIComponent(messageStatusMatch[1]), clientId = messageStatusMatch[2];
+      const result = await messageReceipts.reconcile([hostId, threadId], clientId, async () => {
+        if (hostId !== 'durable') {
+          await sharedServer.connect();
+          const queue = await appServerEvents.readQueue((method, params) => sharedServer.request(method, params), threadId);
+          if (queue.items.some(item => messageDelivery.normalizeId(item.clientUserMessageId) === clientId)) return queue;
+        }
+        return execution.findSentMessage(threadId, clientId, url.searchParams.get('anchorItemId') || '');
+      });
+      sendJson(response, 200, result);
       return;
     }
     const messageMatch = /^\/api\/threads\/([^/]+)\/messages$/.exec(url.pathname);

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

@@ -136,7 +136,7 @@ export class SharedAppServer extends EventEmitter {
         const error = Object.assign(new Error(`${method} 超时；不会自动重发，请先检查对话。`),
           { code: 'app_server_request_timeout' });
         this.traceLifecycle('timeout', diagnostic);
-        if ((method === 'turn/start' || method === 'turn/steer') && this.pending.has(id)) {
+        if (['turn/start', 'turn/steer', 'thread/queue/add'].includes(method) && this.pending.has(id)) {
           messageDelivery.retainLateResult(this.pending.get(id), error);
         } else { this.pending.delete(id); reject(error); }
       }, 30000);
@@ -203,6 +203,11 @@ export class SharedAppServer extends EventEmitter {
     }
   }
 
+  async findSentMessage(threadId, clientId, anchorItemId) {
+    await this.connect();
+    return messageDelivery.findMessage((method, params) => this.request(method, params), threadId, clientId, anchorItemId);
+  }
+
   respondApproval(threadId, body) {
     if (!this.ready || this.socket?.readyState !== WebSocket.OPEN) throw new Error('Codex 内核未就绪');
     this.requireWritable(threadId);

package/package.json

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

package/dist/src/project-archive.mjs

@@ -1,30 +0,0 @@
-import { sharedThreadProjectId, dotsThreadProjectId } from './shared-catalog.mjs';
-
-// Enumerate metadata, not the sidebar's limited window or conversation bodies.
-export async function projectArchiveCandidates(server, dotsServer, projectId) {
-  const projects = await server.projects();
-  const project = projects.find(value => value.id === projectId);
-  if (!project) throw Object.assign(new Error('项目不存在，请刷新列表。'), { statusCode: 404 });
-  const local = [];
-  let cursor;
-  do {
-    const page = await server.request('thread/list', { limit: 100, archived: false,
-      sortKey: 'recency_at', sortDirection: 'desc', ...(cursor ? { cursor } : {}) });
-    local.push(...page.data); cursor = page.nextCursor;
-  } while (cursor);
-  let hosted = [], catalogError = '';
-  if (dotsServer) {
-    try { hosted = await dotsServer.taskCatalog(false, true); }
-    catch (error) { catalogError = `云端目录读取失败，本次仅包含本机对话：${error.message}`; }
-  }
-  const threads = [];
-  for (const [hostId, values, group] of [['local', local, sharedThreadProjectId], ['durable', hosted, dotsThreadProjectId]]) {
-    for (const thread of values) {
-      if (thread.threadSource === 'aeon' || group(thread, projects) !== projectId) continue;
-      const status = typeof thread.status === 'string' ? thread.status : thread.status?.type || 'unknown';
-      threads.push({ id: thread.id, hostId, projectId, threadSource: thread.threadSource,
-        title: thread.name || thread.preview || thread.id, status });
-    }
-  }
-  return { projectId, threads, ...(catalogError ? { catalogError } : {}) };
-}