@trading-boy/cli 0.3.6 → 0.3.7

package/dist/commands/journal.js

@@ -1,43 +1,9 @@
 import { Option } from 'commander';
-import ioredis from 'ioredis';
-const { Redis } = ioredis;
-import { getConfig, createLogger, DecisionType, ActorType, PlanStatus, } from '@trading-boy/core';
-import { Neo4jClient, createDecisionEvent, linkDecisionToToken, linkDecisionToTrader, linkEntryToExit, getDecisionChain, publishDecision, } from '@trading-boy/graph-db';
-import { formatConnectionError } from '../utils.js';
-import { isRemoteMode, apiRequest, ApiError } from '../api-client.js';
-import { buildPreState, buildDefaultPreState, createPlan, getPlan, executePlan, computeKellySizing, extractSetupStats, getStatsBySetupType, } from '@trading-boy/context-engine';
-import { TimescaleClient } from '@trading-boy/timeseries-db';
+import { padRight } from '../utils.js';
+import { apiRequest, ApiError } from '../api-client.js';
 import { registerReviewCommand } from './review.js';
-// ─── Logger ───
-const logger = createLogger('cli-journal');
 // ─── Default Trader ───
 const DEFAULT_TRADER_ID = 'default';
-// ─── Neo4j Client Factory ───
-function createNeo4jClient() {
-    const config = getConfig();
-    return new Neo4jClient({
-        uri: config.NEO4J_URI,
-        username: config.NEO4J_USER,
-        password: config.NEO4J_PASSWORD,
-    });
-}
-function createRedisClient() {
-    const config = getConfig();
-    return new Redis(config.REDIS_URL, {
-        password: config.REDIS_PASSWORD || undefined,
-        lazyConnect: true,
-    });
-}
-function createTimescaleClient() {
-    const config = getConfig();
-    return new TimescaleClient({
-        host: config.TIMESCALE_HOST,
-        port: config.TIMESCALE_PORT,
-        user: config.TIMESCALE_USER,
-        password: config.TIMESCALE_PASSWORD,
-        database: config.TIMESCALE_DB,
-    });
-}
 // ─── Command Registration ───
 export function registerJournalCommand(program) {
     const journal = program
@@ -68,6 +34,7 @@ export function registerJournalCommand(program) {
         .option('--tx-hash <txHash>', 'Solana transaction signature')
         .option('--triggers <triggers...>', 'What initiated the trade')
         .option('--plan <planId>', 'Link to a pre-trade plan (auto-fills fields)')
+        .addOption(new Option('--format <format>', 'Output format').choices(['text', 'json']).default('text'))
         .action(async (symbol, options) => {
         // ─── Input validation ───
         if (options.direction !== undefined && !['LONG', 'SHORT'].includes(options.direction.toUpperCase())) {
@@ -85,144 +52,41 @@ export function registerJournalCommand(program) {
             process.exitCode = 1;
             return;
         }
-        // ─── Remote API mode ───
-        if (await isRemoteMode()) {
-            try {
-                const result = await apiRequest('/api/v1/decisions', {
-                    method: 'POST',
-                    body: {
-                        traderId: options.trader,
-                        decisionType: 'TRADE_ENTRY',
-                        tokenSymbol: symbol.toUpperCase(),
-                        ...(options.mint ? { tokenMint: options.mint } : {}),
-                        direction: options.direction?.toUpperCase(),
-                        entryPrice: options.price,
-                        size: options.size,
-                        sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
-                        thesis: options.thesis,
-                        setupType: options.setup,
-                        emotionalTag: options.emotion,
-                        confidence: options.confidence,
-                        triggers: options.triggers,
-                        txHash: options.txHash,
-                    },
-                });
-                console.log(`Entry logged: id=${result.id} hash=${result.hash}`);
-            }
-            catch (error) {
-                const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
-                console.error(`Error: ${message}`);
-                if (error instanceof ApiError && error.body && typeof error.body === 'object') {
-                    const detail = error.body.error ?? error.body.code;
-                    if (detail)
-                        console.error(`Detail: ${detail}`);
-                }
-                process.exitCode = 1;
-            }
-            return;
-        }
-        const client = createNeo4jClient();
-        const redis = createRedisClient();
-        const tsClient = createTimescaleClient();
         try {
-            await client.connect();
-            await redis.connect();
-            await tsClient.connect();
-            const tokenSymbol = symbol.toUpperCase();
-            // If --plan provided, look up the plan and auto-fill fields
-            let linkedPlan = null;
-            if (options.plan) {
-                linkedPlan = await getPlan(tsClient, options.plan);
-                if (!linkedPlan) {
-                    console.error(`Error: Plan ${options.plan} not found`);
-                    process.exitCode = 1;
-                    return;
-                }
-                if (linkedPlan.status !== PlanStatus.DRAFT) {
-                    console.error(`Error: Plan ${options.plan} is already ${linkedPlan.status}`);
-                    process.exitCode = 1;
-                    return;
-                }
-                logger.info({ planId: options.plan }, 'Auto-filling entry from plan');
-            }
-            // Build real pre-state (fallback to defaults on failure)
-            let preState;
-            try {
-                preState = await buildPreState({ tsClient, redis }, tokenSymbol);
-            }
-            catch {
-                preState = buildDefaultPreState();
-            }
-            const eventTime = new Date();
-            const input = {
-                traderId: options.trader,
-                decisionType: DecisionType.TRADE_ENTRY,
-                actor: ActorType.HUMAN,
-                tokenSymbol,
-                ...(options.mint ? { tokenMint: options.mint } : {}),
-                eventTime,
-                preState,
-                thesis: options.thesis ?? linkedPlan?.thesis,
-                setupType: (options.setup ?? linkedPlan?.setupType),
-                direction: (options.direction ?? linkedPlan?.direction),
-                entryPrice: options.price ?? linkedPlan?.entryTarget,
-                size: options.size,
-                sizeUsd: options.sizeUsd ?? (() => {
-                    const ep = options.price ?? linkedPlan?.entryTarget;
-                    return options.size && ep ? options.size * ep : undefined;
-                })(),
-                emotionalTag: (options.emotion ?? linkedPlan?.emotionalTag),
-                confidence: options.confidence ?? linkedPlan?.confidence,
-                triggers: options.triggers,
-                txHash: options.txHash,
-            };
-            const { id, hash } = await createDecisionEvent(client, input);
-            await linkDecisionToToken(client, id, tokenSymbol);
-            await linkDecisionToTrader(client, id, options.trader);
-            // Mark plan as executed
-            if (linkedPlan) {
-                await executePlan(tsClient, linkedPlan.id, id);
-                logger.info({ planId: linkedPlan.id, decisionId: id }, 'Plan executed');
-            }
-            // Publish to stream (fire-and-forget)
-            publishDecision(redis, {
-                decisionId: id,
-                traderId: options.trader,
-                decisionType: DecisionType.TRADE_ENTRY,
-                actor: ActorType.HUMAN,
-                tokenSymbol,
-                ...(options.mint ? { tokenMint: options.mint } : {}),
-                eventTime: eventTime.toISOString(),
-                preState,
-                thesis: options.thesis,
-                setupType: options.setup,
-                emotionalTag: options.emotion,
-                confidence: options.confidence,
-                direction: options.direction,
-                entryPrice: options.price,
-                size: options.size,
-                sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
-                txHash: options.txHash,
-                triggers: options.triggers,
-            }).catch((error) => {
-                logger.warn({ decisionId: id, error: error instanceof Error ? error.message : String(error) }, 'Failed to publish entry to stream (non-fatal)');
+            const result = await apiRequest('/api/v1/decisions', {
+                method: 'POST',
+                body: {
+                    traderId: options.trader,
+                    decisionType: 'TRADE_ENTRY',
+                    tokenSymbol: symbol.toUpperCase(),
+                    ...(options.mint ? { tokenMint: options.mint } : {}),
+                    direction: options.direction?.toUpperCase(),
+                    entryPrice: options.price,
+                    size: options.size,
+                    sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
+                    thesis: options.thesis,
+                    setupType: options.setup,
+                    emotionalTag: options.emotion,
+                    confidence: options.confidence,
+                    triggers: options.triggers,
+                    txHash: options.txHash,
+                },
             });
-            logger.info({ id, hash }, 'Entry logged');
-            console.log(`Entry logged: id=${id} hash=${hash}`);
+            if (options.format === 'json') {
+                console.log(JSON.stringify(result, null, 2));
+                return;
+            }
+            console.log(`Entry logged: id=${result.id} hash=${result.hash}`);
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.error({ error: message }, 'Failed to log entry');
+            const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
             console.error(`Error: ${message}`);
-            const guidance = formatConnectionError(message);
-            if (guidance)
-                console.error(guidance);
-            process.exitCode = 1;
-        }
-        finally {
-            await redis.quit().catch(() => { });
-            await tsClient.disconnect().catch(() => { });
-            await client.disconnect();
+            if (error instanceof ApiError && error.body && typeof error.body === 'object') {
+                const detail = error.body.error ?? error.body.code;
+                if (detail)
+                    console.error(`Detail: ${detail}`);
+            }
+            process.exitCode = error instanceof ApiError ? 2 : 1;
         }
     });
     // ─── journal log exit <symbol> ───
@@ -237,133 +101,39 @@ export function registerJournalCommand(program) {
         .option('--thesis <thesis>', 'Exit reasoning')
         .option('--size <size>', 'Position size in token units', parseFloat)
         .option('--size-usd <sizeUsd>', 'Position size in USD', parseFloat)
+        .addOption(new Option('--format <format>', 'Output format').choices(['text', 'json']).default('text'))
         .action(async (symbol, options) => {
-        // ─── Remote API mode ───
-        if (await isRemoteMode()) {
-            try {
-                const result = await apiRequest('/api/v1/decisions', {
-                    method: 'POST',
-                    body: {
-                        traderId: options.trader,
-                        decisionType: 'TRADE_EXIT',
-                        tokenSymbol: symbol.toUpperCase(),
-                        ...(options.mint ? { tokenMint: options.mint } : {}),
-                        exitPrice: options.price,
-                        thesis: options.thesis,
-                        size: options.size,
-                        sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
-                        txHash: options.txHash,
-                        linkedEntryId: options.linkEntry,
-                    },
-                });
-                console.log(`Exit logged: id=${result.id} hash=${result.hash}`);
-            }
-            catch (error) {
-                const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
-                console.error(`Error: ${message}`);
-                if (error instanceof ApiError && error.body && typeof error.body === 'object') {
-                    const detail = error.body.error ?? error.body.code;
-                    if (detail)
-                        console.error(`Detail: ${detail}`);
-                }
-                process.exitCode = 1;
-            }
-            return;
-        }
-        const client = createNeo4jClient();
-        const redis = createRedisClient();
-        const tsClient = createTimescaleClient();
         try {
-            await client.connect();
-            await redis.connect();
-            await tsClient.connect();
-            const tokenSymbol = symbol.toUpperCase();
-            // Build real pre-state (fallback to defaults on failure)
-            let preState;
-            try {
-                preState = await buildPreState({ tsClient, redis }, tokenSymbol);
-            }
-            catch {
-                preState = buildDefaultPreState();
-            }
-            const eventTime = new Date();
-            // Fetch entry for linking if provided
-            let entryRecord;
-            if (options.linkEntry) {
-                const chain = await getDecisionChain(client, options.trader, { tokenSymbol });
-                entryRecord = chain.find((d) => d.id === options.linkEntry);
-            }
-            const input = {
-                traderId: options.trader,
-                decisionType: DecisionType.TRADE_EXIT,
-                actor: ActorType.HUMAN,
-                tokenSymbol,
-                ...(options.mint ? { tokenMint: options.mint } : {}),
-                eventTime,
-                preState,
-                exitPrice: options.price,
-                thesis: options.thesis,
-                size: options.size,
-                sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
-                txHash: options.txHash,
-                linkedEntryId: options.linkEntry,
-            };
-            const { id, hash } = await createDecisionEvent(client, input);
-            await linkDecisionToToken(client, id, tokenSymbol);
-            await linkDecisionToTrader(client, id, options.trader);
-            // Link entry to exit via FOLLOWED_BY edge
-            if (options.linkEntry) {
-                await linkEntryToExit(client, options.linkEntry, id);
-                logger.debug({ entryId: options.linkEntry, exitId: id }, 'Linked entry to exit');
-            }
-            // Publish to stream (fire-and-forget)
-            const publishInput = {
-                decisionId: id,
-                traderId: options.trader,
-                decisionType: DecisionType.TRADE_EXIT,
-                actor: ActorType.HUMAN,
-                tokenSymbol,
-                ...(options.mint ? { tokenMint: options.mint } : {}),
-                eventTime: eventTime.toISOString(),
-                preState,
-                exitPrice: options.price,
-                thesis: options.thesis,
-                size: options.size,
-                sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
-                txHash: options.txHash,
-                linkedEntryId: options.linkEntry,
-            };
-            // Embed entry fields for PnL computation
-            if (entryRecord) {
-                publishInput.entryId = entryRecord.id;
-                publishInput.entryTokenMint = entryRecord.tokenMint;
-                publishInput.entryDirection = entryRecord.direction ?? undefined;
-                publishInput.entryEntryPrice = entryRecord.entryPrice ?? undefined;
-                publishInput.entrySizeUsd = entryRecord.sizeUsd ?? undefined;
-                publishInput.entryEventTime = entryRecord.eventTime;
-                publishInput.entryTraderId = options.trader;
-                publishInput.entrySetupType = entryRecord.setupType ?? undefined;
-                publishInput.entryEmotionalTag = entryRecord.emotionalTag ?? undefined;
-            }
-            publishDecision(redis, publishInput).catch((error) => {
-                logger.warn({ decisionId: id, error: error instanceof Error ? error.message : String(error) }, 'Failed to publish exit to stream (non-fatal)');
+            const result = await apiRequest('/api/v1/decisions', {
+                method: 'POST',
+                body: {
+                    traderId: options.trader,
+                    decisionType: 'TRADE_EXIT',
+                    tokenSymbol: symbol.toUpperCase(),
+                    ...(options.mint ? { tokenMint: options.mint } : {}),
+                    exitPrice: options.price,
+                    thesis: options.thesis,
+                    size: options.size,
+                    sizeUsd: options.sizeUsd ?? (options.size && options.price ? options.size * options.price : undefined),
+                    txHash: options.txHash,
+                    linkedEntryId: options.linkEntry,
+                },
             });
-            logger.info({ id, hash }, 'Exit logged');
-            console.log(`Exit logged: id=${id} hash=${hash}`);
+            if (options.format === 'json') {
+                console.log(JSON.stringify(result, null, 2));
+                return;
+            }
+            console.log(`Exit logged: id=${result.id} hash=${result.hash}`);
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.error({ error: message }, 'Failed to log exit');
+            const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
             console.error(`Error: ${message}`);
-            const guidance = formatConnectionError(message);
-            if (guidance)
-                console.error(guidance);
-            process.exitCode = 1;
-        }
-        finally {
-            await redis.quit().catch(() => { });
-            await tsClient.disconnect().catch(() => { });
-            await client.disconnect();
+            if (error instanceof ApiError && error.body && typeof error.body === 'object') {
+                const detail = error.body.error ?? error.body.code;
+                if (detail)
+                    console.error(`Detail: ${detail}`);
+            }
+            process.exitCode = error instanceof ApiError ? 2 : 1;
         }
     });
     // ─── journal list ───
@@ -373,68 +143,30 @@ export function registerJournalCommand(program) {
         .option('--token <symbol>', 'Filter by token symbol')
         .option('--limit <n>', 'Maximum number of results', parseInt, 10)
         .option('--trader <traderId>', 'Trader ID', DEFAULT_TRADER_ID)
+        .addOption(new Option('--format <format>', 'Output format').choices(['text', 'json']).default('text'))
         .action(async (options) => {
-        // ─── Remote API mode ───
-        if (await isRemoteMode()) {
-            try {
-                const params = new URLSearchParams();
-                if (options.trader)
-                    params.set('traderId', options.trader);
-                if (options.token)
-                    params.set('tokenSymbol', options.token.toUpperCase());
-                if (options.limit)
-                    params.set('limit', String(options.limit));
-                const qs = params.toString() ? `?${params.toString()}` : '';
-                const result = await apiRequest(`/api/v1/decisions${qs}`);
-                const decisions = result.decisions ?? [];
-                if (decisions.length === 0) {
-                    console.log('No decisions found.');
-                    return;
-                }
-                // Print formatted table
-                console.log('');
-                console.log(padRight('ID', 38) +
-                    padRight('Type', 20) +
-                    padRight('Token', 8) +
-                    padRight('Direction', 10) +
-                    padRight('Price', 12) +
-                    padRight('Confidence', 12) +
-                    padRight('Hash', 10));
-                console.log('-'.repeat(110));
-                for (const d of decisions) {
-                    const price = (d.entryPrice ?? d.exitPrice);
-                    console.log(padRight(String(d.id ?? ''), 38) +
-                        padRight(String(d.decisionType ?? ''), 20) +
-                        padRight(String(d.tokenSymbol ?? ''), 8) +
-                        padRight(String(d.direction ?? '-'), 10) +
-                        padRight(price !== null && price !== undefined ? Number(price).toFixed(2) : '-', 12) +
-                        padRight(d.confidence !== null && d.confidence !== undefined ? Number(d.confidence).toFixed(2) : '-', 12) +
-                        (d.hash ? String(d.hash).slice(0, 8) + '...' : '-'));
+        try {
+            const params = new URLSearchParams();
+            if (options.trader)
+                params.set('traderId', options.trader);
+            if (options.token)
+                params.set('tokenSymbol', options.token.toUpperCase());
+            if (options.limit)
+                params.set('limit', String(options.limit));
+            const qs = params.toString() ? `?${params.toString()}` : '';
+            const result = await apiRequest(`/api/v1/decisions${qs}`);
+            const decisions = result.decisions ?? [];
+            if (decisions.length === 0) {
+                if (options.format === 'json') {
+                    console.log(JSON.stringify({ decisions: [] }, null, 2));
                 }
-                console.log('');
-                console.log(`Total: ${decisions.length} decision(s)`);
-            }
-            catch (error) {
-                const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
-                console.error(`Error: ${message}`);
-                if (error instanceof ApiError && error.body && typeof error.body === 'object') {
-                    const detail = error.body.error ?? error.body.code;
-                    if (detail)
-                        console.error(`Detail: ${detail}`);
+                else {
+                    console.log('No decisions found.');
                 }
-                process.exitCode = 1;
+                return;
             }
-            return;
-        }
-        const client = createNeo4jClient();
-        try {
-            await client.connect();
-            const decisions = await getDecisionChain(client, options.trader, {
-                tokenSymbol: options.token,
-                limit: options.limit,
-            });
-            if (decisions.length === 0) {
-                console.log('No decisions found.');
+            if (options.format === 'json') {
+                console.log(JSON.stringify(result, null, 2));
                 return;
             }
             // Print formatted table
@@ -448,293 +180,102 @@ export function registerJournalCommand(program) {
                 padRight('Hash', 10));
             console.log('-'.repeat(110));
             for (const d of decisions) {
-                const price = d.entryPrice ?? d.exitPrice;
-                console.log(padRight(d.id, 38) +
-                    padRight(d.decisionType, 20) +
-                    padRight(d.tokenSymbol, 8) +
-                    padRight(d.direction ?? '-', 10) +
-                    padRight(price !== null ? price.toFixed(2) : '-', 12) +
-                    padRight(d.confidence.toFixed(2), 12) +
-                    (d.hash ? d.hash.slice(0, 8) + '...' : '-'));
+                const price = (d.entryPrice ?? d.exitPrice);
+                console.log(padRight(String(d.id ?? ''), 38) +
+                    padRight(String(d.decisionType ?? ''), 20) +
+                    padRight(String(d.tokenSymbol ?? ''), 8) +
+                    padRight(String(d.direction ?? '-'), 10) +
+                    padRight(price !== null && price !== undefined ? Number(price).toFixed(2) : '-', 12) +
+                    padRight(d.confidence !== null && d.confidence !== undefined ? Number(d.confidence).toFixed(2) : '-', 12) +
+                    (d.hash ? String(d.hash).slice(0, 8) + '...' : '-'));
             }
             console.log('');
             console.log(`Total: ${decisions.length} decision(s)`);
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.error({ error: message }, 'Failed to list decisions');
+            const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
             console.error(`Error: ${message}`);
-            const guidance = formatConnectionError(message);
-            if (guidance)
-                console.error(guidance);
-            process.exitCode = 1;
-        }
-        finally {
-            await client.disconnect();
+            if (error instanceof ApiError && error.body && typeof error.body === 'object') {
+                const detail = error.body.error ?? error.body.code;
+                if (detail)
+                    console.error(`Detail: ${detail}`);
+            }
+            process.exitCode = error instanceof ApiError ? 2 : 1;
         }
     });
-    // ─── journal plan <symbol> ───
+    // ─── journal plan ───
     journal
-        .command('plan <symbol>')
-        .description('Create a pre-trade plan before entry')
-        .requiredOption('--thesis <thesis>', 'The reasoning behind the trade')
-        .requiredOption('--setup <setup>', 'Setup type (BREAKOUT, MOMENTUM, etc.)')
-        .requiredOption('--direction <direction>', 'Trade direction (LONG, SHORT)')
-        .requiredOption('--entry-target <price>', 'Planned entry price', parseFloat)
-        .requiredOption('--invalidation <price>', 'Invalidation / stop-loss price', parseFloat)
-        .requiredOption('--take-profit <price>', 'Take-profit target price', parseFloat)
-        .option('--risk-percent <pct>', 'Percentage of portfolio to risk', parseFloat, 2)
-        .option('--confidence <confidence>', 'Confidence level (0-1)', parseFloat, 0.5)
-        .option('--emotion <emotion>', 'Emotional tag (CONVICTION, FOMO, REVENGE, IMPULSE, FEAR, GREED, NEUTRAL)', 'NEUTRAL')
+        .command('plan')
+        .description('List pre-trade plans')
         .option('--trader <traderId>', 'Trader ID', DEFAULT_TRADER_ID)
+        .option('--token <symbol>', 'Filter by token symbol')
+        .option('--status <status>', 'Filter by status: PENDING, EXECUTED, CANCELLED, EXPIRED')
+        .option('--limit <n>', 'Maximum results', parseInt, 50)
         .addOption(new Option('--format <format>', 'Output format').choices(['text', 'json']).default('text'))
-        .action(async (symbol, options) => {
-        // Input validation
-        if (!['LONG', 'SHORT'].includes(options.direction.toUpperCase())) {
-            console.error('Error: --direction must be LONG or SHORT');
-            process.exitCode = 1;
-            return;
-        }
-        if (options.confidence < 0 || options.confidence > 1) {
-            console.error('Error: --confidence must be between 0 and 1');
-            process.exitCode = 1;
-            return;
-        }
-        if (options.riskPercent <= 0 || options.riskPercent > 100) {
-            console.error('Error: --risk-percent must be between 0 and 100');
-            process.exitCode = 1;
-            return;
-        }
-        // Price validation: all prices must be positive
-        if (options.entryTarget <= 0 || options.invalidation <= 0 || options.takeProfit <= 0) {
-            console.error('Error: --entry-target, --invalidation, and --take-profit must be positive numbers');
-            process.exitCode = 1;
-            return;
-        }
-        // Price ordering validation
-        const dir = options.direction.toUpperCase();
-        if (dir === 'LONG' && !(options.invalidation < options.entryTarget && options.entryTarget < options.takeProfit)) {
-            console.error('Error: LONG requires invalidation < entry-target < take-profit');
-            process.exitCode = 1;
-            return;
-        }
-        if (dir === 'SHORT' && !(options.takeProfit < options.entryTarget && options.entryTarget < options.invalidation)) {
-            console.error('Error: SHORT requires take-profit < entry-target < invalidation');
-            process.exitCode = 1;
-            return;
-        }
-        const client = createNeo4jClient();
-        const redis = createRedisClient();
-        const tsClient = createTimescaleClient();
+        .action(async (options) => {
         try {
-            await client.connect();
-            await redis.connect();
-            await tsClient.connect();
-            const tokenSymbol = symbol.toUpperCase();
-            const direction = options.direction.toUpperCase();
-            // Build pre-state
-            let preState;
-            try {
-                preState = await buildPreState({ tsClient, redis }, tokenSymbol);
-            }
-            catch {
-                preState = buildDefaultPreState();
-            }
-            // Compute Kelly suggestion from historical setup stats
-            let kellySuggestion = null;
-            try {
-                const setupStats = await getStatsBySetupType(client, options.trader);
-                const setupKey = options.setup.toUpperCase();
-                const stats = setupStats.get(setupKey);
-                if (stats && stats.totalTrades > 0) {
-                    // Need to get raw decisions for avg win/loss calculation
-                    // Use extractSetupStats from Kelly module with the stats we have
-                    const decisions = await getDecisionChain(client, options.trader, {
-                        tokenSymbol: undefined,
-                        limit: 500,
-                    });
-                    const setupDecisions = decisions.filter((d) => d.setupType === setupKey && d.pnlAbsolute !== null);
-                    const kellyStats = extractSetupStats(setupDecisions);
-                    const kellyResult = computeKellySizing(kellyStats, preState.portfolioValueUsd);
-                    kellySuggestion = kellyResult.fractionalKelly;
-                }
-            }
-            catch {
-                // Non-fatal — proceed without Kelly
-                logger.debug('Could not compute Kelly suggestion');
-            }
-            const plan = await createPlan(tsClient, {
-                traderId: options.trader,
-                tokenSymbol,
-                direction,
-                thesis: options.thesis,
-                setupType: options.setup.toUpperCase(),
-                entryTarget: options.entryTarget,
-                invalidationPrice: options.invalidation,
-                takeProfitPrice: options.takeProfit,
-                riskPercent: options.riskPercent,
-                confidence: options.confidence,
-                emotionalTag: options.emotion.toUpperCase(),
-                preState,
-                kellySuggestion,
-            });
+            const params = new URLSearchParams();
+            params.set('traderId', options.trader);
+            if (options.token)
+                params.set('tokenSymbol', options.token);
+            if (options.status)
+                params.set('status', options.status);
+            params.set('limit', String(options.limit));
+            const data = await apiRequest(`/api/v1/journal/plan?${params.toString()}`);
             if (options.format === 'json') {
-                console.log(JSON.stringify({
-                    id: plan.id,
-                    tokenSymbol: plan.tokenSymbol,
-                    direction: plan.direction,
-                    setupType: plan.setupType,
-                    thesis: plan.thesis,
-                    entryTarget: plan.entryTarget,
-                    invalidationPrice: plan.invalidationPrice,
-                    takeProfitPrice: plan.takeProfitPrice,
-                    riskRewardRatio: plan.riskRewardRatio,
-                    riskPercent: plan.riskPercent,
-                    confidence: plan.confidence,
-                    kellySuggestion,
-                    status: plan.status,
-                    createdAt: plan.createdAt,
-                }, null, 2));
+                console.log(JSON.stringify(data, null, 2));
             }
             else {
-                console.log('');
-                console.log(`═══ Pre-Trade Plan Created ═══`);
-                console.log(`Plan ID:      ${plan.id}`);
-                console.log(`Token:        ${plan.tokenSymbol}`);
-                console.log(`Direction:    ${plan.direction}`);
-                console.log(`Setup:        ${plan.setupType}`);
-                console.log(`Thesis:       ${plan.thesis}`);
-                console.log('');
-                console.log(`Entry Target: $${plan.entryTarget.toFixed(2)}`);
-                console.log(`Invalidation: $${plan.invalidationPrice.toFixed(2)}`);
-                console.log(`Take Profit:  $${plan.takeProfitPrice.toFixed(2)}`);
-                console.log(`R:R Ratio:    ${plan.riskRewardRatio.toFixed(2)}`);
-                console.log(`Risk:         ${plan.riskPercent}% of portfolio`);
-                console.log(`Confidence:   ${plan.confidence}`);
-                if (kellySuggestion !== null && kellySuggestion > 0) {
-                    const posSize = preState.portfolioValueUsd * kellySuggestion;
-                    console.log(`Kelly (Half): ${(kellySuggestion * 100).toFixed(1)}% → $${posSize.toFixed(0)}`);
+                if (data.plans.length === 0) {
+                    console.log('  No pre-trade plans found.');
+                }
+                else {
+                    console.log(`\n  Pre-Trade Plans (${data.count}):\n`);
+                    for (const plan of data.plans) {
+                        console.log(`  ${padRight(String(plan.id ?? ''), 14)} ${padRight(String(plan.tokenSymbol ?? ''), 8)} ${padRight(String(plan.status ?? ''), 12)} ${plan.direction ?? ''}`);
+                    }
+                    console.log('');
                 }
-                console.log('');
-                console.log(`To execute: trading-boy journal log entry ${tokenSymbol} --plan ${plan.id}`);
             }
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.error({ error: message }, 'Failed to create plan');
+            const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
             console.error(`Error: ${message}`);
-            if (message.includes('pre_trade_plans') && message.includes('does not exist')) {
-                console.error('Hint: Run migrations to create the pre_trade_plans table:');
-                console.error('  pnpm --filter @trading-boy/timeseries-db migrate');
-            }
-            const guidance = formatConnectionError(message);
-            if (guidance)
-                console.error(guidance);
-            process.exitCode = 1;
-        }
-        finally {
-            await redis.quit().catch(() => { });
-            await tsClient.disconnect().catch(() => { });
-            await client.disconnect();
+            process.exitCode = error instanceof ApiError ? 2 : 1;
         }
     });
     // ─── journal size ───
     journal
         .command('size')
         .description('Kelly criterion position sizing recommendation')
-        .requiredOption('--setup <setup>', 'Setup type (BREAKOUT, MOMENTUM, etc.)')
-        .option('--capital <capital>', 'Portfolio capital in USD', parseFloat)
-        .option('--fraction <fraction>', 'Kelly fraction (default 0.5 = Half Kelly)', parseFloat, 0.5)
-        .option('--trader <traderId>', 'Trader ID', DEFAULT_TRADER_ID)
+        .requiredOption('--trader <traderId>', 'Trader ID')
+        .option('--capital <usd>', 'Portfolio capital in USD', parseFloat, 10000)
+        .option('--fraction <f>', 'Kelly fraction (0-1, default 0.5 = Half Kelly)', parseFloat, 0.5)
         .addOption(new Option('--format <format>', 'Output format').choices(['text', 'json']).default('text'))
         .action(async (options) => {
-        const client = createNeo4jClient();
-        const redis = createRedisClient();
-        const tsClient = createTimescaleClient();
         try {
-            await client.connect();
-            await redis.connect();
-            await tsClient.connect();
-            const setupKey = options.setup.toUpperCase();
-            // Get capital from option or pre-state
-            let capitalUsd = options.capital;
-            if (!capitalUsd) {
-                try {
-                    const preState = await buildPreState({ tsClient, redis }, 'SOL');
-                    capitalUsd = preState.portfolioValueUsd;
-                }
-                catch {
-                    capitalUsd = 10000; // fallback
-                }
-            }
-            // Get all decisions for this setup
-            const decisions = await getDecisionChain(client, options.trader, {
-                tokenSymbol: undefined,
-                limit: 500,
-            });
-            const setupDecisions = decisions.filter((d) => d.setupType === setupKey && d.pnlAbsolute !== null);
-            const stats = extractSetupStats(setupDecisions);
-            if (stats.totalTrades === 0) {
-                console.log(`No completed trades found for setup type: ${setupKey}`);
-                console.log('Kelly sizing requires historical trade data with outcomes.');
-                return;
-            }
-            const fullResult = computeKellySizing(stats, capitalUsd, 1.0);
-            const halfResult = computeKellySizing(stats, capitalUsd, 0.5);
-            const quarterResult = computeKellySizing(stats, capitalUsd, 0.25);
+            const params = new URLSearchParams();
+            params.set('traderId', options.trader);
+            params.set('capitalUsd', String(options.capital));
+            params.set('fraction', String(options.fraction));
+            const data = await apiRequest(`/api/v1/journal/size?${params.toString()}`);
             if (options.format === 'json') {
-                const payoffRatio = stats.avgLoss !== 0 ? stats.avgWin / Math.abs(stats.avgLoss) : 0;
-                console.log(JSON.stringify({
-                    setupType: setupKey,
-                    sampleSize: stats.totalTrades,
-                    winRate: stats.winRate,
-                    avgWin: stats.avgWin,
-                    avgLoss: stats.avgLoss,
-                    payoffRatio,
-                    capitalUsd: capitalUsd,
-                    fullKelly: { fraction: fullResult.fullKelly, positionSizeUsd: fullResult.positionSizeUsd },
-                    halfKelly: { fraction: halfResult.fractionalKelly, positionSizeUsd: halfResult.positionSizeUsd },
-                    quarterKelly: { fraction: quarterResult.fractionalKelly, positionSizeUsd: quarterResult.positionSizeUsd },
-                    confidenceNote: halfResult.confidenceNote,
-                }, null, 2));
+                console.log(JSON.stringify(data, null, 2));
             }
             else {
-                console.log('');
-                console.log(`═══ Kelly Position Sizing — ${setupKey} ═══`);
-                console.log('');
-                console.log(`Based on last ${stats.totalTrades} ${setupKey} trades:`);
-                console.log(`  Win Rate (p): ${(stats.winRate * 100).toFixed(1)}%`);
-                console.log(`  Avg Win:      $${stats.avgWin.toFixed(2)}`);
-                console.log(`  Avg Loss:     $${stats.avgLoss.toFixed(2)}`);
-                const payoffRatio = stats.avgLoss !== 0 ? stats.avgWin / Math.abs(stats.avgLoss) : 0;
-                console.log(`  Payoff Ratio: ${payoffRatio.toFixed(2)}`);
-                console.log('');
-                console.log(`  Full Kelly:    ${(fullResult.fullKelly * 100).toFixed(1)}% of capital ($${fullResult.positionSizeUsd.toFixed(0)})`);
-                console.log(`  Half Kelly:    ${(halfResult.fractionalKelly * 100).toFixed(1)}% of capital ($${halfResult.positionSizeUsd.toFixed(0)})  ← RECOMMENDED`);
-                console.log(`  Quarter Kelly: ${(quarterResult.fractionalKelly * 100).toFixed(1)}% of capital ($${quarterResult.positionSizeUsd.toFixed(0)})`);
-                console.log('');
-                console.log(`  ${halfResult.confidenceNote}`);
+                console.log('\n  Kelly Position Sizing:\n');
+                for (const [key, value] of Object.entries(data)) {
+                    console.log(`  ${padRight(key, 24)} ${value}`);
+                }
                 console.log('');
             }
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            logger.error({ error: message }, 'Failed to compute Kelly sizing');
+            const message = error instanceof ApiError ? error.message : (error instanceof Error ? error.message : String(error));
             console.error(`Error: ${message}`);
-            const guidance = formatConnectionError(message);
-            if (guidance)
-                console.error(guidance);
-            process.exitCode = 1;
-        }
-        finally {
-            await redis.quit().catch(() => { });
-            await tsClient.disconnect().catch(() => { });
-            await client.disconnect();
+            process.exitCode = error instanceof ApiError ? 2 : 1;
         }
     });
 }
-// ─── Helpers ───
-function padRight(str, len) {
-    return str.length >= len ? str.slice(0, len) : str + ' '.repeat(len - str.length);
-}
+// PlanOptions and SizeOptions removed — commands hidden until API endpoints exist
 //# sourceMappingURL=journal.js.map