@genrupt/cli 0.1.5 → 0.1.7

package/README.md

@@ -6,20 +6,14 @@ Genrupt CLI for local-file workflows and local MCP clients.
 
 Use this when setting up Genrupt for an agent:
 
-Windows user-local launcher:
-
-```powershell
-powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://genrupt.com/downloads/genrupt-cli/install.ps1 | iex"
-genrupt agent install
-```
-
-Universal one-time run:
+Install the CLI:
 
 ```bash
-npx -y @genrupt/cli@latest agent install
+npm install -g @genrupt/cli@latest
+genrupt agent install
 ```
 
-This checks auth, installs Genrupt skills for the detected agent, and writes a local runtime manifest. The user-local launcher avoids `npm install -g`; the `npx` runtime install still tries to install or update the global CLI, but global npm install failures do not block the skills/runtime setup.
+This checks auth, installs Genrupt skills for the detected agent, and writes a local runtime manifest.
 
 ## Install
 
@@ -35,10 +29,10 @@ macOS/Linux:
 curl -fsSL https://genrupt.com/downloads/genrupt-cli/install.sh | sh
 ```
 
-Optional global npm install:
+If global npm install is restricted, run without installing globally:
 
 ```bash
-npm install -g @genrupt/cli
+npx -y @genrupt/cli@latest agent install
 ```
 
 ## Login
@@ -61,6 +55,15 @@ If Genrupt is unreachable and you only want to remove the local file, run:
 genrupt auth logout --local
 ```
 
+If Claude Code or another local MCP client keeps reusing stale credentials after you remove and
+re-add the connector, force a local credential reset:
+
+```bash
+genrupt auth reset
+genrupt auth login
+genrupt setup claude-code --replace
+```
+
 ## Claude Code
 
 ```bash
@@ -85,6 +88,14 @@ genrupt doctor
 
 Checks CLI freshness, auth, remote MCP reachability, installed skills, and the local Genrupt runtime manifest.
 
+If the remote MCP check fails, run:
+
+```bash
+genrupt auth reset
+genrupt auth login
+genrupt doctor
+```
+
 ## Runtime Health
 
 The CLI sends small best-effort runtime health events for failed agent installs, stale CLI detection, doctor failures, and upload failures. Events are sanitized and do not include local paths, filenames, prompts, uploaded content, or tokens.

package/dist/auth.js

@@ -126,12 +126,23 @@ export async function login(options = {}) {
 }
 export async function refreshAccessToken(config) {
     const endpoints = getAuthEndpoints(config.origin);
-    const token = await postJson(endpoints.token, {
-        grant_type: "refresh_token",
-        client_id: config.clientId,
-        refresh_token: config.refreshToken,
-        resource: config.mcpServerUrl,
-    });
+    let token;
+    try {
+        token = await postJson(endpoints.token, {
+            grant_type: "refresh_token",
+            client_id: config.clientId,
+            refresh_token: config.refreshToken,
+            resource: config.mcpServerUrl,
+        });
+    }
+    catch (error) {
+        if (error instanceof HttpError &&
+            ["invalid_grant", "invalid_client", "invalid_target"].includes(getErrorCode(error.payload) ?? "")) {
+            await clearConfig();
+            throw new Error(`Genrupt auth expired or was revoked. Cleared local credentials at ${getConfigPath()}. Run \`genrupt auth login\` to reconnect.`);
+        }
+        throw error;
+    }
     const nextConfig = {
         ...config,
         accessToken: token.access_token,
@@ -201,6 +212,11 @@ export async function logout(options = {}) {
     await clearConfig();
     console.log("Logged out.");
 }
+export async function resetLocalAuth() {
+    await clearConfig();
+    console.log(`Cleared local Genrupt credentials at ${getConfigPath()}.`);
+    console.log("Run `genrupt auth login` to reconnect.");
+}
 export async function assertLoggedIn() {
     await getValidAccessToken();
 }

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { readFile } from "node:fs/promises";
 import { CLI_VERSION } from "./constants.js";
 import { installAgentRuntime } from "./agent.js";
-import { login, logout, printAuthStatus } from "./auth.js";
+import { login, logout, printAuthStatus, resetLocalAuth } from "./auth.js";
 import { callRemoteMcpTool, assertSuccessfulToolPayload } from "./mcpClient.js";
 import { serveLocalMcp } from "./localMcpServer.js";
 import { setupClaudeCode } from "./setup.js";
@@ -76,6 +76,7 @@ Usage:
   genrupt auth login [--origin https://genrupt.com] [--no-open]
   genrupt auth status
   genrupt auth logout [--local]
+  genrupt auth reset
   genrupt version
 
   genrupt agent install [--agent claude|codex|cursor] [--target PATH] [--skip-auth] [--skip-global-install]
@@ -153,6 +154,10 @@ async function handleAuth(args) {
         });
         return;
     }
