create-windy 0.3.13 → 0.3.16

package/README.md

@@ -59,7 +59,7 @@ npx create-windy@latest my-dashboard \
   `system.operations`。
 - 默认不选：离线 `system.license`、文件、任务、通知、工作流、搜索、数据治理、
   Agent、批量数据和示例工单等模块。
-- 默认代码质量：Oxlint + Oxfmt。Husky 会在提交前通过 lint-staged 自动格式化暂存
+- 默认代码质量：Oxlint + Oxfmt。Husky 会在提交前通过 lint-staged 自动格式化并检查暂存
   文件，不会把未暂存内容带入提交；lint、typecheck 和 test 保留为显式命令。
 - `--no-oxc` 会物理排除 Oxc 配置、Husky hook、lint-staged、依赖和质量脚本。
 - 默认法律许可证：`UNLICENSED`，不会生成 `LICENSE` 文件。
@@ -133,9 +133,10 @@ bun run windy update
 bun run windy reconcile --to <精确目标版本>
 ```
 
-更新器要求 Git 工作区干净，从 npm 历史 artifact 重建 Base，并以
-Base/Ours/Theirs 合并共享脚手架。`package.json` 使用字段级合并；已发布 migration
-只允许追加；冲突发生时不写项目，验证失败则从 `.windy/backups/` 自动回滚。项目锁定
+更新器不检查 Git 工作区是否干净：只规划目标版本实际变更的受管文件，从 npm 历史
+artifact 重建 Base，并以 Base/Ours/Theirs 合并共享脚手架。未触及的业务修改不会进入
+更新判断；`package.json` 使用字段级合并；已发布 migration 只允许追加；冲突发生时不写
+项目，验证失败则从 `.windy/backups/` 自动回滚。项目锁定
 的 CLI 检测到新版后，会委托给目标版本生成完整更新计划。受管清单 schema v3 用不含
 hash 的 missing tombstone 记住客户删除的 `project-owned` 路径；后续版本不会把它
 当作首次新增而重建，客户自行恢复文件后则采纳客户实际正文基线。既有 schema v1/v2
@@ -146,8 +147,8 @@ hash 的 missing tombstone 记住客户删除的 `project-owned` 路径；后续
 `.windy/files.json` 和无正文报告，不修改项目源码或推进 Project Lock。来源/目标均
 校验公网 npm artifact identity 与 integrity，只有内置不可变 proof 完整命中的
 `windy-managed` 文件可以对账；`shared-scaffold` 也必须精确命中内置 proof，
-`project-owned` 和未知语义差异保持未决。执行前同样要求 Git 工作区干净；中断仍
-通过 `doctor --repair` 恢复事务。
+`project-owned` 和未知语义差异保持未决。对账不修改项目源码；中断仍通过
+`doctor --repair` 恢复事务。
 
 公网 `0.3.0` 的默认 Git + Oxc 项目需要先运行
 `create-windy@0.3.2 reconcile --to 0.3.0`，确认后增加 `--apply`，提交生成的清单和
@@ -197,8 +198,8 @@ bun run windy module remove work-order --dry-run
 bun run windy module remove work-order --confirm-data-disposition
 ```
 
-命令要求 Git 工作区干净，复用 `update` 的三方计划、CAS 事务、验证和
-`doctor --repair` 恢复；CLI 与项目 Windy 版本也必须完全一致，旧项目先执行
+命令不检查 Git 工作区是否干净，复用 `update` 的三方计划、CAS 事务、验证和
+`doctor --repair` 恢复；未触及的业务改动完全保留。CLI 与项目 Windy 版本也必须完全一致，旧项目先执行
 `bun run windy update`。卸载默认保留业务数据，不执行 down migration，并把模块
 migration 证据保留到 `.windy/module-history/`。目录声明 `archive-data` 或 `manual`
 时，还必须通过 `--data-plan` 提供已审阅的处置文档；CLI 不连接数据库或自动执行

package/dist/cli.js

