@indigoai-us/hq-cli 5.5.0 → 5.5.2

package/dist/commands/pack-install.js

@@ -0,0 +1,513 @@
+/**
+ * hq install <source> — content-pack installer (US-003, hq-core v12.0.0+)
+ *
+ * Source patterns and transports:
+ *   @scope/name[@version]          → npm (default pin = latest, frozen on install)
+ *   https://... | git@... | *.git  → git (SHA-pinned by default; --branch to follow)
+ *   github:owner/repo[#...]        → git (sugar — expands to https://github.com/owner/repo.git)
+ *   ./path | ../path | /path | file:... → local (path recorded as-is)
+ *
+ * Git fragment grammar (after '#'):
+ *   '#<ref>'                → whole repo at ref (tag / branch / SHA)
+ *   '#<subpath>'            → subdirectory of repo at default branch
+ *   '#<subpath>@<ref>'      → subdirectory at ref
+ * Fragment disambiguation: if the token after '#' contains '/' it's a subpath;
+ * otherwise it's a ref. Subpath enables monorepo-hosted packs (e.g.
+ * 'github:indigoai-us/hq#packages/hq-pack-gstack@abc1234') without a separate
+ * registry or release tarball.
+ *
+ * Distinct from pkg-install.ts (entitlement-gated registry flow against the
+ * proprietary HQ registry — that still runs for plain slugs). Spec:
+ * knowledge/public/hq-core/package-yaml-spec.md.
+ *
+ * Flow:
+ *   1. Classify source → transport
+ *   2. Fetch payload to tmpdir (npm pack | git clone | rsync)
+ *   3. Parse + validate package.yaml (10 checks from spec)
+ *   4. Evaluate `conditional` predicate — skip if exits non-zero
+ *   5. Confirm hooks if `contributes.hooks` non-empty (unless --allow-hooks)
+ *   6. Move into packages/{name}/
+ *   7. Append entry to modules.yaml with strategy: package
+ *   8. Run scan-packages.sh to wire contributions into host paths
+ */
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import * as readline from 'readline';
+import * as yaml from 'js-yaml';
+import { execFileSync, spawnSync } from 'child_process';
+import chalk from 'chalk';
+import semverSatisfies from 'semver/functions/satisfies.js';
+import semverValid from 'semver/functions/valid.js';
+import semverValidRange from 'semver/ranges/valid.js';
+import { findHqRoot, readManifest, writeManifest, } from '../utils/manifest.js';
+function classify(source) {
+    if (source.startsWith('@'))
+        return 'npm';
+    if (source.startsWith('http://') ||
+        source.startsWith('https://') ||
+        source.startsWith('git@') ||
+        source.startsWith('git://') ||
+        source.startsWith('github:') ||
+        source.endsWith('.git') ||
+        /\.git#/.test(source)) {
+        return 'git';
+    }
+    // A '#' fragment is only meaningful to git (ref / subpath). If we see one
+    // on a file: or path source, the caller means "clone this local git repo"
+    // — route to git. Local transport does not consume fragments.
+    if (source.includes('#')) {
+        return 'git';
+    }
+    if (source.startsWith('./') ||
+        source.startsWith('../') ||
+        source.startsWith('/') ||
+        source.startsWith('file:')) {
+        return 'local';
+    }
+    // Fallback: bare slug — caller (dispatcher) routes those to legacy flow.
+    throw new Error(`Cannot classify source "${source}" as pack (npm @scope/name, git URL, or path). ` +
+        `Bare slugs go through the registry (Cognito) flow.`);
+}
+/**
+ * Expand 'github:owner/repo' shorthand to a cloneable URL. Passes anything
+ * else through unchanged. Separate from classify() so the transport-dispatch
+ * stays readable.
+ */
+function expandGithubShorthand(url) {
+    if (!url.startsWith('github:'))
+        return url;
+    const slug = url.slice('github:'.length);
+    if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(slug)) {
+        throw new Error(`github: shorthand must be 'github:owner/repo' (got 'github:${slug}')`);
+    }
+    return `https://github.com/${slug}.git`;
+}
+/**
+ * Parse a git source's '#<...>' fragment into { url, subpath, ref }.
+ * Disambiguation: fragment containing '/' is a subpath (optionally with
+ * '@<ref>' suffix); fragment without '/' is a ref.
+ */
+function parseGitFragment(source) {
+    const hashAt = source.indexOf('#');
+    if (hashAt < 0)
+        return { url: source };
+    const url = source.slice(0, hashAt);
+    const frag = source.slice(hashAt + 1);
+    if (frag.includes('/')) {
+        // subpath[@ref]
+        const atAt = frag.lastIndexOf('@');
+        if (atAt > 0) {
+            return { url, subpath: frag.slice(0, atAt), ref: frag.slice(atAt + 1) };
+        }
+        return { url, subpath: frag };
+    }
+    return { url, ref: frag || undefined };
+}
+/**
+ * sourceMatchesPackPattern — exported for the dispatcher in pkg-install.ts
+ * so it can decide whether to route to the new content-pack handler or fall
+ * back to the legacy registry flow.
+ */
+export function sourceMatchesPackPattern(source) {
+    try {
+        classify(source);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function fetchNpm(source, tmpDir) {
+    // Use `npm pack` to grab the tarball without actually installing anything.
+    // Capture output to get the produced filename. Arguments are passed as an
+    // argv array — never interpolated into a shell string — so `source` cannot
+    // break out even if it contains metacharacters.
+    const out = execFileSync('npm', ['pack', '--silent', '--pack-destination', tmpDir, source], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'inherit'] });
+    const tarball = out.trim().split('\n').filter(Boolean).pop();
+    if (!tarball) {
+        throw new Error(`npm pack produced no tarball for "${source}"`);
+    }
+    const tarballPath = path.join(tmpDir, tarball);
+    const extractDir = path.join(tmpDir, 'extracted');
+    fs.mkdirSync(extractDir, { recursive: true });
+    execFileSync('tar', ['-xzf', tarballPath, '-C', extractDir], {
+        stdio: 'inherit',
+    });
+    // npm tarballs unpack into ./package/
+    const payloadDir = path.join(extractDir, 'package');
+    if (!fs.existsSync(payloadDir)) {
+        throw new Error(`npm tarball layout unexpected — no "package/" in ${tarballPath}`);
+    }
+    // Freeze version from the resolved tarball filename when caller passed e.g.
+    // '@scope/name' (no @version) — fall back to the source string.
+    // npm pack writes the filename as scope-name-version.tgz (no leading @).
+    const m = /([0-9]+\.[0-9]+\.[0-9]+[^.]*)\.tgz$/.exec(tarball);
+    const resolvedSource = m ? `${stripVersion(source)}@${m[1]}` : source;
+    return { payloadDir, resolvedSource };
+}
+function stripVersion(src) {
+    // '@scope/name@1.0.0' → '@scope/name'
+    const at = src.lastIndexOf('@');
+    if (at > 0)
+        return src.slice(0, at);
+    return src;
+}
+function fetchGit(source, tmpDir, followBranch) {
+    const parsed = parseGitFragment(source);
+    const url = expandGithubShorthand(parsed.url);
+    const { subpath, ref } = parsed;
+    // Defensive: subpath must not escape the clone root.
+    if (subpath) {
+        if (subpath.startsWith('/') ||
+            subpath.split('/').some((seg) => seg === '..' || seg === '')) {
+            throw new Error(`Invalid subpath "${subpath}" — must be a relative path within the repo.`);
+        }
+    }
+    // Defensive: reject refs that would be ambiguous or shell-dangerous.
+    // `git` itself would tolerate most of these, but refusing them early avoids
+    // having to reason about quoting later.
+    if (ref && /[\s;&|`$<>(){}\\]/.test(ref)) {
+        throw new Error(`Invalid ref "${ref}" — contains disallowed characters.`);
+    }
+    const cloneDir = path.join(tmpDir, 'clone');
+    // Disambiguate ref=branch-or-tag vs. ref=SHA authoritatively via `git
+    // ls-remote`. Hex-shaped branch names (e.g. `deadbeef`) previously got
+    // silently downgraded to the "no --branch" path by a heuristic regex;
+    // that is now fixed. Arguments are passed as argv; no shell.
+    const refIsNamedRef = !!ref && isNamedRef(url, ref);
+    const cloneArgs = ['clone', '--depth', '1'];
+    if (refIsNamedRef)
+        cloneArgs.push('--branch', ref);
+    cloneArgs.push(url, cloneDir);
+    execFileSync('git', cloneArgs, { stdio: 'inherit' });
+    if (ref && !refIsNamedRef) {
+        // SHA (or something ls-remote didn't recognize as a ref). Try a direct
+        // checkout first — works if the SHA happens to be HEAD of the default
+        // branch — otherwise unshallow and retry.
+        try {
+            execFileSync('git', ['-C', cloneDir, 'checkout', ref], {
+                stdio: 'inherit',
+            });
+        }
+        catch {
+            execFileSync('git', ['-C', cloneDir, 'fetch', '--unshallow', 'origin'], {
+                stdio: 'inherit',
+            });
+            execFileSync('git', ['-C', cloneDir, 'checkout', ref], {
+                stdio: 'inherit',
+            });
+        }
+    }
+    const resolvedSha = execFileSync('git', ['-C', cloneDir, 'rev-parse', 'HEAD'], { encoding: 'utf-8' }).trim();
+    // If a subpath is specified, the payload is only that subdirectory.
+    let payloadDir = cloneDir;
+    if (subpath) {
+        const subAbs = path.join(cloneDir, subpath);
+        if (!fs.existsSync(subAbs) || !fs.statSync(subAbs).isDirectory()) {
+            throw new Error(`subpath "${subpath}" not found in ${url}@${resolvedSha.slice(0, 7)}`);
+        }
+        payloadDir = path.join(tmpDir, 'payload');
+        fs.mkdirSync(payloadDir, { recursive: true });
+        rsyncDir(subAbs, payloadDir);
+    }
+    else {
+        // Drop .git — the pack should be file content, not a nested repo
+        fs.rmSync(path.join(cloneDir, '.git'), { recursive: true, force: true });
+    }
+    // Recorded source shape:
+    //   with subpath:    url#subpath@<sha|ref>
+    //   without subpath: url#<sha|ref>
+    // --branch opt-in follows the ref by name; default SHA-pins.
+    const recordedRef = followBranch && ref ? ref : resolvedSha;
+    const resolvedSource = subpath
+        ? `${parsed.url}#${subpath}@${recordedRef}`
+        : `${parsed.url}#${recordedRef}`;
+    return { payloadDir, resolvedSource, resolvedSha };
+}
+function fetchLocal(source, tmpDir) {
+    const clean = source.startsWith('file:') ? source.slice('file:'.length) : source;
+    const abs = path.resolve(process.cwd(), clean);
+    if (!fs.existsSync(abs) || !fs.statSync(abs).isDirectory()) {
+        throw new Error(`Local path not a directory: ${abs}`);
+    }
+    const payloadDir = path.join(tmpDir, 'local');
+    fs.mkdirSync(payloadDir, { recursive: true });
+    rsyncDir(abs, payloadDir);
+    return { payloadDir, resolvedSource: clean };
+}
+/**
+ * Invoke rsync with an argv array (no shell). Trailing slashes on the source
+ * path are preserved by passing the exact strings through execFileSync.
+ */
+function rsyncDir(src, dest) {
+    const srcSlashed = src.endsWith('/') ? src : `${src}/`;
+    const destSlashed = dest.endsWith('/') ? dest : `${dest}/`;
+    execFileSync('rsync', [
+        '-a',
+        '--exclude=.git',
+        '--exclude=node_modules',
+        '--exclude=.DS_Store',
+        srcSlashed,
+        destSlashed,
+    ], { stdio: 'inherit' });
+}
+/**
+ * Ask git whether <ref> resolves as a named branch or tag on <url>. Returns
+ * true only when ls-remote prints a matching refs/heads/<ref> or
+ * refs/tags/<ref>. Anything else (including hex-shaped branch names that
+ * happen to be missing, network failures, or explicit SHAs) falls through to
+ * the SHA-checkout path. Uses argv — no shell.
+ */
+function isNamedRef(url, ref) {
+    try {
+        const out = execFileSync('git', ['ls-remote', '--heads', '--tags', url, ref], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
+        return out.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+// ---------------------------------------------------------------------------
+// Manifest validation (spec §Validation, 10 checks)
+// ---------------------------------------------------------------------------
+function validateManifest(payloadDir, hqVersion) {
+    // 1. parse
+    const manifestPath = path.join(payloadDir, 'package.yaml');
+    if (!fs.existsSync(manifestPath)) {
+        throw new Error('package.yaml missing from pack payload');
+    }
+    let parsed;
+    try {
+        parsed = yaml.load(fs.readFileSync(manifestPath, 'utf-8'));
+    }
+    catch (e) {
+        throw new Error(`package.yaml invalid YAML: ${e.message}`);
+    }
+    const m = parsed;
+    if (!m || typeof m !== 'object') {
+        throw new Error('package.yaml must be a YAML mapping');
+    }
+    // 2. name
+    if (!m.name || !/^hq-pack-[a-z0-9][a-z0-9-]*$/.test(m.name)) {
+        throw new Error(`Invalid pack name "${m.name}" — must match ^hq-pack-[a-z0-9][a-z0-9-]*$`);
+    }
+    // 3. version
+    if (!m.version || !semverValid(m.version)) {
+        throw new Error(`Invalid version "${m.version}" — must be valid semver`);
+    }
+    // 4. publisher
+    if (!m.publisher || !/^@[a-z0-9][a-z0-9-]*$/i.test(m.publisher)) {
+        throw new Error(`Invalid publisher "${m.publisher}" — must be a valid npm scope starting with @`);
+    }
+    // 5. access
+    if (m.access !== 'public' && m.access !== 'private') {
+        throw new Error(`access must be "public" or "private" (got "${m.access}")`);
+    }
+    // 6. requires.hqCore
+    const range = m.requires?.hqCore;
+    if (!range || !semverValidRange(range)) {
+        throw new Error(`requires.hqCore must be a valid semver range (got "${range}")`);
+    }
+    if (hqVersion && !semverSatisfies(hqVersion, range)) {
+        throw new Error(`Host hqCore ${hqVersion} does not satisfy pack requirement ${range}`);
+    }
+    // 7. contributes has at least one non-empty subfield
+    const contributes = (m.contributes ?? {});
+    const nonEmpty = Object.values(contributes).some((v) => Array.isArray(v) && v.length > 0);
+    if (!nonEmpty) {
+        throw new Error('contributes must have at least one non-empty subfield');
+    }
+    // 10. payload files exist (hooks check happens separately in step 8)
+    const subpaths = {
+        workers: (i) => path.join('workers', i),
+        knowledge: (i) => path.join('knowledge', i),
+        skills: (i) => path.join('skills', i),
+        commands: (i) => path.join('commands', `${i}.md`),
+        hooks: (i) => path.join('hooks', `${i}.sh`),
+        policies: (i) => path.join('policies', `${i}.md`),
+        scripts: (i) => path.join('scripts', i),
+    };
+    for (const [key, items] of Object.entries(contributes)) {
+        if (!Array.isArray(items))
+            continue;
+        for (const item of items) {
+            const rel = subpaths[key](item);
+            const abs = path.join(payloadDir, rel);
+            if (!fs.existsSync(abs)) {
+                throw new Error(`contributes.${key} declares "${item}" but payload file missing: ${rel}`);
+            }
+        }
+    }
+    return m;
+}
+function readHqVersion(hqRoot) {
+    const p = path.join(hqRoot, 'core.yaml');
+    if (!fs.existsSync(p))
+        return null;
+    try {
+        const c = yaml.load(fs.readFileSync(p, 'utf-8'));
+        return c?.hqVersion ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+// ---------------------------------------------------------------------------
+// Hooks confirmation
+// ---------------------------------------------------------------------------
+async function confirmHooks(pkg, allowHooks) {
+    const hooks = pkg.contributes.hooks ?? [];
+    if (hooks.length === 0)
+        return true;
+    if (allowHooks) {
+        console.log(chalk.yellow(`--allow-hooks set; installing ${hooks.length} hook(s) without prompting.`));
+        return true;
+    }
+    console.log('');
+    console.log(chalk.yellow(`Pack ${pkg.publisher}/${pkg.name} declares ${hooks.length} hook(s):`));
+    for (const h of hooks)
+        console.log(chalk.yellow(`  - ${h}.sh`));
+    console.log(chalk.yellow('These run automatically on tool events with your shell permissions.'));
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await new Promise((resolve) => {
+        rl.question('Install anyway? [y/N] ', (a) => {
+            rl.close();
+            resolve(a);
+        });
+    });
+    return /^(y|yes)$/i.test(answer.trim());
+}
+// ---------------------------------------------------------------------------
+// Conditional predicate
+//
+// `package.yaml:conditional` is arbitrary bash sourced from a remote pack.
+// Evaluating it is effectively code execution — same trust surface as the
+// post-install hooks. We therefore gate it behind the same confirmation flow:
+// a pack with a `conditional` must be approved (interactively) or run under
+// `--allow-hooks` (ambient trust, e.g. `create-hq --full`).
+// ---------------------------------------------------------------------------
+async function confirmConditional(pkg, allowHooks) {
+    if (!pkg.conditional)
+        return true;
+    if (allowHooks)
+        return true;
+    console.log('');
+    console.log(chalk.yellow(`Pack ${pkg.publisher}/${pkg.name} declares a conditional predicate:`));
+    console.log(chalk.yellow(`  $ ${pkg.conditional}`));
+    console.log(chalk.yellow('This runs as bash with your shell permissions before install proceeds.'));
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const answer = await new Promise((resolve) => {
+        rl.question('Evaluate predicate? [y/N] ', (a) => {
+            rl.close();
+            resolve(a);
+        });
+    });
+    return /^(y|yes)$/i.test(answer.trim());
+}
+function evalConditional(expr) {
+    const r = spawnSync('bash', ['-c', expr], { stdio: 'ignore' });
+    return r.status === 0;
+}
+// ---------------------------------------------------------------------------
+// Move into packages/ + update modules.yaml + scan
+// ---------------------------------------------------------------------------
+function installToPackages(payloadDir, pkg, hqRoot) {
+    const packagesDir = path.join(hqRoot, 'packages');
+    fs.mkdirSync(packagesDir, { recursive: true });
+    const destDir = path.join(packagesDir, pkg.name);
+    if (fs.existsSync(destDir)) {
+        fs.rmSync(destDir, { recursive: true, force: true });
+    }
+    // rsync preserves modes/symlinks; tar also works. argv form — no shell.
+    const srcSlashed = payloadDir.endsWith('/') ? payloadDir : `${payloadDir}/`;
+    const destSlashed = destDir.endsWith('/') ? destDir : `${destDir}/`;
+    execFileSync('rsync', ['-a', srcSlashed, destSlashed], { stdio: 'inherit' });
+    return destDir;
+}
+function updateModulesYaml(hqRoot, pkg, fetched) {
+    const manifest = readManifest(hqRoot) ?? { version: '1', modules: [] };
+    // Drop any existing entry for this pack (idempotent re-install)
+    manifest.modules = manifest.modules.filter((m) => m.name !== pkg.name);
+    const entry = {
+        name: pkg.name,
+        strategy: 'package',
+        source: fetched.resolvedSource,
+        version: pkg.version,
+        installed_at: path.posix.join('packages', pkg.name),
+        installed_at_iso: new Date().toISOString(),
+        access: pkg.access === 'public' ? 'public' : undefined,
+    };
+    if (fetched.resolvedSha)
+        entry.resolved_sha = fetched.resolvedSha;
+    manifest.modules.push(entry);
+    writeManifest(hqRoot, manifest);
+}
+function runScanPackages(hqRoot) {
+    const script = path.join(hqRoot, 'scripts', 'scan-packages.sh');
+    if (!fs.existsSync(script)) {
+        console.log(chalk.dim(`  (scripts/scan-packages.sh not present — skipping auto-wire; ` +
+            `will run on next session start)`));
+        return;
+    }
+    const r = spawnSync('bash', [script], {
+        cwd: hqRoot,
+        env: { ...process.env, HQ_ROOT: hqRoot },
+        stdio: 'inherit',
+    });
+    if (r.status !== 0) {
+        console.log(chalk.yellow('  scan-packages.sh exited non-zero; see output above.'));
+    }
+}
+export async function installPack(source, opts = {}) {
+    const transport = classify(source);
+    const hqRoot = findHqRoot();
+    const hqVersion = readHqVersion(hqRoot);
+    console.log(chalk.dim(`→ transport: ${transport}; source: ${source}`));
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hq-pack-'));
+    try {
+        let fetched;
+        switch (transport) {
+            case 'npm':
+                fetched = fetchNpm(source, tmpDir);
+                break;
+            case 'git':
+                fetched = fetchGit(source, tmpDir, opts.followBranch ?? false);
+                break;
+            case 'local':
+                fetched = fetchLocal(source, tmpDir);
+                break;
+        }
+        const pkg = validateManifest(fetched.payloadDir, hqVersion);
+        if (pkg.conditional) {
+            const allowed = await confirmConditional(pkg, opts.allowHooks ?? false);
+            if (!allowed) {
+                console.log(chalk.red('Install aborted (conditional predicate not approved).'));
+                return;
+            }
+            const ok = evalConditional(pkg.conditional);
+            if (!ok) {
+                console.log(chalk.yellow(`Skipping ${pkg.name}: conditional "${pkg.conditional}" returned non-zero.`));
+                return;
+            }
+        }
+        const confirmed = await confirmHooks(pkg, opts.allowHooks ?? false);
+        if (!confirmed) {
+            console.log(chalk.red('Install aborted (hooks denied).'));
+            return;
+        }
+        const destDir = installToPackages(fetched.payloadDir, pkg, hqRoot);
+        updateModulesYaml(hqRoot, pkg, fetched);
+        runScanPackages(hqRoot);
+        console.log(chalk.green(`\n✓ Installed ${pkg.name}@${pkg.version} → ${path.relative(hqRoot, destDir)}/`));
+        console.log(chalk.dim(`  Wired ${Object.values(pkg.contributes).flat().filter(Boolean).length} ` +
+            `contribution(s) into host-side paths.`));
+    }
+    finally {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+}
+//# sourceMappingURL=pack-install.js.map

package/dist/commands/pack-install.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pack-install.js","sourceRoot":"","sources":["../../src/commands/pack-install.ts"],"names":[],"mappings":"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"}

package/dist/commands/pkg-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pkg-install.d.ts","sourceRoot":"","sources":["../../src/commands/pkg-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAgBnE"}
+{"version":3,"file":"pkg-install.d.ts","sourceRoot":"","sources":["../../src/commands/pkg-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAiCnE"}

package/dist/commands/pkg-install.js

@@ -18,19 +18,31 @@ import * as path from 'path';
 import * as yaml from 'js-yaml';
 import { execSync } from 'child_process';
 import chalk from 'chalk';
-import { getAuthToken } from '../utils/auth.js';
+import { ensureCognitoToken } from '../utils/cognito-session.js';
 import { findHqRoot } from '../utils/hq-root.js';
 import { getRegistryUrl, RegistryClient, } from '../utils/registry-client.js';
 import { verifySha256, verifyRsaSignature } from '../utils/integrity.js';
 import { addToRegistry } from '../utils/registry.js';
+import { installPack, sourceMatchesPackPattern } from './pack-install.js';
 export function registerPackageInstallCommand(parent) {
     parent
-        .command('install <slug>')
-        .description('Install a package from the registry')
-        .option('--company <co>', 'Scope the package to a specific company')
-        .action(async (slug, opts) => {
+        .command('install <source>')
+        .description('Install a package. Sources: bare slug (registry, Cognito-gated), ' +
+        '@scope/name[@ver] (npm pack), git URL[#ref], or local path.')
+        .option('--company <co>', 'Scope the package to a specific company (registry flow only)')
+        .option('--allow-hooks', 'Skip the hooks confirmation prompt (content-pack flow)')
+        .option('--branch', 'Follow a ref instead of SHA-pinning (git content-pack flow)')
+        .action(async (source, opts) => {
         try {
-            await installPackage(slug, opts.company);
+            if (sourceMatchesPackPattern(source)) {
+                await installPack(source, {
+                    allowHooks: opts.allowHooks,
+                    followBranch: opts.branch,
+                });
+            }
+            else {
+                await installPackage(source, opts.company);
+            }
         }
         catch (error) {
             console.error(chalk.red('Install failed:'), error instanceof Error ? error.message : 'Unknown error');
@@ -40,9 +52,9 @@ export function registerPackageInstallCommand(parent) {
 }
 async function installPackage(slug, company) {
     // 1. Auth
-    const token = await getAuthToken();
+    const accessToken = await ensureCognitoToken();
     const registryUrl = getRegistryUrl();
-    const client = new RegistryClient(registryUrl, token.clerk_session_token);
+    const client = new RegistryClient(registryUrl, accessToken);
     // 2. Check entitlement
     console.log(chalk.dim(`Checking entitlement for ${slug}...`));
     const entitlement = await client.checkEntitlement(slug);

package/dist/commands/pkg-install.js.map

@@ -1 +1 @@
-{"version":3,"file":"pkg-install.js","sourceRoot":"","sources":["../../src/commands/pkg-install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pkg-install.js","sourceRoot":"","sources":["../../src/commands/pkg-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACL,cAAc,EACd,cAAc,GACf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,MAAM,UAAU,6BAA6B,CAAC,MAAe;IAC3D,MAAM;SACH,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CACV,mEAAmE;QACjE,6DAA6D,CAChE;SACA,MAAM,CAAC,gBAAgB,EAAE,8DAA8D,CAAC;SACxF,MAAM,CAAC,eAAe,EAAE,wDAAwD,CAAC;SACjF,MAAM,CAAC,UAAU,EAAE,6DAA6D,CAAC;SACjF,MAAM,CACL,KAAK,EACH,MAAc,EACd,IAAkE,EAClE,EAAE;QACF,IAAI,CAAC;YACH,IAAI,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,MAAM,WAAW,CAAC,MAAM,EAAE;oBACxB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,YAAY,EAAE,IAAI,CAAC,MAAM;iBAC1B,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAC5B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CACzD,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CACF,CAAC;AACN,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,IAAY,EACZ,OAAgB;IAEhB,UAAU;IACV,MAAM,WAAW,GAAG,MAAM,kBAAkB,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5D,uBAAuB;IACvB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B,IAAI,KAAK,CAAC,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,sDAAsD,CAC/F,CAAC;IACJ,CAAC;IAED,sBAAsB;IACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAEnD,2BAA2B;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE5E,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YACzC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;SACrC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QACzD,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAElC,mBAAmB;QACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,wCAAwC;QACxC,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;YACJ,CAAC;QACH,CAAC;QAED,aAAa;QACb,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAEvE,8BAA8B;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,QAAQ,CAAC,aAAa,OAAO,SAAS,UAAU,GAAG,EAAE;YACnD,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,gCAAgC;QAChC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QACjE,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAA6B,CAAC;YAClE,IAAI,OAAO,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBAC3C,gCAAgC;gBAChC,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxD,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,WAAW,OAAO,CAAC,IAAI,GAAG,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,yCAAyC;QACzC,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC9C,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YACzC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,qDAAqD;YACrD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAC7D,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAGtB,CAAC;gBACT,IAAI,IAAI,EAAE,OAAO;oBAAE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC1C,IAAI,IAAI,EAAE,IAAI;oBAAE,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACnC,CAAC;QACH,CAAC;QAED,2BAA2B;QAC3B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,aAAa,CAAC,MAAM,EAAE;YACpB,IAAI;YACJ,IAAI;YACJ,OAAO;YACP,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,OAAO;YACd,YAAY,EAAE,GAAG;YACjB,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,IAAI,IAAI,OAAO,0BAA0B,IAAI,GAAG,CAAC,CAAC,CAAC;QAC1F,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CACR,uBAAuB,GAAG,IAAI,GAAG,mCAAmC,CACrE,CACF,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,qDAAqD;QACrD,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/commands/pkg-list.js

@@ -6,7 +6,7 @@
 import chalk from 'chalk';
 import { findHqRoot } from '../utils/hq-root.js';
 import { readRegistry } from '../utils/registry.js';
-import { loadToken, isTokenExpired } from '../utils/token-store.js';
+import { loadCachedTokens, isExpiring } from '@indigoai-us/hq-cloud';
 import { getRegistryUrl, RegistryClient, } from '../utils/registry-client.js';
 export function registerPackageListCommand(parent) {
     parent
@@ -43,10 +43,10 @@ async function listPackages() {
     let entitlements = [];
     let offline = false;
     try {
-        const token = await loadToken();
-        if (token && !isTokenExpired(token)) {
+        const cached = loadCachedTokens();
+        if (cached && !isExpiring(cached, 120)) {
             const registryUrl = getRegistryUrl();
-            const client = new RegistryClient(registryUrl, token.clerk_session_token);
+            const client = new RegistryClient(registryUrl, cached.accessToken);
             const result = await client.getMyEntitlements();
             entitlements = result.entitlements;
         }