gnosys 5.9.2 → 5.9.4

package/dist/lib/setup.js

@@ -16,7 +16,8 @@ import os from "os";
 import { execSync } from "child_process";
 import { loadConfig, updateConfig, getProviderModel, } from "./config.js";
 import { validateModel } from "./modelValidation.js";
-import { getGnosysHome } from "./paths.js";
+import { resolveActiveStorePath, ensureActiveStorePath } from "./setup/storePath.js";
+import { safeQuestion } from "./setup/ui/safePrompt.js";
 // ─── ANSI Colors ────────────────────────────────────────────────────────────
 const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
@@ -138,6 +139,12 @@ export async function fetchDynamicModels() {
             })
                 .filter((m) => m.input > 0 && !m.isFree && !m.isVariant && !m.isGuard)
                 .filter((m) => !/audio|search|embed|tts|vision|image|code-/i.test(m.modelId)) // skip specialized models
+                // v5.9.4 Bug 3 — xAI: OpenRouter returns weird names like
+                // `grok-build-0.1` and `grok-4.20-multi-agent`. Keep only canonical
+                // numbered Grok flagship/preview models (e.g. `grok-3`, `grok-4.0`,
+                // `grok-4.3`). When nothing matches we fall through to the static
+                // tiers a few lines down.
+                .filter((m) => ourProvider !== "xai" || /^grok-[0-9]/.test(m.modelId))
                 .sort((a, b) => b.created - a.created); // newest first
             if (models.length === 0)
                 continue;
@@ -226,6 +233,19 @@ export async function fetchDynamicModels() {
             if (!tiers.some((t) => t.recommended) && tiers.length > 0) {
                 tiers[0].recommended = true;
             }
+            // v5.9.4 Bug 3 — UNION OpenRouter tiers with static PROVIDER_TIERS.xai
+            // so the static catalog (e.g. grok-4.3) always shows up even when
+            // OpenRouter omits it. Dedup by model id; static entries win the tie
+            // (their pricing matches the launch price more reliably).
+            if (ourProvider === "xai") {
+                const seen = new Set(tiers.map((t) => t.model));
+                for (const staticTier of PROVIDER_TIERS.xai ?? []) {
+                    if (!seen.has(staticTier.model)) {
+                        tiers.push(staticTier);
+                        seen.add(staticTier.model);
+                    }
+                }
+            }
             result[ourProvider] = tiers;
         }
         // Cache the result
@@ -532,6 +552,16 @@ export async function detectIDEs(projectDir) {
             // Not installed
         }
     }
