@oxygen-agent/cli 1.662.0 → 1.681.2

package/dist/index.js

@@ -11,7 +11,8 @@ import { applyOxygenHelp } from "./help.js";
 import { buildCommandManifest, getCommandManifestEntry, searchCommandManifest, suggestCommandNames, } from "./command-manifest.js";
 import { AGENCY_DIRECTORY_REGIONS, AGENCY_DIRECTORY_SERVICES, COLLAB_GATE_KINDS, COLLAB_GATE_PROSE, COLLAB_SUBJECT_KINDS, COLLAB_SUBJECT_KINDS_PROSE, COLLAB_SUBJECT_LABELS, COLLAB_SUBJECT_PROSE, GATE_KIND_SUBJECTS, describeWorkflowStatusChange, formatCellForDisplay, formatPublicBudgetScopes, SUBJECT_PATH_FORMS_PROSE, formatSubjectPath, exitCodeForOxygenError, parseSubjectPath, parseSubjectRef, parseWorkflowStatusChange, isVersionGreater, isVersionLess, MAX_MCP_TOOL_NAME_LENGTH, OXYGEN_CAPABILITY_ROUTES, OXYGEN_VERSION, OxygenError, getCapabilityRouteMatch, inferCapabilityRoute, parseKnowledgePageMarkdown, PLAN_LIMITS, serializeCapabilityRoute, sleep, success, TAG_KINDS_PROSE, toFailure, workflowMcpToolName, } from "@oxygen/shared";
 import { TAG_COLORS } from "@oxygen/shared/select-options";
-import { inferImportColumnLabels, inferRowsFileFormat, normalizeImportColumnKey, normalizeRowsForNewTable, normalizeRowsFormat, parseRowsFileBuffer, } from "@oxygen/shared/file-import";
+import { inferImportColumnLabels, inferRowsFileFormat, normalizeImportColumnKey, normalizeRowsForNewTable, normalizeRowsFormat, parseRowsFileBuffer, parseXlsxWorkbookBuffer, } from "@oxygen/shared/file-import";
+import { MAILBOX_IMPORT_FILE_MAX_BYTES as SHARED_MAILBOX_IMPORT_FILE_MAX_BYTES, MAILBOX_IMPORT_ROW_LIMIT as SHARED_MAILBOX_IMPORT_ROW_LIMIT, normalizeMailboxImportFile as normalizeSharedMailboxImportFile, normalizeMailboxImportVendor as normalizeSharedMailboxImportVendor, normalizeMailboxWorkbookRows, parseMailboxImportText, summarizeMailboxImportValidation as summarizeSharedMailboxImportValidation, } from "@oxygen/shared/mailbox-import";
 import { assertRecipeBundleSafe, assertWorkflowGraphManifest, assertWorkflowManifest, buildRecipeManifest, compileWorkflowDefinition, isAnyWorkflowManifest, isRecipeManifest, isWorkflowDefinition, isWorkflowGraphManifest, isWorkflowManifest, } from "@oxygen/workflows";
 import { isRecipeDefinition } from "@oxygen/recipe-sdk";
 import { createBrowserLoginSession, createRelayLoginSession, openBrowser } from "./browser-login.js";
