@pmate/cli 0.21.10 → 0.21.12

package/dist/index.js

@@ -9435,8 +9435,8 @@ __export(index_exports, {
   parseCommandArgs: () => parseCommandArgs
 });
 module.exports = __toCommonJS(index_exports);
-var import_node_fs20 = require("fs");
-var import_node_path25 = __toESM(require("path"));
+var import_node_fs22 = require("fs");
+var import_node_path27 = __toESM(require("path"));
 var import_chalk4 = __toESM(require("chalk"));
 
 // src/cli.ts
@@ -14585,9 +14585,9 @@ ${indent}\`\`\``;
   static richTextToPlain(richText) {
     return richText.map((item) => item.plain_text ?? item.text?.content ?? "").join("").trim();
   }
-  static async requestJson(path26, init) {
+  static async requestJson(path28, init) {
     const token = this.getToken();
-    const response = await fetch(`${this.baseUrl}${path26}`, {
+    const response = await fetch(`${this.baseUrl}${path28}`, {
       method: init.method,
       headers: {
         Authorization: `Bearer ${token}`,
@@ -16223,8 +16223,8 @@ function descriptorPathSegments(descriptor) {
   return ["chains", normalized.chain, "namespaces", normalized.ns, normalized.kind, normalized.name];
 }
 function buildPathUrl(baseUrl, pathSegments, query) {
-  const path26 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
-  const url = new URL(path26, baseUrl);
+  const path28 = `/${pathSegments.map((segment) => encodeURIComponent(segment)).join("/")}`;
+  const url = new URL(path28, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       url.searchParams.set(key, String(value));
@@ -17575,7 +17575,7 @@ var import_node_readline = require("readline");
 var import_chalk3 = __toESM(require("chalk"));
 var ServiceRuntimeRunner = class {
   async deploy(service, options = {}) {
-    switch (service.runtimeType) {
+    switch (this.getType(service)) {
       case "vite":
         await this.deployVite(service, options);
         return;
@@ -17589,12 +17589,17 @@ var ServiceRuntimeRunner = class {
       case "python":
         await this.deployScriptManaged(service);
         return;
+      case "ios":
+      case "android":
+        throw new Error(
+          `Service type "${this.getType(service)}" is registry-only for now; deploy is not supported yet`
+        );
       default:
-        throw new Error(`Unsupported runtimeType for deploy: ${service.runtimeType}`);
+        throw new Error(`Unsupported service type for deploy: ${this.getType(service)}`);
     }
   }
   async init(service, options = {}) {
-    switch (service.runtimeType) {
+    switch (this.getType(service)) {
       case "vite":
       case "static":
         await this.initStaticLike(service);
@@ -17606,8 +17611,13 @@ var ServiceRuntimeRunner = class {
       case "python":
         await this.initServerApp(service, options, { ensurePackageJson: false });
         return;
+      case "ios":
+      case "android":
+        throw new Error(
+          `Service type "${this.getType(service)}" is registry-only for now; init is not supported yet`
+        );
       default:
-        throw new Error(`Unsupported runtimeType for init: ${service.runtimeType}`);
+        throw new Error(`Unsupported service type for init: ${this.getType(service)}`);
     }
   }
   async log(service, options = {}) {
@@ -17677,14 +17687,56 @@ var ServiceRuntimeRunner = class {
       }
     }
   }
-  getDeploy(service) {
-    return service.deploy ?? {};
+  isLegacy(service) {
+    return "runtimeType" in service;
+  }
+  getType(service) {
+    return this.isLegacy(service) ? service.runtimeType : service.type;
+  }
+  getSite(service) {
+    if (!this.isLegacy(service) && service.site) {
+      return service.site;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    return {
+      exposeType: "static-site",
+      repository: String(deploy.repository ?? ""),
+      dir: String(deploy.dir ?? ""),
+      bucket: String(deploy.bucket ?? ""),
+      domain: String(deploy.domain ?? ""),
+      ...deploy.subdomain ? { subdomain: deploy.subdomain } : {}
+    };
+  }
+  getNetwork(service) {
+    if (!this.isLegacy(service) && service.network) {
+      return service.network;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    const exposeType = deploy.port === void 0 ? "internal" : deploy.serviceType === "ws" ? "websocket" : "rest";
+    return {
+      exposeType,
+      repository: String(deploy.repository ?? ""),
+      dir: String(deploy.dir ?? ""),
+      server: String(deploy.server ?? ""),
+      ...deploy.port !== void 0 ? { port: Number(deploy.port) } : {},
+      ...deploy.domain ? { domain: deploy.domain } : {},
+      ...deploy.subdomain ? { subdomain: deploy.subdomain } : {}
+    };
+  }
+  getRunner(service) {
+    if (!this.isLegacy(service) && service.runner) {
+      return service.runner;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    return {
+      script: String(deploy.script ?? "")
+    };
   }
   resolveRepoRoot(service, cwd) {
     if (cwd) {
       return import_node_path23.default.resolve(process.cwd(), cwd);
     }
-    const repository = this.getDeploy(service).repository?.trim();
+    const repository = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).repository?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).repository?.trim();
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
@@ -17698,9 +17750,9 @@ var ServiceRuntimeRunner = class {
   }
   resolveLocalDir(service, cwd) {
     const repoRoot = this.resolveRepoRoot(service, cwd);
-    const dir = this.getDeploy(service).dir?.trim();
+    const dir = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).dir?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).dir?.trim();
     if (!dir) {
-      throw new Error(`Missing deploy.dir for ${service.id}`);
+      throw new Error(`Missing service dir for ${service.id}`);
     }
     return import_node_path23.default.resolve(repoRoot, dir);
   }
@@ -17720,9 +17772,10 @@ var ServiceRuntimeRunner = class {
     if (!(0, import_node_fs18.existsSync)(distDir)) {
       throw new Error(`No dist directory found at ${distDir}`);
     }
-    const bucketName = this.getDeploy(service).bucket?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     await AliyunService.uploadDirectory(distDir, bucketName);
   }
@@ -17732,29 +17785,30 @@ var ServiceRuntimeRunner = class {
     if (!(0, import_node_fs18.existsSync)(srcDir)) {
       throw new Error(`No src directory found at ${srcDir}`);
     }
-    const bucketName = this.getDeploy(service).bucket?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     await AliyunService.uploadDirectory(srcDir, bucketName);
   }
   async deployNode(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
+    const network = this.getNetwork(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
-    const port = deploy.port;
+    const port = network.port;
     if (port !== void 0 && (!Number.isFinite(port) || port <= 0)) {
-      throw new Error(`Invalid deploy.port for ${service.id}`);
+      throw new Error(`Invalid network.port for ${service.id}`);
     }
-    const appDir = deploy.dir?.trim();
+    const appDir = network.dir?.trim();
     if (!appDir) {
-      throw new Error(`Missing deploy.dir for ${service.id}`);
+      throw new Error(`Missing network.dir for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const repoUrl = this.getRepoUrl(repository);
@@ -17782,18 +17836,19 @@ var ServiceRuntimeRunner = class {
     await this.runRemoteCommand(server, command);
   }
   async deployScriptManaged(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
-    const script = deploy.script?.trim();
+    const network = this.getNetwork(service);
+    const runner = this.getRunner(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
+    const script = runner.script?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
     if (!script) {
-      throw new Error(`Missing deploy.script for ${service.id}`);
+      throw new Error(`Missing runner.script for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const repoUrl = this.getRepoUrl(repository);
@@ -17812,43 +17867,43 @@ var ServiceRuntimeRunner = class {
     await this.runRemoteCommand(server, command);
   }
   async initStaticLike(service) {
-    const deploy = this.getDeploy(service);
-    const bucketName = deploy.bucket?.trim();
-    const baseDomain = deploy.domain?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
+    const baseDomain = site.domain?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     if (!baseDomain) {
-      throw new Error(`Missing deploy.domain for ${service.id}`);
+      throw new Error(`Missing site.domain for ${service.id}`);
     }
     await setupStaticSiteBucket({
       bucketName,
       domainName: baseDomain,
-      subdomain: deploy.subdomain,
-      routeType: service.runtimeType === "vite" ? "spa" : "spa"
+      subdomain: site.subdomain,
+      routeType: this.getType(service) === "vite" ? "spa" : "spa"
     });
   }
   async initServerApp(service, options, config) {
-    const deploy = this.getDeploy(service);
-    const subdomain = deploy.subdomain?.trim();
-    const port = deploy.port;
-    const server = deploy.server?.trim();
-    const serviceType = (deploy.serviceType || "rest").trim();
+    const network = this.getNetwork(service);
+    const subdomain = "subdomain" in network ? network.subdomain?.trim() : void 0;
+    const port = network.port;
+    const server = network.server?.trim();
+    const exposeType = network.exposeType;
     if (subdomain && port === void 0) {
-      throw new Error(`Missing deploy.port for ${service.id} (required when subdomain is set)`);
+      throw new Error(`Missing network.port for ${service.id} (required when subdomain is set)`);
     }
     if (subdomain && !server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
-    if (serviceType !== "rest" && serviceType !== "ws") {
-      throw new Error(`Invalid deploy.serviceType for ${service.id}`);
+    if (!["rest", "rpc", "websocket", "internal"].includes(exposeType)) {
+      throw new Error(`Invalid network.exposeType for ${service.id}`);
     }
     if (subdomain) {
       const serverAddress = await resolveServerAddress(server);
-      const templateName = serviceType === "ws" ? "nginx.ws.template" : "nginx.rest.template";
+      const templateName = exposeType === "websocket" ? "nginx.ws.template" : "nginx.rest.template";
       const templatePath = this.resolveTemplatePath(templateName);
       const template = (0, import_node_fs18.readFileSync)(templatePath, "utf8");
-      const host = `${subdomain}.${deploy.domain?.trim() || "pmate.chat"}`;
+      const host = `${subdomain}.${("domain" in network ? network.domain?.trim() : void 0) || "pmate.chat"}`;
       const rendered = template.replace(/\$\{\{PORT\}\}/g, String(port)).replace(/\$\{\{HOSTS\}\}/g, host).replace(/\$\{\{HOST\}\}/g, host);
       const remotePath = `/etc/nginx/sites-enabled/${subdomain}.conf`;
       ui.info(`Uploading nginx config to ${server}`);
@@ -17856,7 +17911,7 @@ var ServiceRuntimeRunner = class {
       ui.success(`Uploaded nginx config to ${server}`, remotePath);
       await this.reloadNginx(server);
       ui.success(`Reloaded nginx on ${server}`);
-      const baseDomain = deploy.domain?.trim() || "pmate.chat";
+      const baseDomain = ("domain" in network ? network.domain?.trim() : void 0) || "pmate.chat";
       const existingA = await AliyunService.getARecordValue(baseDomain, subdomain);
       if (existingA) {
         if (existingA !== serverAddress) {
@@ -17899,18 +17954,19 @@ var ServiceRuntimeRunner = class {
     }
   }
   async showScriptLogs(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
-    const script = deploy.script?.trim();
+    const network = this.getNetwork(service);
+    const runner = this.getRunner(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
+    const script = runner.script?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
     if (!script) {
-      throw new Error(`Missing deploy.script for ${service.id}`);
+      throw new Error(`Missing runner.script for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
@@ -18306,9 +18362,9 @@ var ServiceRuntimeRunner = class {
     return tokens;
   }
   readPathValue(source, pathExpr) {
-    const path26 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
+    const path28 = pathExpr.split(".").map((segment) => segment.trim()).filter(Boolean);
     let cursor = source;
-    for (const segment of path26) {
+    for (const segment of path28) {
       if (!cursor || typeof cursor !== "object" || Array.isArray(cursor)) {
         return void 0;
       }
@@ -18480,9 +18536,6 @@ var ServiceRegistryClient = class {
       if (namespace && item.namespace !== namespace) {
         return false;
       }
-      if (server && item.deploy?.server?.trim() !== server) {
-        return false;
-      }
       return true;
     });
   }
@@ -18858,12 +18911,20 @@ var ServiceCommandHandler = class {
     if (!payload || typeof payload !== "object") {
       return;
     }
-    const deploy = payload.deploy;
-    if (!deploy || typeof deploy !== "object") {
-      return;
+    let serverValue;
+    let portValue;
+    const network = payload.network;
+    if (network && typeof network === "object") {
+      serverValue = network.server;
+      portValue = network.port;
+    } else {
+      const deploy = payload.deploy;
+      if (!deploy || typeof deploy !== "object") {
+        return;
+      }
+      serverValue = deploy.server;
+      portValue = deploy.port;
     }
-    const serverValue = deploy.server;
-    const portValue = deploy.port;
     const server = typeof serverValue === "string" ? serverValue.trim() : "";
     const port = typeof portValue === "number" ? portValue : typeof portValue === "string" && portValue.trim() ? Number(portValue) : void 0;
     if (!server || port === void 0 || !Number.isFinite(port)) {
@@ -18871,7 +18932,8 @@ var ServiceCommandHandler = class {
     }
     const services = await registry.listServices({ server });
     const conflict = services.find((service) => {
-      if (service.deploy?.port !== port) {
+      const servicePort = "network" in service && service.network && typeof service.network === "object" ? service.network.port : "deploy" in service && service.deploy && typeof service.deploy === "object" ? service.deploy.port : void 0;
+      if (servicePort !== port) {
         return false;
       }
       if (!currentService) {
@@ -19101,13 +19163,15 @@ var RoleCommandHandler = class {
 };
 
 // src/commands/AccountCommandHandler.ts
+var import_node_fs20 = require("fs");
+var import_node_path25 = __toESM(require("path"));
 init_sessionStore();
 var AccountCommandHandler = class {
   async handle(args) {
     const token = this.readToken();
-    const baseUrl = this.resolveBaseUrl(args.baseUrl);
     switch (args.action) {
       case "view": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
         const result = await this.request(
           baseUrl,
           token,
@@ -19118,6 +19182,7 @@ var AccountCommandHandler = class {
         return;
       }
       case "role-list": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
         const items = await this.request(
           baseUrl,
           token,
@@ -19128,6 +19193,7 @@ var AccountCommandHandler = class {
         return;
       }
       case "role-add": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
         const item = await this.request(
           baseUrl,
           token,
@@ -19144,6 +19210,7 @@ var AccountCommandHandler = class {
         return;
       }
       case "role-remove": {
+        const baseUrl = this.resolveAuthBaseUrl(args.baseUrl);
         await this.request(
           baseUrl,
           token,
@@ -19158,11 +19225,79 @@ var AccountCommandHandler = class {
         ui.success(`Removed ${args.role} for ${args.account} in ${args.namespace}`);
         return;
       }
+      case "visible-app-list": {
+        const baseUrl = this.resolveAppsBaseUrl(args.baseUrl);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/accounts/${encodeURIComponent(args.account)}/visible-apps`
+        );
+        this.renderStringList(result.items, args.json, "No visible apps found.");
+        return;
+      }
+      case "visible-app-add": {
+        const baseUrl = this.resolveAppsBaseUrl(args.baseUrl);
+        const item = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/accounts/${encodeURIComponent(args.account)}/visible-apps/${encodePathSegment(args.app)}`
+        );
+        ui.success(`Added visible app ${item.appId} for ${item.ownerId}`);
+        this.renderJson(item, args.json);
+        return;
+      }
+      case "visible-app-remove": {
+        const baseUrl = this.resolveAppsBaseUrl(args.baseUrl);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "DELETE",
+          `/accounts/${encodeURIComponent(args.account)}/visible-apps/${encodePathSegment(args.app)}`
+        );
+        ui.success(
+          result.removed ? `Removed visible app ${result.appId} for ${result.ownerId}` : `Visible app ${result.appId} was already absent for ${result.ownerId}`
+        );
+        this.renderJson(result, args.json);
+        return;
+      }
+      case "visible-app-set": {
+        const baseUrl = this.resolveAppsBaseUrl(args.baseUrl);
+        const items = this.resolveVisibleAppsInput(args);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/accounts/${encodeURIComponent(args.account)}/visible-apps`,
+          items
+        );
+        ui.success(`Updated visible apps for ${args.account}`);
+        this.renderJson(result.items, args.json);
+        return;
+      }
+      case "visible-app-resolve": {
+        const baseUrl = this.resolveAppsBaseUrl(args.baseUrl);
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          "/me/visible-apps"
+        );
+        this.renderJson(result.items, args.json);
+        if (!args.json) {
+          this.renderResolvedApps(result.items);
+        }
+        return;
+      }
     }
   }
-  resolveBaseUrl(baseUrl) {
+  resolveAuthBaseUrl(baseUrl) {
     return (baseUrl || process.env.PMATE_AUTH_API_BASE_URL || process.env.AUTH_API_BASE_URL || "https://auth-api-v2.pmate.chat").replace(/\/+$/, "");
   }
+  resolveAppsBaseUrl(baseUrl) {
+    return (baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
+  }
   readToken() {
     return readRequiredSession({
       preferredApp: DEFAULT_APP_ID,
@@ -19217,6 +19352,19 @@ var AccountCommandHandler = class {
       });
     }
   }
+  renderStringList(items, asJson, emptyMessage) {
+    if (asJson) {
+      ui.plain(JSON.stringify(items, null, 2));
+      return;
+    }
+    if (items.length === 0) {
+      ui.warn(emptyMessage);
+      return;
+    }
+    for (const item of items) {
+      ui.plain(item);
+    }
+  }
   renderAccountView(items, asJson) {
     if (asJson) {
       ui.plain(JSON.stringify(items, null, 2));
@@ -19247,7 +19395,293 @@ var AccountCommandHandler = class {
     }
     ui.plain(JSON.stringify(value, null, 2));
   }
+  renderResolvedApps(items) {
+    if (items.length === 0) {
+      ui.warn("No visible apps found.");
+      return;
+    }
+    for (const item of items) {
+      ui.plain(item.id);
+    }
+  }
+  resolveVisibleAppsInput(args) {
+    if (args.apps && args.apps.length > 0) {
+      return args.apps;
+    }
+    if (!args.filePath) {
+      throw new Error("Missing visible apps input");
+    }
+    const absolutePath = this.resolveFilePath(args.filePath);
+    if (!(0, import_node_fs20.existsSync)(absolutePath)) {
+      throw new Error(`JSON file not found: ${absolutePath}`);
+    }
+    const raw = (0, import_node_fs20.readFileSync)(absolutePath, "utf8");
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Invalid JSON in ${absolutePath}: ${message}`);
+    }
+    if (!Array.isArray(parsed) || parsed.some((item) => typeof item !== "string")) {
+      throw new Error(`Expected ${absolutePath} to contain a JSON string array`);
+    }
+    return parsed;
+  }
+  resolveFilePath(filePath) {
+    return import_node_path25.default.resolve(process.cwd(), filePath);
+  }
+};
+function encodePathSegment(value) {
+  return value.split("/").map((segment) => encodeURIComponent(segment)).join("/");
+}
+
+// src/commands/OrgCommandHandler.ts
+var import_node_fs21 = require("fs");
+var import_node_path26 = __toESM(require("path"));
+init_sessionStore();
+var OrgCommandHandler = class {
+  async handle(args) {
+    const token = this.readToken();
+    const baseUrl = this.resolveBaseUrl(args.baseUrl);
+    switch (args.action) {
+      case "list": {
+        const result = await this.request(baseUrl, token, "GET", "/orgs");
+        this.renderJson(result.items, args.json);
+        if (!args.json) {
+          this.renderOrgList(result.items);
+        }
+        return;
+      }
+      case "get":
+      case "view": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/orgs/${encodeURIComponent(args.orgId)}`
+        );
+        this.renderJson(record, true);
+        return;
+      }
+      case "create": {
+        const record = await this.request(baseUrl, token, "POST", "/orgs", {
+          id: args.orgId,
+          displayName: args.displayName,
+          members: args.members
+        });
+        ui.success(`Created org ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "update": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "PATCH",
+          `/orgs/${encodeURIComponent(args.orgId)}`,
+          {
+            ...args.displayName !== void 0 ? { displayName: args.displayName } : {}
+          }
+        );
+        ui.success(`Updated org ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "disable": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "DELETE",
+          `/orgs/${encodeURIComponent(args.orgId)}`
+        );
+        ui.success(`Disabled org ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "member-list": {
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/orgs/${encodeURIComponent(args.orgId)}/members`
+        );
+        this.renderStringList(result.items, args.json, "No members found.");
+        return;
+      }
+      case "member-add": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/orgs/${encodeURIComponent(args.orgId)}/members/${encodeURIComponent(args.account)}`
+        );
+        ui.success(`Added ${args.account} to ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "member-remove": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "DELETE",
+          `/orgs/${encodeURIComponent(args.orgId)}/members/${encodeURIComponent(args.account)}`
+        );
+        ui.success(`Removed ${args.account} from ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "member-set": {
+        const accounts = this.resolveStringArrayInput(args.accounts, args.filePath, "account");
+        const record = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/orgs/${encodeURIComponent(args.orgId)}/members`,
+          accounts
+        );
+        ui.success(`Updated members for ${record.id}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "visible-app-list": {
+        const result = await this.request(
+          baseUrl,
+          token,
+          "GET",
+          `/orgs/${encodeURIComponent(args.orgId)}/visible-apps`
+        );
+        this.renderStringList(result.items, args.json, "No visible apps found.");
+        return;
+      }
+      case "visible-app-add": {
+        const record = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/orgs/${encodeURIComponent(args.orgId)}/visible-apps/${encodePathSegment2(args.app)}`
+        );
+        ui.success(`Added visible app ${record.appId} to ${args.orgId}`);
+        this.renderJson(record, args.json);
+        return;
+      }
+      case "visible-app-remove": {
+        const result = await this.request(
+          baseUrl,
+          token,
+          "DELETE",
+          `/orgs/${encodeURIComponent(args.orgId)}/visible-apps/${encodePathSegment2(args.app)}`
+        );
+        ui.success(
+          result.removed ? `Removed visible app ${result.appId} from ${result.ownerId}` : `Visible app ${result.appId} was already absent from ${result.ownerId}`
+        );
+        this.renderJson(result, args.json);
+        return;
+      }
+      case "visible-app-set": {
+        const apps = this.resolveStringArrayInput(args.apps, args.filePath, "app ref");
+        const result = await this.request(
+          baseUrl,
+          token,
+          "PUT",
+          `/orgs/${encodeURIComponent(args.orgId)}/visible-apps`,
+          apps
+        );
+        ui.success(`Updated visible apps for ${args.orgId}`);
+        this.renderJson(result.items, args.json);
+        return;
+      }
+    }
+  }
+  resolveBaseUrl(baseUrl) {
+    return (baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
+  }
+  readToken() {
+    return readRequiredSession({
+      preferredApp: DEFAULT_APP_ID,
+      fallbackToActiveApp: true
+    }).token;
+  }
+  resolveStringArrayInput(values, filePath, itemLabel) {
+    if (values && values.length > 0) {
+      return values;
+    }
+    if (!filePath) {
+      throw new Error(`Missing ${itemLabel} input`);
+    }
+    const absolutePath = import_node_path26.default.resolve(process.cwd(), filePath);
+    if (!(0, import_node_fs21.existsSync)(absolutePath)) {
+      throw new Error(`JSON file not found: ${absolutePath}`);
+    }
+    const raw = (0, import_node_fs21.readFileSync)(absolutePath, "utf8");
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Invalid JSON in ${absolutePath}: ${message}`);
+    }
+    if (!Array.isArray(parsed) || parsed.some((item) => typeof item !== "string")) {
+      throw new Error(`Expected ${absolutePath} to contain a JSON string array`);
+    }
+    return parsed;
+  }
+  async request(baseUrl, token, method, pathname, body) {
+    const response = await fetch(`${baseUrl}${pathname}`, {
+      method,
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      ...body !== void 0 ? { body: JSON.stringify(body) } : {}
+    });
+    let payload = null;
+    try {
+      payload = await response.json();
+    } catch {
+      payload = null;
+    }
+    if (!response.ok || !payload?.success) {
+      throw new Error(payload?.message || `Request failed with status ${response.status}`);
+    }
+    return payload.data;
+  }
+  renderOrgList(items) {
+    if (items.length === 0) {
+      ui.warn("No orgs found.");
+      return;
+    }
+    for (const item of items) {
+      ui.info(item.id, {
+        displayName: item.displayName,
+        status: item.status,
+        members: item.members
+      });
+    }
+  }
+  renderStringList(items, asJson, emptyMessage) {
+    if (asJson) {
+      ui.plain(JSON.stringify(items, null, 2));
+      return;
+    }
+    if (items.length === 0) {
+      ui.warn(emptyMessage);
+      return;
+    }
+    for (const item of items) {
+      ui.plain(item);
+    }
+  }
+  renderJson(value, asJson) {
+    if (!asJson) {
+      return;
+    }
+    ui.plain(JSON.stringify(value, null, 2));
+  }
 };
+function encodePathSegment2(value) {
+  return value.split("/").map((segment) => encodeURIComponent(segment)).join("/");
+}
 
 // src/agentCommandParser.ts
 init_namespacedRef();
@@ -21020,6 +21454,7 @@ function requireValue7(tokens, optionName) {
 }
 
 // src/accountCommandParser.ts
+init_namespacedRef();
 function parseAccountArgs(tokens) {
   const rest = [...tokens];
   const action = rest.shift();
@@ -21077,6 +21512,102 @@ function parseAccountArgs(tokens) {
       json: json2
     };
   }
+  if (action === "visible-app") {
+    const visibleAction = rest.shift();
+    if (!visibleAction) {
+      throw new Error("Missing account visible-app action. Use: account visible-app list|add|remove|set|resolve");
+    }
+    let account2;
+    let app;
+    const apps = [];
+    let filePath;
+    let baseUrl2;
+    let json2 = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--account":
+          account2 = requireValue8(rest, token);
+          break;
+        case "--app":
+          app = parseNamespacedRef(requireValue8(rest, token), {
+            entityLabel: "app ref"
+          }).fullId;
+          apps.push(app);
+          break;
+        case "--file":
+          filePath = requireValue8(rest, token);
+          break;
+        case "--base-url":
+          baseUrl2 = requireValue8(rest, token);
+          break;
+        case "--json":
+          json2 = true;
+          break;
+        default:
+          throw new Error(`Unknown account visible-app option: ${token}`);
+      }
+    }
+    if (visibleAction === "resolve") {
+      if (account2 || app || apps.length > 0 || filePath) {
+        throw new Error(
+          "Usage: account visible-app resolve [--base-url <url>] [--json]"
+        );
+      }
+      return {
+        type: "account" /* Account */,
+        action: "visible-app-resolve",
+        baseUrl: baseUrl2,
+        json: json2
+      };
+    }
+    if (visibleAction === "list") {
+      if (!account2) {
+        throw new Error(
+          "Usage: account visible-app list --account <id> [--base-url <url>] [--json]"
+        );
+      }
+      return {
+        type: "account" /* Account */,
+        action: "visible-app-list",
+        account: account2,
+        baseUrl: baseUrl2,
+        json: json2
+      };
+    }
+    if (visibleAction === "add" || visibleAction === "remove") {
+      if (!account2 || !app) {
+        throw new Error(
+          `Usage: account visible-app ${visibleAction} --account <id> --app <ns:app> [--base-url <url>] [--json]`
+        );
+      }
+      return {
+        type: "account" /* Account */,
+        action: visibleAction === "add" ? "visible-app-add" : "visible-app-remove",
+        account: account2,
+        app,
+        baseUrl: baseUrl2,
+        json: json2
+      };
+    }
+    if (visibleAction === "set") {
+      if (!account2 || apps.length === 0 && !filePath || apps.length > 0 && filePath) {
+        throw new Error(
+          "Usage: account visible-app set --account <id> (--app <ns:app> ... | --file <path>) [--base-url <url>] [--json]"
+        );
+      }
+      return {
+        type: "account" /* Account */,
+        action: "visible-app-set",
+        account: account2,
+        apps: apps.length > 0 ? apps : void 0,
+        filePath,
+        baseUrl: baseUrl2,
+        json: json2
+      };
+    }
+    throw new Error(`Unknown account visible-app action: ${visibleAction}`);
+  }
   if (action !== "role") {
     throw new Error(`Unknown account action: ${action}`);
   }
@@ -21152,6 +21683,283 @@ function requireValue8(tokens, optionName) {
   return value;
 }
 
+// src/orgCommandParser.ts
+init_namespacedRef();
+function parseOrgArgs(tokens) {
+  const rest = [...tokens];
+  const rawAction = rest.shift();
+  const action = rawAction === "view" ? "view" : rawAction;
+  if (!action) {
+    throw new Error(
+      "Missing org action. Use: org list|get|view|create|update|disable|member|visible-app"
+    );
+  }
+  let baseUrl;
+  let json = false;
+  const takeSharedOptions4 = () => {
+    while (rest.length > 0) {
+      const token = rest[0];
+      if (token === "--base-url") {
+        rest.shift();
+        baseUrl = requireValue9(rest, token);
+        continue;
+      }
+      if (token === "--json") {
+        rest.shift();
+        json = true;
+        continue;
+      }
+      break;
+    }
+  };
+  if (action === "list") {
+    takeSharedOptions4();
+    if (rest.length > 0) {
+      throw new Error(`Unknown org list option: ${rest[0]}`);
+    }
+    return { type: "org" /* Org */, action, baseUrl, json };
+  }
+  if (action === "get" || action === "view" || action === "disable") {
+    const orgId = parseRequiredOrgRef(rest.shift(), action);
+    takeSharedOptions4();
+    if (rest.length > 0) {
+      throw new Error(`Unknown org ${action} option: ${rest[0]}`);
+    }
+    return { type: "org" /* Org */, action, orgId, baseUrl, json };
+  }
+  if (action === "create") {
+    const orgId = parseRequiredOrgRef(rest.shift(), action);
+    let displayName;
+    const members = [];
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--display-name":
+          displayName = requireValue9(rest, token);
+          break;
+        case "--member":
+          members.push(requireValue9(rest, token));
+          break;
+        case "--base-url":
+          baseUrl = requireValue9(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown org create option: ${token}`);
+      }
+    }
+    if (!displayName) {
+      throw new Error(
+        "Usage: org create <ns:org> --display-name <name> [--member <id> ...] [--base-url <url>] [--json]"
+      );
+    }
+    return {
+      type: "org" /* Org */,
+      action,
+      orgId,
+      displayName,
+      members,
+      baseUrl,
+      json
+    };
+  }
+  if (action === "update") {
+    const orgId = parseRequiredOrgRef(rest.shift(), action);
+    let displayName;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--display-name":
+          displayName = requireValue9(rest, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue9(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown org update option: ${token}`);
+      }
+    }
+    if (displayName === void 0) {
+      throw new Error(
+        "Usage: org update <ns:org> --display-name <name> [--base-url <url>] [--json]"
+      );
+    }
+    return {
+      type: "org" /* Org */,
+      action,
+      orgId,
+      displayName,
+      baseUrl,
+      json
+    };
+  }
+  if (action === "member") {
+    return parseOrgMemberArgs(rest);
+  }
+  if (action === "visible-app") {
+    return parseOrgVisibleAppArgs(rest);
+  }
+  throw new Error(`Unknown org action: ${action}`);
+  function parseOrgMemberArgs(memberTokens) {
+    const subAction = memberTokens.shift();
+    if (!subAction) {
+      throw new Error("Missing org member action. Use: org member list|add|remove|set");
+    }
+    const orgId = parseRequiredOrgRef(memberTokens.shift(), `member ${subAction}`);
+    let account;
+    const accounts = [];
+    let filePath;
+    while (memberTokens.length > 0) {
+      const token = memberTokens.shift();
+      switch (token) {
+        case "--account": {
+          const value = requireValue9(memberTokens, token);
+          account = value;
+          accounts.push(value);
+          break;
+        }
+        case "--file":
+          filePath = requireValue9(memberTokens, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue9(memberTokens, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown org member option: ${token}`);
+      }
+    }
+    if (subAction === "list") {
+      return { type: "org" /* Org */, action: "member-list", orgId, baseUrl, json };
+    }
+    if (subAction === "add" || subAction === "remove") {
+      if (!account) {
+        throw new Error(
+          `Usage: org member ${subAction} <ns:org> --account <id> [--base-url <url>] [--json]`
+        );
+      }
+      return {
+        type: "org" /* Org */,
+        action: subAction === "add" ? "member-add" : "member-remove",
+        orgId,
+        account,
+        baseUrl,
+        json
+      };
+    }
+    if (subAction === "set") {
+      if (accounts.length === 0 && !filePath || accounts.length > 0 && filePath) {
+        throw new Error(
+          "Usage: org member set <ns:org> (--account <id> ... | --file <path>) [--base-url <url>] [--json]"
+        );
+      }
+      return {
+        type: "org" /* Org */,
+        action: "member-set",
+        orgId,
+        accounts: accounts.length > 0 ? accounts : void 0,
+        filePath,
+        baseUrl,
+        json
+      };
+    }
+    throw new Error(`Unknown org member action: ${subAction}`);
+  }
+  function parseOrgVisibleAppArgs(visibleTokens) {
+    const subAction = visibleTokens.shift();
+    if (!subAction) {
+      throw new Error(
+        "Missing org visible-app action. Use: org visible-app list|add|remove|set"
+      );
+    }
+    const orgId = parseRequiredOrgRef(visibleTokens.shift(), `visible-app ${subAction}`);
+    let app;
+    const apps = [];
+    let filePath;
+    while (visibleTokens.length > 0) {
+      const token = visibleTokens.shift();
+      switch (token) {
+        case "--app": {
+          const value = parseNamespacedRef(requireValue9(visibleTokens, token), {
+            entityLabel: "app ref"
+          }).fullId;
+          app = value;
+          apps.push(value);
+          break;
+        }
+        case "--file":
+          filePath = requireValue9(visibleTokens, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue9(visibleTokens, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown org visible-app option: ${token}`);
+      }
+    }
+    if (subAction === "list") {
+      return { type: "org" /* Org */, action: "visible-app-list", orgId, baseUrl, json };
+    }
+    if (subAction === "add" || subAction === "remove") {
+      if (!app) {
+        throw new Error(
+          `Usage: org visible-app ${subAction} <ns:org> --app <ns:app> [--base-url <url>] [--json]`
+        );
+      }
+      return {
+        type: "org" /* Org */,
+        action: subAction === "add" ? "visible-app-add" : "visible-app-remove",
+        orgId,
+        app,
+        baseUrl,
+        json
+      };
+    }
+    if (subAction === "set") {
+      if (apps.length === 0 && !filePath || apps.length > 0 && filePath) {
+        throw new Error(
+          "Usage: org visible-app set <ns:org> (--app <ns:app> ... | --file <path>) [--base-url <url>] [--json]"
+        );
+      }
+      return {
+        type: "org" /* Org */,
+        action: "visible-app-set",
+        orgId,
+        apps: apps.length > 0 ? apps : void 0,
+        filePath,
+        baseUrl,
+        json
+      };
+    }
+    throw new Error(`Unknown org visible-app action: ${subAction}`);
+  }
+}
+function parseRequiredOrgRef(value, action) {
+  if (!value || value.startsWith("-")) {
+    throw new Error(`Usage: org ${action} <ns:org>`);
+  }
+  return parseNamespacedRef(value, {
+    entityLabel: "org ref"
+  }).fullId;
+}
+function requireValue9(tokens, optionName) {
+  const value = tokens.shift();
+  if (!value || value.startsWith("-")) {
+    throw new Error(`Missing value for ${optionName}`);
+  }
+  return value;
+}
+
 // src/collectCommandParser.ts
 function parseCollectArgs(tokens) {
   const rest = [...tokens];
@@ -21170,7 +21978,7 @@ function parseCollectArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--source": {
-        const value = requireValue9(rest, token);
+        const value = requireValue10(rest, token);
         if (value !== "cc" && value !== "yelling") {
           throw new Error(`Unsupported collect source: ${value}`);
         }
@@ -21178,7 +21986,7 @@ function parseCollectArgs(tokens) {
         break;
       }
       case "--endpoint":
-        options.endpoint = requireValue9(rest, token);
+        options.endpoint = requireValue10(rest, token);
         break;
       default:
         throw new Error(`Unknown collect option: ${token}`);
@@ -21194,7 +22002,7 @@ function parseCollectArgs(tokens) {
   }
   return { type: "collect" /* Collect */, ...options };
 }
-function requireValue9(tokens, optionName) {
+function requireValue10(tokens, optionName) {
   const value = tokens.shift();
   if (!value) {
     throw new Error(`Missing value for ${optionName}`);
@@ -21229,7 +22037,7 @@ function parsePrepareDevArgs(tokens) {
         close = true;
         break;
       case "--env": {
-        const rawValue = requireValue10(rest, token);
+        const rawValue = requireValue11(rest, token);
         const parsed = Number.parseInt(rawValue, 10);
         if (!Number.isInteger(parsed) || parsed < 0) {
           throw new Error(`Invalid --env value: ${rawValue}`);
@@ -21238,13 +22046,13 @@ function parsePrepareDevArgs(tokens) {
         break;
       }
       case "--env-root":
-        envRoot = requireValue10(rest, token);
+        envRoot = requireValue11(rest, token);
         break;
       case "--base-root":
-        baseRoot = requireValue10(rest, token);
+        baseRoot = requireValue11(rest, token);
         break;
       case "--note":
-        note = requireValue10(rest, token);
+        note = requireValue11(rest, token);
         break;
       case "--json":
         json = true;
@@ -21280,7 +22088,7 @@ function parsePrepareDevArgs(tokens) {
     json
   };
 }
-function requireValue10(tokens, option) {
+function requireValue11(tokens, option) {
   const value = tokens.shift();
   if (!value || value.startsWith("-")) {
     throw new Error(`Missing value for ${option}`);
@@ -21290,7 +22098,7 @@ function requireValue10(tokens, option) {
 
 // src/index.ts
 var pkg = JSON.parse(
-  (0, import_node_fs20.readFileSync)(import_node_path25.default.resolve(__dirname, "..", "package.json"), "utf8")
+  (0, import_node_fs22.readFileSync)(import_node_path27.default.resolve(__dirname, "..", "package.json"), "utf8")
 );
 var HELP_TEXT = [
   import_chalk4.default.bold(`pmate v${pkg.version}`),
@@ -21406,7 +22214,27 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  role list --account <id> [--namespace <ns>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  role add --account <id> --namespace <ns> --role <role> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  role remove --account <id> --namespace <ns> --role <role> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app list --account <id> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app add --account <id> --app <ns:app> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app remove --account <id> --app <ns:app> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app set --account <id> (--app <ns:app> ... | --file <path>) [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app resolve [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://auth-api-v2.pmate.chat")}`,
+  `  ${import_chalk4.default.cyan("org")}              Manage orgs, org members, and org visible apps via apps-api`,
+  `  ${import_chalk4.default.gray("                  list [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  get <ns:org> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  create <ns:org> --display-name <name> [--member <id> ...] [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  update <ns:org> --display-name <name> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  disable <ns:org> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  member list <ns:org> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  member add <ns:org> --account <id> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  member remove <ns:org> --account <id> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  member set <ns:org> (--account <id> ... | --file <path>) [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app list <ns:org> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app add <ns:org> --app <ns:app> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app remove <ns:org> --app <ns:app> [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  visible-app set <ns:org> (--app <ns:app> ... | --file <path>) [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  default base URL: https://apps-api.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("store")}            Manage @pmate/store namespaces, tables, and kv stores`,
   `  ${import_chalk4.default.gray("                  namespace list [--chain <chain>] [--indexer-base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  table list|get|exists|create|update|delete <name> [options]")}`,
@@ -21498,7 +22326,7 @@ function parseCommandArgs(args) {
       const token = rest.shift();
       switch (token) {
         case "--app":
-          app = requireValue11(rest, token);
+          app = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown login option: ${token}`);
@@ -21575,6 +22403,9 @@ function parseCommandArgs(args) {
   if (args.rest[0] === "account") {
     return parseAccountArgs(args.rest.slice(1));
   }
+  if (args.rest[0] === "org") {
+    return parseOrgArgs(args.rest.slice(1));
+  }
   if (args.rest[0] === "store") {
     return parseStoreArgs(args.rest.slice(1));
   }
@@ -21601,7 +22432,7 @@ function parseVercelArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
-          scope = requireValue11(rest, token);
+          scope = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown vercel option: ${token}`);
@@ -21621,10 +22452,10 @@ function parseVercelArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
-          scope = requireValue11(rest, token);
+          scope = requireValue12(rest, token);
           break;
         case "--project":
-          project = requireValue11(rest, token);
+          project = requireValue12(rest, token);
           break;
         case "--last-week":
           lastWeek = true;
@@ -21655,16 +22486,16 @@ function parseAddDnsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--type":
-        options.dnsType = requireValue11(rest, token);
+        options.dnsType = requireValue12(rest, token);
         break;
       case "--value":
-        options.dnsValue = requireValue11(rest, token);
+        options.dnsValue = requireValue12(rest, token);
         break;
       case "--rr":
-        options.dnsRr = requireValue11(rest, token);
+        options.dnsRr = requireValue12(rest, token);
         break;
       case "--ttl": {
-        const ttlValue = requireValue11(rest, token);
+        const ttlValue = requireValue12(rest, token);
         const ttl = Number.parseInt(ttlValue, 10);
         if (!Number.isFinite(ttl) || ttl <= 0) {
           throw new Error(`Invalid --ttl value: ${ttlValue}`);
@@ -21673,7 +22504,7 @@ function parseAddDnsArgs(tokens) {
         break;
       }
       case "--domain":
-        options.dnsDomain = requireValue11(rest, token);
+        options.dnsDomain = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown add-dns option: ${token}`);
@@ -21706,13 +22537,13 @@ function parseBucketArgs(tokens) {
         options.bucketCreate = true;
         break;
       case "--name":
-        options.bucketName = requireValue11(rest, token);
+        options.bucketName = requireValue12(rest, token);
         break;
       case "--subdomain":
-        options.bucketSubdomain = requireValue11(rest, token);
+        options.bucketSubdomain = requireValue12(rest, token);
         break;
       case "--domain":
-        options.bucketDomain = requireValue11(rest, token);
+        options.bucketDomain = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown bucket option: ${token}`);
@@ -21744,7 +22575,7 @@ function parseDevArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--cwd":
-        options.devCwd = requireValue11(rest, token);
+        options.devCwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown dev option: ${token}`);
@@ -21764,7 +22595,7 @@ function parseDeleteArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--cwd":
-        deleteCwd = requireValue11(rest, token);
+        deleteCwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown delete option: ${token}`);
@@ -21798,13 +22629,13 @@ function parseOssArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--bucket":
-        bucket = requireValue11(rest, token);
+        bucket = requireValue12(rest, token);
         break;
       case "--file":
-        filePath = requireValue11(rest, token);
+        filePath = requireValue12(rest, token);
         break;
       case "--key":
-        objectKey = requireValue11(rest, token);
+        objectKey = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown oss option: ${token}`);
@@ -21837,7 +22668,7 @@ function parseEnvArgs(tokens) {
           throw new Error("Only one env action is allowed.");
         }
         action = "set";
-        key = requireValue11(rest, token);
+        key = requireValue12(rest, token);
         break;
       case "--list":
         if (action) {
@@ -21850,17 +22681,17 @@ function parseEnvArgs(tokens) {
           throw new Error("Only one env action is allowed.");
         }
         action = "delete";
-        key = requireValue11(rest, token);
+        key = requireValue12(rest, token);
         break;
       case "--value":
-        value = requireValue11(rest, token);
+        value = requireValue12(rest, token);
         break;
       case "--verbose":
       case "-v":
         verbose = true;
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown env option: ${token}`);
@@ -21918,7 +22749,7 @@ function parseCommitArgs(tokens) {
         push = true;
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown commit option: ${token}`);
@@ -21934,10 +22765,10 @@ function parseSummaryArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--pr":
-        prRef = requireValue11(rest, token);
+        prRef = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown summary option: ${token}`);
@@ -21962,13 +22793,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz create-draft option: ${token}`);
@@ -21994,16 +22825,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--file":
-          filePath = requireValue11(rest, token);
+          filePath = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz update-meta option: ${token}`);
@@ -22033,16 +22864,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--file":
-          filePath = requireValue11(rest, token);
+          filePath = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz append-step option: ${token}`);
@@ -22073,19 +22904,19 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--step-id":
-          stepId = requireValue11(rest, token);
+          stepId = requireValue12(rest, token);
           break;
         case "--file":
-          filePath = requireValue11(rest, token);
+          filePath = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz update-step option: ${token}`);
@@ -22119,16 +22950,16 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--step-ids":
-          stepIdsRaw = requireValue11(rest, token);
+          stepIdsRaw = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz reorder option: ${token}`);
@@ -22161,13 +22992,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz activate option: ${token}`);
@@ -22192,13 +23023,13 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown quiz view option: ${token}`);
@@ -22227,22 +23058,22 @@ function parseQuizArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--paper-id":
-          paperId = requireValue11(rest, token);
+          paperId = requireValue12(rest, token);
           break;
         case "--step-id":
-          stepId = requireValue11(rest, token);
+          stepId = requireValue12(rest, token);
           break;
         case "--file":
-          filePath = requireValue11(rest, token);
+          filePath = requireValue12(rest, token);
           break;
         case "--new-paper-id":
-          newPaperId = requireValue11(rest, token);
+          newPaperId = requireValue12(rest, token);
           break;
         case "--base-url":
-          apiBaseUrl = requireValue11(rest, token);
+          apiBaseUrl = requireValue12(rest, token);
           break;
         case "--link-base":
-          linkBaseUrl = requireValue11(rest, token);
+          linkBaseUrl = requireValue12(rest, token);
           break;
         case "--activate":
           activate = true;
@@ -22332,10 +23163,10 @@ function parseLinearPrArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22364,35 +23195,35 @@ function parseLinearCreateArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--repl":
         useRepl = true;
         break;
       case "--title":
-        title = requireValue11(rest, token);
+        title = requireValue12(rest, token);
         break;
       case "--desc":
       case "--description":
-        description = decodeEscapedNewlines(requireValue11(rest, token));
+        description = decodeEscapedNewlines(requireValue12(rest, token));
         break;
       case "--team-id":
-        teamId = requireValue11(rest, token);
+        teamId = requireValue12(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue11(rest, token);
+        teamKey = requireValue12(rest, token);
         break;
       case "--priority":
-        priority = parseLinearPriority(requireValue11(rest, token));
+        priority = parseLinearPriority(requireValue12(rest, token));
         break;
       case "--parent-id":
-        parentId = requireValue11(rest, token);
+        parentId = requireValue12(rest, token);
         break;
       case "--state-id":
-        stateId = requireValue11(rest, token);
+        stateId = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22427,10 +23258,10 @@ function parseLinearWhoamiArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22455,10 +23286,10 @@ function parseLinearViewArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22493,32 +23324,32 @@ function parseLinearUpdateArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--title":
-        title = requireValue11(rest, token);
+        title = requireValue12(rest, token);
         break;
       case "--desc":
       case "--description":
-        description = decodeEscapedNewlines(requireValue11(rest, token));
+        description = decodeEscapedNewlines(requireValue12(rest, token));
         break;
       case "--team-id":
-        teamId = requireValue11(rest, token);
+        teamId = requireValue12(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue11(rest, token);
+        teamKey = requireValue12(rest, token);
         break;
       case "--priority":
-        priority = parseLinearPriority(requireValue11(rest, token));
+        priority = parseLinearPriority(requireValue12(rest, token));
         break;
       case "--parent-id":
-        parentId = requireValue11(rest, token);
+        parentId = requireValue12(rest, token);
         break;
       case "--state-id":
-        stateId = requireValue11(rest, token);
+        stateId = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22556,10 +23387,10 @@ function parseLinearSubIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22586,15 +23417,15 @@ function parseLinearCommentArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--body":
       case "--desc":
       case "--description":
-        body = decodeEscapedNewlines(requireValue11(rest, token));
+        body = decodeEscapedNewlines(requireValue12(rest, token));
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22624,10 +23455,10 @@ function parseLinearCommentsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22651,16 +23482,16 @@ function parseLinearCycleArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--team-id":
-        teamId = requireValue11(rest, token);
+        teamId = requireValue12(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue11(rest, token);
+        teamKey = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22683,10 +23514,10 @@ function parseLinearTeamsArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22713,16 +23544,16 @@ function parseLinearUserIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cycle":
-        cycle = parseLinearCycle(requireValue11(rest, token));
+        cycle = parseLinearCycle(requireValue12(rest, token));
         break;
       case "--status":
-        status = parseLinearStatus(requireValue11(rest, token));
+        status = parseLinearStatus(requireValue12(rest, token));
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22756,28 +23587,28 @@ function parseLinearIssuesArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--team-id":
-        teamId = requireValue11(rest, token);
+        teamId = requireValue12(rest, token);
         break;
       case "--team-key":
-        teamKey = requireValue11(rest, token);
+        teamKey = requireValue12(rest, token);
         break;
       case "--user":
-        user = requireValue11(rest, token);
+        user = requireValue12(rest, token);
         break;
       case "--cycle":
-        cycle = parseLinearCycle(requireValue11(rest, token));
+        cycle = parseLinearCycle(requireValue12(rest, token));
         break;
       case "--status":
-        status = parseLinearStatus(requireValue11(rest, token));
+        status = parseLinearStatus(requireValue12(rest, token));
         break;
       case "--query":
-        query = requireValue11(rest, token).trim();
+        query = requireValue12(rest, token).trim();
         break;
       case "--limit": {
-        const value = Number.parseInt(requireValue11(rest, token), 10);
+        const value = Number.parseInt(requireValue12(rest, token), 10);
         if (!Number.isInteger(value) || value < 1 || value > 250) {
           throw new Error("Invalid --limit. Expected an integer between 1 and 250.");
         }
@@ -22785,7 +23616,7 @@ function parseLinearIssuesArgs(tokens) {
         break;
       }
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22826,10 +23657,10 @@ function parseLinearLegacyArgs(tokens) {
         useScreenshot = true;
         break;
       case "--account":
-        account = requireValue11(rest, token);
+        account = requireValue12(rest, token);
         break;
       case "--cwd":
-        cwd = requireValue11(rest, token);
+        cwd = requireValue12(rest, token);
         break;
       default:
         throw new Error(`Unknown linear option: ${token}`);
@@ -22923,19 +23754,19 @@ function parseNotionArgs(tokens) {
       const token = rest.shift();
       switch (token) {
         case "--parent":
-          parentPageId = requireValue11(rest, token);
+          parentPageId = requireValue12(rest, token);
           break;
         case "--title":
-          title = requireValue11(rest, token);
+          title = requireValue12(rest, token);
           break;
         case "--private":
           isPrivate = true;
           break;
         case "--content":
-          content2 = requireValue11(rest, token);
+          content2 = requireValue12(rest, token);
           break;
         case "--file":
-          filePath2 = requireValue11(rest, token);
+          filePath2 = requireValue12(rest, token);
           break;
         default:
           throw new Error(`Unknown notion option: ${token}`);
@@ -22979,10 +23810,10 @@ function parseNotionArgs(tokens) {
     const token = rest.shift();
     switch (token) {
       case "--content":
-        content = requireValue11(rest, token);
+        content = requireValue12(rest, token);
         break;
       case "--file":
-        filePath = requireValue11(rest, token);
+        filePath = requireValue12(rest, token);
         break;
       case "--append":
         append = true;
@@ -23027,11 +23858,11 @@ function parseRandomArgs(tokens) {
         mode = "easy";
         break;
       case "--length":
-        length = parsePositiveInt(requireValue11(rest, token), token);
+        length = parsePositiveInt(requireValue12(rest, token), token);
         seenLength = true;
         break;
       case "--charset": {
-        const value = requireValue11(rest, token);
+        const value = requireValue12(rest, token);
         if (!["base64url", "hex", "alnum", "ascii"].includes(value)) {
           throw new Error(
             `Invalid --charset value: ${value}. Use base64url|hex|alnum|ascii.`
@@ -23042,18 +23873,18 @@ function parseRandomArgs(tokens) {
         break;
       }
       case "--count":
-        count = parsePositiveInt(requireValue11(rest, token), token);
+        count = parsePositiveInt(requireValue12(rest, token), token);
         break;
       case "--words":
-        words = parsePositiveInt(requireValue11(rest, token), token);
+        words = parsePositiveInt(requireValue12(rest, token), token);
         seenWords = true;
         break;
       case "--digits":
-        digits = parseNonNegativeInt(requireValue11(rest, token), token);
+        digits = parseNonNegativeInt(requireValue12(rest, token), token);
         seenDigits = true;
         break;
       case "--separator":
-        separator = requireValue11(rest, token);
+        separator = requireValue12(rest, token);
         seenSeparator = true;
         break;
       default:
@@ -23084,7 +23915,7 @@ function parseRandomArgs(tokens) {
     count
   };
 }
-function requireValue11(tokens, optionName) {
+function requireValue12(tokens, optionName) {
   const value = tokens.shift();
   if (!value) {
     throw new Error(`Missing value for ${optionName}`);
@@ -23245,6 +24076,11 @@ async function main() {
         await handler.handle(commandArgs);
         return;
       }
+      case "org" /* Org */: {
+        const handler = new OrgCommandHandler();
+        await handler.handle(commandArgs);
+        return;
+      }
       case "store" /* Store */: {
         const handler = new StoreCommandHandler();
         await handler.handle(commandArgs);