@globio/cli 0.1.9 → 0.2.2

package/dist/index.js

@@ -206,10 +206,10 @@ function renderTable(options) {
   );
   return lines.join("\n");
 }
-function header(version10, subtitle) {
+function header(version11, subtitle) {
   const lines = [
     "",
-    orange("  \u21D2\u21D2") + reset + " globio " + dim(version10),
+    orange("  \u21D2\u21D2") + reset + " globio " + dim(version11),
     dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500")
   ];
   if (subtitle) {
@@ -221,6 +221,10 @@ function header(version10, subtitle) {
 function footer(text4) {
   return "\n" + dim("  " + text4) + "\n";
 }
+function jsonOutput(data) {
+  console.log(JSON.stringify(data, null, 2));
+  process.exit(0);
+}
 
 // src/lib/banner.ts
 var globioGradient = gradientString(
@@ -230,14 +234,14 @@ var globioGradient = gradientString(
   "#ffba08",
   "#ffd000"
 );
-function printBanner(version10) {
+function printBanner(version11) {
   const art = figlet.textSync("Globio", {
     font: "ANSI Shadow",
     horizontalLayout: "default"
   });
   console.log(globioGradient.multiline(art));
   console.log(
-    globioGradient("  \u21D2\u21D2") + "  Game Backend as a Service  \x1B[2mv" + version10 + "\x1B[0m"
+    globioGradient("  \u21D2\u21D2") + "  Game Backend as a Service  \x1B[2mv" + version11 + "\x1B[0m"
   );
   console.log("");
 }
@@ -262,6 +266,18 @@ async function savePat(token) {
   const account = await manageRequest("/account", { token });
   return account;
 }
+function storeProfile(profileName, token, account) {
+  const hadProfiles = config.listProfiles().length > 0;
+  config.setProfile(profileName, {
+    pat: token,
+    account_email: account.email,
+    account_name: account.display_name ?? account.email,
+    created_at: Date.now()
+  });
+  if (profileName === "default" || !hadProfiles) {
+    config.setActiveProfile(profileName);
+  }
+}
 function warnOnDuplicateAccount(accountEmail, targetProfileName) {
   const allProfiles = config.listProfiles();
   const duplicate = allProfiles.find((name) => {
@@ -275,8 +291,23 @@ function warnOnDuplicateAccount(accountEmail, targetProfileName) {
   );
   console.log("");
 }
-async function runTokenLogin(profileName) {
-  const hadProfiles = config.listProfiles().length > 0;
+async function completeTokenLogin(token, profileName, json = false) {
+  const account = await savePat(token);
+  if (!json) {
+    warnOnDuplicateAccount(account.email, profileName);
+  }
+  storeProfile(profileName, token, account);
+  if (json) {
+    jsonOutput({
+      success: true,
+      email: account.email,
+      name: account.display_name ?? account.email,
+      profile: profileName
+    });
+  }
+  return account;
+}
+async function runTokenLogin(profileName, json = false) {
   const token = await p.text({
     message: "Paste your personal access token",
     placeholder: "glo_pat_...",
@@ -293,17 +324,7 @@ async function runTokenLogin(profileName) {
   const spinner2 = p.spinner();
   spinner2.start("Validating personal access token...");
   try {
-    const account = await savePat(token);
-    warnOnDuplicateAccount(account.email, profileName);
-    config.setProfile(profileName, {
-      pat: token,
-      account_email: account.email,
-      account_name: account.display_name ?? account.email,
-      created_at: Date.now()
-    });
-    if (profileName === "default" || !hadProfiles) {
-      config.setActiveProfile(profileName);
-    }
+    const account = await completeTokenLogin(token, profileName, json);
     spinner2.stop("Token validated.");
     p.outro(`Logged in as ${account.email}
 Profile: ${profileName}`);
@@ -313,10 +334,9 @@ Profile: ${profileName}`);
     process.exit(1);
   }
 }
-async function runBrowserLogin(profileName) {
+async function runBrowserLogin(profileName, json = false) {
   const state = crypto.randomUUID();
   const spinner2 = p.spinner();
-  const hadProfiles = config.listProfiles().length > 0;
   await manageRequest("/cli-auth/request", {
     method: "POST",
     body: { state }
@@ -342,16 +362,26 @@ async function runBrowserLogin(profileName) {
           method: "POST",
           body: { code: status.code }
         });
-        warnOnDuplicateAccount(exchange.account.email, profileName);
+        if (!json) {
+          warnOnDuplicateAccount(exchange.account.email, profileName);
+        }
         config.setProfile(profileName, {
           pat: exchange.token,
           account_email: exchange.account.email,
           account_name: exchange.account.display_name ?? exchange.account.email,
           created_at: Date.now()
         });
-        if (profileName === "default" || !hadProfiles) {
+        if (profileName === "default" || config.listProfiles().length === 1) {
           config.setActiveProfile(profileName);
         }
+        if (json) {
+          jsonOutput({
+            success: true,
+            email: exchange.account.email,
+            name: exchange.account.display_name ?? exchange.account.email,
+            profile: profileName
+          });
+        }
         spinner2.stop("Browser approval received.");
         p.outro(`Logged in as ${exchange.account.email}
 Profile: ${profileName}`);
@@ -366,9 +396,34 @@ Profile: ${profileName}`);
   process.exit(1);
 }
 async function login(options = {}) {
-  printBanner(version);
   const profileName = options.profile ?? "default";
   const existing = config.getProfile(profileName);
+  if (options.token) {
+    try {
+      const account = await completeTokenLogin(options.token, profileName, options.json);
+      if (!options.json) {
+        console.log(`Logged in as ${account.email}
+Profile: ${profileName}`);
+      }
+      return;
+    } catch (error) {
+      if (options.json) {
+        jsonOutput({
+          success: false,
+          error: error instanceof Error ? error.message : "Could not validate token"
+        });
+      }
+      console.log(failure(error instanceof Error ? error.message : "Could not validate token"));
+      process.exit(1);
+    }
+  }
+  if (options.json) {
+    jsonOutput({
+      success: false,
+      error: "login --json requires --token <pat>"
+    });
+  }
+  printBanner(version);
   if (existing) {
     const proceed = await p.confirm({
       message: `Already logged in as ${existing.account_email} on profile "${profileName}". Replace?`,
@@ -379,10 +434,6 @@ async function login(options = {}) {
       return;
     }
   }
-  if (options.token) {
-    await runTokenLogin(profileName);
-    return;
-  }
   const choice = await p.select({
     message: "Choose a login method",
     options: [
@@ -395,11 +446,11 @@ async function login(options = {}) {
     process.exit(0);
   }
   if (choice === "token") {
-    await runTokenLogin(profileName);
+    await runTokenLogin(profileName, options.json);
     return;
   }
   try {
-    await runBrowserLogin(profileName);
+    await runBrowserLogin(profileName, options.json);
   } catch (error) {
     p.outro(failure(error instanceof Error ? error.message : "Could not connect to Globio.") + "\x1B[0m");
     process.exit(1);
@@ -453,14 +504,36 @@ var version2 = getCliVersion();
 async function whoami(options = {}) {
   const profileName = options.profile ?? config.getActiveProfile() ?? "default";
   const profile = config.getProfile(profileName);
+  const active = config.getActiveProfile();
   if (!profile) {
+    if (options.json) {
+      jsonOutput({
+        profile: profileName,
+        active: false,
+        account_email: null,
+        account_name: null,
+        org_name: null,
+        active_project_id: null,
+        active_project_name: null
+      });
+    }
     console.log(
       header(version2) + "  " + failure("Not logged in.") + reset + "  Run: globio login\n"
     );
     return;
   }
+  if (options.json) {
+    jsonOutput({
+      profile: profileName,
+      active: profileName === active,
+      account_email: profile.account_email,
+      account_name: profile.account_name,
+      org_name: profile.org_name ?? null,
+      active_project_id: profile.active_project_id ?? null,
+      active_project_name: profile.active_project_name ?? null
+    });
+  }
   const allProfiles = config.listProfiles();
-  const active = config.getActiveProfile();
   const otherProfiles = allProfiles.filter((p6) => p6 !== profileName).join(", ") || "\u2014";
   console.log(
     header(
@@ -607,33 +680,40 @@ function resolveProfileName(profile) {
   return profile ?? config.getActiveProfile() ?? "default";
 }
 async function migrateFirestore(options) {
-  printBanner(version3);
-  p3.intro(gold("\u21D2\u21D2") + "  Firebase \u2192 Globio Migration");
+  if (!options.json) {
+    printBanner(version3);
+    p3.intro(gold("\u21D2\u21D2") + "  Firebase \u2192 Globio Migration");
+  }
   const { firestore } = await initFirebase(options.from);
   const profileName = resolveProfileName(options.profile);
   let collections = [];
   if (options.all) {
     const snapshot = await firestore.listCollections();
     collections = snapshot.map((collection) => collection.id);
-    console.log(
-      green(
-        `Found ${collections.length} collections: ${collections.join(", ")}`
-      )
-    );
+    if (!options.json) {
+      console.log(
+        green(`Found ${collections.length} collections: ${collections.join(", ")}`)
+      );
+    }
   } else if (options.collection) {
     collections = [options.collection];
   } else {
+    if (options.json) {
+      jsonOutput({ success: false, error: "Specify --collection <name> or --all" });
+    }
     console.log(failure("Specify --collection <name> or --all"));
     process.exit(1);
   }
   const results = {};
   for (const collectionId of collections) {
-    console.log("");
-    console.log("  " + orange(collectionId));
+    if (!options.json) {
+      console.log("");
+      console.log("  " + orange(collectionId));
+    }
     const countSnap = await firestore.collection(collectionId).count().get();
     const total = countSnap.data().count;
-    const bar = createProgressBar(collectionId);
-    bar.start(total, 0);
+    const bar = options.json ? null : createProgressBar(collectionId);
+    bar?.start(total, 0);
     results[collectionId] = {
       success: 0,
       failed: 0,
@@ -669,36 +749,49 @@ async function migrateFirestore(options) {
           results[collectionId].failedIds.push(doc.id);
         }
         processed++;
-        bar.update(processed);
+        bar?.update(processed);
       }
       lastDoc = snapshot.docs[snapshot.docs.length - 1] ?? null;
     }
-    bar.stop();
-    console.log(
-      green(`  \u2713 ${results[collectionId].success} documents migrated`)
-    );
-    if (indexFieldCount > 0) {
-      console.log(
-        muted(`  Indexes created for ${indexFieldCount} fields`)
-      );
-    }
-    if (results[collectionId].failed > 0) {
-      console.log(failure(`  \u2717 ${results[collectionId].failed} failed`) + "\x1B[0m");
-      console.log(
-        muted(
-          "  Failed IDs: " + results[collectionId].failedIds.slice(0, 10).join(", ") + (results[collectionId].failedIds.length > 10 ? "..." : "")
-        )
-      );
+    bar?.stop();
+    if (!options.json) {
+      console.log(green(`  \u2713 ${results[collectionId].success} documents migrated`));
+      if (indexFieldCount > 0) {
+        console.log(muted(`  Indexes created for ${indexFieldCount} fields`));
+      }
+      if (results[collectionId].failed > 0) {
+        console.log(failure(`  \u2717 ${results[collectionId].failed} failed`) + "\x1B[0m");
+        console.log(
+          muted(
+            "  Failed IDs: " + results[collectionId].failedIds.slice(0, 10).join(", ") + (results[collectionId].failedIds.length > 10 ? "..." : "")
+          )
+        );
+      }
     }
   }
+  const summary = {
+    collections: collections.map((name) => ({
+      name,
+      migrated: results[name]?.success ?? 0,
+      failed: results[name]?.failed ?? 0,
+      failed_ids: results[name]?.failedIds ?? []
+    })),
+    total_migrated: collections.reduce((sum, name) => sum + (results[name]?.success ?? 0), 0),
+    total_failed: collections.reduce((sum, name) => sum + (results[name]?.failed ?? 0), 0)
+  };
+  if (options.json) {
+    jsonOutput(summary);
+  }
   console.log("");
   p3.outro(
     orange("\u2713") + "  Migration complete.\n\n  " + muted("Your Firebase data is intact.") + "\n  " + muted("Delete it manually when ready.")
   );
 }
 async function migrateFirebaseStorage(options) {
-  printBanner(version3);
-  p3.intro(gold("\u21D2\u21D2") + "  Firebase \u2192 Globio Migration");
+  if (!options.json) {
+    printBanner(version3);
+    p3.intro(gold("\u21D2\u21D2") + "  Firebase \u2192 Globio Migration");
+  }
   const { storage } = await initFirebase(options.from);
   const profileName = resolveProfileName(options.profile);
   const profile = config.getProfile(profileName);
@@ -709,9 +802,11 @@ async function migrateFirebaseStorage(options) {
   const bucket = storage.bucket(bucketName);
   const prefix = options.folder ? options.folder.replace(/^\//, "") : "";
   const [files] = await bucket.getFiles(prefix ? { prefix } : {});
-  console.log(green(`Found ${files.length} files to migrate`));
-  const bar = createProgressBar("Storage");
-  bar.start(files.length, 0);
+  if (!options.json) {
+    console.log(green(`Found ${files.length} files to migrate`));
+  }
+  const bar = options.json ? null : createProgressBar("Storage");
+  bar?.start(files.length, 0);
   let success = 0;
   let failed = 0;
   for (const file of files) {
@@ -725,16 +820,13 @@ async function migrateFirebaseStorage(options) {
         basename(file.name) || file.name
       );
       formData.append("path", file.name);
-      const res = await fetch(
-        "https://api.globio.stanlink.online/vault/files",
-        {
-          method: "POST",
-          headers: {
-            "X-Globio-Key": profile.project_api_key
-          },
-          body: formData
-        }
-      );
+      const res = await fetch("https://api.globio.stanlink.online/vault/files", {
+        method: "POST",
+        headers: {
+          "X-Globio-Key": profile.project_api_key
+        },
+        body: formData
+      });
       if (!res.ok) {
         throw new Error(`Upload failed: ${res.status}`);
       }
@@ -742,9 +834,16 @@ async function migrateFirebaseStorage(options) {
     } catch {
       failed++;
     }
-    bar.increment();
+    bar?.increment();
+  }
+  bar?.stop();
+  const summary = {
+    migrated: success,
+    failed
+  };
+  if (options.json) {
+    jsonOutput(summary);
   }
-  bar.stop();
   console.log("");
   console.log(green(`  \u2713 ${success} files migrated`));
   if (failed > 0) {
@@ -778,11 +877,46 @@ async function createServerKey(projectId, profileName) {
   }
   return created.token;
 }
+function buildSlug(value) {
+  return slugify(value).slice(0, 30);
+}
+async function createProjectRecord(input) {
+  const result = await manageRequest("/projects", {
+    method: "POST",
+    body: {
+      org_id: input.orgId,
+      name: input.name,
+      slug: input.slug ?? buildSlug(input.name),
+      environment: input.environment ?? "development"
+    },
+    profileName: input.profileName
+  });
+  config.setProfile(input.profileName, {
+    active_project_id: result.project.id,
+    active_project_name: result.project.name,
+    org_name: input.orgName,
+    project_api_key: result.keys.server
+  });
+  config.setActiveProfile(input.profileName);
+  return result;
+}
 async function projectsList(options = {}) {
   const profileName = resolveProfileName2(options.profile);
   config.requireAuth(profileName);
   const projects2 = await manageRequest("/projects", { profileName });
   const activeProjectId = config.getProfile(profileName)?.active_project_id;
+  if (options.json) {
+    jsonOutput(
+      projects2.map((project) => ({
+        id: project.id,
+        name: project.name,
+        org_id: project.org_id,
+        org_name: project.org_name,
+        environment: project.environment,
+        active: project.id === activeProjectId
+      }))
+    );
+  }
   if (!projects2.length) {
     console.log(header(version4) + "  " + muted("No projects found.") + "\n");
     return;
@@ -791,7 +925,9 @@ async function projectsList(options = {}) {
     activeProjectId === project.id ? gold(project.name) + reset + " " + orange("\u25CF") + reset : white(project.name),
     muted(project.id),
     muted(project.org_name || project.org_id),
-    inactive(project.environment?.slice(0, 4) ?? "dev")
+    inactive(
+      project.environment === "development" ? "dev" : project.environment === "production" ? "prod" : project.environment === "staging" ? "stg" : project.environment ?? "dev"
+    )
   ]);
   console.log(header(version4));
   console.log(
@@ -815,6 +951,9 @@ async function projectsUse(projectId, options = {}) {
   const projects2 = await manageRequest("/projects", { profileName });
   const project = projects2.find((item) => item.id === projectId);
   if (!project) {
+    if (options.json) {
+      jsonOutput({ success: false, error: `Project not found: ${projectId}` });
+    }
     console.log(failure(`Project not found: ${projectId}`));
     process.exit(1);
   }
@@ -827,6 +966,13 @@ async function projectsUse(projectId, options = {}) {
     project_api_key: apiKey
   });
   config.setActiveProfile(profileName);
+  if (options.json) {
+    jsonOutput({
+      success: true,
+      project_id: project.id,
+      project_name: project.name
+    });
+  }
   console.log(green("Active project: ") + `${project.name} (${project.id})`);
 }
 async function projectsCreate(options = {}) {
@@ -837,6 +983,45 @@ async function projectsCreate(options = {}) {
     console.log(failure("No organizations found. Create one in the console first."));
     process.exit(1);
   }
+  const isNonInteractive = Boolean(options.name && options.org);
+  if (options.json && !isNonInteractive) {
+    jsonOutput({
+      success: false,
+      error: "projects create --json requires --name <name> and --org <orgId>"
+    });
+  }
+  if (isNonInteractive) {
+    const org = orgs.find((item) => item.id === options.org);
+    if (!org) {
+      console.log(failure(`Organization not found: ${options.org}`));
+      process.exit(1);
+    }
+    const result2 = await createProjectRecord({
+      profileName,
+      orgId: org.id,
+      orgName: org.name,
+      name: options.name,
+      environment: options.env ?? "development"
+    });
+    if (options.json) {
+      jsonOutput({
+        success: true,
+        project_id: result2.project.id,
+        project_name: result2.project.name,
+        org_id: org.id,
+        environment: result2.project.environment,
+        client_key: result2.keys.client,
+        server_key: result2.keys.server
+      });
+    }
+    console.log("");
+    console.log(green("Project created successfully."));
+    console.log(orange("Project: ") + reset + `${result2.project.name} (${result2.project.id})`);
+    console.log(orange("Client key: ") + reset + result2.keys.client);
+    console.log(orange("Server key: ") + reset + result2.keys.server);
+    console.log("");
+    return;
+  }
   const orgId = await p4.select({
     message: "Select an organization",
     options: orgs.map((org) => ({
@@ -857,7 +1042,7 @@ async function projectsCreate(options = {}) {
       }),
       slug: ({ results }) => p4.text({
         message: "Project slug",
-        initialValue: slugify(String(results.name ?? "")),
+        initialValue: buildSlug(String(results.name ?? "")),
         validate: (value) => !value ? "Project slug is required" : void 0
       }),
       environment: () => p4.select({
@@ -876,23 +1061,14 @@ async function projectsCreate(options = {}) {
       }
     }
   );
-  const result = await manageRequest("/projects", {
-    method: "POST",
-    body: {
-      org_id: orgId,
-      name: values.name,
-      slug: values.slug,
-      environment: values.environment
-    },
-    profileName
+  const result = await createProjectRecord({
+    profileName,
+    orgId,
+    orgName: orgs.find((org) => org.id === orgId)?.name,
+    name: String(values.name),
+    slug: String(values.slug),
+    environment: String(values.environment)
   });
-  config.setProfile(profileName, {
-    active_project_id: result.project.id,
-    active_project_name: result.project.name,
-    org_name: orgs.find((org) => org.id === orgId)?.name,
-    project_api_key: result.keys.server
-  });
-  config.setActiveProfile(profileName);
   console.log("");
   console.log(green("Project created successfully."));
   console.log(orange("Project: ") + reset + `${result.project.name} (${result.project.id})`);
@@ -904,24 +1080,59 @@ async function projectsCreate(options = {}) {
 // src/commands/init.ts
 var version5 = getCliVersion();
 async function init(options = {}) {
-  printBanner(version5);
-  p5.intro(orange("\u21D2\u21D2") + "  Initialize your Globio project");
   const profileName = options.profile ?? config.getActiveProfile() ?? "default";
   const profile = config.getProfile(profileName);
   if (!profile) {
+    if (options.json) {
+      jsonOutput({ success: false, error: `Run: npx @globio/cli login --profile ${profileName}` });
+    }
     console.log(failure("Run: npx @globio/cli login --profile " + profileName));
     process.exit(1);
   }
-  if (!profile.active_project_id) {
-    await projectsCreate({ profile: profileName });
+  const isNonInteractive = Boolean(options.name && options.org);
+  let filesCreated = [];
+  if (options.json && !isNonInteractive) {
+    jsonOutput({
+      success: false,
+      error: "init --json requires --name <name> and --org <orgId>"
+    });
+  }
+  if (!isNonInteractive) {
+    printBanner(version5);
+    p5.intro(orange("\u21D2\u21D2") + "  Initialize your Globio project");
+    if (!profile.active_project_id) {
+      await projectsCreate({ profile: profileName });
+    } else {
+      await projectsUse(profile.active_project_id, { profile: profileName });
+    }
   } else {
-    await projectsUse(profile.active_project_id, { profile: profileName });
+    const orgId = options.org;
+    const orgName = profile.org_name;
+    const created = await createProjectRecord({
+      profileName,
+      orgId,
+      orgName,
+      name: options.name,
+      slug: options.slug ?? buildSlug(options.name),
+      environment: options.env ?? "development"
+    });
+    void created;
   }
-  const values = await promptInit();
+  const values = isNonInteractive ? {
+    migrateFromFirebase: Boolean(options.from),
+    serviceAccountPath: options.from
+  } : await promptInit();
   const activeProfile = config.getProfile(profileName);
   const activeProjectKey = activeProfile?.project_api_key;
   const { projectId: activeProjectId } = config.requireProject(profileName);
+  const activeProjectName = activeProfile?.active_project_name ?? "unnamed";
   if (!activeProjectKey) {
+    if (options.json) {
+      jsonOutput({
+        success: false,
+        error: `No project API key cached. Run: npx @globio/cli projects use ${activeProjectId}`
+      });
+    }
     console.log(failure("No project API key cached. Run: npx @globio/cli projects use " + activeProjectId));
     process.exit(1);
   }
@@ -936,16 +1147,24 @@ export const globio = new Globio({
 });
 `
     );
-    printSuccess("Created globio.config.ts");
+    filesCreated.push("globio.config.ts");
+    if (!options.json) {
+      printSuccess("Created globio.config.ts");
+    }
   }
   if (!existsSync2(".env")) {
     writeFileSync2(".env", `GLOBIO_API_KEY=${activeProjectKey}
 `);
-    printSuccess("Created .env");
+    filesCreated.push(".env");
+    if (!options.json) {
+      printSuccess("Created .env");
+    }
   }
   if (values.migrateFromFirebase && values.serviceAccountPath) {
-    console.log("");
-    printSuccess("Starting Firebase migration...");
+    if (!options.json) {
+      console.log("");
+      printSuccess("Starting Firebase migration...");
+    }
     await migrateFirestore({
       from: values.serviceAccountPath,
       all: true,
@@ -961,6 +1180,15 @@ export const globio = new Globio({
       profile: profileName
     });
   }
+  if (options.json) {
+    jsonOutput({
+      success: true,
+      project_id: activeProjectId,
+      project_name: activeProjectName,
+      api_key: activeProjectKey,
+      files_created: filesCreated
+    });
+  }
   console.log("");
   p5.outro(
     orange("\u21D2\u21D2") + "  Your project is ready.\n\n  " + muted("Next steps:") + `
@@ -973,9 +1201,22 @@ export const globio = new Globio({
 
 // src/commands/profiles.ts
 var version6 = getCliVersion();
-async function profilesList() {
+async function profilesList(options = {}) {
   const profiles2 = config.listProfiles();
   const active = config.getActiveProfile();
+  const wantsJson = options.json ?? process.argv.includes("--json");
+  if (wantsJson) {
+    jsonOutput(
+      profiles2.map((name) => {
+        const profile = config.getProfile(name);
+        return {
+          name,
+          email: profile?.account_email ?? null,
+          active: name === active
+        };
+      })
+    );
+  }
   if (!profiles2.length) {
     console.log(
       header(version6) + "  " + muted("No profiles. Run: globio login") + "\n"
@@ -1033,6 +1274,14 @@ async function servicesList(options = {}) {
       serviceStatuses = {};
     }
   }
+  if (options.json) {
+    jsonOutput(
+      Object.keys(SERVICE_DESCRIPTIONS).map((service) => ({
+        service,
+        enabled: serviceStatuses[service] ?? false
+      }))
+    );
+  }
   const rows = Object.entries(SERVICE_DESCRIPTIONS).map(([slug, desc]) => {
     const enabled = serviceStatuses[slug] ?? null;
     return [
@@ -1075,10 +1324,28 @@ var version8 = getCliVersion();
 function resolveProfileName3(profile) {
   return profile ?? config.getActiveProfile() ?? "default";
 }
+function parseJsonField(value) {
+  if (!value) return null;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}
 async function functionsList(options = {}) {
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
   const result = await client.code.listFunctions();
+  if (options.json) {
+    jsonOutput(
+      result.success ? result.data.map((fn) => ({
+        slug: fn.slug,
+        type: fn.type,
+        trigger_event: fn.trigger_event,
+        active: fn.active
+      })) : []
+    );
+  }
   if (!result.success || !result.data.length) {
     console.log(header(version8) + "  " + muted("No functions found.") + "\n");
     return;
@@ -1103,9 +1370,12 @@ async function functionsList(options = {}) {
   );
   console.log("");
 }
-async function functionsCreate(slug, _options = {}) {
+async function functionsCreate(slug, options = {}) {
   const filename = `${slug}.js`;
   if (existsSync3(filename)) {
+    if (options.json) {
+      jsonOutput({ success: false, file: filename, error: "File already exists" });
+    }
     console.log(inactive(`${filename} already exists.`));
     return;
   }
@@ -1125,6 +1395,9 @@ async function handler(input, globio) {
 }
 `;
   writeFileSync3(filename, template);
+  if (options.json) {
+    jsonOutput({ success: true, file: filename });
+  }
   console.log(green(`Created ${filename}`));
   console.log(muted(`Deploy with: npx @globio/cli functions deploy ${slug}`));
 }
@@ -1141,8 +1414,8 @@ async function functionsDeploy(slug, options) {
   const code = readFileSync4(filename, "utf-8");
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
-  const spinner2 = ora(`Deploying ${slug}...`).start();
   const existing = await client.code.getFunction(slug);
+  const spinner2 = options.json ? null : ora(`Deploying ${slug}...`).start();
   let result;
   if (existing.success) {
     result = await client.code.updateFunction(slug, {
@@ -1158,11 +1431,21 @@ async function functionsDeploy(slug, options) {
     });
   }
   if (!result.success) {
-    spinner2.fail("Deploy failed");
+    if (options.json) {
+      jsonOutput({ success: false, error: result.error.message });
+    }
+    spinner2?.fail("Deploy failed");
     console.error(result.error.message);
     process.exit(1);
   }
-  spinner2.succeed(existing.success ? `Updated ${slug}` : `Deployed ${slug}`);
+  if (options.json) {
+    jsonOutput({
+      success: true,
+      slug,
+      action: existing.success ? "updated" : "created"
+    });
+  }
+  spinner2?.succeed(existing.success ? `Updated ${slug}` : `Deployed ${slug}`);
 }
 async function functionsInvoke(slug, options) {
   let input = {};
@@ -1176,14 +1459,23 @@ async function functionsInvoke(slug, options) {
   }
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
-  const spinner2 = ora(`Invoking ${slug}...`).start();
+  const spinner2 = options.json ? null : ora(`Invoking ${slug}...`).start();
   const result = await client.code.invoke(slug, input);
-  spinner2.stop();
+  spinner2?.stop();
   if (!result.success) {
+    if (options.json) {
+      jsonOutput({ success: false, error: result.error.message });
+    }
     console.log(failure("Invocation failed"));
     console.error(result.error.message);
     return;
   }
+  if (options.json) {
+    jsonOutput({
+      result: result.data.result,
+      duration_ms: result.data.duration_ms
+    });
+  }
   console.log("");
   console.log(orange("Result:"));
   console.log(JSON.stringify(result.data.result, null, 2));
@@ -1195,6 +1487,21 @@ async function functionsLogs(slug, options) {
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
   const result = await client.code.getInvocations(slug, limit);
+  if (options.json) {
+    jsonOutput(
+      result.success ? result.data.map((invocation) => ({
+        id: invocation.id,
+        trigger_type: invocation.trigger_type,
+        duration_ms: invocation.duration_ms,
+        success: invocation.success,
+        invoked_at: invocation.invoked_at,
+        logs: parseJsonField(invocation.logs) ?? [],
+        error_message: invocation.error_message ?? null,
+        input: parseJsonField(invocation.input),
+        result: parseJsonField(invocation.result)
+      })) : []
+    );
+  }
   if (!result.success || !result.data.length) {
     console.log(header(version8) + "  " + muted("No invocations yet.") + "\n");
     return;
@@ -1225,35 +1532,152 @@ async function functionsLogs(slug, options) {
 async function functionsDelete(slug, options = {}) {
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
-  const spinner2 = ora(`Deleting ${slug}...`).start();
+  const spinner2 = options.json ? null : ora(`Deleting ${slug}...`).start();
   const result = await client.code.deleteFunction(slug);
   if (!result.success) {
-    spinner2.fail(`Delete failed for ${slug}`);
+    if (options.json) {
+      jsonOutput({ success: false, error: result.error.message });
+    }
+    spinner2?.fail(`Delete failed for ${slug}`);
     console.error(result.error.message);
     process.exit(1);
   }
-  spinner2.succeed(`Deleted ${slug}`);
+  if (options.json) {
+    jsonOutput({ success: true, slug });
+  }
+  spinner2?.succeed(`Deleted ${slug}`);
 }
 async function functionsToggle(slug, active, options = {}) {
   const profileName = resolveProfileName3(options.profile);
   const client = getClient(profileName);
-  const spinner2 = ora(
-    `${active ? "Enabling" : "Disabling"} ${slug}...`
-  ).start();
+  const spinner2 = options.json ? null : ora(`${active ? "Enabling" : "Disabling"} ${slug}...`).start();
   const result = await client.code.toggleFunction(slug, active);
   if (!result.success) {
-    spinner2.fail(`Toggle failed for ${slug}`);
+    if (options.json) {
+      jsonOutput({ success: false, error: result.error.message });
+    }
+    spinner2?.fail(`Toggle failed for ${slug}`);
     console.error(result.error.message);
     process.exit(1);
   }
-  spinner2.succeed(`${slug} is now ${active ? "active" : "inactive"}`);
+  if (options.json) {
+    jsonOutput({ success: true, slug, active });
+  }
+  spinner2?.succeed(`${slug} is now ${active ? "active" : "inactive"}`);
 }
 
-// src/index.ts
+// src/commands/watch.ts
+var BASE_URL2 = "https://api.globio.stanlink.online";
 var version9 = getCliVersion();
+async function functionsWatch(slug, options = {}) {
+  const profileName = options.profile ?? config.getActiveProfile();
+  const profile = config.getProfile(profileName ?? "default");
+  if (!profile?.project_api_key) {
+    console.log(
+      failure("No active project.") + reset + " Run: globio projects use <id>"
+    );
+    process.exit(1);
+  }
+  console.log(header(version9));
+  console.log(
+    "  " + orange("watching") + reset + " " + slug + dim(" \xB7 press Ctrl+C to stop") + "\n"
+  );
+  const res = await fetch(`${BASE_URL2}/code/functions/${slug}/watch`, {
+    headers: {
+      "X-Globio-Key": profile.project_api_key,
+      Accept: "text/event-stream"
+    }
+  });
+  if (!res.ok || !res.body) {
+    console.log(failure("Failed to connect to watch stream.") + reset);
+    process.exit(1);
+  }
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  process.on("SIGINT", () => {
+    console.log("\n" + dim("  Stream closed.") + "\n");
+    void reader.cancel();
+    process.exit(0);
+  });
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const chunks = buffer.split("\n\n");
+    buffer = chunks.pop() ?? "";
+    for (const chunk of chunks) {
+      const dataLine = chunk.split("\n").find((line) => line.startsWith("data: "));
+      if (!dataLine) continue;
+      try {
+        renderEvent(JSON.parse(dataLine.slice(6)));
+      } catch {
+      }
+    }
+  }
+}
+function renderEvent(event) {
+  if (event.type === "connected") {
+    console.log(
+      "  " + green("\u25CF") + reset + dim(" connected \u2014 waiting for invocations...\n")
+    );
+    return;
+  }
+  if (event.type === "heartbeat") {
+    return;
+  }
+  if (event.type === "timeout") {
+    console.log(
+      "\n" + dim("  Session timed out after 5 minutes.") + " Run again to resume.\n"
+    );
+    return;
+  }
+  if (event.type !== "invocation" || !event.invoked_at) {
+    return;
+  }
+  const time = new Date(event.invoked_at * 1e3).toISOString().replace("T", " ").slice(0, 19);
+  const status = event.success ? green("\u2713") : failure("\u2717");
+  const trigger = dim(`[${event.trigger_type ?? "http"}]`);
+  const duration = dim(`${event.duration_ms ?? 0}ms`);
+  console.log(
+    "  " + status + reset + " " + dim(time) + "  " + trigger + "  " + duration
+  );
+  if (event.input && event.input !== "{}") {
+    try {
+      console.log(
+        "  " + dim("  input   ") + muted(JSON.stringify(JSON.parse(event.input)))
+      );
+    } catch {
+    }
+  }
+  if (event.logs) {
+    try {
+      const logs = JSON.parse(event.logs);
+      for (const line of logs) {
+        console.log("  " + dim("  log     ") + reset + line);
+      }
+    } catch {
+    }
+  }
+  if (event.result && event.result !== "null") {
+    try {
+      console.log(
+        "  " + dim("  result  ") + muted(JSON.stringify(JSON.parse(event.result)))
+      );
+    } catch {
+    }
+  }
+  if (event.error_message) {
+    console.log("  " + dim("  error   ") + failure(event.error_message) + reset);
+  }
+  console.log("");
+}
+
+// src/index.ts
+var version10 = getCliVersion();
 var program = new Command();
-program.name("globio").description("The official Globio CLI").version(version9).addHelpText("beforeAll", () => {
-  printBanner(version9);
+program.name("globio").description("The official Globio CLI").version(version10).addHelpText("beforeAll", () => {
+  printBanner(version10);
   return "";
 }).addHelpText(
   "after",
@@ -1270,30 +1694,35 @@ Examples:
 Credentials are stored in ~/.globio/profiles/
 `
 );
-program.command("login").description("Log in to your Globio account").option("-p, --profile <name>", "Profile name", "default").option("--token", "Use a personal access token").action(login);
+program.command("login").description("Log in to your Globio account").option("-p, --profile <name>", "Profile name", "default").option("--token <pat>", "Personal access token (non-interactive)").option("--json", "Output as JSON").action(login);
 program.command("logout").description("Log out").option("--profile <name>", "Use a specific profile").action(logout);
-program.command("whoami").description("Show current account and project").option("--profile <name>", "Use a specific profile").action(whoami);
+program.command("whoami").description("Show current account and project").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(whoami);
 program.command("use <profile>").description("Switch active profile").action(useProfile);
-program.command("init").description("Initialize a Globio project").option("--profile <name>", "Use a specific profile").action(init);
-var profiles = program.command("profiles").description("Manage login profiles").action(profilesList);
-profiles.command("list").description("List all profiles").action(profilesList);
+program.command("init").description("Initialize a Globio project").option("-p, --profile <name>", "Profile name").option("--name <name>", "Project name").option("--slug <slug>", "Project slug").option("--org <orgId>", "Organization ID").option("--env <environment>", "Environment (development|staging|production)", "development").option("--no-migrate", "Skip Firebase migration prompt").option("--from <path>", "Firebase service account path (triggers migration)").option("--json", "Output as JSON").action(init);
+var profiles = program.command("profiles").description("Manage login profiles").option("--json", "Output as JSON").action(function() {
+  return profilesList(this.opts());
+});
+profiles.command("list").description("List all profiles").option("--json", "Output as JSON").action(function() {
+  return profilesList(this.opts());
+});
 var projects = program.command("projects").description("Manage projects");
-projects.command("list").description("List projects").option("--profile <name>", "Use a specific profile").action(projectsList);
-projects.command("create").description("Create a project").option("--profile <name>", "Use a specific profile").action(projectsCreate);
-projects.command("use <projectId>").description("Set active project").option("--profile <name>", "Use a specific profile").action(projectsUse);
-program.command("services").description("List available Globio services").option("--profile <name>", "Use a specific profile").action(servicesList);
+projects.command("list").description("List projects").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(projectsList);
+projects.command("create").description("Create a project").option("--name <name>", "Project name").option("--org <orgId>", "Organization ID").option("--env <environment>", "Environment", "development").option("-p, --profile <name>", "Profile name").option("--json", "Output as JSON").action(projectsCreate);
+projects.command("use <projectId>").description("Set active project").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(projectsUse);
+program.command("services").description("List available Globio services").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(servicesList);
 var functions = program.command("functions").alias("fn").description("Manage GlobalCode edge functions");
-functions.command("list").description("List all functions").option("--profile <name>", "Use a specific profile").action(functionsList);
-functions.command("create <slug>").description("Scaffold a new function file locally").option("--profile <name>", "Use a specific profile").action(functionsCreate);
-functions.command("deploy <slug>").description("Deploy a function to GlobalCode").option("-f, --file <path>", "Path to function file").option("-n, --name <name>", "Display name").option("--profile <name>", "Use a specific profile").action(functionsDeploy);
-functions.command("invoke <slug>").description("Invoke a function").option("-i, --input <json>", "JSON input payload").option("--profile <name>", "Use a specific profile").action(functionsInvoke);
-functions.command("logs <slug>").description("Show invocation history").option("-l, --limit <n>", "Number of entries", "20").option("--profile <name>", "Use a specific profile").action(functionsLogs);
-functions.command("delete <slug>").description("Delete a function").option("--profile <name>", "Use a specific profile").action(functionsDelete);
-functions.command("enable <slug>").description("Enable a function").option("--profile <name>", "Use a specific profile").action((slug, options) => functionsToggle(slug, true, options));
-functions.command("disable <slug>").description("Disable a function").option("--profile <name>", "Use a specific profile").action((slug, options) => functionsToggle(slug, false, options));
+functions.command("list").description("List all functions").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsList);
+functions.command("create <slug>").description("Scaffold a new function file locally").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsCreate);
+functions.command("deploy <slug>").description("Deploy a function to GlobalCode").option("-f, --file <path>", "Path to function file").option("-n, --name <name>", "Display name").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsDeploy);
+functions.command("invoke <slug>").description("Invoke a function").option("-i, --input <json>", "JSON input payload").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsInvoke);
+functions.command("logs <slug>").description("Show invocation history").option("-l, --limit <n>", "Number of entries", "20").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsLogs);
+functions.command("watch <slug>").description("Stream live function execution logs").option("--profile <name>", "Use a specific profile").action(functionsWatch);
+functions.command("delete <slug>").description("Delete a function").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(functionsDelete);
+functions.command("enable <slug>").description("Enable a function").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action((slug, options) => functionsToggle(slug, true, options));
+functions.command("disable <slug>").description("Disable a function").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action((slug, options) => functionsToggle(slug, false, options));
 var migrate = program.command("migrate").description("Migrate from Firebase to Globio");
-migrate.command("firestore").description("Migrate Firestore collections to GlobalDoc").requiredOption("--from <path>", "Path to Firebase service account JSON").option("--collection <name>", "Migrate a specific collection").option("--all", "Migrate all collections").option("--profile <name>", "Use a specific profile").action(migrateFirestore);
-migrate.command("firebase-storage").description("Migrate Firebase Storage to GlobalVault").requiredOption("--from <path>", "Path to Firebase service account JSON").requiredOption("--bucket <name>", "Firebase Storage bucket").option("--folder <path>", "Migrate a specific folder").option("--all", "Migrate all files").option("--profile <name>", "Use a specific profile").action(migrateFirebaseStorage);
+migrate.command("firestore").description("Migrate Firestore collections to GlobalDoc").requiredOption("--from <path>", "Path to Firebase service account JSON").option("--collection <name>", "Migrate a specific collection").option("--all", "Migrate all collections").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(migrateFirestore);
+migrate.command("firebase-storage").description("Migrate Firebase Storage to GlobalVault").requiredOption("--from <path>", "Path to Firebase service account JSON").requiredOption("--bucket <name>", "Firebase Storage bucket").option("--folder <path>", "Migrate a specific folder").option("--all", "Migrate all files").option("--profile <name>", "Use a specific profile").option("--json", "Output as JSON").action(migrateFirebaseStorage);
 async function main() {
   if (process.argv.length <= 2) {
     program.help();