@rcs-campaigns/agent-toolkit 0.1.6 → 0.1.8

package/dist/client.d.ts

@@ -42,12 +42,25 @@ export interface GatewayConfig {
  */
 export declare function detectSkin(argv?: readonly string[]): 'wa' | 'rcs';
 /**
- * The package's own version, read at runtime rather than restated in a
- * constant. A hardcoded copy silently goes stale the first time anyone bumps
- * for a release, and both skins show this string to a user. From dist/ and from
- * src/ alike the package root is one level up.
+ * The version of the package the user actually installed, read at runtime rather
+ * than restated in a constant. A hardcoded copy silently goes stale the first
+ * time anyone bumps for a release, and both skins show this string to a user —
+ * as `serverInfo.version` over MCP and in the CLI's usage banner.
+ *
+ * It resolves from the INVOKED BIN, not from `__dirname`, because the two skins
+ * are two npm packages: `wa-mcp` lives in @wa-campaigns/agent-toolkit, which
+ * delegates to this file inside @rcs-campaigns/agent-toolkit. `__dirname` alone
+ * therefore always reports the CORE's number, so a user who installed
+ * @wa-campaigns/agent-toolkit\@0.1.7 was told 0.1.6 — true of the code, but not
+ * of the thing they installed, and not a version they could go and fetch.
+ *
+ * Only the bin names we ship are trusted to locate a package (a test runner or a
+ * bundler entry would otherwise point at ITS package.json); everything else, and
+ * every library import, falls back to this package — the previous behaviour. For
+ * both layouts the package root is one level up from the bin: `bin/wa-mcp.js`
+ * and `dist/mcp.js` alike.
  */
-export declare function readVersion(): string;
+export declare function readVersion(argv?: readonly string[]): string;
 /** Human-readable product + channel names for the running skin. */
 export declare function skinLabels(skin?: 'wa' | 'rcs'): {
     product: string;

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,4EAA4E;AAC5E,MAAM,MAAM,OAAO,GAAG,KAAK,GAAG,UAAU,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,IAAI,GAAG,KAAK,CAO/E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,MAAM,CASpC;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,IAAI,GAAE,IAAI,GAAG,KAAoB;;;;EAI3D;AA6BD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAMpE;AAOD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpD,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,8EAA8E;AAC9E,qBAAa,YAAa,SAAQ,KAAK;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;gBACN,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;CAM/D;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CA4B7E;AAED,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAElD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa;IAI/D,+EAA+E;IACzE,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;CAmCvD"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,4EAA4E;AAC5E,MAAM,MAAM,OAAO,GAAG,KAAK,GAAG,UAAU,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,IAAI,GAAG,KAAK,CAG/E;AAmCD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,WAAW,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,MAAM,CAO1E;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,IAAI,GAAE,IAAI,GAAG,KAAoB;;;;EAI3D;AA6BD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAMpE;AAOD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpD,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,8EAA8E;AAC9E,qBAAa,YAAa,SAAQ,KAAK;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;gBACN,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;CAM/D;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CA4B7E;AAED,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAElD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa;IAI/D,+EAA+E;IACzE,IAAI,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;CAmCvD"}

package/dist/client.js

@@ -18,28 +18,68 @@ const node_path_1 = require("node:path");
  * argv, a bundler-rewritten path, or a direct import all fall through to 'rcs'.
  */
 function detectSkin(argv = process.argv) {
+    const name = invokedBinName(argv);
+    return name === 'wa' || name === 'wa-mcp' ? 'wa' : 'rcs';
+}
+/**
+ * The bin basename this process was launched as — "wa-mcp", "mcp", "cli" — or
+ * '' when argv carries no usable path (a library import, a bundler-rewritten
+ * entry, a test runner). Shared by {@link detectSkin} and {@link readVersion} so
+ * the two can never disagree about which skin is running.
+ */
+function invokedBinName(argv) {
     const invoked = argv[1];
     if (typeof invoked !== 'string')
-        return 'rcs';
+        return '';
     // basename without extension, so ".../bin/wa-mcp.js" → "wa-mcp".
     const base = invoked.split(/[\\/]/).pop() ?? '';
-    const name = base.replace(/\.(js|cjs|mjs|ts)$/, '');
-    return name === 'wa' || name === 'wa-mcp' ? 'wa' : 'rcs';
+    return base.replace(/\.(js|cjs|mjs|ts)$/, '');
 }
 /**
- * The package's own version, read at runtime rather than restated in a
- * constant. A hardcoded copy silently goes stale the first time anyone bumps
- * for a release, and both skins show this string to a user. From dist/ and from
- * src/ alike the package root is one level up.
+ * Every bin basename the two skins ship, as it appears in argv[1]. The WhatsApp
+ * skin's bins are named files (`bin/wa-mcp.js`); the RCS skin's are this
+ * package's own build outputs, which npm resolves to `dist/mcp.js` / `dist/cli.js`
+ * — hence "mcp" and "cli" rather than "rcs-mcp" and "rcs". Anything not in this
+ * set is not one of ours, and is never trusted to locate a package.
  */
-function readVersion() {
+const OWN_BINS = new Set(['wa', 'wa-mcp', 'rcs', 'rcs-mcp', 'mcp', 'cli']);
+/** The `version` of the package.json in `dir`, or undefined if unreadable. */
+function packageVersionAt(dir) {
     try {
-        const pkg = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '..', 'package.json'), 'utf8'));
-        return typeof pkg.version === 'string' ? pkg.version : '0.0.0';
+        const pkg = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(dir, 'package.json'), 'utf8'));
+        return typeof pkg.version === 'string' ? pkg.version : undefined;
     }
     catch {
-        return '0.0.0';
+        return undefined;
+    }
+}
+/**
+ * The version of the package the user actually installed, read at runtime rather
+ * than restated in a constant. A hardcoded copy silently goes stale the first
+ * time anyone bumps for a release, and both skins show this string to a user —
+ * as `serverInfo.version` over MCP and in the CLI's usage banner.
+ *
+ * It resolves from the INVOKED BIN, not from `__dirname`, because the two skins
+ * are two npm packages: `wa-mcp` lives in @wa-campaigns/agent-toolkit, which
+ * delegates to this file inside @rcs-campaigns/agent-toolkit. `__dirname` alone
+ * therefore always reports the CORE's number, so a user who installed
+ * @wa-campaigns/agent-toolkit\@0.1.7 was told 0.1.6 — true of the code, but not
+ * of the thing they installed, and not a version they could go and fetch.
+ *
+ * Only the bin names we ship are trusted to locate a package (a test runner or a
+ * bundler entry would otherwise point at ITS package.json); everything else, and
+ * every library import, falls back to this package — the previous behaviour. For
+ * both layouts the package root is one level up from the bin: `bin/wa-mcp.js`
+ * and `dist/mcp.js` alike.
+ */
+function readVersion(argv = process.argv) {
+    const invoked = argv[1];
+    if (typeof invoked === 'string' && OWN_BINS.has(invokedBinName(argv))) {
+        const own = packageVersionAt((0, node_path_1.join)((0, node_path_1.dirname)(invoked), '..'));
+        if (own)
+            return own;
     }
+    return packageVersionAt((0, node_path_1.join)(__dirname, '..')) ?? '0.0.0';
 }
 /** Human-readable product + channel names for the running skin. */
 function skinLabels(skin = detectSkin()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcs-campaigns/agent-toolkit",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "mcpName": "com.rcs-campaigns/campaigns",
   "description": "Agent skins for the RCS Campaigns gateway: an MCP server (rcs-mcp / wa-mcp) and a CLI (rcs / wa) over one shared client.",
   "license": "UNLICENSED",