@somewhere-tech/cli 0.27.7 → 0.28.0

package/dist/lib/platform-tools.js

@@ -0,0 +1,163 @@
+import { ApiClient } from './client.js';
+import { getToken, loadConfig } from './config.js';
+const MCP_BASE_URL = process.env.SOMEWHERE_MCP_URL?.replace(/\/$/, '') || 'https://mcp.somewhere.tech/mcp';
+let isSdkAuthError = () => false;
+export class PlatformToolError extends Error {
+    tool;
+    constructor(tool, message) {
+        super(message);
+        this.tool = tool;
+        this.name = 'PlatformToolError';
+    }
+}
+function mcpUrl(allTools) {
+    const url = new URL(MCP_BASE_URL);
+    if (allTools)
+        url.searchParams.set('groups', 'all');
+    return url;
+}
+export function mcpAccessExpiresSoon() {
+    const config = loadConfig();
+    if (!config?.refresh_token || !config.access_expires_at)
+        return false;
+    const expiresAt = Date.parse(config.access_expires_at);
+    return Number.isFinite(expiresAt) && expiresAt <= Date.now() + 60_000;
+}
+/** Reuse ApiClient's canonical cli-pair rotation and persistence path. */
+export async function refreshMcpAccessToken(preemptive) {
+    const token = getToken();
+    const client = new ApiClient(token);
+    if (preemptive) {
+        const refreshed = await client.refreshAccessKey(10_000);
+        if (!refreshed) {
+            throw new Error('Session renewal returned an incomplete credential pair.');
+        }
+    }
+    else {
+        await client.call('GET', '/auth/whoami', undefined, undefined, { timeoutMs: 10_000 });
+    }
+    return getToken();
+}
+export function isMcpAuthRejection(err) {
+    if (isSdkAuthError(err))
+        return true;
+    if (!(err instanceof Error))
+        return false;
+    const candidate = err;
+    return candidate.code === 401;
+}
+export async function createPlatformMcpTransport(token, options = {}) {
+    const [{ StreamableHTTPClientTransport, StreamableHTTPError }, { UnauthorizedError }] = await Promise.all([
+        import('@modelcontextprotocol/sdk/client/streamableHttp.js'),
+        import('@modelcontextprotocol/sdk/client/auth.js'),
+    ]);
+    isSdkAuthError = (err) => err instanceof UnauthorizedError
+        || (err instanceof StreamableHTTPError && err.code === 401);
+    return new StreamableHTTPClientTransport(mcpUrl(options.allTools === true), {
+        requestInit: {
+            headers: {
+                Authorization: `Bearer ${token}`,
+                ...(options.userAgent ? { 'User-Agent': options.userAgent } : {}),
+            },
+        },
+    });
+}
+async function connectClient(token, options) {
+    const { Client } = await import('@modelcontextprotocol/sdk/client/index.js');
+    const client = new Client({ name: 'somewhere-cli', version: 'unknown' });
+    const transport = await createPlatformMcpTransport(token, {
+        ...options,
+        userAgent: 'somewhere-cli',
+    });
+    await client.connect(transport);
+    return {
+        client,
+        close: async () => {
+            await client.close().catch(() => { });
+        },
+    };
+}
+async function withPlatformClient(options, operation) {
+    let token = getToken();
+    if (mcpAccessExpiresSoon())
+        token = await refreshMcpAccessToken(true);
+    const attempt = async (accessToken) => {
+        const connection = await connectClient(accessToken, options);
+        try {
+            return await operation(connection.client);
+        }
+        finally {
+            await connection.close();
+        }
+    };
+    try {
+        return await attempt(token);
+    }
+    catch (err) {
+        if (!isMcpAuthRejection(err))
+            throw err;
+    }
+    token = await refreshMcpAccessToken(false);
+    return attempt(token);
+}
+export async function listPlatformTools(options = {}) {
+    return withPlatformClient(options, async (client) => {
+        const result = await client.listTools();
+        return result.tools;
+    });
+}
+function textFromResult(result) {
+    return result.content
+        .filter((block) => block.type === 'text')
+        .map((block) => block.text)
+        .join('\n');
+}
+function toolErrorMessage(text) {
+    try {
+        const parsed = JSON.parse(text);
+        const message = typeof parsed.message === 'string' ? parsed.message : text;
+        const code = typeof parsed.error === 'string' ? `${parsed.error}: ` : '';
+        const next = typeof parsed.next_step === 'string'
+            ? parsed.next_step
+            : typeof parsed.hint === 'string'
+                ? parsed.hint
+                : null;
+        return `${code}${message}${next ? ` Next: ${next}` : ''}`;
+    }
+    catch {
+        return text;
+    }
+}
+export async function callPlatformToolRaw(name, args, options = {}) {
+    const result = await withPlatformClient(options, (client) => client.callTool({ name, arguments: args }));
+    const typed = result;
+    if (typed.isError) {
+        throw new PlatformToolError(name, toolErrorMessage(textFromResult(typed)));
+    }
+    return typed;
+}
+export function platformToolResultValue(result) {
+    if (result.structuredContent !== undefined)
+        return result.structuredContent;
+    const text = textFromResult(result);
+    if (text) {
+        try {
+            return JSON.parse(text);
+        }
+        catch {
+            return text;
+        }
+    }
+    return result.content;
+}
+export async function callPlatformTool(name, args, options = {}) {
+    return platformToolResultValue(await callPlatformToolRaw(name, args, options));
+}
+export async function callPlatformHelpTool(name, args) {
+    const result = await callPlatformToolRaw(name, args);
+    const text = textFromResult(result);
+    if (!text)
+        throw new PlatformToolError(name, `${name} returned an empty response.`);
+    return text;
+}
+//# sourceMappingURL=platform-tools.js.map

package/dist/lib/platform-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform-tools.js","sourceRoot":"","sources":["../../src/lib/platform-tools.ts"],"names":[],"mappings":"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"}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@somewhere-tech/cli",
-  "version": "0.27.7",
+  "version": "0.28.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@somewhere-tech/cli",
-      "version": "0.27.7",
+      "version": "0.28.0",
       "bundleDependencies": [
         "@modelcontextprotocol/sdk",
         "chokidar",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@somewhere-tech/cli",
-  "version": "0.27.7",
+  "version": "0.28.0",
   "description": "CLI for somewhere.tech — auth, projects, deploy, pull, promote, db, logs, env, MCP bridge.",
   "keywords": [
     "somewhere",