thinkwork-cli 0.8.1 → 0.8.2

package/dist/cli.js

@@ -2741,6 +2741,83 @@ async function resolveTenantRest(opts) {
   });
 }
 
+// src/lib/resolve-identifier.ts
+import { select as select5 } from "@inquirer/prompts";
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isUuid(s) {
+  return UUID_RE.test(s);
+}
+async function resolveIdentifier(opts) {
+  const { identifier, list, getId, getAliases, resourceLabel } = opts;
+  if (!identifier) {
+    if (!isInteractive()) {
+      requireTty(`${capitalize(resourceLabel)} identifier`);
+      throw new Error("unreachable: requireTty must exit in non-TTY");
+    }
+    const items2 = await list();
+    if (items2.length === 0) {
+      printError(`No ${resourceLabel}s found. Nothing to pick.`);
+      process.exit(1);
+    }
+    if (items2.length === 1) {
+      console.log(`  Using the only ${resourceLabel}: ${defaultLabel(items2[0], opts)}`);
+      return items2[0];
+    }
+    const chosenId = await select5({
+      message: `Which ${resourceLabel}?`,
+      choices: items2.map((it) => ({
+        name: (opts.pickerLabel ?? defaultLabelFor(opts))(it),
+        value: getId(it)
+      })),
+      loop: false
+    });
+    return items2.find((it) => getId(it) === chosenId);
+  }
+  const items = await list();
+  if (isUuid(identifier)) {
+    const hit = items.find((it) => getId(it) === identifier);
+    if (hit) return hit;
+    printError(
+      `${capitalize(resourceLabel)} with ID "${identifier}" not found. Available: ${formatAvailable(items, opts)}`
+    );
+    process.exit(1);
+  }
+  const needle = identifier.toLowerCase();
+  const matches = items.filter(
+    (it) => getAliases(it).some((a) => a != null && String(a).toLowerCase() === needle)
+  );
+  if (matches.length === 0) {
+    printError(
+      `${capitalize(resourceLabel)} "${identifier}" not found. Available: ${formatAvailable(items, opts)}`
+    );
+    process.exit(1);
+  }
+  if (matches.length > 1) {
+    printError(
+      `"${identifier}" matches ${matches.length} ${resourceLabel}s. Pass the UUID instead \u2014 candidates: ${matches.map(getId).join(", ")}`
+    );
+    process.exit(1);
+  }
+  return matches[0];
+}
+function capitalize(s) {
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
+function defaultLabelFor(opts) {
+  return (item) => defaultLabel(item, opts);
+}
+function defaultLabel(item, opts) {
+  const aliases = opts.getAliases(item).filter(Boolean);
+  const primary = aliases[0] ?? "(no name)";
+  return `${primary}  (${opts.getId(item)})`;
+}
+function formatAvailable(items, opts) {
+  if (items.length === 0) return "(none)";
+  const names = items.map((it) => opts.getAliases(it)[0]).filter((n) => Boolean(n)).slice(0, 10);
+  const suffix = items.length > names.length ? `, \u2026(${items.length - names.length} more)` : "";
+  return names.join(", ") + suffix;
+}
+
 // src/commands/mcp.ts
 async function resolveMcpContext(opts) {
   const stage = await resolveStage({ flag: opts.stage });
@@ -2754,6 +2831,30 @@ async function resolveMcpContext(opts) {
   });
   return { stage, api, tenant };
 }
