superacli 1.1.22 → 1.1.26

package/plugins/toml2json/install-guidance.json

@@ -0,0 +1,11 @@
+{
+  "plugin": "toml2json",
+  "binary": "toml2json",
+  "check": "which toml2json",
+  "install_steps": [
+    "cargo install toml2json",
+    "Verify: toml2json --version",
+    "supercli plugins install ./plugins/toml2json --on-conflict replace --json"
+  ],
+  "note": "Tiny single-purpose tool available via crates.io."
+}

package/plugins/toml2json/meta.json

@@ -0,0 +1,5 @@
+{
+  "description": "Very small CLI for converting TOML to JSON. Reads from stdin or files with pretty-print support.",
+  "tags": ["toml2json", "toml", "json", "converter", "cli", "rust"],
+  "has_learn": true
+}

package/plugins/toml2json/plugin.json

@@ -0,0 +1,85 @@
+{
+  "name": "toml2json",
+  "version": "0.1.0",
+  "description": "Convert TOML to JSON from stdin or files",
+  "source": "https://github.com/woodruffw/toml2json",
+  "checks": [
+    { "type": "binary", "name": "toml2json" }
+  ],
+  "install_guidance": {
+    "plugin": "toml2json",
+    "binary": "toml2json",
+    "check": "which toml2json",
+    "install_steps": [
+      "cargo install toml2json",
+      "Verify: toml2json --version",
+      "supercli plugins install ./plugins/toml2json --on-conflict replace --json"
+    ]
+  },
+  "learn": {
+    "file": "skills/quickstart/SKILL.md"
+  },
+  "commands": [
+    {
+      "namespace": "toml2json",
+      "resource": "self",
+      "action": "version",
+      "description": "Print toml2json version",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "toml2json",
+        "baseArgs": ["--version"],
+        "missingDependencyHelp": "Install toml2json: cargo install toml2json"
+      },
+      "args": []
+    },
+    {
+      "namespace": "toml2json",
+      "resource": "convert",
+      "action": "file",
+      "description": "Convert a TOML file to JSON",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "toml2json",
+        "positionalArgs": ["file"],
+        "passthrough": true,
+        "timeout_ms": 30000,
+        "missingDependencyHelp": "Install toml2json"
+      },
+      "args": [
+        { "name": "file", "type": "string", "required": true, "description": "Path to TOML file" }
+      ]
+    },
+    {
+      "namespace": "toml2json",
+      "resource": "convert",
+      "action": "pretty",
+      "description": "Convert TOML to pretty-printed JSON",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "toml2json",
+        "baseArgs": ["--pretty"],
+        "positionalArgs": ["file"],
+        "passthrough": true,
+        "timeout_ms": 30000,
+        "missingDependencyHelp": "Install toml2json"
+      },
+      "args": [
+        { "name": "file", "type": "string", "required": false, "description": "Path to TOML file (reads stdin if omitted)" }
+      ]
+    },
+    {
+      "namespace": "toml2json",
+      "resource": "_",
+      "action": "_",
+      "description": "Passthrough to toml2json CLI",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "toml2json",
+        "passthrough": true,
+        "missingDependencyHelp": "Install toml2json"
+      },
+      "args": []
+    }
+  ]
+}

package/plugins/toml2json/skills/quickstart/SKILL.md

@@ -0,0 +1,47 @@
+---
+name: toml2json
+description: Use this skill when the user wants to convert TOML files to JSON format, or pipe TOML data through stdin to get JSON output.
+---
+
+# toml2json Plugin
+
+Very small CLI for converting TOML to JSON.
+
+## Commands
+
+### Convert
+- `toml2json convert file` — Convert a TOML file to JSON
+- `toml2json convert pretty` — Convert TOML to pretty-printed JSON
+
+## Usage Examples
+- "Convert a TOML file to JSON"
+- "Pretty-print a TOML configuration as JSON"
+- "Pipe TOML data and convert it"
+
+## Installation
+
+```bash
+cargo install toml2json
+```
+
+## Examples
+
+```bash
+# Convert a file
+toml2json config.toml
+
+# Pretty-print
+toml2json --pretty config.toml
+
+# Pipe from stdin
+cat config.toml | toml2json
+
+# Use with jq
+toml2json config.toml | jq '.key'
+```
+
+## Key Features
+- Convert TOML to JSON
+- Read from files or stdin
+- Pretty-print output option
+- Pipe-friendly for shell workflows

