@aiwg/cli 2026.10.5 → 2026.10.7

package/dist/src/auth/sensitive-input.js

@@ -0,0 +1,151 @@
+import { constants } from 'node:fs';
+import { lstat, open } from 'node:fs/promises';
+import { isInteractive } from '../cli/env.js';
+import { askMultilineSecret, askString, createSecretPromptInterface } from '../cli/prompt-utils.js';
+import { createSecretStore } from './credential-store.js';
+/** Named raw values share the native store used by auth login, in a separate service. */
+export const SENSITIVE_VALUE_SERVICE = 'aiwg.sensitive-values';
+export function namedSensitiveStore(name) {
+    if (!/^[A-Za-z0-9][A-Za-z0-9_.-]{0,127}$/.test(name)) {
+        throw new Error('Sensitive value store name must contain only letters, digits, dots, underscores or hyphens (1–128 characters).');
+    }
+    return createSecretStore({ service: SENSITIVE_VALUE_SERVICE, account: name });
+}
+/** Extract references, never literal values, from the standard command options. */
+export function sensitiveInputOptions(args, prefix = 'value') {
+    const result = { prefix };
+    for (let index = 0; index < args.length; index += 1) {
+        const token = args[index];
+        if (token === '--')
+            break;
+        for (const source of ['file', 'store', 'env']) {
+            const flag = `--${prefix}-${source}`;
+            if (token !== flag && !token.startsWith(`${flag}=`))
+                continue;
+            const value = token === flag ? args[++index] : token.slice(flag.length + 1);
+            if (!value || value.startsWith('--'))
+                throw new Error(`${flag} requires a value`);
+            if (result[source] !== undefined)
+                throw new Error(`${flag} may only be given once`);
+            result[source] = value;
+        }
+        if (token === `--${prefix}-stdin`)
+            result.stdin = true;
+        if (token === `--${prefix}-interactive`)
+            result.interactive = true;
+    }
+    return result;
+}
+/** Extracted from MCP profile login: validate the opened descriptor, never a later path read. */
+export async function readPrivateValueFile(filePath, flag = '--value-file') {
+    if (process.platform === 'win32')
+        throw new Error(`${flag}: private-file input requires native ACL validation on Windows; use stdin or the OS store.`);
+    try {
+        const pre = await lstat(filePath);
+        if (pre.isSymbolicLink())
+            throw new Error('file is a symlink; refusing to follow it');
+        // Reject FIFOs/devices before open, which could otherwise wait indefinitely.
+        if (!pre.isFile())
+            throw new Error('not a regular file');
+    }
+    catch (error) {
+        const code = error.code;
+        throw new Error(`${flag}: ${code === 'ENOENT' ? 'file does not exist' : code ? 'cannot stat private file' : error.message}.`);
+    }
+    let handle;
+    try {
+        handle = await open(filePath, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
+    }
+    catch {
+        throw new Error(`${flag}: cannot open private file (symlinks are refused).`);
+    }
+    try {
+        const stat = await handle.stat();
+        if (!stat.isFile())
+            throw new Error(`${flag}: not a regular file.`);
+        if (stat.nlink !== 1)
+            throw new Error(`${flag}: more than one hard link; refusing to read it.`);
+        if (typeof process.getuid === 'function' && stat.uid !== process.getuid()) {
+            throw new Error(`${flag}: file is not owned by the current user.`);
+        }
+        if ((stat.mode & 0o077) !== 0)
+            throw new Error(`${flag}: file must not allow group or other access (chmod 600).`);
+        return (await handle.readFile({ encoding: 'utf8' })).trim();
+    }
+    finally {
+        await handle.close();
+    }
+}
+async function readStdin() {
+    const chunks = [];
+    for await (const chunk of process.stdin)
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+    return Buffer.concat(chunks).toString('utf8');
+}
+/**
+ * Explicit entry, stdin, private file, native-store reference, named shell variable.
+ * No implicit stdin consumption, env discovery or store probing. An empty selected
+ * source is an error, never permission to try a less preferred source.
+ */
+export async function resolveSensitiveInput(options = {}, dependencies = {}) {
+    const prefix = options.prefix ?? 'value';
+    const terminal = dependencies.isTTY ?? isInteractive();
+    const choices = `--${prefix}-interactive, --${prefix}-stdin, --${prefix}-file <path>, --${prefix}-store <name>, or --${prefix}-env <name>`;
+    const explicitSource = options.stdin || options.file !== undefined || options.store !== undefined || options.env !== undefined;
+    let value;
+    let source;
+    if (options.interactive || (!explicitSource && terminal)) {
+        if (!terminal)
+            throw new Error(`An interactive terminal is required; supply ${choices}.`);
+        source = `--${prefix}-interactive`;
+        if (dependencies.prompt)
+            value = await dependencies.prompt(prefix);
+        else {
+            const rl = createSecretPromptInterface();
+            try {
+                process.stderr.write(`Enter ${prefix} (hidden${options.multiline ? '; finish with an empty line' : ''}): `);
+                value = options.multiline ? await askMultilineSecret(rl, options.signal) : await askString(rl, '', '', options.signal);
+            }
+            finally {
+                rl.close();
+                process.stderr.write('\n');
+            }
+        }
+    }
+    else if (options.stdin) {
+        source = `--${prefix}-stdin`;
+        if (dependencies.stdinIsTTY ?? dependencies.isTTY ?? Boolean(process.stdin.isTTY))
+            throw new Error(`${source} requires piped input, not a terminal.`);
+        value = await (dependencies.readStdin ?? readStdin)();
+    }
+    else if (options.file !== undefined) {
+        source = `--${prefix}-file`;
+        value = await (dependencies.readFile ? dependencies.readFile(options.file) : readPrivateValueFile(options.file, source));
+    }
+    else if (options.store !== undefined) {
+        source = `--${prefix}-store`;
+        try {
+            value = await (dependencies.readStore ? dependencies.readStore(options.store) : namedSensitiveStore(options.store).loadSecret());
+        }
+        catch {
+            throw new Error(`${source}: native store entry could not be read.`);
+        }
+    }
+    else if (options.env !== undefined) {
+        source = `--${prefix}-env`;
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(options.env))
+            throw new Error(`${source} requires a shell variable name.`);
+        value = dependencies.readEnv ? dependencies.readEnv(options.env) : (dependencies.environment ?? process.env)[options.env];
+    }
+    else {
+        throw new Error(`A sensitive value requires an interactive terminal, or a key supplied via ${choices}.`);
+    }
+    const trimmed = value?.trim();
+    if (!trimmed)
+        throw new Error(`${source} received no key (input is empty or not set${options.env && source.endsWith('-env') ? `: ${options.env}` : ''}).`);
+    const controls = options.multiline ? /[\u0000-\u0009\u000b\u000c\u000e-\u001f\u007f]/ : /[\u0000-\u001f\u007f]/;
+    if (trimmed.length > 16384 || controls.test(trimmed))
+        throw new Error(`${source} requires ${options.multiline ? 'non-empty text without control characters' : 'one non-empty line'} (at most 16384 characters).`);
+    return trimmed;
+}
+//# sourceMappingURL=sensitive-input.js.map

