uniweb 1.20.4 → 1.21.0

package/src/commands/status.js

@@ -1,81 +1,96 @@
 /**
- * uniweb status — show how a site's local files compare to the Uniweb backend:
- * its sync identity, unpushed content changes, and the foundation it references.
+ * uniweb status — what to know before working on a site, and what to run about it.
  *
- * LOCAL + OFFLINE by default: it builds the sync packages with an OFFLINE Model
- * resolver and diffs them against the send-only-changed cache (the same diff
- * `uniweb push` runs) — no auth, no backend round-trip.
+ * ⭐ THE ONE QUESTION AN AGENT ASKS IN A PROJECT OTHERS EDIT. Authors change a synced site in
+ * the app at any time, teammates push to git, and Uniweb releases often — and nothing else
+ * in the CLI says so before a command is refused. So status checks each of them, and ends
+ * with the steps to take, in an order that works when followed from the top
+ * (`utils/status-next.js`):
  *
- * `--remote` adds the backend signals (may prompt for login, like `git fetch`):
- *   - whether the synced draft differs from what's live (publish needed),
- *   - whether a newer foundation version is registered than the site pins, and
- *   - who has the site open in the app right now, and on what (`describeEditors`).
- * Those use ASSUMED endpoints (see kb shipping-verbs-and-freshness.md §6.5); until
- * the backend exposes them, `--remote` degrades silently to the local view.
+ *   git      conflicts, a merge waiting, the site's files not committed, the git remote
+ *   app      the session, the site, what changed on the backend since this copy last
+ *            synced, what is not pushed, whether the draft is live, who has the site open,
+ *            the foundation
+ *   uniweb   a newer release
+ *   health   doctor's findings
+ *   dev      the dev server
+ *
+ * ⛔ READ-ONLY, AND IT NEVER PROMPTS. It signs nobody in — with no session it says how — and
+ * writes nothing a later command reads as taken: no ETag, version or hash
+ * (`backend/app-changes.js`). Its one write is the user-level npm cache `update` and
+ * `--version` keep. A check it could not make is `unknown`, never `ok`.
+ *
+ * ⛔ THE GUARDS ARE THE VERBS' OWN. Where status says a push would be refused, it says so
+ * from the function the push calls (`unsettledFiles`, `uncommittedContent`, `untakenBase`),
+ * so the two cannot drift.
+ *
+ * ⭐ AN UPDATE IS NOT AN ALARM [Diego, 2026-10-26]: "most 'breaking' changes don't break a
+ * project, so we don't want to worry agents unnecessarily." A newer release is named with
+ * the one way to take it, the same for every release; none is called breaking.
  *
  * Usage:
- *   uniweb status            Sync identity + unpushed content + foundation ref (local)
- *   uniweb status --remote   Also: whether the backend still holds the site, draft-vs-live,
- *                            a newer-registered-foundation check, and who has it open in
- *                            the app
- *   uniweb status --json     One JSON line (adds a `remote` object under --remote, whose
- *                            `site_state` is live / gone / unknown — `gone` only on the
- *                            backend's own word that it holds no such site)
+ *   uniweb status              every check
+ *   uniweb status --offline    only what this machine knows — no request at all
+ *   uniweb status --json       one JSON document (`schema: 1`)
+ *   --org @x / --personal      the workspace to ask the backend in, for this command only
  *
- * Run from a site, or a workspace with one site.
+ * ⛔ Until 2026-10-26 a bare status was offline, `--remote` asked the backend, and `--json`
+ * was `{ synced, uuid, foundation, changed, unchanged, remote }`. `--remote` is refused now
+ * (`utils/flag-guard.js`).
  */
 
 import { existsSync, readFileSync } from 'node:fs'
-import { join } from 'node:path'
+import { join, relative, resolve } from 'node:path'
 import yaml from 'js-yaml'
 
-import { resolveSiteDir } from './deploy.js'
-import { probeUnpushed, readItemUuids, unitFilesOf } from '../backend/site-sync.js'
-import { resolveWorkspace } from '../backend/workspace.js'
 import {
-  BackendClient,
-  resolveBackendOrigin,
-  WorkspaceMismatchError
-} from '../backend/client.js'
+  probeUnpushed,
+  readItemUuids,
+  readSiteWorkspace,
+  sentRoots,
+  uncommittedContent,
+  unitFilesOf,
+  unsettledFiles,
+  untakenBase
+} from '../backend/site-sync.js'
+import { describeWorkspace, resolveWorkspace, SOURCE_LABEL } from '../backend/workspace.js'
+import { BackendClient, resolveBackendOrigin } from '../backend/client.js'
+import { readAppChanges } from '../backend/app-changes.js'
 import { readBackendState } from '@uniweb/build/uwx'
-import {
-  resolveLocalFoundation,
-  foundationScopedName
-} from '../backend/foundation-bring-along.js'
+import { resolveLocalFoundation, foundationScopedName } from '../backend/foundation-bring-along.js'
 import { computeFoundationDigest } from '../utils/code-upload.js'
 import { compareSemverPrecedence } from '../utils/semver-precedence.js'
 import { checkFlags } from '../utils/flag-guard.js'
+import { isExpired, readRegistryAuth } from '../utils/registry-auth.js'
+import {
+  filesDifferFrom,
+  ignoringRepo,
+  isAncestor,
+  mergeInProgress,
+  readSyncPoint,
+  repoOf,
+  unmergedPaths
+} from '../utils/sync-point.js'
+import { aheadBehind, remoteMoved, upstreamOf } from '../utils/git.js'
+import { getLatestVersion, isBehind } from '../utils/update-check.js'
+import { syncedElsewhere } from '../utils/site-identity.js'
+import { DEFAULT_BACKEND_ORIGIN } from '../utils/config.js'
+import { classifyPackage, findSites, findWorkspaceRoot } from '../utils/workspace.js'
+import { getCliVersion } from '../versions.js'
+import { planNext } from '../utils/status-next.js'
 
 const c = {
   reset: '\x1b[0m',
   bold: '\x1b[1m',
   dim: '\x1b[2m',
+  red: '\x1b[31m',
   cyan: '\x1b[36m',
   green: '\x1b[32m',
   yellow: '\x1b[33m'
 }
