ai-cmd 1.0.2 → 1.0.3

package/README.md

@@ -44,7 +44,10 @@ This project is part of the **Ottili ONE ecosystem** — a modular AI system for
 - Clipboard copy support
 - Optional execution with confirmation
 - Heuristic risk classification for destructive commands
-- OpenAI-compatible provider abstraction
+- First-run configurator for provider, API key, and analytics consent
+- Configurable provider abstraction for OpenAI, Anthropic, Google, Ollama, and vLLM
+- Workspace-aware command generation based on the current folder
+- Opt-in anonymous analytics with separate error reporting
 - JSON mode for scripting
 
 ## Installation
@@ -69,23 +72,68 @@ npm link
 
 Environment variables take precedence over the config file.
 
-If no API key is configured yet, `ai-cmd` creates a starter config file for you on first run.
+If required configuration is missing and you launch `ai-cmd` interactively, a first-run configurator opens and asks for:
 
-### Required
+- AI provider
+- API key
+- analytics consent
 
-```bash
-export AI_API_KEY="your-api-key"
-```
+If you opt in, `config.json` stores `"analytics": true` and a random anonymous install id. If you opt out, it stores `"analytics": false`.
 
-### Optional
+### OpenAI
+
+OpenAI remains the default provider:
 
 ```bash
+export AI_API_KEY="your-api-key"
 export AI_PROVIDER="openai"
 export AI_MODEL="gpt-5.4-mini"
 export AI_BASE_URL="https://api.openai.com/v1"
 export AI_TIMEOUT_MS="30000"
 ```
 
+### Anthropic
+
+```bash
+export AI_PROVIDER="anthropic"
+export AI_API_KEY="your-anthropic-key"
+export AI_MODEL="claude-sonnet-4-20250514"
+export AI_BASE_URL="https://api.anthropic.com/v1"
+```
+
+### Google
+
+```bash
+export AI_PROVIDER="google"
+export AI_API_KEY="your-google-ai-key"
+export AI_MODEL="gemini-2.5-flash"
+export AI_BASE_URL="https://generativelanguage.googleapis.com/v1beta"
+```
+
+### Ollama
+
+Use a local Ollama model such as Gemma:
+
+```bash
+export AI_PROVIDER="ollama"
+export AI_MODEL="gemma3:4b"
+export AI_BASE_URL="http://localhost:11434/api"
+```
+
+No API key is required for the default local Ollama setup.
+
+### vLLM
+
+Use a local or self-hosted OpenAI-compatible vLLM server:
+
+```bash
+export AI_PROVIDER="vllm"
+export AI_MODEL="google/gemma-3-4b-it"
+export AI_BASE_URL="http://localhost:8000/v1"
+```
+
+No API key is required for a local vLLM server unless you configured auth yourself.
+
 ### Example config file
 
 `~/.ai-cmd/config.json`
@@ -96,11 +144,41 @@ export AI_TIMEOUT_MS="30000"
   "model": "gpt-5.4-mini",
   "apiKey": "your-api-key",
   "baseUrl": "https://api.openai.com/v1",
-  "timeoutMs": 30000
+  "timeoutMs": 30000,
+  "analytics": false
 }
 ```
 
-If configuration is missing, `ai-cmd` fails clearly:
+### Analytics
+
+Analytics are opt-in only.
+
+When enabled, `ai-cmd` sends anonymous usage events to:
+
+```text
+https://tracking.ottili.one/api/aicmd
+```
+
+Usage events include:
+
+- anonymous install count
+- CLI starts
+- prompt count
+
+Error reports can include:
+
+- prompt
+- OS
+- version
+- timestamp
+
+Regular usage analytics do not store generated command content.
+
+Analytics requests now use a short-lived server-issued session plus proof-of-work. This does not create perfect authentication for a public open-source client, but it makes automated spam substantially harder and gives the server something real to validate.
+
+Server setup notes live in [docs/analytics-server.md](docs/analytics-server.md).
+
+If OpenAI configuration is missing, `ai-cmd` fails clearly:
 
 ```text
 Missing AI_API_KEY. Set it in your environment or edit ~/.ai-cmd/config.json. A starter config has been created if it did not already exist.
@@ -118,6 +196,8 @@ ai "remove node_modules and reinstall packages" --exec
 ai "find all jpg files" --copy
 ```
 
+`ai-cmd` now inspects the current folder structure and common project files like `package.json`, `Makefile`, `Cargo.toml`, `go.mod`, and compose files so it can suggest commands that fit the active workspace better.
+
 ### Interactive mode
 
 ```bash
@@ -263,7 +343,6 @@ Example shape:
 
 ## Roadmap
 
