@shadowob/cli 1.1.6 → 1.1.7

package/dist/{chunk-E364BDQO.js → chunk-S6XCO6ZW.js}

@@ -8,6 +8,11 @@ import { homedir } from "os";
 import { dirname, join } from "path";
 var DEFAULT_CONFIG_DIR = join(homedir(), ".shadowob");
 var _DEFAULT_CONFIG_FILE = join(DEFAULT_CONFIG_DIR, "shadowob.config.json");
+function expandEnvPlaceholders(value) {
+  return value.replace(/\$\{(?:env:)?([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, key) => {
+    return process.env[key] ?? "";
+  });
+}
 var ConfigManager = class {
   config = null;
   configFile;
@@ -39,7 +44,12 @@ var ConfigManager = class {
     const config = await this.load();
     const profileName = name ?? config.currentProfile;
     if (!profileName) return null;
-    return config.profiles[profileName] ?? null;
+    const profile = config.profiles[profileName];
+    if (!profile) return null;
+    return {
+      serverUrl: expandEnvPlaceholders(profile.serverUrl),
+      token: expandEnvPlaceholders(profile.token)
+    };
   }
   async getCurrentProfileName() {
     const config = await this.load();
@@ -110,21 +120,23 @@ var ConfigManager = class {
     }
     for (const [name, profile] of Object.entries(config.profiles)) {
       const profileResult = { valid: true };
-      if (!profile.serverUrl) {
+      const serverUrl = expandEnvPlaceholders(profile.serverUrl);
+      const token = expandEnvPlaceholders(profile.token);
+      if (!serverUrl) {
         profileResult.valid = false;
         result.errors.push(`Profile "${name}" missing serverUrl`);
       } else {
         try {
-          new URL(profile.serverUrl);
+          new URL(serverUrl);
         } catch {
           profileResult.valid = false;
-          result.errors.push(`Profile "${name}" has invalid serverUrl: ${profile.serverUrl}`);
+          result.errors.push(`Profile "${name}" has invalid serverUrl: ${serverUrl}`);
         }
       }
-      if (!profile.token) {
+      if (!token) {
         profileResult.valid = false;
         result.errors.push(`Profile "${name}" missing token`);
-      } else if (!profile.token.includes(".")) {
+      } else if (!token.includes(".")) {
         result.warnings.push(`Profile "${name}" token does not look like a JWT`);
       }
       result.profileResults[name] = profileResult;
@@ -164,6 +176,12 @@ var ConfigManager = class {
 var configManager = new ConfigManager();
 
 // src/utils/client.ts
+var DEFAULT_SERVER_URL = "https://shadowob.com";
+function resolveServerFlag(value) {
+  const server = value ?? process.env.SHADOWOB_SERVER_ID;
+  if (!server) throw new Error("Missing server. Pass --server or set SHADOWOB_SERVER_ID.");
+  return server;
+}
 async function getConfig(profile) {
   const config = await configManager.getProfile(profile);
   if (!config) {
@@ -251,6 +269,8 @@ async function handleCommand(fn, options, outputFn, errorFn) {
 
 export {
   configManager,
+  DEFAULT_SERVER_URL,
+  resolveServerFlag,
   getClient,
   getClientWithToken,
   getSocket,

package/dist/{client-ZIUDIQPZ.js → client-VR35GYUZ.js}

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_SERVER_URL,
   formatError,
   getClient,
   getClientWithToken,
@@ -10,9 +11,11 @@ import {
   parseNonNegativeInt,
   parsePositiveInt,
   parsePrice,
-  requireOption
-} from "./chunk-E364BDQO.js";
+  requireOption,
+  resolveServerFlag
+} from "./chunk-S6XCO6ZW.js";
 export {
+  DEFAULT_SERVER_URL,
   formatError,
   getClient,
   getClientWithToken,
@@ -24,5 +27,6 @@ export {
   parseNonNegativeInt,
   parsePositiveInt,
   parsePrice,
-  requireOption
+  requireOption,
+  resolveServerFlag
 };

package/dist/index.js

@@ -4,13 +4,14 @@ import {
   getClient,
   getClientWithToken,
   getSocket,
-  parsePositiveInt
-} from "./chunk-E364BDQO.js";
+  parsePositiveInt,
+  resolveServerFlag
+} from "./chunk-S6XCO6ZW.js";
 
 // src/index.ts
 import { Command as Command28 } from "commander";
 
-// src/commands/agents.ts
+// src/commands/api-tokens.ts
 import { Command } from "commander";
 
 // src/utils/output.ts
@@ -88,139 +89,32 @@ function formatObject(obj) {
       formattedValue = chalk.gray("null");
     } else if (typeof value === "boolean") {
       formattedValue = value ? chalk.green("true") : chalk.red("false");
-    } else if (typeof value === "object") {
+    } else if (Array.isArray(value)) {
+      if (value.length > 0 && typeof value[0] === "object" && value[0] !== null) {
+        console.log(chalk.gray(formattedKey));
+        formatArray(value);
+        continue;
+      }
       formattedValue = JSON.stringify(value);
+    } else if (typeof value === "object") {
+      formattedValue = formatNestedValue(value);
     } else {
       formattedValue = String(value);
     }
     console.log(`${chalk.gray(formattedKey)}  ${formattedValue}`);
   }
 }
-
-// src/commands/agents.ts
-function createAgentsCommand() {
-  const agents = new Command("agents").description("Agent management commands");
-  agents.command("list").description("List your agents").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
-    try {
-      const client = await getClient(options.profile);
-      const agents2 = await client.listAgents();
-      output(agents2, { json: options.json });
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("get").description("Get agent details").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      const agent = await client.getAgent(agentId);
-      output(agent, { json: options.json });
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("create").description("Create a new agent").requiredOption("--name <name>", "Agent name").requiredOption("--username <username>", "Agent username").option("--display-name <name>", "Display name").option("--avatar-url <url>", "Avatar URL").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
-    async (options) => {
-      try {
-        const client = await getClient(options.profile);
-        const agent = await client.createAgent({
-          name: options.name,
-          username: options.username,
-          displayName: options.displayName,
-          avatarUrl: options.avatarUrl
-        });
-        output(agent, { json: options.json });
-      } catch (error) {
-        outputError(error instanceof Error ? error.message : String(error), {
-          json: options.json
-        });
-        process.exit(1);
-      }
-    }
-  );
-  agents.command("update").description("Update an agent").argument("<agent-id>", "Agent ID").option("--name <name>", "New name").option("--display-name <name>", "New display name").option("--avatar-url <url>", "New avatar URL").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
-    async (agentId, options) => {
-      try {
-        const client = await getClient(options.profile);
-        const agent = await client.updateAgent(agentId, {
-          name: options.name,
-          displayName: options.displayName,
-          avatarUrl: options.avatarUrl
-        });
-        output(agent, { json: options.json });
-      } catch (error) {
-        outputError(error instanceof Error ? error.message : String(error), {
-          json: options.json
-        });
-        process.exit(1);
-      }
-    }
-  );
-  agents.command("delete").description("Delete an agent").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      await client.deleteAgent(agentId);
-      const outputOpts = { json: options.json };
-      outputSuccess("Agent deleted", outputOpts);
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("start").description("Start an agent").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      await client.startAgent(agentId);
-      const outputOpts = { json: options.json };
-      outputSuccess("Agent started", outputOpts);
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("stop").description("Stop an agent").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      await client.stopAgent(agentId);
-      const outputOpts = { json: options.json };
-      outputSuccess("Agent stopped", outputOpts);
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("token").description("Generate a new token for an agent").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      const result = await client.generateAgentToken(agentId);
-      if (options.json) {
-        output(result, { json: true });
-      } else {
-        console.log(result.token);
-      }
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  agents.command("config").description("Get agent remote config").argument("<agent-id>", "Agent ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (agentId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      const config = await client.getAgentConfig(agentId);
-      output(config, { json: options.json });
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
-      process.exit(1);
-    }
-  });
-  return agents;
+function formatNestedValue(obj) {
+  const username = obj.username || obj.name || obj.displayName;
+  if (username) {
+    return username;
+  }
+  return JSON.stringify(obj);
 }
 
 // src/commands/api-tokens.ts
-import { Command as Command2 } from "commander";
 function createApiTokensCommand() {
-  const tokens = new Command2("api-tokens").description("API token management commands");
+  const tokens = new Command("api-tokens").description("API token management commands");
   tokens.command("list").description("List all API tokens").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
     try {
       const client = await getClient(options.profile);
@@ -270,12 +164,7 @@ function createApiTokensCommand() {
 // src/commands/app.ts
 import { readFile, writeFile } from "fs/promises";
 import { basename } from "path";
-import { Command as Command3 } from "commander";
-function resolveServer(value) {
-  const server = value ?? process.env.SHADOWOB_SERVER_ID;
-  if (!server) throw new Error("Missing server. Pass --server or set SHADOWOB_SERVER_ID.");
-  return server;
-}
+import { Command as Command2 } from "commander";
 function parseJsonInput(value) {
   if (!value) return {};
   const parsed = JSON.parse(value);
@@ -287,16 +176,26 @@ function parseJsonInput(value) {
 async function readJsonFile(path) {
   return JSON.parse(await readFile(path, "utf8"));
 }
+function parsePermissions(value) {
+  return value.split(",").map((item) => item.trim()).filter(Boolean);
+}
 function commandHandlerError(error, json) {
   outputError(error instanceof Error ? error.message : String(error), { json });
   process.exit(1);
 }
 function createAppCommand() {
-  const app = new Command3("app").description("Server App integration commands");
+  const app = new Command2("app").description("Server App integration commands");
   app.command("list").description("List apps installed in a server").requiredOption("--server <server>", "Server ID or slug").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
     try {
       const client = await getClient(options.profile);
-      output(await client.listServerApps(resolveServer(options.server)), { json: options.json });
+      const apps = await client.listServerApps(resolveServerFlag(options.server));
+      output(
+        apps.map((entry) => ({
+          id: entry.id,
+          name: `${entry.appKey} (${entry.name})`
+        })),
+        { json: options.json }
+      );
     } catch (error) {
       commandHandlerError(error, options.json);
     }
@@ -310,7 +209,7 @@ function createAppCommand() {
         const client = await getClient(options.profile);
         const manifest = options.manifestFile ? await readJsonFile(options.manifestFile) : void 0;
         output(
-          await client.discoverServerApp(resolveServer(options.server), {
+          await client.discoverServerApp(resolveServerFlag(options.server), {
             manifestUrl: options.manifestUrl,
             manifest
           }),
@@ -329,7 +228,7 @@ function createAppCommand() {
         }
         const client = await getClient(options.profile);
         const manifest = options.manifestFile ? await readJsonFile(options.manifestFile) : void 0;
-        const result = await client.installServerApp(resolveServer(options.server), {
+        const result = await client.installServerApp(resolveServerFlag(options.server), {
           manifestUrl: options.manifestUrl,
           manifest
         });
@@ -343,7 +242,7 @@ function createAppCommand() {
     async (appKey, options) => {
       try {
         const client = await getClient(options.profile);
-        output(await client.getServerApp(resolveServer(options.server), appKey), {
+        output(await client.getServerApp(resolveServerFlag(options.server), appKey), {
           json: options.json
         });
       } catch (error) {
@@ -351,16 +250,57 @@ function createAppCommand() {
       }
     }
   );
-  app.command("grant").description("Grant a Buddy access to an installed server App").argument("<app-key>", "App key").requiredOption("--server <server>", "Server ID or slug").requiredOption("--buddy <agent-id>", "Buddy agent ID").requiredOption("--permissions <permissions>", "Comma-separated permissions, or *").option("--approval-mode <mode>", "none, first_time, every_time, or policy", "none").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+  app.command("grant").description("Grant a Buddy access to an installed server App").argument("<app-key>", "App key").requiredOption("--server <server>", "Server ID or slug").requiredOption("--buddy <buddy-id>", "Buddy ID").requiredOption("--permissions <permissions>", "Comma-separated permissions, or *").option("--approval-mode <mode>", "none, first_time, every_time, or policy", "none").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
     async (appKey, options) => {
       try {
         const client = await getClient(options.profile);
-        const permissions = options.permissions.split(",").map((item) => item.trim()).filter(Boolean);
-        const result = await client.grantServerAppToBuddy(resolveServer(options.server), appKey, {
-          buddyAgentId: options.buddy,
-          permissions,
-          approvalMode: options.approvalMode
-        });
+        const permissions = parsePermissions(options.permissions);
+        const result = await client.grantServerAppToBuddy(
+          resolveServerFlag(options.server),
+          appKey,
+          {
+            buddyAgentId: options.buddy,
+            permissions,
+            approvalMode: options.approvalMode
+          }
+        );
+        output(result, { json: options.json });
+      } catch (error) {
+        commandHandlerError(error, options.json);
+      }
+    }
+  );
+  app.command("defaults").description("Set default app permissions that members and Buddies can use without prompting").argument("<app-key>", "App key").requiredOption("--server <server>", "Server ID or slug").requiredOption("--permissions <permissions>", "Comma-separated permissions, or *").option("--approval-mode <mode>", "none, first_time, every_time, or policy", "none").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+    async (appKey, options) => {
+      try {
+        const client = await getClient(options.profile);
+        const result = await client.updateServerAppAccessPolicy(
+          resolveServerFlag(options.server),
+          appKey,
+          {
+            defaultPermissions: parsePermissions(options.permissions),
+            defaultApprovalMode: options.approvalMode
+          }
+        );
+        output(result, { json: options.json });
+      } catch (error) {
+        commandHandlerError(error, options.json);
+      }
+    }
+  );
+  app.command("approve").description("Approve one app command for yourself or a Buddy after a first-use prompt").argument("<app-key>", "App key").argument("<command>", "Command name").requiredOption("--server <server>", "Server ID or slug").option("--buddy <buddy-id>", "Buddy ID to approve for").option("--no-remember", "Approve only the immediate retry window").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+    async (appKey, commandName, options) => {
+      try {
+        const client = await getClient(options.profile);
+        const result = await client.approveServerAppCommand(
+          resolveServerFlag(options.server),
+          appKey,
+          {
+            commandName,
+            buddyAgentId: options.buddy,
+            remember: options.remember
+          }
+        );
         output(result, { json: options.json });
       } catch (error) {
         commandHandlerError(error, options.json);
@@ -370,7 +310,7 @@ function createAppCommand() {
   app.command("discover").description("Emit Skill-style command discovery for server Apps").requiredOption("--server <server>", "Server ID or slug").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
     try {
       const client = await getClient(options.profile);
-      const server = resolveServer(options.server);
+      const server = resolveServerFlag(options.server);
       const apps = await client.listServerApps(server);
       const docs = await Promise.all(
         apps.map((entry) => client.getServerAppSkills(server, entry.appKey))
@@ -388,7 +328,7 @@ function createAppCommand() {
     async (appKey, options) => {
       try {
         const client = await getClient(options.profile);
-        const result = await client.getServerAppSkills(resolveServer(options.server), appKey);
+        const result = await client.getServerAppSkills(resolveServerFlag(options.server), appKey);
         if (options.json) output(result, { json: true });
         else console.log(result.markdown);
       } catch (error) {
@@ -396,18 +336,22 @@ function createAppCommand() {
       }
     }
   );
-  app.command("call").description("Call a server App command").argument("<app-key>", "App key").argument("<command>", "Command name").requiredOption("--server <server>", "Server ID or slug").option("--json-input <json>", "JSON command input").option("--input-file <path>", "Read JSON command input from file").option("--file <path>", "Attach a binary file").option("--field <field>", "Multipart file field name", "file").option("--output <path>", "Write binary dataBase64 response to this path").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+  app.command("call").description("Call a server App command").argument("<app-key>", "App key").argument("<command>", "Command name").requiredOption("--server <server>", "Server ID or slug").option("--json-input <json>", "JSON command input").option("--input-file <path>", "Read JSON command input from file").option("--channel-id <id>", "Current Shadow channel ID for approval prompts and app context").option("--file <path>", "Attach a binary file").option("--field <field>", "Multipart file field name", "file").option("--output <path>", "Write binary dataBase64 response to this path").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
     async (appKey, commandName, options) => {
       try {
         const client = await getClient(options.profile);
         const input = options.inputFile ? await readJsonFile(options.inputFile) : parseJsonInput(options.jsonInput);
-        const server = resolveServer(options.server);
+        const server = resolveServerFlag(options.server);
         const result = options.file ? await client.callServerAppCommandMultipart(server, appKey, commandName, {
           input,
+          channelId: options.channelId,
           file: new Blob([await readFile(options.file)]),
           filename: basename(options.file),
           field: options.field
-        }) : await client.callServerAppCommand(server, appKey, commandName, { input });
+        }) : await client.callServerAppCommand(server, appKey, commandName, {
+          input,
+          channelId: options.channelId
+        });
         if (options.output && result && typeof result === "object" && "dataBase64" in result && typeof result.dataBase64 === "string") {
           await writeFile(
             options.output,
@@ -422,15 +366,28 @@ function createAppCommand() {
       }
     }
   );
+  app.command("uninstall").description("Uninstall a server App").argument("<app-key>", "App key").requiredOption("--server <server>", "Server ID or slug").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+    async (appKey, options) => {
+      try {
+        const client = await getClient(options.profile);
+        await client.deleteServerApp(resolveServerFlag(options.server), appKey);
+        const outputOpts = { json: options.json };
+        if (options.json) output({ ok: true }, outputOpts);
+        else outputSuccess(`Uninstalled ${appKey}`, outputOpts);
+      } catch (error) {
+        commandHandlerError(error, options.json);
+      }
+    }
+  );
   return app;
 }
 
 // src/commands/auth.ts
 import { ShadowClient } from "@shadowob/sdk";
-import { Command as Command4 } from "commander";
+import { Command as Command3 } from "commander";
 function createAuthCommand() {
-  const auth = new Command4("auth").description("Authentication commands");
-  auth.command("login").description("Authenticate with a Shadow server").requiredOption("--server-url <url>", "Shadow server URL").requiredOption("--token <token>", "JWT token").option("--profile <name>", "Profile name", "default").option("--json", "Output as JSON").action(
+  const auth = new Command3("auth").description("Authentication commands");
+  auth.command("login").description("Authenticate with a Shadow server").option("--server-url <url>", "Shadow server URL", "https://shadowob.com").requiredOption("--token <token>", "JWT token").option("--profile <name>", "Profile name", "default").option("--json", "Output as JSON").action(
     async (options) => {
       try {
         const client = new ShadowClient(options.serverUrl, options.token);
@@ -541,14 +498,135 @@ function createAuthCommand() {
   return auth;
 }
 
+// src/commands/buddies.ts
+import { Command as Command4 } from "commander";
+function createBuddiesCommand() {
+  const buddies = new Command4("buddies").description("Buddy management commands");
+  buddies.command("list").description("List your buddies").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
+    try {
+      const client = await getClient(options.profile);
+      const agents = await client.listAgents();
+      output(agents, { json: options.json });
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("get").description("Get buddy details").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      const agent = await client.getAgent(buddyId);
+      output(agent, { json: options.json });
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("create").description("Create a new buddy").requiredOption("--name <name>", "Buddy name").requiredOption("--username <username>", "Buddy username").option("--display-name <name>", "Display name").option("--avatar-url <url>", "Avatar URL").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+    async (options) => {
+      try {
+        const client = await getClient(options.profile);
+        const agent = await client.createAgent({
+          name: options.name,
+          username: options.username,
+          displayName: options.displayName,
+          avatarUrl: options.avatarUrl
+        });
+        output(agent, { json: options.json });
+      } catch (error) {
+        outputError(error instanceof Error ? error.message : String(error), {
+          json: options.json
+        });
+        process.exit(1);
+      }
+    }
+  );
+  buddies.command("update").description("Update a buddy").argument("<buddy-id>", "Buddy ID").option("--name <name>", "New name").option("--display-name <name>", "New display name").option("--avatar-url <url>", "New avatar URL").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+    async (buddyId, options) => {
+      try {
+        const client = await getClient(options.profile);
+        const agent = await client.updateAgent(buddyId, {
+          name: options.name,
+          displayName: options.displayName,
+          avatarUrl: options.avatarUrl
+        });
+        output(agent, { json: options.json });
+      } catch (error) {
+        outputError(error instanceof Error ? error.message : String(error), {
+          json: options.json
+        });
+        process.exit(1);
+      }
+    }
+  );
+  buddies.command("delete").description("Delete a buddy").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      await client.deleteAgent(buddyId);
+      const outputOpts = { json: options.json };
+      outputSuccess("Buddy deleted", outputOpts);
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("start").description("Start a buddy").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      await client.startAgent(buddyId);
+      const outputOpts = { json: options.json };
+      outputSuccess("Buddy started", outputOpts);
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("stop").description("Stop a buddy").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      await client.stopAgent(buddyId);
+      const outputOpts = { json: options.json };
+      outputSuccess("Buddy stopped", outputOpts);
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("token").description("Generate a new token for a buddy").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      const result = await client.generateAgentToken(buddyId);
+      if (options.json) {
+        output(result, { json: true });
+      } else {
+        console.log(result.token);
+      }
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  buddies.command("config").description("Get buddy remote config").argument("<buddy-id>", "Buddy ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (buddyId, options) => {
+    try {
+      const client = await getClient(options.profile);
+      const config = await client.getAgentConfig(buddyId);
+      output(config, { json: options.json });
+    } catch (error) {
+      outputError(error instanceof Error ? error.message : String(error), { json: options.json });
+      process.exit(1);
+    }
+  });
+  return buddies;
+}
+
 // src/commands/channels.ts
 import { Command as Command5 } from "commander";
 function createChannelsCommand() {
   const channels = new Command5("channels").description("Channel commands");
-  channels.command("list").description("List channels in a server").requiredOption("--server-id <id>", "Server ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
+  channels.command("list").description("List channels in a server").requiredOption("--server <server>", "Server ID or slug").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (options) => {
     try {
       const client = await getClient(options.profile);
-      const channels2 = await client.getServerChannels(options.serverId);
+      const channels2 = await client.getServerChannels(resolveServerFlag(options.server));
       output(channels2, { json: options.json });
     } catch (error) {
       outputError(error instanceof Error ? error.message : String(error), { json: options.json });
@@ -565,11 +643,11 @@ function createChannelsCommand() {
       process.exit(1);
     }
   });
-  channels.command("create").description("Create a channel").requiredOption("--server-id <id>", "Server ID").requiredOption("--name <name>", "Channel name").option("--type <type>", "Channel type", "text").option("--description <desc>", "Channel description").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+  channels.command("create").description("Create a channel").requiredOption("--server <server>", "Server ID or slug").requiredOption("--name <name>", "Channel name").option("--type <type>", "Channel type", "text").option("--description <desc>", "Channel description").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
     async (options) => {
       try {
         const client = await getClient(options.profile);
-        const channel = await client.createChannel(options.serverId, {
+        const channel = await client.createChannel(resolveServerFlag(options.server), {
           name: options.name,
           type: options.type,
           description: options.description
@@ -840,10 +918,10 @@ function createCommerceCommand() {
     })
   );
   const entitlements = commerce.command("entitlements").description("Purchase entitlement commands");
-  entitlements.command("list").description("List my purchase entitlements").option("--server-id <id>", "Limit to a server shop entitlement list").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+  entitlements.command("list").description("List my purchase entitlements").option("--server <server>", "Limit to a server shop entitlement list").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
     (options) => runCommand(options, async () => {
       const client = await getClient(options.profile);
-      return options.serverId ? client.getEntitlements(options.serverId) : client.getAllEntitlements();
+      return options.server ? client.getEntitlements(resolveServerFlag(options.server)) : client.getAllEntitlements();
     })
   );
   entitlements.command("get").description("Get purchase delivery detail").argument("<entitlement-id>", "Entitlement ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
@@ -1304,7 +1382,7 @@ function createListenCommand() {
       try {
         const eventTypes = options.eventType?.split(",").map((t) => t.trim());
         if (options.mode === "poll") {
-          const { getClient: getClient2 } = await import("./client-ZIUDIQPZ.js");
+          const { getClient: getClient2 } = await import("./client-VR35GYUZ.js");
           const client = await getClient2(options.profile);
           const limit = parseInt(options.last ?? "50", 10);
           const result = await client.getMessages(channelId, limit);
@@ -1970,14 +2048,14 @@ function createProfileCommentsCommand() {
 import { Command as Command20 } from "commander";
 function createSearchCommand() {
   const search = new Command20("search").description("Search commands");
-  search.command("messages").description("Search messages").requiredOption("--query <text>", "Search query").option("--server-id <id>", "Limit to server").option("--channel-id <id>", "Limit to channel").option("--limit <n>", "Number of results (1-100)", "20").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
+  search.command("messages").description("Search messages").requiredOption("--query <text>", "Search query").option("--server <server>", "Limit to server").option("--channel-id <id>", "Limit to channel").option("--limit <n>", "Number of results (1-100)", "20").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(
     async (options) => {
       try {
         const client = await getClient(options.profile);
         const limit = Math.min(Math.max(parseInt(options.limit ?? "20", 10), 1), 100);
         const results = await client.searchMessages({
           q: options.query,
-          serverId: options.serverId,
+          serverId: options.server ? resolveServerFlag(options.server) : void 0,
           channelId: options.channelId,
           limit
         });
@@ -2001,7 +2079,10 @@ function createServersCommand() {
     try {
       const client = await getClient(options.profile);
       const servers2 = await client.listServers();
-      output(servers2, { json: options.json });
+      output(
+        servers2.map((s) => s.server),
+        { json: options.json }
+      );
     } catch (error) {
       outputError(error instanceof Error ? error.message : String(error), { json: options.json });
       process.exit(1);
@@ -2070,7 +2151,17 @@ function createServersCommand() {
     try {
       const client = await getClient(options.profile);
       const members = await client.getMembers(serverId);
-      output(members, { json: options.json });
+      output(
+        members.map(
+          (m) => ({
+            id: m.id,
+            userId: m.userId,
+            username: m.user?.username ?? m.nickname ?? m.uid ?? "",
+            role: m.role
+          })
+        ),
+        { json: options.json }
+      );
     } catch (error) {
       outputError(error instanceof Error ? error.message : String(error), { json: options.json });
       process.exit(1);
@@ -2208,17 +2299,6 @@ function createShopCommand() {
       }
     }
   );
-  products.command("context").description("Get buyer-facing product context").argument("<product-id>", "Product ID").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (productId, options) => {
-    try {
-      const client = await getClient(options.profile);
-      output(await client.getCommerceProductContext(productId), { json: options.json });
-    } catch (error) {
-      outputError(error instanceof Error ? error.message : String(error), {
-        json: options.json
-      });
-      process.exit(1);
-    }
-  });
   products.command("create-by-shop").description("Create a product by shop ID using a JSON payload").argument("<shop-id>", "Shop ID").requiredOption("--data <json>", "Product JSON payload").option("--profile <name>", "Profile to use").option("--json", "Output as JSON").action(async (shopId, options) => {
     try {
       const client = await getClient(options.profile);
@@ -4168,7 +4248,7 @@ program.addCommand(createAppCommand());
 program.addCommand(createServersCommand());
 program.addCommand(createChannelsCommand());
 program.addCommand(createThreadsCommand());
-program.addCommand(createAgentsCommand());
+program.addCommand(createBuddiesCommand());
 program.addCommand(createListenCommand());
 program.addCommand(createDirectMessagesCommand());
 program.addCommand(createWorkspaceCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadowob/cli",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Shadow CLI — command-line interface for Shadow servers",
   "license": "MIT",
   "type": "module",
@@ -13,7 +13,7 @@
   "dependencies": {
     "commander": "^13.1.0",
     "chalk": "^5.4.1",
-    "@shadowob/sdk": "1.1.6"
+    "@shadowob/sdk": "1.1.7"
   },
   "devDependencies": {
     "@types/node": "^22.15.21",