fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ord669 merged 5 commits into from
Jul 27, 2026
Merged

fix: attach email to Sentry user so operator alerts name the human (AIT-278) #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51d440a
fix: attach email to Sentry user so operator alerts name the human (A…
ord669 Jul 27, 2026
c7a8bc1
docs: disclose email in telemetry section (AIT-278)
ord669 Jul 27, 2026
9170059
fix: clear stale Sentry identity when credentials change or lack clai…
ord669 Jul 27, 2026
c9dbbe4
fix: attribute pre-API errors and agent-credential logins in crash re…
ord669 Jul 27, 2026
3988f23
fix: re-show telemetry disclosure to upgraders before email collectio…
ord669 Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down
1 change: 1 addition & 0 deletions src/auth/login.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
kind: 'agent',
credentialPublicId: cred.credentialPublicId,
scopes: cred.scopes,
email,
});
await revalidateActiveWorkspace(json);
maybeInstallClaudeMcp();
Expand Down
15 changes: 12 additions & 3 deletions src/observability/jwt-light.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
try {
const parts = token.split('.');
if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
const payload = JSON.parse(
Buffer.from(payloadB64, 'base64url').toString('utf8'),
) as Record<string, unknown>;
const sub = payload.sub;
return typeof sub === 'string' ? sub : '';
const value = payload[claim];
return typeof value === 'string' ? value : '';
} catch {
return '';
}
}

export function decodeJwtSub(token: string): string {
return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
return decodeJwtClaim(token, 'email');
}
25 changes: 19 additions & 6 deletions src/observability/sentry.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
// touch credentials (--help, --version).
const { readCredentials } = await import('../auth/store.js');
const creds = await readCredentials();
if (!creds?.accessToken) return;

