@blocofy/cli 0.9.0 → 0.10.0

package/bin/blocofy.mjs

@@ -9,21 +9,52 @@
  * livereload. No monorepo required.
  */
 import { randomUUID } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { join, relative, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 import { parseArgs } from "../lib/args.mjs";
-import { checkPages, migrateLayout, pullContent, pushContent } from "../lib/content-sync.mjs";
+import { FORCE_REASON_MAX, checkPages, forcedPaths, migrateLayout, pullContent, pushContent } from "../lib/content-sync.mjs";
 import { PagesCliError, formatDiagnostic } from "../lib/page-files.mjs";
-import { credentialsPath, loadApiCredentials, loadCredentials, saveCredentials } from "../lib/credentials.mjs";
+import {
+  CredentialsError,
+  ENV_CONTEXT,
+  credentialsPath,
+  defaultSecretStoreName,
+  envContext,
+  loadStore,
+  readSecrets,
+  removeSecrets,
+  saveStore,
+  withStoreLock,
+  writeSecret,
+} from "../lib/credentials.mjs";
+import { printError, printTarget, printWarning, redact, registerSecret, targetData } from "../lib/output.mjs";
+import {
+  CONTEXT_NAME_RE,
+  TargetError,
+  claimNewBinding,
+  compareOrigin,
+  enforceBindingPolicy,
+  findBinding,
+  precheckContext,
+  resolveContext,
+  verifyApi,
+  verifyDev,
+  verifyTarget,
+  writeBinding,
+} from "../lib/target.mjs";
 import { startDevServer } from "../lib/dev-server.mjs";
 import { readLocalTemplates } from "../lib/local-theme.mjs";
 import { CliRefusal, DEFAULT_API_URL, decidePageMediaUses, fetchPageMediaUses, isValidApiKey } from "../lib/media-uses.mjs";
-import { githubNote, retryNotice, statusLine, syncScopeNote } from "../lib/messages.mjs";
+import { githubNote, healthAdvice, retryNotice, statusLine, syncScopeNote } from "../lib/messages.mjs";
 import { promptSecret } from "../lib/secret-prompt.mjs";
-import { diffTheme, fetchCanonicalSupport, fetchDevSession, fetchSiteStatus, fetchWhoami, publishInstance, pullTheme, pushTheme, renameInstance } from "../lib/theme-sync.mjs";
+import { MANIFEST_PATH, buildManifest, validateSiteStateTree, verifyManifest } from "../lib/site-state.mjs";
+import { SiteStateFsError, hashBuffer, readSiteStateTree, stagedWriteTree } from "../lib/site-state-fs.mjs";
+import { migrateSiteState } from "../lib/site-migrate.mjs";
+import { applySiteState, downloadAssetBytes, fetchSiteStateExport, planSiteState, publishSiteState, uploadMediaAsset } from "../lib/site-state-client.mjs";
+import { diffTheme, fetchCanonicalSupport, fetchDevSession, fetchSiteStatus, publishInstance, pullTheme, pushTheme, renameInstance } from "../lib/theme-sync.mjs";
 import { isAffirmative, livePushDecision, resolvePushMode } from "../lib/confirm.mjs";
 import { hyperlink, openUrl } from "../lib/term.mjs";
 import { isValidToken, isValidUrl, normalizeUrl } from "../lib/validate.mjs";
@@ -38,7 +69,7 @@ const args = process.argv.slice(2);
 // 0.8.0: `login --api-key` DEĞERSİZ bayraktır (parser'da boolean) — sır gizli prompt'tan ya da
 // BLOCOFY_API_KEY'den gelir, argv'ye asla girmez. `pages media-uses` / `media-decide` v1 API komutlarıdır.
 const KNOWN = {
-  login: ["url", "token", "api-key", "api-url"],
+  login: ["url", "token", "api-key", "api-url", "keychain"],
   pages: ["decisions", "expected-revision-id", "expected-version", "json"],
   themePull: ["draft", "instance"],
   themePush: ["diff", "draft", "instance", "name", "live", "yes", "confirm", "dry-run", "validate", "idempotency-key", "prune"],
@@ -46,15 +77,27 @@ const KNOWN = {
   themePublish: ["instance"],
   themeRename: ["name"],
   content: [],
+  settingsPush: ["instance", "live", "yes", "confirm"],
   pagesPull: ["strict"],
-  pagesPush: ["dry-run", "strict"],
+  pagesPush: ["dry-run", "strict", "force", "reason"],
   pagesCheck: ["strict"],
   pagesMigrate: ["dry-run", "write", "strict"],
+  siteExport: [],
+  siteValidate: ["strict"],
+  siteMigrate: ["dry-run", "write"],
+  sitePlan: ["target", "mode", "accept-live-effects"],
+  siteApply: ["target", "mode", "accept-live-effects"],
+  sitePublish: ["target", "mode", "yes"],
 };
+// CF-T1/T2: every command accepts the global `--context <name>` and `--json` (machine-readable refusals).
 function parseArgsOrExit(rest, known) {
-  const parsed = parseArgs(rest, new Set([...known, "help", "version"]));
+  const parsed = parseArgs(rest, new Set([...known, "context", "json", "help", "version"]));
   if (parsed.unknownFlag) {
-    console.error(`Unknown flag ${parsed.unknownFlag}. Nothing was written. See \`blocofy --help\`.`);
+    printError({ code: "USAGE_UNKNOWN_FLAG", message: `Unknown flag ${parsed.unknownFlag}. Nothing was written. See \`blocofy --help\`.`, details: { flag: parsed.unknownFlag } }, { json: args.includes("--json") });
+    process.exit(1);
+  }
+  if (parsed.flags.context !== undefined && (typeof parsed.flags.context !== "string" || !CONTEXT_NAME_RE.test(parsed.flags.context))) {
+    console.error("--context needs a context name (letters, digits, . _ -). Nothing was written.");
     process.exit(1);
   }
   return parsed;
@@ -72,29 +115,45 @@ function printHelp() {
 Develop your theme locally against live data, preview it three ways, and publish.
 
 Usage
-  blocofy login [--url <url>] [--token <bcf_…>]
-      Save your platform URL + dev token to ~/.blocofy/credentials.json.
+  blocofy login [--context <name>] [--url <url>] [--token <bcf_…>] [--keychain]
+      Verify a dev token against its site (GET /api/dev/whoami) and save it as a named
+      context (default name: the site's slug). Nothing is saved if verification fails.
       Get a token from the admin panel → Settings → Theme CLI tokens.
+        --keychain   keep the secret in the macOS keychain (or BLOCOFY_SECRET_STORE=keychain);
+                     default: ~/.blocofy/secrets.json (0600)
 
-  blocofy login --api-key [--api-url <url>]
-      Save a v1 API key (blcf_live_…) for the \`pages media-*\` commands. The key is read
-      from a HIDDEN prompt — the flag takes no value, so the key never lands in your shell
-      history. Kept alongside the dev token in the same credentials file.
+  blocofy login --api-key [--context <name>] [--api-url <url>]
+      Verify a v1 API key (blcf_live_…, GET /api/v1/ping) and add it to a context. The key is
+      read from a HIDDEN prompt — the flag takes no value. If the context already has a dev
+      token for another site, nothing is saved (TARGET_CREDENTIAL_MISMATCH).
         --api-url <url>  API origin (default https://app.blocofy.com)
       Non-interactive shells: set BLOCOFY_API_KEY + BLOCOFY_API_URL instead.
 
+  blocofy contexts [--json]          list saved contexts (never prints secrets)
+  blocofy use <name>                 default context for read-only commands outside a project
+  blocofy logout --context <name>    remove a context and its secrets
+  blocofy link [dir] --context <name> [--adopt]
+      Bind a project directory to the context's (verified) site: writes .blocofy/project.json
+      (commit it), .blocofy/local.json (your context; git-ignored) and .blocofy/.gitignore.
+      Refuses to rebind a directory bound to another site unless --adopt.
+  blocofy target [dir] [--context <name>] [--json]
+      Show which site a command in [dir] would hit (verified), without writing anything.
+
   blocofy theme dev [dir] [--port <n>] [--no-sync] [--name <name>]
       Start a dev server and print 3 auto-reloading views — Local, live-domain
       Preview, and the theme Editor. Press l / p / e to open each, q to quit.
       Edit a file and save → every open view reloads. Saves sync to a DRAFT theme
       only (never the live site). (dir defaults to cwd)
+      The target site is verified ONCE at start; a long session keeps that target (restart
+      it after changing credentials, context or the project binding).
         --port <n>   local port (default 3030)
         --no-sync    local preview only (skip draft sync + remote views)
         --name <name>  name the draft when it is first created (ignored if it already exists)
 
   blocofy theme pull [dir] [--draft] [--instance <handle>]
       Download the live theme to disk. (dir defaults to cwd)
-        --draft      pull the draft theme (what 'theme dev' syncs into) instead of live
+        --draft      pull the draft theme (what 'theme dev' syncs into) instead of live;
+                     creates the draft if missing, so it needs a bound project
         --instance <handle>  pull a specific theme by its handle (from the admin
                              panel theme card, or \`blocofy status\`)
 
@@ -113,22 +172,24 @@ Usage
         --validate   alias for --dry-run (validate only, nothing written)
         --diff       show what a push WOULD change vs the target (read-only), then stop
         --idempotency-key <k>  attach an idempotency key so a retried push is not double-applied
-        --prune      also REMOVE target files that no longer exist locally (lists them first;
-                     on the live theme asks to confirm — non-interactive shells must add --yes)
+        --prune      also REMOVE target files that no longer exist locally, locales/ included
+                     (lists them first; on the live theme asks to confirm — non-interactive
+                     shells must add --yes)
 
   blocofy theme rename <handle> <new name>
       Rename a theme (the name is just a label). Works on any of your themes,
       including the live one. Handle comes from the panel theme card or 'blocofy status'.
 
   blocofy theme publish [--instance <handle>]
-      Publish a draft theme to the LIVE site. With no flag, publishes the draft that
-      'theme dev' / 'theme push --draft' writes into. The server refuses to publish a
-      theme that has no pages (it would 404) — so publishing is always safe.
+      Publish a draft theme to the LIVE site: it REPLACES the live theme for every visitor.
+      With no flag, publishes the draft that 'theme dev' / 'theme push --draft' writes into.
+      The server refuses to publish a theme that has no pages (it would 404); preview first.
         --instance <handle>  publish a specific theme (handle from the panel / status)
 
   blocofy status
       Show the live theme, page distribution per instance, drafts, and a health flag
-      (ok / live_instance_empty / pages_split). Run before/after publishing.
+      (ok / live_instance_empty / pages_split). For a problem it names the theme holding the
+      pages, the missing pages, why, and safe preview-first next steps — never a one-line fix.
 
   blocofy pages pull [dir] [--strict]
       Download published pages, one folder per language:
@@ -136,26 +197,37 @@ Usage
         pages/<locale>/routes/<path>/index.json   every other page ("/about" → routes/about/index.json)
       Files from the old layout (pages/<slug>.json) are reported, never deleted or overwritten.
       If the site cannot export every published page, nothing is written, every reason is
-      printed (PAGES_EXPORT_INCOMPLETE) and the exit code is 1 (--strict: warnings also exit 1).
+      printed (PAGES_EXPORT_INCOMPLETE) and the exit code is 2 (--strict: warnings exit 1).
 
-  blocofy pages push [dir] [--dry-run] [--strict]
+  blocofy pages push [dir] [--dry-run] [--strict] [--force --reason <text>]
       Write pages/**.json to the site. Updates EXISTING pages only — never creates or
       deletes a page; unchanged pages are skipped. Every file is checked first: if any
       file is invalid, two files point at the same page, or a folder's language does not
       match the file's "locale", NO page is changed. If publishing then stops unexpectedly
       (PAGES_APPLY_FAILED or another publish error), some pages may already be applied: the per-file
-      result printed is authoritative, the exit code is 1, and running the push again is safe.
-      --dry-run: check on the server, write nothing.
+      result printed is authoritative, the exit code is non-zero, and running the push again is safe.
+      Stale files: every pulled file carries "base_revision" (the page as you pulled it). The push
+      first asks for a plan (per page: action, live/draft, changed fields), prints it, then pushes
+      exactly that plan. If a page changed on the site since you pulled it (PAGES_REVISION_CONFLICT)
+      or a file has no base_revision (PAGES_BASE_REVISION_REQUIRED), nothing is changed (exit 2):
+      run \`blocofy pages pull\`, merge your edits, push again. If the site changes between the plan
+      and the push, nothing is changed either (PAGES_PLAN_STALE, exit 2) — run the push again.
+      --force --reason <text>: overwrite anyway (reason: 1-500 characters); the
+      forced pages are listed. An older server cannot check revisions: the push runs
+      as before with a warning.
+      --dry-run: print the plan, write nothing. --json: the server's plan/result JSON on stdout.
       Needs a platform that supports language folders (else PAGES_SERVER_UPGRADE_REQUIRED).
 
   blocofy pages check [dir] [--strict]
-      Check page files. Offline: paths, JSON, layout, duplicates. Logged in: also the
-      site's languages and the server-side dry run. Exit 1 on errors (--strict: warnings too).
+      Check page files. Offline: paths, JSON, layout, duplicates, missing base_revision
+      (PAGES_BASE_REVISION_MISSING warning). Logged in: also the site's languages and the
+      server-side dry run. Exit 1 on errors (--strict: warnings too).
 
   blocofy pages migrate-layout [dir] [--dry-run | --write] [--strict]
       Move old-layout files (pages/<slug>.json) to language folders. --dry-run (default)
       prints the plan; --write moves only proven files. Any ambiguity or conflict: nothing
-      is moved, exit 1. Files without "locale" use the site's default language (login needed).
+      is moved, exit 1. Files without "locale" use the site's default language (login needed;
+      with --write outside a bound project only an explicit --context/env credentials are used).
 
   blocofy pages media-uses <page-handle> [--json]
       List a page's localized-media decisions on its newest DRAFT (v1 API, pages:read).
@@ -168,27 +240,111 @@ Usage
       decorative?, idempotency_key?, witness? } ] } (max 20). Without the two --expected-*
       flags the CLI first GETs the draft and uses its current revision id/version; items
       without an idempotency_key get a random UUID.
+      Transient failures (429/502/503/504, network) are retried: every item carries an
+      idempotency key before the first attempt, so a retry replays the same batch.
       Exit codes: 0 applied (or "No changes" when every item was already recorded);
-      1 usage/auth/network/5xx (no retry); 2 the server refused (4xx) — the {error} JSON
+      1 usage/auth/network/5xx; 2 the server refused (4xx) — the {error} JSON
       is printed to stderr.
 
-  blocofy settings pull [dir] / settings push [dir]
+  blocofy settings pull [dir]
+  blocofy settings push [dir] (--instance <handle> | --live [--yes])
       Download / upload config/settings.json (theme tokens/settings + color schemes).
+      A push names its target (no implicit live write):
+        --instance <handle>  write that theme's settings; a draft shows them in its preview
+                             and goes live with 'blocofy theme publish --instance <handle>'
+        --live       write the LIVE theme (asks to confirm; non-interactive shells add --yes)
+      After a push the CLI says where it applied (preview now / live now / after deploy).
+
+  blocofy site export [dir]
+      Download the whole site as a declarative tree (pages, navigation, theme source, settings,
+      chrome, translations, media/assets.json) into [dir], plus every media file's bytes at
+      media/files/<sha256> (downloaded and hash-verified). Refuses to overwrite a directory
+      bound to another site (same binding rule as every other pull).
+
+  blocofy site validate [dir]
+      Check an exported (or hand-authored) tree OFFLINE — zero network requests: paths, the
+      path↔content binding (a page file's locale/slug must match its folder/name, and so on),
+      duplicate identities, the size/count limits, and the tree against its own manifest digest.
+      Exit 1 on errors (--strict: warnings too).
+
+  blocofy site migrate [dir] [--dry-run | --write]
+      Turn a directory left by the older separate 'theme pull' / 'pages pull' / 'settings pull'
+      into the site-state v1 tree layout (theme-dirs-at-root → theme/**, config/settings.json →
+      theme/config/settings.json). Purely local: no network request, no target/identity check,
+      '.blocofy/' project binding untouched. 'pages/**' files are never moved (already canonical);
+      a file still at the old flat page layout is left alone with a note to run
+      'blocofy pages migrate-layout' first. --dry-run (default) prints the plan: every move,
+      every file left alone, every conflict. --write performs it. Any ambiguity or conflict (a
+      target already exists with different content, an unreadable or symlinked entry, a path the
+      shared site-state rules refuse): zero moves, exit 1. Never invents the parts a directory of
+      separate pulls never had (blocofy-site.json, site/locales.json, globals, navigation,
+      translations, theme/chrome/**) — says so, and points at 'blocofy site export' for those.
+
+  blocofy site plan [dir] [--target new|<handle>] [--mode same_site|restore]
+                    [--accept-live-effects locales] [--json]
+      Ask the site what applying this tree WOULD do — no write. Needs BOTH a dev token and a
+      v1 API key (the dev token is what a theme deploy uses later). Prints the status
+      (planned / awaiting_assets / awaiting_theme_source / draft_complete), the steps, and any
+      missing assets or a differing theme source.
+        --target new|<handle>   a fresh draft theme version (default), or a specific one you
+                                own (from a previous plan/apply's target instance)
+        --mode same_site|restore  same_site refuses a page that changed on this site since the
+                                  tree was exported; restore (default) does not
+        --accept-live-effects locales  required before a state that adds a language may be
+                                       applied (publishing a language prepares its homepage
+                                       LIVE, contract §A3)
+
+  blocofy site apply [dir] [--target new|<handle>] [--mode same_site|restore]
+                     [--accept-live-effects locales] [--json]
+      Build the state into a DRAFT theme version — the live site is never touched. Loops:
+      plan → (upload missing media via the v1 API, or deploy the theme source via the same
+      canonical path 'theme push --instance' uses) → plan → apply, until the target reports
+      draft_complete or 5 passes are used. Safe to re-run: every step is idempotent and a
+      re-plan picks up exactly what is left, so an apply interrupted by anything (network,
+      Ctrl-C, a crash) resumes with the same command.
+      Preview it from the admin panel, then: blocofy site publish.
+
+  blocofy site publish [dir] [--target new|<handle>] [--mode same_site|restore] [--yes]
+      Make an applied state the LIVE site: pointer swap, then navigation, then settings.
+      Refuses (exit 2) if the state is not fully applied yet — run 'site apply' first.
+      Separate live gate: asks to confirm (non-interactive shells must add --yes).
 
   blocofy --version
   blocofy --help
 
 Examples
-  blocofy login --url https://store.myblocofy.com --token bcf_xxxxxxxx
-  blocofy theme pull && blocofy theme dev
-  blocofy theme push && blocofy theme publish
-  blocofy status
-  blocofy login --api-key
+  blocofy login --url https://store.myblocofy.com --token bcf_xxxxxxxx     (context "store")
+  blocofy theme pull store-theme --context store && cd store-theme && blocofy theme dev
+  blocofy link ~/code/store-theme --context store     (an existing checkout)
+  blocofy theme push && blocofy theme publish          (inside the bound project)
+  blocofy target && blocofy status
+  blocofy login --api-key --context store
   blocofy pages media-uses pg_abc123 --json
   blocofy pages media-decide pg_abc123 --decisions decisions.json
 
-Auth: ~/.blocofy/credentials.json (from \`login\`), or BLOCOFY_URL + BLOCOFY_TOKEN env vars.
-v1 API (pages media-*): \`login --api-key\`, or BLOCOFY_API_KEY + BLOCOFY_API_URL env vars.
+Targets (which site a command talks to)
+  Every remote command verifies its site first and prints a Target block on stderr.
+  The context is chosen in this order: --context → BLOCOFY_CONTEXT → env credentials
+  (BLOCOFY_URL+BLOCOFY_TOKEN and/or BLOCOFY_API_URL+BLOCOFY_API_KEY) → .blocofy/local.json
+  → the one saved context matching the project's site → (terminal) pick from the matches.
+  Inside a bound project \`use\` is ignored. Commands that change a site (theme push/publish/
+  rename/dev sync, pages push, settings push, pages media-decide) need a bound project;
+  pulls into a new empty directory bind it. A wrong project/site pairing changes nothing.
+  A binding made against an older server has no platform origin: it still matches the same site
+  (one warning; run \`blocofy link --adopt\` to record it). A server that reports no origin cannot
+  serve a binding that records one (TARGET_UNVERIFIED).
+  Exit codes (every command): 0 ok · 1 usage/network/5xx/local check · 2 server refusal (HTTP 4xx)
+  · 3 target/binding refusal · 4 'site apply' only: not finished within its bounded pass count —
+  every step already applied is safe, re-run the same command to resume.
+  --json: every failure prints {"error":{"code","message","details"}} as the LAST stderr line; the
+  target block ({"target":…}) and any warning lines are printed on stderr before it.
+  Retries: network errors and HTTP 429/502/503/504 are retried up to 3 times (Retry-After honoured,
+  max 30s per wait; else 0.3s/0.9s/2s), resending the identical request (pages push carries one
+  x-idempotency-key per push). HTTP 500 is never retried. Each retry prints a notice on stderr.
+
+Auth: ~/.blocofy/credentials.json (contexts, no secrets) + ~/.blocofy/secrets.json (0600) or the
+macOS keychain. A pre-0.10 credentials file is migrated on first use (backup:
+~/.blocofy/credentials.v1.bak.json — copy it back to roll back).
 The CLI does not build assets — bring your own (npm/Vite/Tailwind); the platform serves
 plain Liquid + static assets.`);
 }
@@ -204,11 +360,136 @@ async function promptValid(rl, question, normalize, valid, hint, tries = 3) {
   process.exit(1);
 }
 
+// ── contexts, login, binding (CF-T1/T2, contract C1/C2) ─────────────────────────────────────────────────────
+
+const JSON_MODE = args.includes("--json");
+/** CF-T3: every retried request (lib/http.mjs) announces itself on stderr — never silent. */
+const onRetry = (info) => console.error(retryNotice(info));
+const retry = { onRetry };
+
+/**
+ * CF-T9 — the one failure exit (contract C2). Exit codes: 0 ok · 1 usage/network/5xx/local validation · 2 server
+ * refusal (HTTP 4xx) · 3 target/binding refusal. Human output goes first (page diagnostics, per-file results); the
+ * shared, redacted `printError` line is always LAST on stderr — under --json it is the `{"error":{code,message,details}}`
+ * envelope (the target block, a `{"target":…}` line, was printed before it).
+ */
+function exitCodeFor(error) {
+  if (error instanceof TargetError || error instanceof CredentialsError) return error.exitCode ?? 1;
+  if (error instanceof CliRefusal) return 2;
+  const status = Number(error?.status);
+  return status >= 400 && status < 500 ? 2 : 1;
+}
+
+function envelopeFor(error) {
+  if (error instanceof CliRefusal) {
+    const e = error.error ?? {};
+    return { code: e.code ?? `http_${error.status}`, message: e.message ?? error.message, details: e.details ?? {} };
+  }
+  const status = Number.isFinite(Number(error?.status)) && error?.status != null ? Number(error.status) : null;
+  const code = typeof error?.code === "string" && error.code ? error.code : status ? `HTTP_${status}` : error instanceof TypeError ? "NETWORK_ERROR" : "ERROR";
+  const details = { ...(error?.details ?? {}) };
+  if (status) details.status = status;
+  if (error instanceof PagesCliError || error instanceof SiteStateFsError) {
+    if (error.diagnostics?.length) details.diagnostics = error.diagnostics;
+    if (Array.isArray(error.pages)) details.pages = error.pages;
+  }
+  return { code, message: error?.message || String(error), details };
+}
+
+function failAndExit(error) {
+  const code = exitCodeFor(error);
+  if ((error instanceof PagesCliError || error instanceof SiteStateFsError) && !JSON_MODE) {
+    if (error.diagnostics?.length) reportPageDiagnostics(error.diagnostics);
+  }
+  if ((error instanceof PagesCliError || error instanceof SiteStateFsError) && Array.isArray(error.pages) && error.pages.length && !JSON_MODE) {
+    console.error("Per-file result:");
+    for (const p of error.pages) console.error(`  ${p.outcome ?? p.action}  ${p.path}`);
+  }
+  if (error instanceof CliRefusal && !JSON_MODE) {
+    // Existing media-* contract: the server's {error} JSON verbatim on stderr.
+    process.stderr.write(redact(JSON.stringify({ error: error.error })) + "\n");
+  } else if ((error instanceof PagesCliError || error instanceof SiteStateFsError) && !JSON_MODE) {
+    process.stderr.write(redact(`${error.diagnostics?.length ? "\n" : ""}error [${error.code}]:\n    ${error.message}`) + "\n");
+  } else if (!JSON_MODE && !(error instanceof TargetError || error instanceof CredentialsError) && !(typeof error?.code === "string" && error.code)) {
+    process.stderr.write(redact(error?.message || String(error)) + "\n");
+  } else {
+    printError(envelopeFor(error), { json: JSON_MODE });
+  }
+  process.exit(code);
+}
+
+function contextNameOrExit(name) {
+  if (name === ENV_CONTEXT || !CONTEXT_NAME_RE.test(name)) {
+    throw new TargetError("TARGET_CONTEXT_INVALID", `"${name}" cannot be used as a context name (letters, digits, . _ -; "env" is reserved).`, { context: name }, 1);
+  }
+  return name;
+}
+
+/**
+ * A new pair may only join a context whose other pair is for the same site. `existing` is the stored context;
+ * `identity` the freshly verified one. Checks the recorded site, else verifies the other pair live.
+ */
+async function assertPairFitsContext(name, existing, identity, otherKind) {
+  if (!existing) return;
+  const mismatch = (otherSite) => {
+    const code = existing[otherKind] ? "TARGET_CREDENTIAL_MISMATCH" : "TARGET_SITE_MISMATCH";
+    throw new TargetError(
+      code,
+      `Context "${name}" is for site ${otherSite.slug ?? otherSite.id}, but these credentials are for ${identity.site.slug ?? identity.site.id}. Nothing was saved. Use another --context name (or \`blocofy logout --context ${name}\` first).`,
+      { context: name, context_site_id: otherSite.id, new_site_id: identity.site.id },
+    );
+  };
+  if (existing.site) {
+    const o = compareOrigin(existing.platform_origin, identity.platformOrigin);
+    // "upgrade" (recorded null, server now reports one): this login records it.
+    if (String(existing.site.id) !== String(identity.site.id) || o === "mismatch" || o === "unproven") mismatch(existing.site);
+    return;
+  }
+  if (!existing[otherKind]) return;
+  const secrets = readSecrets(name, existing);
+  if (otherKind === "dev" && secrets.devToken) {
+    registerSecret(secrets.devToken);
+    const other = await verifyDev({ url: existing.dev.url, token: secrets.devToken, retry });
+    if (String(other.site.id) !== String(identity.site.id) || other.platformOrigin !== identity.platformOrigin) mismatch(other.site);
+  } else if (otherKind === "api" && secrets.apiKey) {
+    registerSecret(secrets.apiKey);
+    const other = await verifyApi({ url: existing.api.url, apiKey: secrets.apiKey, retry });
+    if (String(other.site.id) !== String(identity.site.id) || other.platformOrigin !== identity.platformOrigin) mismatch(other.site);
+  }
+}
+
+/** Save one verified pair into a context (secret first, then the context file). */
+function saveVerifiedPair(name, kind, args) {
+  withStoreLock(() => saveVerifiedPairLocked(name, kind, args));
+}
+
+function saveVerifiedPairLocked(name, kind, { url, secret, identity, storeName }) {
+  const store = loadStore();
+  const existing = store.contexts[name];
+  writeSecret(name, kind, storeName, secret);
+  if (existing?.[kind] && existing[kind].secret.store !== storeName) {
+    try {
+      removeSecrets(name, { [kind]: existing[kind] });
+    } catch {
+      /* the old copy stays in the other store; the context now points at the new one */
+    }
+  }
+  const site = { id: identity.site.id, slug: identity.site.slug ?? existing?.site?.slug ?? null, name: identity.site.name ?? existing?.site?.name ?? null, domain: identity.site.domain ?? existing?.site?.domain ?? null };
+  store.contexts[name] = {
+    ...(existing ?? {}),
+    platform_origin: identity.platformOrigin,
+    site,
+    [kind]: { url, secret: { store: storeName } },
+    verified_at: new Date().toISOString(),
+  };
+  if (!store.current_context) store.current_context = name;
+  saveStore(store);
+}
+
 /**
- * `blocofy login --api-key [--api-url <url>]` — v1 API key login (0.8.0, D3 §4.7).
- * The key is NEVER taken from argv: a hidden prompt on a TTY, BLOCOFY_API_KEY otherwise.
- * Non-TTY without the env var → message + exit 1, nothing written (fail-closed). No message
- * printed by this function ever contains the key (not even a prefix).
+ * `blocofy login --api-key [--context <n>] [--api-url <url>]` — v1 API key login (0.8.0, D3 §4.7; CF-T1).
+ * The key is NEVER taken from argv: a hidden prompt on a TTY, BLOCOFY_API_KEY otherwise. GET /api/v1/ping must
+ * succeed before anything is saved. No message printed by this function ever contains the key.
  */
 async function loginApiKey(flags, positionals) {
   if (positionals.length > 0 || flags.url !== undefined || flags.token !== undefined) {
@@ -242,9 +523,15 @@ async function loginApiKey(flags, positionals) {
     console.error("Invalid API key — a v1 key starts with blcf_live_ (a bcf_ dev token is not accepted for the v1 API). Nothing was written.");
     process.exit(1);
   }
-
-  saveCredentials({ apiUrl, apiKey });
-  console.log(`✓ API key saved → ${credentialsPath()} (API: ${apiUrl})`);
+  registerSecret(apiKey);
+  const storeName = defaultSecretStoreName({ keychain: Boolean(flags.keychain) });
+
+  const identity = await verifyApi({ url: apiUrl, apiKey, retry });
+  const name = contextNameOrExit(typeof flags.context === "string" ? flags.context : identity.site.slug ?? "");
+  await assertPairFitsContext(name, loadStore().contexts[name], identity, "dev");
+  saveVerifiedPair(name, "api", { url: apiUrl, secret: apiKey, identity, storeName });
+  console.log(`✓ API key saved to context "${name}" → ${credentialsPath()} (API: ${apiUrl})`);
+  console.log(`  Site: ${siteLabel(identity.site) || identity.site.id}`);
   console.log("Next: blocofy pages media-uses <page-handle>");
 }
 
@@ -298,41 +585,256 @@ async function login(rest) {
       rl.close();
     }
   }
+  registerSecret(token);
+  const storeName = defaultSecretStoreName({ keychain: Boolean(flags.keychain) });
+
+  // CF-T1: the token's REAL site (resolved server-side from the token) must be verified BEFORE saving — a
+  // wrong-tenant token or an unreachable platform saves nothing (TARGET_UNVERIFIED, exit 3).
+  const identity = await verifyDev({ url, token, retry });
+  const name = contextNameOrExit(typeof flags.context === "string" ? flags.context : identity.site.slug);
+  await assertPairFitsContext(name, loadStore().contexts[name], identity, "api");
+  saveVerifiedPair(name, "dev", { url, secret: token, identity, storeName });
+  console.log(`✓ Saved context "${name}" → ${credentialsPath()}`);
+  console.log(`  Site: ${siteLabel(identity.site)} — commands using context "${name}" target this site.`);
+  console.log(`Next: bind a project directory:  blocofy link <dir> --context ${name}   (or pull into an empty one: blocofy theme pull <dir> --context ${name})`);
+}
+
+async function contextsCommand(rest) {
+  const { positionals } = parseArgsOrExit(rest, []);
+  if (positionals.length) throw new TargetError("USAGE", "Usage: blocofy contexts [--json]", {}, 1);
+  const store = loadStore();
+  const rows = Object.entries(store.contexts).map(([name, c]) => ({
+    name,
+    current: store.current_context === name,
+    site: c.site ?? null,
+    platform_origin: c.platform_origin ?? null,
+    dev: c.dev ? { url: c.dev.url, store: c.dev.secret.store } : null,
+    api: c.api ? { url: c.api.url, store: c.api.secret.store } : null,
+    verified_at: c.verified_at ?? null,
+  }));
+  if (JSON_MODE) {
+    console.log(JSON.stringify({ current_context: store.current_context, contexts: rows }, null, 2));
+    return;
+  }
+  if (rows.length === 0) {
+    console.log("No saved contexts. Run `blocofy login`.");
+    return;
+  }
+  for (const r of rows) {
+    const site = r.site ? `${siteLabel(r.site)} · ${r.site.id}` : "(not verified yet)";
+    const pairs = [r.dev ? `dev ${r.dev.url} [${r.dev.store}]` : null, r.api ? `api ${r.api.url} [${r.api.store}]` : null].filter(Boolean).join(", ");
+    console.log(`${r.current ? "*" : " "} ${r.name}  ${site}  ${pairs}`);
+  }
+}
+
+async function useCommand(rest) {
+  const { positionals } = parseArgsOrExit(rest, []);
+  const name = positionals[0];
+  if (!name || positionals.length > 1) throw new TargetError("USAGE", "Usage: blocofy use <context>", {}, 1);
+  withStoreLock(() => {
+    const store = loadStore();
+    if (!store.contexts[name]) throw new TargetError("TARGET_CONTEXT_UNKNOWN", `No context named "${name}". List them with \`blocofy contexts\`.`, { context: name });
+    store.current_context = name;
+    saveStore(store);
+  });
+  console.log(`✓ Default context for read-only commands outside a project: ${name}`);
+  console.log("  (Inside a bound project the project's site decides; `use` never retargets it.)");
+}
+
+async function logoutCommand(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, []);
+  const name = typeof flags.context === "string" ? flags.context : null;
+  if (!name || positionals.length) throw new TargetError("USAGE", "Usage: blocofy logout --context <name>", {}, 1);
+  withStoreLock(() => {
+    const store = loadStore();
+    const ctx = store.contexts[name];
+    if (!ctx) throw new TargetError("TARGET_CONTEXT_UNKNOWN", `No context named "${name}".`, { context: name });
+    removeSecrets(name, ctx);
+    delete store.contexts[name];
+    if (store.current_context === name) store.current_context = null;
+    saveStore(store);
+  });
+  console.log(`✓ Removed context "${name}" and its secrets.`);
+}
+
+async function linkCommand(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, ["adopt"]);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  if (!existsSync(dir) || !statSync(dir).isDirectory()) throw new TargetError("USAGE", `Directory not found: ${dir}`, { dir }, 1);
+  const envCtx = envContext();
+  const flagContext = typeof flags.context === "string" ? flags.context : null;
+  if (!flagContext && !process.env.BLOCOFY_CONTEXT && !envCtx) {
+    throw new TargetError("TARGET_CONTEXT_REQUIRED", "`blocofy link` needs the context to bind: pass --context <name> (see `blocofy contexts`).", {});
+  }
+  const resolved = await resolveContext({ flagContext, envContextName: process.env.BLOCOFY_CONTEXT || null, envCtx, getStore: () => loadStore(), binding: null, commandClass: "read" });
+  const secrets = resolved.env ? resolved.env.secrets : readSecrets(resolved.name, resolved.context);
+  registerSecret(secrets.devToken);
+  registerSecret(secrets.apiKey);
+  const identity = await verifyTarget({ resolved, secrets, binding: null, retry });
+  for (const w of identity.warnings ?? []) printWarning(w, { json: JSON_MODE });
+
+  let own = null;
+  if (existsSync(join(dir, ".blocofy", "project.json"))) {
+    try {
+      own = findBinding(dir);
+    } catch (error) {
+      // Review M2: --adopt replaces an unreadable binding (the TARGET_BINDING_INVALID message recommends it).
+      if (!(flags.adopt && error instanceof TargetError && error.code === "TARGET_BINDING_INVALID")) throw error;
+    }
+  }
+  const ownOrigin = own ? compareOrigin(own.project.platform_origin, identity.platformOrigin) : "match";
+  if (own && (String(own.project.site_id) !== String(identity.site.id) || (ownOrigin !== "match" && ownOrigin !== "upgrade")) && !flags.adopt) {
+    throw new TargetError(
+      "TARGET_SITE_MISMATCH",
+      `${dir} is already bound to site ${own.project.site_slug ?? own.project.site_id}; context "${resolved.name}" is for ${identity.site.slug ?? identity.site.id}. Nothing was written. Pass --adopt to rebind it.`,
+      { dir, binding_site_id: own.project.site_id, remote_site_id: identity.site.id },
+    );
+  }
+  // Review M3: an env-context link owns no local.json; a stale one (naming another context) is removed.
+  const projectPath = writeBinding(dir, { site: identity.site, platformOrigin: identity.platformOrigin, contextName: resolved.name, staleLocal: true });
+  recordVerifiedSite(resolved, identity);
+  console.log(`✓ Bound ${dir} to ${siteLabel(identity.site) || identity.site.id} (${identity.site.id}) via context "${resolved.name}".`);
+  console.log(`  ${relative(process.cwd(), projectPath) || projectPath} — commit it; .blocofy/local.json stays private (git-ignored).`);
+}
 
