@universalcms/connect 0.13.3 → 0.13.4

package/README.md

@@ -1,7 +1,7 @@
 # @universalcms/connect
 
 Local, deterministic website setup without AI. Universal CMS stays hosted; this
-package creates a website integration, not a CMS installation. Version 0.13.3 is
+package creates a website integration, not a CMS installation. Version 0.13.4 is
 prepared locally; this repository does not establish its public npm availability.
 
 ## Quick start
@@ -20,6 +20,8 @@ connection (Next.js): the CMS manages menus, branding, SEO, analytics, scripts,
 consent and redirects while the site renders every page. Add
 `<CmsNavigation location="header" />` from `@universalcms/connect/react-website`
 where CMS menus should appear.
+Add `--reset` to disconnect the folder first and connect it to another website
+or organization.
 The individual commands below remain for developers and reviewed integrations.
 
 Supported templates: **Next.js 16 App Router on Node**, **React 19.2+ with
@@ -262,7 +264,7 @@ custom adapter still requires review, not forced overwriting.
 For an operator's downloaded artifact, the installation is:
 
 ```sh
-npm install --save-prod ./vendor/universalcms-connect-0.13.3.tgz
+npm install --save-prod ./vendor/universalcms-connect-0.13.4.tgz
 ```
 
 Use your project's package manager. These paths are examples for downloaded
