@openvulcan/dsh-vulcancode 0.4.0 → 0.4.4

package/node_modules/@openvulcan/dsh-vulcan-account/lib/client.js

@@ -32,6 +32,7 @@ window.__ModuleLoader__.load({
 			"use strict";
 			Object.defineProperty(exports, "__esModule", { value: true });
 			exports.AccountFooter = AccountFooter;
+			exports.VulcanMark = VulcanMark;
 			const jsx_runtime_1 = require("react/jsx-runtime");
 			/**
 			 * The OpenVulcan account in the sidebar foot, above Settings: who is signed in and their plan, or
@@ -70,23 +71,6 @@ window.__ModuleLoader__.load({
 			            view.refresh();
 			        });
 			    };
-			    const signIn = (site) => {
-			        // Opened during the click, so no popup blocker stops it, and pointed at the page once known.
-			        const popup = window.open('about:blank', '_blank');
-			        act(async () => {
-			            try {
-			                const { approvalUrl } = await (0, shared_1.callAccount)('POST', `signin?site=${site}`);
-			                if (popup !== null) {
-			                    popup.opener = null;
-			                    popup.location.href = approvalUrl;
-			                }
-			            }
-			            catch (failure) {
-			                popup?.close();
-			                throw failure;
-			            }
-			        });
-			    };
 			    // Without the plugin routes there is nothing to show or do here.
 			    if (live === null)
 			        return null;
@@ -108,11 +92,17 @@ window.__ModuleLoader__.load({
 			    }
 			    const failure = live.signInError ?? error;
 			    const note = failure !== undefined ? t('footer.failed') : live.account.reauthRequired === true ? t('footer.reauth') : t('footer.signedOut');
-			    return ((0, jsx_runtime_1.jsxs)("div", { className: "vac-foot", children: [(0, jsx_runtime_1.jsxs)("button", { type: "button", className: "vac-foot-home", "aria-label": t('footer.open'), title: failure ?? t('footer.open'), onClick: openSettings, children: [(0, jsx_runtime_1.jsx)(VulcanMark, {}), (0, jsx_runtime_1.jsxs)("span", { className: "vac-foot-text", children: [(0, jsx_runtime_1.jsx)("span", { className: "vac-foot-name", children: t('footer.brand') }), (0, jsx_runtime_1.jsx)("span", { className: failure === undefined && live.account.reauthRequired !== true ? 'vac-foot-sub' : 'vac-foot-sub warn', children: note })] })] }), (0, jsx_runtime_1.jsx)("span", { className: "vac-foot-actions", children: shared_1.SITES.map(item => ((0, jsx_runtime_1.jsx)("button", { type: "button", className: "vac-foot-chip", disabled: busy, title: (0, i18n_1.fill)(t('footer.signInAt'), { site: t(`account.site.${item.site}`), domain: item.domain }), onClick: () => { signIn(item.site); }, children: t(`footer.chip.${item.site}`) }, item.site))) })] }));
+			    return ((0, jsx_runtime_1.jsxs)("div", { className: "vac-foot", children: [(0, jsx_runtime_1.jsxs)("button", { type: "button", className: "vac-foot-home", "aria-label": t('footer.open'), title: failure ?? t('footer.open'), onClick: openSettings, children: [(0, jsx_runtime_1.jsx)(VulcanMark, {}), (0, jsx_runtime_1.jsxs)("span", { className: "vac-foot-text", children: [(0, jsx_runtime_1.jsx)("span", { className: "vac-foot-name", children: t('footer.brand') }), (0, jsx_runtime_1.jsx)("span", { className: failure === undefined && live.account.reauthRequired !== true ? 'vac-foot-sub' : 'vac-foot-sub warn', children: note })] })] }), (0, jsx_runtime_1.jsx)("span", { className: "vac-foot-actions", children: shared_1.SITES.map(item => ((0, jsx_runtime_1.jsx)("button", { type: "button", className: "vac-foot-chip", disabled: busy, title: (0, i18n_1.fill)(t('footer.signInAt'), { site: t(`account.site.${item.site}`), domain: item.domain }), onClick: () => { act(() => (0, shared_1.startAccountSignIn)(item.site)); }, children: t(`footer.chip.${item.site}`) }, item.site))) })] }));
 			}
-			/** The OpenVulcan mark: the chevron takes the text colour, the flame keeps its own. */
-			function VulcanMark() {
-			    return ((0, jsx_runtime_1.jsxs)("svg", { className: "vac-foot-mark", viewBox: "32 29 232 259", "aria-hidden": "true", focusable: "false", children: [(0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("linearGradient", { id: "vac-foot-flame", x1: "0%", y1: "100%", x2: "100%", y2: "0%", children: [(0, jsx_runtime_1.jsx)("stop", { offset: "0%", stopColor: "#FF6527" }), (0, jsx_runtime_1.jsx)("stop", { offset: "100%", stopColor: "#F44E1C" })] }) }), (0, jsx_runtime_1.jsx)("path", { d: "M 2 0 L 84 0 C 88 0 91 1 95 5 L 153 76 C 159 83 159 95 153 102 L 95 173 C 91 177 88 178 84 178 L 2 178 L 78 89 Z", fill: "currentColor", transform: "translate(30 110)" }), (0, jsx_runtime_1.jsx)("path", { d: "M 73 0 C 64 14 51 28 38 40 C 21 55 7 68 2 87 C -2 107 8 129 25 150 C 39 134 53 119 67 107 C 82 95 91 79 93 60 C 95 40 86 18 73 0 Z", fill: "url(#vac-foot-flame)", transform: "translate(169 29)" })] }));
+			/**
+			 * Render the OpenVulcan mark with the requested square size, or use the footer dimensions when omitted.
+			 * 按指定的方形尺寸渲染 OpenVulcan 标识，未指定时使用侧栏底部的尺寸。
+			 */
+			function VulcanMark({ size }) {
+			    // The footer and settings can render at once, so each SVG owns its gradient reference.
+			    // 侧栏底部与设置页可以同时渲染，因此每个 SVG 使用独立的渐变标识。
+			    const flameId = (0, react_1.useId)();
+			    return ((0, jsx_runtime_1.jsxs)("svg", { className: size === undefined ? 'vac-foot-mark' : undefined, width: size, height: size, viewBox: "32 29 232 259", "aria-hidden": "true", focusable: "false", children: [(0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("linearGradient", { id: flameId, x1: "0%", y1: "100%", x2: "100%", y2: "0%", children: [(0, jsx_runtime_1.jsx)("stop", { offset: "0%", stopColor: "#FF6527" }), (0, jsx_runtime_1.jsx)("stop", { offset: "100%", stopColor: "#F44E1C" })] }) }), (0, jsx_runtime_1.jsx)("path", { d: "M 2 0 L 84 0 C 88 0 91 1 95 5 L 153 76 C 159 83 159 95 153 102 L 95 173 C 91 177 88 178 84 178 L 2 178 L 78 89 Z", fill: "currentColor", transform: "translate(30 110)" }), (0, jsx_runtime_1.jsx)("path", { d: "M 73 0 C 64 14 51 28 38 40 C 21 55 7 68 2 87 C -2 107 8 129 25 150 C 39 134 53 119 67 107 C 82 95 91 79 93 60 C 95 40 86 18 73 0 Z", fill: `url(#${flameId})`, transform: "translate(169 29)" })] }));
 			}
 
 		},
