@oj-module/cli 0.2.68 → 0.2.71

package/templates/src/app/web/_platform/__client/index.ts

@@ -36,7 +36,7 @@ export function create_platformClient(ctx: ModuleContext) {
 	}
 	ctx.register.apiPrefix(API_PREFIX);
 	bindRequest(ctx.utils.request);
-	return { platformContactsGet, platformContactsDetailGet, platformMarketInstallPost, platformMarketInstallCancelPost, platformMarketTaskGet, platformMarketEnablePost, platformMarketMetaGet, platformMarketTrustGet, platformMarketTrustPost, platformMarketTrustKeyPost, platformMarketTrustKeyDelete, platformMarketIndexGet, platformMarketUninstallImpactGet, platformMarketUninstallPost, platformMarketHistoryGet, platformMarketReleasesGet, platformOrgDepartmentsGet, platformOrgIsMemberGet, platformOrgMembersGet, platformOrgPickerGet, platformOrgResolvePost, platformOrgTreeGet, platformOrgUserGet, platformSolutionsRoutesGet, platformSolutionsVerifyPost, platformSolutionsVerifyLastGet };
+	return { platformContactsGet, platformContactsDetailGet, platformOrgDepartmentsGet, platformOrgIsMemberGet, platformOrgMembersGet, platformOrgPickerGet, platformOrgResolvePost, platformOrgTreeGet, platformOrgUserGet, platformSolutionsRoutesGet, platformSolutionsVerifyPost, platformSolutionsVerifyLastGet };
 }
 
 /**
@@ -115,338 +115,6 @@ export async function platformContactsDetailGet(query: PlatformContactsDetailGet
 	}
 }
 
-export type PlatformMarketInstallPostBody = z.input<(typeof schemas)["platformMarketInstallPost"]["body"]>;
-export type PlatformMarketInstallPostData = z.infer<(typeof schemas)["platformMarketInstallPost"]["data"]>;
-
-export async function platformMarketInstallPost(body: PlatformMarketInstallPostBody): Promise<PlatformMarketInstallPostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/install`, { json: body }).json<OjEnvelope<PlatformMarketInstallPostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketInstallPostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketInstallPost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketInstallPost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketInstallCancelPostBody = z.input<(typeof schemas)["platformMarketInstallCancelPost"]["body"]>;
-export type PlatformMarketInstallCancelPostData = z.infer<(typeof schemas)["platformMarketInstallCancelPost"]["data"]>;
-
-export async function platformMarketInstallCancelPost(body: PlatformMarketInstallCancelPostBody): Promise<PlatformMarketInstallCancelPostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/install/cancel`, { json: body }).json<OjEnvelope<PlatformMarketInstallCancelPostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketInstallCancelPostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketInstallCancelPost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketInstallCancelPost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketTaskGetQuery = z.input<(typeof schemas)["platformMarketTaskGet"]["query"]>;
-export type PlatformMarketTaskGetData = z.infer<(typeof schemas)["platformMarketTaskGet"]["data"]>;
-
-export async function platformMarketTaskGet(query: PlatformMarketTaskGetQuery): Promise<PlatformMarketTaskGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/task`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<PlatformMarketTaskGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketTaskGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketTaskGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketTaskGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketEnablePostBody = z.input<(typeof schemas)["platformMarketEnablePost"]["body"]>;
-export type PlatformMarketEnablePostData = z.infer<(typeof schemas)["platformMarketEnablePost"]["data"]>;
-
-export async function platformMarketEnablePost(body: PlatformMarketEnablePostBody): Promise<PlatformMarketEnablePostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/enable`, { json: body }).json<OjEnvelope<PlatformMarketEnablePostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketEnablePostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketEnablePost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketEnablePost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketMetaGetData = z.infer<(typeof schemas)["platformMarketMetaGet"]["data"]>;
-
-export async function platformMarketMetaGet(): Promise<PlatformMarketMetaGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/meta`).json<OjEnvelope<PlatformMarketMetaGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketMetaGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketMetaGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketMetaGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketTrustGetData = z.infer<(typeof schemas)["platformMarketTrustGet"]["data"]>;
-
-export async function platformMarketTrustGet(): Promise<PlatformMarketTrustGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/trust`).json<OjEnvelope<PlatformMarketTrustGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketTrustGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketTrustGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketTrustGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketTrustPostBody = z.input<(typeof schemas)["platformMarketTrustPost"]["body"]>;
-export type PlatformMarketTrustPostData = z.infer<(typeof schemas)["platformMarketTrustPost"]["data"]>;
-
-export async function platformMarketTrustPost(body: PlatformMarketTrustPostBody): Promise<PlatformMarketTrustPostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/trust`, { json: body }).json<OjEnvelope<PlatformMarketTrustPostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketTrustPostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketTrustPost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketTrustPost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketTrustKeyPostBody = z.input<(typeof schemas)["platformMarketTrustKeyPost"]["body"]>;
-export type PlatformMarketTrustKeyPostData = z.infer<(typeof schemas)["platformMarketTrustKeyPost"]["data"]>;
-
-export async function platformMarketTrustKeyPost(body: PlatformMarketTrustKeyPostBody): Promise<PlatformMarketTrustKeyPostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/trust/key`, { json: body }).json<OjEnvelope<PlatformMarketTrustKeyPostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketTrustKeyPostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketTrustKeyPost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketTrustKeyPost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketTrustKeyDeleteQuery = z.input<(typeof schemas)["platformMarketTrustKeyDelete"]["query"]>;
-export type PlatformMarketTrustKeyDeleteData = z.infer<(typeof schemas)["platformMarketTrustKeyDelete"]["data"]>;
-
-export async function platformMarketTrustKeyDelete(query: PlatformMarketTrustKeyDeleteQuery): Promise<PlatformMarketTrustKeyDeleteData> {
-	const client = ensureReq();
-	try {
-		const env = await client.delete(`_platform/market/trust/key`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<PlatformMarketTrustKeyDeleteData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketTrustKeyDeleteData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketTrustKeyDelete"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketTrustKeyDelete 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketIndexGetData = z.infer<(typeof schemas)["platformMarketIndexGet"]["data"]>;
-
-export async function platformMarketIndexGet(): Promise<PlatformMarketIndexGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/index`).json<OjEnvelope<PlatformMarketIndexGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketIndexGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketIndexGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketIndexGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketUninstallImpactGetQuery = z.input<(typeof schemas)["platformMarketUninstallImpactGet"]["query"]>;
-export type PlatformMarketUninstallImpactGetData = z.infer<(typeof schemas)["platformMarketUninstallImpactGet"]["data"]>;
-
-export async function platformMarketUninstallImpactGet(query: PlatformMarketUninstallImpactGetQuery): Promise<PlatformMarketUninstallImpactGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/uninstall-impact`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<PlatformMarketUninstallImpactGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketUninstallImpactGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketUninstallImpactGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketUninstallImpactGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketUninstallPostBody = z.input<(typeof schemas)["platformMarketUninstallPost"]["body"]>;
-export type PlatformMarketUninstallPostData = z.infer<(typeof schemas)["platformMarketUninstallPost"]["data"]>;
-
-export async function platformMarketUninstallPost(body: PlatformMarketUninstallPostBody): Promise<PlatformMarketUninstallPostData> {
-	const client = ensureReq();
-	try {
-		const env = await client.post(`_platform/market/uninstall`, { json: body }).json<OjEnvelope<PlatformMarketUninstallPostData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketUninstallPostData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketUninstallPost"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketUninstallPost 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketHistoryGetData = z.infer<(typeof schemas)["platformMarketHistoryGet"]["data"]>;
-
-export async function platformMarketHistoryGet(): Promise<PlatformMarketHistoryGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/history`).json<OjEnvelope<PlatformMarketHistoryGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketHistoryGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketHistoryGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketHistoryGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
-export type PlatformMarketReleasesGetQuery = z.input<(typeof schemas)["platformMarketReleasesGet"]["query"]>;
-export type PlatformMarketReleasesGetData = z.infer<(typeof schemas)["platformMarketReleasesGet"]["data"]>;
-
-export async function platformMarketReleasesGet(query: PlatformMarketReleasesGetQuery): Promise<PlatformMarketReleasesGetData> {
-	const client = ensureReq();
-	try {
-		const env = await client.get(`_platform/market/releases`, { searchParams: query as Record<string, string | number | boolean> }).json<OjEnvelope<PlatformMarketReleasesGetData>>();
-		// 2xx + code!==0 也是业务错误（§6.2 通道 a）：oj 不会这么发，但契约机制的价值恰是防漂移
-		if (typeof env.code === "number" && env.code !== 0)
-			throw new ContractApiError(env.code, env.msg ?? "业务错误（信封 code 非 0）");
-		const data = env.data as PlatformMarketReleasesGetData;
-		if (import.meta.env.DEV) {
-			const { schemas } = await import("./api.schemas");
-			const r = schemas["platformMarketReleasesGet"].data.safeParse(data);
-			if (!r.success)
-				throw new ContractApiError(-1, `[契约违例] platformMarketReleasesGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
-		}
-		return data;
-	}
-	catch (e) {
-		throw await toApiError(e);
-	}
-}
-
 export type PlatformOrgDepartmentsGetQuery = z.input<(typeof schemas)["platformOrgDepartmentsGet"]["query"]>;
 export type PlatformOrgDepartmentsGetData = z.infer<(typeof schemas)["platformOrgDepartmentsGet"]["data"]>;
 

package/templates/src/app/web/system/__client/api.schemas.ts

@@ -242,6 +242,8 @@ export const schemas = {
 	"display_name": z.string().nullable(),
 	"email": z.string().nullable(),
 	"position": z.string().nullable(),
+	"employee_no": z.string().nullable().optional(),
+	"phone_number": z.string().nullable().optional(),
 	"departments": z.array(z.object({
 	"id": z.number(),
 	"name": z.string().nullable(),

package/templates/src/app/web/system/locales/en-US.json

@@ -7,7 +7,8 @@
 		"oplog": "Audit Log",
 		"settings": "Site Settings",
 		"wecom": "WeCom Integration",
-		"departments": "Departments"
+		"departments": "Departments",
+		"solutions": "Solutions"
 	},
 	"common": {
 		"confirm": "Confirm",
@@ -40,6 +41,7 @@
 		},
 		"mainDept": "Main dept",
 		"filterDept": "Filter by department (incl. sub-depts)",
+		"searchPlaceholder": "Search by username / display name",
 		"password": "Password",
 		"usernameHint": "ldap:/ sso:/ wecom: prefixes are reserved for external identity sources"
 	},
@@ -129,6 +131,18 @@
 		"secretHint": "Secret items cannot be edited online",
 		"saved": "Settings saved"
 	},
+	"solutionsPage": {
+		"title": "Solution Market (oj-market)",
+		"absentTitle": "No oj-market package in the site catalog",
+		"absentHint": "Factory state: re-run `ojm init --yes` to fetch the bundled installer package, or have a superadmin trigger POST /api/oj-market/backfill to rebuild the local catalog, then refresh this page.",
+		"latest": "Latest in catalog: {{version}}",
+		"installed": "Installed {{version}}",
+		"install": "Install",
+		"doneTitle": "Installed",
+		"goMarket": "Open Solution Market",
+		"upgradableHint": "A newer version is in the catalog — upgrade from within the market page.",
+		"needsTrust": "Publisher key awaits trust confirmation — first-party packages are pre-trusted, so this usually means a third-party package occupies the name. Verify and retry."
+	},
 	"wecom": {
 		"title": "Onboard a corporation",
 		"hint": "Click \"Generate install link\" and send the link or QR code to the corporation's admin to scan/open for approval. On success this system auto-registers the corporation via the create_auth callback (writes wecom_app_profile). The link is generated by WeCom get_customized_auth_url; its validity follows WeCom's response (up to 10 days). The QR code greys out when it expires, so regenerate it.",

package/templates/src/app/web/system/locales/zh-CN.json

@@ -7,7 +7,8 @@
 		"oplog": "操作日志",
 		"settings": "站点设置",
 		"wecom": "企微集成",
-		"departments": "组织架构"
+		"departments": "组织架构",
+		"solutions": "方案安装"
 	},
 	"common": {
 		"confirm": "确认",
@@ -40,6 +41,7 @@
 		},
 		"mainDept": "主部门",
 		"filterDept": "按部门筛选（含子部门）",
+		"searchPlaceholder": "按用户名/显示名搜索",
 		"password": "口令",
 		"usernameHint": "ldap:/ sso:/ wecom: 为外部身份源保留"
 	},
@@ -129,6 +131,18 @@
 		"secretHint": "敏感项不可在线修改",
 		"saved": "设置已保存"
 	},
+	"solutionsPage": {
+		"title": "方案市场（oj-market）",
+		"absentTitle": "站点目录中暂无方案市场安装包",
+		"absentHint": "出厂未装态：请重新执行 ojm init --yes 补充随站分发的安装包，或由超管触发 POST /api/oj-market/backfill 回填本地目录后刷新本页。",
+		"latest": "目录最新版 {{version}}",
+		"installed": "已装 {{version}}",
+		"install": "安装",
+		"doneTitle": "安装完成",
+		"goMarket": "前往方案市场",
+		"upgradableHint": "目录有更新版本——经方案市场页内升级。",
+		"needsTrust": "发布方密钥待信任确认——首方包已预置平台信任，出现本态多为目录被第三方包占用，请核对后重试。"
+	},
 	"wecom": {
 		"title": "开通企业",
 		"hint": "点「生成开通链接」把链接或二维码发给企业管理员，由其扫码/打开授权；授权成功后本系统经 create_auth 回调自动登记该企业（落库 wecom_app_profile）。链接由企微 get_customized_auth_url 生成，有效期以企微返回为准（可达 10 天），过期后二维码置灰，可重新生成。",

package/templates/src/app/web/system/pages/departments/sync-bar.tsx

@@ -37,6 +37,12 @@ const KEY = ["system", "wecom-sync"] as const;
 
 /** 单片推完到下一次 start 的最小间隔：后端限速 10 次/分，串行驱动别自己撞 429 */
 const MIN_GAP_MS = 6000;
