@yagni-app/code-staging 1.0.7-staging.1270.1 → 1.0.8-staging.1273.1

package/README.md

@@ -203,7 +203,14 @@ prefix instead of `claude_code`:
 - **Log events:** `user_prompt`, `assistant_response`, `api_request`,
   `api_error`, `tool_result`, `tool_decision`, `permission_mode_changed`
   (as `event.name`, body `yagni_code.<name>`), with `session.id`,
-  `organization.id`, `terminal.type`, and a per-prompt `prompt.id`.
+  `organization.id`, `user.email`, `terminal.type`, and a per-prompt
+  `prompt.id`.
+
+Every signal carries `organization.id` (the workspace) and `user.email` (the
+signed-in developer's account email, learned from the backend at session
+start) so a collector can attribute sessions and spend per person.
+`OTEL_METRICS_INCLUDE_ACCOUNT_UUID=false` drops the email from all three
+signals. Prompt, response, and tool content never export.
 
 Nothing is exported unless you configure an endpoint. Enable it one of three
 ways (first match wins):

package/dist/extension/config.d.ts

@@ -127,6 +127,12 @@ export interface ContextBrief {
      * The opt-in mining beat fires ONLY on an explicit 0.
      */
     repoDecisionCount?: number;
+    /**
+     * The signed-in developer's account email (additive; absent on older
+     * backends). Feeds the OTel export's `user.email` attribute when the
+     * launcher did not already forward one.
+     */
+    userEmail?: string;
 }
 /**
  * Attribution headers for the model proxy (YAG-471). On the SERVER side these

package/dist/extension/index.d.ts

@@ -3,6 +3,7 @@ import { type SpendResponse } from "./costHud.js";
 import { runInitPass as defaultRunInitPass } from "./initPass.js";
 import { startMcp as defaultStartMcp } from "./mcp/startup.js";
 import { type GuardianGateEvent } from "./permission/gate.js";
+import { registerTelemetry as defaultRegisterTelemetry } from "./telemetry/register.js";
 import { type PluginCliRunner } from "./plugins/panel.js";
 import { type FlushOutcome, type SpoolClientOpts } from "./spool.js";
 import { type TokenProvider } from "./tokenProvider.js";
@@ -67,6 +68,11 @@ export interface RegisterYagniDeps {
      * fresh-workspace first-run and is skipped otherwise, without a network or disk.
      */
     runInitPass?: typeof defaultRunInitPass;
+    /**
+     * OTel export registration. Injectable so tests assert the boot handoff of
+     * the /context `userEmail` into the telemetry identity without an SDK.
+     */
+    registerTelemetry?: typeof defaultRegisterTelemetry;
     /** The workspace id the token is bound to (keys the one-time init marker). */
     getWorkspaceId?: () => string | undefined;
     /** Has the init pass already run once for this workspace? Injectable (no disk in tests). */

package/dist/extension/index.js

@@ -37,7 +37,7 @@ import { registerGoCompareCommand } from "./pipeline/goCompareCommand.js";
 import { DEFAULT_PERMISSION_POLICY, createModeHolder, registerPermissionGate } from "./permission/gate.js";
 import { registerSandbox } from "./sandbox/session.js";
 import { sandboxAutoAllowDecision } from "./sandbox/bash.js";
-import { registerTelemetry } from "./telemetry/register.js";
+import { registerTelemetry as defaultRegisterTelemetry } from "./telemetry/register.js";
 import { loadHooksConfig, makeHookRunner, registerHooks } from "./hooks.js";
 import { loadPermissionRules } from "./permissionRules/loadConfig.js";
 import { registerPluginPanel } from "./plugins/panel.js";