@@ -140,8 +130,8 @@ window.__ModuleLoader__.load({
 			    'account.signedIn': '已登录',
 			    'account.expires': '凭据有效期至 {expires}',
 			    'account.reauth': '凭据轮换中断，需要重新登录。',
-			    'account.waiting': '已打开授权页，批准后自动完成登录。',
-			    'account.openAgain': '重新打开授权页',
+			    'account.waiting': '等待浏览器授权，批准后自动完成登录。',
+			    'account.openAgain': '打开授权页',
 			    'account.cancel': '取消登录',
 			    'account.signOut': '退出登录',
 			    'account.failed': '登录失败：{error}',
@@ -153,7 +143,7 @@ window.__ModuleLoader__.load({
 			    'footer.chip.global': '国际',
 			    'footer.chip.cn': '中国',
 			    'footer.waiting': '等待授权…',
-			    'footer.reopen': '重开',
+			    'footer.reopen': '授权页',
 			    'footer.cancel': '取消',
 			    'footer.reauth': '需要重新登录',
 			    'footer.failed': '登录失败',
@@ -175,8 +165,8 @@ window.__ModuleLoader__.load({
 			    'account.signedIn': 'Signed in',
 			    'account.expires': 'Credential valid until {expires}',
 			    'account.reauth': 'A credential rotation was interrupted; sign in again.',
-			    'account.waiting': 'The approval page is open; sign-in completes once you approve.',
-			    'account.openAgain': 'Open the approval page again',
+			    'account.waiting': 'Approve in your browser to finish signing in.',
+			    'account.openAgain': 'Open approval page',
 			    'account.cancel': 'Cancel sign-in',
 			    'account.signOut': 'Sign out',
 			    'account.failed': 'Sign-in failed: {error}',
@@ -188,7 +178,7 @@ window.__ModuleLoader__.load({
 			    'footer.chip.global': 'Global',
 			    'footer.chip.cn': 'China',
 			    'footer.waiting': 'Waiting for approval…',
-			    'footer.reopen': 'Reopen',
+			    'footer.reopen': 'Approve',
 			    'footer.cancel': 'Cancel',
 			    'footer.reauth': 'Sign in again',
 			    'footer.failed': 'Sign-in failed',
@@ -246,6 +236,12 @@ window.__ModuleLoader__.load({
 			        locale: i18n_1.NAMESPACE,
 			        inject: () => ({ view }),
 			    }, ({ t, view: injected }) => (0, jsx_runtime_1.jsx)(page_1.AccountPage, { view: injected, t: t })));
+			    // dsh 0.2.2 declares this optional slot. The injection waits on older hosts.
+			    // dsh 0.2.2 声明了此可选插槽，旧版宿主上的注入会保持等待。
+			    ctx.slots.inject('settings.section.icon', () => ctx.slots.register({
+			        name: 'settings.section.icon',
+			        id: shared_1.SETTINGS_SECTION,
+			    }, footer_1.VulcanMark));
 			    // Above Settings in the sidebar foot.
 			    ctx.slots.inject('sidebar.footer.action', () => ctx.slots.register({
 			        name: 'sidebar.footer.action',
@@ -296,23 +292,6 @@ window.__ModuleLoader__.load({
 			            view.refresh();
 			        });
 			    };
-			    const signIn = (site) => {
-			        // Opened during the click, so no popup blocker stops it, and pointed at the page once known.
-			        const popup = window.open('about:blank', '_blank');
-			        act(async () => {
-			            try {
-			                const { approvalUrl } = await (0, shared_1.callAccount)('POST', `signin?site=${site}`);
-			                if (popup !== null) {
-			                    popup.opener = null;
-			                    popup.location.href = approvalUrl;
-			                }
-			            }
-			            catch (failure) {
-			                popup?.close();
-			                throw failure;
-			            }
-			        });
-			    };
 			    let body;
 			    if (live === undefined)
 			        body = (0, jsx_runtime_1.jsx)("p", { className: "vac-hint", children: t('loading') });
@@ -323,13 +302,13 @@ window.__ModuleLoader__.load({
 			        body = ((0, jsx_runtime_1.jsxs)("div", { className: "vac-between", children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("div", { className: "vac-inline", children: [(0, jsx_runtime_1.jsx)("span", { className: "vac-badge ok", children: t('account.signedIn') }), (0, jsx_runtime_1.jsx)("strong", { children: t(`account.site.${account.site ?? 'global'}`) }), (0, jsx_runtime_1.jsx)("span", { className: "vac-hint vac-mono", children: shared_1.SITES.find(item => item.site === account.site)?.domain })] }), account.expiresAt === undefined ? null : (0, jsx_runtime_1.jsx)("p", { className: "vac-hint", children: (0, i18n_1.fill)(t('account.expires'), { expires: when(account.expiresAt) }) })] }), (0, jsx_runtime_1.jsx)("button", { type: "button", className: "vac-btn", disabled: busy, onClick: () => { act(() => (0, shared_1.callAccount)('POST', 'signout')); }, children: t('account.signOut') })] }));
 			    }
 			    else if (live.signIn !== null) {
-			        body = ((0, jsx_runtime_1.jsxs)("div", { className: "vac-between", children: [(0, jsx_runtime_1.jsx)("span", { children: t('account.waiting') }), (0, jsx_runtime_1.jsxs)("span", { className: "vac-inline", children: [(0, jsx_runtime_1.jsx)("a", { className: "vac-link", href: live.signIn.approvalUrl, target: "_blank", rel: "noopener noreferrer", children: t('account.openAgain') }), (0, jsx_runtime_1.jsx)("button", { type: "button", className: "vac-btn sm", disabled: busy, onClick: () => { act(() => (0, shared_1.callAccount)('POST', 'signin/cancel')); }, children: t('account.cancel') })] })] }));
+			        body = ((0, jsx_runtime_1.jsxs)("div", { className: "vac-between", children: [(0, jsx_runtime_1.jsx)("span", { role: "status", children: t('account.waiting') }), (0, jsx_runtime_1.jsxs)("span", { className: "vac-inline", children: [(0, jsx_runtime_1.jsx)("a", { className: "vac-link", href: live.signIn.approvalUrl, target: "_blank", rel: "noopener noreferrer", children: t('account.openAgain') }), (0, jsx_runtime_1.jsx)("button", { type: "button", className: "vac-btn sm", disabled: busy, onClick: () => { act(() => (0, shared_1.callAccount)('POST', 'signin/cancel')); }, children: t('account.cancel') })] })] }));
 			    }
 			    else {
-			        body = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [live.account.reauthRequired === true ? (0, jsx_runtime_1.jsx)("div", { className: "vac-alert warn", children: t('account.reauth') }) : null, (0, jsx_runtime_1.jsx)("div", { className: "vac-sites", children: shared_1.SITES.map(item => ((0, jsx_runtime_1.jsxs)("button", { type: "button", className: "vac-site", disabled: busy, onClick: () => { signIn(item.site); }, children: [(0, jsx_runtime_1.jsx)("strong", { children: t(`account.site.${item.site}`) }), (0, jsx_runtime_1.jsx)("span", { children: item.domain }), (0, jsx_runtime_1.jsxs)("span", { style: { fontFamily: 'inherit', color: 'var(--vk-signal)' }, children: [t('account.signIn'), " \u2192"] })] }, item.site))) })] }));
+			        body = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [live.account.reauthRequired === true ? (0, jsx_runtime_1.jsx)("div", { className: "vac-alert warn", children: t('account.reauth') }) : null, (0, jsx_runtime_1.jsx)("div", { className: "vac-sites", children: shared_1.SITES.map(item => ((0, jsx_runtime_1.jsxs)("button", { type: "button", className: "vac-site", disabled: busy, onClick: () => { act(() => (0, shared_1.startAccountSignIn)(item.site)); }, children: [(0, jsx_runtime_1.jsx)("strong", { children: t(`account.site.${item.site}`) }), (0, jsx_runtime_1.jsx)("span", { children: item.domain }), (0, jsx_runtime_1.jsxs)("span", { style: { fontFamily: 'inherit', color: 'var(--vk-signal)' }, children: [t('account.signIn'), " \u2192"] })] }, item.site))) })] }));
 			    }
 			    const failure = live?.signInError === undefined ? error : (0, i18n_1.fill)(t('account.failed'), { error: live.signInError });
