create-warlock 5.33.0 → 5.34.0

package/skills/create-a-warlock-project/SKILL.md

@@ -46,7 +46,7 @@ that is just the project name, the one required answer with no default:
 ```
 A project name is required and no terminal is available to ask for one. Pass it as
 the first argument or --name=<name>. Non-interactive flags: --yes, --pm=<npm|yarn|pnpm>,
---db=<driver>|--no-db, --features=<list>, --ai=<list>, --lint=<oxc|eslint>, --git|--no-git, --jwt|--no-jwt.
+--db=<driver>|--no-db, --features=<list>, --ai=<list>, --lint=<oxc>, --git|--no-git, --jwt|--no-jwt.
 ```
 
 ## After scaffolding: the decisions summary
@@ -72,7 +72,7 @@ Features: none
 | `--no-db`                      | no          | —                                                                   | Opt out of a database — shorthand for `--db=none`.                                                                     |
 | `--pm`                         | yes         | inferred (`npm_config_user_agent` / system)                         | Package manager — must be one of `npm` / `yarn` / `pnpm` / `bun`; anything else is rejected before scaffolding starts. |
 | `--features`                   | yes (CSV)   | none, or `["web"]` when `--stack=web` and `--features` is not given | Comma-separated optional feature keys. An explicit `--features` always wins over the `--stack` default.                |
-| `--lint`                       | yes         | `oxc`                                                               | `oxc` (Oxlint/Oxfmt) or `eslint` (ESLint/Prettier, deprecated); unknown or missing values fail before writes.          |
+| `--lint`                       | yes         | `oxc`                                                               | `oxc` (Oxlint/Oxfmt); removed or invalid values fail before writes.                                                    |
 | `--ai`                         | yes (CSV)   | none                                                                | Comma-separated AI provider keys (auto-pulls `@warlock.js/ai`).                                                        |
 | `--agents`                     | yes (CSV)   | `claude`                                                            | Comma-separated `agent-kit` targets — see below.                                                                       |
 | `--git` / `--no-git`           | no          | off                                                                 | Initialize a Git repo (`git init` + `main` branch + initial commit).                                                   |
@@ -199,101 +199,72 @@ Flags preselect their existing feature keys. Both menus and checklists retain
 terminal paging. The decisions overview previews up to six feature/AI keys with
 a total count; the success screen shows the complete list.
 
-## Choose the linter and formatter
+## Oxlint and Oxfmt
 
