@pmate/cli 0.17.1 → 0.17.2

package/dist/index.d.ts

@@ -483,6 +483,7 @@ type ServiceCommandArgs = {
     type: Command.Service;
     action: "list";
     namespace?: string;
+    repository?: string;
     baseUrl?: string;
     json: boolean;
 } | {

package/dist/index.js

@@ -96,36 +96,18 @@ function loadSessionStoreWithPath() {
   const raw = (0, import_node_fs2.readFileSync)(sessionPath, "utf8");
   const parsed = JSON.parse(raw);
   const store = normalizeStore(parsed);
-  const nextRaw = JSON.stringify(store, null, 2);
-  if (nextRaw !== raw.trim()) {
-    writeSessionStore(store);
-  }
   return { sessionPath, store };
 }
 function normalizeStore(value) {
-  if (isSessionStore(value)) {
-    return {
-      version: SESSION_STORE_VERSION,
-      activeApp: value.activeApp || DEFAULT_APP_ID,
-      sessions: value.sessions || {}
-    };
+  if (!isSessionStore(value)) {
+    throw new Error(
+      `Invalid session store format in ${buildSessionStorePath()}. Run "pmate login" again.`
+    );
   }
-  const legacy = value;
-  const app = resolveStoredAppId(legacy, legacy.session?.app || legacy.app || DEFAULT_APP_ID);
   return {
     version: SESSION_STORE_VERSION,
-    activeApp: app,
-    sessions: {
-      [app]: {
-        ...legacy,
-        app,
-        session: {
-          ...legacy.session,
-          ...legacy.session?.app ? {} : { app }
-        },
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-      }
-    }
+    activeApp: value.activeApp || DEFAULT_APP_ID,
+    sessions: value.sessions || {}
   };
 }
 function isSessionStore(value) {
@@ -14034,46 +14016,6 @@ var BucketCommandHandler = class {
   }
 };
 
-// src/commands/DeployCommandHandler.ts
-var DeployCommandHandler = class {
-  async handle(args) {
-    const serviceId = args.deployApp.trim();
-    const namespace = args.deployNamespace?.trim() || process.env.PMATE_SERVICE_NAMESPACE || "pmate";
-    ui.warn("Top-level deploy is no longer supported.");
-    if (!serviceId) {
-      throw new Error("Use: pmate service deploy <ns:objectId>");
-    }
-    const suggestedAction = args.deployAction === "logs" ? "log" : "deploy";
-    throw new Error(`Use: pmate service ${suggestedAction} ${namespace}:${serviceId}`);
-  }
-};
-
-// src/commands/LogCommandHandler.ts
-var LogCommandHandler = class {
-  async handle(args) {
-    const serviceId = args.logApp.trim();
-    const namespace = args.logNamespace?.trim() || process.env.PMATE_SERVICE_NAMESPACE || process.env.PMATE_LOG_NAMESPACE || "pmate";
-    ui.warn("Top-level log is no longer supported.");
-    if (!serviceId) {
-      throw new Error("Use: pmate service log <ns:objectId>");
-    }
-    throw new Error(`Use: pmate service log ${namespace}:${serviceId}`);
-  }
-};
-
-// src/commands/InitCommandHandler.ts
-var InitCommandHandler = class {
-  async handle(args) {
-    const serviceId = args.initApp.trim();
-    const namespace = args.initNamespace?.trim() || process.env.PMATE_SERVICE_NAMESPACE || "pmate";
-    ui.warn("Top-level init is no longer supported.");
-    if (!serviceId) {
-      throw new Error("Use: pmate service init <ns:objectId>");
-    }
-    throw new Error(`Use: pmate service init ${namespace}:${serviceId}`);
-  }
-};
-
 // src/commands/DeleteCommandHandler.ts
 var import_node_path5 = __toESM(require("path"));
 var import_node_child_process2 = require("child_process");
@@ -18937,21 +18879,6 @@ function parseNamespacedRef(value, options = {}) {
       fullId: `${namespace2}:${objectId}`
     };
   }
-  if (options.allowLegacySlash) {
-    const slashIndex = raw.indexOf("/");
-    if (slashIndex > 0) {
-      const namespace2 = raw.slice(0, slashIndex).trim();
-      const objectId = raw.slice(slashIndex + 1).trim();
-      if (!namespace2 || !objectId) {
-        throw new Error(`Invalid ${entityLabel} "${value}". Use <ns:objectId>.`);
-      }
-      return {
-        namespace: namespace2,
-        objectId,
-        fullId: `${namespace2}:${objectId}`
-      };
-    }
-  }
   const namespace = options.defaultNamespace?.trim();
   if (namespace) {
     return {
@@ -19454,11 +19381,12 @@ var AppCommandHandler = class {
       }
       case "get":
       case "view": {
+        const pathname = this.buildAppPath(args.id);
         const record = await this.request(
           baseUrl,
           token,
           "GET",
-          `/apps/${encodeURIComponent(args.id)}`
+          pathname
         );
         if (args.action === "view" && !args.json) {
           this.renderView(record);
@@ -19483,11 +19411,12 @@ var AppCommandHandler = class {
       }
       case "update": {
         const payload = this.readJsonFile(args.filePath);
+        const pathname = this.buildAppPath(args.id);
         const record = await this.request(
           baseUrl,
           token,
           "PUT",
-          `/apps/${encodeURIComponent(args.id)}`,
+          pathname,
           payload
         );
         ui.success(`Updated app ${record.id}`);
@@ -19495,11 +19424,12 @@ var AppCommandHandler = class {
         return;
       }
       case "delete": {
+        const pathname = this.buildAppPath(args.id);
         const record = await this.request(
           baseUrl,
           token,
           "DELETE",
-          `/apps/${encodeURIComponent(args.id)}`
+          pathname
         );
         ui.success(`Disabled app ${record.id}`);
         this.renderJson(record, args.json);
@@ -19589,6 +19519,12 @@ var AppCommandHandler = class {
       updatedAt: item.updatedAt
     });
   }
+  buildAppPath(appId) {
+    const { namespace, objectId } = parseNamespacedRef(appId, {
+      entityLabel: "app ref"
+    });
+    return `/apps/${encodeURIComponent(namespace)}/${encodeURIComponent(objectId)}`;
+  }
 };
 function readNamespaceFromPayload(payload) {
   if (!payload || typeof payload !== "object") {
@@ -20055,6 +19991,22 @@ var ServiceRegistryClient = class {
   constructor(baseUrl) {
     this.baseUrl = baseUrl;
   }
+  async listServices(filters) {
+    const searchParams = new URLSearchParams();
+    const repository = normalizeRepository(filters?.repository);
+    if (repository) {
+      searchParams.set("repo", repository);
+    }
+    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);
+  }
   async getService(namespace, name) {
     return this.request(
       "GET",
@@ -20097,6 +20049,20 @@ var ServiceRegistryClient = class {
     return payload.data;
   }
 };
+function normalizeRepository(repository) {
+  if (!repository) {
+    return void 0;
+  }
+  const trimmed = repository.trim().replace(/\/+$/, "").replace(/\.git$/i, "");
+  if (!trimmed) {
+    return void 0;
+  }
+  const match = trimmed.match(/^https?:\/\/github\.com\/([^/]+\/[^/]+)$/i);
+  if (match) {
+    return match[1];
+  }
+  return trimmed.replace(/^\/+/, "");
+}
 
 // src/commands/ServiceCommandHandler.ts
 var ServiceCommandHandler = class {
@@ -20106,12 +20072,10 @@ var ServiceCommandHandler = class {
     const runtime = new ServiceRuntimeRunner();
     switch (args.action) {
       case "list": {
-        const response = await this.request(
-          baseUrl,
-          "GET",
-          "/services"
-        );
-        const items = args.namespace ? response.items.filter((item) => item.namespace === args.namespace) : response.items;
+        const items = await registry.listServices({
+          namespace: args.namespace,
+          repository: args.repository
+        });
         this.renderList(items, args.json);
         return;
       }
@@ -20666,16 +20630,14 @@ function parseAgentArgs(tokens) {
     return { type: "agent" /* Agent */, action, namespace, baseUrl, json };
   }
   if (action === "get" || action === "view" || action === "delete") {
-    const first = rest.shift();
-    if (!first) {
+    const ref = rest.shift();
+    if (!ref) {
       throw new Error(
         `Usage: agent ${action} <ns:objectId> [--base-url <url>] [--json]`
       );
     }
-    let namespace = DEFAULT_AGENT_NAMESPACE;
-    let name = first;
+    let namespaceFromOption;
     if (action === "view") {
-      let namespaceFromOption;
       while (rest.length > 0) {
         const token = rest[0];
         if (token === "--ns" || token === "--namespace") {
@@ -20685,30 +20647,23 @@ function parseAgentArgs(tokens) {
         }
         break;
       }
-      const parsed = parseNamespacedRef(first, {
-        defaultNamespace: namespaceFromOption,
-        entityLabel: "agent ref"
-      });
-      namespace = parsed.namespace;
-      name = parsed.objectId;
-    } else if (first.includes(":")) {
-      const parsed = parseNamespacedRef(first, { entityLabel: "agent ref" });
-      namespace = parsed.namespace;
-      name = parsed.objectId;
-    } else {
-      const second = rest.shift();
-      if (second && !second.startsWith("-")) {
-        namespace = first;
-        name = second;
-      } else if (second) {
-        rest.unshift(second);
-      }
     }
+    const parsed = parseNamespacedRef(ref, {
+      defaultNamespace: action === "view" ? namespaceFromOption : void 0,
+      entityLabel: "agent ref"
+    });
     takeSharedOptions4();
     if (rest.length > 0) {
       throw new Error(`Unknown agent ${action} option: ${rest[0]}`);
     }
-    return { type: "agent" /* Agent */, action, namespace, name, baseUrl, json };
+    return {
+      type: "agent" /* Agent */,
+      action,
+      namespace: parsed.namespace,
+      name: parsed.objectId,
+      baseUrl,
+      json
+    };
   }
   if (action === "create") {
     let namespace = DEFAULT_AGENT_NAMESPACE;
@@ -20738,27 +20693,13 @@ function parseAgentArgs(tokens) {
     return { type: "agent" /* Agent */, action, namespace, filePath, baseUrl, json };
   }
   if (action === "update") {
-    const first = rest.shift();
-    if (!first) {
+    const ref = rest.shift();
+    if (!ref) {
       throw new Error(
         "Usage: agent update <ns:objectId> --file <path> [--base-url <url>] [--json]"
       );
     }
-    let namespace = DEFAULT_AGENT_NAMESPACE;
-    let name = first;
-    if (first.includes(":")) {
-      const parsed = parseNamespacedRef(first, { entityLabel: "agent ref" });
-      namespace = parsed.namespace;
-      name = parsed.objectId;
-    } else {
-      const second = rest.shift();
-      if (second && !second.startsWith("-")) {
-        namespace = first;
-        name = second;
-      } else if (second) {
-        rest.unshift(second);
-      }
-    }
+    const parsed = parseNamespacedRef(ref, { entityLabel: "agent ref" });
     let filePath;
     while (rest.length > 0) {
       const token = rest.shift();
@@ -20779,7 +20720,15 @@ function parseAgentArgs(tokens) {
     if (!filePath) {
       throw new Error("Missing required option --file for agent update");
     }
-    return { type: "agent" /* Agent */, action, namespace, name, filePath, baseUrl, json };
+    return {
+      type: "agent" /* Agent */,
+      action,
+      namespace: parsed.namespace,
+      name: parsed.objectId,
+      filePath,
+      baseUrl,
+      json
+    };
   }
   throw new Error(`Unknown agent action: ${action}`);
 }
@@ -21218,12 +21167,16 @@ function parseServiceArgs(tokens) {
   let json = false;
   if (action === "list") {
     let namespace;
+    let repository;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
         case "--namespace":
           namespace = requireValue5(rest, token);
           break;
+        case "--repo":
+          repository = requireValue5(rest, token);
+          break;
         case "--base-url":
           baseUrl = requireValue5(rest, token);
           break;
@@ -21234,7 +21187,7 @@ function parseServiceArgs(tokens) {
           throw new Error(`Unknown service list option: ${token}`);
       }
     }
-    return { type: "service" /* Service */, action, namespace, baseUrl, json };
+    return { type: "service" /* Service */, action, namespace, repository, baseUrl, json };
   }
   if (action === "get" || action === "view" || action === "delete" || action === "deploy" || action === "init" || action === "log") {
     const ref = rest.shift();
@@ -21277,7 +21230,6 @@ function parseServiceArgs(tokens) {
     }
     const parsedRef = parseNamespacedRef(ref, {
       defaultNamespace: action === "view" || action === "deploy" || action === "init" || action === "log" ? namespaceFromOption : void 0,
-      allowLegacySlash: action === "view" || action === "deploy" || action === "init" || action === "log",
       entityLabel: "service ref"
     });
     const namespace = parsedRef.namespace;
@@ -21606,12 +21558,6 @@ var HELP_TEXT = [
   `  ${import_chalk3.default.cyan("sts")}              Request an OSS STS token from the CI server`,
   `  ${import_chalk3.default.cyan("bucket")}           Manage OSS buckets`,
   `  ${import_chalk3.default.gray("                  --create --name <bucket> [--subdomain <name> --domain <name>]")}`,
-  `  ${import_chalk3.default.cyan("deploy")}           Deprecated; use pmate service deploy`,
-  `  ${import_chalk3.default.gray("                  <service-name> [deploy|logs] [--ns <namespace>]")}`,
-  `  ${import_chalk3.default.cyan("log")}              Deprecated; use pmate service log`,
-  `  ${import_chalk3.default.gray("                  <service-name> [--ns <namespace>]")}`,
-  `  ${import_chalk3.default.cyan("init")}             Deprecated; use pmate service init`,
-  `  ${import_chalk3.default.gray("                  <service-name> [--ns <namespace>]")}`,
   `  ${import_chalk3.default.cyan("delete")}           Tear down app resources created by init`,
   `  ${import_chalk3.default.gray("                  [app] <app-name> [--cwd <dir>]")}`,
   `  ${import_chalk3.default.cyan("dev")}              Run the dev script for app dir from .pmate.yaml`,
@@ -21667,7 +21613,7 @@ var HELP_TEXT = [
   `  ${import_chalk3.default.gray("                  --thread <name> [--endpoint <url>] [--json]")}`,
   `  ${import_chalk3.default.cyan("agent")}            Manage agent registry entries via agent-ui-api`,
   `  ${import_chalk3.default.gray("                  namespaces [--base-url <url>] [--json]")}`,
-  `  ${import_chalk3.default.gray("                  list [--namespace <ns>] [--base-url <url>] [--json]")}`,
+  `  ${import_chalk3.default.gray("                  list [--namespace <ns>] [--repo <owner/name|https://github.com/owner/name>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk3.default.gray("                  get <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk3.default.gray("                  view (<ns:objectId> | <id> --ns <namespace>) [--base-url <url>] [--json]")}`,
   `  ${import_chalk3.default.gray("                  create [<namespace>] --file <path> [--base-url <url>] [--json]")}`,
@@ -21792,15 +21738,6 @@ function parseCommandArgs(args) {
   if (args.rest[0] === "bucket") {
     return parseBucketArgs(args.rest.slice(1));
   }
-  if (args.rest[0] === "deploy") {
-    return parseDeployArgs(args.rest.slice(1));
-  }
-  if (args.rest[0] === "log") {
-    return parseLogArgs(args.rest.slice(1));
-  }
-  if (args.rest[0] === "init") {
-    return parseInitArgs(args.rest.slice(1));
-  }
   if (args.rest[0] === "delete") {
     return parseDeleteArgs(args.rest.slice(1));
   }
@@ -22006,119 +21943,6 @@ function parseBucketArgs(tokens) {
   }
   return { type: "bucket" /* Bucket */, ...options };
 }
-function parseDeployArgs(tokens) {
-  const options = {
-    deployApp: "",
-    deployAction: "deploy",
-    deployCwd: process.cwd()
-  };
-  const rest = [...tokens];
-  const appName = rest.shift();
-  if (!appName || appName.startsWith("-")) {
-    throw new Error("Missing app name for deploy command");
-  }
-  options.deployApp = appName;
-  while (rest.length > 0) {
-    const token = rest.shift();
-    switch (token) {
-      case "deploy":
-        options.deployAction = "deploy";
-        break;
-      case "logs":
-        options.deployAction = "logs";
-        break;
-      case "--cwd":
-        options.deployCwd = requireValue8(rest, token);
-        break;
-      case "--ns":
-      case "--namespace":
-        options.deployNamespace = requireValue8(rest, token);
-        break;
-      case "--base-url":
-        options.deployBaseUrl = requireValue8(rest, token);
-        break;
-      default:
-        throw new Error(`Unknown deploy option: ${token}`);
-    }
-  }
-  return { type: "deploy" /* Deploy */, ...options };
-}
-function parseLogArgs(tokens) {
-  const options = {
-    logApp: "",
-    logCwd: process.cwd(),
-    logPage: 0,
-    logHistory: false
-  };
-  const rest = [...tokens];
-  const appName = rest.shift();
-  if (!appName || appName.startsWith("-")) {
-    throw new Error("Missing app name for log command");
-  }
-  options.logApp = appName;
-  while (rest.length > 0) {
-    const token = rest.shift();
-    switch (token) {
-      case "--cwd":
-        options.logCwd = requireValue8(rest, token);
-        break;
-      case "--ns":
-        options.logNamespace = requireValue8(rest, token);
-        break;
-      case "--base-url":
-        options.logBaseUrl = requireValue8(rest, token);
-        break;
-      case "--page": {
-        const value = requireValue8(rest, token);
-        const page = Number.parseInt(value, 10);
-        if (!Number.isFinite(page) || page < 0) {
-          throw new Error(`Invalid log page: ${value}`);
-        }
-        options.logPage = page;
-        break;
-      }
-      case "--history":
-        options.logHistory = true;
-        break;
-      case "--search":
-        options.logSearch = requireValue8(rest, token);
-        break;
-      default:
-        throw new Error(`Unknown log option: ${token}`);
-    }
-  }
-  return { type: "log" /* Log */, ...options };
-}
-function parseInitArgs(tokens) {
-  const options = {
-    initApp: "",
-    initCwd: process.cwd()
-  };
-  const rest = [...tokens];
-  const appName = rest.shift();
-  if (!appName || appName.startsWith("-")) {
-    throw new Error("Missing app name for init command");
-  }
-  options.initApp = appName;
-  while (rest.length > 0) {
-    const token = rest.shift();
-    switch (token) {
-      case "--cwd":
-        options.initCwd = requireValue8(rest, token);
-        break;
-      case "--ns":
-      case "--namespace":
-        options.initNamespace = requireValue8(rest, token);
-        break;
-      case "--base-url":
-        options.initBaseUrl = requireValue8(rest, token);
-        break;
-      default:
-        throw new Error(`Unknown init option: ${token}`);
-    }
-  }
-  return { type: "init" /* Init */, ...options };
-}
 function parseDevArgs(tokens) {
   const options = {
     devApp: "",
@@ -23330,21 +23154,6 @@ async function main() {
         await handler.handle(commandArgs);
         return;
       }
-      case "deploy" /* Deploy */: {
-        const handler = new DeployCommandHandler();
-        await handler.handle(commandArgs);
-        return;
-      }
-      case "log" /* Log */: {
-        const handler = new LogCommandHandler();
-        await handler.handle(commandArgs);
-        return;
-      }
-      case "init" /* Init */: {
-        const handler = new InitCommandHandler();
-        await handler.handle(commandArgs);
-        return;
-      }
       case "delete" /* Delete */: {
         const handler = new DeleteCommandHandler();
         await handler.handle(commandArgs);

package/package.json

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