-const say = {
-  ok: (m) => console.log(`${c.green}✓${c.reset} ${m}`),
-  info: (m) => console.log(`${c.cyan}→${c.reset} ${m}`),
-  warn: (m) => console.log(`${c.yellow}⚠${c.reset} ${m}`),
-  dim: (m) => console.log(`  ${c.dim}${m}${c.reset}`)
-}
-
-function readSiteYml(siteDir) {
-  const p = join(siteDir, 'site.yml')
-  if (!existsSync(p)) return {}
-  try {
-    return yaml.load(readFileSync(p, 'utf8')) || {}
-  } catch {
-    return {}
-  }
-}
 
-function foundationRef(siteYml) {
-  const f = siteYml.foundation
-  if (!f) return null
-  return typeof f === 'string' ? f : f.ref || null
-}
+/** What the document's version says: a reader keyed on it never reads another shape. */
+export const STATUS_SCHEMA = 1
 
 // What an item that this copy has not synced is called — by its Section on the site.
 const ITEM_KIND = { pages: 'a page', page_sections: 'a section', layout_sections: 'a layout section' }
@@ -150,244 +165,687 @@ export function fileByItemUuid(siteDir, backend) {
   }
 }
 
-// A versioned registry ref `@org/name@1.2.3` → its scoped name `@org/name` and
-// pinned version `1.2.3`. A bare/local/unversioned ref → nulls.
+// ─── reading the project ────────────────────────────────────────────────────
+
+function readSiteYml(siteDir) {
+  const p = join(siteDir, 'site.yml')
+  if (!existsSync(p)) return {}
+  try {
+    return yaml.load(readFileSync(p, 'utf8')) || {}
+  } catch {
+    return {}
+  }
+}
+
+/**
+ * The site this status is about — never asked for: a status prompts for nothing. A site
+ * folder is its own; a workspace with one site, that one; with several, none, and the
+ * caller names them.
+ */
+async function findSite(cwd) {
+  if ((await classifyPackage(cwd)) === 'site') return { siteDir: cwd }
+  const root = findWorkspaceRoot(cwd)
+  if (!root) return { none: true }
+  const sites = await findSites(root)
+  if (sites.length === 1) return { siteDir: resolve(root, sites[0]) }
+  return sites.length ? { several: sites, root } : { none: true, root }
+}
+
+/**
+ * The `uniweb` this project runs: the copy installed in it, else the version its
+ * `package.json` names, else this CLI's own.
+ */
+function projectUniweb(siteDir) {
+  const root = findWorkspaceRoot(siteDir) || siteDir
+  try {
+    const v = JSON.parse(readFileSync(join(root, 'node_modules', 'uniweb', 'package.json'), 'utf8')).version
+    if (typeof v === 'string') return v
+  } catch {
+    // not installed
+  }
+  try {
+    const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'))
+    const spec = pkg.devDependencies?.uniweb || pkg.dependencies?.uniweb
+    const m = typeof spec === 'string' ? spec.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/) : null
+    if (m) return m[0]
+  } catch {
+    // no package.json
+  }
+  return getCliVersion()
+}
+
+function foundationRef(siteYml) {
+  const f = siteYml.foundation
+  if (!f) return null
+  return typeof f === 'string' ? f : f.ref || null
+}
+
+// A versioned registry ref `@org/name@1.2.3` → its scoped name and pinned version.
 function splitFoundationRef(fnd) {
   if (!fnd || fnd[0] !== '@') return { scope: null, version: null }
   const at = fnd.lastIndexOf('@')
-  return at > 0
-    ? { scope: fnd.slice(0, at), version: fnd.slice(at + 1) }
-    : { scope: null, version: null }
+  return at > 0 ? { scope: fnd.slice(0, at), version: fnd.slice(at + 1) } : { scope: null, version: null }
 }
 
-export async function status(args = []) {
-  // See utils/flag-guard.js — an unrecognized flag is invisible to a literal scan.
-  // Straight to stderr: this is a usage error, so it must not be mistaken for the
-  // status document even under --json.
-  const badFlag = checkFlags('status', args)
-  if (badFlag) {
-    console.error(`\x1b[31m✗\x1b[0m ${badFlag.message}`)
-    return { exitCode: 2 }
+const count = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`
+
+// ─── the checks ─────────────────────────────────────────────────────────────
+
+/**
+ * Git: conflicts, a merge waiting, what is not committed, and the git remote.
+ * @returns {Promise<{ checks: object[], proposals: object[], localFiles: string[]|null }>}
+ */
+async function gitChecks(siteDir, { offline, origin }) {
+  const checks = []
+  const proposals = []
+  const repo = repoOf(siteDir)
+  if (!repo) {
+    const ignored = Boolean(ignoringRepo(siteDir))
+    checks.push({
+      id: 'git.repo',
+      state: 'skipped',
+      summary: ignored
+        ? 'The git repository around this folder ignores it, so a pull here takes the backend\'s version over your files, asking first.'
+        : 'Not a git repository, so a pull here takes the backend\'s version over your files, asking first.'
+    })
+    return { checks, proposals, localFiles: null }
   }
-  const jsonMode = args.includes('--json')
-  const remote = args.includes('--remote')
-  const siteDir = await resolveSiteDir(args, 'status')
-  const siteYml = readSiteYml(siteDir)
-  const fnd = foundationRef(siteYml)
-  const { scope: fndScope, version: fndVersion } = splitFoundationRef(fnd)
+  checks.push({ id: 'git.repo', state: 'ok', summary: `In the git repository at ${repo.top}.`, quiet: true })
 
-  // Local content diff — builds the sync packages, never authenticates.
-  //
-  // ⭐ The ORIGIN is resolved here rather than taken from the client below, because
-  // this probe is deliberately offline and the client may never be built. It decides
-  // whose asset ids the comparison reads: against the wrong backend every media ref
-  // reads as changed.
-  const probeBackend = resolveBackendOrigin()
-  // ⭐ Identity is this backend's, from sync.json. It read `site.yml::$uuid`, so after
-  // step 4 moved the key every project reported itself as never synced.
-  const uuid = readBackendState(siteDir, probeBackend).site?.uuid || null
-  let probe = null
-  let probeErr = null
-  try {
-    probe = await probeUnpushed(siteDir, { backend: probeBackend })
-  } catch (err) {
-    probeErr = err.message
+  if (unsettledFiles(siteDir)) {
+    const files = unmergedPaths(repo).filter((p) => !repo.prefix || p.startsWith(repo.prefix))
+    checks.push({
+      id: 'git.conflicts',
+      state: 'blocking',
+      summary: `${count(files.length, 'file')} here ${files.length === 1 ? 'is' : 'are'} in conflict.`,
+      files,
+      blocks: ['push', 'publish', 'pull', 'refresh']
+    })
+    proposals.push({ step: 'conflicts', command: null, why: `settle the conflict markers in ${count(files.length, 'file')}, then \`git add\` each` })
+  } else {
+    checks.push({ id: 'git.conflicts', state: 'ok', summary: 'Nothing in conflict.', quiet: true })
   }
 
-  // Remote signals — opt-in (`--remote`). May prompt for login. Degrades to null
-  // on 404 / any failure, so a backend without the endpoints just shows local.
-  let site = null
-  // Whether the backend holds the site this binding names — live / gone / unknown, never
-  // folded (`client.siteState`). Null when there is no binding to ask about.
-  let siteState = null
-  let fdnLatest = null
-  let foundationFresh = null // true/false when both digests are known; else null
-  let localFoundationVersion = null
-  let remoteError = null // a refusal about the workspace — the one remote failure worth saying
-  if (remote) {
-    try {
-      const client = new BackendClient({
-        args,
-        command: 'Status'
-      })
-      // The workspace this status works in — the login's, unless this command names
-      // another (`workspace.js`). None chosen is reported, like a site outside it.
-      const ws = await resolveWorkspace({ client, args })
-      if (ws.refused) throw Object.assign(new Error(ws.reason), { status: 409 })
-      client.setWorkspace(ws.workspace, { source: ws.source })
-      if (uuid) {
-        siteState = await client.siteState(uuid)
-        if (siteState.state === 'live') {
-          site = siteState.site || null
-          // In another workspace: it exists, and the refusal says where — report it.
-          if (siteState.status === 409) remoteError = siteState.detail
-        } else if (siteState.refused) {
-          // The workspace this status works in, refused: say so — it is not a fact about the site.
-          remoteError = siteState.detail
+  const merging = mergeInProgress(repo)
+  checks.push(
+    merging
+      ? { id: 'git.merge', state: 'blocking', summary: 'A merge is waiting for its commit.', blocks: ['push', 'publish', 'pull', 'refresh'] }
+      : { id: 'git.merge', state: 'ok', summary: 'No merge in progress.', quiet: true }
+  )
+  if (merging) proposals.push({ step: 'merge', command: 'git commit', why: 'finish the merge in progress' })
+
+  const uncommitted = merging ? null : uncommittedContent(siteDir, { verb: 'push' })
+  const n = uncommitted?.paths.length || 0
+  checks.push(
+    uncommitted
+      ? {
+          id: 'git.uncommitted',
+          state: 'attention',
+          summary: repo.head
+            ? `${n} of the site's files ${n === 1 ? 'is' : 'are'} not committed — in git a push sends what is committed.`
+            : 'This repository has no commit yet — in git a push sends what is committed.',
+          files: uncommitted.paths,
+          blocks: ['push', 'publish']
         }
+      : { id: 'git.uncommitted', state: 'ok', summary: "The site's files are committed." }
+  )
+
+  // What this copy changed since its last sync, file by file — while its branch holds the
+  // sync point that sync recorded.
+  let localFiles = null
+  const point = readSyncPoint(siteDir, origin)
+  if (repo.head && point && isAncestor(repo, point)) localFiles = filesDifferFrom(repo, point, sentRoots(siteDir))
+
+  const upstream = upstreamOf(siteDir)
+  if (!upstream) {
+    checks.push({ id: 'git.remote', state: 'skipped', summary: 'No upstream branch to compare with.' })
+  } else {
+    const counts = aheadBehind(siteDir) || { ahead: 0, behind: 0 }
+    let moved = null
+    let asked = false
+    if (offline) {
+      moved = counts.behind > 0
+    } else {
+      const answer = await remoteMoved(siteDir)
+      if (answer) {
+        moved = answer.moved
+        asked = true
       }
-      // Foundation freshness: prefer the LOCAL foundation's scoped name (so a
-      // local-foundation site can be checked too); fall back to a scoped
-      // site.yml ref. The digest compare is read-only — it never builds, so it
-      // only fires when the local foundation is already built (dist present).
-      const local = resolveLocalFoundation(siteDir, siteYml)
-      localFoundationVersion = local?.version ?? null
-      const lookupName =
-        (local && (await foundationScopedName(local.dir))) || fndScope
-      if (lookupName) fdnLatest = await client.readFoundationLatest(lookupName)
-      if (local?.dir && fdnLatest?.digest) {
-        const localDigest = computeFoundationDigest(join(local.dir, 'dist'))
-        if (localDigest) foundationFresh = localDigest === fdnLatest.digest
-      }
-    } catch (err) {
-      // Degrade silently — except a refusal about the workspace: `--org` named one the
-      // backend does not work on this site from, or the deployment has another. Saying
-      // nothing would read as "fine".
-      if (err instanceof WorkspaceMismatchError || err?.status === 409) remoteError = err.message
-      // Not asked, or not answered: that is not knowing, never `gone`.
-      if (uuid && !siteState) siteState = { state: 'unknown', status: null, detail: err?.message || null }
     }
-  }
-
-  if (jsonMode) {
-    console.log(
-      JSON.stringify({
-        synced: Boolean(uuid),
-        uuid,
-        foundation: fnd,
-        changed: probe ? probe.changed : null,
-        unchanged: probe ? probe.unchanged : null,
-        ...(probeErr ? { error: probeErr } : {}),
-        ...(remote
-          ? {
-              remote: {
-                // ⭐ live · gone · unknown — `gone` only on the backend's own word about
-                // this site; null when this directory names no site on this backend.
-                site_state: siteState ? siteState.state : null,
-                site_state_detail: siteState?.detail ?? null,
-                site,
-                foundation_latest: fdnLatest?.latest_version ?? null,
-                foundation_fresh: foundationFresh,
-                ...(remoteError ? { error: remoteError } : {})
-              }
-            }
-          : {})
+    const parts = []
+    if (moved) parts.push(`${upstream.remote} has commits this branch does not${asked ? '' : ' (as of the last fetch)'}.`)
+    if (counts.ahead) parts.push(`${count(counts.ahead, 'commit')} here ${counts.ahead === 1 ? 'is' : 'are'} not on ${upstream.tracking}.`)
+    if (moved === null) {
+      checks.push({
+        id: 'git.remote',
+        state: 'unknown',
+        summary: `Could not ask ${upstream.remote} for new commits — no network, or it needs a sign-in.`,
+        lines: parts,
+        detail: { ...counts, upstream: upstream.tracking }
       })
-    )
-    return { exitCode: 0 }
+    } else {
+      checks.push({
+        id: 'git.remote',
+        state: parts.length ? 'attention' : 'ok',
+        summary: parts.length ? parts.join(' ') : `Up to date with ${upstream.tracking}${asked ? '' : ' (as of the last fetch)'}.`,
+        detail: { ...counts, upstream: upstream.tracking }
+      })
+    }
+    if (moved) proposals.push({ step: 'refresh', command: 'npx uniweb refresh', why: "take your teammates' commits" })
+    if (counts.ahead) proposals.push({ step: 'gitpush', command: 'git push', why: `share ${count(counts.ahead, 'commit')} with your team`, ask: true })
   }
+  return { checks, proposals, localFiles, uncommitted: Boolean(uncommitted), merging }
+}
 
-  console.log('')
+/**
+ * The session for `origin`, read and never asked for: UNIWEB_TOKEN, else the stored one.
+ * @returns {Promise<{ token: string, handle: string|null } | { expired: true } | null>}
+ */
+async function sessionFor(origin) {
+  if (process.env.UNIWEB_TOKEN) return { token: process.env.UNIWEB_TOKEN, handle: null }
+  const stored = await readRegistryAuth(origin)
+  if (!stored?.token) return null
+  if (isExpired(stored)) return { expired: true }
+  return { token: stored.token, handle: stored.handle || stored.username || null }
+}
 
-  // Sync identity
-  if (uuid) {
-    say.ok(`Synced — site-content ${c.bold}${uuid}${c.reset}`)
-  } else {
-    say.warn('Not synced — this site has never been pushed to a backend.')
-    say.dim(
-      'Run `uniweb push` to create it, or `uniweb publish` to sync and go live in one step.'
-    )
+/**
+ * The sign-in an agent runs: on this backend — a bare login goes to the default one — and in
+ * the workspace the site was created in, when this copy knows it.
+ */
+function loginCommand(siteDir, origin, uuid) {
+  const server = origin === DEFAULT_BACKEND_ORIGIN ? '' : ` --server ${origin}`
+  if (!uuid) return `npx uniweb login --browser${server}`
+  const ws = readSiteWorkspace(siteDir, origin)
+  return `npx uniweb login --browser${server} ${ws ? `--org ${ws}` : '--personal'}`
+}
+
+/** Unit paths → the files the author keeps them in, as a pull writes them back. */
+function filesOfUnits(siteDir, units) {
+  return units.map((u) => (u === 'site.yml' ? 'site.yml' : unitFilesOf(siteDir, u)[0] ?? u))
+}
+
+/**
+ * The app: what the backend holds of this site, against this copy.
+ * @returns {Promise<{ checks: object[], proposals: object[], backend: object }>}
+ */
+async function appChecks(siteDir, siteYml, { offline, args, git }) {
+  const checks = []
+  const proposals = []
+  const origin = resolveBackendOrigin()
+  const uuid = readBackendState(siteDir, origin).site?.uuid || null
+  const backend = { origin, workspace: null }
+
+  // ── What this machine knows ──
+  const base = git.merging ? null : untakenBase(siteDir, origin)
+  if (base) {
+    checks.push({
+      id: 'app.base',
+      state: 'blocking',
+      summary: base.headline.replace(/^Not pushed — /, '').replace(/^./, (ch) => ch.toUpperCase()),
+      blocks: ['push', 'publish']
+    })
+    proposals.push({ step: 'pull', command: 'npx uniweb pull', why: "merge the backend's content with yours" })
   }
 
-  // Content
-  if (probeErr) {
-    say.warn(`Couldn't compute content changes: ${probeErr}`)
-    say.dim(
-      'A build error or an unresolved data Model can block the offline diff.'
-    )
-  } else if (!uuid) {
-    const n = probe.changed
-    say.info(`${n} content ${n === 1 ? 'entity' : 'entities'} ready to push.`)
-  } else if (probe.changed === 0) {
-    say.ok('Content is in sync with the last push.')
-  } else {
-    const n = probe.changed
-    say.info(
-      `${c.bold}${n}${c.reset} content ${n === 1 ? 'entity' : 'entities'} not pushed` +
-        (probe.unchanged ? ` (${probe.unchanged} unchanged)` : '') +
-        '.'
+  // What this copy holds that the backend lacks: by file, from the sync point, in git; else
+  // the send-only-changed probe a push runs, which counts entities.
+  let unpushedFiles = null
+  let unpushed = false
+  if (!uuid) {
+    const elsewhere = process.env.UNIWEB_SERVER ? null : syncedElsewhere(siteDir, origin)
+    checks.push(
+      elsewhere
+        ? {
+            id: 'app.site',
+            state: 'attention',
+            summary: `This project's site is on ${elsewhere.join(', ')}, not on ${origin}, where you are signed in.`,
+            lines: [`To work with it there: npx uniweb login --server ${elsewhere[0]}`]
+          }
+        : { id: 'app.unpushed', state: 'skipped', summary: `Not in the app on ${origin} yet — \`npx uniweb push\` puts it there.` }
     )
-    say.dim(
-      'Run `uniweb publish` to sync and go live (or `uniweb push` to sync only).'
+  } else if (git.localFiles) {
+    unpushedFiles = git.localFiles
+    unpushed = unpushedFiles.length > 0
+    checks.push(
+      unpushed
+        ? {
+            id: 'app.unpushed',
+            state: 'attention',
+            summary: `${count(unpushedFiles.length, 'file')} here ${unpushedFiles.length === 1 ? 'holds' : 'hold'} changes the backend does not have yet.`,
+            files: unpushedFiles
+          }
+        : { id: 'app.unpushed', state: 'ok', summary: 'Nothing waiting to be pushed.' }
     )
+  } else {
+    try {
+      const probe = await probeUnpushed(siteDir, { backend: origin })
+      unpushed = probe.changed > 0
+      checks.push({
+        id: 'app.unpushed',
+        state: unpushed ? 'attention' : 'ok',
+        summary: unpushed ? 'This copy holds changes the backend does not have yet.' : 'Nothing waiting to be pushed.',
+        detail: { entities: probe.changed, unchanged: probe.unchanged }
+      })
+    } catch (err) {
+      checks.push({ id: 'app.unpushed', state: 'unknown', summary: `Could not tell what is not pushed: ${err.message}` })
+    }
+  }
+  if (uuid && (unpushed || git.uncommitted)) {
+    proposals.push({
+      step: 'push',
+      command: git.uncommitted ? 'npx uniweb push --commit -m "<what you changed>"' : 'npx uniweb push',
+      why: git.uncommitted ? 'commit your changes and send them to the app' : 'send your changes to the app'
+    })
   }
 
-  // Foundation
-  if (fnd) say.dim(`Foundation: ${fnd}`)
+  if (offline) {
+    checks.push({ id: 'app.session', state: 'skipped', summary: 'The backend was not asked (--offline).' })
+    return { checks, proposals, backend }
+  }
 
-  // Remote signals
-  if (remote) {
-    if (remoteError) say.warn(remoteError)
-    if (siteState?.state === 'gone') {
-      say.warn(`The backend has no site ${uuid} — it was deleted there, or the backend was rebuilt.`)
-      say.dim(
-        `To push this as a new site: uniweb forget --server ${probeBackend}, then uniweb push.`
-      )
-    } else if (siteState?.state === 'unknown') {
-      // A refused workspace is already said above, as itself.
-      const detail = siteState.refused ? null : siteState.detail
-      say.dim(`Could not tell whether the backend holds this site${detail ? ` (${detail})` : ''}.`)
+  // ── What the backend says ──
+  const session = await sessionFor(origin)
+  if (!session || session.expired) {
+    if (!uuid) {
+      checks.push({ id: 'app.session', state: 'skipped', summary: `Not signed in to ${origin} — needed to bring the site into the app.` })
+    } else {
+      checks.push({
+        id: 'app.session',
+        state: 'unknown',
+        summary: session?.expired
+          ? `The session on ${origin} has expired, so nothing there was checked.`
+          : `Not signed in to ${origin}, so nothing there was checked.`
+      })
+      proposals.push({ step: 'login', command: loginCommand(siteDir, origin, uuid), why: `sign in, so the backend can be checked` })
     }
-    if (site) {
-      if (site.draft_dirty) {
-        say.info(
-          'Synced draft has changes not yet live — run `uniweb publish` to go live.'
-        )
-      } else if (site.published) {
-        say.ok('Live with the latest synced content.')
-      } else {
-        say.info(
-          'Synced but not published yet — run `uniweb publish` to go live.'
-        )
-      }
+    return { checks, proposals, backend }
+  }
+
+  const client = new BackendClient({ token: session.token, args, command: 'Status' })
+  const ws = await resolveWorkspace({ client, args }).catch((err) => ({ refused: true, reason: err.message }))
+  if (ws.refused) {
+    checks.push({
+      id: 'app.session',
+      state: 'blocking',
+      summary: `Signed in to ${origin}, with no workspace chosen.`,
+      lines: String(ws.reason || '').split('\n').map((l) => l.trim()).filter(Boolean),
+      blocks: ['push', 'publish', 'pull']
+    })
+    proposals.push({
+      step: 'login',
+      command: uuid && readSiteWorkspace(siteDir, origin) ? `npx uniweb login --org ${readSiteWorkspace(siteDir, origin)}` : null,
+      why: 'choose the workspace to work in — the person decides which',
+      ask: true
+    })
+    return { checks, proposals, backend }
+  }
+  client.setWorkspace(ws.workspace, { source: ws.source })
+  backend.workspace = ws.workspace
+  checks.push({
+    id: 'app.session',
+    state: 'ok',
+    summary: `Signed in to ${origin}${session.handle ? ` as @${String(session.handle).replace(/^@/, '')}` : ''}, working in ${describeWorkspace(ws.workspace)} (${SOURCE_LABEL[ws.source] || ws.source}).`
+  })
+
+  const [state, changes, foundation] = await Promise.all([
+    uuid ? client.siteState(uuid) : null,
+    uuid ? readAppChanges({ client, siteDir, siteUuid: uuid }).catch((err) => ({ error: err })) : null,
+    foundationCheck(siteDir, siteYml, client).catch(() => null)
+  ])
+
+  if (state) {
+    // ⭐ `site_state` is the backend's word on this site — `live`, `gone` or `unknown` —
+    // for a script that decides on it: `gone` only when the backend says it holds no such
+    // site, never for a failure to reach it (`client.siteState`).
+    const detail = { site_state: state.state }
+    if (state.status === 401) {
+      checks.push({ id: 'app.site', state: 'unknown', summary: `${origin} did not accept the session — sign in again.`, detail })
+      proposals.push({ step: 'login', command: loginCommand(siteDir, origin, uuid), why: 'sign in again' })
+    } else if (state.state === 'gone') {
+      checks.push({
+        id: 'app.site',
+        state: 'blocking',
+        summary: `${origin} has no site ${uuid} — it was deleted there, or the backend was rebuilt.`,
+        lines: [`To push this as a new site: npx uniweb forget --server ${origin}, then npx uniweb push.`],
+        blocks: ['push', 'publish', 'pull'],
+        detail
+      })
+    } else if (state.state === 'live' && state.status === 409) {
+      checks.push({
+        id: 'app.site',
+        state: 'blocking',
+        summary: 'The site is kept in another workspace.',
+        lines: state.detail ? [state.detail] : [],
+        blocks: ['push', 'publish', 'pull'],
+        detail: { ...detail, workspace: state.workspace ?? null }
+      })
+      if (state.workspace) proposals.push({ step: 'login', command: `npx uniweb login --org ${state.workspace}`, why: `work in ${state.workspace}, where the site is`, ask: true })
+    } else if (state.state === 'live') {
+      checks.push({ id: 'app.site', state: 'ok', summary: `The site is in the app on ${origin}.`, quiet: true, detail })
+    } else {
+      checks.push({ id: 'app.site', state: 'unknown', summary: `Could not tell whether ${origin} holds this site${state.detail ? ` (${state.detail})` : ''}.`, detail })
+    }
+  }
+
+  if (changes) checks.push(...changeChecks(siteDir, changes, unpushedFiles, proposals))
+
+  const site = state?.site
+  if (site) {
+    if (!site.published) {
+      checks.push({ id: 'app.live', state: 'attention', summary: 'In the app, not live yet.' })
+      proposals.push({ step: 'publish', command: 'npx uniweb publish', why: 'take the site live — the person decides, and it may ask for payment', ask: true })
+    } else if (site.draft_dirty) {
+      checks.push({ id: 'app.live', state: 'attention', summary: 'Live, with changes in the app that are not live yet.' })
+      proposals.push({ step: 'publish', command: 'npx uniweb publish', why: 'make those changes live — the person decides', ask: true })
+    } else {
+      checks.push({ id: 'app.live', state: 'ok', summary: 'Live, with the latest content.' })
     }
     // An array is the backend's answer, `[]` included; no key is a backend that does not
     // say, and then neither do we.
-    if (Array.isArray(site?.editors)) {
-      if (!site.editors.length) {
-        say.dim('Nobody has this site open in the app.')
-      } else {
-        say.info('Open in the app now:')
-        const fileOf = fileByItemUuid(siteDir, probeBackend)
-        for (const { person, tabs } of describeEditors(site.editors, { fileOf })) {
-          console.log(`    ${person}${tabs.length ? '' : ', with nothing open'}`)
-          for (const tab of tabs) console.log(`      ${c.dim}${tab}${c.reset}`)
-        }
+    if (Array.isArray(site.editors)) {
+      const people = describeEditors(site.editors, { fileOf: fileByItemUuid(siteDir, origin) })
+      // One person is named once, in the summary; several, on each of their tabs.
+      const who = (p) => (people.length === 1 ? '' : `${p.person}: `)
+      checks.push(
+        people.length
+          ? {
+              id: 'app.editors',
+              state: 'attention',
+              summary: `Open in the app now: ${people.map((p) => p.person).join(', ')}.`,
+              lines: people.flatMap((p) => (p.tabs.length ? p.tabs.map((t) => `${who(p)}${t}`) : [`${who(p)}nothing open`])),
+              detail: { editors: site.editors }
+            }
+          : { id: 'app.editors', state: 'ok', summary: 'Nobody has the site open in the app.', detail: { editors: [] } }
+      )
+    }
+  }
+  if (foundation) checks.push(foundation)
+  return { checks, proposals, backend }
+}
+
+/** `app.changes`: what moved on the backend, and where it meets what moved here. */
+function changeChecks(siteDir, changes, unpushedFiles, proposals) {
+  if (changes.error) {
+    return [{ id: 'app.changes', state: 'unknown', summary: `Could not read the site from the backend: ${changes.error.message}` }]
+  }
+  const { content, records } = changes
+  const unknown = [content, records].filter((l) => l.state === 'unknown')
+  const files = [
+    ...filesOfUnits(siteDir, [...content.changed, ...content.removed]),
+    ...content.added.map((u) => `${u} (new)`)
+  ]
+  const lines = []
+  if (content.outsideUnits) lines.push("the site's settings — its services, languages or queries")
+  if (records.changed.length) lines.push(`records changed: ${records.changed.join(', ')}`)
+  if (records.added.length) lines.push(`records added: ${records.added.join(', ')}`)
+  if (records.removed) lines.push(`${count(records.removed, 'record')} removed`)
+  if (records.folder) lines.push('the records\' sub-folders (folder.yml)')
+  const moved = files.length + lines.length
+  if (!moved) {
+    return [
+      unknown.length
+        ? { id: 'app.changes', state: 'unknown', summary: `Could not tell what changed on the backend: ${unknown.map((l) => l.detail).join('; ')}.` }
+        : { id: 'app.changes', state: 'ok', summary: 'Nothing changed on the backend since this copy last synced.' }
+    ]
+  }
+  // Where the backend's changes meet this copy's: a push of those is refused until a pull
+  // merges them — `diffSiteUnits`' "changed on both sides".
+  const overlap = unpushedFiles?.length ? files.filter((f) => unpushedFiles.includes(f)) : []
+  const n = files.length + content.outsideUnits + records.changed.length + records.added.length + records.removed + records.folder
+  proposals.push({ step: 'pull', command: 'npx uniweb pull', why: `take the ${count(n, 'change')} made on the backend` })
+  return [
+    {
+      id: 'app.changes',
+      state: overlap.length ? 'blocking' : 'attention',
+      summary:
+        `${count(n, 'change')} on the backend since this copy last synced — in the app, or pushed from another copy.` +
+        (overlap.length ? ` You changed ${count(overlap.length, 'of those files', 'of those files')} here too.` : ''),
+      files,
+      lines,
+      ...(overlap.length ? { blocks: ['push', 'publish'] } : {}),
+      detail: {
+        content: { state: content.state, changed: content.changed, added: content.added, removed: content.removed, outsideUnits: content.outsideUnits },
+        records: { state: records.state, changed: records.changed, added: records.added, removed: records.removed, folder: records.folder },
+        ...(overlap.length ? { overlap } : {}),
+        ...(unknown.length ? { unknown: unknown.map((l) => l.detail) } : {})
       }
     }
-    if (
-      fdnLatest?.latest_version &&
-      fndVersion &&
-      fdnLatest.latest_version !== fndVersion
-    ) {
-      say.info(
-        `A newer foundation version (${fdnLatest.latest_version}) is registered than the site pins (${fndVersion}).`
+  ]
+}
+
+/**
+ * `app.foundation`: the local foundation against its registered version — what the next
+ * push or publish does with it (`backend/foundation-bring-along.js`).
+ */
+async function foundationCheck(siteDir, siteYml, client) {
+  const fnd = foundationRef(siteYml)
+  const { scope: fndScope, version: fndVersion } = splitFoundationRef(fnd)
+  const local = resolveLocalFoundation(siteDir, siteYml)
+  const name = (local && (await foundationScopedName(local.dir))) || fndScope
+  if (!name) return null
+  const latest = await client.readFoundationLatest(name)
+  if (!latest?.latest_version) return null
+  if (local?.dir) {
+    const digest = latest.digest ? computeFoundationDigest(join(local.dir, 'dist')) : null
+    if (!digest) return null // not built, or the registry keeps no digest: nothing to compare
+    if (digest === latest.digest) return { id: 'app.foundation', state: 'ok', summary: 'The foundation matches its registered version.' }
+    if (compareSemverPrecedence(local.version, latest.latest_version) === -1) {
+      return {
+        id: 'app.foundation',
+        state: 'blocking',
+        summary: `The registry holds foundation ${latest.latest_version}, newer than your ${local.version} — a push or publish stops until you pull that change, or pass --bump to release yours above it.`,
+        blocks: ['push', 'publish']
+      }
+    }
+    return { id: 'app.foundation', state: 'attention', summary: "The foundation's code changed since it was registered — the next push or publish releases it as the next version." }
+  }
+  if (fndVersion && latest.latest_version !== fndVersion) {
+    return { id: 'app.foundation', state: 'attention', summary: `A newer version of the foundation (${latest.latest_version}) is registered than the site pins (${fndVersion}).` }
+  }
+  return { id: 'app.foundation', state: 'ok', summary: `The site pins the latest version of its foundation (${fndVersion}).` }
+}
+
+/** `uniweb.version`: a newer Uniweb, named the same way for every release. */
+async function versionCheck(siteDir, { offline }) {
+  const runs = projectUniweb(siteDir)
+  if (offline) return { checks: [{ id: 'uniweb.version', state: 'skipped', summary: `This project runs Uniweb ${runs}; npm was not asked (--offline).` }], proposals: [] }
+  const latest = await getLatestVersion({ allowNetwork: true, timeoutMs: 2000, maxAgeMs: 60 * 60 * 1000 })
+  if (!latest) return { checks: [{ id: 'uniweb.version', state: 'unknown', summary: `This project runs Uniweb ${runs}; npm did not answer, so a newer release is not known.` }], proposals: [] }
+  if (!isBehind(runs, latest)) {
+    return { checks: [{ id: 'uniweb.version', state: 'ok', summary: `Uniweb ${runs}, the latest.`, detail: { runs, latest } }], proposals: [] }
+  }
+  return {
+    checks: [{ id: 'uniweb.version', state: 'attention', summary: `Uniweb ${latest} is out; this project runs ${runs}.`, detail: { runs, latest } }],
+    proposals: [{ step: 'update', latest: true, command: 'npx uniweb@latest update', why: 'bring the project and its AGENTS.md up to date — then build, and look at the pages' }]
+  }
+}
+
+// Doctor's findings `uniweb update` answers: the project's dependencies, or its AGENTS.md,
+// behind the CLI it runs.
+const UPDATE_FINDINGS = new Set(['deps-behind-cli', 'agents-md-missing', 'agents-md-unstamped', 'agents-md-outdated'])
+
+/**
+ * `health.doctor`: doctor's findings, read without printing them.
+ *
+ * ⚠️ doctor measures the project against the CLI that RUNS it. Run by a newer CLI than the
+ * project's (`npx uniweb@latest status`), its dependency and AGENTS.md findings are against
+ * that newer one — which the project's own `uniweb update` does not know — so the step that
+ * answers them is the newer CLI's.
+ */
+async function doctorCheck(siteDir) {
+  try {
+    const { doctor } = await import('./doctor.js')
+    const res = await doctor([], { quiet: true })
+    const open = (res.issues || []).filter((i) => !i.fixed && (i.type === 'error' || i.type === 'warn'))
+    if (!open.length) return { checks: [{ id: 'health.doctor', state: 'ok', summary: 'doctor: every check passes.' }], proposals: [] }
+    const ids = [...new Set(open.map((i) => i.id).filter(Boolean))]
+    const parts = [res.errors && count(res.errors, 'error'), res.warnings && count(res.warnings, 'warning')].filter(Boolean)
+    const proposals = []
+    if (open.some((i) => UPDATE_FINDINGS.has(i.id))) {
+      const newer = isBehind(projectUniweb(siteDir), getCliVersion())
+      proposals.push(
+        newer
+          ? { step: 'update', latest: true, command: 'npx uniweb@latest update', why: 'bring the project and its AGENTS.md up to date — then build, and look at the pages' }
+          : { step: 'update', command: 'npx uniweb update', why: "align the dependencies and AGENTS.md with this project's Uniweb" }
       )
     }
-    // What the next push or publish does with it (`backend/foundation-bring-along.js`):
-    // release changed code — under the next version when its own is taken — unless the
-    // registry holds a NEWER version, which stops them. ⛔ This pointed at `uniweb
-    // register` until 2026-09-24 — which cannot release a change under a version
-    // already registered, since a registered version is immutable.
-    if (foundationFresh === false) {
-      if (compareSemverPrecedence(localFoundationVersion, fdnLatest.latest_version) === -1) {
-        say.info(
-          `The registry holds foundation ${fdnLatest.latest_version}, newer than your ${localFoundationVersion} — a push or publish stops until you pull that change, or pass \`--bump\` to release yours above it.`
-        )
+    const rest = open.filter((i) => !UPDATE_FINDINGS.has(i.id))
+    if (rest.length) proposals.push({ step: 'doctor', command: 'npx uniweb doctor', why: `read its ${count(rest.length, 'finding')} — \`--fix\` repairs what it can` })
+    return {
+      checks: [
+        {
+          id: 'health.doctor',
+          state: 'attention',
+          summary: `doctor: ${parts.join(', ')}${ids.length ? ` (${ids.join(', ')})` : ''}.`,
+          detail: { errors: res.errors, warnings: res.warnings, issues: open.map(({ id, type, message }) => ({ id: id ?? null, type, message })) }
+        }
+      ],
+      proposals
+    }
+  } catch (err) {
+    return { checks: [{ id: 'health.doctor', state: 'unknown', summary: `doctor did not finish: ${err.message}` }], proposals: [] }
+  }
+}
+
+/** `dev.server`: the site's dev server, confirmed by asking it. */
+async function devCheck(siteDir, { offline }) {
+  if (offline) return { id: 'dev.server', state: 'skipped', summary: 'The dev server was not asked (--offline).' }
+  try {
+    const { runningDevServer } = await import('@uniweb/build/site')
+    const running = await runningDevServer(siteDir, { timeout: 1000 })
+    return running
+      ? { id: 'dev.server', state: 'ok', summary: `The dev server is running at ${running.url}.`, detail: { url: running.url } }
+      : { id: 'dev.server', state: 'skipped', summary: 'The dev server is not running — `npx uniweb dev` starts it.' }
+  } catch (err) {
+    return { id: 'dev.server', state: 'unknown', summary: `Could not ask the dev server: ${err.message}` }
+  }
+}
+
+// ─── the command ────────────────────────────────────────────────────────────
+
+const GROUPS = [
+  ['git', 'Git'],
+  ['app', 'App'],
+  ['uniweb', 'Uniweb'],
+  ['health', 'Health'],
+  ['dev', 'Dev server']
+]
+
+const ICON = {
+  ok: `${c.green}✓${c.reset}`,
+  attention: `${c.cyan}→${c.reset}`,
+  blocking: `${c.red}✗${c.reset}`,
+  unknown: `${c.yellow}?${c.reset}`,
+  skipped: `${c.dim}·${c.reset}`
+}
+
+function render({ siteLabel, backend, checks, next }) {
+  const out = ['']
+  out.push(`${c.bold}Status of ${siteLabel}${c.reset}`)
+  for (const [prefix, title] of GROUPS) {
+    const group = checks.filter((k) => k.id.split('.')[0] === prefix && !(k.quiet && k.state === 'ok'))
+    if (!group.length) continue
+    out.push('')
+    out.push(prefix === 'app' ? `${c.bold}${title}${c.reset} ${c.dim}— ${backend.origin}${c.reset}` : `${c.bold}${title}${c.reset}`)
+    for (const k of group) {
+      out.push(`  ${ICON[k.state]} ${k.state === 'skipped' ? `${c.dim}${k.summary}${c.reset}` : k.summary}`)
+      const files = k.files || []
+      for (const f of files.slice(0, 12)) out.push(`      ${c.dim}${f}${c.reset}`)
+      if (files.length > 12) out.push(`      ${c.dim}… and ${files.length - 12} more${c.reset}`)
+      for (const l of k.lines || []) out.push(`      ${c.dim}${l}${c.reset}`)
+    }
+  }
+  out.push('')
+  if (!next.length) {
+    out.push(`${ICON.ok} ${c.bold}Nothing to do.${c.reset}`)
+  } else {
+    out.push(`${c.bold}Next${c.reset}`)
+    next.forEach((s, i) => {
+      const ask = s.ask ? `${c.yellow}ask the person first —${c.reset} ` : ''
+      if (s.command) {
+        out.push(`  ${i + 1}. ${c.cyan}${s.command}${c.reset}`)
+        out.push(`     ${ask}${c.dim}${s.why}${c.reset}`)
       } else {
-        say.info(
-          'Local foundation differs from the registered version — the next `uniweb push` or `uniweb publish` releases it.'
-        )
+        out.push(`  ${i + 1}. ${ask}${s.why}`)
       }
-    } else if (foundationFresh === true) {
-      say.ok('Local foundation matches the registered version.')
-    }
-    if (!site && !fdnLatest) {
-      say.dim('(No remote signals — the backend may not expose them yet.)')
+    })
+  }
+  const unknown = checks.filter((k) => k.state === 'unknown').map((k) => k.id)
+  if (unknown.length) {
+    out.push('')
+    out.push(`${c.dim}Not known: ${unknown.join(', ')} — see above.${c.reset}`)
+  }
+  out.push('')
+  return out.join('\n')
+}
+
+export async function status(args = []) {
+  // See utils/flag-guard.js — an unrecognized flag is invisible to a literal scan.
+  // Straight to stderr: this is a usage error, so it must not be mistaken for the
+  // status document even under --json.
+  const badFlag = checkFlags('status', args)
+  if (badFlag) {
+    console.error(`${c.red}✗${c.reset} ${badFlag.message}`)
+    return { exitCode: 2 }
+  }
+  const json = args.includes('--json')
+  const offline = args.includes('--offline')
+
+  const found = await findSite(process.cwd())
+  if (!found.siteDir) {
+    const sites = found.several || []
+    if (json) {
+      console.log(JSON.stringify({ schema: STATUS_SCHEMA, error: sites.length ? 'several-sites' : 'no-site', sites }))
+    } else if (sites.length) {
+      console.error(`${c.red}✗${c.reset} Several sites here — run status from the one you mean:`)
+      for (const s of sites) console.error(`  ${c.cyan}cd ${s} && npx uniweb status${c.reset}`)
+    } else {
+      console.error(`${c.red}✗${c.reset} No Uniweb site here. Run status from a site, or a project with one site.`)
     }
+    return { exitCode: 2 }
+  }
+  const siteDir = found.siteDir
+  const siteYml = readSiteYml(siteDir)
+  const origin = resolveBackendOrigin()
+
+  // ⭐ Under --json, stdout carries the document and nothing else: whatever a check's
+  // helpers say on the way goes to stderr.
+  const saved = { log: console.log, info: console.info, warn: console.warn }
+  if (json) console.log = console.info = console.warn = (...a) => console.error(...a)
+  let git, app, version, health, dev
+  try {
+    git = await gitChecks(siteDir, { offline, origin })
+    ;[app, version, health, dev] = await Promise.all([
+      appChecks(siteDir, siteYml, { offline, args, git }),
+      versionCheck(siteDir, { offline }),
+      doctorCheck(siteDir),
+      devCheck(siteDir, { offline })
+    ])
+  } finally {
+    Object.assign(console, saved)
   }
+  const checks = [...git.checks, ...app.checks, ...version.checks, ...health.checks, dev]
+  const next = planNext([...git.proposals, ...app.proposals, ...version.proposals, ...health.proposals])
 
-  console.log('')
+  const root = findWorkspaceRoot(siteDir) || siteDir
+  const site = relative(root, siteDir) || '.'
+  if (json) {
+    console.log(
+      JSON.stringify({
+        schema: STATUS_SCHEMA,
+        uniweb: getCliVersion(),
+        site,
+        backend: app.backend.origin,
+        workspace: app.backend.workspace,
+        offline,
+        checks: checks.map(({ quiet, id, state, summary, blocks = [], ...rest }) => ({ id, state, summary, blocks, ...rest })),
+        next
+      })
+    )
+    return { exitCode: 0 }
+  }
+  console.log(render({ siteLabel: site === '.' ? 'this site' : `${site}/`, backend: app.backend, checks, next }))
   return { exitCode: 0 }
 }