+/**
+ * 同步请求超时：单条 `sync/start` 处理一片（预算 12s + 单次上游软超时 5s，最坏 ~17s），
+ * 远长于运行时 `request` 的默认 10s。不单独放宽，前端必然在「片还没推完」时先抛
+ * `Request timed out`。30s 与服务器默认路由超时对齐，留足余量。
+ */
+const SYNC_TIMEOUT_MS = 30_000;
 /** 一轮点击最多推多少片（12 秒/片 ≈ 12 分钟）：兜底防呆，正常企业两三次就到底 */
 const MAX_SLICES = 60;
 
@@ -61,21 +67,21 @@ function remember(view: SyncView): SyncView {
 }
 
 async function fetchStatus(): Promise<SyncView> {
-	const env = await request.get(withAgent("auth/wecom/sync/status")).json<{ code: number, data?: SyncView }>();
+	const env = await request.get(withAgent("auth/wecom/sync/status"), { timeout: SYNC_TIMEOUT_MS }).json<{ code: number, data?: SyncView }>();
 	if (!env.data)
 		throw new Error("企业微信同步状态读取失败");
 	return remember(env.data);
 }
 
 async function pushSlice(): Promise<SyncView> {
-	const env = await request.post("auth/wecom/sync/start", { json: agentBody() }).json<{ code: number, data?: SyncView }>();
+	const env = await request.post("auth/wecom/sync/start", { json: agentBody(), timeout: SYNC_TIMEOUT_MS }).json<{ code: number, data?: SyncView }>();
 	if (!env.data)
 		throw new Error("企业微信同步未能启动");
 	return remember(env.data);
 }
 
 async function cancelSync(): Promise<SyncView> {
-	const env = await request.post("auth/wecom/sync/cancel", { json: agentBody() }).json<{ code: number, data?: SyncView }>();
+	const env = await request.post("auth/wecom/sync/cancel", { json: agentBody(), timeout: SYNC_TIMEOUT_MS }).json<{ code: number, data?: SyncView }>();
 	if (!env.data)
 		throw new Error("取消同步失败");
 	return remember(env.data);

package/templates/src/app/web/system/pages/roles/index.tsx

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { systemPermissionsGet, systemRolesGet } from "../../__client";
 import { isForbidden } from "../errors";
 import { ForbiddenPanel } from "../forbidden";
+import { roleLabel } from "./role-label";
 import { visibleRoles } from "./visible-roles";
 
 type RoleRow = SystemRolesGetData[number];
@@ -41,16 +42,11 @@ export default function RolesPage() {
 		{
 			// R2：solution 角色带 title_key → 按当前语言实时翻译，title（安装期解析文本）兜底；
 			// 内置角色（builtin）的 title 是种子里的站点默认语言文本，按角色名再兜一层 locale；
-			// custom 角色无 key 原样显示 title（对齐下方权限点 title_key 的渲染先例）
+			// custom 角色无 key 原样显示 title（对齐下方权限点 title_key 的渲染先例）。
+			// 渲染口径与成员资格页共用 roleLabel（pages/roles/role-label.ts），改一处两处生效。
 			title: t("system:rolesPage.columns.title"),
 			dataIndex: "title",
-			render: (_: string, row: RoleRow) => {
-				if (row.title_key)
-					return t(row.title_key, { defaultValue: row.title ?? "" });
-				return row.builtin
-					? t(`system:rolesPage.roleTitle.${row.name}`, { defaultValue: row.title ?? row.name })
-					: row.title;
-			},
+			render: (_: string, row: RoleRow) => roleLabel(row, t),
 		},
 		{ title: t("system:rolesPage.holders"), dataIndex: "holders" },
 		{

package/templates/src/app/web/system/pages/roles/role-label.ts

@@ -0,0 +1,26 @@
+/**
+ * 角色语言名解析（纯函数）：角色页（roles/index.tsx R2 先例）与成员资格页
+ * （users/roles.tsx）共用的显示名口径，BDD 用例见 cli __tests__/users-roles-display.test.ts。
+ *
+ * 回退链（与角色页表格列渲染逐字一致）：
+ *   title_key（solution 角色，跨模块 namespace）→ t 译文，缺译文回退 title；
+ *   内置角色（builtin）→ `system:rolesPage.roleTitle.<name>` locale 键，缺键回退 title → name；
+ *   custom 角色 → 原样 title，title 空回退 name。
+ */
+export interface RoleLabelRow {
+	name: string
+	title: string | null
+	title_key: string | null
+	builtin: boolean
+}
+
+/** i18next t 的最小消费面（TFunction 兼容此签名） */
+type Translate = (key: string, options?: { defaultValue?: string }) => string;
+
+export function roleLabel(row: RoleLabelRow, t: Translate): string {
+	if (row.title_key)
+		return t(row.title_key, { defaultValue: row.title ?? "" });
+	return row.builtin
+		? t(`system:rolesPage.roleTitle.${row.name}`, { defaultValue: row.title ?? row.name })
+		: (row.title ?? row.name);
+}

package/templates/src/app/web/system/pages/solutions/index.tsx

@@ -0,0 +1,110 @@
+import type { SolutionsRow, TaskLike } from "./market-entry";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { App, Button, Card, Progress, Result, Space, Tag } from "antd";
+import { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { Link } from "react-router";
+import { ojMarketIndexGet, ojMarketInstallPost, ojMarketTaskGet } from "../../../../../oj-market/web/__client";
+import { explainError, isForbidden } from "../errors";
+import { ForbiddenPanel } from "../forbidden";
+import { marketEntryOf, taskOutcomeOf } from "./market-entry";
+
+/**
+ * 方案安装入口（Phase B T3，superadmin）：市场 UI 出厂未装（纯 web 方案包），
+ * 首装经此页走既有平台编排面 POST /api/oj-market/install（api 随脚手架内置，R29）。
+ * 状态推导与任务终态映射见 ./market-entry（纯函数，tests/solutions-entry.spec 钉）。
+ */
+export default function SolutionsPage() {
+	const { t } = useTranslation();
+	const { message } = App.useApp();
+	const queryClient = useQueryClient();
+	const [taskId, setTaskId] = useState<string | null>(null);
+
+	const query = useQuery({
+		queryKey: ["system", "solutions"],
+		// size 上限 200（生成契约 max）；首方目录规模小，翻页边角不在本页处理
+		queryFn: () => ojMarketIndexGet({ page: 1, size: 200 }),
+	});
+	const entry = marketEntryOf((query.data?.list ?? []) as unknown as SolutionsRow[]);
+
+	const taskQuery = useQuery({
+		queryKey: ["system", "solutions-task", taskId],
+		enabled: taskId !== null,
+		refetchInterval: q => (q.state.data && taskOutcomeOf(q.state.data as unknown as TaskLike).kind !== "running" ? false : 800),
+		queryFn: () => ojMarketTaskGet({ id: taskId! }),
+	});
+	const outcome = taskQuery.data ? taskOutcomeOf(taskQuery.data as unknown as TaskLike) : null;
+
+	// 终态后刷新目录行：安装完成 → 卡片翻「已装」态（含取消/失败也刷，状态以服务端为准）
+	useEffect(() => {
+		if (outcome !== null && outcome.kind !== "running")
+			void queryClient.invalidateQueries({ queryKey: ["system", "solutions"] });
+	}, [outcome, queryClient]);
+
+	const installMut = useMutation({
+		mutationFn: () => ojMarketInstallPost({ source: "cdn", name: "oj-market" }),
+		onSuccess: r => setTaskId(r.task_id ?? null),
+		onError: e => message.error(explainError(e, t)),
+	});
+
+	if (query.error && isForbidden(query.error))
+		return <ForbiddenPanel t={t} error={query.error} />;
+
+	if (entry.kind === "absent") {
+		return (
+			<Result
+				status="warning"
+				title={t("system:solutionsPage.absentTitle")}
+				subTitle={t("system:solutionsPage.absentHint")}
+				style={{ paddingTop: 48 }}
+			/>
+		);
+	}
+
+	return (
+		<Space direction="vertical" style={{ width: "100%", paddingTop: 16 }}>
+			<Card title={t("system:solutionsPage.title")}>
+				<Space direction="vertical" style={{ width: "100%" }}>
+					<Space wrap>
+						<Tag color="blue">oj-market</Tag>
+						{entry.kind === "installable" && <Tag>{t("system:solutionsPage.latest", { version: entry.latest })}</Tag>}
+						{entry.kind === "installed" && <Tag color="green">{t("system:solutionsPage.installed", { version: entry.installed })}</Tag>}
+						{entry.kind === "installed" && entry.latest !== null && entry.latest !== entry.installed && (
+							<Tag color="orange">{t("system:solutionsPage.latest", { version: entry.latest })}</Tag>
+						)}
+					</Space>
+					{entry.kind === "installable" && outcome?.kind !== "done" && (
+						<>
+							<Button type="primary" loading={installMut.isPending || outcome?.kind === "running"} onClick={() => installMut.mutate()}>
+								{t("system:solutionsPage.install")}
+							</Button>
+							{outcome?.kind === "running" && (
+								<>
+									<Progress percent={outcome.progress} size="small" style={{ maxWidth: 480 }} />
+									<span>{outcome.message}</span>
+								</>
+							)}
+							{outcome?.kind === "failed" && <span style={{ color: "#cf1322" }}>{outcome.message}</span>}
+							{outcome?.kind === "needsTrust" && <span style={{ color: "#d48806" }}>{t("system:solutionsPage.needsTrust")}</span>}
+						</>
+					)}
+					{outcome?.kind === "done" && (
+						<Result
+							status="success"
+							title={t("system:solutionsPage.doneTitle")}
+							extra={<Link to="/oj-market"><Button type="primary">{t("system:solutionsPage.goMarket")}</Button></Link>}
+							style={{ padding: "16px 0" }}
+						/>
+					)}
+					{entry.kind === "installed" && (
+						<Space>
+							<Link to="/oj-market"><Button type="primary">{t("system:solutionsPage.goMarket")}</Button></Link>
+							{entry.upgradable && <span>{t("system:solutionsPage.upgradableHint")}</span>}
+						</Space>
+					)}
+				</Space>
+			</Card>
+		</Space>
+	);
+}