@hasna/recordings 0.1.10 → 0.1.11

package/dist/mcp/index.js

@@ -21,7 +21,7 @@ var __require = import.meta.require;
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/recordings",
-    version: "0.1.10",
+    version: "0.1.11",
     type: "module",
     description: "Speech-to-text recording tool with MCP and CLI \u2014 records, transcribes, and optionally enhances text using AI",
     main: "dist/index.js",
@@ -14226,7 +14226,7 @@ var coerce2 = {
 };
 var NEVER2 = INVALID2;
 // src/lib/config.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2, mkdirSync as mkdirSync3, cpSync } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2, mkdirSync as mkdirSync3, cpSync, readdirSync as readdirSync3, statSync } from "fs";
 import { join as join5 } from "path";
 import { homedir as homedir6 } from "os";
 var DEFAULT_CONFIG = {
@@ -14263,7 +14263,7 @@ function loadConfig(configPath) {
     try {
       const raw = readFileSync2(filePath, "utf-8");
       const fileConfig = JSON.parse(raw);
-      Object.assign(config, fileConfig);
+      Object.assign(config, expandEnvBackedConfig(fileConfig));
     } catch {}
   }
   if (process.env.OPENAI_API_KEY) {
@@ -14309,6 +14309,16 @@ function loadConfig(configPath) {
   }
   return config;
 }
+function expandEnvBackedConfig(config) {
+  const expanded = { ...config };
+  for (const key of ["openai_api_key", "enhancement_api_key"]) {
+    const value = expanded[key];
+    if (typeof value === "string" && value.startsWith("$") && value.length > 1) {
+      expanded[key] = process.env[value.slice(1)] || value;
+    }
+  }
+  return expanded;
+}
 function findConfigFile() {
   let dir = process.cwd();
   const root = "/";
@@ -14350,20 +14360,44 @@ function loadSecretKey(keyName) {
   const secretsPath = join5(homedir6(), ".secrets");
   if (!existsSync4(secretsPath))
     return "";
-  try {
-    const content = readFileSync2(secretsPath, "utf-8");
-    const match = content.match(new RegExp(`export\\s+${keyName}\\s*=\\s*"([^"]+)"`));
-    if (match)
-      return match[1];
-    const match2 = content.match(new RegExp(`export\\s+${keyName}\\s*=\\s*'([^']+)'`));
-    if (match2)
-      return match2[1];
-    const match3 = content.match(new RegExp(`${keyName}\\s*=\\s*(.+)`));
-    if (match3)
-      return match3[1].trim().replace(/^["']|["']$/g, "");
-  } catch {}
+  for (const candidate of listSecretFiles(secretsPath)) {
+    try {
+      const content = readFileSync2(candidate, "utf-8");
+      const match = content.match(new RegExp(`export\\s+${keyName}\\s*=\\s*"([^"]+)"`));
+      if (match)
+        return match[1];
+      const match2 = content.match(new RegExp(`export\\s+${keyName}\\s*=\\s*'([^']+)'`));
+      if (match2)
+        return match2[1];
+      const match3 = content.match(new RegExp(`${keyName}\\s*=\\s*(.+)`));
+      if (match3)
+        return match3[1].trim().replace(/^["']|["']$/g, "");
+    } catch {}
+  }
   return "";
 }
+function listSecretFiles(path) {
+  try {
+    const stats = statSync(path);
+    if (stats.isFile())
+      return [path];
+    if (!stats.isDirectory())
+      return [];
+    return readdirSync3(path).sort().flatMap((entry) => {
+      const child = join5(path, entry);
+      try {
+        const childStats = statSync(child);
+        if (childStats.isDirectory())
+          return listSecretFiles(child);
+        if (childStats.isFile() && child.endsWith(".env"))
+          return [child];
+      } catch {}
+      return [];
+    });
+  } catch {
+    return [];
+  }
+}
 function ensureDataDir(config) {
   const { mkdirSync: mkdirSync4 } = __require("fs");
   mkdirSync4(config.audio_dir, { recursive: true });
@@ -14814,15 +14848,9 @@ function extractInstruction(text, trigger) {
   }
   return text;
 }
-async function enhanceText(rawText, instruction, config) {
+async function enhanceText(rawText, instruction, config, systemPrompt) {
   const client = getEnhancementClient(config);
-  try {
-    const response = await client.chat.completions.create({
-      model: config.enhancement_model,
-      messages: [
-        {
-          role: "system",
-          content: `You are a writing assistant. The user has dictated speech that needs to be transformed into polished output.
+  const basePrompt = `You are a writing assistant. The user has dictated speech that needs to be transformed into polished output.
 
 Rules:
 - Output ONLY the enhanced/rewritten text \u2014 no explanations, no preamble
@@ -14830,7 +14858,18 @@ Rules:
 - Fix grammar, structure, and clarity
 - If the user is giving instructions (e.g., "write an email saying..."), produce the actual output (the email), not a description of it
 - If the user says "say it better" or similar, rewrite their preceding text to be clearer and more professional
-- Match the appropriate tone (formal for business, casual for personal)`
+- Match the appropriate tone (formal for business, casual for personal)`;
+  const fullPrompt = systemPrompt ? `${basePrompt}
+
+Additional context:
+${systemPrompt}` : basePrompt;
+  try {
+    const response = await client.chat.completions.create({
+      model: config.enhancement_model,
+      messages: [
+        {
+          role: "system",
+          content: fullPrompt
         },
         {
           role: "user",
@@ -14852,7 +14891,7 @@ Rules:
     throw new EnhancementError(`Enhancement failed: ${msg}`);
   }
 }
-async function processText(rawText, config) {
+async function processText(rawText, config, systemPrompt) {
   if (!config.auto_enhance) {
     return { text: rawText, mode: "raw", enhancement_model: null };
   }
@@ -14860,7 +14899,7 @@ async function processText(rawText, config) {
   if (!detection.needs) {
     return { text: rawText, mode: "raw", enhancement_model: null };
   }
-  const result = await enhanceText(rawText, detection.instruction, config);
+  const result = await enhanceText(rawText, detection.instruction, config, systemPrompt);
   return {
     text: result.enhanced,
     mode: "enhanced",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/recordings",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "description": "Speech-to-text recording tool with MCP and CLI — records, transcribes, and optionally enhances text using AI",
   "main": "dist/index.js",

package/src/__tests__/enhancer.test.ts

@@ -544,6 +544,71 @@ describe("processText", () => {
   });
 });
 
+// ── systemPrompt support ──────────────────────────────────────────────────
+
+describe("systemPrompt support", () => {
+  test("processText passes systemPrompt through to enhanceText", async () => {
+    let capturedMessages: Array<{ role: string; content: string }> = [];
+    mock.module("openai", () => ({
+      default: class MockOpenAI {
+        chat = {
+          completions: {
+            create: mock((opts: { messages: Array<{ role: string; content: string }> }) => {
+              capturedMessages = opts.messages;
+              return Promise.resolve({
+                choices: [{ message: { content: "Enhanced with context" } }],
+              });
+            }),
+          },
+        };
+      },
+    }));
+
+    resetEnhancementClient();
+    const { processText: process } = await import("../lib/enhancer.js");
+    resetEnhancementClient();
+
+    await process("write an email saying thanks", config, "You are working on the Acme project");
+    expect(capturedMessages[0]!.content).toContain("Additional context:");
+    expect(capturedMessages[0]!.content).toContain("Acme project");
+
+    resetEnhancementClient();
+  });
+
+  test("processText works without systemPrompt", async () => {
+    let capturedMessages: Array<{ role: string; content: string }> = [];
+    mock.module("openai", () => ({
+      default: class MockOpenAI {
+        chat = {
+          completions: {
+            create: mock((opts: { messages: Array<{ role: string; content: string }> }) => {
+              capturedMessages = opts.messages;
+              return Promise.resolve({
+                choices: [{ message: { content: "Enhanced without context" } }],
+              });
+            }),
+          },
+        };
+      },
+    }));
+
+    resetEnhancementClient();
+    const { processText: process } = await import("../lib/enhancer.js");
+    resetEnhancementClient();
+
+    await process("write an email saying thanks", config);
+    expect(capturedMessages[0]!.content).not.toContain("Additional context:");
+
+    resetEnhancementClient();
+  });
+
+  test("processText ignores systemPrompt for raw dictation", async () => {
+    const result = await processText("Just a regular note", config, "project context");
+    expect(result.mode).toBe("raw");
+    expect(result.text).toBe("Just a regular note");
+  });
+});
+
 // ── extractInstruction (tested via needsEnhancement) ────────────────────────
 
 describe("extractInstruction behavior via needsEnhancement", () => {

package/src/cli/index.ts

@@ -148,6 +148,7 @@ program
   .description("Transcribe an existing audio file")
   .option("--no-enhance", "Skip AI enhancement")
   .option("-t, --tags <tags>", "Comma-separated tags")
+  .option("--system-prompt <prompt>", "System prompt for enhancement context")
   .action(async (file, opts) => {
     const config = loadConfig();
     ensureDataDir(config);
@@ -156,7 +157,7 @@ program
     console.log(chalk.blue("Transcribing..."));
     const transcription = await transcribeAudio(file, config);
 
-    const processed = await processText(transcription.text, config);
+    const processed = await processText(transcription.text, config, opts.systemPrompt);
     const parentOpts = program.opts();
     const tags = opts.tags ? opts.tags.split(",").map((t: string) => t.trim()) : [];
 
@@ -472,64 +473,6 @@ program
     }
   });
 
-// ── start ───────────────────────────────────────────────────────────────────
-
-program
-  .command("start")
-  .description("Launch the menu bar helper app (F5 to toggle recording)")
-  .option("--login", "Also add to Login Items so it starts automatically")
-  .action(async (opts) => {
-    const { execSync } = require("node:child_process") as typeof import("node:child_process");
-    const { join: pathJoin } = require("node:path") as typeof import("node:path");
-    const { homedir: getHome } = require("node:os") as typeof import("node:os");
-    const { existsSync: fileExists } = require("node:fs") as typeof import("node:fs");
-    const home = getHome();
-
-    const appPath = pathJoin(home, ".hasna", "recordings", "RecordingsHelper.app");
-    const oldAppPath = pathJoin(home, ".recordings", "RecordingsHelper.app");
-
-    if (!fileExists(appPath) && !fileExists(oldAppPath)) {
-      console.error(chalk.red("RecordingsHelper.app not found. Run: recordings shortcut --install"));
-      process.exit(1);
-    }
-
-    const resolvedAppPath = fileExists(appPath) ? appPath : oldAppPath;
-
-    // Kill existing instance
-    try { execSync("pkill -f RecordingsHelper", { stdio: "pipe" }); } catch { /* not running */ }
-
-    // Launch
-    execSync(`open "${resolvedAppPath}"`, { stdio: "pipe" });
-    console.log(chalk.green("Recordings helper launched — press F5 to record"));
-
-    if (opts.login) {
-      try {
-        execSync(
-          `osascript -e 'tell application "System Events" to make login item at end with properties {path:"${resolvedAppPath}", hidden:true}'`,
-          { stdio: "pipe" }
-        );
-        console.log(chalk.green("Added to Login Items — will start on boot"));
-      } catch {
-        console.log(chalk.yellow("Could not add to Login Items — add manually in System Settings > General > Login Items"));
-      }
-    }
-  });
-
-// ── stop ────────────────────────────────────────────────────────────────────
-
-program
-  .command("stop")
-  .description("Stop the menu bar helper app")
-  .action(() => {
-    const { execSync } = require("node:child_process") as typeof import("node:child_process");
-    try {
-      execSync("pkill -f RecordingsHelper", { stdio: "pipe" });
-      console.log(chalk.green("Recordings helper stopped"));
-    } catch {
-      console.log(chalk.dim("Not running"));
-    }
-  });
-
 // ── listen ───────────────────────────────────────────────────────────────────
 
 program
@@ -680,13 +623,12 @@ program
   .command("shortcut")
   .description("Set up a global keyboard shortcut for recording (macOS)")
   .option("--raycast", "Generate Raycast script command")
-  .option("--install", "Set up F5 global shortcut via macOS Services (no extra installs)")
   .option("--karabiner", "Set up Fn key via Karabiner-Elements")
   .option("--skhd", "Generate skhd hotkey config")
   .option("--hammerspoon", "Generate Hammerspoon config")
   .option("--script", "Just output the shell script path")
   .action((opts) => {
-    const { writeFileSync, mkdirSync, chmodSync, existsSync: fileExists } = require("node:fs") as typeof import("node:fs");
+    const { writeFileSync, mkdirSync, chmodSync } = require("node:fs") as typeof import("node:fs");
     const { join: pathJoin } = require("node:path") as typeof import("node:path");
     const { homedir: getHome } = require("node:os") as typeof import("node:os");
     const home = getHome();
@@ -746,72 +688,6 @@ fi
     writeFileSync(scriptPath, script, "utf-8");
     chmodSync(scriptPath, 0o755);
 
-    if (opts.install) {
-      // Install the native menu bar app — no config needed, just works with F5
-      const { execSync: exec } = require("node:child_process") as typeof import("node:child_process");
-
-      const appPath = pathJoin(home, ".hasna", "recordings", "RecordingsHelper.app");
-      const srcSwift = pathJoin(__dirname, "..", "native", "RecordingsHelper.swift");
-      const distApp = pathJoin(__dirname, "..", "RecordingsHelper.app");
-
-      // Copy pre-built app if available, otherwise compile
-      if (fileExists(pathJoin(distApp, "Contents", "MacOS", "RecordingsHelper"))) {
-        exec(`rm -rf "${appPath}" && cp -R "${distApp}" "${appPath}"`, { stdio: "pipe", shell: "/bin/bash" });
-      } else if (fileExists(srcSwift)) {
-        // Compile from source
-        console.log(chalk.blue("Compiling native helper app..."));
-        const appDir = pathJoin(home, ".hasna", "recordings", "RecordingsHelper.app", "Contents", "MacOS");
-        mkdirSync(appDir, { recursive: true });
-
-        const plistDir = pathJoin(home, ".hasna", "recordings", "RecordingsHelper.app", "Contents");
-        const plist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0"><dict>
-<key>CFBundleExecutable</key><string>RecordingsHelper</string>
-<key>CFBundleIdentifier</key><string>com.hasna.recordings-helper</string>
-<key>CFBundleName</key><string>Recordings</string>
-<key>LSUIElement</key><true/>
-<key>NSMicrophoneUsageDescription</key><string>Recordings needs microphone access for speech transcription.</string>
-</dict></plist>`;
-        writeFileSync(pathJoin(plistDir, "Info.plist"), plist, "utf-8");
-
-        try {
-          exec(
-            `DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer xcrun swiftc -O -o "${appDir}/RecordingsHelper" "${srcSwift}" -framework Cocoa -framework Carbon`,
-            { stdio: "pipe" }
-          );
-        } catch {
-          // Fallback to default toolchain
-          exec(
-            `swiftc -O -o "${appDir}/RecordingsHelper" "${srcSwift}" -framework Cocoa -framework Carbon`,
-            { stdio: "pipe" }
-          );
-        }
-      } else {
-        console.error(chalk.red("Cannot find RecordingsHelper. Run from the project directory or rebuild."));
-        process.exit(1);
-      }
-
-      // Kill existing instance and launch
-      try { exec("pkill -f RecordingsHelper", { stdio: "pipe" }); } catch { /* not running */ }
-      exec(`open "${appPath}"`, { stdio: "pipe" });
-
-      // Add to Login Items
-      try {
-        exec(
-          `osascript -e 'tell application "System Events" to make login item at end with properties {path:"${appPath}", hidden:true}'`,
-          { stdio: "pipe" }
-        );
-      } catch { /* already exists or no permission */ }
-
-      console.log(chalk.green("\nRecordings helper installed and running!\n"));
-      console.log(`  ${chalk.yellow("F5")}     Start/stop recording`);
-      console.log(`  ${chalk.dim("🎙")}      Menu bar icon (click for options)`);
-      console.log(`  ${chalk.dim("Auto")}   Starts on login\n`);
-      console.log(chalk.dim("  Press F5 → speak → F5 → text is pasted where your cursor is."));
-      return;
-    }
-
     if (opts.karabiner) {
       const karabinerDir = pathJoin(home, ".config", "karabiner", "assets", "complex_modifications");
       mkdirSync(karabinerDir, { recursive: true });
@@ -900,9 +776,6 @@ ${scriptPath}
     console.log(chalk.cyan(`  ${scriptPath}\n`));
     console.log("Bind it to a hotkey using any of these:\n");
 
-    console.log(chalk.bold("  macOS built-in") + chalk.dim(" (no extra installs — recommended)"));
-    console.log(`    recordings shortcut --install\n`);
-
     console.log(chalk.bold("  Karabiner-Elements") + chalk.dim(" (for Fn key specifically)"));
     console.log(`    brew install --cask karabiner-elements`);
     console.log(`    recordings shortcut --karabiner\n`);

package/src/lib/config.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, mkdirSync, cpSync } from "fs";
+import { existsSync, readFileSync, mkdirSync, cpSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import type { RecordingsConfig } from "../types/index.js";
@@ -42,7 +42,7 @@ export function loadConfig(configPath?: string): RecordingsConfig {
     try {
       const raw = readFileSync(filePath, "utf-8");
       const fileConfig = JSON.parse(raw) as Partial<RecordingsConfig>;
-      Object.assign(config, fileConfig);
+      Object.assign(config, expandEnvBackedConfig(fileConfig));
     } catch {
       // Ignore invalid config files
     }
@@ -102,6 +102,19 @@ export function loadConfig(configPath?: string): RecordingsConfig {
   return config;
 }
 
+function expandEnvBackedConfig(config: Partial<RecordingsConfig>): Partial<RecordingsConfig> {
+  const expanded = { ...config };
+
+  for (const key of ["openai_api_key", "enhancement_api_key"] as const) {
+    const value = expanded[key];
+    if (typeof value === "string" && value.startsWith("$") && value.length > 1) {
+      expanded[key] = process.env[value.slice(1)] || value;
+    }
+  }
+
+  return expanded;
+}
+
 function findConfigFile(): string | null {
   // Walk up from cwd looking for .recordings/config.json
   let dir = process.cwd();
@@ -150,24 +163,51 @@ function loadSecretKey(keyName: string): string {
   const secretsPath = join(homedir(), ".secrets");
   if (!existsSync(secretsPath)) return "";
 
-  try {
-    const content = readFileSync(secretsPath, "utf-8");
-    const match = content.match(
-      new RegExp(`export\\s+${keyName}\\s*=\\s*"([^"]+)"`)
-    );
-    if (match) return match[1]!;
+  for (const candidate of listSecretFiles(secretsPath)) {
+    try {
+      const content = readFileSync(candidate, "utf-8");
+      const match = content.match(
+        new RegExp(`export\\s+${keyName}\\s*=\\s*"([^"]+)"`)
+      );
+      if (match) return match[1]!;
+
+      const match2 = content.match(
+        new RegExp(`export\\s+${keyName}\\s*=\\s*'([^']+)'`)
+      );
+      if (match2) return match2[1]!;
+
+      const match3 = content.match(new RegExp(`${keyName}\\s*=\\s*(.+)`));
+      if (match3) return match3[1]!.trim().replace(/^["']|["']$/g, "");
+    } catch {
+      // Ignore unreadable secret files
+    }
+  }
 
-    const match2 = content.match(
-      new RegExp(`export\\s+${keyName}\\s*=\\s*'([^']+)'`)
-    );
-    if (match2) return match2[1]!;
+  return "";
+}
 
-    const match3 = content.match(new RegExp(`${keyName}\\s*=\\s*(.+)`));
-    if (match3) return match3[1]!.trim().replace(/^["']|["']$/g, "");
+function listSecretFiles(path: string): string[] {
+  try {
+    const stats = statSync(path);
+    if (stats.isFile()) return [path];
+    if (!stats.isDirectory()) return [];
+
+    return readdirSync(path)
+      .sort()
+      .flatMap((entry) => {
+        const child = join(path, entry);
+        try {
+          const childStats = statSync(child);
+          if (childStats.isDirectory()) return listSecretFiles(child);
+          if (childStats.isFile() && child.endsWith(".env")) return [child];
+        } catch {
+          // Ignore entries that disappear or are unreadable
+        }
+        return [];
+      });
   } catch {
-    // Ignore
+    return [];
   }
-  return "";
 }
 
 export function ensureDataDir(config: RecordingsConfig): void {

package/src/lib/enhancer.ts

@@ -92,17 +92,12 @@ function extractInstruction(text: string, trigger: string): string {
 export async function enhanceText(
   rawText: string,
   instruction: string,
-  config: RecordingsConfig
+  config: RecordingsConfig,
+  systemPrompt?: string
 ): Promise<EnhancementResult> {
   const client = getEnhancementClient(config);
 
-  try {
-    const response = await client.chat.completions.create({
-      model: config.enhancement_model,
-      messages: [
-        {
-          role: "system",
-          content: `You are a writing assistant. The user has dictated speech that needs to be transformed into polished output.
+  const basePrompt = `You are a writing assistant. The user has dictated speech that needs to be transformed into polished output.
 
 Rules:
 - Output ONLY the enhanced/rewritten text — no explanations, no preamble
@@ -110,7 +105,17 @@ Rules:
 - Fix grammar, structure, and clarity
 - If the user is giving instructions (e.g., "write an email saying..."), produce the actual output (the email), not a description of it
 - If the user says "say it better" or similar, rewrite their preceding text to be clearer and more professional
-- Match the appropriate tone (formal for business, casual for personal)`,
+- Match the appropriate tone (formal for business, casual for personal)`;
+
+  const fullPrompt = systemPrompt ? `${basePrompt}\n\nAdditional context:\n${systemPrompt}` : basePrompt;
+
+  try {
+    const response = await client.chat.completions.create({
+      model: config.enhancement_model,
+      messages: [
+        {
+          role: "system",
+          content: fullPrompt,
         },
         {
           role: "user",
@@ -141,7 +146,8 @@ Rules:
  */
 export async function processText(
   rawText: string,
-  config: RecordingsConfig
+  config: RecordingsConfig,
+  systemPrompt?: string
 ): Promise<{
   text: string;
   mode: "raw" | "enhanced";
@@ -157,7 +163,7 @@ export async function processText(
     return { text: rawText, mode: "raw", enhancement_model: null };
   }
 
-  const result = await enhanceText(rawText, detection.instruction, config);
+  const result = await enhanceText(rawText, detection.instruction, config, systemPrompt);
 
   return {
     text: result.enhanced,