@hasna/machines 0.0.9 → 0.0.11

package/dist/mcp/index.js

@@ -1,26 +1,41 @@
 #!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: (newValue) => all[name] = () => newValue
     });
 };
 
 // src/mcp/index.ts
-import { readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname5, join as join9 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
+// src/version.ts
+import { existsSync, readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+function getPackageVersion() {
+  try {
+    const here = dirname(fileURLToPath(import.meta.url));
+    const candidates = [join(here, "..", "package.json"), join(here, "..", "..", "package.json")];
+    const pkgPath = candidates.find((candidate) => existsSync(candidate));
+    if (!pkgPath) {
+      return "0.0.0";
+    }
+    return JSON.parse(readFileSync(pkgPath, "utf8")).version || "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+
+// src/mcp/http.ts
+import { createServer } from "http";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+
 // src/mcp/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
@@ -3999,20 +4014,20 @@ var coerce = {
 var NEVER = INVALID;
 // src/commands/backup.ts
 import { homedir } from "os";
-import { join } from "path";
+import { join as join2 } from "path";
 function quote(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function defaultBackupSources() {
   const home = homedir();
   return [
-    join(home, ".hasna"),
-    join(home, ".ssh"),
-    join(home, ".secrets")
+    join2(home, ".hasna"),
+    join2(home, ".ssh"),
+    join2(home, ".secrets")
   ];
 }
 function buildBackupPlan(bucket, prefix = "machines") {
-  const archivePath = join(homedir(), ".hasna", "machines", "backup.tgz");
+  const archivePath = join2(homedir(), ".hasna", "machines", "backup.tgz");
   const sources = defaultBackupSources();
   const steps = [
     {
@@ -4063,33 +4078,33 @@ function runBackup(bucket, prefix = "machines", options = {}) {
 }
 
 // src/manifests.ts
-import { existsSync as existsSync2, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { arch, homedir as homedir2, hostname, platform, userInfo } from "os";
-import { dirname as dirname2 } from "path";
+import { dirname as dirname3 } from "path";
 
 // src/paths.ts
-import { existsSync, mkdirSync } from "fs";
-import { dirname, join as join2, resolve } from "path";
+import { existsSync as existsSync2, mkdirSync } from "fs";
+import { dirname as dirname2, join as join3, resolve } from "path";
 function homeDir() {
   return process.env["HOME"] || process.env["USERPROFILE"] || "~";
 }
 function getDataDir() {
-  return process.env["HASNA_MACHINES_DIR"] || join2(homeDir(), ".hasna", "machines");
+  return process.env["HASNA_MACHINES_DIR"] || join3(homeDir(), ".hasna", "machines");
 }
 function getDbPath() {
-  return process.env["HASNA_MACHINES_DB_PATH"] || join2(getDataDir(), "machines.db");
+  return process.env["HASNA_MACHINES_DB_PATH"] || join3(getDataDir(), "machines.db");
 }
 function getManifestPath() {
-  return process.env["HASNA_MACHINES_MANIFEST_PATH"] || join2(getDataDir(), "machines.json");
+  return process.env["HASNA_MACHINES_MANIFEST_PATH"] || join3(getDataDir(), "machines.json");
 }
 function getNotificationsPath() {
-  return process.env["HASNA_MACHINES_NOTIFICATIONS_PATH"] || join2(getDataDir(), "notifications.json");
+  return process.env["HASNA_MACHINES_NOTIFICATIONS_PATH"] || join3(getDataDir(), "notifications.json");
 }
 function ensureParentDir(filePath) {
   if (filePath === ":memory:")
     return;
-  const dir = dirname(resolve(filePath));
-  if (!existsSync(dir)) {
+  const dir = dirname2(resolve(filePath));
+  if (!existsSync2(dir)) {
     mkdirSync(dir, { recursive: true });
   }
 }
@@ -4154,10 +4169,10 @@ function getDefaultManifest() {
   };
 }
 function readManifest(path = getManifestPath()) {
-  if (!existsSync2(path)) {
+  if (!existsSync3(path)) {
     return getDefaultManifest();
   }
-  const raw = JSON.parse(readFileSync(path, "utf8"));
+  const raw = JSON.parse(readFileSync2(path, "utf8"));
   return fleetSchema.parse(raw);
 }
 function validateManifest(path = getManifestPath()) {
@@ -4181,7 +4196,7 @@ function getManifestMachine(machineId, path = getManifestPath()) {
 function detectCurrentMachineManifest() {
   const machineId = process.env["HASNA_MACHINES_MACHINE_ID"] || hostname();
   const user = userInfo().username;
-  const bunDir = dirname2(process.execPath);
+  const bunDir = dirname3(process.execPath);
   return {
     id: machineId,
     hostname: hostname(),
@@ -4207,22 +4222,22 @@ import { hostname as hostname2 } from "os";
 import { createRequire } from "module";
 import { Database } from "bun:sqlite";
 import {
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   mkdirSync as mkdirSync2,
   readdirSync,
   copyFileSync
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join3, relative } from "path";
-import { existsSync as existsSync22, mkdirSync as mkdirSync22, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join4, relative } from "path";
+import { existsSync as existsSync22, mkdirSync as mkdirSync22, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir22 } from "os";
 import { join as join22 } from "path";
 import { readdirSync as readdirSync2, existsSync as existsSync32 } from "fs";
 import { join as join32 } from "path";
 import { homedir as homedir32 } from "os";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-import { join as join6, dirname as dirname3 } from "path";
+import { join as join42 } from "path";
+import { join as join6, dirname as dirname4 } from "path";
 import { homedir as homedir5, platform as platform2 } from "os";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -4255,9 +4270,9 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue2 = (v) => v;
-function __exportSetter2(name, newValue) {
-  this[name] = __returnValue2.bind(null, newValue);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
 }
 var __export2 = (target, all) => {
   for (var name in all)
@@ -4265,7 +4280,7 @@ var __export2 = (target, all) => {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter2.bind(all, name)
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -13387,17 +13402,17 @@ var init_zod = __esm(() => {
   init_external();
 });
 function getDataDir2(serviceName) {
-  const dir = join3(HASNA_DIR, serviceName);
+  const dir = join4(HASNA_DIR, serviceName);
   mkdirSync2(dir, { recursive: true });
   return dir;
 }
 function getDbPath2(serviceName) {
   const dir = getDataDir2(serviceName);
-  return join3(dir, `${serviceName}.db`);
+  return join4(dir, `${serviceName}.db`);
 }
 var HASNA_DIR;
 var init_dotfile = __esm(() => {
-  HASNA_DIR = join3(homedir3(), ".hasna");
+  HASNA_DIR = join4(homedir3(), ".hasna");
 });
 var exports_config = {};
 __export2(exports_config, {
@@ -13420,7 +13435,7 @@ function getCloudConfig() {
     return CloudConfigSchema.parse({});
   }
   try {
-    const raw = readFileSync2(CONFIG_PATH, "utf-8");
+    const raw = readFileSync3(CONFIG_PATH, "utf-8");
     return CloudConfigSchema.parse(JSON.parse(raw));
   } catch {
     return CloudConfigSchema.parse({});
@@ -13711,7 +13726,7 @@ class SyncProgressTracker {
 init_adapter();
 init_config();
 init_discover();
-var AUTO_SYNC_CONFIG_PATH = join4(homedir4(), ".hasna", "cloud", "config.json");
+var AUTO_SYNC_CONFIG_PATH = join42(homedir4(), ".hasna", "cloud", "config.json");
 init_config();
 init_adapter();
 init_dotfile();
@@ -14089,16 +14104,16 @@ function runCertPlan(domains, options = {}) {
 }
 
 // src/commands/dns.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
 import { join as join7 } from "path";
 function getDnsPath() {
   return join7(getDataDir(), "dns.json");
 }
 function readMappings() {
   const path = getDnsPath();
-  if (!existsSync4(path))
+  if (!existsSync5(path))
     return [];
-  return JSON.parse(readFileSync3(path, "utf8"));
+  return JSON.parse(readFileSync4(path, "utf8"));
 }
 function writeMappings(mappings) {
   const path = getDnsPath();
@@ -14400,7 +14415,7 @@ function runTailscaleInstall(machineId, options = {}) {
 }
 
 // src/commands/notifications.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
 var notificationChannelSchema = exports_external.object({
   id: exports_external.string(),
   type: exports_external.enum(["email", "webhook", "command"]),
@@ -14556,10 +14571,10 @@ function getDefaultNotificationConfig() {
   };
 }
 function readNotificationConfig(path = getNotificationsPath()) {
-  if (!existsSync5(path)) {
+  if (!existsSync6(path)) {
     return getDefaultNotificationConfig();
   }
-  return notificationConfigSchema.parse(JSON.parse(readFileSync4(path, "utf8")));
+  return notificationConfigSchema.parse(JSON.parse(readFileSync5(path, "utf8")));
 }
 function writeNotificationConfig(config, path = getNotificationsPath()) {
   ensureParentDir(path);
@@ -14731,24 +14746,6 @@ function manifestValidate() {
   return validateManifest(getManifestPath());
 }
 
-// src/version.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname4, join as join8 } from "path";
-import { fileURLToPath } from "url";
-function getPackageVersion() {
-  try {
-    const here = dirname4(fileURLToPath(import.meta.url));
-    const candidates = [join8(here, "..", "package.json"), join8(here, "..", "..", "package.json")];
-    const pkgPath = candidates.find((candidate) => existsSync6(candidate));
-    if (!pkgPath) {
-      return "0.0.0";
-    }
-    return JSON.parse(readFileSync5(pkgPath, "utf8")).version || "0.0.0";
-  } catch {
-    return "0.0.0";
-  }
-}
-
 // src/commands/status.ts
 function getStatus() {
   const manifest = readManifest();
@@ -15268,6 +15265,9 @@ function getAgentStatus(machineId = getLocalMachineId()) {
 }
 
 // src/mcp/server.ts
+function buildServer(version = getPackageVersion()) {
+  return createMcpServer(version);
+}
 function createMcpServer(version) {
   const server = new McpServer({ name: "machines", version });
   server.tool("machines_status", "Return local machine fleet status paths and machine identity.", {}, async () => ({
@@ -15364,21 +15364,107 @@ function createMcpServer(version) {
   return server;
 }
 
-// src/mcp/index.ts
-function getPkgVersion() {
+// src/mcp/http.ts
+var DEFAULT_HTTP_PORT = 8821;
+var HTTP_NAME = "machines";
+function isHttpMode(args = process.argv.slice(2)) {
+  return args.includes("--http") || process.env.MCP_HTTP === "1";
+}
+function resolveHttpPort(args = process.argv.slice(2)) {
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--port" && args[i + 1]) {
+      return parsePort(args[i + 1]);
+    }
+    if (arg.startsWith("--port=")) {
+      return parsePort(arg.slice("--port=".length));
+    }
+  }
+  const envPort = process.env.MCP_HTTP_PORT;
+  if (envPort) {
+    return parsePort(envPort);
+  }
+  return DEFAULT_HTTP_PORT;
+}
+function parsePort(raw) {
+  const port = Number.parseInt(raw, 10);
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error(`Invalid port: ${raw}`);
+  }
+  return port;
+}
+function pathnameFromRequest(req) {
+  return new URL(req.url ?? "/", "http://127.0.0.1").pathname;
+}
+async function readRequestBody(req) {
+  if (req.method !== "POST" && req.method !== "DELETE") {
+    return;
+  }
+  const chunks = [];
+  for await (const chunk of req) {
+    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+  }
+  const text = Buffer.concat(chunks).toString("utf8");
+  if (!text) {
+    return;
+  }
+  return JSON.parse(text);
+}
+async function handleMcpRequest(req, res) {
+  const server = buildServer();
+  const transport = new StreamableHTTPServerTransport({
+    sessionIdGenerator: undefined
+  });
+  await server.connect(transport);
   try {
-    const pkgPath = join9(dirname5(fileURLToPath2(import.meta.url)), "..", "..", "package.json");
-    return JSON.parse(readFileSync7(pkgPath, "utf8")).version || "0.0.0";
-  } catch {
-    return "0.0.0";
+    const body = await readRequestBody(req);
+    await transport.handleRequest(req, res, body);
+  } finally {
+    res.on("close", () => {
+      transport.close().catch(() => {
+        return;
+      });
+      server.close().catch(() => {
+        return;
+      });
+    });
   }
 }
+function startHttpServer(options = {}) {
+  const host = options.host ?? "127.0.0.1";
+  const port = options.port ?? resolveHttpPort();
+  const name = options.name ?? HTTP_NAME;
+  const httpServer = createServer(async (req, res) => {
+    const path = pathnameFromRequest(req);
+    if (req.method === "GET" && path === "/health") {
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({ status: "ok", name }));
+      return;
+    }
+    if (path === "/mcp") {
+      await handleMcpRequest(req, res);
+      return;
+    }
+    res.writeHead(404, { "content-type": "application/json" });
+    res.end(JSON.stringify({ error: "Not found" }));
+  });
+  httpServer.listen(port, host, () => {
+    const address = httpServer.address();
+    const boundPort = typeof address === "object" && address ? address.port : port;
+    console.error(`machines-mcp HTTP listening on http://${host}:${boundPort}`);
+  });
+  return httpServer;
+}
+
+// src/mcp/index.ts
 function printHelp() {
   console.log(`Usage: machines-mcp [options]
 
-MCP server for machine fleet management tools (stdio transport)
+MCP server for machine fleet management tools (stdio transport by default)
 
 Options:
+  --http         Start Streamable HTTP transport on 127.0.0.1 (or MCP_HTTP=1)
+  --port <n>     HTTP port (default: 8821, or MCP_HTTP_PORT env)
   -V, --version  output the version number
   -h, --help     display help for command`);
 }
@@ -15388,9 +15474,13 @@ if (args.includes("--help") || args.includes("-h")) {
   process.exit(0);
 }
 if (args.includes("--version") || args.includes("-V")) {
-  console.log(getPkgVersion());
+  console.log(getPackageVersion());
   process.exit(0);
 }
-var server = createMcpServer(getPkgVersion());
-var transport = new StdioServerTransport;
-await server.connect(transport);
+if (isHttpMode(args)) {
+  startHttpServer({ port: resolveHttpPort(args) });
+} else {
+  const server = buildServer();
+  const transport = new StdioServerTransport;
+  await server.connect(transport);
+}

package/dist/mcp/server.d.ts

@@ -1,4 +1,5 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 export declare const MACHINE_MCP_TOOL_NAMES: readonly ["machines_status", "machines_doctor", "machines_self_test", "machines_apps_list", "machines_apps_status", "machines_apps_diff", "machines_apps_plan", "machines_apps_apply", "machines_manifest", "machines_manifest_validate", "machines_manifest_bootstrap", "machines_manifest_get", "machines_manifest_remove", "machines_agent_status", "machines_setup_preview", "machines_setup_apply", "machines_sync_preview", "machines_sync_apply", "machines_diff", "machines_install_tailscale_preview", "machines_install_tailscale_apply", "machines_install_claude_status", "machines_install_claude_diff", "machines_install_claude_preview", "machines_install_claude_apply", "machines_ssh_resolve", "machines_ports", "machines_backup_preview", "machines_backup_apply", "machines_cert_preview", "machines_cert_apply", "machines_dns_add", "machines_dns_list", "machines_dns_render", "machines_notifications_add", "machines_notifications_list", "machines_notifications_test", "machines_notifications_dispatch", "machines_notifications_remove", "machines_serve_info", "machines_serve_dashboard"];
+export declare function buildServer(version?: string): McpServer;
 export declare function createMcpServer(version: string): McpServer;
 //# sourceMappingURL=server.d.ts.map

package/dist/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA2BpE,eAAO,MAAM,sBAAsB,4jCA0CzB,CAAC;AAEX,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CA6R1D"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA4BpE,eAAO,MAAM,sBAAsB,4jCA0CzB,CAAC;AAEX,wBAAgB,WAAW,CAAC,OAAO,GAAE,MAA4B,GAAG,SAAS,CAE5E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CA6R1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/machines",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Machine fleet management CLI + MCP for developers",
   "type": "module",
   "license": "Apache-2.0",