-`--lint=oxc` is the default. It also accepts `--lint oxc` and installs exact
-`oxlint@1.88.0` and `oxfmt@0.73.0` versions, emits `.oxlintrc.json` and
-`.oxfmtrc.json`, and removes the template's ESLint/Prettier configs and dependencies.
-Pass `--lint=eslint` to opt in to ESLint/Prettier. The custom wizard prompts for
-the same choice; a flag preselects it.
+Oxlint **1.88.0** and Oxfmt **0.73.0** are the only supported tools. New apps
+pin TypeScript **7.0.2** and include `.oxlintrc.json`, `.oxfmtrc.json`,
+`.oxfmtignore`, and VS Code settings for `oxc.oxc-vscode`.
+`--lint=oxc` is optional; `--lint=eslint` fails with the 5.34.0 removal message.
+The wizard has no toolchain choice.
 
 ```bash
-# Default: Oxlint + Oxfmt, TypeScript 7.0.2
 npm create warlock@latest my-app -- --yes
-
-# Explicit opt-in: ESLint + Prettier, TypeScript 6.0.3
-npm create warlock@latest my-eslint-app -- --lint=eslint --yes
-```
-
-Both choices provide `lint`/`format` and non-mutating `lint:check`/`format:check`
-scripts. Oxc projects also configure VS Code format-on-save with the official
-`oxc.oxc-vscode` formatter, use `source.fixAll.oxc` for lint fixes and recommend
-that extension. The ESLint toolchain retains its Prettier/ESLint editor settings.
-Oxc config enables `devServer.healthCheckers: { eslint: false, oxlint: true }` and
-leaves TypeScript health checks enabled. Style matches the template's 100-column,
-double-quote, semicolon and trailing-comma settings. Import sorting is on in
-`.oxfmtrc.json`, kept to one block like the ESLint toolchain's
-`@ianvs/prettier-plugin-sort-imports`:
-
-```json
-{ "sortImports": { "newlinesBetween": false, "internalPattern": ["app/", "web/", "@shared/"] } }
-```
-
-`format` (`npm run format`) orders built-ins, packages, internal aliases,
-then relative imports. Neither formatter deletes unused imports. ESLint reports
-them through `unused-imports/no-unused-imports`; Oxlint uses `no-unused-vars`.
-Scripts in both toolchains call local binaries
-(`eslint --fix ./src --max-warnings=0`, `tsc --noEmit`), never `npx`.
-
-## TypeScript 7 in 5.32
-
-Default Oxlint/Oxfmt projects pin `typescript` to `7.0.2`; `tsc` is the native Go compiler.
-The template uses `module: "ESNext"`, `moduleResolution: "bundler"`, explicit
-Node types, and `paths` relative to its tsconfig, without `baseUrl`.
-Existing apps must remove `baseUrl`, rebase alias targets, and replace
-`moduleResolution: "node"` / `"node10"` before typechecking.
-
-Explicit `--lint=eslint` projects pin `typescript` to **6.0.3**, the newest version
-supported by typescript-eslint. Its parser requires the JavaScript compiler API
-removed in TypeScript 7, and its declared peer range is `>=4.8.4 <6.1.0`
-([parser package metadata](https://registry.npmjs.org/@typescript-eslint/parser/8.71.2)).
-Both modes use the same tsconfig settings above, which are valid in TypeScript 6.
-ESLint mode prints a deprecation warning naming removal in 5.34.0 and the Oxc migration command. Both modes install with every supported package manager.
-
-### Prettier import order in ESLint mode
-
-The ESLint scaffold’s `@ianvs/prettier-plugin-sort-imports` uses Babel instead of
-the compiler API. Keep these options in `.prettierrc.json`:
-
-```json
-{
-  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
-  "importOrder": ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^(app|web|@shared)/", "^[.]"],
-  "importOrderParserPlugins": ["typescript", "jsx", "decorators"]
-}
+cd my-app
+npm run lint:check
+npm run format:check
 ```
 
-Leave `importOrderTypeScriptVersion` at its default to keep type and value imports
-separate. Run `npm run format`, then `npm run lint:check`; formatting preserves
-unused imports, and `npm run lint` can apply ESLint’s unused-import fixes.
+Oxlint enables `"categories": { "correctness": "error" }`, unused-variable/import
+checks, explicit class accessibility and type-import style. Oxfmt sorts imports
+with `"sortImports": { "newlinesBetween": false, "internalPattern": ["app/", "web/", "@shared/"] }`.
+It keeps built-ins, packages, internal aliases and relative imports in one block.
+Formatting retains unused imports; lint reports them. Local package scripts use
+`oxlint`, `oxfmt` and `tsc` directly. The non-mutating scripts are `lint:check`
+and `format:check`. Background checks run TypeScript and configured Oxlint.
 
-## Migrate to Oxlint and Oxfmt in 5.33
+## Migration
 
-ESLint + Prettier are deprecated in 5.33.0 and will be removed in **5.34.0**.
-New apps should use `--lint=oxc`. To migrate an existing app, install the new
-core release and `ts-morph`, then run:
+ESLint and Prettier support was removed in **5.34.0**. Oxlint/Oxfmt is the only
+supported toolchain. `--lint eslint` and `healthCheckers.eslint` are removed.
+Install the new core release and `ts-morph`, then migrate an existing app:
 
 ```bash
-npx warlock upgrade --from 5.32 --to 5.33.0 --dry-run
-npx warlock upgrade --from 5.32 --to 5.33.0
+npm install --save-dev ts-morph
+npx warlock upgrade --from 5.33 --to 5.34.0 --dry-run
+npx warlock upgrade --from 5.33 --to 5.34.0
 npm install
 npm run format
 npm run lint:check
 npx warlock check
 ```
 
-Review every reported `file:line`: customized configs are preserved and need
-manual translation before removal. The codemod installs the template's Oxlint
-and Oxfmt versions and pins TypeScript to 7.0.2. It replaces standard lint/format
-scripts, removes legacy dependencies, and deletes only recognized generated
-configs. A generated `.prettierignore` becomes `.oxfmtignore`. Existing Oxc
-configs are preserved. `--dry-run --json` reports the same planned changes
-without writing files.
-
-Explicit deprecated ESLint scaffolds set `devServer.healthCheckers.eslint: true`;
-existing apps must set this themselves to retain background ESLint checking.
-
-Oxc formatting scripts explicitly read `.gitignore` and `.oxfmtignore`. Oxfmt
-0.73 otherwise defaults to `.prettierignore` (`oxfmt --help`); the explicit
-paths make migrated ignore rules effective. The package template format gate
-also defaults to Oxfmt; `--lint=eslint` is its deprecated compatibility mode.
+The `oxc-toolchain-removal` step reapplies the preserved 5.33 `oxc-toolchain`
+migration when legacy configs, scripts or dependencies remain. Apps upgrading
+from 5.32 can still use `npx warlock upgrade --from 5.32 --to 5.33.0` first.
+It replaces standard scripts/dependencies, pins TypeScript 7.0.2, updates generated
+editor settings, removes `healthCheckers.eslint` and selects Oxlint. A generated
+`.prettierignore` becomes `.oxfmtignore`; Oxfmt scripts read it explicitly.
+
+Literal custom rules are translated without executing the config. Per-folder
+`no-restricted-imports` and `no-restricted-exports` become Oxlint overrides with
+file/exclusion patterns. Supported `@typescript-eslint/*` rules become native
+`typescript/*` rules (or native base rules). Options are checked against the
+pinned Oxlint 1.88.0 schema. Type-aware equivalents enable `options.typeAware`
+and add `oxlint-tsgolint@7.0.2004` to the app's dev dependencies.
+`unused-imports/no-unused-imports` uses `no-unused-vars` with safe import fixes;
+Oxlint shares the severity for imports and variables, so differing active
+severities are reported for review.
+
+Only unsupported rules/options, computed or imported settings, selectors such
+as `no-restricted-syntax`, and conflicting existing Oxc rules need manual review.
+Each finding names its source `file:line`, rule and affected file patterns.
+Fully ported lint configs are removed; configs with findings remain for reference
+until those findings are addressed. Existing Oxc rules are kept on conflict.
+`--dry-run --json` reports the same plan without writes. Customized formatting,
+editor settings and nonstandard scripts can also require review.
+
+**Upgrading:** new and migrated template configs enable
+`"categories": { "correctness": "error" }`. Address the additional diagnostics;
+existing Oxc configs retain their categories. A real lockfile beside a workspace
+marker determines the installer: `package-lock.json` plus `pnpm-workspace.yaml`
+without `pnpm-lock.yaml` now produces `npm install`.

package/templates/toolchains/oxc/.oxlintrc.json

@@ -2,7 +2,7 @@
   "$schema": "./node_modules/oxlint/configuration_schema.json",
   "plugins": ["typescript", "import", "react"],
   "env": { "node": true, "es2021": true },
-  "categories": { "correctness": "off" },
+  "categories": { "correctness": "error" },
   "rules": {
     "typescript/no-explicit-any": "off",
     "no-unused-vars": [

package/templates/warlock/{.prettierignore → .oxfmtignore}

@@ -1,4 +1,2 @@
 node_modules
 dist
-
-

package/templates/warlock/.oxfmtrc.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "semi": true,
+  "tabWidth": 2,
+  "printWidth": 100,
+  "singleQuote": false,
+  "arrowParens": "always",
+  "trailingComma": "all",
+  "endOfLine": "lf",
+  "sortImports": {
+    "newlinesBetween": false,
+    "internalPattern": ["app/", "web/", "@shared/"]
+  },
+  "ignorePatterns": ["node_modules/", "dist/"]
+}

package/templates/warlock/.oxlintrc.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript", "import", "react"],
+  "env": { "node": true, "es2021": true },
+  "categories": { "correctness": "error" },
+  "rules": {
+    "typescript/no-explicit-any": "off",
+    "no-unused-vars": [
+      "warn",
+      {
+        "vars": "all",
+        "varsIgnorePattern": "^_",
+        "args": "after-used",
+        "argsIgnorePattern": "^_"
+      }
+    ],
+    "typescript/explicit-member-accessibility": ["error", { "accessibility": "explicit" }],
+    "typescript/consistent-type-imports": [
+      "error",
+      { "prefer": "type-imports", "disallowTypeAnnotations": false }
+    ]
+  },
+  "ignorePatterns": ["node_modules/", "dist/"]
+}

package/templates/warlock/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["oxc.oxc-vscode"]
+}

package/templates/warlock/.vscode/settings.json

@@ -1,41 +1,35 @@
 {
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.defaultFormatter": "oxc.oxc-vscode",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
+    "source.fixAll.oxc": "explicit",
     "source.organizeImports": "never"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
   "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
   "[javascriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
   "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
   "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode",
     "editor.formatOnSave": true
   },
-  "prettier.configPath": ".prettierrc.json",
-  "prettier.requireConfig": true,
-  "prettier.ignorePath": ".prettierignore",
-  "prettier.documentSelectors": ["**/*.{ts,tsx,js,jsx,json,css,md}"],
-  "prettier.enable": true,
-  "prettier.useEditorConfig": false,
-  "prettier.resolveGlobalModules": false,
-  "eslint.format.enable": false,
-  "eslint.codeActionsOnSave.mode": "all"
+  "oxc.enable.oxlint": true,
+  "oxc.enable.oxfmt": true,
+  "oxc.requireConfig": true
 }

