@inneranimalmedia/agentsam-sdk 2.6.1 → 2.6.3

package/src/cli.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import pkg from '../package.json' with { type: 'json' };
-import readline from 'readline';
 import { cancel, intro, isCancel, outro, select, text } from '@clack/prompts';
 import path from 'node:path';
 import { buildLocalScaffoldMeta } from './lib/local-scaffold.js';
@@ -9,10 +8,11 @@ import { writeScaffoldFiles } from './lib/write-files.js';
 import { initializeGitRepository } from './lib/init-git.js';
 import { initializeLocalSqlite } from './local/sqlite.js';
 import { printContextSummary } from './lib/detect-context.js';
-import { promptOptionalByokKeys } from './lib/prompt-byok.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';
 import { runDeploy } from './commands/deploy.js';
@@ -24,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';
@@ -33,17 +35,21 @@ import { runRecon } from './commands/recon.js';
 import { runCad } from './commands/cad.js';
 import { runSkills } from './commands/skills.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 { 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';
 import { repositoryRoot } from './knowledge/config.js';
-import { resolveAccountSdkKey } from './lib/account-session.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';
 
 const VERSION = pkg.version;
 
@@ -53,13 +59,6 @@ function reportCliError(error) {
   console.error(`\n${rendered}\n`);
 }
 
-function createPrompt() {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return {
-    ask: (q) => new Promise((resolve) => rl.question(q, resolve)),
-    close: () => rl.close(),
-  };
-}
 
 function printHelp() {
   console.log(renderHelpOverview(VERSION));
@@ -73,8 +72,11 @@ 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:
@@ -88,14 +90,16 @@ function printLegacyHelp() {
     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
     agentsam env init <name>   Create a secure provider profile + reusable shell loader
     agentsam login             Sign in to Inner Animal Media and persist a secure machine-local session
     agentsam logout            Sign out locally; provider credentials stay untouched
@@ -103,14 +107,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
@@ -138,11 +144,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 <sdk_…>            Use existing AGENTSAM_SDK_KEY (skip browser auth)
+  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
@@ -235,11 +243,6 @@ async function runLocalInit(config) {
     console.log(`    ${step}`);
   }
 
-  const sdkKey = resolveAccountSdkKey({ env: process.env }).value;
-  if (prompt && sdkKey) {
-    console.log('\n  Optional — BYOK keys for IAM dashboard Agent Sam (skip with Enter):\n');
-    await promptOptionalByokKeys(sdkKey, prompt);
-  }
 
   console.log(`
   Local means local: no Worker, tunnel, IAM login, or cloud database is required.
@@ -291,17 +294,12 @@ async function initInteractive(partial = {}) {
   if (runTarget !== 'local') {
     const { detectContext, missingForInit } = await import('./lib/detect-context.js');
     const ctx = await detectContext();
-    if (missingForInit(ctx, resolveAccountSdkKey({ env: process.env }).value, { runTarget }).length) {
+    if (missingForInit(ctx, resolveAccountAuth({ env: process.env }).value, { runTarget }).length) {
       printContextSummary(ctx);
     }
   }
 
-  const prompt = resolveAccountSdkKey({ env: process.env }).value ? createPrompt() : null;
-  try {
-    await runLocalInit({ projectName, lane: laneKey, runTarget, prompt });
-  } finally {
-    prompt?.close();
-  }
+  await runLocalInit({ projectName, lane: laneKey, runTarget, prompt: null });
   outro(`Created ${projectName}`);
 }
 
@@ -317,6 +315,8 @@ async function initFromArgs(argv) {
 const command = process.argv[2];
 const rest = process.argv.slice(3);
 
+hydrateSecureCredentials(process.env);
+
 if (command === '--version' || command === '-v') {
   console.log(VERSION);
 } else if (command === 'help') {
@@ -350,6 +350,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; }
@@ -387,6 +393,20 @@ 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);
+  } catch (e) {
+    reportCliError(e);
+    process.exit(1);
+  }
 } else if (command === 'env') {
   try {
     await runEnv(rest);
@@ -401,6 +421,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);
@@ -408,6 +435,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);
@@ -443,6 +477,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') {
@@ -509,6 +567,9 @@ 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 (['index', 'search', 'repo'].includes(command)) {
   try {
     const commands = await import('./commands/knowledge.js');
@@ -524,6 +585,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));
@@ -538,8 +600,44 @@ 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 {

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,