const sub = decodeJwtSub(creds.accessToken);
if (!sub) return;
sentryModule.setUser({ id: sub });
const token = creds?.accessToken ?? '';
const sub = token ? decodeJwtSub(token) : '';
// Agent (hmok_) tokens are opaque — the login email is persisted alongside.
const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
// Always apply (or clear) — an early return here would leave a previous
// login's identity attached after a credential change mid-process.
sentryModule.setUser(sub || email ? {
...(sub ? { id: sub } : {}),
...(email ? { email } : {}),
} : null);
// Tags too: Slack alert rules render user.email/user.id tags, not the
// user context (AIT-278). `undefined` removes the tag.
sentryModule.setTag('user.id', sub || undefined);
sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
if (!initialized || !sentryModule) return;
if (!shouldCaptureToSentry(err)) return;
// Attach identity here too, not only in apiClient — errors thrown before
// the first API call (local validation, arg handling) must still name the
// logged-in user in operator alerts (AIT-278). Best-effort.
try { await setCliUserFromCreds(); } catch { /* never block capture */ }
try {
// Tag with severity + code when available (AppError subclasses).
if (err && typeof err === 'object') {
Expand Down
11 changes: 10 additions & 1 deletion src/observability/telemetry.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
telemetry?: TelemetryFlag;
telemetryDisclosureShown?: boolean;
telemetryDisclosureVersion?: number;
// Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
// are preserved by the read+merge+write pattern below.
[key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
*/
export function maybePrintFirstRunDisclosure(): void {
const cfg = readConfig();
if (cfg.telemetryDisclosureShown) return;
// Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
if (seen >= DISCLOSURE_VERSION) return;
process.stderr.write(
[
'',
'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
' No command arguments, file contents, or env var values are sent.',
' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.
' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
'',
].join('\n'),
);
cfg.telemetryDisclosureShown = true;
cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
writeConfig(cfg);
}
3 changes: 3 additions & 0 deletions src/storage/secrets.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
credentialPublicId?: string;
/** Agent credentials only: scopes granted at issue time. */
scopes?: string[];
/** Agent credentials only: login email — the hmok_ token is opaque, so this
* is the only human identity available for crash attribution (AIT-278). */
email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: attach email to Sentry user so operator alerts name the human (AIT-278)#37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ord669
merged 5 commits into

from

Jul 27, 2026
 Merged


fix: attach email to Sentry user so operator alerts name the human (AIT-278)
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
51d440a

fix: attach email to Sentry user so operator alerts name the human (A…


ord669 Jul 27, 2026
c7a8bc1

docs: disclose email in telemetry section (AIT-278)


ord669 Jul 27, 2026
9170059

fix: clear stale Sentry identity when credentials change or lack clai…


ord669 Jul 27, 2026
c9dbbe4

fix: attribute pre-API errors and agent-credential logins in crash re…


ord669 Jul 27, 2026
3988f23

fix: re-show telemetry disclosure to upgraders before email collectio…


ord669 Jul 27, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,8 @@ expects this token echoed back in the response body.
HookMyApp CLI reports crashes to our Sentry project so we can fix bugs fast.
**No command arguments, file contents, or environment variable values are
sent.** Only the error class, stack trace, CLI version, platform, and (when
you are logged in) your WorkOS user id are reported.
you are logged in) your WorkOS user id and account email are reported — the
email lets us match a crash report to your support request.

Telemetry is ON by default — industry norm for product CLIs (npm, Next.js,
Vercel, Homebrew). You can disable it any time:
Expand Down

1 change: 1 addition & 0 deletions
src/auth/login.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -584,6 +584,7 @@ async function persistAgentCredential(
 kind: 'agent',
 credentialPublicId: cred.credentialPublicId,
 scopes: cred.scopes,
 email,
 });
 await revalidateActiveWorkspace(json);
 maybeInstallClaudeMcp();
Expand Down

15 changes: 12 additions & 3 deletions
src/observability/jwt-light.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
//
// Safe failure: malformed token → empty string → Sentry.setUser skips (the
// observability/sentry.ts caller guards on empty sub).
export function decodeJwtSub(token: string): string {
function decodeJwtClaim(token: string, claim: string): string {
 try {
 const parts = token.split('.');
 if (parts.length < 2) return '';
Expand All@@ -17,9 +17,18 @@ export function decodeJwtSub(token: string): string {
 const payload = JSON.parse(
 Buffer.from(payloadB64, 'base64url').toString('utf8'),
 ) as Record<string, unknown>;
 const sub = payload.sub;
 return typeof sub === 'string' ? sub : '';
 const value = payload[claim];
 return typeof value === 'string' ? value : '';
 } catch {
 return '';
 }
}

export function decodeJwtSub(token: string): string {
 return decodeJwtClaim(token, 'sub');
}

// Operator alerts must name the human, not just the WorkOS id (AIT-278).
export function decodeJwtEmail(token: string): string {
 return decodeJwtClaim(token, 'email');
}

25 changes: 19 additions & 6 deletions
src/observability/sentry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
// CLI error pre-0.11.0 was caused by violating this rule.

import { isTelemetryEnabled, maybePrintFirstRunDisclosure } from './telemetry.js';
import { decodeJwtSub } from './jwt-light.js';
import { decodeJwtSub, decodeJwtEmail } from './jwt-light.js';
import { shutdownPostHog } from './posthog.js';
import { getConfigDir } from '../storage/path.js';

Expand DownExpand Up@@ -210,11 +210,20 @@ export async function setCliUserFromCreds(): Promise<void> {
 // touch credentials (--help, --version).
 const { readCredentials } = await import('../auth/store.js');
 const creds = await readCredentials();
 if (!creds?.accessToken) return;

 const sub = decodeJwtSub(creds.accessToken);
 if (!sub) return;
 sentryModule.setUser({ id: sub });
 const token = creds?.accessToken ?? '';
 const sub = token ? decodeJwtSub(token) : '';
 // Agent (hmok_) tokens are opaque — the login email is persisted alongside.
 const email = (token ? decodeJwtEmail(token) : '') || creds?.email || '';
 // Always apply (or clear) — an early return here would leave a previous
 // login's identity attached after a credential change mid-process.
 sentryModule.setUser(sub || email ? {
 ...(sub ? { id: sub } : {}),
 ...(email ? { email } : {}),
 } : null);
 // Tags too: Slack alert rules render user.email/user.id tags, not the
 // user context (AIT-278). `undefined` removes the tag.
 sentryModule.setTag('user.id', sub || undefined);
 sentryModule.setTag('user.email', email || undefined);
}

/**
Expand DownExpand Up@@ -261,6 +270,10 @@ export function shouldCaptureToSentry(err: any): boolean {
export async function captureError(err: unknown): Promise<void> {
 if (!initialized || !sentryModule) return;
 if (!shouldCaptureToSentry(err)) return;
 // Attach identity here too, not only in apiClient — errors thrown before
 // the first API call (local validation, arg handling) must still name the
 // logged-in user in operator alerts (AIT-278). Best-effort.
 try { await setCliUserFromCreds(); } catch { /* never block capture */ }
 try {
 // Tag with severity + code when available (AppError subclasses).
 if (err && typeof err === 'object') {
Expand Down

11 changes: 10 additions & 1 deletion
src/observability/telemetry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,14 @@ import { getConfigFile, safeWriteFileSync } from '../storage/path.js';

type TelemetryFlag = 'on' | 'off';

// Bump when the disclosure text materially changes what is collected (v2:
// account email + user id, AIT-278) so existing installs see it again.
const DISCLOSURE_VERSION = 2;

interface Config {
 telemetry?: TelemetryFlag;
 telemetryDisclosureShown?: boolean;
 telemetryDisclosureVersion?: number;
 // Other existing keys (activeWorkspaceId, activeWorkspaceSlug, env, etc.)
 // are preserved by the read+merge+write pattern below.
 [key: string]: unknown;
Expand DownExpand Up@@ -86,16 +91,20 @@ export function unsetPersistedTelemetry(): void {
 */
export function maybePrintFirstRunDisclosure(): void {
 const cfg = readConfig();
 if (cfg.telemetryDisclosureShown) return;
 // Legacy bool counts as v1 — upgraders must see the v2 (email) disclosure.
 const seen = cfg.telemetryDisclosureVersion ?? (cfg.telemetryDisclosureShown ? 1 : 0);
 if (seen >= DISCLOSURE_VERSION) return;
 process.stderr.write(
 [
 '',
 'ℹ Telemetry: HookMyApp CLI reports crashes + usage analytics to help us fix bugs and improve UX.',
 ' No command arguments, file contents, or env var values are sent.',
 ' When logged in, your account email + user id accompany crash reports.',
Comment thread
coderabbitai[bot] marked this conversation as resolved.

 ' Disable: `hookmyapp config set telemetry off` or `HOOKMYAPP_TELEMETRY=off`',
 '',
 ].join('\n'),
 );
 cfg.telemetryDisclosureShown = true;
 cfg.telemetryDisclosureVersion = DISCLOSURE_VERSION;
 writeConfig(cfg);
}

3 changes: 3 additions & 0 deletions
src/storage/secrets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,9 @@ export interface Secrets {
 credentialPublicId?: string;
 /** Agent credentials only: scopes granted at issue time. */
 scopes?: string[];
 /** Agent credentials only: login email — the hmok_ token is opaque, so this
 * is the only human identity available for crash attribution (AIT-278). */
 email?: string;
}

/** True for an auth.md-issued org-scoped agent credential (no refresh token). */
Expand Down
Loading