@inneranimalmedia/agentsam-sdk 2.6.2 → 2.6.4

package/src/cli/command-catalog.js

@@ -0,0 +1,130 @@
+/**
+ * CLI command catalog — machine-readable authority for help, assist tips, and dispatch hints.
+ * Alias ≠ authority: skill tips and SAM operation ids live here so help is not a prose-only dump.
+ */
+
+/** @typedef {{ id: string, aliases?: string[], summary: string, topic: string, skill?: string, operation?: string, common?: boolean }} CliCommandEntry */
+
+/** @type {CliCommandEntry[]} */
+export const CLI_COMMAND_CATALOG = Object.freeze([
+  { id: 'help', aliases: ['-h', '--help'], summary: 'Interactive or topic help from this catalog', topic: 'start', skill: 'agentsam-app-fundamentals', common: true },
+  { id: 'create', summary: 'Scaffold a new AgentSam project from a preset', topic: 'create', skill: 'agentsam-app-fundamentals', common: false },
+  { id: 'add', summary: 'Add an explicit feature/capability selection', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'plugins', summary: 'Install and manage AgentSam plugins', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'dev', summary: 'Run this project’s npm dev script', topic: 'work', skill: 'agentsam-app-fundamentals' },
+  { id: 'inspect', summary: 'Bounded repository inspect / authority view', topic: 'work', skill: 'agentsam-app-fundamentals', operation: 'repository.inspect', common: true },
+  { id: 'capabilities', summary: 'Inspect capability contracts', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'skills', aliases: ['skill'], summary: 'List or load portable skill instructions', topic: 'create', skill: 'agentsam-app-fundamentals', common: true },
+  { id: 'context', summary: 'Git + bridge context from any repo', topic: 'work', skill: 'agentsam-app-fundamentals' },
+  { id: 'status', summary: 'Account, models, terminal, and live deploy awareness', topic: 'runtime', skill: 'agentsam-progression-guard', common: true },
+  { id: 'db', summary: 'Project-local SQLite status/init', topic: 'runtime', skill: 'agentsam-app-fundamentals' },
+  { id: 'models', summary: 'Probe hosted/local model availability', topic: 'start', skill: 'agentsam-app-fundamentals', common: true },
+  { id: 'providers', summary: 'Configure machine provider credentials', topic: 'start', skill: 'agentsam-app-fundamentals' },
+  { id: 'env', summary: 'Provider profile / shell loader helpers', topic: 'start', skill: 'agentsam-app-fundamentals' },
+  { id: 'api-key', aliases: ['apikey', 'api-keys'], summary: 'Create/list/rotate AgentSam API keys (aak_*)', topic: 'start', skill: 'agentsam-app-fundamentals', common: true },
+  { id: 'login', summary: 'Sign in and persist machine-local session', topic: 'start', skill: 'agentsam-app-fundamentals' },
+  { id: 'logout', summary: 'Sign out locally', topic: 'start', skill: 'agentsam-app-fundamentals' },
+  { id: 'whoami', summary: 'Authenticated account + tokenPermissions', topic: 'start', skill: 'agentsam-app-fundamentals', common: true },
+  { id: 'resume', summary: 'Resume a saved AgentSam session', topic: 'start', skill: 'agentsam-app-fundamentals' },
+  { id: 'shell', summary: 'Interactive slash-command shell', topic: 'inside', skill: 'agentsam-app-fundamentals' },
+  { id: 'start-local', summary: 'Local PTY WebSocket service', topic: 'runtime', skill: 'agentsam-app-fundamentals' },
+  { id: 'ollama', summary: 'Local Ollama setup/status/models', topic: 'runtime', skill: 'agentsam-app-fundamentals' },
+  { id: 'tunnel', summary: 'Cloudflare Tunnel via Wrangler', topic: 'runtime', skill: 'agentsam-cloudflare-workers' },
+  { id: 'connections', aliases: ['connection'], summary: 'Inspect execution connections', topic: 'runtime', skill: 'agentsam-cloudflare-workers' },
+  { id: 'deploy', summary: 'Graduate intentionally to cloud', topic: 'runtime', skill: 'agentsam-progression-guard', common: true },
+  { id: 'deploy-receipt', summary: 'Merkle deploy/checkpoint receipts', topic: 'runtime', skill: 'agentsam-progression-guard' },
+  { id: 'cloudflare', aliases: ['cf'], summary: 'Wrangler reads + Worker CPU profiles', topic: 'runtime', skill: 'agentsam-cloudflare-workers' },
+  { id: 'go', summary: 'Go product discover/build/deploy', topic: 'runtime', skill: 'agentsam-cloudflare-workers' },
+  { id: 'mcp', summary: 'MCP server catalog and client adapters', topic: 'runtime', skill: 'agentsam-cloudflare-workers' },
+  { id: 'eval', summary: 'Context fixtures and live eval telemetry', topic: 'runtime', skill: 'agentsam-app-fundamentals' },
+  { id: 'index', summary: 'Plan/run incremental AST (+ optional embeddings)', topic: 'work', skill: 'agentsam-codebaseindex', operation: 'codebaseindex.ingest' },
+  { id: 'search', summary: 'Retrieve indexed code/text', topic: 'work', skill: 'agentsam-codebaseindex' },
+  { id: 'repo', summary: 'Repository snapshot / observations', topic: 'work', skill: 'agentsam-app-fundamentals', operation: 'repository.inspect' },
+  { id: 'init', summary: 'Knowledge setup or local scaffold', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'codebaseindex', aliases: ['ingest', 'codebase-index'], summary: 'Guided codebase ingest: materials, allowlist, embeddings, storage', topic: 'work', skill: 'agentsam-codebaseindex', operation: 'codebaseindex.ingest', common: true },
+  { id: 'brand', summary: 'Deterministic brand intelligence', topic: 'work', skill: 'agentsam-app-fundamentals', operation: 'brand.scan' },
+  { id: 'plan', summary: 'Composable plans (e.g. brand)', topic: 'work', skill: 'agentsam-app-fundamentals' },
+  { id: 'security', aliases: ['sca'], summary: 'Dependency + trust-boundary scan', topic: 'work', skill: 'agentsam-progression-guard', operation: 'security.scan', common: true },
+  { id: 'merkle', summary: 'File integrity snapshots and explorer', topic: 'work', skill: 'agentsam-app-fundamentals' },
+  { id: 'cad', summary: 'Blender/OpenSCAD/FreeCAD CAD tools', topic: 'work', skill: 'agentsam-app-fundamentals', operation: 'cad.blender.inspect' },
+  { id: 'dockerize', summary: 'Build/run supported containers', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'mini', summary: 'Create a small local gadget', topic: 'create', skill: 'agentsam-jr-dev' },
+  { id: 'recon', summary: 'Bounded-worker packets + finding reports', topic: 'work', skill: 'agentsam-app-fundamentals' },
+  { id: 'autorag', summary: 'AutoRAG configure/probe helpers', topic: 'work', skill: 'agentsam-codebaseindex' },
+  { id: 'identity', summary: 'Identity portal, providers, protocol surfaces', topic: 'create', skill: 'agentsam-app-fundamentals' },
+  { id: 'scaffold', summary: 'Generate CMS or worker-api starter', topic: 'create', skill: 'agentsam-jr-dev' },
+  { id: 'goap', summary: 'GOAP blackboard status/plan', topic: 'inside', skill: 'agentsam-app-fundamentals' },
+  { id: 'app', aliases: ['apps'], summary: 'Bundled AgentSam apps launcher', topic: 'create', skill: 'agentsam-app-fundamentals' },
+]);
+
+const byId = new Map();
+for (const entry of CLI_COMMAND_CATALOG) {
+  byId.set(entry.id, entry);
+  for (const alias of entry.aliases || []) byId.set(alias, entry);
+}
+
+/**
+ * @param {string} name
+ * @returns {CliCommandEntry|null}
+ */
+export function getCliCommand(name) {
+  const key = String(name || '').trim().toLowerCase();
+  if (!key) return null;
+  return byId.get(key) || null;
+}
+
+export function listCliCommands(options = {}) {
+  let rows = [...CLI_COMMAND_CATALOG];
+  if (options.topic) rows = rows.filter((r) => r.topic === options.topic);
+  if (options.common) rows = rows.filter((r) => r.common);
+  return rows;
+}
+
+/**
+ * Machine baseline: every command surfaces how to load its skill from inside the CLI.
+ * @param {CliCommandEntry|string} entryOrId
+ * @param {{ write?: (s: string) => void, quiet?: boolean }} [options]
+ */
+export function printAssistTip(entryOrId, options = {}) {
+  if (options.quiet) return;
+  // Never contaminate machine JSON streams.
+  if (options.json || process.argv.includes('--json') || process.argv.includes('--format=json')) return;
+  const entry = typeof entryOrId === 'string' ? getCliCommand(entryOrId) : entryOrId;
+  if (!entry?.skill) return;
+  const write = options.write || ((s) => process.stderr.write(s));
+  const op = entry.operation ? ` · sam.invoke("${entry.operation}")` : '';
+  write(`  tip: use skill ${entry.skill}   (agentsam skills ${entry.skill})${op}\n`);
+}
+
+/**
+ * Suggest close command ids for unknown input.
+ * @param {string} name
+ * @param {number} [limit]
+ */
+export function suggestCliCommands(name, limit = 5) {
+  const q = String(name || '').toLowerCase();
+  if (!q) return listCliCommands({ common: true }).slice(0, limit);
+  return CLI_COMMAND_CATALOG
+    .map((entry) => {
+      const hay = [entry.id, ...(entry.aliases || []), entry.summary].join(' ').toLowerCase();
+      let score = 0;
+      if (entry.id.startsWith(q) || (entry.aliases || []).some((a) => a.startsWith(q))) score += 3;
+      if (hay.includes(q)) score += 1;
+      for (const t of q.split(/[^a-z0-9]+/).filter(Boolean)) {
+        if (hay.includes(t)) score += 1;
+      }
+      return { entry, score };
+    })
+    .filter((x) => x.score > 0)
+    .sort((a, b) => b.score - a.score || a.entry.id.localeCompare(b.entry.id))
+    .slice(0, limit)
+    .map((x) => x.entry);
+}
+
+export const CLI_HELP_TOPICS = Object.freeze([
+  { id: 'start', label: 'Start / resume', summary: 'Enter AgentSam, resume work, identity, models.' },
+  { id: 'work', label: 'Build / inspect', summary: 'Repository intelligence, ingest, security, brand.' },
+  { id: 'runtime', label: 'Runtime / terminal', summary: 'Local, remote, sandbox, and deployment controls.' },
+  { id: 'inside', label: 'Inside AgentSam', summary: 'Shell and GOAP surfaces.' },
+  { id: 'create', label: 'Create / extend', summary: 'Scaffold, add capabilities, identity, skills.' },
+]);

