@pmate/cli 0.20.10 → 0.21.0

package/dist/index.d.ts

@@ -418,6 +418,17 @@ type AgentCommandArgs = {
     name: string;
     baseUrl?: string;
     json: boolean;
+} | {
+    type: Command.Agent;
+    action: "call";
+    namespace: string;
+    name: string;
+    payload?: Record<string, unknown>;
+    filePath?: string;
+    baseUrl?: string;
+    hubBaseUrl?: string;
+    from?: string;
+    json: boolean;
 } | {
     type: Command.Agent;
     action: "rename";
@@ -543,6 +554,7 @@ type ServiceCommandArgs = {
     action: "list";
     namespace?: string;
     repository?: string;
+    server?: string;
     baseUrl?: string;
     json: boolean;
 } | {

package/dist/index.js

@@ -158,7 +158,15 @@ function loadExistingSessionStoreOrEmpty() {
       sessions: {}
     };
   }
-  return loadSessionStore();
+  try {
+    return loadSessionStore();
+  } catch {
+    return {
+      version: SESSION_STORE_VERSION,
+      activeAppRef: DEFAULT_APP_ID,
+      sessions: {}
+    };
+  }
 }
 function loadSessionStoreWithPath() {
   const sessionPath = buildSessionStorePath();
@@ -12683,12 +12691,15 @@ var init_AgentLlmClient = __esm({
       }
       async prompt(name, payload, namespace = DEFAULT_NAMESPACE) {
         const agentId = `${namespace}:${name}`;
+        return this.call(agentId, payload);
+      }
+      async call(agentId, payload, options) {
         const client = new import_agent_sdk.AgentClient({
-          baseUrl: this.hubBaseUrl,
+          baseUrl: options?.hubBaseUrl ?? this.hubBaseUrl,
           agentService: this.agentService
         });
         try {
-          await client.login(this.from, {
+          await client.login(options?.from ?? this.from, {
             token: this.token
           });
           const result = await client.prompt({
@@ -19108,6 +19119,7 @@ function parseMessageText(raw) {
 // src/commands/AgentCommandHandler.ts
 var import_node_fs11 = require("fs");
 var import_node_path16 = __toESM(require("path"));
+init_AgentLlmClient();
 init_sessionStore();
 
 // src/storeClient.ts
@@ -19476,6 +19488,25 @@ var AgentCommandHandler = class {
         this.renderJson(record, args.json);
         return;
       }
+      case "call": {
+        const payload = args.filePath ? this.readJsonObjectFile(args.filePath) : args.payload;
+        const client = this.createRuntimeClient({
+          token,
+          agentApiBaseUrl: baseUrl,
+          hubBaseUrl: args.hubBaseUrl,
+          from: args.from
+        });
+        const result = await client.call(
+          formatNamespacedDisplayId(args.namespace, args.name),
+          payload,
+          {
+            hubBaseUrl: args.hubBaseUrl,
+            from: args.from
+          }
+        );
+        this.renderCallResult(result, args.json);
+        return;
+      }
       case "delete": {
         const record = await this.request(
           baseUrl,
@@ -19547,6 +19578,14 @@ var AgentCommandHandler = class {
       throw new Error(`Invalid JSON in ${absolutePath}: ${message}`);
     }
   }
+  readJsonObjectFile(filePath) {
+    const parsed = this.readJsonFile(filePath);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      const absolutePath = import_node_path16.default.resolve(process.cwd(), filePath);
+      throw new Error(`Invalid JSON in ${absolutePath}: expected an object`);
+    }
+    return parsed;
+  }
   async request(baseUrl, token, method, pathname, body) {
     const response = await fetch(`${baseUrl}${pathname}`, {
       method,
@@ -19589,6 +19628,24 @@ var AgentCommandHandler = class {
     }
     ui.plain(JSON.stringify(value, null, 2));
   }
+  renderCallResult(value, asJson) {
+    if (value === null) {
+      if (asJson) {
+        this.renderJson(value, true);
+        return;
+      }
+      ui.warn("Agent returned no result.");
+      return;
+    }
+    if (typeof value === "string" && !asJson) {
+      ui.plain(value);
+      return;
+    }
+    this.renderJson(value, true);
+  }
+  createRuntimeClient(options) {
+    return new AgentLlmClient(options);
+  }
   renderNamespaces(items, asJson) {
     if (asJson) {
       ui.plain(JSON.stringify(items, null, 2));
@@ -20960,15 +21017,24 @@ var ServiceRegistryClient = class {
     if (repository) {
       searchParams.set("repo", repository);
     }
+    const server = filters?.server?.trim();
+    if (server) {
+      searchParams.set("server", server);
+    }
     const payload = await this.request(
       "GET",
       `/services${searchParams.size > 0 ? `?${searchParams.toString()}` : ""}`
     );
     const namespace = filters?.namespace?.trim();
-    if (!namespace) {
-      return payload.items;
-    }
-    return payload.items.filter((item) => item.namespace === namespace);
+    return payload.items.filter((item) => {
+      if (namespace && item.namespace !== namespace) {
+        return false;
+      }
+      if (server && item.deploy?.server?.trim() !== server) {
+        return false;
+      }
+      return true;
+    });
   }
   async getService(namespace, name) {
     return this.request(
@@ -21038,7 +21104,8 @@ var ServiceCommandHandler = class {
       case "list": {
         const items = await registry.listServices({
           namespace: args.namespace,
-          repository: args.repository
+          repository: args.repository,
+          server: args.server
         });
         this.renderList(items, args.json);
         return;
@@ -21052,6 +21119,7 @@ var ServiceCommandHandler = class {
       case "create": {
         const payload = this.readJsonFile(args.filePath);
         await this.requireNamespace(payload, baseUrl);
+        await this.requireUniqueServerPort(payload, registry);
         const record = await this.request(
           baseUrl,
           "POST",
@@ -21064,6 +21132,10 @@ var ServiceCommandHandler = class {
       }
       case "update": {
         const payload = this.readJsonFile(args.filePath);
+        await this.requireUniqueServerPort(payload, registry, {
+          namespace: args.namespace,
+          name: args.name
+        });
         const record = await this.request(
           baseUrl,
           "PUT",
@@ -21176,6 +21248,37 @@ var ServiceCommandHandler = class {
       throw new Error(`Namespace "${namespace}" is not registered. Run: pmate ns create ${namespace}`);
     }
   }
+  async requireUniqueServerPort(payload, registry, currentService) {
+    if (!payload || typeof payload !== "object") {
+      return;
+    }
+    const deploy = payload.deploy;
+    if (!deploy || typeof deploy !== "object") {
+      return;
+    }
+    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)) {
+      return;
+    }
+    const services = await registry.listServices({ server });
+    const conflict = services.find((service) => {
+      if (service.deploy?.port !== port) {
+        return false;
+      }
+      if (!currentService) {
+        return true;
+      }
+      return !(service.namespace === currentService.namespace && service.name === currentService.name);
+    });
+    if (conflict) {
+      throw new Error(
+        `Port ${port} is already used on server ${server} by ${formatNamespacedDisplayId(conflict.namespace, conflict.name)}`
+      );
+    }
+  }
   renderList(items, asJson) {
     if (asJson) {
       ui.plain(JSON.stringify(items, null, 2));
@@ -21186,11 +21289,7 @@ var ServiceCommandHandler = class {
       return;
     }
     for (const item of items) {
-      ui.info(formatNamespacedDisplayId(item.namespace, item.name), {
-        kind: item.kind,
-        runtimeType: item.runtimeType,
-        status: item.status
-      });
+      ui.info(formatNamespacedDisplayId(item.namespace, item.name), item);
     }
   }
   renderJson(value, asJson) {
@@ -21552,7 +21651,7 @@ function parseAgentArgs(tokens) {
   const rawAction = rest.shift();
   const action = rawAction === "view" ? "view" : rawAction;
   if (!action) {
-    throw new Error("Missing agent action. Use: agent namespaces|list|get|view|create|update|rename|delete");
+    throw new Error("Missing agent action. Use: agent namespaces|list|get|view|create|update|rename|call|delete");
   }
   let baseUrl;
   let json = false;
@@ -21716,6 +21815,62 @@ function parseAgentArgs(tokens) {
       json
     };
   }
+  if (action === "call") {
+    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]"
+      );
+    }
+    const parsed = parseNamespacedRef(ref, { entityLabel: "agent ref" });
+    let filePath;
+    let payload;
+    let hubBaseUrl;
+    let from;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--payload":
+          if (filePath) {
+            throw new Error("Agent call accepts either --payload or --file, not both.");
+          }
+          payload = parseJsonObject(requireValue(rest, token), token);
+          break;
+        case "--file":
+          if (payload) {
+            throw new Error("Agent call accepts either --payload or --file, not both.");
+          }
+          filePath = requireValue(rest, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue(rest, token);
+          break;
+        case "--hub-base-url":
+          hubBaseUrl = requireValue(rest, token);
+          break;
+        case "--from":
+          from = requireValue(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown agent call option: ${token}`);
+      }
+    }
+    return {
+      type: "agent" /* Agent */,
+      action,
+      namespace: parsed.namespace,
+      name: parsed.objectId,
+      payload,
+      filePath,
+      baseUrl,
+      hubBaseUrl,
+      from,
+      json
+    };
+  }
   if (action === "rename") {
     let namespace;
     let from;
@@ -21774,6 +21929,19 @@ function parseBareRenameId(value, entityName) {
   }
   return normalized;
 }
+function parseJsonObject(value, optionName) {
+  let parsed;
+  try {
+    parsed = JSON.parse(value);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Invalid JSON for ${optionName}: ${message}`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`Invalid JSON for ${optionName}: expected an object.`);
+  }
+  return parsed;
+}
 
 // src/nsCommandParser.ts
 var DEFAULT_CHAIN = "pmate";
@@ -22257,6 +22425,7 @@ function parseServiceArgs(tokens) {
   if (action === "list") {
     let namespace;
     let repository;
+    let server;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
@@ -22266,6 +22435,9 @@ function parseServiceArgs(tokens) {
         case "--repo":
           repository = requireValue5(rest, token);
           break;
+        case "--server":
+          server = requireValue5(rest, token);
+          break;
         case "--base-url":
           baseUrl = requireValue5(rest, token);
           break;
@@ -22276,7 +22448,7 @@ function parseServiceArgs(tokens) {
           throw new Error(`Unknown service list option: ${token}`);
       }
     }
-    return { type: "service" /* Service */, action, namespace, repository, baseUrl, json };
+    return { type: "service" /* Service */, action, namespace, repository, server, baseUrl, json };
   }
   if (action === "view") {
     const ref = rest.shift();
@@ -22777,7 +22949,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.cyan("collect")}          Collect threads/messages from Electron chat app via CDP`,
   `  ${import_chalk4.default.gray("                  --list [--endpoint <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  --thread <name> [--endpoint <url>] [--json]")}`,
-  `  ${import_chalk4.default.cyan("agent")}            Manage agent registry entries via agent-ui-api`,
+  `  ${import_chalk4.default.cyan("agent")}            Manage agent registry entries and call agents for debugging`,
   `  ${import_chalk4.default.gray("                  namespaces [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  get <ns:objectId> [--base-url <url>] [--json]")}`,
@@ -22785,8 +22957,9 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  create [<namespace>] --file <path> [--base-url <url>] [--json]")}`,
   `  ${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("                  call <ns:objectId> [--payload <json>] [--file <path>] [--base-url <url>] [--hub-base-url <url>] [--from <id>] [--json]")}`,
   `  ${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")}`,
+  `  ${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:cli session and default hub: https://hub.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("ns")}               Manage registered namespaces`,
   `  ${import_chalk4.default.gray("                  list [--chain <chain>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  get <namespace> [--chain <chain>] [--base-url <url>] [--json]")}`,
@@ -22816,7 +22989,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://apps-api.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("service")}          Manage service registry entries via apps-api`,
-  `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--repo <owner/name|https://github.com/owner/name>] [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--repo <owner/name|https://github.com/owner/name>] [--server <name>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  get <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  view <ns:objectId> [--base-url <url>]")}`,
   `  ${import_chalk4.default.gray("                  create --file <path> [--base-url <url>] [--json]")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.20.10",
+  "version": "0.21.0",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {