@indigoai-us/hq-cli 5.5.0 → 5.5.2

package/src/commands/pkg-install.ts

@@ -20,7 +20,7 @@ import * as yaml from 'js-yaml';
 import { execSync } from 'child_process';
 import { Command } from 'commander';
 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,
@@ -28,23 +28,41 @@ import {
 } 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: Command): void {
   parent
-    .command('install <slug>')
-    .description('Install a package from the registry')
-    .option('--company <co>', 'Scope the package to a specific company')
-    .action(async (slug: string, opts: { company?: string }) => {
-      try {
-        await installPackage(slug, opts.company);
-      } catch (error) {
-        console.error(
-          chalk.red('Install failed:'),
-          error instanceof Error ? error.message : 'Unknown error'
-        );
-        process.exit(1);
+    .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: string,
+        opts: { company?: string; allowHooks?: boolean; branch?: boolean }
+      ) => {
+        try {
+          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'
+          );
+          process.exit(1);
+        }
       }
-    });
+    );
 }
 
 async function installPackage(
@@ -52,9 +70,9 @@ async function installPackage(
   company?: string
 ): Promise<void> {
   // 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}...`));

package/src/commands/pkg-list.ts

@@ -8,7 +8,7 @@ import { Command } from 'commander';
 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,
@@ -59,12 +59,12 @@ async function listPackages(): Promise<void> {
   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
+        cached.accessToken
       );
       const result = await client.getMyEntitlements();
       entitlements = result.entitlements;

package/src/commands/pkg-update.ts

@@ -12,7 +12,7 @@ import * as yaml from 'js-yaml';
 import { execSync } from 'child_process';
 import { Command } from 'commander';
 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,
@@ -51,9 +51,9 @@ async function updatePackages(slug?: string): Promise<void> {
     return;
   }
 
-  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);
 
   const toCheck = slug
     ? entries.filter((e) => e.slug === slug)