@tacone/prosey 0.7.1 → 0.8.0

package/bin/prosey

@@ -101623,26 +101623,55 @@ function configPath() {
 function ensureDir(path) {
   return mkdir(path, { recursive: true });
 }
+function mergeOverDefaults(user, defaults) {
+  return {
+    pager: user.pager ?? defaults.pager,
+    hints: user.hints ?? defaults.hints,
+    format: user.format ?? defaults.format,
+    ai: user.ai?.command !== undefined ? user.ai : defaults.ai,
+    summarize: {
+      command: user.summarize?.command ?? defaults.summarize?.command,
+      prompt: user.summarize?.prompt ?? defaults.summarize?.prompt
+    },
+    transcribe: {
+      command: user.transcribe?.command ?? defaults.transcribe?.command,
+      prompt: user.transcribe?.prompt ?? defaults.transcribe?.prompt
+    }
+  };
+}
+async function parseOrEmpty(text) {
+  try {
+    return lt(text);
+  } catch {
+    return {};
+  }
+}
 async function loadConfig() {
+  const defaultConfig = await parseOrEmpty(await readDefaultConfig());
   const path = configPath();
   if (!existsSync(path)) {
     const dir = configDir();
     await ensureDir(dir);
     await writeFile(path, await readDefaultConfig(), "utf8");
-    return {};
-  }
-  const raw = await readFile(path, "utf8");
-  try {
-    return lt(raw);
-  } catch {
-    return {};
+    return defaultConfig;
   }
+  const userConfig = await parseOrEmpty(await readFile(path, "utf8"));
+  return mergeOverDefaults(userConfig, defaultConfig);
 }
 async function resetConfig() {
   const path = configPath();
   const dir = configDir();
   await ensureDir(dir);
-  await writeFile(path, await readDefaultConfig(), "utf8");
+  const raw = await readDefaultConfig();
+  const commented = raw.split(`
+`).map((line) => {
+    const trimmed = line.trim();
+    if (trimmed === "" || trimmed.startsWith("#"))
+      return line;
+    return line.replace(trimmed, `# ${trimmed}`);
+  }).join(`
+`);
+  await writeFile(path, commented, "utf8");
   return path;
 }
 
@@ -103185,6 +103214,17 @@ ${css}
 
   }
 }
+main.content {
+  max-width: 50em;
+  margin: 0 auto;
+  padding: 0 1rem;
+}
+@media (max-width: 767px) {
+  main.content {
+    margin-top: 0rem;
+  }
+}
+
 h1 { --pico-font-size: 1.9rem; }
 h2 { --pico-font-size: 1.5rem; }
 h3 { --pico-font-size: 1.25rem; }
@@ -103194,12 +103234,22 @@ h6 { --pico-font-size: 0.85rem; }
 h1, h2, h3, h4, h5, h6 {
   --pico-font-weight: 500;
   --pico-line-height: 1.25;
-  margin-top: 0;
+  margin-top: 0.1em;
+  margin-bottom: 0.666em;
 }
 h1 {
   letter-spacing: -0.03em;
+  margin-top: calc(var(--pico-typography-spacing-vertical) * 2);
   margin-bottom: calc(var(--pico-typography-spacing-vertical) * 2);
 }
+@media (max-width: 767px) {
+  h1 {
+    margin-top: calc(var(--pico-typography-spacing-vertical) * 2);
+    margin-bottom: calc(var(--pico-typography-spacing-vertical) * 2);
+    text-align: center;
+  }
+}
+
 li:last-child {
   margin-bottom: 0px;
 }
