truecourse 0.1.12 → 0.1.14

package/cli.mjs

@@ -12610,6 +12610,7 @@ var init_logs = __esm({
 // tools/cli/src/commands/start.ts
 var start_exports = {};
 __export(start_exports, {
+  getServerProcess: () => getServerProcess,
   runStart: () => runStart
 });
 import { spawn as spawn2 } from "node:child_process";
@@ -12662,10 +12663,14 @@ async function startServiceMode(openBrowser) {
     v2.info("Check logs with: truecourse service logs");
   }
 }
-function startConsoleMode() {
+function getServerProcess() {
+  return _serverProcess;
+}
+function startConsoleMode(openBrowser) {
   const serverPath = getServerPath();
+  const url2 = getServerUrl();
   v2.step("Starting server (embedded PostgreSQL starts automatically)...");
-  const serverProcess = spawn2(
+  const serverProcess = _serverProcess = spawn2(
     process.execPath,
     [serverPath],
     {
@@ -12687,6 +12692,11 @@ function startConsoleMode() {
   };
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
+  if (openBrowser) {
+    healthcheck().then((healthy) => {
+      if (healthy) openInBrowser(url2);
+    });
+  }
 }
 async function runStart({ openBrowser = true } = {}) {
   we("Starting TrueCourse");
@@ -12697,13 +12707,13 @@ async function runStart({ openBrowser = true } = {}) {
     } catch (error) {
       v2.error(`Service mode failed: ${error.message}`);
       v2.info("Falling back to console mode. Reconfigure with: truecourse setup");
-      startConsoleMode();
+      startConsoleMode(openBrowser);
     }
   } else {
-    startConsoleMode();
+    startConsoleMode(openBrowser);
   }
 }
-var __dirname;
+var __dirname, _serverProcess;
 var init_start = __esm({
   "tools/cli/src/commands/start.ts"() {
     "use strict";
@@ -12712,6 +12722,7 @@ var init_start = __esm({
     init_platform();
     init_logs();
     __dirname = path4.dirname(fileURLToPath(import.meta.url));
+    _serverProcess = null;
   }
 });
 
@@ -12724,6 +12735,7 @@ __export(helpers_exports, {
   getConfigPath: () => getConfigPath,
   getServerUrl: () => getServerUrl,
   openInBrowser: () => openInBrowser,
+  promptInstallSkills: () => promptInstallSkills,
   readConfig: () => readConfig,
   renderDiffResults: () => renderDiffResults,
   renderDiffResultsSummary: () => renderDiffResultsSummary,
@@ -12734,8 +12746,11 @@ __export(helpers_exports, {
   writeConfig: () => writeConfig
 });
 import { exec } from "node:child_process";
+import { cpSync, existsSync } from "node:fs";
 import fs5 from "node:fs";
 import path5 from "node:path";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 import os4 from "node:os";
 function getConfigPath() {
   return path5.join(os4.homedir(), ".truecourse", "config.json");
@@ -12769,16 +12784,28 @@ async function ensureServer() {
     if (!res.ok) throw new Error(`Server returned ${res.status}`);
     return false;
   } catch {
-    const { runStart: runStart2 } = await Promise.resolve().then(() => (init_start(), start_exports));
+    const envPath = path5.join(os4.homedir(), ".truecourse", ".env");
+    if (!fs5.existsSync(envPath)) {
+      const { runSetup: runSetup2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
+      await runSetup2();
+    }
+    const { runStart: runStart2, getServerProcess: getServerProcess2 } = await Promise.resolve().then(() => (init_start(), start_exports));
     await runStart2({ openBrowser: false });
-    try {
-      const res = await fetch(`${url2}/api/health`);
-      if (!res.ok) throw new Error();
-    } catch {
-      v2.error("Server failed to start. Check logs with: truecourse service logs");
-      process.exit(1);
+    const killServer = () => {
+      const proc = getServerProcess2();
+      if (proc && !proc.killed) proc.kill("SIGTERM");
+    };
+    process.on("exit", killServer);
+    for (let i = 0; i < 120; i++) {
+      try {
+        const res = await fetch(`${url2}/api/health`);
+        if (res.ok) return true;
+      } catch {
+      }
+      await new Promise((r2) => setTimeout(r2, 500));
     }
-    return true;
+    v2.error("Server failed to start. Check logs with: truecourse service logs");
+    process.exit(1);
   }
 }
 async function ensureRepo() {
@@ -12801,7 +12828,11 @@ async function ensureRepo() {
     v2.error(message);
     process.exit(1);
   }
-  return await res.json();
+  const repo = await res.json();
+  if (res.status === 201) {
+    await promptInstallSkills(process.cwd());
+  }
+  return repo;
 }
 function connectSocket(repoId) {
   const url2 = getServerUrl();
@@ -12995,9 +13026,30 @@ function renderDiffResultsSummary(result) {
   v2.info("Run `truecourse list --diff` to see full details.");
 }
 function openInBrowser(url2) {
+  console.log(`   Opening ${url2}`);
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   exec(`${cmd} ${url2}`);
 }
+async function promptInstallSkills(repoPath) {
+  const installSkills = await me({
+    message: "Would you like to install Claude Code skills?"
+  });
+  if (BD(installSkills) || !installSkills) return;
+  const __dirname3 = dirname(fileURLToPath2(import.meta.url));
+  const srcPath = resolve(__dirname3, "..", "..", "skills", "truecourse");
+  const distPath = resolve(__dirname3, "skills", "truecourse");
+  const skillsSrc = existsSync(srcPath) ? srcPath : distPath;
+  if (!existsSync(skillsSrc)) {
+    v2.warn("Skills directory not found in package \u2014 skipping.");
+    return;
+  }
+  const skillsDest = resolve(repoPath, ".claude", "skills");
+  cpSync(skillsSrc, skillsDest, { recursive: true });
+  v2.success("Installed Claude Code skills:");
+  v2.message("  - truecourse-analyze  (run analysis)");
+  v2.message("  - truecourse-list     (list violations)");
+  v2.message("  - truecourse-fix      (apply fixes)");
+}
 var DEFAULT_PORT, DEFAULT_CONFIG;
 var init_helpers = __esm({
   "tools/cli/src/commands/helpers.ts"() {
@@ -13009,38 +13061,15 @@ var init_helpers = __esm({
   }
 });
 
-// node_modules/.pnpm/commander@12.1.0/node_modules/commander/esm.mjs
-var import_index = __toESM(require_commander(), 1);
-var {
-  program,
-  createCommand,
-  createArgument,
-  createOption,
-  CommanderError,
-  InvalidArgumentError,
-  InvalidOptionArgumentError,
-  // deprecated old name
-  Command,
-  Argument,
-  Option,
-  Help
-} = import_index.default;
-
-// tools/cli/src/index.ts
-init_dist2();
-import fs7 from "node:fs";
-import path8 from "node:path";
-import os6 from "node:os";
-
 // tools/cli/src/commands/setup.ts
-init_dist2();
+var setup_exports = {};
+__export(setup_exports, {
+  runSetup: () => runSetup
+});
+import { execSync as execSync4 } from "node:child_process";
 import fs6 from "node:fs";
 import path6 from "node:path";
 import os5 from "node:os";
-var DEFAULT_MODELS = {
-  anthropic: "claude-sonnet-4-20250514",
-  openai: "gpt-5.3-codex"
-};
 function buildEnvContents(config) {
   const lines = [
     "# TrueCourse Environment Configuration",
@@ -13073,8 +13102,9 @@ async function runSetup() {
   const provider = await de({
     message: "Which LLM provider would you like to use?",
     options: [
-      { value: "anthropic", label: "Anthropic (Claude)" },
-      { value: "openai", label: "OpenAI (GPT)" },
+      { value: "claude-code", label: "Claude Code CLI \u2014 no API key needed (Recommended)" },
+      { value: "anthropic", label: "Anthropic (Claude API)" },
+      { value: "openai", label: "OpenAI (GPT API)" },
       { value: "skip", label: "Skip for now" }
     ]
   });
@@ -13083,9 +13113,18 @@ async function runSetup() {
     process.exit(0);
   }
   const config = {};
-  if (provider === "anthropic" || provider === "openai") {
+  if (provider === "anthropic" || provider === "openai" || provider === "claude-code") {
     config.provider = provider;
   }
+  if (provider === "claude-code") {
+    try {
+      execSync4("which claude", { stdio: "ignore" });
+    } catch {
+      v2.error("Claude Code CLI not found on PATH. Install it first: https://docs.anthropic.com/en/docs/claude-code");
+      process.exit(1);
+    }
+    v2.success("Claude Code CLI detected.");
+  }
   if (provider === "anthropic") {
     const anthropicKey = await ue({
       message: "Enter your Anthropic API key:",
@@ -13130,7 +13169,7 @@ async function runSetup() {
     }
     config.model = model?.trim() || defaultModel;
   }
-  const useLangfuse = await me({
+  const useLangfuse = provider !== "claude-code" && await me({
     message: "Would you like to enable Langfuse tracing?",
     initialValue: false
   });
@@ -13176,8 +13215,8 @@ async function runSetup() {
   const runMode = await de({
     message: "How would you like to run TrueCourse?",
     options: [
-      { value: "console", label: "Console (keep terminal open)" },
-      { value: "service", label: "Background service (runs automatically, no terminal needed)" }
+      { value: "service", label: "Background service (Recommended)" },
+      { value: "console", label: "Console (keep terminal open)" }
     ]
   });
   if (BD(runMode)) {
@@ -13193,16 +13232,46 @@ async function runSetup() {
   v2.info("Database migrations are applied on server startup.");
   fe("Setup complete!");
 }
+var DEFAULT_MODELS;
+var init_setup = __esm({
+  "tools/cli/src/commands/setup.ts"() {
+    "use strict";
+    init_dist2();
+    DEFAULT_MODELS = {
+      anthropic: "claude-sonnet-4-20250514",
+      openai: "gpt-5.3-codex"
+    };
+  }
+});
+
+// node_modules/.pnpm/commander@12.1.0/node_modules/commander/esm.mjs
+var import_index = __toESM(require_commander(), 1);
+var {
+  program,
+  createCommand,
+  createArgument,
+  createOption,
+  CommanderError,
+  InvalidArgumentError,
+  InvalidOptionArgumentError,
+  // deprecated old name
+  Command,
+  Argument,
+  Option,
+  Help
+} = import_index.default;
 
 // tools/cli/src/index.ts
+init_dist2();
+init_setup();
 init_start();
+import fs7 from "node:fs";
+import path8 from "node:path";
+import os6 from "node:os";
 
 // tools/cli/src/commands/add.ts
 init_dist2();
 init_helpers();
-import { cpSync, existsSync } from "node:fs";
-import { resolve, dirname } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
 async function runAdd() {
   const repoPath = process.cwd();
   const serverUrl = getServerUrl();
@@ -13229,30 +13298,8 @@ async function runAdd() {
     const repo = await res.json();
     const repoUrl = `${serverUrl}/repos/${repo.id}`;
     v2.success(`Repository "${repo.name}" added`);
-    const installSkills = await me({
-      message: "Would you like to install Claude Code skills?"
-    });
-    if (BD(installSkills)) {
-      openInBrowser(repoUrl);
-      fe("Opened in browser");
-      return;
-    }
-    if (installSkills) {
-      const cliDir = dirname(fileURLToPath2(import.meta.url));
-      const skillsSrc = resolve(cliDir, "..", "..", "skills", "truecourse");
-      if (!existsSync(skillsSrc)) {
-        v2.warn("Skills directory not found in package \u2014 skipping.");
-      } else {
-        const skillsDest = resolve(repoPath, ".claude", "skills", "truecourse");
-        cpSync(skillsSrc, skillsDest, { recursive: true });
-        v2.success("Installed Claude Code skills:");
-        v2.message("  - truecourse-analyze  (run analysis)");
-        v2.message("  - truecourse-list     (list violations)");
-        v2.message("  - truecourse-fix      (apply fixes)");
-      }
-    }
-    openInBrowser(repoUrl);
-    fe("Opened in browser");
+    await promptInstallSkills(repoPath);
+    fe(`Open ${repoUrl}`);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     if (message.includes("ECONNREFUSED") || message.includes("fetch failed")) {
@@ -13270,15 +13317,37 @@ async function runAdd() {
 init_dist2();
 init_helpers();
 var TIMEOUT_MS = 15 * 60 * 1e3;
-async function runAnalyze() {
+async function runAnalyze({ noAutostart = false } = {}) {
   we("Analyzing repository");
-  const firstRun = await ensureServer();
+  if (noAutostart) {
+    const url2 = getServerUrl();
+    try {
+      const res = await fetch(`${url2}/api/health`);
+      if (!res.ok) throw new Error();
+    } catch {
+      v2.error("TrueCourse server is not running. Start it with: npx truecourse start");
+      process.exit(1);
+    }
+  }
+  const firstRun = noAutostart ? false : await ensureServer();
   const repo = await ensureRepo();
   v2.step(`Repository: ${repo.name}`);
   const serverUrl = getServerUrl();
   const socket = connectSocket(repo.id);
   const spinner = L2();
   spinner.start("Starting analysis...");
+  let canceled = false;
+  const onSigint = () => {
+    if (canceled) return;
+    canceled = true;
+    spinner.stop("Cancelling analysis...");
+    fetch(`${serverUrl}/api/repos/${repo.id}/analyze/cancel`, { method: "POST" }).catch(() => {
+    }).finally(() => {
+      socket.disconnect();
+      process.exit(130);
+    });
+  };
+  process.on("SIGINT", onSigint);
   try {
     await new Promise((resolve2, reject) => {
       const timeout = setTimeout(() => {
@@ -13305,6 +13374,10 @@ async function runAnalyze() {
         violationsReady = true;
         checkDone();
       });
+      socket.on("analysis:canceled", () => {
+        clearTimeout(timeout);
+        reject(new Error("CANCELED"));
+      });
       fetch(`${serverUrl}/api/repos/${repo.id}/analyze`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -13336,23 +13409,42 @@ async function runAnalyze() {
     }
     const violations = await res.json();
     renderViolationsSummary(violations);
+    const repoUrl = `${serverUrl}/repos/${repo.id}`;
     if (firstRun) {
-      const repoUrl = `${serverUrl}/repos/${repo.id}`;
       openInBrowser(repoUrl);
+      fe("Analysis complete \u2014 opened in browser");
+    } else {
+      fe(`Analysis complete \u2014 open ${repoUrl}`);
     }
-    fe("Analysis complete");
   } catch (err) {
-    spinner.stop("Analysis failed");
     const message = err instanceof Error ? err.message : String(err);
-    v2.error(message);
-    process.exit(1);
+    if (message === "CANCELED") {
+      spinner.stop("Analysis cancelled");
+      fe("Analysis cancelled");
+    } else {
+      spinner.stop("Analysis failed");
+      v2.error(message);
+      process.exit(1);
+    }
   } finally {
+    process.removeListener("SIGINT", onSigint);
     socket.disconnect();
   }
 }
-async function runAnalyzeDiff() {
+async function runAnalyzeDiff({ noAutostart = false } = {}) {
   we("Running diff check");
-  await ensureServer();
+  if (noAutostart) {
+    const url2 = getServerUrl();
+    try {
+      const res = await fetch(`${url2}/api/health`);
+      if (!res.ok) throw new Error();
+    } catch {
+      v2.error("TrueCourse server is not running. Start it with: npx truecourse start");
+      process.exit(1);
+    }
+  } else {
+    await ensureServer();
+  }
   const repo = await ensureRepo();
   v2.step(`Repository: ${repo.name}`);
   const serverUrl = getServerUrl();
@@ -13604,11 +13696,11 @@ program2.command("start").description("Start TrueCourse services").action(async
 program2.command("add").description("Add the current directory as a repository").action(async () => {
   await runAdd();
 });
-program2.command("analyze").description("Analyze the current repository").option("--diff", "Run diff check against latest analysis").action(async (options) => {
+program2.command("analyze").description("Analyze the current repository").option("--diff", "Run diff check against latest analysis").option("--no-autostart", "Don't auto-start the server (for use from Claude Code skills)").action(async (options) => {
   if (options.diff) {
-    await runAnalyzeDiff();
+    await runAnalyzeDiff({ noAutostart: !options.autostart });
   } else {
-    await runAnalyze();
+    await runAnalyze({ noAutostart: !options.autostart });
   }
 });
 program2.command("list").description("List violations from the latest analysis").option("--diff", "Show diff check results (new and resolved)").action(async (options) => {

package/db/migrations/0009_sticky_blizzard.sql

@@ -0,0 +1,16 @@
+CREATE TABLE "analysis_usage" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"analysis_id" uuid NOT NULL,
+	"provider" text NOT NULL,
+	"call_type" text NOT NULL,
+	"input_tokens" integer DEFAULT 0 NOT NULL,
+	"output_tokens" integer DEFAULT 0 NOT NULL,
+	"cache_read_tokens" integer DEFAULT 0 NOT NULL,
+	"cache_write_tokens" integer DEFAULT 0 NOT NULL,
+	"total_tokens" integer DEFAULT 0 NOT NULL,
+	"cost_usd" text,
+	"duration_ms" integer DEFAULT 0 NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "analysis_usage" ADD CONSTRAINT "analysis_usage_analysis_id_analyses_id_fk" FOREIGN KEY ("analysis_id") REFERENCES "public"."analyses"("id") ON DELETE cascade ON UPDATE no action;