@my-life-buddies/cli 0.23.0-dev.1 → 0.23.0-dev.5

package/dist/web/widget-document.js

@@ -0,0 +1,41 @@
+// 注入隔离的 Widget 文档；只允许向宿主发送固定方法，不提供身份、Token 或网络代理。
+((render) => {
+  let counter = 0, closed = false, gesture = 0;
+  const pending = new Map();
+  document.addEventListener('click', event => { if (event.isTrusted) gesture = Date.now(); }, true);
+  function request(method, params = {}) {
+    if (closed) return Promise.reject(new Error('小挂件已关闭'));
+    const requestId = `${render}-${++counter}`;
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => { pending.delete(requestId); reject(new Error('操作等待超时，请关闭后重新打开并核对数据')); }, 90000);
+      pending.set(requestId, {resolve, reject, timer});
+      parent.postMessage({channel:'buddy-widget-bridge', render, requestId, method, params}, '*');
+    });
+  }
+  window.addEventListener('message', event => {
+    const data = event.data;
+    if (event.source !== parent || data?.channel !== 'buddy-widget-reply' || data.render !== render) return;
+    const call = pending.get(data.requestId); if (!call) return;
+    pending.delete(data.requestId); clearTimeout(call.timer);
+    if (data.error) call.reject(Object.assign(new Error(data.error.message), {status:data.error.status, code:data.error.code}));
+    else call.resolve(data.value);
+  });
+  const records = Object.freeze({
+    list: module => request('records.list', {module}).then(value => value.records),
+    get: (module, recordId) => request('records.get', {module, recordId}).then(value => value.record),
+    create: (module, data) => request('records.create', {module, data}),
+    update: (module, recordId, data, options = {}) => request('records.update', {module, recordId, data, expectedRevision:options.expectedRevision}),
+    delete: (module, recordId, options = {}) => request('records.delete', {module, recordId, expectedRevision:options.expectedRevision}),
+  });
+  const media = Object.freeze({
+    url: mediaId => request('media.url', {mediaId}).then(value => value.url),
+    pickAndUpload: () => {
+      if (Date.now() - gesture > 1000) return Promise.reject(new Error('请点击按钮后选择图片'));
+      gesture = 0; return request('media.pickAndUpload');
+    },
+  });
+  Object.defineProperty(window, 'dadaWidget', { value: Object.freeze({records, media,
+    close: async () => { await request('close'); closed = true; },
+  }), configurable:false, writable:false });
+  window.addEventListener('load', () => parent.postMessage({channel:'buddy-widget-document', render, state:'ready'}, '*'), {once:true});
+})(__WIDGET_RENDER__);

package/dist/web/widgets.js

@@ -1,5 +1,4 @@
-/* Client reference: my-life-buddies-ios dev ff1845b (2026-09-16).
-   Native point sizes share the phone's scale; Web content remains in an opaque sandbox. */
+/* SIT Widget 编辑宿主。页面保持不透明沙箱，身份和记录操作由 CLI 代理。 */
 (() => {
   const el = (tag, className = '', text) => {
     const node = document.createElement(tag); node.className = className;
@@ -31,8 +30,8 @@
     let failed = false, signature = '', selected, focusBefore, openRevision = 0, frameObserver;
     let collapseTimer, closeTimer, loadTimer, documentFrame, documentToken, documentReady;
     let phase = 'normal', choices, pill, busy = false, refreshPromise;
-    let documentLifecycle = false, canDelete = false;
-    const timers = () => { clearTimeout(loadTimer); frameObserver?.disconnect(); frameObserver = undefined; documentFrame = undefined; documentReady = undefined; };
+    let documentLifecycle = false, editing = false, conversationRevision = 0, widgetSession;
+    const timers = () => { endSession(); clearTimeout(loadTimer); frameObserver?.disconnect(); frameObserver = undefined; documentFrame = undefined; documentReady = undefined; };
     const scale = () => device.clientWidth / 415;
     const resize = new ResizeObserver(() => { phone.style.setProperty('--widget-unit', `${scale()}px`); });
     resize.observe(device);
@@ -97,16 +96,11 @@
         const previousIDs = items.map(item => item.id).join(',');
         items = value.widgets || []; failed = false;
         documentLifecycle = value.capabilities?.documentLifecycle === true;
-        canDelete = value.capabilities?.deleteWidget === true;
+        editing = value.capabilities?.widgetEditing === true;
+        conversationRevision = value.conversationRevision ?? 0;
         if (selected && !items.some(item => item.id === selected.id)) close(true);
         if (previousIDs !== items.map(item => item.id).join(',')) { setPhase('normal'); scheduleCollapse(); }
-        // Revoked ownership must also remove an already open owner menu.
-        if (selected && items.find(item => item.id === selected.id)?.role !== 'owner') {
-          overlay.querySelector('.widget-options')?.remove();
-          overlay.querySelector('.widget-confirm-backdrop')?.remove();
-          overlay.querySelector('.widget-native-share')?.remove();
-          const more = overlay.querySelector('.widget-more'); if (more) more.hidden = true;
-        }
+
       } catch { if (mine === generation) failed = true; }
       finally { if (mine === generation) { loading = false; lastRefresh = Date.now(); render(); } }
     }
@@ -115,39 +109,11 @@
       const note = el('div', `widget-pin-note${error ? ' is-error' : ''}`, text); note.setAttribute('role', 'status'); overlay.append(note);
       setTimeout(() => note.remove(), 4000);
     }
