@indigoai-us/hq-cli 5.108.24 → 5.108.25

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [5.108.25] — 2026-09-08
+
 ## [5.108.24] — 2026-09-08
 
 ### Added

package/dist/commands/files.d.ts

@@ -89,6 +89,17 @@ export declare function stripRedundantCompanyScope(prefix: string): {
     prefix: string;
     strippedSlug: string;
 } | null;
+/**
+ * The company an anchored path names, or `undefined` for a relative/personal
+ * path.
+ *
+ * Discarding this slug is what makes retargeting possible: strip the anchor,
+ * then resolve the company from somewhere else, and the operation lands on a
+ * DIFFERENT company than the operator pasted. Callers pair this with
+ * `normalizeCompanyFilePrefix` so the anchor either MATCHES the explicit
+ * `--company` (or is refused), or BECOMES the company when none was given.
+ */
+export declare function companySlugFromAnchor(prefix: string, personal?: boolean): string | undefined;
 export declare function runFilesDelete(params: RunFilesDeleteParams, deps?: {
     confirm?: ConfirmFn;
 }): Promise<void>;

package/dist/commands/files.js

@@ -5,6 +5,8 @@ import { resolveVaultCredential } from "../utils/resolve-vault-credential.js";
 import { gateApiKeyCapabilities } from "../utils/api-key-command-gate.js";
 import { vaultApiFetch, getCompanyUid } from "./secrets.js";
 import { GROUP_ID_PATTERN, EMAIL_PATTERN, normalizeFilePrefix } from "./_patterns.js";
+import { looksLikeCompanyUid } from "../utils/vault-api.js";
+import { AuthError } from "../utils/auth-error.js";
 // ---------------------------------------------------------------------------
 // Pure helpers (exported for unit tests)
 // ---------------------------------------------------------------------------
@@ -157,8 +159,8 @@ export function registerFilesCommand(program) {
                 process.exit(1);
             }
             // Fork: --with present → existing direct-grant path. No --with →
