toolaby 1.7.0 → 1.7.1

package/README.md

@@ -3,7 +3,7 @@
 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
-npm i -g toolaby              # once (or run every command through `npx -y toolaby@latest …`)
+npm i -g toolaby              # once (or run every command through `npx -y toolaby@latest …`); on Windows, type toolaby-cli
 toolaby wire <tool-id>        # in your extension's folder, on Test; signs you in first if it must
 toolaby wire <tool-id> --live # the same, on Live: the store build
 ```

package/bin.mjs

@@ -38,13 +38,13 @@ import { homedir } from 'node:os';
 import { spawn } from 'node:child_process';
 import { createHmac, randomBytes } from 'node:crypto';
 import { wireManifest, drawsItself, WORKER_LINES, wallWorkerSource, configValues, wrappedBy, namedWorker as workerIn, startsPlatform as startsWall, CLASSIC_CLIENT } from './lib/manifest.js';
-import { wiringSummary, popupSwapIn, ownCode } from './lib/summary.js';
+import { wiringSummary, popupSwapIn, gatesIn, ownCode } from './lib/summary.js';
 import { detectProject, CODE_FILES, POPUP_FILES, SIDE_PANEL_FILES, filesToWrite, fillPages, scaffoldManifest, scaffoldFilesFor, surfacesOf, hasPopup, hasSidePanel, SURFACES, STALE_FILES, BUILD_COPY_NOTE, AGENT_FILES, AGENT_ENTRY_FILES } from './lib/project.js';
 import { runMcp } from './lib/mcp.js';
 import { runCheck } from './lib/check.js';
 import { inside, signInPage, devicePolling, opener, privateKind, privateContent, privateCopies, googleKey, projectRoot, gitDirectory, gitObject, gitObjects, gitFile, notAnImage, unpacked, COMPRESSED, publicLinks, privateLinks, oneLine, fetchBounded, fetchHere, readBounded, readText, SCAFFOLD_FILES } from './lib/safe.js';
 
-const VERSION = '1.7.0';
+const VERSION = '1.7.1';
 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.
@@ -297,9 +297,16 @@ async function wire() {
   const oldConfig = existsSync(configPath) ? readOr(configPath, '') : '';
   const remembered = oldConfig.match(/appPopup:\s*'([^']*)'/)?.[1] || null;
   const rememberedSidePanel = oldConfig.match(/appSidePanel:\s*'([^']*)'/)?.[1] || null;
+  // The extension's own code, read first: a popup it handles itself (setPopup, getPopup) decides which page stands in
+  // front, and whether it opens the paywall anywhere decides whether the lines for it are a step.
+  const code = project.manifestFile ? [...tree].filter(ownCode).slice(0, 400).map((path) => { let text = ''; try { if (statSync(join(dir, path)).size < 512_000) text = readOr(join(dir, path), ''); } catch { /* gone */ } return { path, text }; }) : [];
+  const popupSwap = popupSwapIn(code);
+  // Wired for the first time, an extension whose code handles its popup keeps it in front: the Wall's in front of it is
+  // skipped by setPopup(), and found by getPopup() where the code expects its own (Chrome's action sample threw so).
+  const keptForSwap = !oldConfig && !!popupSwap && typeof manifest?.action?.default_popup === 'string' && !flag('--own-popup');
   // An extension whose own pages draw the panel — what `create` makes, "your popup first", or asked with --own-popup —
   // keeps them in front.
-  const ownInFront = flag('--own-popup') || drawsItself(manifest, oldConfig);
+  const ownInFront = flag('--own-popup') || drawsItself(manifest, oldConfig) || keptForSwap;
   // The background the manifest names, read from inside the folder only: whether it starts the Wall, or is the Wall's.
   const namedWorker = workerIn(manifest) ?? '';
   const workerSource = namedWorker && has(namedWorker) && !inside(dir, namedWorker).why ? readOr(join(dir, namedWorker), '') : null;
@@ -344,9 +351,7 @@ async function wire() {
   } else if (project.createWorker) {
     write(project.createWorker.file, project.createWorker.content);
   }
-  // The extension's own code, read for a popup it swaps while it runs: the Wall's in front of it could be skipped then.
-  const code = appPopup ? [...tree].filter(ownCode).slice(0, 400).map((path) => { let text = ''; try { if (statSync(join(dir, path)).size < 512_000) text = readOr(join(dir, path), ''); } catch { /* gone */ } return { path, text }; }) : [];
-  const summary = wiringSummary({ project, wiring, appPopup, appSidePanel, workerStarts: !!project.worker && startsPlatform(join(dir, project.worker)), popupSwap: popupSwapIn(code) });
+  const summary = wiringSummary({ project, wiring, appPopup, appSidePanel, workerStarts: !!project.worker && startsPlatform(join(dir, project.worker)), popupSwap, keptForSwap, gates: project.manifestFile ? gatesIn(code) : null });
 
   // Wired again, a folder takes `upgrade` (wire, replacing the platform's files): the command, ready to paste.
   const into = opt('--into');

package/lib/summary.js

@@ -9,6 +9,8 @@ export function popupSwapIn(files) {
     }
     return null;
 }
+/** Whether the extension's own code opens the paywall anywhere: gate() or showPaywall(), outside its comments. */
+export const gatesIn = (files) => files.some((f) => /\btoolaby\s*\.\s*(gate|showPaywall)\s*\(/.test(withoutComments(f.text)));
 /** Whether a path is the extension's own code, for popupSwapIn: a script, not the Wall's, not a dependency's or a build's. */
 export const ownCode = (path) => /\.(m?js|jsx|ts|tsx)$/.test(path) && !/(^|\/)toolaby[^/]*$/.test(path) && !/(^|\/)(node_modules|dist|build|\.output|\.wxt|\.plasmo)\//.test(path);
 export function wiringSummary(o) {
@@ -21,6 +23,8 @@ export function wiringSummary(o) {
             ? { tone: 'warn', label: 'Popup', text: `Your code handles the popup itself (${o.popupSwap.call} in ${o.popupSwap.file}), so keep yours in front`, fix: 'own-popup' }
             : { tone: 'ok', label: 'Popup', text: `The Wall checks first, then opens ${o.appPopup}` });
     }
+    else if (ownPopup && o.keptForSwap && o.popupSwap)
+        rows.push({ tone: 'ok', label: 'Popup', text: `Yours stays in front, as your code handles it (${o.popupSwap.call} in ${o.popupSwap.file})` });
     else if (ownPopup)
         rows.push({ tone: 'ok', label: 'Popup', text: `Yours stays in front; toolaby.showPaywall() opens the Wall's` });
     else if (p.note)