@@ -103228,7 +103278,7 @@ img[alt="Prosey"]:hover, img[alt="Prosey"]:active, img[alt="Prosey"]:focus { fil
 <div style="flex:1;text-align:center;font-size:.85rem;color:var(--pico-muted-color)">${watchMeta ? watchMetaHtml(watchMeta.duration, watchMeta.wordCount, watchMeta.videoId) : ""}</div>
 <button id="theme-btn" type="button" style="background:none;border:none;cursor:pointer;padding:0;line-height:1;opacity:.5;filter:grayscale(100%);transition:all 0.3s;flex-shrink:0">\uD83D\uDCA1</button>
 </div>
-<main style="max-width:50em;margin:0 auto;padding:1rem">
+<main class="content">
 ${body}
 </main>
 <script>
@@ -103263,7 +103313,7 @@ function openInBrowser(htmlPath) {
 // package.json
 var package_default = {
   name: "@tacone/prosey",
-  version: "0.7.1",
+  version: "0.8.0",
   description: "Download YouTube video transcripts from the CLI",
   module: "src/index.ts",
   type: "module",
@@ -122082,6 +122132,7 @@ var listOnly = false;
 var outputPath;
 var outputJson = false;
 var format3 = "markdown";
+var formatExplicit = false;
 var noDecode = false;
 var showDetails = true;
 var noCache = false;
@@ -122114,14 +122165,19 @@ for (let i = 0;i < args.length; i++) {
   } else if (arg === "--json") {
     outputJson = true;
     format3 = "json";
+    formatExplicit = true;
   } else if (arg === "--text") {
     outputJson = false;
     format3 = "text";
+    formatExplicit = true;
   } else if (arg === "--markdown") {
     format3 = "markdown";
+    formatExplicit = true;
   } else if (arg === "--html") {
     format3 = "html";
+    formatExplicit = true;
   } else if (arg === "--format") {
+    formatExplicit = true;
     const val = args[++i];
     if (val === "json") {
       format3 = "json";
@@ -122209,6 +122265,9 @@ debug("Pager:", pagerCmd ?? "none");
     useHints = config.hints;
   }
 }
+if (!formatExplicit && config.format) {
+  format3 = config.format;
+}
 if (useHints) {
   const hasMarkdownPager = pagerCmd === "bat -lmd --style plain" || pagerCmd === "glow -p" || pagerCmd === "mdcat -l -p";
   if (!hasMarkdownPager) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tacone/prosey",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Download YouTube video transcripts from the CLI",
   "module": "src/index.ts",
   "type": "module",

package/src/config.test.ts

@@ -3,7 +3,8 @@ import { rm, readFile } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { configPath, loadConfig, resetConfig } from "./config";
+import { configPath, loadConfig, resetConfig, mergeOverDefaults } from "./config";
+import type { ProseyConfig } from "./config";
 
 const ORIGINAL_XDG = process.env.XDG_CONFIG_HOME;
 const ORIGINAL_PROSEY_CONFIG = process.env.PROSEY_CONFIG_PATH;
@@ -49,7 +50,11 @@ describe("loadConfig", () => {
     expect(existsSync(tmpConfig)).toBe(false);
 
     const config = await loadConfig();
-    expect(config).toEqual({});
+    expect(config.pager).toBe("auto");
+    expect(config.hints).toBe(true);
+    expect(config.format).toBe("html");
+    expect(config.ai?.command).toBeString();
+    expect(config.summarize?.prompt).toBeString();
     expect(existsSync(tmpConfig)).toBe(true);
 
     const content = await readFile(tmpConfig, "utf8");
@@ -73,7 +78,10 @@ describe("loadConfig", () => {
     await Bun.write(tmpConfig, "invalid [[\ntoml{{{");
 
     const config = await loadConfig();
-    expect(config).toEqual({});
+    expect(config.pager).toBe("auto");
+    expect(config.hints).toBe(true);
+    expect(config.format).toBe("html");
+    expect(config.ai?.command).toBeString();
   });
 });
 
@@ -86,7 +94,20 @@ describe("resetConfig", () => {
     } catch {}
   });
 
-  test("overwrites existing file with defaults", async () => {
+  test("reset + load returns full defaults", async () => {
+    process.env.PROSEY_CONFIG_PATH = tmpConfig;
+
+    await resetConfig();
+    const config = await loadConfig();
+    expect(config.pager).toBe("auto");
+    expect(config.hints).toBe(true);
+    expect(config.format).toBe("html");
+    expect(config.ai?.command).toBeString();
+    expect(config.summarize?.prompt).toBeString();
+    expect(config.transcribe?.prompt).toBeString();
+  });
+
+  test("overwrites existing file with commented defaults", async () => {
     process.env.PROSEY_CONFIG_PATH = tmpConfig;
 
     await Bun.write(tmpConfig, "# garbage");
@@ -94,7 +115,84 @@ describe("resetConfig", () => {
     expect(path).toBe(tmpConfig);
 
     const content = await readFile(tmpConfig, "utf8");
-    expect(content).toContain("[summarize]");
-    expect(content).toContain("command = ");
+    expect(content).toContain("# [summarize]");
+    expect(content).toContain("# command = ");
+  });
+});
+
+describe("mergeOverDefaults", () => {
+  const defaults: ProseyConfig = {
+    pager: "auto",
+    hints: true,
+    format: "html",
+    ai: { command: "opencode run" },
+    summarize: { prompt: "default summary", command: "opencode run" },
+    transcribe: { prompt: "default transcribe" },
+  };
+
+  test("empty user config returns defaults", () => {
+    const result = mergeOverDefaults({}, defaults);
+    expect(result.pager).toBe("auto");
+    expect(result.hints).toBe(true);
+    expect(result.format).toBe("html");
+    expect(result.ai?.command).toBe("opencode run");
+    expect(result.summarize?.prompt).toBe("default summary");
+    expect(result.transcribe?.prompt).toBe("default transcribe");
+  });
+
+  test("user pager overrides default", () => {
+    const result = mergeOverDefaults({ pager: "less" }, defaults);
+    expect(result.pager).toBe("less");
+    expect(result.hints).toBe(true);
+  });
+
+  test("user hints overrides default", () => {
+    const result = mergeOverDefaults({ hints: false }, defaults);
+    expect(result.hints).toBe(false);
+    expect(result.pager).toBe("auto");
+  });
+
+  test("user format overrides default", () => {
+    const result = mergeOverDefaults({ format: "markdown" }, defaults);
+    expect(result.format).toBe("markdown");
+    expect(result.hints).toBe(true);
+  });
+
+  test("user ai.command overrides default", () => {
+    const result = mergeOverDefaults({ ai: { command: "my-cmd" } }, defaults);
+    expect(result.ai?.command).toBe("my-cmd");
+    expect(result.summarize?.prompt).toBe("default summary");
+  });
+
+  test("user summarize.prompt overrides default", () => {
+    const result = mergeOverDefaults({ summarize: { prompt: "my prompt" } }, defaults);
+    expect(result.summarize?.prompt).toBe("my prompt");
+    expect(result.summarize?.command).toBe("opencode run");
+  });
+
+  test("user transcribe.prompt overrides default", () => {
+    const result = mergeOverDefaults({ transcribe: { prompt: "my transcribe" } }, defaults);
+    expect(result.transcribe?.prompt).toBe("my transcribe");
+    expect(result.summarize?.prompt).toBe("default summary");
+  });
+
+  test("all user values override all defaults", () => {
+    const result = mergeOverDefaults(
+      {
+        pager: "custom",
+        hints: false,
+        ai: { command: "custom-ai" },
+        summarize: { command: "custom-sum", prompt: "custom-sum-prompt" },
+        transcribe: { command: "custom-trans", prompt: "custom-trans-prompt" },
+      },
+      defaults,
+    );
+    expect(result.pager).toBe("custom");
+    expect(result.hints).toBe(false);
+    expect(result.ai?.command).toBe("custom-ai");
+    expect(result.summarize?.command).toBe("custom-sum");
+    expect(result.summarize?.prompt).toBe("custom-sum-prompt");
+    expect(result.transcribe?.command).toBe("custom-trans");
+    expect(result.transcribe?.prompt).toBe("custom-trans-prompt");
   });
 });

package/src/config.ts

@@ -8,6 +8,7 @@ import { load } from "js-toml";
 export interface ProseyConfig {
   pager?: string;
   hints?: boolean;
+  format?: string;
   ai?: {
     command?: string;
   };
@@ -46,28 +47,59 @@ function ensureDir(path: string): Promise<void> {
   return mkdir(path, { recursive: true }) as Promise<void>;
 }
 
+export function mergeOverDefaults(user: ProseyConfig, defaults: ProseyConfig): ProseyConfig {
+  return {
+    pager: user.pager ?? defaults.pager,
+    hints: user.hints ?? defaults.hints,
+    format: user.format ?? defaults.format,
+    ai: user.ai?.command !== undefined ? user.ai : defaults.ai,
+    summarize: {
+      command: user.summarize?.command ?? defaults.summarize?.command,
+      prompt: user.summarize?.prompt ?? defaults.summarize?.prompt,
+    },
+    transcribe: {
+      command: user.transcribe?.command ?? defaults.transcribe?.command,
+      prompt: user.transcribe?.prompt ?? defaults.transcribe?.prompt,
+    },
+  };
+}
+
+async function parseOrEmpty(text: string): Promise<ProseyConfig> {
+  try {
+    return load(text) as ProseyConfig;
+  } catch {
+    return {};
+  }
+}
+
 export async function loadConfig(): Promise<ProseyConfig> {
+  const defaultConfig = await parseOrEmpty(await readDefaultConfig());
   const path = configPath();
 
   if (!existsSync(path)) {
     const dir = configDir();
     await ensureDir(dir);
     await writeFile(path, await readDefaultConfig(), "utf8");
-    return {};
+    return defaultConfig;
   }
 
-  const raw = await readFile(path, "utf8");
-  try {
-    return load(raw) as ProseyConfig;
-  } catch {
-    return {};
-  }
+  const userConfig = await parseOrEmpty(await readFile(path, "utf8"));
+  return mergeOverDefaults(userConfig, defaultConfig);
 }
 
 export async function resetConfig(): Promise<string> {
   const path = configPath();
   const dir = configDir();
   await ensureDir(dir);
-  await writeFile(path, await readDefaultConfig(), "utf8");
+  const raw = await readDefaultConfig();
+  const commented = raw
+    .split("\n")
+    .map((line) => {
+      const trimmed = line.trim();
+      if (trimmed === "" || trimmed.startsWith("#")) return line;
+      return line.replace(trimmed, `# ${trimmed}`);
+    })
+    .join("\n");
+  await writeFile(path, commented, "utf8");
   return path;
 }

package/src/default-config.toml

@@ -1,6 +1,10 @@
 # Default prosey configuration
 # Created automatically on first run. Edit as needed.
 
+# Default output format: "markdown", "html", "text", or "json".
+# Can be overridden per-invocation via --html, --markdown, --text, --json, or --format.
+format = "html"
+
 # Pager command for transcript and summary output.
 # Defaults to "auto": bat -lmd --style plain → glow -p → mdcat -l -p → less
 # Set to a custom command (e.g. "less -R") to override.

package/src/html.ts

@@ -77,6 +77,17 @@ ${css}
 
   }
 }
+main.content {
+  max-width: 50em;
+  margin: 0 auto;
+  padding: 0 1rem;
+}
+@media (max-width: 767px) {
+  main.content {
+    margin-top: 0rem;
+  }
+}
+
 h1 { --pico-font-size: 1.9rem; }
 h2 { --pico-font-size: 1.5rem; }
 h3 { --pico-font-size: 1.25rem; }
@@ -86,12 +97,22 @@ h6 { --pico-font-size: 0.85rem; }
 h1, h2, h3, h4, h5, h6 {
   --pico-font-weight: 500;
   --pico-line-height: 1.25;
-  margin-top: 0;
+  margin-top: 0.1em;
+  margin-bottom: 0.666em;
 }
 h1 {
   letter-spacing: -0.03em;
+  margin-top: calc(var(--pico-typography-spacing-vertical) * 2);
   margin-bottom: calc(var(--pico-typography-spacing-vertical) * 2);
 }
+@media (max-width: 767px) {
+  h1 {
+    margin-top: calc(var(--pico-typography-spacing-vertical) * 2);
+    margin-bottom: calc(var(--pico-typography-spacing-vertical) * 2);
+    text-align: center;
+  }
+}
+
 li:last-child {
   margin-bottom: 0px;
 }
@@ -120,7 +141,7 @@ img[alt="Prosey"]:hover, img[alt="Prosey"]:active, img[alt="Prosey"]:focus { fil
 <div style="flex:1;text-align:center;font-size:.85rem;color:var(--pico-muted-color)">${watchMeta ? watchMetaHtml(watchMeta.duration, watchMeta.wordCount, watchMeta.videoId) : ""}</div>
 <button id="theme-btn" type="button" style="background:none;border:none;cursor:pointer;padding:0;line-height:1;opacity:.5;filter:grayscale(100%);transition:all 0.3s;flex-shrink:0">💡</button>
 </div>
-<main style="max-width:50em;margin:0 auto;padding:1rem">
+<main class="content">
 ${body}
 </main>
 <script>

package/src/index.ts

@@ -249,6 +249,7 @@ let listOnly = false;
 let outputPath: string | undefined;
 let outputJson = false;
 let format: "text" | "json" | "markdown" | "html" = "markdown";
+let formatExplicit = false;
 let noDecode = false;
 let showDetails = true;
 let noCache = false;
@@ -281,14 +282,19 @@ for (let i = 0; i < args.length; i++) {
   } else if (arg === "--json") {
     outputJson = true;
     format = "json";
+    formatExplicit = true;
   } else if (arg === "--text") {
     outputJson = false;
     format = "text";
+    formatExplicit = true;
   } else if (arg === "--markdown") {
     format = "markdown";
+    formatExplicit = true;
   } else if (arg === "--html") {
     format = "html";
+    formatExplicit = true;
   } else if (arg === "--format") {
+    formatExplicit = true;
     const val = args[++i];
     if (val === "json") {
       format = "json";
@@ -384,6 +390,10 @@ debug("Pager:", pagerCmd ?? "none");
   }
 }
 
+if (!formatExplicit && config.format) {
+  format = config.format as "text" | "json" | "markdown" | "html";
+}
+
 if (useHints) {
   const hasMarkdownPager =
     pagerCmd === "bat -lmd --style plain" || pagerCmd === "glow -p" || pagerCmd === "mdcat -l -p";