clickroom 0.1.0 → 0.2.0

package/README.md

@@ -98,6 +98,22 @@ Each `clickroom` terminal is a live **session**. The dashboard (`/`, team only)
 
 In a review, the project name in the toolbar is a switcher with the same list. `clickroom list` prints it in the terminal.
 
+## Workspaces
+
+On clickroom.dev every team has a workspace at its own address, `<workspace>.clickroom.dev`, with its own people, projects, comments and builds. Each review is at `<workspace>.clickroom.dev/<project>`.
+
+- **Signing up:** on clickroom.dev, *Start a workspace* signs you in with your email address (a link, or Google) and asks for a name and an address. You're its owner and signed in there right away.
+- **Your workspaces:** clickroom.dev lists every workspace your address is in, as an owner, teammate or client. *Open* signs you in there. Each workspace's dashboard has *Switch* next to its name.
+- **Sharing from a computer:** `clickroom login <workspace>`, then `clickroom` in a project. Builds are uploaded. Live dev servers (the relay) belong to the first workspace only.
+- **Separate by design:** a sign-in, a CLI key or a share link of one workspace opens nothing in another, even for a project with the same name (`test/workspaces.test.js`). The admin key and the Slack webhook belong to the first workspace.
+
+How it's set up:
+- `APP_HOST` (`{ws}.clickroom.dev`) and `DEFAULT_WS` (`yna`) turn workspaces on. The first workspace keeps its storage from before workspaces (Registry `registry`, rooms and builds by project name). Others use Registry `ws:<slug>`, and rooms and builds under `<slug>/`.
+- The `Directory` Durable Object knows every workspace and which email addresses are in each. Each workspace's Registry keeps that list up to date.
+- The bare domain (`AUTH_URL`) has the public pages, `/login` and the list of your workspaces. It also keeps the API for CLIs set up before, and Google's return address.
+- Prototypes run on `{name}--{ws}.clickroom-preview.dev` (`PROTO_HOST`), a separate site. Each review address frames the review from there.
+- `PASSTHROUGH_HOSTS` lists hosts under the wildcard route that aren't the app's, such as the relay's tunnel.
+
 ## People
 
 Everyone except share-link clients signs in as themselves, by email address. A browser stays signed in for 30 days from its last visit; signing in again while signed in (clickroom.dev's *Sign in*) goes straight to the dashboard.

package/bin/clickroom.js

@@ -8,7 +8,7 @@ import { call } from '../cli/client.js';
 const HELP = `clickroom: multiplayer review for locally built prototypes
 
 On a teammate's computer
-  clickroom login [url]       connect this computer to your team's clickroom (default https://clickroom.dev):
+  clickroom login <workspace> connect this computer to your team's workspace (acme → acme.clickroom.dev):
                               approve it in the browser where you're signed in from your invite
   clickroom                   then, in a project: builds it, uploads it as v1 and keeps the session open
                               (p pushes the next version). The team sees it on the dashboard.

package/cli/gaps.js

@@ -18,7 +18,7 @@ const questionCount = async (name) =>
 
 // Resolves to the number of questions it added (drafts), or throws.
 export async function findGaps(name, root) {
-  if (!hasClaude()) throw new Error('Claude Code (`claude`) is not installed on this Mac');
+  if (!hasClaude()) throw new Error('Claude Code (`claude`) is not installed on the computer running `clickroom` for this project');
   const before = await questionCount(name);
   const mcp = JSON.stringify({ mcpServers: { clickroom: { command: process.execPath, args: [path.join(ROOT, 'bin', 'clickroom.js'), 'mcp'] } } });
   const args = ['-p', gapsPrompt(name), '--mcp-config', mcp, '--strict-mcp-config', '--tools', 'Read,Glob,Grep', '--allowedTools', TOOLS.join(','), '--disallowedTools', NEVER.join(','), '--no-session-persistence'];

package/cli/login.js

@@ -5,12 +5,14 @@ import { bold, dim } from './dev.js';
 
 export const DEFAULT_URL = 'https://clickroom.dev';
 
-// `clickroom login [url]`: connects this computer to a clickroom server as you. It opens a page in
-// your browser (where you're signed in from your invite) to approve this computer, then keeps a
-// key of its own in ~/.clickroom/credentials.json.
+// `clickroom login [workspace|url]`: connects this computer to a clickroom workspace as you
+// ("acme" means https://acme.clickroom.dev). It opens a page in your browser (where you're signed
+// in from your invite) to approve this computer, then keeps a key of its own in
+// ~/.clickroom/credentials.json.
 export async function login(arg) {
+  if (arg && /^[a-z][a-z0-9-]{1,19}$/.test(arg)) arg = `https://${arg}.${new URL(DEFAULT_URL).hostname}`;
   const url = (arg || process.env.CLICKROOM_URL || credentials()?.url || DEFAULT_URL).replace(/\/$/, '');
-  if (!/^https?:\/\//.test(url)) throw new Error('usage: clickroom login [https://clickroom.example]');
+  if (!/^https?:\/\//.test(url)) throw new Error('usage: clickroom login <workspace>   (or a URL: clickroom login https://acme.clickroom.dev)');
   if (adminToken() && !process.env.CLICKROOM_TOKEN) console.log(dim('  This computer has the admin key (.dev.vars), which the clickroom command uses first.'));
   const res = await fetch(`${url}/__ps/api/cli-login`, {
     method: 'POST',

package/cli/note.js

@@ -3,7 +3,7 @@ import { call } from './client.js';
 import { changedSource, folderChanges } from './changes.js';
 
 // The version note when a push comes without one ("Push v16" on the dashboard, or an empty
-// answer in the terminal): Claude Code on this Mac (`claude -p`) describes the source changes
+// answer in the terminal): Claude Code on this computer (`claude -p`) describes the source changes
 // since the last push as reviewers will notice them, plus the comments fixed in this version.
 // Without git, Claude or a usable answer: the fixed comments, else the changed file names.
 // CLICKROOM_AUTO_NOTE=off never asks Claude.

package/cli/share.js

@@ -102,8 +102,9 @@ export async function share(arg, opts) {
   let base, teamUrl, clientUrl;
   const links = () => {
     base = tunnelUrl || `http://localhost:${port}`;
-    teamUrl = `${base}/s/${encodeURIComponent(name)}`;
-    clientUrl = `${project.origin || base}/s/${encodeURIComponent(name)}?t=${project.token}`;
+    // The review's own address when the server has one (APP_URL/<name>), else /s/<name>.
+    teamUrl = project.reviewUrl || `${base}/s/${encodeURIComponent(name)}`;
+    clientUrl = `${project.reviewUrl || `${project.origin || base}/s/${encodeURIComponent(name)}`}?t=${project.token}`;
     console.log('');
     console.log(`  ${bold('Review (you, team)')}  ${teamUrl} ${dim('(press o to open it signed in)')}`);
     console.log(`  ${bold('Client link')}         ${clientUrl}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickroom",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Share prototype builds for review: pins, region comments, threads, versions, and agent hand-off (MCP). Teammates push builds to their team’s clickroom with `clickroom login`.",
   "type": "module",
   "bin": {