package/templates/warlock/README.md

@@ -29,22 +29,22 @@ It restarts on file changes.
 
 ## Scripts
 
-| Command | What it does |
-| --- | --- |
-| `npm run dev` | Development server with live reload |
-| `npm run build` | Type-check and build for production |
-| `npm run start` | Run the production build (run `build` first) |
-| `npm run migrate` | Run pending database migrations |
-| `npm run migrate.fresh` | Drop everything and re-run all migrations |
-| `npm run migrate.list` | List migrations and their status |
-| `npm run seed` | Run the database seeders |
-| `npm run jwt` | Generate a JWT secret into `.env` |
-| `npm run tsc` | Type-check without building |
-| `npm run lint` | The configured linter, auto-fixing what it can |
-| `npm run format` | The configured formatter over `src/` |
-| `npm run lint:check` | Lint without changing files |
-| `npm run format:check` | Check formatting without changing files |
-| `npm run skills:sync` | Refresh the AI agent skills (see below) |
+| Command                 | What it does                                   |
+| ----------------------- | ---------------------------------------------- |
+| `npm run dev`           | Development server with live reload            |
+| `npm run build`         | Type-check and build for production            |
+| `npm run start`         | Run the production build (run `build` first)   |
+| `npm run migrate`       | Run pending database migrations                |
+| `npm run migrate.fresh` | Drop everything and re-run all migrations      |
+| `npm run migrate.list`  | List migrations and their status               |
+| `npm run seed`          | Run the database seeders                       |
+| `npm run jwt`           | Generate a JWT secret into `.env`              |
+| `npm run tsc`           | Type-check without building                    |
+| `npm run lint`          | The configured linter, auto-fixing what it can |
+| `npm run format`        | The configured formatter over `src/`           |
+| `npm run lint:check`    | Lint without changing files                    |
+| `npm run format:check`  | Check formatting without changing files        |
+| `npm run skills:sync`   | Refresh the AI agent skills (see below)        |
 
 The `warlock` CLI has more than the scripts expose — run `npx warlock --help`
 for the full list. Two worth knowing:
@@ -157,7 +157,5 @@ Node types, and `paths` relative to its tsconfig, without `baseUrl`.
 Existing apps must remove `baseUrl`, rebase alias targets, and replace
 `moduleResolution: "node"` / `"node10"` before typechecking.
 
-Use the Oxlint/Oxfmt lint mode with TS7. The optional ESLint scaffold is retained,
-but typescript-eslint's parser requires the removed JavaScript compiler API and
-does not support TS7. ESLint mode is scheduled for deprecation in 5.33 and removal
-in 5.34. A parser's bundled older TypeScript is separate from the app's native `tsc`.
+Oxlint/Oxfmt is the only toolchain in 5.34.0. Correctness rules report errors;
+use `npm run lint:check` and `npm run format:check` before committing.

package/templates/warlock/package.json

@@ -19,14 +19,14 @@
     "gen.mig": "warlock generate.migration",
     "gen.r": "warlock generate.repository",
     "gen.rs": "warlock generate.resource",
-    "lint": "eslint --fix ./src --max-warnings=0",
-    "format": "node -e \"console.warn('Deprecated: Prettier support is removed in 5.34.0; migrate with npx warlock upgrade --from 5.32 --to 5.33.0.')\" && prettier --write \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json",
+    "lint": "oxlint --fix ./src --max-warnings=0",
+    "format": "oxfmt --ignore-path .gitignore --ignore-path .oxfmtignore --write ./src",
     "tsc": "warlock generate.typings && tsc --noEmit",
     "postinstall": "agent-kit init && agent-kit sync || echo \"warning: AI agent skills were NOT synced, so coding agents will not see the @warlock.js skills. Run the skills:sync script.\"",
     "skills:sync": "agent-kit sync",
     "skills:watch": "agent-kit watch",