+    if (subcommand === "reset") {
+        await resetLocalAuth();
+        return;
+    }
     throw new Error("Unknown auth command. Run `genrupt --help`.");
 }
 async function handleSetup(args) {
@@ -360,5 +365,5 @@ main().catch(async (error) => {
         ? await buildUnknownCommandUpdateHint()
         : "";
     console.error(`${message}${updateHint}`);
-    process.exit(1);
+    process.exitCode = 1;
 });

package/dist/constants.js

@@ -3,5 +3,5 @@ export const DEFAULT_MCP_SERVER_URL = `${DEFAULT_ORIGIN}/api/agent/mcp`;
 export const OAUTH_DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
 export const OAUTH_SCOPE = "mcp";
 export const CLI_CLIENT_NAME = "Genrupt CLI";
-export const CLI_VERSION = "0.1.5";
+export const CLI_VERSION = "0.1.7";
 export const ACCESS_TOKEN_REFRESH_SKEW_MS = 60_000;

package/dist/doctor.js

@@ -234,7 +234,7 @@ export async function runDoctor(options = {}) {
                 label: "Remote MCP",
                 status: "fail",
                 detail: message,
-                remediation: "Run: genrupt auth login, then retry genrupt doctor",
+                remediation: "Run: genrupt auth reset, then genrupt auth login, then retry genrupt doctor",
             });
         }
     }

package/dist/globalCli.js

@@ -180,10 +180,11 @@ export function buildGlobalCliDiagnosticsLines(diagnostics) {
 }
 export function buildNoGlobalInstallRemediation() {
     return [
-        "Install the user-local launcher without npm global writes:",
-        `  powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://genrupt.com/downloads/genrupt-cli/install.ps1 | iex"`,
+        `Update the global CLI:`,
+        `  npm install -g ${CLI_PACKAGE_NAME}@latest`,
         "Or keep using npx:",
         `  npx -y ${CLI_PACKAGE_NAME}@latest doctor`,
-        "If you want the global npm command, check that npm's global prefix is writable or run the install from an elevated terminal.",
+        "If global npm install is restricted, install the user-local launcher:",
+        `  powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://genrupt.com/downloads/genrupt-cli/install.ps1 | iex"`,
     ];
 }

package/dist/localMcpServer.js

@@ -2,6 +2,7 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { CLI_VERSION } from "./constants.js";
+import { getConfigPath, readConfig } from "./config.js";
 import { listRemoteMcpTools, callRemoteMcpTool } from "./mcpClient.js";
 import { uploadProductReferenceImages, uploadReferenceMedia, } from "./upload.js";
 import { classifyCliError, emitRuntimeTelemetry } from "./telemetry.js";
@@ -43,6 +44,16 @@ const LOCAL_UPLOAD_TOOL = {
         additionalProperties: false,
     },
 };
