create-windy 0.3.6 → 0.3.8

package/dist/cli.js

@@ -2767,6 +2767,34 @@ function isDirectoryNotRemovable(error) {
 // src/workspace-membership.ts
 import { readdir as readdir2 } from "fs/promises";
 import { join as join5 } from "path";
+function deriveFinalWorkspaceMembership(current, target, files) {
+  const membersByBase = new Map;
+  for (const expectation of [...current, ...target]) {
+    if (!membersByBase.has(expectation.base)) {
+      membersByBase.set(expectation.base, new Set);
+    }
+  }
+  for (const expectation of current) {
+    const members = membersByBase.get(expectation.base);
+    for (const path of expectation.members)
+      members.add(path);
+  }
+  for (const file of files) {
+    for (const [base, members] of membersByBase) {
+      if (!isDirectWorkspaceManifest(base, file.path))
+        continue;
+      if (file.action === "delete")
+        members.delete(file.path);
+      if (file.action === "create" || file.action === "update") {
+        members.add(file.path);
+      }
+    }
+  }
+  return [...membersByBase].sort(([left], [right]) => left.localeCompare(right)).map(([base, members]) => ({
+    base,
+    members: [...members].sort((left, right) => left.localeCompare(right))
+  }));
+}
 async function snapshotWorkspaceBase(root, base) {
   assertSafeWorkspaceBase(base);
   await inspectSafePath(root, base);
@@ -2808,6 +2836,14 @@ function assertSafeWorkspaceBase(base) {
     throw new Error(`workspace \u4E0D\u5F97\u904D\u5386 node_modules\uFF1A${base}`);
   }
 }
+function isDirectWorkspaceManifest(base, path) {
+  const prefix = `${base}/`;
+  if (!path.startsWith(prefix))
+    return false;
+  const relative3 = path.slice(prefix.length);
+  const segments = relative3.split("/");
+  return segments.length === 2 && segments[0]?.length > 0 && segments[1] === "package.json";
+}
 function isMissing(error) {
   return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
@@ -8687,7 +8723,7 @@ function conflict(path2, reason, expectedProjectContent) {
 }
 
 // src/update/planner-file.ts
-async function planFile(path2, baseRoot, targetRoot, source, target, ours, provenance, targetContentOverride, manageGeneratedProjectOwned = false) {
+async function planFile(path2, baseRoot, targetRoot, source, target, ours, provenance, targetContentOverride, manageGeneratedProjectOwned = false, forcePlatformBaseline = false) {
   const [base, theirs] = await Promise.all([
     readOptional(join19(baseRoot, path2)),
     targetContentOverride ? Promise.resolve(targetContentOverride) : readOptional(join19(targetRoot, path2))
@@ -8698,7 +8734,7 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
     if (manageGeneratedProjectOwned) {
       return planGeneratedProjectOwned(path2, source, target, ours, theirs, expected);
     }
-    return !source && !ours && theirs ? readyPlannedFile(path2, ownership, "create", "\u65B0\u589E\u9879\u76EE\u6269\u5C55\u70B9", expected, theirs) : readyPlannedFile(path2, ownership, "preserve", "\u9879\u76EE\u62E5\u6709\uFF0CWindy \u4E0D\u8986\u76D6", expected);
+    return !source && !ours && theirs ? readyPlannedFile(path2, ownership, "create", "\u65B0\u589E\u9879\u76EE\u6269\u5C55\u70B9", expected, theirs) : readyPlannedFile(path2, ownership, "preserve", "\u9ED8\u8BA4\u4FDD\u7559\u9879\u76EE\u7248\u672C", expected);
   }
   const repaired = ours && theirs ? repairKnownDerivedFile({
     path: path2,
@@ -8736,6 +8772,14 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   const oursChanged = hashContent(ours) !== source.hash;
   const sourceArtifactHash = artifactHashOf(source);
   const targetChanged = targetChangedSinceBase(sourceArtifactHash, base, theirs);
+  if (shouldForcePlatformBaseline({
+    forcePlatformBaseline,
+    oursChanged,
+    sourceArtifactHash,
+    base
+  })) {
+    return readyPlannedFile(path2, ownership, "update", "\u5F3A\u5236\u91C7\u7528\u76EE\u6807\u5E73\u53F0\u57FA\u7EBF", expected, theirs);
+  }
   if (!oursChanged && !targetChanged) {
     return readyPlannedFile(path2, ownership, "preserve", "\u53CC\u65B9\u672A\u4FEE\u6539", expected);
   }
@@ -8752,12 +8796,15 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
     const merged = mergePackageJson(base, ours, theirs);
     return merged.content ? readyPlannedFile(path2, ownership, "update", "package.json \u5B57\u6BB5\u7EA7\u5408\u5E76", expected, merged.content) : conflict2(path2, ownership, `\u5B57\u6BB5\u51B2\u7A81\uFF1A${merged.conflicts.join("\u3001")}`, expected);
   }
-  if (ownership === "shared-scaffold" && base) {
+  if (base) {
     const merged = await mergeTextFile(base, ours, theirs);
     return merged.content ? readyPlannedFile(path2, ownership, "update", "\u4E09\u65B9\u5408\u5E76", expected, merged.content) : conflict2(path2, ownership, merged.conflict || "\u4E09\u65B9\u5408\u5E76\u5931\u8D25", expected);
   }
   return conflict2(path2, ownership, "\u5BA2\u6237\u548C Windy \u5747\u5DF2\u4FEE\u6539", expected);
 }
+function shouldForcePlatformBaseline(input) {
+  return input.forcePlatformBaseline && !input.oursChanged && input.base !== undefined && hashContent(input.base) !== input.sourceArtifactHash;
+}
 function targetChangedSinceBase(sourceHash, base, target) {
   return base && target ? hashContent(base) !== hashContent(target) : !!target && hashContent(target) !== sourceHash;
 }
@@ -8959,7 +9006,9 @@ var recipes = [
   { id: "starter-0.3.2-to-0.3.3", from: "0.3.2", to: "0.3.3" },
   { id: "starter-0.3.3-to-0.3.4", from: "0.3.3", to: "0.3.4" },
   { id: "starter-0.3.4-to-0.3.5", from: "0.3.4", to: "0.3.5" },
-  { id: "starter-0.3.5-to-0.3.6", from: "0.3.5", to: "0.3.6" }
+  { id: "starter-0.3.5-to-0.3.6", from: "0.3.5", to: "0.3.6" },
+  { id: "starter-0.3.6-to-0.3.7", from: "0.3.6", to: "0.3.7" },
+  { id: "starter-0.3.7-to-0.3.8", from: "0.3.7", to: "0.3.8" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)
@@ -9054,7 +9103,8 @@ async function createUpdatePlan(request, artifacts) {
     migrations,
     artifactSet,
     provenance,
-    manageGeneratedProjectOwned: request.targetModules !== undefined
+    manageGeneratedProjectOwned: request.targetModules !== undefined,
+    forcePlatformBaseline: request.forcePlatformBaseline === true
   });
   deriveWebDockerfilePlan(files, projectSnapshots, new Set([...paths, ...workspaceSnapshot.manifests.keys()]));
   for (const file of files) {
@@ -9105,7 +9155,7 @@ async function createUpdatePlan(request, artifacts) {
     files,
     dependencyExpectations,
     workspaceMembershipExpectations: workspaceSnapshot.membershipExpectations,
-    finalWorkspaceMembershipExpectations: targetWorkspaceSnapshot.membershipExpectations,
+    finalWorkspaceMembershipExpectations: deriveFinalWorkspaceMembership(workspaceSnapshot.membershipExpectations, targetWorkspaceSnapshot.membershipExpectations, files),
     conflicts,
     detachedToolchain,
     targetProvenance,
@@ -9141,7 +9191,7 @@ async function planFiles(input) {
     } else if (forcedContent) {
       files.push(readyPlannedFile(path2, input.targetEntries.get(path2)?.ownership ?? input.sourceEntries.get(path2)?.ownership ?? classifyOwnership(path2), "update", "\u5408\u5E76\u5E73\u53F0\u4E0E\u4E0B\u6E38 migration \u5386\u53F2", expected, forcedContent));
     } else {
-      files.push(await planFile(path2, input.artifactSet.baseDirectory, input.artifactSet.targetDirectory, input.sourceEntries.get(path2), input.targetEntries.get(path2), ours, input.provenance, input.migrations.contentOverrides.get(path2), input.manageGeneratedProjectOwned));
+      files.push(await planFile(path2, input.artifactSet.baseDirectory, input.artifactSet.targetDirectory, input.sourceEntries.get(path2), input.targetEntries.get(path2), ours, input.provenance, input.migrations.contentOverrides.get(path2), input.manageGeneratedProjectOwned, input.forcePlatformBaseline));
     }
   }
   return files;
@@ -10702,7 +10752,11 @@ async function runUpdate(args, projectDirectory) {
     return;
   }
   const updater = new DefaultStarterUpdater;
-  const plan = await updater.plan({ projectDirectory, targetVersion: target });
+  const plan = await updater.plan({
+    projectDirectory,
+    targetVersion: target,
+    forcePlatformBaseline: args.includes("--force")
+  });
   printPlan(plan);
   if (args.includes("--dry-run")) {
     await rm11(plan.temporaryRoot, { recursive: true, force: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "5be88a688b54b87cf58a753535efb875ee3058e4",
-  "generatorVersion": "0.3.6",
+  "templateCommit": "25260c844c95d14d4ac3ccae6e7553dbde2fd9c6",
+  "generatorVersion": "0.3.8",
   "modules": [
     {
       "name": "system",

package/template/AGENTS.md

@@ -31,26 +31,30 @@
 - 这是 Starter 的初始配置；项目所有者可按团队需要保留、替换或扩展。
 - 实际可用命令和提交检查以当前项目的 `package.json` 与 Git hooks 为准。
 
-## Windy 升级边界
+## Windy 升级策略
 
-- 业务需求优先通过自有模块和既有扩展点实现，尽量不要直接修改 Windy 提供的平台核心、
-  Composition Root、共享脚手架和根工具链配置，以减少后续升级冲突。
-- 修改前先查看 `.windy/files.json` 的 ownership；优先扩展 `project-owned` 路径，
-  对 `windy-managed` 路径仅在没有可用扩展点时做最小改动。
-- 确需修改 Windy 受管代码时，使用独立小提交记录原因和影响；升级前先运行
+- 除 `node_modules` 等依赖产物外，生成到仓库中的源码都归项目所有者所有，可以按需
+  修改、替换或删除。`.windy/files.json` 的 ownership 是兼容字段名，只表示 updater
+  的默认合并策略和冲突风险，不是源码权限控制。
+- 业务需求优先通过自有模块和既有扩展点实现；直接修改平台核心、Composition Root、
+  共享脚手架或根工具链同样受支持，但通常会增加后续三方合并成本。
+- 修改前可查看 ownership 评估升级风险；优先扩展 `project-owned` 路径，对
+  `windy-managed` 路径建议保持改动小而清晰。
+- 直接修改 Windy 基线代码时，使用独立小提交记录原因和影响；升级前先运行
   `bun run windy update --dry-run`，根据三方合并计划处理冲突。
 - 完整定制登录页时，在 project-owned 的
-  `apps/web/src/app/auth/login-page.ts` 注册业务组件；不要修改
-  `apps/web/src/pages/auth/LoginPage.vue` 或 Router。业务页面复用
+  `apps/web/src/app/auth/login-page.ts` 注册业务组件可获得最低升级成本。若直接修改
+  `apps/web/src/pages/auth/LoginPage.vue` 或 Router，升级器会尝试三方合并。业务页面复用
   `useLoginFlow`、`DevelopmentAuthWarning` 和平台品牌设置，保留安全
   `returnTo`、真实认证与开发认证提示。
-- 定制 404、500、维护中或网络异常页时，只修改 project-owned 的
+- 定制 404、500、维护中或网络异常页时，优先修改 project-owned 的
   `apps/web/src/app/error-pages.ts`，并把业务 SFC 放在 `apps/web/src/app/`；
-  保留四个类型化注册项，不要为换视觉修改 Router、HTTP 核心或平台默认错误页。
+  直接修改 Router、HTTP 核心或平台默认错误页时会增加三方合并成本。
 - 新增业务管理页面时，在业务 Module Manifest 注册 Feature、Permission、菜单和
   Admin Route，再把 Vue 页面绑定到 project-owned 的
-  `apps/web/src/app/business-routes.ts`；不要修改 Router 或 AppSidebar。导航来自
-  服务端 Manifest 快照，接入见 `docs/development/business-web-routes.md`。
+  `apps/web/src/app/business-routes.ts` 是推荐接入方式。直接修改 Router 或 AppSidebar
+  时同样按 Base/Ours/Theirs 合并。导航来自服务端 Manifest 快照，接入见
+  `docs/development/business-web-routes.md`。
 - 业务 Agent Operation 开启 Provider 出网时，必须在 Manifest 同时声明最小
   `providerDataPolicy.inputFields` JSON Pointer allowlist 与
   `envelopeFields`；raw input 会在进入 `prepare` 前裁剪并执行 DLP。接入与升级

package/template/docs/development/custom-error-pages.md

@@ -9,8 +9,9 @@ apps/web/src/app/error-pages.ts
 
 该文件在 `.windy/files.json` 中属于 `project-owned`。Windy 升级会给尚无此文件的
 项目创建默认选择器；文件存在后，后续更新只保留业务选择。平台默认页面
-`apps/web/src/pages/errors/PlatformErrorPage.vue` 属于 `windy-managed`，Router 和
-全局错误导航属于 `shared-scaffold`，业务项目不应为换视觉而修改这些文件。
+`apps/web/src/pages/errors/PlatformErrorPage.vue` 标记为 `windy-managed`，Router 和
+全局错误导航标记为 `shared-scaffold`。优先使用 project-owned 接缝可降低升级合并
+成本；项目仍可直接修改这些文件，updater 会按 Base/Ours/Theirs 尝试合并。
 
 ## 默认行为
 

package/template/docs/development/custom-login-page.md

@@ -8,8 +8,9 @@ apps/web/src/app/auth/login-page.ts
 
 该文件在 `.windy/files.json` 中属于 `project-owned`。Windy 升级会为旧项目新增它，
 但一旦文件存在，后续 `windy update` 只会保留，不会覆盖业务选择。平台默认登录页
-`apps/web/src/pages/auth/LoginPage.vue` 仍是 `windy-managed`，Router 仍是
-`shared-scaffold`；业务项目不应直接修改这两处。
+`apps/web/src/pages/auth/LoginPage.vue` 标记为 `windy-managed`，Router 标记为
+`shared-scaffold`。优先使用 project-owned 接缝可降低升级合并成本；业务项目仍可直接
+修改这两处，updater 会按 Base/Ours/Theirs 尝试合并。
 
 ## 默认行为