@fastino-ai/pioneer-cli 0.1.0 → 0.2.1

package/src/index.tsx

@@ -8,14 +8,23 @@ import React, { useState, useEffect } from "react";
 import { render, Box, Text, useApp, useInput } from "ink";
 import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
+import * as fs from "fs";
+import * as path from "path";
 
 import {
   getApiKey,
   getBaseUrl,
   saveConfig,
   clearApiKey,
+  getAgentConfig,
+  getBudgetConfig,
+  getSandboxConfig,
+  getMLConfig,
+  getSystemPrompt,
 } from "./config.js";
 import * as api from "./api.js";
+import { ChatApp } from "./chat/ChatApp.js";
+import type { AgentConfig } from "./agent/types.js";
 
 // ─────────────────────────────────────────────────────────────────────────────
 // ASCII Banner
@@ -235,16 +244,411 @@ function ApiCommand<T>({ action, successMessage }: ApiCommandProps<T>) {
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
-// Help Component
+// Local Dataset Helpers
 // ─────────────────────────────────────────────────────────────────────────────
 
-const Help: React.FC = () => {
+const DATASETS_DIR = path.join(process.cwd(), "datasets");
+
+function ensureDatasetsDir(): void {
+  if (!fs.existsSync(DATASETS_DIR)) {
+    fs.mkdirSync(DATASETS_DIR, { recursive: true });
+  }
+}
+
+interface LocalDataset {
+  id: string;
+  name: string;
+  path: string;
+  type: string;
+  size: number;
+  sample_size: number;
+  created_at: string;
+  source: "local";
+}
+
+function listLocalDatasets(): LocalDataset[] {
+  if (!fs.existsSync(DATASETS_DIR)) {
+    return [];
+  }
+
+  const files = fs.readdirSync(DATASETS_DIR).filter((f) => f.endsWith(".json"));
+  return files.map((filename) => {
+    const filePath = path.join(DATASETS_DIR, filename);
+    const stats = fs.statSync(filePath);
+    let data: unknown[] = [];
+    let type = "unknown";
+
+    try {
+      const content = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+      data = Array.isArray(content) ? content : content.data ?? [];
+      const firstItem = data[0] as Record<string, unknown> | undefined;
+      type = content.task_type ?? (firstItem?.spans ? "ner" : firstItem?.label ? "classification" : "custom");
+    } catch {
+      // Ignore parse errors
+    }
+
+    return {
+      id: filename.replace(".json", ""),
+      name: filename.replace(".json", ""),
+      path: filePath,
+      type,
+      size: stats.size,
+      sample_size: data.length,
+      created_at: stats.birthtime.toISOString(),
+      source: "local" as const,
+    };
+  });
+}
+
+function saveLocalDataset(name: string, data: unknown, type: string): string {
+  ensureDatasetsDir();
+  const filename = `${name.replace(/[^a-zA-Z0-9-_]/g, "_")}.json`;
+  const filePath = path.join(DATASETS_DIR, filename);
+  fs.writeFileSync(filePath, JSON.stringify({ task_type: type, data }, null, 2));
+  return filePath;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Generate Command (saves to local file when --save is false)
+// ─────────────────────────────────────────────────────────────────────────────
+
+interface GenerateCommandProps<T> {
+  action: () => Promise<api.ApiResult<T>>;
+  datasetName: string;
+  datasetType: string;
+  saveToRemote: boolean;
+}
+
+interface GenerateResult {
+  data?: unknown[];
+  success?: boolean;
+  dataset?: { id?: string; dataset_name?: string };
+}
+
+function GenerateCommand<T extends GenerateResult>({
+  action,
+  datasetName,
+  datasetType,
+  saveToRemote,
+}: GenerateCommandProps<T>) {
+  const { exit } = useApp();
+  const [state, setState] = useState<"loading" | "done" | "error">("loading");
+  const [savedPath, setSavedPath] = useState<string | null>(null);
+  const [savedDatasetId, setSavedDatasetId] = useState<string | null>(null);
+  const [remoteSaveFailed, setRemoteSaveFailed] = useState(false);
+  const [count, setCount] = useState(0);
+  const [error, setError] = useState("");
+
+  useEffect(() => {
+    (async () => {
+      const result = await action();
+      if (result.ok && result.data) {
+        const data = result.data.data ?? [];
+        setCount(Array.isArray(data) ? data.length : 0);
+
+        // Check if dataset was saved remotely
+        const savedDataset = result.data.dataset;
+        if (savedDataset?.id) {
+          setSavedDatasetId(savedDataset.id);
+        } else if (!saveToRemote) {
+          // Save to local file only if not saving remotely
+          const name = datasetName || `${datasetType}-${Date.now()}`;
+          const filePath = saveLocalDataset(name, data, datasetType);
+          setSavedPath(filePath);
+        } else {
+          // Remote save was requested but no dataset returned - save locally as fallback
+          setRemoteSaveFailed(true);
+          const name = datasetName || `${datasetType}-${Date.now()}`;
+          const filePath = saveLocalDataset(name, data, datasetType);
+          setSavedPath(filePath);
+        }
+        setState("done");
+      } else {
+        setError(result.error ?? "Unknown error");
+        setState("error");
+      }
+      setTimeout(() => exit(), 500);
+    })();
+  }, [action, exit, datasetName, datasetType, saveToRemote]);
+
+  if (state === "loading") {
+    return <Loading />;
+  }
+
+  if (state === "error") {
+    return <ErrorMessage error={error} />;
+  }
+
+  return (
+    <Box flexDirection="column">
+      <Success message={`${datasetType.toUpperCase()} dataset generated (${count} examples)`} />
+      {savedDatasetId && (
+        <Text color="green">Saved to remote: {savedDatasetId}</Text>
+      )}
+      {remoteSaveFailed && (
+        <Text color="yellow">⚠ Remote save failed (check server logs). Saved locally instead.</Text>
+      )}
+      {savedPath && (
+        <Text color="cyan">Saved to: {savedPath}</Text>
+      )}
+    </Box>
+  );
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Dataset List Command (shows both remote and local)
+// ─────────────────────────────────────────────────────────────────────────────
+
+function DatasetListCommand() {
+  const { exit } = useApp();
+  const [state, setState] = useState<"loading" | "done">("loading");
+  const [remoteData, setRemoteData] = useState<api.DatasetListResponse | null>(null);
+  const [remoteError, setRemoteError] = useState<string | null>(null);
+  const [localDatasets, setLocalDatasets] = useState<LocalDataset[]>([]);
+
+  useEffect(() => {
+    (async () => {
+      // Fetch remote and local datasets
+      const result = await api.listDatasets();
+      const local = listLocalDatasets();
+      setLocalDatasets(local);
+
+      if (result.ok) {
+        setRemoteData(result.data ?? null);
+      } else {
+        setRemoteError(result.error ?? "Unknown error");
+      }
+      setState("done");
+      setTimeout(() => exit(), 500);
+    })();
+  }, [exit]);
+
+  if (state === "loading") {
+    return <Loading />;
+  }
+
+  const remoteDatasets = remoteData?.datasets ?? [];
+
+  return (
+    <Box flexDirection="column">
+      <Text bold color="cyan">Remote Datasets {remoteError ? "" : `(${remoteDatasets.length})`}</Text>
+      {remoteError ? (
+        <Text dimColor color="red">  Error: {remoteError.slice(0, 50)}</Text>
+      ) : remoteDatasets.length === 0 ? (
+        <Text dimColor>  No remote datasets</Text>
+      ) : (
+        remoteDatasets.map((ds) => (
+          <Text key={ds.id}>
+            {"  "}<Text color="yellow">{ds.id.slice(0, 8)}</Text> {ds.dataset_name} <Text dimColor>({ds.dataset_type}, {ds.sample_size} examples)</Text>
+          </Text>
+        ))
+      )}
+      <Text> </Text>
+      <Text bold color="cyan">Local Datasets ({localDatasets.length})</Text>
+      {localDatasets.length === 0 ? (
+        <Text dimColor>  No local datasets in ./datasets/</Text>
+      ) : (
+        localDatasets.map((ds) => (
+          <Text key={ds.id}>
+            {"  "}<Text color="green">{ds.name}</Text> <Text dimColor>({ds.type}, {ds.sample_size} examples)</Text>
+          </Text>
+        ))
+      )}
+    </Box>
+  );
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Model List Command
+// ─────────────────────────────────────────────────────────────────────────────
+
+type ModelListFilter = "all" | "trained" | "deployed";
+
+interface ModelListCommandProps {
+  filter: ModelListFilter;
+}
+
+function ModelListCommand({ filter }: ModelListCommandProps) {
+  const { exit } = useApp();
+  const [state, setState] = useState<"loading" | "done" | "error">("loading");
+  const [data, setData] = useState<api.AllModelsResponse | null>(null);
+  const [error, setError] = useState("");
+
+  useEffect(() => {
+    (async () => {
+      const result = await api.listAllModels();
+      if (result.ok) {
+        setData(result.data ?? null);
+        setState("done");
+      } else {
+        setError(result.error ?? "Unknown error");
+        setState("error");
+      }
+      setTimeout(() => exit(), 500);
+    })();
+  }, [exit]);
+
+  if (state === "loading") {
+    return <Loading />;
+  }
+
+  if (state === "error") {
+    return <ErrorMessage error={error} />;
+  }
+
+  const showDeployed = filter === "all" || filter === "deployed";
+  const showTrained = filter === "all" || filter === "trained";
+
+  return (
+    <Box flexDirection="column">
+      {showDeployed && (
+        <>
+          <Text bold color="cyan">Deployed Models ({data?.deployed.length ?? 0})</Text>
+          {data?.deployed.length === 0 ? (
+            <Text dimColor>  No deployed models</Text>
+          ) : (
+            <JsonOutput data={data?.deployed} />
+          )}
+        </>
+      )}
+      {showDeployed && showTrained && <Text> </Text>}
+      {showTrained && (
+        <>
+          <Text bold color="cyan">Trained Models ({data?.trained.length ?? 0})</Text>
+          {data?.trained.length === 0 ? (
+            <Text dimColor>  No trained models</Text>
+          ) : (
+            <JsonOutput data={data?.trained} />
+          )}
+        </>
+      )}
+    </Box>
+  );
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Help Components
+// ─────────────────────────────────────────────────────────────────────────────
+
+type HelpContext = "root" | "auth" | "dataset" | "job" | "model" | "chat";
+
+interface HelpProps {
+  context?: HelpContext;
+}
+
+const Help: React.FC<HelpProps> = ({ context = "root" }) => {
   const { exit } = useApp();
 
   useEffect(() => {
     setTimeout(() => exit(), 100);
   }, [exit]);
 
+  // Auth help
+  if (context === "auth") {
+    return (
+      <Box flexDirection="column">
+        <Text bold>Auth Commands:</Text>
+        <Text>  auth login     Login with API key</Text>
+        <Text>  auth logout    Clear stored API key</Text>
+        <Text>  auth status    Show auth status</Text>
+      </Box>
+    );
+  }
+
+  // Dataset help
+  if (context === "dataset") {
+    return (
+      <Box flexDirection="column">
+        <Text bold>Dataset Commands:</Text>
+        <Text>  dataset list              List all datasets</Text>
+        <Text>  dataset get {"<id>"}          Get dataset details</Text>
+        <Text>  dataset delete {"<id>"}       Delete a dataset</Text>
+        <Text>  dataset download {"<id>"}     Get download URL</Text>
+        <Text>  dataset analyze {"<id>"}      Analyze a dataset</Text>
+        <Text> </Text>
+        <Text bold>  Generate:</Text>
+        <Text>  dataset generate ner</Text>
+        <Text>    --labels {"<l1,l2,...>"}      Entity labels (required)</Text>
+        <Text>    --num {"<n>"}                 Number of examples (default: 10)</Text>
+        <Text>    --domain {"<desc>"}           Domain description</Text>
+        <Text>    --save true               Save to database</Text>
+        <Text>    --name {"<name>"}             Dataset name (required if --save)</Text>
+        <Text> </Text>
+        <Text>  dataset generate classification</Text>
+        <Text>    --labels {"<l1,l2,...>"}      Class labels (required)</Text>
+        <Text>    --num {"<n>"}                 Number of examples (default: 10)</Text>
+        <Text>    --domain {"<desc>"}           Domain description</Text>
+        <Text>    --multi-label true        Enable multi-label</Text>
+        <Text>    --save true               Save to database</Text>
+        <Text>    --name {"<name>"}             Dataset name (required if --save)</Text>
+        <Text> </Text>
+        <Text>  dataset generate custom</Text>
+        <Text>    --prompt {"<prompt>"}         Task description (required)</Text>
+        <Text>    --format {"<json>"}           Output format as JSON (required)</Text>
+        <Text>    --num {"<n>"}                 Number of examples (default: 10)</Text>
+        <Text>    --save true               Save to database</Text>
+        <Text>    --name {"<name>"}             Dataset name (required if --save)</Text>
+        <Text> </Text>
+        <Text bold>  Infer Labels:</Text>
+        <Text>  dataset infer ner              Infer NER labels from description</Text>
+        <Text>  dataset infer classification   Infer classification labels</Text>
+        <Text>  dataset infer fields           Infer input/output fields</Text>
+        <Text>    --domain {"<desc>"}           Domain description (required)</Text>
+      </Box>
+    );
+  }
+
+  // Job help
+  if (context === "job") {
+    return (
+      <Box flexDirection="column">
+        <Text bold>Job Commands:</Text>
+        <Text>  job list           List training jobs</Text>
+        <Text>  job get {"<id>"}       Get job details</Text>
+        <Text>  job logs {"<id>"}      Get job logs</Text>
+        <Text>  job delete {"<id>"}    Delete a training job</Text>
+        <Text>  job create         Create training job</Text>
+        <Text>    --model-name {"<name>"}   Model name (required)</Text>
+        <Text>    --dataset-ids {"<ids>"}   Comma-separated dataset IDs (required)</Text>
+        <Text>    --base-model {"<model>"}  Base model (default: fastino/gliner2-base-v1)</Text>
+        <Text>    --epochs {"<n>"}          Number of epochs (default: 5)</Text>
+      </Box>
+    );
+  }
+
+  // Model help
+  if (context === "model") {
+    return (
+      <Box flexDirection="column">
+        <Text bold>Model Commands:</Text>
+        <Text>  model list             List all models (trained + deployed)</Text>
+        <Text>  model list trained     List trained models only</Text>
+        <Text>  model list deployed    List deployed models only</Text>
+        <Text>  model delete {"<id>"}      Undeploy a model</Text>
+        <Text>  model download {"<id>"}    Get model download URL</Text>
+      </Box>
+    );
+  }
+
+  // Chat help
+  if (context === "chat") {
+    return (
+      <Box flexDirection="column">
+        <Text bold>Chat Commands:</Text>
+        <Text>  chat                   Start interactive chat agent</Text>
+        <Text>    --provider {"<name>"}    LLM provider (anthropic, openai)</Text>
+        <Text>    --model {"<model>"}      Model to use</Text>
+        <Text>    --message {"<msg>"}      Initial message to process</Text>
+        <Text>    --max-tokens {"<n>"}     Max tokens (default: 500000, 0=unlimited)</Text>
+        <Text>    --max-cost {"<n>"}       Max cost in USD (default: 5.0, 0=unlimited)</Text>
+        <Text>    --max-time {"<n>"}       Max time in seconds (default: 7200, 0=unlimited)</Text>
+        <Text>    --max-tools {"<n>"}      Max tool calls per turn (default: 50, 0=unlimited)</Text>
+        <Text>    --no-limit           Remove all limits</Text>
+      </Box>
+    );
+  }
+
+  // Root help - overview only
   return (
     <Box flexDirection="column">
       <Text color="cyan">{BANNER}</Text>
@@ -252,44 +656,98 @@ const Help: React.FC = () => {
       <Text bold>Usage:</Text>
       <Text>  pioneer {"<command>"} {"[options]"}</Text>
       <Text> </Text>
-      <Text bold>Auth Commands:</Text>
-      <Text>  auth login              Login with API key</Text>
-      <Text>  auth logout             Clear stored API key</Text>
-      <Text>  auth status             Show auth status</Text>
-      <Text> </Text>
-      <Text bold>Dataset Commands:</Text>
-      <Text>  dataset list            List all datasets</Text>
-      <Text>  dataset get {"<id>"}        Get dataset details</Text>
-      <Text>  dataset delete {"<id>"}     Delete a dataset</Text>
-      <Text>  dataset download {"<id>"}   Get download URL</Text>
-      <Text>  dataset analyze {"<id>"}    Analyze a dataset</Text>
+      <Text bold>Commands:</Text>
+      <Text>  chat       Start interactive chat agent</Text>
+      <Text>  auth       Authentication (login, logout, status)</Text>
+      <Text>  dataset    Manage datasets (list, generate, infer)</Text>
+      <Text>  job        Manage training jobs</Text>
+      <Text>  model      Manage models</Text>
       <Text> </Text>
-      <Text bold>Job Commands:</Text>
-      <Text>  job list                List training jobs</Text>
-      <Text>  job get {"<id>"}            Get job details</Text>
-      <Text>  job logs {"<id>"}           Get job logs</Text>
-      <Text>  job create              Create training job</Text>
-      <Text>    --model-name {"<name>"}   Model name (required)</Text>
-      <Text>    --dataset-ids {"<ids>"}   Comma-separated dataset IDs</Text>
-      <Text>    --base-model {"<model>"}  Base model (default: fastino/gliner2-base-v1)</Text>
-      <Text>    --epochs {"<n>"}          Number of epochs (default: 5)</Text>
-      <Text> </Text>
-      <Text bold>Model Commands:</Text>
-      <Text>  model list              List deployed models</Text>
-      <Text>  model trained           List trained models</Text>
-      <Text>  model delete {"<id>"}       Undeploy a model</Text>
-      <Text>  model download {"<id>"}     Get model download URL</Text>
-      <Text> </Text>
-      <Text bold>Options:</Text>
-      <Text>  --help                  Show this help</Text>
+      <Text dimColor>Run 'pioneer {"<command>"} --help' for details on a specific command.</Text>
       <Text> </Text>
       <Text dimColor>Environment:</Text>
-      <Text dimColor>  PIONEER_API_URL   API base URL (default: http://localhost:5001)</Text>
-      <Text dimColor>  PIONEER_API_KEY   API key (overrides saved key)</Text>
+      <Text dimColor>  PIONEER_API_URL       API base URL (default: http://localhost:5001)</Text>
+      <Text dimColor>  PIONEER_API_KEY       API key (overrides saved key)</Text>
+      <Text dimColor>  ANTHROPIC_API_KEY     Anthropic API key for chat agent</Text>
+      <Text dimColor>  OPENAI_API_KEY        OpenAI API key for chat agent</Text>
     </Box>
   );
 };
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Chat Wrapper Component
+// ─────────────────────────────────────────────────────────────────────────────
+
+interface ChatWrapperProps {
+  flags: Record<string, string>;
+}
+
+const ChatWrapper: React.FC<ChatWrapperProps> = ({ flags }) => {
+  const { exit } = useApp();
+
+  // Build agent config from flags and stored config
+  const storedConfig = getAgentConfig();
+  const budgetConfig = getBudgetConfig();
+  const systemPrompt = getSystemPrompt();
+
+  // Apply budget overrides from flags
+  const budget = { ...budgetConfig };
+  let maxToolCalls = 50; // Default
+
+  if (flags["no-limit"] === "true") {
+    // Remove all limits
+    budget.maxTokens = undefined;
+    budget.maxCost = undefined;
+    budget.maxTime = undefined;
+    budget.maxIterations = undefined;
+    maxToolCalls = 1000; // Effectively unlimited
+  } else {
+    // Apply individual overrides (0 = unlimited)
+    if (flags["max-tokens"]) {
+      const val = parseInt(flags["max-tokens"], 10);
+      budget.maxTokens = val === 0 ? undefined : val;
+    }
+    if (flags["max-cost"]) {
+      const val = parseFloat(flags["max-cost"]);
+      budget.maxCost = val === 0 ? undefined : val;
+    }
+    if (flags["max-time"]) {
+      const val = parseInt(flags["max-time"], 10);
+      budget.maxTime = val === 0 ? undefined : val;
+    }
+    if (flags["max-tools"]) {
+      const val = parseInt(flags["max-tools"], 10);
+      maxToolCalls = val === 0 ? 1000 : val;
+    }
+  }
+
+  const agentConfig: AgentConfig = {
+    provider: (flags.provider as "anthropic" | "openai") || storedConfig.provider,
+    model: flags.model || storedConfig.model,
+    apiKey: storedConfig.apiKey,
+    baseUrl: storedConfig.baseUrl,
+    budget,
+    systemPrompt,
+    maxToolCalls,
+  };
+
+  // Validate we have an API key
+  if (!agentConfig.apiKey) {
+    return (
+      <Box flexDirection="column">
+        <ErrorMessage error="No API key configured. Set ANTHROPIC_API_KEY or OPENAI_API_KEY environment variable." />
+        <Text dimColor>
+          Or run: export ANTHROPIC_API_KEY="your-key"
+        </Text>
+      </Box>
+    );
+  }
+
+  const initialMessage = flags.message;
+
+  return <ChatApp config={agentConfig} initialMessage={initialMessage} />;
+};
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Main Router
 // ─────────────────────────────────────────────────────────────────────────────
@@ -302,23 +760,37 @@ interface AppProps {
 const App: React.FC<AppProps> = ({ command, flags }) => {
   const [group, action, ...rest] = command;
 
-  // Help
-  if (!group || flags.help === "true") {
+  // Root help (no command)
+  if (!group) {
     return <Help />;
   }
 
+  // Chat command - Interactive agent
+  if (group === "chat") {
+    if (flags.help === "true" || action === "help") {
+      return <Help context="chat" />;
+    }
+    return <ChatWrapper flags={flags} />;
+  }
+
   // Auth commands
   if (group === "auth") {
+    if (flags.help === "true" || !action || action === "help") {
+      return <Help context="auth" />;
+    }
     if (action === "login") return <AuthLogin />;
     if (action === "logout") return <AuthLogout />;
     if (action === "status") return <AuthStatus />;
-    return <Help />;
+    return <Help context="auth" />;
   }
 
   // Dataset commands
   if (group === "dataset") {
+    if (flags.help === "true" || !action || action === "help") {
+      return <Help context="dataset" />;
+    }
     if (action === "list") {
-      return <ApiCommand action={api.listDatasets} />;
+      return <DatasetListCommand />;
     }
     if (action === "get" && rest[0]) {
       return <ApiCommand action={() => api.getDataset(rest[0])} />;
@@ -337,11 +809,140 @@ const App: React.FC<AppProps> = ({ command, flags }) => {
     if (action === "analyze" && rest[0]) {
       return <ApiCommand action={() => api.analyzeDataset(rest[0])} />;
     }
-    return <Help />;
+
+    // Generate commands
+    if (action === "generate") {
+      const subAction = rest[0];
+      const numExamples = flags["num"] ? parseInt(flags["num"], 10) : undefined;
+      const domainDescription = flags["domain"];
+      const saveDataset = flags["save"] === "true";
+      const datasetName = flags["name"];
+
+      if (subAction === "ner") {
+        const labels = flags["labels"]?.split(",");
+        if (!labels || labels.length === 0) {
+          return <ErrorMessage error="--labels is required (comma-separated)" />;
+        }
+        return (
+          <GenerateCommand
+            action={() =>
+              api.generateNER({
+                labels,
+                num_examples: numExamples,
+                domain_description: domainDescription,
+                save_dataset: saveDataset,
+                dataset_name: datasetName,
+              })
+            }
+            datasetName={datasetName || "ner-dataset"}
+            datasetType="ner"
+            saveToRemote={saveDataset}
+          />
+        );
+      }
+
+      if (subAction === "classification") {
+        const labels = flags["labels"]?.split(",");
+        if (!labels || labels.length === 0) {
+          return <ErrorMessage error="--labels is required (comma-separated)" />;
+        }
+        const multiLabel = flags["multi-label"] === "true";
+        return (
+          <GenerateCommand
+            action={() =>
+              api.generateClassification({
+                labels,
+                num_examples: numExamples,
+                domain_description: domainDescription,
+                multi_label: multiLabel,
+                save_dataset: saveDataset,
+                dataset_name: datasetName,
+              })
+            }
+            datasetName={datasetName || "classification-dataset"}
+            datasetType="classification"
+            saveToRemote={saveDataset}
+          />
+        );
+      }
+
+      if (subAction === "custom") {
+        const prompt = flags["prompt"];
+        const formatStr = flags["format"];
+        if (!prompt || !formatStr) {
+          return <ErrorMessage error="--prompt and --format are required" />;
+        }
+        let outputFormat: Record<string, unknown>;
+        try {
+          outputFormat = JSON.parse(formatStr);
+        } catch {
+          return <ErrorMessage error="--format must be valid JSON" />;
+        }
+        return (
+          <GenerateCommand
+            action={() =>
+              api.generateCustom({
+                prompt,
+                output_format: outputFormat,
+                num_examples: numExamples,
+                save_dataset: saveDataset,
+                dataset_name: datasetName,
+              })
+            }
+            datasetName={datasetName || "custom-dataset"}
+            datasetType="custom"
+            saveToRemote={saveDataset}
+          />
+        );
+      }
+
+      return <Help context="dataset" />;
+    }
+
+    // Infer labels commands
+    if (action === "infer") {
+      const subAction = rest[0];
+      const domainDescription = flags["domain"];
+
+      if (!domainDescription) {
+        return <ErrorMessage error="--domain is required" />;
+      }
+
+      if (subAction === "ner") {
+        return (
+          <ApiCommand
+            action={() => api.inferNERLabels({ domain_description: domainDescription })}
+          />
+        );
+      }
+
+      if (subAction === "classification") {
+        return (
+          <ApiCommand
+            action={() => api.inferClassificationLabels({ domain_description: domainDescription })}
+          />
+        );
+      }
+
+      if (subAction === "fields") {
+        return (
+          <ApiCommand
+            action={() => api.inferFields({ domain_description: domainDescription })}
+          />
+        );
+      }
+
+      return <Help context="dataset" />;
+    }
+
+    return <Help context="dataset" />;
   }
 
   // Job commands
   if (group === "job") {
+    if (flags.help === "true" || !action || action === "help") {
+      return <Help context="job" />;
+    }
     if (action === "list") {
       return <ApiCommand action={api.listJobs} />;
     }
@@ -351,6 +952,14 @@ const App: React.FC<AppProps> = ({ command, flags }) => {
     if (action === "logs" && rest[0]) {
       return <ApiCommand action={() => api.getJobLogs(rest[0])} />;
     }
+    if (action === "delete" && rest[0]) {
+      return (
+        <ApiCommand
+          action={() => api.deleteJob(rest[0])}
+          successMessage={`Training job ${rest[0]} deleted`}
+        />
+      );
+    }
     if (action === "create") {
       const modelName = flags["model-name"];
       const datasetIds = flags["dataset-ids"]?.split(",") ?? [];
@@ -375,16 +984,27 @@ const App: React.FC<AppProps> = ({ command, flags }) => {
         />
       );
     }
-    return <Help />;
+    return <Help context="job" />;
   }
 
   // Model commands
   if (group === "model") {
-    if (action === "list") {
-      return <ApiCommand action={api.listModels} />;
+    if (flags.help === "true" || !action || action === "help") {
+      return <Help context="model" />;
     }
-    if (action === "trained") {
-      return <ApiCommand action={api.listTrainedModels} />;
+    if (action === "list") {
+      const subAction = rest[0];
+      if (subAction === "help") {
+        return <Help context="model" />;
+      }
+      if (subAction === "trained") {
+        return <ModelListCommand filter="trained" />;
+      }
+      if (subAction === "deployed") {
+        return <ModelListCommand filter="deployed" />;
+      }
+      // Default: show all models
+      return <ModelListCommand filter="all" />;
     }
     if (action === "delete" && rest[0]) {
       return (
@@ -397,7 +1017,7 @@ const App: React.FC<AppProps> = ({ command, flags }) => {
     if (action === "download" && rest[0]) {
       return <ApiCommand action={() => api.downloadModel(rest[0])} />;
     }
-    return <Help />;
+    return <Help context="model" />;
   }
 
   return <Help />;