package/plugins/worktrunk/install-guidance.json

@@ -0,0 +1,11 @@
+{
+  "plugin": "worktrunk",
+  "binary": "wt",
+  "check": "which wt",
+  "install_steps": [
+    "cargo install worktrunk",
+    "wt config shell install",
+    "supercli plugins install ./plugins/worktrunk --on-conflict replace --json"
+  ],
+  "note": "Also available via: brew, pacman, winget, conda. Binary name is 'wt'. Shell integration required for cd commands."
+}

package/plugins/worktrunk/meta.json

@@ -0,0 +1,5 @@
+{
+  "description": "Git worktree management CLI designed for parallel AI agent workflows. Makes worktrees as easy as branches.",
+  "tags": ["worktrunk", "git", "worktree", "branch", "cli", "rust"],
+  "has_learn": true
+}

package/plugins/worktrunk/plugin.json

@@ -0,0 +1,116 @@
+{
+  "name": "worktrunk",
+  "version": "0.1.0",
+  "description": "CLI for Git worktree management, designed for parallel AI agent workflows",
+  "source": "https://github.com/max-sixty/worktrunk",
+  "checks": [
+    { "type": "binary", "name": "wt" }
+  ],
+  "install_guidance": {
+    "plugin": "worktrunk",
+    "binary": "wt",
+    "check": "which wt",
+    "install_steps": [
+      "cargo install worktrunk",
+      "wt config shell install",
+      "supercli plugins install ./plugins/worktrunk --on-conflict replace --json"
+    ]
+  },
+  "learn": {
+    "file": "skills/quickstart/SKILL.md"
+  },
+  "commands": [
+    {
+      "namespace": "worktrunk",
+      "resource": "self",
+      "action": "version",
+      "description": "Print worktrunk version",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "baseArgs": ["--version"],
+        "missingDependencyHelp": "Install worktrunk: cargo install worktrunk"
+      },
+      "args": []
+    },
+    {
+      "namespace": "worktrunk",
+      "resource": "branch",
+      "action": "switch",
+      "description": "Switch to a worktree branch",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "baseArgs": ["switch"],
+        "passthrough": true,
+        "timeout_ms": 30000,
+        "missingDependencyHelp": "Install worktrunk"
+      },
+      "args": [
+        { "name": "branch", "type": "string", "required": true, "description": "Branch name to switch to" }
+      ]
+    },
+    {
+      "namespace": "worktrunk",
+      "resource": "branch",
+      "action": "create",
+      "description": "Create and switch to a new worktree branch",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "baseArgs": ["switch", "-c"],
+        "passthrough": true,
+        "timeout_ms": 30000,
+        "missingDependencyHelp": "Install worktrunk"
+      },
+      "args": [
+        { "name": "branch", "type": "string", "required": true, "description": "New branch name" }
+      ]
+    },
+    {
+      "namespace": "worktrunk",
+      "resource": "branch",
+      "action": "list",
+      "description": "List all worktree branches",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "baseArgs": ["list"],
+        "passthrough": true,
+        "timeout_ms": 10000,
+        "missingDependencyHelp": "Install worktrunk"
+      },
+      "args": []
+    },
+    {
+      "namespace": "worktrunk",
+      "resource": "branch",
+      "action": "remove",
+      "description": "Remove a worktree branch",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "baseArgs": ["remove"],
+        "passthrough": true,
+        "timeout_ms": 30000,
+        "missingDependencyHelp": "Install worktrunk"
+      },
+      "args": [
+        { "name": "branch", "type": "string", "required": false, "description": "Branch name to remove (uses current if omitted)" }
+      ]
+    },
+    {
+      "namespace": "worktrunk",
+      "resource": "_",
+      "action": "_",
+      "description": "Passthrough to wt CLI",
+      "adapter": "process",
+      "adapterConfig": {
+        "command": "wt",
+        "passthrough": true,
+        "missingDependencyHelp": "Install worktrunk"
+      },
+      "args": []
+    }
+  ]
+}

package/plugins/worktrunk/skills/quickstart/SKILL.md