+async function resolveServer(identifier, api, tenantSlug) {
+  return resolveIdentifier({
+    identifier,
+    list: async () => {
+      const res = await apiFetch(
+        api.apiUrl,
+        api.authSecret,
+        "/api/skills/mcp-servers",
+        {},
+        { "x-tenant-slug": tenantSlug }
+      );
+      return res.servers ?? [];
+    },
+    getId: (s) => s.id,
+    getAliases: (s) => [s.slug, s.name],
+    resourceLabel: "MCP server",
+    pickerLabel: (s) => `${s.name}  ${chalk10.dim(`(${s.slug}, ${s.id})`)}`
+  });
+}
+function formatAuth(s) {
+  if (s.authType === "per_user_oauth") return `OAuth (${s.oauthProvider})`;
+  if (s.authType === "tenant_api_key") return "API Key";
+  return "none";
+}
 function registerMcpCommand(program2) {
   const mcp = program2.command("mcp").description("Manage MCP servers for your tenant");
   mcp.command("list").alias("ls").description("List registered MCP servers. Prompts for stage/tenant in a TTY when omitted.").option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").addHelpText(
@@ -2765,7 +2866,7 @@ Examples:
 
   # Scriptable
   $ thinkwork mcp list -s dev -t acme
-  $ thinkwork mcp list -s prod -t acme --json | jq '.[].slug'
+  $ thinkwork mcp list -s prod -t acme --json | jq '.[].id'
 `
   ).action(async (opts) => {
     try {
@@ -2785,11 +2886,11 @@ Examples:
       console.log("");
       for (const s of servers) {
         const status = s.enabled ? chalk10.green("enabled") : chalk10.dim("disabled");
-        const authLabel = s.authType === "per_user_oauth" ? `OAuth (${s.oauthProvider})` : s.authType === "tenant_api_key" ? "API Key" : "none";
         console.log(`  ${chalk10.bold(s.name)}  ${chalk10.dim(s.slug)}  ${status}`);
+        console.log(`    ID:        ${s.id}`);
         console.log(`    URL:       ${s.url}`);
         console.log(`    Transport: ${s.transport}`);
-        console.log(`    Auth:      ${authLabel}`);
+        console.log(`    Auth:      ${formatAuth(s)}`);
         if (s.tools?.length) console.log(`    Tools:     ${s.tools.length} cached`);
         console.log("");
       }
@@ -2860,36 +2961,111 @@ Examples:
       }
     }
   );
-  mcp.command("remove <id>").alias("rm").description("Remove an MCP server. Prompts for stage/tenant in a TTY when omitted.").option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").action(async (id, opts) => {
+  mcp.command("update [id]").description(
+    "Update an MCP server's URL / transport / auth / enabled state. Accepts UUID, slug, or name; prompts in a TTY when the positional is omitted. Preserves agent assignments (unlike remove + re-add)."
+  ).option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").option("--url <url>", "New URL").option("--transport <type>", "streamable-http | sse").option("--auth-type <type>", "none | tenant_api_key | per_user_oauth").option("--api-key <token>", "API key (for tenant_api_key auth)").option("--oauth-provider <name>", "OAuth provider name (for per_user_oauth auth)").option("--name <n>", "Rename").option("--enable", "Enable the server").option("--disable", "Disable the server (doesn't delete)").addHelpText(
+    "after",
+    `
+Examples:
+  # Change URL in place (preserves agent assignments, unlike remove + re-add)
+  $ thinkwork mcp update lastmile-routing --url https://dev-mcp.lastmile-tei.com/routing
+
+  # Disable without deleting
+  $ thinkwork mcp update lastmile-routing --disable
+
+  # Rename + change transport
+  $ thinkwork mcp update 629dcee1-1e14-4b83-9907-cb529e6035f6 --name "LastMile Routing" --transport sse
+
+  # Interactive \u2014 pick the server from a list
+  $ thinkwork mcp update
+`
+  ).action(
+    async (idArg, opts) => {
+      try {
+        const { stage, api, tenant } = await resolveMcpContext(opts);
+        const server = await resolveServer(idArg, api, tenant.slug);
+        const body = {};
+        if (opts.url !== void 0) body.url = opts.url;
+        if (opts.transport !== void 0) body.transport = opts.transport;
+        if (opts.authType !== void 0) body.authType = opts.authType;
+        if (opts.apiKey !== void 0) body.apiKey = opts.apiKey;
+        if (opts.oauthProvider !== void 0) body.oauthProvider = opts.oauthProvider;
+        if (opts.name !== void 0) body.name = opts.name;
+        if (opts.enable) body.enabled = true;
+        if (opts.disable) body.enabled = false;
+        if (Object.keys(body).length === 0) {
+          printError(
+            "Nothing to update. Pass at least one of: --url, --transport, --auth-type, --api-key, --oauth-provider, --name, --enable, --disable."
+          );
+          process.exit(1);
+        }
+        printHeader("mcp update", stage);
+        await apiFetch(
+          api.apiUrl,
+          api.authSecret,
+          `/api/skills/mcp-servers/${server.id}`,
+          { method: "PUT", body: JSON.stringify(body) },
+          { "x-tenant-slug": tenant.slug }
+        );
+        printSuccess(
+          `Updated ${server.name} (${server.slug}) \u2014 changed ${Object.keys(body).join(", ")}.`
+        );
+      } catch (err) {
+        if (isCancellation(err)) return;
+        printError(err instanceof Error ? err.message : String(err));
+        process.exit(1);
+      }
+    }
+  );
+  mcp.command("remove [id]").alias("rm").description(
+    "Remove an MCP server. Accepts UUID, slug, or name; prompts from a list when omitted in a TTY."
+  ).option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").addHelpText(
+    "after",
+    `
+Examples:
+  # Interactive picker
+  $ thinkwork mcp remove
+
+  # By slug (case-insensitive)
+  $ thinkwork mcp remove lastmile-routing
+
+  # By UUID (from \`mcp list\` or --json)
+  $ thinkwork mcp remove 629dcee1-1e14-4b83-9907-cb529e6035f6
+`
+  ).action(async (idArg, opts) => {
     try {
       const { api, tenant } = await resolveMcpContext(opts);
+      const server = await resolveServer(idArg, api, tenant.slug);
       await apiFetch(
         api.apiUrl,
         api.authSecret,
-        `/api/skills/mcp-servers/${id}`,
+        `/api/skills/mcp-servers/${server.id}`,
         { method: "DELETE" },
         { "x-tenant-slug": tenant.slug }
       );
-      printSuccess("MCP server removed.");
+      printSuccess(`MCP server removed: ${server.name} (${server.slug}).`);
     } catch (err) {
       if (isCancellation(err)) return;
       printError(err instanceof Error ? err.message : String(err));
       process.exit(1);
     }
   });
-  mcp.command("test <id>").description("Test connection and discover tools. Prompts for stage/tenant in a TTY when omitted.").option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").action(async (id, opts) => {
+  mcp.command("test [id]").description(
+    "Test connection and discover tools. Accepts UUID, slug, or name; prompts from a list when omitted in a TTY."
+  ).option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").action(async (idArg, opts) => {
     try {
       const { stage, api, tenant } = await resolveMcpContext(opts);
+      const server = await resolveServer(idArg, api, tenant.slug);
       printHeader("mcp test", stage);
       const result = await apiFetch(
         api.apiUrl,
         api.authSecret,
-        `/api/skills/mcp-servers/${id}/test`,
+        `/api/skills/mcp-servers/${server.id}/test`,
         { method: "POST" },
         { "x-tenant-slug": tenant.slug }
       );
       if (result.ok) {
-        printSuccess("Connection successful.");
+        printSuccess(`Connection successful: ${server.name}.`);
         if (result.tools?.length) {
           console.log(chalk10.bold(`
   Discovered tools (${result.tools.length}):
@@ -2913,11 +3089,14 @@ Examples:
       process.exit(1);
     }
   });