@@ -894,413 +895,26 @@ function readJsonFileValue(path, inputName) {
  * shortcut) so the server applies the encrypted transfer-vault contract.
  */
 function normalizeMailboxImportFile(value, mode) {
-    if (!Array.isArray(value) || value.length === 0) {
-        throw new OxygenError("invalid_request", "--file must contain a non-empty mailboxes array.", { exitCode: 1 });
+    try {
+        return normalizeSharedMailboxImportFile(value, mode);
     }
-    const rows = value.map((entry, index) => {
-        if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
-            throw new OxygenError("invalid_request", `mailboxes[${index}] must be an object.`, { exitCode: 1 });
+    catch (error) {
+        if (error instanceof OxygenError &&
+            error.message ===
+                "This identity-only import contains a password. Choose a secure credential import for a compatible Google app-password export.") {
+            throw new OxygenError("invalid_request", "Mailbox credentials require --from credentials --vendor <source> (or --from hypertide for a Hypertide export); keep --validate-only for a no-network preflight. An identity import never accepts or forwards passwords.", { exitCode: 1 });
         }
-        return normalizeMailboxExportRow(entry, index, mode);
-    });
-    return dedupeMailboxImportRows(rows);
+        throw error;
+    }
 }
 function summarizeMailboxImportValidation(mailboxes, input) {
-    const providers = { google: 0, microsoft: 0 };
-    const infrastructurePlatforms = {};
-    let credentialRows = 0;
-    for (const mailbox of mailboxes) {
-        if (mailbox.provider === "google")
-            providers.google += 1;
-        if (mailbox.provider === "microsoft")
-            providers.microsoft += 1;
-        if (typeof mailbox.infrastructure_platform === "string") {
-            const platform = mailbox.infrastructure_platform;
-            infrastructurePlatforms[platform] =
-                (infrastructurePlatforms[platform] ?? 0) + 1;
-        }
-        if (typeof mailbox.app_password === "string")
-            credentialRows += 1;
-    }
     return {
-        valid: true,
-        source: input.source,
-        ...(input.sourceProvider
-            ? { source_provider: input.sourceProvider }
-            : {}),
-        rows: mailboxes.length,
-        providers,
-        infrastructure_platforms: infrastructurePlatforms,
-        credential_rows: credentialRows,
-        identity_only_rows: mailboxes.length - credentialRows,
-        limits: {
-            max_rows: MAILBOX_IMPORT_ROW_LIMIT,
-            max_file_bytes: MAILBOX_IMPORT_FILE_MAX_BYTES,
-        },
-        mutation: false,
-        network_request: false,
-        provider_call: false,
-        credits_used: 0,
+        ...summarizeSharedMailboxImportValidation(mailboxes, input),
         next_action: "Re-run the same command without --validate-only to register these mailboxes.",
     };
 }
-const MAILBOX_EMAIL_HEADERS = new Set([
-    "address",
-    "email",
-    "emailaddress",
-    "fromemail",
-    "mailbox",
-    "mailboxaddress",
-    "mailboxemail",
-]);
-const MAILBOX_PROVIDER_HEADERS = new Set([
-    "emailprovider",
-    "esp",
-    "mailboxprovider",
-    "platform",
-    "provider",
-    "serviceprovider",
-    "type",
-]);
-const MAILBOX_PASSWORD_HEADERS = new Set([
-    "apppassword",
-    "applicationpassword",
-    "googleapppassword",
-    "imappassword",
-    "mailboxpassword",
-    "password",
-    "smtppassword",
-]);
-const MAILBOX_WORKSPACE_HEADERS = new Set([
-    "externalaccountid",
-    "mailboxid",
-    "mailboxuid",
-    "sourceaccountid",
-    "sourcemailboxid",
-    "uid",
-    "workspaceexternalid",
-]);
-const MAILBOX_PLATFORM_HEADERS = new Set([
-    "infrastructure",
-    "infrastructureplatform",
-    "infraplatform",
-]);
-const MAILBOX_TENANT_HEADERS = new Set([
-    "azuretenantid",
-    "entratenantid",
-    "microsofttenantid",
-    "tenantid",
-]);
-const MAILBOX_NON_TRANSFERABLE_SECRET_HEADERS = new Set([
-    "accesstoken",
-    "applicationsecret",
-    "authenticatorsecret",
-    "authorization",
-    "authorizationcode",
-    "bearertoken",
-    "clientsecret",
-    "clientprivatekey",
-    "delegationkey",
-    "idtoken",
-    "mfacode",
-    "mfasecret",
-    "oauthaccesstoken",
-    "oauthcode",
-    "oauthrefreshtoken",
-    "oauthtoken",
-    "onetimepassword",
-    "otp",
-    "otpsecret",
-    "privatekey",
-    "refreshtoken",
-    "serviceaccountkey",
-    "serviceaccountjson",
-    "serviceaccountprivatekey",
-    "totp",
-    "totpsecret",
-]);
-const MAILBOX_IMPORT_FILE_MAX_BYTES = 5 * 1024 * 1024;
-const MAILBOX_IMPORT_ROW_LIMIT = 500;
-/**
- * Normalize common mailbox-vendor export labels locally, then send only
- * Oxygen's canonical fields. Passwords are accepted only in credential mode
- * and only become Google app passwords; Microsoft passwords are dropped because
- * one Outlook OAuth consent per mailbox is its only warmup path. OAuth grants,
- * MFA/TOTP seeds, and delegation keys are rejected in every mode. Host columns
- * may prove the provider but never cross the request boundary.
- */
-function normalizeMailboxExportRow(row, index, mode) {
-    const byHeader = new Map();
-    for (const [header, value] of Object.entries(row)) {
-        const normalizedHeader = normalizeMailboxExportHeader(header);
-        const existing = byHeader.get(normalizedHeader);
-        if (existing !== undefined &&
-            String(existing).trim() !== String(value ?? "").trim()) {
-            throw new OxygenError("invalid_request", `mailboxes[${index}] contains conflicting columns that normalize to ${normalizedHeader}.`, { exitCode: 1 });
-        }
-        byHeader.set(normalizedHeader, value);
-    }
-    const email = readUniqueMailboxExportString(byHeader, MAILBOX_EMAIL_HEADERS, index, "email_address", (value) => value.trim().toLowerCase()) ?? readEmailShapedMailboxUsername(byHeader);
-    const providerValues = readMailboxExportStrings(byHeader, MAILBOX_PROVIDER_HEADERS);
-    const provider = normalizeMailboxProvider(providerValues, byHeader, index);
-    if (!email ||
-        email.length > 320 ||
-        !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].email_address must be a valid address of at most 320 characters.`, { exitCode: 1 });
-    }
-    if (!provider) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].provider could not be inferred. Oxygen imports Google Workspace and Microsoft 365/Entra identities; generic SMTP credentials are not transferable yet.`, { exitCode: 1 });
-    }
-    if (hasMailboxExportValue(byHeader, MAILBOX_NON_TRANSFERABLE_SECRET_HEADERS) ||
-        hasNonTransferableMailboxAuthLikeValue(byHeader)) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains OAuth, MFA/TOTP, client-secret, or delegation material. Those credentials are never transferable; import the mailbox identity and complete the provider's administrator consent flow.`, { exitCode: 1 });
-    }
-    const passwords = readMailboxExportStrings(byHeader, MAILBOX_PASSWORD_HEADERS);
-    const distinctPasswords = [...new Set(passwords)];
-    if (distinctPasswords.some((password) => password.length > 1024)) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].app_password must be at most 1024 characters.`, { exitCode: 1 });
-    }
-    if (mode === "identity" && distinctPasswords.length > 0) {
-        throw new OxygenError("invalid_request", "Mailbox credentials require --from credentials --vendor <source> (or --from hypertide for a Hypertide export); keep --validate-only for a no-network preflight. An identity import never accepts or forwards passwords.", { exitCode: 1 });
-    }
-    if (provider !== "microsoft" && distinctPasswords.length > 1) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains conflicting SMTP/IMAP/app-password values.`, { exitCode: 1 });
-    }
-    if (mode === "credential" &&
-        provider === "google" &&
-        distinctPasswords.length === 0) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] needs a Google app password for credential import. OAuth tokens and an ordinary account password are not portable.`, { exitCode: 1 });
-    }
-    const workspaceExternalId = readUniqueMailboxExportString(byHeader, MAILBOX_WORKSPACE_HEADERS, index, "workspace_external_id", (value) => value.trim());
-    if (workspaceExternalId && workspaceExternalId.length > 512) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].workspace_external_id must be at most 512 characters.`, { exitCode: 1 });
-    }
-    const tenantId = readUniqueMailboxExportString(byHeader, MAILBOX_TENANT_HEADERS, index, "tenant_id", (value) => value.trim().toLowerCase());
-    if (tenantId && provider !== "microsoft") {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].tenant_id applies only to Microsoft mailboxes.`, { exitCode: 1 });
-    }
-    if (tenantId &&
-        !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(tenantId.trim())) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}].tenant_id must be a Microsoft Entra tenant GUID.`, { exitCode: 1 });
-    }
-    const infrastructurePlatformRaw = readUniqueMailboxExportString(byHeader, MAILBOX_PLATFORM_HEADERS, index, "infrastructure_platform", (value) => normalizeMailboxExportHeader(value)) ??
-        (providerValues.some((value) => ["azure", "entra", "microsoftazure"].includes(normalizeMailboxExportHeader(value)))
-            ? "microsoft_azure"
-            : null);
-    const infrastructurePlatform = normalizeMailboxInfrastructurePlatform(infrastructurePlatformRaw, provider, index);
-    return {
-        email_address: email.trim().toLowerCase(),
-        provider,
-        ...(workspaceExternalId !== null
-            ? { workspace_external_id: workspaceExternalId.trim() }
-            : {}),
-        ...(infrastructurePlatformRaw
-            ? { infrastructure_platform: infrastructurePlatform }
-            : {}),
-        ...(tenantId ? { tenant_id: tenantId.trim().toLowerCase() } : {}),
-        ...(mode === "credential" &&
-            provider === "google" &&
-            distinctPasswords[0] !== undefined
-            ? { app_password: distinctPasswords[0] }
-            : {}),
-    };
-}
-function normalizeMailboxExportHeader(value) {
-    return value
-        .replace(/^\uFEFF/, "")
-        .normalize("NFKC")
-        .trim()
-        .toLowerCase()
-        .replace(/[^a-z0-9]/g, "");
-}
-function readMailboxExportString(byHeader, headers) {
-    for (const header of headers) {
-        const value = byHeader.get(header);
-        if (typeof value === "string" && value.length > 0)
-            return value;
-    }
-    return null;
-}
-function readUniqueMailboxExportString(byHeader, headers, index, field, normalize) {
-    const values = readMailboxExportStrings(byHeader, headers);
-    if (values.length === 0)
-        return null;
-    const normalized = [...new Set(values.map(normalize))];
-    if (normalized.length > 1) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains conflicting ${field} aliases.`, { exitCode: 1 });
-    }
-    return normalized[0] ?? null;
-}
-function readMailboxExportStrings(byHeader, headers) {
-    const values = [];
-    for (const header of headers) {
-        const value = byHeader.get(header);
-        if (typeof value === "string" && value.length > 0)
-            values.push(value);
-    }
-    return values;
-}
-function hasMailboxExportValue(byHeader, headers) {
-    for (const header of headers) {
-        const value = byHeader.get(header);
-        if (value !== undefined && value !== null && String(value).trim()) {
-            return true;
-        }
-    }
-    return false;
-}
-function hasNonTransferableMailboxAuthLikeValue(byHeader) {
-    for (const [header, value] of byHeader) {
-        if (/(?:token|secret|privatekey|totp|passcode|authorization)/.test(header) &&
-            value !== undefined &&
-            value !== null &&
-            String(value).trim()) {
-            return true;
-        }
-    }
-    return false;
-}
-function readEmailShapedMailboxUsername(byHeader) {
-    for (const header of ["username", "imapusername", "smtpusername"]) {
-        const value = byHeader.get(header);
-        if (typeof value === "string" && value.includes("@"))
-            return value.trim().toLowerCase();
-    }
-    return null;
-}
-function normalizeMailboxProvider(providerValues, byHeader, index) {
-    const explicit = providerValues.map((value) => {
-        const normalized = normalizeMailboxExportHeader(value);
-        if (["google", "googleworkspace", "gmail", "gsuite"].includes(normalized)) {
-            return "google";
-        }
-        if ([
-            "azure",
-            "entra",
-            "m365",
-            "microsoft",
-            "microsoft365",
-            "microsoftazure",
-            "ms365",
-            "o365",
-            "office365",
-            "outlook",
-        ].includes(normalized)) {
-            return "microsoft";
-        }
-        throw new OxygenError("invalid_request", `mailboxes[${index}].provider is unsupported; expected Google/Gmail/Workspace or Microsoft/Outlook/Office 365/Entra.`, { exitCode: 1 });
-    });
-    const explicitKinds = [...new Set(explicit)];
-    if (explicitKinds.length > 1) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains conflicting provider aliases.`, { exitCode: 1 });
-    }
-    const hostValues = [
-        byHeader.get("imaphost"),
-        byHeader.get("imaphostname"),
-        byHeader.get("imapserver"),
-        byHeader.get("smtphost"),
-        byHeader.get("smtphostname"),
-        byHeader.get("smtpserver"),
-    ].filter((value) => typeof value === "string" && Boolean(value.trim()));
-    const hostKinds = hostValues.map((value) => {
-        const hostname = normalizeMailboxHost(value);
-        if (hostname === "smtp.gmail.com" || hostname === "imap.gmail.com") {
-            return "google";
-        }
-        if (hostname === "smtp.office365.com" ||
-            hostname === "outlook.office365.com") {
-            return "microsoft";
-        }
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains a non-standard SMTP/IMAP host. Oxygen imports Google Workspace and Microsoft 365/Entra identities; generic SMTP credential transport is not supported.`, { exitCode: 1 });
-    });
-    const inferredKinds = [...new Set(hostKinds)];
-    if (inferredKinds.length > 1) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] contains conflicting Google and Microsoft mail hosts.`, { exitCode: 1 });
-    }
-    const explicitKind = explicitKinds[0];
-    const inferredKind = inferredKinds[0];
-    if (explicitKind && inferredKind && explicitKind !== inferredKind) {
-        throw new OxygenError("invalid_request", `mailboxes[${index}] has conflicting provider and SMTP/IMAP host evidence.`, { exitCode: 1 });
-    }
-    return explicitKind ?? inferredKind ?? null;
-}
-function normalizeMailboxHost(value) {
-    const withoutScheme = value
-        .trim()
-        .toLowerCase()
-        .replace(/^[a-z]+:\/\//, "");
-    return withoutScheme.split(/[/:]/, 1)[0] ?? "";
-}
-function normalizeMailboxInfrastructurePlatform(raw, provider, index) {
-    if (!raw) {
-        return provider === "google" ? "google_workspace" : "microsoft_365";
-    }
-    const normalized = normalizeMailboxExportHeader(raw);
-    if (["google", "googleworkspace", "gmail", "gsuite", "workspace"].includes(normalized)) {
-        if (provider !== "google") {
-            throw mailboxPlatformConflict(index, provider);
-        }
-        return "google_workspace";
-    }
-    if (["azure", "entra", "microsoftazure"].includes(normalized)) {
-        if (provider !== "microsoft") {
-            throw mailboxPlatformConflict(index, provider);
-        }
-        return "microsoft_azure";
-    }
-    if ([
-        "m365",
-        "microsoft",
-        "microsoft365",
-        "ms365",
-        "o365",
-        "office365",
-        "outlook",
-    ].includes(normalized)) {
-        if (provider !== "microsoft") {
-            throw mailboxPlatformConflict(index, provider);
-        }
-        return "microsoft_365";
-    }
-    throw new OxygenError("invalid_request", `mailboxes[${index}].infrastructure_platform is unsupported; expected Google Workspace, Microsoft 365, Azure, or Entra.`, { exitCode: 1 });
-}
-function mailboxPlatformConflict(index, provider) {
-    return new OxygenError("invalid_request", `mailboxes[${index}].infrastructure_platform conflicts with provider=${provider}.`, { exitCode: 1 });
-}
-function dedupeMailboxImportRows(rows) {
-    const unique = new Map();
-    for (const row of rows) {
-        const address = String(row.email_address).toLowerCase();
-        const existing = unique.get(address);
-        if (!existing) {
-            unique.set(address, row);
-            continue;
-        }
-        if (JSON.stringify(existing) !== JSON.stringify(row)) {
-            throw new OxygenError("invalid_request", `Duplicate mailbox ${address} has conflicting provider, platform, tenant, external id, or credential fields.`, { exitCode: 1 });
-        }
-    }
-    return [...unique.values()];
-}
 function normalizeMailboxImportVendor(raw, from) {
-    if (from === "hypertide") {
-        if (raw && raw.trim().toLowerCase() !== "hypertide") {
-            throw new OxygenError("invalid_request", "--from hypertide is fixed to --vendor hypertide.", { exitCode: 1 });
-        }
-        return null;
-    }
-    if (from === "credentials" && !raw) {
-        throw new OxygenError("invalid_request", "--vendor <source> is required with --from credentials so the imported mailbox keeps its provenance.", { exitCode: 1 });
-    }
-    if (!raw)
-        return null;
-    const normalized = raw.trim().toLowerCase();
-    if (normalized.length < 1 ||
-        normalized.length > 64 ||
-        !/^[a-z0-9]+(?:[._-][a-z0-9]+)*$/.test(normalized)) {
-        throw new OxygenError("invalid_request", "--vendor must be 1-64 lowercase letters, digits, dots, underscores, or hyphens.", { exitCode: 1 });
-    }
-    return normalized;
+    return normalizeSharedMailboxImportVendor(raw, from);
 }
 async function readMailboxImportFile(path) {
     let buffer;
@@ -1310,42 +924,24 @@ async function readMailboxImportFile(path) {
     catch {
         throw new OxygenError("mailbox_import_file_unreadable", `Couldn't read --file '${basename(path)}'. Check that the path exists and is readable. CSV/JSON/JSONL/XLSX identity files are accepted; credential exports require --from credentials (or --from hypertide). See https://oxygen-agent.com/docs/providers/mailbox-compatibility.`, { exitCode: 1 });
     }
-    if (buffer.byteLength > MAILBOX_IMPORT_FILE_MAX_BYTES) {
-        throw new OxygenError("invalid_request", `Mailbox import files must be ${MAILBOX_IMPORT_FILE_MAX_BYTES / 1024 / 1024} MB or smaller.`, { exitCode: 1 });
+    if (buffer.byteLength > SHARED_MAILBOX_IMPORT_FILE_MAX_BYTES) {
+        throw new OxygenError("invalid_request", `Mailbox import files must be ${SHARED_MAILBOX_IMPORT_FILE_MAX_BYTES / 1024 / 1024} MB or smaller.`, { exitCode: 1 });
     }
     const format = inferRowsFileFormat(path);
     let rows;
-    if (format === "json") {
-        let parsed;
+    if (format === "xlsx") {
         try {
-            parsed = JSON.parse(buffer.toString("utf8"));
+            rows = normalizeMailboxWorkbookRows(await parseXlsxWorkbookBuffer(buffer));
         }
         catch {
-            throw new OxygenError("invalid_json", "--file must contain valid JSON. File contents are omitted from this error because mailbox imports may contain credentials.", { exitCode: 1 });
-        }
-        if (Array.isArray(parsed)) {
-            rows = parsed;
-        }
-        else if (parsed &&
-            typeof parsed === "object" &&
-            !Array.isArray(parsed) &&
-            Array.isArray(parsed.mailboxes)) {
-            rows = parsed.mailboxes;
-        }
-        else {
-            throw new OxygenError("invalid_request", "--file JSON must contain a mailbox array or { mailboxes: [...] }.", { exitCode: 1 });
+            throw new OxygenError("invalid_mailbox_import_file", `Couldn't parse the ${format.toUpperCase()} mailbox file. File contents are omitted from this error because mailbox imports may contain credentials.`, { exitCode: 1 });
         }
     }
     else {
-        try {
-            rows = await parseRowsFileBuffer(buffer, format);
-        }
-        catch {
-            throw new OxygenError("invalid_mailbox_import_file", `Couldn't parse the ${format.toUpperCase()} mailbox file. File contents are omitted from this error because mailbox imports may contain credentials.`, { exitCode: 1 });
-        }
+        rows = parseMailboxImportText(buffer.toString("utf8"), format);
     }
-    if (rows.length > MAILBOX_IMPORT_ROW_LIMIT) {
-        throw new OxygenError("invalid_request", `Mailbox imports are limited to ${MAILBOX_IMPORT_ROW_LIMIT} rows per request.`, { exitCode: 1 });
+    if (rows.length > SHARED_MAILBOX_IMPORT_ROW_LIMIT) {
+        throw new OxygenError("invalid_request", `Mailbox imports are limited to ${SHARED_MAILBOX_IMPORT_ROW_LIMIT} rows per request.`, { exitCode: 1 });
     }
     return rows;
 }
@@ -6311,7 +5907,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
     }));
     program
         .command("tags")
-        .description(`Workspace tags: one vocabulary across ${TAG_KINDS_PROSE}. Tags normalize to lowercase (trimmed, deduped, max 50 per item; any characters — nothing is slugified, so "Q3 Outbound" becomes "q3 outbound"). ATTACH tags on the owning surface — each of those groups has its own \`tag\` subcommand (e.g. \`oxygen inbox tag\`, \`oxygen tables tag\`, \`oxygen domains tag\`) — then \`tags get <tag>\` returns every carrier with deep-links. CURATE the vocabulary here: \`tags create\` declares a tag (with a description, color, and pin) before anything carries it, \`tags update\` re-annotates one, and \`tags rename\`/\`merge\`/\`delete\` reshape it everywhere at once.`)
+        .description(`Workspace tags: one vocabulary across ${TAG_KINDS_PROSE}. Tags normalize to lowercase (trimmed, deduped, max 50 per item; any characters — nothing is slugified, so "Q3 Outbound" becomes "q3 outbound"). ATTACH tags on the owning surface — each of those groups has its own \`tag\` subcommand (e.g. \`oxygen inbox tag\`, \`oxygen tables tag\`, \`oxygen domains tag\`) — then \`tags get <tag>\` returns every carrier with deep-links. CURATE the vocabulary here: \`tags create\` declares a tag (with a description, color, and pin) before anything carries it, \`tags update\` re-annotates one, and \`tags rename\`/\`merge\`/\`delete\` reshape it everywhere at once. Tags are free, inert metadata: attaching or removing one costs 0 credits, makes no provider call, and changes no sending, routing, or warm-up behaviour.`)
         .addCommand(new Command("list")
         .description("List every workspace tag with per-primitive counts, most-used first.")
         .option("--json", "Print a JSON envelope.")
@@ -8541,6 +8137,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         // appearing in a command's flag strings, so an approval-shaped name
         // here would mislabel every command that carries it.
         .option("--move-existing", "Also re-home the mailboxes you already have onto the new dedicated IP. Off by default because moving an established mailbox throws away the sending warmup it accumulated on its current IP.")
+        .option("--country <code>", "ISO 3166-1 alpha-2 country the dedicated IP should sit in (e.g. US, DE). Match it to where your mailboxes' owners plausibly sign in from — the IP's job is making the sign-in look ordinary, and an account that suddenly authenticates from another country is what gets it challenged. Omitted uses the default region. An unserviceable or out-of-stock country fails before anything is ordered or charged.")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("egress dedicated request", options, () => requestOxygen("/api/cli/egress/dedicated", {
@@ -8548,6 +8145,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
             body: {
                 ...(options.approved ? { approve: true } : {}),
                 ...(options.moveExisting ? { move_existing: true } : {}),
+                ...(readOption(options.country) ? { country: readOption(options.country) } : {}),
             },
         }));
     }))
