@pmate/cli 0.21.5 → 0.21.7

package/dist/index.d.ts

@@ -693,6 +693,72 @@ type ServiceCommandArgs = {
     history: boolean;
     search?: string;
     follow: boolean;
+} | {
+    type: Command.Service;
+    action: "env-list";
+    appId: string;
+    scope?: string;
+    includeSecretMeta: boolean;
+    includeSecretValue: boolean;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-get";
+    appId: string;
+    key: string;
+    scope: string;
+    includeSecretValue: boolean;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-set";
+    appId: string;
+    key: string;
+    value?: string;
+    scope: string;
+    secret: boolean;
+    prompt: boolean;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-unset";
+    appId: string;
+    key: string;
+    scope: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-resolve";
+    appId: string;
+    stage: "dev" | "preview" | "prod";
+    branch?: string;
+    includeSecretValue: boolean;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-pull";
+    appId: string;
+    stage: "dev" | "preview" | "prod";
+    branch?: string;
+    output: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "env-copy-from";
+    targetAppId: string;
+    sourceAppId: string;
+    scope?: string;
+    includeSecret: boolean;
+    overwrite: boolean;
+    onlyKeys?: string[];
+    baseUrl?: string;
+    json: boolean;
 };
 type VercelProjectsCommandArgs = {
     type: Command.Vercel;

package/dist/index.js

@@ -11660,7 +11660,7 @@ var PrepareDevCommandHandler = class {
       this.renderOpen(result2, args.json);
       return result2;
     }
-    const result = await this.closeEnvironment(args.repo, args.envIndex, envRoot);
+    const result = await this.closeEnvironment(args.repo, args.envIndex, envRoot, baseRoot);
     this.renderClose(result, args.json);
     return result;
   }
@@ -11732,9 +11732,10 @@ var PrepareDevCommandHandler = class {
     }
     throw new Error(`No available dev environment found for ${repo} under ${envRoot}`);
   }