-    "lint:check": "eslint ./src --max-warnings=0",
-    "format:check": "node -e \"console.warn('Deprecated: Prettier support is removed in 5.34.0; migrate with npx warlock upgrade --from 5.32 --to 5.33.0.')\" && prettier --check \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json"
+    "lint:check": "oxlint ./src --max-warnings=0",
+    "format:check": "oxfmt --ignore-path .gitignore --ignore-path .oxfmtignore --check ./src"
   },
   "dependencies": {
     "@mongez/reinforcements": "^4.0.2",
@@ -43,18 +43,11 @@
     "dayjs": "^1.11.19"
   },
   "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@mongez/agent-kit": "^1.3.1",
     "@types/node": "^25.0.3",
-    "@types/prettier": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.50.0",
-    "@typescript-eslint/parser": "^8.50.0",
-    "eslint": "^9.39.2",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-unused-imports": "^4.3.0",
-    "prettier": "^3.7.4",
     "typescript": "7.0.2",
-    "vitest": "4.0.5"
+    "vitest": "4.0.5",
+    "oxlint": "1.88.0",
+    "oxfmt": "0.73.0"
   }
 }

package/templates/warlock/skills/code-standards/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: code-standards
-description: 'Project-level TypeScript code standards for apps built on Warlock.js — `interface` vs `type`, access modifiers, no `any`, no inline-duplicated unions, file-naming suffixes (`.contract.ts` / `.type.ts` / `.service.ts` / `.model.ts` / `.resource.ts` / `.spec.ts`), single-responsibility files, FP-factory + internal-class pattern, brace-every-control-block readability with blank lines between consecutive blocks, JSDoc on public surface and non-obvious logic, error classes extending framework errors, async/await + `Promise.all`, `undefined` over `null`, Vitest co-located, ESLint/Prettier or Oxlint/Oxfmt. Triggers: writing/editing any `.ts` / `.tsx` file in this project; user asks "what are the code standards / style rules / conventions"; spawning a sub-agent that will write code; reviewing a diff for style issues; deciding `interface` vs `type`, when to use a class, where helpers live, how to name a file, or whether something needs JSDoc. Skip: pure-Markdown / JSON / YAML edits with no code change; runtime / behavior questions about a specific framework primitive — load the relevant `@warlock.js/<pkg>` skill instead; package-publishing or CI workflow questions.'
+description: 'Project-level TypeScript code standards for apps built on Warlock.js — `interface` vs `type`, access modifiers, no `any`, no inline-duplicated unions, file-naming suffixes (`.contract.ts` / `.type.ts` / `.service.ts` / `.model.ts` / `.resource.ts` / `.spec.ts`), single-responsibility files, FP-factory + internal-class pattern, brace-every-control-block readability with blank lines between consecutive blocks, JSDoc on public surface and non-obvious logic, error classes extending framework errors, async/await + `Promise.all`, `undefined` over `null`, Vitest co-located, Oxlint/Oxfmt. Triggers: writing/editing any `.ts` / `.tsx` file in this project; user asks "what are the code standards / style rules / conventions"; spawning a sub-agent that will write code; reviewing a diff for style issues; deciding `interface` vs `type`, when to use a class, where helpers live, how to name a file, or whether something needs JSDoc. Skip: pure-Markdown / JSON / YAML edits with no code change; runtime / behavior questions about a specific framework primitive — load the relevant `@warlock.js/<pkg>` skill instead; package-publishing or CI workflow questions.'
 ---
 
 # Code Standards