-- additional provider adapters
 - richer shell support
 - more precise filesystem-aware risk detection
 - Homebrew distribution

package/dist/analytics/client.d.ts

@@ -0,0 +1,2 @@
+import type { AnalyticsClient, AppConfig } from "../types/index.js";
+export declare function createAnalyticsClient(config: AppConfig): AnalyticsClient;

package/dist/analytics/client.js

@@ -0,0 +1,95 @@
+import { APP_NAME, APP_VERSION } from "../utils/branding.js";
+import { createAnalyticsProof, createAnalyticsSession, isAnalyticsSessionFresh } from "./session.js";
+const TRACKING_BASE_URL = "https://tracking.ottili.one/api/aicmd";
+function createSessionGetter(config) {
+    let cachedSession;
+    let sessionPromise;
+    return async () => {
+        if (isAnalyticsSessionFresh(cachedSession)) {
+            return cachedSession;
+        }
+        if (!sessionPromise) {
+            sessionPromise = createAnalyticsSession(config).then((session) => {
+                cachedSession = session;
+                sessionPromise = undefined;
+                return session;
+            });
+        }
+        return sessionPromise;
+    };
+}
+async function postJson(path, payload, config, getSession) {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 1_500);
+    try {
+        const session = await getSession();
+        if (!session) {
+            return;
+        }
+        await fetch(`${TRACKING_BASE_URL}${path}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "User-Agent": `${APP_NAME}/${APP_VERSION}`,
+                "X-AI-CMD-Install-Id": config.analyticsId ?? "",
+                "X-AI-CMD-Session-Id": session.sessionId,
+                "X-AI-CMD-Session-Expires": session.expiresAt,
+                "X-AI-CMD-Session-Signature": session.signature
+            },
+            body: JSON.stringify({
+                payload,
+                auth: createAnalyticsProof(session, payload)
+            }),
+            signal: controller.signal
+        });
+    }
+    catch {
+        // Analytics should never block or break the CLI.
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+function createNoopAnalyticsClient() {
+    return {
+        async trackCliStart() { },
+        async trackPromptSent() { },
+        async trackError() { }
+    };
+}
+export function createAnalyticsClient(config) {
+    if (!config.analytics || !config.analyticsId) {
+        return createNoopAnalyticsClient();
+    }
+    const getSession = createSessionGetter(config);
+    const basePayload = () => ({
+        installId: config.analyticsId,
+        app: APP_NAME.toLowerCase(),
+        version: APP_VERSION,
+        time: new Date().toISOString()
+    });
+    return {
+        async trackCliStart(payload) {
+            await postJson("/events", {
+                ...basePayload(),
+                event: "cli_started",
+                ...payload
+            }, config, getSession);
+        },
+        async trackPromptSent(payload) {
+            await postJson("/events", {
+                ...basePayload(),
+                event: "prompt_sent",
+                ...payload
+            }, config, getSession);
+        },
+        async trackError(payload) {
+            await postJson("/errors", {
+                ...basePayload(),
+                event: "error_reported",
+                ...payload
+            }, config, getSession);
+        }
+    };
+}
+//# sourceMappingURL=client.js.map

package/dist/analytics/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/analytics/client.ts"],"names":[],"mappings":"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"}

package/dist/analytics/session.d.ts

@@ -0,0 +1,15 @@
+import type { AppConfig } from "../types/index.js";
+export interface AnalyticsSession {
+    sessionId: string;
+    nonce: string;
+    difficulty: number;
+    expiresAt: string;
+    signature: string;
+}
+export declare function createAnalyticsSession(config: AppConfig): Promise<AnalyticsSession | undefined>;
+export declare function isAnalyticsSessionFresh(session: AnalyticsSession | undefined): session is AnalyticsSession;
+export declare function createAnalyticsProof(session: AnalyticsSession, payload: Record<string, unknown>): {
+    payloadHash: string;
+    counter: number;
+    proof: string;
+};

package/dist/analytics/session.js

@@ -0,0 +1,70 @@
+import { createHash } from "node:crypto";
+import { APP_NAME, APP_VERSION } from "../utils/branding.js";
+const TRACKING_BASE_URL = "https://tracking.ottili.one/api/aicmd";
+const SESSION_REFRESH_BUFFER_MS = 60_000;
+function sha256(input) {
+    return createHash("sha256").update(input).digest("hex");
+}
+function hasLeadingZeroes(hex, zeroCount) {
+    return hex.startsWith("0".repeat(Math.max(0, zeroCount)));
+}
+export async function createAnalyticsSession(config) {
+    if (!config.analyticsId) {
+        return undefined;
+    }
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 1_500);
+    try {
+        const response = await fetch(`${TRACKING_BASE_URL}/session`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "User-Agent": `${APP_NAME}/${APP_VERSION}`
+            },
+            body: JSON.stringify({
+                installId: config.analyticsId,
+                app: APP_NAME.toLowerCase(),
+                version: APP_VERSION
+            }),
+            signal: controller.signal
+        });
+        if (!response.ok) {
+            return undefined;
+        }
+        return (await response.json());
+    }
+    catch {
+        return undefined;
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+export function isAnalyticsSessionFresh(session) {
+    if (!session) {
+        return false;
+    }
+    return (new Date(session.expiresAt).getTime() - Date.now() >
+        SESSION_REFRESH_BUFFER_MS);
+}
+export function createAnalyticsProof(session, payload) {
+    const payloadHash = sha256(JSON.stringify(payload));
+    let counter = 0;
+    while (counter < 250_000) {
+        const proof = sha256(`${session.sessionId}:${session.nonce}:${payloadHash}:${counter}`);
+        if (hasLeadingZeroes(proof, session.difficulty)) {
+            return {
+                payloadHash,
+                counter,
+                proof
+            };
+        }
+        counter += 1;
+    }
+    return {
+        payloadHash,
+        counter,
+        proof: sha256(`${session.sessionId}:${session.nonce}:${payloadHash}:${counter}`)
+    };
+}
+//# sourceMappingURL=session.js.map

package/dist/analytics/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/analytics/session.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands.d.ts

@@ -1,9 +1,10 @@
 import { runCommand } from "../exec/runCommand.js";
-import type { AIProvider, AppConfig, PlatformContext, PromptAdapter } from "../types/index.js";
+import type { AIProvider, AnalyticsClient, AppConfig, PlatformContext, PromptAdapter } from "../types/index.js";
 export interface CliDependencies {
     loadConfig: () => Promise<AppConfig>;
     detectPlatformContext: () => Promise<PlatformContext>;
     createProvider: (config: AppConfig) => AIProvider;
+    createAnalyticsClient: (config: AppConfig) => AnalyticsClient;
     createPromptAdapter: () => PromptAdapter;
     copyToClipboard: (command: string) => Promise<void>;
     commandRunner: typeof runCommand;

package/dist/cli/commands.js

@@ -1,8 +1,9 @@
 import clipboardy from "clipboardy";
 import { Command, Option } from "commander";
+import { createAnalyticsClient as createDefaultAnalyticsClient } from "../analytics/client.js";
 import { startRepl } from "./repl.js";
 import { createPromptAdapter } from "./prompts.js";
-import { loadConfig } from "../config/userConfig.js";
+import { loadOrConfigureConfig } from "../config/configurator.js";
 import { generateCommand } from "../core/generateCommand.js";
 import { formatSuggestion } from "../core/output.js";
 import { runCommand } from "../exec/runCommand.js";
@@ -10,14 +11,16 @@ import { detectPlatformContext } from "../platform/detectPlatform.js";
 import { createProvider } from "../providers/factory.js";
 import { assessCommandRisk } from "../safety/classifyRisk.js";
 import { enforceExecutionPolicy } from "../safety/executionPolicy.js";
-import { ClipboardError, ConfigurationError, getErrorMessage } from "../utils/errors.js";
+import { ClipboardError, ConfigurationError, ExecutionPolicyError, UserCancelledError, getErrorMessage } from "../utils/errors.js";
 import { formatVersionBanner } from "../utils/branding.js";
 import { Logger } from "../utils/logger.js";
+import { inspectWorkspace } from "../workspace/inspectWorkspace.js";
 export function createDefaultDependencies() {
     return {
-        loadConfig: () => loadConfig(),
+        loadConfig: () => loadOrConfigureConfig(),
         detectPlatformContext,
         createProvider,
+        createAnalyticsClient: createDefaultAnalyticsClient,
         createPromptAdapter,
         copyToClipboard: async (command) => {
             try {
@@ -53,6 +56,32 @@ function ensureInteractiveFlagsAreValid(options) {
         throw new ConfigurationError("--json, --exec, --yes, and --copy require a question in one-shot mode.");
     }
 }
+function shouldReportError(error) {
+    return !(error instanceof UserCancelledError || error instanceof ExecutionPolicyError);
+}
+async function prepareRuntime(options, deps, mode) {
+    const config = await deps.loadConfig();
+    const platform = await deps.detectPlatformContext();
+    const effectivePlatform = options.shell
+        ? { ...platform, shell: options.shell }
+        : platform;
+    const provider = deps.createProvider(config);
+    const analytics = deps.createAnalyticsClient(config);
+    const workspaceContext = await inspectWorkspace(effectivePlatform.cwd);
+    await analytics.trackCliStart({
+        os: effectivePlatform.os,
+        shell: effectivePlatform.shell,
+        provider: config.provider,
+        mode
+    });
+    return {
+        config,
+        effectivePlatform,
+        provider,
+        analytics,
+        ...(workspaceContext ? { workspaceContext } : {})
+    };
+}
 function writeJsonWithExecution(suggestion, execution) {
     process.stdout.write(`${JSON.stringify({
         question: suggestion.question,
@@ -65,31 +94,71 @@ function writeJsonWithExecution(suggestion, execution) {
         execution
     }, null, 2)}\n`);
 }
-async function handleOneShot(question, options, deps) {
+async function handleOneShot(question, options, deps, runtime) {
     const logger = new Logger(options.debug);
-    const config = await deps.loadConfig();
-    const platform = await deps.detectPlatformContext();
-    const provider = deps.createProvider(config);
-    const effectivePlatform = options.shell
-        ? { ...platform, shell: options.shell }
-        : platform;
-    if (options.exec && effectivePlatform.os === "unsupported") {
-        throw new ConfigurationError("Execution is disabled on unsupported host OSes. Use a Unix-like shell or WSL.");
-    }
-    logger.debug("Using platform context", effectivePlatform);
-    logger.debug("Using provider", {
-        provider: config.provider,
-        model: config.model,
-        baseUrl: config.baseUrl
-    });
-    const suggestion = await generateCommand({
-        question,
-        platform: effectivePlatform,
-        provider,
-        explainRequested: true
-    });
-    let execution;
-    if (options.json) {
+    try {
+        if (options.exec && runtime.effectivePlatform.os === "unsupported") {
+            throw new ConfigurationError("Execution is disabled on unsupported host OSes. Use a Unix-like shell or WSL.");
+        }
+        logger.debug("Using platform context", runtime.effectivePlatform);
+        logger.debug("Using provider", {
+            provider: runtime.config.provider,
+            model: runtime.config.model,
+            baseUrl: runtime.config.baseUrl
+        });
+        await runtime.analytics.trackPromptSent({
+            os: runtime.effectivePlatform.os,
+            shell: runtime.effectivePlatform.shell,
+            provider: runtime.config.provider,
+            mode: "one-shot"
+        });
+        const suggestion = await generateCommand({
+            question,
+            platform: runtime.effectivePlatform,
+            provider: runtime.provider,
+            explainRequested: true,
+            ...(runtime.workspaceContext
+                ? { workspaceContext: runtime.workspaceContext }
+                : {})
+        });
+        let execution;
+        if (options.json) {
+            if (options.copy) {
+                try {
+                    await deps.copyToClipboard(suggestion.command);
+                    process.stderr.write("Command copied to clipboard.\n");
+                }
+                catch (error) {
+                    if (error instanceof ClipboardError) {
+                        process.stderr.write(`${error.message}\n${suggestion.command}\n`);
+                    }
+                    else {
+                        throw error;
+                    }
+                }
+            }
+            if (options.exec) {
+                const assessment = assessCommandRisk(suggestion.command);
+                await enforceExecutionPolicy({
+                    command: suggestion.command,
+                    risk: assessment.level,
+                    yes: options.yes,
+                    prompt: deps.createPromptAdapter(),
+                    ...(assessment.reasons[0] ? { reason: assessment.reasons[0] } : {})
+                });
+                execution = await deps.commandRunner(suggestion.command, {
+                    cwd: runtime.effectivePlatform.cwd,
+                    stdio: "pipe"
+                });
+            }
+            writeJsonWithExecution(suggestion, execution);
+            return;
+        }
+        process.stdout.write(`${formatSuggestion(suggestion, {
+            color: !options.noColor,
+            explain: true,
+            json: false
+        })}\n`);
         if (options.copy) {
             try {
                 await deps.copyToClipboard(suggestion.command);
@@ -104,57 +173,36 @@ async function handleOneShot(question, options, deps) {
                 }
             }
         }
-        if (options.exec) {
-            const assessment = assessCommandRisk(suggestion.command);
-            await enforceExecutionPolicy({
-                command: suggestion.command,
-                risk: assessment.level,
-                yes: options.yes,
-                prompt: deps.createPromptAdapter(),
-                ...(assessment.reasons[0] ? { reason: assessment.reasons[0] } : {})
-            });
-            execution = await deps.commandRunner(suggestion.command, {
-                cwd: effectivePlatform.cwd,
-                stdio: "pipe"
-            });
+        if (!options.exec) {
+            return;
         }
-        writeJsonWithExecution(suggestion, execution);
-        return;
+        const assessment = assessCommandRisk(suggestion.command);
+        await enforceExecutionPolicy({
+            command: suggestion.command,
+            risk: assessment.level,
+            yes: options.yes,
+            prompt: deps.createPromptAdapter(),
+            ...(assessment.reasons[0] ? { reason: assessment.reasons[0] } : {})
+        });
+        await deps.commandRunner(suggestion.command, {
+            cwd: runtime.effectivePlatform.cwd,
+            stdio: "inherit"
+        });
     }
-    process.stdout.write(`${formatSuggestion(suggestion, {
-        color: !options.noColor,
-        explain: true,
-        json: false
-    })}\n`);
-    if (options.copy) {
-        try {
-            await deps.copyToClipboard(suggestion.command);
-            process.stderr.write("Command copied to clipboard.\n");
-        }
-        catch (error) {
-            if (error instanceof ClipboardError) {
-                process.stderr.write(`${error.message}\n${suggestion.command}\n`);
-            }
-            else {
-                throw error;
-            }
+    catch (error) {
+        if (shouldReportError(error)) {
+            await runtime.analytics.trackError({
+                prompt: question,
+                os: runtime.effectivePlatform.os,
+                shell: runtime.effectivePlatform.shell,
+                provider: runtime.config.provider,
+                message: getErrorMessage(error),
+                time: new Date().toISOString(),
+                ...(error instanceof Error ? { code: error.name } : {})
+            });
         }
+        throw error;
     }
-    if (!options.exec) {
-        return;
-    }
-    const assessment = assessCommandRisk(suggestion.command);
-    await enforceExecutionPolicy({
-        command: suggestion.command,
-        risk: assessment.level,
-        yes: options.yes,
-        prompt: deps.createPromptAdapter(),
-        ...(assessment.reasons[0] ? { reason: assessment.reasons[0] } : {})
-    });
-    await deps.commandRunner(suggestion.command, {
-        cwd: effectivePlatform.cwd,
-        stdio: "inherit"
-    });
 }
 export async function runCli(argv = process.argv, dependencies = createDefaultDependencies()) {
     const program = new Command();
@@ -166,11 +214,7 @@ export async function runCli(argv = process.argv, dependencies = createDefaultDe
         .option("--yes", "Skip the standard confirmation prompt for low/medium-risk commands")
         .option("--explain", "Show the explanation alongside the generated command")
         .option("--json", "Emit machine-readable JSON")
-        .addOption(new Option("--shell <shell>", "Shell hint for command generation").choices([
-        "bash",
-        "zsh",
-        "sh"
-    ]))
+        .addOption(new Option("--shell <shell>", "Shell hint for command generation").choices(["bash", "zsh", "sh"]))
         .option("-v, --version", "Show branded version information")
         .option("--copy", "Copy the generated command to the clipboard")
         .option("--no-color", "Disable colored output")
@@ -188,22 +232,23 @@ export async function runCli(argv = process.argv, dependencies = createDefaultDe
         if (!question) {
             ensureInteractiveFlagsAreValid(options);
             const logger = new Logger(options.debug);
-            const config = await dependencies.loadConfig();
-            const platform = await dependencies.detectPlatformContext();
-            const provider = dependencies.createProvider(config);
-            const effectivePlatform = options.shell
-                ? { ...platform, shell: options.shell }
-                : platform;
+            const runtime = await prepareRuntime(options, dependencies, "interactive");
             await startRepl({
-                platform: effectivePlatform,
-                provider,
+                platform: runtime.effectivePlatform,
+                provider: runtime.provider,
+                providerName: runtime.config.provider,
                 prompt: dependencies.createPromptAdapter(),
+                analytics: runtime.analytics,
+                ...(runtime.workspaceContext
+                    ? { workspaceContext: runtime.workspaceContext }
+                    : {}),
                 color: !options.noColor,
                 logger
             });
             return;
         }
-        await handleOneShot(question, options, dependencies);
+        const runtime = await prepareRuntime(options, dependencies, "one-shot");
+        await handleOneShot(question, options, dependencies, runtime);
     });
     await program.parseAsync(argv);
 }
@@ -212,8 +257,7 @@ export async function runCliAndHandleErrors(argv = process.argv, dependencies =
         await runCli(argv, dependencies);
     }
     catch (error) {
-        const debug = argv.includes("--debug") ||
-            argv.includes("-d");
+        const debug = argv.includes("--debug") || argv.includes("-d");
         process.stderr.write(`${getErrorMessage(error, debug)}\n`);
         process.exitCode = 1;
     }