takumi-cli 1.2.7 → 1.3.1

package/README.md

@@ -45,7 +45,7 @@ takumi setup
 
 | Command | Description |
 |---------|-------------|
-| `takumi convert <path> [crf] [max_height]` | Convert to FireTV-optimized H.264 MP4 |
+| `takumi convert <path> [--profile name]` | Convert to optimized MP4 |
 | `takumi trim <video> <start> <end>` | Cut a clip between timestamps |
 | `takumi cc <path> [lang] [model] [format]` | Generate captions using Whisper |
 | `takumi thumb <path> [timestamp]` | Extract a poster image (JPG) |
@@ -60,11 +60,20 @@ All commands accept a single file or a folder (processes all videos recursively)
 ### Examples
 
 ```bash
-# Convert all videos in a folder for FireTV
-takumi convert ./videos
+# Convert for web (default, plays everywhere)
+takumi convert video.mp4
 
-# Higher quality conversion, max 720p
-takumi convert ./videos 21 720
+# Convert for FireTV
+takumi convert ./videos --profile firetv
+
+# Compressed for email or Slack
+takumi convert video.mp4 --profile small
+
+# High quality for portfolio
+takumi convert video.mp4 --profile hq
+
+# Custom: override quality and max height
+takumi convert ./videos --crf 21 --max 720
 
 # Trim a 75-second clip
 takumi trim video.mp4 00:01:30 00:02:45

package/bin/takumi-mcp

@@ -54,5 +54,8 @@ if [ -z "$NODE" ]; then
   exit 1
 fi
 
-SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+if [ -z "${SCRIPT_DIR:-}" ]; then
+  REAL_PATH="$(realpath "$0" 2>/dev/null || readlink -f "$0" 2>/dev/null || echo "$0")"
+  SCRIPT_DIR="$(cd "$(dirname "$REAL_PATH")/.." && pwd)"
+fi
 exec "$NODE" "$SCRIPT_DIR/mcp/server.js"

package/commands/convert.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
-# ── Convert: FireTV-optimized MP4 ────────────────────────────────────────────
+# ── Convert: Video conversion with profile presets ──────────────────────────
+
+# ── Profiles ────────────────────────────────────────────────────────────────
+#
+#   web     (default) — Web-optimized MP4. Plays everywhere.
+#   firetv  — FireTV-optimized H.264 MP4. High Profile, mod16 dimensions.
+#   small   — Compressed for email, Slack, low bandwidth. 720p, higher CRF.
+#   hq      — High quality for portfolio or client delivery. Low CRF.
 
 SIZES_16_9=("1920:1080" "1280:720" "1024:576" "768:432" "512:288" "256:144")
 SIZES_4_3=("640:480" "576:432" "512:384" "448:336" "384:288" "320:240" "256:192" "192:144" "128:96")
@@ -26,12 +33,66 @@ get_best_mod16() {
   echo "${SIZES[-1]}"
 }
 
+apply_profile() {
+  local PROFILE="$1"
+  case "$PROFILE" in
+    web)
+      PROFILE_CRF=23
+      PROFILE_MAX_H=1080
+      PROFILE_LEVEL=""
+      PROFILE_PROFILE="main"
+      PROFILE_SUFFIX="_web"
+      PROFILE_MOD16=false
+      PROFILE_AUDIO_BITRATE="128k"
+      ;;
+    firetv)
+      PROFILE_CRF=23
+      PROFILE_MAX_H=1080
+      PROFILE_LEVEL="4.0"
+      PROFILE_PROFILE="high"
+      PROFILE_SUFFIX="_firetv"
+      PROFILE_MOD16=true
+      PROFILE_AUDIO_BITRATE="128k"
+      ;;
+    small)
+      PROFILE_CRF=28
+      PROFILE_MAX_H=720
+      PROFILE_LEVEL=""
+      PROFILE_PROFILE="main"
+      PROFILE_SUFFIX="_small"
+      PROFILE_MOD16=false
+      PROFILE_AUDIO_BITRATE="96k"
+      ;;
+    hq)
+      PROFILE_CRF=18
+      PROFILE_MAX_H=2160
+      PROFILE_LEVEL=""
+      PROFILE_PROFILE="high"
+      PROFILE_SUFFIX="_hq"
+      PROFILE_MOD16=false
+      PROFILE_AUDIO_BITRATE="192k"
+      ;;
+    *)
+      echo "Unknown profile: $PROFILE"
+      echo "Available: web, firetv, small, hq"
+      return 1
+      ;;
+  esac
+}
+
 convert_file() {
-  local VIDEO="$1" CRF="$2" MAX_H="$3"
+  local VIDEO="$1" CRF="$2" MAX_H="$3" PROFILE="$4"
+
+  apply_profile "$PROFILE" || return 1
+
+  # Allow explicit overrides
+  CRF="${CRF:-$PROFILE_CRF}"
+  MAX_H="${MAX_H:-$PROFILE_MAX_H}"
+
   local DIR BASENAME OUTPUT
   DIR="$(dirname "$VIDEO")"
   BASENAME="$(basename "${VIDEO%.*}")"
-  OUTPUT="${DIR}/${BASENAME}${CONVERT_SUFFIX}.mp4"
+  OUTPUT="${DIR}/${BASENAME}${PROFILE_SUFFIX}.mp4"
 
   if [ -f "$OUTPUT" ]; then
     echo "⏭️  Skipping (output exists): $(basename "$VIDEO")"
@@ -40,7 +101,7 @@ convert_file() {
 
   echo ""
   echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-  echo "🎬 Processing: $(basename "$VIDEO")"
+  echo "🎬 Processing: $(basename "$VIDEO") [${PROFILE}]"
 
   local SRC_W SRC_H
   SRC_W=$(ffprobe -v error -select_streams v:0 -show_entries stream=width -of csv=p=0 "$VIDEO" 2>/dev/null)
@@ -51,18 +112,29 @@ convert_file() {
     return 1
   fi
 
-  local TARGET TGT_W TGT_H
-  TARGET=$(get_best_mod16 "$SRC_W" "$SRC_H" "$MAX_H")
-  TGT_W="${TARGET%%:*}"
-  TGT_H="${TARGET##*:}"
+  local SCALE_FILTER
+  if [ "$PROFILE_MOD16" = true ]; then
+    local TARGET TGT_W TGT_H
+    TARGET=$(get_best_mod16 "$SRC_W" "$SRC_H" "$MAX_H")
+    TGT_W="${TARGET%%:*}"
+    TGT_H="${TARGET##*:}"
+    SCALE_FILTER="scale=${TGT_W}:${TGT_H}"
+    echo "   ${SRC_W}x${SRC_H} → ${TGT_W}x${TGT_H} (mod16) | CRF: $CRF"
+  else
+    SCALE_FILTER="scale=-2:'min(${MAX_H},ih)'"
+    echo "   ${SRC_W}x${SRC_H} → max ${MAX_H}p | CRF: $CRF"
+  fi
 
-  echo "   ${SRC_W}x${SRC_H} → ${TGT_W}x${TGT_H} (mod16) | CRF: $CRF"
+  local LEVEL_FLAGS=""
+  if [ -n "$PROFILE_LEVEL" ]; then
+    LEVEL_FLAGS="-level $PROFILE_LEVEL"
+  fi
 
   if ffmpeg -i "$VIDEO" \
     -c:v libx264 -preset slow -crf "$CRF" \
-    -profile:v high -level 4.0 -pix_fmt yuv420p \
-    -vf "scale=${TGT_W}:${TGT_H}" -r 30 \
-    -c:a aac -b:a 128k -ac 2 -ar 44100 \
+    -profile:v "$PROFILE_PROFILE" $LEVEL_FLAGS -pix_fmt yuv420p \
+    -vf "$SCALE_FILTER" \
+    -c:a aac -b:a "$PROFILE_AUDIO_BITRATE" -ac 2 -ar 44100 \
     -movflags +faststart \
     -y -loglevel warning -stats \
     "$OUTPUT" 2>&1; then
@@ -78,25 +150,63 @@ convert_file() {
 }
 
 cmd_convert() {
-  local INPUT="${1:-}"
-  local CRF="${2:-23}"
-  local MAX_H="${3:-1080}"
+  local INPUT=""
+  local PROFILE="web"
+  local CRF=""
+  local MAX_H=""
+
+  # Parse arguments
+  while [ $# -gt 0 ]; do
+    case "$1" in
+      --profile)  PROFILE="$2"; shift 2 ;;
+      --crf)      CRF="$2"; shift 2 ;;
+      --max)      MAX_H="$2"; shift 2 ;;
+      --help|-h|help)
+        echo "Usage: takumi convert <file_or_folder> [options]"
+        echo ""
+        echo "Options:"
+        echo "  --profile <name>  Conversion profile (default: web)"
+        echo "  --crf <value>     Quality override (18-28, lower = better)"
+        echo "  --max <height>    Max height in pixels"
+        echo ""
+        echo "Profiles:"
+        echo "  web      Web-optimized MP4. Plays everywhere. (default)"
+        echo "  firetv   FireTV-optimized. High Profile, mod16 dimensions."
+        echo "  small    Compressed for email/Slack. 720p, smaller file."
+        echo "  hq       High quality for portfolio or client delivery."
+        echo ""
+        echo "Examples:"
+        echo "  takumi convert video.mp4"
+        echo "  takumi convert ./videos --profile firetv"
+        echo "  takumi convert ./videos --profile small"
+        echo "  takumi convert video.mp4 --crf 21 --max 720"
+        return 0
+        ;;
+      *)
+        if [ -z "$INPUT" ]; then
+          INPUT="$1"
+        fi
+        shift
+        ;;
+    esac
+  done
 
   if [ -z "$INPUT" ]; then
-    echo "Usage: ./takumi.sh convert <file_or_folder> [crf] [max_height]"
-    echo "  crf:        18-28 (default: 23, lower = better quality)"
-    echo "  max_height: max output height (default: 1080)"
+    echo "Usage: takumi convert <file_or_folder> [--profile web|firetv|small|hq] [--crf N] [--max N]"
     return 1
   fi
 
+  # Validate profile
+  apply_profile "$PROFILE" || return 1
+
   if [ -f "$INPUT" ]; then
-    convert_file "$INPUT" "$CRF" "$MAX_H"
+    convert_file "$INPUT" "$CRF" "$MAX_H" "$PROFILE"
   elif [ -d "$INPUT" ]; then
     echo "📂 Scanning: $INPUT"
-    echo "⚙️  CRF: $CRF | Max: ${MAX_H}p | H.264 MP4"
+    echo "⚙️  Profile: $PROFILE | CRF: ${CRF:-$PROFILE_CRF} | Max: ${MAX_H:-$PROFILE_MAX_H}p"
     while IFS= read -r file; do
-      convert_file "$file" "$CRF" "$MAX_H"
-    done < <(find_videos "$INPUT" "$CONVERT_SUFFIX")
+      convert_file "$file" "$CRF" "$MAX_H" "$PROFILE"
+    done < <(find_videos "$INPUT" "$PROFILE_SUFFIX")
     echo ""
     echo "🏁 Done!"
   else

package/mcp/server.js

@@ -11,12 +11,18 @@ const BASH = findBash();
 const TAKUMI = path.resolve(__dirname, "..", "takumi.sh");
 const ENV = { ...process.env, SCRIPT_DIR: path.resolve(__dirname, "..") };
 
+function result(text, isError = false) {
+  return {
+    content: [{ type: "text", text }],
+    isError,
+  };
+}
+
 function run(args) {
   if (!BASH) {
-    return Promise.resolve({
-      text: "Error: bash not found. On Windows, install Git for Windows: https://git-scm.com/download/win",
-      isError: true,
-    });
+    return Promise.resolve(
+      result("Error: bash not found. On Windows, install Git for Windows: https://git-scm.com/download/win", true)
+    );
   }
 
   // Validate that file path args exist before running
@@ -24,10 +30,7 @@ function run(args) {
   if (filePath) {
     const fs = require("fs");
     if (!fs.existsSync(filePath)) {
-      return Promise.resolve({
-        text: `Error: file or folder not found: ${filePath}`,
-        isError: true,
-      });
+      return Promise.resolve(result(`Error: file or folder not found: ${filePath}`, true));
     }
   }
 
@@ -35,11 +38,11 @@ function run(args) {
     execFile(BASH, [TAKUMI, ...args], { timeout: 300_000, env: ENV }, (err, stdout, stderr) => {
       const output = [stdout, stderr].filter(Boolean).join("\n").trim();
       if (err && !output) {
-        resolve({ text: `Error (exit code ${err.code}): ${err.message}`, isError: true });
+        resolve(result(`Error (exit code ${err.code}): ${err.message}`, true));
       } else if (err) {
-        resolve({ text: `Error (exit code ${err.code}):\n${output}`, isError: true });
+        resolve(result(`Error (exit code ${err.code}):\n${output}`, true));
       } else {
-        resolve({ text: output || "Done.", isError: false });
+        resolve(result(output || "Done."));
       }
     });
   });
@@ -71,16 +74,18 @@ async function main() {
 
   server.tool(
     "takumi_convert",
-    "Convert videos to FireTV-optimized H.264 MP4",
+    "Convert videos to optimized MP4. Choose a profile based on the user's intent:\n- 'web' (default): website, CMS, landing page, blog, general use, online publishing, embedding in a webpage\n- 'firetv': FireTV app, Amazon Fire tablet, streaming device, TV app assets, broadcast, set-top box\n- 'small': email attachment, Slack, Teams, Discord, SMS, quick preview, social sharing, file size matters, low bandwidth, mobile messaging\n- 'hq': portfolio, client deliverable, showreel, demo reel, presentation, archival, best possible quality",
     {
       path: z.string().describe("Path to video file or folder"),
-      crf: z.number().optional().describe("Quality (lower = better, default 23)"),
-      max_height: z.number().optional().describe("Max height in pixels (default 1080)"),
+      profile: z.enum(["web", "firetv", "small", "hq"]).optional().describe("Conversion profile. 'web': website/CMS/general use/embedding. 'firetv': FireTV/streaming device/TV app. 'small': email/Slack/Teams/Discord/messaging/quick share/preview/low bandwidth. 'hq': portfolio/client delivery/showreel/presentation/archival. Default: web"),
+      crf: z.number().optional().describe("Quality override (18-28, lower = better)"),
+      max_height: z.number().optional().describe("Max height override in pixels"),
     },
-    async ({ path: p, crf, max_height }) => {
+    async ({ path: p, profile, crf, max_height }) => {
       const args = ["convert", p];
-      if (crf !== undefined) args.push(String(crf));
-      if (max_height !== undefined) args.push(String(max_height));
+      if (profile) args.push("--profile", profile);
+      if (crf !== undefined) args.push("--crf", String(crf));
+      if (max_height !== undefined) args.push("--max", String(max_height));
       return run(args);
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takumi-cli",
-  "version": "1.2.7",
+  "version": "1.3.1",
   "description": "The craftsman's toolkit for shaping video assets",
   "bin": {
     "takumi": "bin/takumi.js",

package/takumi.sh

@@ -4,7 +4,7 @@
 # ============================================================================
 # Commands:
 #   cc        Generate closed captions (SRT/VTT) using Whisper
-#   convert   Convert videos to FireTV-optimized H.264 MP4 (mod16)
+#   convert   Convert videos to optimized MP4 (web, firetv, small, hq)
 #   trim      Cut a clip between timestamps
 #   thumb     Extract poster image from video
 #   info      Show video metadata
@@ -27,7 +27,7 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
 VIDEO_EXTENSIONS="mp4|mov|avi|mkv|webm|m4v|flv|wmv|mpg|mpeg|ts"
-CONVERT_SUFFIX="_firetv"
+CONVERT_SUFFIX="_web"
 
 # ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -56,7 +56,7 @@ show_help() {
   echo "  update                             Update to latest version"
   echo "  mcp-config                         Print MCP server config"
   echo "  cc <path> [lang] [model] [format]  Generate captions from video"
-  echo "  convert <path> [crf] [max_height]  Convert to FireTV H.264 MP4"
+  echo "  convert <path> [--profile <name>]   Convert to optimized MP4"
   echo "  trim <video> <start> <end>         Cut a clip between timestamps"
   echo "  thumb <path> [timestamp]            Extract poster image (JPG)"
   echo "  info <path>                         Show video metadata"
@@ -68,7 +68,7 @@ show_help() {
   echo "Examples:"
   echo "  ./takumi.sh setup"
   echo "  ./takumi.sh cc ./videos ja"
-  echo "  ./takumi.sh convert ./videos 21"
+  echo "  ./takumi.sh convert ./videos --profile firetv"
   echo "  ./takumi.sh trim video.mp4 00:01:30 00:02:45"
   echo "  ./takumi.sh thumb video.mp4 00:00:15"
   echo "  ./takumi.sh info ./videos"

package/test.sh

@@ -131,6 +131,38 @@ assert "640x480 capped 240 → 320:240" "320:240" "$OUT"
 OUT=$(get_best_mod16 3840 2160 1080)
 assert "4K capped 1080 → 1920:1080" "1920:1080" "$OUT"
 
+# ── Convert profiles ───────────────────────────────────────────────────────
+
+echo ""
+echo "🔧 Convert profiles"
+
+source commands/convert.sh
+
+apply_profile web
+assert "web profile CRF" "23" "$PROFILE_CRF"
+assert "web profile suffix" "_web" "$PROFILE_SUFFIX"
+assert "web profile mod16 off" "false" "$PROFILE_MOD16"
+
+apply_profile firetv
+assert "firetv profile CRF" "23" "$PROFILE_CRF"
+assert "firetv profile suffix" "_firetv" "$PROFILE_SUFFIX"
+assert "firetv profile mod16 on" "true" "$PROFILE_MOD16"
+
+apply_profile small
+assert "small profile CRF" "28" "$PROFILE_CRF"
+assert "small profile max height" "720" "$PROFILE_MAX_H"
+assert "small profile suffix" "_small" "$PROFILE_SUFFIX"
+
+apply_profile hq
+assert "hq profile CRF" "18" "$PROFILE_CRF"
+assert "hq profile suffix" "_hq" "$PROFILE_SUFFIX"
+
+OUT=$(apply_profile badprofile 2>&1)
+assert "bad profile shows error" "Unknown profile" "$OUT"
+
+OUT=$(run convert video.mp4 --help)
+assert "convert --help shows profiles" "Profiles:" "$OUT"
+
 # ── Paths with spaces ──────────────────────────────────────────────────────
 
 echo ""