@schuttdev/gigai 0.1.0-beta.14 → 0.1.0-beta.16

package/dist/{dist-EG3MXFDE.js → dist-GANOIL6Z.js}

@@ -45,11 +45,16 @@ import { spawn as spawn4 } from "child_process";
 import { input, select, checkbox, confirm } from "@inquirer/prompts";
 import { writeFile as writeFile2 } from "fs/promises";
 import { resolve as resolve4 } from "path";
-import { execFile } from "child_process";
+import { execFile, spawn as spawn5 } from "child_process";
 import { promisify } from "util";
 import { input as input2 } from "@inquirer/prompts";
 import { readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
 import { resolve as resolve5 } from "path";
+import { writeFile as writeFile4 } from "fs/promises";
+import { resolve as resolve6, join as join3 } from "path";
+import { homedir, platform } from "os";
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
 function connectWithToken(store, encryptedToken, orgUuid, encryptionKey, sessionTtlSeconds) {
   let payload;
   try {
@@ -267,7 +272,7 @@ function executeTool(entry, args, timeout) {
         `Cannot execute tool of type: ${entry.type}`
       );
   }
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const start = Date.now();
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -315,7 +320,7 @@ function executeTool(entry, args, timeout) {
         reject(new GigaiError(ErrorCode.EXEC_TIMEOUT, `Tool execution timed out after ${effectiveTimeout}ms`));
         return;
       }
-      resolve6({
+      resolve7({
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8"),
         exitCode: exitCode ?? 1,
@@ -607,7 +612,7 @@ async function execCommandSafe(command, args, config) {
       throw new GigaiError(ErrorCode.VALIDATION_ERROR, "Null byte in argument");
     }
   }
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const child = spawn2(command, args, {
       shell: false,
       stdio: ["ignore", "pipe", "pipe"]
@@ -629,7 +634,7 @@ async function execCommandSafe(command, args, config) {
       reject(new GigaiError(ErrorCode.EXEC_FAILED, `Failed to spawn ${command}: ${err.message}`));
     });
     child.on("close", (exitCode) => {
-      resolve6({
+      resolve7({
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8"),
         exitCode: exitCode ?? 1
@@ -833,13 +838,13 @@ async function loadConfig(path) {
   return GigaiConfigSchema.parse(json);
 }
 function runCommand(command, args) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const child = spawn3(command, args, { shell: false, stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     child.stdout.on("data", (chunk) => chunks.push(chunk));
     child.on("error", reject);
     child.on("close", (exitCode) => {
-      resolve6({ stdout: Buffer.concat(chunks).toString("utf8").trim(), exitCode: exitCode ?? 1 });
+      resolve7({ stdout: Buffer.concat(chunks).toString("utf8").trim(), exitCode: exitCode ?? 1 });
     });
   });
 }
@@ -901,6 +906,41 @@ async function getTailscaleDnsName() {
     return null;
   }
 }
+async function ensureTailscaleFunnel(port) {
+  const dnsName = await getTailscaleDnsName();
+  if (!dnsName) {
+    throw new Error("Tailscale is not running or not connected. Install/start Tailscale first.");
+  }
+  console.log("  Enabling Tailscale Funnel...");
+  try {
+    const { stdout, stderr } = await execFileAsync("tailscale", ["funnel", "--bg", `${port}`]);
+    const output = stdout + stderr;
+    if (output.includes("Funnel is not enabled")) {
+      const urlMatch = output.match(/(https:\/\/login\.tailscale\.com\/\S+)/);
+      const enableUrl = urlMatch?.[1] ?? "https://login.tailscale.com/admin/machines";
+      console.log(`
+  Funnel is not enabled on your tailnet.`);
+      console.log(`  Enable it here: ${enableUrl}
+`);
+      await confirm({ message: "I've enabled Funnel in my Tailscale admin. Continue?", default: true });
+      const retry = await execFileAsync("tailscale", ["funnel", "--bg", `${port}`]);
+      if ((retry.stdout + retry.stderr).includes("Funnel is not enabled")) {
+        throw new Error("Funnel is still not enabled. Please enable it in your Tailscale admin and try again.");
+      }
+    }
+  } catch (e) {
+    if (e.message.includes("Funnel is still not enabled")) throw e;
+  }
+  try {
+    const { stdout } = await execFileAsync("tailscale", ["funnel", "status"]);
+    if (stdout.includes("No serve config")) {
+      throw new Error("Funnel setup failed. Run 'tailscale funnel --bg " + port + "' manually to debug.");
+    }
+  } catch {
+  }
+  console.log(`  Tailscale Funnel active: https://${dnsName}`);
+  return `https://${dnsName}`;
+}
 async function runInit() {
   console.log("\n  gigai server setup\n");
   const httpsProvider = await select({
@@ -919,7 +959,6 @@ async function runInit() {
         provider: "tailscale",
         funnelPort: 7443
       };
-      console.log("  Will use Tailscale Funnel for HTTPS.");
       break;
     case "cloudflare": {
       const tunnelName = await input({
@@ -1023,10 +1062,11 @@ async function runInit() {
   Config written to: ${configPath}`);
   let serverUrl;
   if (httpsProvider === "tailscale") {
-    const dnsName = await getTailscaleDnsName();
-    if (dnsName) {
-      serverUrl = `https://${dnsName}`;
-      console.log(`  Detected Tailscale URL: ${serverUrl}`);
+    try {
+      serverUrl = await ensureTailscaleFunnel(port);
+    } catch (e) {
+      console.error(`  ${e.message}`);
+      console.log("  You can enable Funnel later and run 'gigai server start' manually.\n");
     }
   } else if (httpsProvider === "cloudflare" && httpsConfig && "domain" in httpsConfig && httpsConfig.domain) {
     serverUrl = `https://${httpsConfig.domain}`;
@@ -1038,16 +1078,29 @@ async function runInit() {
       required: true
     });
   }
+  console.log("\n  Starting server...");
+  const serverArgs = ["server", "start", "--config", configPath];
+  if (!httpsConfig) serverArgs.push("--dev");
+  const child = spawn5("gigai", serverArgs, {
+    detached: true,
+    stdio: "ignore",
+    cwd: resolve4(".")
+  });
+  child.unref();
+  await new Promise((r) => setTimeout(r, 1500));
+  try {
+    const res = await fetch(`http://localhost:${port}/health`);
+    if (res.ok) {
+      console.log(`  Server running on port ${port} (PID ${child.pid})`);
+    }
+  } catch {
+    console.log(`  Server starting in background (PID ${child.pid})`);
+  }
   const store = new AuthStore();
   const code = generatePairingCode(store, config.auth.pairingTtlSeconds);
   store.destroy();
   console.log(`
-  Pairing code: ${code}`);
-  console.log(`  Expires in ${config.auth.pairingTtlSeconds / 60} minutes.
-`);
-  console.log(`  Start the server with: gigai server start${httpsConfig ? "" : " --dev"}
-`);
-  console.log(`  Then paste this into Claude to pair:
+  Paste this into Claude to pair:
 `);
   console.log(`  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
   console.log(`  Install the gigai CLI and pair with my server:
@@ -1059,6 +1112,10 @@ async function runInit() {
 `);
   console.log(`  Then show me the skill file output so I can save it.`);
   console.log(`  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+  console.log(`
+  Pairing code expires in ${config.auth.pairingTtlSeconds / 60} minutes.`);
+  console.log(`  Run 'gigai server pair' to generate a new one.
+`);
 }
 async function loadConfigFile(path) {
   const configPath = resolve5(path ?? "gigai.config.json");
@@ -1183,6 +1240,125 @@ Note: The server must be running for the client to use this code.`);
   console.log(`For a live pairing code, use the server's /auth/pair/generate endpoint.`);
   store.destroy();
 }
+var execFileAsync2 = promisify2(execFile2);
+function getGigaiBin() {
+  return process.argv[1] ?? "gigai";
+}
+function getLaunchdPlist(configPath) {
+  const bin = getGigaiBin();
+  return `<?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>Label</key>
+  <string>com.gigai.server</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${bin}</string>
+    <string>server</string>
+    <string>start</string>
+    <string>--config</string>
+    <string>${configPath}</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${join3(homedir(), ".gigai", "server.log")}</string>
+  <key>StandardErrorPath</key>
+  <string>${join3(homedir(), ".gigai", "server.log")}</string>
+  <key>WorkingDirectory</key>
+  <string>${homedir()}</string>
+</dict>
+</plist>
+`;
+}
+function getSystemdUnit(configPath) {
+  const bin = getGigaiBin();
+  return `[Unit]
+Description=gigai server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=${bin} server start --config ${configPath}
+Restart=always
+RestartSec=5
+WorkingDirectory=${homedir()}
+
+[Install]
+WantedBy=default.target
+`;
+}
+async function installDaemon(configPath) {
+  const config = resolve6(configPath ?? "gigai.config.json");
+  const os = platform();
+  if (os === "darwin") {
+    const plistPath = join3(homedir(), "Library", "LaunchAgents", "com.gigai.server.plist");
+    await writeFile4(plistPath, getLaunchdPlist(config));
+    console.log(`  Wrote launchd plist: ${plistPath}`);
+    try {
+      await execFileAsync2("launchctl", ["load", plistPath]);
+      console.log("  Service loaded and started.");
+    } catch {
+      console.log(`  Load it with: launchctl load ${plistPath}`);
+    }
+    console.log(`  Logs: ~/.gigai/server.log`);
+    console.log(`  Stop:  launchctl unload ${plistPath}`);
+  } else if (os === "linux") {
+    const unitDir = join3(homedir(), ".config", "systemd", "user");
+    const unitPath = join3(unitDir, "gigai.service");
+    const { mkdir: mkdir2 } = await import("fs/promises");
+    await mkdir2(unitDir, { recursive: true });
+    await writeFile4(unitPath, getSystemdUnit(config));
+    console.log(`  Wrote systemd unit: ${unitPath}`);
+    try {
+      await execFileAsync2("systemctl", ["--user", "daemon-reload"]);
+      await execFileAsync2("systemctl", ["--user", "enable", "--now", "gigai"]);
+      console.log("  Service enabled and started.");
+    } catch {
+      console.log("  Enable it with: systemctl --user enable --now gigai");
+    }
+    console.log(`  Logs:   journalctl --user -u gigai -f`);
+    console.log(`  Stop:   systemctl --user stop gigai`);
+    console.log(`  Remove: systemctl --user disable gigai`);
+  } else {
+    console.log("  Persistent daemon not supported on this platform.");
+    console.log("  Run 'gigai server start' manually.");
+  }
+}
+async function uninstallDaemon() {
+  const os = platform();
+  if (os === "darwin") {
+    const plistPath = join3(homedir(), "Library", "LaunchAgents", "com.gigai.server.plist");
+    try {
+      await execFileAsync2("launchctl", ["unload", plistPath]);
+    } catch {
+    }
+    const { unlink: unlink2 } = await import("fs/promises");
+    try {
+      await unlink2(plistPath);
+      console.log("  Service removed.");
+    } catch {
+      console.log("  No service found.");
+    }
+  } else if (os === "linux") {
+    try {
+      await execFileAsync2("systemctl", ["--user", "disable", "--now", "gigai"]);
+    } catch {
+    }
+    const unitPath = join3(homedir(), ".config", "systemd", "user", "gigai.service");
+    const { unlink: unlink2 } = await import("fs/promises");
+    try {
+      await unlink2(unitPath);
+      await execFileAsync2("systemctl", ["--user", "daemon-reload"]);
+      console.log("  Service removed.");
+    } catch {
+      console.log("  No service found.");
+    }
+  }
+}
 async function startServer() {
   const { values } = parseArgs({
     options: {
@@ -1238,9 +1414,11 @@ async function startServer() {
 export {
   createServer,
   generateServerPairingCode,
+  installDaemon,
   loadConfig,
   runInit,
   startServer,
+  uninstallDaemon,
   unwrapTool,
   wrapCli,
   wrapImport,

package/dist/index.js

@@ -51,8 +51,8 @@ function getOrgUUID() {
   if (process.env.GIGAI_ORG_UUID) {
     return process.env.GIGAI_ORG_UUID;
   }
-  const proxyUrl = process.env.ANTHROPIC_PROXY_URL ?? "";
-  const jwtMatch = proxyUrl.match(/\/([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/);
+  const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || "";
+  const jwtMatch = proxyUrl.match(/jwt_([^@]+)/);
   if (jwtMatch) {
     try {
       const payload = decodeJWTPayload(jwtMatch[1]);
@@ -62,18 +62,25 @@ function getOrgUUID() {
     } catch {
     }
   }
+  const anthropicProxy = process.env.ANTHROPIC_PROXY_URL ?? "";
+  const anthropicJwtMatch = anthropicProxy.match(/([A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+)/);
+  if (anthropicJwtMatch) {
+    try {
+      const payload = decodeJWTPayload(anthropicJwtMatch[1]);
+      if (payload.organization_uuid) {
+        return payload.organization_uuid;
+      }
+    } catch {
+    }
+  }
   const apiKey = process.env.ANTHROPIC_API_KEY ?? "";
-  if (apiKey.includes("/")) {
-    const parts = apiKey.split("/");
-    const jwtPart = parts.find((p) => p.includes(".") && p.split(".").length === 3);
-    if (jwtPart) {
-      try {
-        const payload = decodeJWTPayload(jwtPart);
-        if (payload.organization_uuid) {
-          return payload.organization_uuid;
-        }
-      } catch {
+  if (apiKey.includes(".")) {
+    try {
+      const payload = decodeJWTPayload(apiKey);
+      if (payload.organization_uuid) {
+        return payload.organization_uuid;
       }
+    } catch {
     }
   }
   throw new Error(
@@ -82,6 +89,23 @@ function getOrgUUID() {
 }
 
 // src/http.ts
+async function getProxyDispatcher() {
+  const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+  if (!proxyUrl) return void 0;
+  try {
+    const undici = await import("undici");
+    return new undici.ProxyAgent(proxyUrl);
+  } catch {
+    return void 0;
+  }
+}
+var _dispatcher = null;
+async function ensureDispatcher() {
+  if (_dispatcher === null) {
+    _dispatcher = await getProxyDispatcher();
+  }
+  return _dispatcher;
+}
 function createHttpClient(serverUrl, sessionToken) {
   const baseUrl = serverUrl.replace(/\/$/, "");
   async function request(path, init = {}) {
@@ -94,10 +118,15 @@ function createHttpClient(serverUrl, sessionToken) {
     if (!headers["Content-Type"] && init.body && typeof init.body === "string") {
       headers["Content-Type"] = "application/json";
     }
-    const res = await fetch(`${baseUrl}${path}`, {
+    const dispatcher = await ensureDispatcher();
+    const fetchOpts = {
       ...init,
       headers
-    });
+    };
+    if (dispatcher) {
+      fetchOpts.dispatcher = dispatcher;
+    }
+    const res = await fetch(`${baseUrl}${path}`, fetchOpts);
     if (!res.ok) {
       let errorBody;
       try {
@@ -124,11 +153,16 @@ function createHttpClient(serverUrl, sessionToken) {
       if (sessionToken) {
         headers["Authorization"] = `Bearer ${sessionToken}`;
       }
-      const res = await fetch(`${baseUrl}${path}`, {
+      const dispatcher = await ensureDispatcher();
+      const fetchOpts = {
         method: "POST",
         headers,
         body: formData
-      });
+      };
+      if (dispatcher) {
+        fetchOpts.dispatcher = dispatcher;
+      }
+      const res = await fetch(`${baseUrl}${path}`, fetchOpts);
       if (!res.ok) {
         let errorBody;
         try {
@@ -144,7 +178,12 @@ function createHttpClient(serverUrl, sessionToken) {
       if (sessionToken) {
         headers["Authorization"] = `Bearer ${sessionToken}`;
       }
-      const res = await fetch(`${baseUrl}${path}`, { headers });
+      const dispatcher = await ensureDispatcher();
+      const fetchOpts = { headers };
+      if (dispatcher) {
+        fetchOpts.dispatcher = dispatcher;
+      }
+      const res = await fetch(`${baseUrl}${path}`, fetchOpts);
       if (!res.ok) {
         throw new Error(`HTTP ${res.status}: ${res.statusText}`);
       }
@@ -538,7 +577,7 @@ function runCitty() {
           dev: { type: "boolean", description: "Development mode (no HTTPS)" }
         },
         async run({ args }) {
-          const { startServer } = await import("./dist-EG3MXFDE.js");
+          const { startServer } = await import("./dist-GANOIL6Z.js");
           const extraArgs = [];
           if (args.config) extraArgs.push("--config", args.config);
           if (args.dev) extraArgs.push("--dev");
@@ -549,7 +588,7 @@ function runCitty() {
       init: defineCommand({
         meta: { name: "init", description: "Interactive setup wizard" },
         async run() {
-          const { runInit } = await import("./dist-EG3MXFDE.js");
+          const { runInit } = await import("./dist-GANOIL6Z.js");
           await runInit();
         }
       }),
@@ -559,10 +598,27 @@ function runCitty() {
           config: { type: "string", alias: "c", description: "Config file path" }
         },
         async run({ args }) {
-          const { generateServerPairingCode } = await import("./dist-EG3MXFDE.js");
+          const { generateServerPairingCode } = await import("./dist-GANOIL6Z.js");
           await generateServerPairingCode(args.config);
         }
       }),
+      install: defineCommand({
+        meta: { name: "install", description: "Install as persistent background service" },
+        args: {
+          config: { type: "string", alias: "c", description: "Config file path" }
+        },
+        async run({ args }) {
+          const { installDaemon } = await import("./dist-GANOIL6Z.js");
+          await installDaemon(args.config);
+        }
+      }),
+      uninstall: defineCommand({
+        meta: { name: "uninstall", description: "Remove background service" },
+        async run() {
+          const { uninstallDaemon } = await import("./dist-GANOIL6Z.js");
+          await uninstallDaemon();
+        }
+      }),
       status: defineCommand({
         meta: { name: "status", description: "Show server status" },
         async run() {
@@ -586,21 +642,21 @@ function runCitty() {
       cli: defineCommand({
         meta: { name: "cli", description: "Wrap a CLI command" },
         async run() {
-          const { wrapCli } = await import("./dist-EG3MXFDE.js");
+          const { wrapCli } = await import("./dist-GANOIL6Z.js");
           await wrapCli();
         }
       }),
       mcp: defineCommand({
         meta: { name: "mcp", description: "Wrap an MCP server" },
         async run() {
-          const { wrapMcp } = await import("./dist-EG3MXFDE.js");
+          const { wrapMcp } = await import("./dist-GANOIL6Z.js");
           await wrapMcp();
         }
       }),
       script: defineCommand({
         meta: { name: "script", description: "Wrap a script" },
         async run() {
-          const { wrapScript } = await import("./dist-EG3MXFDE.js");
+          const { wrapScript } = await import("./dist-GANOIL6Z.js");
           await wrapScript();
         }
       }),
@@ -610,7 +666,7 @@ function runCitty() {
           path: { type: "positional", description: "Path to config file", required: true }
         },
         async run({ args }) {
-          const { wrapImport } = await import("./dist-EG3MXFDE.js");
+          const { wrapImport } = await import("./dist-GANOIL6Z.js");
           await wrapImport(args.path);
         }
       })
@@ -622,7 +678,7 @@ function runCitty() {
       name: { type: "positional", description: "Tool name", required: true }
     },
     async run({ args }) {
-      const { unwrapTool } = await import("./dist-EG3MXFDE.js");
+      const { unwrapTool } = await import("./dist-GANOIL6Z.js");
       await unwrapTool(args.name);
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schuttdev/gigai",
-  "version": "0.1.0-beta.14",
+  "version": "0.1.0-beta.16",
   "type": "module",
   "bin": {
     "gigai": "dist/index.js"