-  saveCredentials({ url, token });
-  console.log(`✓ Saved credentials → ${credentialsPath()}`);
+async function targetCommand(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, []);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  const t = await prepareTarget({ command: "target", commandClass: "read", dir, flags, needs: "any", mode: "read", record: false, quiet: true });
+  if (JSON_MODE) console.log(JSON.stringify({ target: t.display }, null, 2));
+  else printTarget(t.display, { stream: process.stdout });
+}
+
+/** An unverified (migrated) named context gets the verified site recorded once. */
+function recordVerifiedSite(resolved, identity) {
+  if (resolved.env || resolved.context.site) return;
+  withStoreLock(() => {
+    const store = loadStore();
+    const ctx = store.contexts[resolved.name];
+    if (!ctx || ctx.site) return;
+    ctx.site = { id: identity.site.id, slug: identity.site.slug ?? null, name: identity.site.name ?? null, domain: identity.site.domain ?? null };
+    ctx.platform_origin = identity.platformOrigin;
+    ctx.verified_at = new Date().toISOString();
+    saveStore(store);
+  });
+}
 
-  // Token'ın GERÇEK site'ını göster — site sunucuda TOKEN'dan çözülür, URL kozmetik.
-  // Yanlış tenant'ın token'ıyla login olduysan ("klarosa URL + ksc token") hemen
-  // görürsün. whoami yoksa/erişilemezse sessiz geç.
+async function promptContext(candidates) {
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
   try {
-    const who = await fetchWhoami({ url, token });
-    if (who?.site) console.log(`  Site: ${siteLabel(who.site)} — your theme commands target this tenant.`);
-  } catch {
-    /* best-effort */
+    process.stderr.write(`Several saved contexts match this project's site:\n${candidates.map((c, i) => `  ${i + 1}) ${c}`).join("\n")}\n`);
+    const answer = (await rl.question("Use which context? [number] ")).trim();
+    return candidates[Number(answer) - 1] ?? null;
+  } finally {
+    rl.close();
   }
