@oj-module/cli 0.2.53 → 0.2.56

package/templates/src/{system/web → app/web/system}/pages/wecom/index.tsx

@@ -191,7 +191,7 @@ export default function WecomAdminPage() {
 		queryKey: ["system", "wecom-tenant-admin", corps.map(c => c.corpId).join(",")],
 		queryFn: async () => {
 			const out: Record<string, TenantAdminState> = {};
-			await Promise.all(corps.map(async c => {
+			await Promise.all(corps.map(async (c) => {
 				out[c.corpId] = await fetchTenantAdmin(c.corpId);
 			}));
 			return out;
@@ -244,7 +244,13 @@ export default function WecomAdminPage() {
 			title: t("system:wecom.tenantAdmin.action"),
 			key: "action",
 			render: (_: unknown, row: { corpId: string, name: string | null }) => (
-				<Button size="small" onClick={() => { setResetTarget(row); setResetPwd(""); }}>
+				<Button
+					size="small"
+					onClick={() => {
+						setResetTarget(row);
+						setResetPwd("");
+					}}
+				>
 					{t("system:wecom.tenantAdmin.reset")}
 				</Button>
 			),
@@ -433,7 +439,10 @@ export default function WecomAdminPage() {
 			<Modal
 				open={resetTarget != null}
 				title={t("system:wecom.tenantAdmin.resetTitle")}
-				onCancel={() => { setResetTarget(null); setResetPwd(""); }}
+				onCancel={() => {
+					setResetTarget(null);
+					setResetPwd("");
+				}}
 				onOk={() => resetMut.mutate({ corpId: resetTarget!.corpId, password: resetPwd })}
 				confirmLoading={resetMut.isPending}
 				okButtonProps={{ disabled: resetPwd.length < 6 }}

package/templates/src/{system/web/entry.ts → app/web/system/routes.ts}

@@ -1,11 +1,10 @@
-import type { AppRouteRecordRaw } from "@oj-module/runtime";
+import type { AppRouteRecordRaw, ModuleContext } from "@oj-module/runtime";
 
 import { SettingOutlined } from "@ant-design/icons";
-import { defineModule } from "@oj-module/runtime";
 
 import { createElement, lazy } from "react";
 
-import { createSystemClient } from "./__client/api";
+import { createSystemClient } from "./__client";
 
 const Users = lazy(() => import("./pages/users"));
 const UserRoles = lazy(() => import("./pages/users/roles"));
@@ -16,7 +15,24 @@ const Settings = lazy(() => import("./pages/settings"));
 const LoginMethods = lazy(() => import("./pages/login-methods"));
 const WecomAdmin = lazy(() => import("./pages/wecom"));
 
-const routes: AppRouteRecordRaw[] = [
+/**
+ * `/system` 根的角色门禁（对齐后端 assertSystemAdmin，access.ts:87）——
+ * superadmin **或** admin 均可，两者必须同时保留：D12（2026-10-22）起账号名=角色名，
+ * admin 与 superadmin 是两个独立账号（seed.sql），只留 ["admin"] 会把 superadmin
+ * 挡在门外（注册期过滤 → 路由消失 → 登录后 404 兜底）。改这两个值前先跑
+ * tests/system-guard.regression.spec.ts。
+ */
+const SYSTEM_ROLES = ["admin", "superadmin"];
+
+/**
+ * 系统管理根 `/system`：框架管理面（用户/成员资格/角色权限/操作日志/站点设置/登录方式），
+ * 数据源为 oj 后端 /api/system/*（模板 api 模块）。__client 由 `ojm api` 生成。
+ *
+ * 路由级门禁（B16）挂在根上：非系统管理员整棵子树不注入、菜单不可见（等价于原先的
+ * 模块级 requiredRoles——聚合后模块级会把 /home 一起挡掉，故必须下移到根路由）；
+ * API 级 403 由 assertSystemAdmin + service 层硬 enforcement 兜底。
+ */
+export const routes: AppRouteRecordRaw[] = [
 	{
 		path: "/system",
 		handle: {
@@ -25,6 +41,7 @@ const routes: AppRouteRecordRaw[] = [
 			// 负 order = 底部固定区：系统管理 pin 在侧边栏底部（2026-10-20 序轴约定）
 			order: -100,
 			layout: "container",
+			roles: SYSTEM_ROLES,
 		},
 		children: [
 			{
@@ -74,35 +91,7 @@ const routes: AppRouteRecordRaw[] = [
 	},
 ];
 
-/**
- * system 模块：框架管理面（用户/成员资格/角色权限/操作日志/站点设置/登录方式），
- * 数据源为 oj 后端 /api/system/*（模板 api 模块）。__client 不随模板分发——
- * init 后 `oj openapi -o openapi.json` + `ojm api` 生成（生成前本文件 ts 报红属预期，
- * devkit manual §2.2）。
- */
-export default defineModule({
-	name: "system",
-	description: "系统管理模块（框架管理面）",
-	version: "0.1.0",
-	peerRuntime: ">=0.0.0",
-	// 路由级门禁（B16）：非系统管理员不注入 /system 路由、菜单不可见；
-	// API 级 403 由 assertSystemAdmin + service 层硬 enforcement 兜底。
-	// 角色口径对齐后端 assertSystemAdmin（access.ts:87）——superadmin **或**
-	// admin 均可，两者必须同时保留：D12（2026-10-22）起账号名=角色名，admin 与
-	// superadmin 是两个独立账号（seed.sql），只留 ["admin"] 会把 superadmin 挡在
-	// 门外（注册期过滤 → 路由消失 → 登录后 404 兜底）。改这两个值前先跑
-	// tests/system-guard.regression.spec.ts（只留 ["admin"] 会立刻变红）。
-	config: { requiredRoles: ["admin", "superadmin"] },
-	routes,
-	i18n: {
-		"zh-CN": () => import("./locales/zh-CN.json"),
-		"en-US": () => import("./locales/en-US.json"),
-	},
-	lifecycle: {
-		async onInit(ctx) {
-			// 构造即接线：登记 /system 前缀 + 绑定 scoped request（D11 前缀收敛），
-			// 页面直接 import 生成的端点函数（模块级单槽 req 已由本调用绑定）。
-			createSystemClient(ctx);
-		},
-	},
-});
+/** 构造即接线：登记 /system 前缀 + 绑定 scoped request（D11 前缀收敛）。 */
+export async function onInit(ctx: ModuleContext) {
+	createSystemClient(ctx);
+}

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

@@ -0,0 +1,36 @@
+/* eslint-disable */
+// 生成物：ojm api 从契约生成，勿手改（改动请改契约文件后重跑 ojm api）
+// AC-D15：仅供 DEV 校验动态 import，生产构建不进产物
+import { z } from "@oj-module/runtime";
+
+export const schemas = {
+	"webGetAsyncRoutesGet": {
+		data: z.array(z.object({
+	"path": z.string().optional(),
+	"component": z.string().optional(),
+	"children": z.array(z.object({
+
+})).optional()
+})),
+	},
+	"webHelloGet": {
+		data: z.object({
+	"message": z.string(),
+	"user": z.number().nullable()
+}),
+	},
+	"webUserInfoGet": {
+		data: z.object({
+	"id": z.string(),
+	"avatar": z.string(),
+	"username": z.string(),
+	"displayName": z.string(),
+	"email": z.string(),
+	"phoneNumber": z.string(),
+	"description": z.string(),
+	"roles": z.array(z.string()),
+	"mustChange": z.boolean(),
+	"permissions": z.array(z.string())
+}),
+	},
+};

package/templates/src/{web/web/__client/api.ts → app/web/web/__client/index.ts}

@@ -17,6 +17,9 @@ export const API_PREFIX = "/web";
 /** 认领身份前缀（契约 apiPrefix，字面等于模块目录名）：跨模块认领护栏对比基准 */
 export const MODULE_PREFIX = "/web";
 
+/** 认领方模块（web.config clientOwners 指定）：跨模块认领护栏对比基准 */
+export const MODULE_OWNER = "/app";
+
 /**
  * 模块 entry 的 onInit 里一行创建（构造即 install）：完成 apiPrefix 登记 +
  * scoped request 绑定，返回绑好前缀的端点函数集合。一模块一 client；
@@ -28,8 +31,8 @@ export function createWebClient(ctx: ModuleContext) {
 	// 单槽、卸载互相耦合；跨模块需求应由本模块创建后经 provider 暴露。
 	// 注意对比基准是 MODULE_PREFIX（目录名）而非 API_PREFIX——D-M8 映射时线上前缀
 	// 属于别的命名空间，认领身份仍按目录名。
-	if (import.meta.env.DEV && ctx.module.name !== MODULE_PREFIX.slice(1)) {
-		console.warn(`[ojm-api] 模块 "${ctx.module.name}" 正在认领 ${MODULE_PREFIX} 的 client——跨模块认领会共享 request 单槽、卸载互相耦合；应由 "${MODULE_PREFIX.slice(1)}" 模块在自身 onInit 创建，跨模块需求经 provider 暴露。`);
+	if (import.meta.env.DEV && ctx.module.name !== MODULE_OWNER.slice(1)) {
+		console.warn(`[ojm-api] 模块 "${ctx.module.name}" 正在认领 ${MODULE_PREFIX} 的 client——跨模块认领会共享 request 单槽、卸载互相耦合；应由 "${MODULE_OWNER.slice(1)}" 模块在自身 onInit 创建，跨模块需求经 provider 暴露。`);
 	}
 	ctx.register.apiPrefix(API_PREFIX);
 	bindRequest(ctx.utils.request);
@@ -64,14 +67,22 @@ async function toApiError(e: unknown): Promise<unknown> {
 	return e;
 }
 
-export async function webGetAsyncRoutesGet(): Promise<unknown> {
+export type WebGetAsyncRoutesGetData = z.infer<(typeof schemas)["webGetAsyncRoutesGet"]["data"]>;
+
+export async function webGetAsyncRoutesGet(): Promise<WebGetAsyncRoutesGetData> {
 	const client = ensureReq();
 	try {
-		const env = await client.get(`web/get-async-routes`).json<OjEnvelope<unknown>>();
+		const env = await client.get(`web/get-async-routes`).json<OjEnvelope<WebGetAsyncRoutesGetData>>();
 		// 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 unknown;
+		const data = env.data as WebGetAsyncRoutesGetData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["webGetAsyncRoutesGet"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] webGetAsyncRoutesGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -79,14 +90,22 @@ export async function webGetAsyncRoutesGet(): Promise<unknown> {
 	}
 }
 
-export async function webHelloGet(): Promise<unknown> {
+export type WebHelloGetData = z.infer<(typeof schemas)["webHelloGet"]["data"]>;
+
+export async function webHelloGet(): Promise<WebHelloGetData> {
 	const client = ensureReq();
 	try {
-		const env = await client.get(`web/hello`).json<OjEnvelope<unknown>>();
+		const env = await client.get(`web/hello`).json<OjEnvelope<WebHelloGetData>>();
 		// 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 unknown;
+		const data = env.data as WebHelloGetData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["webHelloGet"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] webHelloGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {
@@ -94,14 +113,22 @@ export async function webHelloGet(): Promise<unknown> {
 	}
 }
 
-export async function webUserInfoGet(): Promise<unknown> {
+export type WebUserInfoGetData = z.infer<(typeof schemas)["webUserInfoGet"]["data"]>;
+
+export async function webUserInfoGet(): Promise<WebUserInfoGetData> {
 	const client = ensureReq();
 	try {
-		const env = await client.get(`web/user-info`).json<OjEnvelope<unknown>>();
+		const env = await client.get(`web/user-info`).json<OjEnvelope<WebUserInfoGetData>>();
 		// 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 unknown;
+		const data = env.data as WebUserInfoGetData;
+		if (import.meta.env.DEV) {
+			const { schemas } = await import("./api.schemas");
+			const r = schemas["webUserInfoGet"].data.safeParse(data);
+			if (!r.success)
+				throw new ContractApiError(-1, `[契约违例] webUserInfoGet 响应与契约不符：${r.error.issues.map(i => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ")}`);
+		}
 		return data;
 	}
 	catch (e) {

package/templates/src/oj-market/web/api/defaultClient.ts

@@ -28,7 +28,7 @@ import {
 	platformMarketTrustPost,
 	platformMarketUninstallImpactGet,
 	platformMarketUninstallPost,
-} from "../../../_platform/web/__client/api";
+} from "../../../app/web/_platform/__client";
 
 // 绑定运行时 request 到生成 client 的模块级单槽（生成 client 是静态单例，必须由某处
 // bindRequest；此处兜底确保市场子应用无论挂载顺序都能拿到请求实例）。与 _platform 模块

package/templates/tests/auth-ldap.spec.ts

@@ -4,8 +4,8 @@
 /* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写 */
 import { afterEach, beforeAll, describe, expect, it } from "vitest";
 
-import { esc, firstAttr } from "../src/auth/api/_shared/ldap";
-import { createLdapLogin } from "../src/auth/api/_shared/ldap-login";
+import { esc, firstAttr } from "../src/app/api/auth/_shared/ldap";
+import { createLdapLogin } from "../src/app/api/auth/_shared/ldap-login";
 import { installDb } from "./fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/auth-session.spec.ts

@@ -1,11 +1,11 @@
 // BDD：登录链——B1 登录顺序（D14 统一 401）、B2 首登改密（AC1-27）、B3 refresh 轮换/reuse 检测（AC1-13）、B4 JWT 仅 sub。
 // deps 全注入（Node 侧 crypto 只读不可 stub，设计 §9.1）；fake bcrypt 以 `hashed:<pw>` 为口令哈希约定。
 /* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写 */
-import type { SessionDeps } from "../src/auth/api/_shared/session";
+import type { SessionDeps } from "../src/app/api/auth/_shared/session";
 
 import { afterEach, beforeAll, describe, expect, it } from "vitest";
-import { assertPermission } from "../src/_platform/api/_shared/service/infra/access";
-import { createSession } from "../src/auth/api/_shared/session";
+import { assertPermission } from "../src/app/api/_platform/_shared/service/infra/access";
+import { createSession } from "../src/app/api/auth/_shared/session";
 import { installDb } from "./fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/auth-throttle.spec.ts

@@ -5,7 +5,7 @@
 /* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写 */
 import { afterEach, beforeAll, describe, expect, it } from "vitest";
 
-import { loginBlocked, loginFailed, loginSucceeded, resetLoginThrottle } from "../src/_platform/api/_shared/service/infra/rate";
+import { loginBlocked, loginFailed, loginSucceeded, resetLoginThrottle } from "../src/app/api/_platform/_shared/service/infra/rate";
 import { installDb } from "./fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/fixture.ts

@@ -1,6 +1,6 @@
 // 后端 BDD 夹具：node:sqlite 内存库 + **真实迁移文件**建表，装到 globalThis.db——
 // 与 oj 运行时注入的全局同名同面，service 代码不改一行即可被测。
-// 夹具直接读 src/<模块>/api/migrations/*.sql，与迁移不可能漂移（沿用 oj-wiki 先例）。
+// 夹具直接读 src/app/api/<模块>/migrations/*.sql，与迁移不可能漂移（沿用 oj-wiki 先例）。
 //
 // **构造器垫片（db.table / listTables）**：oj 的构造器是二进制内的 Rust 实现，Node 侧无可复用
 // 模块，故这里按手册契约（oj-api-dev api-manual「查询构造器」）写一层**最小 JS 渲染层**——
@@ -33,6 +33,8 @@ const { join, dirname } = req("node:path");
 const { fileURLToPath } = req("node:url");
 
 const SRC = join(dirname(fileURLToPath(import.meta.url)), "..", "src");
+/** 后端模块根（0.2.55 布局：`src/app/api/<模块>`）；迁移按目录发现，不在夹具里抄模块清单。 */
+const API_ROOT = join(SRC, "app", "api");
 
 export const ADMIN = 1;
 
@@ -465,9 +467,9 @@ function listTables(dbo: any, prefix?: string): string[] {
 /** 建内存库 + 注入全局；返回 DatabaseSync 供用例直插数据/断言。 */
 export function installDb(): any {
 	const dbo = new DatabaseSync(":memory:");
-	// 重放 src 下全部模块的迁移（方言专属文件除外）
-	for (const mod of readdirSync(SRC)) {
-		const dir = join(SRC, mod, "api", "migrations");
+	// 重放 src/app/api 下全部模块的迁移（方言专属文件除外）
+	for (const mod of readdirSync(API_ROOT)) {
+		const dir = join(API_ROOT, mod, "migrations");
 		if (!existsSync(dir))
 			continue;
 		for (const f of readdirSync(dir).filter((f: string) => f.endsWith(".sql") && !/\.(?:mysql|pg)\.sql$/.test(f)).sort())

package/templates/tests/guard.spec.ts

@@ -3,7 +3,7 @@
 // （真实迁移建表 / 运行时全局 db 同面 / 事务往返）——S0 spike 的「一条真实判权 AC + 形态证明」。
 import { beforeAll, describe, expect, it } from "vitest";
 
-import { decideAccess, moduleOf } from "../src/_platform/api/_shared/service/infra/guard";
+import { decideAccess, moduleOf } from "../src/app/api/_platform/_shared/service/infra/guard";
 import { ADMIN, installDb } from "./fixture";
 
 const as = (roles: string[], bindings: Record<string, string[]> = {}) => ({ roles, bindings });

package/templates/tests/lifecycle/atomic-state.spec.ts

@@ -4,14 +4,14 @@
 // 只保证读回自己写出的内容；任何不符格式的字节一律视为损坏 → 空状态，损坏上下文并入
 // 读结果（corruptNote 出口，禁 console——release isolate console 抛 BadResource，Finding A）。
 // fs 依赖经 globalThis.fs 注入（平台 isolate 注入 FsApi；测试注入 node:fs/promises 适配）。
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
 import * as fsp from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { atomicWriteText } from "../../src/_platform/api/_lifecycle/atomic";
-import { createStateStore } from "../../src/_platform/api/_lifecycle/state";
+import { atomicWriteText } from "../../src/app/api/_platform/_lifecycle/atomic";
+import { createStateStore } from "../../src/app/api/_platform/_lifecycle/state";
 
 const g = globalThis as any;
 

package/templates/tests/lifecycle/bootstrap.spec.ts

@@ -5,14 +5,14 @@
 //    与 PEM 私钥块实体（header 后跟 ≥100 字符 base64 体；tasks.ts redact 正则与测试假体
 //    体长 <100 不误伤）双口径扫描。
 // ③ 集成（market-api.spec）：信任库为空 + bootstrapKey 注入 → cdn 安装直达 done 不落 needs_trust。
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
 import * as fsp from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { createTrustStore } from "../../src/_platform/api/_lifecycle/trust";
-import { BOOTSTRAP_KEY, seedBootstrapKey } from "../../src/_platform/api/market/bootstrap";
+import { createTrustStore } from "../../src/app/api/_platform/_lifecycle/trust";
+import { BOOTSTRAP_KEY, seedBootstrapKey } from "../../src/app/api/_platform/market/bootstrap";
 
 const g = globalThis as any;
 

package/templates/tests/lifecycle/deploy-smoke.spec.ts

@@ -8,19 +8,19 @@
 // 快照逐数组 ⊇ 声明，少 = 注册丢失判失败）collect-all 全败齐报。
 // entry 浏览器加载不在安装器验（Node import 必假绿——设计 §4.1），注释钉口径。
 // fetch/sha384/query/reload 面经 ctx 注入 stub（同 steps-fs 范式），fs 为 globalThis.fs 面。
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
-import type { StateStore } from "../../src/_platform/api/_lifecycle/state";
-import type { DeployWebContext, ModuleEntry } from "../../src/_platform/api/_lifecycle/steps/deploy-web";
-import type { ReloadContext, ReloadFace, ReloadResult } from "../../src/_platform/api/_lifecycle/steps/reload";
-import type { SmokeContext } from "../../src/_platform/api/_lifecycle/steps/smoke";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
+import type { StateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import type { DeployWebContext, ModuleEntry } from "../../src/app/api/_platform/_lifecycle/steps/deploy-web";
+import type { ReloadContext, ReloadFace, ReloadResult } from "../../src/app/api/_platform/_lifecycle/steps/reload";
+import type { SmokeContext } from "../../src/app/api/_platform/_lifecycle/steps/smoke";
 import { createHash } from "node:crypto";
 import * as fsp from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { deployWeb, posixPath, upsertModulesJson } from "../../src/_platform/api/_lifecycle/steps/deploy-web";
-import { reloadAndAssert } from "../../src/_platform/api/_lifecycle/steps/reload";
-import { probeUrlOf, smoke } from "../../src/_platform/api/_lifecycle/steps/smoke";
+import { deployWeb, posixPath, upsertModulesJson } from "../../src/app/api/_platform/_lifecycle/steps/deploy-web";
+import { reloadAndAssert } from "../../src/app/api/_platform/_lifecycle/steps/reload";
+import { probeUrlOf, smoke } from "../../src/app/api/_platform/_lifecycle/steps/smoke";
 
 const g = globalThis as any;
 

package/templates/tests/lifecycle/installer.spec.ts

@@ -12,22 +12,22 @@
 // 过期（30min）可接管。setEnabled 四处同写（D12/AC-P1-6）：锁摘除/恢复 + sidecar + route + modules。
 // 步骤面全 stub 注入（DIP）：fetch/exec/tar/reload 不真跑；register/smoke/audit 走真实内存库夹具。
 /* eslint-disable test/prefer-lowercase-title -- 任务/AC 编号是验收锚点，保留大写（register.spec 同约定） */
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
-import type { InstallRequest } from "../../src/_platform/api/_lifecycle/installer";
-import type { StateStore } from "../../src/_platform/api/_lifecycle/state";
-import type { ExecFace } from "../../src/_platform/api/_lifecycle/steps/extract";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
+import type { InstallRequest } from "../../src/app/api/_platform/_lifecycle/installer";
+import type { StateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import type { ExecFace } from "../../src/app/api/_platform/_lifecycle/steps/extract";
 import { createHash } from "node:crypto";
 import * as fsp from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { defaultTestKey, nodeVerifyEd25519, signedArchiveFor } from "../../../src/lifecycle/__tests__/helpers";
-import { atomicWriteText } from "../../src/_platform/api/_lifecycle/atomic";
-import { gcVersions, reconcile, runInstall, setEnabled, STAGES } from "../../src/_platform/api/_lifecycle/installer";
-import { acquireTaskLock, commitLockEntry, parseLock, readLock, serializeLock, writeLock } from "../../src/_platform/api/_lifecycle/lock";
-import { createStateStore } from "../../src/_platform/api/_lifecycle/state";
-import { getTask, readTasks, redact, sweepTimedOut, writeTask } from "../../src/_platform/api/_lifecycle/tasks";
-import { createTrustStore } from "../../src/_platform/api/_lifecycle/trust";
+import { atomicWriteText } from "../../src/app/api/_platform/_lifecycle/atomic";
+import { gcVersions, reconcile, runInstall, setEnabled, STAGES } from "../../src/app/api/_platform/_lifecycle/installer";
+import { acquireTaskLock, commitLockEntry, parseLock, readLock, serializeLock, writeLock } from "../../src/app/api/_platform/_lifecycle/lock";
+import { createStateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import { getTask, readTasks, redact, sweepTimedOut, writeTask } from "../../src/app/api/_platform/_lifecycle/tasks";
+import { createTrustStore } from "../../src/app/api/_platform/_lifecycle/trust";
 import { installDb } from "../fixture";
 
 const g = globalThis as any;

package/templates/tests/lifecycle/market-api.spec.ts

@@ -7,11 +7,11 @@
 // 简报 `task/:id` 段参数形态在模板 http 面无先例（contacts/detail?id= 同款 query 惯例），备案于任务报告。
 // 步骤面全 stub 注入（DIP）：fetch/exec/reload 不真跑；register/smoke/audit 走真实内存库夹具。
 /* eslint-disable test/prefer-lowercase-title -- 端点动词/路径是验收锚点，保留大写（installer.spec 同约定） */
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
-import type { FetchFace } from "../../src/_platform/api/_lifecycle/steps/download";
-import type { ExecFace } from "../../src/_platform/api/_lifecycle/steps/extract";
-import type { ReloadFace } from "../../src/_platform/api/_lifecycle/steps/reload";
-import type { MarketEnv } from "../../src/_platform/api/market/api";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
+import type { FetchFace } from "../../src/app/api/_platform/_lifecycle/steps/download";
+import type { ExecFace } from "../../src/app/api/_platform/_lifecycle/steps/extract";
+import type { ReloadFace } from "../../src/app/api/_platform/_lifecycle/steps/reload";
+import type { MarketEnv } from "../../src/app/api/_platform/market/api";
 import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import * as fsp from "node:fs/promises";
@@ -22,14 +22,14 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { parse } from "yaml";
 import { defaultTestKey, nodeVerifyEd25519, signedArchiveFor } from "../../../src/lifecycle/__tests__/helpers";
 import { signIndex } from "../../../src/publish";
-import { readLock, writeLock } from "../../src/_platform/api/_lifecycle/lock";
-import { compareVersions } from "../../src/_platform/api/_lifecycle/semver";
-import { createStateStore } from "../../src/_platform/api/_lifecycle/state";
-import { getTask, writeTask } from "../../src/_platform/api/_lifecycle/tasks";
-import { createTrustStore } from "../../src/_platform/api/_lifecycle/trust";
-import { invalidateAllUsers } from "../../src/_platform/api/_shared/service/infra/access";
-import { createMarketApi, marketEnv, parseVersionsJson, versionsJsonPathOf } from "../../src/_platform/api/market/api";
-import { localIndexSource } from "../../src/_platform/api/market/index-source";
+import { readLock, writeLock } from "../../src/app/api/_platform/_lifecycle/lock";
+import { compareVersions } from "../../src/app/api/_platform/_lifecycle/semver";
+import { createStateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import { getTask, writeTask } from "../../src/app/api/_platform/_lifecycle/tasks";
+import { createTrustStore } from "../../src/app/api/_platform/_lifecycle/trust";
+import { invalidateAllUsers } from "../../src/app/api/_platform/_shared/service/infra/access";
+import { createMarketApi, marketEnv, parseVersionsJson, versionsJsonPathOf } from "../../src/app/api/_platform/market/api";
+import { localIndexSource } from "../../src/app/api/_platform/market/index-source";
 import { installDb } from "../fixture";
 
 function hexToBytes(hex: string): Uint8Array {
@@ -305,7 +305,7 @@ describe("权限门（R9：市场编排 superadmin 独占，meta 登录即可）
 	it("pair-pin：meta apiVersion === _platform/manifest.yaml version（手工镜像漂移防护，P2-9）", async () => {
 		// API_VERSION（market/api.ts）与 _platform/manifest.yaml version 为手工同步的双真源；
 		// 本测试经 meta 端点间接钉住 API_VERSION，漂移即红（peerPlatform 预检口径失真）。
-		const manifestPath = join(dirname(fileURLToPath(import.meta.url)), "../../src/_platform/api/manifest.yaml");
+		const manifestPath = join(dirname(fileURLToPath(import.meta.url)), "../../src/app/api/_platform/manifest.yaml");
 		const manifestVersion = (parse(readFileSync(manifestPath, "utf8")) as { version: string }).version;
 		const api = createMarketApi(makeEnv());
 		g.http = { user: { id: 1 } };

package/templates/tests/lifecycle/migrate.spec.ts

@@ -7,16 +7,16 @@
 // rollbackGuard 纯函数：目标产物 max seq < 账本 head = 降版部署，禁止（OJ-9/M003 同源红线）；
 // seq 为数值非版本号，直接数值比较（semver.ts 不适用）。
 // exec/fs 面注入 stub（同 steps-fs 范式），不真跑 oj/sqlite。
-import type { FsFace } from "../../src/_platform/api/_lifecycle/atomic";
-import type { StateStore } from "../../src/_platform/api/_lifecycle/state";
-import type { ExecFace } from "../../src/_platform/api/_lifecycle/steps/extract";
-import type { MigrateContext } from "../../src/_platform/api/_lifecycle/steps/migrate";
+import type { FsFace } from "../../src/app/api/_platform/_lifecycle/atomic";
+import type { StateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import type { ExecFace } from "../../src/app/api/_platform/_lifecycle/steps/extract";
+import type { MigrateContext } from "../../src/app/api/_platform/_lifecycle/steps/migrate";
 import * as fsp from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { parseLock } from "../../src/_platform/api/_lifecycle/lock";
-import { buildMigrateCmd, maxAppliedSeq, migrate, migrateSvcDirOf, parseMigrateOutput, rollbackGuard } from "../../src/_platform/api/_lifecycle/steps/migrate";
+import { parseLock } from "../../src/app/api/_platform/_lifecycle/lock";
+import { buildMigrateCmd, maxAppliedSeq, migrate, migrateSvcDirOf, parseMigrateOutput, rollbackGuard } from "../../src/app/api/_platform/_lifecycle/steps/migrate";
 
 const g = globalThis as any;
 const DB_BYTES = new TextEncoder().encode("sqlite-header-bytes\n");

package/templates/tests/lifecycle/preflight.spec.ts

@@ -1,5 +1,5 @@
-import type { SolutionState, StateStore } from "../../src/_platform/api/_lifecycle/state";
-import type { InstallContext } from "../../src/_platform/api/_lifecycle/steps/preflight";
+import type { SolutionState, StateStore } from "../../src/app/api/_platform/_lifecycle/state";
+import type { InstallContext } from "../../src/app/api/_platform/_lifecycle/steps/preflight";
 // BDD：安装预检规则引擎（P1-5，R7/R8/R9/R24，十阶段状态机 stage 1）。
 // 规则真源：docs/prd/solution/202610171254-lifecycle-manifest-contract.md（C2-01~33 安装列）；
 // 期望真源：packages/cli/src/lifecycle/__tests__/fixtures/（fixture-valid 零违规、fixture-invalid 七码齐报）。
@@ -12,7 +12,7 @@ import { fileURLToPath } from "node:url";
 
 import { describe, expect, it } from "vitest";
 import { parse } from "yaml";
-import { preflight } from "../../src/_platform/api/_lifecycle/steps/preflight";
+import { preflight } from "../../src/app/api/_platform/_lifecycle/steps/preflight";
 
 const FIXTURES = join(dirname(fileURLToPath(import.meta.url)), "../../../src/lifecycle/__tests__/fixtures");
 const VALID = parse(readFileSync(join(FIXTURES, "fixture-valid/manifest.yaml"), "utf8")) as any;

package/templates/tests/lifecycle/register.spec.ts

@@ -8,7 +8,7 @@
 /* eslint-disable test/prefer-lowercase-title -- 任务/AC 编号是验收锚点，保留大写（DB/P1-5） */
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 
-import { checkOccupancy, queryAllRegistered, queryRegistered, registerSolution } from "../../src/_platform/api/_lifecycle/steps/register";
+import { checkOccupancy, queryAllRegistered, queryRegistered, registerSolution } from "../../src/app/api/_platform/_lifecycle/steps/register";
 import { installDb } from "../fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/lifecycle/semver.spec.ts

@@ -3,7 +3,7 @@
 // 无 prerelease > 有 prerelease；「1.0」「1.0.0」「1.0.0.0」视为相等（安装器容错口径）。
 import { describe, expect, it } from "vitest";
 
-import { compareVersions } from "../../src/_platform/api/_lifecycle/semver";
+import { compareVersions } from "../../src/app/api/_platform/_lifecycle/semver";
 
 const cases: Array<[a: string, b: string, expected: -1 | 0 | 1]> = [
 	// 主版本数值比较（非字典序）

package/templates/tests/lifecycle/sha384.spec.ts

@@ -4,7 +4,7 @@
 import { Buffer } from "node:buffer";
 import { createHash } from "node:crypto";
 import { describe, expect, it } from "vitest";
-import { bytesToBase64, sha384B64, sha384Bytes } from "../../src/_platform/api/_lifecycle/sha384";
+import { bytesToBase64, sha384B64, sha384Bytes } from "../../src/app/api/_platform/_lifecycle/sha384";
 
 const hex = (bytes: Uint8Array): string => Array.from(bytes, b => b.toString(16).padStart(2, "0")).join("");
 

package/templates/tests/lifecycle/solutions-api.spec.ts

@@ -5,7 +5,7 @@
 /* eslint-disable test/prefer-lowercase-title -- 端点路径是验收锚点 */
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
-import api from "../../src/_platform/api/solutions/api";
+import api from "../../src/app/api/_platform/solutions/api";
 import { installDb } from "../fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/lifecycle/source-seq.spec.ts

@@ -4,7 +4,7 @@
 // 四条负向是 G7 的重点：水位写坏 / 表不存在 / 值非法都必须**拒**，不能静默当「第一次见」——
 // 静默重置等于把「防回放」降级成「每次都当第一次见」，攻击者先破坏状态再回放即可穿透。
 import { beforeEach, describe, expect, it } from "vitest";
-import { guardAndRecordSourceSeq, readSourceSeq, SOURCE_SEQ_TABLE } from "../../src/_platform/api/_lifecycle/source-seq";
+import { guardAndRecordSourceSeq, readSourceSeq, SOURCE_SEQ_TABLE } from "../../src/app/api/_platform/_lifecycle/source-seq";
 import { installDb } from "../fixture";
 
 const SRC = "https://cdn.example.com/solutions";