saterminal 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saterminal",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "bin": {
     "sat": "src/main.ts"

package/src/api.ts

@@ -1,11 +1,12 @@
 import { defaultFocus, domainsForSkills } from "./focus.ts";
 import type { Focus, PracticeQuestion, QuestionDetail, QuestionMeta } from "./types.ts";
 
-const baseUrl = "https://practicesat.vercel.app/api";
+const baseUrl = "https://mysatprep.fun/api";
 
 type ApiEnvelope<T> = {
   success: boolean;
   data: T;
+  error?: string;
   message?: string;
 };
 
@@ -18,7 +19,7 @@ export async function fetchQuestionBank(excludeIds: Iterable<string> = [], focus
 
   const response = await fetchJson<ApiEnvelope<QuestionMeta[]>>(`${baseUrl}/get-questions?${params}`);
   if (!response.success || !Array.isArray(response.data)) {
-    throw new Error(response.message || "Question bank fetch failed.");
+    throw new Error(response.error || response.message || "Question bank fetch failed.");
   }
 
   return response.data.filter((item) => item.questionId && item.external_id);
@@ -27,7 +28,7 @@ export async function fetchQuestionBank(excludeIds: Iterable<string> = [], focus
 export async function fetchQuestion(id: string): Promise<QuestionDetail> {
   const response = await fetchJson<ApiEnvelope<QuestionDetail>>(`${baseUrl}/question/${id}`);
   if (!response.success || !response.data) {
-    throw new Error(response.message || `Question ${id} fetch failed.`);
+    throw new Error(response.error || response.message || `Question ${id} fetch failed.`);
   }
 
   return response.data;
@@ -69,10 +70,44 @@ async function fetchJson<T>(url: string): Promise<T> {
       accept: "application/json",
     },
   });
+  const body = await response.text();
+  const contentType = response.headers.get("content-type") ?? "unknown content type";
 
   if (!response.ok) {
-    throw new Error(`${response.status} ${response.statusText}`);
+    throw new Error(`${response.status} ${response.statusText}: ${responseError(body)}`);
   }
 
-  return (await response.json()) as T;
+  if (!contentType.toLowerCase().includes("application/json")) {
+    throw new Error(`Expected JSON from ${url}, got ${contentType}: ${snippet(body)}`);
+  }
+
+  try {
+    return JSON.parse(body) as T;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Invalid JSON from ${url}: ${message}. Response: ${snippet(body)}`);
+  }
+}
+
+function responseError(body: string): string {
+  try {
+    const parsed = JSON.parse(body) as { error?: unknown; message?: unknown; details?: unknown };
+    const message = parsed.error || parsed.message || parsed.details;
+    if (typeof message === "string" && message.trim()) {
+      return message;
+    }
+  } catch {
+    // Fall back to the raw body below.
+  }
+
+  return snippet(body);
+}
+
+function snippet(value: string): string {
+  const normalized = value.replace(/\s+/g, " ").trim();
+  if (!normalized) {
+    return "empty response";
+  }
+
+  return normalized.length > 160 ? `${normalized.slice(0, 157)}...` : normalized;
 }

package/src/cli.ts

@@ -1,3 +1,4 @@
+import { readFile } from "node:fs/promises";
 import { difficultyLabels, domainLabels, focusSummary, skillLabels } from "./focus.ts";
 import { progressBarText } from "./progress.ts";
 import { buildSummaryRows, loadAttemptEvents, loadAttempts, loadFocus } from "./state.ts";
@@ -16,6 +17,7 @@ export type HistoryFilters = {
 export type ParsedCli =
   | { kind: "tui" }
   | { kind: "review" }
+  | { kind: "version" }
   | { kind: "help" }
   | { kind: "error"; message: string }
   | {
@@ -107,6 +109,10 @@ export function parseArgs(args: string[]): ParsedCli {
       return { kind: "help" };
     }
 
+    if (arg === "-V" || arg === "--version") {
+      return { kind: "version" };
+    }
+
     if (arg === "-p" || arg === "--pretty") {
       pretty = true;
       continue;
@@ -222,6 +228,11 @@ export async function runCliCommand(
     return 0;
   }
 
+  if (parsed.kind === "version") {
+    stdout.write(`sat ${await packageVersion()}\n`);
+    return 0;
+  }
+
   if (parsed.kind === "error") {
     stderr.write(`${parsed.message}\n\n${helpText()}\n`);
     return 1;
@@ -392,12 +403,19 @@ export function helpText(): string {
     "  -p, --pretty    Use colorized human-readable output",
     "      --json      Output JSON",
     "      --no-color  Disable ANSI color in pretty output",
+    "  -V, --version   Show version",
     "  -h, --help      Show this help",
     "",
     "Run `sat` with no command to open the interactive TUI.",
   ].join("\n");
 }
 
+async function packageVersion(): Promise<string> {
+  const packageJson = await readFile(new URL("../package.json", import.meta.url), "utf8");
+  const parsed = JSON.parse(packageJson) as { version?: unknown };
+  return typeof parsed.version === "string" && parsed.version ? parsed.version : "unknown";
+}
+
 export function filterHistory(attempts: Attempt[], filters: HistoryFilters = {}, now = new Date()): Attempt[] {
   let rows = [...attempts].sort((a, b) => b.updated_at.localeCompare(a.updated_at));
 

package/src/tui/question.ts

@@ -30,11 +30,11 @@ export function questionRows(detail: QuestionDetail, width: number): DisplayRow[
 }
 
 export function practiceQuestionUrl(question: PracticeQuestion): string {
-  return `https://practicesat.vercel.app/question?questionId=${encodeURIComponent(question.meta.questionId)}`;
+  return `https://mysatprep.fun/question/${encodeURIComponent(question.meta.questionId)}`;
 }
 
 export function practiceQuestionApiUrl(question: PracticeQuestion): string {
-  return `https://practicesat.vercel.app/api/question/${encodeURIComponent(question.meta.external_id)}`;
+  return `https://mysatprep.fun/api/question/${encodeURIComponent(question.meta.external_id)}`;
 }
 
 export function openExternalQuestion(question: PracticeQuestion): void {