-  async closeEnvironment(repo, envIndex, envRoot) {
+  async closeEnvironment(repo, envIndex, envRoot, baseRoot) {
     const envPath = import_node_path10.default.join(envRoot, `${repo}-${envIndex}`);
     const lockPath = import_node_path10.default.join(envPath, LOCK_FILE_NAME);
+    const baseRepoPath = import_node_path10.default.join(baseRoot, repo);
     if (!await this.pathExists(envPath) || !await this.pathExists(import_node_path10.default.join(envPath, ".git"))) {
       throw new Error(`Dev environment not found: ${envPath}`);
     }
@@ -11744,6 +11745,7 @@ var PrepareDevCommandHandler = class {
         `Cannot close ${repo}-${envIndex}: local changes detected. Commit or clean the worktree first.`
       );
     }
+    const baseRepoSync = await this.syncBaseRepo(baseRepoPath);
     const removedLock = await this.removeLock(lockPath);
     return {
       action: "close",
@@ -11751,7 +11753,9 @@ var PrepareDevCommandHandler = class {
       envIndex,
       envPath,
       lockPath,
-      removedLock
+      removedLock,
+      baseRepoPath,
+      baseRepoSync
     };
   }
   resolveRoot(input, fallbackSegments) {
@@ -11766,6 +11770,33 @@ var PrepareDevCommandHandler = class {
       throw new Error(`Expected ${cwd} to be on main, got ${branch || "(detached)"}`);
     }
   }
+  async syncBaseRepo(baseRepoPath) {
+    if (!await this.pathExists(baseRepoPath) || !await this.pathExists(import_node_path10.default.join(baseRepoPath, ".git"))) {
+      throw new Error(`Cannot close dev environment: base repo not found: ${baseRepoPath}`);
+    }
+    const origin = await this.safeGitOutput(baseRepoPath, ["remote", "get-url", "origin"]);
+    if (!origin || this.isLocalOrigin(origin)) {
+      throw new Error(
+        `Cannot close dev environment: base repo has invalid origin: ${baseRepoPath}`
+      );
+    }
+    const branch = await this.safeGitOutput(baseRepoPath, ["branch", "--show-current"]);
+    if (branch !== "main") {
+      throw new Error(
+        `Cannot close dev environment: base repo must be on main before sync, got ${branch || "(detached)"}.`
+      );
+    }
+    if (await this.hasUncommittedChanges(baseRepoPath)) {
+      throw new Error(
+        `Cannot close dev environment: base repo has local changes: ${baseRepoPath}`
+      );
+    }
+    await this.runGit(["pull", "--ff-only"], baseRepoPath);
+    return {
+      attempted: true,
+      updated: true
+    };
+  }
   async hasUncommittedChanges(cwd) {
     const status = await this.getGitOutput(cwd, ["status", "--porcelain"]);
     if (!status) {
@@ -11851,7 +11882,9 @@ var PrepareDevCommandHandler = class {
     }
     ui.success(`Closed ${result.repo}-${result.envIndex}`, {
       path: result.envPath,
-      lockRemoved: result.removedLock
+      lockRemoved: result.removedLock,
+      baseRepo: result.baseRepoPath,
+      baseRepoSynced: result.baseRepoSync.updated
     });
   }
 };
@@ -15002,15 +15035,18 @@ var INTRO_MIN_LENGTHS = Object.freeze({
 var FIELD_RULES = Object.freeze({
   teachingArticle: Object.freeze({
     label: "teachingArticle\uFF08\u6559\u5B66\u77ED\u6587\uFF09",
+    legacyLabel: "knowledgeSummary\uFF08\u77E5\u8BC6\u8BB2\u89E3\uFF09",
     defaultHint: "\u77E5\u8BC6\u8BB2\u89E3\u81F3\u5C11\u8981\u5148\u628A\u9898\u76EE\u524D\u63D0\u8BF4\u6E05\u695A\uFF0C\u518D\u8BA9\u7528\u6237\u53BB\u9009\u7B54\u6848\u3002",
     introHint: "\u5F00\u573A\u9898\u81F3\u5C11\u8981\u8BB2\u6E05\u5B83\u662F\u4EC0\u4E48\u3001\u89E3\u51B3\u4EC0\u4E48\u95EE\u9898\uFF0C\u4EE5\u53CA\u8BFB\u8005\u63A5\u4E0B\u6765\u8BE5\u5E26\u7740\u4EC0\u4E48\u7406\u89E3\u8DEF\u5F84\u7EE7\u7EED\u5F80\u4E0B\u770B\u3002"
   }),
   teachingTip: Object.freeze({
     label: "teachingTip\uFF08\u8865\u5145\u8BF4\u660E\uFF09",
+    legacyLabel: "knowledgeNote\uFF08\u8865\u5145\u8BF4\u660E\uFF09",
     introHint: "\u5F00\u573A\u9898\u8981\u8865\u5145\u4E3A\u4EC0\u4E48\u5BB9\u6613\u8BEF\u89E3\uFF0C\u6216\u8005\u7B2C\u4E00\u6B21\u8BFB\u8FD9\u5757\u5185\u5BB9\u65F6\u5E94\u8BE5\u5148\u770B\u54EA\u91CC\u3002"
   }),
   explanation: Object.freeze({
     label: "explanation\uFF08\u89E3\u6790\uFF09",
+    legacyLabel: "explanation\uFF08\u89E3\u6790\uFF09",
     defaultHint: "\u89E3\u6790\u81F3\u5C11\u8981\u6309 3W+1H \u8BB2\u6E05 What\u3001Why\u3001Where\u3001How\uFF0C\u5E76\u8986\u76D6\u6B63\u786E\u539F\u56E0\u548C\u4E00\u4E2A\u5E38\u89C1\u8BEF\u533A\u3002",
     introHint: "\u89E3\u6790\u81F3\u5C11\u8981\u6309 3W+1H \u8BB2\u6E05 What\u3001Why\u3001Where\u3001How\uFF0C\u5E76\u8865\u4E0A\u6B63\u786E\u539F\u56E0\u3001\u4E00\u4E2A\u5E38\u89C1\u8BEF\u533A\uFF0C\u4EE5\u53CA\u5B83\u548C\u5F53\u524D\u4E0A\u4E0B\u6587\u7684\u5177\u4F53\u5173\u7CFB\u3002"
   })
@@ -15025,14 +15061,47 @@ function formatStepLabel(step, index) {
   const stepId = String(step?.stepId || `step-${index + 1}`);
   return `\u7B2C ${index + 1} \u9898\uFF08${stepId}\uFF09`;
 }
+function getFieldValue(step, field) {
+  if (field === "teachingArticle") {
+    return step.teachingArticle ?? step.knowledgeSummary;
+  }
+  if (field === "teachingTip") {
+    return step.teachingTip ?? step.knowledgeNote;
+  }
+  return step[field];
+}
+function getFieldLabel(step, field) {
+  const fieldRule = FIELD_RULES[field];
+  if (field === "teachingArticle" && step.teachingArticle == null && step.knowledgeSummary != null) {
+    return fieldRule.legacyLabel ?? "teachingArticle\uFF08\u6559\u5B66\u77ED\u6587\uFF09";
+  }
+  if (field === "teachingTip" && step.teachingTip == null && step.knowledgeNote != null) {
+    return fieldRule.legacyLabel ?? "teachingTip\uFF08\u8865\u5145\u8BF4\u660E\uFF09";
+  }
+  return fieldRule.label;
+}
+function normalizeQuizStep(rawStep) {
+  return {
+    ...rawStep,
+    conceptTitle: rawStep.conceptTitle ?? rawStep.knowledgeTitle,
+    teachingArticle: rawStep.teachingArticle ?? rawStep.knowledgeSummary,
+    teachingTip: rawStep.teachingTip ?? rawStep.knowledgeNote
+  };
+}
+function normalizeQuizPaperPayloadDocument(payload) {
+  const rawSteps = Array.isArray(payload.steps) ? payload.steps : [];
+  return {
+    ...payload,
+    steps: rawSteps.map((step) => normalizeQuizStep(step ?? {}))
+  };
+}
 function assertMinLength(step, index, field, minLength, hint) {
-  const currentLength = countMeaningfulChars(step?.[field]);
+  const currentLength = countMeaningfulChars(getFieldValue(step, field));
   if (currentLength >= minLength) {
     return;
   }
-  const fieldRule = FIELD_RULES[field];
   throw new Error(
-    `${formatStepLabel(step, index)}\u7684${fieldRule.label}\u592A\u77ED\uFF0C\u81F3\u5C11\u9700\u8981${minLength}\u4E2A\u975E\u7A7A\u767D\u5B57\u7B26\uFF0C\u5F53\u524D\u53EA\u6709${currentLength}\u4E2A\u3002${hint}`
+    `${formatStepLabel(step, index)}\u7684${getFieldLabel(step, field)}\u592A\u77ED\uFF0C\u81F3\u5C11\u9700\u8981${minLength}\u4E2A\u975E\u7A7A\u767D\u5B57\u7B26\uFF0C\u5F53\u524D\u53EA\u6709${currentLength}\u4E2A\u3002${hint}`
   );
 }
 function validateQuizPaperPayload(payload) {
@@ -15114,8 +15183,10 @@ async function publishQuizPaper({
 }) {
   const trimmedApiBaseUrl = apiBaseUrl.replace(/\/+$/, "");
   const trimmedLinkBaseUrl = linkBaseUrl.replace(/\/+$/, "");
-  const { steps = [], ...metadata } = payload ?? {};
-  validateQuizPaperPayload(payload);
+  const rawPayload = payload ?? {};
+  const normalizedPayload = normalizeQuizPaperPayloadDocument(rawPayload);
+  const { steps = [], ...metadata } = normalizedPayload;
+  validateQuizPaperPayload(rawPayload);
   await requestJson(
     fetchImpl,
     `${trimmedApiBaseUrl}/api/quiz/papers`,
@@ -15292,6 +15363,7 @@ async function appendQuizPaperStep({
   const trimmedApiBaseUrl = apiBaseUrl.replace(/\/+$/, "");
   const trimmedLinkBaseUrl = linkBaseUrl.replace(/\/+$/, "");
   const previewLink = `${trimmedLinkBaseUrl}/?paper=${encodeURIComponent(paperId)}`;
+  const normalizedStep = normalizeQuizStep(step);
   const data = await requestJson(
     fetchImpl,
     `${trimmedApiBaseUrl}/api/quiz/papers/${encodeURIComponent(paperId)}/steps`,
@@ -15301,7 +15373,7 @@ async function appendQuizPaperStep({
         Authorization: `Bearer ${token}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(step)
+      body: JSON.stringify(normalizedStep)
     },
     `\u8FFD\u52A0\u9898\u76EE\uFF08${String(step?.stepId ?? "unknown-step")}\uFF09`
   );
@@ -15324,6 +15396,7 @@ async function updateQuizPaperStep({
   const trimmedApiBaseUrl = apiBaseUrl.replace(/\/+$/, "");
   const trimmedLinkBaseUrl = linkBaseUrl.replace(/\/+$/, "");
   const previewLink = `${trimmedLinkBaseUrl}/?paper=${encodeURIComponent(paperId)}`;
+  const normalizedStep = normalizeQuizStep(step);
   const data = await requestJson(
     fetchImpl,
     `${trimmedApiBaseUrl}/api/quiz/papers/${encodeURIComponent(paperId)}/steps/${encodeURIComponent(stepId)}`,
@@ -15333,7 +15406,7 @@ async function updateQuizPaperStep({
         Authorization: `Bearer ${token}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(step)
+      body: JSON.stringify(normalizedStep)
     },
     `\u66F4\u65B0\u9898\u76EE\uFF08${stepId}\uFF09`
   );
@@ -17303,7 +17376,9 @@ function readNamespaceFromPayload(payload) {
 
 // src/commands/ServiceCommandHandler.ts
 var import_node_fs18 = require("fs");
+var import_promises5 = require("fs/promises");
 var import_node_path23 = __toESM(require("path"));
+var import_promises6 = require("readline/promises");
 
 // src/services/ServiceRuntimeRunner.ts
 var import_node_fs17 = require("fs");
@@ -18398,6 +18473,107 @@ var ServiceCommandHandler = class {
         });
         return;
       }
+      case "env-list": {
+        const payload = await this.request(
+          baseUrl,
+          "GET",
+          this.buildEnvPath(args.appId, {
+            scope: args.scope,
+            includeSecretMeta: args.includeSecretMeta,
+            includeSecretValue: args.includeSecretValue
+          })
+        );
+        this.renderJson(payload, true);
+        return;
+      }
+      case "env-get": {
+        const payload = await this.request(
+          baseUrl,
+          "GET",
+          `${this.buildEnvBasePath(args.appId)}/${encodeURIComponent(args.key)}?${new URLSearchParams({
+            scope: args.scope,
+            ...args.includeSecretValue ? { includeSecretValue: "true" } : {}
+          }).toString()}`
+        );
+        this.renderJson(payload, true);
+        return;
+      }
+      case "env-set": {
+        const value = await this.resolveEnvValue(args);
+        const payload = await this.request(
+          baseUrl,
+          "PUT",
+          `${this.buildEnvBasePath(args.appId)}/${encodeURIComponent(args.key)}`,
+          {
+            value,
+            scope: args.scope,
+            kind: args.secret ? "secret" : "plain"
+          }
+        );
+        ui.success(`Updated env ${args.key} for ${args.appId}`);
+        this.renderJson(payload, args.json);
+        return;
+      }
+      case "env-unset": {
+        const payload = await this.request(
+          baseUrl,
+          "DELETE",
+          `${this.buildEnvBasePath(args.appId)}/${encodeURIComponent(args.key)}?${new URLSearchParams({
+            scope: args.scope
+          }).toString()}`
+        );
+        ui.success(`Deleted env ${payload.key} (${payload.scope}) from ${args.appId}`);
+        this.renderJson(payload, args.json);
+        return;
+      }
+      case "env-resolve": {
+        const payload = await this.request(
+          baseUrl,
+          "POST",
+          `${this.buildEnvBasePath(args.appId)}/resolve`,
+          {
+            stage: args.stage,
+            ...args.branch ? { branch: args.branch } : {},
+            ...args.includeSecretValue ? { includeSecretValue: true } : {}
+          }
+        );
+        this.renderJson(payload, true);
+        return;
+      }
+      case "env-pull": {
+        const payload = await this.request(
+          baseUrl,
+          "POST",
+          `${this.buildEnvBasePath(args.appId)}/pull`,
+          {
+            stage: args.stage,
+            ...args.branch ? { branch: args.branch } : {},
+            format: "dotenv"
+          }
+        );
+        const outputPath = import_node_path23.default.resolve(process.cwd(), args.output);
+        await (0, import_promises5.writeFile)(outputPath, payload.content, "utf8");
+        ui.success(`Wrote env file for ${args.appId} to ${outputPath}`);
+        this.renderJson({ ...payload, output: outputPath }, args.json);
+        return;
+      }
+      case "env-copy-from": {
+        const payload = await this.request(
+          baseUrl,
+          "POST",
+          `${this.buildEnvBasePath(args.targetAppId)}/copy-from`,
+          {
+            sourceAppId: args.sourceAppId,
+            ...args.scope ? { scope: args.scope } : {},
+            ...args.includeSecret ? { includeSecret: true } : {},
+            ...args.overwrite ? { overwrite: true } : {},
+            ...args.onlyKeys?.length ? { onlyKeys: args.onlyKeys } : {}
+          }
+        );
+        ui.success(`Copied env items from ${args.sourceAppId} to ${args.targetAppId}`);
+        this.renderJson(payload, args.json);
+        return;
+      }
     }
   }
   resolveBaseUrl(baseUrl) {
@@ -18437,6 +18613,44 @@ var ServiceCommandHandler = class {
     }
     return payload.data;
   }
+  buildEnvBasePath(appId) {
+    return `/apps/by-id/${encodeURIComponent(appId)}/env`;
+  }
+  buildEnvPath(appId, query) {
+    const params = new URLSearchParams();
+    if (query.scope) {
+      params.set("scope", query.scope);
+    }
+    if (query.includeSecretMeta) {
+      params.set("includeSecretMeta", "true");
+    }
+    if (query.includeSecretValue) {
+      params.set("includeSecretValue", "true");
+    }
+    const qs = params.toString();
+    return `${this.buildEnvBasePath(appId)}${qs ? `?${qs}` : ""}`;
+  }
+  async resolveEnvValue(args) {
+    if (args.value !== void 0) {
+      return args.value;
+    }
+    if (!args.prompt && !args.secret) {
+      throw new Error("Missing env value. Pass a value or use --prompt.");
+    }
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      throw new Error("Prompt input requires an interactive terminal.");
+    }
+    const rl = (0, import_promises6.createInterface)({
+      input: process.stdin,
+      output: process.stdout
+    });
+    try {
+      const prompt = args.secret ? `Enter secret value for ${args.key}: ` : `Enter value for ${args.key}: `;
+      return await rl.question(prompt);
+    } finally {
+      rl.close();
+    }
+  }
   async requireNamespace(payload, baseUrl) {
     if (!payload || typeof payload !== "object") {
       throw new Error("Service payload must be a JSON object.");
@@ -19883,6 +20097,10 @@ init_namespacedRef();
 function parseServiceArgs(tokens) {
   const rest = [...tokens];
   const rawAction = rest.shift();
+  if (rawAction && looksLikeNamespacedRef(rawAction) && rest[0] === "env") {
+    rest.shift();
+    return parseServiceEnvArgs(rawAction, rest);
+  }
   const action = rawAction === "view" ? "view" : rawAction;
   if (!action) {
     throw new Error("Missing service action. Use: service list|get|view|create|update|rename|delete");
@@ -20159,6 +20377,245 @@ function parseBareRenameId3(value, entityName) {
   }
   return normalized;
 }
+function looksLikeNamespacedRef(value) {
+  return value.includes(":") && !value.startsWith("-");
+}
+function parseServiceEnvArgs(appId, tokens) {
+  const rest = [...tokens];
+  const action = rest.shift();
+  if (!action) {
+    throw new Error("Usage: service <ns:app> env list|get|set|unset|resolve|pull|copy-from");
+  }
+  let baseUrl;
+  let json = false;
+  if (action === "list") {
+    let scope;
+    let includeSecretMeta = false;
+    let includeSecretValue = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--scope":
+          scope = requireValue6(rest, token);
+          break;
+        case "--include-secret-meta":
+          includeSecretMeta = true;
+          break;
+        case "--include-secret-value":
+          includeSecretValue = true;
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env list option: ${token}`);
+      }
+    }
+    return { type: "service" /* Service */, action: "env-list", appId, scope, includeSecretMeta, includeSecretValue, baseUrl, json };
+  }
+  if (action === "get") {
+    const key = rest.shift();
+    if (!key || key.startsWith("-")) {
+      throw new Error("Usage: service <ns:app> env get <key> --scope <scope> [--include-secret-value]");
+    }
+    let scope;
+    let includeSecretValue = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--scope":
+          scope = requireValue6(rest, token);
+          break;
+        case "--include-secret-value":
+          includeSecretValue = true;
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env get option: ${token}`);
+      }
+    }
+    if (!scope) {
+      throw new Error("Usage: service <ns:app> env get <key> --scope <scope> [--include-secret-value]");
+    }
+    return { type: "service" /* Service */, action: "env-get", appId, key, scope, includeSecretValue, baseUrl, json };
+  }
+  if (action === "set") {
+    const key = rest.shift();
+    if (!key || key.startsWith("-")) {
+      throw new Error("Usage: service <ns:app> env set <key> [value] --scope <scope> [--secret] [--prompt]");
+    }
+    let value;
+    if (rest[0] && !rest[0].startsWith("-")) {
+      value = rest.shift();
+    }
+    let scope;
+    let secret = false;
+    let prompt = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--scope":
+          scope = requireValue6(rest, token);
+          break;
+        case "--secret":
+          secret = true;
+          break;
+        case "--prompt":
+          prompt = true;
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env set option: ${token}`);
+      }
+    }
+    if (!scope) {
+      throw new Error("Usage: service <ns:app> env set <key> [value] --scope <scope> [--secret] [--prompt]");
+    }
+    if (!value && !secret && !prompt) {
+      throw new Error("Missing env value. Pass a value or use --prompt.");
+    }
+    return { type: "service" /* Service */, action: "env-set", appId, key, value, scope, secret, prompt, baseUrl, json };
+  }
+  if (action === "unset") {
+    const key = rest.shift();
+    if (!key || key.startsWith("-")) {
+      throw new Error("Usage: service <ns:app> env unset <key> --scope <scope>");
+    }
+    let scope;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--scope":
+          scope = requireValue6(rest, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env unset option: ${token}`);
+      }
+    }
+    if (!scope) {
+      throw new Error("Usage: service <ns:app> env unset <key> --scope <scope>");
+    }
+    return { type: "service" /* Service */, action: "env-unset", appId, key, scope, baseUrl, json };
+  }
+  if (action === "resolve") {
+    let stage;
+    let branch;
+    let includeSecretValue = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--stage":
+          stage = requireValue6(rest, token);
+          break;
+        case "--branch":
+          branch = requireValue6(rest, token);
+          break;
+        case "--include-secret-value":
+          includeSecretValue = true;
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env resolve option: ${token}`);
+      }
+    }
+    if (!stage) {
+      throw new Error("Usage: service <ns:app> env resolve --stage <dev|preview|prod> [--branch <name>]");
+    }
+    return { type: "service" /* Service */, action: "env-resolve", appId, stage, branch, includeSecretValue, baseUrl, json };
+  }
+  if (action === "pull") {
+    let stage;
+    let branch;
+    let output = ".env.local";
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--stage":
+          stage = requireValue6(rest, token);
+          break;
+        case "--branch":
+          branch = requireValue6(rest, token);
+          break;
+        case "--output":
+          output = requireValue6(rest, token);
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env pull option: ${token}`);
+      }
+    }
+    if (!stage) {
+      throw new Error("Usage: service <ns:app> env pull --stage <dev|preview|prod> [--branch <name>] [--output <path>]");
+    }
+    return { type: "service" /* Service */, action: "env-pull", appId, stage, branch, output, baseUrl, json };
+  }
+  if (action === "copy-from") {
+    const sourceAppId = rest.shift();
+    if (!sourceAppId || sourceAppId.startsWith("-")) {
+      throw new Error("Usage: service <ns:app> env copy-from <source-ns:app> [--scope <scope>] [--include-secret] [--overwrite]");
+    }
+    let scope;
+    let includeSecret = false;
+    let overwrite = false;
+    let onlyKeys;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--scope":
+          scope = requireValue6(rest, token);
+          break;
+        case "--include-secret":
+          includeSecret = true;
+          break;
+        case "--overwrite":
+          overwrite = true;
+          break;
+        case "--only":
+          onlyKeys = requireValue6(rest, token).split(",").map((item) => item.trim()).filter(Boolean);
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env copy-from option: ${token}`);
+      }
+    }
+    return { type: "service" /* Service */, action: "env-copy-from", targetAppId: appId, sourceAppId, scope, includeSecret, overwrite, onlyKeys, baseUrl, json };
+  }
+  throw new Error(`Unknown service env action: ${action}`);
+}
 
 // src/roleCommandParser.ts
 function parseRoleArgs(tokens) {

package/package.json

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