@@ -55,6 +59,10 @@ export function wiringSummary(o) {
         rows.push({ tone: 'todo', label: 'Background', text: `Add these 2 lines to the top of ${p.worker}:`, code: p.workerLines.trim() });
     else if (p.worker)
         rows.push({ tone: 'ok', label: 'Background', text: `${p.worker} starts the Wall` });
+    // With no page of the Wall's in front, the paywall opens only where the code asks for it: when nothing does, the lines.
+    if (!o.appPopup && !o.appSidePanel && o.gates === false && p.kind === 'plain') {
+        rows.push({ tone: 'todo', label: 'Paywall', text: p.built ? 'Nothing opens it yet. Where your paid action starts, add (the import is the path to toolaby.js):' : 'Nothing opens it yet. Where your paid action starts, in a module script, add:', code: `import { toolaby } from '${p.built ? './toolaby.js' : '/toolaby.js'}';\n\nconst permit = await toolaby.gate();\nif (!permit.allowed) return toolaby.showPaywall(permit);` });
+    }
     // The manifest: what it gained, or, generated by a framework, what its config needs.
     if (w)
         rows.push({ tone: 'ok', label: 'Manifest', text: w.added.length ? w.added.join(' · ') : 'Has what the Wall needs' });

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "toolaby",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "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; check it, and give coding agents the Wall as an MCP server.",
   "type": "module",
   "bin": {
+    "toolaby-cli": "bin.mjs",
     "toolaby": "bin.mjs"
   },
   "files": [