uniweb 0.83.0 → 0.85.0

package/src/commands/publish.js

@@ -55,10 +55,11 @@ import {
 } from '@uniweb/build/site'
 import { emitSyncPackages } from '@uniweb/build/uwx'
 import {
-  decideDeclaration,
-  fingerprintRequest,
+  bankLanguages,
   reconcile,
-  reconcileRequest
+  announceServices,
+  foundationSupports,
+  recordsNotAsked
 } from '../backend/service-request.js'
 import { isSiteRelativeExtensionUrl } from '@uniweb/build'
 import { resolveDefaultLocale } from '@uniweb/core/locale-config'
@@ -235,19 +236,6 @@ export function unservedLanguages(asked, served) {
   return asked.filter((l) => !got.has(l))
 }
 
-function describeServices(rows) {
-  if (!Array.isArray(rows) || rows.length === 0) return 'nothing'
-  return rows
-    .map((r) => {
-      const name = typeof r?.name === 'string' ? r.name : '?'
-      // A row that omits `enabled` is an ask, not a refusal — the backend's three
-      // states. Only an explicit `false` reads as off.
-      return r?.enabled === false ? `${name} (off)` : name
-    })
-    .sort()
-    .join(', ')
-}
-
 async function persistLastDeploy(siteDir, opts) {
   if (opts.saveDeploys === false) return
   try {
@@ -392,9 +380,9 @@ export async function publish(args = []) {
     resolved = resolvePublishTarget(deployYml, client.origin, {
       defaultBackend: DEFAULT_BACKEND_ORIGIN
     })
-    // The last request we are known to have sent TO THIS BACKEND, for the declaration
-    // gate below. Read from the SAME deploy.yml load — one read, and the memo is the
-    // only durable record of it (see backend/service-request.js for why not the cache).
+    // The language selection last sent TO THIS BACKEND, for its reconcile below. Read
+    // from the SAME deploy.yml load — one read, and the memo is the only durable record
+    // of it (see backend/service-request.js).
     priorRequest = deployYml?.deploys?.[resolved.targetName] || null
   } catch {
     // Malformed/ambiguous deploy.yml — don't block the publish on the memo.
@@ -818,98 +806,20 @@ export async function publish(args = []) {
   const injectInfo = {
     ...(fnd.ref ? { foundation: fnd.ref } : {})
   }
-  // ⛔ IS THE FILE ASKING FOR ANYTHING BY ITS `$services` / `$secrets` BLOCK?
-  //
-  // The blocks ride inside the site-content document, so without this gate every
-  // push re-sends them — and the backend REPLACES what it is sent. A paragraph
-  // edit would therefore overwrite whatever the stored request has become, which
-  // in the consent workflow is a decision the owner made in the app. Under "the
-  // file is a request", an unchanged block is not asking for anything.
-  //
-  // ⚠️ The residual window, stated because it is real and narrow: the base is
-  // banked at publish, so a request changed in the app BETWEEN a `uniweb pull` and
-  // the next publish is not seen — the pulled block reads as unchanged-from-nothing
-  // and is declared. It closes when the status route carries the stored request
-  // (backend is adding it) and we compare against theirs instead of our memory.
-  //
-  // ⭐ ASK THE BACKEND rather than trusting our memory, when it will tell us. The
-  // banked fingerprint says what WE last sent; the status read says what the site
-  // actually has. Only the second one sees a change made in the app, which is where
-  // the consent workflow's decisions happen — so this is what closes the window
-  // between a `uniweb pull` and the next publish.
-  //
-  // ⚖️ Degrades to the banked comparison on any failure — an older backend, a
-  // network blip, a site never pushed. That is the shipped behaviour and it is safe:
-  // it withholds an unchanged block and sends a changed one; it merely cannot see
-  // the app's side.
-  // What this site is PROVISIONED with on the backend being published to.
-  const provisioned = readBackendState(siteDir, client.origin)
-  const boundUuid = provisioned.site?.uuid || null
-  let declaration = decideDeclaration(siteYml, priorRequest, provisioned)
-  let adopted = null
-  // Before the push, so a never-synced site has no uuid and simply skips this.
-  const status =
-    // This backend's site, from sync.json. It read `site.yml::$uuid`, so after step 4
-    // the remote reconcile below never ran and every publish declared blind.
-    boundUuid
-      ? await client.siteStatus(boundUuid)
-      : null
-  if (status && Array.isArray(status.services)) {
-    const r = reconcileRequest(siteYml, status.services, priorRequest, provisioned)
-    if (r.action === 'none') {
-      declaration = { declare: false, reason: 'in-sync' }
-    } else if (r.action === 'send') {
-      declaration = { declare: true, reason: 'changed' }
-    } else if (r.action === 'adopt') {
-      // The owner decided in the app and this file is simply behind. Nothing to
-      // ask for, so nothing is sent — and the file can be brought in line, which
-      // is offered rather than done, because site.yml is theirs.
-      declaration = { declare: false, reason: 'adopt' }
-      adopted = status.services
-    } else {
-      // ⛔ CONFLICT — both moved. Withhold and SAY SO. Not a stop: the content
-      // publish is a separate thing the owner asked for, and blocking it over a
-      // services disagreement couples two unrelated intents. Not a guess either;
-      // the request stays in their file, unsent, and they are told.
-      declaration = { declare: false, reason: 'conflict' }
-      adopted = status.services
-    }
-  }
+  // ⭐ WHAT THE SITE HAS — read before the push, for the language selection. Only this
+  // read sees a decision the owner made in the app since this clone last synced. It
+  // reads this backend's site, from sync.json; a never-synced site has none.
+  const boundUuid = readBackendState(siteDir, client.origin).site?.uuid || null
+  const status = boundUuid ? await client.siteStatus(boundUuid) : null
 
-  // ⛔ EVERY STRING BELOW IS FOR A SITE OWNER, NOT FOR US.
-  //
-  // "request", "declaration", "send", "adopt", "reconcile" are how this file
-  // MODELS the problem and they are the wrong words to say out loud: an author
-  // does not think they are sending a request, they think they want their site to
-  // have search. Say services, on and off, site.yml and your site. The internal
-  // vocabulary stays in the code and the comments, where it earns its precision.
-  //
-  // ⭐ THE OWNER IS THE ONLY ONE WHO CAN RANK TWO OF THEIR OWN INTENTS.
-  //
-  // `conflict` means the file and the site both moved since we last agreed, so
-  // neither is "the" request. ⛔ Withholding silently and saying "edit site.yml"
-  // is advice that CANNOT WORK: with no banked base the file has nothing to move
-  // relative to, so editing it produces the same conflict forever. That shipped
-  // for one commit. Asking is the only thing that resolves it.
-  if (declaration.reason === 'conflict') {
-    say.warn('Your site\'s services were changed elsewhere, and site.yml changed too.')
-    say.dim(`  in sync.json: ${describeServices(provisioned.services)}`)
-    say.dim(`  on your site: ${describeServices(adopted)}`)
-    if (isNonInteractive(args)) {
-      say.dim('  Left your site as it is — run without --non-interactive to choose.')
-    } else if (await confirm('Use the services listed in site.yml?', false)) {
-      declaration = { declare: true, reason: 'resolved-send' }
-      adopted = null
-    } else {
-      // Declining to send is not yet a decision to take theirs, so this falls
-      // through to the offer below and "neither, leave it alone" stays available.
-      declaration = { declare: false, reason: 'adopt' }
-    }
-  }
+  // ⭐ THE SERVICES are stated by the push itself — the file's, and off for each held
+  // one it no longer lists (`statedServices`) — and the backend decides per service.
+  // Said here: what the file asks that will not be sent as written.
+  announceServices({ siteYml, say, supports: await foundationSupports(siteDir, siteYml) })
 
-  // ⭐ THE SAME QUESTION FOR THE LANGUAGE SELECTION, and it is the one that costs.
+  // ⭐ THE LANGUAGE SELECTION IS A REQUEST TOO, and it is the one that costs.
   //
-  // `publishLanguages` is a request like `$services`: pushed up, projected back on
+  // `publishLanguages` is a request like `services`: pushed up, projected back on
   // pull, stored on the other side. ⛔ Nothing over there deliberately rewrites it
   // today — which is why this was nearly skipped — but a base is not only for
   // detecting an overwrite. Without one, a selection that has always been in the
@@ -938,34 +848,6 @@ export async function publish(args = []) {
     }
   }
 
-  if (declaration.reason === 'adopt' && adopted) {
-    // ⚖️ Deliberately says WHAT differs, not WHO moved. The usual cause is a
-    // decision made in the app — but the same state follows a request of ours the
-    // site refused, where nothing of theirs changed and ours simply did not take.
-    // We cannot tell those apart here, so the wording claims neither.
-    say.info('Your site has different services than site.yml lists.')
-    say.dim(`  in sync.json: ${describeServices(provisioned.services)}`)
-    say.dim(`  on your site: ${describeServices(adopted)}`)
-    // ⭐ OFFERED, NEVER DONE. site.yml is the owner's file, and a publish that
-    // silently rewrites an authored file is the surprise this seam exists to
-    // avoid. Default No, and declining costs nothing: the site is already
-    // correct, only the file is behind, and the offer returns next publish.
-    //
-    // ⚖️ A DECLINED conflict reaches here too, and that is deliberate — having
-    // been asked which they meant and said "not mine", taking the site's is the
-    // other half of the same question, not a silent overwrite of an edit.
-    if (!isNonInteractive(args) && (await confirm('Update site.yml to match?', false))) {
-      const { writeSiteConfig } = await import('@uniweb/build/uwx')
-      writeSiteConfig(siteDir, { $services: adopted })
-      // Keep the in-memory copy in step, or the deploy.yml bank below records the
-      // file as it WAS and the offer repeats forever.
-      siteYml.$services = adopted
-      say.ok('site.yml updated.')
-    }
-  } else if (!declaration.declare && declaration.reason !== 'adopt') {
-    say.dim('Services unchanged.')
-  }
-
   // publish rides the same gated push as `uniweb push`: if an app author has
   // edited since this clone last synced, the push is refused rather than
   // overwriting them, and nothing goes live. `--force` drops the precondition.
@@ -983,7 +865,6 @@ export async function publish(args = []) {
     backend: client.origin,
     // The keys this deployment's Sections take — see deploymentFields.
     ...fields,
-    ...(declaration.declare ? {} : { declareServices: false }),
     // Placement identity for the folder — see writeFolderItemUuids.
     folderItemUuids: readFolderItemUuids(siteDir, client.origin),
     // Identity for the records' list items — see readRecordItemUuids.
@@ -1017,6 +898,10 @@ export async function publish(args = []) {
   if (refuseUnsendableRecords(pkg.refusals, { error: say.err, note: say.dim })) {
     return { exitCode: 1 }
   }
+  // ⭐ `records` is what delivers the records the pages show on the published site — said
+  // here, at publish, and never at push: syncing records does not depend on it.
+  const notAsked = recordsNotAsked({ siteYml, shown: pkg.recordsShown })
+  if (notAsked) say.warn(notAsked)
   const report = {
     info: (m) => say.info(m),
     note: (m) => say.dim(m),
@@ -1127,24 +1012,9 @@ export async function publish(args = []) {
     lastDeploy: {
       at: new Date().toISOString(),
       host: 'uniweb',
-      // The request this publish is known to have sent — the base the declaration
-      // gate compares against next time. ⛔ A FINGERPRINT, never the block:
-      // deploy.yml is committed, `$secrets` carries secret material and a
-      // service's `config` is opaque, so recording either verbatim would write
-      // them into git. Absent when the file declares no block.
-      ...(declaration.declare
-        ? fingerprintRequest(siteYml, provisioned)
-        : {
-            // Nothing was sent, so the base is unchanged — carry it forward
-            // rather than dropping it, or the next publish would read "no record"
-            // and declare.
-            ...(priorRequest?.servicesRequest
-              ? { servicesRequest: priorRequest.servicesRequest }
-              : {}),
-            ...(priorRequest?.secretsRequest
-              ? { secretsRequest: priorRequest.secretsRequest }
-              : {})
-          }),
+      // The language selection this publish sent — the base its reconcile compares
+      // against next time. ⛔ A FINGERPRINT: the selection itself is in site.yml.
+      ...bankLanguages(siteYml),
       // What was actually shipped. A version number can't answer that — two
       // publishes of "0.1.0" are not the same content — and after the fact the
       // working tree has moved on. `dirty` matters as much as the sha: it says the

package/src/commands/pull.js

@@ -95,7 +95,8 @@ import {
   rebankSyncHashes,
   writeQueryUuids,
   mergeBaseVersions,
-  mergeItemBaseVersions,
+  writeItemBaseVersions,
+  pulledItemVersions,
   writeUnitBases,
   writeItemUuids,
   writeFolderItemUuids
@@ -887,6 +888,9 @@ export async function pull(args = [], deps = {}) {
   // The Models the pulled site's queries name, as the push qualified them — the re-bank
   // below resolves with them too (see there).
   let pulledQueryModels = []
+  // The versions this copy holds after the pull: every site-content item the pulled
+  // document carries (`pulledItemVersions`), banked below once the files have taken it.
+  let pulledVersions = null
   if (content && !content.notModified) {
     const siteDoc =
       content.docs &&
@@ -905,6 +909,7 @@ export async function pull(args = [], deps = {}) {
       // The next push re-establishes it; until then our side reports as unknown,
       // which is honest rather than wrong.
       writeUnitBases(siteDir, client.origin, { remote: computeUnitHashes(siteDoc), local: {} })
+      pulledVersions = pulledItemVersions(siteDoc, content.itemVersions)
       // Per-item identity for the next push. Without it the backend reads our
       // records as new and re-mints every page and section row.
       writeItemUuids(siteDir, client.origin, collectUnitUuids(siteDoc))
@@ -1216,7 +1221,13 @@ export async function pull(args = [], deps = {}) {
       // Records this pull did not place were not taken, so neither is their lane.
       if (lane === folderLane && recordsNotPlaced) continue
       mergeBaseVersions(siteDir, client.origin, lane.versions)
-      mergeItemBaseVersions(siteDir, client.origin, lane.itemVersions)
+    }
+    // ⭐ The site-content items' versions REPLACE what this copy held: a pull is how it
+    // sees the site, and a version kept for an item the site no longer has would be sent
+    // again, asking the backend to delete it. The folder lane's are not kept — that lane
+    // is gated by its entity version. (Both were merged into one map until 2026-10-07.)
+    if (pulledVersions && content && !content.notModified && !content.refused) {
+      writeItemBaseVersions(siteDir, client.origin, pulledVersions)
     }
     // Persist the ETags so the next pull is conditional (304 when unchanged). The
     // folder's is DROPPED when records were not placed, so the next pull fetches

package/src/commands/push.js

@@ -74,7 +74,8 @@ import {
   syncedElsewhere,
   describeSyncedElsewhere
 } from '../utils/site-identity.js'
-import { confirm } from '../utils/interactive.js'
+import { confirm, isNonInteractive } from '../utils/interactive.js'
+import { announceServices, foundationSupports } from '../backend/service-request.js'
 import { guardEmptyRecords } from '../utils/records-guard.js'
 import { bringFoundationAlong } from '../backend/foundation-bring-along.js'
 import {
@@ -520,6 +521,10 @@ export async function push(args = [], deps = {}) {
       ref: siteYml?.foundation
     })
   }
+  // ⭐ THE SERVICES `site.yml` ASKS FOR are stated by the emit — the file's, and off for
+  // each held one it no longer lists (`statedServices`) — and the backend decides per
+  // service. Said here: what the file asks that will not be sent as written.
+  announceServices({ siteYml, say: { warn }, supports: await foundationSupports(siteDir, siteYml) })
   const emitOptions = {
     backend: client.origin,
     // Placement identity for the folder — see writeFolderItemUuids.

package/src/framework-index.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-10-06T02:16:00.292Z",
+  "generatedAt": "2026-10-07T11:39:54.164Z",
   "packages": {
     "@uniweb/api": {
       "version": "0.6.10",
@@ -10,7 +10,7 @@
       ]
     },
     "@uniweb/build": {
-      "version": "0.76.1",
+      "version": "0.78.0",
       "path": "framework/build",
       "deps": [
         "@uniweb/content-reader",
@@ -35,7 +35,7 @@
       "deps": []
     },
     "@uniweb/core": {
-      "version": "0.37.1",
+      "version": "0.37.2",
       "path": "framework/core",
       "deps": [
         "@uniweb/semantic-parser",
@@ -55,7 +55,7 @@
       ]
     },
     "@uniweb/kit": {
-      "version": "0.19.17",
+      "version": "0.19.18",
       "path": "framework/kit",
       "deps": [
         "@uniweb/core",
@@ -84,7 +84,7 @@
       ]
     },
     "@uniweb/runtime": {
-      "version": "0.29.1",
+      "version": "0.29.2",
       "path": "framework/runtime",
       "deps": [
         "@uniweb/core",
@@ -117,7 +117,7 @@
       "deps": []
     },
     "@uniweb/templates": {
-      "version": "0.17.14",
+      "version": "0.18.0",
       "path": "framework/templates",
       "deps": []
     },
@@ -127,7 +127,7 @@
       "deps": []
     },
     "@uniweb/unipress": {
-      "version": "0.10.20",
+      "version": "0.10.22",
       "path": "framework/unipress",
       "deps": [
         "@uniweb/build",