-    function showConfirmation(card, item, mine, current) {
-      const shade = el('div', 'widget-confirm-backdrop');
-      const dialog = el('section', 'widget-confirm'); dialog.setAttribute('role', 'alertdialog'); dialog.setAttribute('aria-label', '删除小挂件？');
-      dialog.append(el('h4', '', '删除小挂件？'), el('p', '', '将删除小挂件和其中的数据，所有会话里的引用及首页固定都会失效。此操作不可恢复。'));
-      const actions = el('div', 'widget-confirm-actions');
-      const cancel = button('取消', () => { if (!busy) { shade.remove(); card.querySelector('.widget-more')?.focus(); } });
-      const remove = button('删除', async () => {
-        if (busy) return;
-        busy = true; cancel.disabled = true; remove.disabled = true; remove.textContent = '正在删除…';
-        try {
-          await api(`/api/simulator/widgets/${encodeURIComponent(item.id)}`, {method:'DELETE'});
-          if (mine !== openRevision || current !== generation) return;
-          items = items.filter(value => value.id !== item.id); render(); busy = false; close();
-        } catch {
-          if (mine !== openRevision || current !== generation) return;
-          shade.remove(); notify('操作失败，请稍后重试', true);
-        } finally { if (mine === openRevision && current === generation) busy = false; }
-      }, 'widget-destructive');
-      actions.append(cancel, remove); dialog.append(actions); shade.append(dialog); card.append(shade); cancel.focus();
-    }
-    function showShare(card) {
-      // Sharing chooses real conversations in the App; the simulator never fabricates recipients.
-      const notice = el('div', 'widget-native-share');
-      notice.append(el('h4', '', '在搭搭 App 中分享'), el('p', '', '使用真机预览打开这个搭子，在小挂件的「分享」中选择聊天。'));
-      notice.append(button('打开真机预览', () => { close(true); document.querySelector('#pair-device').click(); }), button('返回小挂件', () => notice.remove()));
-      card.append(notice); notice.querySelector('button').focus();
-    }
     function ownerMenu(card, item, mine, current) {
       const old = card.querySelector('.widget-options'); if (old) { old.remove(); return; }
       const currentItem = items.find(value => value.id === item.id);
-      if (currentItem?.role !== 'owner' || busy) return;
+      if (!currentItem || busy) return;
       const menu = el('div', 'widget-options'); menu.setAttribute('role', 'menu');
-      const share = button('分享', () => { menu.remove(); showShare(card); });
       const pin = button(currentItem.isPinned ? '从首页取消固定' : '固定到首页', async () => {
         if (busy) return; busy = true; menu.querySelectorAll('button').forEach(node => { node.disabled = true; });
         try {
@@ -158,10 +124,8 @@
           if (mine === openRevision && current === generation) { menu.remove(); notify('操作失败，请稍后重试', true); }
         } finally { if (mine === openRevision && current === generation) busy = false; }
       });
-      const remove = button('删除小挂件', () => { menu.remove(); showConfirmation(card, item, mine, current); }, 'widget-destructive');
-      share.prepend(menuIcon('share')); pin.prepend(menuIcon(currentItem.isPinned ? 'unpin' : 'pin')); remove.prepend(menuIcon('trash'));
-      for (const row of [share, pin, ...(canDelete ? [remove] : [])]) { row.setAttribute('role', 'menuitem'); menu.append(row); }
-      card.append(menu); share.focus();
+      pin.prepend(menuIcon(currentItem.isPinned ? 'unpin' : 'pin'));
+      pin.setAttribute('role', 'menuitem'); menu.append(pin); card.append(menu); pin.focus();
     }
     async function open(item, messageId) {
       if (!item.type || !ready) return;
@@ -191,6 +155,22 @@
       };
       const frame = el('iframe', 'widget-document'); frame.title = item.title; frame.setAttribute('sandbox', 'allow-scripts'); frame.referrerPolicy = 'no-referrer'; frame.style.visibility = 'hidden';
       documentFrame = frame; documentToken = crypto.randomUUID();
