minecodex 2.0.35 → 2.0.36

package/features/images/src/adapters/codex/image-sources.mjs

@@ -1,28 +1,35 @@
-export function createImageSourcesAdapter(codex) {
-  const isImageNavigation = props => props?.variant === "browse"
-    && props.tabs?.some(item => item.key === "generated")
-    && props.tabs?.some(item => item.key === "uploaded");
+export function createImageSourcesAdapter(codex, signal, invalidate) {
+  const account = codex.account(signal, invalidate);
+  const visible = node => node?.isConnected && node.getBoundingClientRect().width > 0 && node.getBoundingClientRect().height > 0;
+  const isImageNavigation = (props, plus) => props?.variant === "browse"
+    && (plus ? ["images", "all", "folders"] : ["generated", "uploaded"]).every(key => props.tabs?.some(item => item.key === key));
 
   function applicability() {
     const props=codex.props(codex.rail(),value=>Boolean((value.router ?? value.value?.router)?.state?.location));
     const location=(props?.router ?? props?.value?.router)?.state?.location;
-    if (!location) return "unknown";
-    return location.pathname === "/space/files" && new URLSearchParams(location.search).get("tab") === "images"
+    const current = account.read();
+    if (!location || current.status !== "available") return "unknown";
+    return (current.planType === "plus" ? location.pathname === "/library"
+      : location.pathname === "/space/files" && new URLSearchParams(location.search).get("tab") === "images")
       ? "applicable" : "not-applicable";
   }
   return {applicability,read() {
+    if (applicability() !== "applicable") return null;
+    const current = account.read(), plus = current.planType === "plus";
     const tabs = [...document.querySelectorAll('[role="tablist"]')].find(node =>
-      !node.closest("[data-minecodex-image-navigation]")
-      && codex.props(node, isImageNavigation));
+      (visible(node) || node.hidden && visible(node.parentElement?.querySelector('[data-minecodex-image-navigation]')))
+      && !node.closest("[data-minecodex-image-navigation]")
+      && codex.props(node, props => isImageNavigation(props, plus)));
     if (!tabs) return null;
     // 26.1007 把来源工具栏包进独立 inset；图库仍是同级的 flex 内容区。
-    let navigation = tabs.parentElement?.parentElement;
+    let navigation = plus ? tabs.parentElement : tabs.parentElement?.parentElement;
     while (navigation && !navigation.nextElementSibling) navigation = navigation.parentElement;
     const content = navigation?.nextElementSibling;
     const shell = navigation?.parentElement;
-    if (!content || !shell) return null;
-    const props = codex.props(tabs, isImageNavigation);
-    const search = shell.querySelector('input[type="search"],input[placeholder="Search"]');
-    return {tabs, navigation, content, shell, search, selectedKey:props.selectedKey};
+    if (!content || !shell || !(visible(content) || content.hidden
+      && content.nextElementSibling?.id === "minecodex-image-gen-content" && visible(content.nextElementSibling))) return null;
+    const props = codex.props(tabs, props => isImageNavigation(props, plus));
+    const search = shell.querySelector('input[type="search"],input[placeholder="Search"],input[placeholder="Search library"],input[placeholder="搜索资料库"],input[placeholder="搜索库"],input[placeholder="搜尋資料庫"]');
+    return {tabs, navigation, content, shell, search, selectedKey:props.selectedKey, accountKey:current.key, mode:plus ? "library" : "space"};
   }};
 }

package/features/images/src/adapters/codex/native-image-source.mjs