@@ -0,0 +1,62 @@
+---
+name: worktrunk
+description: Use this skill when the user wants to manage Git worktrees, switch between parallel branches, or work with multiple worktrees.
+---
+
+# worktrunk Plugin
+
+CLI for Git worktree management, designed for parallel AI agent workflows.
+
+## Commands
+
+### Branch
+- `worktrunk branch switch` — Switch to a worktree branch
+- `worktrunk branch create` — Create and switch to a new worktree branch
+- `worktrunk branch list` — List all worktree branches
+- `worktrunk branch remove` — Remove a worktree branch
+
+## Usage Examples
+- "Switch to a different worktree branch"
+- "Create a new worktree for a feature branch"
+- "List all my worktrees"
+- "Remove a worktree I no longer need"
+
+## Installation
+
+```bash
+cargo install worktrunk
+wt config shell install
+```
+
+## Examples
+
+```bash
+# Switch to existing branch
+wt switch feature-branch
+
+# Create and switch to new branch
+wt switch -c new-feature
+
+# Create with external tool execution
+wt switch -c -x claude new-feature
+
+# List all worktrees
+wt list
+
+# Remove current worktree
+wt remove
+
+# Remove specific worktree
+wt remove old-branch
+
+# Checkout PR
+wt switch pr:123
+```
+
+## Key Features
+- Branch-name based worktree addressing
+- Automatic path computation
+- Hooks for workflow automation
+- LLM commit message generation
+- PR checkout support
+- Build cache sharing between worktrees

package/server/app.js

@@ -1,6 +1,8 @@
 const express = require("express");
 const path = require("path");
 const { getStorage } = require("./storage/adapter");
+const { registerAllPluginResources, syncPluginResources } = require("./services/pluginResourceService");
+const { requireAuth } = require("./middleware/auth");
 
 const dashboardRouter = require("./routes/dashboard");
 const adaptersRouter = require("./routes/adapters");
@@ -12,6 +14,9 @@ const plansRouter = require("./routes/plans");
 const jobsRouter = require("./routes/jobs");
 const askRouter = require("./routes/ask");
 const pluginsRouter = require("./routes/plugins");
+const docsRouter = require("./routes/docs");
+const settingsRouter = require("./routes/settings");
+const clientsRouter = require("./routes/clients");
 
 const PORT = process.env.PORT || 3000;
 
@@ -23,22 +28,25 @@ app.use(express.urlencoded({ extended: true, limit: "20mb" }));
 app.set("view engine", "ejs");
 app.set("views", path.join(__dirname, "views"));
 
+// Static file serving - must be before API routes
 app.use("/static", express.static(path.join(__dirname, "public")));
+app.use("/uploads", express.static(path.join(__dirname, "uploads")));
+app.use("/docs", express.static(path.join(__dirname, "../docs")));
 
-// API routes
-app.use("/api/dashboard", dashboardRouter);
-app.use("/api/adapters", adaptersRouter);
-app.use("/api/config", configRouter);
-app.use("/api/commands", commandsRouter);
-app.use("/api/specs", specsRouter);
-app.use("/api/mcp", mcpRouter);
-app.use("/api/plans", plansRouter);
-app.use("/api/jobs", jobsRouter);
-app.use("/api/ask", askRouter);
+// API routes (with authentication)
+app.use("/api/dashboard", requireAuth, dashboardRouter);
+app.use("/api/adapters", requireAuth, adaptersRouter);
+app.use("/api/commands", requireAuth, commandsRouter);
+app.use("/api/specs", requireAuth, specsRouter);
+app.use("/api/mcp", requireAuth, mcpRouter);
+app.use("/api/plans", requireAuth, plansRouter);
+app.use("/api/jobs", requireAuth, jobsRouter);
+app.use("/api/ask", requireAuth, askRouter);
 app.use("/api/plugins", pluginsRouter);
-
-// Tree/command endpoints under /api (config router handles them)
-app.use("/api", configRouter);
+app.use("/api/docs", requireAuth, docsRouter);
+app.use("/api/clients", requireAuth, clientsRouter);
+app.use("/api", settingsRouter);
+app.use("/api/config", requireAuth, configRouter);
 
 app.use("/", dashboardRouter);
 
