toolaby 1.0.1 → 1.0.3

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

@@ -22,9 +22,9 @@ import { join, resolve, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { spawn } from 'node:child_process';
 import { wireManifest, WORKER_LINES } from './lib/manifest.js';
-import { detectProject, CODE_FILES, filesToWrite } from './lib/project.js';
+import { detectProject, CODE_FILES, filesToWrite, BUILD_COPY_NOTE } from './lib/project.js';
 
-const VERSION = '1.0.1';
+const VERSION = '1.0.3';
 const CLIENT_ID = 'toolaby-cli';
 const argv = process.argv.slice(2);
 // `--version` and `--help` are commands of their own; every other command is the first bare word.
@@ -88,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;
@@ -159,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;
 }
@@ -176,8 +181,9 @@ async function wire() {
   const plan = await filesFor(slug, false);
   const site = plan.site;
   const configSource = ['manifest.config.ts', 'manifest.config.js', 'manifest.ts', 'src/manifest.ts'].find(has);
-  const project = detectProject({ has, packageJson: has('package.json') ? readJson(join(dir, 'package.json')) : null, manifest, manifestSource: configSource ? readFileSync(join(dir, configSource), 'utf8') : null, site });
-  if (project.kind === 'unknown') fail(`${dir} has no manifest.json and is not a WXT, CRXJS or Plasmo project — run this inside your extension's folder, or point --into at it.`);
+  const project = detectProject({ has, packageJson: has('package.json') ? readJson(join(dir, 'package.json')) : null, manifest, manifestSource: configSource ? readFileSync(join(dir, configSource), 'utf8') : null, site, tree });
+  // Nothing recognised: nothing is written and nothing guessed. A manifest below the top is where to point --into; otherwise the Set up page's Do it myself has the files and the three things to paste.
+  if (project.kind === 'unknown') fail(`${dir} has no manifest.json at the top and is not a WXT, CRXJS or Plasmo project${project.foundManifest ? ` — there is one at ${project.foundManifest}: run this with --into ${dirname(project.foundManifest) || '.'}` : ''}.\n  Nothing was written. For a layout of your own, the tool's Set up page → Do it myself has the files and the three things to paste.`);
 
   // The extension's own popup: the manifest's, or — wired before — the one the existing configuration remembers.
   const configPath = join(dir, `${project.codeDir}toolaby.config.js`);
@@ -207,7 +213,8 @@ async function wire() {
   out(`  Written: ${targets.join(', ')}${did.length ? `,\n           ${did.join(',\n           ')}` : ''}.\n`);
   for (const sn of project.snippets) out(`  Add to ${sn.file} — yours to paste, the manifest being generated:\n\n${sn.code.split('\n').map((l) => `     ${l}`).join('\n')}\n`);
   if (ownWorker) out(`  Your background, ${ownWorker.file}: add${ownWorker.classic ? ' — after giving "background" a "type": "module" in manifest.json (importScripts() is not available in a module worker)' : ''}:\n\n${project.workerLines.trimEnd().split('\n').map((l) => `     ${l}`).join('\n')}\n`);
-  out(`  Next: ${project.kind === 'plain' ? '' : 'build or start the dev server, then '}chrome://extensions → reload it. The tool's Set up page says "checked in" the moment it starts.`);
+  if (project.built) out(`  ${BUILD_COPY_NOTE}\n`);
+  out(`  Next: ${project.kind === 'plain' && !project.built ? '' : 'build or start the dev server, then '}chrome://extensions → reload it. The tool's Set up page says "checked in" the moment it starts.`);
   if (project.note) out(`  ${project.note}\n`);
   else if (appPopup) out(`  Your popup opens as before; what the Free plan holds (Pricing, in the dashboard) decides when the Wall's panel takes its place.\n`);
   else out(`  No popup to stand in front of: count a use where your feature runs — the Set up page shows the line.\n`);

package/lib/project.js

@@ -1,4 +1,6 @@
 // Generated from wall/src/packages/wiring/project.ts by wall/scripts/pack-create.mjs — edit there.
+/** What to tell a developer whose build ships the extension — the Wire button, the command and the Set up page all say it in these words. */
+export const BUILD_COPY_NOTE = 'A build ships this extension: make sure it copies the platform\'s files to its output — toolaby.js, toolaby.config.js, toolaby-client.module.js, paywall.js, paywall.css and toolaby-popup.* — the way it copies your popup.html.';
 /** Always written, where the build imports from: the client, its config and types, and the panel a popup of the developer's own can draw. */
 export const CODE_FILES = ['toolaby.config.js', 'toolaby.js', 'toolaby-client.module.js', 'toolaby.d.ts', 'paywall.js', 'paywall.css'];
 /** The Wall's popup, where the build copies files as they are; it imports the panel beside it, so the panel goes there too when that is elsewhere. */
@@ -19,6 +21,8 @@ const dep = (pkg, name) => !!(pkg?.dependencies?.[name] || pkg?.devDependencies?
 const first = (has, candidates) => candidates.find(has) ?? null;
 export function detectProject(o) {
     const { has, packageJson: pkg, manifest, site } = o;
+    const scripts = pkg?.scripts ?? {};
+    const built = !!scripts.build || has('dist') || has('build');
     const wxt = dep(pkg, 'wxt') || !!first(has, ['wxt.config.ts', 'wxt.config.js', 'wxt.config.mts', 'wxt.config.mjs']);
     const plasmo = dep(pkg, 'plasmo');
     const crxjs = dep(pkg, '@crxjs/vite-plugin');
@@ -49,7 +53,7 @@ export function detectProject(o) {
             `});`,
         ].join('\n');
         return {
-            kind: 'wxt', label: 'WXT', codeDir: '', popupDir: `${src}public/`, manifestFile: null, wrapper: true, appPopup, worker,
+            kind: 'wxt', label: 'WXT', codeDir: '', popupDir: `${src}public/`, manifestFile: null, wrapper: true, appPopup, worker, built: false, foundManifest: null,
             createWorker: worker ? null : { file: workerFile, content: workerLines },
             workerLines, snippets: [{ file: first(has, ['wxt.config.ts', 'wxt.config.js', 'wxt.config.mts', 'wxt.config.mjs']) ?? 'wxt.config.ts', language: 'ts', code }],
         };
@@ -64,10 +68,10 @@ export function detectProject(o) {
         const workerLines = `import { toolaby } from '${importPath(workerFile)}';\n\ntoolaby.startBackground();\n`;
         const code = JSON.stringify({ manifest: { permissions: ['storage'], host_permissions: [`${site}/*`], externally_connectable: { matches: [`${site}/*`] } } }, null, 2).replace(/^\{\n|\n\}$/g, '');
         return {
-            kind: 'plasmo', label: 'Plasmo', codeDir: '', popupDir: '', manifestFile: null, wrapper: false, appPopup: null, worker,
+            kind: 'plasmo', label: 'Plasmo', codeDir: '', popupDir: '', manifestFile: null, wrapper: false, appPopup: null, worker, built: false, foundManifest: null,
             createWorker: worker ? null : { file: workerFile, content: workerLines },
             workerLines, snippets: [{ file: 'package.json', language: 'json', code }],
-            note: 'Plasmo builds only the pages its manifest names, so the Wall\'s popup cannot stand in front of yours: ask the gate in your popup — the lines under Fine-tune.',
+            note: 'Plasmo builds only the pages its manifest names, so the Wall\'s popup cannot stand in front of yours: ask the gate in your popup — the lines are in the docs, under Plasmo.',
         };
     }
     if (crxjs && !has('manifest.json')) {
@@ -96,21 +100,26 @@ export function detectProject(o) {
             `});`,
         ].join('\n');
         return {
-            kind: 'crxjs', label: 'CRXJS', codeDir: '', popupDir: '', manifestFile: null, wrapper: true, appPopup, worker: worker && has(worker) ? worker : null,
+            kind: 'crxjs', label: 'CRXJS', codeDir: '', popupDir: '', manifestFile: null, wrapper: true, appPopup, worker: worker && has(worker) ? worker : null, built: false, foundManifest: null,
             createWorker: worker && has(worker) ? null : { file: workerFile, content: workerLines },
             workerLines, snippets: [{ file: configFile ?? 'manifest.config.ts', language: 'ts', code }, ...(appPopup ? [{ file: viteFile, language: 'ts', code: vite }] : [])],
         };
     }
     if (has('manifest.json')) {
         // A plain extension, or CRXJS with a real manifest.json: the manifest is edited (wireManifest), everything at the root.
+        // A plain extension with a build (webpack, Rollup, Parcel, esbuild…) is wired the same way — the manifest is a file and
+        // the files go beside it — but only what the build copies reaches the output, so that is said.
         const declared = typeof manifest?.action?.default_popup === 'string' ? manifest.action.default_popup : null;
         const named = typeof manifest?.background?.service_worker === 'string' ? manifest.background.service_worker : null;
         const workerFile = named && has(named) ? named : 'background.js';
         return {
-            kind: crxjs ? 'crxjs' : 'plain', label: crxjs ? 'CRXJS' : 'a plain extension', codeDir: '', popupDir: '', manifestFile: 'manifest.json', wrapper: true,
+            kind: crxjs ? 'crxjs' : 'plain', label: crxjs ? 'CRXJS' : 'a plain extension', codeDir: '', popupDir: '', manifestFile: 'manifest.json', wrapper: true, built: crxjs ? false : built, foundManifest: null,
             appPopup: declared && declared !== 'toolaby-popup.html' ? declared : null, worker: named && has(named) ? named : null, createWorker: null,
             workerLines: `import { toolaby } from '${importPath(workerFile)}';\n\ntoolaby.startBackground();\n`, snippets: [],
         };
     }
-    return { kind: 'unknown', label: 'unknown', codeDir: '', popupDir: '', manifestFile: null, wrapper: false, appPopup: null, worker: null, createWorker: null, workerLines: '', snippets: [] };
+    // Nothing recognised. A manifest below the root — src/, public/, a package of a monorepo — is where the wiring should have
+    // been pointed, and is said; the shallowest one, since a fixture or a dependency may carry another.
+    const foundManifest = [...(o.tree ?? [])].filter((p) => p.endsWith('/manifest.json') && !p.includes('node_modules/')).sort((a, b) => a.split('/').length - b.split('/').length || a.localeCompare(b))[0] ?? null;
+    return { kind: 'unknown', label: 'unknown', codeDir: '', popupDir: '', manifestFile: null, wrapper: false, appPopup: null, worker: null, createWorker: null, workerLines: '', snippets: [], built, foundManifest };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolaby",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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" },