-  console.log(`Next: cd into your theme directory, then run  blocofy theme dev`);
 }
 
-/** Resolve credentials (URL + token) or exit with guidance. */
-function requireCreds() {
-  const creds = loadCredentials();
-  if (!creds || !creds.url || !creds.token) {
-    console.error("Login required: run `blocofy login` (or set BLOCOFY_URL + BLOCOFY_TOKEN).");
-    process.exit(1);
+/**
+ * The one gate every remote command passes BEFORE its first request (contract C2): binding policy → context
+ * resolution → offline precheck → required pair → remote identity (both pairs when present) → binding match →
+ * target block. Throws TargetError / CredentialsError; never returns an unverified target.
+ *
+ * `needs`: "dev" | "api" | "any". Returns `{ name, dev, api, identity, binding, newBinding, display }`.
+ */
+async function prepareTarget({ command, commandClass, dir, flags, needs, mode, record = true, quiet = false, resolveClass = commandClass }) {
+  const binding = findBinding(dir);
+  const { newBinding } = enforceBindingPolicy({ commandClass, binding, dir, command });
+  const envCtx = envContext();
+  let cachedStore = null;
+  const resolved = await resolveContext({
+    flagContext: typeof flags.context === "string" ? flags.context : null,
+    envContextName: process.env.BLOCOFY_CONTEXT || null,
+    envCtx,
+    getStore: () => (cachedStore ??= loadStore()),
+    binding,
+    commandClass: resolveClass,
+    isTTY: Boolean(process.stdin.isTTY && process.stderr.isTTY),
+    prompt: promptContext,
+  });
+  precheckContext({ binding, resolved });
+  const secrets = resolved.env ? resolved.env.secrets : readSecrets(resolved.name, resolved.context);
+  registerSecret(secrets.devToken);
+  registerSecret(secrets.apiKey);
+
+  const hasDev = Boolean(resolved.context.dev && secrets.devToken);
+  const hasApi = Boolean(resolved.context.api && secrets.apiKey);
+  if (needs === "dev" && !hasDev) {
+    throw new TargetError("LOGIN_REQUIRED", `Login required: context "${resolved.name}" has no dev token. Run \`blocofy login${resolved.env ? "" : ` --context ${resolved.name}`}\` (or set BLOCOFY_URL + BLOCOFY_TOKEN).`, { context: resolved.name }, 1);
+  }
+  if (needs === "api" || needs === "both") {
+    if (!hasApi) {
+      throw new TargetError("LOGIN_REQUIRED", `API key required: run \`blocofy login --api-key\` (or set BLOCOFY_API_KEY + BLOCOFY_API_URL). The dev token (bcf_) is not accepted for the v1 API.`, { context: resolved.name }, 1);
+    }
+    if (!isValidApiKey(secrets.apiKey)) {
+      throw new TargetError("LOGIN_REQUIRED", `The API key of context "${resolved.name}" is not a v1 key — it must start with blcf_live_. Run \`blocofy login --api-key\`.`, { context: resolved.name }, 1);
+    }
+  }
+  // CF-T4 — site plan/apply need BOTH pairs: the v1 API for the site-state endpoints, the dev token for the
+  // canonical theme deploy `awaiting_theme_source` asks for. `verifyTarget` below already asserts they
+  // resolve to the same site whenever both are present (dev && api), which "both" makes unconditional.
+  if (needs === "both" && !hasDev) {
+    throw new TargetError(
+      "LOGIN_REQUIRED",
+      `Login required: context "${resolved.name}" has no dev token. Run \`blocofy login${resolved.env ? "" : ` --context ${resolved.name}`}\` (or set BLOCOFY_URL + BLOCOFY_TOKEN). Site plan/apply need both a dev token and a v1 API key.`,
+      { context: resolved.name },
+      1,
+    );
+  }
+
+  const identity = await verifyTarget({ resolved, secrets, binding, retry });
+  for (const w of identity.warnings ?? []) printWarning(w, { json: JSON_MODE });
+  if (record) recordVerifiedSite(resolved, identity);
+
+  const url = needs === "api" ? resolved.context.api?.url : resolved.context.dev?.url ?? resolved.context.api?.url;
+  const bindingLabel = binding ? relative(process.cwd(), binding.projectPath) || binding.projectPath : newBinding ? "none (new pull)" : "none";
+  const display = targetData({ site: identity.site, url, contextName: resolved.name, bindingLabel, operation: `${command} · ${mode}` });
+  if (!quiet) printTarget(display, { json: JSON_MODE });
+  return {
+    name: resolved.name,
+    dev: hasDev ? { url: resolved.context.dev.url, token: secrets.devToken } : null,
+    api: hasApi ? { apiUrl: resolved.context.api.url, apiKey: secrets.apiKey } : null,
+    identity,
+    binding,
+    newBinding,
+    display,
+  };
+}
+
+/**
+ * Review M4: a pull into a new directory claims the binding exclusively BEFORE fetching/writing content; the claim is
+ * released if the pull fails. `fn` performs the pull.
+ */
+async function withNewBindingClaim(target, dir, fn) {
+  if (!target.newBinding) return fn();
+  const claim = claimNewBinding(dir, { site: target.identity.site, platformOrigin: target.identity.platformOrigin });
+  try {
+    return await fn();
+  } catch (error) {
+    claim.release();
+    throw error;
   }
-  return creds;
 }
 
+/** After a successful pull into a new directory: record provenance (project.json + local.json + .gitignore). */
+function bindAfterPull(target, dir) {
+  if (!target.newBinding) return;
+  writeBinding(dir, { site: target.identity.site, platformOrigin: target.identity.platformOrigin, contextName: target.name });
+  console.log(`  Bound ${dir} to ${siteLabel(target.identity.site) || target.identity.site.id} (.blocofy/project.json).`);
+}
+
+
 async function themePull(rest) {
   const { flags, positionals } = parseArgsOrExit(rest, KNOWN.themePull);
   const dir = resolve(positionals[0] ?? process.cwd());
-  const creds = requireCreds();
   const draft = Boolean(flags.draft);
   const instance = typeof flags.instance === "string" ? flags.instance : null;
-  const { count } = await pullTheme({ dir, url: creds.url, token: creds.token, draft, instance });
   const what = instance ? `instance ${instance}` : draft ? "draft" : "live";
+  // Review M1: a draft pull provisions the draft server-side (`?draft=1`), so it is a remote mutation: binding required.
+  const target = await prepareTarget({ command: draft ? "theme pull --draft" : "theme pull", commandClass: draft ? "remote-mutation" : "local-write", dir, flags, needs: "dev", mode: what });
+  const { count } = await withNewBindingClaim(target, dir, () => pullTheme({ dir, url: target.dev.url, token: target.dev.token, draft, instance, onRetry }));
   console.log(`Downloaded ${count} ${what} theme files → ${dir}`);
+  bindAfterPull(target, dir);
 }
 
 async function themePush(rest) {
@@ -342,10 +844,23 @@ async function themePush(rest) {
     console.error(`Theme directory not found: ${dir}`);
     process.exit(1);
   }
-  const creds = requireCreds();
   const instanceFlag = typeof flags.instance === "string" ? flags.instance : null;
   const name = typeof flags.name === "string" ? flags.name : null;
   const dryRun = Boolean(flags["dry-run"] || flags.validate);
+  // Yeni varsayılan hedef: DRAFT (güvenli). `--live` eski anında-canlı davranışını
+  // açıkça geri getirir; `--instance` belirli bir temayı adresler. Sadece "live"
+  // modu canlıya yazar ve onay gerektirir.
+  const { mode, instance } = resolvePushMode({
+    live: Boolean(flags.live),
+    draft: Boolean(flags.draft),
+    instance: instanceFlag,
+  });
+  // CF-T2: `--diff` and `--dry-run` are reads; every other push is a remote mutation (binding required). The
+  // target is verified (whoami, both pairs, binding) before the first theme request — no best-effort swallow.
+  const readOnly = Boolean(flags.diff) || dryRun;
+  const opMode = flags.diff ? `read · diff vs ${instanceFlag ? `instance ${instanceFlag}` : "live"}` : dryRun ? `read · dry run (${mode === "instance" ? `instance ${instance}` : mode})` : mode === "instance" ? `instance ${instance}` : mode;
+  const target = await prepareTarget({ command: "theme push", commandClass: readOnly ? "read" : "remote-mutation", dir, flags, needs: "dev", mode: `${opMode}${flags.prune && !readOnly ? " · prune" : ""}` });
+  const creds = target.dev;
   // 0.5.0: her push'a otomatik idempotency key — kanonik dal (protokol + key) ancak böyle seçilir; key
   // OLMADAN header'lar tek başına legacy writer'a düşer ve --live push pinned render'a YANSIMAZ (M4
   // read cutover'ının ana CLI şikâyeti). Push-OPERASYONU-başına üretilir: fetchWithRetry'nin 5xx/429
@@ -357,14 +872,8 @@ async function themePush(rest) {
   // `--diff`: read-only preview vs the LIVE theme (or --instance). No write; the draft target is not
   // diffable (a draft GET would PROVISION the draft server-side — a read-only command must not mutate).
   if (flags.diff) {
-    let diffSite = null;
-    try {
-      diffSite = (await fetchWhoami({ url: creds.url, token: creds.token })).site;
-    } catch {
-      /* best-effort — etiket kozmetik, diff yine koşar */
-    }
-    const diffTarget = diffSite ? ` of ${siteLabel(diffSite)}` : "";
-    const d = await diffTheme({ dir, url: creds.url, token: creds.token, instance: instanceFlag });
+    const diffTarget = ` of ${siteLabel(target.identity.site)}`;
+    const d = await diffTheme({ dir, url: creds.url, token: creds.token, instance: instanceFlag, onRetry });
     console.log(instanceFlag ? `Diff vs theme ${instanceFlag}${diffTarget}:` : `Diff vs the LIVE theme${diffTarget} (push default writes to a DRAFT):`);
     const total = d.added.length + d.changed.length + d.removed.length;
     if (total === 0) {
@@ -378,33 +887,15 @@ async function themePush(rest) {
     return;
   }
 
-  // Yeni varsayılan hedef: DRAFT (güvenli). `--live` eski anında-canlı davranışını
-  // açıkça geri getirir; `--instance` belirli bir temayı adresler. Sadece "live"
-  // modu canlıya yazar ve onay gerektirir.
-  const { mode, instance } = resolvePushMode({
-    live: Boolean(flags.live),
-    draft: Boolean(flags.draft),
-    instance: instanceFlag,
-  });
-
-  // Hedef tenant'ı çöz ve GÖSTER — site sunucuda TOKEN'dan çözülür (URL kozmetik),
-  // yanlış-tenant'a yazımı görünür kılar ("klarosa sandım, ksc'ye yazdım"). whoami
-  // yoksa/erişilemezse sessiz geç; etiketi confirmation mesajlarında da kullan.
-  let site = null;
-  let whoami = null;
-  try {
-    whoami = await fetchWhoami({ url: creds.url, token: creds.token });
-    site = whoami.site;
-  } catch {
-    /* best-effort */
-  }
-  const target = site ? siteLabel(site) : creds.url;
+  // Hedef tenant'ı GÖSTER — site sunucuda TOKEN'dan çözülür ve prepareTarget'ta DOĞRULANDI (CF-T2).
+  const whoami = target.identity;
+  const siteName = siteLabel(whoami.site) || String(whoami.site.id);
   if (mode === "instance") {
-    console.log(`→ Pushing to theme ${instance}${site ? ` of ${target}` : ""}`);
+    console.log(`→ Pushing to theme ${instance} of ${siteName}`);
   } else if (mode === "live") {
-    console.log(dryRun ? `→ Validating against the LIVE theme of ${target} (dry run — nothing will be written)` : `→ Pushing to the LIVE theme of ${target}`);
+    console.log(dryRun ? `→ Validating against the LIVE theme of ${siteName} (dry run — nothing will be written)` : `→ Pushing to the LIVE theme of ${siteName}`);
   } else {
-    console.log(`→ Pushing to a draft${site ? ` of ${target}` : ""}`);
+    console.log(`→ Pushing to a draft of ${siteName}`);
   }
 
   // Canlı push (`--live`) ANINDA canlı temayı değiştirir (önizleme yok). Agent/CI
@@ -418,7 +909,7 @@ async function themePush(rest) {
     isTTY: Boolean(process.stdin.isTTY),
   });
   if (decision.mustAbort) {
-    console.error(`⚠ 'theme push --live' writes to the LIVE theme of ${target} immediately (no preview).`);
+    console.error(`⚠ 'theme push --live' writes to the LIVE theme of ${siteName} immediately (no preview).`);
     console.error(`  Non-interactive shell: pass --live --yes to confirm, or omit --live to push to a safe draft.`);
     process.exit(1);
   }
@@ -426,7 +917,7 @@ async function themePush(rest) {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     let answer;
     try {
-      answer = await rl.question(`⚠ Push to the LIVE theme of ${target}? Immediate, no preview. [y/N] `);
+      answer = await rl.question(`⚠ Push to the LIVE theme of ${siteName}? Immediate, no preview. [y/N] `);
     } finally {
       rl.close();
     }
@@ -440,7 +931,7 @@ async function themePush(rest) {
   // verilmiş `--instance`; whoami çözülemediyse canlı sayılır) canlı-push onay kuralı aynen uygulanır:
   // `--yes`/`--confirm` → onaylı, TTY → liste basıldıktan sonra y/N, non-TTY → yazımsız çıkış.
   const prune = Boolean(flags.prune) && !dryRun;
-  const liveTarget = mode === "live" || (mode === "instance" && (whoami == null || String(instance) === String(whoami.liveThemeId)));
+  const liveTarget = mode === "live" || (mode === "instance" && (whoami.liveThemeId == null || String(instance) === String(whoami.liveThemeId)));
   const pruneDecision = livePushDecision({
     draft: !prune || !liveTarget,
     yes: Boolean(flags.yes),
@@ -448,7 +939,7 @@ async function themePush(rest) {
     isTTY: Boolean(process.stdin.isTTY),
   });
   if (pruneDecision.mustAbort) {
-    console.error(`⚠ 'theme push --prune' removes files from the LIVE theme of ${target}.`);
+    console.error(`⚠ 'theme push --prune' removes files from the LIVE theme of ${siteName}.`);
     console.error(`  Non-interactive shell: pass --prune --yes to confirm. Nothing was written.`);
     process.exit(1);
   }
@@ -458,7 +949,7 @@ async function themePush(rest) {
     if (!pruneDecision.needsPrompt) return true;
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     try {
-      return isAffirmative(await rl.question(`⚠ Remove these files from the LIVE theme of ${target}? [y/N] `));
+      return isAffirmative(await rl.question(`⚠ Remove these files from the LIVE theme of ${siteName}? [y/N] `));
     } finally {
       rl.close();
     }
@@ -473,7 +964,7 @@ async function themePush(rest) {
   // 0.5.0: eski (protokolsüz) bir sunucu `dryRun` alanını bilmez ve SESSİZCE GERÇEK YAZIM yapardı —
   // dry-run yalnız sunucu kanonik protokolü beyan ediyorsa koşar (sorgusuz, mutasyonsuz GET ön kontrolü).
   if (dryRun) {
-    const { supported } = await fetchCanonicalSupport({ url: creds.url, token: creds.token });
+    const { supported } = await fetchCanonicalSupport({ url: creds.url, token: creds.token, onRetry });
     if (!supported) {
       console.error("✗ --dry-run needs a server that speaks the canonical protocol; this one does not.");
       console.error("  An old server would IGNORE dryRun and write for real. Nothing was sent.");
@@ -492,21 +983,25 @@ async function themePush(rest) {
       name: mode === "draft" ? name : null,
       dryRun,
       idempotencyKey,
-      onRetry: (info) => console.error(retryNotice(info)),
+      onRetry,
       prune,
       confirmPrune,
     });
   } catch (error) {
     if (error?.code === "cli_upgrade_required") {
-      const missing = Array.isArray(error?.body?.fence?.missing) ? error.body.fence.missing.join(", ") : "";
-      console.error("✗ Sunucu bu CLI sürümünü reddetti (cli_upgrade_required).");
-      console.error(`  Güncelle:  npm i -g @blocofy/cli@latest${missing ? `\n  Sunucunun istediği eksik yetenekler: ${missing}` : ""}`);
-      process.exit(1);
+      const missing = Array.isArray(error?.body?.fence?.missing) ? error.body.fence.missing : [];
+      if (!JSON_MODE) {
+        console.error("✗ Sunucu bu CLI sürümünü reddetti (cli_upgrade_required).");
+        console.error(`  Güncelle:  npm i -g @blocofy/cli@latest${missing.length ? `\n  Sunucunun istediği eksik yetenekler: ${missing.join(", ")}` : ""}`);
+      }
+      failAndExit({ code: "cli_upgrade_required", status: error.status, message: "The server refused this CLI version; update it: npm i -g @blocofy/cli@latest", details: { missing } });
     }
     if (error?.code === "idempotency_conflict") {
-      console.error("✗ Idempotency çakışması: aynı anahtar daha önce FARKLI içerikle kullanılmış (409).");
-      console.error("  `--idempotency-key` verdiysen yeni bir anahtarla dene; vermediysen tekrar `blocofy theme push` yeterli (her koşu taze anahtar üretir).");
-      process.exit(1);
+      if (!JSON_MODE) {
+        console.error("✗ Idempotency çakışması: aynı anahtar daha önce FARKLI içerikle kullanılmış (409).");
+        console.error("  `--idempotency-key` verdiysen yeni bir anahtarla dene; vermediysen tekrar `blocofy theme push` yeterli (her koşu taze anahtar üretir).");
+      }
+      failAndExit({ code: "idempotency_conflict", status: error.status, message: "The idempotency key was already used with different content. Retry with a new key (or omit --idempotency-key).", details: {} });
     }
     throw error;
   }
@@ -569,26 +1064,30 @@ function reportPageDiagnostics(diagnostics, { strict = false } = {}) {
   return errors > 0 || (strict && warnings > 0) ? 1 : 0;
 }
 
-function exitForPagesError(error) {
-  if (error instanceof PagesCliError) {
-    if (error.diagnostics?.length) reportPageDiagnostics(error.diagnostics);
-    else console.error(`error [${error.code}]:\n    ${error.message}`);
-    // The stable top code always prints, after the individual findings it summarises.
-    if (error.diagnostics?.length) console.error(`\nerror [${error.code}]:\n    ${error.message}`);
-    if (Array.isArray(error.pages) && error.pages.length) {
-      console.error("Per-file result:");
-      for (const p of error.pages) console.error(`  ${p.outcome ?? p.action}  ${p.path}`);
-    }
-    process.exit(1);
-  }
-  console.error(error?.message ?? error);
-  process.exit(1);
-}
-
 function localeLabel(p) {
   return `${p.locale} ${p.slug}`;
 }
 
+/** CF-T3 — plan totals, as the target block's operation and the table footer show them. */
+function planTotals(pages) {
+  const count = (action) => pages.filter((p) => p.action === action).length;
+  return { live: count("publish"), draft: count("draft"), unchanged: count("unchanged"), conflicts: pages.filter((p) => p.conflict === true).length };
+}
+
+/** CF-T3 — the per-page plan a revision-checking server returned (stdout). */
+function printPlanTable(plan) {
+  const pages = plan.pages ?? [];
+  const rows = pages.map((p) => [p.action ?? "", p.target ?? "", p.locale ?? "", p.path ?? "", (p.changed_fields ?? []).join(", ") || "-", p.conflict ? "[conflict]" : ""]);
+  const header = ["ACTION", "TARGET", "LOCALE", "PATH", "CHANGED", ""];
+  const widths = header.map((h, i) => Math.max(h.length, ...rows.map((r) => r[i].length)));
+  const line = (r) => "  " + r.map((c, i) => c.padEnd(widths[i])).join("  ").trimEnd();
+  console.log("Plan:");
+  console.log(line(header));
+  for (const r of rows) console.log(line(r));
+  const t = planTotals(pages);
+  console.log(`Totals: live ${t.live} · draft ${t.draft} · unchanged ${t.unchanged} · conflicts ${t.conflicts}`);
+}
+
 async function pagesPush(rest) {
   const { flags, positionals } = parseArgsOrExit(rest, KNOWN.pagesPush);
   const dir = resolve(positionals[0] ?? process.cwd());
@@ -596,15 +1095,66 @@ async function pagesPush(rest) {
     console.error(`Directory not found: ${dir}`);
     process.exit(1);
   }
-  const creds = requireCreds();
   const dryRun = Boolean(flags["dry-run"]);
-  const result = await pushContent({ dir, url: creds.url, token: creds.token, scope: "pages", dryRun });
+  const force = Boolean(flags.force);
+  const reason = typeof flags.reason === "string" ? flags.reason : null;
+  // CF-T3 — force always carries a reason (1–500 characters); a reason without force is a mistake, not a no-op.
+  if (flags.reason !== undefined && !force) {
+    printError({ code: "USAGE_REASON_WITHOUT_FORCE", message: "--reason is only used with --force. Nothing was sent." }, { json: JSON_MODE });
+    process.exit(1);
+  }
+  if (force && (reason === null || reason.trim() === "" || reason.length > FORCE_REASON_MAX)) {
+    printError({ code: "USAGE_FORCE_REASON_REQUIRED", message: `--force needs --reason <text> (1-${FORCE_REASON_MAX} characters): why newer content on the site may be overwritten. Nothing was sent.` }, { json: JSON_MODE });
+    process.exit(1);
+  }
+  const baseMode = `${dryRun ? "read · dry run" : "live"}${force ? " · FORCE" : ""}`;
+  const target = await prepareTarget({ command: "pages push", commandClass: dryRun ? "read" : "remote-mutation", dir, flags, needs: "dev", mode: baseMode, quiet: true });
+  // The target block is printed once: with the plan totals when the server returns a plan, else as soon as it is known.
+  let shown = false;
+  const showTarget = (operation = target.display.operation) => {
+    if (shown) return;
+    shown = true;
+    printTarget({ ...target.display, operation }, { json: JSON_MODE });
+  };
+  const creds = target.dev;
+  let result;
+  try {
+    result = await pushContent({
+      dir,
+      url: creds.url,
+      token: creds.token,
+      scope: "pages",
+      dryRun,
+      force,
+      forceReason: reason,
+      onRetry,
+      onServer: (server) => {
+        if (server.revisionCas) return;
+        showTarget();
+        printWarning({ code: "PAGES_REVISION_CAS_UNAVAILABLE", message: "stale-file protection is not available on this server: a page file pulled before someone else's edit can overwrite it. Pull right before you push." }, { json: JSON_MODE });
+      },
+      onPlan: (plan) => {
+        const t = planTotals(plan.pages ?? []);
+        showTarget(`pages push · ${dryRun ? "dry run · " : ""}${force ? "FORCE · " : ""}live ${t.live} · draft ${t.draft} · unchanged ${t.unchanged}`);
+        if (!JSON_MODE) printPlanTable(plan);
+      },
+    });
+  } catch (error) {
+    showTarget();
+    throw error;
+  }
+  showTarget();
   const code = reportPageDiagnostics(result.diagnostics ?? [], { strict: Boolean(flags.strict) });
+  if (JSON_MODE) {
+    const { fileCount: _f, revisionCas: _r, ...body } = result;
+    console.log(JSON.stringify(body, null, 2));
+    process.exit(code);
+  }
   const pages = result.pages ?? [];
   const count = (k, v) => pages.filter((p) => p[k] === v).length;
   const warnings = (result.diagnostics ?? []).filter((d) => d.level === "warning").length;
   if (dryRun) {
-    console.log(`Preflight passed: ${count("action", "publish")} updates, ${count("action", "draft")} drafts, ${count("action", "unchanged")} unchanged, 0 conflicts, ${warnings} warning(s).`);
+    console.log(`Preflight passed: ${count("action", "publish")} updates, ${count("action", "draft")} drafts, ${count("action", "unchanged")} unchanged, ${count("conflict", true)} conflicts, ${warnings} warning(s).`);
     console.log("Dry run only; no pages were changed.");
   } else {
     for (const p of pages) if (p.outcome !== "unchanged") console.log(`  ${p.outcome}  ${localeLabel(p)}  (${p.path})`);
@@ -613,16 +1163,23 @@ async function pagesPush(rest) {
         `(only existing pages are updated — none created or deleted).`,
     );
   }
+  const forced = forcedPaths(result.forced);
+  if (forced.length) {
+    console.log(dryRun ? "Forced (would overwrite without a base check):" : "Forced:");
+    for (const path of forced) console.log(`  ${path}`);
+  }
   process.exit(code);
 }
 
 async function pagesPull(rest) {
   const { flags, positionals } = parseArgsOrExit(rest, KNOWN.pagesPull);
   const dir = resolve(positionals[0] ?? process.cwd());
-  const creds = requireCreds();
-  const { count, diagnostics } = await pullContent({ dir, url: creds.url, token: creds.token, scope: "pages" });
+  const target = await prepareTarget({ command: "pages pull", commandClass: "local-write", dir, flags, needs: "dev", mode: "published pages" });
+  const creds = target.dev;
+  const { count, diagnostics } = await withNewBindingClaim(target, dir, () => pullContent({ dir, url: creds.url, token: creds.token, scope: "pages", onRetry }));
   const code = reportPageDiagnostics(diagnostics, { strict: Boolean(flags.strict) });
   console.log(`Downloaded ${count} page file(s) → ${dir}`);
+  bindAfterPull(target, dir);
   process.exit(code);
 }
 
@@ -633,9 +1190,9 @@ async function pagesCheck(rest) {
     console.error(`Directory not found: ${dir}`);
     process.exit(1);
   }
-  const creds = loadCredentials();
-  const online = Boolean(creds?.url && creds?.token);
-  const r = await checkPages({ dir, ...(online ? { url: creds.url, token: creds.token } : {}) });
+  const creds = (await optionalTarget({ command: "pages check", dir, flags }))?.dev;
+  const online = Boolean(creds);
+  const r = await checkPages({ dir, onRetry, ...(online ? { url: creds.url, token: creds.token } : {}) });
   const code = reportPageDiagnostics(r.diagnostics, { strict: Boolean(flags.strict) });
   const errors = r.diagnostics.filter((d) => d.level === "error").length;
   console.log(`Checked ${r.fileCount} page file(s) ${r.online ? "(with the site's languages and a server dry run)" : "(offline — log in to also check against the site)"}: ${errors} error(s), ${r.diagnostics.length - errors} warning(s).`);
@@ -653,10 +1210,10 @@ async function pagesMigrate(rest) {
     console.error(`Directory not found: ${dir}`);
     process.exit(1);
   }
-  const creds = loadCredentials();
-  const online = Boolean(creds?.url && creds?.token);
+  const creds = (await optionalTarget({ command: "pages migrate-layout", dir, flags, localWrite: Boolean(flags.write) }))?.dev;
+  const online = Boolean(creds);
   const write = Boolean(flags.write);
-  const r = await migrateLayout({ dir, write, ...(online ? { url: creds.url, token: creds.token } : {}) });
+  const r = await migrateLayout({ dir, write, onRetry, ...(online ? { url: creds.url, token: creds.token } : {}) });
   const code = reportPageDiagnostics(r.diagnostics, { strict: Boolean(flags.strict) });
   for (const m of r.moves) console.log(`  ${write && !r.refused ? "moved" : "move"}  ${m.from} → ${m.to}`);
   if (r.refused) console.error(`Migration refused; no files were moved.`);
@@ -665,57 +1222,434 @@ async function pagesMigrate(rest) {
   process.exit(r.refused ? 1 : code);
 }
 
-async function contentPush(scope, rest) {
-  const { positionals } = parseArgsOrExit(rest, KNOWN.content);
+// ── site state (CF-T4): export | validate | plan | apply | publish ─────────────────────────────────────────
+
+/**
+ * A site-state tree on disk → what a plan/apply/publish request body needs: `files` (every tree path
+ * EXCEPT `blocofy-site.json` itself and `media/files/<sha256>` bytes — contract §A1, those never travel in
+ * a request) and a freshly recomputed `manifest` (the digest must describe the CURRENT files; a stale
+ * committed one would just be refused). Provenance fields (`platform_origin`, `source_site`, `exported_at`)
+ * are kept from the tree's own `blocofy-site.json` when it parses — that is what `site export` wrote — and
+ * only synthesized from the verified target identity for a tree that never had one.
+ *
+ * Throws `SiteStateFsError` when the tree read found a symlink or other unreadable entry: nothing is sent.
+ */
+function loadSiteStateForRequest(dir, identity) {
+  const tree = readSiteStateTree(dir);
+  if (tree.diagnostics.length > 0) {
+    throw new SiteStateFsError("SITE_STATE_INVALID_PATH", "The local tree has unreadable entries; nothing was sent.", tree.diagnostics);
+  }
+  const requestFiles = { ...tree.files };
+  delete requestFiles[MANIFEST_PATH];
+
+  let provenance = null;
+  if (tree.files[MANIFEST_PATH] !== undefined) {
+    try {
+      const parsed = JSON.parse(tree.files[MANIFEST_PATH]);
+      if (parsed && typeof parsed === "object") {
+        provenance = {
+          platformOrigin: typeof parsed.platform_origin === "string" ? parsed.platform_origin : null,
+          sourceSite: parsed.source_site ?? null,
+          exportedAt: typeof parsed.exported_at === "string" ? parsed.exported_at : null,
+        };
+      }
+    } catch {
+      /* fall back to the verified identity below */
+    }
+  }
+  const manifest = buildManifest({
+    files: requestFiles,
+    platformOrigin: provenance?.platformOrigin ?? identity.platformOrigin ?? null,
+    sourceSite: provenance?.sourceSite ?? { id: identity.site.id, slug: identity.site.slug ?? "" },
+    exportedAt: provenance?.exportedAt ?? new Date().toISOString(),
+  });
+  return { tree, requestFiles, manifest };
+}
+
+/** `--target new|<handle>` (default new), `--mode same_site|restore` (default restore), `--accept-live-effects locales`. */
+function siteStateTargetFlags(flags) {
+  const targetFlag = typeof flags.target === "string" && flags.target ? flags.target : "new";
+  const mode = typeof flags.mode === "string" && flags.mode ? flags.mode : "restore";
+  if (mode !== "same_site" && mode !== "restore") {
+    console.error('--mode must be "same_site" or "restore". Nothing was sent.');
+    process.exit(1);
+  }
+  const acceptLiveEffects =
+    typeof flags["accept-live-effects"] === "string"
+      ? flags["accept-live-effects"].split(",").map((s) => s.trim()).filter(Boolean)
+      : [];
+  return { targetFlag, mode, acceptLiveEffects };
+}
+
+function siteStateBody({ manifest, requestFiles, opts }) {
+  return { manifest, files: requestFiles, mode: opts.mode, target: { instance: opts.targetFlag }, accept_live_effects: opts.acceptLiveEffects };
+}
+
+/** CF-T4 — the target block's operation: "plan/apply/publish · <draft instance> · mode <m> [· LIVE EFFECTS: …]". */
+function siteStateOperationLabel(opts, op) {
+  const t = opts.targetFlag === "new" ? "new draft instance" : `instance ${opts.targetFlag}`;
+  const live = opts.acceptLiveEffects.length ? ` · LIVE EFFECTS: ${opts.acceptLiveEffects.join(",")}` : "";
+  return `${op} · ${t} · mode ${opts.mode}${live}`;
+}
+
+function printSiteStatePlan(plan) {
+  console.log(`Status: ${plan.status} (target instance: ${plan.target_instance ?? "not created yet"})`);
+  if (plan.steps.length === 0) {
+    console.log("No steps: this state is already applied to the target.");
+  } else {
+    console.log("Steps:");
+    for (const s of plan.steps) {
+      console.log(`  ${String(s.seq).padStart(2)}  ${s.owner.padEnd(14)} ${s.action.padEnd(16)} ${s.key}${s.live_effect ? "  [LIVE EFFECT]" : ""}`);
+    }
+  }
+  if (plan.assets_missing.length > 0) console.log(`Assets missing on the site: ${plan.assets_missing.join(", ")}`);
+  if (plan.theme_source) {
+    console.log(`Theme source differs (digest ${plan.theme_source.digest.slice(0, 12)}…); deploy it to ${plan.theme_source.instance ?? "the new draft instance"}.`);
+  }
+  for (const p of plan.preconditions ?? []) console.warn(`precondition [${p.code}]: ${p.message}`);
+  for (const d of plan.diagnostics ?? []) console.warn(formatDiagnostic(d));
+}
+
+async function siteExport(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.siteExport);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  const target = await prepareTarget({ command: "site export", commandClass: "local-write", dir, flags, needs: "api", mode: "export" });
+  const { apiUrl, apiKey } = target.api;
+  const { fileCount, assetCount } = await withNewBindingClaim(target, dir, async () => {
+    const data = await fetchSiteStateExport({ apiUrl, apiKey, onRetry });
+    const entries = [[MANIFEST_PATH, JSON.stringify(data.manifest, null, 2) + "\n"]];
+    for (const [path, content] of Object.entries(data.files ?? {})) entries.push([path, content]);
+    const assets = Array.isArray(data.assets) ? data.assets : [];
+    for (const asset of assets) {
+      const buf = await downloadAssetBytes({ url: asset.url, onRetry });
+      const got = hashBuffer(buf);
+      if (got !== asset.sha256) {
+        throw new Error(`Downloaded ${asset.filename ?? asset.sha256} does not match its sha256 (expected ${asset.sha256}, got ${got}); nothing was written.`);
+      }
+      entries.push([`media/files/${asset.sha256}`, buf]);
+    }
+    // Staged, all-or-nothing: nothing lands on disk until every text file AND every downloaded, hash-verified
+    // asset is ready.
+    stagedWriteTree(dir, entries);
+    return { fileCount: entries.length - assets.length, assetCount: assets.length };
+  });
+  console.log(`Exported ${fileCount} file(s) + ${assetCount} asset(s) → ${dir}`);
+  bindAfterPull(target, dir);
+}
+
+async function siteValidate(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.siteValidate);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  if (!existsSync(dir)) {
+    console.error(`Directory not found: ${dir}`);
+    process.exit(1);
+  }
+  const tree = readSiteStateTree(dir);
+  const combined = { ...tree.files };
+  for (const a of tree.assets) combined[a.path] = ""; // content irrelevant to the structural checks below
+  const findings = [...tree.diagnostics, ...validateSiteStateTree(combined)];
+
+  if (tree.files[MANIFEST_PATH] !== undefined) {
+    let manifest = null;
+    try {
+      manifest = JSON.parse(tree.files[MANIFEST_PATH]);
+    } catch {
+      /* reported below */
+    }
+    if (manifest === null) {
+      findings.push({ level: "error", code: "SITE_STATE_INVALID_FILE", message: "blocofy-site.json is not valid JSON", path: MANIFEST_PATH });
+    } else {
+      const withoutManifest = { ...tree.files };
+      delete withoutManifest[MANIFEST_PATH];
+      const refusal = verifyManifest(manifest, withoutManifest);
+      if (refusal) findings.push({ level: "error", code: refusal.code, message: refusal.message, path: MANIFEST_PATH });
+    }
+  }
+
+  const code = reportPageDiagnostics(findings, { strict: Boolean(flags.strict) });
+  const errors = findings.filter((f) => f.level === "error").length;
+  console.log(`Checked ${Object.keys(tree.files).length + tree.assets.length} file(s): ${errors} error(s), ${findings.length - errors} warning(s).`);
+  process.exit(code);
+}
+
+/**
+ * `site migrate` — purely local (no `prepareTarget`, no identity call, `.blocofy/` never read): turns a
+ * directory left by the older separate `theme pull` / `pages pull` / `settings pull` into the site-state
+ * v1 tree layout. Always reports the plan first (every move, every file left alone, every conflict), then
+ * with --write performs it.
+ */
+async function siteMigrate(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.siteMigrate);
+  if (flags["dry-run"] && flags.write) {
+    console.error("Use either --dry-run or --write, not both. Nothing was moved.");
+    process.exit(1);
+  }
   const dir = resolve(positionals[0] ?? process.cwd());
   if (!existsSync(dir)) {
     console.error(`Directory not found: ${dir}`);
     process.exit(1);
   }
-  const creds = requireCreds();
-  const result = await pushContent({ dir, url: creds.url, token: creds.token, scope });
+  const write = Boolean(flags.write);
+  const r = migrateSiteState({ dir, write });
+
+  for (const m of r.moves) console.log(`  ${write && !r.refused ? "moved" : "move "}  ${m.from} → ${m.to}`);
+  for (const u of r.untouched) console.log(`  leave  ${u.path}  (${u.reason})`);
+  for (const d of r.diagnostics) console.error(formatDiagnostic(d));
+
+  if (r.refused) {
+    console.error("Migration refused; nothing was moved.");
+  } else if (r.moves.length === 0) {
+    console.log("Nothing to do: this directory is already in the site-state tree layout.");
+  } else if (write) {
+    console.log(`Moved ${r.moved} file(s) into the site-state tree layout.`);
+  } else {
+    console.log(`${r.moves.length} file(s) would move. Dry run only; run with --write to move them.`);
+  }
+  if (!r.refused && r.needsExport) {
+    console.log(
+      "This tree still has no blocofy-site.json (and none of site/locales.json, globals, media-policy, " +
+        "content-model, translations, navigation, theme/chrome/**): run `blocofy site export` against a live " +
+        "site to complete it before `site plan`/`apply`/`publish`.",
+    );
+  }
+  process.exit(r.refused ? 1 : 0);
+}
+
+async function sitePlan(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.sitePlan);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  if (!existsSync(dir)) {
+    console.error(`Directory not found: ${dir}`);
+    process.exit(1);
+  }
+  const opts = siteStateTargetFlags(flags);
+  const target = await prepareTarget({ command: "site plan", commandClass: "read", dir, flags, needs: "both", mode: siteStateOperationLabel(opts, "plan") });
+  const { requestFiles, manifest } = loadSiteStateForRequest(dir, target.identity);
+  const plan = await planSiteState({ apiUrl: target.api.apiUrl, apiKey: target.api.apiKey, body: siteStateBody({ manifest, requestFiles, opts }), onRetry });
+  if (JSON_MODE) console.log(JSON.stringify(plan));
+  else printSiteStatePlan(plan);
+}
+
+/** CF-T4 — bounded: plan → (upload assets | deploy theme) → plan → apply, repeated, never more than this many passes. */
+const MAX_APPLY_PASSES = 5;
+
+async function siteApply(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.siteApply);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  if (!existsSync(dir)) {
+    console.error(`Directory not found: ${dir}`);
+    process.exit(1);
+  }
+  const opts = siteStateTargetFlags(flags);
+  const target = await prepareTarget({ command: "site apply", commandClass: "remote-mutation", dir, flags, needs: "both", mode: siteStateOperationLabel(opts, "apply") });
+  const { apiUrl, apiKey } = target.api;
+  const { requestFiles, manifest, tree } = loadSiteStateForRequest(dir, target.identity);
+  const assetsBySha = new Map(tree.assets.map((a) => [a.sha256, a]));
+  // media/assets.json carries each asset's real filename + mime; the filesystem entry alone (media/files/<sha256>)
+  // does not, and uploading with the right content-type is what lets the server categorize/reject it correctly.
+  const assetMetaBySha = new Map();
+  try {
+    for (const entry of JSON.parse(requestFiles["media/assets.json"] ?? "[]")) {
+      if (entry && typeof entry.sha256 === "string") assetMetaBySha.set(entry.sha256, entry);
+    }
+  } catch {
+    /* an unparsable media/assets.json is caught by `site validate`; upload falls back to generic metadata */
+  }
+  const body = () => siteStateBody({ manifest, requestFiles, opts });
+
+  const deployThemeSource = async (themeSource) => {
+    const themeDir = join(tree.root, "theme");
+    if (!existsSync(themeDir)) {
+      console.error(`This state's theme source (theme/) is missing locally at ${themeDir}; nothing was deployed.`);
+      process.exit(1);
+    }
+    console.error(`  deploying theme source to ${themeSource.instance}…`);
+    await pushTheme({ dir: themeDir, url: target.dev.url, token: target.dev.token, instance: themeSource.instance, idempotencyKey: themeSource.idempotency_key, prune: true, onRetry });
+  };
+
+  let last = null;
+  for (let pass = 1; pass <= MAX_APPLY_PASSES; pass++) {
+    const plan = await planSiteState({ apiUrl, apiKey, body: body(), onRetry });
+    last = plan;
+
+    if (plan.status === "awaiting_assets") {
+      for (const sha of plan.assets_missing) {
+        const asset = assetsBySha.get(sha);
+        if (!asset) {
+          console.error(`Asset ${sha} is missing on the site and not found locally at media/files/${sha}. Export the site state again, or add the file. Nothing more was sent.`);
+          process.exit(1);
+        }
+        const meta = assetMetaBySha.get(sha);
+        console.error(`  uploading ${meta?.filename ?? asset.path}…`);
+        await uploadMediaAsset({
+          apiUrl,
+          apiKey,
+          filename: typeof meta?.filename === "string" ? meta.filename : asset.path.split("/").pop(),
+          content: readFileSync(asset.abs),
+          mime: typeof meta?.mime === "string" ? meta.mime : undefined,
+          onRetry,
+        });
+      }
+      continue;
+    }
+    if (plan.status === "awaiting_theme_source") {
+      await deployThemeSource(plan.theme_source);
+      continue;
+    }
+    if (plan.steps.length === 0) break; // draft_complete (or published — an apply target is never live)
+
+    const applied = await applySiteState({ apiUrl, apiKey, body: { ...body(), expected_plan_hash: plan.plan_hash }, onRetry });
+    last = applied;
+    if (applied.status === "awaiting_theme_source") {
+      await deployThemeSource(applied.theme_source);
+      continue;
+    }
+    if (applied.status === "draft_complete") break;
+    // else still "planned" (e.g. the server's own bounded per-call convergence left steps): loop, re-plan.
+  }
+
+  const done = last?.status === "draft_complete" || last?.status === "published";
+  if (JSON_MODE) console.log(JSON.stringify(last));
+  if (done) {
+    console.log(`✓ draft_complete — target instance ${last.target_instance}.`);
+    return;
+  }
   console.log(
-    `Settings push: ${result.settingsUpdated ? "theme settings updated" : "theme settings unchanged"}, ` +
-      `${result.schemesUpserted} color scheme(s) upserted (${result.fileCount} file).`,
+    `Not finished after ${MAX_APPLY_PASSES} pass(es) — target instance ${last?.target_instance ?? "?"}, status ${last?.status ?? "unknown"}. ` +
+      "Run `blocofy site apply` again to continue; every step already applied is safe to resume from.",
   );
+  process.exit(4);
 }
 
-async function contentPull(scope, rest) {
-  const { positionals } = parseArgsOrExit(rest, KNOWN.content);
+async function sitePublish(rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.sitePublish);
   const dir = resolve(positionals[0] ?? process.cwd());
-  const creds = requireCreds();
-  const { count } = await pullContent({ dir, url: creds.url, token: creds.token, scope });
-  console.log(`Downloaded ${count} settings file(s) → ${dir}`);
+  if (!existsSync(dir)) {
+    console.error(`Directory not found: ${dir}`);
+    process.exit(1);
+  }
+  const opts = siteStateTargetFlags(flags);
+  const target = await prepareTarget({ command: "site publish", commandClass: "remote-mutation", dir, flags, needs: "api", mode: `${siteStateOperationLabel(opts, "publish")} · LIVE` });
+  const { apiUrl, apiKey } = target.api;
+  const siteName = siteLabel(target.identity.site) || String(target.identity.site.id);
+
+  // Separate live gate (contract §A3): TTY asks y/N, a non-interactive shell must pass --yes — same
+  // decision `settings push --live` uses, before ANY site-state request is sent.
+  const decision = livePushDecision({ draft: false, yes: Boolean(flags.yes), confirm: false, isTTY: Boolean(process.stdin.isTTY) });
+  if (decision.mustAbort) {
+    console.error(`⚠ 'site publish' makes this state the LIVE site of ${siteName}.`);
+    console.error("  Non-interactive shell: pass --yes to confirm. Nothing was sent.");
+    process.exit(1);
+  }
+  if (decision.needsPrompt) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    let answer;
+    try {
+      answer = await rl.question(`⚠ Publish this state as the LIVE site of ${siteName}? [y/N] `);
+    } finally {
+      rl.close();
+    }
+    if (!isAffirmative(answer)) {
+      console.error("Aborted. Nothing was sent.");
+      process.exit(1);
+    }
+  }
+
+  const { requestFiles, manifest } = loadSiteStateForRequest(dir, target.identity);
+  const result = await publishSiteState({ apiUrl, apiKey, body: siteStateBody({ manifest, requestFiles, opts }), onRetry });
+  if (JSON_MODE) console.log(JSON.stringify(result));
+  console.log(
+    `✓ Published — target instance ${result.target_instance}${result.swapped ? " (now live)" : " (already live)"}; ` +
+      `${result.navigation.length} menu(s) written, globals ${result.globals ? "updated" : "unchanged"}.`,
+  );
 }
 
-/** Resolve the v1 API pair (blcf_live_ key only) or exit 1 with guidance. Never prints the key. */
-function requireApiCreds() {
-  let creds;
-  try {
-    creds = loadApiCredentials();
-  } catch (error) {
-    console.error(error?.message ?? error);
+async function contentPush(scope, rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.settingsPush);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  // T10.1 "never implicitly live": the target is named — a theme handle or an explicit --live. Refused before any request.
+  if (flags.instance === true || flags.instance === "") {
+    console.error("--instance needs a theme handle (from the admin panel theme card, or `blocofy status`). Nothing was sent.");
     process.exit(1);
   }
-  if (!creds) {
-    console.error("API key required: run `blocofy login --api-key` (or set BLOCOFY_API_KEY + BLOCOFY_API_URL). The dev token (bcf_) is not accepted for the v1 API.");
+  const instance = typeof flags.instance === "string" ? flags.instance : null;
+  if (instance && flags.live) {
+    console.error("Pass either --instance <handle> or --live, not both. Nothing was sent.");
     process.exit(1);
   }
-  if (!isValidApiKey(creds.apiKey)) {
-    console.error(`The stored API key (${creds.source}) is not a v1 key — it must start with blcf_live_. Run \`blocofy login --api-key\`.`);
+  if (!instance && !flags.live) {
+    console.error("settings push needs a target. Nothing was sent.");
+    console.error("  --instance <handle>  write a specific theme (a draft stays out of the live site until published)");
+    console.error("  --live               write the LIVE theme (asks to confirm; non-interactive shells add --yes)");
     process.exit(1);
   }
-  return creds;
+  if (!existsSync(dir)) {
+    console.error(`Directory not found: ${dir}`);
+    process.exit(1);
+  }
+  const target = await prepareTarget({ command: `${scope} push`, commandClass: "remote-mutation", dir, flags, needs: "dev", mode: instance ? `instance ${instance}` : "live" });
+  const creds = target.dev;
+  if (!instance) {
+    const siteName = siteLabel(target.identity.site) || String(target.identity.site.id);
+    const decision = livePushDecision({ draft: false, yes: Boolean(flags.yes), confirm: Boolean(flags.confirm), isTTY: Boolean(process.stdin.isTTY) });
+    if (decision.mustAbort) {
+      console.error(`⚠ 'settings push --live' writes the theme settings of the LIVE theme of ${siteName}.`);
+      console.error("  Non-interactive shell: pass --live --yes to confirm, or target a draft with --instance <handle>. Nothing was sent.");
+      process.exit(1);
+    }
+    if (decision.needsPrompt) {
+      const rl = createInterface({ input: process.stdin, output: process.stdout });
+      let answer;
+      try {
+        answer = await rl.question(`⚠ Push settings to the LIVE theme of ${siteName}? [y/N] `);
+      } finally {
+        rl.close();
+      }
+      if (!isAffirmative(answer)) {
+        console.error("Aborted. Nothing was sent.");
+        process.exit(1);
+      }
+    }
+  }
+  const result = await pushContent({ dir, url: creds.url, token: creds.token, scope, instance, onRetry });
+  console.log(
+    `Settings push: ${result.settingsUpdated ? "theme settings updated" : "theme settings unchanged"}, ` +
+      `${result.schemesUpserted} color scheme(s) upserted (${result.fileCount} file).`,
+  );
+  // T10.1 — where the write is visible (an older server sends none of these fields).
+  const h = result.instance ?? instance;
+  if (result.live_requires === "theme_publish") {
+    console.log(`Applied to draft theme ${h} — visible in its preview; not live until \`blocofy theme publish --instance ${h}\`.`);
+  } else if (result.live_requires === "theme_deploy") {
+    console.log(`Saved; the live site shows it after the next theme deploy/publish (live_applied: false). Visible in the preview now.`);
+  } else if (result.live_applied === true) {
+    console.log(`Applied to the live theme${h ? ` ${h}` : ""} — live now.`);
+  }
 }
 
-/** v1 refusal (4xx) → {error} JSON on stderr, exit 2; anything else → message, exit 1. */
-function exitForApiError(error) {
-  if (error instanceof CliRefusal) {
-    console.error(JSON.stringify({ error: error.error }));
-    process.exit(2);
+async function contentPull(scope, rest) {
+  const { flags, positionals } = parseArgsOrExit(rest, KNOWN.content);
+  const dir = resolve(positionals[0] ?? process.cwd());
+  const target = await prepareTarget({ command: `${scope} pull`, commandClass: "local-write", dir, flags, needs: "dev", mode: "live" });
+  const creds = target.dev;
+  const { count } = await withNewBindingClaim(target, dir, () => pullContent({ dir, url: creds.url, token: creds.token, scope, onRetry }));
+  console.log(`Downloaded ${count} settings file(s) → ${dir}`);
+  bindAfterPull(target, dir);
+}
+
+/**
+ * Optional online mode for offline-capable reads (`pages check`, `pages migrate-layout`): no credentials at all, or
+ * no context choosable outside a project → offline. Inside a bound project every other refusal still applies.
+ */
+async function optionalTarget({ command, dir, flags, localWrite = false }) {
+  try {
+    // Review I3: a command that writes local files (migrate-layout --write) never borrows the global default
+    // context — outside a binding it needs an explicit --context/env, else it runs offline.
+    return await prepareTarget({ command, commandClass: "read", resolveClass: localWrite ? "local-write" : "read", dir, flags, needs: "dev", mode: localWrite ? "read · local write" : "read" });
+  } catch (error) {
+    if (error instanceof TargetError && (error.code === "LOGIN_REQUIRED" || (error.code === "TARGET_CONTEXT_REQUIRED" && !findBinding(dir)))) return null;
+    throw error;
   }
-  console.error(error?.message ?? error);
-  process.exit(1);
 }
 
 function printMediaUsesView(view) {
@@ -741,8 +1675,8 @@ async function pagesMediaUses(rest) {
     console.error("Usage: blocofy pages media-uses <page-handle> [--json]");
     process.exit(1);
   }
-  const { apiUrl, apiKey } = requireApiCreds();
-  const view = await fetchPageMediaUses({ apiUrl, apiKey, page });
+  const { apiUrl, apiKey } = (await prepareTarget({ command: "pages media-uses", commandClass: "read", dir: process.cwd(), flags, needs: "api", mode: `read · page ${page}` })).api;
+  const view = await fetchPageMediaUses({ apiUrl, apiKey, page, onRetry });
   if (flags.json) console.log(JSON.stringify(view, null, 2));
   else printMediaUsesView(view);
 }
@@ -784,9 +1718,9 @@ async function pagesMediaDecide(rest) {
     process.exit(1);
   }
 
-  const { apiUrl, apiKey } = requireApiCreds();
+  const { apiUrl, apiKey } = (await prepareTarget({ command: "pages media-decide", commandClass: "remote-mutation", dir: process.cwd(), flags, needs: "api", mode: `draft · page ${page}` })).api;
   if (expectedRevisionId === null) {
-    const view = await fetchPageMediaUses({ apiUrl, apiKey, page });
+    const view = await fetchPageMediaUses({ apiUrl, apiKey, page, onRetry });
     if (view.applicable === false) {
       console.error(`Page ${page}: media decisions not applicable (${view.reason}). Nothing was written.`);
       process.exit(1);
@@ -798,7 +1732,7 @@ async function pagesMediaDecide(rest) {
     item && typeof item === "object" && typeof item.idempotency_key !== "string" ? { ...item, idempotency_key: randomUUID() } : item,
   );
 
-  const out = await decidePageMediaUses({ apiUrl, apiKey, page, expectedRevisionId, expectedVersion, decisions });
+  const out = await decidePageMediaUses({ apiUrl, apiKey, page, expectedRevisionId, expectedVersion, decisions, onRetry });
   if (flags.json) {
     console.log(JSON.stringify(out, null, 2));
     return;
@@ -821,7 +1755,10 @@ async function themeDev(rest) {
     process.exit(1);
   }
 
-  const creds = requireCreds();
+  // CF-T2: draft sync mutates the site (remote-mutation, binding required); `--no-sync` only renders (read).
+  const noSync = Boolean(flags["no-sync"]);
+  const target = await prepareTarget({ command: "theme dev", commandClass: noSync ? "read" : "remote-mutation", dir: themeDir, flags, needs: "dev", mode: noSync ? "read · local preview" : "draft" });
+  const creds = target.dev;
   const port = Number(flags.port) || 3030;
 
   // Dev session: live-domain preview + theme editor URLs (+ a draft to sync into).
@@ -830,7 +1767,7 @@ async function themeDev(rest) {
   if (!flags["no-sync"]) {
     try {
       const name = typeof flags.name === "string" ? flags.name : null;
-      session = await fetchDevSession({ url: creds.url, token: creds.token, name });
+      session = await fetchDevSession({ url: creds.url, token: creds.token, name, onRetry });
     } catch (error) {
       console.warn(
         `Warning: dev session unavailable (${error?.message || error}). ` +
@@ -845,7 +1782,7 @@ async function themeDev(rest) {
 
   // Çözülen site'ı göster (session TOKEN'dan çözer) → hangi tenant'ı düzenlediğin belli olsun.
   const siteLine = session?.site ? `${siteLabel(session.site)} · ` : "";
-  console.log(`\nblocofy theme dev — ${siteLine}${creds.url} (token ${creds.token.slice(0, 8)}…)\n`);
+  console.log(`\nblocofy theme dev — ${siteLine}${creds.url} (context ${target.name})\n`);
   console.log(`  (l) Local      ${hyperlink(localUrl)}`);
   if (previewUrl) console.log(`  (p) Preview    ${hyperlink(previewUrl)}`);
   if (editorUrl) console.log(`  (e) Editor     ${hyperlink(editorUrl)}`);
@@ -959,7 +1896,8 @@ async function themeDev(rest) {
 
 async function themePublish(rest) {
   const { flags } = parseArgsOrExit(rest, KNOWN.themePublish);
-  const creds = requireCreds();
+  const target = await prepareTarget({ command: "theme publish", commandClass: "remote-mutation", dir: process.cwd(), flags, needs: "dev", mode: `live${typeof flags.instance === "string" ? ` · instance ${flags.instance}` : " · CLI draft"}` });
+  const creds = target.dev;
   let instance = typeof flags.instance === "string" ? flags.instance : null;
   if (!instance) {
     // Belirtilmediyse: `theme dev` / `theme push --draft`'ın yazdığı taslağı yayınla. Kaynak
@@ -969,7 +1907,7 @@ async function themePublish(rest) {
     // `drafts` canlı OLMAYAN HER instance'ı içerir; sunucunun `ensureDraftInstance`'ı ise
     // `source === "import"` olanı seçer (yayınlanan taslak import'tan çıkarılır). Aynı seçimi
     // burada tekrarla — yoksa bir kez yayın yapmış her sitede iki taslak görünür ve komut takılır.
-    const status = await fetchSiteStatus({ url: creds.url, token: creds.token });
+    const status = await fetchSiteStatus({ url: creds.url, token: creds.token, onRetry });
     const drafts = status?.drafts ?? [];
     const cliDrafts = drafts.filter((d) => d.source === "import");
     if (cliDrafts.length === 1) {
@@ -983,7 +1921,7 @@ async function themePublish(rest) {
       process.exit(1);
     }
   }
-  const result = await publishInstance({ url: creds.url, token: creds.token, instanceId: instance });
+  const result = await publishInstance({ url: creds.url, token: creds.token, instanceId: instance, onRetry });
   console.log(
     `✓ Theme ${result.published} is now LIVE${result.cloned ? " (pages cloned from the previous live theme)" : ""}.`,
   );
@@ -998,14 +1936,15 @@ async function themeRename(rest) {
     console.error("  Rename a theme (handle from the panel theme card or `blocofy status`).");
     process.exit(1);
   }
-  const creds = requireCreds();
-  const result = await renameInstance({ url: creds.url, token: creds.token, instance: handle, name });
+  const creds = (await prepareTarget({ command: "theme rename", commandClass: "remote-mutation", dir: process.cwd(), flags, needs: "dev", mode: `instance ${handle}` })).dev;
+  const result = await renameInstance({ url: creds.url, token: creds.token, instance: handle, name, onRetry });
   console.log(`✓ Renamed to "${result.name}" (${result.id}).`);
 }
 
-async function status() {
-  const creds = requireCreds();
-  const s = await fetchSiteStatus({ url: creds.url, token: creds.token });
+async function status(rest) {
+  const { flags } = parseArgsOrExit(rest, []);
+  const creds = (await prepareTarget({ command: "status", commandClass: "read", dir: process.cwd(), flags, needs: "dev", mode: "read" })).dev;
+  const s = await fetchSiteStatus({ url: creds.url, token: creds.token, onRetry });
   const live = s.live_theme_instance;
   console.log(`\nSite: ${s.site.slug}${s.url ? ` · ${s.url}` : ""}`);
   console.log(
@@ -1014,24 +1953,8 @@ async function status() {
       : `Live theme: none`,
   );
   console.log(`Health: ${s.health}`);
-  // orphan_missing_slugs yeni sunucu alanı (PR #661). Eski/deploy-edilmemiş sunucuda
-  // yok → null; o durumda eski (yumuşatılmış) sayaç satırına düş.
-  const missing = Array.isArray(s.orphan_missing_slugs) ? s.orphan_missing_slugs : null;
-  if (s.health === "live_instance_empty") {
-    console.error(
-      `  ⚠ The live theme has no pages — the site will 404. Publish a theme with content:  blocofy theme publish`,
-    );
-  } else if (s.health === "pages_split") {
-    if (missing && missing.length) {
-      console.warn(
-        `  ⚠ These pages are published only on a non-live theme, so visitors can't reach them (404 risk): ` +
-          `${missing.join(", ")}\n` +
-          `  Fix: publish the theme that has them —  blocofy theme publish`,
-      );
-    } else {
-      console.warn(`  ⚠ ${s.orphaned_pages} page(s) published on a non-live theme.`);
-    }
-  }
+  // CF-T9: no imperative one-line fix — which theme holds the pages, why, and safe (preview-first) next steps.
+  for (const line of healthAdvice(s)) console.error(line);
   if (Array.isArray(s.drafts) && s.drafts.length > 0) {
     console.log(`Drafts: ${s.drafts.map((d) => `${d.id}${d.name ? ` ${d.name}` : ""}`).join(", ")}`);
   }
@@ -1040,6 +1963,40 @@ async function status() {
 
 const [first, ...rest] = args;
 
+function commandKey(a, b) {
+  return `${a} ${b ?? ""}`;
+}
+
+// command → handler. Every failure exits through failAndExit (exit codes 1/2/3, --json envelope last).
+const COMMANDS = {
+  login: login,
+  contexts: contextsCommand,
+  use: useCommand,
+  logout: logoutCommand,
+  link: linkCommand,
+  target: targetCommand,
+  status: status,
+  "theme dev": themeDev,
+  "theme pull": themePull,
+  "theme push": themePush,
+  "theme publish": themePublish,
+  "theme rename": themeRename,
+  "pages media-uses": pagesMediaUses,
+  "pages media-decide": pagesMediaDecide,
+  "pages pull": pagesPull,
+  "pages push": pagesPush,
+  "pages check": pagesCheck,
+  "pages migrate-layout": pagesMigrate,
+  "settings pull": (r) => contentPull("settings", r),
+  "settings push": (r) => contentPush("settings", r),
+  "site export": siteExport,
+  "site validate": siteValidate,
+  "site migrate": siteMigrate,
+  "site plan": sitePlan,
+  "site apply": siteApply,
+  "site publish": sitePublish,
+};
+
 if (first === "--version" || first === "-v") {
   console.log(VERSION);
 } else if (!first || first === "--help" || first === "-h" || first === "help") {
@@ -1051,63 +2008,10 @@ if (first === "--version" || first === "-v") {
 } else if (args.includes("--version") || args.includes("-v")) {
   // Aynı simetri: `theme push <dir> --version` da yalnız sürüm basar, asla yazmaz.
   console.log(VERSION);
-} else if (first === "login") {
-  login(rest).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "theme" && rest[0] === "dev") {
-  themeDev(rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "theme" && rest[0] === "pull") {
-  themePull(rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "theme" && rest[0] === "push") {
-  themePush(rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "theme" && rest[0] === "publish") {
-  themePublish(rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "theme" && rest[0] === "rename") {
-  themeRename(rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "status") {
-  status().catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "pages" && rest[0] === "media-uses") {
-  pagesMediaUses(rest.slice(1)).catch(exitForApiError);
-} else if (first === "pages" && rest[0] === "media-decide") {
-  pagesMediaDecide(rest.slice(1)).catch(exitForApiError);
-} else if (first === "pages" && rest[0] === "pull") {
-  pagesPull(rest.slice(1)).catch(exitForPagesError);
-} else if (first === "pages" && rest[0] === "push") {
-  pagesPush(rest.slice(1)).catch(exitForPagesError);
-} else if (first === "pages" && rest[0] === "check") {
-  pagesCheck(rest.slice(1)).catch(exitForPagesError);
-} else if (first === "pages" && rest[0] === "migrate-layout") {
-  pagesMigrate(rest.slice(1)).catch(exitForPagesError);
-} else if (first === "settings" && rest[0] === "pull") {
-  contentPull("settings", rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
-} else if (first === "settings" && rest[0] === "push") {
-  contentPush("settings", rest.slice(1)).catch((error) => {
-    console.error(error?.message ?? error);
-    process.exit(1);
-  });
+} else if (COMMANDS[commandKey(first, rest[0])] || COMMANDS[first]) {
+  const keyed = COMMANDS[commandKey(first, rest[0])];
+  const handler = keyed ?? COMMANDS[first];
+  handler(keyed ? rest.slice(1) : rest).catch(failAndExit);
 } else {
   console.error(`Unknown command: ${args.join(" ")}\n`);
   printHelp();