@datarails-ai/dr-cli 1.6.139 → 1.6.141

package/dist/cli.js

@@ -8,7 +8,7 @@ import { fileURLToPath as fileURLToPath3 } from "url";
 // package.json
 var package_default = {
   name: "@datarails-ai/dr-cli",
-  version: "1.6.139",
+  version: "1.6.141",
   description: "Datarails CLI",
   type: "module",
   engines: {
@@ -40,7 +40,7 @@ var package_default = {
     postinstall: "node scripts/postinstall.mjs"
   },
   dependencies: {
-    "@datarails-ai/dr-appspace-cli": "0.12.14",
+    "@datarails-ai/dr-appspace-cli": "0.12.15",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@napi-rs/keyring": "^1.3.0",
     commander: "^12.1.0",
@@ -69,7 +69,7 @@ var package_default = {
 };
 
 // src/buildInfo.ts
-var BUILD_TIME = "2026-10-15T21:07:03.000Z";
+var BUILD_TIME = "2026-10-19T11:02:10.572Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -4282,6 +4282,575 @@ function isENOENT(err) {
   return typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT";
 }
 
+// src/scopes/matcher.ts
+var SCOPE_RE = /^(\*|[a-z][a-z0-9-]*):(\*|read|write|destructive)$/;
+var ACTION_RANK = new Map(
+  ["read", "write", "destructive"].map((action, rank) => [action, rank])
+);
+function actionSatisfies(granted, wanted) {
+  if (granted === "*" || granted === wanted) return true;
+  const g = ACTION_RANK.get(granted);
+  const w = ACTION_RANK.get(wanted);
+  if (g === void 0 || w === void 0) return false;
+  return g > w;
+}
+var WHITESPACE = "\\t\\n\\v\\f\\r \\x1c-\\x1f\\x85\\xa0\\u1680\\u2000-\\u200a\\u2028\\u2029\\u202f\\u205f\\u3000\\ufeff";
+var TRIM_RE = new RegExp(`^[${WHITESPACE}]+|[${WHITESPACE}]+$`, "g");
+var SPLIT_RE = new RegExp(`[${WHITESPACE}]+`);
+function trimShared(value) {
+  return value.replace(TRIM_RE, "");
+}
+function splitScopeString(value) {
+  return value.split(SPLIT_RE).filter((part) => part !== "");
+}
+function parseScope(value) {
+  if (typeof value !== "string") return null;
+  const m = SCOPE_RE.exec(trimShared(value).toLowerCase());
+  return m ? [m[1], m[2]] : null;
+}
+function parsed(scopes) {
+  const list28 = scopes ?? [];
+  const entries = typeof list28 === "string" ? splitScopeString(list28) : Array.isArray(list28) ? list28 : [];
+  return entries.map(parseScope).filter((p) => p !== null);
+}
+function scopeEntries(scopes) {
+  return parsed(scopes);
+}
+function isAgentScoped(scopes) {
+  return parsed(scopes).length > 0;
+}
+function isAllowed(scopes, resource, action) {
+  const entries = parsed(scopes);
+  if (entries.length === 0) return true;
+  const res = trimShared(resource).toLowerCase();
+  const act = trimShared(action).toLowerCase();
+  return entries.some(([r, a]) => (r === "*" || r === res) && actionSatisfies(a, act));
+}
+function isEntryAllowed(scopes, entry) {
+  return entry.requires.every((r) => isAllowed(scopes, r.resource, r.action));
+}
+
+// src/scopes/scopesMap.ts
+import { readFileSync } from "fs";
+import * as path3 from "path";
+import { fileURLToPath } from "url";
+function isDeniedEntry(entry) {
+  return entry !== void 0 && Object.prototype.hasOwnProperty.call(entry, "denied");
+}
+var ACTIONS = /* @__PURE__ */ new Set(["read", "write", "destructive"]);
+var RESOURCE_RE = /^[a-z][a-z0-9-]*$/;
+function isValidResourceName(v) {
+  return RESOURCE_RE.test(v);
+}
+function isAction(v) {
+  return typeof v === "string" && ACTIONS.has(v);
+}
+function isResource(v) {
+  return typeof v === "string" && isValidResourceName(v);
+}
+function parseRequirement(v) {
+  if (typeof v !== "object" || v === null) return null;
+  const o = v;
+  if (!isResource(o.resource) || !isAction(o.action)) return null;
+  return { resource: o.resource, action: o.action };
+}
+function parseDenial(v) {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return null;
+  const o = v;
+  if (typeof o.reason !== "string" || o.reason.trim() === "") return null;
+  if (typeof o.until !== "string" || o.until.trim() === "") return null;
+  return { reason: o.reason, until: o.until };
+}
+function parseEntry(v) {
+  if (typeof v !== "object" || v === null) return null;
+  const o = v;
+  if (Object.prototype.hasOwnProperty.call(o, "denied")) {
+    if (Object.prototype.hasOwnProperty.call(o, "requires")) return null;
+    const denied = parseDenial(o.denied);
+    if (denied === null) return null;
+    return { denied };
+  }
+  if (!Array.isArray(o.requires)) return null;
+  const requires = [];
+  for (const raw of o.requires) {
+    const req = parseRequirement(raw);
+    if (req === null) return null;
+    requires.push(req);
+  }
+  return { requires };
+}
+function emptyTable() {
+  return /* @__PURE__ */ Object.create(null);
+}
+function parseStringMap(v) {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
+  const out = emptyTable();
+  for (const [k, val] of Object.entries(v)) {
+    if (typeof val === "string") out[k] = val;
+  }
+  return out;
+}
+function parseResources(v) {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
+  const out = emptyTable();
+  for (const [resource, val] of Object.entries(v)) {
+    if (!isResource(resource)) continue;
+    if (typeof val !== "object" || val === null || Array.isArray(val)) continue;
+    const o = val;
+    if (typeof o.product !== "string" || o.product === "") continue;
+    if (typeof o.productName !== "string" || o.productName === "") continue;
+    out[resource] = { product: o.product, productName: o.productName };
+  }
+  return out;
+}
+function parsePendingCommands(v, pending) {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
+  const out = emptyTable();
+  for (const [group, val] of Object.entries(v)) {
+    if (pending === void 0 || !Object.prototype.hasOwnProperty.call(pending, group)) continue;
+    if (!Array.isArray(val)) continue;
+    if (!val.every((p) => typeof p === "string" && p.split(" ")[0] === group)) continue;
+    out[group] = val;
+  }
+  return out;
+}
+function parseScopesMap(text2) {
+  let raw;
+  try {
+    raw = JSON.parse(text2);
+  } catch {
+    return void 0;
+  }
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
+  const o = raw;
+  if (o.version !== 1 || o.cliVersion !== void 0 && typeof o.cliVersion !== "string" || typeof o.commands !== "object" || o.commands === null || Array.isArray(o.commands))
+    return void 0;
+  const commands2 = emptyTable();
+  for (const [k, v] of Object.entries(o.commands)) {
+    const entry = parseEntry(v);
+    if (entry === null) return void 0;
+    commands2[k] = entry;
+  }
+  const map = { version: 1, commands: commands2 };
+  if (typeof o.cliVersion === "string") map.cliVersion = o.cliVersion;
+  if (typeof o._contract === "string") map._contract = o._contract;
+  const aliases = parseStringMap(o.aliases);
+  if (aliases !== void 0) map.aliases = aliases;
+  const pending = parseStringMap(o.pending);
+  if (pending !== void 0) map.pending = pending;
+  const pendingCommands = parsePendingCommands(o.pendingCommands, pending);
+  if (pendingCommands !== void 0) map.pendingCommands = pendingCommands;
+  const resources = parseResources(o.resources);
+  if (resources !== void 0) map.resources = resources;
+  const deferred = new Set(Object.values(pendingCommands ?? {}).flat());
+  for (const cmdPath of Object.keys(commands2)) {
+    if (deferred.has(cmdPath)) return void 0;
+    if (pending !== void 0 && Object.prototype.hasOwnProperty.call(pending, cmdPath.split(" ")[0]))
+      return void 0;
+  }
+  return map;
+}
+function loadScopesMap(here = path3.dirname(fileURLToPath(import.meta.url))) {
+  let text2;
+  try {
+    text2 = readFileSync(path3.join(here, "scopes-map.json"), "utf8");
+  } catch {
+    return void 0;
+  }
+  return parseScopesMap(text2);
+}
+function scopesMapKey(cmd) {
+  const names = [];
+  for (let c = cmd; c !== null && c.parent !== null; c = c.parent)
+    names.unshift(c.name());
+  return names.join(" ");
+}
+function commandPathOf(argv, root) {
+  const names = [];
+  let cmd = root;
+  for (let i = 0; i < argv.length; i += 1) {
+    const token = argv[i];
+    if (token === "--") break;
+    if (token.startsWith("-") && token !== "-") {
+      if (!token.startsWith("--") && token.length > 2) continue;
+      if (token.includes("=")) continue;
+      if (takesValue(token, cmd)) i += 1;
+      continue;
+    }
+    const child2 = childNamed(cmd, token);
+    if (child2 === void 0) break;
+    names.push(child2.name());
+    cmd = child2;
+  }
+  return names.join(" ");
+}
+function childNamed(cmd, token) {
+  return cmd.commands.find((c) => c.name() === token || c.aliases().includes(token));
+}
+function takesValue(flag, cmd) {
+  for (let c = cmd; c !== null; c = c.parent) {
+    for (const opt of c.options) {
+      if (opt.short !== flag && opt.long !== flag) continue;
+      return opt.required || opt.optional;
+    }
+  }
+  return declaredWithValueBelow(flag, cmd);
+}
+function declaredWithValueBelow(flag, cmd) {
+  for (const child2 of cmd.commands) {
+    for (const opt of child2.options) {
+      if ((opt.short === flag || opt.long === flag) && (opt.required || opt.optional)) return true;
+    }
+    if (declaredWithValueBelow(flag, child2)) return true;
+  }
+  return false;
+}
+
+// src/scopes/filter.ts
+var SCOPE_EXIT_CODE = 3;
+var ScopeFilterError = class extends Error {
+  constructor(command, message) {
+    super(message);
+    this.command = command;
+  }
+  command;
+  exitCode = SCOPE_EXIT_CODE;
+};
+var ScopeHiddenError = class extends ScopeFilterError {
+  constructor(command, required2) {
+    super(
+      command,
+      `'dr ${command}' is not available under this identity's credential scope (needs ${required2.join(", ")}); run 'dr whoami' to see the scopes this identity carries`
+    );
+    this.required = required2;
+    this.name = "ScopeHiddenError";
+  }
+  required;
+};
+var ScopeUnavailableError = class extends ScopeFilterError {
+  constructor(command, reason, until) {
+    super(
+      command,
+      `'dr ${command}' is unavailable to any agent-scoped credential (one whose scopes claim carries at least one resource:action entry): ${reason} (this is not a missing scope \u2014 no scope grants it; ${until} lifts the restriction)`
+    );
+    this.reason = reason;
+    this.until = until;
+    this.name = "ScopeUnavailableError";
+  }
+  reason;
+  until;
+};
+var ScopeGroupHiddenError = class extends ScopeFilterError {
+  constructor(command, required2, tickets) {
+    super(
+      command,
+      `'dr ${command}' has no subcommand available to this identity.` + (required2.length > 0 ? ` Its subcommands need ${required2.join(", ")} \u2014 run 'dr whoami' to see the scopes this identity carries.` : "") + (tickets.length > 0 ? ` Some are closed to any agent-scoped credential whatever its scopes (${tickets.join(", ")}).` : "")
+    );
+    this.required = required2;
+    this.tickets = tickets;
+    this.name = "ScopeGroupHiddenError";
+  }
+  required;
+  tickets;
+};
+function hide(cmd) {
+  cmd._hidden = true;
+}
+function refuseHelp(cmd, err) {
+  cmd.outputHelp = () => {
+    throw err;
+  };
+}
+function leafAnswer(leaf, scopes, map) {
+  const key = scopesMapKey(leaf);
+  if (!Object.prototype.hasOwnProperty.call(map.commands, key)) return void 0;
+  const entry = map.commands[key];
+  if (entry === void 0) return void 0;
+  if (isDeniedEntry(entry))
+    return {
+      err: new ScopeUnavailableError(key, entry.denied.reason, entry.denied.until),
+      required: [],
+      denial: entry.denied
+    };
+  if (isEntryAllowed(scopes, entry)) return void 0;
+  const required2 = entry.requires.map((r) => `${r.resource}:${r.action}`);
+  return { err: new ScopeHiddenError(key, required2), required: required2, denial: void 0 };
+}
+var intercepted = /* @__PURE__ */ new WeakMap();
+function intercept(cmd, err, armed) {
+  intercepted.set(cmd, err);
+  refuseHelp(cmd, err);
+  cmd.action(() => {
+    throw err;
+  });
+  const parent = cmd.parent;
+  if (parent === null || armed.has(parent)) return;
+  armed.add(parent);
+  parent.hook("preSubcommand", (_parent, sub) => {
+    const denial = intercepted.get(sub);
+    if (denial !== void 0) throw denial;
+  });
+}
+function interceptGroup(group, err) {
+  group.allowExcessArguments(true);
+  group.allowUnknownOption(true);
+  group.helpCommand(true);
+  refuseHelp(group, err);
+  group.action(() => {
+    throw err;
+  });
+}
+function groupAnswer(group, below) {
+  const key = scopesMapKey(group);
+  const [mark] = below.denials;
+  if (mark !== void 0 && below.denials.length === 1 && below.required.length === 0)
+    return new ScopeUnavailableError(key, mark.reason, mark.until);
+  if (below.required.length === 0 && below.denials.length === 0) return void 0;
+  return new ScopeGroupHiddenError(
+    key,
+    below.required,
+    below.denials.map((d) => d.until).filter((t, i, all) => all.indexOf(t) === i)
+  );
+}
+function filterBelow(node, scopes, map, armed) {
+  const here = { count: 0, answer: void 0, required: [], denials: [] };
+  let allAnswered = node.commands.length > 0;
+  for (const child2 of node.commands) {
+    if (child2.commands.length > 0) {
+      const below = filterBelow(child2, scopes, map, armed);
+      here.count += below.count;
+      if (below.answer === void 0) {
+        allAnswered = false;
+        continue;
+      }
+      interceptGroup(child2, below.answer);
+      hide(child2);
+      addRequired(here, below.required);
+      addDenials(here, below.denials);
+      continue;
+    }
+    const answer = leafAnswer(child2, scopes, map);
+    if (answer === void 0) {
+      allAnswered = false;
+      continue;
+    }
+    intercept(child2, answer.err, armed);
+    hide(child2);
+    here.count += 1;
+    addRequired(here, answer.required);
+    if (answer.denial !== void 0) addDenials(here, [answer.denial]);
+  }
+  if (allAnswered) here.answer = groupAnswer(node, here);
+  return here;
+}
+function addRequired(into, required2) {
+  for (const r of required2) if (!into.required.includes(r)) into.required.push(r);
+}
+function addDenials(into, denials) {
+  for (const d of denials)
+    if (!into.denials.some((x) => x.reason === d.reason && x.until === d.until))
+      into.denials.push(d);
+}
+function applyScopeFilter(root, scopes, map) {
+  if (map === void 0 || !isAgentScoped(scopes)) return 0;
+  return filterBelow(root, scopes, map, /* @__PURE__ */ new Set()).count;
+}
+
+// src/commands/_tenantPin.ts
+var SERVER_VAR = "DR_PIN_SERVER";
+var ACCOUNT_VAR = "DR_PIN_ACCOUNT";
+var ORG_MODE_VAR = "DR_PIN_ORG_MODE";
+var TenantPinError = class extends Error {
+  /** "You cannot do this", the same exit code a scope denial uses (spec §8). */
+  exitCode = SCOPE_EXIT_CODE;
+  constructor(message) {
+    super(`tenant pin: ${message}`);
+    this.name = "TenantPinError";
+  }
+};
+var ORG_MODE_UNSCOPED_ALLOWED = /* @__PURE__ */ new Set([
+  "login",
+  "whoami",
+  "users me",
+  // Local only: skills, the CLI's own update, the Help Center, MCP registration, and
+  // app-space scaffolding never write to the tenant.
+  "skill list",
+  "skill print",
+  "skill install",
+  "skill init-project",
+  "update",
+  "kb search",
+  "kb get",
+  "kb categories",
+  "kb sections",
+  "kb articles-in-section",
+  "kb recent",
+  "kb attachments",
+  "kb article-images",
+  "mcp register",
+  "mcp unregister",
+  "mcp list",
+  "mcp serve",
+  "app-space scaffold",
+  "app-space contract",
+  "app-space eject"
+]);
+var ORG_MODE_READ_SCOPED_REFUSED = /* @__PURE__ */ new Set([
+  "devices request-logs",
+  "desk smtp test",
+  "dashboards prepare",
+  "storyboards prepare"
+]);
+var LOCAL_COMMANDS_WITH_TARGET_FLAGS = /* @__PURE__ */ new Set([
+  "app-space scaffold"
+]);
+var EMAIL_RE = /^[^\s@]+@[^\s@]+$/;
+function readTenantPin(env = process.env) {
+  const rawServer = env[SERVER_VAR];
+  const rawAccount = env[ACCOUNT_VAR];
+  const rawOrgMode = env[ORG_MODE_VAR];
+  if (rawServer === void 0 && rawAccount === void 0 && rawOrgMode === void 0) {
+    return void 0;
+  }
+  if (rawServer === void 0 || rawServer.trim() === "") {
+    throw new TenantPinError(`${SERVER_VAR} is required when any DR_PIN_* variable is set`);
+  }
+  let server;
+  try {
+    server = resolve(rawServer).key;
+  } catch {
+    throw new TenantPinError(`${SERVER_VAR} is not a known server key or Datarails URL`);
+  }
+  if (rawOrgMode !== void 0 && rawOrgMode !== "1") {
+    throw new TenantPinError(`${ORG_MODE_VAR} must be 1 when set`);
+  }
+  if (rawOrgMode === "1") {
+    if (rawAccount !== void 0) {
+      throw new TenantPinError(
+        `${ORG_MODE_VAR}=1 pins a server only; ${ACCOUNT_VAR} must not be set with it`
+      );
+    }
+    return { kind: "org", server };
+  }
+  const account = normaliseAccount(rawAccount);
+  if (account === void 0 || !EMAIL_RE.test(account)) {
+    throw new TenantPinError(`${ACCOUNT_VAR} must be the login email (or set ${ORG_MODE_VAR}=1)`);
+  }
+  return { kind: "customer", server, account };
+}
+function describePin(pin) {
+  return pin.kind === "customer" ? `${pin.server} as ${pin.account}` : `${pin.server} (org mode)`;
+}
+function assertFlagsWithinPin(pin, serverFlag, accountFlag) {
+  assertServerFlagWithinPin(pin, serverFlag);
+  assertAccountFlagWithinPin(pin, accountFlag);
+}
+function assertServerFlagWithinPin(pin, serverFlag) {
+  if ((serverFlag ?? "").trim() === "") {
+    throw new TenantPinError(
+      `--server is required while dr is pinned to ${describePin(pin)}; pass --server ${pin.server}`
+    );
+  }
+  const server = resolveServer(serverFlag);
+  if (server !== pin.server) {
+    throw new TenantPinError(
+      `--server ${server} is outside the pin; this session may only reach ${describePin(pin)}`
+    );
+  }
+}
+function assertAccountFlagWithinPin(pin, accountFlag) {
+  if (pin.kind !== "customer") return;
+  const account = normaliseAccount(accountFlag);
+  if (account === void 0) {
+    throw new TenantPinError(
+      `--account is required while dr is pinned to ${describePin(pin)}; pass --account ${pin.account}`
+    );
+  }
+  if (account !== pin.account) {
+    throw new TenantPinError(
+      `--account ${account} is outside the pin; this session may only act as ${pin.account}`
+    );
+  }
+}
+function assertIdentityWithinPin(pin, serverKey, email) {
+  let canonical = serverKey;
+  try {
+    canonical = resolve(serverKey).key;
+  } catch {
+  }
+  if (canonical !== pin.server) {
+    throw new TenantPinError(
+      `server ${serverKey} is outside the pin; this session may only reach ${describePin(pin)}`
+    );
+  }
+  if (pin.kind === "customer" && email !== pin.account) {
+    throw new TenantPinError(
+      `account ${email} is outside the pin; this session may only act as ${pin.account}`
+    );
+  }
+}
+function declaresOption(cmd, flag) {
+  for (let c = cmd; c !== null; c = c.parent) {
+    if (c.options.some((o) => o.long === flag)) return true;
+  }
+  return false;
+}
+function assertReadOnly(key, map) {
+  if (map === void 0) {
+    throw new TenantPinError(
+      `org mode is read-only, and without scopes-map.json dr cannot tell whether \`dr ${key}\` writes`
+    );
+  }
+  const entry = Object.prototype.hasOwnProperty.call(map.commands, key) ? map.commands[key] : void 0;
+  const writes = entry === void 0 || isDeniedEntry(entry) || (entry.requires.length === 0 ? !ORG_MODE_UNSCOPED_ALLOWED.has(key) : entry.requires.some((r) => r.action !== "read") || ORG_MODE_READ_SCOPED_REFUSED.has(key));
+  if (writes) {
+    throw new TenantPinError(`org mode is read-only; \`dr ${key}\` is not a read-only command`);
+  }
+}
+var defaultTenantPinDeps = {
+  get env() {
+    return process.env;
+  },
+  loadMap: () => loadScopesMap()
+};
+function enforceTenantPin(cmd, deps = defaultTenantPinDeps) {
+  const pin = readTenantPin(deps.env);
+  if (pin === void 0) return;
+  const key = scopesMapKey(cmd);
+  if (key === "logout") {
+    throw new TenantPinError(`\`dr logout\` is refused while dr is pinned to ${describePin(pin)}`);
+  }
+  const opts = cmd.optsWithGlobals();
+  if (key === "login-as") {
+    const target = normaliseAccount(cmd.processedArgs[0]);
+    if (pin.kind !== "customer" || target !== pin.account || opts.userId !== void 0) {
+      throw new TenantPinError(
+        `\`dr login-as\` may only target the pinned account, by email, while dr is pinned to ${describePin(pin)}`
+      );
+    }
+  }
+  for (const { flag, value, envVar } of [
+    { flag: "--app-space-host", value: opts.appSpaceHost, envVar: "DR_APP_SPACE_HOST" },
+    { flag: "--connectors-url", value: opts.connectorsUrl, envVar: void 0 }
+  ]) {
+    if (!declaresOption(cmd, flag)) continue;
+    const fromEnv = envVar === void 0 ? "" : deps.env[envVar] ?? "";
+    if ((value ?? "").trim() !== "" || fromEnv.trim() !== "") {
+      throw new TenantPinError(
+        `${flag}${envVar === void 0 ? "" : ` / ${envVar}`} is refused while dr is pinned to ${describePin(pin)}`
+      );
+    }
+  }
+  const required2 = !LOCAL_COMMANDS_WITH_TARGET_FLAGS.has(key);
+  if (declaresOption(cmd, "--server") && (required2 || opts.server !== void 0)) {
+    assertServerFlagWithinPin(pin, opts.server);
+  }
+  if (declaresOption(cmd, "--account") && (required2 || opts.account !== void 0)) {
+    assertAccountFlagWithinPin(pin, opts.account);
+  }
+  if (pin.kind === "org") assertReadOnly(key, deps.loadMap());
+}
+
 // src/telemetry/context.ts
 var NO_IDENTITY = {
   operator: "",
@@ -4551,10 +5120,13 @@ function batchSetupOptions(timeoutFlag) {
 var BATCH_TIMEOUT_FLAG_HELP = `Minimum whole-command budget in seconds. Default ${DEFAULT_CALL_TIMEOUT_MS / 1e3}s for one item; a batch gets ${DEFAULT_CALL_TIMEOUT_MS / 1e3}s + ${BATCH_PER_TARGET_TIMEOUT_MS / 1e3}s per call (capped at ${BATCH_MAX_TIMEOUT_MS / 1e3}s). This is a floor, so it only ever widens that budget; max ${BATCH_TIMEOUT_MAX_SECONDS}s`;
 async function setupCall(serverFlag, accountFlag, options = {}) {
   setConfirmCmdAccountFlag(normaliseAccount(accountFlag));
+  const pin = readTenantPin();
+  if (pin !== void 0) assertFlagsWithinPin(pin, serverFlag, accountFlag);
   const fileStore = await resolveFileStore(serverFlag);
   const key = fileStore?.key ?? resolveServer(serverFlag);
   const store = options.store ?? fileStore?.store ?? await KeyringStore.defaultWithCleanup();
   const email = await resolveAccount(store, key, accountFlag);
+  if (pin !== void 0) assertIdentityWithinPin(pin, key, email);
   const stored = await store.getSession(key, email);
   if (stored !== void 0) {
     emitApiKeyExpiryWarning(stored, `${key}:${email}`);
@@ -4610,56 +5182,8 @@ async function setupCall(serverFlag, accountFlag, options = {}) {
   };
 }
 
-// src/scopes/matcher.ts
-var SCOPE_RE = /^(\*|[a-z][a-z0-9-]*):(\*|read|write|destructive)$/;
-var ACTION_RANK = new Map(
-  ["read", "write", "destructive"].map((action, rank) => [action, rank])
-);
-function actionSatisfies(granted, wanted) {
-  if (granted === "*" || granted === wanted) return true;
-  const g = ACTION_RANK.get(granted);
-  const w = ACTION_RANK.get(wanted);
-  if (g === void 0 || w === void 0) return false;
-  return g > w;
-}
-var WHITESPACE = "\\t\\n\\v\\f\\r \\x1c-\\x1f\\x85\\xa0\\u1680\\u2000-\\u200a\\u2028\\u2029\\u202f\\u205f\\u3000\\ufeff";
-var TRIM_RE = new RegExp(`^[${WHITESPACE}]+|[${WHITESPACE}]+$`, "g");
-var SPLIT_RE = new RegExp(`[${WHITESPACE}]+`);
-function trimShared(value) {
-  return value.replace(TRIM_RE, "");
-}
-function splitScopeString(value) {
-  return value.split(SPLIT_RE).filter((part) => part !== "");
-}
-function parseScope(value) {
-  if (typeof value !== "string") return null;
-  const m = SCOPE_RE.exec(trimShared(value).toLowerCase());
-  return m ? [m[1], m[2]] : null;
-}
-function parsed(scopes) {
-  const list28 = scopes ?? [];
-  const entries = typeof list28 === "string" ? splitScopeString(list28) : Array.isArray(list28) ? list28 : [];
-  return entries.map(parseScope).filter((p) => p !== null);
-}
-function scopeEntries(scopes) {
-  return parsed(scopes);
-}
-function isAgentScoped(scopes) {
-  return parsed(scopes).length > 0;
-}
-function isAllowed(scopes, resource, action) {
-  const entries = parsed(scopes);
-  if (entries.length === 0) return true;
-  const res = trimShared(resource).toLowerCase();
-  const act = trimShared(action).toLowerCase();
-  return entries.some(([r, a]) => (r === "*" || r === res) && actionSatisfies(a, act));
-}
-function isEntryAllowed(scopes, entry) {
-  return entry.requires.every((r) => isAllowed(scopes, r.resource, r.action));
-}
-
 // src/scopes/render.ts
-var ACTIONS = ["read", "write", "destructive"];
+var ACTIONS2 = ["read", "write", "destructive"];
 var OTHER = "Other";
 var ALL_PRODUCTS = "All products";
 var ALL_RESOURCES = "* (all resources)";
@@ -4673,7 +5197,7 @@ function describeScopes(scopes, resources) {
   const byResource = /* @__PURE__ */ new Map();
   for (const [resource, action] of entries) {
     const actions = byResource.get(resource) ?? /* @__PURE__ */ new Set();
-    if (action === "*") for (const a of ACTIONS) actions.add(a);
+    if (action === "*") for (const a of ACTIONS2) actions.add(a);
     else actions.add(action);
     byResource.set(resource, actions);
   }
@@ -4703,7 +5227,7 @@ function renderTree(byResource, resources) {
   const width = Math.max(...[...byResource.keys()].map((r) => label(r).length));
   const row = (resource, indent) => {
     const actions = byResource.get(resource);
-    return `${indent}${label(resource).padEnd(width)}  ${ACTIONS.filter((a) => actions.has(a)).join(", ")}`;
+    return `${indent}${label(resource).padEnd(width)}  ${ACTIONS2.filter((a) => actions.has(a)).join(", ")}`;
   };
   const sorted = [...byResource.keys()].sort();
   if (resources === void 0 || Object.keys(resources).length === 0)
@@ -4724,182 +5248,6 @@ function renderTree(byResource, resources) {
   return lines;
 }
 
-// src/scopes/scopesMap.ts
-import { readFileSync } from "fs";
-import * as path3 from "path";
-import { fileURLToPath } from "url";
-function isDeniedEntry(entry) {
-  return entry !== void 0 && Object.prototype.hasOwnProperty.call(entry, "denied");
-}
-var ACTIONS2 = /* @__PURE__ */ new Set(["read", "write", "destructive"]);
-var RESOURCE_RE = /^[a-z][a-z0-9-]*$/;
-function isValidResourceName(v) {
-  return RESOURCE_RE.test(v);
-}
-function isAction(v) {
-  return typeof v === "string" && ACTIONS2.has(v);
-}
-function isResource(v) {
-  return typeof v === "string" && isValidResourceName(v);
-}
-function parseRequirement(v) {
-  if (typeof v !== "object" || v === null) return null;
-  const o = v;
-  if (!isResource(o.resource) || !isAction(o.action)) return null;
-  return { resource: o.resource, action: o.action };
-}
-function parseDenial(v) {
-  if (typeof v !== "object" || v === null || Array.isArray(v)) return null;
-  const o = v;
-  if (typeof o.reason !== "string" || o.reason.trim() === "") return null;
-  if (typeof o.until !== "string" || o.until.trim() === "") return null;
-  return { reason: o.reason, until: o.until };
-}
-function parseEntry(v) {
-  if (typeof v !== "object" || v === null) return null;
-  const o = v;
-  if (Object.prototype.hasOwnProperty.call(o, "denied")) {
-    if (Object.prototype.hasOwnProperty.call(o, "requires")) return null;
-    const denied = parseDenial(o.denied);
-    if (denied === null) return null;
-    return { denied };
-  }
-  if (!Array.isArray(o.requires)) return null;
-  const requires = [];
-  for (const raw of o.requires) {
-    const req = parseRequirement(raw);
-    if (req === null) return null;
-    requires.push(req);
-  }
-  return { requires };
-}
-function emptyTable() {
-  return /* @__PURE__ */ Object.create(null);
-}
-function parseStringMap(v) {
-  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
-  const out = emptyTable();
-  for (const [k, val] of Object.entries(v)) {
-    if (typeof val === "string") out[k] = val;
-  }
-  return out;
-}
-function parseResources(v) {
-  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
-  const out = emptyTable();
-  for (const [resource, val] of Object.entries(v)) {
-    if (!isResource(resource)) continue;
-    if (typeof val !== "object" || val === null || Array.isArray(val)) continue;
-    const o = val;
-    if (typeof o.product !== "string" || o.product === "") continue;
-    if (typeof o.productName !== "string" || o.productName === "") continue;
-    out[resource] = { product: o.product, productName: o.productName };
-  }
-  return out;
-}
-function parsePendingCommands(v, pending) {
-  if (typeof v !== "object" || v === null || Array.isArray(v)) return void 0;
-  const out = emptyTable();
-  for (const [group, val] of Object.entries(v)) {
-    if (pending === void 0 || !Object.prototype.hasOwnProperty.call(pending, group)) continue;
-    if (!Array.isArray(val)) continue;
-    if (!val.every((p) => typeof p === "string" && p.split(" ")[0] === group)) continue;
-    out[group] = val;
-  }
-  return out;
-}
-function parseScopesMap(text2) {
-  let raw;
-  try {
-    raw = JSON.parse(text2);
-  } catch {
-    return void 0;
-  }
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
-  const o = raw;
-  if (o.version !== 1 || o.cliVersion !== void 0 && typeof o.cliVersion !== "string" || typeof o.commands !== "object" || o.commands === null || Array.isArray(o.commands))
-    return void 0;
-  const commands2 = emptyTable();
-  for (const [k, v] of Object.entries(o.commands)) {
-    const entry = parseEntry(v);
-    if (entry === null) return void 0;
-    commands2[k] = entry;
-  }
-  const map = { version: 1, commands: commands2 };
-  if (typeof o.cliVersion === "string") map.cliVersion = o.cliVersion;
-  if (typeof o._contract === "string") map._contract = o._contract;
-  const aliases = parseStringMap(o.aliases);
-  if (aliases !== void 0) map.aliases = aliases;
-  const pending = parseStringMap(o.pending);
-  if (pending !== void 0) map.pending = pending;
-  const pendingCommands = parsePendingCommands(o.pendingCommands, pending);
-  if (pendingCommands !== void 0) map.pendingCommands = pendingCommands;
-  const resources = parseResources(o.resources);
-  if (resources !== void 0) map.resources = resources;
-  const deferred = new Set(Object.values(pendingCommands ?? {}).flat());
-  for (const cmdPath of Object.keys(commands2)) {
-    if (deferred.has(cmdPath)) return void 0;
-    if (pending !== void 0 && Object.prototype.hasOwnProperty.call(pending, cmdPath.split(" ")[0]))
-      return void 0;
-  }
-  return map;
-}
-function loadScopesMap(here = path3.dirname(fileURLToPath(import.meta.url))) {
-  let text2;
-  try {
-    text2 = readFileSync(path3.join(here, "scopes-map.json"), "utf8");
-  } catch {
-    return void 0;
-  }
-  return parseScopesMap(text2);
-}
-function scopesMapKey(cmd) {
-  const names = [];
-  for (let c = cmd; c !== null && c.parent !== null; c = c.parent)
-    names.unshift(c.name());
-  return names.join(" ");
-}
-function commandPathOf(argv, root) {
-  const names = [];
-  let cmd = root;
-  for (let i = 0; i < argv.length; i += 1) {
-    const token = argv[i];
-    if (token === "--") break;
-    if (token.startsWith("-") && token !== "-") {
-      if (!token.startsWith("--") && token.length > 2) continue;
-      if (token.includes("=")) continue;
-      if (takesValue(token, cmd)) i += 1;
-      continue;
-    }
-    const child2 = childNamed(cmd, token);
-    if (child2 === void 0) break;
-    names.push(child2.name());
-    cmd = child2;
-  }
-  return names.join(" ");
-}
-function childNamed(cmd, token) {
-  return cmd.commands.find((c) => c.name() === token || c.aliases().includes(token));
-}
-function takesValue(flag, cmd) {
-  for (let c = cmd; c !== null; c = c.parent) {
-    for (const opt of c.options) {
-      if (opt.short !== flag && opt.long !== flag) continue;
-      return opt.required || opt.optional;
-    }
-  }
-  return declaredWithValueBelow(flag, cmd);
-}
-function declaredWithValueBelow(flag, cmd) {
-  for (const child2 of cmd.commands) {
-    for (const opt of child2.options) {
-      if ((opt.short === flag || opt.long === flag) && (opt.required || opt.optional)) return true;
-    }
-    if (declaredWithValueBelow(flag, child2)) return true;
-  }
-  return false;
-}
-
 // src/commands/whoami.ts
 function registerWhoamiCommand(root) {
   const cmd = root.command("whoami").description(
@@ -31927,7 +32275,7 @@ function registerErrorEnrichmentsCommand(root) {
 
 // src/commands/skill.ts
 import { createHash as createHash8 } from "crypto";
-import { readFile as readFile3, mkdir as mkdir2, readdir as readdir2, rm as rm2, rmdir, stat, writeFile as writeFile3 } from "fs/promises";
+import { lstat, readFile as readFile3, mkdir as mkdir2, readdir as readdir2, rm as rm2, rmdir, stat, writeFile as writeFile3 } from "fs/promises";
 import { dirname as dirname6, join as join9, resolve as resolve2 } from "path";
 
 // src/commands/_skillsRoot.ts
@@ -32107,6 +32455,9 @@ function skillDirAbs(targetAbs, dotDir, name) {
   return join9(targetAbs, dotDir, "skills", name);
 }
 var MANIFEST_FILE = ".dr-cli-manifest.json";
+var RETIRED_SKILLS = {
+  "datarails-connectors-onboard-connector": "drip-implement-connector"
+};
 var MARKER_BEGIN = "<!-- dr-cli:begin -->";
 var MARKER_END = "<!-- dr-cli:end -->";
 var USERSPACE_ENV = "DR_CLI_USERSPACE_SKILLS";
@@ -32209,7 +32560,16 @@ async function runSkillInstall(cfg) {
   const skills = await getEmbeddedSkills();
   const verbose = cfg.verbose ?? false;
   const probe = await pluginManagedProbe(abs, cfg.env);
-  if (probe.managed && !(cfg.force ?? false)) {
+  const pluginSkip = probe.managed && !(cfg.force ?? false);
+  await removeRetiredSkills({
+    targetAbs: abs,
+    skills,
+    // On a skipped install, a replacement whose plugin is absent is not written below.
+    servedByPlugins: pluginSkip ? probe.installedPlugins : null,
+    out: cfg.out,
+    verbose
+  });
+  if (pluginSkip) {
     cfg.out.write(
       `Skipped ${join9(abs, ".claude", "skills")}: this machine gets the dr-cli skills from the dr-cli plugin (${probe.reason}). Pass --force to write them anyway.
 `
@@ -32350,9 +32710,34 @@ async function readManifest(skillDir) {
     return [];
   }
 }
+async function removeRetiredSkills(cfg) {
+  const { targetAbs, out } = cfg;
+  for (const [old, replacement] of Object.entries(RETIRED_SKILLS)) {
+    for (const dotDir of [".claude", ".gemini"]) {
+      const skillDir = skillDirAbs(targetAbs, dotDir, old);
+      const removed = await removeUserSpaceCopy(skillDir);
+      if (removed === null) continue;
+      const files = `${removed.files} file${removed.files === 1 ? "" : "s"}`;
+      out.write(
+        `Removed retired skill ${old}: ${files} at ${skillDir} (now ${replacement})` + (removed.dirRemoved ? "" : "; directory kept, it holds files the CLI did not write") + "\n"
+      );
+      if (dotDir !== ".claude" || cfg.servedByPlugins === null) continue;
+      const next = cfg.skills.find((s) => s.name === replacement);
+      if (next === void 0 || cfg.servedByPlugins.has(next.plugin)) continue;
+      await installSkillTree({
+        skillDir: skillDirAbs(targetAbs, dotDir, next.name),
+        files: next.files,
+        out,
+        verbose: cfg.verbose,
+        label: `skill ${next.name}`
+      });
+    }
+  }
+}
 async function removeUserSpaceCopy(skillDir) {
   const manifestPath = join9(skillDir, MANIFEST_FILE);
   try {
+    if ((await lstat(skillDir)).isSymbolicLink()) return null;
     await stat(manifestPath);
   } catch {
     return null;
@@ -32360,7 +32745,9 @@ async function removeUserSpaceCopy(skillDir) {
   let files = 0;
   for (const rel of await readManifest(skillDir)) {
     try {
-      const p = join9(skillDir, ...relSegments(rel));
+      const segs = relSegments(rel);
+      if (await crossesLink(skillDir, segs.slice(0, -1))) continue;
+      const p = join9(skillDir, ...segs);
       await rm2(p, { force: true });
       await rmdir(dirname6(p)).catch(() => {
       });
@@ -32375,6 +32762,18 @@ async function removeUserSpaceCopy(skillDir) {
   );
   return { files, dirRemoved };
 }
+async function crossesLink(root, dirSegs) {
+  let p = root;
+  for (const seg of dirSegs) {
+    p = join9(p, seg);
+    try {
+      if ((await lstat(p)).isSymbolicLink()) return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
 async function installSkillTree(opts) {
   const { skillDir, files, out, verbose, label } = opts;
   const prev = await readManifest(skillDir);
@@ -35874,7 +36273,7 @@ function registerDocumentsCommand(root) {
 // src/commands/integrations.ts
 import { Option as Option2 } from "commander";
 import { constants as fsConstants } from "fs";
-import { lstat, open as open2 } from "fs/promises";
+import { lstat as lstat2, open as open2 } from "fs/promises";
 
 // src/api/integrations.ts
 async function list23(client, opts, reqOptions) {
@@ -43860,7 +44259,7 @@ function parseSavedSearchId(raw) {
   return id;
 }
 async function writeSqlFile(path13, sql) {
-  const existing = await lstat(path13).catch((err) => {
+  const existing = await lstat2(path13).catch((err) => {
     if (err.code === "ENOENT") return void 0;
     throw err;
   });
@@ -72013,156 +72412,6 @@ function copySessionCredentials(mountPath = SESSION_AUTH_MOUNT, target = credent
   }
 }
 
-// src/scopes/filter.ts
-var SCOPE_EXIT_CODE = 3;
-var ScopeFilterError = class extends Error {
-  constructor(command, message) {
-    super(message);
-    this.command = command;
-  }
-  command;
-  exitCode = SCOPE_EXIT_CODE;
-};
-var ScopeHiddenError = class extends ScopeFilterError {
-  constructor(command, required2) {
-    super(
-      command,
-      `'dr ${command}' is not available under this identity's credential scope (needs ${required2.join(", ")}); run 'dr whoami' to see the scopes this identity carries`
-    );
-    this.required = required2;
-    this.name = "ScopeHiddenError";
-  }
-  required;
-};
-var ScopeUnavailableError = class extends ScopeFilterError {
-  constructor(command, reason, until) {
-    super(
-      command,
-      `'dr ${command}' is unavailable to any agent-scoped credential (one whose scopes claim carries at least one resource:action entry): ${reason} (this is not a missing scope \u2014 no scope grants it; ${until} lifts the restriction)`
-    );
-    this.reason = reason;
-    this.until = until;
-    this.name = "ScopeUnavailableError";
-  }
-  reason;
-  until;
-};
-var ScopeGroupHiddenError = class extends ScopeFilterError {
-  constructor(command, required2, tickets) {
-    super(
-      command,
-      `'dr ${command}' has no subcommand available to this identity.` + (required2.length > 0 ? ` Its subcommands need ${required2.join(", ")} \u2014 run 'dr whoami' to see the scopes this identity carries.` : "") + (tickets.length > 0 ? ` Some are closed to any agent-scoped credential whatever its scopes (${tickets.join(", ")}).` : "")
-    );
-    this.required = required2;
-    this.tickets = tickets;
-    this.name = "ScopeGroupHiddenError";
-  }
-  required;
-  tickets;
-};
-function hide(cmd) {
-  cmd._hidden = true;
-}
-function refuseHelp(cmd, err) {
-  cmd.outputHelp = () => {
-    throw err;
-  };
-}
-function leafAnswer(leaf, scopes, map) {
-  const key = scopesMapKey(leaf);
-  if (!Object.prototype.hasOwnProperty.call(map.commands, key)) return void 0;
-  const entry = map.commands[key];
-  if (entry === void 0) return void 0;
-  if (isDeniedEntry(entry))
-    return {
-      err: new ScopeUnavailableError(key, entry.denied.reason, entry.denied.until),
-      required: [],
-      denial: entry.denied
-    };
-  if (isEntryAllowed(scopes, entry)) return void 0;
-  const required2 = entry.requires.map((r) => `${r.resource}:${r.action}`);
-  return { err: new ScopeHiddenError(key, required2), required: required2, denial: void 0 };
-}
-var intercepted = /* @__PURE__ */ new WeakMap();
-function intercept(cmd, err, armed) {
-  intercepted.set(cmd, err);
-  refuseHelp(cmd, err);
-  cmd.action(() => {
-    throw err;
-  });
-  const parent = cmd.parent;
-  if (parent === null || armed.has(parent)) return;
-  armed.add(parent);
-  parent.hook("preSubcommand", (_parent, sub) => {
-    const denial = intercepted.get(sub);
-    if (denial !== void 0) throw denial;
-  });
-}
-function interceptGroup(group, err) {
-  group.allowExcessArguments(true);
-  group.allowUnknownOption(true);
-  group.helpCommand(true);
-  refuseHelp(group, err);
-  group.action(() => {
-    throw err;
-  });
-}
-function groupAnswer(group, below) {
-  const key = scopesMapKey(group);
-  const [mark] = below.denials;
-  if (mark !== void 0 && below.denials.length === 1 && below.required.length === 0)
-    return new ScopeUnavailableError(key, mark.reason, mark.until);
-  if (below.required.length === 0 && below.denials.length === 0) return void 0;
-  return new ScopeGroupHiddenError(
-    key,
-    below.required,
-    below.denials.map((d) => d.until).filter((t, i, all) => all.indexOf(t) === i)
-  );
-}
-function filterBelow(node, scopes, map, armed) {
-  const here = { count: 0, answer: void 0, required: [], denials: [] };
-  let allAnswered = node.commands.length > 0;
-  for (const child2 of node.commands) {
-    if (child2.commands.length > 0) {
-      const below = filterBelow(child2, scopes, map, armed);
-      here.count += below.count;
-      if (below.answer === void 0) {
-        allAnswered = false;
-        continue;
-      }
-      interceptGroup(child2, below.answer);
-      hide(child2);
-      addRequired(here, below.required);
-      addDenials(here, below.denials);
-      continue;
-    }
-    const answer = leafAnswer(child2, scopes, map);
-    if (answer === void 0) {
-      allAnswered = false;
-      continue;
-    }
-    intercept(child2, answer.err, armed);
-    hide(child2);
-    here.count += 1;
-    addRequired(here, answer.required);
-    if (answer.denial !== void 0) addDenials(here, [answer.denial]);
-  }
-  if (allAnswered) here.answer = groupAnswer(node, here);
-  return here;
-}
-function addRequired(into, required2) {
-  for (const r of required2) if (!into.required.includes(r)) into.required.push(r);
-}
-function addDenials(into, denials) {
-  for (const d of denials)
-    if (!into.denials.some((x) => x.reason === d.reason && x.until === d.until))
-      into.denials.push(d);
-}
-function applyScopeFilter(root, scopes, map) {
-  if (map === void 0 || !isAgentScoped(scopes)) return 0;
-  return filterBelow(root, scopes, map, /* @__PURE__ */ new Set()).count;
-}
-
 // src/scopes/identityScopes.ts
 function peekIdentityFlags(argv) {
   const flags = {};
@@ -72554,6 +72803,9 @@ function buildRootCommand() {
   root.hook("preAction", (_thisCommand, actionCommand) => {
     recordCommandStart(commandPath(actionCommand), Date.now());
   });
+  root.hook("preAction", (_thisCommand, actionCommand) => {
+    enforceTenantPin(actionCommand);
+  });
   registerLoginCommand(root);
   registerLoginAsCommand(root);
   registerWhoamiCommand(root);
@@ -72707,6 +72959,7 @@ function annotateScopeDenial(err, argv, root, deps = defaultScopeDenialDeps) {
 function exitCodeFor(err) {
   if (err instanceof ScopeFilterError) return err.exitCode;
   if (err instanceof ScopeDeniedError) return SCOPE_EXIT_CODE;
+  if (err instanceof TenantPinError) return err.exitCode;
   return 1;
 }
 var UNKNOWN_OPTION_PATTERN = /(unknown option ')(-[\s\S]*)'/g;