toolaby 1.0.0 → 1.0.2

package/README.md

@@ -3,13 +3,14 @@
 The Toolaby command line. It puts the Wall — sign-in, a Free plan, paid plans, licences and subscriptions — into a Chrome extension you already have, or makes a new one for you.
 
 ```sh
-npx toolaby login                    # once: a code to approve in your browser
-npx toolaby wire wow--screenzard     # in your extension's folder
+npm i -g toolaby            # once (or run every command through `npx -y toolaby …`)
+toolaby login               # once: a code to approve in your browser
+toolaby wire <tool-id>      # in your extension's folder; `toolaby tools` lists your ids
 ```
 
 ## What it does
 
-**`toolaby login`** signs you in. It shows a code and opens the Toolaby dashboard; you approve the code there, and the command is signed in as you from then on. It works the way GitHub's and Stripe's command lines sign in, and only ever acts on your own tools.
+**`toolaby login`** signs you in. It shows a code and opens the Toolaby dashboard; you approve the code there — as the account the dashboard is signed in to — and the command is signed in as that account from then on. It works the way GitHub's and Stripe's command lines sign in, and only ever acts on that account's own tools.
 
 **`toolaby wire <tool-id>`**, run in your extension's folder, wires that extension to your tool:
 

package/bin.mjs

@@ -24,10 +24,11 @@ import { spawn } from 'node:child_process';
 import { wireManifest, WORKER_LINES } from './lib/manifest.js';
 import { detectProject, CODE_FILES, filesToWrite } from './lib/project.js';
 
-const VERSION = '1.0.0';
+const VERSION = '1.0.2';
 const CLIENT_ID = 'toolaby-cli';
 const argv = process.argv.slice(2);
-const command = argv.find((a) => !a.startsWith('--')) ?? 'help';
+// `--version` and `--help` are commands of their own; every other command is the first bare word.
+const command = argv.find((a) => ['--version', '-v', '--help', '-h'].includes(a)) ?? argv.find((a) => !a.startsWith('--')) ?? 'help';
 const rest = argv.filter((a) => a !== command);
 const positional = rest.filter((a) => !a.startsWith('--'));
 const opt = (k, d = null) => { const i = rest.indexOf(k); return i >= 0 && rest[i + 1] && !rest[i + 1].startsWith('--') ? rest[i + 1] : d; };
@@ -87,7 +88,7 @@ async function login() {
       const all = readCredentials();
       all[wall] = { token, email, at: new Date().toISOString() };
       writeCredentials(all);
-      out(`\n\n  Signed in${email ? ` as ${email}` : ''}. The session is in ${CREDENTIALS}; \`toolaby logout\` revokes it.\n`);
+      out(`\n\n  Signed in${email ? ` as ${email}` : ''}.\n`);
       return token;
     }
     const why = poll.json.error;
@@ -158,7 +159,12 @@ async function filesFor(slug, scaffold) {
   const token = await tokenOrLogin();
   const res = await api(`/api/cli/wiring/${slug}${scaffold ? '?scaffold=1' : ''}`, { token });
   if (res.status === 401) { out('  The stored session is no longer valid; signing in again.'); await login(); return filesFor(slug, scaffold); }
-  if (res.status === 404) fail(res.json.message ?? `No tool "${slug}" in your workspaces.`);
+  if (res.status === 404) {
+    // Say who the command is: the tool may well exist — in a workspace of another account of theirs.
+    const me = await api('/api/cli/me', { token }).catch(() => null);
+    const who = me?.ok ? `\n\n  You are signed in as ${me.json.email}${me.json.workspaces.length ? ` (workspaces: ${me.json.workspaces.map((w) => w.slug).join(', ')})` : ' (no workspace yet)'}.\n  Another account owns it? \`toolaby logout\`, sign in to the dashboard as that account, then run this again.` : '';
+    fail(`${res.json.message ?? `No tool "${slug}" in your workspaces.`}${who}`);
+  }
   if (!res.ok) fail(res.json.message ?? `The Wall answered HTTP ${res.status}.`);
   return res.json;
 }
@@ -245,4 +251,4 @@ function help() {
 const commands = { login: async () => { await login(); }, logout, whoami, tools, wire, create, help, '--help': help, '-h': help, '--version': () => out(VERSION), '-v': () => out(VERSION) };
 const run = commands[command];
 if (!run) { console.error(`\n  Unknown command "${command}".`); help(); process.exit(1); }
-run().catch((e) => fail(e.message));
+Promise.resolve().then(run).catch((e) => fail(e.message));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolaby",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "The Toolaby command line: sign in once, then wire any Chrome extension to your tool on the Wall — sign-in, the Free plan, licences and subscriptions — or start a new one.",
   "type": "module",
   "bin": { "toolaby": "./bin.mjs" },