@@ -4,6 +4,7 @@ import {createNativeImageModules} from "./native-image-modules.mjs";
 export function createNativeImageSource(codex, { requestHostAction, libraryApi, createCloudImageActions, promptGlyphSource, signal, modules = createNativeImageModules() } = {}) {
   const connect = modules.gallery;
   const opened = new Map();
+  const account = codex.account(signal);
 
   function uploadFile({base64,name}) {
     const decoded=atob(base64),bytes=new Uint8Array(decoded.length);
@@ -42,11 +43,11 @@ export function createNativeImageSource(codex, { requestHostAction, libraryApi,
   }
 
   function navigationContract(anchor) {
+    const plus = account.read().planType === "plus";
     for (let fiber = codex.currentFiber(anchor); fiber; fiber = fiber.return) {
       const props = fiber.memoizedProps;
       if (typeof fiber.type === "function" && props?.variant === "browse"
-        && props.tabs?.some(item => item.key === "generated")
-        && props.tabs?.some(item => item.key === "uploaded")) return {type:fiber.type, props};
+        && (plus ? ["images", "all", "folders"] : ["generated", "uploaded"]).every(key => props.tabs?.some(item => item.key === key))) return {type:fiber.type, props};
     }
     throw new Error("Native image navigation contract changed");
   }
@@ -61,7 +62,9 @@ export function createNativeImageSource(codex, { requestHostAction, libraryApi,
         const props = {
           ...contract.props,
           selectedKey,
-          tabs:[...contract.props.tabs, {key:"imagegen", name:"Image Gen"}],
+          tabs:account.read().planType === "plus"
+            ? contract.props.tabs.flatMap(tab => tab.key === "images" ? [tab, {key:"imagegen", name:"Image Gen"}] : [tab])
+            : [...contract.props.tabs, {key:"imagegen", name:"Image Gen"}],
           onSelect:key => {
             onSelect(key);
             if (key !== "imagegen") navigationContract(anchor).props.onSelect(key);

package/features/images/src/frontend/local-image-source.mjs

@@ -78,7 +78,7 @@ export function installLocalImageSource(config, signal, sources, native) {
   async function scan() {
     if (signal.aborted) return;
     const entry = sources.read();
-    if (mounted && mounted.entry.tabs === entry?.tabs) {
+    if (mounted && mounted.entry.tabs === entry?.tabs && mounted.entry.accountKey === entry?.accountKey && mounted.entry.mode === entry?.mode) {
       if (!mounted.active) mounted.nav?.render(entry.selectedKey);
       return;
     }
@@ -176,11 +176,12 @@ export function installLocalImageSource(config, signal, sources, native) {
   }
 
   let scheduled = false;
-  const observer = new MutationObserver(() => {
+  function schedule() {
     if (scheduled) return;
     scheduled = true;
     queueMicrotask(() => {scheduled = false; void scan();});
-  });
+  }
+  const observer = new MutationObserver(schedule);
   observer.observe(document.body, {childList:true, subtree:true, attributes:true, attributeFilter:["aria-selected"]});
   void scan();
   let cleaned = false;
@@ -188,6 +189,7 @@ export function installLocalImageSource(config, signal, sources, native) {
   signal.addEventListener("abort", cleanup, {once:true});
   return {
     cleanup,
+    refresh:schedule,
     selfCheck() {
       const entry=sources.read(),scope=sources.applicability();
       if (!entry) return {state:scope === "applicable" ? "unavailable" : scope,reason:scope === "not-applicable" ? "outside-image-sources" : "image-sources-anchor-unavailable"};

package/features/images/src/library-prompt-page.mjs

@@ -259,7 +259,7 @@ function localPromptRequested(){openPendingLocalPrompt();void scan();}
 document.addEventListener("minecodex:image-prompt",localPromptRequested);
 const localeObserver = new MutationObserver(() => mounted?.refreshLocale());
 localeObserver.observe(document.documentElement, { attributes:true, attributeFilter:["lang"] });
-localImageSource = installLocalImageSource(config, signal, createImageSourcesAdapter(config.codex), createNativeImageSource(config.codex, {
+localImageSource = installLocalImageSource(config, signal, createImageSourcesAdapter(config.codex, signal, () => localImageSource?.refresh()), createNativeImageSource(config.codex, {
   requestHostAction:config.requestHostAction, libraryApi, createCloudImageActions, promptGlyphSource, signal,
 }));
 config.registerSelfCheck?.(() => {

package/features/sites/src/adapters/codex/renderer.mjs

@@ -1,7 +1,8 @@
 // 专有路由、页面锚点和原生网页打开协议不跨出此适配器。
-export function createSitesAdapter(signal,codex) {
+export function createSitesAdapter(signal,codex,invalidate) {
   let nativeButton,nativeInner,nativePlus,nativeSiteIcon,nativeMore,nativeExternal,nativeGlobe,nativeActionsClass;
   const owned="data-mcx-sites";
+  const account=codex.account(signal,invalidate);
   const text=(en,zh)=>(document.documentElement.lang || navigator.language).startsWith("zh") ? zh : en;
   const visible=e=>!!e?.isConnected && e.getBoundingClientRect().width>0 && e.getBoundingClientRect().height>0;
   async function until(check) {
@@ -19,20 +20,73 @@ function router() {
   return p?.router || p?.value?.router;
 }
 function pageInfo() {
-  if (router()?.state?.location?.pathname !== "/space/sites") return null;
-  const input = [...document.querySelectorAll("input")].find(e => /Search sites|搜索站点|搜尋網站/.test(e.placeholder));
+  if (applicability() !== "applicable") return null;
+  const plus=account.read().planType === "plus";
+  const input = [...document.querySelectorAll("input")].find(e => visible(e) && /Search sites|搜索站点|搜尋網站/.test(e.placeholder));
   if (!input) return null;
   let page = input.parentElement;
   while (page && !page.classList.contains("min-h-full")) page = page.parentElement;
   if (!page || page.children.length < 2) return null;
-  const content = page.children[1], list = page.querySelector('[data-testid="sites-table"], [data-testid="sites-grid"]');
+  const content = plus ? page.lastElementChild : page.children[1], list = page.querySelector('[data-testid="sites-table"], [data-testid="sites-grid"]');
+  if (!visible(content)) return null;
   const native = nativeProps(list || content.querySelector("button") || content.querySelector("p") || content.lastElementChild?.lastElementChild, p => "viewMode" in p && "shared" in p);
   const grid = native ? native.viewMode === "grid" : !!page.querySelector('button[aria-label="Grid view"][aria-pressed="true"],button[aria-label="网格视图"][aria-pressed="true"]');
-  const shared = native ? !!native.shared : [...page.querySelectorAll("button[aria-pressed=true]")].some(b => /Shared with you|与你共享|與你共用/.test(b.textContent));
-  const create = [...page.firstElementChild.querySelectorAll("button")].find(b => /^(New|新建|新增)$/.test(b.textContent.trim()) && !b.hasAttribute(owned));
+  const ownershipTabs=[...page.querySelectorAll('[role="tablist"]')].find(node=>!node.closest(`[${owned}]`)&&nativeProps(node,p=>p.tabs?.some(tab=>tab.key==="owned")&&p.tabs?.some(tab=>tab.key==="shared")));
+  const ownership=ownershipTabs&&nativeProps(ownershipTabs,p=>p.tabs?.some(tab=>tab.key==="owned")&&p.tabs?.some(tab=>tab.key==="shared"));
+  const shared = ownership ? ownership.selectedKey === "shared" : native ? !!native.shared : [...page.querySelectorAll("button[aria-pressed=true]")].some(b => /Shared with you|与你共享|與你共用/.test(b.textContent));
+  const create = [...(plus ? page : page.firstElementChild).querySelectorAll("button")].find(b => visible(b) && (plus ? /^(Create Site|创建站点|建立網站)$/ : /^(New|新建|新增)$/).test(b.textContent.trim()) && !b.hasAttribute(owned));
   codex.report("sites-page",true);
-  return { page, input, content, list, grid, shared, create, empty: list ? null : [...content.children].findLast(e => !e.hasAttribute(owned)) };
+  return { page, input, content, list, grid, shared, create, plus, ownershipTabs:plus?(ownershipTabs??null):null, accountKey:account.read().key, empty: list ? null : [...content.children].findLast(e => !e.hasAttribute(owned)) };
 }
+function mountOwnership(page,onSelect) {
+  const tabs=page.ownershipTabs,original=tabs?[...tabs.querySelectorAll('[role="tab"]')]:[];
+  let wrapper;
+  const hidden=tabs?.hidden,node=tabs?tabs.cloneNode(false):document.createElement("div");
+  if (!tabs) {
+    // 26.1007：共享能力确认后可能移除原标签组；保留已测 browse 分支。
+    node.className="flex min-w-0 items-center gap-1 hide-scrollbar overflow-x-auto overflow-y-hidden";
+    node.setAttribute("role","tablist");node.setAttribute("aria-label",text("Site views","站点视图"));
+    const native=document.createElement("button");native.type="button";native.setAttribute("role","tab");native.setAttribute("aria-selected","true");
+    native.textContent=text("Owned by you","你拥有的");
+    native.className="cursor-interaction items-center text-sm select-none focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-0 flex h-9 min-w-0 rounded-full border border-transparent px-4 py-0 font-medium ring-inset bg-primary-ghost-hover text-default";
+    native.onclick=()=>{const r=router(),location=r.state.location,search=new URLSearchParams(location.search);search.delete("view");search.delete("search");r.navigate({pathname:location.pathname,search:search.size?`?${search}`:""},{state:location.state});};
+    original.push(native);
+    wrapper=page.content.cloneNode(false);
+    wrapper.classList.remove("min-h-0","flex-1","flex-col","pb-4","bg-surface");wrapper.classList.add("min-h-15","items-center");
+    wrapper.setAttribute(owned,"ownership-wrapper");wrapper.append(node);page.content.before(wrapper);
+  }
+  const buttons=original.map(button=>button.cloneNode(true));
+  let selected="native";
+  node.removeAttribute("id");node.setAttribute(owned,"ownership");
+  const added=original[0].cloneNode(false);added.textContent=text("Added by you","由你添加");buttons.push(added);
+  buttons.forEach((button,index)=>{
+    button.removeAttribute("id");button.removeAttribute("aria-controls");
+    button.onclick=()=>{selected=index===original.length?"added":"native";if(selected==="native")original[index].click();sync();onSelect(selected);};
+    node.append(button);
+  });
+  function sync() {
+    const active=original.find(button=>button.getAttribute("aria-selected")==="true"),inactive=original.find(button=>button.getAttribute("aria-selected")!=="true");
+    buttons.forEach((button,index)=>{
+      const chosen=selected==="added"?index===original.length:original[index]?.getAttribute("aria-selected")==="true";
+      button.className=(chosen?active:inactive)?.className || original[0].className.replace("bg-primary-ghost-hover text-default","text-secondary hover:bg-background-primary-ghost-hover/50 hover:text-default");
+      button.setAttribute("aria-selected",String(chosen));button.tabIndex=chosen?0:-1;
+    });
+  }
+  node.onkeydown=event=>{
+    if (!["ArrowLeft","ArrowRight","Home","End"].includes(event.key))return;
+    event.preventDefault();const index=buttons.indexOf(document.activeElement),last=buttons.length-1;
+    const next=event.key==="Home"?0:event.key==="End"?last:(index+(event.key==="ArrowRight"?1:last))%buttons.length;
+    buttons[next].click();buttons[next].focus();
+  };
+  if (tabs) {tabs.after(node);tabs.hidden=true;}sync();
+  return {node,tabs,sync,selection:()=>selected,selectAdded:()=>added.click(),dispose(){wrapper?.remove();node.remove();if(tabs)tabs.hidden=hidden;}};
+}
+function applicability() {
+  const current=account.read(),path=router()?.state?.location?.pathname;
+  if (!path || current.status !== "available") return "unknown";
+  return path === (current.planType === "plus" ? "/sites" : "/space/sites") ? "applicable" : "not-applicable";
+}
+function isSitesPath() { return ["/sites","/space/sites"].includes(router()?.state?.location?.pathname); }
 function browserMenu() {
   for (const menu of document.querySelectorAll('[role="menu"]')) {
     if (!visible(menu)) continue;
@@ -85,7 +139,7 @@ async function open(origin,url,cwd) {
 function templates(page) {
   const create = page.create;
   if (create) {
-    const template = page.page.querySelector('button[data-size="lg"][data-color="secondary"]');
+    const template = page.page.querySelector('button[data-size="lg"][data-color="secondary"]') || create;
     if (template) { nativeButton = template.className; nativeInner = template.firstElementChild?.className || ""; }
     nativePlus = create.querySelector("svg")?.cloneNode(true);
     // New 的图标在桌面端隐藏，克隆后只保留图标自身样式。
@@ -100,5 +154,5 @@ function templates(page) {
   return {nativeButton,nativeInner,nativePlus,nativeSiteIcon,nativeMore,nativeExternal,nativeGlobe,nativeActionsClass};
 }
 
-return {templates,pageInfo,browserMenu,fullViewControl,open,path:()=>router()?.state?.location?.pathname};
+return {templates,pageInfo,mountOwnership,browserMenu,fullViewControl,open,applicability,isSitesPath,accountKey:()=>account.read().key,path:()=>router()?.state?.location?.pathname};
 }

package/features/sites/src/frontend/entry.mjs

@@ -1,4 +1,4 @@
-const nativeSites=createSitesAdapter(signal,config.codex);
+const nativeSites=createSitesAdapter(signal,config.codex,schedule);
 // 复用 Prompts 已验证的原生图标与 Lucide 图标，保持交互一致。
 const ICONS = config.resources.icons;
 const MENU_CLASSES = {"menu": "no-drag z-50 m-px flex select-none flex-col overflow-y-auto bg-surface-elevated-secondary/90 text-default ring-border ring-[0.5px] shadow-xl-spread backdrop-blur-sm rounded-2xl p-[var(--app-menu-gutter,var(--mcx-spacing))] min-w-[var(--app-menu-min-width,220px)]", "item": "no-drag outline-hidden flex min-h-[var(--app-menu-item-height,0px)] shrink-0 items-center justify-center p-[var(--app-menu-item-padding,var(--padding-row-y)_var(--padding-row-x))] text-(length:--app-menu-item-font-size,var(--mcx-text-sm)) leading-(--app-menu-item-line-height,var(--mcx-text-sm--line-height)) rounded-xl text-default group hover:bg-primary-ghost-hover focus:bg-primary-ghost-hover cursor-interaction flex flex-col", "row": "flex w-full min-w-0 items-center gap-[var(--spacing-menu-item-content,calc(var(--mcx-spacing)*1.5))]", "leading": "_leadingIcon_ml6jk_2"};
@@ -8,7 +8,11 @@ const owned = "data-mcx-sites";
 let disposed = false, state = { sites: [], projects: [], threads: [] }, addButton, rowsRoot, fallback, dialog, menu;
 let rowSignature = "", nativeButton, nativeInner, nativePlus, nativeSiteIcon, nativeMore, timer, revision = 0, opening = false;
 let nativeExternal, nativeGlobe, nativeActionsClass;
-let currentPage, refreshAt = 0, pendingLayout = null;
+let currentPage, currentAccount, refreshAt = 0, pendingLayout = null;
+let ownership;
+const nativeHidden=new Map();
+function restoreNativeContent() { for (const [node,hidden] of nativeHidden) node.hidden=hidden; nativeHidden.clear(); }
+function restoreOwnership() { restoreNativeContent();ownership?.dispose();ownership=null; }
 const style = document.createElement("style");
 style.setAttribute(owned, "style");
 style.textContent = config.resources.styles;
@@ -106,7 +110,7 @@ function loadPreview(container, url, cachedOnly = false) {
   });
 }
 function row(site, grid) {
-  const r = element("div", grid ? "group/site-card relative grid h-[210px] min-w-0 grid-rows-[148px_62px] overflow-hidden rounded-2xl border border-subtle bg-surface-card shadow-sm" : "relative col-span-full grid min-h-[82px] grid-cols-subgrid items-center overflow-hidden rounded-xl px-4 py-4 select-none hover:bg-primary-ghost-hover");
+  const r = element("div", grid ? "group/site-card relative grid h-[210px] min-w-0 grid-rows-[148px_62px] overflow-hidden rounded-2xl border border-subtle bg-surface-card shadow-sm" : "group/site-row relative col-span-full grid min-h-[82px] grid-cols-subgrid items-center overflow-hidden rounded-xl px-4 py-4 select-none hover:bg-primary-ghost-hover");
   r.setAttribute(owned, "entry"); r.dataset.siteId = site.id;
   const open = element("button", "absolute inset-0 cursor-interaction rounded-xl bg-transparent focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none focus-visible:ring-inset");
   open.type = "button"; open.setAttribute("aria-label", text("Open ", "打开 ") + site.title); open.onclick = () => openSite(site); r.append(open);
@@ -210,32 +214,54 @@ function showBrowserAdd({ site, project, preferProject }) {
 }
 function reconcile() {
   if (disposed) return;
+  if (currentAccount && nativeSites.accountKey() !== currentAccount) { closeMenu();dialog?.close(); }
   updateBrowserMenu();
   const page = nativeSites.pageInfo();
-  if (!page) { addButton?.remove(); addButton = null; rowsRoot?.remove(); rowsRoot = null; fallback?.remove(); fallback = null; rowSignature = ""; currentPage = null; closeMenu(); return; }
+  if (!page) { restoreOwnership();addButton?.remove(); addButton = null; rowsRoot?.remove(); rowsRoot = null; fallback?.remove(); fallback = null; rowSignature = ""; currentPage = null; closeMenu(); document.querySelectorAll("[data-mcx-sites-empty-suppressed]").forEach(e => e.removeAttribute("data-mcx-sites-empty-suppressed")); return; }
   cacheNative(page);
-  if (currentPage !== page.page) { currentPage = page.page; rowSignature = ""; if (Date.now() - refreshAt > 1500) refresh().catch(e => notice(e.message)); }
+  if (currentPage !== page.page || currentAccount !== page.accountKey) {
+    restoreOwnership();
+    if (currentAccount && currentAccount !== page.accountKey) { closeMenu(); dialog?.close(); }
+    addButton?.remove(); addButton=null; rowsRoot?.remove(); rowsRoot=null; fallback?.remove(); fallback=null;
+    currentPage = page.page; currentAccount=page.accountKey; rowSignature = "";
+    if (Date.now() - refreshAt > 1500) refresh().catch(e => notice(e.message));
+  }
+  if (page.plus && (!ownership || ownership.tabs !== page.ownershipTabs || !ownership.node.isConnected)) {
+    const added=ownership?.selection()==="added";
+    restoreOwnership();ownership=nativeSites.mountOwnership(page,()=>{restoreNativeContent();rowSignature="";schedule();});
+    if (added) ownership.selectAdded();
+  }
+  ownership?.sync();
+  const added=ownership?.selection()==="added";
+  if (added) {
+    for (const child of page.content.children) if (!child.hasAttribute(owned)) {
+      if (!nativeHidden.has(child)) nativeHidden.set(child,child.hidden);
+      child.hidden=true;
+    }
+  } else restoreNativeContent();
   if (!addButton?.isConnected && page.create) {
     addButton = button(text("Add site", "添加站点"), () => showDiscovery()); addButton.setAttribute(owned, "add");
     if (nativePlus) addButton.firstElementChild.prepend(nativePlus.cloneNode(true));
     page.create.before(addButton);
   }
   const query = page.input.value.trim().toLowerCase();
-  const sites = state.sites.filter(s => [s.title, s.url || "", state.projects.find(p => p.id === s.origin.projectId)?.name || ""].some(v => v.toLowerCase().includes(query)));
-  const signature = JSON.stringify([revision, query, page.shared, page.grid]);
-  if (signature === rowSignature && rowsRoot?.isConnected && (page.list ? rowsRoot.parentElement === page.list : fallback?.isConnected)) return;
+  const sites = ownership && !added || !ownership && page.shared ? [] : state.sites.filter(s => [s.title, s.url || "", state.projects.find(p => p.id === s.origin.projectId)?.name || ""].some(v => v.toLowerCase().includes(query)));
+  const list=added?null:page.list;
+  const signature = JSON.stringify([revision, query, page.shared, page.grid,added]);
+  if (signature === rowSignature && rowsRoot?.isConnected && (list ? rowsRoot.parentElement === list : fallback?.isConnected)) return;
   rowsRoot?.remove(); fallback?.remove(); fallback = null;
   document.querySelectorAll("[data-mcx-sites-empty-suppressed]").forEach(e => e.removeAttribute("data-mcx-sites-empty-suppressed"));
   rowsRoot = element("div"); rowsRoot.setAttribute(owned, "rows"); rowSignature = signature;
-  if (!sites.length) { rowsRoot = null; return; }
-  if (page.empty) page.empty.setAttribute("data-mcx-sites-empty-suppressed", "");
-  if (page.list) page.list.append(rowsRoot);
+  if (!sites.length && !added) { rowsRoot = null; return; }
+  if (page.empty && !added) page.empty.setAttribute("data-mcx-sites-empty-suppressed", "");
+  if (list) list.append(rowsRoot);
   else {
     fallback = element("div", "@container pb-3"); fallback.setAttribute(owned, "fallback");
     const layout = element("div"); layout.setAttribute(owned, page.grid ? "grid" : "table"); fallback.append(layout); layout.append(rowsRoot);
     page.content.append(fallback);
   }
   rowsRoot.append(...sites.map(s => row(s, page.grid)));
+  if (!sites.length) rowsRoot.append(element("p","text-sm text-secondary",text("No added sites found.","没有找到你添加的站点。")));
 }
 function schedule() { clearTimeout(timer); timer = setTimeout(reconcile, 60); }
 function newDialog(title, back) {
@@ -375,7 +401,7 @@ async function until(check, milliseconds = 7000) {
 
 async function applyWebLayout(token) {
   try {
-    await until(() => pendingLayout !== token || (nativeSites.path() !== "/space/sites" && (nativeSites.fullViewControl(true) || nativeSites.fullViewControl(false))));
+    await until(() => pendingLayout !== token || (!nativeSites.isSitesPath() && (nativeSites.fullViewControl(true) || nativeSites.fullViewControl(false))));
     if (pendingLayout !== token) return;
     const hide = [...document.querySelectorAll("button")].find(e => visible(e) && /^(Hide sidebar|隐藏侧栏|隐藏侧边栏|隱藏側邊欄|收起侧栏)$/.test(e.getAttribute("aria-label") || "")); hide?.click();
     // 使用原生完整视图入口，保留原生网页标签和底部聊天输入框。
@@ -414,9 +440,8 @@ observer.observe(document.body, { childList: true, subtree: true, attributes: tr
 document.addEventListener("input", schedule); document.addEventListener("click", onClick, true); document.addEventListener("keydown", onKey, true); document.addEventListener("pointerdown", onPointer, true);
 refresh().catch(e => notice(e.message)); schedule();
 config.registerSelfCheck?.(() => {
-  const path=nativeSites.path();
-  if (!path) return {state:"unknown",reason:"navigation-context-unavailable"};
-  if (path !== "/space/sites") return {state:"not-applicable",reason:"outside-sites-page"};
+  const scope=nativeSites.applicability();
+  if (scope !== "applicable") return {state:scope,reason:scope === "unknown" ? "account-or-navigation-unavailable" : "outside-sites-page"};
   const page=nativeSites.pageInfo(),available=Boolean(page?.create && addButton?.isConnected);
   return {state:available ? "available" : "unavailable",reason:available ? null : "sites-anchor-unavailable",
     checks:[{name:"sites-page",available:Boolean(page)},{name:"sites-create-anchor",available}],scopes:[{name:"sites-page",element:page?.page},{name:"sites-dialog",element:dialog},{name:"sites-menu",element:menu}]};
@@ -425,5 +450,6 @@ return () => {
   disposed = true; pendingLayout = null; clearTimeout(timer); observer.disconnect();
   document.removeEventListener("input", schedule); document.removeEventListener("click", onClick, true); document.removeEventListener("keydown", onKey, true); document.removeEventListener("pointerdown", onPointer, true);
   closeMenu(); dialog?.close(); document.querySelectorAll(`[${owned}]`).forEach(e => e.remove());
+  restoreOwnership();
   document.querySelectorAll("[data-mcx-sites-empty-suppressed]").forEach(e => e.removeAttribute("data-mcx-sites-empty-suppressed"));
 };

package/features/usage-meter/src/usage-meter.mjs

@@ -36,10 +36,31 @@ function svgNode(name, attributes) {
   return node;
 }
 
+function quotaArc(start, end, clockwise) {
+  const radius = 43 / 3;
+  const point = angle => {
+    const radians = (angle - 90) * Math.PI / 180;
+    return [16 + radius * Math.cos(radians), 16 + radius * Math.sin(radians)];
+  };
+  const from = point(start), to = point(end);
+  return `M ${from[0]} ${from[1]} A ${radius} ${radius} 0 ${Math.abs(end - start) > 180 ? 1 : 0} ${clockwise ? 1 : 0} ${to[0]} ${to[1]}`;
+}
+
 function draw(windows) {
   const svg = svgNode("svg", { viewBox: "0 0 32 32", class: "mcx-usage-ring", "aria-hidden": "true" });
-  for (const [key, radius] of [["weekly", 43 / 3], ["fiveHour", 10.5]]) {
-    if (windows[key] == null) continue;
+  if (windows.fiveHour != null) {
+    // 左下、右下各留 24° 圆头中心间距；两段都从左下切口扣减。
+    for (const [key, start, end, clockwise] of [["fiveHour", 237, 483, true], ["weekly", 213, 147, false]]) {
+      const group = svgNode("g", { "data-window": key, fill: "none", stroke: "currentColor", "stroke-width": 10 / 3, "stroke-linecap": "round" });
+      group.append(svgNode("path", { d: quotaArc(start, end, clockwise), opacity: 0.18 }));
+      if (windows[key] > 0) {
+        const remainingStart = start + (end - start) * (1 - windows[key] / 100);
+        group.append(svgNode("path", { d: quotaArc(remainingStart, end, clockwise) }));
+      }
+      svg.append(group);
+    }
+  } else {
+    const key = "weekly", radius = 43 / 3;
     const group = svgNode("g", { "data-window": key, fill: "none", stroke: "currentColor", "stroke-width": 10 / 3 });
     group.append(svgNode("circle", { cx: 16, cy: 16, r: radius, opacity: 0.18 }));
     if (windows[key] > 0) group.append(svgNode("circle", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",

package/packages/codex-adapter/src/renderer/environment.mjs

@@ -101,7 +101,42 @@ export function createCodexEnvironment() {
     const scope = node && props(node, value => Boolean((value.router ?? value.value?.router)?.state?.location));
     return (scope?.router ?? scope?.value?.router)?.state?.location?.pathname ?? null;
   }
-  return { composer, composerSurface, rail, railSlot, route, navigation, mcpAppSource, currentThreadId:element => composer(element)?.threadId ?? null,
+  function account(signal, invalidate) {
+    let client, unsubscribe;
+    const cleanup = () => { unsubscribe?.(); unsubscribe = null; client = null; };
+    signal?.addEventListener("abort", cleanup, {once:true});
+    return {read() {
+      let auth, nextClient;
+      props(rail(), value => {
+        for (const candidate of [value.auth, value.value]) {
+          if (candidate && "authMethod" in Object(candidate) && "accountId" in Object(candidate)) auth ||= candidate;
+        }
+        for (const candidate of [value.queryClient, value.client, value.value]) {
+          if (typeof candidate?.getQueryData === "function" && typeof candidate?.getQueryCache === "function") nextClient ||= candidate;
+        }
+        return Boolean(auth && nextClient);
+      });
+      if (nextClient !== client) {
+        cleanup(); client = nextClient;
+        if (invalidate && !signal?.aborted) unsubscribe = client?.getQueryCache().subscribe(event => {
+          if (event.query?.queryKey?.[0] === "accounts") invalidate();
+        });
+      }
+      const unknown = {status:"unknown", planType:null, source:null, key:null};
+      if (signal?.aborted || !auth || auth.isLoading || !auth.userId || !auth.accountId
+        || !["chatgpt", "chatgptAuthTokens"].includes(auth.authMethod)) return unknown;
+      const data = client?.getQueryData(["accounts", "check"]);
+      const current = data?.accounts?.find(value => value.id === auth.accountId);
+      // 已有账号清单却找不到当前身份时，不借用上一个账号的登录套餐。
+      if (data && !current) return unknown;
+      const cachedPlan = typeof current?.plan_type === "string" ? current.plan_type : null;
+      const loginPlan = typeof auth.planAtLogin === "string" ? auth.planAtLogin : null;
+      const planType = cachedPlan ?? loginPlan;
+      if (!planType || planType === "unknown") return unknown;
+      return {status:"available", planType, source:cachedPlan ? "accounts/check" : "planAtLogin", key:JSON.stringify([auth.userId, auth.accountId])};
+    }};
+  }
+  return { composer, composerSurface, rail, railSlot, route, navigation, account, mcpAppSource, currentThreadId:element => composer(element)?.threadId ?? null,
     // 仅供 UI／插件 native Adapter 使用，交互层不读取 React props。
     currentFiber, props, report, diagnostics:() => [...capabilities.values()].map(item => ({...item})) };
 }