thinkwork-cli 0.9.1 → 0.9.2

package/dist/cli.js

@@ -1,4 +1,9 @@
 #!/usr/bin/env node
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // src/cli.ts
 import { Command } from "commander";
@@ -2690,7 +2695,116 @@ and AgentCore for per-stage detail.
 
 // src/commands/mcp.ts
 import chalk10 from "chalk";
-import { createClient, adminKeys, AdminOpsError } from "@thinkwork/admin-ops";
+
+// ../../packages/admin-ops/src/client.ts
+var AdminOpsError = class extends Error {
+  status;
+  body;
+  constructor(status, message, body) {
+    super(message);
+    this.name = "AdminOpsError";
+    this.status = status;
+    this.body = body;
+  }
+};
+function createClient(config) {
+  const fetchImpl = config.fetchImpl ?? fetch;
+  const base = config.apiUrl.replace(/\/+$/, "");
+  const doFetch = async (path2, init = {}) => {
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${config.authSecret}`,
+      "x-api-key": config.authSecret
+    };
+    if (config.principalId) headers["x-principal-id"] = config.principalId;
+    if (config.principalEmail) headers["x-principal-email"] = config.principalEmail;
+    if (config.tenantId) headers["x-tenant-id"] = config.tenantId;
+    if (config.agentId) headers["x-agent-id"] = config.agentId;
+    const res = await fetchImpl(`${base}${path2}`, {
+      ...init,
+      headers: { ...headers, ...init.headers }
+    });
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}));
+      const message = body.error ?? `HTTP ${res.status}`;
+      throw new AdminOpsError(res.status, message, body);
+    }
+    return res.json();
+  };
+  const doGraphql = async (query, variables) => {
+    const res = await doFetch("/graphql", {
+      method: "POST",
+      body: JSON.stringify({ query, variables: variables ?? {} })
+    });
+    if (res.errors && res.errors.length > 0) {
+      const msg = res.errors.map((e) => e.message).join("; ");
+      throw new AdminOpsError(200, msg, res);
+    }
+    return res.data;
+  };
+  return {
+    apiUrl: base,
+    tenantId: config.tenantId,
+    fetch: doFetch,
+    graphql: doGraphql,
+    withTenant(tenantId) {
+      return createClient({ ...config, tenantId });
+    }
+  };
+}
+
+// ../../packages/admin-ops/src/tenants.ts
+var tenants_exports = {};
+__export(tenants_exports, {
+  getTenant: () => getTenant,
+  getTenantBySlug: () => getTenantBySlug,
+  listTenants: () => listTenants,
+  updateTenant: () => updateTenant
+});
+async function listTenants(client) {
+  return client.fetch("/api/tenants");
+}
+async function getTenant(client, id) {
+  return client.fetch(`/api/tenants/${encodeURIComponent(id)}`);
+}
+async function getTenantBySlug(client, slug) {
+  return client.fetch(`/api/tenants/by-slug/${encodeURIComponent(slug)}`);
+}
+async function updateTenant(client, id, input4) {
+  return client.fetch(`/api/tenants/${encodeURIComponent(id)}`, {
+    method: "PUT",
+    body: JSON.stringify(input4)
+  });
+}
+
+// ../../packages/admin-ops/src/admin-keys.ts
+var admin_keys_exports = {};
+__export(admin_keys_exports, {
+  createAdminKey: () => createAdminKey,
+  listAdminKeys: () => listAdminKeys,
+  revokeAdminKey: () => revokeAdminKey
+});
+async function createAdminKey(client, tenantIdOrSlug, input4 = {}) {
+  return client.fetch(
+    `/api/tenants/${encodeURIComponent(tenantIdOrSlug)}/mcp-admin-keys`,
+    {
+      method: "POST",
+      body: JSON.stringify(input4)
+    }
+  );
+}
+async function listAdminKeys(client, tenantIdOrSlug) {
+  const res = await client.fetch(
+    `/api/tenants/${encodeURIComponent(tenantIdOrSlug)}/mcp-admin-keys`
+  );
+  return res.keys;
+}
+async function revokeAdminKey(client, tenantIdOrSlug, keyId) {
+  await client.fetch(
+    `/api/tenants/${encodeURIComponent(tenantIdOrSlug)}/mcp-admin-keys/${encodeURIComponent(keyId)}`,
+    { method: "DELETE" }
+  );
+}
 
 // src/api-client.ts
 import { readFileSync as readFileSync5, existsSync as existsSync9 } from "fs";
@@ -3273,7 +3387,7 @@ old one.
         apiUrl: ctx.api.apiUrl,
         authSecret: ctx.api.authSecret
       });
-      const created = await adminKeys.createAdminKey(client, ctx.tenant.slug, {
+      const created = await admin_keys_exports.createAdminKey(client, ctx.tenant.slug, {
         name: opts.name
       });
       printJson(created);
@@ -3293,7 +3407,7 @@ old one.
         apiUrl: ctx.api.apiUrl,
         authSecret: ctx.api.authSecret
       });
-      const all = await adminKeys.listAdminKeys(client, ctx.tenant.slug);
+      const all = await admin_keys_exports.listAdminKeys(client, ctx.tenant.slug);
       const rows = opts.all ? all : all.filter((k) => !k.revoked_at);
       printJson(rows);
       printTable(rows, [
@@ -3316,7 +3430,7 @@ old one.
         apiUrl: ctx.api.apiUrl,
         authSecret: ctx.api.authSecret
       });
-      await adminKeys.revokeAdminKey(client, ctx.tenant.slug, keyId);
+      await admin_keys_exports.revokeAdminKey(client, ctx.tenant.slug, keyId);
       printSuccess(`MCP admin key revoked: ${keyId}`);
     } catch (err) {
       if (err instanceof AdminOpsError && err.status === 404) {
@@ -4799,7 +4913,6 @@ Examples:
 }
 
 // src/commands/tenant.ts
-import { createClient as createClient2, tenants as tenantOps, AdminOpsError as AdminOpsError2 } from "@thinkwork/admin-ops";
 function registerTenantCommand(program2) {
   const tenant = program2.command("tenant").alias("tenants").description("Manage tenants (workspaces) \u2014 create, rename, and configure plans / defaults.");
   tenant.command("list").alias("ls").description("List tenants the caller can see.").option("-s, --stage <name>", "Deployment stage").addHelpText(
@@ -4815,8 +4928,8 @@ Examples:
       const stage = await resolveStage({ flag: opts.stage });
       const api = resolveApiConfig(stage);
       if (!api) process.exit(1);
-      const client = createClient2({ apiUrl: api.apiUrl, authSecret: api.authSecret });
-      const rows = await tenantOps.listTenants(client);
+      const client = createClient({ apiUrl: api.apiUrl, authSecret: api.authSecret });
+      const rows = await tenants_exports.listTenants(client);
       printJson(rows);
       printTable(rows, [
         { key: "slug", header: "SLUG" },
@@ -4841,11 +4954,11 @@ Examples:
       const stage = await resolveStage({ flag: opts.stage });
       const api = resolveApiConfig(stage);
       if (!api) process.exit(1);
-      const client = createClient2({ apiUrl: api.apiUrl, authSecret: api.authSecret });
+      const client = createClient({ apiUrl: api.apiUrl, authSecret: api.authSecret });
       const isUuid2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
         idOrSlug
       );
-      const tenant2 = isUuid2 ? await tenantOps.getTenant(client, idOrSlug) : await tenantOps.getTenantBySlug(client, idOrSlug);
+      const tenant2 = isUuid2 ? await tenants_exports.getTenant(client, idOrSlug) : await tenants_exports.getTenantBySlug(client, idOrSlug);
       printJson(tenant2);
       printTable([tenant2], [
         { key: "slug", header: "SLUG" },
@@ -4855,7 +4968,7 @@ Examples:
         { key: "id", header: "ID" }
       ]);
     } catch (err) {
-      if (err instanceof AdminOpsError2 && err.status === 404) {
+      if (err instanceof AdminOpsError && err.status === 404) {
         printError(`Tenant "${idOrSlug}" not found`);
         process.exit(2);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwork-cli",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Thinkwork CLI — deploy, manage, and interact with your Thinkwork stack",
   "license": "Apache-2.0",
   "type": "module",
@@ -18,8 +18,7 @@
     "commander": "^12.0.0",
     "graphql": "^16.10.0",
     "jszip": "^3.10.1",
-    "ora": "^9.3.0",
-    "@thinkwork/admin-ops": "0.0.0"
+    "ora": "^9.3.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.6",
@@ -28,7 +27,8 @@
     "tsup": "^8.0.0",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0",
-    "vitest": "^2.0.0"
+    "vitest": "^2.0.0",
+    "@thinkwork/admin-ops": "0.0.0"
   },
   "engines": {
     "node": ">=20"