@inneranimalmedia/agentsam-sdk 2.6.4 → 2.6.5

package/src/commands/cloudflare.js

@@ -1,56 +1,486 @@
 import path from 'node:path';
+import fs from 'node:fs';
 import { listWranglerNativeCommands, runWranglerNative, summarizeCloudflareCpuProfileFile, WRANGLER_OPERATION_FAMILIES } from '../cloudflare/index.js';
 import { renderDiagnosticError } from '../errors/index.js';
+import {
+  CloudflareApiClient,
+  CloudflareApiError,
+  listCloudflareCapabilities,
+  listCloudflareFeaturePacks,
+  assessCapabilityAuthorization,
+  capabilityAuthorizationMatrix,
+  scopesForCapabilities,
+  scopesForFeaturePacks,
+  requestedCloudflareScopes,
+  workflows,
+  scanner,
+  tags,
+  tagGateway,
+  brandProtection,
+  keyless,
+  tokenValidation,
+  pages,
+  snippets,
+} from '../../packages/connectors/cloudflare/src/index.js';
+import { AGENTSAM_TAG_VOCABULARY as TAG_VOCAB } from '../../packages/connectors/cloudflare/src/families/tags.js';
+import {
+  isCloudflareLoginFamily,
+  runCloudflareBrowserOAuthLogin,
+} from './cloudflare-login.js';
 
 function parse(argv = []) {
-  const subcommand = argv[0] || 'status';
-  const takesAction = subcommand === 'run' || subcommand === 'cpu';
-  const out = { subcommand, action: takesAction ? (argv[1] || '') : '', cwd: process.cwd(), json: false, name: '', account: '', config: '', env: '', profile: '', path: '', page: null, file: '' };
-  for (let i = takesAction ? 2 : 1; i < argv.length; i += 1) {
+  const out = {
+    family: argv[0] || 'status',
+    // Never seed action from argv[1] — flags like `--json` would become the action
+    // and `agentsam cloudflare status --json` would fall through to the help menu.
+    action: '',
+    rest: [],
+    cwd: process.cwd(),
+    json: false,
+    name: '',
+    account: '',
+    config: '',
+    env: '',
+    profile: '',
+    path: '',
+    page: null,
+    file: '',
+    zone: '',
+    url: '',
+    id: '',
+    version: '',
+    instance: '',
+    event: '',
+    measurementId: '',
+    endpoint: '/metrics',
+    hideOriginalIp: true,
+    setUpTag: true,
+    capability: '',
+    resource: '',
+    tag: '',
+    status: '',
+    help: false,
+    pack: '',
+  };
+
+  // Legacy: cloudflare run <id> / cloudflare cpu analyze
+  if (out.family === 'run' || out.family === 'cpu') {
+    const maybeAction = argv[1] || '';
+    out.action = maybeAction.startsWith('-') ? '' : maybeAction;
+    let i = out.action ? 2 : 1;
+    for (; i < argv.length; i += 1) {
+      const arg = argv[i];
+      if (arg === '--json') out.json = true;
+      else if (arg === '--cwd') out.cwd = argv[++i] || out.cwd;
+      else if (arg === '--name') out.name = argv[++i] || '';
+      else if (arg === '--account') out.account = argv[++i] || '';
+      else if (arg === '--config') out.config = argv[++i] || '';
+      else if (arg === '--env') out.env = argv[++i] || '';
+      else if (arg === '--profile') out.profile = argv[++i] || '';
+      else if (arg === '--path') out.path = argv[++i] || '';
+      else if (arg === '--page') out.page = Number(argv[++i] || 1);
+      else if (arg === '--file') out.file = argv[++i] || '';
+      else if (arg === '--help' || arg === '-h') out.help = true;
+      else if (!out.action && !arg.startsWith('-')) out.action = arg;
+      else if (out.family === 'cpu' && out.action === 'analyze' && !out.file && !arg.startsWith('-')) out.file = arg;
+      else out.rest.push(arg);
+    }
+    return out;
+  }
+
+  for (let i = 1; i < argv.length; i += 1) {
     const arg = argv[i];
     if (arg === '--json') out.json = true;
     else if (arg === '--cwd') out.cwd = argv[++i] || out.cwd;
-    else if (arg === '--name') out.name = argv[++i] || '';
     else if (arg === '--account') out.account = argv[++i] || '';
-    else if (arg === '--config') out.config = argv[++i] || '';
-    else if (arg === '--env') out.env = argv[++i] || '';
-    else if (arg === '--profile') out.profile = argv[++i] || '';
-    else if (arg === '--path') out.path = argv[++i] || '';
-    else if (arg === '--page') out.page = Number(argv[++i] || 1);
+    else if (arg === '--zone') out.zone = argv[++i] || '';
+    else if (arg === '--name') out.name = argv[++i] || '';
+    else if (arg === '--url') out.url = argv[++i] || '';
+    else if (arg === '--id') out.id = argv[++i] || '';
+    else if (arg === '--version') out.version = argv[++i] || '';
+    else if (arg === '--instance') out.instance = argv[++i] || '';
+    else if (arg === '--event') out.event = argv[++i] || '';
+    else if (arg === '--measurement-id') out.measurementId = argv[++i] || '';
+    else if (arg === '--endpoint') out.endpoint = argv[++i] || '/metrics';
+    else if (arg === '--hide-original-ip') out.hideOriginalIp = true;
+    else if (arg === '--forward-original-ip') out.hideOriginalIp = false;
+    else if (arg === '--no-setup-tag') out.setUpTag = false;
+    else if (arg === '--capability') out.capability = argv[++i] || '';
+    else if (arg === '--pack' || arg === '--packs') out.pack = argv[++i] || '';
+    else if (arg === '--resource') out.resource = argv[++i] || '';
+    else if (arg === '--tag') out.tag = argv[++i] || '';
+    else if (arg === '--status') out.status = argv[++i] || '';
     else if (arg === '--file') out.file = argv[++i] || '';
+    else if (arg === '--page') out.page = Number(argv[++i] || 1);
     else if (arg === '--help' || arg === '-h') out.help = true;
-    else if (out.subcommand === 'cpu' && out.action === 'analyze' && !out.file) out.file = arg;
+    else if (!out.action && !arg.startsWith('-')) out.action = arg;
+    else if (!arg.startsWith('-')) out.rest.push(arg);
     else throw new Error(`unknown cloudflare option: ${arg}`);
   }
   return out;
 }
 
-const help = `Agent Sam · Cloudflare\n\n  agentsam cloudflare status [--cwd PATH] [--json]\n  agentsam cloudflare commands [--json]\n  agentsam cloudflare run <whoami|deployments.list|versions.list|types.check|queues.list> [options] [--json]\n  agentsam cloudflare cpu analyze <profile.cpuprofile> [--cwd PATH] [--json]\n\nSafe native runner is read-only. Deploy, rollback, secret reads, D1 mutation, R2 writes, and long-running tail/dev sessions remain explicit operator actions.\n`;
+const help = `Agent Sam · Cloudflare
+
+Account & access
+  agentsam cloudflare status [--json]
+  agentsam cloudflare login --pack agentsam   # agentsam_cf_browser_oauth (ENTER to open)
+  agentsam cloudflare login --list-packs
+  agentsam cloudflare authorize --pack data   # alias of login
+  agentsam cloudflare permissions [--capability ID] [--json]
+  agentsam cloudflare capabilities [--json]
+  agentsam cloudflare commands [--json]
+
+Compute
+  agentsam cloudflare workflows status|list|inspect|versions|graph|run|instances|instance|step|pause|resume|terminate|event|delete …
+
+Web & delivery
+  agentsam cloudflare tag-gateway status|configure|disable --zone ZONE_ID …
+  agentsam cloudflare scanner status|scan|result|search|har|dom|screenshot|bulk …
+
+Organization
+  agentsam cloudflare tags status|keys|values|summary|resources|list|vocabulary …
+
+  agentsam cloudflare pages status|list|inspect|deployments|deployment|logs|domains …
+  agentsam cloudflare snippets status|list|inspect|content|rules … --zone ZONE_ID
+
+Security (eligibility-first)
+  agentsam cloudflare brand status|queries|matches|logos|scan …
+  agentsam cloudflare keyless status|list|inspect|enable|disable --zone ZONE_ID …
+  agentsam cloudflare token-validation status|configs|rules --zone ZONE_ID …
+
+Native (Wrangler reads)
+  agentsam cloudflare run <whoami|…> [--json]
+  agentsam cloudflare cpu analyze <profile.cpuprofile> [--json]
+
+Auth lanes
+  agentsam_api_key / agentsam_browser_oauth  → Inner Animal Media identity
+  agentsam_cf_browser_oauth                  → Cloudflare API scopes via feature packs
+  CLOUDFLARE_API_TOKEN                       → optional direct token (still supported)
+
+Scope mitigation: never dump 300+ CF permissions — authorize by pack
+  (data | compute | ai | web | media | security | agentsam).
+`;
+
+function clientFromArgs(args, options = {}) {
+  return new CloudflareApiClient({
+    apiToken: options.apiToken || process.env.CLOUDFLARE_API_TOKEN,
+    accountId: args.account || options.accountId || process.env.CLOUDFLARE_ACCOUNT_ID,
+    fetchImpl: options.fetchImpl || globalThis.fetch,
+  });
+}
+
+function formatHuman(result) {
+  if (result == null) return '';
+  if (typeof result === 'string') return result;
+  const lines = [];
+  if (result.capability_label || result.capability_id) {
+    lines.push(`Agent Sam · ${result.capability_label || result.capability_id}`);
+    lines.push('');
+  }
+  if (result.availability != null) {
+    const mark = result.availability === 'available' || result.availability === 'generally_available'
+      ? (result.authorized === false ? '○' : '✓')
+      : '○';
+    lines.push(`availability   ${mark} ${result.availability}`);
+  }
+  if (result.authorized === false && result.permission_required) {
+    lines.push(`permission     ${result.permission_required}`);
+  }
+  if (result.remediation?.authorize_hint) {
+    lines.push('');
+    lines.push(`[Authorize]  ${result.remediation.authorize_hint}`);
+  }
+  if (result.learn) {
+    lines.push('');
+    lines.push(`Learn: ${result.learn}`);
+  }
+  if (result.message && result.ok === false) lines.push(result.message);
+  if (lines.length <= 2) return `${JSON.stringify(result, null, 2)}\n`;
+  return `${lines.join('\n')}\n\n${JSON.stringify(result, null, 2)}\n`;
+}
+
+async function dispatchFamily(args, options) {
+  const client = clientFromArgs(args, options);
+  const family = args.family;
+  const action = args.action || 'status';
+  const name = args.name || args.rest[0] || '';
+  const id = args.id || args.rest[1] || args.rest[0] || '';
+
+  if (family === 'permissions' || family === 'capabilities') {
+    if (family === 'capabilities' || action === 'list' || (!args.capability && !args.pack)) {
+      return {
+        schema: 'agentsam.cloudflare.capabilities.v1',
+        baseline_scopes: requestedCloudflareScopes(),
+        feature_packs: listCloudflareFeaturePacks().map((pack) => ({
+          id: pack.id,
+          label: pack.label,
+          description: pack.description,
+          capabilities: pack.capabilities,
+          scope_count: scopesForFeaturePacks([pack.id]).length,
+          authorize: `agentsam cloudflare login --pack ${pack.id}`,
+        })),
+        mitigation: 'Use feature packs for consent UX — never present the full Cloudflare scope catalog.',
+        capabilities: listCloudflareCapabilities().map((c) => ({
+          id: c.id,
+          label: c.label,
+          domain: c.domain,
+          availability: c.availability,
+          permission: c.permissionLabel,
+          oauth_scopes: c.oauthScopes,
+          note: c.availabilityNote || null,
+        })),
+        tag_vocabulary: TAG_VOCAB,
+      };
+    }
+    if (args.pack) {
+      const scopes = scopesForFeaturePacks(args.pack.split(','));
+      return {
+        pack: args.pack,
+        scopes_to_request: scopes,
+        scope_count: scopes.length,
+        authorize: `agentsam cloudflare login --pack ${args.pack}`,
+        authorize_url_hint: `/api/connections/cloudflare/start?packs=${encodeURIComponent(args.pack)}`,
+      };
+    }
+    const assessment = assessCapabilityAuthorization(args.capability, []);
+    return {
+      ...assessment,
+      scopes_to_request: scopesForCapabilities({ capabilities: [args.capability] }),
+      authorize: `agentsam cloudflare login --capability ${args.capability}`,
+      authorize_url_hint: `/api/connections/cloudflare/start?capabilities=${encodeURIComponent(args.capability)}`,
+    };
+  }
+
+  if (family === 'workflows' || family === 'workflow') {
+    if (action === 'status') return workflows.workflowsStatus(client);
+    if (action === 'list') return workflows.workflowsList(client, { page: args.page });
+    if (action === 'inspect') return workflows.workflowsInspect(client, name);
+    if (action === 'versions') return workflows.workflowsVersions(client, name);
+    if (action === 'graph') return workflows.workflowsGraph(client, name, args.version || args.rest[1]);
+    if (action === 'run') {
+      let params;
+      if (args.file) params = JSON.parse(fs.readFileSync(args.file, 'utf8'));
+      return workflows.workflowsRun(client, name, { params });
+    }
+    if (action === 'instances') return workflows.workflowsInstances(client, name);
+    if (action === 'instance') return workflows.workflowsInstance(client, name, args.instance || args.rest[1]);
+    if (action === 'step') return workflows.workflowsStep(client, name, args.instance || args.rest[1]);
+    if (action === 'pause') return workflows.workflowsSetStatus(client, name, args.instance || args.rest[1], 'paused');
+    if (action === 'resume') return workflows.workflowsSetStatus(client, name, args.instance || args.rest[1], 'running');
+    if (action === 'terminate') return workflows.workflowsSetStatus(client, name, args.instance || args.rest[1], 'terminated');
+    if (action === 'event') {
+      return workflows.workflowsEvent(client, name, args.instance || args.rest[1], args.event || args.rest[2], {});
+    }
+    if (action === 'delete') return workflows.workflowsDelete(client, name);
+    throw new Error(`unknown workflows action: ${action}`);
+  }
+
+  if (family === 'scanner') {
+    if (action === 'status') return scanner.scannerStatus(client);
+    if (action === 'scan') return scanner.scannerScan(client, args.url || args.rest[0]);
+    if (action === 'result' || action === 'status-scan') return scanner.scannerResult(client, args.id || args.rest[0]);
+    if (action === 'search') return scanner.scannerSearch(client, { q: args.url || args.rest[0] });
+    if (action === 'har') return scanner.scannerHar(client, args.id || args.rest[0]);
+    if (action === 'dom') return scanner.scannerDom(client, args.id || args.rest[0]);
+    if (action === 'screenshot') return scanner.scannerScreenshot(client, args.id || args.rest[0]);
+    if (action === 'bulk') {
+      const urls = args.file
+        ? fs.readFileSync(args.file, 'utf8').split(/\r?\n/).map((l) => l.trim()).filter(Boolean)
+        : args.rest;
+      return scanner.scannerBulk(client, urls);
+    }
+    throw new Error(`unknown scanner action: ${action}`);
+  }
+
+  if (family === 'tags') {
+    if (action === 'status') return tags.tagsStatus(client);
+    if (action === 'keys') return tags.tagsKeys(client);
+    if (action === 'values') return tags.tagsValues(client, args.tag || args.rest[0]);
+    if (action === 'summary') return tags.tagsSummary(client);
+    if (action === 'resources') return tags.tagsResources(client, args.tag ? { tag: args.tag } : {});
+    if (action === 'list') return tags.tagsGet(client, args.resource || args.rest[0]);
+    if (action === 'vocabulary') return { ok: true, vocabulary: TAG_VOCAB };
+    throw new Error(`unknown tags action: ${action}`);
+  }
+
+  if (family === 'tag-gateway' || family === 'tag_gateway') {
+    const zone = args.zone;
+    if (!zone) throw new Error('--zone required');
+    if (action === 'status') return tagGateway.tagGatewayStatus(client, zone);
+    if (action === 'configure') {
+      return tagGateway.tagGatewayConfigure(client, zone, {
+        measurementId: args.measurementId,
+        endpoint: args.endpoint,
+        hideOriginalIp: args.hideOriginalIp,
+        setUpTag: args.setUpTag,
+        enabled: true,
+      });
+    }
+    if (action === 'disable') return tagGateway.tagGatewayDisable(client, zone);
+    throw new Error(`unknown tag-gateway action: ${action}`);
+  }
+
+  if (family === 'brand') {
+    if (action === 'status') return brandProtection.brandProtectionStatus(client);
+    if (action === 'queries') return brandProtection.brandQueries(client);
+    if (action === 'matches') return brandProtection.brandMatches(client, args.id ? { query_id: args.id } : {});
+    if (action === 'logos') return brandProtection.brandLogos(client);
+    if (action === 'logo-matches') return brandProtection.brandLogoMatches(client, args.id || args.rest[0]);
+    if (action === 'scan') return brandProtection.brandScanPage(client, args.url || args.rest[0]);
+    if (action === 'query' && args.rest[0] === 'add') {
+      return brandProtection.brandQueryAdd(client, { query: args.rest[1] || args.name });
+    }
+    throw new Error(`unknown brand action: ${action}`);
+  }
+
+  if (family === 'keyless') {
+    const zone = args.zone;
+    if (action === 'status') return keyless.keylessStatus(client, zone);
+    if (!zone) throw new Error('--zone required');
+    if (action === 'list') return keyless.keylessList(client, zone);
+    if (action === 'inspect') return keyless.keylessInspect(client, zone, args.id || args.rest[0]);
+    if (action === 'enable') return keyless.keylessEnable(client, zone, args.id || args.rest[0]);
+    if (action === 'disable') return keyless.keylessDisable(client, zone, args.id || args.rest[0]);
+    if (action === 'doctor') return keyless.keylessStatus(client, zone);
+    throw new Error(`unknown keyless action: ${action}`);
+  }
+
+  if (family === 'pages') {
+    const project = args.name || args.rest[0] || '';
+    if (action === 'status') return pages.pagesStatus(client);
+    if (action === 'list') return pages.pagesList(client, { page: args.page });
+    if (action === 'inspect') return pages.pagesInspect(client, project);
+    if (action === 'deployments') return pages.pagesDeployments(client, project);
+    if (action === 'deployment') return pages.pagesDeployment(client, project, args.id || args.rest[1]);
+    if (action === 'logs') return pages.pagesDeploymentLogs(client, project, args.id || args.rest[1]);
+    if (action === 'domains') return pages.pagesDomains(client, project);
+    if (action === 'purge-cache') return pages.pagesPurgeBuildCache(client, project);
+    if (action === 'retry') return pages.pagesRetryDeployment(client, project, args.id || args.rest[1]);
+    if (action === 'rollback') return pages.pagesRollbackDeployment(client, project, args.id || args.rest[1]);
+    throw new Error(`unknown pages action: ${action}`);
+  }
+
+  if (family === 'snippets') {
+    const zone = args.zone;
+    if (!zone) throw new Error('--zone required');
+    const name = args.name || args.rest[0] || '';
+    const yes = args.rest.includes('--yes') || false;
+    if (action === 'status') return snippets.snippetsStatus(client, zone);
+    if (action === 'list') return snippets.snippetsList(client, zone);
+    if (action === 'inspect') return snippets.snippetsInspect(client, zone, name);
+    if (action === 'content') return snippets.snippetsContent(client, zone, name);
+    if (action === 'rules' && (!args.rest[0] || args.rest[0] === 'list')) {
+      return snippets.snippetsRulesList(client, zone);
+    }
+    if (action === 'rules' && args.rest[0] === 'plan') {
+      return snippets.snippetsRulesPlan(client, zone, []);
+    }
+    throw new Error(`unknown snippets action: ${action}`);
+  }
+
+  if (family === 'token-validation' || family === 'token_validation') {
+    const zone = args.zone;
+    if (!zone) throw new Error('--zone required');
+    if (action === 'status') return tokenValidation.tokenValidationStatus(client, zone);
+    if (action === 'configs') return tokenValidation.tokenValidationListConfigs(client, zone);
+    if (action === 'config') return tokenValidation.tokenValidationGetConfig(client, zone, args.id || args.rest[0]);
+    if (action === 'rules') return tokenValidation.tokenValidationListRules(client, zone);
+    throw new Error(`unknown token-validation action: ${action}`);
+  }
+
+  return null;
+}
 
 export async function runCloudflare(argv = [], options = {}) {
+  const familyPeek = String(argv[0] || 'status').trim().toLowerCase();
+  if (isCloudflareLoginFamily(familyPeek)) {
+    const loginArgv = familyPeek === 'packs'
+      ? ['--list-packs', ...argv.slice(1)]
+      : argv.slice(1);
+    return runCloudflareBrowserOAuthLogin(loginArgv, options);
+  }
+
   const args = parse(argv);
   if (options.cwd && !argv.includes('--cwd')) args.cwd = path.resolve(options.cwd);
   const write = options.write || ((value) => process.stdout.write(value));
-  if (args.help) { write(help); return null; }
+  if (args.help || args.family === 'help') {
+    write(help);
+    return null;
+  }
+
   try {
     let result;
-    if (args.subcommand === 'status') {
-      result = await runWranglerNative('whoami', args, options);
-    } else if (args.subcommand === 'commands') {
-      result = { schema_version: 1, native: listWranglerNativeCommands(), families: WRANGLER_OPERATION_FAMILIES };
-    } else if (args.subcommand === 'run') {
+
+    if (args.family === 'status' && !args.action) {
+      // Prefer API token probe when present; else Wrangler whoami
+      if (process.env.CLOUDFLARE_API_TOKEN || options.apiToken) {
+        const client = clientFromArgs(args, options);
+        const matrix = capabilityAuthorizationMatrix([]);
+        result = {
+          schema: 'agentsam.cloudflare.status.v1',
+          provider: 'cloudflare',
+          auth: {
+            mode: 'api_token',
+            token_configured: Boolean(client.apiToken),
+            account_id: client.accountId || null,
+          },
+          capabilities: matrix,
+          feature_packs: listCloudflareFeaturePacks().map((p) => ({
+            id: p.id,
+            label: p.label,
+            authorize: `agentsam cloudflare login --pack ${p.id}`,
+          })),
+          note: 'OAuth scope matrix unknown for raw API tokens — use family status probes for live authorization. Prefer agentsam_cf_browser_oauth packs for scoped consent.',
+        };
+        // Live probes for key families when account present
+        if (client.accountId) {
+          result.probes = {};
+          for (const [key, fn] of [
+            ['workflows', () => workflows.workflowsStatus(client)],
+            ['scanner', () => scanner.scannerStatus(client)],
+          ]) {
+            try {
+              result.probes[key] = await fn();
+            } catch (err) {
+              result.probes[key] = err instanceof CloudflareApiError ? err.toJSON() : { ok: false, error: String(err.message || err) };
+            }
+          }
+        }
+      } else {
+        result = await runWranglerNative('whoami', args, options);
+      }
+    } else if (args.family === 'commands') {
+      result = {
+        schema_version: 1,
+        native: listWranglerNativeCommands(),
+        families: WRANGLER_OPERATION_FAMILIES,
+        semantic: [
+          'login', 'authorize', 'permissions', 'capabilities', 'workflows', 'scanner', 'tags',
+          'tag-gateway', 'brand', 'keyless', 'token-validation', 'pages', 'snippets',
+        ],
+      };
+    } else if (args.family === 'run') {
       if (!args.action) throw new Error('cloudflare native command id required');
       result = await runWranglerNative(args.action, args, options);
-    } else if (args.subcommand === 'cpu' && args.action === 'analyze') {
+    } else if (args.family === 'cpu' && args.action === 'analyze') {
       result = summarizeCloudflareCpuProfileFile({ cwd: path.resolve(args.cwd), file: args.file });
     } else {
-      write(help);
-      return null;
+      result = await dispatchFamily(args, options);
+      if (result == null) {
+        write(help);
+        return null;
+      }
     }
-    write(args.json ? `${JSON.stringify(result)}\n` : `${JSON.stringify(result, null, 2)}\n`);
+
+    write(args.json ? `${JSON.stringify(result)}\n` : formatHuman(result));
     return result;
   } catch (error) {
-    if (args.json) write(`${JSON.stringify({ ok: false, error: error?.diagnostic || { code: error?.code || 'cloudflare_operation_failed', message: error?.message || String(error) } })}\n`);
+    const payload = error instanceof CloudflareApiError
+      ? error.toJSON()
+      : { ok: false, error: error?.diagnostic || { code: error?.code || 'cloudflare_operation_failed', message: error?.message || String(error) } };
+    if (args.json) write(`${JSON.stringify(payload)}\n`);
+    else if (error?.remediation) write(`${formatHuman(payload)}`);
     else write(`${renderDiagnosticError(error)}\n`);
     error.reported = true;
     throw error;

package/src/commands/codebaseindex.js

@@ -465,7 +465,12 @@ async function runWizard(root, opts) {
   }
 
   // Default scope from categorized inventory (not "include everything")
-  let include = opts.include ? splitList(opts.include) : [...(inventory.suggested.include || [])];
+  let include = opts.include
+    ? splitList(opts.include)
+    : [...new Set([
+      ...(inventory.suggested.include || []),
+      ...(inventory.suggested.include_files || []),
+    ])];
   let exclude = opts.exclude ? splitList(opts.exclude) : [...(inventory.suggested.exclude || [])];
 
   if (discovered.assistModels.length) {

package/src/commands/compute.js

@@ -0,0 +1,4 @@
+/**
+ * Compatibility shim — prefer `agentsam google-cloud`.
+ */
+export { runCompute, runGoogleCloud, normalizeGoogleCloudArgv } from './google-cloud.js';

package/src/commands/connections.js

@@ -11,11 +11,15 @@ import {
 import { resolveIamIssuer } from '../../packages/identity/src/contracts/auth-config.js';
 import { collectRuntimeStatus } from './runtime-status.js';
 
-const PRODUCTION_CALLBACK = `https://agentsam.inneranimalmedia.com${CLOUDFLARE_CALLBACK_PATH}`;
-
 function doctor(env = process.env) {
   const iam = {
-    issuer: resolveIamIssuer(env),
+    issuer: (() => {
+      try {
+        return resolveIamIssuer(env);
+      } catch {
+        return null;
+      }
+    })(),
     clientId: Boolean(String(env.IAM_CLIENT_ID || '').trim()),
     serverSecret: Boolean(String(env.IAM_CLIENT_SECRET || '').trim()),
     originAlias: Boolean(String(env.IAM_ORIGIN || '').trim()),
@@ -29,7 +33,9 @@ function printSetup(env = process.env) {
   const client = resolveCloudflareOAuthClient(env);
   console.log('Cloudflare connector setup');
   console.log('');
-  console.log(`  callback: ${PRODUCTION_CALLBACK}`);
+  console.log(`  callback path: ${CLOUDFLARE_CALLBACK_PATH}`);
+  console.log('  Register full https://<local-studio-host>' + CLOUDFLARE_CALLBACK_PATH);
+  console.log('  on the Cloudflare OAuth client (CLOUDFLARE_OAUTH_CLIENT_ID).');
   console.log('  authorize: https://dash.cloudflare.com/oauth2/auth');
   console.log('  token:     https://dash.cloudflare.com/oauth2/token');
   console.log('  revoke:    https://dash.cloudflare.com/oauth2/revoke');
@@ -39,7 +45,7 @@ function printSetup(env = process.env) {
   if (client.fixture) {
     console.log('STOP: fixture credentials are loaded. OAuth start will return 503.');
   } else if (client.status === 'not_configured') {
-    console.log('status: not_configured — production may deploy; connector stays optional.');
+    console.log('status: not_configured — set CLOUDFLARE_OAUTH_CLIENT_ID on the Local Studio Worker.');
   } else {
     console.log(`status: ${client.status}`);
   }