insta 0.0.57 → 0.0.58

package/README.md

@@ -233,7 +233,7 @@ build never reaches a production installer.
 | `INSTA_PROJECT_ID` · `INSTA_ORG_ID` · `INSTA_BRANCH` | Target a project, org or branch without linking |
 | `INSTA_PASSWORD` | Password for non-interactive login |
 | `INSTA_NO_AUTOUPDATE` | Disable self-update |
-| `INSTA_NO_TELEMETRY` · `DO_NOT_TRACK` | Disable usage analytics. Each command sends one event (command, flags, outcome, version, OS) to the same PostHog project as the console. Only ids, enums and numbers among the arguments are kept — names, branches, keys, paths, secret values, free text and error messages never leave the machine; custom API hosts report nothing |
+| `INSTA_NO_TELEMETRY` · `DO_NOT_TRACK` | Disable usage analytics. Each command sends one event (command, flags, outcome, version, OS) to the same PostHog project as the console. Only ids, enums and numbers among the arguments are kept — names, branches, keys, paths, secret values, free text and error messages never leave the machine; custom API hosts report nothing. Before you sign in, events carry a random id stored in `~/.insta/telemetry.json`; the first command after you sign in sends one extra event merging that id into your account, and the first command after the session ends (logout, `env use`) retires it |
 
 ## Agent skills
 

package/dist/telemetry.js

@@ -18,6 +18,7 @@ const PROJECT_KEYS = {
 };
 // The send is awaited before the process exits, so it gets one bounded attempt and no retry.
 const SEND_TIMEOUT_MS = 1500;
+const ID_FILE = join(os.homedir(), '.insta', 'telemetry.json');
 const REDACTED = '[REDACTED]';
 const oneOf = (values) => (v) => values.includes(v);
 const ID = (v) => /^(?:[0-9a-f]{8}-[0-9a-f-]{27}|[a-z]+_[\w-]{1,64}|(?=.*\d)[\w-]{1,64})$/i.test(v);
@@ -144,6 +145,7 @@ export function buildCommandEvent(command, args, options, outcome, ctx) {
             auth_kind: token ? (token.startsWith('insta_') ? 'api_key' : 'session') : null,
             project_id: ctx.project?.projectId ?? null,
             org_id: ctx.project?.orgId ?? null,
+            ...(ctx.project ? { $groups: { project: ctx.project.projectId, ...(ID(ctx.project.orgId) ? { org: ctx.project.orgId } : {}) } } : {}),
             tty: ctx.tty,
             ci: !!ctx.env.CI,
             agent: detectAgent(ctx.env),
@@ -154,20 +156,22 @@ export function buildCommandEvent(command, args, options, outcome, ctx) {
         },
     };
 }
-export async function anonymousId(file = join(os.homedir(), '.insta', 'telemetry.json')) {
+export async function readState(file = ID_FILE) {
     try {
         const parsed = JSON.parse(await readFile(file, 'utf8'));
         if (typeof parsed.anonymousId === 'string' && parsed.anonymousId)
-            return parsed.anonymousId;
+            return parsed;
     }
     catch { }
-    const id = randomUUID();
+    return writeState({ anonymousId: randomUUID() }, file);
+}
+async function writeState(state, file = ID_FILE) {
     try {
         await mkdir(dirname(file), { recursive: true });
-        await writeFile(file, JSON.stringify({ anonymousId: id }, null, 2));
+        await writeFile(file, JSON.stringify(state, null, 2));
     }
     catch { }
-    return id;
+    return state;
 }
 export async function sendBatch(key, batch, fetchImpl = fetch) {
     try {
@@ -201,16 +205,27 @@ export async function trackCommand(cmd, args, outcome, cliVersion, deps = {}) {
         if (!key)
             return;
         const project = await (deps.loadProject ?? readProject)();
+        const userId = config.user?.id;
+        let state = await readState(deps.idFile);
+        // Session gone or switched: the id belongs to the account that left, so later commands get a fresh one.
+        if (state.identifiedAs && state.identifiedAs !== userId)
+            state = await writeState({ anonymousId: randomUUID() }, deps.idFile);
         const event = buildCommandEvent(command, args.flat(), cmd.opts(), outcome, {
             cliVersion,
             channel: deps.channel ?? detectChannel(),
             config,
             project,
-            anonymousId: await anonymousId(deps.idFile),
+            anonymousId: state.anonymousId,
             env,
             tty: deps.tty ?? !!process.stdout.isTTY,
         });
-        await sendBatch(key, [event], deps.fetchImpl);
+        const batch = [event];
+        const merge = userId !== undefined && state.identifiedAs !== userId;
+        if (merge)
+            batch.push({ event: '$identify', distinct_id: userId, timestamp: event.timestamp, properties: { $anon_distinct_id: state.anonymousId } });
+        const sent = await sendBatch(key, batch, deps.fetchImpl);
+        if (merge && sent)
+            await writeState({ ...state, identifiedAs: userId }, deps.idFile);
     }
     catch { }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "insta",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "type": "module",
   "description": "InstaCloud CLI — a thin client of the platform control-plane API.",
   "keywords": [