package/src/cli/dispatch.js

@@ -0,0 +1,48 @@
+/**
+ * Catalog-backed dispatch bootstrap.
+ * Full cli.js cutover is incremental — this module is the target authority for handlers.
+ */
+
+import { getCliCommand, printAssistTip, suggestCliCommands } from './command-catalog.js';
+
+/** @type {Record<string, () => Promise<(argv: string[]) => unknown>>} */
+const HANDLERS = {
+  codebaseindex: async () => (await import('../commands/codebaseindex.js')).runCodebaseindex,
+  ingest: async () => (await import('../commands/codebaseindex.js')).runCodebaseindex,
+  'codebase-index': async () => (await import('../commands/codebaseindex.js')).runCodebaseindex,
+  skill: async () => (await import('../commands/skill.js')).runSkill,
+  skills: async () => (await import('../commands/skills.js')).runSkills,
+};
+
+/**
+ * @param {string} command
+ * @param {string[]} rest
+ * @param {{ reportError?: (e: Error) => void }} [ctx]
+ */
+export async function dispatchCatalogCommand(command, rest = [], ctx = {}) {
+  const entry = getCliCommand(command);
+  if (!entry) {
+    const suggestions = suggestCliCommands(command);
+    const err = new Error(`Unknown command: ${command}`);
+    err.code = 'AGENTSAM_UNKNOWN_COMMAND';
+    err.suggestions = suggestions;
+    throw err;
+  }
+
+  printAssistTip(entry, { json: rest.includes('--json') });
+
+  const loader = HANDLERS[entry.id] || HANDLERS[command];
+  if (!loader) {
+    const err = new Error(`Catalog entry "${entry.id}" is not yet wired to a lazy handler (legacy cli.js path).`);
+    err.code = 'AGENTSAM_HANDLER_NOT_MIGRATED';
+    err.entry = entry;
+    throw err;
+  }
+
+  const run = await loader();
+  return run(rest);
+}
+
+export function listDispatchableCommands() {
+  return Object.keys(HANDLERS);
+}

