meshy-dsh 0.2.0 → 0.2.1

package/README.md

@@ -32,11 +32,13 @@ exported `MESHY_API_KEY` does not reach the CLI; the browser login does.
 In Web and Desktop, a **Meshy** entry appears in the left sidebar. It opens a Meshy page with your
 account and a few example requests: pick one and a new session opens with it filled in, ready to
 edit and send. **Settings → Meshy** (also the plugin's page under **Plugins**) shows the
-Meshy CLI version, whether you are signed in, which site (meshy.ai or meshy.cn) and your
-credits. **Sign in to Meshy** shows the approval link with a QR code for your phone and the code
+Meshy CLI version, whether and how you are signed in (browser or API key), which site (meshy.ai
+or meshy.cn) and your credits. **Sign in to Meshy** shows the approval link with a QR code for your phone and the code
 to check; the page picks up the approval by itself. Clicking a `.glb` file in the right sidebar, or
 the card of a model the agent delivers, opens an interactive 3D preview (drag to orbit, scroll to
-zoom, reset the view or let it turn) with its file size and triangle count. tui and headless have
+zoom, reset the view or let it turn) with its file size and triangle count. Models up to 256 MB
+open, past dsh's 32 MB limit for previewing a whole file, because the preview reads them in 2 MB
+pieces. tui and headless have
 neither; the skills work the same everywhere.
 
 ## How it works

package/README.zh.md

@@ -18,7 +18,7 @@ dsh plugin --profile web add github:meshy-dev/meshy-dsh
 
 ## 设置页与 3D 预览
 
-在 Web 和 Desktop 里，左侧栏会出现 **Meshy** 入口，打开后是 Meshy 页面：显示账号，并给出几个示例需求，点一个就会新开会话并填好需求，改一改再发送。**设置 → Meshy**（插件页里也有）会显示 Meshy CLI 版本、是否已登录、所在站点（meshy.ai 或 meshy.cn）和积分。点**登录 Meshy**会显示批准链接、二维码和核对用的验证码，可以用手机扫码批准，页面会自动发现批准完成。在右侧栏点一个 `.glb` 文件，或点 agent 交付的模型卡片，会打开可交互的 3D 预览（拖动旋转，滚轮缩放，可复位视角或自动旋转），并显示文件大小和三角面数。tui 和 headless 没有这些界面，skill 在任何界面都一样能用。
+在 Web 和 Desktop 里，左侧栏会出现 **Meshy** 入口，打开后是 Meshy 页面：显示账号，并给出几个示例需求，点一个就会新开会话并填好需求，改一改再发送。**设置 → Meshy**（插件页里也有）会显示 Meshy CLI 版本、是否已登录及登录方式（浏览器或 API key）、所在站点（meshy.ai 或 meshy.cn）和积分。点**登录 Meshy**会显示批准链接、二维码和核对用的验证码，可以用手机扫码批准，页面会自动发现批准完成。在右侧栏点一个 `.glb` 文件，或点 agent 交付的模型卡片，会打开可交互的 3D 预览（拖动旋转，滚轮缩放，可复位视角或自动旋转），并显示文件大小和三角面数。预览会按 2 MB 分块读取模型，所以不受 dsh 整文件预览 32 MB 的上限限制，最大可预览 256 MB。tui 和 headless 没有这些界面，skill 在任何界面都一样能用。
 
 ## 工作方式
 

package/lib/client.js

@@ -2542,6 +2542,12 @@ const name = "meshy-dsh-client";
 const inject = ["slots", "locale"];
 const NS = "meshy";
 const GLB_ID = "meshy-dsh/glb";
