agent-factorio 0.2.0 → 0.3.0

package/README.md

@@ -1,8 +1,8 @@
 # agent-factorio
 
-CLI for [AgentFactorio](https://github.com/your-org/agent-factorio) — AI Agent Fleet Management hub.
+CLI for [AgentFactorio](https://github.com/gmuffiness/agent-factorio) — All your team's agents, one place.
 
-Register and manage your AI agents from any project.
+Register and manage your AI agents (Claude Code, Cursor, Codex, etc.) from any project.
 
 ## Install
 

package/bin.js

@@ -4,11 +4,24 @@
  * AgentFactorio CLI — register and manage agents from any project
  *
  * Usage:
- *   npx agent-factorio login     # Connect to hub + join organization
- *   npx agent-factorio push      # Push agent config to hub
- *   npx agent-factorio status    # Show registration status
- *   npx agent-factorio whoami    # Show login info
- *   npx agent-factorio logout    # Remove global config
+ *   npx agent-factorio login          # Connect to hub + join organization
+ *   npx agent-factorio push           # Push agent config to hub
+ *   npx agent-factorio status         # Show registration status
+ *   npx agent-factorio whoami         # Show login info
+ *   npx agent-factorio logout         # Remove global config
+ *   npx agent-factorio connect        # Poll hub and relay messages
+ *
+ *   npx agent-factorio org list       # List organizations
+ *   npx agent-factorio org create     # Create a new organization
+ *   npx agent-factorio org join       # Join via invite code
+ *   npx agent-factorio org switch     # Change default organization
+ *   npx agent-factorio org info       # Show current org details
+ *
+ *   npx agent-factorio agent list     # List agents in current org
+ *   npx agent-factorio agent info     # Show agent details
+ *   npx agent-factorio agent edit     # Edit agent properties
+ *   npx agent-factorio agent pull     # Sync hub config to local
+ *   npx agent-factorio agent delete   # Delete an agent
  */
 
 import { readFileSync } from "fs";
@@ -21,6 +34,20 @@ import { statusCommand } from "./commands/status.mjs";
 import { whoamiCommand } from "./commands/whoami.mjs";
 import { logoutCommand } from "./commands/logout.mjs";
 import { connectCommand } from "./commands/connect.mjs";
+import {
+  orgListCommand,
+  orgCreateCommand,
+  orgJoinCommand,
+  orgSwitchCommand,
+  orgInfoCommand,
+} from "./commands/org.mjs";
+import {
+  agentListCommand,
+  agentInfoCommand,
+  agentEditCommand,
+  agentPullCommand,
+  agentDeleteCommand,
+} from "./commands/agent.mjs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf-8"));
@@ -32,6 +59,8 @@ program
   .description("AgentFactorio CLI — AI Agent Fleet Management")
   .version(pkg.version);
 
+// --- Existing top-level commands ---
+
 program
   .command("login")
   .description("Connect to an AgentFactorio hub and join an organization")
@@ -62,4 +91,77 @@ program
   .description("Poll hub and relay messages to local OpenClaw Gateway")
   .action(connectCommand);
 
+// --- org subcommands ---
+
+const org = program
+  .command("org")
+  .description("Manage organizations");
+
+org
+  .command("list")
+  .description("List all organizations you belong to")
+  .action(orgListCommand);
+
+org
+  .command("create")
+  .description("Create a new organization")
+  .argument("[name]", "Organization name")
+  .action(orgCreateCommand);
+
+org
+  .command("join")
+  .description("Join an organization via invite code")
+  .argument("[inviteCode]", "Invite code")
+  .action(orgJoinCommand);
+
+org
+  .command("switch")
+  .description("Change the default organization")
+  .action(orgSwitchCommand);
+
+org
+  .command("info")
+  .description("Show details about the current organization")
+  .action(orgInfoCommand);
+
+// --- agent subcommands ---
+
+const agent = program
+  .command("agent")
+  .description("Manage agents");
+
+agent
+  .command("list")
+  .description("List all agents in the current organization")
+  .action(agentListCommand);
+
+agent
+  .command("info")
+  .description("Show agent details")
+  .argument("[id]", "Agent ID (defaults to local project agent)")
+  .action(agentInfoCommand);
+
+agent
+  .command("edit")
+  .description("Edit agent properties")
+  .argument("[id]", "Agent ID (defaults to local project agent)")
+  .option("--name <name>", "Agent name")
+  .option("--vendor <vendor>", "Vendor (e.g. anthropic, openai)")
+  .option("--model <model>", "Model (e.g. claude-sonnet-4-20250514)")
+  .option("--description <desc>", "Description")
+  .option("--status <status>", "Status (active, idle, error)")
+  .action(agentEditCommand);
+
+agent
+  .command("pull")
+  .description("Sync agent config from hub to local project")
+  .argument("[id]", "Agent ID (defaults to local project agent)")
+  .action(agentPullCommand);
+
+agent
+  .command("delete")
+  .description("Delete an agent")
+  .argument("[id]", "Agent ID (defaults to local project agent)")
+  .action(agentDeleteCommand);
+
 program.parse();

