gramatr 0.3.59 → 0.3.62

package/bin/clear-creds.ts

@@ -0,0 +1,141 @@
+#!/usr/bin/env node
+/**
+ * gramatr clear-creds — Nuke ALL stored gramatr credentials.
+ *
+ * Stronger than `gramatr logout` (which only removes ~/.gmtr.json).
+ * This sweeps every credential location in the resolveAuthToken chain
+ * (core/auth.ts), so the next install/login is forced through OAuth.
+ *
+ * Locations cleared:
+ *   1. ~/.gmtr.json                              — deleted entirely
+ *   2. ~/gmtr-client/settings.json `auth.api_key` — stripped, file preserved
+ *
+ * Env vars (GRAMATR_API_KEY, GMTR_TOKEN) cannot be cleared from a child
+ * process — they live in the parent shell. We detect them and warn.
+ *
+ * Not-logged-in is not an error: exits 0 with a clean message.
+ */
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+
+function getHome(): string {
+  return process.env.HOME || process.env.USERPROFILE || homedir();
+}
+
+function gmtrJsonPath(): string {
+  return join(getHome(), ".gmtr.json");
+}
+
+function legacySettingsPath(): string {
+  const gmtrDir = process.env.GMTR_DIR || join(getHome(), "gmtr-client");
+  return join(gmtrDir, "settings.json");
+}
+
+function log(msg: string = ""): void {
+  process.stdout.write(`${msg}\n`);
+}
+
+function showHelp(): void {
+  log(`gramatr clear-creds — Remove every stored gramatr credential
+
+Usage:
+  gramatr clear-creds   Sweep ~/.gmtr.json + auth.api_key from gmtr-client/settings.json
+
+After running, the next install or login will be forced through OAuth.
+
+Env vars (GRAMATR_API_KEY, GMTR_TOKEN) cannot be unset from this process.
+If they are set, this command warns and tells you the shell command to run.`);
+}
+
+interface ClearResult {
+  removedGmtrJson: boolean;
+  strippedLegacyKey: boolean;
+  envVarsSet: string[];
+}
+
+export function clearAll(): ClearResult {
+  const result: ClearResult = {
+    removedGmtrJson: false,
+    strippedLegacyKey: false,
+    envVarsSet: [],
+  };
+
+  // 1. ~/.gmtr.json — delete entirely
+  const gj = gmtrJsonPath();
+  if (existsSync(gj)) {
+    unlinkSync(gj);
+    result.removedGmtrJson = true;
+  }
+
+  // 2. ~/gmtr-client/settings.json — strip auth.api_key, preserve rest
+  const ls = legacySettingsPath();
+  if (existsSync(ls)) {
+    try {
+      const data = JSON.parse(readFileSync(ls, "utf8"));
+      if (data && data.auth && typeof data.auth === "object" && "api_key" in data.auth) {
+        delete data.auth.api_key;
+        // If auth is now empty, remove it too to keep the file tidy
+        if (Object.keys(data.auth).length === 0) delete data.auth;
+        writeFileSync(ls, `${JSON.stringify(data, null, 2)}\n`);
+        result.strippedLegacyKey = true;
+      }
+    } catch {
+      // malformed JSON — leave it alone, user can fix manually
+    }
+  }
+
+  // 3. Env vars — detect only, cannot mutate parent shell
+  for (const v of ["GRAMATR_API_KEY", "GMTR_TOKEN"]) {
+    if (process.env[v]) result.envVarsSet.push(v);
+  }
+
+  return result;
+}
+
+export function main(argv: string[] = process.argv.slice(2)): number {
+  if (argv.includes("--help") || argv.includes("-h")) {
+    showHelp();
+    return 0;
+  }
+
+  const r = clearAll();
+
+  if (!r.removedGmtrJson && !r.strippedLegacyKey && r.envVarsSet.length === 0) {
+    log("No stored credentials found. Already fully cleared.");
+    return 0;
+  }
+
+  if (r.removedGmtrJson) log(`Removed ${gmtrJsonPath()}`);
+  if (r.strippedLegacyKey) log(`Stripped auth.api_key from ${legacySettingsPath()}`);
+
+  if (r.envVarsSet.length > 0) {
+    log("");
+    log(`WARNING: the following env vars are still set in your shell:`);
+    for (const v of r.envVarsSet) log(`  ${v}`);
+    log("");
+    log("These take precedence over file-based credentials. To clear them:");
+    log(`  unset ${r.envVarsSet.join(" ")}        # bash/zsh`);
+    log(`  Remove-Item Env:${r.envVarsSet.join(", Env:")}    # PowerShell`);
+    log("");
+    log("Until then, the next install will still resolve a token from the env.");
+    return 0;
+  }
+
+  log("");
+  log("All credentials cleared. Next 'gramatr login' or 'gramatr install' will use OAuth.");
+  return 0;
+}
+
+const isDirect = (() => {
+  try {
+    const invoked = process.argv[1] || "";
+    return invoked.endsWith("clear-creds.ts") || invoked.endsWith("clear-creds.js");
+  } catch {
+    return false;
+  }
+})();
+
+if (isDirect) {
+  process.exit(main());
+}

