takumi-cli 1.2.3 → 1.2.9

package/README.md

@@ -89,15 +89,51 @@ takumi info ./videos
 
 takumi includes an MCP server so AI clients like Claude Code and Kiro can use all commands as tools. No syntax to remember, just describe what you want.
 
-```bash
-takumi mcp-config
+Run `takumi mcp-config` to get the config block for your client, or copy from below.
+
+### VS Code
+
+Create or edit `.vscode/mcp.json` in your project:
+
+```json
+{
+  "servers": {
+    "takumi": {
+      "command": "takumi-mcp"
+    }
+  }
+}
 ```
 
-This prints the JSON config block for each client. Paste the relevant one into:
+### Claude Code
+
+Add to `~/.claude.json` or create `.mcp.json` in your project root:
+
+```json
+{
+  "mcpServers": {
+    "takumi": {
+      "command": "takumi-mcp"
+    }
+  }
+}
+```
+
+### Kiro
+
+Create or edit `.kiro/settings/mcp.json` in your project:
+
+```json
+{
+  "mcpServers": {
+    "takumi": {
+      "command": "takumi-mcp"
+    }
+  }
+}
+```
 
-- **VS Code:** `.vscode/mcp.json` (uses `"servers"`)
-- **Claude Code:** `~/.claude.json` or project `.mcp.json` (uses `"mcpServers"`)
-- **Kiro:** `.kiro/settings/mcp.json` (uses `"mcpServers"`)
+> **Note:** If your editor can't find `takumi-mcp`, use the full path from `takumi mcp-config` instead.
 
 Once configured, just ask in natural language:
 

package/bin/takumi-mcp

@@ -0,0 +1,61 @@
+#!/bin/bash
+# Wrapper to start the takumi MCP server.
+# Finds node even when launched outside a login shell (VS Code, Kiro, etc.)
+
+find_node() {
+  # Check PATH first
+  if command -v node &>/dev/null; then
+    command -v node
+    return
+  fi
+
+  # nvm (macOS/Linux)
+  if [ -d "$HOME/.nvm/versions/node" ]; then
+    local latest
+    latest="$(ls -v "$HOME/.nvm/versions/node" | tail -1)"
+    if [ -n "$latest" ] && [ -x "$HOME/.nvm/versions/node/$latest/bin/node" ]; then
+      echo "$HOME/.nvm/versions/node/$latest/bin/node"
+      return
+    fi
+  fi
+
+  # fnm
+  if [ -d "$HOME/.fnm" ]; then
+    local latest
+    latest="$(ls -v "$HOME/.fnm/node-versions" 2>/dev/null | tail -1)"
+    if [ -n "$latest" ] && [ -x "$HOME/.fnm/node-versions/$latest/installation/bin/node" ]; then
+      echo "$HOME/.fnm/node-versions/$latest/installation/bin/node"
+      return
+    fi
+  fi
+
+  # Homebrew
+  if [ -x "/opt/homebrew/bin/node" ]; then
+    echo "/opt/homebrew/bin/node"
+    return
+  fi
+  if [ -x "/usr/local/bin/node" ]; then
+    echo "/usr/local/bin/node"
+    return
+  fi
+
+  # Volta
+  if [ -x "$HOME/.volta/bin/node" ]; then
+    echo "$HOME/.volta/bin/node"
+    return
+  fi
+
+  return 1
+}
+
+NODE="$(find_node)"
+if [ -z "$NODE" ]; then
+  echo "Error: node not found. Install Node.js: https://nodejs.org" >&2
+  exit 1
+fi
+
+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/mcp-config.sh

@@ -2,12 +2,12 @@
 # ── MCP Config: Print MCP server configuration JSON ─────────────────────────
 
 cmd_mcp-config() {
-  local MCP_SERVER
-  MCP_SERVER="$(realpath "${SCRIPT_DIR}/mcp/server.js")"
+  local MCP_CMD
+  MCP_CMD="$(command -v takumi-mcp 2>/dev/null || realpath "${SCRIPT_DIR}/bin/takumi-mcp")"
 
-  if [ ! -f "$MCP_SERVER" ]; then
-    echo "❌ MCP server not found at: ${MCP_SERVER}"
-    echo "   Run 'takumi setup' first."
+  if [ ! -x "$MCP_CMD" ]; then
+    echo "❌ takumi-mcp not found."
+    echo "   Reinstall takumi: brew upgrade takumi / npm install -g takumi-cli"
     return 1
   fi
 
@@ -17,8 +17,7 @@ cmd_mcp-config() {
 {
   "servers": {
     "takumi": {
-      "command": "node",
-      "args": ["${MCP_SERVER}"]
+      "command": "${MCP_CMD}"
     }
   }
 }
@@ -31,8 +30,7 @@ EOF
 {
   "mcpServers": {
     "takumi": {
-      "command": "node",
-      "args": ["${MCP_SERVER}"]
+      "command": "${MCP_CMD}"
     }
   }
 }
@@ -45,8 +43,7 @@ EOF
 {
   "mcpServers": {
     "takumi": {
-      "command": "node",
-      "args": ["${MCP_SERVER}"]
+      "command": "${MCP_CMD}"
     }
   }
 }

package/mcp/server.js

@@ -11,22 +11,38 @@ 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
+  const filePath = args[1];
+  if (filePath) {
+    const fs = require("fs");
+    if (!fs.existsSync(filePath)) {
+      return Promise.resolve(result(`Error: file or folder not found: ${filePath}`, true));
+    }
+  }
+
   return new Promise((resolve) => {
     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: ${err.message}`, isError: true });