+      if (editing) {
+        const session = {id:item.id, render:documentToken, revision:conversationRevision, closed:false};
+        widgetSession = session;
+        session.ready = bridgeCall(session, 'open');
+        try { await session.ready; }
+        catch (error) { if (mine === openRevision && current === generation) { failedLoad(); notify(error.message, true); } return; }
+        if (mine !== openRevision || current !== generation || session.closed) return;
+        session.heartbeat = setInterval(() => {
+          if (session.closed) return;
+          bridgeCall(session, 'heartbeat').catch(error => {
+            if (session.closed) return;
+            if (error.status === 404 || error.status === 409) { close(true); notify('小挂件连接已失效，请重新打开', true); }
+            else session.resume = true;
+          });
+        }, 30000);
+      }
       const url = new URL(window.previewApiUrl?.(`/api/simulator/widgets/${encodeURIComponent(item.id)}`) ?? `/api/simulator/widgets/${encodeURIComponent(item.id)}`, location.href);
       if (messageId !== undefined) url.searchParams.set('messageId', messageId);
       url.searchParams.set('render', documentToken); frame.src = url.href;
@@ -210,11 +190,65 @@
       }); frameObserver.observe(body);
       loadTimer = setTimeout(failedLoad, 15000);
       await refresh(true);
-      if (mine === openRevision && current === generation) more.hidden = failed || items.find(value => value.id === item.id)?.role !== 'owner';
+      if (mine === openRevision && current === generation) more.hidden = failed || !items.some(value => value.id === item.id);
+    }
+    async function bridgeCall(session, method, params = {}, requestId = crypto.randomUUID()) {
+      const body = JSON.stringify({render:session.render, conversationRevision:session.revision, method, params, requestId});
+      for (let attempt = 0; ; attempt++) {
+        try { return await api(`/api/simulator/widgets/${encodeURIComponent(session.id)}/bridge`, {method:'POST', body, ...(method === 'close' ? {keepalive:true} : {})}); }
+        catch (error) { if (attempt >= 1 || (error.status && error.status < 500)) throw error; }
+      }
     }
