@ascenda-one/github-collector 0.1.19 → 0.1.21

package/dist/cli.js

@@ -1113,8 +1113,8 @@ var require_tokenStore = __commonJS({
     var fs = __importStar(__require("fs"));
     var os = __importStar(__require("os"));
     var path = __importStar(__require("path"));
-    function ascendaHome() {
-      return process.env.ASCENDA_HOME ?? path.join(os.homedir(), ".ascenda");
+    function ascendaHome(home = os.homedir()) {
+      return process.env.ASCENDA_HOME ?? path.join(home, ".ascenda");
     }
     function defaultTokenFilePath2(toolInstallationId) {
       return path.join(ascendaHome(), "tokens", sanitizeFilePart(toolInstallationId));
@@ -2397,10 +2397,10 @@ var require_salt = __commonJS({
     exports.hashWithMachineSalt = hashWithMachineSalt;
     var crypto = __importStar(__require("crypto"));
     var fs = __importStar(__require("fs"));
-    var os = __importStar(__require("os"));
     var path = __importStar(__require("path"));
+    var tokenStore_1 = require_tokenStore();
     function machineSaltFilePath() {
-      return path.join(os.homedir(), ".ascenda", "salt");
+      return path.join((0, tokenStore_1.ascendaHome)(), "salt");
     }
     var cache = /* @__PURE__ */ new Map();
     function readOrCreateMachineSalt(saltFilePath = machineSaltFilePath()) {
@@ -2672,10 +2672,10 @@ var require_hookAdapter = __commonJS({
     exports.MissingInstallationIdError = MissingInstallationIdError;
     function resolveCliAgentInstallationId(toolType, identity = {}) {
       const fromEnv = process.env.ASCENDA_TOOL_INSTALLATION_ID?.trim();
-      if (fromEnv)
+      if (fromEnv && belongsToToolType(toolType, fromEnv))
         return { toolInstallationId: qualify(toolType, fromEnv), source: "env" };
       const fromCredentials = identity.host ? (0, credentials_1.readHostCredentials)(identity.host)?.toolInstallationId?.trim() : void 0;
-      if (fromCredentials)
+      if (fromCredentials && belongsToToolType(toolType, fromCredentials))
         return { toolInstallationId: qualify(toolType, fromCredentials), source: "credentials" };
       const candidates = (0, tokenStore_1.listPersistedToolInstallationIds)(toolType);
       if (candidates.length === 1)
@@ -2685,6 +2685,9 @@ var require_hookAdapter = __commonJS({
     function defaultSetupCommand(host) {
       return host ? `npx @ascenda-one/${host.replace(/_cli$/, "")}-hooks setup` : "the agent's setup command";
     }
+    function belongsToToolType(toolType, value) {
+      return !value.includes(":") || value.startsWith(`${toolType}:`);
+    }
     function qualify(toolType, value) {
       return value.includes(":") ? value : `${toolType}:${value}`;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "publishConfig": { "access": "public" },
   "name": "@ascenda-one/github-collector",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Code-forge collaboration collector for Ascenda work telemetry — first-person review and pull-request signals.",
   "repository": {
     "type": "git",