@@ -4011,7 +4011,7 @@ create-windy \u9ED8\u8BA4\u5EFA\u7ACB \`main\` \u5206\u652F\u5E76\u521B\u5EFA \`
 
 // src/project-package.ts
 var defaultLintStaged = {
-  "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "oxfmt --write"
+  "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": ["oxfmt --write", "oxlint"]
 };
 function createStarterPackage(source, projectName, includeOxc = true, projectLicense = "UNLICENSED", selectedModules = [], generatorVersion) {
   const { "lint-staged": sourceLintStaged, ...sourceWithoutLintStaged } = source;
@@ -4566,7 +4566,7 @@ function isMissing4(error) {
 import { createInterface as createInterface2 } from "readline/promises";
 import { stdin, stdout } from "process";
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/key.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/key.js
 var keybindings = ["emacs", "vim"];
 var keybindingLookup = new Set(keybindings);
 function isKeybinding(value) {
@@ -4583,7 +4583,7 @@ var isDownKey = (key, keybindings2 = []) => key.name === "down" || keybindings2.
 var isSpaceKey = (key) => key.name === "space";
 var isNumberKey = (key) => "1234567890".includes(key.name);
 var isEnterKey = (key) => key.name === "enter" || key.name === "return";
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/errors.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/errors.js
 class AbortPromptError extends Error {
   name = "AbortPromptError";
   message = "Prompt was aborted";
@@ -4609,10 +4609,10 @@ class HookError extends Error {
 class ValidationError extends Error {
   name = "ValidationError";
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-state.js
 import { AsyncResource as AsyncResource2 } from "async_hooks";
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/hook-engine.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/hook-engine.js
 import { AsyncLocalStorage, AsyncResource } from "async_hooks";
 var hookStorage = new AsyncLocalStorage;
 function createStore(rl) {
@@ -4717,7 +4717,7 @@ var effectScheduler = {
   }
 };
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-state.js
 function isFactory(value) {
   return typeof value === "function";
 }
@@ -4738,7 +4738,7 @@ function useState(defaultValue) {
   });
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-effect.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-effect.js
 function useEffect(cb, depArray) {
   withPointer((pointer) => {
     const oldDeps = pointer.get();
@@ -4750,7 +4750,7 @@ function useEffect(cb, depArray) {
   });
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/theme.js
 import { styleText } from "util";
 
 // ../../node_modules/.bun/@inquirer+figures@2.0.7/node_modules/@inquirer/figures/dist/index.js
@@ -5042,7 +5042,7 @@ var figures = shouldUseMain ? mainSymbols : fallbackSymbols;
 var dist_default = figures;
 var replacements = Object.entries(specialMainSymbols);
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/theme.js
 var defaultTheme = {
   prefix: {
     idle: styleText("blue", "?"),
@@ -5070,7 +5070,7 @@ function getDefaultTheme() {
   };
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/make-theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/make-theme.js
 function isPlainObject(value) {
   if (typeof value !== "object" || value === null)
     return false;
@@ -5098,7 +5098,7 @@ function makeTheme(...themes) {
   return deepMerge(...themesToMerge);
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-prefix.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-prefix.js
 function usePrefix({ status = "idle", theme }) {
   const [showLoader, setShowLoader] = useState(false);
   const [tick, setTick] = useState(0);
@@ -5128,7 +5128,7 @@ function usePrefix({ status = "idle", theme }) {
   const iconName = status === "loading" ? "idle" : status;
   return typeof prefix === "string" ? prefix : prefix[iconName] ?? prefix["idle"];
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-memo.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-memo.js
 function useMemo(fn, dependencies) {
   return withPointer((pointer) => {
     const prev = pointer.get();
@@ -5140,12 +5140,12 @@ function useMemo(fn, dependencies) {
     return prev.value;
   });
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-ref.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-ref.js
 function useRef(val) {
   return useState({ current: val })[0];
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/use-keypress.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-keypress.js
 function useKeypress(userHandler) {
   const signal = useRef(userHandler);
   signal.current = userHandler;
@@ -5163,7 +5163,7 @@ function useKeypress(userHandler) {
     };
   }, []);
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/utils.js
 var import_cli_width = __toESM(require_cli_width(), 1);
 
 // ../../node_modules/.bun/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/utils.js
@@ -5507,7 +5507,7 @@ function wrapAnsi(string, columns, options) {
 `);
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/utils.js
 function breakLines(content, width) {
   return content.split(`
 `).flatMap((line) => wrapAnsi(line, width, { trim: false, wordWrap: false }).split(`
@@ -5518,7 +5518,7 @@ function readlineWidth() {
   return import_cli_width.default({ defaultWidth: 80, output: readline().output });
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
 function usePointerPosition({ active, renderedItems, pageSize, loop }) {
   const state = useRef({
     lastPointer: active,
@@ -5584,7 +5584,7 @@ function usePagination({ items, active, renderItem, pageSize, loop = true }) {
   return pageBuffer.filter((line) => typeof line === "string").join(`
 `);
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/create-prompt.js
 var import_mute_stream = __toESM(require_lib(), 1);
 import * as readline2 from "readline";
 import { AsyncResource as AsyncResource3 } from "async_hooks";
@@ -5797,7 +5797,7 @@ var {
   unload
 } = signalExitWrap(processOk(process3) ? new SignalExit(process3) : new SignalExitFallback);
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/screen-manager.js
 import { stripVTControlCharacters } from "util";
 
 // ../../node_modules/.bun/@inquirer+ansi@2.0.7/node_modules/@inquirer/ansi/dist/index.js
@@ -5816,7 +5816,7 @@ var cursorTo = (x, y) => {
 var eraseLine = ESC2 + "2K";
 var eraseLines = (lines) => lines > 0 ? (eraseLine + cursorUp(1)).repeat(lines - 1) + eraseLine + cursorLeft : "";
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/screen-manager.js
 var height = (content) => content.split(`
 `).length;
 var lastLine = (content) => content.split(`
@@ -5882,7 +5882,7 @@ class ScreenManager {
   }
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
 class PromisePolyfill extends Promise {
   static withResolver() {
     let resolve6;
@@ -5895,7 +5895,7 @@ class PromisePolyfill extends Promise {
   }
 }
 
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/create-prompt.js
 import path from "path";
 var nativeSetImmediate = globalThis.setImmediate;
 function getCallSites() {
@@ -6006,7 +6006,7 @@ function createPrompt(view) {
   };
   return prompt;
 }
-// ../../node_modules/.bun/@inquirer+core@11.2.1+e154a6929a67600d/node_modules/@inquirer/core/dist/lib/Separator.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/Separator.js
 import { styleText as styleText2 } from "util";
 class Separator {
   separator = styleText2("dim", Array.from({ length: 15 }).join(dist_default.line));
@@ -6020,7 +6020,7 @@ class Separator {
     return Boolean(choice && typeof choice === "object" && "type" in choice && choice.type === "separator");
   }
 }
-// ../../node_modules/.bun/@inquirer+checkbox@5.2.1+e154a6929a67600d/node_modules/@inquirer/checkbox/dist/index.js
+// ../../node_modules/.bun/@inquirer+checkbox@5.2.1+7cb241fc07b679d9/node_modules/@inquirer/checkbox/dist/index.js
 import { styleText as styleText3 } from "util";
 var checkboxTheme = {
   icon: {
@@ -8869,6 +8869,10 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   if (!oursChanged && !targetChanged) {
     return readyPlannedFile(path2, ownership, "preserve", "\u53CC\u65B9\u672A\u4FEE\u6539", expected);
   }
+  if (targetChanged && path2.endsWith("package.json") && base) {
+    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 (!oursChanged) {
     return readyPlannedFile(path2, ownership, "update", "\u4EC5 Windy \u4FEE\u6539", expected, theirs);
   }
@@ -8878,10 +8882,6 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
   if (hashContent(ours) === target.hash) {
     return readyPlannedFile(path2, ownership, "preserve", "\u5DF2\u5305\u542B\u76EE\u6807\u5185\u5BB9", expected);
   }
-  if (path2.endsWith("package.json") && base) {
-    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 (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);
@@ -8995,15 +8995,6 @@ function isMissing5(error) {
 // src/update/preflight.ts
 async function assertProjectReadyForUpdate(projectDirectory) {
   await assertNoPendingUpdate(projectDirectory);
-  await assertGitClean(projectDirectory);
-}
-async function assertGitClean(projectDirectory) {
-  const result2 = await captureProcess("git", ["status", "--porcelain"], projectDirectory);
-  if (result2.code !== 0)
-    throw new Error("\u66F4\u65B0\u8981\u6C42\u5F53\u524D\u76EE\u5F55\u662F\u6709\u6548\u7684 Git \u4ED3\u5E93");
-  if (result2.stdout.trim()) {
-    throw new Error("\u66F4\u65B0\u524D\u8BF7\u5148\u63D0\u4EA4\u6216\u6682\u5B58\u4E4B\u5916\u59A5\u5584\u5904\u7406 Git \u5DE5\u4F5C\u533A\u6539\u52A8");
-  }
 }
 async function assertNoPendingUpdate(projectDirectory) {
   const root = await resolveProjectRoot(projectDirectory);
@@ -9099,7 +9090,10 @@ var recipes = [
   { id: "starter-0.3.9-to-0.3.10", from: "0.3.9", to: "0.3.10" },
   { id: "starter-0.3.10-to-0.3.11", from: "0.3.10", to: "0.3.11" },
   { id: "starter-0.3.11-to-0.3.12", from: "0.3.11", to: "0.3.12" },
-  { id: "starter-0.3.12-to-0.3.13", from: "0.3.12", to: "0.3.13" }
+  { id: "starter-0.3.12-to-0.3.13", from: "0.3.12", to: "0.3.13" },
+  { id: "starter-0.3.13-to-0.3.14", from: "0.3.13", to: "0.3.14" },
+  { id: "starter-0.3.14-to-0.3.15", from: "0.3.14", to: "0.3.15" },
+  { id: "starter-0.3.15-to-0.3.16", from: "0.3.15", to: "0.3.16" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (sourceVersion === targetVersion)
@@ -11277,7 +11271,9 @@ async function main() {
   }
   await createProject(await applyInteractiveSelection(options));
 }
-main().catch((error) => {
+try {
+  await main();
+} catch (error) {
   console.error(error instanceof Error ? error.message : String(error));
   process.exitCode = 1;
-});
+}

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "f5aaae44748b7023cea669439ab887629f76935b",
-  "generatorVersion": "0.3.13",
+  "templateCommit": "39074967cfcee6aca5ff6d3e2791b93ab90e70af",
+  "generatorVersion": "0.3.16",
   "modules": [
     {
       "name": "system",

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

@@ -76,7 +76,8 @@ composable。
 
 ## 从 0.2.32 升级
 
-先提交当前业务改动并保持 Git 工作区干净，然后执行：
+可直接在现有业务改动上执行：更新不会检查无关工作区改动；若平台变更与同一共享文件
+重叠，计划会报告三方合并冲突：
 
 ```bash
 bunx --bun create-windy@latest update --check --cwd .

package/template/docs/development/module-lifecycle.md

@@ -25,8 +25,9 @@ CAS 写入、验证、Project Lock/受管清单提交和 `doctor --repair` 恢
 版本混用。
 
 `add` 与 `remove` 是幂等操作：集合已满足时不启动事务。`update` 不改变集合，用当前
-CLI 重建所选模块并应用目录声明的更新 recipe。正式操作要求 Git 工作区干净；客户
-修改过的受管文件或模块 project-owned 扩展点会形成冲突，不会被静默覆盖。
+CLI 重建所选模块并应用目录声明的更新 recipe。正式操作只处理计划涉及的文件，不检查
+无关 Git 工作区改动；客户修改过的受管文件或模块 project-owned 扩展点会形成冲突，
+不会被静默覆盖。
 
 ## 数据处置
 

package/template/package.json

@@ -70,7 +70,10 @@
     "test": "bun test --path-ignore-patterns='packages/create-windy/template/**' && bun run --cwd apps/web test"
   },
   "lint-staged": {
-    "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "oxfmt --write"
+    "*.{cjs,css,cts,html,js,json,jsonc,jsx,less,md,mdx,mjs,mts,scss,ts,tsx,vue,yaml,yml}": [
+      "oxfmt --write",
+      "oxlint"
+    ]
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",