@yagni-app/code-staging 0.1.0-staging.997.1 → 0.2.0-staging.1025.1

package/dist/extension/sessionRuns.js

@@ -0,0 +1,77 @@
+/**
+ * YAG-383: tracks the `/go` run ids a driver session has launched, so /cost's
+ * server-authoritative spend fetch can widen its query to include them.
+ *
+ * The backend writes a run-attributed dispatch's `llm_usage.session_id` as
+ * the RUN id, not the driver session id (see attributionHeaders in
+ * config.ts: a `/go` child's completions carry `x-yagni-run-id`, and the
+ * proxy stores THAT in `session_id` — the run id wins, by design, so a
+ * per-run query works on its own). A plain `GET /api/yagni-code/spend?
+ * sessionId=<driver>` therefore never sees a single `/go` run's spend: it is
+ * real spend, billed under this session's work, but invisible to that query.
+ * `/cost` (index.ts's `fetchSpend`) closes that gap by also asking for every
+ * run id this process has launched, via `runIds=`.
+ *
+ * Module-level state is the right shape here: one CLI process IS one driver
+ * session, so "run ids this process has launched" and "run ids this session
+ * has launched" are the same list. Capped at the most recent
+ * `MAX_TRACKED_RUN_IDS` so an extremely long-lived session's /cost call never
+ * grows an unbounded query string (the backend independently caps `runIds` at
+ * the same number — see MAX_SPEND_RUN_IDS in routes/yagniCode.ts — capping
+ * symmetrically here keeps a stable, useful most-recent set instead of
+ * trailing off into a 400 from the server).
+ */
+const MAX_TRACKED_RUN_IDS = 20;
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+let runIds = [];
+/**
+ * Count of run ids ever pushed off the front of `runIds` by the
+ * `MAX_TRACKED_RUN_IDS` cap below. Carry-over from the /cost re-review: a
+ * long-lived session that launches more than 20 `/go` runs silently lost the
+ * oldest ones from /cost's `runIds=` widening, with no indication that
+ * anything was left out — an honesty gap identical in spirit to
+ * `counterfactualIncomplete` / `unbilledSellMillicents` elsewhere in this
+ * surface. Tracked here (not derived) because the dropped ids themselves are
+ * gone — only the count survives.
+ */
+let dropped = 0;
+/**
+ * Record a `/go` run id once it is known (the goCommand.ts seam right after
+ * `runSession.start()` resolves). Ignores anything that is not UUID-shaped
+ * and de-dupes a repeat call for the same run (a resumed/re-adopted run can
+ * report the same id twice) — both defensive, since a malformed value here
+ * must never corrupt /cost's query string.
+ */
+export function recordSessionRun(runId) {
+    if (!UUID_RE.test(runId))
+        return;
+    if (runIds.includes(runId))
+        return;
+    runIds.push(runId);
+    if (runIds.length > MAX_TRACKED_RUN_IDS) {
+        const overflow = runIds.length - MAX_TRACKED_RUN_IDS;
+        dropped += overflow;
+        runIds = runIds.slice(overflow);
+    }
+}
+/** The run ids recorded so far this process, oldest first, capped. */
+export function sessionRunIds() {
+    return [...runIds];
+}
+/**
+ * How many run ids this session has ever dropped off the front of the
+ * `MAX_TRACKED_RUN_IDS` cap. Zero for the overwhelming majority of sessions
+ * (20 `/go` runs in one process is a lot); /cost's server rendering
+ * (costHud.ts's `formatServerCostLines`) surfaces this as an "Excludes N
+ * earlier /go runs." note when it is nonzero, so a long session's spend total
+ * is never silently missing runs with no explanation.
+ */
+export function droppedSessionRuns() {
+    return dropped;
+}
+/** Test-only reset: module-level state otherwise leaks across test files/cases. */
+export function _resetSessionRunsForTest() {
+    runIds = [];
+    dropped = 0;
+}
+//# sourceMappingURL=sessionRuns.js.map

package/dist/extension/subagents.d.ts

@@ -9,9 +9,11 @@
  *
  * Agent definitions are the Claude Code format — markdown with
  * name/description/tools/model frontmatter — discovered from the repo's
