Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

fix(cli): keep analytics identity in sync with auth

Kshitij Jhunjhunwalad00a3b5576ef
diff --git a/ts/packages/cli/src/analytics/dispatch.ts b/ts/packages/cli/src/analytics/dispatch.ts
index 93d818ba0..8a92c066d 100644
--- a/ts/packages/cli/src/analytics/dispatch.ts
+++ b/ts/packages/cli/src/analytics/dispatch.ts
@@ -129,6 +129,8 @@ const postHogEnabled = Effect.gen(function* () {
return projectKey.length > 0;
});
+export const analyticsIdentityLinkingEnabled = postHogEnabled;
+
const jsonFromString = Schema.parseJson();
const prettyJsonFromString = Schema.parseJson({ space: 2 });
const decodeJson = Schema.decodeUnknown(jsonFromString);
@@ -376,15 +378,17 @@ const getApiKeyFingerprint = Effect.flatMap(getUserApiKey, apiKey =>
);
// The keychain* security modes strip the api key from user_data.json, so no
-// fingerprint is computable here; a parseable user config in one of those
-// modes is the signal that the persisted identity still belongs to a login.
+// fingerprint is computable here. A persisted org is the durable login signal:
+// logout keeps the file but clears org_id, so a stale analytics identity can
+// never survive a failed best-effort state cleanup.
const keyringBackedLoginPresent = Effect.gen(function* () {
const paths = yield* getAnalyticsPaths;
const cliConfig = yield* readOptionalJson<{ security?: unknown }>(paths.cliConfigPath);
if (cliConfig?.security !== 'keychain' && cliConfig?.security !== 'keychain-subprocess') {
return false;
}
- return (yield* readUserConfig) !== undefined;
+ const userConfig = yield* readUserConfig;
+ return typeof userConfig?.org_id === 'string' && userConfig.org_id.trim().length > 0;
});
const getDistinctId = (installId: string) =>
diff --git a/ts/packages/cli/src/commands/login.cmd.ts b/ts/packages/cli/src/commands/login.cmd.ts
index 21ecef1db..a3206c21d 100644
--- a/ts/packages/cli/src/commands/login.cmd.ts
+++ b/ts/packages/cli/src/commands/login.cmd.ts
@@ -14,11 +14,11 @@ import { ComposioUserContext } from 'src/services/user-context';
import { TerminalUI } from 'src/services/terminal-ui';
import { commandHintStep } from 'src/services/command-hints';
import { runOrgSelection } from 'src/effects/select-org-project';
+import { linkAnalyticsIdentityForOrg } from 'src/effects/link-analytics-identity';
import { setupCacheDir } from 'src/effects/setup-cache-dir';
import { primeConsumerConnectedToolkitsCacheInBackground } from 'src/services/consumer-short-term-cache';
import { inferSkillReleaseChannel, installSkillSafe } from 'src/effects/install-skill';
import { handleAgentAuthError } from 'src/effects/handle-agent-auth-error';
-import { linkApolloIdentityForAnalytics } from 'src/analytics/dispatch';
import { APP_VERSION } from 'src/constants';
import {
ensureAgentSignupAllowed,
@@ -352,7 +352,15 @@ const directLogin = (params: { userApiKey: string; org?: string }) =>
: Option.getOrUndefined(ctx.data.testUserId);
yield* ctx.login(params.userApiKey, selectedOrg.id, testUserId);
- yield* linkApolloIdentityForAnalytics(sessionInfo.org_member.id, params.userApiKey);
+ yield* linkAnalyticsIdentityForOrg({
+ apiKey: params.userApiKey,
+ baseURL: ctx.data.baseURL,
+ orgId: selectedOrg.id,
+ knownIdentity: {
+ orgId: sessionInfo.project.org.id,
+ orgMemberId: sessionInfo.org_member.id,
+ },
+ });
yield* primeConsumerConnectedToolkitsCacheInBackground({
orgId: selectedOrg.id,
});
@@ -382,6 +390,8 @@ const storeCredentials = (params: {
skipHints?: boolean;
/** When true, skip JSON output (emitted later after org picker with final selection). */
skipOutput?: boolean;
+ /** When true, wait to link analytics until the org picker has made its final selection. */
+ deferAnalyticsIdentity?: boolean;
}) =>
Effect.gen(function* () {
const ctx = yield* ComposioUserContext;
@@ -395,6 +405,7 @@ const storeCredentials = (params: {
orgMemberId,
skipHints = false,
skipOutput = false,
+ deferAnalyticsIdentity = false,
} = params;
// Call session/info to enrich the login with org/project metadata.
@@ -437,8 +448,13 @@ const storeCredentials = (params: {
yield* ctx.login(uakApiKey, orgId, testUserId);
// Linked only after the credential persists, so stitching cannot outlive a failed login.
const linkedOrgMemberId = sessionInfo?.org_member.id ?? orgMemberId;
- if (linkedOrgMemberId) {
- yield* linkApolloIdentityForAnalytics(linkedOrgMemberId, uakApiKey);
+ if (linkedOrgMemberId && !deferAnalyticsIdentity) {
+ yield* linkAnalyticsIdentityForOrg({
+ apiKey: uakApiKey,
+ baseURL,
+ orgId,
+ knownIdentity: { orgId, orgMemberId: linkedOrgMemberId },
+ });
}
yield* primeConsumerConnectedToolkitsCacheInBackground({
orgId,
@@ -559,6 +575,7 @@ const loginWithKey = (params: {
orgMemberId: uakSessionInfo.org_member.id,
skipHints: willRunPicker,
skipOutput: true,
+ deferAnalyticsIdentity: willRunPicker,
});
if (willRunPicker) {
@@ -588,6 +605,15 @@ const loginWithKey = (params: {
}
const finalOrgId = result?.id ?? xOrgId;
const finalOrgName = result?.name ?? uakSessionInfo.project.org.name ?? '';
+ yield* linkAnalyticsIdentityForOrg({
+ apiKey: uakApiKey,
+ baseURL: ctx.data.baseURL,
+ orgId: finalOrgId,
+ knownIdentity: {
+ orgId: uakSessionInfo.project.org.id,
+ orgMemberId: uakSessionInfo.org_member.id,
+ },
+ });
yield* emitLoginComplete({
email: linkedSession.account.email ?? undefined,
orgId: finalOrgId,
@@ -754,6 +780,7 @@ export const browserLogin = (params: {
orgMemberId: uakSessionInfo.org_member.id,
skipHints: willRunPicker,
skipOutput: willRunPicker,
+ deferAnalyticsIdentity: willRunPicker,
});
if (willRunPicker) {
@@ -783,6 +810,15 @@ export const browserLogin = (params: {
}
const finalOrgId = result?.id ?? xOrgId;
const finalOrgName = result?.name ?? uakSessionInfo.project.org.name ?? '';
+ yield* linkAnalyticsIdentityForOrg({
+ apiKey: uakApiKey,
+ baseURL: ctx.data.baseURL,
+ orgId: finalOrgId,
+ knownIdentity: {
+ orgId: uakSessionInfo.project.org.id,
+ orgMemberId: uakSessionInfo.org_member.id,
+ },
+ });
yield* emitLoginComplete({
email: linkedSession.account.email ?? undefined,
orgId: finalOrgId,
diff --git a/ts/packages/cli/src/commands/orgs/commands/orgs.switch.cmd.ts b/ts/packages/cli/src/commands/orgs/commands/orgs.switch.cmd.ts
index 042f50d12..89317912c 100644
--- a/ts/packages/cli/src/commands/orgs/commands/orgs.switch.cmd.ts
+++ b/ts/packages/cli/src/commands/orgs/commands/orgs.switch.cmd.ts
@@ -2,6 +2,7 @@ import { Command, Options } from '@effect/cli';
import { Effect, Option } from 'effect';
import { requireAuth } from 'src/effects/require-auth';
import { runOrgSelection } from 'src/effects/select-org-project';
+import { linkAnalyticsIdentityForOrg } from 'src/effects/link-analytics-identity';
import { TerminalUI } from 'src/services/terminal-ui';
import { ComposioUserContext } from 'src/services/user-context';
@@ -49,6 +50,11 @@ export const orgsCmd$Switch = Command.make('switch', { orgId, limit }, ({ orgId,
}
yield* ctx.login(apiKey, result.id, Option.getOrUndefined(ctx.data.testUserId));
+ yield* linkAnalyticsIdentityForOrg({
+ apiKey,
+ baseURL: ctx.data.baseURL,
+ orgId: result.id,
+ });
yield* ui.log.success(`Updated current org to "${result.name}".`);
yield* ui.output(
diff --git a/ts/packages/cli/src/effects/link-analytics-identity.ts b/ts/packages/cli/src/effects/link-analytics-identity.ts
new file mode 100644
index 000000000..6b013dff7
--- /dev/null
+++ b/ts/packages/cli/src/effects/link-analytics-identity.ts
@@ -0,0 +1,43 @@
+import { Effect } from 'effect';
+import {
+ analyticsIdentityLinkingEnabled,
+ linkApolloIdentityForAnalytics,
+} from 'src/analytics/dispatch';
+import { getSessionInfoByUserApiKey } from 'src/services/composio-clients';
+
+type KnownOrgIdentity = {
+ readonly orgId: string;
+ readonly orgMemberId: string;
+};
+
+export const linkAnalyticsIdentityForOrg = (params: {
+ readonly apiKey: string;
+ readonly baseURL: string;
+ readonly orgId: string;
+ readonly knownIdentity?: KnownOrgIdentity;
+}) =>
+ Effect.gen(function* () {
+ const knownIdentity =
+ params.knownIdentity?.orgId === params.orgId ? params.knownIdentity : undefined;
+ if (!knownIdentity && !(yield* analyticsIdentityLinkingEnabled)) {
+ return;
+ }
+ const orgMemberId = knownIdentity
+ ? knownIdentity.orgMemberId
+ : yield* getSessionInfoByUserApiKey({
+ baseURL: params.baseURL,
+ userApiKey: params.apiKey,
+ orgId: params.orgId,
+ }).pipe(
+ Effect.map(sessionInfo => sessionInfo.org_member.id),
+ Effect.catchAll(error =>
+ Effect.logDebug('Failed to resolve analytics identity for selected org:', error).pipe(
+ Effect.as(undefined)
+ )
+ )
+ );
+
+ if (orgMemberId) {
+ yield* linkApolloIdentityForAnalytics(orgMemberId, params.apiKey);
+ }
+ });
diff --git a/ts/packages/cli/test/src/analytics.dispatch.test.ts b/ts/packages/cli/test/src/analytics.dispatch.test.ts
index 1d51661a7..649ce330c 100644
--- a/ts/packages/cli/test/src/analytics.dispatch.test.ts
+++ b/ts/packages/cli/test/src/analytics.dispatch.test.ts
@@ -1068,6 +1068,55 @@ describe('CLI analytics dispatch', () => {
}).pipe(Effect.provide(makePlatformLayer(home)));
});
+ it.effect('does not reuse a stale keychain identity when logout loses the state lock', () => {
+ const home = tempy.temporaryDirectory();
+ const scriptPath = `${home}/composio.ts`;
+ enableTelemetry('');
+ vi.stubEnv('COMPOSIO_CACHE_DIR', `${home}/.composio`);
+ process.argv[1] = scriptPath;
+
+ return Effect.gen(function* () {
+ const fs = yield* FileSystem.FileSystem;
+ const path = yield* Path.Path;
+ yield* fs.writeFileString(scriptPath, '');
+ const composioDir = path.join(home, '.composio');
+ yield* fs.makeDirectory(composioDir, { recursive: true });
+ yield* fs.writeFileString(
+ path.join(composioDir, 'config.json'),
+ JSON.stringify({ security: 'keychain-subprocess' })
+ );
+ // Logout persists an empty credential record but intentionally keeps
+ // user_data.json in place.
+ yield* fs.writeFileString(
+ path.join(composioDir, USER_CONFIG_FILE_NAME),
+ JSON.stringify({ base_url: 'https://backend.example.test' })
+ );
+ yield* fs.writeFileString(
+ path.join(composioDir, 'analytics.json'),
+ JSON.stringify({
+ install_id: 'install_keychain_logout',
+ apollo_user_id: 'om_logged_out_keychain_user',
+ aliased_apollo_user_id: 'om_logged_out_keychain_user',
+ })
+ );
+ const lockPath = path.join(composioDir, 'analytics.json.lock');
+ yield* fs.writeFileString(lockPath, 'other-process');
+
+ // The clear is best-effort and times out while another process owns
+ // the lock, leaving the old identity on disk.
+ yield* clearApolloIdentityForAnalytics;
+ yield* fs.remove(lockPath);
+ childProcessMocks.spawn.mockClear();
+
+ yield* trackCliEventEffect({ name: 'producer_event' });
+
+ const args = childProcessMocks.spawn.mock.calls[0]![1] as string[];
+ const payload = decodeWorkerPayload<{ distinctId: string; installId: string }>(args[2]!);
+ expect(payload.distinctId).not.toBe('om_logged_out_keychain_user');
+ expect(payload.distinctId).toBe(`anon_${payload.installId}`);
+ }).pipe(Effect.provide(makePlatformLayer(home)));
+ });
+
it.effect('does not trust a fingerprint-less identity outside keychain modes', () => {
const home = tempy.temporaryDirectory();
const scriptPath = `${home}/composio.ts`;
diff --git a/ts/packages/cli/test/src/commands/login.cmd.test.ts b/ts/packages/cli/test/src/commands/login.cmd.test.ts
index 310195f0d..99b965d39 100644
--- a/ts/packages/cli/test/src/commands/login.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/login.cmd.test.ts
@@ -28,6 +28,7 @@ vi.mock('src/analytics/dispatch', async importOriginal => {
const { ComposioUserContext } = await import('src/services/user-context');
return {
...actual,
+ analyticsIdentityLinkingEnabled: Effect.succeed(true),
linkApolloIdentityForAnalytics: ((apolloUserId: string) =>
Effect.map(ComposioUserContext, ctx => {
analyticsMocks.linkCalls.push({ apolloUserId, loggedInAtLinkTime: ctx.isLoggedIn() });
@@ -340,19 +341,24 @@ describe('CLI: composio login', () => {
const url = requestUrl(requestInput);
if (url.includes('/api/v3/auth/session/info')) {
+ const selectedOrgId = new Headers(init?.headers).get('x-org-id');
return mockFetchResponse({
project: {
name: 'Default Project',
id: 'project_id_default',
- org_id: 'org_default',
+ org_id: selectedOrgId ?? 'org_default',
nano_id: 'project_default',
created_at: '2026-01-01T00:00:00.000Z',
updated_at: '2026-01-01T00:00:00.000Z',
- org: { id: 'org_default', name: 'Example Org', plan: 'enterprise' },
+ org: {
+ id: selectedOrgId ?? 'org_default',
+ name: selectedOrgId ? 'Selected Org' : 'Example Org',
+ plan: 'enterprise',
+ },
},
org_member: {
- id: 'member_123',
+ id: selectedOrgId ? 'member_selected' : 'member_default',
user_id: 'user_123',
name: 'CLI User',
@@ -408,9 +414,10 @@ describe('CLI: composio login', () => {
expect(output).toContain('Logged in as [email protected] in "Selected Org"');
// The analytics identity is linked exactly once, and only after the
- // credential was stored via ctx.login.
+ // credential was stored via ctx.login, using the selected org's
+ // membership rather than the API key's home-org membership.
expect(analyticsMocks.linkCalls).toEqual([
- { apolloUserId: 'member_123', loggedInAtLinkTime: true },
+ { apolloUserId: 'member_selected', loggedInAtLinkTime: true },
]);
})
);
diff --git a/ts/packages/cli/test/src/commands/orgs.switch.cmd.test.ts b/ts/packages/cli/test/src/commands/orgs.switch.cmd.test.ts
new file mode 100644
index 000000000..39a1624b2
--- /dev/null
+++ b/ts/packages/cli/test/src/commands/orgs.switch.cmd.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, layer } from '@effect/vitest';
+import { ConfigProvider, Effect } from 'effect';
+import { afterEach, vi } from 'vitest';
+import { extendConfigProvider } from 'src/services/config';
+import { cli, TestLive } from 'test/__utils__';
+
+const analyticsMocks = vi.hoisted(() => ({
+ linkCalls: [] as string[],
+}));
+
+vi.mock('src/analytics/dispatch', async importOriginal => {
+ const actual = await importOriginal<typeof import('src/analytics/dispatch')>();
+ const { Effect } = await import('effect');
+ return {
+ ...actual,
+ analyticsIdentityLinkingEnabled: Effect.succeed(true),
+ linkApolloIdentityForAnalytics: ((apolloUserId: string) =>
+ Effect.sync(() => {
+ analyticsMocks.linkCalls.push(apolloUserId);
+ })) as unknown as typeof actual.linkApolloIdentityForAnalytics,
+ };
+});
+
+describe('CLI: composio orgs switch', () => {
+ afterEach(() => {
+ vi.restoreAllMocks();
+ analyticsMocks.linkCalls.length = 0;
+ });
+
+ const testConfigProvider = ConfigProvider.fromMap(
+ new Map([['COMPOSIO_USER_API_KEY', 'uak_switch_test']])
+ ).pipe(extendConfigProvider);
+
+ layer(TestLive({ baseConfigProvider: testConfigProvider }))(it => {
+ it.scoped('[Then] links analytics to the selected org membership', () =>
+ Effect.gen(function* () {
+ vi.spyOn(globalThis, 'fetch').mockImplementation(
+ async (_requestInput: RequestInfo | URL, init?: RequestInit) => {
+ expect(new Headers(init?.headers).get('x-org-id')).toBe('org_selected');
+ return new Response(
+ JSON.stringify({
+ project: {
+ name: 'Selected Project',
+ id: 'project_selected',
+ org_id: 'org_selected',
+ nano_id: 'project_selected',
+ email: '[email protected]',
+ created_at: '2026-01-01T00:00:00.000Z',
+ updated_at: '2026-01-01T00:00:00.000Z',
+ org: { id: 'org_selected', name: 'Selected Org', plan: 'enterprise' },
+ },
+ org_member: {
+ id: 'member_selected',
+ user_id: 'user_123',
+ email: '[email protected]',
+ name: 'CLI User',
+ role: 'admin',
+ },
+ api_key: null,
+ }),
+ { status: 200, headers: { 'Content-Type': 'application/json' } }
+ );
+ }
+ );
+
+ yield* cli(['orgs', 'switch', '--org-id', 'org_selected']);
+
+ expect(analyticsMocks.linkCalls).toEqual(['member_selected']);
+ })
+ );
+ });
+});