uniweb 0.86.0 → 0.87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -41,17 +41,17 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
-    "@uniweb/content-writer": "^0.3.4",
+    "@uniweb/kit": "^0.20.0",
+    "@uniweb/runtime": "^0.29.4",
     "@uniweb/core": "^0.38.0",
-    "@uniweb/runtime": "^0.29.3",
     "@uniweb/semantic-parser": "^1.5.1",
     "@uniweb/schemas": "^0.13.0",
-    "@uniweb/kit": "^0.20.0"
+    "@uniweb/content-writer": "^0.3.4"
   },
   "peerDependencies": {
-    "@uniweb/content-reader": "^1.2.8",
-    "@uniweb/build": "^0.79.0",
-    "@uniweb/semantic-parser": "^1.5.1"
+    "@uniweb/build": "^0.80.0",
+    "@uniweb/semantic-parser": "^1.5.1",
+    "@uniweb/content-reader": "^1.2.8"
   },
   "peerDependenciesMeta": {
     "@uniweb/build": {

package/partials/agents.md

@@ -1740,7 +1740,7 @@ source: education
 
 ### Custom layouts
 
-Layouts live in `layouts/` inside the foundation and are auto-discovered. Set `defaultLayout` in `main.js`.
+Layouts live in `layouts/` inside the foundation and are auto-discovered. Set `defaultLayout` in `main.js`, or name a layout `Default`. With neither, a page that names no layout gets the built-in layout — `header`, the page, `footer`, nothing else — and a `defaultLayout` that names none of your layouts stops the build.
 
 ```jsx
 // layouts/DocsLayout/index.jsx

package/src/backend/site-sync.js

@@ -12,7 +12,7 @@
  */
 
 import { writeFileSync, readFileSync, mkdirSync, existsSync, unlinkSync } from 'node:fs'
-import { join, dirname, relative, isAbsolute } from 'node:path'
+import { join, dirname, relative, isAbsolute, basename } from 'node:path'
 import yaml from 'js-yaml'
 import { hasUncommittedContent } from '../utils/git.js'
 import { recordWritten } from '../utils/pull-written.js'
@@ -54,7 +54,8 @@ import {
   writeRegisteredFoundation,
   backfillLinkUuids,
   LINK_MODEL,
-  bankedFileUuids
+  bankedFileUuids,
+  existingSectionFile
 } from '@uniweb/build/uwx'
 
 // First entity `$`-document out of a `.uwx` we produced or the backend served.
@@ -295,7 +296,15 @@ export function pulledItemVersions(doc, itemVersions) {
 // The files a unit projects to, under the site's own roots — `site.yml::paths` can
 // relocate `pages` and `layout`. `site.yml` stands for the `info` unit, which projects
 // to three files.
-function unitFilesOf(siteDir, unitPath) {
+//
+// ⭐ A section unit's path names it by its id (`pages/about/about.md`), and the author's
+// file may carry an ordering prefix or a child mark (`1-about.md`, `@about.md`), which a
+// pull writes back into in place. So the unit is looked up as a pull finds it
+// (`existingSectionFile`). ⛔ Until 2026-10-07 the id path was taken as the file: a push
+// recorded no file for a numbered section, and the next `pull --merge` merged against an
+// older version — a false conflict on a line only the other side had changed (measured
+// on the starter's `1-welcome.md`).
+export function unitFilesOf(siteDir, unitPath) {
   if (unitPath === 'site.yml') return ['site.yml', 'theme.yml', 'head.html']
   let paths = {}
   try {
@@ -304,7 +313,12 @@ function unitFilesOf(siteDir, unitPath) {
     /* no or unreadable site.yml — the defaults are right */
   }
   for (const root of ['pages', 'layout']) {
-    if (unitPath.startsWith(`${root}/`)) return [`${paths[root] || root}${unitPath.slice(root.length)}`]
+    if (!unitPath.startsWith(`${root}/`)) continue
+    const rel = `${paths[root] || root}${unitPath.slice(root.length)}`
+    if (!rel.endsWith('.md') || existsSync(join(siteDir, rel))) return [rel]
+    const id = basename(rel, '.md')
+    const found = existingSectionFile(join(siteDir, dirname(rel)), id, id, { child: true })
+    return [found ? relative(siteDir, found) : rel]
   }
   return []
 }
@@ -2467,7 +2481,10 @@ export async function pushSyncPackages({
   // What the backend holds that this copy doesn't. None of it was overwritten, and no
   // later push will overwrite it — but the files are behind until a pull.
   if (notHeld.kept.length || notHeld.foreign.length) {
-    const paths = [...new Set([...notHeld.kept, ...notHeld.foreign])].sort()
+    // Named by the file it is in here, not by its id (`unitFilesOf`).
+    const paths = [
+      ...new Set([...notHeld.kept, ...notHeld.foreign].map((p) => (p === 'site.yml' ? p : unitFilesOf(siteDir, p)[0] || p)))
+    ].sort()
     note(`Changed on the backend by someone else, not in your files yet: ${paths.join(', ')}`)
     note('Take them with `uniweb refresh` (or `uniweb pull --merge`). Until then, pushing leaves them as they are.')
   }

package/src/commands/register.js

@@ -698,7 +698,10 @@ async function runRegister(args = []) {
           // fd 2 is our stderr: progress stays visible, stdout stays parseable.
           // Found by a harness that had to work around it by taking the last
           // JSON line off stdout.
-          stdio: jsonMode ? ['inherit', 2, 'inherit'] : 'inherit'
+          stdio: jsonMode ? ['inherit', 2, 'inherit'] : 'inherit',
+          // A step of register: the build's "Share with clients: uniweb register" hint
+          // would tell someone running register to run register.
+          env: { ...process.env, UNIWEB_BUILD_STEP: '1' }
         })
       } catch (err) {
         error(`Build failed: ${err.message}`)

package/src/framework-index.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-10-07T18:16:06.785Z",
+  "generatedAt": "2026-10-08T04:40:54.241Z",
   "packages": {
     "@uniweb/api": {
       "version": "0.7.0",
@@ -10,7 +10,7 @@
       ]
     },
     "@uniweb/build": {
-      "version": "0.79.0",
+      "version": "0.80.0",
       "path": "framework/build",
       "deps": [
         "@uniweb/content-reader",
@@ -84,7 +84,7 @@
       ]
     },
     "@uniweb/runtime": {
-      "version": "0.29.3",
+      "version": "0.29.4",
       "path": "framework/runtime",
       "deps": [
         "@uniweb/core",
@@ -117,7 +117,7 @@
       "deps": []
     },
     "@uniweb/templates": {
-      "version": "0.18.1",
+      "version": "0.18.2",
       "path": "framework/templates",
       "deps": []
     },
@@ -127,7 +127,7 @@
       "deps": []
     },
     "@uniweb/unipress": {
-      "version": "0.10.23",
+      "version": "0.10.24",
       "path": "framework/unipress",
       "deps": [
         "@uniweb/build",