- * `.claude/agents/` and `.pi/agents/` plus the user's `~/.claude/agents/`
- * (project beats user on a name collision). A built-in `general` agent is
- * always available, so the tool works in a repo with no definitions at all.
+ * `.claude/agents/` and `.pi/agents/`, the user's `~/.claude/agents/`, and
+ * any Claude Code plugin `agents/` dirs the launcher passed via
+ * `YAGNI_CLAUDE_AGENT_DIRS` (project beats user beats plugin on a name
+ * collision). A built-in `general` agent is always available, so the tool
+ * works in a repo with no definitions at all.
  * Claude model names map onto YAGNI tiers (opus→advanced, sonnet→standard,
  * haiku→efficient); unknown models run on standard.
  */
@@ -28,7 +30,12 @@ export declare const MAX_PARALLEL_SUBAGENTS = 4;
  * subagent would inherit.
  */
 export declare const DEFAULT_SUBAGENT_TOOLS: string[];
-export type SubagentSource = "project-claude" | "project-pi" | "user-claude" | "builtin";
+export type SubagentSource = "project-claude" | "project-pi" | "user-claude" | "plugin" | "builtin";
+/**
+ * Claude Code plugin `agents/` dirs, delimiter-joined by the yagni launcher
+ * (see yagni-code-cli claudeCompat.ts — trust gating happens there).
+ */
+export declare const CLAUDE_AGENT_DIRS_ENV = "YAGNI_CLAUDE_AGENT_DIRS";
 export interface SubagentDef {
     name: string;
     description: string;
@@ -49,11 +56,14 @@ export declare function parseAgentMarkdown(content: string, fallbackName: string
 export interface DiscoverDeps {
     cwd: string;
     homeDir?: string;
+    /** Env seam for the plugin agent dirs (defaults to process.env). */
+    env?: NodeJS.ProcessEnv;
 }
 /**
- * All available agents: built-in general, then user `~/.claude/agents`, then
- * the repo's `.pi/agents` and `.claude/agents` — later wins on a name
- * collision, so a project definition beats a user one beats the built-in.
+ * All available agents: built-in general, then Claude Code plugin `agents/`
+ * dirs (launcher-provided), then user `~/.claude/agents`, then the repo's
+ * `.pi/agents` and `.claude/agents` — later wins on a name collision, so a
+ * project definition beats a user one beats a plugin one beats the built-in.
  */
 export declare function discoverSubagents(deps: DiscoverDeps): SubagentDef[];
 export declare function formatAgentList(agents: SubagentDef[]): string;

package/dist/extension/subagents.js

@@ -9,18 +9,27 @@
  *
  * Agent definitions are the Claude Code format — markdown with
  * name/description/tools/model frontmatter — discovered from the repo's
- * `.claude/agents/` and `.pi/agents/` plus the user's `~/.claude/agents/`
- * (project beats user on a name collision). A built-in `general` agent is
- * always available, so the tool works in a repo with no definitions at all.
+ * `.claude/agents/` and `.pi/agents/`, the user's `~/.claude/agents/`, and
+ * any Claude Code plugin `agents/` dirs the launcher passed via
+ * `YAGNI_CLAUDE_AGENT_DIRS` (project beats user beats plugin on a name
+ * collision). A built-in `general` agent is always available, so the tool
+ * works in a repo with no definitions at all.
  * Claude model names map onto YAGNI tiers (opus→advanced, sonnet→standard,
  * haiku→efficient); unknown models run on standard.
  */
 import * as fs from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { delimiter, join } from "node:path";
 import { parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
+import { sanitizeCallerSegment } from "./config.js";
 import { runStage } from "./pipeline/runner.js";
+/**
+ * YAG-471 attribution: the `x-yagni-caller` prefix for a subagent invocation.
+ * The sanitized agent name is capped so the WHOLE label (prefix + name) stays
+ * within the model proxy's 64-char caller-label limit.
+ */
+const SUBAGENT_CALLER_PREFIX = "subagent:";
 export const SUBAGENT_TOOL_NAME = "subagent";
 export const GENERAL_AGENT_NAME = "general";
 export const MAX_PARALLEL_SUBAGENTS = 4;
@@ -39,6 +48,21 @@ export const DEFAULT_SUBAGENT_TOOLS = [
     "write",
     "ask_yagni",
 ];
+/**
+ * Claude Code plugin `agents/` dirs, delimiter-joined by the yagni launcher
+ * (see yagni-code-cli claudeCompat.ts — trust gating happens there).
+ */
+export const CLAUDE_AGENT_DIRS_ENV = "YAGNI_CLAUDE_AGENT_DIRS";
+const CLAUDE_COMPAT_DISABLE_ENV = "YAGNI_DISABLE_CLAUDE_COMPAT";
+function pluginAgentDirs(env) {
+    const disabled = env[CLAUDE_COMPAT_DISABLE_ENV];
+    if (disabled !== undefined && disabled !== "" && disabled !== "0")
+        return [];
+    const raw = env[CLAUDE_AGENT_DIRS_ENV];
+    if (!raw)
+        return [];
+    return raw.split(delimiter).filter(Boolean);
+}
 const GENERAL_BODY = `You are a capable software-engineering subagent with a fresh context window. Complete the task you are given end to end, autonomously.
 
 You are grounded in how THIS company works: call ask_yagni before inferring a convention, an ownership rule, or anything organization-specific.
@@ -51,6 +75,10 @@ const GENERAL_AGENT = {
     body: GENERAL_BODY,
     source: "builtin",
 };
+// Concrete tiers a subagent can actually run on. `balanced` is deliberately NOT
+// a member here even though it is a member of `ModelTier`: a subagent needs
+// ONE model for its whole run, and balanced is a session-level routing policy,
+// not a rung — see mapModelTier's explicit branch below.
 const TIER_VALUES = ["peak", "advanced", "standard", "efficient"];
 /** Claude Code model names → YAGNI tiers; YAGNI tiers pass through. */
 export function mapModelTier(model) {
@@ -59,6 +87,15 @@ export function mapModelTier(model) {
     const normalized = model.trim().toLowerCase();
     if (TIER_VALUES.includes(normalized))
         return normalized;
+    // `balanced` names a SESSION routing policy, not a tier a subagent can run
+    // on. Handled explicitly rather than falling through to the catch-all
+    // below, so frontmatter that names the policy reads as an intentional
+    // "router-decide" choice, not an unrecognized string: it lands on the
+    // built-in default lane (standard) — the session-level policy (driver
+    // turns) owns balanced's resolution; this is just a safe landing spot for
+    // frontmatter that names it.
+    if (normalized === "balanced")
+        return "standard";
     if (normalized.includes("opus"))
         return "advanced";
     if (normalized.includes("sonnet"))
@@ -117,14 +154,16 @@ function loadAgentsFromDir(dir, source) {
     return agents;
 }
 /**
- * All available agents: built-in general, then user `~/.claude/agents`, then
- * the repo's `.pi/agents` and `.claude/agents` — later wins on a name
- * collision, so a project definition beats a user one beats the built-in.
+ * All available agents: built-in general, then Claude Code plugin `agents/`
+ * dirs (launcher-provided), then user `~/.claude/agents`, then the repo's
+ * `.pi/agents` and `.claude/agents` — later wins on a name collision, so a
+ * project definition beats a user one beats a plugin one beats the built-in.
  */
 export function discoverSubagents(deps) {
     const home = deps.homeDir ?? homedir();
     const layers = [
         [GENERAL_AGENT],
+        ...pluginAgentDirs(deps.env ?? process.env).map((dir) => loadAgentsFromDir(dir, "plugin")),
         loadAgentsFromDir(join(home, ".claude", "agents"), "user-claude"),
         loadAgentsFromDir(join(deps.cwd, ".pi", "agents"), "project-pi"),
         loadAgentsFromDir(join(deps.cwd, ".claude", "agents"), "project-claude"),
@@ -138,6 +177,7 @@ export function discoverSubagents(deps) {
 }
 const SOURCE_LABEL = {
     builtin: "built-in",
+    plugin: "claude plugin",
     "user-claude": "~/.claude/agents",
     "project-pi": ".pi/agents",
     "project-claude": ".claude/agents",
@@ -234,6 +274,11 @@ export function makeSubagentTool(deps = {}) {
                     cwd,
                     signal,
                     personaBody: () => def.body,
+                    // YAG-471: attribute this child's completions to the specific
+                    // subagent, not the generic /go stage label the runner would
+                    // otherwise derive from stage.id ("implement", reused as the
+                    // synthetic subagent stage — see buildSubagentStage).
+                    callerLabel: `${SUBAGENT_CALLER_PREFIX}${sanitizeCallerSegment(def.name, 64 - SUBAGENT_CALLER_PREFIX.length)}`,
                 });
                 return { agent: def.name, task, result };
             }));

package/dist/launch.d.ts

@@ -1,7 +1,9 @@
 /**
- * Build the configured pi launch. `buildLaunch` is pure (no spawn, no fs) so it
- * is fully unit-testable: it returns the child environment and the pi argv that
- * registers pi-extension-yagni and defaults the provider to `yagni`.
+ * Build the configured pi launch. `buildLaunch` has no spawn/fs side effects,
+ * so it stays fully unit-testable, though it is no longer strictly pure: it
+ * mints a fresh session id (`randomUUID()`) on every call. It returns the
+ * child environment and the pi argv that registers pi-extension-yagni and
+ * defaults the provider to `yagni`.
  */
 import type { Credentials } from "./credentials.js";
 export interface LaunchPlan {
@@ -61,6 +63,12 @@ export interface BuildLaunchOptions {
     profilePath?: string;
     /** Distribution-specific root shared with the bundled extension. */
     stateDir?: string;
+    /**
+     * Launcher version, forwarded as `YAGNI_CODE_VERSION` so the bundled
+     * extension (which has no package.json on disk to read) can label its crash
+     * reports with the shipping version. Optional: omitted, reports say "unknown".
+     */
+    cliVersion?: string;
     /** Base environment to extend (defaults to process.env at call sites). */
     baseEnv?: NodeJS.ProcessEnv;
     /** Clock seam for the token-expiry preflight (defaults to Date.now). */
@@ -71,6 +79,12 @@ export interface BuildLaunchOptions {
      * anything the user passes explicitly still wins.
      */
     extraAgentArgs?: string[];
+    /**
+     * Launcher-computed child env (e.g. Claude-compat plugin agent dirs and
+     * rules dirs). Merged before the YAGNI-critical keys so it can never
+     * override the token, base URL, or hermetic agent dir.
+     */
+    extraEnv?: Record<string, string>;
 }
 export declare function buildLaunch(creds: Credentials | null, passthroughArgs: string[], opts: BuildLaunchOptions): LaunchPlan;
 //# sourceMappingURL=launch.d.ts.map

package/dist/launch.js

@@ -1,8 +1,11 @@
 /**
- * Build the configured pi launch. `buildLaunch` is pure (no spawn, no fs) so it
- * is fully unit-testable: it returns the child environment and the pi argv that
- * registers pi-extension-yagni and defaults the provider to `yagni`.
+ * Build the configured pi launch. `buildLaunch` has no spawn/fs side effects,
+ * so it stays fully unit-testable, though it is no longer strictly pure: it
+ * mints a fresh session id (`randomUUID()`) on every call. It returns the
+ * child environment and the pi argv that registers pi-extension-yagni and
+ * defaults the provider to `yagni`.
  */
+import { randomUUID } from "node:crypto";
 import { agentDirEnvVar } from "./branding.js";
 /**
  * How close to expiry the token can be before launch warns. A coding session
@@ -50,6 +53,13 @@ export function buildLaunch(creds, passthroughArgs, opts) {
     }
     const env = {
         ...(opts.baseEnv ?? {}),
+        ...(opts.extraEnv ?? {}),
+        // One session id per launch (YAG-471 attribution). The extension reads this
+        // as YAGNI_SESSION_ID and forwards it as the model proxy's x-yagni-session-id
+        // header on the driver's own completions. /go's children override
+        // YAGNI_CALLER with their own stage/subagent/advisor label but inherit this
+        // session id (unless they also carry a YAGNI_RUN_ID, which wins server-side).
+        YAGNI_SESSION_ID: randomUUID(),
         YAGNI_TOKEN: creds.token,
         YAGNI_BASE_URL: creds.baseUrl,
         // Forward the token's expiry (when known) so the extension can surface a
@@ -63,6 +73,9 @@ export function buildLaunch(creds, passthroughArgs, opts) {
         // the launcher read (0600). Absent when the caller can't resolve it.
         ...(opts.profilePath ? { YAGNI_PROFILE_PATH: opts.profilePath } : {}),
         ...(opts.stateDir ? { YAGNI_CODE_HOME: opts.stateDir } : {}),
+        // Forward the launcher's version so the extension's crash reports carry
+        // the shipping version (the bundled extension has no package.json to read).
+        ...(opts.cliVersion ? { YAGNI_CODE_VERSION: opts.cliVersion } : {}),
         // Rebrand pi's chrome ("pi"/"π" → "YAGNI Code"): pi reads piConfig.name from
         // the package at PI_PACKAGE_DIR (a shadow package the launcher generates).
         ...(opts.piPackageDir ? { PI_PACKAGE_DIR: opts.piPackageDir } : {}),
@@ -87,12 +100,12 @@ export function buildLaunch(creds, passthroughArgs, opts) {
     // explicitly chose one (so power users can still point pi elsewhere).
     const userChoseProvider = passthroughArgs.some(arg => arg === "--provider" || arg.startsWith("--provider="));
     // Default the model to the `balanced` tier (YAG-380). Balanced drives on the
-    // judgment-grade `advanced` model — the same driver quality this default gave
-    // before — and additionally lets the session escalate hard calls to `peak`
-    // through the capped ask_advisor tool. So it is strictly additive: no session
-    // reasons worse than it did, and the hard ones can reason better. A user
-    // `--model` (e.g. `standard` or `efficient`) still wins. Without this, pi's
-    // default-model heuristic could land an interactive session on a weaker tier.
+    // judgment-grade `advanced` model and additionally lets the session escalate
+    // hard calls to `peak` through the capped ask_advisor tool. So it is strictly
+    // additive: no session reasons worse than plain advanced, and the hard ones
+    // can reason better. A user `--model` (e.g. `standard` or `efficient`) still
+    // wins. Without this, pi's default-model heuristic could land an interactive
+    // session on a weaker tier.
     // Detect if the user explicitly set a model, whether via "--model" as a separate
     // argument or using the equals form "--model=efficient". The previous check only
     // caught the separate form, causing a duplicate "--model balanced" to be added

package/dist/login.d.ts

@@ -9,6 +9,13 @@ export interface LoginDeps {
     baseUrl?: string;
     /** Which profile to store the minted token in. Defaults to the active one. */
     profileName?: string;
+    /**
+     * Client identifier sent with the token poll so the backend can attribute
+     * the minted credential to the app that requested it. Defaults to "cli";
+     * the desktop shell (which reuses this flow) passes "desktop". The server
+     * treats unknown values as absent, so this can never break a login.
+     */
+    client?: string;
     fetchImpl?: typeof fetch;
     now?: () => number;
     sleep?: (ms: number) => Promise<void>;

package/dist/login.js

@@ -100,7 +100,9 @@ export async function login(deps = {}) {
             res = await fetchImpl(`${baseUrl}/api/yagni-code/auth/token`, {
                 method: "POST",
                 headers: { "content-type": "application/json" },
-                body: JSON.stringify({ device_code: start.device_code }),
+                // `client` attributes the minted token to the requesting app; servers
+                // that predate the field simply ignore it.
+                body: JSON.stringify({ device_code: start.device_code, client: deps.client ?? "cli" }),
                 signal: AbortSignal.timeout(POLL_REQUEST_TIMEOUT_MS),
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "0.1.0-staging.997.1",
+  "version": "0.2.0-staging.1025.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)",
@@ -38,5 +38,5 @@
     "@earendil-works/pi-tui": "0.83.0",
     "typebox": "^1.1.38"
   },
-  "yagniSourceSha": "015f793032920ead37a63edc0dc4401fa7b50eec"
+  "yagniSourceSha": "ad43200e08a990ead4d891e469d4b88e338b070a"
 }