moshcode 0.24.2 → 0.25.0

package/bin/moshcode.mjs

@@ -546,7 +546,15 @@ async function main() {
     } catch (e) { console.error(String(e.message || e)); process.exitCode = 1; }
     return;
   }
-  if (cmd === "whoami") { await whoami(); return; }
+  if (cmd === "whoami") {
+    if (rest.length > 1 || (rest.length === 1 && rest[0] !== "--json")) {
+      console.error("usage: moshcode whoami [--json]");
+      process.exitCode = 1;
+      return;
+    }
+    await whoami({ json: rest[0] === "--json" });
+    return;
+  }
   if (cmd === "logout") { logout(); return; }
   if (cmd === "run") {
     let max = 3, dryRun = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moshcode",
-  "version": "0.24.2",
+  "version": "0.25.0",
   "type": "module",
   "description": "moshcode — a metal wrapper for coding engines and native UGig/CoinPay workflow CLIs, with OpenPRD and moshscript",
   "repository": {
@@ -12,8 +12,8 @@
     "url": "https://github.com/moshcoder/moshcode/issues"
   },
   "bin": {
-    "moshcode": "./bin/moshcode.mjs",
-    "moshscript": "./bin/moshscript.mjs"
+    "moshcode": "bin/moshcode.mjs",
+    "moshscript": "bin/moshscript.mjs"
   },
   "scripts": {
     "start": "node bin/moshcode.mjs",

package/src/auth.mjs

@@ -167,22 +167,88 @@ export async function loginAuto({ device = false, browser = false } = {}) {
 }
 
 /** Print who is logged in (verified against the app). */
-export async function whoami() {
+export async function whoami({ json = false } = {}) {
   const creds = loadCreds();
-  if (!creds?.token) { console.log("not logged in — run: moshcode login"); return; }
+  if (!creds?.token) {
+    if (json) {
+      console.log(JSON.stringify({
+        status: "not_logged_in",
+        verified: false,
+        api: API(),
+        user: null,
+      }, null, 2));
+    } else {
+      console.log("not logged in — run: moshcode login");
+    }
+    return;
+  }
+  const api = creds.api || API();
+  const localUser = {
+    id: creds.id ?? null,
+    email: creds.email ?? null,
+    name: null,
+    credits: null,
+  };
+  const printJson = (value) => console.log(JSON.stringify(value, null, 2));
   try {
-    const res = await fetch(`${creds.api || API()}/api/me`, { headers: { authorization: `Bearer ${creds.token}` } });
-    if (res.status === 401) { console.log("session expired — run: moshcode login"); return; }
+    const res = await fetch(`${api}/api/me`, { headers: { authorization: `Bearer ${creds.token}` } });
+    if (res.status === 401) {
+      if (json) {
+        printJson({
+          status: "expired",
+          verified: false,
+          api,
+          user: localUser,
+          error: { type: "auth", status: 401 },
+        });
+      }
+      else console.log("session expired — run: moshcode login");
+      return;
+    }
     // Any other error status still has a body, and it isn't an account — reading
     // it as one prints a made-up identity for a session the app just refused.
     if (!res.ok) {
-      console.log(`${creds.email || "logged in"} @ ${creds.api || API()} (couldn't verify — the app returned ${res.status})`);
+      if (json) {
+        printJson({
+          status: "unverified",
+          verified: false,
+          api,
+          user: localUser,
+          error: { type: "http", status: res.status },
+        });
+      } else {
+        console.log(`${creds.email || "logged in"} @ ${api} (couldn't verify — the app returned ${res.status})`);
+      }
       return;
     }
     const me = await res.json();
-    console.log(`${me.email || me.name || "moshcoder"} 🤘  (${me.credits ?? "?"} credits)  @ ${creds.api || API()}`);
+    if (json) {
+      printJson({
+        status: "authenticated",
+        verified: true,
+        api,
+        user: {
+          id: me.id ?? creds.id ?? null,
+          email: me.email ?? creds.email ?? null,
+          name: me.name ?? null,
+          credits: me.credits ?? null,
+        },
+      });
+    } else {
+      console.log(`${me.email || me.name || "moshcoder"} 🤘  (${me.credits ?? "?"} credits)  @ ${api}`);
+    }
   } catch {
-    console.log(`${creds.email || "logged in"} @ ${creds.api || API()} (couldn't reach the app to verify)`);
+    if (json) {
+      printJson({
+        status: "unreachable",
+        verified: false,
+        api,
+        user: localUser,
+        error: { type: "network" },
+      });
+    } else {
+      console.log(`${creds.email || "logged in"} @ ${api} (couldn't reach the app to verify)`);
+    }
   }
 }
 

package/src/cli-schema.mjs

@@ -161,7 +161,9 @@ export const CORE_CLI_COMMANDS = [
     name: "whoami",
     group: "account",
     description: "show the logged-in account",
-    synopsis: [["moshcode whoami", ""]],
+    synopsis: [["moshcode whoami [--json]", ""]],
+    flags: [["--json", "print account status as machine-readable JSON", ""]],
+    examples: [["moshcode whoami --json", "inspect the current session from a script"]],
     seeAlso: ["login", "logout"],
   },
   {

package/src/completion.mjs

@@ -215,7 +215,7 @@ Register-ArgumentCompleter -Native -CommandName moshcode -ScriptBlock {
         }
       }
       'login' { if ($wordToComplete.StartsWith('-')) { $choices = $script:MoshcodeCompletionLogin } }
-      { $_ -in @('engines', 'tools', 'commands') } {
+      { $_ -in @('whoami', 'engines', 'tools', 'commands') } {
         if ($wordToComplete.StartsWith('-')) { $choices = $script:MoshcodeCompletionJson }
       }
       'run' { if ($wordToComplete.StartsWith('-')) { $choices = $script:MoshcodeCompletionRun } }
@@ -321,7 +321,7 @@ _moshcode_completion() {
       login)
         [[ "$cur" == -* ]] && choices="--browser -b --device -d"
         ;;
-      engines|tools|commands)
+      whoami|engines|tools|commands)
         [[ "$cur" == -* ]] && choices="--json"
         ;;
       run)
@@ -464,7 +464,7 @@ _moshcode() {
     login)
       _values "login option" --browser -b --device -d
       ;;
-    engines|tools|commands)
+    whoami|engines|tools|commands)
       _values "option" --json
       ;;
     run)