-    window.addEventListener('message', event => {
-      if (!documentFrame || event.source !== documentFrame.contentWindow || event.data?.channel !== 'buddy-widget-document' || event.data?.render !== documentToken) return;
-      documentReady?.(event.data.state);
+    function endSession() {
+      const session = widgetSession; widgetSession = undefined;
+      if (!session || session.closed) return;
+      session.closed = true; clearInterval(session.heartbeat); session.cancelPicker?.();
+      // 等正在建立的交互完成；CLI 会等待已发出的保存，再幂等关闭。
+      void session.ready.then(() => bridgeCall(session, 'close')).catch(() => {});
+    }
+    function pickImage(session) {
+      if (session.cancelPicker) return Promise.reject(new Error('请先完成当前图片选择'));
+      return new Promise((resolve, reject) => {
+        const input = el('input'); input.type = 'file'; input.accept = 'image/jpeg,image/png,image/webp'; input.hidden = true;
+        const finish = (error, value) => { session.cancelPicker = undefined; input.remove(); error ? reject(error) : resolve(value); };
+        session.cancelPicker = () => finish(new Error('图片选择已取消'));
+        input.addEventListener('cancel', () => finish(new Error('图片选择已取消')));
+        input.addEventListener('change', async () => {
+          try {
+            const file = input.files?.[0];
+            if (!file) throw new Error('图片选择已取消');
+            if (!['image/jpeg','image/png','image/webp'].includes(file.type) || file.size > 5 * 1024 * 1024) throw new Error('请选择 5 MiB 以内的 JPEG、PNG 或 WebP 图片');
+            const base64 = await new Promise((done, fail) => {
+              const reader = new FileReader(); reader.onload = () => done(String(reader.result).split(',')[1]); reader.onerror = () => fail(new Error('无法读取图片')); reader.readAsDataURL(file);
+            });
+            if (session.closed) throw new Error('小挂件已关闭');
+            finish(null, await bridgeCall(session, 'media.upload', {mimeType:file.type, base64}));
+          } catch (error) { finish(error); }
+        });
+        overlay.append(input); input.click();
+      });
+    }
+    window.addEventListener('message', async event => {
+      if (!documentFrame || event.source !== documentFrame.contentWindow || event.data?.render !== documentToken) return;
+      if (event.data.channel === 'buddy-widget-document') { documentReady?.(event.data.state); return; }
+      if (event.data.channel !== 'buddy-widget-bridge') return;
+      const {method, params, requestId} = event.data, session = widgetSession;
+      const target = event.source, render = documentToken;
+      const reply = value => target.postMessage({channel:'buddy-widget-reply', render, requestId, ...value}, '*');
+      try {
+        if (!session || session.closed) throw new Error('当前页面不支持编辑，请重新打开小挂件');
+        if (typeof requestId !== 'string' || !/^[a-zA-Z0-9-]{16,64}$/.test(requestId)
+          || !['records.list','records.get','records.create','records.update','records.delete','media.url','media.pickAndUpload','close'].includes(method)) throw new Error('页面请求了未开放的能力');
+        await session.ready;
+        if (session.closed) throw new Error('小挂件已关闭');
+        if (session.resume) { await bridgeCall(session, 'resume'); session.resume = false; }
+        const value = method === 'media.pickAndUpload' ? await pickImage(session) : await bridgeCall(session, method, params, requestId);
+        if (session !== widgetSession || session.closed) return;
+        reply({value});
+        if (method === 'close') close();
+      } catch (error) {
+        reply({error:{message:error.message || '操作未完成，请重试', status:error.status, code:error.code}});
+      }
     });
     overlay.addEventListener('click', event => { if (event.target === overlay) close(); });
     document.addEventListener('pointerdown', event => {
@@ -225,11 +259,11 @@
     document.addEventListener('keydown', event => {
       if (event.key === 'Escape') {
         if (busy) return;
-        const nested = overlay.querySelector('.widget-confirm-backdrop,.widget-native-share,.widget-options');
+        const nested = overlay.querySelector('.widget-options');
         if (nested) { nested.remove(); overlay.querySelector('.widget-more')?.focus(); } else if (!overlay.hidden) close(); else closeChoices();
       }
       if (event.key === 'Tab' && !overlay.hidden) {
-        const scope = overlay.querySelector('.widget-confirm,.widget-native-share') || overlay;
+        const scope = overlay;
         const controls = [...scope.querySelectorAll('button:not(:disabled), iframe')].filter(node => !node.hidden && node.getClientRects().length);
         const first = controls[0], last = controls.at(-1);
         if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last?.focus(); }
@@ -240,7 +274,7 @@
       clearTimeout(collapseTimer); closeChoices(false);
       if (!document.hidden) { setPhase('normal'); scheduleCollapse(); void refresh(true); }
     });
-    window.addEventListener('pagehide', () => { resize.disconnect(); timers(); clearTimeout(collapseTimer); clearTimeout(closeTimer); });
+    window.addEventListener('pagehide', () => { resize.disconnect(); close(true); clearTimeout(collapseTimer); clearTimeout(closeTimer); });
     return {
       update({active, conversationRevision, devRevision, reloading = false}) {
         const key = `${conversationRevision || 0}:${devRevision || 0}`;
@@ -248,7 +282,7 @@
         else if (selected && (key !== scope || reloading)) reopen = { id: selected.id, messageId: selected.messageId };
         conversationScope = conversationRevision;
         if (key !== scope || !active) {
-          scope = key; generation++; ready = false; items = []; failed = false; loading = false; lastRefresh = 0; busy = false; documentLifecycle = false; canDelete = false;
+          scope = key; generation++; ready = false; items = []; failed = false; loading = false; lastRefresh = 0; busy = false; documentLifecycle = false; editing = false;
           clearTimeout(collapseTimer); close(true);
         }
         ready = active; render();
@@ -271,7 +305,7 @@
         }
         details.append(el('p', item.type && item.summary?.trim() ? '' : 'widget-secondary', item.type ? item.summary?.trim() || '打开查看最新内容' : '此小挂件已删除或不可用')); card.append(details);
         if (item.type) card.append(button('去查看', () => open(item, messageId), 'widget-entry-open'));
-        const permission = {owner:'可管理、分享',editor:'可编辑',viewer:'仅支持查看'}[item.role];
+        const permission = item.role ? '会话成员可编辑、固定' : undefined;
         const metadata = el('div', 'widget-entry-metadata');
         if (item.creatorName?.trim()) metadata.append(el('span', 'widget-creator', `${item.creatorName.trim()}创建`));
         if (permission) metadata.append(el('span', 'widget-permission', (metadata.children.length ? '｜' : '') + permission));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@my-life-buddies/cli",
-  "version": "0.23.0-dev.1",
+  "version": "0.23.0-dev.5",
   "type": "module",
   "description": "搭搭 SIT 开发命令行工具",
   "publishConfig": {
@@ -41,7 +41,12 @@
     "ws": "8.21.3"
   },
   "devDependencies": {
-    "@buddy/cli-core": "0.23.0-dev.1",
-    "@buddy/preview": "0.23.0-dev.1"
+    "@buddy/cli-core": "0.23.0-dev.5",
+    "@buddy/preview": "0.23.0-dev.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@code.devops.xiaohongshu.com/dada/cli.git",
+    "directory": "apps/cli"
   }
 }