aiwg 2026.10.7 → 2026.10.9

package/agentic/code/addons/aiwg-hooks/hooks/aiwg-session.cjs

@@ -45,8 +45,17 @@ async function compactContext() {
   try {
     const buffer = Buffer.alloc(65537);
     let used = 0;
+    // stdin can be a non-blocking pipe whose writer has not sent the event yet.
+    // EAGAIN means "no data yet", not "no input": wait briefly and retry.
+    const deadline = Date.now() + 5000;
+    const pause = new Int32Array(new SharedArrayBuffer(4));
     while (used < buffer.length) {
-      const count = fs.readSync(0, buffer, used, buffer.length - used, null);
+      let count;
+      try { count = fs.readSync(0, buffer, used, buffer.length - used, null); }
+      catch (error) {
+        if (error && error.code === 'EAGAIN' && Date.now() < deadline) { Atomics.wait(pause, 0, 0, 10); continue; }
+        throw error;
+      }
       if (count === 0) break;
       used += count;
     }

package/agentic/code/plugins/agent-loop/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-loop",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Iterative AI coding loops with automatic recovery - iteration beats perfection",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/agent-persistence/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-persistence",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Human-in-the-loop (HITL) gate definitions for agent operations. Provides reusable YAML gates for destructive-action authorization, false-positive override, and recovery escalation. Loaded by agent loops and orchestrators that need bounded human checkpoints.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/agentic-installer/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-installer",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Structured YAML manifests for reproducible, agent-driven software installation across platforms. Scripts are the primary artifact; agentic instructions handle adaptation and recovery.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/aiwg-dev/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "aiwg-dev",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Developer tooling for building AIWG itself and AIWG addons/frameworks. Not for end users — install explicitly with `aiwg use aiwg-dev`.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/aiwg-evals/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "aiwg-evals",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Automated evaluation framework for agent quality, based on KAMI benchmark methodology and ReAct patterns",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/auto-memory/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-memory",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Automatic memory seed templates for AIWG projects",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/browser-control/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-control",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Drive a real, user-installed Chromium-derived browser from an AIWG agent. Wraps @playwright/mcp with a setup wizard, health-check doctor, allow-list enforcement, and an opinionated agent persona that respects authorization and audit boundaries.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/color-palette/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "color-palette",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Color palette selection and review tooling with color theory fundamentals, current trend research, and accessibility analysis.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/compound-memory/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "compound-memory",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Governed orchestration across AIWG line memory, semantic memory, and llm-wiki.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/context-curator/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-curator",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Context curation and distractor filtering for production-grade agent reliability",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/daemon/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "daemon",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Persistent daemon session capabilities: Concierge front-end, session memory, scheduler integration",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/doc-intelligence/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "doc-intelligence",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Documentation intelligence addon for scraping, extraction, analysis, and generated-docs auditing.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/droid-bridge/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "droid-bridge",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "MCP server bridging Claude Code to Factory Droid for batch operations and automated fixes",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/forensics/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "forensics",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Digital forensics and incident response framework with 14 specialized agents covering target profiling, evidence acquisition, log/memory/container/cloud analysis, IOC extraction, and reporting.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/guided-implementation/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "guided-implementation",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Bounded iteration control for autonomous issue-to-code implementation",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/hooks/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "hooks",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Claude Code hooks for workflow tracing and observability.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/hooks/hooks/aiwg-session.cjs

@@ -45,8 +45,17 @@ async function compactContext() {
   try {
     const buffer = Buffer.alloc(65537);
     let used = 0;
+    // stdin can be a non-blocking pipe whose writer has not sent the event yet.
+    // EAGAIN means "no data yet", not "no input": wait briefly and retry.
+    const deadline = Date.now() + 5000;
+    const pause = new Int32Array(new SharedArrayBuffer(4));
     while (used < buffer.length) {
-      const count = fs.readSync(0, buffer, used, buffer.length - used, null);
+      let count;
+      try { count = fs.readSync(0, buffer, used, buffer.length - used, null); }
+      catch (error) {
+        if (error && error.code === 'EAGAIN' && Date.now() < deadline) { Atomics.wait(pause, 0, 0, 10); continue; }
+        throw error;
+      }
       if (count === 0) break;
       used += count;
     }

package/agentic/code/plugins/knowledge-base/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "knowledge-base",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Knowledge-base / wiki framework with skills for ingestion, query, and lint. Build a structured, citable corpus with cross-references and concept pages.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/line-memory/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "line-memory",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Bounded, plain-text project memory with least-recently-used retention.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/llm-wiki/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-wiki",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "LLM-maintained markdown wiki that compounds as sources are ingested. Thin topology declaration on the semantic memory kernel — ships schema profiles and page templates, no custom mechanics.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/marketing/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "marketing",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Marketing automation framework with 37 specialized agents for campaign management.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/media-curator/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "media-curator",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Media archive management framework with 7 specialized agents for source discovery, acquisition (yt-dlp / Internet Archive / Bandcamp), quality assessment, metadata tagging, and provenance tracking.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/nlp-prod/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "nlp-prod",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Tools, skills, and CLI extensions for designing and productionizing LLM inference pipelines. Pattern-guided, slim by default, eval-first.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/ops/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "ops",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Operational infrastructure framework with 12 specialized agents covering incident response, runbook execution, fleet inventory, certificate lifecycle, and disaster recovery planning.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/prose-integration/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "prose-integration",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Tools for reading, parsing, validating, and executing OpenProse programs from AIWG workflows",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/research/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "research",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Research workflow framework with 9 specialized agents for discovery, acquisition, synthesis, citation management, GRADE quality assessment, and OAIS-compliant archival.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/rlm/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "rlm",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "RLM-inspired recursive context decomposition for processing arbitrarily large codebases and document corpora through programmatic sub-agent delegation",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/sdlc/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "sdlc",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Complete SDLC framework with 180+ specialized agents for software development lifecycle management.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/security-engineering/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "security-engineering",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Applied security framework for cryptographic primitive selection, chain-of-trust design, authentication factor analysis, supply-chain trust, and physical-threat modeling. Complements OWASP-style application audits.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/semantic-memory/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "semantic-memory",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Topology-agnostic semantic memory operations: ingest, lint, query-capture, and structured event logging. Consumers declare a memory topology in their manifest.json; kernel skills read that contract to parameterize behavior.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/skill-factory/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "skill-factory",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Build, enhance, validate, and package Claude skills end-to-end. Coordinates skill-builder, skill-enhancer, quality-checker, and skill-packager via the skill-architect agent.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/star-prompt/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "star-prompt",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Tasteful prompt to encourage users to star the repository after successful command completion",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/testing-quality/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "testing-quality",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Evidence-bound test conformance, platform protocols, normalization transactions and research-guided testing workflows",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/twelve-factor/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "twelve-factor",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Design-time and audit-time workflows for Twelve-Factor and modern 12+ Factor cloud-native application practices.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/uat-mcp/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "uat-mcp",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Agent-executable acceptance testing via MCP connections — generate, execute, and report on UAT plans that validate MCP tool surfaces.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/utils/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "utils",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Core AIWG utilities for context regeneration and workspace management.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/validation-complete/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "validation-complete",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Validation Complete for AIWG",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/verbalized-sampling/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "verbalized-sampling",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Training-free prompting technique that improves output diversity by 1.6-2.1x through verbalized probability distributions, addressing RLHF mode collapse",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/voice/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "voice",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Voice profile system for consistent, authentic writing.",
   "author": {
     "name": "AIWG Contributors",

package/agentic/code/plugins/writing/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "writing",
-  "version": "2026.10.7",
+  "version": "2026.10.9",
   "description": "Writing quality validation and AI pattern detection.",
   "author": {
     "name": "AIWG Contributors",

package/dist/src/artifacts/cli.js

@@ -24,9 +24,9 @@ import { resolveIndexWorkers } from './index-preparation.js';
 import { SUPPORTED_VIEWS } from './corpus-views/renderers.js';
 import { parseResourceSelector, readVerifiedRegularFile, } from '../resources/web-release.js';
 import { findPackageRoot } from '../cli/find-package-root.js';
-import { createResourceCredentialProvider } from '../auth/resource-credentials.js';
+import { createResourceCredentialProvider, prepareResourceCredentials } from '../auth/resource-credentials.js';
 const MAX_RESOURCE_TRUST_ROOT_BYTES = 64 * 1024;
-function webReleaseOptionsFromEnvironment() {
+function webReleaseOptionsFromEnvironment(credentialProvider = createResourceCredentialProvider(process.env)) {
     const baseUrl = process.env.AIWG_RESOURCE_BASE_URL;
     const cacheRoot = process.env.AIWG_RESOURCE_CACHE_ROOT;
     const trustRootFile = process.env.AIWG_RESOURCE_TRUST_ROOT_FILE;
@@ -44,7 +44,7 @@ function webReleaseOptionsFromEnvironment() {
         }
     }
     return {
-        credentialProvider: createResourceCredentialProvider(process.env),
+        credentialProvider,
         ...(baseUrl === undefined ? {} : { baseUrl }),
         ...(cacheRoot === undefined ? {} : { cacheRoot }),
         ...(publicKeyPem === undefined ? {} : { publicKeyPem }),
@@ -1465,6 +1465,8 @@ const DISCOVER_VALUE_FLAGS = new Set([
  * @implements #1214
  */
 async function handleDiscover(args) {
+    const credentials = await prepareResourceCredentials(args);
+    args = credentials.args;
     const { discoverCapability } = await import('./query-engine.js');
     const cwd = process.cwd();
     // Parse the positional phrase. Flags may appear before or after it — the
@@ -1526,7 +1528,7 @@ async function handleDiscover(args) {
     const offline = flags.includes('--offline');
     const webReleaseOptions = resourceSource === 'local'
         ? undefined
-        : webReleaseOptionsFromEnvironment();
+        : webReleaseOptionsFromEnvironment(credentials.credentialProvider);
     await discoverCapability(cwd, {
         phrase,
         typeFilter,
@@ -1578,6 +1580,8 @@ function showFlagValues(flags, name) {
     return values;
 }
 async function handleShow(args) {
+    const credentials = await prepareResourceCredentials(args);
+    args = credentials.args;
     const { showArtifact, showMetadata } = await import('./query-engine.js');
     const cwd = process.cwd();
     const positional = [];
@@ -1676,7 +1680,7 @@ async function handleShow(args) {
     const offline = flags.includes('--offline');
     const webReleaseOptions = resourceSource === 'local'
         ? undefined
-        : webReleaseOptionsFromEnvironment();
+        : webReleaseOptionsFromEnvironment(credentials.credentialProvider);
     const params = {
         name,
         boundRuleBodies: flags.includes('--bound-rule-bodies'),

package/dist/src/auth/config.js

@@ -1,5 +1,5 @@
-import fs from "node:fs";
 import path from "node:path";
+import { readPrivateValueFile } from "./sensitive-input.js";
 export const DEFAULT_AUTH_BASE_URL = "https://releases.aiwg.io";
 export const DEFAULT_AUTH_CLIENT_ID = "aiwg-cli";
 export const DEFAULT_AUTH_SCOPES = ["releases:read", "profile:read"];
@@ -24,14 +24,9 @@ export function authConfigFromEnvironment(env = process.env) {
         throw new Error("AIWG auth scopes are invalid");
     return { baseUrl, clientId, scopes, requestTimeoutMs: 30_000 };
 }
-export function explicitResourceToken(env = process.env) {
+export async function explicitResourceToken(env = process.env) {
     if (env.AIWG_RESOURCE_TOKEN_FILE) {
-        const pathname = path.resolve(env.AIWG_RESOURCE_TOKEN_FILE);
-        const stat = fs.lstatSync(pathname);
-        if (!stat.isFile() || stat.isSymbolicLink() || (stat.mode & 0o077) !== 0) {
-            throw new Error("AIWG_RESOURCE_TOKEN_FILE must be a non-symlink regular file with mode 0600");
-        }
-        return fs.readFileSync(pathname, "utf8").trim() || null;
+        return await readPrivateValueFile(path.resolve(env.AIWG_RESOURCE_TOKEN_FILE), "AIWG_RESOURCE_TOKEN_FILE") || null;
     }
     return env.AIWG_RESOURCE_TOKEN?.trim() || null;
 }

package/dist/src/auth/resource-credentials.js

@@ -1,12 +1,19 @@
 import { explicitResourceToken } from "./config.js";
 import { createCredentialStore } from "./credential-store.js";
+import { resolveSensitiveInput, sensitiveInputOptions } from "./sensitive-input.js";
 /**
  * Resolve credentials for protected release downloads. Explicit compatibility
  * inputs take precedence over interactive-login credentials.
  */
-export function createResourceCredentialProvider(env = process.env, store) {
+export function createResourceCredentialProvider(env = process.env, store, source = {}, dependencies = {}) {
+    const hasSource = source.interactive || source.stdin || source.file !== undefined || source.store !== undefined || source.env !== undefined;
+    // A command may fetch several manifests and bodies. Never consume stdin or
+    // ask for the same explicit credential more than once, including on failure.
+    let resolvedSource;
     return async () => {
-        const explicit = explicitResourceToken(env);
+        if (hasSource)
+            return resolvedSource ??= resolveSensitiveInput({ ...source, prefix: 'resource-token' }, { ...dependencies, environment: env });
+        const explicit = await explicitResourceToken(env);
         if (explicit)
             return explicit;
         const selected = store ?? createCredentialStore();
@@ -22,4 +29,30 @@ export function createResourceCredentialProvider(env = process.env, store) {
         }
     };
 }
+/** Parse once before command-specific positional parsing or helper forwarding. */
+export async function prepareResourceCredentials(args, env = process.env, store, dependencies = {}) {
+    const source = sensitiveInputOptions(args, 'resource-token');
+    const remaining = [];
+    const valueFlags = ['--resource-token-file', '--resource-token-store', '--resource-token-env'];
+    for (let index = 0; index < args.length; index++) {
+        const token = args[index];
+        if (token === '--') {
+            remaining.push(...args.slice(index));
+            break;
+        }
+        if (valueFlags.includes(token)) {
+            index++;
+            continue;
+        }
+        if (valueFlags.some(flag => token.startsWith(`${flag}=`)) ||
+            token === '--resource-token-stdin' || token === '--resource-token-interactive')
+            continue;
+        remaining.push(token);
+    }
+    const credentialProvider = createResourceCredentialProvider(env, store, source, dependencies);
+    if (source.interactive || source.stdin || source.file !== undefined || source.store !== undefined || source.env !== undefined) {
+        await credentialProvider();
+    }
+    return { args: remaining, credentialProvider, omitEnv: ['AIWG_RESOURCE_TOKEN', ...(source.env ? [source.env] : [])] };
+}
 //# sourceMappingURL=resource-credentials.js.map

package/dist/src/cli/handlers/cost-report.js

@@ -1,6 +1,7 @@
 /** OpenRouter fleet cost-report CLI handler. @issue #1187 */
 import os from 'node:os';
 import path from 'node:path';
+import { sensitiveInputOptions } from '../../auth/sensitive-input.js';
 import { FleetConfigMissingError, formatFleetSpendReport, generateFleetSpendReport, } from '../../cost/fleet-report.js';
 function option(args, name) {
     const index = args.indexOf(name);
@@ -9,10 +10,11 @@ function option(args, name) {
 }
 function usage() {
     return [
-        'Usage: aiwg cost-report (--fleet | --key <key_ref>) [--source openrouter] [--config <fleet.yaml>] [--json]',
+        'Usage: aiwg cost-report (--fleet | --key <key_ref> [--key-store <name>]) [--source openrouter] [--config <fleet.yaml>] [--json]',
         '',
         'Reads bot-to-key references from ~/.config/aiwg/fleet.yaml and credentials from',
         '~/.config/aiwg/keys/<key_ref> or AIWG_OPENROUTER_KEY_<KEY_REF>.',
+        'Use --key-store <name> for one key, or per-entry key_store references in fleet YAML.',
         '',
         'AIWG observes and correlates spend; OpenRouter enforces all key limits and caps.',
     ].join('\n');
@@ -40,6 +42,9 @@ export const costReportHandler = {
             ? path.resolve(ctx.cwd, configuredPath)
             : path.join(os.homedir(), '.config', 'aiwg', 'fleet.yaml');
         try {
+            const keyStore = sensitiveInputOptions(ctx.args, 'key').store;
+            if (keyStore !== undefined && !keyRef)
+                return { exitCode: 2, message: '--key-store requires --key <key_ref>; use per-entry key_store references for --fleet.' };
             const capValue = option(ctx.args, '--monthly-cap');
             const cap = capValue === undefined ? 0 : Number(capValue);
             if (!Number.isFinite(cap) || cap < 0)
@@ -53,6 +58,7 @@ export const costReportHandler = {
                             bot: option(ctx.args, '--bot') ?? keyRef,
                             machine: option(ctx.args, '--machine') ?? os.hostname(),
                             key_ref: keyRef,
+                            ...(keyStore !== undefined ? { key_store: keyStore } : {}),
                             monthly_cap: cap,
                         }],
                 } : {}),