+/**
+* dsh refuses a complete-file read above 32 MiB (`maxFileBytes`), so the preview reads 2 MiB
+* windows (`maxBytes`, the per-window cap) and stops at its own limit instead.
+*/
+const WINDOW = 2 << 20;
+const MAX_GLB = 256 << 20;
 /** The left-sidebar entry and its page in the main column share this id. */
 const PAGE_ID = "meshy";
 const EXAMPLES = [
@@ -2612,7 +2618,9 @@ const en = {
 	"site.cn": "China",
 	credits: "Credits",
 	"credits.get": "Get credits",
-	account: "Account",
+	method: "Signed in with",
+	"method.browser": "Browser",
+	"method.apiKey": "API key",
 	more: "Manage account",
 	signIn: "Sign in to Meshy",
 	"signIn.hint": "Approve in your browser once; the Meshy skills then use this sign-in.",
@@ -2639,6 +2647,7 @@ const en = {
 	"viewer.title": "3D model",
 	"viewer.loading": "Loading model…",
 	"viewer.failed": "This model cannot be shown",
+	"viewer.tooLarge": "The model is {size}, over the {limit} preview limit. Remesh it to fewer faces to preview it.",
 	"viewer.triangles": "{count} triangles",
 	"viewer.reset": "Reset view",
 	"viewer.spin": "Auto-rotate",
@@ -2674,7 +2683,9 @@ const zh = {
 	"site.cn": "中国站",
 	credits: "积分",
 	"credits.get": "获取积分",
-	account: "账号",
+	method: "登录方式",
+	"method.browser": "浏览器登录",
+	"method.apiKey": "API key",
 	more: "管理账号",
 	signIn: "登录 Meshy",
 	"signIn.hint": "在浏览器里批准一次，Meshy 技能之后都会使用这个登录。",
@@ -2701,6 +2712,7 @@ const zh = {
 	"viewer.title": "3D 模型",
 	"viewer.loading": "正在加载模型…",
 	"viewer.failed": "无法显示这个模型",
+	"viewer.tooLarge": "模型有 {size}，超过 {limit} 的预览上限。减面后再预览。",
 	"viewer.triangles": "{count} 个三角面",
 	"viewer.reset": "重置视角",
 	"viewer.spin": "自动旋转",
@@ -3057,9 +3069,9 @@ function MeshyPanel({ t, view }) {
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "meshy-divider" }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "meshy-row",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("account") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("method") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "meshy-muted",
-							children: auth.credential ?? auth.source ?? "—"
+							children: auth.method ? t(`method.${auth.method}`) : "—"
 						})]
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "meshy-divider" }),
@@ -3328,34 +3340,111 @@ function MeshyPage({ t }) {
 		})
 	});
 }
-/** The keyed `sidebar.right.tab.document` body for .glb, fed the file's complete bytes. */
-function GlbBody({ content, t }) {
+let workspaceFiles;
+var TooLarge = class extends Error {
+	size;
+	constructor(size) {
+		super("too large");
+		this.size = size;
+	}
+};
+/** A preview tab's `dsh-resource://file/session/<id>/<path>` address (dsh-util-workspace-path's grammar). */
+function sessionFileOf(address) {
+	const m = /^dsh-resource:\/\/file\/session\/([^/?#]+)\/([^?#]+)/.exec(address);
+	return m ? {
+		sessionId: decodeURIComponent(m[1]),
+		path: m[2].split("/").map(decodeURIComponent).join("/")
+	} : void 0;
+}
+/** Read the whole file window by window; a change mid-read starts over on the new version. */
+async function readWindows(address, signal, progress) {
+	const file = sessionFileOf(address);
+	if (!file || !workspaceFiles) throw new Error(`cannot read ${address}`);
+	let chunks = [];
+	let offset = 0;
+	let version;
+	let length = WINDOW;
+	for (;;) {
+		const res = await workspaceFiles.readBytes(file.sessionId, file.path, { range: {
+			offset,
+			length
+		} }, signal);
+		signal.throwIfAborted();
+		if (!res.ok) {
+			const limit = res.error.details?.limit;
+			if (res.error.code === "workspace-file/too-large" && limit && limit < length) {
+				length = limit;
+				continue;
+			}
+			throw new Error(res.error.message ?? res.error.code);
+		}
+		const w = res.value;
+		if (version !== void 0 && w.version !== version) {
+			chunks = [];
+			offset = 0;
+			version = void 0;
+			continue;
+		}
+		version = w.version;
+		if ((w.bytes ?? 0) > MAX_GLB) throw new TooLarge(w.bytes);
+		chunks.push(w.data);
+		offset += w.data.byteLength;
+		if (offset > MAX_GLB) throw new TooLarge(offset);
+		progress(offset, w.bytes ?? offset);
+		if (w.eof || w.data.byteLength === 0) break;
+	}
+	const data = new Uint8Array(offset);
+	let at = 0;
+	for (const c of chunks) {
+		data.set(c, at);
+		at += c.byteLength;
+	}
+	return {
+		data,
+		version
+	};
+}
+/** The keyed `sidebar.right.tab.document` body for .glb; it reads the file itself (renderer loading). */
+function GlbBody({ content, resourceAddress, t }) {
 	const host = (0, react.useRef)(null);
 	const [viewer, setViewer] = (0, react.useState)();
 	const [error, setError] = (0, react.useState)();
 	const [spinning, setSpinning] = (0, react.useState)(false);
+	const [size, setSize] = (0, react.useState)(0);
+	const [progress, setProgress] = (0, react.useState)();
 	(0, react.useEffect)(() => {
 		const el = host.current;
-		if (content.kind !== "bytes" || !content.data || !el) return;
+		if (content.kind !== "renderer" || !el) return;
+		const abort = new AbortController();
 		let mounted;
-		let cancelled = false;
 		setError(void 0);
 		setViewer(void 0);
 		setSpinning(false);
-		require.async("./client.viewer.js").then((module) => module.mountViewer(el, content.data)).then((v) => {
-			if (cancelled) v.dispose();
-			else {
-				mounted = v;
-				setViewer(v);
-			}
+		setProgress(void 0);
+		readWindows(resourceAddress, abort.signal, (read, total) => setProgress([read, total])).then(async ({ data, version }) => {
+			const v = await (await require.async("./client.viewer.js")).mountViewer(el, data);
+			if (abort.signal.aborted) return v.dispose();
+			mounted = v;
+			setSize(data.byteLength);
+			setViewer(v);
+			content.loaded?.(version);
 		}).catch((err) => {
-			if (!cancelled) setError(String(err?.message ?? err));
+			if (abort.signal.aborted) return;
+			setError(err instanceof TooLarge ? t("viewer.tooLarge", {
+				size: (0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(err.size),
+				limit: (0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(MAX_GLB)
+			}) : String(err?.message ?? err));
+			content.failed?.();
 		});
 		return () => {
-			cancelled = true;
+			abort.abort();
 			mounted?.dispose();
 		};
-	}, [content]);
+	}, [
+		content.kind,
+		content.revision,
+		resourceAddress
+	]);
 	const toggle = () => {
 		viewer?.setAutoRotate(!spinning);
 		setSpinning(!spinning);
@@ -3369,10 +3458,21 @@ function GlbBody({ content, t }) {
 			}),
 			!viewer && !error && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "meshy-overlay meshy-muted",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Logo, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.TextShimmer, {
-					active: true,
-					children: t("viewer.loading")
-				})]
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Logo, {}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.TextShimmer, {
+						active: true,
+						children: t("viewer.loading")
+					}),
+					progress && progress[1] > WINDOW && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "meshy-small",
+						children: [
+							(0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(progress[0]),
+							" / ",
+							(0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(progress[1])
+						]
+					})
+				]
 			}),
 			error && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "meshy-overlay",