+const LOCAL_AUTH_STATUS_TOOL = {
+    name: "get_genrupt_cli_auth_status",
+    title: "Get Genrupt CLI auth status",
+    description: "Use when Genrupt MCP tools are missing, failing to connect, or asking for auth repair. This local diagnostic tool checks whether this machine has cached Genrupt CLI credentials and returns the credential file path plus exact repair commands. It does not validate credentials with the server or expose tokens.",
+    inputSchema: {
+        type: "object",
+        properties: {},
+        additionalProperties: false,
+    },
+};
 const LOCAL_REFERENCE_MEDIA_UPLOAD_TOOL = {
     name: "upload_reference_media",
     title: "Upload local reference media",
@@ -144,6 +155,26 @@ async function handleLocalReferenceMediaUploadTool(args) {
     });
     return buildToolResult(payload);
 }
+async function handleLocalAuthStatusTool() {
+    const config = await readConfig();
+    return buildToolResult({
+        hasLocalCredentials: Boolean(config),
+        configPath: getConfigPath(),
+        origin: config?.origin ?? null,
+        mcpServerUrl: config?.mcpServerUrl ?? null,
+        accessTokenExpiresAt: config?.accessTokenExpiresAt ?? null,
+        scope: config?.scope ?? null,
+        nextActions: config
+            ? [
+                "Run `genrupt doctor` to validate the remote MCP connection.",
+                "If Claude Code still fails, run `genrupt auth reset`, then `genrupt auth login`, then restart Claude Code.",
+            ]
+            : [
+                "Run `genrupt auth login` to connect this machine.",
+                "Run `genrupt setup claude-code --replace` after login if Claude Code does not show Genrupt.",
+            ],
+    });
+}
 export async function serveLocalMcp() {
     const server = new Server({
         name: "genrupt-cli",
@@ -159,6 +190,7 @@ export async function serveLocalMcp() {
             const remote = await listRemoteMcpTools();
             return {
                 tools: [
+                    LOCAL_AUTH_STATUS_TOOL,
                     LOCAL_UPLOAD_TOOL,
                     LOCAL_REFERENCE_MEDIA_UPLOAD_TOOL,
                     ...remote.tools.filter((tool) => tool.name !== LOCAL_UPLOAD_TOOL.name &&
@@ -169,7 +201,7 @@ export async function serveLocalMcp() {
         catch (error) {
             console.error(`[genrupt] Failed to list remote MCP tools: ${error instanceof Error ? error.message : String(error)}`);
             return {
-                tools: [LOCAL_UPLOAD_TOOL, LOCAL_REFERENCE_MEDIA_UPLOAD_TOOL],
+                tools: [LOCAL_AUTH_STATUS_TOOL],
             };
         }
     });
@@ -184,6 +216,9 @@ export async function serveLocalMcp() {
             if (request.params.name === LOCAL_REFERENCE_MEDIA_UPLOAD_TOOL.name) {
                 return await handleLocalReferenceMediaUploadTool(args);
             }
+            if (request.params.name === LOCAL_AUTH_STATUS_TOOL.name) {
+                return await handleLocalAuthStatusTool();
+            }
             return await callRemoteMcpTool(request.params.name, args);
         }
         catch (error) {

package/dist/mcpClient.js

@@ -1,4 +1,5 @@
 import { getValidAccessToken, getValidConfig, refreshAccessToken } from "./auth.js";
+import { clearConfig, getConfigPath } from "./config.js";
 import { HttpError, getErrorDescription } from "./http.js";
 let nextJsonRpcId = 1;
 function parseEventStreamPayload(text) {
@@ -53,7 +54,16 @@ async function withAuthRetry(call) {
             throw error;
         }
         const refreshed = await refreshAccessToken(config);
-        return call(refreshed.accessToken, refreshed.mcpServerUrl);
+        try {
+            return await call(refreshed.accessToken, refreshed.mcpServerUrl);
+        }
+        catch (retryError) {
+            if (retryError instanceof HttpError && retryError.status === 401) {
+                await clearConfig();
+                throw new Error(`Genrupt auth is no longer valid. Cleared local credentials at ${getConfigPath()}. Run \`genrupt auth login\` to reconnect.`);
+            }
+            throw retryError;
+        }
     }
 }
 export async function listRemoteMcpTools() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genrupt/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Genrupt CLI for OAuth login, local file uploads, and local MCP bridge setup.",
   "license": "MIT",
   "repository": {