-			    return ((0, jsx_runtime_1.jsxs)("div", { className: "vac vac-page", children: [(0, jsx_runtime_1.jsxs)("div", { className: "vac-page-head", children: [(0, jsx_runtime_1.jsx)("h2", { children: t('page.title') }), (0, jsx_runtime_1.jsx)("p", { className: "vac-lead", children: t('page.lead') })] }), (0, jsx_runtime_1.jsxs)("section", { className: "vac-section", children: [(0, jsx_runtime_1.jsx)("div", { className: "vac-section-head", children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h3", { className: "vac-section-title", children: t('account.title') }), live?.account.signedIn === true ? null : (0, jsx_runtime_1.jsx)("p", { className: "vac-section-lead", children: t('account.lead') })] }) }), (0, jsx_runtime_1.jsxs)("div", { className: "vac-section-body", children: [body, failure === undefined ? null : (0, jsx_runtime_1.jsx)("p", { className: "vac-error", role: "alert", children: failure })] })] })] }));
+			    return ((0, jsx_runtime_1.jsxs)("div", { className: "vac vac-page", "data-vulcan-settings-width": "readable", children: [(0, jsx_runtime_1.jsxs)("header", { className: "vac-page-head", "data-vulcan-settings-header": true, children: [(0, jsx_runtime_1.jsx)("h2", { children: t('page.title') }), (0, jsx_runtime_1.jsx)("p", { className: "vac-lead", children: t('page.lead') })] }), (0, jsx_runtime_1.jsxs)("section", { className: "vac-section", children: [(0, jsx_runtime_1.jsx)("div", { className: "vac-section-head", children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h3", { className: "vac-section-title", children: t('account.title') }), live?.account.signedIn === true ? null : (0, jsx_runtime_1.jsx)("p", { className: "vac-section-lead", children: t('account.lead') })] }) }), (0, jsx_runtime_1.jsxs)("div", { className: "vac-section-body", children: [body, failure === undefined ? null : (0, jsx_runtime_1.jsx)("p", { className: "vac-error", role: "alert", children: failure })] })] })] }));
 			}
 			/** The suite's entry on the Plugins page: what it holds, and the way to its settings. */
 			function PluginPageSummary({ view, t, open }) {
@@ -349,6 +328,7 @@ window.__ModuleLoader__.load({
 			Object.defineProperty(exports, "__esModule", { value: true });
 			exports.HostWatch = exports.SITES = exports.GUARD_SECTION = exports.SUITE_PACKAGE = exports.SETTINGS_SECTION = exports.PACKAGE_NAME = void 0;
 			exports.callAccount = callAccount;
+			exports.startAccountSignIn = startAccountSignIn;
 			exports.messageOf = messageOf;
 			/** Checked against `package.json` by `scripts/bundle-client.mjs`. */
 			exports.PACKAGE_NAME = '@openvulcan/dsh-vulcan-account';
@@ -372,6 +352,34 @@ window.__ModuleLoader__.load({
 			        throw new Error(answer?.error?.message ?? `HTTP ${response.status}`);
 			    return answer.value;
 			}
+			/**
+			 * Start device sign-in for the selected site and request its authorization page. Resolves after
+			 * asking the browser or desktop shell to open it, and rejects if the sign-in request fails.
+			 * 为所选站点发起设备登录并请求打开授权页。向浏览器或桌面壳发出打开请求后完成，登录请求失败时拒绝。
+			 */
+			async function startAccountSignIn(site) {
+			    // A browser needs the click to open a tab before the asynchronous sign-in request.
+			    // 浏览器需要利用点击手势在异步登录请求之前打开标签页。
+			    const popup = window.open('about:blank', '_blank');
+			    try {
+			        // The account service validates the approval URL against the selected site and sign-in state.
+			        // 账号服务会根据所选站点和登录状态验证授权地址。
+			        const { approvalUrl } = await callAccount('POST', `signin?site=${site}`);
+			        if (popup === null) {
+			            // dsh Desktop denies the blank tab and sends HTTP(S) URLs directly to the system browser.
+			            // dsh 桌面端拒绝空白标签页，并将 HTTP(S) 地址直接交给系统浏览器。
+			            window.open(approvalUrl, '_blank', 'noopener,noreferrer');
+			        }
+			        else if (!popup.closed) {
+			            popup.opener = null;
+			            popup.location.replace(approvalUrl);
+			        }
+			    }
+			    catch (failure) {
+			        popup?.close();
+			        throw failure;
+			    }
+			}
 			function messageOf(error) {
 			    return error instanceof Error ? error.message : String(error);
 			}

package/node_modules/@openvulcan/dsh-vulcan-account/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvulcan/dsh-vulcan-account",
-  "version": "0.4.0",
+  "version": "0.4.4",
   "description": "OpenVulcan account for DeepSeek Harness: sign in once, used by every VulcanCode plugin.",
   "license": "MIT",
   "icon": "./assets/account-icon.png",
@@ -42,7 +42,7 @@
     }
   },
   "dependencies": {
-    "@openvulcan/openvulcan-account": "0.4.0"
+    "@openvulcan/openvulcan-account": "0.4.4"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",