@@ -10075,9 +9673,10 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     }))
         .addCommand(new Command("destinations")
-        .description("List where a connected integration can send — for Microsoft Teams, the teams you belong to, and one team's channels with --team-id. Free: these are read-only lookups, so no approval or credit cap is needed.")
+        .description("List where a connected integration can send — for Microsoft Teams, your teams and your chats, plus one team's channels with --team-id. Free: these are read-only lookups, so no approval or credit cap is needed.")
         .argument("<integration_id>", "Integration id. Supported: 'microsoft_teams'.")
-        .option("--team-id <id>", "List this team's channels as well as your teams.")
+        .option("--team-id <id>", "List this team's channels as well.")
+        .option("--kind <kind>", "Narrow to one of: teams, channels, chats. Default lists teams and chats.")
         .option("--connection-id <id>", "Use a specific connection when several are active.")
         .option("--json", "Print a JSON envelope.")
         .action(async (integrationId, options) => {
@@ -10086,6 +9685,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
             const teamId = readOption(options.teamId);
             if (teamId)
                 params.set("team_id", teamId);
+            const kind = readOption(options.kind);
+            if (kind)
+                params.set("kind", kind);
             const connectionId = readOption(options.connectionId);
             if (connectionId)
                 params.set("connection_id", connectionId);
@@ -10129,6 +9731,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         .description("List connected LinkedIn sender accounts with health status, rate limits, and today's usage.")
         .option("--status <status>", "Filter by sender status: active, paused, disconnected, restricted, or credentials_required.")
         .option("--no-usage", "Skip today's per-account usage counts for a faster, lighter response.")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches sender accounts carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("senders list", options, () => {
@@ -10138,6 +9741,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
             const status = readOption(options.status);
             if (status)
                 params.set("status", status);
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
             const suffix = params.toString();
             return requestOxygen(`/api/cli/senders${suffix ? `?${suffix}` : ""}`);
         });
@@ -10313,6 +9919,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         .option("--total-reads-per-day <n>", "Daily cap across all read units.")
         .option("--min-spacing-seconds <n>", "Minimum seconds between actions.")
         .option("--spacing-jitter-seconds <n>", "Random jitter seconds added to action spacing.")
+        .option("--interactive-min-spacing-seconds <n>", "Minimum seconds between human-sent Unibox actions.")
+        .option("--interactive-spacing-jitter-seconds <n>", "Random jitter seconds added to human-sent Unibox action spacing.")
+        .option("--interactive-sends-per-hour <n>", "Hourly cap on human-sent Unibox actions.")
         .option("--timezone <tz>", "IANA timezone the daily action counters reset in, e.g. America/New_York.")
         .option("--warmup-restart", "Start (or restart) the warm-up ramp now — gradually raises this account's invite + message caps to full over ~2 weeks.")
         .option("--warmup-disable", "Turn off warm-up for this account (treat it as already warm and use its full configured caps).")
@@ -10335,12 +9944,31 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         .addCommand(new Command("list")
         .description("List sender profiles with their per-channel account counts (LinkedIn / WhatsApp / inboxes).")
         .option("--status <status>", "Filter by status: active, paused, or archived.")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches sender profiles carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("senders profiles list", options, () => {
+            const params = new URLSearchParams();
             const status = readOption(options.status);
-            return requestOxygen(`/api/cli/senders/profiles${status ? `?status=${encodeURIComponent(status)}` : ""}`);
+            if (status)
+                params.set("status", status);
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
+            const suffix = params.toString();
+            return requestOxygen(`/api/cli/senders/profiles${suffix ? `?${suffix}` : ""}`);
         });
+    }))
+        .addCommand(new Command("tag")
+        .description("Replace a sender profile's workspace tags (whole set; `--tags \"\"` clears) — one edit pools the whole sending identity behind a campaign tag. Member accounts keep their own tags. See `oxygen tags list` for the vocabulary.")
+        .argument("<id>", "Sender profile id.")
+        .requiredOption("--tags <tags>", "Comma-separated workspace tags (replaces the whole set; empty clears).")
+        .option("--json", "Print a JSON envelope.")
+        .action(async (id, options) => {
+        await handleAsyncAction("senders profiles tag", options, () => requestOxygen(`/api/cli/senders/profiles/${encodeURIComponent(id)}/tags`, {
+            method: "POST",
+            body: { tags: splitCommaList(options.tags) },
+        }));
     }))
         .addCommand(new Command("get")
         .description("Get one sender profile with the LinkedIn/WhatsApp senders and inboxes attached to it.")
@@ -10864,6 +10492,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         .description("List connected WhatsApp accounts with health status, warm-up ramp state, limits, and today's usage.")
         .option("--status <status>", "Filter by account status: active, paused, disconnected, restricted, or credentials_required.")
         .option("--no-usage", "Skip today's per-account usage counts.")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches WhatsApp accounts carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("whatsapp accounts", options, () => {
@@ -10873,6 +10502,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
             const status = readOption(options.status);
             if (status)
                 params.set("status", status);
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
             const suffix = params.toString();
             return requestOxygen(`/api/cli/whatsapp/accounts${suffix ? `?${suffix}` : ""}`);
         });
@@ -12508,12 +12140,31 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     })))
         .addCommand(new Command("numbers")
-        .description("The org's dialing pool: list | release. Buying is done from the web shop, which prices and previews the recurring order before it is placed.")
+        .description("The org's dialing pool: list | tag | release. Buying is done from the web shop, which prices and previews the recurring order before it is placed.")
         .addCommand(new Command("list")
-        .description("List the org's phone numbers with warm-up state, daily cap, and what each one costs per month.")
+        .description("List the org's phone numbers with warm-up state, daily cap, and what each one costs per month. Optional --tag narrows to one campaign's numbers.")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches phone numbers carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
-        await handleAsyncAction("voice numbers list", options, () => requestOxygen("/api/cli/voice/numbers"));
+        await handleAsyncAction("voice numbers list", options, () => {
+            const params = new URLSearchParams();
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
+            const suffix = params.toString();
+            return requestOxygen(`/api/cli/voice/numbers${suffix ? `?${suffix}` : ""}`);
+        });
+    }))
+        .addCommand(new Command("tag")
+        .description("Replace a phone number's workspace tags (whole set; `--tags \"\"` clears) — e.g. pool the numbers dialing one campaign behind its tag. See `oxygen tags list` for the vocabulary.")
+        .argument("<number>", "Phone number in E.164 (e.g. +14155550142) or its id.")
+        .requiredOption("--tags <tags>", "Comma-separated workspace tags (replaces the whole set; empty clears).")
+        .option("--json", "Print a JSON envelope.")
+        .action(async (number, options) => {
+        await handleAsyncAction("voice numbers tag", options, () => requestOxygen(`/api/cli/voice/numbers/${encodeURIComponent(number)}/tags`, {
+            method: "POST",
+            body: { tags: splitCommaList(options.tags) },
+        }));
     }))
         .addCommand(new Command("release")
         .description("Give a number back to the carrier and stop its monthly charge. IRREVERSIBLE — the number returns to the carrier's pool and can be taken by someone else within minutes; you cannot get it back. Previews by default; pass --approved to actually release.")
@@ -12984,10 +12635,11 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     })));
     program.addCommand(new Command("mailboxes")
-        .description("Native email sending pool: register/refresh Google/Microsoft mailboxes (including secure local Hypertide transfer), pause/disable inboxes, connect EmailGuard monitoring, and run managed SendKit warmup with explicit plans and credit caps. Safe import preflight: run `oxygen mailboxes compatibility --catalog-only --json`, then `oxygen mailboxes import --file <path> --validate-only --json` (add the credential source flags shown by import help when the file contains credentials).")
+        .description("Native email sending pool: register/refresh Google/Microsoft mailboxes (including secure local Hypertide transfer), pause/disable inboxes, connect EmailGuard monitoring, and run managed SendKit warmup with explicit plans and credit caps. Managed InboxKit Google and Microsoft mailboxes use InboxKit's native Sequencer export during the approved warmup action; SendKit warms them but never owns campaign dispatch. Safe import preflight: run `oxygen mailboxes compatibility --catalog-only --json`, then `oxygen mailboxes import --file <path> --validate-only --json` (add the credential source flags shown by import help when the file contains credentials).")
         .addCommand(new Command("list")
         .description("List the org's sending mailboxes with provider, status, warmup state, source (managed = bought through Oxygen, byok = bring-your-own), and a pool overview (including counts by source).")
         .option("--status <status>", "Filter by status: active, paused, or disabled.")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches mailboxes carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("mailboxes list", options, () => {
@@ -12995,6 +12647,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
             const status = readOption(options.status);
             if (status)
                 params.set("status", status);
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
             const suffix = params.toString();
             return requestOxygen(`/api/cli/mailboxes${suffix ? `?${suffix}` : ""}`);
         });
@@ -13035,7 +12690,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     }))
         .addCommand(new Command("import")
-        .description("Register (or refresh) sending mailboxes in bulk. Use --validate-only with a local file for a non-mutating, no-network preflight; without it, import is a 0-credit state mutation whose upsert is idempotent by mailbox address. CSV/JSON/JSONL/XLSX identity files from any vendor use --file plus optional --vendor. Compatible Google app-password exports use --from credentials --vendor <source>; --from hypertide remains a shortcut. Connected Zapmail inventories use --from zapmail. In credential files, app_password is Google-only; Microsoft password fields are discarded locally. OAuth grants, MFA/TOTP seeds, and delegation keys never transfer: Microsoft warmup requires one Outlook OAuth authorization per mailbox (`mailboxes warmup microsoft`) and EmailGuard remains vendor_blocked for Microsoft. Google app passwords are sent only in the request body, encrypted server-side, and never returned.")
+        .description("Register (or refresh) sending mailboxes in bulk. Use --validate-only with a local file for a non-mutating, no-network preflight; without it, import is a 0-credit state mutation whose upsert is idempotent by mailbox address. CSV/JSON/JSONL/XLSX identity files from any vendor use --file plus optional --vendor. Compatible Google app-password exports use --from credentials --vendor <source>; --from hypertide remains a shortcut. Connected Zapmail inventories use --from zapmail. In credential files, app_password is Google-only; Microsoft password fields are discarded locally. OAuth grants, MFA/TOTP seeds, and delegation keys never transfer: managed InboxKit Google/Microsoft warmup uses native InboxKit Sequencer export during `warmup enable`; eligible non-InboxKit Microsoft warmup uses the separate Outlook OAuth fallback (`mailboxes warmup microsoft`); EmailGuard remains vendor_blocked for Microsoft. Google app passwords are sent only in the request body, encrypted server-side, and never returned.")
         .addHelpText("after", [
         "",
         "Ordinary identity file contract (CSV / JSON / JSONL / XLSX):",
@@ -13110,7 +12765,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
                         : from === "credentials"
                             ? "credential_file"
                             : "identity_file",
-                    sourceProvider,
+                    sourceProvider: from === "hypertide" ? "hypertide" : sourceProvider,
                 });
             }
             return requestOxygen("/api/cli/mailboxes", {
@@ -13380,9 +13035,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     }))
         .addCommand(new Command("warmup")
-        .description("Mailbox warmup for the sending pool — the weeks of low-volume conversational mail that make a new inbox look trusted before you cold-send from it. Oxygen's native warmup runs on ONE rail: SendKit, managed and credit-billed at 3,000 credits per warming inbox per month ($3). Oxygen enrolls the mailbox for you — preview first, then re-run with --approved to execute and bill. Google and Microsoft both warm here; a Microsoft inbox first needs one Outlook authorization of its own (`mailboxes warmup microsoft`). Inboxes already warming on the retired TrulyInbox rail keep reporting and are wound down here with `warmup disable`; they are never silently moved onto SendKit.")
+        .description("Mailbox warmup for the sending pool — the weeks of low-volume conversational mail that make a new inbox look trusted before you cold-send from it. Oxygen's native warmup runs on ONE rail: SendKit, managed and credit-billed at 3,000 credits per warming inbox per month ($3). Oxygen enrolls the mailbox for you — preview first, then re-run with --approved to execute and bill. Managed InboxKit Google and Microsoft mailboxes are exported through InboxKit's native Sequencer integration inside that approved action; InboxKit auto-export stays off, and any non-cancelled InboxKit warmup blocks the handoff so one mailbox cannot warm twice. SendKit is warmup-only: native OXYGEN Sequences still own campaigns and sends. Eligible non-InboxKit Microsoft mailboxes use the separate `mailboxes warmup microsoft` OAuth fallback. Inboxes already warming on the retired TrulyInbox rail keep reporting and are wound down here with `warmup disable`; they are never silently moved onto SendKit.")
         .addCommand(new Command("enable")
-        .description("Enroll sending mailboxes in Oxygen's managed SendKit warmup and stamp each mailbox's warmup state. Targets the whole pool unless --mailboxes is given. Without --approved this is a 0-credit, no-provider-write priced preview: nothing is enrolled or billed. Preview one inbox with `oxygen mailboxes warmup enable --mailboxes sender@example.com --json`. Execute by echoing its --plan and --max-credits with --approved. Microsoft inboxes must finish `mailboxes warmup microsoft` (one Outlook authorization each) before they can enroll. New enrollments only ever land on SendKit — the retired TrulyInbox rail is refused here and only accepts teardown.")
+        .description("Enroll sending mailboxes in Oxygen's managed SendKit warmup and stamp each mailbox's warmup state. Targets the whole pool unless --mailboxes is given; one synchronous preview/approval is capped at 220 mailboxes, so split larger pools into explicit batches. Without --approved this is a 0-credit, no-provider-write priced preview: nothing is exported, enrolled, or billed. Preview one inbox with `oxygen mailboxes warmup enable --mailboxes sender@example.com --json`. Execute by echoing its --plan and --max-credits with --approved. Managed InboxKit Google and Microsoft mailboxes use InboxKit's native Sequencer export here by default; auto-export remains off, and any non-cancelled InboxKit warmup must be cancelled before export (pausing is not enough). Only eligible non-InboxKit Microsoft mailboxes need `mailboxes warmup microsoft`. SendKit supplies warmup only — OXYGEN Sequences retain campaign enrollment and dispatch. New enrollments only ever land on SendKit; the retired TrulyInbox rail is refused here and only accepts teardown.")
         .option("--mailboxes <list>", "Comma-separated mailbox ids or addresses to warm. Omit to warm the whole pool.")
         .option("--approved", "Execute the PRICED enrollment. Without it the response is a priced preview and nothing is enrolled or billed.")
         .option("--plan <hash>", "Hash from the fresh preview (required with --approved).")
@@ -13426,8 +13081,8 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         });
     }))
         .addCommand(new Command("microsoft")
-        .description("Authorize Microsoft/Outlook mailboxes for SendKit warmup — ONE browser consent PER MAILBOX, never a password or app password. There is no tenant-admin shortcut: a 40-inbox Microsoft pool means 40 separate authorizations, each opened by whoever can sign in to that mailbox. The preview names the exact mailboxes and how many consent links are still outstanding, at 0 credits. Approve that fresh hash with --max-credits 0 to mint the links, open every returned consent_url, then re-run with --status to see which mailboxes came back authorized. Warmup itself stays OFF until a separately approved `warmup enable`.")
-        .option("--mailboxes <list>", "Comma-separated Microsoft mailbox ids or addresses. Omit to select every Microsoft mailbox in the pool.")
+        .description("NON-INBOXKIT FALLBACK ONLY: authorize eligible Microsoft/Outlook mailboxes for SendKit warmup with ONE browser consent PER MAILBOX, never a password or app password. Do not run this for managed InboxKit mailboxes: both Google and Microsoft use InboxKit's native Sequencer export during the separately approved `warmup enable`. For the fallback there is no tenant-admin shortcut: a 40-inbox Microsoft pool means 40 separate authorizations, each opened by whoever can sign in to that mailbox. The preview names the exact fallback mailboxes and outstanding links at 0 credits. Approve that fresh hash with --max-credits 0, open every returned consent_url, then re-run with --status. Warmup itself stays OFF until `warmup enable`.")
+        .option("--mailboxes <list>", "Comma-separated eligible non-InboxKit Microsoft mailbox ids or addresses. Omit to select the pool; the command refuses a scope containing managed InboxKit rows and points to warmup enable.")
         .option("--tenant <id>", "Deprecated and ignored: SendKit consent is per mailbox, so there is no tenant-wide scope to bind. Still accepted so older scripts keep running.")
         .option("--approved", "Mint the per-mailbox consent links for the exact previewed mailbox scope. Still 0 credits — a human then has to open each link.")
         .option("--plan <hash>", "Fresh setup preview hash (required with --approved).")
@@ -13678,6 +13333,7 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
         .option("--expiring", "Only non-deleted domains expiring within 60 days.")
         .option("--has-mailboxes <bool>", "true → only domains with sending mailboxes; false → only domains without.")
         .option("--include-archived", "Include archived domains (hidden by default).")
+        .option("--tag <tags>", "Comma-separated workspace tags — matches domains carrying ANY of these tags (see `oxygen tags list`).")
         .option("--json", "Print a JSON envelope.")
         .action(async (options) => {
         await handleAsyncAction("domains list", options, () => {
@@ -13701,6 +13357,9 @@ fixed scan; watermark_cursor starts a later bounded replay. Consumers must retai
                 params.set("has_mailboxes", hasMailboxes);
             if (options.includeArchived)
                 params.set("include_archived", "true");
+            const tags = splitCommaList(options.tag);
+            if (tags.length > 0)
+                params.set("tag", tags.join(","));
             const suffix = params.toString();
             return requestOxygen(`/api/cli/domains${suffix ? `?${suffix}` : ""}`);
         });
@@ -21731,6 +21390,9 @@ options) {
     setLimit("total_reads_per_day", options.totalReadsPerDay);
     setLimit("min_action_spacing_seconds", options.minSpacingSeconds);
     setLimit("action_spacing_jitter_seconds", options.spacingJitterSeconds);
+    setLimit("interactive_min_spacing_seconds", options.interactiveMinSpacingSeconds);
+    setLimit("interactive_spacing_jitter_seconds", options.interactiveSpacingJitterSeconds);
+    setLimit("interactive_sends_per_hour", options.interactiveSendsPerHour);
     // Send windows are campaign-scoped; the only per-account time setting is the
     // timezone the daily counters reset in.
     const workingHours = {};