@pmate/cli 0.24.21 → 0.24.22

package/dist/index.d.ts

@@ -45,6 +45,7 @@ type ListCommandArgs = {
 type LoginCommandArgs = {
     type: Command.Login;
     app?: string;
+    profileId?: string;
 };
 type AddDnsCommandArgs = {
     type: Command.AddDns;

package/dist/index.js

@@ -111,13 +111,13 @@ function saveLoginSession(session, requestedApp = DEFAULT_APP_ID) {
   const token = session.token?.trim();
   const issuedAt = session.session.issuedAt?.trim();
   const expiresAt = session.session.expiresAt?.trim();
-  if (!accountId || !token || !issuedAt || !expiresAt) {
+  if (!accountId || !profileId || !token || !issuedAt || !expiresAt) {
     throw new Error("Invalid login session payload.");
   }
   const nextSession = {
     token,
     accountId,
-    ...profileId ? { profileId } : {},
+    profileId,
     issuedAt,
     expiresAt,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -181,6 +181,11 @@ function loadSessionStoreWithPath() {
   return { sessionPath, store };
 }
 function normalizeStore(value) {
+  if (isLegacySessionStoreVersion(value)) {
+    throw new Error(
+      `Unsupported session store version in ${buildSessionStorePath()}. Run "pmate login" again.`
+    );
+  }
   if (!isSessionStore(value)) {
     throw new Error(
       `Invalid session store format in ${buildSessionStorePath()}. Run "pmate login" again.`
@@ -188,6 +193,9 @@ function normalizeStore(value) {
   }
   return value;
 }
+function isLegacySessionStoreVersion(value) {
+  return !!value && typeof value === "object" && "version" in value && value.version !== SESSION_STORE_VERSION;
+}
 function isSessionStore(value) {
   if (!value || typeof value !== "object") {
     return false;
@@ -233,7 +241,7 @@ function isStoredSession(value) {
     return false;
   }
   const session = value;
-  return typeof session.token === "string" && !!session.token.trim() && typeof session.accountId === "string" && !!session.accountId.trim() && (session.profileId === void 0 || typeof session.profileId === "string" && !!session.profileId.trim()) && typeof session.issuedAt === "string" && !!session.issuedAt.trim() && typeof session.expiresAt === "string" && !!session.expiresAt.trim() && typeof session.updatedAt === "string" && !!session.updatedAt.trim();
+  return typeof session.token === "string" && !!session.token.trim() && typeof session.accountId === "string" && !!session.accountId.trim() && typeof session.profileId === "string" && !!session.profileId.trim() && typeof session.issuedAt === "string" && !!session.issuedAt.trim() && typeof session.expiresAt === "string" && !!session.expiresAt.trim() && typeof session.updatedAt === "string" && !!session.updatedAt.trim();
 }
 function resolveReadApp(store, options) {
   const requestedApp = options?.app?.trim();
@@ -281,47 +289,7 @@ var init_sessionStore = __esm({
     import_node_path3 = __toESM(require("path"));
     init_namespacedRef();
     DEFAULT_APP_ID = "pmate:factory";
-    SESSION_STORE_VERSION = 3;
-  }
-});
-
-// src/profileClient.ts
-async function fetchDefaultProfileId(options) {
-  const token = options.token.trim();
-  const app = options.app.trim();
-  const accountId = options.accountId.trim();
-  if (!token || !app || !accountId) {
-    throw new Error("Missing token, app, or accountId for profile lookup.");
-  }
-  const url = new URL(`${resolveAuthApiBaseUrl(options.authApiBaseUrl)}/profiles`);
-  url.searchParams.set("app", app);
-  url.searchParams.set("account", accountId);
-  const response = await fetch(url, {
-    headers: {
-      Authorization: `Bearer ${token}`
-    }
-  });
-  if (!response.ok) {
-    const detail = await response.text();
-    throw new Error(
-      `Failed to resolve default profile (${response.status}): ${detail || response.statusText}`
-    );
-  }
-  const envelope = await response.json();
-  const profileId = envelope.data?.[0]?.id?.trim();
-  if (!profileId) {
-    throw new Error(`No profile found for app ${app} and account ${accountId}.`);
-  }
-  return profileId;
-}
-function resolveAuthApiBaseUrl(value) {
-  return (value || process.env.PMATE_AUTH_API_BASE_URL || process.env.AUTH_API_BASE_URL || DEFAULT_AUTH_API_BASE_URL).replace(/\/+$/, "");
-}
-var DEFAULT_AUTH_API_BASE_URL;
-var init_profileClient = __esm({
-  "src/profileClient.ts"() {
-    "use strict";
-    DEFAULT_AUTH_API_BASE_URL = "https://auth-api-v2.pmate.chat";
+    SESSION_STORE_VERSION = 4;
   }
 });
 
@@ -9514,7 +9482,6 @@ var init_AgentLlmClient = __esm({
     import_node_path11 = __toESM(require("path"));
     init_dist2();
     init_sessionStore();
-    init_profileClient();
     DEFAULT_AGENT_API_BASE_URL = "https://agent-api.pmate.chat";
     DEFAULT_AGENT_HUB_BASE_URL = "https://hub.pmate.chat";
     DEFAULT_NAMESPACE = "pmate-cli";
@@ -9527,7 +9494,6 @@ var init_AgentLlmClient = __esm({
         this.token = options?.token ?? this.session.token;
         this.profileId = options?.profileId?.trim() || process.env.PMATE_PROFILE_ID || this.session.profileId;
         this.agentApiBaseUrl = resolveAgentApiBaseUrl(options?.agentApiBaseUrl);
-        this.authApiBaseUrl = resolveAuthApiBaseUrl(options?.authApiBaseUrl);
         this.hubBaseUrl = resolveHubBaseUrl(options?.hubBaseUrl);
         this.from = options?.from?.trim() || void 0;
         this.agentService = new AgentService({
@@ -9594,12 +9560,7 @@ var init_AgentLlmClient = __esm({
         if (profileId) {
           return profileId;
         }
-        return fetchDefaultProfileId({
-          token: this.token,
-          app: DEFAULT_APP_ID,
-          accountId: this.session.accountId,
-          authApiBaseUrl: this.authApiBaseUrl
-        });
+        throw new Error(`Missing profileId in session. Run "pmate login --app ${DEFAULT_APP_ID}" again.`);
       }
       resolveFrom(value, profileId) {
         return value?.trim() || this.from || profileId;
@@ -10048,8 +10009,52 @@ var ListCommandHandler = class {
 // src/commands/LoginCommandHandler.ts
 var import_node_child_process = require("child_process");
 var import_node_http = require("http");
+var import_promises = require("readline/promises");
 init_sessionStore();
-init_profileClient();
+
+// src/profileClient.ts
+var DEFAULT_AUTH_API_BASE_URL = "https://auth-api-v2.pmate.chat";
+async function fetchDefaultProfileId(options) {
+  const profiles = await fetchProfiles(options);
+  const profileId = profiles[0]?.id?.trim();
+  if (!profileId) {
+    throw new Error(
+      `No profile found for app ${options.app.trim()} and account ${options.accountId.trim()}.`
+    );
+  }
+  return profileId;
+}
+async function fetchProfiles(options) {
+  const token = options.token.trim();
+  const app = options.app.trim();
+  const accountId = options.accountId.trim();
+  if (!token || !app || !accountId) {
+    throw new Error("Missing token, app, or accountId for profile lookup.");
+  }
+  const url = new URL(`${resolveAuthApiBaseUrl(options.authApiBaseUrl)}/profiles`);
+  url.searchParams.set("app", app);
+  url.searchParams.set("account", accountId);
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${token}`
+    }
+  });
+  if (!response.ok) {
+    const detail = await response.text();
+    throw new Error(
+      `Failed to resolve default profile (${response.status}): ${detail || response.statusText}`
+    );
+  }
+  const envelope = await response.json();
+  return (envelope.data ?? []).filter(
+    (profile) => !!profile?.id && typeof profile.id === "string"
+  );
+}
+function resolveAuthApiBaseUrl(value) {
+  return (value || process.env.PMATE_AUTH_API_BASE_URL || process.env.AUTH_API_BASE_URL || DEFAULT_AUTH_API_BASE_URL).replace(/\/+$/, "");
+}
+
+// src/commands/LoginCommandHandler.ts
 var AUTH_UI_BASE_URL = "https://auth.pmate.chat";
 var AUTH_API_BASE_URL = DEFAULT_AUTH_API_BASE_URL;
 var CALLBACK_PATH = "/pmate-login-callback";
@@ -10082,11 +10087,16 @@ var LoginCommandHandler = class {
     try {
       const token = await callback.waitForToken;
       const loginResponse = await this.exchangeSession(token, appId);
-      const profileId = await fetchDefaultProfileId({
+      const profiles = await fetchProfiles({
         token: loginResponse.token,
         app: appId,
         accountId: loginResponse.session.identity.accountId
       });
+      const profileId = await this.resolveProfileId({
+        appId,
+        requestedProfileId: args.profileId,
+        profiles
+      });
       savedSession = saveLoginSession({ ...loginResponse, profileId }, appId);
     } finally {
       await callback.close();
@@ -10119,6 +10129,58 @@ var LoginCommandHandler = class {
     }
     return resp.data;
   }
+  async resolveProfileId(input) {
+    const requestedProfileId = input.requestedProfileId?.trim();
+    if (requestedProfileId) {
+      const exists = input.profiles.some((profile) => profile.id === requestedProfileId);
+      if (!exists) {
+        throw new Error(`Profile ${requestedProfileId} was not found for app ${input.appId}.`);
+      }
+      return requestedProfileId;
+    }
+    if (input.profiles.length === 0) {
+      throw new Error(`No profile found for app ${input.appId}.`);
+    }
+    if (input.profiles.length === 1) {
+      return input.profiles[0].id;
+    }
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      const selected = input.profiles[0];
+      ui.warn("Multiple profiles found; non-interactive login selected the first profile.", {
+        app: input.appId,
+        profileId: selected.id
+      });
+      return selected.id;
+    }
+    ui.info(`Multiple profiles found for ${input.appId}. Select one:`);
+    input.profiles.forEach((profile, index) => {
+      ui.plain(`${index + 1}. ${this.formatProfileLabel(profile)}`);
+    });
+    const rl = (0, import_promises.createInterface)({
+      input: process.stdin,
+      output: process.stdout
+    });
+    try {
+      while (true) {
+        const answer = (await rl.question("Profile number: ")).trim();
+        const index = Number.parseInt(answer, 10);
+        if (Number.isInteger(index) && index >= 1 && index <= input.profiles.length) {
+          return input.profiles[index - 1].id;
+        }
+        ui.warn(`Enter a number from 1 to ${input.profiles.length}.`);
+      }
+    } finally {
+      rl.close();
+    }
+  }
+  formatProfileLabel(profile) {
+    const parts = [
+      profile.nickName?.trim(),
+      profile.userName?.trim(),
+      profile.role?.trim()
+    ].filter(Boolean);
+    return parts.length > 0 ? `${parts.join(" / ")} (${profile.id})` : profile.id;
+  }
   async startCallbackServer() {
     let resolveToken;
     let rejectToken;
@@ -11272,7 +11334,7 @@ var import_node_path5 = __toESM(require("path"));
 var import_node_child_process2 = require("child_process");
 
 // src/serverAddress.ts
-var import_promises = require("dns/promises");
+var import_promises2 = require("dns/promises");
 var IPV4_PATTERN = /^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/;
 function isIpv4Address(value) {
   return IPV4_PATTERN.test(value.trim());
@@ -11285,7 +11347,7 @@ async function resolveServerAddress(server) {
   if (isIpv4Address(normalized)) {
     return normalized;
   }
-  const resolved = await (0, import_promises.lookup)(normalized, { family: 4 });
+  const resolved = await (0, import_promises2.lookup)(normalized, { family: 4 });
   return resolved.address;
 }
 
@@ -11947,7 +12009,7 @@ function formatEnvValue(value) {
 
 // src/commands/PrepareDevCommandHandler.ts
 var import_node_fs6 = require("fs");
-var import_promises2 = require("fs/promises");
+var import_promises3 = require("fs/promises");
 var import_node_os3 = __toESM(require("os"));
 var import_node_path10 = __toESM(require("path"));
 var import_node_child_process5 = require("child_process");
@@ -11971,7 +12033,7 @@ var PrepareDevCommandHandler = class {
     return result;
   }
   async openEnvironment(repo, note, envRoot, baseRoot) {
-    await (0, import_promises2.mkdir)(envRoot, { recursive: true });
+    await (0, import_promises3.mkdir)(envRoot, { recursive: true });
     const baseRepoPath = import_node_path10.default.join(baseRoot, repo);
     if (!await this.pathExists(baseRepoPath)) {
       throw new Error(`Base repo not found: ${baseRepoPath}`);
@@ -12130,7 +12192,7 @@ var PrepareDevCommandHandler = class {
   }
   async pathExists(targetPath) {
     try {
-      await (0, import_promises2.access)(targetPath, import_node_fs6.constants.F_OK);
+      await (0, import_promises3.access)(targetPath, import_node_fs6.constants.F_OK);
       return true;
     } catch {
       return false;
@@ -12145,7 +12207,7 @@ var PrepareDevCommandHandler = class {
       note,
       openedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await (0, import_promises2.writeFile)(lockPath, `${JSON.stringify(payload, null, 2)}
+    await (0, import_promises3.writeFile)(lockPath, `${JSON.stringify(payload, null, 2)}
 `, {
       encoding: "utf8",
       flag: "wx"
@@ -12155,7 +12217,7 @@ var PrepareDevCommandHandler = class {
     if (!await this.pathExists(lockPath)) {
       return false;
     }
-    await (0, import_promises2.rm)(lockPath, { force: true });
+    await (0, import_promises3.rm)(lockPath, { force: true });
     return true;
   }
   isLocalOrigin(origin) {
@@ -13076,7 +13138,7 @@ var import_node_child_process8 = require("child_process");
 var import_node_fs8 = require("fs");
 var import_node_os4 = __toESM(require("os"));
 var import_node_path13 = __toESM(require("path"));
-var import_promises3 = require("readline/promises");
+var import_promises4 = require("readline/promises");
 var import_openai = __toESM(require("openai"));
 var import_sdk = require("@linear/sdk");
 var ISSUE_SUMMARY_FIELDS = `
@@ -13927,7 +13989,7 @@ var LinearCommandHandler = class {
         return accounts[index];
       }
     }
-    const rl = (0, import_promises3.createInterface)({
+    const rl = (0, import_promises4.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -14093,7 +14155,7 @@ var LinearCommandHandler = class {
     ui.info(issue.description?.trim() ? issue.description : "  (no description)");
   }
   async collectReplInput() {
-    const rl = (0, import_promises3.createInterface)({
+    const rl = (0, import_promises4.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -14153,7 +14215,7 @@ var LinearCommandHandler = class {
     } else {
       ui.info("Copy a screenshot to your clipboard, then press Enter.");
     }
-    const rl = (0, import_promises3.createInterface)({
+    const rl = (0, import_promises4.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -15047,7 +15109,7 @@ var import_node_child_process9 = require("child_process");
 var import_node_fs10 = require("fs");
 var import_node_os5 = __toESM(require("os"));
 var import_node_path15 = __toESM(require("path"));
-var import_promises4 = require("readline/promises");
+var import_promises5 = require("readline/promises");
 var import_jsqr = __toESM(require("jsqr"));
 var import_pngjs = require("pngjs");
 var QrcodeCommandHandler = class {
@@ -15079,7 +15141,7 @@ var QrcodeCommandHandler = class {
   }
   async captureScreenshot() {
     ui.info("Capture a QR code screenshot now (macOS screencapture).");
-    const rl = (0, import_promises4.createInterface)({
+    const rl = (0, import_promises5.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -15130,7 +15192,7 @@ var QrcodeCommandHandler = class {
     return value ? value : null;
   }
   async promptValue(detected) {
-    const rl = (0, import_promises4.createInterface)({
+    const rl = (0, import_promises5.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -18464,9 +18526,9 @@ function readNamespaceFromPayload(payload) {
 
 // src/commands/ServiceCommandHandler.ts
 var import_node_fs20 = require("fs");
-var import_promises5 = require("fs/promises");
+var import_promises6 = require("fs/promises");
 var import_node_path24 = __toESM(require("path"));
-var import_promises6 = require("readline/promises");
+var import_promises7 = require("readline/promises");
 
 // src/services/ServiceRuntimeRunner.ts
 var import_node_fs19 = require("fs");
@@ -20195,7 +20257,7 @@ var ServiceCommandHandler = class {
           }
         );
         const outputPath = import_node_path24.default.resolve(process.cwd(), args.output);
-        await (0, import_promises5.writeFile)(outputPath, payload.content, "utf8");
+        await (0, import_promises6.writeFile)(outputPath, payload.content, "utf8");
         ui.success(`Wrote env file for ${args.appId} to ${outputPath}`);
         this.renderJson({ ...payload, output: outputPath }, args.json);
         return;
@@ -20283,7 +20345,7 @@ var ServiceCommandHandler = class {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
       throw new Error("Prompt input requires an interactive terminal.");
     }
-    const rl = (0, import_promises6.createInterface)({
+    const rl = (0, import_promises7.createInterface)({
       input: process.stdin,
       output: process.stdout
     });
@@ -20861,7 +20923,13 @@ var AccountCommandHandler = class {
             signature: this.signBotChallenge(challenge, privateKey)
           }
         );
-        const saved = saveLoginSession(login, args.app);
+        const profileId = await fetchDefaultProfileId({
+          token: login.token,
+          app: args.app,
+          accountId: login.session.identity.accountId,
+          authApiBaseUrl: baseUrl
+        });
+        const saved = saveLoginSession({ ...login, profileId }, args.app);
         if (!args.json) {
           ui.success(`Logged in bot ${args.name} to ${saved.app}`);
         }
@@ -24268,7 +24336,7 @@ var HELP_TEXT = [
   import_chalk4.default.bold("Commands:"),
   `  ${import_chalk4.default.cyan("list [path]")}      List apps from .pmate.yaml in the target folder`,
   `  ${import_chalk4.default.cyan("login")}            Log in and store a session in ~/.pmate/session.json`,
-  `  ${import_chalk4.default.gray("                  [--app <app-id>]")}`,
+  `  ${import_chalk4.default.gray("                  [--app <app-id>] [--profile-id <id>]")}`,
   `  ${import_chalk4.default.cyan("add-dns")}          Add a DNS record via Aliyun DNS`,
   `  ${import_chalk4.default.gray("                  --type <t> --value <v> --rr <rr> [--ttl <n>] [--domain <name>]")}`,
   `  ${import_chalk4.default.cyan("sts")}              Request an OSS STS token from the CI server`,
@@ -24491,17 +24559,21 @@ function parseCommandArgs(args) {
   if (args.rest[0] === "login") {
     const rest = args.rest.slice(1);
     let app;
+    let profileId;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
         case "--app":
           app = requireValue13(rest, token);
           break;
+        case "--profile-id":
+          profileId = requireValue13(rest, token);
+          break;
         default:
           throw new Error(`Unknown login option: ${token}`);
       }
     }
-    return { type: "login" /* Login */, app };
+    return { type: "login" /* Login */, app, profileId };
   }
   if (args.rest[0] === "add-dns") {
     return parseAddDnsArgs(args.rest.slice(1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.24.21",
+  "version": "0.24.22",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -11,16 +11,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
-    "clean": "rimraf dist",
-    "dev": "ts-node src/index.ts",
-    "release": "npm publish",
-    "start": "node dist/index.js",
-    "test": "vitest run src/tests",
-    "typecheck": "tsc --noEmit",
-    "prepare": "npm run build"
-  },
   "keywords": [
     "cli",
     "typescript",
@@ -67,10 +57,13 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.17"
   },
-  "pnpm": {
-    "overrides": {
-      "@pmate/meta": "^1.1.13",
-      "@pmate/utils": "^1.1.3"
-    }
+  "scripts": {
+    "build": "npm run clean && tsup --config tsup.config.ts && node scripts/copy-templates.js",
+    "clean": "rimraf dist",
+    "dev": "ts-node src/index.ts",
+    "release": "npm publish",
+    "start": "node dist/index.js",
+    "test": "vitest run src/tests",
+    "typecheck": "tsc --noEmit"
   }
-}
+}