@clanker-code/c2c 0.9.1 → 0.11.0

package/bin/c2c-deliver-inbox-js-wrapper.js

@@ -10,6 +10,25 @@ function executableForWrapper(argv1) {
   return basename.startsWith("c2c-deliver-inbox") ? "c2c-deliver-inbox" : "c2c";
 }
 
+function packageManagerForWrapper(selfPath, env = process.env) {
+  const userAgent = env.npm_config_user_agent || "";
+  if (userAgent.startsWith("pnpm/")) {
+    return "pnpm";
+  }
+  if (userAgent.startsWith("bun/")) {
+    return "bun";
+  }
+
+  const normalizedPath = selfPath.replace(/\\/g, "/").toLowerCase();
+  if (normalizedPath.includes("/.bun/install/global/")) {
+    return "bun";
+  }
+  if (normalizedPath.includes("/pnpm/global/")) {
+    return "pnpm";
+  }
+  return "npm";
+}
+
 function main() {
   const executable = executableForWrapper(process.argv[1]);
   let binary;
@@ -22,7 +41,14 @@ function main() {
 
   const result = childProcess.spawnSync(binary, process.argv.slice(2), {
     stdio: "inherit",
-    env: process.env,
+    // The native binary cannot otherwise tell that it was launched by this
+    // npm package wrapper.  Preserve the owning package manager so
+    // `c2c self-update` upgrades the package instead of replacing the bundled
+    // binary under node_modules.
+    env: {
+      ...process.env,
+      C2C_SELF_UPDATE_PACKAGE_MANAGER: packageManagerForWrapper(__filename),
+    },
   });
 
   if (result.error) {
@@ -38,4 +64,8 @@ function main() {
   process.exit(result.status === null ? 1 : result.status);
 }
 
-main();
+if (require.main === module) {
+  main();
+}
+
+module.exports = { executableForWrapper, packageManagerForWrapper, main };

package/bin/c2c-js-wrapper.js

@@ -10,6 +10,25 @@ function executableForWrapper(argv1) {
   return basename.startsWith("c2c-deliver-inbox") ? "c2c-deliver-inbox" : "c2c";
 }
 
+function packageManagerForWrapper(selfPath, env = process.env) {
+  const userAgent = env.npm_config_user_agent || "";
+  if (userAgent.startsWith("pnpm/")) {
+    return "pnpm";
+  }
+  if (userAgent.startsWith("bun/")) {
+    return "bun";
+  }
+
+  const normalizedPath = selfPath.replace(/\\/g, "/").toLowerCase();
+  if (normalizedPath.includes("/.bun/install/global/")) {
+    return "bun";
+  }
+  if (normalizedPath.includes("/pnpm/global/")) {
+    return "pnpm";
+  }
+  return "npm";
+}
+
 function main() {
   const executable = executableForWrapper(process.argv[1]);
   let binary;
@@ -22,7 +41,14 @@ function main() {
 
   const result = childProcess.spawnSync(binary, process.argv.slice(2), {
     stdio: "inherit",
-    env: process.env,
+    // The native binary cannot otherwise tell that it was launched by this
+    // npm package wrapper.  Preserve the owning package manager so
+    // `c2c self-update` upgrades the package instead of replacing the bundled
+    // binary under node_modules.
+    env: {
+      ...process.env,
+      C2C_SELF_UPDATE_PACKAGE_MANAGER: packageManagerForWrapper(__filename),
+    },
   });
 
   if (result.error) {
@@ -38,4 +64,8 @@ function main() {
   process.exit(result.status === null ? 1 : result.status);
 }
 
-main();
+if (require.main === module) {
+  main();
+}
+
+module.exports = { executableForWrapper, packageManagerForWrapper, main };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clanker-code/c2c",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "Resolver and CLI wrapper for the c2c agent messaging binary",
   "license": "MIT",
   "repository": {
@@ -17,9 +17,9 @@
     "index.js"
   ],
   "optionalDependencies": {
-    "@clanker-code/c2c-linux-x64": "0.9.1",
-    "@clanker-code/c2c-linux-arm64": "0.9.1",
-    "@clanker-code/c2c-darwin-x64": "0.9.1",
-    "@clanker-code/c2c-darwin-arm64": "0.9.1"
+    "@clanker-code/c2c-linux-x64": "0.11.0",
+    "@clanker-code/c2c-linux-arm64": "0.11.0",
+    "@clanker-code/c2c-darwin-x64": "0.11.0",
+    "@clanker-code/c2c-darwin-arm64": "0.11.0"
   }
 }