package/commands/agent.mjs

@@ -0,0 +1,272 @@
+/**
+ * agent-factorio agent — Agent management subcommands
+ */
+import * as fs from "fs";
+import * as path from "path";
+import { ask, confirm } from "../lib/prompt.mjs";
+import { getDefaultOrg, readLocalConfig, writeLocalConfig, findProjectRoot } from "../lib/config.mjs";
+import { authApiCall } from "../lib/api.mjs";
+import { success, error, info, label, heading, dim } from "../lib/log.mjs";
+
+/**
+ * Resolve agent ID from argument or local config
+ * @param {string} [idArg]
+ * @returns {string}
+ */
+function resolveAgentId(idArg) {
+  if (idArg) return idArg;
+
+  const local = readLocalConfig();
+  if (local?.agentId) return local.agentId;
+
+  error("No agent ID specified and no local .agent-factorio/config.json found.");
+  info("Run this command with an agent ID, or run it from a project with a registered agent.");
+  process.exit(1);
+}
+
+/**
+ * agent list — List all agents in the current organization
+ */
+export async function agentListCommand() {
+  const org = getDefaultOrg();
+  if (!org) {
+    error("Not logged in. Run `agent-factorio login` first.");
+    process.exit(1);
+  }
+
+  try {
+    const res = await authApiCall(`/api/cli/agents?orgId=${org.orgId}`);
+    if (!res.ok) {
+      error(res.data?.error || "Failed to fetch agents");
+      process.exit(1);
+    }
+
+    const { agents } = res.data;
+    if (!agents.length) {
+      info("No agents in this organization.");
+      info("Run `agent-factorio push` from a project to register an agent.");
+      return;
+    }
+
+    heading(`Agents in "${org.orgName}"`);
+    console.log("");
+
+    // Find max name length for alignment
+    const maxName = Math.max(...agents.map((a) => a.name.length), 4);
+
+    // Header
+    const header = `  ${"NAME".padEnd(maxName + 2)}${"VENDOR".padEnd(12)}${"MODEL".padEnd(20)}${"STATUS".padEnd(10)}DEPARTMENT`;
+    dim(header);
+
+    for (const agent of agents) {
+      const status = agent.status === "active" ? "\x1b[32mactive\x1b[0m" : agent.status;
+      console.log(
+        `  ${agent.name.padEnd(maxName + 2)}${(agent.vendor || "-").padEnd(12)}${(agent.model || "-").padEnd(20)}${(agent.status || "-").padEnd(10)}${agent.departmentName || "-"}`
+      );
+    }
+
+    console.log("");
+    dim(`  ${agents.length} agent(s) total`);
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * agent info [id] — Show agent details
+ */
+export async function agentInfoCommand(id) {
+  const agentId = resolveAgentId(id);
+
+  try {
+    const res = await authApiCall(`/api/cli/agents/${agentId}`);
+    if (!res.ok) {
+      error(res.data?.error || "Failed to fetch agent");
+      process.exit(1);
+    }
+
+    const a = res.data;
+
+    heading(`Agent: ${a.name}`);
+    console.log("");
+    label("  ID", a.id);
+    label("  Vendor", a.vendor);
+    label("  Model", a.model);
+    label("  Status", a.status);
+    label("  Description", a.description || "-");
+    label("  Department", a.departmentName);
+    label("  Runtime", a.runtimeType || "api");
+    label("  Last Active", a.lastActive || "-");
+    label("  Created", a.createdAt || "-");
+    label("  Monthly Cost", `$${a.monthlyCost ?? 0}`);
+    label("  Tokens Used", String(a.tokensUsed ?? 0));
+
+    if (a.skills?.length) {
+      console.log("");
+      heading("  Skills");
+      for (const s of a.skills) {
+        console.log(`    - ${s.name} (${s.category})`);
+      }
+    }
+
+    if (a.mcpTools?.length) {
+      console.log("");
+      heading("  MCP Tools");
+      for (const t of a.mcpTools) {
+        const server = t.server ? ` [${t.server}]` : "";
+        console.log(`    - ${t.name}${server}`);
+      }
+    }
+
+    if (a.resources?.length) {
+      console.log("");
+      heading("  Resources");
+      for (const r of a.resources) {
+        console.log(`    - ${r.type}: ${r.name} (${r.url || "-"})`);
+      }
+    }
+
+    if (a.context?.length) {
+      console.log("");
+      heading("  Context");
+      for (const c of a.context) {
+        const source = c.sourceFile ? ` (${c.sourceFile})` : "";
+        const preview = c.content.length > 80 ? c.content.slice(0, 80) + "..." : c.content;
+        console.log(`    - [${c.type}]${source} ${preview}`);
+      }
+    }
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * agent edit [id] — Edit agent properties
+ */
+export async function agentEditCommand(id, options) {
+  const agentId = resolveAgentId(id);
+
+  const updates = {};
+  if (options.name) updates.name = options.name;
+  if (options.vendor) updates.vendor = options.vendor;
+  if (options.model) updates.model = options.model;
+  if (options.description) updates.description = options.description;
+  if (options.status) updates.status = options.status;
+
+  if (Object.keys(updates).length === 0) {
+    error("No fields to update. Use --name, --vendor, --model, --description, or --status.");
+    process.exit(1);
+  }
+
+  try {
+    const res = await authApiCall(`/api/cli/agents/${agentId}`, {
+      method: "PATCH",
+      body: updates,
+    });
+
+    if (!res.ok) {
+      error(res.data?.error || "Failed to update agent");
+      process.exit(1);
+    }
+
+    success(res.data.message || "Agent updated successfully");
+
+    // Update local config if this is the local agent
+    const local = readLocalConfig();
+    if (local?.agentId === agentId) {
+      if (updates.name) local.agentName = updates.name;
+      if (updates.vendor) local.vendor = updates.vendor;
+      if (updates.model) local.model = updates.model;
+      writeLocalConfig(local);
+      dim("  Local config updated.");
+    }
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * agent pull [id] — Pull agent config from hub to local config
+ */
+export async function agentPullCommand(id) {
+  const agentId = resolveAgentId(id);
+
+  try {
+    const res = await authApiCall(`/api/cli/agents/${agentId}`);
+    if (!res.ok) {
+      error(res.data?.error || "Failed to fetch agent");
+      process.exit(1);
+    }
+
+    const a = res.data;
+    const org = getDefaultOrg();
+
+    writeLocalConfig({
+      hubUrl: org.hubUrl,
+      orgId: a.orgId,
+      agentId: a.id,
+      agentName: a.name,
+      vendor: a.vendor,
+      model: a.model,
+      pushedAt: a.lastActive || new Date().toISOString(),
+    });
+
+    success(`Synced agent "${a.name}" to local config.`);
+    label("  Agent", a.name);
+    label("  Vendor", a.vendor);
+    label("  Model", a.model);
+    label("  Status", a.status);
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * agent delete [id] — Delete an agent
+ */
+export async function agentDeleteCommand(id) {
+  const agentId = resolveAgentId(id);
+
+  // Fetch agent name for confirmation
+  try {
+    const infoRes = await authApiCall(`/api/cli/agents/${agentId}`);
+    const agentName = infoRes.ok ? infoRes.data.name : agentId;
+
+    const confirmed = await confirm(`Delete agent "${agentName}"? This cannot be undone`, false);
+    if (!confirmed) {
+      info("Cancelled.");
+      return;
+    }
+
+    const res = await authApiCall(`/api/cli/agents/${agentId}`, {
+      method: "DELETE",
+    });
+
+    if (!res.ok) {
+      error(res.data?.error || "Failed to delete agent");
+      process.exit(1);
+    }
+
+    success(res.data.message || "Agent deleted successfully");
+
+    // Remove local config if this is the local agent
+    const local = readLocalConfig();
+    if (local?.agentId === agentId) {
+      const root = findProjectRoot();
+      const configPath = path.join(root, ".agent-factorio", "config.json");
+      try {
+        fs.unlinkSync(configPath);
+        dim("  Local config removed.");
+      } catch {
+        // ignore
+      }
+    }
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}

package/commands/login.mjs

@@ -46,7 +46,7 @@ export async function loginCommand() {
   const defaultUrl = existing?.organizations?.[0]?.hubUrl || "";
 
   // 1. Hub URL
-  const hubUrl = await ask("AgentFactorio Hub URL", defaultUrl || "http://localhost:3000");
+  const hubUrl = await ask("AgentFactorio Hub URL", defaultUrl || "https://agent-factorio.vercel.app");
   if (!hubUrl) {
     error("Hub URL is required.");
     process.exit(1);
@@ -100,11 +100,11 @@ export async function loginCommand() {
 
   // 6. Create or Join
   const { index: actionIdx } = await choose("Create or join an organization?", [
-    "Join existing (invite code)",
     "Create new",
+    "Join existing (invite code)",
   ]);
 
-  if (actionIdx === 1) {
+  if (actionIdx === 0) {
     // Create new org
     const orgName = await ask("Organization name");
     if (!orgName) {
@@ -121,8 +121,8 @@ export async function loginCommand() {
       process.exit(1);
     }
 
-    const { orgId, orgName: name, inviteCode, memberId } = res.data;
-    upsertOrg({ hubUrl, orgId, orgName: name, inviteCode, memberName, email, memberId, userId });
+    const { orgId, orgName: name, inviteCode, memberId, authToken } = res.data;
+    upsertOrg({ hubUrl, orgId, orgName: name, inviteCode, memberName, email, memberId, userId, authToken });
 
     success(`Created "${name}" (${orgId})`);
     info(`Invite code: ${inviteCode} — share with your team!`);
@@ -143,8 +143,8 @@ export async function loginCommand() {
       process.exit(1);
     }
 
-    const { orgId, orgName, memberId } = res.data;
-    upsertOrg({ hubUrl, orgId, orgName, inviteCode: inviteCode.toUpperCase(), memberName, email, memberId, userId });
+    const { orgId, orgName, memberId, authToken } = res.data;
+    upsertOrg({ hubUrl, orgId, orgName, inviteCode: inviteCode.toUpperCase(), memberName, email, memberId, userId, authToken });
 
     success(`Joined "${orgName}" (${orgId})`);
   }

package/commands/org.mjs

@@ -0,0 +1,219 @@
+/**
+ * agent-factorio org — Organization management subcommands
+ */
+import { ask, choose } from "../lib/prompt.mjs";
+import { readGlobalConfig, writeGlobalConfig, getDefaultOrg, upsertOrg } from "../lib/config.mjs";
+import { apiCall, authApiCall } from "../lib/api.mjs";
+import { success, error, info, label, heading, dim } from "../lib/log.mjs";
+
+/**
+ * org list — List all organizations the user belongs to
+ */
+export async function orgListCommand() {
+  try {
+    const res = await authApiCall("/api/cli/orgs");
+    if (!res.ok) {
+      error(res.data?.error || "Failed to fetch organizations");
+      process.exit(1);
+    }
+
+    const { organizations } = res.data;
+    if (!organizations.length) {
+      info("You are not a member of any organizations.");
+      info("Run `agent-factorio org create` or `agent-factorio org join` to get started.");
+      return;
+    }
+
+    const config = readGlobalConfig();
+    const defaultOrgId = config?.defaultOrg;
+
+    heading("Organizations");
+    console.log("");
+
+    for (const org of organizations) {
+      const isDefault = org.orgId === defaultOrgId;
+      const marker = isDefault ? " (default)" : "";
+      console.log(`  ${org.orgName}${marker}`);
+      label("    ID", org.orgId);
+      label("    Role", org.role);
+      label("    Invite Code", org.inviteCode);
+      label("    Members", String(org.memberCount));
+      label("    Agents", String(org.agentCount));
+      console.log("");
+    }
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}
+
+/**
+ * org create <name> — Create a new organization
+ */
+export async function orgCreateCommand(name) {
+  const org = getDefaultOrg();
+  if (!org) {
+    error("Not logged in. Run `agent-factorio login` first.");
+    process.exit(1);
+  }
+
+  const orgName = name || await ask("Organization name");
+  if (!orgName) {
+    error("Organization name is required.");
+    process.exit(1);
+  }
+
+  const res = await apiCall(org.hubUrl, "/api/cli/login", {
+    body: {
+      action: "create",
+      orgName,
+      memberName: org.memberName || "CLI User",
+      email: org.email,
+      userId: org.userId,
+    },
+  });
+
+  if (!res.ok) {
+    error(`Failed to create organization: ${res.data?.error || "Unknown error"}`);
+    process.exit(1);
+  }
+
+  const { orgId, orgName: createdName, inviteCode, memberId, authToken } = res.data;
+  upsertOrg({
+    hubUrl: org.hubUrl,
+    orgId,
+    orgName: createdName,
+    inviteCode,
+    memberName: org.memberName,
+    email: org.email,
+    memberId,
+    userId: org.userId,
+    authToken,
+  });
+
+  success(`Created "${createdName}" (${orgId})`);
+  info(`Invite code: ${inviteCode} — share with your team!`);
+}
+
+/**
+ * org join <inviteCode> — Join an organization via invite code
+ */
+export async function orgJoinCommand(code) {
+  const org = getDefaultOrg();
+  if (!org) {
+    error("Not logged in. Run `agent-factorio login` first.");
+    process.exit(1);
+  }
+
+  const inviteCode = code || await ask("Invite code");
+  if (!inviteCode) {
+    error("Invite code is required.");
+    process.exit(1);
+  }
+
+  const res = await apiCall(org.hubUrl, "/api/cli/login", {
+    body: {
+      action: "join",
+      inviteCode,
+      memberName: org.memberName || "CLI User",
+      email: org.email,
+      userId: org.userId,
+    },
+  });
+
+  if (!res.ok) {
+    error(`Failed to join: ${res.data?.error || "Invalid invite code"}`);
+    process.exit(1);
+  }
+
+  const { orgId, orgName, memberId, authToken } = res.data;
+  upsertOrg({
+    hubUrl: org.hubUrl,
+    orgId,
+    orgName,
+    inviteCode: inviteCode.toUpperCase(),
+    memberName: org.memberName,
+    email: org.email,
+    memberId,
+    userId: org.userId,
+    authToken,
+  });
+
+  success(`Joined "${orgName}" (${orgId})`);
+}
+
+/**
+ * org switch — Interactively select the default organization
+ */
+export async function orgSwitchCommand() {
+  const config = readGlobalConfig();
+  if (!config?.organizations?.length) {
+    error("No organizations found. Run `agent-factorio login` first.");
+    process.exit(1);
+  }
+
+  if (config.organizations.length === 1) {
+    info(`Only one organization: "${config.organizations[0].orgName}". Already set as default.`);
+    return;
+  }
+
+  const options = config.organizations.map((o) => {
+    const marker = o.orgId === config.defaultOrg ? " (current)" : "";
+    return `${o.orgName}${marker}`;
+  });
+
+  const { index } = await choose("Select default organization", options);
+  const selected = config.organizations[index];
+
+  config.defaultOrg = selected.orgId;
+  writeGlobalConfig(config);
+
+  success(`Default organization set to "${selected.orgName}" (${selected.orgId})`);
+}
+
+/**
+ * org info — Show details about the current default organization
+ */
+export async function orgInfoCommand() {
+  const org = getDefaultOrg();
+  if (!org) {
+    error("Not logged in. Run `agent-factorio login` first.");
+    process.exit(1);
+  }
+
+  try {
+    const res = await authApiCall("/api/cli/orgs");
+    if (!res.ok) {
+      // Fallback to local config info
+      heading("Organization (local config)");
+      console.log("");
+      label("  Name", org.orgName);
+      label("  ID", org.orgId);
+      label("  Invite Code", org.inviteCode);
+      label("  Hub", org.hubUrl);
+      return;
+    }
+
+    const match = res.data.organizations.find((o) => o.orgId === org.orgId);
+    if (!match) {
+      info("Organization not found on hub. Showing local config.");
+      label("  Name", org.orgName);
+      label("  ID", org.orgId);
+      label("  Hub", org.hubUrl);
+      return;
+    }
+
+    heading("Organization");
+    console.log("");
+    label("  Name", match.orgName);
+    label("  ID", match.orgId);
+    label("  Role", match.role);
+    label("  Invite Code", match.inviteCode);
+    label("  Members", String(match.memberCount));
+    label("  Agents", String(match.agentCount));
+    label("  Hub", org.hubUrl);
+  } catch (err) {
+    error(err.message);
+    process.exit(1);
+  }
+}

package/lib/api.mjs

@@ -2,21 +2,25 @@
  * Hub API call helper
  */
 
+import { getDefaultOrg } from "./config.mjs";
+
 /**
  * Make an API request to the AgentFactorio hub
  * @param {string} hubUrl - Base URL of the hub
  * @param {string} path - API path (e.g. "/api/cli/login")
- * @param {{ method?: string, body?: unknown }} [options]
+ * @param {{ method?: string, body?: unknown, authToken?: string }} [options]
  * @returns {Promise<{ ok: boolean, status: number, data: unknown }>}
  */
 export async function apiCall(hubUrl, path, options = {}) {
   const url = `${hubUrl.replace(/\/$/, "")}${path}`;
   const method = options.method || (options.body ? "POST" : "GET");
 
-  const fetchOptions = {
-    method,
-    headers: { "Content-Type": "application/json" },
-  };
+  const headers = { "Content-Type": "application/json" };
+  if (options.authToken) {
+    headers["Authorization"] = `Bearer ${options.authToken}`;
+  }
+
+  const fetchOptions = { method, headers };
 
   if (options.body) {
     fetchOptions.body = JSON.stringify(options.body);
@@ -33,6 +37,23 @@ export async function apiCall(hubUrl, path, options = {}) {
   return { ok: res.ok, status: res.status, data };
 }
 
+/**
+ * Make an authenticated API call using the default org's hubUrl and authToken.
+ * @param {string} path - API path
+ * @param {{ method?: string, body?: unknown }} [options]
+ * @returns {Promise<{ ok: boolean, status: number, data: unknown }>}
+ */
+export async function authApiCall(path, options = {}) {
+  const org = getDefaultOrg();
+  if (!org) {
+    throw new Error("Not logged in. Run `agent-factorio login` first.");
+  }
+  if (!org.authToken) {
+    throw new Error("Auth token missing. Run `agent-factorio login` again to get a token.");
+  }
+  return apiCall(org.hubUrl, path, { ...options, authToken: org.authToken });
+}
+
 /**
  * Check if hub is reachable
  * @param {string} hubUrl

package/lib/config.mjs

@@ -13,7 +13,7 @@ const LOCAL_CONFIG_NAME = "config.json";
 // --- Global config ---
 
 /**
- * @typedef {{ hubUrl: string, orgId: string, orgName: string, inviteCode: string, memberName?: string, email?: string, memberId?: string, userId?: string }} OrgEntry
+ * @typedef {{ hubUrl: string, orgId: string, orgName: string, inviteCode: string, memberName?: string, email?: string, memberId?: string, userId?: string, authToken?: string }} OrgEntry
  * @typedef {{ organizations: OrgEntry[], defaultOrg?: string }} GlobalConfig
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-factorio",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CLI for AgentFactorio — AI Agent Fleet Management hub",
   "type": "module",
   "bin": {