@nodii/dev 0.6.17 → 0.6.20

package/README.md

@@ -402,6 +402,29 @@ version. A set never submitted needs `--file`: the body `figma submit --file`
 would send. A cold run can outlast the edge's gateway; the CLI then says
 `DEV_TIMEOUT` and to run it again (Dev keeps the mains it read for 5 minutes).
 
+### Large sets: submit as a Dev job
+
+`figma submit`, `figma resubmit` and `design check --change-set` send
+`Prefer: respond-async`. Dev answers 202 with a job, and the CLI polls it
+(`getDesignSubmitJob`) with backoff, printing progress on stderr, until it
+ends. The output and exit code are the synchronous call's: a succeeded job
+prints Dev's 200 body and warnings, a failed one its error and findings. A
+large set's gate outlasts the edge's 30 s timeout, so this is the default.
+
+- `a submit is already running: JOB`: Dev already runs a submit (or a dry run)
+  for this set (409 `SUBMIT_IN_PROGRESS` / `CONFORMANCE_IN_PROGRESS`). The CLI
+  polls that job instead of sending again, then exits 1 with the 409's code
+  and that job's outcome (`--json`: `details.result` or `details.error`):
+  this command's body was not sent, so read the set and run it again if it
+  still needs to go.
+- `SUBMIT_JOB_LOST`: Dev restarted while the job ran. Run the same command again.
+- `SUBMIT_JOB_UNREACHABLE`: polling lost the edge; the job runs on in Dev.
+  Read the set with `figma changeset show` before sending it again.
+- `--sync` sends the old single request. If it (or a submit's 202) meets the
+  edge's 502 or 504, the CLI reads the set and says whether the submit landed;
+  it never resends. `SUBMIT_UNCONFIRMED` means it hasn't yet: check with
+  `figma changeset show` before submitting again.
+
 When `figma submit`, `figma resubmit` or the dry run hits
 `DS_CONFORMANCE_FAILED`, the CLI prints each finding and Dev's warnings. A
 submit Dev accepts prints its warnings too. On a stale version it also prints

package/dist/cli.js

@@ -43,12 +43,13 @@ import {
   figmaScopeSet,
   figmaScopeSetText,
   figmaSubmit,
+  submitMode,
   isChangeSetId,
   scopeText,
   scopesFrom,
   conformanceLines,
 } from "./figma.js";
-export { figmaLock } from "./figma.js";
+export { figmaLock, submitMode } from "./figma.js";
 import { docsCommand, rulebookCommand, rulesCommand } from "./upload.js";
 import { changeSetCommand, guidelineCommand } from "./guidelines.js";
 import { designCheck, designCheckText, designRoles, designRolesText } from "./design.js";
@@ -96,7 +97,7 @@ Usage: nodii-dev <command> [options] [--json]
   design check FILE_KEY|LINK [--nodes A,B] [--roles R,S] [--library]
                                         # the DS conformance check Dev's submit runs, before you submit;
                                         # reads Figma with FIGMA_PAT; exit 1 = DS_CONFORMANCE_FAILED or an error (--json: data.passed)
-  design check --change-set CS [--file SUBMIT.json] [--figma-version V]
+  design check --change-set CS [--file SUBMIT.json] [--figma-version V] [--sync]
                                         # Dev's dry run of the submit gate on a set, with the image guard;
                                         # a stale version is a warning that prints when to retry
   figma lock FILE_KEY --title TEXT [--scope KIND:ID ...]
@@ -107,8 +108,12 @@ Usage: nodii-dev <command> [options] [--json]
   figma publish-plan FILE_KEY           # what to publish, and what to leave unchecked in Figma's dialog
   figma published FILE_KEY|CHANGE_SET --figma-version V   # a file key marks every awaiting set published
   figma check|log-write|submit|apply|abandon|release
+  figma submit CHANGE_SET --file SUBMIT.json [--sync]
+                                        # submit, resubmit and design check --change-set run as a job in Dev
+                                        # and poll it (a large set outlasts the edge's timeout); --sync waits
+                                        # on one request instead. A 502/504 is checked against the set, never resent
   figma withdraw CHANGE_SET             # holder takes back a submit: in_review -> editing (or a re-submit -> applying)
-  figma resubmit CHANGE_SET PAYLOAD.json
+  figma resubmit CHANGE_SET PAYLOAD.json [--sync]
                                         # holder re-submits every rejected item: applying -> in_review, round + 1
   figma changeset show CHANGE_SET       # items, variants, round, decision and comment (with the previous round's)
   figma file add FILE_KEY --name TEXT --kind design-system|surfaces|prototype [--module M]
@@ -428,7 +433,7 @@ export async function main(argv = process.argv.slice(2)) {
   if (command === "design" && action === "roles") return emit(await designRoles(rest), json, designRolesText);
   if (command === "design" && action === "check") {
     if ((!rest[0] && f["change-set"] === undefined) || rest.length > 1)
-      throw new CliError("USAGE", "design check FILE_KEY|LINK [--nodes A,B] [--roles R,S] [--library] | design check --change-set CS [--file SUBMIT.json] [--figma-version V]", 2);
+      throw new CliError("USAGE", "design check FILE_KEY|LINK [--nodes A,B] [--roles R,S] [--library] | design check --change-set CS [--file SUBMIT.json] [--figma-version V] [--sync]", 2);
     const result = await designCheck(rest[0], f);
     emit(result.payload, json, result.human ?? designCheckText);
     if (result.exitCode) {
@@ -646,7 +651,7 @@ export async function main(argv = process.argv.slice(2)) {
     if (action === "submit") {
       const payload = f.file ? JSON.parse(await readFile(f.file, "utf8")) : { figmaVersion: requireFlag(f, "figma-version") };
       // A 200 carries top-level warnings (STALE_FIGMA_VERSION): print them.
-      return emit(await figmaSubmit(rest[0], payload), json, (p) =>
+      return emit(await figmaSubmit(rest[0], payload, { sync: submitMode(f) }), json, (p) =>
         [JSON.stringify(p.data, null, 2), ...conformanceLines({ warnings: p.warnings })].join("\n"));
     }
     if (action === "file") {
@@ -686,7 +691,7 @@ export async function main(argv = process.argv.slice(2)) {
     if (action === "withdraw")
       return emit(await figmaWithdraw(rest[0]), json, (p) => `Withdrew ${rest[0]}; it is back in ${p.data?.state ?? "editing"}.`);
     if (action === "resubmit")
-      return emit(await figmaResubmit(rest[0], rest[1]), json, (p) =>
+      return emit(await figmaResubmit(rest[0], rest[1], { sync: submitMode(f) }), json, (p) =>
         [`Re-submitted ${rest[0]}; it is ${p.data.state}.`, figmaChangeSetText(p.data), ...conformanceLines({ warnings: p.warnings })].join("\n"));
     if (action === "changeset") {
       if (rest[0] !== "show" || !rest[1] || rest.length > 2) throw new CliError("USAGE", "figma changeset show CHANGE_SET", 2);

package/dist/core.js

@@ -4,7 +4,7 @@ import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { homedir, platform } from "node:os";
 import { dirname, join } from "node:path";
 
-export const VERSION = "0.6.17";
+export const VERSION = "0.6.20";
 export const configPath = () =>
   process.env.NODII_DEV_CONFIG_PATH ??
   join(homedir(), ".config/nodii-dev/config.json");
@@ -113,7 +113,7 @@ const staleCode = (raw) => {
   }
 };
 
-async function devFetch(method, path, bodyText, contentType, accept) {
+async function devFetch(method, path, bodyText, contentType, accept, extra = {}) {
   const config = await readConfig();
   const auth = await authProvider();
   const url = requestUrl(config, path);
@@ -124,7 +124,7 @@ async function devFetch(method, path, bodyText, contentType, accept) {
   let refreshed = false;
   let adopted = false;
   for (;;) {
-    const headers = { accept };
+    const headers = { accept, ...extra };
     if (bodyText !== undefined) headers["content-type"] = contentType;
     Object.assign(headers, await auth.headers({ method, path, body: bodyText ?? "" }));
     let response;
@@ -143,8 +143,9 @@ async function devFetch(method, path, bodyText, contentType, accept) {
   }
 }
 
-export async function devRawRequest(method, path, bodyText, contentType = "application/json") {
-  const { response, raw } = await devFetch(method, path, bodyText, contentType, "application/json");
+/** A JSON call that keeps the status: `{ status, payload }`. Errors throw as devRawRequest's do. */
+export async function devExchange(method, path, bodyText, { contentType = "application/json", headers = {} } = {}) {
+  const { response, raw } = await devFetch(method, path, bodyText, contentType, "application/json", headers);
   let payload;
   try {
     payload = raw ? JSON.parse(raw) : {};
@@ -158,7 +159,11 @@ export async function devRawRequest(method, path, bodyText, contentType = "appli
       1,
       payload.details,
     );
-  return payload;
+  return { status: response.status, payload };
+}
+
+export async function devRawRequest(method, path, bodyText, contentType = "application/json") {
+  return (await devExchange(method, path, bodyText, { contentType })).payload;
 }
 
 /** A Dev route that answers with text (e.g. a document body as text/markdown). Errors are Dev's JSON. */
@@ -173,6 +178,10 @@ export async function devTextRequest(method, path) {
 export const devRequest = (method, path, body) =>
   devRawRequest(method, path, body === undefined ? undefined : JSON.stringify(body));
 
+/** A JSON call sent with `Prefer: respond-async` (RFC 7240): `{ status, payload }`, 202 when Dev took it as a job. */
+export const devAsyncRequest = async (method, path, body) =>
+  devExchange(method, path, body === undefined ? undefined : JSON.stringify(body), { headers: { prefer: "respond-async" } });
+
 /** Proves the stored OAuth login works: a token refresh, then the agent read once registered. */
 export async function checkLogin() {
   const config = await readConfig();
@@ -184,7 +193,7 @@ export async function checkLogin() {
 export const encode = (value) => encodeURIComponent(value);
 // Switches never take the next token as their value, so
 // `docs upload --wait rulebook/` keeps rulebook/ as a path.
-const SWITCHES = new Set(["json", "wait", "dry-run", "check", "all", "fleet", "help", "yes", "mine", "no-browser", "include-drafts", "drafted", "library"]);
+const SWITCHES = new Set(["json", "wait", "dry-run", "check", "all", "fleet", "help", "yes", "mine", "no-browser", "include-drafts", "drafted", "library", "async", "sync"]);
 export function parseArgs(argv) {
   const flags = {};
   const args = [];

package/dist/design.js

@@ -8,7 +8,7 @@
 // library main.
 import { readFile } from "node:fs/promises";
 import { CliError, devRequest } from "./core.js";
-import { conformanceLines, figmaConformance, figmaFileKey } from "./figma.js";
+import { conformanceLines, figmaConformance, figmaFileKey, submitMode } from "./figma.js";
 import { checkConformance, neededMains, VERSION as CHECK_VERSION } from "./vendor/ds-conformance.mjs";
 
 const FIGMA_API = "https://api.figma.com/v1";
@@ -159,7 +159,7 @@ export async function lastPublish(figmaGet, fileKey) {
 /**
  * The main of each instance, keyed by the instance's componentId (this file's
  * id for it), resolved as Dev's gate resolves it (Dev issue 92, conformance
- * 1.0.3), so both give one verdict:
+ * 1.0.4), so both give one verdict:
  * - a local component (remote: false) is read from this file;
  * - a remote one is found in the DS file's published listing, else by Figma's
  *   lookup of its key, and is read only from a library Dev has registered
@@ -273,8 +273,10 @@ const nodeId = (x) => (/^\d+-\d+$/.test(x) ? x.replace("-", ":") : x);
  * finding fails; stale overrides (a value equal to the main's) are listed but
  * never fail (DEC-0035).
  */
-export async function designCheck(target, flags = {}, { request = devRequest, env = process.env, figmaGet, read } = {}) {
-  if (flags["change-set"] !== undefined) return designCheckChangeSet(target, flags, { request, ...(read ? { read } : {}) });
+export async function designCheck(target, flags = {}, { request = devRequest, send, progress, env = process.env, figmaGet, read } = {}) {
+  submitMode(flags);
+  if (flags["change-set"] !== undefined)
+    return designCheckChangeSet(target, flags, { request, ...(send ? { send } : {}), ...(progress ? { progress } : {}), ...(read ? { read } : {}) });
   // A --nodes that names nothing must not widen to every page.
   if (flags.nodes !== undefined && ([flags.nodes].flat().includes(true) || !list(flags.nodes).length))
     throw new CliError("USAGE", "--nodes needs node ids, e.g. --nodes 12:34,12:56", 2);
@@ -345,6 +347,8 @@ export async function designCheck(target, flags = {}, { request = devRequest, en
     // Same value through a different variable: the file is behind a library
     // republish. Accept the update in Figma (MW6-17); never a failure.
     libraryUpdatePending: result.libraryUpdatePending ?? [],
+    // What the app-UI gate leaves out (email), with its node count (Dev issue 116).
+    outOfScope: result.outOfScope ?? [], outOfScopeNodes: result.outOfScopeNodes ?? 0,
     warnings,
   };
   return { payload: { data }, exitCode: data.passed ? 0 : 1 };
@@ -367,8 +371,9 @@ export function designCheckText({ data }) {
  * plus the submit-time guards against the set's items: IMAGE_NOT_TRUECOLOR
  * refuses; STALE_FIGMA_VERSION is a warning. Changes no state.
  */
-export async function designCheckChangeSet(target, flags, { request = devRequest, read = (f) => readFile(f, "utf8") } = {}) {
+export async function designCheckChangeSet(target, flags, { request = devRequest, send, progress, read = (f) => readFile(f, "utf8") } = {}) {
   const id = flags["change-set"];
+  const sync = submitMode(flags);
   if (id === true || !id) throw new CliError("USAGE", "--change-set needs a change set id, e.g. --change-set CS-123", 2);
   if (target !== undefined) throw new CliError("USAGE", "design check --change-set CS takes no file: Dev checks the set's own items", 2);
   if (flags["figma-version"] === true) throw new CliError("USAGE", "--figma-version needs a version id", 2);
@@ -387,17 +392,18 @@ export async function designCheckChangeSet(target, flags, { request = devRequest
   if (flags["figma-version"]) body = { ...body, figmaVersion: String(flags["figma-version"]) };
   let p;
   try {
-    p = await figmaConformance(id, body, { request });
+    p = await figmaConformance(id, body, { request, sync, ...(send ? { send } : {}), ...(progress ? { progress } : {}) });
   } catch (error) {
     // A cold run reads every root and main from Figma and can outlast the
     // edge's gateway (504, an HTML page). Dev keeps the mains it read for 5
     // minutes, so the same run again usually answers.
-    if (error?.code !== "HTTP_504") throw error;
-    throw new CliError("DEV_TIMEOUT", `Dev's dry run of ${id} ran past the edge's gateway timeout while reading Figma; run it again (Dev keeps the library mains it read for 5 minutes)`, 1);
+    if (error?.code !== "HTTP_504" && error?.code !== "HTTP_502") throw error;
+    throw new CliError("DEV_TIMEOUT", `Dev's dry run of ${id} ran past the edge's gateway timeout while reading Figma; run it again${sync ? " without --sync, so Dev runs it as a job" : ""} (Dev keeps the library mains it read for 5 minutes)`, 1);
   }
   const r = p.data ?? {};
   const data = { changeSetId: id, checkVersion: r.version, passed: Boolean(r.passed), checked: r.checked, findings: r.findings ?? [],
-    staleOverrides: r.staleOverrides ?? [], libraryUpdatePending: r.libraryUpdatePending ?? [], warnings: r.warnings ?? [], staleVersion: r.staleVersion ?? null };
+    staleOverrides: r.staleOverrides ?? [], libraryUpdatePending: r.libraryUpdatePending ?? [],
+    outOfScope: r.outOfScope ?? [], outOfScopeNodes: r.outOfScopeNodes ?? 0, warnings: r.warnings ?? [], staleVersion: r.staleVersion ?? null };
   return { payload: { data }, exitCode: data.passed ? 0 : 1, human: designCheckChangeSetText };
 }
 

package/dist/figma.js

@@ -1,5 +1,6 @@
 import { readFile } from "node:fs/promises";
-import { CliError, devRequest, encode } from "./core.js";
+import { setTimeout as delay } from "node:timers/promises";
+import { CliError, devAsyncRequest, devRequest, encode } from "./core.js";
 
 /** A Figma file key, or the key inside a figma.com file link (a branch link's branch key). */
 export function figmaFileKey(value) {
@@ -55,7 +56,158 @@ export function resubmitPayload(text, file) {
   return body;
 }
 
-export async function figmaResubmit(id, file, { request = devRequest, read = (f) => readFile(f, "utf8") } = {}) {
+// Async submit, re-submit and dry run (`Prefer: respond-async`): a large set's
+// gate outlasts the edge's 30 s timeout (CS-2470 got a 504 while Dev went on to
+// answer 422), so Dev answers 202 with a job, polled here until it ends. A Dev
+// that ignores the header answers synchronously, which is taken as is.
+const JOB_POLL_MS = [1000, 2000, 3000, 5000];
+// Dev fails a job still running after 20 minutes (SUBMIT_JOB_LOST); stop a little later.
+const JOB_WAIT_MS = 25 * 60_000;
+const JOB_PROGRESS_MS = 15_000;
+const IN_PROGRESS = new Set(["SUBMIT_IN_PROGRESS", "CONFORMANCE_IN_PROGRESS"]);
+const GATEWAY = new Set(["HTTP_502", "HTTP_504"]);
+const TRANSIENT = new Set([...GATEWAY, "HTTP_503", "HTTP_429", "DEV_UNREACHABLE"]);
+const stderrLine = (line) => process.stderr.write(`${line}\n`);
+/** --sync sends the old synchronous call; the default (or --async) runs it as a job in Dev and polls it. */
+export function submitMode(f) {
+  if (f.sync && f.async) throw new CliError("USAGE", "pass --sync or --async, not both", 2);
+  return Boolean(f.sync);
+}
+const DONE = new Set(["succeeded", "failed"]);
+const jobName = (job) => (job.kind === "conformance" ? "dry run" : job.kind === "resubmit" ? "re-submit" : "submit");
+
+export const submitJobPath = (job) => `/api/v1/design/change-sets/${encode(job.changeSetId)}/submit-jobs/${encode(job.id)}`;
+
+/** A finished job as the synchronous call would have answered: `succeeded` is its 200 body, `failed` throws its error. */
+export function jobOutcome(job) {
+  if (job.state === "succeeded") return job.result ?? {};
+  const e = job.error ?? {};
+  if (e.code === "SUBMIT_JOB_LOST")
+    throw new CliError(e.code, `${e.message ?? "Dev lost this job"} (${jobName(job)} job ${job.id} on ${job.changeSetId}). Run the same command again.`, 1, { job });
+  // Never a gateway code: that reads as the edge's gateway on this command's own request.
+  throw new CliError(!e.code || GATEWAY.has(e.code) ? "SUBMIT_JOB_FAILED" : e.code, e.message ?? `Dev's ${jobName(job)} job ${job.id} failed with HTTP ${job.httpStatus}`, 1, e.details ?? { httpStatus: job.httpStatus });
+}
+
+/** Polls a running job (getDesignSubmitJob) with backoff until it ends, printing progress. */
+export async function pollSubmitJob(job, { request = devRequest, sleep = delay, progress = stderrLine, now = Date.now } = {}) {
+  const start = now();
+  let printed = start;
+  let misses = 0;
+  for (let n = 0; !DONE.has(job.state); n++) {
+    if (now() - start > JOB_WAIT_MS)
+      throw new CliError("SUBMIT_JOB_TIMEOUT", `Dev's ${jobName(job)} job ${job.id} is still running after ${Math.round(JOB_WAIT_MS / 60_000)} min; read ${job.changeSetId} with nodii-dev figma changeset show ${job.changeSetId} before running it again.`, 1, { job });
+    await sleep(JOB_POLL_MS[Math.min(n, JOB_POLL_MS.length - 1)]);
+    try {
+      job = { changeSetId: job.changeSetId, ...(await request("GET", submitJobPath(job))).data };
+      misses = 0;
+    } catch (error) {
+      if (error?.code === "SUBMIT_JOB_NOT_FOUND")
+        throw new CliError("SUBMIT_JOB_LOST", `Dev no longer knows ${jobName(job)} job ${job.id} on ${job.changeSetId} (it restarted). Read the set with nodii-dev figma changeset show ${job.changeSetId}, then run the same command again.`, 1, { job });
+      if (!TRANSIENT.has(error?.code)) throw error;
+      // A poll that hit the edge's gateway or a blip retries; the job runs on in Dev.
+      if (++misses > 5)
+        throw new CliError("SUBMIT_JOB_UNREACHABLE", `Lost touch with Dev (${error.code}) while its ${jobName(job)} job ${job.id} on ${job.changeSetId} ran; the job goes on in Dev. Do not send it again yet: read the set with nodii-dev figma changeset show ${job.changeSetId} in a few minutes.`, 1, { job, cause: error.code });
+      progress(`polling ${job.id} again (${error.code})`);
+      continue;
+    }
+    if (!DONE.has(job.state) && now() - printed >= JOB_PROGRESS_MS) {
+      printed = now();
+      progress(`${job.changeSetId}: ${jobName(job)} job ${job.id} still running (${Math.round((printed - start) / 1000)} s)`);
+    }
+  }
+  progress(`${job.changeSetId}: ${jobName(job)} job ${job.id} ${job.state}${job.httpStatus && job.state === "failed" ? ` (HTTP ${job.httpStatus})` : ""} after ${Math.round((now() - start) / 1000)} s`);
+  return jobOutcome(job);
+}
+
+/**
+ * Sends a change-set call with `Prefer: respond-async` and answers as the
+ * synchronous call does. A 409 SUBMIT_IN_PROGRESS or CONFORMANCE_IN_PROGRESS
+ * names the job already running for the set: that one is polled instead.
+ */
+export async function changeSetJob(method, path, body, { changeSetId, kind, send = devAsyncRequest, progress = stderrLine, ...poll } = {}) {
+  let job;
+  let adopted = null;
+  try {
+    const { status, payload } = await send(method, path, body);
+    if (status !== 202) return payload;
+    if (!payload?.data?.id)
+      throw new CliError("SUBMIT_UNCONFIRMED", `Dev took the ${kind === "conformance" ? "dry run" : kind} on ${changeSetId} as a job (202) but named no job; do not send it again yet: read the set with nodii-dev figma changeset show ${changeSetId}.`, 1, { changeSetId, payload });
+    job = { changeSetId, ...payload.data };
+    progress(`${job.changeSetId}: Dev is running the ${jobName(job)} as job ${job.id}; polling`);
+  } catch (error) {
+    if (!IN_PROGRESS.has(error?.code) || !error.details?.job?.id) throw error;
+    job = { changeSetId, ...error.details.job };
+    // A dry run never answers for a submit, nor a submit for a dry run.
+    if ((job.kind === "conformance") !== (kind === "conformance")) throw error;
+    progress(`a ${jobName(job)} is already running: ${job.id}; polling it`);
+    adopted = error;
+  }
+  if (!adopted) return pollSubmitJob(job, { progress, ...poll });
+  // An adopted job ran its own body, so its answer is never this command's: it
+  // ends as the 409 it met, with that job's outcome in the details.
+  let outcome;
+  try {
+    outcome = { result: await pollSubmitJob(job, { progress, ...poll }) };
+  } catch (error) {
+    outcome = { error: { code: error.code, message: error.message, details: error.details } };
+  }
+  // Polling that stopped (lost the edge, or timed out) leaves the job's end unknown.
+  const unknown = !outcome.result && ["SUBMIT_JOB_UNREACHABLE", "SUBMIT_JOB_TIMEOUT"].includes(outcome.error.code);
+  const ended = outcome.result ? "succeeded" : unknown ? `has no known outcome yet (${outcome.error.code})` : `failed (${outcome.error.code})`;
+  throw new CliError(
+    adopted.code,
+    `The ${jobName(job)} already running on ${changeSetId} (job ${job.id}) ${ended}; this command's body was not sent. Read the set with nodii-dev figma changeset show ${changeSetId}, then run it again ${unknown ? "only once that job has ended" : "if it still needs to go"}.`,
+    1,
+    { job, ...outcome },
+  );
+}
+
+// A submit lands an editing set in_review, a re-submit an applying one: only that move
+// from the call's own entry state counts, never a set that was in review already.
+const ENTRY = { submit: "editing", resubmit: "applying" };
+
+/**
+ * A submit or re-submit that met the edge's gateway (502/504) may still have
+ * landed in Dev (CS-2468 did): read the set and say which, never send again.
+ */
+async function afterGatewayTimeout(id, kind, before, error, { sync, request, progress }) {
+  let after = null;
+  try {
+    after = (await request("GET", `/api/v1/design/change-sets/${encode(id)}`)).data;
+  } catch {}
+  const status = error.code.replace("HTTP_", "HTTP ");
+  if (before?.state === ENTRY[kind] && after?.state === "in_review") {
+    progress(`Dev answered ${status} (the edge's gateway), but the submit landed: ${id} is ${after.state}. Its warnings were not returned; run nodii-dev figma changeset show ${id}.`);
+    return { data: after, warnings: [], landedAfterGatewayTimeout: true };
+  }
+  throw new CliError(
+    "SUBMIT_UNCONFIRMED",
+    [
+      `Dev answered ${status} (the edge's gateway timeout)${after ? ` and ${id} is still ${after.state}` : `, and ${id} could not be read`}.`,
+      "Dev may still be working on it: do not send it again yet.",
+      `Check with nodii-dev figma changeset show ${id} in a few minutes; if nothing changed, submit again${sync ? " without --sync, so Dev runs it as a job" : ""}.`,
+    ].join("\n"),
+    1,
+    { changeSetId: id, state: after?.state ?? null, gateway: error.code },
+  );
+}
+
+/** A submit or re-submit, async unless `sync`; a gateway timeout is checked against the set, not resent. */
+async function submitCall(id, kind, body, { sync = false, request = devRequest, progress = stderrLine, ...job } = {}) {
+  const path = `/api/v1/design/change-sets/${encode(id)}/${kind}`;
+  let before = null;
+  try {
+    before = (await request("GET", `/api/v1/design/change-sets/${encode(id)}`)).data;
+  } catch {}
+  try {
+    return sync ? await request("POST", path, body) : await changeSetJob("POST", path, body, { changeSetId: id, kind, request, progress, ...job });
+  } catch (error) {
+    if (!GATEWAY.has(error?.code)) throw error;
+    return afterGatewayTimeout(id, kind, before, error, { sync, request, progress });
+  }
+}
+
+export async function figmaResubmit(id, file, { request = devRequest, read = (f) => readFile(f, "utf8"), ...options } = {}) {
   if (!id || !file) throw new CliError("USAGE", "figma resubmit CHANGE_SET PAYLOAD.json", 2);
   let text;
   try {
@@ -65,7 +217,7 @@ export async function figmaResubmit(id, file, { request = devRequest, read = (f)
   }
   const body = resubmitPayload(text, file);
   try {
-    return await request("POST", `/api/v1/design/change-sets/${encode(id)}/resubmit`, body);
+    return await submitCall(id, "resubmit", body, { request, ...options });
   } catch (error) {
     const say = RESUBMIT_REFUSALS[error?.code];
     if (!say) throw scopeRefusal(error, id) ?? error;
@@ -185,6 +337,11 @@ export function conformanceLines(r) {
     lines.push(`${r.libraryUpdatePending.length} node(s) behind a library republish (not failures; accept the library update in this file, MW6-17):`);
     for (const f of r.libraryUpdatePending) lines.push(`  ${f.nodeId}\t${f.check ?? "libraryUpdatePending"}\t${f.detail}`);
   }
+  // Email is outside the app-UI gate (Dev issue 116): counted, never silent.
+  if (r.outOfScope?.length) {
+    lines.push(`out of scope: ${r.outOfScopeNodes ?? "?"} node(s) in ${r.outOfScope.length} part(s), not checked (email: the Email kit, email bodies, the block palette):`);
+    for (const f of r.outOfScope) lines.push(`  ${f.nodeId}\toutOfScope\t${f.detail}`);
+  }
   // Warnings never refuse: STALE_FIGMA_VERSION is one (Dev issue 92, until
   // Dev issue 107). With staleVersion, its wait is printed below instead.
   const warnings = (r.warnings ?? []).filter((f) => !(r.staleVersion && f.check === "STALE_FIGMA_VERSION"));
@@ -314,12 +471,15 @@ export const figmaScopeSetText = (id, data) =>
     ...(data?.released?.length ? [`Released for other sets: ${data.released.map(scopeText).join(", ")}`] : []),
   ].join("\n");
 
-export const figmaSubmit = (id, payload, { request = devRequest } = {}) =>
-  changeSetCall(id, request)("POST", `/api/v1/design/change-sets/${encode(id)}/submit`, payload);
+/** A submit, async unless `sync` (options: sync, request, send, progress, sleep). */
+export const figmaSubmit = (id, payload, { request = devRequest, ...options } = {}) =>
+  changeSetCall(id, (method, path, body) => submitCall(id, "submit", body, { request, ...options }))(
+    "POST", `/api/v1/design/change-sets/${encode(id)}/submit`, payload);
 
-/** checkDesignConformance: the submit gate's dry run on a change set; changes no state. Body: { figmaVersion?, items? }. */
-export const figmaConformance = (id, body = {}, { request = devRequest } = {}) =>
-  changeSetCall(id, request)("POST", `/api/v1/design/change-sets/${encode(id)}/conformance`, body);
+/** checkDesignConformance: the submit gate's dry run on a change set; changes no state. Body: { figmaVersion?, items? }. Async unless `sync`. */
+export const figmaConformance = (id, body = {}, { request = devRequest, sync = false, ...options } = {}) =>
+  changeSetCall(id, (method, path, b) => (sync ? request(method, path, b) : changeSetJob(method, path, b, { changeSetId: id, kind: "conformance", request, ...options })))(
+    "POST", `/api/v1/design/change-sets/${encode(id)}/conformance`, body);
 
 export const figmaLogWrite = (id, tool, nodeIds, { request = devRequest } = {}) =>
   changeSetCall(id, request)("POST", `/api/v1/design/change-sets/${encode(id)}/writes`, { tool, nodeIds });

package/dist/vendor/ds-conformance.mjs

@@ -1,5 +1,6 @@
 // ds-conformance.mjs: the design-system conformance check (DEC-0034 MW6-14 to
-// MW6-17, as amended by DEC-0035, DEC-0036 and DEC-0045).
+// MW6-17, as amended by DEC-0035, DEC-0036 and DEC-0045, and scoped by
+// Dev issue 116).
 //
 // Canonical source: design-system `infra/figma/ds-conformance.mjs`. Every copy
 // (Dev's submit gate, nodii-clis' `design check`) vendors these
@@ -20,13 +21,16 @@
 //             remote component, from the same file for a local one), or
 //             null when it can't be resolved
 //     options: { library?: boolean, declaredRoles?: string[] }
-//     returns { version, findings, staleOverrides, libraryUpdatePending },
-//     each a list of { nodeId, check, detail }; only `findings` fail
+//     returns { version, findings, staleOverrides, libraryUpdatePending,
+//     outOfScope, outOfScopeNodes }, each list a list of { nodeId, check,
+//     detail }; only `findings` fail. `outOfScope` lists the roots of what
+//     the app-UI gate doesn't check (the Email kit), `outOfScopeNodes` how
+//     many nodes they hold
 //   neededMains(nodes, mains, options) -> componentIds still to fetch; call
 //     it until it returns [] (each round can reveal instances inside slot
 //     content).
 
-export const VERSION = "1.0.3";
+export const VERSION = "1.0.4";
 
 /** @typedef {{ nodeId: string, check: string, detail: string }} Finding */
 /**
@@ -118,13 +122,30 @@ const TEXT_STYLE_FIELDS = new Set([
 const STYLE_FIELD = /^(inherit)?(Fill|Stroke|Text|Effect|Grid)StyleId$/i;
 
 const SURFACE_NAME = /^Surface \//;
+// Email is out of the app-UI gate's scope (Dev issue 116): the Email kit's
+// twelve registered parts (DESIGN-SYSTEM-33), an email (a frame named Email
+// that places only those parts), and the template editor's block palette.
+const EMAIL_KIT =
+  /^Email ?\/ ?(Header|Alert strip|Heading|Amount block|Button|Link fallback|Divider|Key-value row|Security note|Code box|QR pay block|Footer)$/i;
+const EMAIL_FRAME = /^email\b/i;
+const BLOCK_PALETTE = /^(email )?blocks? (panel|palette)$/i;
+// A column of a table, grid or list; a page named "List Page" is no column.
+const TABLE_CONTAINER = /table|list|grid/i;
+const NOT_A_TABLE = /\blist page\b/i;
 const CUSTOMER_HEADER =
   /^(customer|client|contact|lead|applicant|candidate)s?( name)?$/i;
 const EXTERNAL_PLANE = /customer portal|partner room|external/i;
 // The viewer's own record (R5): the App Frame sidebar footer, the user menu
 // and the profile. Not any footer: a dialog or table footer can list others.
 const SELF_CONTAINER =
-  /sidebar ?footer|user button|user menu|account menu|profile/i;
+  /sidebar ?footer|user button|user menu|account menu|profile|\b(my|own) (account|tokens?|security|sessions?|settings|notification settings|records?)\b/i;
+// A frame the screen marks as the viewer's own: "[self]", "(self)", a
+// trailing "· self", or "(you)".
+const SELF_MARK = /\[self\]|\(self\)|·\s*self\s*$|\(you\)/i;
+// Where the screens show who the viewer is: the App Frame footer, the user
+// and account menus, and frames marked self or named my/own.
+const VIEWER_PLACE =
+  /sidebar ?footer|user button|user menu|account menu|\b(my|own) (profile|account|tokens?|security|sessions?|settings)\b/i;
 const SELF_TEXT = /\(you\)|^you$/i;
 const SIGNED_IN = /^(signed in( as\b.*)?|not you\?.*)$/i;
 // The signed-in account card (Account Context, kind=Account) shows the
@@ -143,6 +164,16 @@ const PHONE = /(?<![\w.+\-/])\+?\(?\d[\d ().-]{7,}\d(?![\w\-/])/g;
 const LOCAL_PHONE = /^(\(\d{3,5}\)[ .-]?|\d{3,5}[ .-])\d{3,5}([ .-]\d{2,5})?$/;
 const DATE = /^(\d{4}-\d{2}-\d{2}|\d{1,2}[-/.]\d{1,2}[-/.]\d{2,4})/;
 const ROLE_ANNOTATION = /\[role:([a-z0-9._-]+)\]/gi;
+// otherPersonRevealed is about people (Dev issue 116): a value is judged
+// by the field it fills. A tenant's business contact (support phone or
+// email, caller or sender id, business address) is not personal.
+const BUSINESS_FIELD =
+  /\b(support|help ?desk|helpline|hotline|toll[- ]free|caller id|sender( id)?|sending (address|domain|number)|from (address|email|number)|reply[- ]to|business|tenant)\b/i;
+// A person's field wins: "Support agent" is a person.
+const PERSON_FIELD =
+  /\b(user|member|customer|recipient|applicant|employee|candidate|assignee|owner|invitee|requester|reviewer|agent|engineer|staff|rep|manager|person|personal|your|my)\b/i;
+// A field's frame names its label: field/Caller ID, select/Sender ID.
+const FIELD_FRAME = /^(field|select|input|textarea|kv|detail|row) ?\/ ?(.+)$/i;
 
 /** "I12:34;56:78" -> ["12:34", "56:78"]; "12:34" -> ["12:34"]. */
 const segments = (id) => (id.startsWith("I") ? id.slice(1) : id).split(";");
@@ -325,6 +356,25 @@ function analyse(entry, mains, library = false) {
   };
   const componentLabel = (inst) =>
     setOf(inst)?.name ?? componentOf(inst)?.name ?? inst.name;
+  // What the app-UI gate leaves out: each root, outermost first (byId is in
+  // document order, so a parent is decided before its children).
+  /** @type {Map<string, string>} */
+  const scopeRoots = new Map();
+  /** @type {Map<string, "kit" | "other" | "none">} */
+  const placedMemo = new Map();
+  const out = new Set();
+  for (const n of byId.values()) {
+    const p = parent.get(n.id);
+    if (p && out.has(p.id)) {
+      out.add(n.id);
+      continue;
+    }
+    const why = outOfScopeRoot(n, parent, componentLabel, placedMemo);
+    if (why) {
+      out.add(n.id);
+      scopeRoots.set(n.id, why);
+    }
+  }
   return {
     root,
     components,
@@ -340,7 +390,54 @@ function analyse(entry, mains, library = false) {
     componentOf,
     setOf,
     componentLabel,
+    out,
+    scopeRoots,
+  };
+}
+
+const emailKitPart = (n, parent, componentLabel) =>
+  (n.type === "INSTANCE" && EMAIL_KIT.test(componentLabel(n) ?? "")) ||
+  ((n.type === "COMPONENT" || n.type === "COMPONENT_SET") &&
+    (EMAIL_KIT.test(n.name ?? "") ||
+      (n.type === "COMPONENT" &&
+        EMAIL_KIT.test(parent.get(n.id)?.name ?? ""))));
+/**
+ * Why a node and everything in it is outside the app-UI gate, or null: an
+ * Email kit part, an email made of them (a frame named Email whose only
+ * placed parts, at any depth, are the kit's), or the template editor's
+ * block palette.
+ */
+function outOfScopeRoot(n, parent, componentLabel, memo) {
+  if (emailKitPart(n, parent, componentLabel))
+    return `Email kit part ${n.type === "INSTANCE" ? componentLabel(n) : n.name}`;
+  if (n.type !== "FRAME" && n.type !== "GROUP" && n.type !== "SECTION")
+    return null;
+  if (BLOCK_PALETTE.test(n.name ?? "")) return `email block palette ${n.name}`;
+  // Every part placed in it, at any depth, is the kit's.
+  /** @returns {"kit" | "other" | "none"} */
+  const placed = (x) => {
+    const hit = memo.get(x.id);
+    if (hit) return hit;
+    let kind = /** @type {"kit" | "other" | "none"} */ ("none");
+    if (emailKitPart(x, parent, componentLabel)) kind = "kit";
+    else if (x.type === "INSTANCE") kind = "other";
+    else
+      for (const c of x.children ?? []) {
+        const k = placed(c);
+        if (k === "other") {
+          kind = "other";
+          break;
+        }
+        if (k === "kit") kind = "kit";
+      }
+    memo.set(x.id, kind);
+    return kind;
   };
+  // An email is named so; an editor's workspace around it, or an app screen
+  // holding a kit part, stays in scope.
+  return EMAIL_FRAME.test(n.name ?? "") && placed(n) === "kit"
+    ? `email ${n.name}`
+    : null;
 }
 
 /** Component ids whose mains the check still needs. */
@@ -350,7 +447,7 @@ export function neededMains(nodes, mains = {}, options = {}) {
     if (!entry?.document) continue;
     const a = analyse(entry, mains, Boolean(options.library));
     for (const n of a.byId.values()) {
-      if (n.type !== "INSTANCE" || !n.componentId) continue;
+      if (n.type !== "INSTANCE" || !n.componentId || a.out.has(n.id)) continue;
       if (Object.prototype.hasOwnProperty.call(mains, n.componentId)) continue;
       // The screen's own instances (for overrides and slot content), and
       // every table header cell (for its fill).
@@ -423,7 +520,8 @@ function textOf(n) {
  *   mains?: Record<string, NodesEntry | null>,
  *   options?: { library?: boolean, declaredRoles?: string[] } }} input
  * @returns {{ version: string, findings: Finding[], staleOverrides: Finding[],
- *   libraryUpdatePending: Finding[] }}
+ *   libraryUpdatePending: Finding[], outOfScope: Finding[],
+ *   outOfScopeNodes: number }}
  */
 export function checkConformance({
   nodes,
@@ -440,6 +538,9 @@ export function checkConformance({
   const staleOverrides = [];
   /** @type {Finding[]} */
   const libraryUpdatePending = [];
+  /** @type {Finding[]} */
+  const outOfScope = [];
+  const outNodes = new Set();
   const seen = new Set();
   const push = (list, nodeId, check, detail) => {
     const key = `${nodeId}|${check}|${detail}`;
@@ -454,12 +555,46 @@ export function checkConformance({
       labelRoles.set(label.trim().toLowerCase(), r);
   const librarySetNames = new Set();
   const usedRoles = new Set();
+  const analyses = Object.values(nodes ?? {})
+    .filter((entry) => entry?.document)
+    .map((entry) => analyse(entry, mains, library));
+  // The viewer (R5): the email and phone the screens show in the viewer's
+  // own places (the App Frame footer, a frame marked self). The same value
+  // anywhere else is still the viewer's own.
+  const viewer = new Set();
+  for (const a of analyses)
+    for (const n of a.byId.values()) {
+      if (n.type !== "TEXT" || a.out.has(n.id)) continue;
+      const ids = identifiers(textOf(n));
+      if (ids.length === 0) continue;
+      if (
+        a
+          .ancestors(n)
+          .some(
+            (x) =>
+              VIEWER_PLACE.test(x.name ?? "") || SELF_MARK.test(x.name ?? ""),
+          )
+      )
+        for (const id of ids) viewer.add(id);
+    }
 
-  for (const entry of Object.values(nodes ?? {})) {
-    if (!entry?.document) continue;
-    const a = analyse(entry, mains, library);
+  for (const a of analyses) {
     for (const set of Object.values(a.componentSets))
       if (set?.remote) librarySetNames.add(set.name);
+    for (const [nodeId, why] of a.scopeRoots) {
+      let count = 0;
+      for (const n of indexTree(a.byId.get(nodeId)).byId.values()) {
+        if (!outNodes.has(n.id)) count++;
+        outNodes.add(n.id);
+      }
+      if (count > 0)
+        push(
+          outOfScope,
+          nodeId,
+          "outOfScope",
+          `${why}: ${count} node${count === 1 ? "" : "s"} outside the app-UI gate (email, Dev issue 116)`,
+        );
+    }
     // Every (node, field) the screen overrode on an instance it placed.
     /** @type {Map<string, { fields: Set<string>, from: any }>} */
     const overrideFields = new Map();
@@ -481,12 +616,16 @@ export function checkConformance({
     // not; one equal to the main's value is a stale mark (DEC-0035).
     for (const [id, { fields, from }] of overrideFields) {
       const node = a.byId.get(id);
-      if (!node || !a.shown(node)) continue;
+      if (!node || !a.shown(node) || a.out.has(id)) continue;
       const base = baselineInstance(a, mains, from, node);
       if (!base) continue;
       const mainNode = a.mainNodeFor(base, id);
       if (!mainNode) continue;
       const mainStyles = mains[base.componentId]?.styles ?? {};
+      // Slot content a library part ships by default: its value there is
+      // the library's, not this file's (DEC-0047).
+      /** @type {ReturnType<typeof defaultSlotContent> | undefined} */
+      let slotDefault;
       const differ = [];
       const equal = [];
       for (const field of [...fields].sort()) {
@@ -494,7 +633,20 @@ export function checkConformance({
         if (exemptPaint(a, from, node, field)) continue;
         const mine = fieldValue(node, field, a.styles);
         const theirs = fieldValue(mainNode, field, mainStyles);
-        if (sameValue(mine, theirs)) equal.push(field);
+        if (sameValue(mine, theirs)) {
+          equal.push(field);
+          continue;
+        }
+        if (slotDefault === undefined)
+          slotDefault = defaultSlotContent(a, mains, node);
+        if (
+          slotDefault &&
+          sameValue(
+            mine,
+            fieldValue(slotDefault.node, field, slotDefault.styles),
+          )
+        )
+          equal.push(field);
         else
           differ.push(
             `${field} ${shortValue(mine)} (main ${shortValue(theirs)})`,
@@ -518,7 +670,7 @@ export function checkConformance({
     }
 
     for (const n of a.byId.values()) {
-      if (!a.shown(n)) continue;
+      if (!a.shown(n) || a.out.has(n.id)) continue;
       const own = !a.composed(n);
 
       if (n.type === "INSTANCE")
@@ -670,14 +822,17 @@ export function checkConformance({
         revealedByPermission(a, n)
       )
         continue;
-      for (const m of text.matchAll(EMAIL)) {
+      const business = businessField(a, n);
+      for (const m of business ? [] : text.matchAll(EMAIL)) {
         const local = m[0].split("@")[0] ?? "";
         if (MASKED.test(local) || ROLE_MAILBOX.test(local)) continue;
+        if (viewer.has(m[0].toLowerCase())) continue;
         push(findings, n.id, "otherPersonRevealed", `unmasked email ${m[0]}`);
       }
-      for (const m of text.matchAll(PHONE)) {
+      for (const m of business ? [] : text.matchAll(PHONE)) {
         const digits = m[0].replace(/\D/g, "");
-        if (DATE.test(m[0]) || MASKED.test(m[0])) continue;
+        if (DATE.test(m[0]) || MASKED.test(m[0]) || viewer.has(digits))
+          continue;
         const phoneShaped =
           m[0].startsWith("+") || LOCAL_PHONE.test(m[0].trim());
         if (phoneShaped && digits.length >= 10 && digits.length <= 15)
@@ -703,14 +858,19 @@ export function checkConformance({
       if (
         header.type !== "TEXT" ||
         !CUSTOMER_HEADER.test(textOf(header)) ||
-        !a.shown(header)
+        !a.shown(header) ||
+        a.out.has(header.id)
       )
         continue;
       // A column header sits in a table, list or grid; a "Customer" form
       // label does not head anything.
       const table = a
         .ancestors(header)
-        .find((x) => /table|list|grid/i.test(x.name ?? ""));
+        .find(
+          (x) =>
+            TABLE_CONTAINER.test(x.name ?? "") &&
+            !NOT_A_TABLE.test(x.name ?? ""),
+        );
       // The header's cell bounds its column, unless the parent is the whole
       // header row: then the header text's own box does.
       const cell = a.parent.get(header.id);
@@ -723,7 +883,13 @@ export function checkConformance({
           : header.absoluteBoundingBox;
       if (!table || !box) continue;
       for (const n of indexTree(table).byId.values()) {
-        if (n.type !== "TEXT" || n.id === header.id || !a.shown(n)) continue;
+        if (
+          n.type !== "TEXT" ||
+          n.id === header.id ||
+          !a.shown(n) ||
+          a.out.has(n.id)
+        )
+          continue;
         if (!screenText(a, n, overridden)) continue;
         const b = n.absoluteBoundingBox;
         const text = textOf(n);
@@ -760,7 +926,74 @@ export function checkConformance({
         `declared role ${role.role} has no ${role.componentName} instance`,
       );
   }
-  return { version: VERSION, findings, staleOverrides, libraryUpdatePending };
+  return {
+    version: VERSION,
+    findings,
+    staleOverrides,
+    libraryUpdatePending,
+    outOfScope,
+    outOfScopeNodes: outNodes.size,
+  };
+}
+
+/** The emails (lower-cased) and phone digits a text shows. */
+function identifiers(text) {
+  return [
+    ...[...text.matchAll(EMAIL)].map((m) => m[0].toLowerCase()),
+    ...[...text.matchAll(PHONE)].map((m) => m[0].replace(/\D/g, "")),
+  ];
+}
+
+/**
+ * The labels of the field a text fills: its field frame's name
+ * (field/Caller ID), a Field instance's label, and its own layer name.
+ */
+function fieldLabels(a, n) {
+  const labels = [];
+  if (n.name && n.name !== n.characters) labels.push(n.name);
+  for (const x of a.ancestors(n).slice(0, 4)) {
+    const m = FIELD_FRAME.exec(x.name ?? "");
+    if (m) labels.push(m[2]);
+    for (const [prop, v] of Object.entries(x.componentProperties ?? {}))
+      if (/^label\b/i.test(prop) && typeof v?.value === "string")
+        labels.push(v.value);
+  }
+  return labels;
+}
+/** A business contact field (support, caller id, sender, business address). */
+function businessField(a, n) {
+  const labels = fieldLabels(a, n);
+  return (
+    labels.some((l) => BUSINESS_FIELD.test(l)) &&
+    !labels.some((l) => PERSON_FIELD.test(l))
+  );
+}
+
+/**
+ * The node a library part's main draws, by default, where `node` sits in
+ * slot content: the nearest slot above it, in the instance that owns that
+ * slot, matched by the layer names from the slot down. Null when the node
+ * isn't in slot content, the owner's main can't be read, or its default
+ * content has no such layer.
+ */
+function defaultSlotContent(a, mains, node) {
+  const up = a.ancestors(node);
+  const slotAt = up.findIndex((x) => x.type === "SLOT");
+  if (slotAt === -1) return null;
+  const slot = up[slotAt];
+  const owner = up.slice(slotAt + 1).find((x) => x.type === "INSTANCE");
+  const tree = owner ? a.mainTree(owner.componentId) : null;
+  if (!owner || !tree) return null;
+  const main = mains[owner.componentId];
+  const names = [...up.slice(0, slotAt).reverse(), node].map((x) => x.name);
+  let level = [...tree.byId.values()].filter(
+    (x) => x.type === "SLOT" && x.name === slot.name,
+  );
+  for (const name of names)
+    level = level.flatMap((x) =>
+      (x.children ?? []).filter((c) => c.name === name),
+    );
+  return level[0] ? { node: level[0], styles: main.styles ?? {} } : null;
 }
 
 /**
@@ -865,7 +1098,12 @@ function handDrawnButton(n) {
 }
 function isSelf(a, n) {
   const up = a.ancestors(n);
-  if (up.some((x) => SELF_CONTAINER.test(x.name ?? ""))) return true;
+  if (
+    up.some(
+      (x) => SELF_CONTAINER.test(x.name ?? "") || SELF_MARK.test(x.name ?? ""),
+    )
+  )
+    return true;
   const accountCard = (x) => {
     const set =
       x.type === "INSTANCE"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodii/dev",
-  "version": "0.6.17",
+  "version": "0.6.20",
   "description": "Agent CLI for Nodii Dev, reached through the platform edge",
   "type": "module",
   "bin": {