@@ -52,14 +52,16 @@ Never omit `public` / `private` / `protected`. Explicit is faster to read than i
 export class CartService {
   public readonly currency: string;
   private items: CartItem[] = [];
-  public add(item: CartItem) { /* ... */ }
+  public add(item: CartItem) {
+    /* ... */
+  }
 }
 
 // ❌
 export class CartService {
-  readonly currency: string;     // missing public
-  items: CartItem[] = [];        // missing private
-  add(item: CartItem) {}         // missing public
+  readonly currency: string; // missing public
+  items: CartItem[] = []; // missing private
+  add(item: CartItem) {} // missing public
 }
 ```
 
@@ -75,12 +77,12 @@ If a union appears in more than one place, extract it to a named exported type o
 // ✅
 export type OrderStatus = "pending" | "paid" | "shipped" | "cancelled";
 
-export type Order = { status: OrderStatus; /* ... */ };
-export type OrderEvent = { status: OrderStatus; /* ... */ };
+export type Order = { status: OrderStatus /* ... */ };
+export type OrderEvent = { status: OrderStatus /* ... */ };
 
 // ❌ inline duplication — changing the set means N edits and N chances to miss one
-export type Order = { status: "pending" | "paid" | "shipped" | "cancelled"; /* ... */ };
-export type OrderEvent = { status: "pending" | "paid" | "shipped" | "cancelled"; /* ... */ };
+export type Order = { status: "pending" | "paid" | "shipped" | "cancelled" /* ... */ };
+export type OrderEvent = { status: "pending" | "paid" | "shipped" | "cancelled" /* ... */ };
 ```
 
 ### 1.5 Constrain generics
@@ -89,10 +91,14 @@ Open generics are almost always wrong. If `T` has a contract, declare it.
 
 ```typescript
 // ✅
-export function publish<T extends DomainEvent>(event: T): void { /* ... */ }
+export function publish<T extends DomainEvent>(event: T): void {
+  /* ... */
+}
 
 // ❌
-export function publish<T>(event: T): void { /* ... */ }
+export function publish<T>(event: T): void {
+  /* ... */
+}
 ```
 
 ### 1.6 Prefer `undefined` for "absent"
@@ -102,7 +108,9 @@ Use `undefined` everywhere — optional properties, optional parameters, "not fo
 ```typescript
 // ✅
 export type User = { id: string; phone?: string };
-function find(id: string): User | undefined { /* ... */ }
+function find(id: string): User | undefined {
+  /* ... */
+}
 
 // ❌ mixed
 export type User = { id: string; phone: string | null };
@@ -162,14 +170,14 @@ Always bare: `from "./order.service"`, never `from "./order.service.ts"` or `.js
 
 ## 3. File naming
 
-| Suffix         | Purpose                              | Example                |
-| -------------- | ------------------------------------ | ---------------------- |
-| `.contract.ts` | Interface only (blueprint)           | `payment.contract.ts`  |
-| `.type.ts`     | Types only (data shapes)             | `order.type.ts`        |
-| `.service.ts`  | Service class                        | `cart.service.ts`      |
-| `.model.ts`    | Domain model class                   | `user.model.ts`        |
-| `.resource.ts` | Output mapper (model → wire format)  | `order.resource.ts`    |
-| `.spec.ts`     | Co-located test for a sibling `.ts`  | `cart.service.spec.ts` |
+| Suffix         | Purpose                             | Example                |
+| -------------- | ----------------------------------- | ---------------------- |
+| `.contract.ts` | Interface only (blueprint)          | `payment.contract.ts`  |
+| `.type.ts`     | Types only (data shapes)            | `order.type.ts`        |
+| `.service.ts`  | Service class                       | `cart.service.ts`      |
+| `.model.ts`    | Domain model class                  | `user.model.ts`        |
+| `.resource.ts` | Output mapper (model → wire format) | `order.resource.ts`    |
+| `.spec.ts`     | Co-located test for a sibling `.ts` | `cart.service.spec.ts` |
 
 **One primary export per file.** If a `.contract.ts` also defines closely-related data types used only by that contract, that's fine — but the primary export is the interface.
 