package/src/cli.js

@@ -11,6 +11,7 @@ import { printContextSummary } from './lib/detect-context.js';
 import { runStartLocal } from './commands/start-local.js';
 import { runOllama } from './commands/ollama.js';
 import { runModels } from './commands/models.js';
+import { runApp } from './commands/app.js';
 import { runProviders } from './commands/providers.js';
 import { runEnv } from './commands/env.js';
 import { runTunnel } from './commands/tunnel.js';
@@ -23,6 +24,8 @@ import { runDb } from './commands/db.js';
 import { runStatus } from './commands/status.js';
 import { runInteractive } from './commands/interactive.js';
 import { runShell } from './commands/shell.js';
+import { runGoap } from './commands/goap.js';
+import { runBrand, runPlan } from './commands/brand.js';
 import { runDockerize } from './commands/dockerize.js';
 import { runMini } from './commands/mini.js';
 import { runMerkle } from './commands/merkle.js';
@@ -31,11 +34,16 @@ import { runSecurity } from './commands/security.js';
 import { runRecon } from './commands/recon.js';
 import { runCad } from './commands/cad.js';
 import { runSkills } from './commands/skills.js';
+import { runSkill } from './commands/skill.js';
 import { runEval } from './commands/eval.js';
+import { runMcp } from './commands/mcp.js';
 import { runCloudflare } from './commands/cloudflare.js';
