@oj-module/cli 0.2.68 → 0.2.71

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

@@ -418,6 +418,31 @@ describe("smoke 探活（D14/Q-A：health 不强制）", () => {
 		expect(r.message).toContain("探活");
 		expect(r.message).toContain("404");
 	});
+
+	it("纯 web 方案（无 api 段，routes 均为页面路由）：探活跳过、零探针请求（2026-11-07 实锤）", async () => {
+		// oj-market 0.2.0 重装现场：manifest 无 api 段、routes=[/oj-market]（页面路由），
+		// 旧逻辑把页面路由塞进 api 前缀探 /api/oj-market → 404 → smoke 失败 + 全量补偿回滚
+		// （含 modules.json）→ 重装死循环、市场菜单永久消失。纯 web 包无 api 面可探 = 无事可验视为过。
+		await seedDeployed();
+		const urls: string[] = [];
+		const r = await smoke(smCtx({
+			manifest: solManifest({
+				api: undefined,
+				routes: [{ path: "/oj-market", category: "main", order: 200, title_key: "oj-market:menu.main" }],
+				permissions: undefined,
+				roles: undefined,
+				settings: undefined,
+			}),
+			query: async () => ({ module: "demo-solution", routes: ["/oj-market"], settings: [], roles: [], permissions: [] }),
+			fetch: async (url) => {
+				urls.push(url);
+				return { ok: false, status: 404 };
+			},
+		}));
+		expect(urls).toEqual([]);
+		expect(r.ok).toBe(true);
+		expect(r.message).toContain("纯 web");
+	});
 });
 
 describe("smoke integrity（R10：部署落位后重算 sha384 vs modules.json）", () => {

package/templates/tests/lifecycle/exec-grant.spec.ts

@@ -0,0 +1,38 @@
+// exec 授权守卫（2026-11-07 市场线演练实锤）：
+// oj 的 exec 按「请求模块上下文」逐模块授权（oj-bin bridge/exec.rs per_module）——
+// 安装器在端点请求内同步跑（解压 tar / oj migrate 都要 exec），所以编排面落在
+// 哪个 api 模块，哪个模块就必须持有与 _platform 完全一致的 allow 清单。
+// Phase B 把市场编排面放在 src/oj-market/api（模块上下文 = oj-market），
+// 而 config 只授权了 _platform → 真机上首装/收敛全部 NotCapable
+// 「module 'oj-market' is not authorized for exec」（单测全注入 exec，绕过了授权层，
+// 演练才暴露）。本守卫钉住：两模块授权同集合同命令、逐字一致。
+
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import { parse } from "yaml";
+
+const configPath = path.join(path.dirname(fileURLToPath(import.meta.url)), "../../config.yaml");
+
+interface ExecGrant { allow?: string[] }
+
+function execGrants(): Record<string, ExecGrant> {
+	const doc = parse(readFileSync(configPath, "utf8")) as { platform?: { exec?: Record<string, ExecGrant> } };
+	return doc.platform?.exec ?? {};
+}
+
+describe("platform.exec 逐模块授权", () => {
+	it("编排模块 oj-market 与 _platform 同集合同命令（逐字一致）", () => {
+		const grants = execGrants();
+		expect(Object.keys(grants).sort()).toEqual(["_platform", "oj-market"]);
+		expect(grants["oj-market"]?.allow).toEqual(grants._platform?.allow);
+		expect(grants._platform?.allow?.length).toBeGreaterThan(0);
+	});
+
+	it("编排模块 oj-market 具 platform 特权（安装器 reloadConfig/信任库写面；迁移自 _platform 编排端点）", () => {
+		const doc = parse(readFileSync(configPath, "utf8")) as { platform?: { modules?: string[] } };
+		expect(doc.platform?.modules).toContain("_platform");
+		expect(doc.platform?.modules).toContain("oj-market");
+	});
+});

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

@@ -259,6 +259,42 @@ describe("runInstall 全绿路径（步骤 stub，register/smoke/audit 走真实
 		expect(await getTask(taskDir, "nope")).toBeNull();
 	});
 
+	it("web-only 方案包（无 api 段，extracting C2-31 放行面）：lock_commit 整体归位版本目录后，deploying_web 改从版本目录取 web 树 → done（2026-11-07 市场线演练实锤：staging 被 rename 后部署段读空）", async () => {
+		const m = manifestFixture("0.2.0");
+		delete m.api;
+		m.web = { entry: "modules/demo-solution/0.2.0/entry.js" };
+		m.archive = { file: "demo-solution-0.2.0.tgz", sha256: SHA256, size: ARCHIVE.byteLength, signature: signedArchiveFor(ARCHIVE, "demo-solution", "0.2.0", { keyPair: TEST_KEY }).sig };
+		// exec stub：web-only 产物树（单根 + 无 api/ 目录——lock_commit 回退「整体 rename」形态，
+		// 版本目录 = 包内容；web 树随之离开 staging）
+		const exec: ExecFace = {
+			run: async (argv) => {
+				if (argv[0] === "tar" && argv[1] === "-tvzf")
+					return { code: 0, stdout: "demo-solution-0.2.0/manifest.yaml\ndemo-solution-0.2.0/web/modules/demo-solution/0.2.0/entry.js\n", stderr: "" };
+				if (argv[0] === "tar" && argv[1] === "-xzf") {
+					const dest = argv[4]!;
+					const dir = join(dest, "demo-solution-0.2.0", "web", "modules", "demo-solution", "0.2.0");
+					await fsp.mkdir(dir, { recursive: true });
+					await fsp.writeFile(join(dir, "entry.js"), ENTRY);
+					await fsp.writeFile(join(dest, "demo-solution-0.2.0", "manifest.yaml"), new TextEncoder().encode(JSON.stringify(m)));
+					return { code: 0, stdout: "", stderr: "" };
+				}
+				return { code: 0, stdout: "", stderr: "" };
+			},
+		};
+		const t = await runInstall(makeReq({ manifest: m, version: "0.2.0", exec }));
+		expect(t.status).toBe("done");
+		expect(t.stages.find(s => s.stage === "deploying_web")?.ok).toBe(true);
+		// web 树落站点产物根 + 清单 upsert（integrity 为包内容重算值，R10）
+		await fsp.access(join(siteModulesDir, "demo-solution", "0.2.0", "entry.js"));
+		const list = JSON.parse(await fsp.readFile(modulesJsonPath, "utf8")) as any[];
+		expect(list[0]).toMatchObject({ name: "demo-solution", entry: "modules/demo-solution/0.2.0/entry.js", integrity: `sha384-${sha384b64(ENTRY)}` });
+		// web-only 包 api 锁零变更：锁是 oj 装配真源（原生七键清单），写锁会让 oj 按 C2 清单装配
+		// （reload 400）并遮蔽同名内建模块（2026-11-07 演练实锤：双轨同名 oj-market 锁遮蔽编排面）。
+		// 版本目录仍归位（回滚素材/审计形态），生效面 = modules.json upsert + 注册 + sidecar。
+		expect(parseLock(await fsp.readFile(lockPath, "utf8").catch(() => ""))).toEqual({});
+		await fsp.access(join(sharedRoot, "demo-solution-0.2.0", "manifest.yaml"));
+	});
+
 	it("preview 形态：派生 .ojm-preview.yaml 存在时两份 config 一起接线（否则 reload 恒 unchanged）", async () => {
 		// ojm preview 派生出来的那份才是服务端在读的 config（spa 挂载 + platform.root 改写）
 		const derived = join(root, ".ojm-preview.yaml");