@lifeaitools/clauth 1.5.5 → 1.5.7

package/cli/commands/serve.js

@@ -739,6 +739,7 @@ function dashboardHtml(port, whitelist, isStaged = false) {
     <button class="btn-add" onclick="toggleAddService()">+ Add Service</button>
     <button class="btn-check" id="check-btn" onclick="checkAll()">⬤ Check All</button>
     <button class="btn-lock" onclick="lockVault()">🔒 Lock</button>
+    <button class="btn-stop" onclick="restartDaemon()" style="background:#1a2e1a;border:1px solid #166534;color:#86efac" title="Restart daemon — keeps vault unlocked">↺ Restart</button>
     <button class="btn-stop" onclick="stopDaemon()" style="background:#7f1d1d;border:1px solid #991b1b;color:#fca5a5" title="Stop daemon — password required on next start">⏹ Stop</button>
     <button class="btn-cancel" style="margin-left:auto" onclick="toggleChangePw()">Change Password</button>
   </div>
@@ -747,8 +748,12 @@ function dashboardHtml(port, whitelist, isStaged = false) {
     <h3>Add New Service</h3>
     <div class="add-row">
       <div class="add-field">
-        <label>Service name</label>
-        <input class="add-input" id="add-name" type="text" placeholder="e.g. coolify-admin" autocomplete="off" spellcheck="false">
+        <label>Slug <span style="color:#475569;font-weight:400">(used in <code style="font-size:.72rem">clauth get &lt;slug&gt;</code>)</span></label>
+        <input class="add-input" id="add-name" type="text" placeholder="e.g. coolify-admin" autocomplete="off" spellcheck="false" style="font-family:'Courier New',monospace">
+      </div>
+      <div class="add-field">
+        <label>Label <span style="color:#475569;font-weight:400">(display name)</span></label>
+        <input class="add-input" id="add-label" type="text" placeholder="e.g. Coolify Admin Token" autocomplete="off" spellcheck="false">
       </div>
       <div class="add-field">
         <label>Key type</label>
@@ -756,6 +761,12 @@ function dashboardHtml(port, whitelist, isStaged = false) {
           <option value="">Loading…</option>
         </select>
       </div>
+    </div>
+    <div class="add-row">
+      <div class="add-field">
+        <label>Description <span style="color:#475569;font-weight:400">(optional)</span></label>
+        <input class="add-input" id="add-description" type="text" placeholder="e.g. API token for Coolify deployments" autocomplete="off" spellcheck="false" style="width:420px">
+      </div>
       <div class="add-field">
         <label>Project <span style="color:#475569;font-weight:400">(optional)</span></label>
         <input class="add-input" id="add-project" type="text" placeholder="e.g. marketing-engine" autocomplete="off" spellcheck="false">
@@ -1121,6 +1132,17 @@ async function makeLive() {
   }
 }
 
+// ── Restart daemon (keeps boot.key — vault stays unlocked) ──
+async function restartDaemon() {
+  if (!confirm("Restart the daemon?\\n\\nThe vault will stay unlocked (boot.key kept).")) return;
+  const btn = document.querySelector('[onclick="restartDaemon()"]');
+  if (btn) { btn.disabled = true; btn.textContent = "↺ Restarting…"; }
+  try {
+    await fetch(BASE + "/restart", { method: "POST" });
+  } catch {}
+  document.getElementById("main-view").innerHTML = '<div style="text-align:center;padding:80px 20px"><div style="font-size:3rem;margin-bottom:16px">↺</div><div style="font-size:1.1rem;color:#86efac">Restarting…</div><div style="font-size:.85rem;color:#64748b;margin-top:8px">Page will reload automatically.</div></div>';
+}
+
 // ── Stop daemon (user-initiated — clears boot.key, requires password on restart) ──
 async function stopDaemon() {
   if (!confirm("Stop the daemon?\\n\\nCredentials will need to be re-entered on next start.")) return;
@@ -1176,14 +1198,18 @@ function renderServiceGrid(services) {
   grid.innerHTML = filtered.map(s => \`
     <div class="card">
       <div style="display:flex;align-items:flex-start;justify-content:space-between">
-        <div>
-          <div class="card-name">\${s.name}</div>
+        <div style="flex:1;min-width:0">
+          <div style="display:flex;align-items:baseline;gap:8px;flex-wrap:wrap">
+            <span class="card-name" id="label-display-\${s.name}">\${s.label && s.label !== s.name ? s.label : s.name}</span>
+            <code style="font-family:'Courier New',monospace;font-size:.75rem;color:#64748b;background:rgba(100,116,139,.1);padding:1px 6px;border-radius:3px;letter-spacing:.3px">\${s.name}</code>
+          </div>
           <div style="display:flex;align-items:center;gap:6px;margin-top:2px">
             <div class="card-type">\${s.key_type || "secret"}</div>
             <span class="svc-badge \${s.enabled === false ? "off" : "on"}" id="badge-\${s.name}">\${s.enabled === false ? "disabled" : "enabled"}</span>
             <span class="expiry-badge" id="expiry-\${s.name}" style="font-size:.65rem;border-radius:3px;padding:1px 6px;display:none"></span>
             \${s.project ? \`<span style="font-size:.68rem;color:#3b82f6;background:rgba(59,130,246,.1);border:1px solid rgba(59,130,246,.2);border-radius:3px;padding:1px 6px">\${s.project}</span>\` : ""}
           </div>
+          \${s.description ? \`<div style="font-size:.78rem;color:#64748b;margin-top:4px;line-height:1.3">\${s.description}</div>\` : ""}
           \${KEY_URLS[s.name] ? \`<a class="card-getkey" href="\${KEY_URLS[s.name]}" target="_blank" rel="noopener">↗ Get / rotate key</a>\` : ""}
           \${(EXTRA_LINKS[s.name] || []).map(l => \`<a class="card-getkey" href="\${l.url}" target="_blank" rel="noopener" style="margin-left:0">\${l.label}</a>\`).join("")}
         </div>
@@ -1197,14 +1223,22 @@ function renderServiceGrid(services) {
         <button class="btn-project" onclick="toggleProjectEdit('\${s.name}')">\${s.project ? "✎ Project" : "+ Project"}</button>
         <button class="btn \${s.enabled === false ? "btn-enable" : "btn-disable"}" id="togbtn-\${s.name}" onclick="toggleService('\${s.name}')">\${s.enabled === false ? "Enable" : "Disable"}</button>
         <button class="btn-rotate" id="rotbtn-\${s.name}" style="display:none;background:#0e7490;border:1px solid #06b6d4;color:#cffafe;font-size:.75rem;padding:3px 8px;border-radius:4px;cursor:pointer" onclick="rotateKey('\${s.name}')">↻ Rotate</button>
-        <button class="btn-rename" onclick="toggleRename('\${s.name}')" title="Rename service">✎</button>
+        <button class="btn-rename" onclick="toggleLabelEdit('\${s.name}')" title="Edit display label">✏️</button>
         <button class="btn-delete" onclick="deleteService('\${s.name}')" title="Delete service">✕</button>
       </div>
       <div class="rename-panel" id="rn-\${s.name}">
-        <input class="rename-input" id="rn-input-\${s.name}" value="\${s.name}" spellcheck="false" autocomplete="off" placeholder="New name…">
-        <button class="btn" onclick="saveRename('\${s.name}')" style="padding:4px 10px;font-size:.8rem">Save</button>
-        <button class="btn" onclick="toggleRename('\${s.name}')" style="padding:4px 10px;font-size:.8rem;background:#1e293b">Cancel</button>
-        <span class="rename-msg" id="rn-msg-\${s.name}"></span>
+        <div style="display:flex;align-items:center;gap:8px;margin-bottom:4px">
+          <span style="font-size:.72rem;color:#64748b">Edit label for</span>
+          <code style="font-family:'Courier New',monospace;font-size:.75rem;color:#94a3b8;background:rgba(100,116,139,.1);padding:1px 5px;border-radius:3px">\${s.name}</code>
+          <span style="font-size:.68rem;color:#475569">(slug unchanged)</span>
+        </div>
+        <div style="display:flex;gap:6px;align-items:center">
+          <input class="rename-input" id="rn-input-\${s.name}" value="\${s.label || s.name}" spellcheck="false" autocomplete="off" placeholder="Human-readable label…"
+            onkeydown="if(event.key==='Enter')saveLabel('\${s.name}');if(event.key==='Escape')toggleLabelEdit('\${s.name}')">
+          <button class="btn" onclick="saveLabel('\${s.name}')" style="padding:4px 10px;font-size:.8rem">Save</button>
+          <button class="btn" onclick="toggleLabelEdit('\${s.name}')" style="padding:4px 10px;font-size:.8rem;background:#1e293b">Cancel</button>
+          <span class="rename-msg" id="rn-msg-\${s.name}"></span>
+        </div>
       </div>
       <div class="project-edit" id="pe-\${s.name}">
         <input type="text" id="pe-input-\${s.name}" value="\${s.project || ""}" placeholder="Project name…" spellcheck="false" autocomplete="off">
@@ -1428,39 +1462,50 @@ async function clearProject(name) {
 }
 
 // ── Rename service ───────────────────────────
-function toggleRename(name) {
+function toggleLabelEdit(name) {
   const panel = document.getElementById("rn-" + name);
   const open  = panel.style.display === "block";
   panel.style.display = open ? "none" : "block";
   if (!open) {
     const inp = document.getElementById("rn-input-" + name);
-    inp.value = name;
+    const svc = allServices.find(s => s.name === name);
+    inp.value = (svc && svc.label) ? svc.label : name;
     inp.focus(); inp.select();
     document.getElementById("rn-msg-" + name).textContent = "";
   }
 }
 
-async function saveRename(oldName) {
-  const inp  = document.getElementById("rn-input-" + oldName);
-  const msg  = document.getElementById("rn-msg-" + oldName);
-  const newName = inp.value.trim();
-  if (!newName || newName === oldName) { toggleRename(oldName); return; }
+async function saveLabel(name) {
+  const inp  = document.getElementById("rn-input-" + name);
+  const msg  = document.getElementById("rn-msg-" + name);
+  const newLabel = inp.value.trim();
+  if (!newLabel) { toggleLabelEdit(name); return; }
+  const svc = allServices.find(s => s.name === name);
+  if (svc && newLabel === svc.label) { toggleLabelEdit(name); return; }
   msg.style.color = "#94a3b8"; msg.textContent = "Saving…";
   try {
-    const r = await fetch(BASE + "/rename/" + oldName, {
+    const r = await fetch(BASE + "/update-service", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ new_name: newName })
+      body: JSON.stringify({ service: name, label: newLabel })
     }).then(r => r.json());
     if (r.locked) { showLockScreen(false); return; }
     if (r.error) throw new Error(r.error);
-    msg.style.color = "#4ade80"; msg.textContent = "✓ Renamed";
-    setTimeout(() => loadServices(), 800);
+    msg.style.color = "#4ade80"; msg.textContent = "✓ Label updated";
+    // Update in-memory and DOM immediately
+    if (svc) svc.label = newLabel;
+    const labelEl = document.getElementById("label-display-" + name);
+    if (labelEl) labelEl.textContent = newLabel;
+    setTimeout(() => { toggleLabelEdit(name); }, 800);
   } catch (e) {
     msg.style.color = "#f87171"; msg.textContent = "✗ " + e.message;
   }
 }
 
+// Legacy rename (slug) — kept for API compatibility but hidden from UI
+function toggleRename(name) { toggleLabelEdit(name); }
+async function saveRename(oldName) { await saveLabel(oldName); }
+
 // ── Delete service ───────────────────────────
 async function deleteService(name) {
   if (!confirm(\`Delete service "\${name}"? This cannot be undone.\`)) return;
@@ -1706,6 +1751,8 @@ async function toggleAddService() {
   panel.style.display = open ? "none" : "block";
   if (!open) {
     document.getElementById("add-name").value = "";
+    document.getElementById("add-label").value = "";
+    document.getElementById("add-description").value = "";
     document.getElementById("add-project").value = "";
     document.getElementById("add-msg").textContent = "";
     // Fetch available key types from server
@@ -1728,16 +1775,19 @@ async function toggleAddService() {
 
 async function addService() {
   const name = document.getElementById("add-name").value.trim().toLowerCase();
+  const label = document.getElementById("add-label").value.trim();
+  const description = document.getElementById("add-description").value.trim();
   const type = document.getElementById("add-type").value;
   const project = document.getElementById("add-project").value.trim();
   const msg  = document.getElementById("add-msg");
 
-  if (!name) { msg.className = "add-msg fail"; msg.textContent = "Service name is required."; return; }
-  if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) { msg.className = "add-msg fail"; msg.textContent = "Lowercase letters, numbers, hyphens, underscores only."; return; }
+  if (!name) { msg.className = "add-msg fail"; msg.textContent = "Slug is required."; return; }
+  if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) { msg.className = "add-msg fail"; msg.textContent = "Slug: lowercase letters, numbers, hyphens, underscores only."; return; }
 
   msg.className = "add-msg"; msg.textContent = "Creating…";
   try {
-    const payload = { name, key_type: type, label: name };
+    const payload = { name, key_type: type, label: label || name };
+    if (description) payload.description = description;
     if (project) payload.project = project;
     const r = await fetch(BASE + "/add-service", {
       method: "POST",
@@ -1764,8 +1814,9 @@ document.addEventListener("DOMContentLoaded", () => {
   document.getElementById("lock-input").addEventListener("keydown", e => {
     if (e.key === "Enter") unlock();
   });
-  document.getElementById("add-name").addEventListener("keydown", e => {
-    if (e.key === "Enter") addService();
+  ["add-name", "add-label", "add-description", "add-project"].forEach(id => {
+    const el = document.getElementById(id);
+    if (el) el.addEventListener("keydown", e => { if (e.key === "Enter") addService(); });
   });
 });
 
@@ -3233,6 +3284,28 @@ function createServer(initPassword, whitelist, port, tunnelHostnameInit = null,
       return ok(res, { status: tunnelStatus });
     }
 
+    // POST /restart — spawn fresh process then exit (keeps boot.key, vault stays unlocked)
+    if (method === "POST" && reqPath === "/restart") {
+      ok(res, { ok: true, message: "restarting" });
+      const { spawn } = await import("child_process");
+      const cliEntry = path.resolve(__dirname, "../index.js");
+      const childArgs = [cliEntry, "serve", "start", "--port", String(port)];
+      if (password) childArgs.push("--pw", password);
+      if (whitelist) childArgs.push("--services", whitelist.join(","));
+      if (tunnelHostname) childArgs.push("--tunnel", tunnelHostname);
+      const out = fs.openSync(LOG_FILE, "a");
+      const child = spawn(process.execPath, childArgs, {
+        detached: true,
+        stdio: ["ignore", out, out],
+        env: { ...process.env, __CLAUTH_DAEMON: "1" },
+      });
+      child.unref();
+      stopTunnel();
+      removePid();
+      setTimeout(() => process.exit(0), 300);
+      return;
+    }
+
     // GET|POST /shutdown (for daemon stop — programmatic, keeps boot.key)
     // Accept POST as well — older scripts and curl default to POST
     if ((method === "GET" || method === "POST") && reqPath === "/shutdown") {
@@ -4248,7 +4321,7 @@ function createServer(initPassword, whitelist, port, tunnelHostnameInit = null,
     // Don't count browser noise, MCP discovery probes, or OAuth probes as auth failures
     const isBenign = reqPath.startsWith("/.well-known/") || [
       "/favicon.ico", "/robots.txt", "/apple-touch-icon.png", "/apple-touch-icon-precomposed.png",
-      "/sse", "/mcp", "/message", "/register", "/authorize", "/token", "/shutdown",
+      "/sse", "/mcp", "/message", "/register", "/authorize", "/token", "/shutdown", "/restart",
     ].includes(reqPath);
     if (isBenign) {
       res.writeHead(404, { "Content-Type": "application/json", ...CORS });
@@ -4671,6 +4744,88 @@ const MCP_TOOLS = [
     description: "Test whether the clauth MCP connector is reachable via the Cloudflare tunnel. Returns connectivity status and tunnel URL.",
     inputSchema: { type: "object", properties: {}, additionalProperties: false }
   },
+
+  // ── Google Workspace (gws CLI) ──────────────────────────────────────────
+  {
+    name: "gws_run",
+    description: "Run any gws CLI command for Google Workspace (Drive, Gmail, Calendar, Docs, Sheets, Slides, Tasks, People, Chat, etc.).\nCLI pattern: gws <service> <resource> [sub_resource] <method> [--params JSON] [--body JSON]",
+    inputSchema: {
+      type: "object",
+      properties: {
+        service: { type: "string", description: "Google Workspace service: drive, sheets, gmail, calendar, docs, slides, tasks, people, chat, classroom, forms, keep, meet, script" },
+        resource: { type: "string", description: "Resource noun, e.g. 'files', 'users', 'events'" },
+        sub_resource: { type: "string", description: "Optional sub-resource, e.g. 'messages' in 'users messages'" },
+        method: { type: "string", description: "Method verb: list, get, insert, update, delete, send, create" },
+        params: { type: "object", description: "Query/path params passed as --params JSON" },
+        body: { type: "object", description: "Request body passed as --json JSON" }
+      },
+      required: ["service", "resource", "method"],
+      additionalProperties: false
+    }
+  },
+  {
+    name: "gws_gmail_list",
+    description: "List Gmail messages. Supports Gmail search syntax (e.g. 'from:alice subject:meeting is:unread').",
+    inputSchema: {
+      type: "object",
+      properties: {
+        query: { type: "string", description: "Gmail search query" },
+        max_results: { type: "number", description: "Max messages (1-500, default 10)" }
+      },
+      additionalProperties: false
+    }
+  },
+  {
+    name: "gws_gmail_read",
+    description: "Read a single Gmail message by ID. Returns full message with headers and body.",
+    inputSchema: {
+      type: "object",
+      properties: { message_id: { type: "string", description: "Gmail message ID" } },
+      required: ["message_id"],
+      additionalProperties: false
+    }
+  },
+  {
+    name: "gws_gmail_send",
+    description: "Send an email via Gmail.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        to: { type: "string", description: "Recipient email address" },
+        subject: { type: "string", description: "Email subject" },
+        body: { type: "string", description: "Plain-text email body" },
+        from: { type: "string", description: "Sender name/address (optional)" }
+      },
+      required: ["to", "subject", "body"],
+      additionalProperties: false
+    }
+  },
+  {
+    name: "gws_calendar_list",
+    description: "List upcoming Google Calendar events.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        calendar_id: { type: "string", description: "Calendar ID (default: primary)" },
+        max_results: { type: "number", description: "Max events (default 10)" },
+        time_min: { type: "string", description: "Start bound ISO 8601, e.g. '2026-04-10T00:00:00Z'" },
+        time_max: { type: "string", description: "End bound ISO 8601" }
+      },
+      additionalProperties: false
+    }
+  },
+  {
+    name: "gws_drive_list",
+    description: "List files in Google Drive. Supports Drive search query syntax.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        query: { type: "string", description: "Drive search query, e.g. \"name contains 'report'\"" },
+        max_results: { type: "number", description: "Max files (default 10)" }
+      },
+      additionalProperties: false
+    }
+  },
 ];
 
 function writeTempSecret(service, value) {
@@ -4963,6 +5118,70 @@ async function handleMcpTool(vault, name, args) {
       return mcpResult(results.join("\n"));
     }
 
+    // ── Google Workspace (gws CLI) ───────────────────────────────────────
+    case "gws_run": {
+      const { service, resource, sub_resource, method, params, body } = args;
+      const cmdArgs = [service, resource];
+      if (sub_resource) cmdArgs.push(sub_resource);
+      cmdArgs.push(method);
+      if (params) cmdArgs.push("--params", `'${JSON.stringify(params)}'`);
+      if (body) cmdArgs.push("--json", `'${JSON.stringify(body)}'`);
+      try {
+        const raw = execSyncTop(["gws", ...cmdArgs].join(" "), { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) {
+        return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`);
+      }
+    }
+
+    case "gws_gmail_list": {
+      const p = { userId: "me", maxResults: args.max_results ?? 10 };
+      if (args.query) p.q = args.query;
+      try {
+        const raw = execSyncTop(`gws gmail users messages list --params '${JSON.stringify(p)}'`, { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) { return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`); }
+    }
+
+    case "gws_gmail_read": {
+      const p = { userId: "me", id: args.message_id, format: "full" };
+      try {
+        const raw = execSyncTop(`gws gmail users messages get --params '${JSON.stringify(p)}'`, { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) { return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`); }
+    }
+
+    case "gws_gmail_send": {
+      const lines = [];
+      if (args.from) lines.push(`From: ${args.from}`);
+      lines.push(`To: ${args.to}`, `Subject: ${args.subject}`, "Content-Type: text/plain; charset=utf-8", "MIME-Version: 1.0", "", args.body);
+      const encoded = Buffer.from(lines.join("\r\n")).toString("base64url");
+      const bodyObj = { userId: "me", resource: { raw: encoded } };
+      try {
+        const raw = execSyncTop(`gws gmail users messages send --json '${JSON.stringify(bodyObj)}'`, { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) { return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`); }
+    }
+
+    case "gws_calendar_list": {
+      const p = { calendarId: args.calendar_id ?? "primary", maxResults: args.max_results ?? 10, singleEvents: true, orderBy: "startTime" };
+      if (args.time_min) p.timeMin = args.time_min;
+      if (args.time_max) p.timeMax = args.time_max;
+      try {
+        const raw = execSyncTop(`gws calendar events list --params '${JSON.stringify(p)}'`, { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) { return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`); }
+    }
+
+    case "gws_drive_list": {
+      const p = { pageSize: args.max_results ?? 10, fields: "files(id,name,mimeType,modifiedTime,size,webViewLink)" };
+      if (args.query) p.q = args.query;
+      try {
+        const raw = execSyncTop(`gws drive files list --params '${JSON.stringify(p)}'`, { encoding: "utf8", timeout: 30000, windowsHide: true });
+        try { return mcpResult(JSON.stringify(JSON.parse(raw.trim()), null, 2)); } catch { return mcpResult(raw); }
+      } catch (err) { return mcpError(`gws failed: ${err.stderr || err.stdout || err.message}`); }
+    }
+
     default:
       return mcpError(`Unknown tool: ${name}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifeaitools/clauth",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Hardware-bound credential vault for the LIFEAI infrastructure stack",
   "type": "module",
   "bin": {