toolaby 1.0.3 → 1.1.0

package/bin.mjs

@@ -24,7 +24,7 @@ import { spawn } from 'node:child_process';
 import { wireManifest, WORKER_LINES } from './lib/manifest.js';
 import { detectProject, CODE_FILES, filesToWrite, BUILD_COPY_NOTE } from './lib/project.js';
 
-const VERSION = '1.0.3';
+const VERSION = '1.1.0';
 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.
@@ -155,10 +155,11 @@ const readJson = (path) => { try { return JSON.parse(readFileSync(path, 'utf8'))
 const isId = (s) => typeof s === 'string' && /^[a-z0-9][a-z0-9-]{1,118}$/.test(s);
 
 /** The tool's files from the Wall, as the signed-in developer: a tool of theirs, or a clear no. */
-async function filesFor(slug, scaffold) {
+async function filesFor(slug, scaffold, manifestKey = null) {
   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); }
+  const q = new URLSearchParams(); if (scaffold) q.set('scaffold', '1'); if (manifestKey) q.set('manifestKey', manifestKey);
+  const res = await api(`/api/cli/wiring/${slug}${q.size ? `?${q}` : ''}`, { token });
+  if (res.status === 401) { out('  The stored session is no longer valid; signing in again.'); await login(); return filesFor(slug, scaffold, manifestKey); }
   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);
@@ -178,17 +179,19 @@ async function wire() {
   const has = (p) => tree.has(p.replace(/\/$/, ''));
   const manifest = has('manifest.json') ? readJson(join(dir, 'manifest.json')) : null;
   if (has('manifest.json') && !manifest) fail('manifest.json could not be read as JSON.');
-  const plan = await filesFor(slug, false);
+  // A key the manifest already has is the identity the platform adopts; otherwise the platform's goes in.
+  const plan = await filesFor(slug, false, typeof manifest?.key === 'string' ? manifest.key : null);
   const site = plan.site;
+  const manifestKey = plan.identity?.manifestKey ?? null;
   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, tree });
+  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, manifestKey });
   // 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`);
   const remembered = existsSync(configPath) ? readFileSync(configPath, 'utf8').match(/appPopup:\s*'([^']*)'/)?.[1] || null : null;
-  const wiring = project.manifestFile && manifest ? wireManifest(manifest, { site, has, remembered }) : null;
+  const wiring = project.manifestFile && manifest ? wireManifest(manifest, { site, has, remembered, manifestKey }) : null;
   const appPopup = wiring ? wiring.appPopup : project.wrapper ? (project.appPopup ?? remembered) : null;
   const targets = filesToWrite(project, appPopup);
   const present = targets.filter((f) => existsSync(join(dir, f)));

package/lib/manifest.js

@@ -6,15 +6,25 @@
  * the storage permission; the platform's address as a host permission and
  * for externally_connectable (the site's sign-in and purchase handoffs); a
  * module service worker when the manifest names none, or names one that is
- * not there; and the Wall's popup in front of the extension's own, which
- * the configuration then remembers. Pure: given the manifest and what is
- * on disk, it says what to write.
+ * not there; the Wall's popup in front of the extension's own, which the
+ * configuration then remembers; and the extension's identity — the `key`
+ * that fixes its id, which the tool key is bound to (identity.ts) — unless
+ * the manifest has one of its own, which is then the identity the platform
+ * adopts. Pure: given the manifest and what is on disk, it says what to
+ * write.
  */
 export const WALL_POPUP = 'toolaby-popup.html';
 export const WORKER_LINES = "import { toolaby } from './toolaby.js';\n\ntoolaby.startBackground();\n";
 export function wireManifest(input, o) {
     const manifest = JSON.parse(JSON.stringify(input));
     const did = [];
+    // The identity: the manifest's own key stays (the platform adopts it); otherwise the platform's goes in, and the unpacked extension's id is known before it loads.
+    const own = typeof manifest.key === 'string' && manifest.key.trim() ? manifest.key.trim() : null;
+    if (!own && o.manifestKey) {
+        manifest.key = o.manifestKey;
+        did.push('a "key", so the extension keeps one id and the platform knows it');
+    }
+    const manifestKey = own ?? o.manifestKey ?? null;
     const add = (list, value) => { const arr = Array.isArray(list) ? [...list] : []; if (!arr.includes(value))
         arr.push(value); return arr; };
     if (!(Array.isArray(manifest.permissions) && manifest.permissions.includes('storage'))) {
@@ -48,5 +58,5 @@ export function wireManifest(input, o) {
     else {
         ownWorker = { file: named, classic: manifest.background?.type !== 'module' };
     }
-    return { manifest, did, writeWorker, ownWorker, appPopup };
+    return { manifest, did, writeWorker, ownWorker, appPopup, manifestKey };
 }

package/lib/project.js

@@ -21,6 +21,7 @@ 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 keyLine = o.manifestKey ? `key: '${o.manifestKey}',` : null;
     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']);
@@ -38,6 +39,7 @@ export function detectProject(o) {
             `// wxt.config.ts — what the Wall needs in the manifest${appPopup ? ', and its popup in front of yours' : ''}`,
             `export default defineConfig({`,
             `  manifest: {`,
+            ...(keyLine ? [`    ${keyLine} // the extension's id, known to the platform`] : []),
             `    permissions: ['storage'],`,
             `    host_permissions: ['${site}/*'],`,
             `    externally_connectable: { matches: ['${site}/*'] },`,
@@ -66,7 +68,7 @@ export function detectProject(o) {
         const worker = first(has, [`${src}background.ts`, `${src}background.js`, `${src}background/index.ts`, `${src}background/index.js`]);
         const workerFile = worker ?? `${src}background.ts`;
         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, '');
+        const code = JSON.stringify({ manifest: { ...(o.manifestKey ? { key: o.manifestKey } : {}), 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, built: false, foundManifest: null,
             createWorker: worker ? null : { file: workerFile, content: workerLines },
@@ -84,6 +86,7 @@ export function detectProject(o) {
         const workerLines = `import { toolaby } from '${importPath(workerFile)}';\n\ntoolaby.startBackground();\n`;
         const code = [
             `// ${configFile ?? 'manifest.config.ts'} — add inside defineManifest({ … })`,
+            ...(keyLine && !/\bkey:/.test(source) ? [`${keyLine} // the extension's id, known to the platform`] : []),
             `permissions: ['storage'],`,
             `host_permissions: ['${site}/*'],`,
             `externally_connectable: { matches: ['${site}/*'] },`,

package/package.json

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