@just-every/design 0.1.23 → 0.1.24

package/dist/cli.js

@@ -16,7 +16,7 @@ import { parseArtifactsDownloadPositional, parseArtifactsListPositional } from '
 import { clearConfig, readConfig, resolveConfigPath, writeConfig } from './config.js';
 import { DesignAppClient } from './design-client.js';
 import { parseJsonOrThrow } from './json.js';
-import { detectClients, detectDefaultClients, runInstall, runRemove, } from './install.js';
+import { checkIntegrations, detectClients, detectDefaultClients, ensureLocalLauncher, resolveLocalInstallLayout, runInstall, runRemove, } from './install.js';
 import { startMcpServer } from './server.js';
 import { buildCreateRunRequest, NOT_AUTHENTICATED_HELP, watchRun } from './tool-logic.js';
 function parseArgs(argv) {
@@ -476,6 +476,185 @@ async function promptYesNo(question, defaultYes = false) {
         rl.close();
     }
 }
+function createInstallChecklistUi(args) {
+    const stream = process.stderr;
+    const enabled = args.enabled;
+    const title = args.title ?? 'Every Design setup';
+    const state = {
+        auth: 'todo',
+        cli: 'todo',
+        integrations: 'todo',
+    };
+    let mode = 'loading';
+    let loadingMessage = 'Checking…';
+    let workingOn = null;
+    function color(code, text) {
+        if (!enabled)
+            return text;
+        return `\x1b[${code}m${text}\x1b[0m`;
+    }
+    function iconFor(s) {
+        if (s === 'ok')
+            return color('32', '✔');
+        if (s === 'working')
+            return color('33', '▣');
+        return color('90', '☐');
+    }
+    function clear() {
+        if (!enabled)
+            return;
+        // Clear screen + home.
+        stream.write('\x1b[2J\x1b[H');
+    }
+    function render() {
+        clear();
+        stream.write(`${title}\n\n`);
+        if (mode === 'loading') {
+            stream.write(`${loadingMessage}\n`);
+            return;
+        }
+        const line = (key, label) => {
+            const s = state[key];
+            stream.write(` ${iconFor(s)} ${label}\n`);
+        };
+        line('auth', 'Authentication');
+        line('cli', 'Design CLI');
+        line('integrations', 'Integrations');
+        if (workingOn) {
+            stream.write(`\n${color('90', 'Working on:')} ${workingOn}\n`);
+        }
+    }
+    function setLoading(message) {
+        mode = 'loading';
+        loadingMessage = message;
+        if (enabled)
+            render();
+        else
+            stream.write(`${title}: ${message}\n`);
+    }
+    function setChecklist(next) {
+        mode = 'checklist';
+        workingOn = null;
+        Object.assign(state, next);
+        if (enabled)
+            render();
+        else {
+            stream.write('== System Status ==\n');
+            stream.write(`- Authentication: ${state.auth}\n`);
+            stream.write(`- Design CLI: ${state.cli}\n`);
+            stream.write(`- Integrations: ${state.integrations}\n`);
+        }
+    }
+    function setWorking(key, label) {
+        mode = 'checklist';
+        state[key] = 'working';
+        workingOn = label;
+        if (enabled)
+            render();
+        else
+            stream.write(`Working on: ${label}\n`);
+    }
+    function log(line) {
+        if (!enabled) {
+            stream.write(`${line}\n`);
+            return;
+        }
+        // Preserve the UI by printing below it.
+        stream.write(`\n${line}\n`);
+    }
+    return {
+        setLoading,
+        setChecklist,
+        setWorking,
+        log,
+    };
+}
+function resolveNpmLatestVersion(packageName) {
+    const npm = which('npm');
+    if (!npm)
+        return null;
+    const res = spawnSync(npm, ['view', packageName, 'version', '--json'], { encoding: 'utf8' });
+    if (res.status !== 0)
+        return null;
+    const raw = String(res.stdout || '').trim();
+    if (!raw)
+        return null;
+    try {
+        const parsed = JSON.parse(raw);
+        if (typeof parsed === 'string')
+            return parsed.trim() || null;
+    }
+    catch {
+        // Some npm versions print a bare string.
+    }
+    return raw.split(/\r?\n/)[0]?.trim() || null;
+}
+function readJsonVersionMaybe(raw) {
+    try {
+        const parsed = JSON.parse(raw);
+        const v = typeof parsed?.version === 'string' ? parsed.version.trim() : '';
+        return v || null;
+    }
+    catch {
+        return null;
+    }
+}
+async function readLocalInstalledDesignCliVersion(homeDir) {
+    const local = resolveLocalInstallLayout(homeDir, 'xdg');
+    const pkgPath = path.join(local.installDir, 'node_modules', '@just-every', 'design', 'package.json');
+    try {
+        const raw = await readFile(pkgPath, 'utf8');
+        return readJsonVersionMaybe(raw);
+    }
+    catch {
+        return null;
+    }
+}
+async function checkAuthValidity(args) {
+    const cfg = await loadMergedConfig(args.configPath, { designOrigin: args.designOrigin, loginOrigin: args.loginOrigin });
+    const sessionToken = (process.env.DESIGN_MCP_SESSION_TOKEN ?? cfg.sessionToken ?? '').trim();
+    if (!sessionToken) {
+        return { ok: false, cfg: null, reason: 'missing' };
+    }
+    const client = new DesignAppClient({
+        designOrigin: cfg.designOrigin,
+        sessionToken,
+        activeAccountSlug: cfg.activeAccountSlug,
+    });
+    try {
+        await client.getMe();
+        return { ok: true, cfg: cfg };
+    }
+    catch {
+        return { ok: false, cfg: cfg, reason: 'invalid' };
+    }
+}
+async function checkDesignCliStatus(args) {
+    if (args.launcher === 'npx') {
+        // Using npx means users can always run `npx -y <pkg>@latest` without a local launcher.
+        return { ok: true };
+    }
+    const local = resolveLocalInstallLayout(args.homeDir, 'xdg');
+    const launcherExists = existsSync(local.launcherPath);
+    const cliJsExists = existsSync(local.cliJsPath);
+    const installed = launcherExists && cliJsExists;
+    const needsPath = args.updatePath ? !pathHasEntry(local.binDir) : false;
+    const installedVersion = installed ? await readLocalInstalledDesignCliVersion(args.homeDir) : null;
+    const latestVersion = resolveNpmLatestVersion(args.packageName);
+    const outdated = Boolean(installed && latestVersion && installedVersion && latestVersion !== installedVersion);
+    const ok = installed && !needsPath && !outdated;
+    if (ok) {
+        return { ok: true, installedVersion, latestVersion };
+    }
+    return {
+        ok: false,
+        missing: !installed,
+        outdated,
+        needsPath,
+        installedVersion,
+        latestVersion,
+    };
+}
 function pathHasEntry(entry) {
     const list = (process.env.PATH ?? '')
         .split(path.delimiter)
@@ -660,7 +839,7 @@ function recommendedMode(client, skillsEnabled) {
         return 'skill';
     return 'mcp';
 }
-async function promptInstallPlan(clients, skillsEnabled) {
+async function promptInstallPlan(clients, skillsEnabled, opts) {
     const installed = clients.filter((c) => c.installed);
     const missing = clients.filter((c) => !c.installed);
     console.error('Detected clients:');
@@ -674,7 +853,7 @@ async function promptInstallPlan(clients, skillsEnabled) {
         console.error('Not detected:');
         missing.forEach((c) => console.error(`  - ${c.label}`));
     }
-    const useRecommended = await promptYesNo('Use recommended defaults for detected clients?', true);
+    const useRecommended = opts?.mode === 'edit' ? false : await promptYesNo('Use recommended defaults for detected clients?', true);
     const plan = Object.create(null);
     for (const c of clients) {
         plan[c.client] = useRecommended ? recommendedMode(c, skillsEnabled) : 'disabled';
@@ -790,48 +969,16 @@ async function main() {
             console.error(`Invalid --launcher value: ${launcherFlag}. Expected npx|local.`);
             process.exit(1);
         }
-        console.error('Every Design setup');
-        console.error('');
-        console.error('Step 1/3: Authenticate');
-        const existingAuth = await readConfig(configPath);
-        let authedCfg = existingAuth;
-        if (!hasAuth(existingAuth)) {
-            if (dryRun) {
-                console.error(`Dry run: no auth found at ${configPath}. Install would run auth login first.`);
-            }
-            else if (!isTtyInteractive()) {
-                console.error(`No auth found at ${configPath}.`);
-                console.error('Run `every-design auth login` (or `npx -y @just-every/design@latest auth login`) first, then re-run install.');
-                process.exit(1);
-            }
-            if (!dryRun) {
-                const proceed = yes ? true : await promptYesNo('No auth found. Login now?', true);
-                if (!proceed) {
-                    console.error('Aborted.');
-                    process.exit(1);
-                }
-                authedCfg = await runAuthLoginFlow({ configPath, designOrigin, loginOrigin, flags });
-            }
-        }
-        else {
-            console.error('Auth already configured.');
-            if (looksExpired(existingAuth?.sessionExpiresAt)) {
-                console.error('Warning: saved session looks expired; you may need to re-run auth login.');
-            }
-        }
-        console.error('');
-        console.error('Step 2/3: Configure launcher');
         const launcher = launcherFromFlag ?? 'local';
-        console.error(`Using launcher: ${launcher}${launcherFromFlag ? ' (from flag)' : ''}.`);
-        if (launcher === 'local' && updatePath) {
-            const localBin = path.join(os.homedir(), '.local', 'bin');
-            const ensured = await ensurePathEntryOnSystem({ entry: localBin, dryRun, yes });
-            if (ensured.note)
-                console.error(ensured.note);
-        }
-        console.error('');
-        console.error('Step 3/3: Configure clients');
-        const clientList = resolveFlagString(flags, 'client')?.trim() || resolveFlagString(flags, 'clients')?.trim();
+        const ui = createInstallChecklistUi({ enabled: isTtyInteractive(), title: 'Every Design setup' });
+        ui.setLoading('Checking…');
+        const authCheck = await checkAuthValidity({ configPath, designOrigin, loginOrigin });
+        const cliCheck = await checkDesignCliStatus({
+            launcher,
+            updatePath,
+            packageName: '@just-every/design',
+            homeDir: os.homedir(),
+        });
         const detections = detectClients();
         const allClients = [
             'code',
@@ -842,7 +989,8 @@ async function main() {
             'gemini',
             'qwen',
         ];
-        let plan;
+        const clientList = resolveFlagString(flags, 'client')?.trim() || resolveFlagString(flags, 'clients')?.trim();
+        const defaultPlan = Object.create(null);
         if (clientList) {
             const requested = clientList
                 .split(',')
@@ -855,107 +1003,245 @@ async function main() {
                     return detectDefaultClients();
                 return requested.filter((c) => allClients.includes(c));
             })();
-            plan = Object.create(null);
             for (const c of allClients) {
-                plan[c] = selected.includes(c)
+                defaultPlan[c] = selected.includes(c)
                     ? (c === 'code' || c === 'codex') && skillsEnabled
                         ? 'skill'
                         : 'mcp'
                     : 'disabled';
             }
         }
-        else if (yes) {
-            plan = Object.create(null);
+        else {
+            for (const c of allClients)
+                defaultPlan[c] = 'disabled';
             for (const c of detections) {
-                plan[c.client] = recommendedMode(c, skillsEnabled);
+                defaultPlan[c.client] = recommendedMode(c, skillsEnabled);
             }
         }
-        else {
-            plan = await promptInstallPlan(detections, skillsEnabled);
-        }
-        const mcpClients = [];
-        const skillClients = [];
-        for (const c of allClients) {
-            const mode = plan[c] ?? 'disabled';
-            if (mode === 'disabled')
-                continue;
-            if (mode === 'skill') {
-                if (c === 'code' || c === 'codex' || c === 'claude-code') {
-                    skillClients.push(c);
+        const splitPlan = (plan) => {
+            const mcpClients = [];
+            const skillClients = [];
+            for (const c of allClients) {
+                const mode = plan[c] ?? 'disabled';
+                if (mode === 'disabled')
+                    continue;
+                if (mode === 'skill') {
+                    if (c === 'code' || c === 'codex' || c === 'claude-code') {
+                        skillClients.push(c);
+                    }
+                    else {
+                        mcpClients.push(c);
+                    }
                     continue;
                 }
                 mcpClients.push(c);
-                continue;
             }
-            mcpClients.push(c);
-        }
-        if (mcpClients.length === 0 && skillClients.length === 0) {
-            console.error('No clients selected. Nothing to do.');
-            process.exit(1);
-        }
-        const confirm = yes ? true : await promptYesNo('Apply these changes?', true);
-        if (!confirm) {
-            console.error('Aborted.');
-            process.exit(1);
-        }
-        const results = [];
-        if (skillClients.length) {
-            results.push({
-                title: 'Skill + MCP (recommended)',
-                result: await runInstall({
-                    clients: skillClients,
+            return { mcpClients, skillClients, selected: [...new Set([...skillClients, ...mcpClients])] };
+        };
+        const { mcpClients: defaultMcpClients, skillClients: defaultSkillClients, selected: defaultSelected } = splitPlan(defaultPlan);
+        const integrationsChecks = await (async () => {
+            const out = [];
+            if (defaultSkillClients.length) {
+                out.push(await checkIntegrations({
+                    clients: defaultSkillClients,
                     serverName,
                     packageName: '@just-every/design',
                     installSkills: true,
-                    dryRun,
-                    force,
                     launcher,
-                }),
-            });
-        }
-        if (mcpClients.length) {
-            results.push({
-                title: 'MCP only',
-                result: await runInstall({
-                    clients: mcpClients,
+                }));
+            }
+            if (defaultMcpClients.length) {
+                out.push(await checkIntegrations({
+                    clients: defaultMcpClients,
                     serverName,
                     packageName: '@just-every/design',
                     installSkills: false,
-                    dryRun,
-                    force,
                     launcher,
-                }),
-            });
-        }
-        const changed = results.flatMap((r) => r.result.changed);
-        const skipped = results.flatMap((r) => r.result.skipped);
-        const notes = results.flatMap((r) => r.result.notes);
-        console.error('');
-        console.error('Summary');
-        console.error(`- Auth: ${hasAuth(authedCfg) ? 'configured' : 'missing'}`);
-        console.error(`- Server name: ${serverName}`);
-        console.error(`- Launcher: ${launcher}`);
-        console.error(`- Clients configured: ${[...new Set([...skillClients, ...mcpClients])].join(', ')}`);
+                }));
+            }
+            return out;
+        })();
+        const integrationsOk = defaultSelected.length === 0
+            ? false
+            : integrationsChecks.every((c) => c.ok);
+        let finalAuthOk = authCheck.ok;
+        let finalCliOk = cliCheck.ok;
+        let finalIntegrationsOk = integrationsOk;
+        ui.setChecklist({
+            auth: authCheck.ok ? 'ok' : 'todo',
+            cli: cliCheck.ok ? 'ok' : 'todo',
+            integrations: integrationsOk ? 'ok' : 'todo',
+        });
         if (dryRun) {
-            console.error('- Dry run: no files were modified');
+            ui.log('Dry run mode: no changes will be applied.');
+            if (!authCheck.ok) {
+                ui.log(`[dry-run] Would run: every-design auth login (config: ${configPath})`);
+            }
+            if (!cliCheck.ok && launcher === 'local') {
+                const local = resolveLocalInstallLayout(os.homedir(), 'xdg');
+                if (updatePath) {
+                    const ensured = await ensurePathEntryOnSystem({ entry: local.binDir, dryRun: true, yes: true });
+                    if (ensured.note)
+                        ui.log(ensured.note);
+                }
+                ui.log(`[dry-run] Would ensure local launcher at ${local.launcherPath}`);
+            }
+            if (!integrationsOk && defaultSelected.length) {
+                const results = [];
+                if (defaultSkillClients.length) {
+                    results.push({
+                        title: 'Skill + MCP',
+                        result: await runInstall({
+                            clients: defaultSkillClients,
+                            serverName,
+                            packageName: '@just-every/design',
+                            installSkills: true,
+                            dryRun: true,
+                            force,
+                            launcher,
+                        }),
+                    });
+                }
+                if (defaultMcpClients.length) {
+                    results.push({
+                        title: 'MCP only',
+                        result: await runInstall({
+                            clients: defaultMcpClients,
+                            serverName,
+                            packageName: '@just-every/design',
+                            installSkills: false,
+                            dryRun: true,
+                            force,
+                            launcher,
+                        }),
+                    });
+                }
+                for (const note of results.flatMap((r) => r.result.notes))
+                    ui.log(note);
+            }
+            process.exit(0);
         }
-        if (changed.length) {
-            console.error('Updated:');
-            for (const p of changed)
-                console.error(`- ${p}`);
+        if (authCheck.ok && cliCheck.ok && integrationsOk) {
+            ui.log('All checks passed — everything is up-to-date.');
+            process.exit(0);
         }
-        if (skipped.length) {
-            console.error('Skipped:');
-            for (const p of skipped)
-                console.error(`- ${p}`);
+        if (!authCheck.ok) {
+            if (!isTtyInteractive()) {
+                console.error(`Authentication is missing/invalid at ${configPath}.`);
+                console.error('Run `every-design auth login` (or `npx -y @just-every/design@latest auth login`) first, then re-run install.');
+                process.exit(1);
+            }
+            const proceed = yes ? true : await promptYesNo('Authentication missing/invalid. Login now?', true);
+            if (!proceed) {
+                console.error('Aborted.');
+                process.exit(1);
+            }
+            ui.setWorking('auth', 'Authentication');
+            await runAuthLoginFlow({ configPath, designOrigin, loginOrigin, flags });
+            ui.setChecklist({ auth: 'ok' });
+            finalAuthOk = true;
         }
-        if (notes.length) {
-            console.error('Notes:');
+        if (!cliCheck.ok && launcher === 'local') {
+            const local = resolveLocalInstallLayout(os.homedir(), 'xdg');
+            const summary = (() => {
+                if (cliCheck.missing)
+                    return 'Install Design CLI (every-design)?';
+                if (cliCheck.outdated) {
+                    const latest = cliCheck.latestVersion ? ` to v${cliCheck.latestVersion}` : '';
+                    const cur = cliCheck.installedVersion ? ` (current v${cliCheck.installedVersion})` : '';
+                    return `Update Design CLI${latest}?${cur}`;
+                }
+                if (cliCheck.needsPath)
+                    return `Add ${local.binDir} to PATH?`;
+                return 'Update Design CLI?';
+            })();
+            const proceed = yes ? true : await promptYesNo(summary, true);
+            if (!proceed) {
+                if (cliCheck.missing) {
+                    console.error('Design CLI is not installed; exiting.');
+                    process.exit(1);
+                }
+                // Installed but outdated: keep going.
+            }
+            else {
+                ui.setWorking('cli', 'Design CLI');
+                if (updatePath) {
+                    const ensured = await ensurePathEntryOnSystem({ entry: local.binDir, dryRun: false, yes: true });
+                    if (ensured.note)
+                        ui.log(ensured.note);
+                }
+                if (cliCheck.missing || cliCheck.outdated) {
+                    const res = await ensureLocalLauncher({
+                        packageName: '@just-every/design',
+                        dryRun: false,
+                        force: cliCheck.outdated,
+                    });
+                    for (const n of res.notes)
+                        ui.log(n);
+                }
+                ui.setChecklist({ cli: 'ok' });
+                finalCliOk = true;
+            }
+        }
+        if (!integrationsOk) {
+            if (defaultSelected.length === 0) {
+                console.error('No supported clients detected. Provide --client to select a target.');
+                process.exit(1);
+            }
+            const proceedRecommended = yes ? true : await promptYesNo('Install/update integrations (recommended)?', true);
+            const planToApply = proceedRecommended
+                ? defaultPlan
+                : await promptInstallPlan(detections, skillsEnabled, { mode: 'edit' });
+            const { mcpClients, skillClients, selected } = splitPlan(planToApply);
+            if (selected.length === 0) {
+                console.error('No clients selected. Nothing to do.');
+                process.exit(1);
+            }
+            ui.setWorking('integrations', 'Integrations');
+            const results = [];
+            if (skillClients.length) {
+                results.push({
+                    title: 'Skill + MCP',
+                    result: await runInstall({
+                        clients: skillClients,
+                        serverName,
+                        packageName: '@just-every/design',
+                        installSkills: true,
+                        dryRun: false,
+                        force,
+                        launcher,
+                    }),
+                });
+            }
+            if (mcpClients.length) {
+                results.push({
+                    title: 'MCP only',
+                    result: await runInstall({
+                        clients: mcpClients,
+                        serverName,
+                        packageName: '@just-every/design',
+                        installSkills: false,
+                        dryRun: false,
+                        force,
+                        launcher,
+                    }),
+                });
+            }
+            const changed = results.flatMap((r) => r.result.changed);
+            const notes = results.flatMap((r) => r.result.notes);
+            if (changed.length)
+                ui.log(`Updated: ${changed.join(', ')}`);
             for (const n of notes)
-                console.error(`- ${n}`);
+                ui.log(n);
+            ui.setChecklist({ integrations: 'ok' });
+            finalIntegrationsOk = true;
+        }
+        if (finalAuthOk && finalCliOk && finalIntegrationsOk) {
+            ui.log('All set. Restart your client(s) so they pick up the new MCP config.');
+        }
+        else {
+            ui.log('Install finished (some steps were skipped). Restart your client(s) so they pick up the new MCP config.');
         }
-        console.error('');
-        console.error('Next steps: restart your client(s) so they pick up the new MCP config.');
         process.exit(0);
     }
     // CLI helpers (non-MCP). These are mostly useful for Skills/playbooks and scripting.