-            // browser-launch share-session path. Per PRD, the direct-grant
-            // path is unchanged from US-001 and operates on a single prefix.
+            // browser-launch share-session path. The direct-grant path
+            // operates on a single prefix.
             if (opts.with !== undefined) {
                 if (paths.length !== 1) {
                     console.error(chalk.red("Direct grant (--with) takes exactly one prefix. Pass multiple paths only when minting a share-session URL."));
@@ -190,7 +192,15 @@ export function registerFilesCommand(program) {
         .requiredOption("--with <principal>", "Email address, group id, or '@all' to remove the company-wide grant")
         .action(async (prefix, opts) => {
         try {
-            const canonicalPrefix = normalizeFilePrefix(prefix);
+            // Unshare MUTATES access with no preview, and it resolves the target
+            // company from --company (not from the pasted anchor), so a mismatched
+            // anchor would revoke a real grant in the wrong company.
+            const canonicalPrefix = normalizeCompanyFilePrefix(prefix, {
+                mutating: true,
+                ...(files.opts().company !== undefined
+                    ? { companySlug: files.opts().company }
+                    : {}),
+            });
             const principal = opts.with;
             const isAll = principal === "@all";
             const isEmail = !isAll && EMAIL_PATTERN.test(principal);
@@ -264,10 +274,21 @@ export function registerFilesCommand(program) {
         .description("Show the ACL (access control list) for a file prefix")
         .action(async (prefix) => {
         try {
-            const canonicalPrefix = normalizeFilePrefix(prefix);
+            // Read-only, so stripping is safe — but a mismatched anchor would show
+            // a DIFFERENT company's ACL than the one the operator pasted.
+            const explicitCompany = files.opts().company;
+            const canonicalPrefix = normalizeCompanyFilePrefix(prefix, {
+                ...(explicitCompany !== undefined
+                    ? { companySlug: explicitCompany }
+                    : {}),
+            });
             const token = (await resolveVaultCredential()).token;
-            const companySlug = files.opts().company;
-            const companyUid = await getCompanyUid(token, companySlug);
+            // Resolve through the anchor so the answer describes the company the
+            // operator actually pasted, and never a different one.
+            const companyUid = await resolveCompanyUidForAnchoredPath(token, {
+                explicit: explicitCompany,
+                anchorSlug: companySlugFromAnchor(prefix),
+            });
             // `/acl/tree` carries the prefix's own row metadata (directRow) and the
             // caller's effectivePermission alongside direct/inherited/children, so
             // a single request returns everything the "files acl" view needs.
@@ -474,7 +495,13 @@ export function registerFilesCommand(program) {
     return files;
 }
 async function runDirectGrant(params) {
-    const canonicalPrefix = normalizeFilePrefix(params.prefix);
+    const canonicalPrefix = normalizeCompanyFilePrefix(params.prefix, {
+        mutating: true,
+        rootAdvice: "Use --full --with <principal> to share the entire vault, or pass a bounded path.",
+        ...(params.companySlug !== undefined
+            ? { companySlug: params.companySlug }
+            : {}),
+    });
     if (!params.permission) {
         console.error(chalk.red("--permission is required when --with is set (read | write)"));
         process.exit(1);
@@ -565,9 +592,15 @@ async function runDirectGrant(params) {
     }
 }
 async function runShareSession(params) {
-    // Normalize every path through the shared prefix helper so a trailing
-    // `/` becomes `/*` consistently with the direct-grant path.
-    const normalizedPaths = params.paths.map(normalizeFilePrefix);
+    // Validate every path before minting a session; an anchored path must never
+    // silently become a share of the corresponding company-relative objects.
+    const normalizedPaths = params.paths.map((prefix) => normalizeCompanyFilePrefix(prefix, {
+        mutating: true,
+        rootAdvice: "Use --full --with <principal> to share the entire vault, or pass a bounded path.",
+        ...(params.companySlug !== undefined
+            ? { companySlug: params.companySlug }
+            : {}),
+    }));
     let expiresInMs;
     if (params.expires !== undefined) {
         const parsed = parseDuration(params.expires);
@@ -723,36 +756,179 @@ export function stripRedundantCompanyScope(prefix) {
         return null;
     return { prefix: m[2] ?? "", strippedSlug: m[1] };
 }
+/**
+ * Resolve the company for a possibly-anchored path, refusing any retarget.
+ *
+ * The pure normalizer can only compare slug against slug. That left a hole: a
+ * UID-form `--company` was skipped by the string check, so
+ * `--company cmp_beta delete <alpha-anchored-path>` stripped the anchor,
+ * resolved beta, and previewed/deleted from beta. Comparing IDENTITIES rather
+ * than strings is the only way to close it, and that needs resolution.
+ *
+ * - no anchor            -> unchanged behaviour
+ * - anchor, no --company -> the anchor IS the company
+ * - UID anchor           -> compare with the selected company UID
+ * - slug + explicit UID  -> validate the selected entity's slug directly
+ * - slug + slug          -> resolve BOTH and require the same uid
+ *
+ * API keys can verify UID anchors through their company selector or keyed
+ * membership. Slug anchors still fail closed because keys cannot read entities.
+ */
+async function resolveCompanyUidForAnchoredPath(token, opts) {
+    if (opts.anchorSlug === undefined) {
+        return getCompanyUid(token, opts.explicit);
+    }
+    if (looksLikeCompanyUid(opts.anchorSlug)) {
+        const selectedUid = await getCompanyUid(token, opts.explicit ?? (token.startsWith("hqk_") ? undefined : opts.anchorSlug));
+        if (selectedUid !== opts.anchorSlug) {
+            throw new Error(`Refusing anchored path: it names company '${opts.anchorSlug}' ` +
+                `but this command targets '${selectedUid}'. Pass a matching company or path.`);
+        }
+        return selectedUid;
+    }
+    if (token.startsWith("hqk_")) {
+        throw new Error(`Refusing anchored path under an API key: the anchor names ` +
+            `'${opts.anchorSlug}', and an API key cannot resolve a slug to verify ` +
+            `that is the company it is bound to. Pass the bucket-relative path.`);
+    }
+    if (opts.explicit !== undefined && looksLikeCompanyUid(opts.explicit)) {
+        // An explicit UID disambiguates duplicate slugs. Resolving the slug first
+        // would fail before the caller's unambiguous selector could be considered.
+        const response = await vaultApiFetch({
+            token,
+            path: `/entity/${encodeURIComponent(opts.explicit)}`,
+            signal: AbortSignal.timeout(15_000),
+        });
+        if (response.status === 401)
+            throw new AuthError();
+        if (!response.ok) {
+            throw new Error(`Failed to resolve company '${opts.explicit}' (HTTP ${response.status})`);
+        }
+        const data = (await response.json());
+        if (data.entity?.uid !== opts.explicit ||
+            data.entity.type !== "company" ||
+            data.entity.slug !== opts.anchorSlug) {
+            throw new Error(`Refusing anchored path: cannot verify that company '${opts.explicit}' ` +
+                `has the anchored slug '${opts.anchorSlug}'. Pass a matching company or path.`);
+        }
+        return opts.explicit;
+    }
+    const anchorUid = await getCompanyUid(token, opts.anchorSlug);
+    if (opts.explicit === undefined)
+        return anchorUid;
+    const explicitUid = await getCompanyUid(token, opts.explicit);
+    if (explicitUid !== anchorUid) {
+        throw new Error(`Refusing anchored path: it names company '${opts.anchorSlug}' ` +
+            `(${anchorUid}) but this command targets '${opts.explicit}' ` +
+            `(${explicitUid}). Re-run with --company ${opts.anchorSlug}, or pass ` +
+            `the bucket-relative path.`);
+    }
+    return anchorUid;
+}
+/**
+ * The company an anchored path names, or `undefined` for a relative/personal
+ * path.
+ *
+ * Discarding this slug is what makes retargeting possible: strip the anchor,
+ * then resolve the company from somewhere else, and the operation lands on a
+ * DIFFERENT company than the operator pasted. Callers pair this with
+ * `normalizeCompanyFilePrefix` so the anchor either MATCHES the explicit
+ * `--company` (or is refused), or BECOMES the company when none was given.
+ */
+export function companySlugFromAnchor(prefix, personal) {
+    if (personal)
+        return undefined;
+    return stripRedundantCompanyScope(prefix)?.strippedSlug;
+}
+/**
+ * Normalize company paths at the CLI boundary, preserving personal keys.
+ *
+ * `mutating` marks a route that CHANGES access and has no preview or
+ * confirmation step (grant, share, unshare). Those refuse an anchored path
+ * outright rather than guessing, because stripping the anchor changes which
+ * objects the operation reaches and there is nothing downstream to catch it.
+ *
+ * `companySlug` is the company the command is actually targeting. When the
+ * anchor names a DIFFERENT company we refuse in every mode: stripping would
+ * silently retarget the operation at the active company, so
+ * `--company beta unshare <alpha-anchored-path>` would revoke a real grant in
+ * beta while leaving alpha untouched.
+ */
+function normalizeCompanyFilePrefix(prefix, options = {}) {
+    const scope = options.personal ? null : stripRedundantCompanyScope(prefix);
+    if (!scope)
+        return normalizeFilePrefix(prefix);
+    // A `cmp_…` reference is a UID, not a slug, so it can only be compared to the
+    // anchor by RESOLVING it — which this pure helper cannot do. Comparing the
+    // strings would refuse `--company cmp_acme` against an `acme` anchor even
+    // though both name the same company, and `getCompanyUid`'s ambiguity error
+    // explicitly tells callers to retry with `--company <uid>`. Skip the check
+    // rather than break that recovery path; the UID is authoritative either way.
+    if (options.companySlug !== undefined &&
+        !looksLikeCompanyUid(options.companySlug) &&
+        !looksLikeCompanyUid(scope.strippedSlug) &&
+        options.companySlug !== scope.strippedSlug) {
+        throw new Error(`Refusing anchored path '${prefix}': it names company ` +
+            `'${scope.strippedSlug}' but this command targets ` +
+            `'${options.companySlug}'. Stripping the anchor would apply the ` +
+            `operation to '${options.companySlug}' instead. Re-run with ` +
+            `--company ${scope.strippedSlug}, or pass the bucket-relative path.`);
+    }
+    // A bare anchor strips to nothing. The ACL routes would ship that empty
+    // prefix to a server that answers 400, so fail here with a message that says
+    // what to do instead. `deferRootReject` is for callers that already have a
+    // root guard with better copy — `runFilesDelete` says "Refusing to delete the
+    // vault root", which beats anything this generic helper could write.
+    if (!scope.prefix && !options.deferRootReject) {
+        // Route-specific: `--full` exists ONLY on `files share`. Suggesting it for
+        // `unshare` fails with an unknown option and names the opposite operation.
+        const advice = options.rootAdvice ??
+            "Pass a bounded bucket-relative path (e.g. 'projects/foo').";
+        throw new Error(`Refusing anchored path '${prefix}': it resolves to the vault root. ` +
+            advice);
+    }
+    if (options.mutating) {
+        throw new Error(`Refusing anchored path '${prefix}': the vault is already ` +
+            `company-scoped, so removing 'companies/${scope.strippedSlug}/' would ` +
+            `change which objects this affects. Retry with the bucket-relative ` +
+            `path '${normalizeFilePrefix(scope.prefix)}' if that is what you intend.`);
+    }
+    console.error(chalk.yellow(`Note: stripped redundant 'companies/${scope.strippedSlug}/' — the vault ` +
+        `is already company-scoped; using bucket-relative '${scope.prefix}'.`));
+    return normalizeFilePrefix(scope.prefix);
+}
 export async function runFilesDelete(params, deps = {}) {
     const confirm = deps.confirm ?? realConfirm;
-    // The vault is already company-scoped — a `companies/<slug>/` prefix is the HQ
-    // LOCAL tree layout, not a vault key, and the server 400s it (HQ-8F). Strip it
-    // here so a pasted local path is gracefully normalized to bucket-relative
-    // BEFORE the dry-run/preview (so the operator still sees the exact keys and
-    // confirms the right target). If stripping empties the prefix, the root-reject
-    // below catches it with a clear message.
-    const scope = stripRedundantCompanyScope(params.prefix);
-    if (scope) {
-        console.error(chalk.yellow(`Note: stripped redundant 'companies/${scope.strippedSlug}/' — the vault ` +
-            `is already company-scoped; using bucket-relative ` +
-            `'${scope.prefix || "(root)"}'.`));
-    }
-    const rawPrefix = scope ? scope.prefix : params.prefix;
-    // Normalize exactly as the share/unshare/acl paths do (trailing `/` → `/*`),
-    // then reject the root/empty prefix CLIENT-side so a typo never reaches the
-    // server as a vault-wide delete. The server enforces this too (defense in
-    // depth), but failing fast here is clearer and avoids a wasted round-trip.
-    const normalized = normalizeFilePrefix(rawPrefix);
+    // Strip the local company anchor before preview/confirmation (HQ-8F/HQ-CA).
+    // Personal keys are already bucket-relative and must keep any such anchor.
+    // Normalize trailing `/` to `/*`, then reject the root/empty prefix before
+    // any network call, including when stripping a bare company anchor empties it.
+    // The anchor names a company. Compare it with --company (refusing a
+    // mismatch), and when --company was omitted ADOPT it rather than letting the
+    // membership fallback pick a different company to delete from.
+    const anchorSlug = companySlugFromAnchor(params.prefix, params.personal);
+    const normalized = normalizeCompanyFilePrefix(params.prefix, {
+        personal: params.personal,
+        deferRootReject: true,
+        ...(params.companySlug !== undefined
+            ? { companySlug: params.companySlug }
+            : {}),
+    });
     if (normalized === "" || normalized === "*" || normalized === "/*") {
         console.error(chalk.red("Refusing to delete the vault root. Pass a bounded prefix (e.g. 'projects/foo/' or 'projects/foo/*') or an exact key."));
         process.exit(1);
     }
     const token = (await resolveVaultCredential()).token;
     // Personal scope resolves the vault server-side from the caller's identity —
-    // no company to look up. Company scope resolves the companyUid as before.
+    // no company to look up. Company scope resolves the companyUid through the
+    // anchor-aware resolver so an anchored path can never delete from a company
+    // other than the one it names.
     const companyUid = params.personal
         ? undefined
-        : await getCompanyUid(token, params.companySlug);
+        : await resolveCompanyUidForAnchoredPath(token, {
+            explicit: params.companySlug,
+            anchorSlug,
+        });
     const scopeArgs = params.personal
         ? { personal: true }
         : { companyUid };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.108.24",
+  "version": "5.108.25",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {