@pmate/cli 0.24.17 → 0.24.19

package/dist/index.d.ts

@@ -659,6 +659,7 @@ type AgentCommandArgs = {
     baseUrl?: string;
     hubBaseUrl?: string;
     from?: string;
+    profileId?: string;
     json: boolean;
 } | {
     type: Command.Agent;

package/dist/index.js

@@ -107,6 +107,7 @@ function saveLoginSession(session, requestedApp = DEFAULT_APP_ID) {
     );
   }
   const accountId = session.session.identity?.accountId?.trim();
+  const profileId = session.profileId?.trim();
   const token = session.token?.trim();
   const issuedAt = session.session.issuedAt?.trim();
   const expiresAt = session.session.expiresAt?.trim();
@@ -116,6 +117,7 @@ function saveLoginSession(session, requestedApp = DEFAULT_APP_ID) {
   const nextSession = {
     token,
     accountId,
+    ...profileId ? { profileId } : {},
     issuedAt,
     expiresAt,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -231,7 +233,7 @@ function isStoredSession(value) {
     return false;
   }
   const session = value;
-  return typeof session.token === "string" && !!session.token.trim() && typeof session.accountId === "string" && !!session.accountId.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() && (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();
 }
 function resolveReadApp(store, options) {
   const requestedApp = options?.app?.trim();
@@ -283,6 +285,46 @@ var init_sessionStore = __esm({
   }
 });
 
+// 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";
+  }
+});
+
 // node_modules/@pmate/meta/src/types/account.types.ts
 var init_account_types = __esm({
   "node_modules/@pmate/meta/src/types/account.types.ts"() {
@@ -8512,7 +8554,11 @@ var init_AgentClient = __esm({
         const timeoutMs = options?.timeoutMs ?? this.timeoutMs;
         await this.waitForConnection(timeoutMs);
         const token = options?.token ?? "";
-        await this.sendAuth(token, timeoutMs);
+        const profileId = options?.profileId;
+        if (!profileId) {
+          throw new Error("AgentClient user auth requires profileId");
+        }
+        await this.sendAuth(token, timeoutMs, profileId);
         return true;
       }
       async prompt(request) {
@@ -8723,10 +8769,14 @@ var init_AgentClient = __esm({
         }
         if (event.type === "connected") {
           this.emit("connected" /* Connected */, event.data);
+          if (!event.data) {
+            this.rejectAuth(new Error("Agent websocket disconnected before auth ack"));
+          }
           return;
         }
         if (event.type === "error") {
           this.emit("error" /* Error */, event.data);
+          this.rejectAuth(new Error("Agent websocket error before auth ack"));
         }
       }
       handleIncomingMessage(message) {
@@ -8736,7 +8786,11 @@ var init_AgentClient = __esm({
         if (message.opcode === 3 /* ACK */) {
           const ack = message.body;
           const success = ack?.status === "ok";
-          this.resolveAuth(success);
+          if (!success) {
+            this.rejectAuth(new Error(ack?.message ?? ack?.code ?? "Auth failed"));
+            return;
+          }
+          this.resolveAuth();
           return;
         }
         if (message.opcode === 2 /* AGENT */) {
@@ -8795,17 +8849,19 @@ var init_AgentClient = __esm({
           });
         });
       }
-      async sendAuth(token, timeoutMs) {
+      async sendAuth(token, timeoutMs, profileId) {
         if (!this.ws || !this.from) {
           throw new Error("AgentClient not initialized");
         }
-        const msg = Msg.create(this.from, "@hub", 4 /* AUTH */, { token, as: "user" });
+        const body = {
+          token,
+          as: "user",
+          profileId
+        };
+        const msg = Msg.create(this.from, "@hub", 4 /* AUTH */, body);
         const waiter = this.waitForAuthAck(timeoutMs);
         await this.ws.sendMsg(msg);
-        const success = await waiter;
-        if (!success) {
-          throw new Error("Auth failed");
-        }
+        await waiter;
       }
       waitForAuthAck(timeoutMs) {
         if (this.authPromise) {
@@ -8821,13 +8877,21 @@ var init_AgentClient = __esm({
         });
         return this.authPromise;
       }
-      resolveAuth(success) {
+      resolveAuth() {
         if (!this.authResolve) {
           return;
         }
         const resolve = this.authResolve;
         this.clearAuthWaiter();
-        resolve(success);
+        resolve();
+      }
+      rejectAuth(error) {
+        if (!this.authReject) {
+          return;
+        }
+        const reject = this.authReject;
+        this.clearAuthWaiter();
+        reject(error);
       }
       clearAuthWaiter() {
         if (this.authTimer) {
@@ -8995,11 +9059,6 @@ function resolveAgentApiBaseUrl(value) {
 function resolveHubBaseUrl(value) {
   return (value || process.env.PMATE_AGENT_HUB_BASE_URL || DEFAULT_AGENT_HUB_BASE_URL).replace(/\/+$/, "");
 }
-function readSessionToken() {
-  return readRequiredSession({
-    preferredApp: DEFAULT_APP_ID
-  }).token;
-}
 function unwrapAgentResult(agentId, value) {
   if (!value || typeof value !== "object") {
     if (value == null) {
@@ -9037,7 +9096,7 @@ function resolveMimeType(filePath) {
       return "application/octet-stream";
   }
 }
-var import_node_fs7, import_node_path11, DEFAULT_AGENT_API_BASE_URL, DEFAULT_AGENT_HUB_BASE_URL, DEFAULT_NAMESPACE, DEFAULT_FROM, DEFAULT_AGENT_PROMPT_TIMEOUT_MS, AgentLlmClient;
+var import_node_fs7, import_node_path11, DEFAULT_AGENT_API_BASE_URL, DEFAULT_AGENT_HUB_BASE_URL, DEFAULT_NAMESPACE, DEFAULT_AGENT_PROMPT_TIMEOUT_MS, AgentLlmClient;
 var init_AgentLlmClient = __esm({
   "src/llm/AgentLlmClient.ts"() {
     "use strict";
@@ -9045,17 +9104,22 @@ 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";
-    DEFAULT_FROM = "pmate-cli";
     DEFAULT_AGENT_PROMPT_TIMEOUT_MS = 12e4;
     AgentLlmClient = class {
       constructor(options) {
-        this.token = options?.token ?? readSessionToken();
+        this.session = readRequiredSession({
+          preferredApp: DEFAULT_APP_ID
+        });
+        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 ?? DEFAULT_FROM;
+        this.from = options?.from?.trim() || void 0;
         this.agentService = new AgentService({
           agentApiBaseUrl: this.agentApiBaseUrl,
           token: this.token
@@ -9072,8 +9136,10 @@ var init_AgentLlmClient = __esm({
           timeoutMs: DEFAULT_AGENT_PROMPT_TIMEOUT_MS
         });
         try {
-          await client.login(options?.from ?? this.from, {
-            token: this.token
+          const profileId = await this.resolveProfileId();
+          await client.login(this.resolveFrom(options?.from, profileId), {
+            token: this.token,
+            profileId
           });
           const result = await client.prompt({
             agentId,
@@ -9093,8 +9159,10 @@ var init_AgentLlmClient = __esm({
           minChunkSizeBytes: 0
         });
         try {
-          await client.login(options?.from ?? this.from, {
-            token: this.token
+          const profileId = await this.resolveProfileId();
+          await client.login(this.resolveFrom(options?.from, profileId), {
+            token: this.token,
+            profileId
           });
           const input = new AsyncStream();
           const stream = client.stream({
@@ -9111,6 +9179,21 @@ var init_AgentLlmClient = __esm({
           client.close();
         }
       }
+      async resolveProfileId() {
+        const profileId = this.profileId?.trim();
+        if (profileId) {
+          return profileId;
+        }
+        return fetchDefaultProfileId({
+          token: this.token,
+          app: DEFAULT_APP_ID,
+          accountId: this.session.accountId,
+          authApiBaseUrl: this.authApiBaseUrl
+        });
+      }
+      resolveFrom(value, profileId) {
+        return value?.trim() || this.from || profileId;
+      }
     };
   }
 });
@@ -9556,8 +9639,9 @@ var ListCommandHandler = class {
 var import_node_child_process = require("child_process");
 var import_node_http = require("http");
 init_sessionStore();
+init_profileClient();
 var AUTH_UI_BASE_URL = "https://auth.pmate.chat";
-var AUTH_API_BASE_URL = "https://auth-api-v2.pmate.chat";
+var AUTH_API_BASE_URL = DEFAULT_AUTH_API_BASE_URL;
 var CALLBACK_PATH = "/pmate-login-callback";
 var LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
 function buildHostedLoginUrl(redirectUrl, appId = DEFAULT_APP_ID) {
@@ -9588,7 +9672,12 @@ var LoginCommandHandler = class {
     try {
       const token = await callback.waitForToken;
       const loginResponse = await this.exchangeSession(token, appId);
-      savedSession = saveLoginSession(loginResponse, appId);
+      const profileId = await fetchDefaultProfileId({
+        token: loginResponse.token,
+        app: appId,
+        accountId: loginResponse.session.identity.accountId
+      });
+      savedSession = saveLoginSession({ ...loginResponse, profileId }, appId);
     } finally {
       await callback.close();
     }
@@ -16602,7 +16691,8 @@ var AgentCommandHandler = class {
           token,
           agentApiBaseUrl: baseUrl,
           hubBaseUrl: args.hubBaseUrl,
-          from: args.from
+          from: args.from,
+          profileId: args.profileId
         });
         if (args.filePath) {
           const filePayload = this.tryReadJsonObjectFile(args.filePath);
@@ -21085,7 +21175,7 @@ function parseAgentArgs(tokens) {
     const ref = rest.shift();
     if (!ref) {
       throw new Error(
-        "Usage: agent call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--json]"
+        "Usage: agent call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--profile-id <id>] [--json]"
       );
     }
     const parsed = parseNamespacedRef(ref, { entityLabel: "agent ref" });
@@ -21093,6 +21183,7 @@ function parseAgentArgs(tokens) {
     let payload;
     let hubBaseUrl;
     let from;
+    let profileId;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
@@ -21111,6 +21202,9 @@ function parseAgentArgs(tokens) {
         case "--from":
           from = requireValue(rest, token);
           break;
+        case "--profile-id":
+          profileId = requireValue(rest, token);
+          break;
         case "--json":
           json = true;
           break;
@@ -21128,6 +21222,7 @@ function parseAgentArgs(tokens) {
       baseUrl,
       hubBaseUrl,
       from,
+      profileId,
       json
     };
   }
@@ -23842,7 +23937,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  update <ns:objectId> --file <path> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  rename --from <id> --to <id> --ns <namespace> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  move --from <id> --ns <namespace> --to-ns <namespace> [--to <id>] [--base-url <url>] [--json]")}`,
-  `  ${import_chalk4.default.gray("                  call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--profile-id <id>] [--json]")}`,
   `  ${import_chalk4.default.gray("                    --file reads JSON payload files, or streams binary files such as .wav to ASR agents; --payload becomes stream params for binary files")}`,
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  list defaults to all namespaces; create defaults to namespace: pmate; default base URL: https://agent-api.pmate.chat; call uses pmate:factory session and default hub: https://hub.pmate.chat")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.24.17",
+  "version": "0.24.19",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -56,7 +56,7 @@
     "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@pmate/agent-sdk": "^1.1.5",
+    "@pmate/agent-sdk": "^1.1.11",
     "@pmate/meta": "^1.1.13",
     "@pmate/utils": "^1.1.3",
     "@types/node": "^25.0.3",