@@ -539,7 +541,7 @@ npx --no-install universalcms-connect init \
   --environment 22222222-2222-4222-8222-222222222222
 ```
 
-After a public release, `npx @universalcms/connect@0.13.3 init` is the equivalent
+After a public release, `npx @universalcms/connect@0.13.4 init` is the equivalent
 registry entry point. Copy the real IDs/API origin from **Developer setup**.
 Missing values are prompted in a terminal; `--non-interactive` fails instead.
 Init prints a plan. Run the same command with `--apply` after reviewing it.
@@ -589,7 +591,7 @@ The CMS button reads the website's **`/api/cms-source`** endpoint. Current Next.
 prepares delivery scaffolding. React/Vite setup serves its reviewed public manifest through the normal dev command.
 Custom exporters need their explicit adapter; a delivery check alone is insufficient.
 
-Use the CMS's reviewed 0.13.3 package for the staged commands and current source
+Use the CMS's reviewed 0.13.4 package for the staged commands and current source
 discovery. Review source diagnostics and complete public
 mappings for unsupported pages. Restart the website using its normal server command, then run:
 

package/dist/cli.mjs

@@ -20,7 +20,7 @@ import { WEBSITE_SECTIONS } from './website-http.mjs';
 import { setupSource, applySourcePlan, syncSource, readSourceSettings } from './source-setup.mjs';
 import { processIo, runCreate, runGuided } from './guided.mjs';
 
-const help = `Universal CMS connector 0.13.3
+const help = `Universal CMS connector 0.13.4
 
 Quick start (recommended) — run in your website folder:
   npx @universalcms/connect@latest --cms https://YOUR_CMS_ADDRESS
@@ -33,6 +33,7 @@ Quick start (recommended) — run in your website folder:
   --cms <origin>           Your Universal CMS address (or UNIVERSALCMS_URL)
   --code <code>            One-time code from Developer setup → Connect without a browser
   --details                Show every file and technical message
+  --reset                  Disconnect this folder first, then connect it to another website or organization
 
 New website managed entirely from the CMS (pages, posts, menus, design):
   npx @universalcms/connect@latest create my-website --cms https://YOUR_CMS_ADDRESS
@@ -338,7 +339,7 @@ function guidedArguments(args) {
   for (let index = 0; index < args.length; index++) {
     const name = args[index];
     if (Object.hasOwn(options, name)) throw new SetupError('Each option can be given once.');
-    if (name === '--details') { options[name] = true; continue; }
+    if (name === '--details' || name === '--reset') { options[name] = true; continue; }
     if (!names.has(name)) throw new SetupError(`Unknown option ${JSON.stringify(name.slice(0, 40))}. Use --help for instructions.`);
     const value = args[++index];
     if (!value || value.startsWith('--')) throw new SetupError('An option is missing its value.');
@@ -363,7 +364,7 @@ async function main() {
     // it expires in ten minutes, works once and never reaches project files.
     const options = guidedArguments(process.argv.slice(2));
     if (!process.stdin.isTTY || !process.stderr.isTTY) throw new SetupError('This setup needs an interactive terminal. Run it directly in your website folder.');
-    await runGuided(options['--project'] ?? process.cwd(), { cms: options['--cms'], code: options['--code'], details: options['--details'] === true }, processIo({ ask, write: value => process.stdout.write(value) }));
+    await runGuided(options['--project'] ?? process.cwd(), { cms: options['--cms'], code: options['--code'], details: options['--details'] === true, reset: options['--reset'] === true }, processIo({ ask, write: value => process.stdout.write(value) }));
     return;
   }
   const { command, options } = argumentsFor(process.argv.slice(2));

package/dist/guided.mjs

@@ -9,7 +9,7 @@
 import { createHash, randomBytes, timingSafeEqual } from 'node:crypto';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
-import { cp, lstat, mkdir, readdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { chmod, cp, lstat, mkdir, readdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { analyze, applyPlan, projectRoot, readProjectFile, SetupError } from './core.mjs';
@@ -378,6 +378,7 @@ export async function runGuided(directory, options, io) {
   const analysis = await analyze(root).catch(() => ({}));
   const framework = typeof analysis.framework === 'string' && analysis.framework !== 'Unknown' ? analysis.framework : null;
   io.write(`✔ Found ${framework ? `a ${framework} website` : 'a website'} in ${path.basename(root)}\n`);
+  if (options.reset) await resetConnection(root, io);
 
   // A Universal CMS theme website only needs pairing and its private key.
   if (await readProjectFile(root, THEME_FILE) !== null) {
@@ -429,7 +430,7 @@ export async function runGuided(directory, options, io) {
     : await waitForBrowserApproval({ cms, io, request: { origin: saved?.websiteOrigin ?? suggestedOrigin(manifest, framework) ?? '', project: path.basename(root).slice(0, 80), framework: framework ?? '' } });
   let mode = 'full';
   const mismatch = connection => saved && (saved.siteId !== connection.siteId || saved.environmentId !== connection.environmentId);
-  const different = 'This folder is already connected to a different website or environment in the CMS. Choose the same website when approving, or ask your developer to review .universalcms/connection.json. Nothing was changed.';
+  const different = 'This folder is already connected to a different website or environment in the CMS. Choose the same website when approving, or run the command again with --reset to connect it to the other website. Nothing was changed.';
   // Check (and safely fix) the website before redeeming, so a blocked site
   // never leaves an unused key behind. The approval expires on its own.
   if (approval.scope && !installed) {
@@ -471,6 +472,41 @@ export const THEME_FILE = '.universalcms/theme.json';
 export const THEME_WEBSITE_FILE = '.universalcms/website.json';
 const THEME_PORT = 3100;
 
+const RESET_FILES = ['.universalcms/connection.json', '.universalcms/settings-only.json', '.universalcms/discovered.json', '.universalcms/website.json'];
+const RESET_ENV = /^\s*(?:export\s+)?(CMS_API_BASE_URL|CMS_SITE_ID|CMS_ENVIRONMENT_ID|CMS_LOCALE|CMS_API_KEY|CMS_WEBSITE_ORIGIN|CMS_SOURCE_ORIGIN|CMS_ADMIN_ORIGIN)\s*=/;
+
+/**
+ * `--reset`: disconnect this folder from its CMS website so it can be connected
+ * to another website or organization. Removes only the saved connection and the
+ * private CMS_* values; generated integration code stays and is updated when
+ * the folder is connected again in the same run.
+ */
+export async function resetConnection(directory, io) {
+  const root = await projectRoot(directory);
+  const settingsOnly = await readProjectFile(root, SETTINGS_ONLY_FILE) !== null, theme = await readProjectFile(root, THEME_FILE) !== null;
+  const full = !settingsOnly && !theme && (await readProjectFile(root, '.universalcms/publication.config.json') !== null || await readProjectFile(root, '.universalcms/website.integration.json') !== null);
+  if (full) fail('This folder has a full page integration (pages are bound to CMS content for one website). Moving it to another website needs your developer: the page bindings and imported content belong to the current website. Nothing was changed.');
+  const present = [];
+  for (const file of RESET_FILES) if (await readProjectFile(root, file) !== null) present.push(file);
+  const envText = await readProjectFile(root, '.env.local');
+  const envLines = envText === null ? [] : envText.split(/\r?\n/).filter(line => RESET_ENV.test(line));
+  const saved = await readConnection(root).catch(() => null);
+  if (!present.length && !envLines.length) { io.write('This folder is not connected to a CMS website. Nothing to reset.\n'); return false; }
+  io.write(`\nDisconnect this folder${saved ? ` from website ${saved.siteId} (${saved.websiteOrigin})` : ''}:\n`);
+  for (const file of present) io.write(`  remove: ${file}\n`);
+  if (envLines.length) io.write(`  remove from .env.local: ${envLines.map(line => line.split('=')[0].replace(/^\s*(export\s+)?/, '').trim()).join(', ')}\n`);
+  io.write('Your pages, design and other settings stay as they are. You will connect it to a website right after this.\n');
+  if (!yes(await io.ask('Disconnect? [Y/n] '))) fail('Nothing was changed.');
+  for (const file of present) await rm(path.join(root, file), { force: true });
+  if (envLines.length) {
+    const kept = envText.split(/(\r?\n)/).reduce((out, part, index, parts) => { if (index % 2 === 0 && !RESET_ENV.test(part)) out.push(part + (parts[index + 1] ?? '')); return out; }, []).join('');
+    await writeFile(path.join(root, '.env.local'), kept, { mode: 0o600 });
+    await chmod(path.join(root, '.env.local'), 0o600);
+  }
+  io.write('✔ Disconnected. The old website key still works until you revoke it in that website\'s Developer setup → Advanced → website keys.\n');
+  return true;
+}
+
 /** Save the public theme connection and the private key after pairing. */
 async function connectTheme(root, paired, io) {
   const { connection } = paired;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universalcms/connect",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "Deterministic framework-aware Universal CMS setup for reviewed native websites",
   "type": "module",
   "bin": {