+        resolve(result(`Error (exit code ${err.code}): ${err.message}`, true));
       } else if (err) {
-        resolve({ text: output, isError: true });
+        resolve(result(`Error (exit code ${err.code}):\n${output}`, true));
       } else {
-        resolve({ text: output || "Done.", isError: false });
+        resolve(result(output || "Done."));
       }
     });
   });

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "takumi-cli",
-  "version": "1.2.3",
+  "version": "1.2.9",
   "description": "The craftsman's toolkit for shaping video assets",
   "bin": {
-    "takumi": "bin/takumi.js"
+    "takumi": "bin/takumi.js",
+    "takumi-mcp": "bin/takumi-mcp"
   },
   "files": [
     "bin/",

package/test.sh

@@ -131,6 +131,45 @@ 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"
 
+# ── Paths with spaces ──────────────────────────────────────────────────────
+
+echo ""
+echo "🔧 Paths with spaces"
+
+TMP_DIR=$(mktemp -d)
+SPACE_DIR="${TMP_DIR}/folder with spaces"
+mkdir -p "$SPACE_DIR"
+
+OUT=$(run info "$SPACE_DIR/nonexistent file.mp4")
+assert "info handles spaces in path" "not found" "$OUT"
+
+OUT=$(run convert "$SPACE_DIR/nonexistent file.mp4")
+assert "convert handles spaces in path" "not found" "$OUT"
+
+OUT=$(run trim "$SPACE_DIR/nonexistent file.mp4" 00:00:00 00:00:05)
+assert "trim handles spaces in path" "not found" "$OUT"
+
+OUT=$(run thumb "$SPACE_DIR/nonexistent file.mp4")
+assert "thumb handles spaces in path" "not found" "$OUT"
+
+OUT=$(run gif "$SPACE_DIR/nonexistent file.mp4" 00:00:00 00:00:05)
+assert "gif handles spaces in path" "not found" "$OUT"
+
+OUT=$(run strip "$SPACE_DIR/nonexistent file.mp4" audio)
+assert "strip handles spaces in path" "not found" "$OUT"
+
+rm -rf "$TMP_DIR"
+
+# ── MCP server ──────────────────────────────────────────────────────────────
+
+echo ""
+echo "🔧 MCP server"
+
+MCP_INIT='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2024-11-05","capabilities":{},"clientInfo":{"name":"test","version":"1.0.0"}}}'
+OUT=$(echo "$MCP_INIT" | node mcp/server.js 2>/dev/null || true)
+assert "MCP server initializes" "takumi" "$OUT"
+assert "MCP server reports tools capability" "tools" "$OUT"
+
 # ── All commands listed in help ──────────────────────────────────────────────
 
 echo ""
@@ -141,6 +180,7 @@ for CMD in "${COMMANDS[@]}"; do
   assert "$CMD listed in help" "$CMD" "$HELP"
 done
 assert "setup listed in help" "setup" "$HELP"
+assert "mcp-config listed in help" "mcp-config" "$HELP"
 
 # ── Results ──────────────────────────────────────────────────────────────────