@@ -216,9 +224,15 @@ export function placeOrder(config: OrderConfig) {
 class PlacementRun {
   private items: ResolvedItem[] = [];
   private total = 0;
-  public async run(): Promise<OrderResult> { /* ... */ }
-  private async validate(): Promise<void> { /* ... */ }
-  private async charge(): Promise<void> { /* ... */ }
+  public async run(): Promise<OrderResult> {
+    /* ... */
+  }
+  private async validate(): Promise<void> {
+    /* ... */
+  }
+  private async charge(): Promise<void> {
+    /* ... */
+  }
 }
 ```
 
@@ -283,7 +297,9 @@ Identifiers carry the meaning. Add a comment only when the **why** is non-obviou
 ```typescript
 // ❌ noise
 // Loop over items
-for (const item of items) { /* ... */ }
+for (const item of items) {
+  /* ... */
+}
 
 // ✅ the WHY isn't obvious from the code
 // Stripe returns idempotency_key on retry but not on first call —
@@ -362,7 +378,7 @@ Every promise is either awaited, returned, or explicitly `.catch()`'d. A "fire a
 
 ```typescript
 // ❌
-sendWelcomeEmail(user);  // floating — if it rejects, you'll never know
+sendWelcomeEmail(user); // floating — if it rejects, you'll never know
 
 // ✅
 await sendWelcomeEmail(user);
@@ -481,7 +497,7 @@ Validation runs once at the route boundary; everything inward consumes the typed
 type Order = { totalCents: number; placedAtUtc: Date };
 
 // ❌
-type Order = { total: number; placedAt: string };  // float money, ambiguous tz
+type Order = { total: number; placedAt: string }; // float money, ambiguous tz
 ```
 
 See `skills/data-and-persistence/SKILL.md`.
@@ -551,12 +567,11 @@ A secret with no safe default (a payment key, a signing secret) should fail loud
 
 ## 11. Tooling
 
-Use the project's selected toolchain: `eslint.config.js` + `.prettierrc.json`, or
-`.oxlintrc.json` + `.oxfmtrc.json`. Run `npm run lint:check` and
+Use the project's toolchain: `.oxlintrc.json` + `.oxfmtrc.json`. Run `npm run lint:check` and
 `npm run format:check` for non-mutating checks. The Oxc scaffold enables the
 Oxlint development health checker and retains TypeScript checking.
 
-`npx warlock check` is the one verify command, in either toolchain: it
+`npx warlock check` is the one verify command, with Oxlint: it
 typechecks, runs the configured linter and the affected tests, and checks the
 framework's conventions — `request.validated()` instead of `request.all()`,
 guarded or `public: true` mutating routes, safe redirects, redacted logs,
@@ -564,17 +579,17 @@ bounded regexes on input, one controller per file, `type` (not `kind`) as a
 union's discriminator. Each problem has a `WL` code and its fix
 (`npx warlock explain <CODE>`).
 
-For ESLint, consider enabling these additional rules:
+For Oxlint, consider enabling these additional rules:
 
-- `@typescript-eslint/explicit-member-accessibility` — enforces § 1.2
-- `@typescript-eslint/no-explicit-any` — enforces § 1.3
-- `@typescript-eslint/consistent-type-definitions` — supports § 1.1
-- `@typescript-eslint/no-floating-promises` — enforces § 6.3
-- `@typescript-eslint/await-thenable`
+- `typescript/explicit-member-accessibility` — enforces § 1.2
+- `typescript/no-explicit-any` — enforces § 1.3
+- `typescript/consistent-type-definitions` — supports § 1.1
+- `typescript/no-floating-promises` — enforces § 6.3 (requires `oxlint-tsgolint` and `options.typeAware: true`)
+- `typescript/await-thenable` (same type-aware engine requirement)
 - `curly` — enforces braces (§ 4.4)
 - `no-console` — enforces § 8
 
-Match the selected formatter config: `.prettierrc.json` or `.oxfmtrc.json`. Both use 100 columns, double quotes, semicolons and trailing commas. Prettier uses `@ianvs/prettier-plugin-sort-imports` (Babel, independent of TypeScript); it sorts built-ins, packages, aliases (`app/*`, `web/*`, `@shared/*`) and relatives in one block while preserving separate type imports. Oxfmt sorts imports through its own configuration. Both retain unused imports: ESLint reports them through `unused-imports/no-unused-imports`, and Oxlint through `no-unused-vars`. Run the formatter, then the linter.
+Match `.oxfmtrc.json`: 100 columns, double quotes, semicolons, trailing commas and built-in import sorting.
 
 ---
 
@@ -583,6 +598,7 @@ Match the selected formatter config: `.prettierrc.json` or `.oxfmtrc.json`. Both
 Before any change ships:
 
 **Craft**
+
 - [ ] All class members have access modifiers
 - [ ] No `any`
 - [ ] No inline-duplicated unions or literal sets
@@ -600,6 +616,7 @@ Before any change ships:
 - [ ] `npx warlock check` exits 0
 
 **Non-negotiable defaults**
+
 - [ ] Every untrusted input has a `@warlock.js/seal` schema at the boundary
 - [ ] Money fields are integer minor units, time stored as UTC
 - [ ] IDs exposed in URLs are opaque (UUID / nanoid)