+import { runGo } from './commands/go.js';
 import { runWhoami } from './commands/whoami.js';
+import { runApiKey } from './commands/api-key.js';
 import { runResume } from './commands/resume.js';
 import { runLogin, runLogout } from './commands/account-auth.js';
+import { runPlugins } from './commands/plugins.js';
 import { applyPresetSelection, runAdd, runCapabilities, runDev, runInspect } from './commands/product.js';
 import { listPresets, resolvePreset } from './presets/index.js';
 import fs from 'node:fs';
@@ -43,6 +51,8 @@ import { repositoryRoot } from './knowledge/config.js';
 import { resolveAccountAuth } from './lib/account-session.js';
 import { renderDiagnosticError } from './errors/index.js';
 import { renderHelpOverview, runHelp } from './ui/cli/help.js';
+import { hydrateSecureCredentials } from './security/local-vault.js';
+import { getCliCommand, printAssistTip, suggestCliCommands } from './cli/command-catalog.js';
 
 const VERSION = pkg.version;
 
@@ -65,27 +75,33 @@ function printLegacyHelp() {
     agentsam                     Enter the interactive Agent Sam experience
     agentsam create <name> --preset <fullstack|cms|prototype|data>
     agentsam add <auth|cms|knowledge|agent|deploy-cloudflare>
+    agentsam plugins list|install|connect|status|remove [@agentsam-mcp]
     agentsam dev               Run this project's existing npm dev script
     agentsam inspect [--json]  Bounded repository index by default; use --view full for authority envelope
+    agentsam brand [scan|…]    Deterministic brand intelligence on repository.snapshot authority
+    agentsam plan brand        Composable brand normalization plan (--goap optional)
     agentsam deploy            Graduate an AgentSam project intentionally
 
   Capability discovery:
     agentsam capabilities [capability-id] [--json]
+    agentsam skill list|create|inspect|install|alias|remove|invoke
     agentsam skills [skill-id-or-alias] [--references] [--json]
 
   Power-user UX:
     agentsam context [--json]  Git repo/revision + bridge configuration from any repo
     agentsam init              Configure knowledge in this repo; --name scaffolds a new project
     agentsam index             Plan/run incremental AST and optional embeddings (--help)
+    agentsam codebaseindex     Guided ingest: materials/allowlist/embeddings/storage (alias: ingest)
     agentsam search "query"    Retrieve indexed code/text; --semantic enables embeddings
     agentsam repo snapshot     Git composition/churn; --save retains observations
     agentsam cad blender       Programmatic Blender inspect/build/render/export (--help)
+    agentsam cad project       Editable CAD project tools/workflows (--help)
     agentsam mini <name>       Create and preview a small local gadget (--help for options)
     agentsam merkle            File integrity, snapshots, comparisons, and interactive explorer (--help)
     agentsam deploy-receipt    Merkle deploy/checkpoint capture + promote/failure receipts (--help)
     agentsam recon             Bounded-worker task packets + finding-report validation (--help)
     agentsam security          Dependency scan, log triage, and verified repair (--help)
-    agentsam status [--json]   Live local Git + DB + API + PTY status
+    agentsam status [--json] [-i]   Honest awareness: account + models + terminal + live Worker
     agentsam db init|status    Manage the project-local SQLite database
     agentsam models            Verify configured providers and selectable hosted/local models
     agentsam providers         Configure, verify, and remove machine provider credentials
@@ -96,14 +112,16 @@ function printLegacyHelp() {
     agentsam resume [session]  Resume a saved Agent Sam session; omit id for picker
     agentsam eval context      Offline context-strategy/economics fixtures (--help)
     agentsam cloudflare        Native Wrangler reads + Worker CPU profile analysis (--help)
+    agentsam go                Go runtime discovery/build/deploy (Cloudflare worker-container)
     agentsam start-local       Local PTY on ws://127.0.0.1:3099 (no tunnel, no Cloudflare)
     agentsam ollama            Opt-in local Ollama setup/status/model management
     agentsam shell             Interactive Agent Sam slash-command shell
-    agentsam tunnel            Explicitly expose local PTY when remote access is wanted
+    agentsam tunnel            Choose/list/inspect/run real Cloudflare Tunnels via Wrangler
     agentsam deploy            Graduate to Cloudflare / GCP when ready
     agentsam dockerize         Build/run app, knowledge, or CAD containers (--help)
     agentsam identity preview  Preview the reusable local auth portal (not production login)
-    agentsam identity init     Add reusable identity package surfaces
+    agentsam identity init     Scaffold identity app (+ optional --provider)
+    agentsam identity providers|plan|schema|resolve  Protocol-driven identity surfaces
     agentsam help
     agentsam --version
     agentsam --help
@@ -131,11 +149,13 @@ function printLegacyHelp() {
   Run agentsam from any project to enter the account-aware interactive experience.
   Account, model-provider, terminal, and deploy permissions are requested only when the related capability needs them.
 
-  Tunnel options:
-    --quick                    Quick tunnel (default) — trycloudflare.com URL
-    --named                    Named CF tunnel (needs --tunnel-name --hostname --zone-id)
-    --port <n>                 Local PTY port (default 3099)
-    --token <aak_…>            Use AGENTSAM_API_KEY-compatible account credential
+  Tunnel commands:
+    agentsam tunnel            Guided picker over Wrangler-visible tunnels
+    agentsam tunnel list       List real Cloudflare Tunnels
+    agentsam tunnel info <id>  Inspect one tunnel
+    agentsam tunnel run <id>   Run/start a connector on this machine
+    agentsam tunnel create <name>
+    agentsam tunnel quick-start [url]
 
   Init options:
     --name <name>              Project directory name
@@ -300,6 +320,13 @@ async function initFromArgs(argv) {
 const command = process.argv[2];
 const rest = process.argv.slice(3);
 
+hydrateSecureCredentials(process.env);
+
+const catalogEntry = command && !command.startsWith('-') ? getCliCommand(command) : null;
+if (catalogEntry && command !== 'help') {
+  printAssistTip(catalogEntry);
+}
+
 if (command === '--version' || command === '-v') {
   console.log(VERSION);
 } else if (command === 'help') {
@@ -333,6 +360,12 @@ if (command === '--version' || command === '-v') {
 } else if (command === 'add') {
   try { await runAdd(rest); }
   catch (e) { reportCliError(e); process.exitCode = 1; }
+} else if (command === 'plugins') {
+  try { await runPlugins(rest); }
+  catch (e) { reportCliError(e); process.exitCode = 1; }
+} else if (command === 'install' && rest[0] === 'plugins') {
+  try { await runPlugins(['install', rest[1] || 'agentsam-mcp', ...rest.slice(2)]); }
+  catch (e) { reportCliError(e); process.exitCode = 1; }
 } else if (command === 'dev') {
   try { await runDev(rest); }
   catch (e) { reportCliError(e); process.exitCode = 1; }
@@ -370,6 +403,13 @@ if (command === '--version' || command === '-v') {
     reportCliError(e);
     process.exit(1);
   }
+} else if (command === 'app' || command === 'apps') {
+  try {
+    await runApp(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exit(1);
+  }
 } else if (command === 'providers') {
   try {
     await runProviders(rest);
@@ -391,6 +431,13 @@ if (command === '--version' || command === '-v') {
     reportCliError(e);
     process.exit(1);
   }
+} else if (command === 'mcp') {
+  try {
+    await runMcp(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
 } else if (command === 'cloudflare' || command === 'cf') {
   try {
     await runCloudflare(rest);
@@ -398,6 +445,13 @@ if (command === '--version' || command === '-v') {
     if (!e?.reported) reportCliError(e);
     process.exitCode = 1;
   }
+} else if (command === 'go') {
+  try {
+    await runGo(rest);
+  } catch (e) {
+    if (!e?.reported) reportCliError(e);
+    process.exitCode = 1;
+  }
 } else if (command === 'login') {
   try {
     await runLogin(rest);
@@ -419,6 +473,13 @@ if (command === '--version' || command === '-v') {
     reportCliError(e);
     process.exitCode = 1;
   }
+} else if (command === 'api-key' || command === 'apikey' || command === 'api-keys') {
+  try {
+    await runApiKey(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
 } else if (command === 'resume') {
   try {
     await runResume(rest);
@@ -433,6 +494,30 @@ if (command === '--version' || command === '-v') {
     reportCliError(e);
     process.exit(1);
   }
+} else if (command === 'goap') {
+  try {
+    await runGoap(rest[0], {
+      cwd: process.cwd(),
+      json: rest.includes('--json'), args: rest.slice(1),
+    });
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
+} else if (command === 'brand') {
+  try {
+    await runBrand(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
+} else if (command === 'plan') {
+  try {
+    await runPlan(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
 } else if (command === 'start-local') {
   await runStartLocal({});
 } else if (command === 'ollama') {
@@ -479,13 +564,20 @@ if (command === '--version' || command === '-v') {
   }
 } else if (command === 'security' || command === 'sca') {
   await runSecurity(rest);
-} else if (command === 'skills' || command === 'skill') {
+} else if (command === 'skills') {
   try {
     runSkills(rest);
   } catch (e) {
     reportCliError(e);
     process.exitCode = 1;
   }
+} else if (command === 'skill') {
+  try {
+    await runSkill(rest);
+  } catch (e) {
+    reportCliError(e);
+    process.exitCode = 1;
+  }
 } else if (command === 'merkle') {
   await runMerkle(rest);
 } else if (command === 'deploy-receipt') {
@@ -499,6 +591,18 @@ if (command === '--version' || command === '-v') {
     reportCliError(e);
     process.exitCode = 1;
   }
+} else if (command === 'autorag') {
+  try { await (await import('./commands/autorag.js')).runAutoRag(rest); }
+  catch (e) { reportCliError(e); process.exitCode = 1; }
+} else if (command === 'codebaseindex' || command === 'ingest' || command === 'codebase-index') {
+  try {
+    await (await import('./commands/codebaseindex.js')).runCodebaseindex(rest);
+  } catch (e) {
+    if (e?.code !== 'AGENTSAM_CODEBASEINDEX_CANCELLED') {
+      reportCliError(e);
+      process.exitCode = 1;
+    }
+  }
 } else if (['index', 'search', 'repo'].includes(command)) {
   try {
     const commands = await import('./commands/knowledge.js');
@@ -514,6 +618,7 @@ if (command === '--version' || command === '-v') {
   } catch (e) { reportCliError(e); process.exitCode = 1; }
 } else if (command === 'identity') {
   const sub = rest[0];
+  const identityProtocol = await import('./commands/identity-protocol.js');
   if (sub === 'preview') {
     try {
       await runIdentityPreview(rest.slice(1));
@@ -528,12 +633,57 @@ if (command === '--version' || command === '-v') {
       reportCliError(e);
       process.exit(1);
     }
+  } else if (sub === 'providers') {
+    try {
+      await identityProtocol.runIdentityProviders(rest.slice(1));
+    } catch (e) {
+      reportCliError(e);
+      process.exit(1);
+    }
+  } else if (sub === 'plan') {
+    try {
+      await identityProtocol.runIdentityPlan(rest.slice(1));
+    } catch (e) {
+      reportCliError(e);
+      process.exit(1);
+    }
+  } else if (sub === 'schema') {
+    try {
+      await identityProtocol.runIdentitySchema(rest.slice(1));
+    } catch (e) {
+      reportCliError(e);
+      process.exit(1);
+    }
+  } else if (sub === 'resolve') {
+    try {
+      await identityProtocol.runIdentityResolve(rest.slice(1));
+    } catch (e) {
+      reportCliError(e);
+      process.exit(1);
+    }
   } else {
-    console.error('\n  Usage:\n    agentsam identity preview [--open] [--port 8791]\n    agentsam identity init --name <project> [--brand "Name"]\n');
+    identityProtocol.printIdentityHelp();
+    process.exit(1);
+  }
+} else if (command === 'scaffold') {
+  try {
+    const { runScaffold } = await import('./lib/scaffold/index.js');
+    await runScaffold(rest[0] ?? null);
+  } catch (e) {
+    reportCliError(e);
     process.exit(1);
   }
 } else {
   console.error(`\n  Unknown command: ${command}\n`);
+  const suggestions = suggestCliCommands(command);
+  if (suggestions.length) {
+    console.error('  Did you mean:');
+    for (const row of suggestions) {
+      console.error(`    agentsam ${row.id}  — ${row.summary}`);
+      if (row.skill) console.error(`      tip: use skill ${row.skill}`);
+    }
+    console.error('');
+  }
   printHelp();
   process.exit(1);
 }

package/src/cloudflare/index.js

@@ -6,6 +6,12 @@ export {
   parseWranglerErrorEvidence,
   runWranglerNative,
 } from './wrangler.js';
+export {
+  readCloudflareDeploymentContract,
+  collectCloudflareDeploymentStatus,
+  parseWranglerToml,
+  resolveProjectD1Database,
+} from './runtime-status.js';
 export {
   summarizeCloudflareCpuProfile,
   summarizeCloudflareCpuProfileFile,