@@ -556,7 +556,7 @@ complete -c moshcode -n '__moshcode_nested_is mcp list' -l json -d 'print JSON'
 complete -c moshcode -n '__moshcode_nested_is skill list; or __moshcode_nested_is skills list' -l json -d 'print JSON'
 complete -c moshcode -n '__moshcode_command_is login' -l browser -s b -d 'use browser authentication'
 complete -c moshcode -n '__moshcode_command_is login' -l device -s d -d 'use device-code authentication'
-complete -c moshcode -n '${atSecondToken("agents engines tools commands")}' -l json -d 'print JSON'
+complete -c moshcode -n '${atSecondToken("agents whoami engines tools commands")}' -l json -d 'print JSON'
 complete -c moshcode -n '__moshcode_command_is run' -l dry-run -d 'show actions without executing'
 complete -c moshcode -n '__moshcode_command_is run' -l max -s n -r -d 'maximum loop count'
 complete -c moshcode -n '__moshcode_command_is uninstall remove' -l yes -s y -d 'confirm deleting a binary'

package/src/tui.mjs

@@ -539,7 +539,14 @@ export async function tui() {
       catch (e) { console.log(err(String(e.message || e))); }
       continue;
     }
-    if (cmd === "whoami") { await whoami(); continue; }
+    if (cmd === "whoami") {
+      if (rest.length > 1 || (rest.length === 1 && rest[0] !== "--json")) {
+        console.log(err("usage: /whoami [--json]"));
+        continue;
+      }
+      await whoami({ json: rest[0] === "--json" });
+      continue;
+    }
     if (cmd === "logout") { logout(); continue; }
     if (cmd === "run") {
       await runFile(rest);