Merge branch 'mcp'

Author: pimterry

build-setup/build-cli.ts

@@ -0,0 +1,10 @@
+#!/bin/sh
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+APP_DIR="$(dirname "$SCRIPT_DIR")"
+export HTK_DESKTOP_RESOURCES="$SCRIPT_DIR"
+if [ "$(uname)" = "Darwin" ]; then
+    export HTK_DESKTOP_EXE="$APP_DIR/MacOS/HTTP Toolkit"
+else
+    export HTK_DESKTOP_EXE="$APP_DIR/httptoolkit"
+fi
+exec "$SCRIPT_DIR/httptoolkit-server/bin/httptoolkit-server" ctl "$@"

httptoolkit-ctl

@@ -0,0 +1,4 @@
+@echo off
+set "HTK_DESKTOP_RESOURCES=%~dp0"
+for %%I in ("%~dp0..") do set "HTK_DESKTOP_EXE=%%~fI\HTTP Toolkit.exe"
+"%~dp0httptoolkit-server\bin\httptoolkit-server.cmd" ctl %*

httptoolkit-ctl.cmd

@@ -0,0 +1,10 @@
+#!/bin/sh
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+APP_DIR="$(dirname "$SCRIPT_DIR")"
+export HTK_DESKTOP_RESOURCES="$SCRIPT_DIR"
+if [ "$(uname)" = "Darwin" ]; then
+    export HTK_DESKTOP_EXE="$APP_DIR/MacOS/HTTP Toolkit"
+else
+    export HTK_DESKTOP_EXE="$APP_DIR/httptoolkit"
+fi
+exec "$SCRIPT_DIR/httptoolkit-server/bin/httptoolkit-server" mcp "$@"

httptoolkit-mcp

@@ -0,0 +1,4 @@
+@echo off
+set "HTK_DESKTOP_RESOURCES=%~dp0"
+for %%I in ("%~dp0..") do set "HTK_DESKTOP_EXE=%%~fI\HTTP Toolkit.exe"
+"%~dp0httptoolkit-server\bin\httptoolkit-server.cmd" mcp %*

httptoolkit-mcp.cmd

@@ -10,24 +10,21 @@
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "server:setup": "tsx ./build-setup/setup-server.ts",
-    "build": "npm run build:src && npm run build:cli && npm run build:electron",
+    "build": "npm run build:src && npm run build:electron",
     "build:src": "tsc",
     "postbuild:src": "tsx ./build-setup/strip-preload-map.ts",
     "build:electron": "npm run server:setup && electron-builder build --config ./build-setup/electron-builder.config.cjs",
     "build:dir-only": "npm run server:setup && electron-builder --dir",
     "start": "npm run server:setup && npm run start:app",
     "start:dev": "tsx ./build-setup/skip-server.ts && cross-env HTK_DEV=true APP_URL='http://localhost:8080' npm run start:app",
     "start:app": "tsc-watch --onSuccess \"electron .\"",
-    "build:cli": "tsx ./build-setup/build-cli.ts",
-    "test": "npm run server:setup && npm run build:src && npm run test:unit && npm run build:cli && npm run test:smoke",
-    "test:unit": "node --experimental-strip-types --import ./test/register-stubs.js --test test/ui-bridge.spec.ts",
-    "test:smoke": "playwright test"
+    "test": "npm run server:setup && npm run build:src && playwright test"
   },
   "keywords": [],
   "author": "Tim Perry",
   "license": "AGPL-3.0-or-later",
   "config": {
-    "httptoolkit-server-version": "1.24.4"
+    "httptoolkit-server-version": "1.25.0"
   },
   "build": {
     "appId": "tech.httptoolkit.desktop",
@@ -61,7 +58,8 @@
     ],
     "extraResources": [
       "httptoolkit-server/**/*",
-      "httptoolkit-cli{,.*}"
+      "httptoolkit-ctl{,.*}",
+      "httptoolkit-mcp{,.*}"
     ],
     "artifactName": "HttpToolkit-${version}-${arch}.${ext}",
     "mac": {

package.json

@@ -2,7 +2,6 @@ import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
     testDir: './test',
-    testIgnore: 'ui-bridge.spec.ts',
     timeout: 30000,
     workers: 1,
     retries: 0,