+    // v5.9.4 Bug 12 — Grok Build (xAI's coding agent) stores MCP config at
+    // ~/.grok/config.toml. The directory's presence is the detection signal.
+    try {
+        const stat = await fs.stat(path.join(home, ".grok"));
+        if (stat.isDirectory())
+            detected.push("grok-build");
+    }
+    catch {
+        // Not installed
+    }
     return detected;
 }
 /**
@@ -551,6 +581,68 @@ function claudeDesktopConfigPath() {
     }
     return path.join(home, ".config", "Claude", "claude_desktop_config.json");
 }
+/**
+ * Replace (or append) a `[mcp.<name>]` block inside the TOML text for
+ * Grok Build's config file. Preserves every line outside that block —
+ * deci-046 read-then-merge rule. We can't pull in a TOML dependency
+ * without adding to package.json, so we ship a minimal hand-rolled
+ * updater scoped exactly to the `[mcp.gnosys]` use case.
+ *
+ * Spec assumption: TOML headers we touch are simple `[a.b]` lines with
+ * no inline tables or nested arrays. Any other content is left alone.
+ *
+ * Exported for tests.
+ */
+export function upsertGrokMcpBlock(existing, name, entry) {
+    const sectionHeader = `[mcp.${name}]`;
+    const lines = existing.split("\n");
+    const headerIdx = lines.findIndex((line) => line.trim() === sectionHeader);
+    const blockBody = renderGrokMcpBlock(entry);
+    if (headerIdx === -1) {
+        // Append a fresh block, separated by a blank line if the file has content.
+        const prefix = existing.length === 0 || existing.endsWith("\n\n")
+            ? existing
+            : existing.endsWith("\n") ? `${existing}\n` : `${existing}\n\n`;
+        return `${prefix}${sectionHeader}\n${blockBody}`;
+    }
+    // Replace the existing block — everything from sectionHeader up to the
+    // next `[` header (or EOF). Count blank lines immediately after the block
+    // so we can preserve the original spacing before the next section.
+    let endIdx = lines.length;
+    for (let i = headerIdx + 1; i < lines.length; i++) {
+        if (/^\s*\[/.test(lines[i])) {
+            endIdx = i;
+            break;
+        }
+    }
+    let trailingBlankBeforeNext = 0;
+    while (endIdx > headerIdx + 1 && lines[endIdx - 1].trim() === "") {
+        trailingBlankBeforeNext++;
+        endIdx--;
+    }
+    const afterLines = lines.slice(endIdx);
+    const hasFollowingSection = afterLines.some((l) => /^\s*\[/.test(l));
+    const beforeBlock = lines.slice(0, headerIdx).join("\n");
+    const head = beforeBlock.length > 0 ? `${beforeBlock}\n` : "";
+    if (!hasFollowingSection) {
+        // No following section — drop trailing blank lines and end with a single \n.
+        return `${head}${sectionHeader}\n${blockBody}`;
+    }
+    const gap = "\n".repeat(Math.max(1, trailingBlankBeforeNext));
+    const afterBlock = afterLines.join("\n");
+    return `${head}${sectionHeader}\n${blockBody}${gap}${afterBlock}`;
+}
+function renderGrokMcpBlock(entry) {
+    const argsStr = `[${entry.args.map((a) => JSON.stringify(a)).join(", ")}]`;
+    const lines = [
+        `command = ${JSON.stringify(entry.command)}`,
+        `args = ${argsStr}`,
+    ];
+    if (typeof entry.startup_timeout_sec === "number") {
+        lines.push(`startup_timeout_sec = ${entry.startup_timeout_sec}`);
+    }
+    return `${lines.join("\n")}\n`;
+}
 /**
  * Set up Gnosys MCP integration for a specific IDE.
  */
@@ -716,6 +808,29 @@ export async function setupIDE(ide, projectDir) {
                 await fs.writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
                 return { success: true, message: "Antigravity MCP config updated (~/.gemini/antigravity/mcp_config.json)" };
             }
+            case "grok-build": {
+                // v5.9.4 Bug 12 — Grok Build reads its MCP servers from a
+                // `[mcp.<name>]` block in ~/.grok/config.toml. We never clobber
+                // unrelated TOML content (per deci-046 read-then-merge rule); the
+                // helper preserves every line outside the `[mcp.gnosys]` block.
+                const grokDir = path.join(os.homedir(), ".grok");
+                const configPath = path.join(grokDir, "config.toml");
+                await fs.mkdir(grokDir, { recursive: true });
+                let existing = "";
+                try {
+                    existing = await fs.readFile(configPath, "utf-8");
+                }
+                catch {
+                    // File doesn't exist yet — start fresh
+                }
+                const updated = upsertGrokMcpBlock(existing, "gnosys", {
+                    command: "gnosys",
+                    args: ["serve"],
+                    startup_timeout_sec: 90,
+                });
+                await fs.writeFile(configPath, updated, "utf-8");
+                return { success: true, message: "Grok Build MCP config updated (~/.grok/config.toml)" };
+            }
             case "claude-desktop": {
                 // Claude Desktop reads MCP servers from claude_desktop_config.json
                 // in a platform-specific app data directory. Distinct from Claude
@@ -769,7 +884,7 @@ async function askChoice(rl, question, options) {
     }
     console.log();
     while (true) {
-        const answer = await rl.question(`${DIM}>${RESET} `);
+        const answer = await safeQuestion(rl, `${DIM}>${RESET} `);
         const num = parseInt(answer.trim(), 10);
         if (num >= 1 && num <= options.length) {
             return num - 1;
@@ -782,7 +897,7 @@ async function askChoice(rl, question, options) {
  */
 async function askInput(rl, prompt, opts) {
     const suffix = opts?.default ? ` ${DIM}(${opts.default})${RESET}` : "";
-    const answer = await rl.question(`${prompt}${suffix}: `);
+    const answer = await safeQuestion(rl, `${prompt}${suffix}: `);
     const trimmed = answer.trim();
     return trimmed || opts?.default || "";
 }
@@ -791,7 +906,7 @@ async function askInput(rl, prompt, opts) {
  */
 async function askYesNo(rl, question, defaultYes = true) {
     const hint = defaultYes ? "Y/n" : "y/N";
-    const answer = await rl.question(`${question} [${hint}] `);
+    const answer = await safeQuestion(rl, `${question} [${hint}] `);
     const trimmed = answer.trim().toLowerCase();
     if (trimmed === "")
         return defaultYes;
@@ -866,31 +981,21 @@ async function getRegisteredProjects() {
 }
 /**
  * Try to load existing gnosys.json config for displaying current values.
- * Checks the project .gnosys dir first, then the global ~/.gnosys dir.
- * Returns null if no config found.
+ * Resolves the active store via the shared `resolveActiveStorePath` helper
+ * (v5.9.4 Bug 10 — was reading from a different store than the summary
+ * panel, producing stale-display bugs in `gnosys setup models`).
+ * Returns null if no config exists in either project or global stores.
  */
 async function loadExistingConfig(projectDir) {
-    // Try project-level config first
+    const storePath = resolveActiveStorePath(projectDir);
     try {
-        const projectStore = path.join(projectDir, ".gnosys");
-        const stat = await fs.stat(path.join(projectStore, "gnosys.json"));
+        const stat = await fs.stat(path.join(storePath, "gnosys.json"));
         if (stat.isFile()) {
-            return await loadConfig(projectStore);
+            return await loadConfig(storePath);
         }
     }
     catch {
-        // No project config
-    }
-    // Try global config at ~/.gnosys
-    try {
-        const globalStore = getGnosysHome();
-        const stat = await fs.stat(path.join(globalStore, "gnosys.json"));
-        if (stat.isFile()) {
-            return await loadConfig(globalStore);
-        }
-    }
-    catch {
-        // No global config
+        // No config in the resolved store
     }
     return null;
 }
@@ -983,16 +1088,10 @@ export async function runSetup(opts) {
     let upgraded = false;
     try {
         // ─── Banner ───────────────────────────────────────────────────────
-        const tagline = "Persistent Memory for AI Agents";
-        const versionStr = `Gnosys v${version}`;
-        const bannerContentWidth = Math.max(versionStr.length, tagline.length);
-        const bannerInner = bannerContentWidth + 4;
-        const bannerBorder = "\u2500".repeat(bannerInner);
+        // v5.9.3 redesign: atom-based splash replaces the old ASCII box banner.
+        const { renderColdStartSplash } = await import("./setup/coldStart.js");
         console.log();
-        console.log(`\u250C${bannerBorder}\u2510`);
-        console.log(`\u2502  ${BOLD}${CYAN}Gnosys${RESET} v${version}${" ".repeat(bannerInner - versionStr.length - 2)}\u2502`);
-        console.log(`\u2502  ${DIM}${tagline}${RESET}${" ".repeat(bannerInner - tagline.length - 2)}\u2502`);
-        console.log(`\u2514${bannerBorder}\u2518`);
+        console.log(renderColdStartSplash(version));
         console.log();
         // ─── Load existing config for defaults ───────────────────────────
         const existingConfig = await loadExistingConfig(projectDir);
@@ -1076,7 +1175,12 @@ export async function runSetup(opts) {
         const currentProviderHint = currentProvider
             ? ` ${DIM}(current: ${currentProvider})${RESET}`
             : "";
-        const providerIndex = await askChoice(rl, `${BOLD}Step 1/5${RESET} ${DIM}\u2014${RESET} Choose your LLM provider${currentProviderHint}`, providerOptions);
+        // v5.9.3 Screen 1.1 chrome \u2014 Header + Title + step counter wrap.
+        const { renderProviderStepHeader, renderModelStepHeader, renderKeyStepHeader } = await import("./setup/coldStart.js");
+        console.log();
+        console.log(renderProviderStepHeader(version));
+        console.log();
+        const providerIndex = await askChoice(rl, `Choose your LLM provider${currentProviderHint}`, providerOptions);
         const isSkip = providerIndex === PROVIDER_ORDER.length; // last option
         const provider = isSkip ? "skip" : PROVIDER_ORDER[providerIndex];
         // ─── Step 2/5 — Model tier ────────────────────────────────────────
@@ -1096,7 +1200,11 @@ export async function runSetup(opts) {
                     return `${t.name} (${t.model})  ${DIM}${formatPrice(t.input, t.output)}${RESET}${rec}`;
                 });
                 tierOptions.push(`Custom ${DIM}(enter model name)${RESET}`);
-                const tierIndex = await askChoice(rl, `${BOLD}Step 2/5${RESET} ${DIM}\u2014${RESET} Choose model tier${currentModelHint}`, tierOptions);
+                // v5.9.3 Screen 1.2 chrome \u2014 Header + Title + step counter wrap.
+                console.log();
+                console.log(renderModelStepHeader(provider, version));
+                console.log();
+                const tierIndex = await askChoice(rl, `Choose model tier${currentModelHint}`, tierOptions);
                 if (tierIndex === tiers.length) {
                     model = await askInput(rl, "Enter model name");
                 }
@@ -1169,8 +1277,9 @@ export async function runSetup(opts) {
         };
         const legacyEnvVar = legacyEnvVars[provider] ?? "";
         if (needsKey) {
+            // v5.9.3 Screen 1.3 chrome \u2014 Header + Title + step counter wrap.
             console.log();
-            console.log(`${BOLD}Step 3/5${RESET} ${DIM}\u2014${RESET} API Key`);
+            console.log(renderKeyStepHeader(provider, version));
             console.log();
             // Check where the key currently lives
             const existingKeySource = detectKeySource(envVarName, legacyEnvVar);
@@ -1503,12 +1612,14 @@ export async function runSetup(opts) {
             codex: "Codex",
             "gemini-cli": "Gemini CLI",
             antigravity: "Antigravity",
+            // v5.9.4 Bug 12 — Grok Build (~/.grok/config.toml).
+            "grok-build": "Grok Build",
         };
         // IDEs whose MCP config lives at the user level (~/...) rather than per-project.
         // We don't try to create a project-level directory for these.
-        const userLevelIdes = new Set(["claude", "claude-desktop", "gemini-cli", "antigravity"]);
+        const userLevelIdes = new Set(["claude", "claude-desktop", "gemini-cli", "antigravity", "grok-build"]);
         // Build IDE options: show detected ones and offer to create missing ones
-        const allIdeKeys = ["claude", "claude-desktop", "cursor", "codex", "gemini-cli", "antigravity"];
+        const allIdeKeys = ["claude", "claude-desktop", "cursor", "codex", "gemini-cli", "antigravity", "grok-build"];
         const ideOptions = [];
         const ideKeyForOption = []; // parallel array mapping option index to IDE key
         for (const ide of allIdeKeys) {
@@ -1590,21 +1701,8 @@ export async function runSetup(opts) {
         const structuringModel = isSkip ? "" : (taskOverrides.structuring?.model ?? getStructuringModel(provider, model));
         // ─── Write config to gnosys.json ─────────────────────────────────
         if (!isSkip) {
-            // Determine which store path to write to — prefer project, fall back to global
-            let storePath;
-            const projectStore = path.join(projectDir, ".gnosys");
-            const globalStore = getGnosysHome();
-            if (fsSync.existsSync(path.join(projectStore, "gnosys.json"))) {
-                storePath = projectStore;
-            }
-            else if (fsSync.existsSync(path.join(globalStore, "gnosys.json"))) {
-                storePath = globalStore;
-            }
-            else {
-                // Default to global store — create directory if needed
-                await fs.mkdir(globalStore, { recursive: true });
-                storePath = globalStore;
-            }
+            // v5.9.4 Bug 10 — unified store resolution.
+            const storePath = ensureActiveStorePath(projectDir);
             // Build the config updates
             // Build LLM config update, preserving existing provider-specific settings
             const existingLlm = existingConfig?.llm;
@@ -1716,7 +1814,7 @@ export async function runSetup(opts) {
             console.log("Share your gnosys.db across machines via NAS or shared drive.");
             console.log(`Your local DB stays fast, the remote is the source of truth.`);
             console.log();
-            const setUpRemote = (await rl.question(`Configure remote sync now? [y/N] `)).trim().toLowerCase();
+            const setUpRemote = (await safeQuestion(rl, `Configure remote sync now? [y/N] `)).trim().toLowerCase();
             if (setUpRemote === "y" || setUpRemote === "yes") {
                 console.log();
                 try {
@@ -1767,6 +1865,60 @@ export async function runSetup(opts) {
         throw err;
     }
 }
+/**
+ * Update ONLY `llm.defaultProvider` in gnosys.json. Used by the summary
+ * panel row 1 ("provider") so it stops dragging the user into the full
+ * model picker — that's row 2's job.
+ *
+ * v5.9.4 Bug 4 — before this split, both summary rows routed through
+ * `runModelsSetup`, leaving no way to swap provider without also choosing
+ * a new model. Now row 1 picks a provider, row 2 picks a model.
+ */
+export async function runProviderOnlySetup(opts = {}) {
+    const projectDir = opts.directory ? path.resolve(opts.directory) : process.cwd();
+    const ownsRl = !opts.rl;
+    const rl = opts.rl ?? createInterface({ input: stdin, output: stdout });
+    try {
+        const { Header } = await import("./setup/ui/header.js");
+        const { Title } = await import("./setup/ui/title.js");
+        const { Spinner } = await import("./setup/ui/spinner.js");
+        const { printStatus } = await import("./setup/ui/status.js");
+        console.log();
+        console.log(Header(["gnosys", "setup", "provider"]));
+        console.log();
+        console.log(Title("Default provider", "pick the LLM provider — model stays as configured"));
+        console.log();
+        const existingConfig = await loadExistingConfig(projectDir);
+        const currentProvider = existingConfig?.llm.defaultProvider;
+        const pricingSpin = Spinner("fetching latest pricing from openrouter…");
+        const fetchStart = Date.now();
+        const dynamicModels = await fetchDynamicModels();
+        const fetchMs = Date.now() - fetchStart;
+        if (Object.keys(dynamicModels).length > 0) {
+            pricingSpin.ok("pricing loaded", `${fetchMs} ms`);
+        }
+        else {
+            pricingSpin.fail("pricing fetch failed", "using bundled tiers");
+        }
+        console.log();
+        const provider = await pickProvider(rl, dynamicModels, "Choose your LLM provider", currentProvider);
+        if (!provider || provider === currentProvider) {
+            printStatus("warn", "no change · provider unchanged");
+            return;
+        }
+        const storePath = ensureActiveStorePath(projectDir);
+        const existingLlm = existingConfig?.llm ?? {};
+        await updateConfig(storePath, {
+            llm: { ...existingLlm, defaultProvider: provider },
+        });
+        printStatus("ok", `default provider · ${provider}`, `${storePath}/gnosys.json`);
+        printStatus("progress", "model unchanged", "use row 2 to swap the model");
+    }
+    finally {
+        if (ownsRl)
+            rl.close();
+    }
+}
 /**
  * Models-only configuration — prompts for provider, model, and key (or accepts
  * them via options for non-interactive use). Validates the model against the
@@ -1777,30 +1929,47 @@ export async function runModelsSetup(opts = {}) {
     const ownsRl = !opts.rl;
     const rl = opts.rl ?? createInterface({ input: stdin, output: stdout });
     try {
+        // v5.9.3 Screen 3 — Header + Title at the top.
+        const { Header } = await import("./setup/ui/header.js");
+        const { Title } = await import("./setup/ui/title.js");
+        const { Spinner } = await import("./setup/ui/spinner.js");
+        const { printDiff } = await import("./setup/ui/diff.js");
+        const { printStatus } = await import("./setup/ui/status.js");
         console.log();
-        console.log(`${BOLD}${CYAN}Gnosys${RESET} ${DIM}— Model Configuration${RESET}`);
+        console.log(Header(["gnosys", "setup", "models"]));
+        console.log();
+        console.log(Title("Model configuration", "pick a provider and model — we'll validate it before saving"));
         console.log();
         const existingConfig = await loadExistingConfig(projectDir);
         const currentProvider = existingConfig?.llm.defaultProvider;
         const currentModel = existingConfig
             ? getProviderModel(existingConfig, existingConfig.llm.defaultProvider)
             : undefined;
-        // Step 1: provider (or use --provider flag)
-        console.log(`${DIM}Fetching latest model pricing...${RESET}`);
+        // Step 1: provider (or use --provider flag). v5.9.3: animate the
+        // OpenRouter pricing fetch under a Spinner so the user gets feedback
+        // on what would otherwise feel like a hang.
+        const pricingSpin = Spinner("fetching latest pricing from openrouter…");
+        const fetchStart = Date.now();
         const dynamicModels = await fetchDynamicModels();
+        const fetchMs = Date.now() - fetchStart;
+        const modelCount = Object.values(dynamicModels).reduce((n, tiers) => n + tiers.length, 0);
         if (Object.keys(dynamicModels).length > 0) {
-            console.log(`${DIM}${CHECK} Live pricing loaded from OpenRouter${RESET}`);
+            pricingSpin.ok(`pricing loaded · ${modelCount} models cached`, `${fetchMs} ms`);
+        }
+        else {
+            // No-op fallback (cache miss + network fail) — keep the hardcoded
+            // tiers but signal that we're running offline.
+            pricingSpin.fail("pricing fetch failed", "using bundled tiers");
         }
         console.log();
         let provider;
         if (opts.provider) {
             if (!PROVIDER_ORDER.includes(opts.provider)) {
-                console.log(`${CROSS} Unknown provider: ${opts.provider}`);
-                console.log(`  Valid: ${PROVIDER_ORDER.join(", ")}`);
+                printStatus("fail", `unknown provider \`${opts.provider}\``, `valid: ${PROVIDER_ORDER.join(", ")}`);
                 return;
             }
             provider = opts.provider;
-            console.log(`Provider: ${GREEN}${provider}${RESET}`);
+            printStatus("ok", "provider", provider);
         }
         else {
             provider = await pickProvider(rl, dynamicModels, "Choose your LLM provider", currentProvider);
@@ -1809,7 +1978,7 @@ export async function runModelsSetup(opts = {}) {
         let model;
         if (opts.model) {
             model = opts.model;
-            console.log(`Model: ${GREEN}${model}${RESET}`);
+            printStatus("ok", "model", model);
         }
         else {
             const tiers = dynamicModels[provider] ?? PROVIDER_TIERS[provider];
@@ -1822,7 +1991,7 @@ export async function runModelsSetup(opts = {}) {
             }
         }
         if (!model) {
-            console.log(`${CROSS} No model selected. Aborting.`);
+            printStatus("fail", "no model selected · aborting");
             return;
         }
         // Step 3: load API key from existing storage (if available)
@@ -1849,42 +2018,31 @@ export async function runModelsSetup(opts = {}) {
             console.log(`${WARN} No API key found for ${provider}. Run 'gnosys setup' to configure one.`);
             // Continue anyway — user might just want to update the model in config
         }
-        // Step 4: validate (default: true)
+        // Step 4: validate (default: true) — v5.9.3 Screen 3: animated
+        // Spinner with latency reported on success.
         const shouldValidate = opts.validate !== false;
         const isLocalProvider = provider === "ollama" || provider === "lmstudio";
         if (shouldValidate && (apiKey || isLocalProvider)) {
             console.log();
-            console.log(`${DIM}Testing ${provider}/${model}...${RESET}`);
+            const validateSpin = Spinner(`validating ${provider} / ${model}…`);
             const customBaseUrl = provider === "custom"
                 ? process.env.GNOSYS_LLM_BASE_URL
                 : undefined;
             const result = await validateModel(provider, model, apiKey, { customBaseUrl });
             if (result.ok) {
-                console.log(`  ${CHECK} Model validated (${result.latencyMs}ms)`);
+                validateSpin.ok("model validated", `${result.latencyMs} ms · ${provider} / ${model}`);
             }
             else {
-                console.log(`  ${WARN} Model test failed: ${result.error}`);
-                const proceed = await askYesNo(rl, "  Save config anyway?", false);
+                validateSpin.fail("model test failed", result.error);
+                const proceed = await askYesNo(rl, "Save config anyway?", false);
                 if (!proceed) {
-                    console.log(`  ${DIM}Cancelled.${RESET}`);
+                    printStatus("warn", "cancelled · no changes written");
                     return;
                 }
             }
         }
-        // Step 5: write config
-        const projectStore = path.join(projectDir, ".gnosys");
-        const globalStore = getGnosysHome();
-        let storePath;
-        if (fsSync.existsSync(path.join(projectStore, "gnosys.json"))) {
-            storePath = projectStore;
-        }
-        else if (fsSync.existsSync(path.join(globalStore, "gnosys.json"))) {
-            storePath = globalStore;
-        }
-        else {
-            await fs.mkdir(globalStore, { recursive: true });
-            storePath = globalStore;
-        }
+        // Step 5: write config (v5.9.4 Bug 10 — unified store resolution).
+        const storePath = ensureActiveStorePath(projectDir);
         const existingLlm = existingConfig?.llm;
         const existingProviderConfig = existingLlm
             ? existingLlm[provider]
@@ -1902,10 +2060,12 @@ export async function runModelsSetup(opts = {}) {
                 },
             },
         });
+        // v5.9.3 Screen 3 — Diff() before the saved confirmation. Shows what
+        // landed in gnosys.json.
+        const { buildModelsDiffRows } = await import("./setup/modelsRender.js");
         console.log();
-        console.log(`  ${CHECK} Config saved: ${storePath}/gnosys.json`);
-        console.log(`  ${DIM}Provider: ${provider}${RESET}`);
-        console.log(`  ${DIM}Model:    ${model}${RESET}`);
+        printDiff(buildModelsDiffRows(currentProvider, currentModel, provider, model));
+        printStatus("ok", `saved · ${storePath}/gnosys.json`);
     }
     finally {
         if (ownsRl)
@@ -1960,11 +2120,8 @@ export async function runModelsCommand(opts = {}) {
             console.log(`${WARN} No provider configured. Run 'gnosys setup' first.`);
             return;
         }
-        const projectStore = path.join(projectDir, ".gnosys");
-        const globalStore = getGnosysHome();
-        const storePath = fsSync.existsSync(path.join(projectStore, "gnosys.json"))
-            ? projectStore
-            : globalStore;
+        // v5.9.4 Bug 10 — unified store resolution.
+        const storePath = ensureActiveStorePath(projectDir);
         const existingProviderConfig = existingConfig?.llm?.[currentProvider];
         const providerConfigBase = (typeof existingProviderConfig === "object" && existingProviderConfig !== null)
             ? existingProviderConfig
@@ -2009,81 +2166,105 @@ export async function runDreamSetup(opts = {}) {
     const ownsRl = !opts.rl;
     const rl = opts.rl ?? createInterface({ input: stdin, output: stdout });
     try {
-        console.log();
-        console.log(`${BOLD}${CYAN}Gnosys${RESET} ${DIM}— Dream Mode Setup${RESET}`);
-        console.log();
+        // v5.9.3 Screen 7 — three grouped sub-screens (7.0 enable, 7.1
+        // machine+model, 7.2 thresholds+sub-tasks). Each sub-screen renders
+        // its own Header with `step N of 3` so the progress is always visible.
+        const { Header } = await import("./setup/ui/header.js");
+        const { Title } = await import("./setup/ui/title.js");
+        const { Spinner } = await import("./setup/ui/spinner.js");
+        const { printDiff } = await import("./setup/ui/diff.js");
+        const { printStatus } = await import("./setup/ui/status.js");
         const existingConfig = await loadExistingConfig(projectDir);
         const existingDream = existingConfig?.dream;
         // Show current state via central DB
         const { GnosysDB } = await import("./db.js");
+        const { getMachineId } = await import("./remote.js");
         const localDb = GnosysDB.openLocal();
-        const designatedMachine = localDb.getDreamMachineId();
-        const localMachine = (() => {
-            let id = localDb.getMeta("machine_id");
-            if (!id) {
-                const hostname = process.env.HOSTNAME || process.env.COMPUTERNAME || "unknown";
-                id = `${hostname}-${Date.now().toString(36)}`;
-                localDb.setMeta("machine_id", id);
+        // v5.9.4 Bugs 7+8 — also peek at the remote DB (if configured) so re-entry
+        // sees a designation made on a different machine. Open remote read-only;
+        // we'll mirror writes below.
+        const remoteDb = await openRemoteDbIfConfigured(localDb);
+        const designatedMachine = localDb.getDreamMachineId() ?? remoteDb?.getDreamMachineId() ?? null;
+        // v5.9.4 Bug 9 — share the canonical machine-id resolver (os.hostname()
+        // fallback included) instead of re-rolling HOSTNAME/COMPUTERNAME logic.
+        const localMachine = getMachineId(localDb);
+        // Mirror dream_machine_id writes to both DBs (Bug 8).
+        const setDreamMachineEverywhere = (id) => {
+            localDb.setDreamMachineId(id);
+            try {
+                remoteDb?.setDreamMachineId(id);
             }
-            return id;
-        })();
-        const recentRuns = localDb.getRecentDreamRuns(1);
-        const lastRun = recentRuns[0];
-        console.log(`${DIM}Current state${RESET}`);
-        console.log(`  Enabled:           ${existingDream?.enabled ? GREEN + "yes" + RESET : DIM + "no" + RESET}`);
-        console.log(`  Designated:        ${designatedMachine ? designatedMachine + (designatedMachine === localMachine ? ` ${GREEN}(this machine)${RESET}` : ` ${DIM}(other machine)${RESET}`) : DIM + "none" + RESET}`);
-        console.log(`  This machine ID:   ${DIM}${localMachine}${RESET}`);
-        if (existingDream) {
-            console.log(`  Provider:          ${existingDream.provider}${existingDream.model ? "/" + existingDream.model : ""}`);
-            console.log(`  Idle threshold:    ${existingDream.idleMinutes} min`);
-            console.log(`  Max runtime:       ${existingDream.maxRuntimeMinutes} min`);
-        }
-        if (lastRun) {
-            console.log(`  Last run:          ${DIM}${lastRun.completed}${RESET}`);
-        }
-        else {
-            console.log(`  Last run:          ${DIM}never${RESET}`);
-        }
+            catch { /* remote may be transiently unavailable */ }
+        };
+        const clearDreamMachineEverywhere = () => {
+            localDb.clearDreamMachineId();
+            try {
+                remoteDb?.clearDreamMachineId();
+            }
+            catch { /* remote may be transiently unavailable */ }
+        };
+        // ─── 7.0  Overview & enable ────────────────────────────────────────
+        console.log();
+        console.log(Header(["gnosys", "setup", "dream"], { version: "step 1 of 3" }));
+        console.log();
+        console.log(Title("Dream Mode", "gnosys runs background consolidation while you're idle — merging related memories, generating summaries, surfacing relationships."));
+        console.log();
+        const currentStateLine = existingDream?.enabled
+            ? `enabled · ${designatedMachine ? designatedMachine === localMachine ? `${localMachine} (this machine)` : designatedMachine : "no designated machine"}`
+            : "disabled · no designated machine";
+        printStatus("progress", "current", currentStateLine);
         console.log();
-        // Step 1: Enable
-        const enabled = await askYesNo(rl, "Enable dream mode?", existingDream?.enabled ?? true);
+        const enabled = await askYesNo(rl, "enable Dream Mode?", existingDream?.enabled ?? true);
         if (!enabled) {
             // Persist disabled state and clear designation
-            const storePath = pickStorePath(projectDir);
+            const storePath = ensureActiveStorePath(projectDir);
             await updateConfig(storePath, {
                 dream: { ...(existingDream ?? {}), enabled: false },
             });
-            localDb.clearDreamMachineId();
-            console.log(`${CHECK} Dream mode disabled. Designation cleared.`);
+            clearDreamMachineEverywhere();
+            console.log();
+            printStatus("ok", "dream mode disabled · designation cleared");
             localDb.close();
+            remoteDb?.close();
             return;
         }
-        // Step 2: Designate this machine
+        // ─── 7.1  Designated machine + model ───────────────────────────────
+        console.log();
+        console.log(Header(["gnosys", "setup", "dream", "machine"], { version: "step 2 of 3" }));
+        console.log();
+        console.log(Title("Only one machine dreams at a time — we'll designate one now."));
+        console.log();
+        printStatus("progress", "this machine", localMachine);
+        console.log();
         const designate = await askYesNo(rl, designatedMachine === localMachine
-            ? "This machine is currently the dream node. Keep it that way?"
-            : `Designate THIS machine (${localMachine}) to run dream cycles?`, true);
+            ? "this machine is currently the dreamer — keep it?"
+            : `designate THIS machine (${localMachine}) as the dreamer?`, true);
         if (designate) {
-            localDb.setDreamMachineId(localMachine);
-            console.log(`  ${CHECK} ${localMachine} is now the dream node.`);
+            setDreamMachineEverywhere(localMachine);
+            printStatus("ok", `${localMachine} is the dreamer`);
         }
         else if (designatedMachine === localMachine) {
-            localDb.clearDreamMachineId();
-            console.log(`  ${WARN} Designation cleared. No machine will dream until you re-run this on another machine.`);
+            clearDreamMachineEverywhere();
+            printStatus("warn", "designation cleared", "no machine will dream until you re-run on another");
         }
         else {
-            console.log(`  ${DIM}Keeping current designation: ${designatedMachine || "none"}${RESET}`);
+            printStatus("progress", "keeping current designation", designatedMachine || "none");
         }
-        // Step 3: Provider
+        // Pricing fetch — animated Spinner.
         console.log();
-        console.log(`${DIM}Fetching latest model pricing...${RESET}`);
+        const pricingSpin = Spinner("fetching latest pricing from openrouter…");
+        const fetchStart = Date.now();
         const dynamicModels = await fetchDynamicModels();
+        const fetchMs = Date.now() - fetchStart;
         if (Object.keys(dynamicModels).length > 0) {
-            console.log(`${DIM}${CHECK} Live pricing loaded from OpenRouter${RESET}`);
+            pricingSpin.ok("pricing loaded", `${fetchMs} ms`);
+        }
+        else {
+            pricingSpin.fail("pricing fetch failed", "using bundled tiers");
         }
         console.log();
         const defaultProvider = existingDream?.provider || existingConfig?.llm.defaultProvider || "ollama";
-        const dreamProvider = await pickProvider(rl, dynamicModels, `${BOLD}Step 3${RESET} ${DIM}—${RESET} Choose dream LLM provider`, defaultProvider);
-        // Step 4: Model
+        const dreamProvider = await pickProvider(rl, dynamicModels, "Choose dream LLM provider — local is recommended (dream runs a lot)", defaultProvider);
         let dreamModel = "";
         if (dreamProvider === "custom" || dreamProvider === "skip") {
             dreamModel = await askInput(rl, "Enter model name");
@@ -2094,63 +2275,83 @@ export async function runDreamSetup(opts = {}) {
                 dreamModel = await askInput(rl, "Enter model name");
             }
             else {
-                dreamModel = await pickModel(rl, dreamProvider, dynamicModels, `${BOLD}Step 4${RESET} ${DIM}—${RESET} Choose dream model`, existingDream?.model);
+                dreamModel = await pickModel(rl, dreamProvider, dynamicModels, "Choose dream model", existingDream?.model);
             }
         }
-        // Step 5: Validate (Layer 1 alert)
+        // Validate — animated Spinner with the model latency reported.
         if (dreamProvider !== "skip") {
             const apiKey = await getApiKeyForProvider(dreamProvider);
-            if (apiKey || dreamProvider === "ollama" || dreamProvider === "lmstudio") {
+            const isLocalProvider = dreamProvider === "ollama" || dreamProvider === "lmstudio";
+            if (apiKey || isLocalProvider) {
                 console.log();
-                console.log(`${DIM}Testing ${dreamProvider}/${dreamModel}...${RESET}`);
+                const validateSpin = Spinner(`validating ${dreamProvider} / ${dreamModel}…`);
                 try {
                     const customBaseUrl = dreamProvider === "custom" ? process.env.GNOSYS_LLM_BASE_URL : undefined;
                     const result = await validateModel(dreamProvider, dreamModel, apiKey, { customBaseUrl });
                     if (result.ok) {
-                        console.log(`  ${CHECK} Validated (${result.latencyMs}ms)`);
+                        validateSpin.ok("model validated", `${result.latencyMs} ms · ${dreamProvider} / ${dreamModel}`);
                     }
                     else {
-                        console.log(`  ${WARN} Could not reach ${dreamProvider}/${dreamModel}: ${result.error}`);
-                        console.log(`  ${DIM}Dream is configured but won't run useful work until this is fixed.${RESET}`);
-                        const proceed = await askYesNo(rl, "  Continue saving config anyway?", true);
+                        validateSpin.fail("could not reach model", result.error);
+                        const proceed = await askYesNo(rl, "save config anyway?", true);
                         if (!proceed) {
-                            console.log(`  ${DIM}Setup cancelled. No changes saved.${RESET}`);
+                            printStatus("warn", "setup cancelled · no changes written");
                             localDb.close();
+                            remoteDb?.close();
                             return;
                         }
                     }
                 }
                 catch (err) {
-                    console.log(`  ${DIM}Validation skipped: ${err instanceof Error ? err.message : err}${RESET}`);
+                    printStatus("warn", "validation skipped", err instanceof Error ? err.message : String(err));
                 }
             }
             else {
-                console.log(`  ${WARN} No API key configured for ${dreamProvider}. Set one via 'gnosys setup models'.`);
+                printStatus("warn", `no API key for ${dreamProvider}`, "set one via `gnosys setup models`");
             }
         }
-        // Step 6-8: schedule
+        // ─── 7.2  Thresholds + sub-tasks ───────────────────────────────────
         console.log();
-        console.log(`${BOLD}Step 6${RESET} ${DIM}—${RESET} Schedule`);
-        const idleAns = await askInput(rl, `Idle minutes before triggering`, {
-            default: String(existingDream?.idleMinutes ?? 10),
-        });
-        const idleMinutes = Math.max(1, parseInt(idleAns) || 10);
-        const runtimeAns = await askInput(rl, `Max runtime minutes`, {
-            default: String(existingDream?.maxRuntimeMinutes ?? 30),
-        });
-        const maxRuntimeMinutes = Math.max(1, parseInt(runtimeAns) || 30);
-        const minMemAns = await askInput(rl, `Minimum memories before activating`, {
-            default: String(existingDream?.minMemories ?? 10),
-        });
-        const minMemories = Math.max(1, parseInt(minMemAns) || 10);
-        // Step 9: sub-tasks
+        console.log(Header(["gnosys", "setup", "dream", "when & what"], { version: "step 3 of 3" }));
         console.log();
-        console.log(`${BOLD}Step 9${RESET} ${DIM}—${RESET} Dream sub-tasks`);
-        const selfCritique = await askYesNo(rl, "Self-critique (rule + LLM-based review flagging)", existingDream?.selfCritique ?? true);
-        const generateSummaries = await askYesNo(rl, "Generate summaries (LLM)", existingDream?.generateSummaries ?? true);
-        const discoverRelationships = await askYesNo(rl, "Discover relationships (LLM)", existingDream?.discoverRelationships ?? true);
+        console.log(Title("Thresholds & sub-tasks", "press enter to accept defaults, or `e` to edit"));
+        console.log();
+        // Defaults pulled from the existing config (or the global defaults).
+        const dIdle = existingDream?.idleMinutes ?? 10;
+        const dRuntime = existingDream?.maxRuntimeMinutes ?? 30;
+        const dMinMem = existingDream?.minMemories ?? 10;
+        const dSelfCritique = existingDream?.selfCritique ?? true;
+        const dGenSummaries = existingDream?.generateSummaries ?? true;
+        const dDiscover = existingDream?.discoverRelationships ?? true;
+        const { renderThresholdsBlock } = await import("./setup/dreamRender.js");
+        for (const line of renderThresholdsBlock(dIdle, dRuntime, dMinMem, {
+            selfCritique: dSelfCritique,
+            generateSummaries: dGenSummaries,
+            discoverRelationships: dDiscover,
+        })) {
+            console.log(line);
+        }
+        console.log();
+        const editChoice = (await askInput(rl, "press enter to accept defaults, or e to edit")).trim().toLowerCase();
+        let idleMinutes = dIdle;
+        let maxRuntimeMinutes = dRuntime;
+        let minMemories = dMinMem;
+        let selfCritique = dSelfCritique;
+        let generateSummaries = dGenSummaries;
+        let discoverRelationships = dDiscover;
+        if (editChoice === "e") {
+            const idleAns = await askInput(rl, "idle minutes before triggering", { default: String(dIdle) });
+            idleMinutes = Math.max(1, parseInt(idleAns) || dIdle);
+            const runtimeAns = await askInput(rl, "max runtime minutes", { default: String(dRuntime) });
+            maxRuntimeMinutes = Math.max(1, parseInt(runtimeAns) || dRuntime);
+            const minMemAns = await askInput(rl, "minimum memories before activating", { default: String(dMinMem) });
+            minMemories = Math.max(1, parseInt(minMemAns) || dMinMem);
+            selfCritique = await askYesNo(rl, "self-critique (rule + LLM-based review flagging)", dSelfCritique);
+            generateSummaries = await askYesNo(rl, "generate summaries (LLM)", dGenSummaries);
+            discoverRelationships = await askYesNo(rl, "discover relationships (LLM)", dDiscover);
+        }
         // Save
-        const storePath = pickStorePath(projectDir);
+        const storePath = ensureActiveStorePath(projectDir);
         await updateConfig(storePath, {
             dream: {
                 enabled: true,
@@ -2168,159 +2369,90 @@ export async function runDreamSetup(opts = {}) {
         // doesn't fire immediately based on stale history.
         localDb.resetDreamConsecutiveFailures();
         localDb.close();
+        remoteDb?.close();
+        // Final Diff block per the design — provider/machine + the two
+        // threshold fields most users actually care about.
         console.log();
-        console.log(`  ${CHECK} Dream config saved: ${storePath}/gnosys.json`);
-        console.log(`  ${DIM}Provider:    ${dreamProvider}${dreamModel ? "/" + dreamModel : ""}${RESET}`);
-        console.log(`  ${DIM}Schedule:    idle ${idleMinutes}m / max ${maxRuntimeMinutes}m / min ${minMemories} memories${RESET}`);
-        console.log(`  ${DIM}Designated:  ${designate ? localMachine + " (this machine)" : (designatedMachine || "none")}${RESET}`);
+        printStatus("ok", "dream mode enabled");
         console.log();
-        console.log(`${DIM}Tip: 'gnosys dream log' shows recent runs once dream starts cycling.${RESET}`);
+        const { buildDreamDiffRows } = await import("./setup/dreamRender.js");
+        printDiff(buildDreamDiffRows(existingDream
+            ? {
+                provider: existingDream.provider,
+                model: existingDream.model,
+                machine: designatedMachine ?? "—",
+                idleMinutes: existingDream.idleMinutes,
+                maxRuntimeMinutes: existingDream.maxRuntimeMinutes,
+            }
+            : null, {
+            provider: dreamProvider,
+            model: dreamModel || undefined,
+            machine: designate ? localMachine : (designatedMachine ?? "none"),
+            idleMinutes,
+            maxRuntimeMinutes,
+            selfCritique,
+            generateSummaries,
+            discoverRelationships,
+        }));
+        const dreamerName = designate ? localMachine : (designatedMachine ?? "the designated machine");
+        printStatus("progress", `first cycle runs after ${dreamerName} is idle for ${idleMinutes} min`);
+        printStatus("progress", "check status anytime with", "gnosys dashboard");
     }
     finally {
         if (ownsRl)
             rl.close();
     }
 }
+/**
+ * v5.9.3 (deci-050): `gnosys setup chat` is deprecated. Chat config
+ * moves into the chat TUI's own settings panel in v6.0 (road-014). This
+ * stub renders a deprecation notice and exits. The function signature
+ * is preserved so existing callers (cli.ts subcommand registration)
+ * continue to compile.
+ */
 export async function runChatSetup(opts = {}) {
-    const projectDir = opts.directory ? path.resolve(opts.directory) : process.cwd();
-    const ownsRl = !opts.rl;
-    const rl = opts.rl ?? createInterface({ input: stdin, output: stdout });
-    try {
-        console.log();
-        console.log(`${BOLD}${CYAN}Gnosys${RESET} ${DIM}— Chat Setup${RESET}`);
-        console.log();
-        const existingConfig = await loadExistingConfig(projectDir);
-        const existingChat = existingConfig?.chat;
-        const existingRecall = existingConfig?.recall;
-        const existingChatTask = existingConfig?.taskModels?.chat;
-        const defaultLLMProvider = existingConfig?.llm.defaultProvider || "anthropic";
-        // ── Current state ────────────────────────────────────────────────
-        console.log(`${DIM}Current state${RESET}`);
-        const currentProvider = existingChatTask?.provider || defaultLLMProvider;
-        const currentModel = existingChatTask?.model || "(default for provider)";
-        console.log(`  Provider:          ${currentProvider}${existingChatTask ? "" : ` ${DIM}(inherited from default)${RESET}`}`);
-        console.log(`  Model:             ${currentModel}`);
-        console.log(`  Recall mode:       ${existingRecall?.aggressive ? "aggressive" : "filtered"} (max ${existingRecall?.maxMemories ?? 8}, threshold ${existingRecall?.minRelevance ?? 0.4})`);
-        console.log(`  Tools fence:       ${existingChat?.toolsEnabled !== false ? GREEN + "on" + RESET : DIM + "off" + RESET}`);
-        console.log(`  Auto-summarize:    ${existingChat?.autoSummarizeAfterTurns && existingChat.autoSummarizeAfterTurns > 0 ? `after ${existingChat.autoSummarizeAfterTurns} turns` : DIM + "off" + RESET}`);
-        console.log(`  System prefix:     ${existingChat?.systemPromptPrefix ? `${DIM}"${existingChat.systemPromptPrefix.slice(0, 50)}${existingChat.systemPromptPrefix.length > 50 ? "…" : ""}"${RESET}` : DIM + "none" + RESET}`);
-        console.log();
-        // ── Step 1: provider/model override ──────────────────────────────
-        const overrideProvider = await askYesNo(rl, existingChatTask
-            ? `Currently routing chat to ${currentProvider}. Change it?`
-            : `Chat currently uses the default provider (${defaultLLMProvider}). Route chat to a different LLM?`, false);
-        let chatProvider;
-        let chatModel;
-        if (overrideProvider) {
-            console.log();
-            console.log(`${DIM}Fetching latest model pricing...${RESET}`);
-            const dynamicModels = await fetchDynamicModels();
-            console.log();
-            chatProvider = await pickProvider(rl, dynamicModels, `${BOLD}Step 1${RESET} ${DIM}—${RESET} Choose chat LLM provider`, currentProvider);
-            if (chatProvider === "custom" || chatProvider === "skip") {
-                chatModel = await askInput(rl, "Enter model name");
-            }
-            else {
-                const tiers = dynamicModels[chatProvider] ?? PROVIDER_TIERS[chatProvider] ?? [];
-                if (tiers.length === 0) {
-                    chatModel = await askInput(rl, "Enter model name");
-                }
-                else {
-                    chatModel = await pickModel(rl, chatProvider, dynamicModels, `${BOLD}Step 2${RESET} ${DIM}—${RESET} Choose chat model`, existingChatTask?.model);
-                }
-            }
-            // Validate
-            const apiKey = await getApiKeyForProvider(chatProvider);
-            if (apiKey || chatProvider === "ollama" || chatProvider === "lmstudio") {
-                console.log();
-                console.log(`${DIM}Testing ${chatProvider}/${chatModel}...${RESET}`);
-                try {
-                    const customBaseUrl = chatProvider === "custom" ? process.env.GNOSYS_LLM_BASE_URL : undefined;
-                    const result = await validateModel(chatProvider, chatModel, apiKey, { customBaseUrl });
-                    if (result.ok) {
-                        console.log(`  ${CHECK} Validated (${result.latencyMs}ms)`);
-                    }
-                    else {
-                        console.log(`  ${WARN} Could not reach ${chatProvider}/${chatModel}: ${result.error}`);
-                        const proceed = await askYesNo(rl, "  Continue saving config anyway?", true);
-                        if (!proceed) {
-                            console.log(`  ${DIM}Setup cancelled. No changes saved.${RESET}`);
-                            return;
-                        }
-                    }
-                }
-                catch (err) {
-                    console.log(`  ${DIM}Validation skipped: ${err instanceof Error ? err.message : err}${RESET}`);
-                }
-            }
-            else {
-                console.log(`  ${WARN} No API key configured for ${chatProvider}. Set one via 'gnosys setup models'.`);
-            }
-        }
-        // ── Step 2: recall tuning ─────────────────────────────────────────
-        console.log();
-        console.log(`${BOLD}Recall${RESET} ${DIM}—${RESET} how aggressively to inject memories into chat`);
-        const recallAggressive = await askYesNo(rl, "Aggressive (more memories, lower threshold) vs filtered (fewer, higher quality)?", existingRecall?.aggressive ?? true);
-        const maxMemAns = await askInput(rl, "Max memories per chat turn", {
-            default: String(existingRecall?.maxMemories ?? 8),
-        });
-        const maxMemories = Math.max(1, Math.min(20, parseInt(maxMemAns) || 8));
-        const thresholdAns = await askInput(rl, "Min relevance score (0.0-1.0, lower returns more)", {
-            default: String(existingRecall?.minRelevance ?? 0.4),
-        });
-        const minRelevance = Math.max(0, Math.min(1, parseFloat(thresholdAns) || 0.4));
-        // ── Step 3: chat-only knobs ───────────────────────────────────────
-        console.log();
-        console.log(`${BOLD}Chat options${RESET}`);
-        const toolsEnabled = await askYesNo(rl, "Allow LLM to call gnosys tools via gnosys-tool fences?", existingChat?.toolsEnabled ?? true);
-        const autoSumAns = await askInput(rl, "Auto-summarize nudge after N turns (0 to disable)", { default: String(existingChat?.autoSummarizeAfterTurns ?? 0) });
-        const autoSummarizeAfterTurns = Math.max(0, parseInt(autoSumAns) || 0);
-        const prefixDefault = existingChat?.systemPromptPrefix ?? "";
-        const systemPromptPrefix = await askInput(rl, `System prompt prefix (persona/style/domain — Enter for ${prefixDefault ? "current" : "none"})`, { default: prefixDefault });
-        // ── Save ──────────────────────────────────────────────────────────
-        const storePath = pickStorePath(projectDir);
-        const updates = {
-            recall: { aggressive: recallAggressive, maxMemories, minRelevance },
-            chat: { toolsEnabled, autoSummarizeAfterTurns, systemPromptPrefix },
-        };
-        if (overrideProvider && chatProvider && chatProvider !== "skip" && chatModel) {
-            const existingTaskModels = existingConfig?.taskModels || {};
-            updates.taskModels = {
-                ...existingTaskModels,
-                chat: { provider: chatProvider, model: chatModel },
-            };
-        }
-        await updateConfig(storePath, updates);
-        console.log();
-        console.log(`  ${CHECK} Chat config saved: ${storePath}/gnosys.json`);
-        if (overrideProvider && chatProvider && chatModel) {
-            console.log(`  ${DIM}Provider:    ${chatProvider}/${chatModel}${RESET}`);
-        }
-        else {
-            console.log(`  ${DIM}Provider:    (inherits default → ${defaultLLMProvider})${RESET}`);
-        }
-        console.log(`  ${DIM}Recall:      ${recallAggressive ? "aggressive" : "filtered"} (max ${maxMemories}, threshold ${minRelevance})${RESET}`);
-        console.log(`  ${DIM}Tools:       ${toolsEnabled ? "on" : "off"}${RESET}`);
-        console.log(`  ${DIM}Auto-summarize: ${autoSummarizeAfterTurns > 0 ? `after ${autoSummarizeAfterTurns} turns` : "off"}${RESET}`);
-        console.log();
-        console.log(`${DIM}Tip: run 'gnosys chat' to start a session.${RESET}`);
-    }
-    finally {
-        if (ownsRl)
-            rl.close();
-    }
+    void opts; // signature preserved; opts unused in deprecation notice
+    // Use atom-based render so the notice matches the rest of v5.9.3.
+    const { Header } = await import("./setup/ui/header.js");
+    const { Status } = await import("./setup/ui/status.js");
+    const { Footer } = await import("./setup/ui/footer.js");
+    const { c, color } = await import("./setup/ui/tokens.js");
+    const v = `v${getVersion()}`;
+    console.log();
+    console.log(Header(["gnosys", "setup", "chat"], { version: v }));
+    console.log();
+    console.log(Status("warn", "chat settings have moved"));
+    console.log();
+    console.log(`   ${color(c.text, "chat is now configured from inside the TUI itself.")}`);
+    console.log(`   ${color(c.textDim, "open it with")}                            ${color(c.text, "gnosys chat")}`);
+    console.log(`   ${color(c.textDim, "then press")}                              ${color(c.text, "⌃, (settings)")}`);
+    console.log();
+    console.log(Footer("v6.0 will retire this command entirely"));
 }
-/** Resolve where to write gnosys.json — project store if exists, else global store. */
-function pickStorePath(projectDir) {
-    const projectStore = path.join(projectDir, ".gnosys");
-    const globalStore = getGnosysHome();
-    if (fsSync.existsSync(path.join(projectStore, "gnosys.json"))) {
-        return projectStore;
+// ─── runChatSetup body removed in v5.9.3 (deci-050) ─────────────────
+// Provider/model override + recall tuning + tools fence + auto-summarize
+// + system prompt prefix all move to the v6.0 chat TUI's settings panel
+// (road-014). The exported stub above renders a deprecation notice.
+/**
+ * Open the remote central DB ONLY when sync is configured AND the share
+ * is reachable. Returns null otherwise. Used by the dream wizard so it
+ * can mirror `dream_machine_id` writes to both DB meta tables (Bug 8).
+ */
+async function openRemoteDbIfConfigured(localDb) {
+    try {
+        if (!localDb.isAvailable())
+            return null;
+        const remotePath = localDb.getMeta("remote_path");
+        if (!remotePath)
+            return null;
+        if (!fsSync.existsSync(path.join(remotePath, "gnosys.db")))
+            return null;
+        const { GnosysDB } = await import("./db.js");
+        return new GnosysDB(remotePath);
     }
-    if (!fsSync.existsSync(globalStore)) {
-        fsSync.mkdirSync(globalStore, { recursive: true });
+    catch {
+        return null;
     }
-    return globalStore;
 }
 /**
  * Best-effort lookup of the API key for a provider. Used by the dream setup