package/bin/gramatr.js

@@ -2,9 +2,19 @@
 /**
  * gramatr CLI entry point — thin JS wrapper that bootstraps TypeScript.
  * tsx is a production dependency, resolved directly from node_modules.
+ *
+ * ESM module: packages/client/package.json has "type": "module" (added in
+ * PR #487 to support top-level await in bin/gmtr-login.ts). This file must
+ * use ESM imports — bare `require()` will throw ReferenceError at load time.
+ * v0.3.60 hotfix: #487 converted the .ts bin files but missed this .js twin.
  */
-const { spawnSync } = require('child_process');
-const { join, dirname } = require('path');
+import { spawnSync } from 'node:child_process';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const script = join(__dirname, 'gramatr.ts');
 const args = process.argv.slice(2);

package/bin/gramatr.ts

@@ -312,6 +312,9 @@ function main(): void {
     case 'logout':
       runTs(join(binDir, 'logout.ts'), raw.slice(1));
       return;
+    case 'clear-creds':
+      runTs(join(binDir, 'clear-creds.ts'), raw.slice(1));
+      return;
     case 'detect':
       renderDetections();
       return;
@@ -333,7 +336,8 @@ function main(): void {
       log('  install [target]   Install gramatr (claude-code, codex, gemini-cli, all)');
       log('  login              Authenticate with the gramatr server (OAuth)');
       log('  add-api-key        Add an API key explicitly (interactive / piped / --from-env)');
-      log('  logout             Clear stored credentials (~/.gmtr.json)');
+      log('  logout             Clear session token (~/.gmtr.json)');
+      log('  clear-creds        Nuke ALL stored credentials, force OAuth on next login');
       log('  detect             Show detected CLI platforms');
       log('  doctor             Check installation health');
       log('  upgrade            Upgrade all installed targets');

package/bin/statusline.ts

@@ -129,7 +129,7 @@ const c = {
   // Text hierarchy (warm neutrals)
   text: '\x1b[38;2;236;236;236m',       // #ECECEC — primary text
   textSec: '\x1b[38;2;136;136;136m',    // #888888 — secondary
-  textMuted: '\x1b[38;2;102;102;102m',  // #666666 — muted/labels
+  textMuted: '\x1b[38;2;192;192;192m',  // #C0C0C0 — muted/labels (dimmer than primary, readable on light backgrounds)
   // Brand
   primary: '\x1b[38;2;59;130;246m',     // #3B82F6 — blue accent
   accent: '\x1b[38;2;96;165;250m',      // #60A5FA — lighter blue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gramatr",
-  "version": "0.3.59",
+  "version": "0.3.62",
   "description": "grāmatr — context engineering layer for AI coding agents. Every prompt gets a pre-computed intelligence packet: decision routing, capability audit, behavioral directives, memory pre-load, and ISC scaffolds. Continuity across sessions for Claude Code, Codex, and Gemini CLI.",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",