@@ -421,7 +421,7 @@ export async function registerYagni(pi, deps = {}) {
     // OTel export (traces, metrics, log events; Claude Code parity). A no-op
     // unless the launcher's gate set YAGNI_OTEL_EXPORT=1 — see the CLI's
     // otel.ts for the sources and src/telemetry for the exporter.
-    const telemetry = registerTelemetry(pi, { env });
+    const telemetry = (deps.registerTelemetry ?? defaultRegisterTelemetry)(pi, { env });
     {
         let previousMode = modeHolder.get();
         modeHolder.onSet((m) => {
@@ -840,6 +840,29 @@ export async function registerYagni(pi, deps = {}) {
             contextBrief = undefined;
         }
     }
+    // The developer's account email for the OTel export (`user.email`), so a
+    // collector can attribute sessions per person. Set before session_start
+    // fires, so even the session.count metric carries it. No-op when export is
+    // off or the launcher already forwarded YAGNI_USER_EMAIL.
+    const bootUserEmail = typeof briefResult?.userEmail === "string" ? briefResult.userEmail : undefined;
+    telemetry.setUserEmail(bootUserEmail);
+    if (telemetry.enabled && !bootUserEmail && !telemetry.config.identity.userEmail) {
+        // Attribution would otherwise degrade silently: leave a trail in the local
+        // error sink so "why is user.email missing in the collector" is answerable.
+        // Info, not warn: one line per session start, and an account with no
+        // email hits it by design. The fields name each way the email can be
+        // absent — the boot fetch failed or lacked the field, and whether the
+        // launcher's YAGNI_USER_EMAIL was unset or forwarded blank.
+        logEvent({
+            source: "telemetry",
+            level: "info",
+            event: "user_email_missing",
+            fields: {
+                contextFetch: briefResult === null ? "failed_or_skipped" : "no_email_field",
+                launcherEmail: env.YAGNI_USER_EMAIL === undefined ? "unset" : "blank",
+            },
+        });
+    }
     // M1 ambient judgment recall: after a `read`, append the recorded judgment for
     // that path to the tool result (result modification is supported on pi's
     // `tool_result` event — verified against 0.80.2). No-op when the corpus is thin

package/dist/extension/telemetry/config.d.ts

@@ -37,7 +37,11 @@ export interface SignalConfig {
 export interface TelemetryIdentity {
     /** Bound workspace id (YAGNI_WORKSPACE_ID) → `organization.id`. */
     organizationId?: string;
-    /** The signed-in user's email when the launcher forwards it → `user.email`. */
+    /**
+     * The signed-in user's email → `user.email`. From `YAGNI_USER_EMAIL` when
+     * the launcher forwards it; otherwise learned from the /context boot fetch
+     * (`TelemetryHandle.setUserEmail`). Gated by `includeAccountId`.
+     */
     userEmail?: string;
     /** Shipping CLI version (YAGNI_CODE_VERSION) → `app.version`. */
     appVersion?: string;

package/dist/extension/telemetry/register.d.ts

@@ -27,6 +27,13 @@ export interface TelemetryHandle {
     toolDecision(input: ToolDecisionInput): void;
     /** The mode holder calls this on every /mode (or shift-tab) change. */
     permissionModeChanged(fromMode: string, toMode: string): void;
+    /**
+     * The entry calls this with the account email the /context boot fetch
+     * returned. A launcher-forwarded `YAGNI_USER_EMAIL` wins; otherwise every
+     * span, metric, and event from here on carries `user.email` (still subject
+     * to the `includeAccountId` gate).
+     */
+    setUserEmail(email: string | undefined): void;
     /** Test/introspection seam: the live tracker once the SDK is up. */
     readonly tracker: SessionTelemetry | null;
 }

package/dist/extension/telemetry/register.js

@@ -27,6 +27,7 @@ const NOOP_HANDLE = (config) => ({
     config,
     toolDecision: () => { },
     permissionModeChanged: () => { },
+    setUserEmail: () => { },
     tracker: null,
 });
 export function registerTelemetry(pi, deps = {}) {
@@ -187,6 +188,20 @@ export function registerTelemetry(pi, deps = {}) {
         },
         toolDecision: guard("tool_decision", (input) => tracker?.toolDecision(input)),
         permissionModeChanged: guard("permission_mode_changed", (from, to) => tracker?.permissionModeChanged(from, to)),
+        // Precedence, lowest to highest: this call (the /context boot fetch) <
+        // the launcher's YAGNI_USER_EMAIL, which resolveTelemetryConfig already
+        // placed on `identity`. So an identity that is set is never overwritten,
+        // whichever writer set it; a new writer must slot into this order
+        // explicitly rather than rely on call timing. The tracker reads
+        // `config.identity` on every attribute set, so this applies whether the
+        // SDK is already up or still lazy-loading.
+        setUserEmail: (email) => {
+            if (config.identity.userEmail)
+                return;
+            const trimmed = typeof email === "string" ? email.trim() : "";
+            if (trimmed)
+                config.identity.userEmail = trimmed;
+        },
     };
 }
 //# sourceMappingURL=register.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.0.7-staging.1270.1",
+  "version": "1.0.8-staging.1273.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -58,5 +58,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "7148d4d0a99f32505ec662e0bbd209279306b4b9"
+  "yagniSourceSha": "bb2c4a103e2db69e8dcc6eec98c7343ddefca05c"
 }