@@ -3390,7 +3490,11 @@ function GlbBody({ content, t }) {
 				className: "meshy-bar",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					className: "meshy-chip",
-					children: [content.data ? `${(0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(content.data.byteLength)} · ` : "", t("viewer.triangles", { count: viewer.triangles.toLocaleString() })]
+					children: [
+						(0, _deepseek_ai_dsh_client_ui_primitives.fileSizeText)(size),
+						" · ",
+						t("viewer.triangles", { count: viewer.triangles.toLocaleString() })
+					]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					className: "meshy-tools",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
@@ -3468,15 +3572,23 @@ function apply(ctx) {
 	ctx.inject([
 		"documentPreviews",
 		"slots",
-		"locale"
+		"locale",
+		"remote",
+		"remote.workspaceFiles"
 	], (ctx) => {
+		ctx.effect(() => {
+			workspaceFiles = ctx.remote.workspaceFiles;
+			return () => {
+				workspaceFiles = void 0;
+			};
+		}, "meshy-dsh: workspace file reads");
 		ctx.effect(() => ctx.documentPreviews.register({
 			id: GLB_ID,
 			extensions: ["glb"],
 			binaryExtensions: ["glb"],
 			priority: "extension",
 			title: () => ctx.locale.bind(NS)("viewer.title"),
-			loading: "bytes-complete"
+			loading: "renderer"
 		}), "meshy-dsh: glb preview");
 		ctx.effect(() => ctx.slots.inject("sidebar.right.tab.document", () => ctx.slots.register({
 			name: "sidebar.right.tab.document",

package/lib/index.js

@@ -77,8 +77,8 @@ export async function status() {
     auth: {
       authenticated: r.authenticated === true,
       verified: r.verified === true,
-      source: r.source ?? null,
-      credential: r.credential ?? null,
+      // How it signed in, never the credential: an OAuth access token starts msy_at_.
+      method: r.authenticated !== true ? null : String(r.credential ?? '').startsWith('msy_at_') ? 'browser' : 'apiKey',
       region: typeof r.base_url_v1 === 'string' && r.base_url_v1.includes('meshy.cn') ? 'cn' : 'global',
       balance: typeof r.balance?.balance === 'number' ? r.balance.balance : null,
       hint: r.hint ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshy-dsh",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Meshy skills for DeepSeek Harness: textured, rigged and animated 3D models or print-ready files from text or images, through meshy-cli, with a Meshy settings page and a 3D preview for GLB files.",
   "keywords": [
     "dsh-plugin",