-  mcp.command("assign <mcpServerId>").description("Assign an MCP server to an agent. Prompts for stage/agent when omitted in a TTY.").option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").option("--agent <id>", "Agent ID").action(
-    async (mcpServerId, opts) => {
+  mcp.command("assign [mcpServer]").description(
+    "Assign an MCP server to an agent. Accepts UUID, slug, or name for the server; prompts from a list when omitted in a TTY."
+  ).option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").option("--agent <id>", "Agent ID").action(
+    async (mcpServerArg, opts) => {
       try {
         const { input: input3 } = await import("@inquirer/prompts");
-        const { api } = await resolveMcpContext(opts);
+        const { api, tenant } = await resolveMcpContext(opts);
+        const server = await resolveServer(mcpServerArg, api, tenant.slug);
         let agent = opts.agent;
         if (!agent) {
           if (!process.stdin.isTTY) {
@@ -2930,9 +3109,11 @@ Examples:
           api.apiUrl,
           api.authSecret,
           `/api/skills/agents/${agent}/mcp-servers`,
-          { method: "POST", body: JSON.stringify({ mcpServerId }) }
+          { method: "POST", body: JSON.stringify({ mcpServerId: server.id }) }
+        );
+        printSuccess(
+          `MCP server assigned to agent. (${result.created ? "new" : "updated"}) \u2014 ${server.name} \u2192 ${agent}`
         );
-        printSuccess(`MCP server assigned to agent. (${result.created ? "new" : "updated"})`);
       } catch (err) {
         if (isCancellation(err)) return;
         printError(err instanceof Error ? err.message : String(err));
@@ -2940,11 +3121,14 @@ Examples:
       }
     }
   );
-  mcp.command("unassign <mcpServerId>").description("Remove an MCP server from an agent. Prompts for stage/agent when omitted in a TTY.").option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").option("--agent <id>", "Agent ID").action(
-    async (mcpServerId, opts) => {
+  mcp.command("unassign [mcpServer]").description(
+    "Remove an MCP server from an agent. Accepts UUID, slug, or name for the server; prompts from a list when omitted in a TTY."
+  ).option("-s, --stage <name>", "Deployment stage").option("-t, --tenant <slug>", "Tenant slug").option("--agent <id>", "Agent ID").action(
+    async (mcpServerArg, opts) => {
       try {
         const { input: input3 } = await import("@inquirer/prompts");
-        const { api } = await resolveMcpContext(opts);
+        const { api, tenant } = await resolveMcpContext(opts);
+        const server = await resolveServer(mcpServerArg, api, tenant.slug);
         let agent = opts.agent;
         if (!agent) {
           if (!process.stdin.isTTY) {
@@ -2956,10 +3140,10 @@ Examples:
         await apiFetch(
           api.apiUrl,
           api.authSecret,
-          `/api/skills/agents/${agent}/mcp-servers/${mcpServerId}`,
+          `/api/skills/agents/${agent}/mcp-servers/${server.id}`,
           { method: "DELETE" }
         );
-        printSuccess("MCP server unassigned from agent.");
+        printSuccess(`MCP server unassigned from agent: ${server.name} \u219B ${agent}`);
       } catch (err) {
         if (isCancellation(err)) return;
         printError(err instanceof Error ? err.message : String(err));
@@ -2970,7 +3154,7 @@ Examples:
 }
 
 // src/commands/tools.ts
-import { select as select5, password } from "@inquirer/prompts";
+import { select as select6, password } from "@inquirer/prompts";
 import chalk11 from "chalk";
 var TOOL_PROVIDERS = {
   "web-search": ["exa", "serpapi"]
@@ -3054,7 +3238,7 @@ Examples:
             printError(`--provider is required. One of: ${TOOL_PROVIDERS["web-search"].join(", ")}`);
             process.exit(1);
           }
-          provider = await select5({
+          provider = await select6({
             message: "Provider:",
             choices: TOOL_PROVIDERS["web-search"].map((p) => ({ name: p, value: p })),
             loop: false
@@ -3242,7 +3426,7 @@ function registerUpdateCommand(program2) {
 
 // src/commands/user.ts
 import { spawn as spawn4 } from "child_process";
-import { input as input2, select as select6 } from "@inquirer/prompts";
+import { input as input2, select as select7 } from "@inquirer/prompts";
 function getTerraformOutput2(cwd, key) {
   return new Promise((resolve3, reject) => {
     const proc = spawn4("terraform", ["output", "-raw", key], {
@@ -3313,7 +3497,7 @@ async function promptStage(region) {
     console.log(`  Using the only deployed stage: ${stages[0]}`);
     return stages[0];
   }
-  return await select6({
+  return await select7({
     message: "Which stage?",
     choices: stages.map((s) => ({ name: s, value: s })),
     loop: false
@@ -3332,7 +3516,7 @@ async function promptTenant(apiUrl, authSecret) {
     console.log(`  Using the only tenant: ${list[0].name} (${list[0].slug})`);
     return list[0].slug;
   }
-  return await select6({
+  return await select7({
     message: "Which tenant?",
     choices: list.map((t) => ({
       name: `${t.name}  (slug: ${t.slug})`,
@@ -3351,7 +3535,7 @@ async function promptOptionalName() {
 }
 async function promptRole() {
   if (!process.stdin.isTTY) return "member";
-  return await select6({
+  return await select7({
     message: "Role:",
     choices: [
       { name: "member \u2014 regular access", value: "member" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwork-cli",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Thinkwork CLI — deploy, manage, and interact with your Thinkwork stack",
   "license": "MIT",
   "type": "module",