@@ -66,12 +74,37 @@ app.get("/mcp", (req, res) => res.redirect("/api/mcp"));
 app.get("/jobs", (req, res) => res.redirect("/api/jobs"));
 app.get("/plugins", (req, res) => res.redirect("/api/plugins"));
 app.get("/adapters", (req, res) => res.redirect("/api/adapters"));
+app.get("/docs", (req, res) => res.redirect("/api/docs"));
+
+// Doc sub-page redirects
+app.get("/api/plugins.html", (req, res) => res.redirect("/docs/plugins.html"));
+app.get("/api/adapters.html", (req, res) => res.redirect("/docs/adapters.html"));
+app.get("/api/server.md", (req, res) => res.redirect("/docs/server.md"));
+app.get("/api/changelog.html", (req, res) => res.redirect("/docs/changelog.html"));
 
 async function start() {
   try {
     // Initialize storage singleton
     getStorage();
 
+    // Sync plugin resources (cleanup orphaned)
+    console.log("[Plugin Resources] Syncing plugin resources...");
+    const syncResults = await syncPluginResources();
+    if (syncResults.removedMcp.length > 0 || syncResults.removedSpecs.length > 0) {
+      console.log(`[Plugin Resources] Cleaned up ${syncResults.removedMcp.length} MCP and ${syncResults.removedSpecs.length} orphaned specs`);
+    }
+    if (syncResults.errors.length > 0) {
+      console.warn(`[Plugin Resources] ${syncResults.errors.length} sync errors`);
+    }
+
+    // Register plugin resources (self-healing)
+    console.log("[Plugin Resources] Registering plugin resources...");
+    const resourceResults = await registerAllPluginResources();
+    if (resourceResults.totalErrors > 0) {
+      console.warn(`[Plugin Resources] ${resourceResults.totalErrors} errors during registration`);
+    }
+    console.log(`[Plugin Resources] Registered ${resourceResults.registeredMcp} MCP servers and ${resourceResults.registeredSpecs} OpenAPI specs`);
+
     app.listen(PORT, () => {
       console.log(`SUPERCLI server running on http://localhost:${PORT}`);
     });

package/server/middleware/auth.js

@@ -0,0 +1,70 @@
+const { getSettings } = require("../services/pluginsService");
+
+// Cache settings for 30 seconds to avoid repeated storage reads
+let cachedSettings = null;
+let cacheExpiry = 0;
+
+async function getCachedSettings() {
+  const now = Date.now();
+  if (cachedSettings && now < cacheExpiry) {
+    return cachedSettings;
+  }
+  cachedSettings = await getSettings();
+  cacheExpiry = now + 30000; // 30 seconds
+  return cachedSettings;
+}
+
+/**
+ * Authentication middleware for API endpoints
+ *
+ * Flow:
+ * 1. Check admin_mode_enabled - if true, skip all auth
+ * 2. Check public_access - if true, allow all requests
+ * 3. Allow settings endpoint when no API keys exist (for bootstrapping)
+ * 4. Check X-API-Key header - validate against stored API keys
+ * 5. Return 401 if no valid auth
+ */
+async function requireAuth(req, res, next) {
+  try {
+    const settings = await getCachedSettings();
+
+    // Admin mode - skip all authentication
+    if (settings.admin_mode_enabled === true) {
+      return next();
+    }
+
+    // Public access - allow all requests
+    if (settings.public_access === true) {
+      return next();
+    }
+
+    // Allow HTML views (browser navigation) without auth
+    // This allows users to navigate the UI without API keys
+    if (req.accepts("html") && !req.headers["x-requested-with"] && req.query.format !== "json") {
+      return next();
+    }
+
+    // Check API key
+    const apiKey = req.headers["x-api-key"];
+    if (!apiKey) {
+      return res.status(401).json({ error: "Unauthorized: API key required" });
+    }
+
+    // Validate API key against stored keys
+    const apiKeys = Array.isArray(settings.api_keys) ? settings.api_keys : [];
+    const isValid = apiKeys.some(k => k.key === apiKey);
+
+    if (!isValid) {
+      return res.status(401).json({ error: "Unauthorized: Invalid API key" });
+    }
+
+    // Valid API key
+    next();
+  } catch (err) {
+    console.error("Auth middleware error:", err);
+    // Fail open on error to avoid breaking existing deployments
+    next();
+  }
+}
+
+module.exports = { requireAuth, getCachedSettings };

package/server/routes/adapters.js

@@ -55,6 +55,9 @@ router.get("/:name/packages", async (req, res, next) => {
       return res.status(404).render("error", { message: `Adapter '${name}' not found` })
     }
     const packages = await adaptersService.getAdapterPackages(name)
+    if (req.headers.accept?.includes("application/json") || req.query.format === "json") {
+      return res.json({ packages })
+    }
     res.render("adapter-packages", { adapter, packages })
   } catch (err) {
     next(err)
@@ -151,17 +154,6 @@ router.delete("/:name", async (req, res, next) => {
   }
 })
 
-// Get adapter packages
-router.get("/:name/packages", async (req, res, next) => {
-  try {
-    const { name } = req.params
-    const packages = await adaptersService.getAdapterPackages(name)
-    res.json({ packages })
-  } catch (err) {
-    next(err)
-  }
-})
-
 // Add package to adapter
 router.post("/:name/packages", async (req, res, next) => {
   try {

package/server/routes/clients.js

@@ -0,0 +1,46 @@
+const { Router } = require("express");
+const { getStorage } = require("../storage/adapter");
+const { requireAuth } = require("../middleware/auth");
+
+const router = Router();
+
+// Helper function to handle errors
+function handleError(res, err) {
+  console.error(err);
+  const status = err.status || 500;
+  const error = err.error || { code: 500, type: "internal_error", message: err.message || "Internal server error" };
+  res.status(status).json({ error });
+}
+
+// List clients endpoint
+router.get("/", requireAuth, async (req, res) => {
+  try {
+    const storage = getStorage();
+    const clientKeys = await storage.listKeys("client:");
+    const clients = [];
+    
+    for (const key of clientKeys) {
+      try {
+        const client = await storage.get(key);
+        if (client && client.client_id) {
+          clients.push(client);
+        }
+      } catch (err) {
+        // Skip if client read fails
+      }
+    }
+    
+    // Sort by last_seen descending
+    clients.sort((a, b) => new Date(b.last_seen) - new Date(a.last_seen));
+    
+    if (req.query.format !== "json" && req.accepts("html") && !req.xhr && !req.headers["x-requested-with"]) {
+      return res.render("clients", { clients });
+    }
+    
+    res.json({ clients });
+  } catch (err) {
+    handleError(res, err);
+  }
+});
+
+module.exports = router;

package/server/routes/docs.js

@@ -0,0 +1,10 @@
+const { Router } = require("express")
+
+const router = Router()
+
+// GET /api/docs - redirect to standalone docs with fromServerUI param
+router.get("/", (req, res) => {
+  res.redirect("/docs/index.html?fromServerUI=1")
+})
+
+module.exports = router

package/server/routes/jobs.js

@@ -7,7 +7,7 @@ const router = Router()
 router.post("/", async (req, res) => {
   try {
     const storage = getStorage()
-    const { command, args, status, duration_ms, timestamp, plan_id, error } = req.body
+    const { command, args, status, duration_ms, timestamp, plan_id, error, client_id } = req.body
     
     // Generate a unique sequential-ish ID
     const jobId = `job:${Date.now()}_${Math.random().toString(36).substring(2, 9)}`
@@ -20,7 +20,8 @@ router.post("/", async (req, res) => {
       duration_ms: duration_ms || 0,
       plan_id: plan_id || null,
       error: error || null,
-      timestamp: timestamp || new Date().toISOString()
+      timestamp: timestamp || new Date().toISOString(),
+      client_id: client_id || null
     }
     
     await storage.set(jobId, doc)

package/server/routes/mcp.js

@@ -19,6 +19,7 @@ function sanitizeMcpPayload(payload, fallbackName) {
   }
   if (typeof payload.timeout_ms === "number" && payload.timeout_ms > 0) out.timeout_ms = payload.timeout_ms
   if (payload.stateful === true || payload.stateful === "true" || payload.stateful === "on") out.stateful = true
+  if (typeof payload.pluginSource === "string") out.pluginSource = payload.pluginSource
   return out
 }