package/dist/src/channel/manager.mjs

@@ -18,6 +18,7 @@ import { spawn } from 'child_process';
 import os from 'os';
 import { resolveUserConfigDir } from '../config/user-config-dir.mjs';
 import { boundedExecFileSync } from '../process/bounded-child-process.mjs';
+import { helperEnvironment } from '../process/cli-command.mjs';
 import {
   assertCanonicalInstallation,
   createInstallationIdentity,
@@ -594,10 +595,12 @@ export async function getVersionInfo() {
     try {
       const gitHash = boundedExecFileSync('git', ['rev-parse', '--short', 'HEAD'], 'quick', {
         cwd: config.edgePath,
+        env: helperEnvironment(),
         encoding: 'utf8',
       }).trim();
       const gitBranch = boundedExecFileSync('git', ['branch', '--show-current'], 'quick', {
         cwd: config.edgePath,
+        env: helperEnvironment(),
         encoding: 'utf8',
       }).trim();
       info.edgePath = config.edgePath;

package/dist/src/cli/handlers/agentcard.js

@@ -10,6 +10,7 @@
  * @issue #1253
  */
 import { fetchAgentCard } from '../../a2a/agent-card.js';
+import { resolveSensitiveInput, sensitiveInputOptions } from '../../auth/sensitive-input.js';
 import { loadJwkSet } from '../../a2a/jws.js';
 import { AiwgError, EXIT_CODES, handlerResultFromError } from '../errors.js';
 function parseVerifyArgs(args) {
@@ -39,6 +40,9 @@ function parseVerifyArgs(args) {
     }
     const jwks = get('--jwks');
     const bearer = get('--bearer');
+    if (args.includes('--bearer') && (!bearer || bearer.startsWith('--'))) {
+        throw new AiwgError({ code: 'ERR_AGENTCARD_BEARER', message: '--bearer requires a value; prefer --bearer-stdin, --bearer-file, --bearer-store or --bearer-env.', exitCode: EXIT_CODES.USAGE });
+    }
     const skipVerify = args.includes('--skip-verify');
     const json = args.includes('--json');
     if (!jwks && !skipVerify) {
@@ -73,36 +77,49 @@ async function loadJwksFromSource(source) {
 }
 async function handleVerify(args) {
     const parsed = parseVerifyArgs(args);
+    const sources = sensitiveInputOptions(args, 'bearer');
+    const hasSource = sources.interactive || sources.stdin || sources.file !== undefined || sources.store !== undefined || sources.env !== undefined;
+    if (parsed.bearer !== undefined) {
+        console.error('Warning: --bearer is deprecated and exposes the value on argv; use --bearer-interactive, --bearer-stdin, --bearer-file, --bearer-store or --bearer-env.');
+    }
+    // No source intentionally means public/unauthenticated access, even at a TTY.
+    const bearer = hasSource
+        ? await resolveSensitiveInput(sources)
+        : parsed.bearer === undefined ? undefined : await resolveSensitiveInput({ prefix: 'bearer', env: 'LEGACY_BEARER' }, { readEnv: () => parsed.bearer });
+    const redact = (text) => bearer ? text.split(bearer).join('[REDACTED]') : text;
+    const log = (text) => console.log(redact(text));
+    const error = (text) => console.error(redact(text));
+    const jsonReplacer = (_key, value) => typeof value === 'string' ? redact(value) : value;
     const opts = {
         skipVerify: parsed.skipVerify,
     };
-    if (parsed.bearer !== undefined)
-        opts.bearer = parsed.bearer;
-    if (parsed.jwks !== undefined && !parsed.skipVerify) {
-        opts.jwks = await loadJwksFromSource(parsed.jwks);
-    }
+    if (bearer !== undefined)
+        opts.bearer = bearer;
     let verified;
     try {
+        if (parsed.jwks !== undefined && !parsed.skipVerify) {
+            opts.jwks = await loadJwksFromSource(parsed.jwks);
+        }
         verified = await fetchAgentCard(parsed.host, parsed.instance, opts);
     }
     catch (err) {
         const message = err.message;
         if (parsed.json) {
-            console.log(JSON.stringify({
+            log(JSON.stringify({
                 ok: false,
                 host: parsed.host,
                 instance: parsed.instance,
                 error: message,
-            }, null, 2));
+            }, jsonReplacer, 2));
         }
         else {
-            console.error(`AgentCard verification FAILED for ${parsed.host}/${parsed.instance}`);
-            console.error(`  ${message}`);
+            error(`AgentCard verification FAILED for ${parsed.host}/${parsed.instance}`);
+            error(`  ${message}`);
         }
         return { exitCode: EXIT_CODES.GENERAL };
     }
     if (parsed.json) {
-        console.log(JSON.stringify({
+        log(JSON.stringify({
             ok: true,
             host: parsed.host,
             instance: parsed.instance,
@@ -118,38 +135,38 @@ async function handleVerify(args) {
                 capabilities: verified.card.capabilities,
                 skills: verified.card.skills,
             },
-        }, null, 2));
+        }, jsonReplacer, 2));
     }
     else {
         const banner = parsed.skipVerify ? '(verification SKIPPED)' : 'VERIFIED';
-        console.log(`AgentCard ${banner} for ${parsed.host}/${parsed.instance}`);
-        console.log(`  name:               ${verified.card.name}`);
-        console.log(`  protocolVersion:    ${verified.card.protocolVersion}`);
-        console.log(`  url:                ${verified.card.url}`);
-        console.log(`  version:            ${verified.card.version}`);
+        log(`AgentCard ${banner} for ${parsed.host}/${parsed.instance}`);
+        log(`  name:               ${verified.card.name}`);
+        log(`  protocolVersion:    ${verified.card.protocolVersion}`);
+        log(`  url:                ${verified.card.url}`);
+        log(`  version:            ${verified.card.version}`);
         if (verified.card.preferredTransport) {
-            console.log(`  preferredTransport: ${verified.card.preferredTransport}`);
+            log(`  preferredTransport: ${verified.card.preferredTransport}`);
         }
         if (verified.kid) {
-            console.log(`  signing kid:        ${verified.kid}`);
+            log(`  signing kid:        ${verified.kid}`);
         }
-        console.log(`  verifiedAt:         ${verified.verifiedAt}`);
+        log(`  verifiedAt:         ${verified.verifiedAt}`);
         const exts = verified.card.capabilities?.extensions ?? [];
         if (exts.length > 0) {
-            console.log(`  extensions:`);
+            log(`  extensions:`);
             for (const e of exts) {
                 const tag = e.required ? '[required]' : '[optional]';
-                console.log(`    ${tag} ${e.uri}`);
+                log(`    ${tag} ${e.uri}`);
             }
         }
         const skills = verified.card.skills ?? [];
         if (skills.length > 0) {
-            console.log(`  skills (${skills.length}):`);
+            log(`  skills (${skills.length}):`);
             for (const s of skills.slice(0, 5)) {
-                console.log(`    - ${s.id}${s.name ? ' (' + s.name + ')' : ''}`);
+                log(`    - ${s.id}${s.name ? ' (' + s.name + ')' : ''}`);
             }
             if (skills.length > 5)
-                console.log(`    ... and ${skills.length - 5} more`);
+                log(`    ... and ${skills.length - 5} more`);
         }
     }
     return { exitCode: 0 };
@@ -164,7 +181,12 @@ function printUsage() {
     console.log('  --host <url>        Executor host (e.g. https://exec.test)');
     console.log('  --instance <id>     Instance id (UUIDv7)');
     console.log('  --jwks <path|url>   JWKS file path or URL (required unless --skip-verify)');
-    console.log('  --bearer <token>    Optional bearer token for the card endpoint');
+    console.log('  --bearer-interactive  Read optional bearer in a terminal without echo');
+    console.log('  --bearer-stdin        Read optional bearer from piped stdin');
+    console.log('  --bearer-file <path>  Read optional bearer from an owner-only private file');
+    console.log('  --bearer-store <name> Read optional bearer from a named OS store entry');
+    console.log('  --bearer-env <NAME>   Read optional bearer from a named shell variable');
+    console.log('  --bearer <token>      Deprecated: exposes the value on argv');
     console.log('  --skip-verify       Skip JWS verification (NOT recommended)');
     console.log('  --json              Emit JSON output');
 }

package/dist/src/cli/handlers/auth.js

@@ -1,3 +1,4 @@
+import { namedSensitiveStore, resolveSensitiveInput, sensitiveInputOptions } from '../../auth/sensitive-input.js';
 import { AuthClient, defaultBrowserOpener } from "../../auth/client.js";
 import { authConfigFromEnvironment } from "../../auth/config.js";
 import { createCredentialStore } from "../../auth/credential-store.js";
@@ -5,6 +6,8 @@ function usage() {
     return [
         "Usage:",
         "  aiwg auth login [--device] [--device-label <label>] [--store native|file] [--allow-file-store]",
+        "  aiwg auth secret set <name> [--value-interactive | --value-stdin | --value-file <path> | --value-store <name> | --value-env <name>]",
+        "  aiwg auth secret delete <name>",
         "  aiwg auth status [--json] [--store native|file] [--allow-file-store]",
         "  aiwg auth logout [--all] [--store native|file] [--allow-file-store]",
         "",
@@ -46,9 +49,25 @@ export function createAuthHandler(dependencies = {}) {
                 return { exitCode: 0 };
             }
             const [subcommand, ...args] = ctx.args;
-            if (!["login", "status", "logout"].includes(subcommand))
+            if (!["login", "status", "logout", "secret"].includes(subcommand))
                 return { exitCode: 2, message: usage() };
             try {
+                if (subcommand === "secret") {
+                    const [operation, name, ...inputArgs] = args;
+                    if (!["set", "delete"].includes(operation) || !name || name.startsWith('--'))
+                        return { exitCode: 2, message: usage() };
+                    const store = (dependencies.secretStore ?? namedSensitiveStore)(name);
+                    if (operation === "delete")
+                        await store.deleteSecret();
+                    else {
+                        const secret = await resolveSensitiveInput({ ...sensitiveInputOptions(inputArgs), signal: ctx.signal }, {
+                            environment: dependencies.env, ...dependencies.sensitiveInput,
+                        });
+                        await store.saveSecret(secret);
+                    }
+                    console.log(operation === "delete" ? "Named sensitive value removed." : "Named sensitive value stored.");
+                    return { exitCode: 0 };
+                }
                 const storeMode = value(args, "--store") || "native";
                 if (!["native", "file"].includes(storeMode))
                     return { exitCode: 2, message: "--store must be native or file" };
@@ -119,7 +138,8 @@ export function createAuthHandler(dependencies = {}) {
                 return { exitCode: 0 };
             }
             catch (error) {
-                return { exitCode: classify(error), message: error instanceof Error ? error.message : String(error) };
+                return { exitCode: classify(error), message: subcommand === 'secret' && !/^(--value-|A sensitive value|An interactive terminal|Sensitive value store name)/.test(error instanceof Error ? error.message : '')
+                        ? 'Native sensitive value store operation failed.' : error instanceof Error ? error.message : String(error) };
             }
         },
     };

package/dist/src/cli/handlers/decision.js

@@ -1,10 +1,12 @@
+import { resolveSensitiveInput, sensitiveInputOptions } from '../../auth/sensitive-input.js';
+import { decisionPricing } from '../../decision/pricing.js';
 import { ATTRIBUTION_FIELD_PATTERN, DecisionAskUsageError, decisionCapabilities, DecisionLedgerSinceError, decisionLedgerHistory, decisionLedgerStats, evaluateRequestPath, listPatterns, livePlan, MAX_ATTRIBUTION_FIELD_LENGTH, materializeSyntheticClassificationSetup, parseDecisionLedgerSince, readDecisionContextFile, runDecisionOffloadCheckpoint, runOfflinePattern, setupJev, showPattern, syntheticClassificationSetup, validateDecisionInput, } from '../../decision/driver.js';
 function jsonResult(value, exitCode = 0) {
     return { exitCode, message: JSON.stringify(value, null, 2), rawOutput: true };
 }
 function usage() {
     return [
-        'Usage: aiwg decision <capabilities|status|patterns|validate|evaluate|setup|history|stats> [options]',
+        'Usage: aiwg decision <capabilities|status|patterns|validate|evaluate|setup|history|stats|pricing> [options]',
         '       aiwg decision ask --question "<q>" (--yes-no | --choices a,b,c | --scale 1-5) [--context <text> | --context-file <path> | --context-stdin] [--threshold 0.8] [--timeout-ms 15000] [--passes N] [--escalation-passes N] [--provider <id>] [--session <id>] [--caller <tag>] [--record-text] [--json]',
         '',
         'Commands:',
@@ -16,9 +18,10 @@ function usage() {
         '  validate <request|definition|ruleset|binding> <path>',
         '  evaluate --request <path> [--host-policy-module <path>]',
         '  setup synthetic-classification [--output-dir <dir>]',
-        '  setup jev [--token-stdin] [--region <r>] [--endpoint <url>] [--verify] [--remove]',
+        '  setup jev [--token-interactive | --token-stdin | --token-file <path> | --token-store <name> | --token-env <name>] [--region <r>] [--endpoint <url>] [--verify] [--remove]',
         '  ask --question "<q>" (--yes-no | --choices a,b,c | --scale 1-5) [--provider <id>] [--session <id>] [--caller <tag>] [--record-text]',
         '  history [--since <date>] [--provider <id>] [--session <id>] [--kind yes-no|choices|scale] [--status answered|fallback] [--caller <tag>|<prefix>* | --no-caller] [--json]',
+        '  pricing [--refresh --model jev-X.Y.Z] [--dry-run] [--offline | --allow-snapshot] [--json]',
         '  stats [--since <date>] [--provider <id>] [--session <id>] [--kind yes-no|choices|scale] [--status answered|fallback] [--caller <tag>|<prefix>* | --no-caller] [--group-by provider|session|kind|caller|passes|escalation] [--json]',
         '',
         'Notes:',
@@ -99,7 +102,7 @@ function takeAttributionOption(args, name, reason) {
     return value;
 }
 async function decisionSetupJev(rest) {
-    const token = rest.includes('--token-stdin') ? (await readStdin()).trim() : undefined;
+    const token = rest.includes('--remove') ? undefined : await resolveSensitiveInput(sensitiveInputOptions(rest, 'token'));
     const result = await setupJev({
         token,
         region: takeOption(rest, '--region'),
@@ -314,6 +317,7 @@ async function decisionStats(ctx) {
         `  jev usage: input=${group.jevUsage.inputTokens} output=${group.jevUsage.outputTokens}`,
         `  tokens per answered decision=${group.tokensPerAnsweredDecision?.toFixed(2) ?? '-'}`,
         `  llm_tokens_avoided=${group.llm_tokens_avoided} jev_tokens=${group.jev_tokens} cost_weighted_net_usd=${group.cost_weighted_net_usd.toFixed(6)}`,
+        ...group.ratesUsed.map(rate => `  rates used (${rate.calls} calls): ${JSON.stringify(rate.method)} source=${rate.method.source ?? 'manual'} checked_at=${rate.method.checked_at ?? 'unknown'}`),
         `  v1 comparison only: estimated LLM tokens avoided=${group.estimatedLlmTokensAvoidedTotal} net savings=${group.netSavingsTokens}`,
         ...(group.legacyReestimatedCalls ? [`  v1 records re-estimated=${group.legacyReestimatedCalls} weights=${JSON.stringify(result.legacyEstimationWeights)}`] : []),
     ]);
@@ -331,6 +335,21 @@ async function executeDecision(ctx) {
             return await decisionAsk(ctx);
         if (command === 'history')
             return await decisionHistory(ctx);
+        if (command === 'pricing') {
+            const args = ctx.args.slice(1);
+            assertLedgerArgs(args, ['--model'], ['--refresh', '--dry-run', '--offline', '--allow-snapshot', '--json']);
+            const result = await decisionPricing({ cwd: ctx.cwd, refresh: args.includes('--refresh'), dryRun: args.includes('--dry-run'),
+                offline: args.includes('--offline'), allowSnapshot: args.includes('--allow-snapshot'), model: args.includes('--model') ? takeRequiredOption(args, '--model') : undefined });
+            if (args.includes('--json'))
+                return jsonResult(result);
+            return { exitCode: 0, rawOutput: true, message: [
+                    `decision.ask.cost: ${JSON.stringify(result.current)}`,
+                    `Source URL: ${result.sourceUrl}`,
+                    ...('snapshotDate' in result && result.snapshotDate ? [`Bundled snapshot dated ${result.snapshotDate}`] : []),
+                    ...('warning' in result && result.warning ? [`Warning: ${result.warning}`] : []),
+                    ...('diff' in result ? [`${result.written ? 'Written' : 'Dry run; config unchanged'}: ${JSON.stringify(result.diff)}`] : []),
+                ].join('\n') };
+        }
         if (command === 'stats')
             return await decisionStats(ctx);
         if (command === 'patterns') {

package/dist/src/cli/handlers/effect.js

@@ -19,10 +19,8 @@
  * @see docs/contracts/effect-ledger.v1.md
  */
 import { readFile } from 'node:fs/promises';
-import { basename, resolve } from 'node:path';
-import { createSecretStore } from '../../auth/credential-store.js';
-import { readAiwgConfig } from '../../config/aiwg-config.js';
-import { CORE_EFFECT_KINDS, DEFAULT_LEDGER_KEY_SERVICE, EFFECT_EXIT_CODES, EFFECT_SUBSYSTEMS, EffectLedgerError, LEDGER_TEST_KEY_ENV, LedgerSigningKey, activeKey, containsRestrictedMaterial, createBuiltinVerifierRegistry, createTrackerVerifiers, credentialStoreKeyProvider, effectId as deriveEffectId, effectOutputJson, environmentTestKeyProvider, generateLedgerKeySecret, initLedgerKeyring, inspectLedgerLocks, isValidEffectId, ledgerLockRecoveryVerifier, lookupEffect, openEffectLedger, payloadDigest, readLedgerKeyring, reconcileEffect, recordIntent, recordOutcome, recordReconciled, recoverStaleLedgerLock, rotateKey, runVerifier, staticKeyProvider, verifyDecisionLinks, verifyLedger, writeCheckpoint, } from '../../effects/index.js';
+import { resolve } from 'node:path';
+import { CORE_EFFECT_KINDS, EFFECT_EXIT_CODES, EFFECT_SUBSYSTEMS, EffectLedgerError, LedgerSigningKey, activeKey, containsRestrictedMaterial, createBuiltinVerifierRegistry, createTrackerVerifiers, effectId as deriveEffectId, effectOutputJson, generateLedgerKeySecret, initLedgerKeyring, inspectLedgerLocks, isValidEffectId, ledgerLockRecoveryVerifier, lookupEffect, payloadDigest, readLedgerKeyring, reconcileEffect, recordIntent, recordOutcome, recordReconciled, recoverStaleLedgerLock, rotateKey, runVerifier, staticKeyProvider, verifyDecisionLinks, verifyLedger, writeCheckpoint, } from '../../effects/index.js';
 import { parseLedgerPrivateKey } from '../../effects/keys.js';
 import { JsonlOperatorDecisionStore, verifyDecisionChain } from '../../audit/operator-decision.js';
 import { readConfig, readGitRemoteUrls } from '../../tracker/project-inputs.js';
@@ -166,77 +164,7 @@ function keyValue(entry, flag) {
         throw usage(`--${flag} expects key=value`, 'invalid-key-value');
     return [entry.slice(0, eq), entry.slice(eq + 1)];
 }
-const IDENTIFIER = /^[A-Za-z0-9][A-Za-z0-9._:/@-]{0,255}$/;
-function defaultProject(projectDir) {
-    const cleaned = basename(resolve(projectDir)).replace(/[^A-Za-z0-9._:/@-]/g, '-').replace(/^[^A-Za-z0-9]+/, '');
-    return cleaned && IDENTIFIER.test(cleaned) ? cleaned : 'project';
-}
-async function hostConfig(projectDir) {
-    let config;
-    try {
-        config = await readAiwgConfig(projectDir);
-    }
-    catch {
-        throw new EffectLedgerError('usage', 'aiwg.config could not be read', 'config-unreadable');
-    }
-    const effects = config?.effects;
-    if (effects === undefined || effects === null)
-        return {};
-    if (typeof effects !== 'object' || Array.isArray(effects))
-        throw usage('aiwg.config effects must be an object', 'config-invalid');
-    return effects;
-}
-function testContext(env) {
-    return env.VITEST === 'true' || env.NODE_ENV === 'test' || env.CI === 'true' || env.CI === '1';
-}
-function keyStore(session, role) {
-    const { deps, config, account } = session;
-    if (deps.keyStore)
-        return deps.keyStore(role, account);
-    if (session.env[LEDGER_TEST_KEY_ENV] && testContext(session.env))
-        return null;
-    const provider = config.keyProvider ?? {};
-    try {
-        if (provider.type === 'file') {
-            if (!provider.path)
-                throw new Error('missing path');
-            const pathname = resolve(session.projectDir, provider.path);
-            return createSecretStore({ useFile: true, allowFile: true, pathname: role === 'next' ? `${pathname}.next` : pathname, service: DEFAULT_LEDGER_KEY_SERVICE, account });
-        }
-        if (provider.type !== undefined && provider.type !== 'credential-store')
-            throw new Error('unknown provider');
-        return createSecretStore({ service: provider.service ?? DEFAULT_LEDGER_KEY_SERVICE, account: role === 'next' ? `${account}.next` : account });
-    }
-    catch {
-        throw new EffectLedgerError('key-unavailable', 'Effect ledger key provider is not configured correctly on this host', 'key-provider-invalid');
-    }
-}
-function keyProvider(session) {
-    const store = keyStore(session, 'current');
-    if (!store)
-        return environmentTestKeyProvider(session.env);
-    return credentialStoreKeyProvider({ account: session.account, store });
-}
-function describeKeyProvider(session) {
-    if (session.deps.keyStore)
-        return { type: 'injected', account: session.account };
-    if (session.env[LEDGER_TEST_KEY_ENV] && testContext(session.env))
-        return { type: 'environment-test-key' };
-    const provider = session.config.keyProvider ?? {};
-    if (provider.type === 'file')
-        return { type: 'file', account: session.account };
-    return { type: 'credential-store', service: provider.service ?? DEFAULT_LEDGER_KEY_SERVICE, account: session.account };
-}
-function openLedger(session, registry) {
-    const writer = session.config.writer ?? 'cli';
-    return openEffectLedger({
-        projectDir: session.projectDir, scope: session.scope, writer, keyProvider: keyProvider(session),
-        ...(session.deps.clock ? { clock: session.deps.clock } : {}),
-        ...(session.deps.sink ? { sink: session.deps.sink } : {}),
-        ...(registry ? { verifiers: registry } : {}),
-        ...(session.deps.lockTimeoutMs ? { lockTimeoutMs: session.deps.lockTimeoutMs } : {}),
-    });
-}
+import { effectSession, keyStore, describeKeyProvider, openLedger } from '../../effects/host.js';
 /**
  * The one place the CLI builds its verifier registry: the built-ins, lock
  * recovery, the tracker verifiers (#2719) and any injected extensions.
@@ -804,15 +732,7 @@ async function execute(ctx, deps) {
             throw usage('--format must be json or text', 'invalid-format');
         const projectDir = resolve(one(parsed, 'project-dir') ?? ctx.cwd ?? process.cwd());
         const subsystem = resolveSubsystem(parsed);
-        const config = await hostConfig(projectDir);
-        const tenant = config.tenant ?? 'local';
-        const project = config.project ?? defaultProject(projectDir);
-        if (!IDENTIFIER.test(tenant) || !IDENTIFIER.test(project))
-            throw usage('aiwg.config effects tenant and project must be identifiers', 'config-invalid');
-        const scope = { tenant, project, subsystem };
-        const env = deps.env ?? process.env;
-        const account = config.keyProvider?.account ?? `ledger/${tenant}/${project}/${subsystem}`;
-        const session = { projectDir, scope, config, account, deps, env };
+        const session = await effectSession(projectDir, subsystem, deps);
         let rendered;
         switch (sub) {
             case 'id':