@clearlysh/beehaven 0.8.23 → 0.8.25

package/dist/daemon.js

@@ -171,14 +171,14 @@ async function simulateCloudAppRpc(params) {
  * Curated "available to install" app list served by /api/marketplace.
  *
  * This is a stub catalog. Once the cloud marketplace is live, the daemon
- * will fetch from https://clearly.sh/apps/catalog.json instead of this
+ * will fetch from https://www.clearly.sh/apps/catalog.json instead of this
  * hardcoded array. The installed-app set is subtracted at serve time so
  * users don't see things they already have.
  *
  * Shapes roughly mirror AgentHiveCatalogEntry minus the live "registered"
  * state — a catalog entry is a promise of what installing would give you.
  */
-const CATALOG_URL = 'https://clearly.sh/apps/catalog.json';
+const CATALOG_URL = 'https://www.clearly.sh/apps/catalog.json';
 const CATALOG_CACHE_MS = 5 * 60_000; // 5 min
 let _catalogCache = null;
 let _catalogFetchedAt = 0;
@@ -234,7 +234,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'pro',
         tags: ['commerce', 'cloud', 'api'],
         kind: 'cloud',
-        install: { source: 'url', url: 'https://clearly.sh/apps/shopify/shopify-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/shopify/shopify-0.1.0.hive' },
         frontend: { title: 'Shopify', icon: '🛍️' },
     },
     {
@@ -245,7 +245,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'free',
         tags: ['creative', '3d', 'local'],
         kind: 'local',
-        install: { source: 'url', url: 'https://clearly.sh/apps/blender/blender-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/blender/blender-0.1.0.hive' },
         frontend: { title: 'Blender', icon: '🧊' },
     },
     {
@@ -256,7 +256,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'pro',
         tags: ['design', 'cloud', 'api'],
         kind: 'cloud',
-        install: { source: 'url', url: 'https://clearly.sh/apps/figma/figma-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/figma/figma-0.1.0.hive' },
         frontend: { title: 'Figma', icon: '🎨' },
     },
     {
@@ -267,7 +267,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'pro',
         tags: ['creative', 'audio', 'local'],
         kind: 'local',
-        install: { source: 'url', url: 'https://clearly.sh/apps/logic-pro/logic-pro-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/logic-pro/logic-pro-0.1.0.hive' },
         frontend: { title: 'Logic Pro', icon: '🎚️' },
     },
     {
@@ -278,7 +278,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'free',
         tags: ['smart-home', 'local'],
         kind: 'local',
-        install: { source: 'url', url: 'https://clearly.sh/apps/hue/hue-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/hue/hue-0.1.0.hive' },
         frontend: { title: 'Philips Hue', icon: '💡' },
     },
     {
@@ -289,7 +289,7 @@ const STATIC_FALLBACK_APPS = [
         tier: 'pro',
         tags: ['productivity', 'cloud', 'api'],
         kind: 'cloud',
-        install: { source: 'url', url: 'https://clearly.sh/apps/jira/jira-0.1.0.hive' },
+        install: { source: 'url', url: 'https://www.clearly.sh/apps/jira/jira-0.1.0.hive' },
         frontend: { title: 'Jira', icon: '📋' },
     },
     {
@@ -707,7 +707,7 @@ let daemonAppManager = null;
 // curl-only distribution — the CLI is NOT published to npm. Updates fetch the
 // versioned tarball from downloads.clearly.sh via the public installer script.
 let announcedManagedUpdates = false;
-const INSTALL_URL = process.env.BEEHAVEN_INSTALL_URL || 'https://clearly.sh/install.sh';
+const INSTALL_URL = process.env.BEEHAVEN_INSTALL_URL || 'https://www.clearly.sh/install.sh';
 /**
  * ⚠ THE SAME OVERRIDE ITS SIBLING ALREADY HAD. `min-version.ts` reads `BEEHAVEN_CLI_FEED` so the
  * force-update gate can be exercised against a scratch channel; the auto-updater — the half that

package/dist/folder-sync.js

@@ -77,7 +77,7 @@ export async function linkProject(relay, folderPath, brandId) {
         }
         if (projects.length === 0) {
             console.error('  No projects found in your Clearly account.');
-            console.error('  Create a project at https://clearly.sh first.');
+            console.error('  Create a project at https://www.clearly.sh first.');
             process.exit(1);
         }
         console.log('\n  Available projects:\n');

package/dist/local-app-manager.js

@@ -97,7 +97,7 @@ export class LocalAppManager extends EventEmitter {
      */
     templateVars() {
         // `webBase` — dev Mac app sets this via env; defaults to production.
-        const webBase = process.env.BEEHAVEN_WEB_BASE ?? process.env.CLEARLY_WEB_BASE ?? 'https://clearly.sh';
+        const webBase = process.env.BEEHAVEN_WEB_BASE ?? process.env.CLEARLY_WEB_BASE ?? 'https://www.clearly.sh';
         // User identity — the daemon stores these in config on sign-in
         // install(), so they're available without decoding the JWT here.
         const cfg = readDaemonConfigSafe();

package/dist/setup-relay.js

@@ -1,148 +1,28 @@
 #!/usr/bin/env node
 // ============================================================================
 // Beehaven Office - Relay Setup (Login)
-// Browser-based OAuth login flow for Clearly account
+// The daemon's interactive sign-in fallback, and logout.
 // ============================================================================
-import http from 'http';
-import crypto from 'crypto';
-import { createInterface } from 'readline';
-import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, chmodSync } from 'fs';
 import { homedir } from 'os';
 import { join } from 'path';
 import { spawnSync } from 'child_process';
 import { Relay, CLEARLY_RELAY_URL } from './relay.js';
-import { resolveRelaySelection } from './relay-presets.js';
 import { SESSION_KEYCHAIN_ACCOUNTS, KEYCHAIN_SERVICE } from './keychain.js';
-import { withUtm } from './utm.js';
 const CONFIG_DIR = join(homedir(), '.beehaven');
 const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
-const AUTH_BASE_URL = 'https://clearly.sh/auth/beehaven';
-const LOGIN_TIMEOUT_MS = 120_000; // 2 minutes
 /**
- * The raw config, for questions that must be answered BEFORE a token exists.
- * `Relay.loadConfig()` returns null without one, which is the state a first login is in.
+ * The daemon calls this when it starts interactively with no token, or when its session has
+ * expired (daemon.ts). It then re-reads the config, so all it needs is credentials on disk.
+ *
+ * ⚠⚠ AWO-224 — THIS USED TO BE A SECOND, DIFFERENT SIGN-IN. It opened
+ * `https://www.clearly.sh/auth/beehaven?callback=…`, waited for a single `token` and wrote its own
+ * config. The web app no longer serves that route (404 on prod and, via the apex redirect, the
+ * same 404), so the fallback opened a dead page and timed out after two minutes. It now runs the
+ * exact flow `beehaven login` runs (`browser-login.ts`: `/cli/auth`, the keychain idToken slot
+ * the daemon reads, both dial-target keys) and nothing else — it must NOT restart the daemon,
+ * because it runs inside it.
  */
-function readConfigFile() {
-    if (!existsSync(CONFIG_FILE))
-        return {};
-    try {
-        return JSON.parse(readFileSync(CONFIG_FILE, 'utf8'));
-    }
-    catch {
-        return {};
-    }
-}
-function saveRelayConfig(token, endpoint) {
-    mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
-    let existing = {};
-    if (existsSync(CONFIG_FILE)) {
-        try {
-            existing = JSON.parse(readFileSync(CONFIG_FILE, 'utf8'));
-        }
-        catch (err) {
-            console.warn(`[config] Failed to parse ${CONFIG_FILE}:`, err.message);
-        }
-    }
-    existing.token = token;
-    // ⚠ BOTH KEYS, as `beehaven env` writes them — `endpoint` is dialled, `relayUrl` is the alias
-    // other surfaces read. Updating one leaves the other naming a different environment.
-    existing.endpoint = endpoint;
-    existing.relayUrl = endpoint;
-    existing.tier = 'connected';
-    writeFileSync(CONFIG_FILE, JSON.stringify(existing, null, 2));
-    chmodSync(CONFIG_FILE, 0o600);
-}
-function prompt(question) {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            resolve(answer.trim());
-        });
-    });
-}
-/**
- * Start a local HTTP server on a random port to receive the OAuth callback.
- * Returns a promise for the token, plus helpers to get the port and close.
- */
-function startCallbackServer() {
-    let resolveToken;
-    let rejectToken;
-    let serverRef;
-    let settled = false;
-    const oauthState = crypto.randomBytes(32).toString('hex');
-    const promise = new Promise((resolve, reject) => {
-        resolveToken = resolve;
-        rejectToken = reject;
-        serverRef = http.createServer((req, res) => {
-            if (settled)
-                return;
-            const url = new URL(req.url, `http://localhost`);
-            if (url.pathname === '/callback') {
-                // Validate OAuth state parameter to prevent CSRF (skip if server doesn't echo it back yet)
-                const returnedState = url.searchParams.get('state');
-                if (returnedState && returnedState !== oauthState) {
-                    res.writeHead(403, { 'Content-Type': 'text/html' });
-                    res.end('<!DOCTYPE html><html><body><h1>Invalid state parameter</h1></body></html>');
-                    return;
-                }
-                const token = url.searchParams.get('token');
-                if (token) {
-                    settled = true;
-                    res.writeHead(200, { 'Content-Type': 'text/html' });
-                    res.end([
-                        '<!DOCTYPE html><html><head>',
-                        '<meta charset="utf-8">',
-                        '<title>Beehaven - Logged In</title>',
-                        '<style>',
-                        'body{font-family:system-ui,-apple-system,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#fef9ef}',
-                        '.card{text-align:center;padding:48px;border-radius:16px;background:white;box-shadow:0 2px 12px rgba(0,0,0,0.08)}',
-                        'h1{margin:0 0 8px;font-size:24px}',
-                        'p{margin:0;color:#666;font-size:15px}',
-                        '.bee{font-size:48px;margin-bottom:16px}',
-                        '</style>',
-                        '</head><body>',
-                        '<div class="card">',
-                        '<div class="bee">&#x1F41D;</div>',
-                        '<h1>Logged in!</h1>',
-                        '<p>You can close this tab and return to your terminal.</p>',
-                        '</div>',
-                        '</body></html>',
-                    ].join(''));
-                    serverRef.close();
-                    resolve(token);
-                }
-                else {
-                    res.writeHead(400, { 'Content-Type': 'text/html' });
-                    res.end('<!DOCTYPE html><html><body><h1>Missing token</h1></body></html>');
-                }
-            }
-            else {
-                res.writeHead(404);
-                res.end();
-            }
-        });
-        serverRef.listen(0, '127.0.0.1');
-        // Timeout after 2 minutes
-        const timer = setTimeout(() => {
-            if (!settled) {
-                settled = true;
-                serverRef.close();
-                reject(new Error('Login timed out after 2 minutes.'));
-            }
-        }, LOGIN_TIMEOUT_MS);
-        serverRef.on('close', () => clearTimeout(timer));
-    });
-    return {
-        promise,
-        getPort: () => serverRef.address()?.port || 0,
-        close: () => {
-            settled = true;
-            serverRef?.close();
-        },
-        state: oauthState,
-    };
-}
 export async function login() {
     console.log('');
     console.log('  Clearly account required to use Beehaven.');
@@ -165,114 +45,19 @@ export async function login() {
         console.log('  Session expired. Please log in again.');
         console.log('');
     }
-    // Start local callback server
-    const callbackServer = startCallbackServer();
-    // Small delay to let server bind
-    await new Promise((r) => setTimeout(r, 100));
-    const port = callbackServer.getPort();
-    if (!port) {
-        console.log('  Failed to start auth server.');
-        callbackServer.close();
-        return false;
-    }
-    const callbackUrl = `http://localhost:${port}/callback`;
-    const authUrl = withUtm(`${AUTH_BASE_URL}?callback=${encodeURIComponent(callbackUrl)}&state=${callbackServer.state}`);
-    // Try to open browser
-    let browserOpened = false;
-    try {
-        const openModule = await import('open');
-        await openModule.default(authUrl);
-        browserOpened = true;
-    }
-    catch {
-        browserOpened = false;
-    }
-    if (browserOpened) {
-        console.log('  Opening browser to sign in with Google...');
-        console.log('');
-        console.log('  Waiting for login... (press Ctrl+C to cancel)');
-    }
-    else {
-        // Fallback: show URL and offer manual token paste
-        console.log('  Could not open browser. Sign in manually:');
-        console.log('');
-        console.log(`  1. Open: ${authUrl}`);
-        console.log('  2. Sign in with Google');
-        console.log('');
-        console.log('  Waiting for login callback...');
-        console.log('  Or paste your relay token below:');
-        console.log('');
-        // Race: callback server vs manual token paste
-        const manualToken = prompt('  Relay token: ').then((token) => {
-            if (token) {
-                callbackServer.close();
-                return token;
-            }
-            return null;
-        });
-        try {
-            const token = await Promise.race([
-                callbackServer.promise,
-                manualToken.then((t) => {
-                    if (t)
-                        return t;
-                    return new Promise(() => { });
-                }),
-            ]);
-            if (token) {
-                return await verifyAndSave(token);
-            }
-        }
-        catch (err) {
-            console.log(`  ${err.message}`);
-            return false;
-        }
-    }
-    // Wait for callback
     try {
-        const token = await callbackServer.promise;
-        return await verifyAndSave(token);
-    }
-    catch (err) {
-        console.log(`  ${err.message}`);
-        return false;
-    }
-}
-async function verifyAndSave(token) {
-    // Validate token format before sending to server
-    if (!token || !/^[a-zA-Z0-9_\-.]{20,}$/.test(token)) {
-        console.log('  Invalid token format.');
-        return false;
-    }
-    console.log('');
-    console.log('  Verifying...');
-    const relay = new Relay();
-    /**
-     * ⚠⚠ THE ACTIVE RELAY, NOT A HARDCODED PROD CONSTANT. Both of these were `CLEARLY_RELAY_URL`, so
-     * a staging or dev user who signed in here was VERIFIED against prod and then had `endpoint`
-     * OVERWRITTEN to prod — silently moving them to another environment as a side effect of logging
-     * in. `beehaven env staging` writes the target; a login must honour it, never redefine it.
-     *
-     * ⚠ Read from the file rather than `Relay.loadConfig()`: that returns null without a token, which
-     * is exactly the state a first login is in. `resolveRelaySelection` defaults to prod when the
-     * config names nothing, so the no-config case is unchanged.
-     */
-    const dialUrl = resolveRelaySelection(readConfigFile()).url;
-    const profile = await relay.verifyToken(token, dialUrl);
-    if (profile) {
-        saveRelayConfig(token, dialUrl);
-        if (profile.displayName) {
-            console.log(`  Logged in as ${profile.displayName} (${profile.subscriptionPlan})`);
-        }
-        else {
-            console.log('  Logged in.');
-        }
+        // ⚠ Imported lazily: the Mac app loads this file for `logout` alone and should not pull in
+        // the sign-in flow's dependencies to do it.
+        const { browserLogin } = await import('./browser-login.js');
+        const who = await browserLogin();
+        console.log(`  Logged in as ${who.email ?? who.userId}.`);
         console.log('  Config saved to ~/.beehaven/config.json');
         console.log('');
         return true;
     }
-    else {
-        console.log('  Token verification failed. Please try again.');
+    catch (err) {
+        console.log(`  ${err?.message ?? err}`);
+        console.log('  Run `beehaven login`, then start again.');
         console.log('');
         return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clearlysh/beehaven",
-  "version": "0.8.23",
+  "version": "0.8.25",
   "description": "Beehaven CLI — command your Clearly workspace, agents, and canvas from the terminal",
   "private": false,
   "type": "module",

package/scripts/sync-skills.mjs

@@ -35,6 +35,7 @@ const SOURCES = {
   'agent-doodle-space':'apps/mcp-server/plugin/skills/agent-doodle-space/SKILL.md',
   'design-craft':   'apps/mcp-server/plugin/skills/design-craft/SKILL.md',
   'layout-systems': 'apps/mcp-server/plugin/skills/layout-systems/SKILL.md',
+  'brand-identity': 'apps/mcp-server/plugin/skills/brand-identity/SKILL.md',
   'pair-on-canvas': 'apps/mcp-server/plugin/skills/pair-on-canvas/SKILL.md',
   'codebase-map':   'apps/mcp-server/plugin/skills/codebase-map/SKILL.md',
   'clearly-workspace': 'apps/mcp-server/plugin/skills/clearly-workspace/SKILL.md',

package/skills/README.md

@@ -1,24 +1,26 @@
-# CLI-paired Claude Code skills
+# Skills shipped with the CLI
 
-Claude Code skills that document built-in `beehaven` CLI verbs.
-Distinct from hive-paired skills (which live with each hive in
-`clearly-hives/<hive>/skills/`).
+The `beehaven` tarball carries the agent skills a CLI-only user needs — the same set the Clearly
+Mac app installs — so `curl | sh` teaches an agent Clearly without the app.
 
-A skill belongs here when it documents functionality that ships
-with the CLI itself, not with any specific hive. Currently:
+## Where each skill comes from
 
-- **`claude-shopper/`** — documents `beehaven shop find/at/search/get/checkout`
-  (the shop@0 protocol surface). Not paired with any hive — the shop
-  catalog is part of the CLI's Yellow Pages integration.
+| Skill | Source of truth (edit HERE, never the copy) |
+|---|---|
+| `beehaven-cli` | `clearly-hives/beehaven-cli/skills/SKILL.md` |
+| `clearly-agent`, `clearly-canvas`, `clearly-workspace`, `design-craft`, `layout-systems`, `brand-identity`, `pair-on-canvas`, `codebase-map`, `agent-home`, `agent-doodle-space` | `apps/mcp-server/plugin/skills/<name>/` in the monorepo |
+| `claude-shopper` | this folder — hand-written, documents `beehaven shop` (the shop@0 protocol) |
 
-These aren't installed by `beehaven install` (that's for hive-paired
-skills via the `agentDocs.claudeCode` manifest field). If a user wants
-the claude-shopper skill, they install it manually:
+`scripts/sync-skills.mjs` copies every monorepo source into `skills/<name>/` (`npm run sync:skills`,
+and automatically at `prepack`) and writes `skills/index.json`. Its `SOURCES` table mirrors the
+Mac app's `electron-builder*.yml` extraResources and `SHIPPED_SKILLS`
+(`apps/electron/electron/agent-skills-installer.ts`); `apps/electron/scripts/verify-mcp-parity.mjs`
+fails when the two sets disagree.
 
-```bash
-cp -R packages/cli/skills/claude-shopper ~/.claude/skills/beehaven-shopper
-```
+## Rules
 
-Or eventually via a `beehaven skills install-bundled <name>` verb (not
-yet built). See `beehaven_sdk/docs/LOCAL_HIVES.md` §11.5 for the
-hive-paired skill flow this complements.
+- Edit the source, then run `npm run sync:skills`. A change made to a copy here is overwritten.
+- Copies are generated, so they are listed in `.gitignore` (a second committed copy is a second copy
+  to drift). ⚠ `agent-home`, `agent-doodle-space`, `clearly-agent` and `clearly-workspace` are still
+  tracked from before that rule; treat them as generated all the same.
+- Only `README.md` and `claude-shopper/` are hand-written here.